diff options
Diffstat (limited to 'svx/inc')
665 files changed, 695 insertions, 21229 deletions
diff --git a/svx/inc/AccessibleSelectionBase.hxx b/svx/inc/AccessibleSelectionBase.hxx deleted file mode 100644 index 09767025d84a..000000000000 --- a/svx/inc/AccessibleSelectionBase.hxx +++ /dev/null @@ -1,76 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: AccessibleSelectionBase.hxx,v $ - * $Revision: 1.6 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVX_ACCESSIBILITY_ACCESSIBLE_SELECTION_BASE_HXX -#define _SVX_ACCESSIBILITY_ACCESSIBLE_SELECTION_BASE_HXX - -#include <comphelper/accessibleselectionhelper.hxx> -#include "svx/svxdllapi.h" - -namespace accessibility -{ -/** @descr - This base class provides a base implementation of the - <type>XAccessibleSelection</type> interface. - The following methods have to be implemented if this - class is used: - - <method>implGetMutex</method>, - <method>implGetAccessibleContext</method>, - <method>implIsSelected</method>, - <method>implSelect</method>, -*/ - class SVX_DLLPUBLIC AccessibleSelectionBase : public ::comphelper::OCommonAccessibleSelection, - public ::com::sun::star::accessibility::XAccessibleSelection - { - protected: - - virtual ::osl::Mutex& implGetMutex() = 0; - - public: - - // XAccessibleSelection - default implementations - virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clearAccessibleSelection( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - - public: - - AccessibleSelectionBase(); - virtual ~AccessibleSelectionBase(); - }; - -} - -#endif // _SVX_ACCESSIBILITY_ACCESSIBLE_SELECTION_BASE_HXX diff --git a/svx/inc/AccessibleStaticTextBase.hxx b/svx/inc/AccessibleStaticTextBase.hxx deleted file mode 100644 index 60a31117185f..000000000000 --- a/svx/inc/AccessibleStaticTextBase.hxx +++ /dev/null @@ -1,562 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: AccessibleStaticTextBase.hxx,v $ - * $Revision: 1.14 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVX_ACCESSILE_STATIC_TEXT_BASE_HXX_ -#define _SVX_ACCESSILE_STATIC_TEXT_BASE_HXX_ - -#include <memory> -#include <tools/gen.hxx> -#include <cppuhelper/implbase2.hxx> -#include <com/sun/star/uno/Any.hxx> -#include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/accessibility/XAccessible.hpp> -#include <com/sun/star/accessibility/XAccessibleText.hpp> -#include <com/sun/star/accessibility/XAccessibleTextAttributes.hpp> -#include <com/sun/star/accessibility/TextSegment.hpp> -#include "svx/svxdllapi.h" - - -class SvxEditSource; -class SvxEditViewForwarder; - -namespace accessibility -{ - - class AccessibleStaticTextBase_Impl; - - typedef ::cppu::ImplHelper2< - ::com::sun::star::accessibility::XAccessibleText, - ::com::sun::star::accessibility::XAccessibleTextAttributes > AccessibleStaticTextBase_BASE; - - /** Helper class for objects containing EditEngine/Outliner text - - This class implements the XAccessibleText interface for static - text, somewhat similar to the children of the - AccessibleTextHelper class. Currently, there are no children, - i.e. the whole text is presented in one big chunk. This might - change in the future, if a need for image bullets should - arise. These, by convention, would be represented as children - of the text. - - You have to implement the SvxEditSource, SvxTextForwarder, - SvxViewForwarder and SvxEditViewForwarder interfaces in order - to enable your object to cooperate with this - class. SvxTextForwarder encapsulates the fact that text - objects do not necessarily have an EditEngine at their - disposal, SvxViewForwarder and SvxEditViewForwarder do the - same for the document and the edit view. The three mentioned - forwarder objects are not stored by the AccessibleTextHelper, - but fetched every time from the SvxEditSource. So you are best - off making your SvxEditSource::Get*Forwarder methods cache the - current forwarder. - - As this class is intended for static (i.e. non-changing) text - only, no event broadcasting is necessary. You must handle - visibility by yourself, the bounding boxes returned by - getCharacterBounds() are relative to your accessibility - object. - - @attention All public non-UNO methods (those are the uppercase - ones) must not be called with any mutex hold, except when - calling from the main thread (with holds the solar mutex), - unless stated otherwise. This is because they themselves might - need the solar mutex in addition to the object mutex, and the - ordering of the locking must be: first solar mutex, then - object mutex. Furthermore, state change events might be fired - internally. - - @derive Use this class as a base for objects containing static - edit engine text. To avoid overwriting every interface method - to intercept derived object defunc state, just set NULL as the - edit source. Every interface method will then properly throw - an exception. - */ - class SVX_DLLPUBLIC AccessibleStaticTextBase : public AccessibleStaticTextBase_BASE - { - - public: - /** Create accessible text object for given edit source - - @param pEditSource - The edit source to use. Object ownership is transferred - from the caller to the callee. The object listens on the - SvxEditSource for object disposal, so no provisions have - to be taken if the caller destroys the data (e.g. the - model) contained in the given SvxEditSource. - - */ - explicit AccessibleStaticTextBase( ::std::auto_ptr< SvxEditSource > pEditSource ); - virtual ~AccessibleStaticTextBase(); - - private: - - // declared, but not defined - SVX_DLLPRIVATE AccessibleStaticTextBase( const AccessibleStaticTextBase& ); - // declared, but not defined - SVX_DLLPRIVATE AccessibleStaticTextBase& operator= ( const AccessibleStaticTextBase& ); - - public: - /** Query the current edit source - - @attention This method returns by reference, so you are - responsible for serialization (typically, you aquired the - solar mutex when calling this method). Thus, the method - should only be called from the main office thread. - - */ - virtual const SvxEditSource& GetEditSource() const SAL_THROW((::com::sun::star::uno::RuntimeException)); - - /** Set the current edit source - - @attention You are required to have the solar mutex - locked, when calling this method. Thus, the method should - only be called from the main office thread. - - The EditSource set here is required to broadcast out the - following hints: EDITSOURCE_HINT_PARASMOVED, - EDITSOURCE_HINT_SELECTIONCHANGED, TEXT_HINT_MODIFIED, - TEXT_HINT_PARAINSERTED, TEXT_HINT_PARAREMOVED, - TEXT_HINT_TEXTHEIGHTCHANGED, - TEXT_HINT_VIEWSCROLLED. Otherwise, not all state changes - will get noticed by the accessibility object. Further - more, when the corresponding core object or the model is - dying, either the edit source must be set to NULL or it - has to broadcast a SFX_HINT_DYING hint. - - This class does not have a dispose method, since it is not - a UNO component. Nevertheless, it holds C++ references to - several core objects, so you should issue a - SetEditSource(::std::auto_ptr<SvxEditSource>(NULL)) in - your dispose() method. - - @param pEditSource - The new edit source to set. Object ownership is transferred - from the caller to the callee. - */ - virtual void SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ) SAL_THROW((::com::sun::star::uno::RuntimeException)); - - /** Set the event source - - @attention When setting a reference here, you should call - Dispose() when you as the owner are disposing, since until - then this object will hold that reference - - @param rInterface - The interface that should be set as the source for - accessibility events sent by this object. - */ - virtual void SetEventSource( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rInterface ); - - /** Get the event source - - @return the interface that is set as the source for - accessibility events sent by this object. - */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetEventSource() const; - - /** Set offset of EditEngine from parent - - @attention You are required to have the solar mutex - locked, when calling this method. Thus, the method should - only be called from the main office thread. - - If the origin of the underlying EditEngine does - not correspond to the upper left corner of the object - using this class, you have to specify the offset. - - @param rPoint - The offset in screen coordinates (i.e. pixel) - */ - virtual void SetOffset( const Point& rPoint ); - - /** Query offset of EditEngine from parent - - @return the offset in screen coordinates (i.e. pixel) - */ - virtual Point GetOffset() const; - - /** Update the visible children - - As this class currently does not represent any content - using children, this does nothing at the moment. - - @attention You are required to have the solar mutex - locked, when calling this method. Thus, the method should - only be called from the main office thread. - - This method reevaluates the visibility of all - childrens. Call this method if your visibility state has - changed somehow, e.g. if the visible area has changed and - the AccessibleStaticTextHelper isn't notified - internally. Normally, there should not be a need to call - this method. - */ - virtual void UpdateChildren() SAL_THROW((::com::sun::star::uno::RuntimeException)); - - /** Drop all references and enter disposed state - - This method drops all references to external objects (also - the event source reference set via SetEventSource()) and - sets the object into the disposed state (i.e. the methods - return default values or throw a uno::DisposedException - exception). - */ - virtual void Dispose(); - - // XAccessibleText interface implementation - virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException); - /// This will only work with a functional SvxEditViewForwarder, i.e. an EditEngine/Outliner in edit mode - virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - /// Does not support AccessibleTextType::SENTENCE (missing feature in EditEngine) - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - /// Does not support AccessibleTextType::SENTENCE (missing feature in EditEngine) - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - /// Does not support AccessibleTextType::SENTENCE (missing feature in EditEngine) - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - /// This will only work with a functional SvxEditViewForwarder, i.e. an EditEngine/Outliner in edit mode - virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - - // 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); - - // child-related methods from XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - - // child-related methods from XAccessibleComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - - protected: - Rectangle GetParagraphBoundingBox() const; - sal_Int32 GetParagraphCount() const; - sal_Int32 GetParagraphIndex() const; - sal_Int32 GetLineCount( sal_Int32 nParagraph ) const; - - private: - - /// @dyn - const std::auto_ptr< AccessibleStaticTextBase_Impl > mpImpl; - - }; - -} // end of namespace accessibility - -#endif /* _SVX_ACCESSILE_STATIC_TEXT_BASE_HXX_ */ -/************************************************************************* - * - * 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 - * - * $RCSfile: AccessibleStaticTextBase.hxx,v $ - * $Revision: 1.14 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVX_ACCESSILE_STATIC_TEXT_BASE_HXX_ -#define _SVX_ACCESSILE_STATIC_TEXT_BASE_HXX_ - -#include <memory> -#include <tools/gen.hxx> -#include <cppuhelper/implbase2.hxx> -#include <com/sun/star/uno/Any.hxx> -#include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/accessibility/XAccessible.hpp> -#include <com/sun/star/accessibility/XAccessibleText.hpp> -#include <com/sun/star/accessibility/XAccessibleTextAttributes.hpp> -#include <com/sun/star/accessibility/TextSegment.hpp> -#include "svx/svxdllapi.h" - - -class SvxEditSource; - -namespace accessibility -{ - - class AccessibleStaticTextBase_Impl; - - typedef ::cppu::ImplHelper2< - ::com::sun::star::accessibility::XAccessibleText, - ::com::sun::star::accessibility::XAccessibleTextAttributes > AccessibleStaticTextBase_BASE; - - /** Helper class for objects containing EditEngine/Outliner text - - This class implements the XAccessibleText interface for static - text, somewhat similar to the children of the - AccessibleTextHelper class. Currently, there are no children, - i.e. the whole text is presented in one big chunk. This might - change in the future, if a need for image bullets should - arise. These, by convention, would be represented as children - of the text. - - You have to implement the SvxEditSource, SvxTextForwarder, - SvxViewForwarder and SvxEditViewForwarder interfaces in order - to enable your object to cooperate with this - class. SvxTextForwarder encapsulates the fact that text - objects do not necessarily have an EditEngine at their - disposal, SvxViewForwarder and SvxEditViewForwarder do the - same for the document and the edit view. The three mentioned - forwarder objects are not stored by the AccessibleTextHelper, - but fetched every time from the SvxEditSource. So you are best - off making your SvxEditSource::Get*Forwarder methods cache the - current forwarder. - - As this class is intended for static (i.e. non-changing) text - only, no event broadcasting is necessary. You must handle - visibility by yourself, the bounding boxes returned by - getCharacterBounds() are relative to your accessibility - object. - - @attention All public non-UNO methods (those are the uppercase - ones) must not be called with any mutex hold, except when - calling from the main thread (with holds the solar mutex), - unless stated otherwise. This is because they themselves might - need the solar mutex in addition to the object mutex, and the - ordering of the locking must be: first solar mutex, then - object mutex. Furthermore, state change events might be fired - internally. - - @derive Use this class as a base for objects containing static - edit engine text. To avoid overwriting every interface method - to intercept derived object defunc state, just set NULL as the - edit source. Every interface method will then properly throw - an exception. - */ - class SVX_DLLPUBLIC AccessibleStaticTextBase : public AccessibleStaticTextBase_BASE - { - - public: - /** Create accessible text object for given edit source - - @param pEditSource - The edit source to use. Object ownership is transferred - from the caller to the callee. The object listens on the - SvxEditSource for object disposal, so no provisions have - to be taken if the caller destroys the data (e.g. the - model) contained in the given SvxEditSource. - - */ - explicit AccessibleStaticTextBase( ::std::auto_ptr< SvxEditSource > pEditSource ); - virtual ~AccessibleStaticTextBase(); - - private: - - // declared, but not defined - SVX_DLLPRIVATE AccessibleStaticTextBase( const AccessibleStaticTextBase& ); - // declared, but not defined - SVX_DLLPRIVATE AccessibleStaticTextBase& operator= ( const AccessibleStaticTextBase& ); - - public: - /** Query the current edit source - - @attention This method returns by reference, so you are - responsible for serialization (typically, you aquired the - solar mutex when calling this method). Thus, the method - should only be called from the main office thread. - - */ - virtual const SvxEditSource& GetEditSource() const SAL_THROW((::com::sun::star::uno::RuntimeException)); - - /** Set the current edit source - - @attention You are required to have the solar mutex - locked, when calling this method. Thus, the method should - only be called from the main office thread. - - The EditSource set here is required to broadcast out the - following hints: EDITSOURCE_HINT_PARASMOVED, - EDITSOURCE_HINT_SELECTIONCHANGED, TEXT_HINT_MODIFIED, - TEXT_HINT_PARAINSERTED, TEXT_HINT_PARAREMOVED, - TEXT_HINT_TEXTHEIGHTCHANGED, - TEXT_HINT_VIEWSCROLLED. Otherwise, not all state changes - will get noticed by the accessibility object. Further - more, when the corresponding core object or the model is - dying, either the edit source must be set to NULL or it - has to broadcast a SFX_HINT_DYING hint. - - This class does not have a dispose method, since it is not - a UNO component. Nevertheless, it holds C++ references to - several core objects, so you should issue a - SetEditSource(::std::auto_ptr<SvxEditSource>(NULL)) in - your dispose() method. - - @param pEditSource - The new edit source to set. Object ownership is transferred - from the caller to the callee. - */ - virtual void SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ) SAL_THROW((::com::sun::star::uno::RuntimeException)); - - /** Set the event source - - @attention When setting a reference here, you should call - Dispose() when you as the owner are disposing, since until - then this object will hold that reference - - @param rInterface - The interface that should be set as the source for - accessibility events sent by this object. - */ - virtual void SetEventSource( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rInterface ); - - /** Get the event source - - @return the interface that is set as the source for - accessibility events sent by this object. - */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetEventSource() const; - - /** Set offset of EditEngine from parent - - @attention You are required to have the solar mutex - locked, when calling this method. Thus, the method should - only be called from the main office thread. - - If the origin of the underlying EditEngine does - not correspond to the upper left corner of the object - using this class, you have to specify the offset. - - @param rPoint - The offset in screen coordinates (i.e. pixel) - */ - virtual void SetOffset( const Point& rPoint ); - - /** Query offset of EditEngine from parent - - @return the offset in screen coordinates (i.e. pixel) - */ - virtual Point GetOffset() const; - - /** Update the visible children - - As this class currently does not represent any content - using children, this does nothing at the moment. - - @attention You are required to have the solar mutex - locked, when calling this method. Thus, the method should - only be called from the main office thread. - - This method reevaluates the visibility of all - childrens. Call this method if your visibility state has - changed somehow, e.g. if the visible area has changed and - the AccessibleStaticTextHelper isn't notified - internally. Normally, there should not be a need to call - this method. - */ - virtual void UpdateChildren() SAL_THROW((::com::sun::star::uno::RuntimeException)); - - /** Drop all references and enter disposed state - - This method drops all references to external objects (also - the event source reference set via SetEventSource()) and - sets the object into the disposed state (i.e. the methods - return default values or throw a uno::DisposedException - exception). - */ - virtual void Dispose(); - - // XAccessibleText interface implementation - virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException); - /// This will only work with a functional SvxEditViewForwarder, i.e. an EditEngine/Outliner in edit mode - virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - /// Does not support AccessibleTextType::SENTENCE (missing feature in EditEngine) - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - /// Does not support AccessibleTextType::SENTENCE (missing feature in EditEngine) - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - /// Does not support AccessibleTextType::SENTENCE (missing feature in EditEngine) - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - /// This will only work with a functional SvxEditViewForwarder, i.e. an EditEngine/Outliner in edit mode - virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - - // 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); - - // child-related methods from XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - - // child-related methods from XAccessibleComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - - protected: - Rectangle GetParagraphBoundingBox() const; - - private: - - /// @dyn - const std::auto_ptr< AccessibleStaticTextBase_Impl > mpImpl; - - }; - -} // end of namespace accessibility - -#endif /* _SVX_ACCESSILE_STATIC_TEXT_BASE_HXX_ */ diff --git a/svx/inc/ActionDescriptionProvider.hxx b/svx/inc/ActionDescriptionProvider.hxx index b34ca9a1d312..5b6e0ab9ab35 100644 --- a/svx/inc/ActionDescriptionProvider.hxx +++ b/svx/inc/ActionDescriptionProvider.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ActionDescriptionProvider.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/DescriptionGenerator.hxx b/svx/inc/DescriptionGenerator.hxx index 5eaa84893ffb..501b350eef05 100644 --- a/svx/inc/DescriptionGenerator.hxx +++ b/svx/inc/DescriptionGenerator.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: DescriptionGenerator.hxx,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/ParseContext.hxx b/svx/inc/ParseContext.hxx index 135919ab7993..6b0ec247a39e 100644 --- a/svx/inc/ParseContext.hxx +++ b/svx/inc/ParseContext.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ParseContext.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/UnoForbiddenCharsTable.hxx b/svx/inc/UnoForbiddenCharsTable.hxx deleted file mode 100644 index 3fe2d2054da7..000000000000 --- a/svx/inc/UnoForbiddenCharsTable.hxx +++ /dev/null @@ -1,68 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: UnoForbiddenCharsTable.hxx,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVX_UNOFORBIDDENCHARSTABLE_HXX_ -#define _SVX_UNOFORBIDDENCHARSTABLE_HXX_ - -#include <com/sun/star/i18n/XForbiddenCharacters.hpp> -#include <com/sun/star/linguistic2/XSupportedLocales.hpp> -#include <vos/ref.hxx> - -#include <cppuhelper/implbase2.hxx> -#include "svx/svxdllapi.h" - -class SvxForbiddenCharactersTable; - -class SVX_DLLPUBLIC SvxUnoForbiddenCharsTable : public cppu::WeakImplHelper2< - com::sun::star::i18n::XForbiddenCharacters, - com::sun::star::linguistic2::XSupportedLocales> -{ -protected: - /** this virtual function is called if the forbidden characters are changed */ - virtual void onChange(); - - vos::ORef<SvxForbiddenCharactersTable> mxForbiddenChars; - -public: - SvxUnoForbiddenCharsTable(vos::ORef<SvxForbiddenCharactersTable> xForbiddenChars); - ~SvxUnoForbiddenCharsTable(); - - // XForbiddenCharacters - virtual com::sun::star::i18n::ForbiddenCharacters SAL_CALL getForbiddenCharacters( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::container::NoSuchElementException, com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasForbiddenCharacters( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setForbiddenCharacters( const com::sun::star::lang::Locale& rLocale, const com::sun::star::i18n::ForbiddenCharacters& rForbiddenCharacters ) throw(com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeForbiddenCharacters( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - - // XSupportedLocales - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > SAL_CALL getLocales( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasLocale( const ::com::sun::star::lang::Locale& aLocale ) throw (::com::sun::star::uno::RuntimeException); -}; - -#endif // _SVX_UNOFORBIDDENCHARSTABLE_HXX_ diff --git a/svx/inc/UnoNamespaceMap.hxx b/svx/inc/UnoNamespaceMap.hxx index 4fd3fe211483..7e3a1be005b8 100644 --- a/svx/inc/UnoNamespaceMap.hxx +++ b/svx/inc/UnoNamespaceMap.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: UnoNamespaceMap.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/XPropertyTable.hxx b/svx/inc/XPropertyTable.hxx index bc0fa5ea74e8..59ca1e1e086a 100644 --- a/svx/inc/XPropertyTable.hxx +++ b/svx/inc/XPropertyTable.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: XPropertyTable.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/accessibility.hrc b/svx/inc/accessibility.hrc index 5688f7a8033e..3e386be0daf1 100644 --- a/svx/inc/accessibility.hrc +++ b/svx/inc/accessibility.hrc @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: accessibility.hrc,v $ - * $Revision: 1.10 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -78,10 +75,8 @@ #define RID_SVXSTR_GRAPHCTRL_ACC_NAME (RID_SVXSTR_GRAPHCTRL_ACC_START + 0) #define RID_SVXSTR_GRAPHCTRL_ACC_DESCRIPTION (RID_SVXSTR_GRAPHCTRL_ACC_START + 1) -// text paragraphs and bullets +// text paragraphs #define RID_SVXSTR_A11Y_TEXTHELPER_START (RID_SVXSTR_ACCESSIBILITY_START + 70) -#define RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION (RID_SVXSTR_A11Y_TEXTHELPER_START + 2) -#define RID_SVXSTR_A11Y_IMAGEBULLET_NAME (RID_SVXSTR_A11Y_TEXTHELPER_START + 3) // SvxShowCharSetAcc #define RID_SVXSTR_CHARACTER_SELECTION (RID_SVXSTR_ACCESSIBILITY_START + 80) diff --git a/svx/inc/acorrcfg.hxx b/svx/inc/acorrcfg.hxx deleted file mode 100644 index 046cf1a6198a..000000000000 --- a/svx/inc/acorrcfg.hxx +++ /dev/null @@ -1,136 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: acorrcfg.hxx,v $ - * $Revision: 1.7 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVXACCFG_HXX -#define _SVXACCFG_HXX - -// include --------------------------------------------------------------- - -#include "svx/svxdllapi.h" -#include <unotools/configitem.hxx> -/* -----------------------------12.10.00 11:40-------------------------------- - - ---------------------------------------------------------------------------*/ -class SvxAutoCorrect; -class SvxAutoCorrCfg; -class SVX_DLLPUBLIC SvxBaseAutoCorrCfg : public utl::ConfigItem -{ - SvxAutoCorrCfg& rParent; - com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames(); - -public: - SvxBaseAutoCorrCfg(SvxAutoCorrCfg& rParent); - ~SvxBaseAutoCorrCfg(); - - void Load(sal_Bool bInit); - virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames); - void SetModified() {ConfigItem::SetModified();} -}; -/* -----------------------------12.10.00 11:40-------------------------------- - - ---------------------------------------------------------------------------*/ -class SVX_DLLPUBLIC SvxSwAutoCorrCfg : public utl::ConfigItem -{ - SvxAutoCorrCfg& rParent; - com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames(); - -public: - SvxSwAutoCorrCfg(SvxAutoCorrCfg& rParent); - ~SvxSwAutoCorrCfg(); - - void Load(sal_Bool bInit); - virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames); - void SetModified() {ConfigItem::SetModified();} -}; -/*-------------------------------------------------------------------- - Beschreibung: Konfiguration fuer Auto Correction - --------------------------------------------------------------------*/ -class SVX_DLLPUBLIC SvxAutoCorrCfg -{ - friend class SvxBaseAutoCorrCfg; - friend class SvxSwAutoCorrCfg; - - SvxAutoCorrect* pAutoCorrect; - - SvxBaseAutoCorrCfg aBaseConfig; - SvxSwAutoCorrCfg aSwConfig; - - // Flags f"ur Autotext: - sal_Bool bFileRel; - sal_Bool bNetRel; - // Tiphilfe f"ur Autotext w"ahrend der Eingabe - sal_Bool bAutoTextTip; - sal_Bool bAutoTextPreview; - sal_Bool bAutoFmtByInput; - sal_Bool bSearchInAllCategories; - -public: - void SetModified() - { - aBaseConfig.SetModified(); - aSwConfig.SetModified(); - } - void Commit() - { - aBaseConfig.Commit(); - aSwConfig.Commit(); - } - - SvxAutoCorrect* GetAutoCorrect() { return pAutoCorrect; } - const SvxAutoCorrect* GetAutoCorrect() const { return pAutoCorrect; } - // der Pointer geht in den Besitz des ConfigItems! - void SetAutoCorrect( SvxAutoCorrect* ); - - sal_Bool IsAutoFmtByInput() const { return bAutoFmtByInput; } - void SetAutoFmtByInput( sal_Bool bSet ) { bAutoFmtByInput = bSet;aSwConfig.SetModified();} - - sal_Bool IsSaveRelFile() const { return bFileRel; } - void SetSaveRelFile( sal_Bool bSet ) { bFileRel = bSet; aSwConfig.SetModified(); } - - sal_Bool IsSaveRelNet() const { return bNetRel; } - void SetSaveRelNet( sal_Bool bSet ) { bNetRel = bSet; aSwConfig.SetModified();} - - sal_Bool IsAutoTextPreview() const {return bAutoTextPreview;} - void SetAutoTextPreview(sal_Bool bSet) {bAutoTextPreview = bSet; aSwConfig.SetModified();} - - sal_Bool IsAutoTextTip() const { return bAutoTextTip; } - void SetAutoTextTip(sal_Bool bSet ) { bAutoTextTip = bSet;aSwConfig.SetModified();} - - sal_Bool IsSearchInAllCategories() const { return bSearchInAllCategories;} - void SetSearchInAllCategories(sal_Bool bSet ) { bSearchInAllCategories = bSet; aSwConfig.SetModified(); } - - SvxAutoCorrCfg(); - virtual ~SvxAutoCorrCfg(); - static SvxAutoCorrCfg* Get(); -}; - - -#endif diff --git a/svx/inc/anchorid.hxx b/svx/inc/anchorid.hxx index db897fb3e11e..976d0dc504c6 100644 --- a/svx/inc/anchorid.hxx +++ b/svx/inc/anchorid.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: anchorid.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/asiancfg.hxx b/svx/inc/asiancfg.hxx deleted file mode 100644 index 303da7e76630..000000000000 --- a/svx/inc/asiancfg.hxx +++ /dev/null @@ -1,72 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: asiancfg.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_ASIANCFG_HXX -#define _SVX_ASIANCFG_HXX - -#include <unotools/configitem.hxx> -#include <com/sun/star/uno/Sequence.h> -#include "svx/svxdllapi.h" - -namespace com{namespace sun{namespace star{ -namespace lang{ - struct Locale; -}}}} -//----------------------------------------------------------------------------- -struct SvxAsianConfig_Impl; -class SVX_DLLPUBLIC SvxAsianConfig : public utl::ConfigItem -{ - SvxAsianConfig_Impl* pImpl; - -public: - SvxAsianConfig(sal_Bool bEnableNotify = sal_True); - virtual ~SvxAsianConfig(); - - void Load(); - virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames); - - sal_Bool IsKerningWesternTextOnly() const; - void SetKerningWesternTextOnly(sal_Bool bSet); - - sal_Int16 GetCharDistanceCompression() const; - void SetCharDistanceCompression(sal_Int16 nSet); - - com::sun::star::uno::Sequence<com::sun::star::lang::Locale> - GetStartEndCharLocales(); - - sal_Bool GetStartEndChars( const com::sun::star::lang::Locale& rLocale, - rtl::OUString& rStartChars, - rtl::OUString& rEndChars ); - void SetStartEndChars( const com::sun::star::lang::Locale& rLocale, - const rtl::OUString* pStartChars, - const rtl::OUString* pEndChars ); -}; - -#endif diff --git a/svx/inc/bolnitem.hxx b/svx/inc/bolnitem.hxx deleted file mode 100644 index 22040d790c71..000000000000 --- a/svx/inc/bolnitem.hxx +++ /dev/null @@ -1,86 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: bolnitem.hxx,v $ - * $Revision: 1.7 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_BOLNITEM_HXX -#define _SVX_BOLNITEM_HXX - -// include --------------------------------------------------------------- - - - -#include <svl/poolitem.hxx> -#include "svx/svxdllapi.h" - - - -// class SvxLineItem ----------------------------------------------------- - - -/* -[Beschreibung] -Dieses Item transportiert eine SvxBorderLine. -*/ - -class SvxBorderLine; - -class SVX_DLLPUBLIC SvxLineItem : public SfxPoolItem -{ -public: - TYPEINFO(); - - SvxLineItem( const USHORT nId ); - SvxLineItem( const SvxLineItem& rCpy ); - ~SvxLineItem(); - SvxLineItem &operator=( const SvxLineItem& rLine ); - - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); - 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 &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; - virtual int ScaleMetrics( long nMult, long nDiv ); - virtual int HasMetrics() const; - - const SvxBorderLine* GetLine () const { return pLine; } - void SetLine ( const SvxBorderLine *pNew ); - -private: - SvxBorderLine* pLine; -}; - - - - -#endif diff --git a/svx/inc/bulitem.hxx b/svx/inc/bulitem.hxx deleted file mode 100644 index cae4fbcc24ef..000000000000 --- a/svx/inc/bulitem.hxx +++ /dev/null @@ -1,163 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: bulitem.hxx,v $ - * $Revision: 1.6 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_BULITEM_HXX -#define _SVX_BULITEM_HXX - -// include --------------------------------------------------------------- - -#include "svx/svxdllapi.h" - - -// define ---------------------------------------------------------------- - -// Styles -#define BS_ABC_BIG 0 -#define BS_ABC_SMALL 1 -#define BS_ROMAN_BIG 2 -#define BS_ROMAN_SMALL 3 -#define BS_123 4 -#define BS_NONE 5 -#define BS_BULLET 6 -#define BS_BMP 128 - -// Justification -#define BJ_HLEFT 0x01 -#define BJ_HRIGHT 0x02 -#define BJ_HCENTER 0x04 -#define BJ_VTOP 0x08 -#define BJ_VBOTTOM 0x10 -#define BJ_VCENTER 0x20 - -// Valid-Bits -// Erstmal nur die Werte, die vom Dialog geaendert werden... -#define VALID_FONTCOLOR 0x0001 -#define VALID_FONTNAME 0x0002 -#define VALID_SYMBOL 0x0004 -#define VALID_BITMAP 0x0008 -#define VALID_SCALE 0x0010 -#define VALID_START 0x0020 -#define VALID_STYLE 0x0040 -#define VALID_PREVTEXT 0x0080 -#define VALID_FOLLOWTEXT 0x0100 -#include <svl/poolitem.hxx> -#include <vcl/font.hxx> -#include <goodies/grfmgr.hxx> - -// class SvxBulletItem --------------------------------------------------- - -class SVX_DLLPUBLIC SvxBulletItem : public SfxPoolItem -{ - Font aFont; - GraphicObject* pGraphicObject; - String aPrevText; - String aFollowText; - USHORT nStart; - USHORT nStyle; - long nWidth; - USHORT nScale; - sal_Unicode cSymbol; - BYTE nJustify; - USHORT nValidMask; // Nur temporaer fuer GetAttribs/SetAttribs, wegen des grossen Bullets - -#ifdef _SVX_BULITEM_CXX - void SetDefaultFont_Impl(); - void SetDefaults_Impl(); -#endif - -public: - TYPEINFO(); - - SvxBulletItem( USHORT nWhich = 0 ); - SvxBulletItem( BYTE nStyle, const Font& rFont, USHORT nStart = 0, USHORT nWhich = 0 ); - SvxBulletItem( const Font& rFont, sal_Unicode cSymbol, USHORT nWhich=0 ); - SvxBulletItem( const Bitmap&, USHORT nWhich = 0 ); - SvxBulletItem( const GraphicObject&, USHORT nWhich = 0 ); - SvxBulletItem( SvStream& rStrm, USHORT nWhich = 0 ); - SvxBulletItem( const SvxBulletItem& ); - ~SvxBulletItem(); - - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream&, USHORT nVersion ) const; - virtual SvStream& Store( SvStream & , USHORT nItemVersion ) const; - - String GetFullText() const; - sal_Unicode GetSymbol() const { return cSymbol; } - String GetPrevText() const { return aPrevText; } - String GetFollowText() const { return aFollowText; } - - USHORT GetStart() const { return nStart; } - long GetWidth() const { return nWidth; } - USHORT GetStyle() const { return nStyle; } - BYTE GetJustification() const { return nJustify; } - Font GetFont() const { return aFont; } - USHORT GetScale() const { return nScale; } - - Bitmap GetBitmap() const; - void SetBitmap( const Bitmap& rBmp ); - - const GraphicObject& GetGraphicObject() const; - void SetGraphicObject( const GraphicObject& rGraphicObject ); - - void SetSymbol( sal_Unicode c) { cSymbol = c; } - void SetPrevText( const String& rStr) { aPrevText = rStr;} - void SetFollowText(const String& rStr) { aFollowText=rStr;} - - void SetStart( USHORT nNew ) { nStart = nNew; } - void SetWidth( long nNew ) { nWidth = nNew; } - void SetStyle( USHORT nNew ) { nStyle = nNew; } - void SetJustification( BYTE nNew ) { nJustify = nNew; } - void SetFont( const Font& rNew) { aFont = rNew; } - void SetScale( USHORT nNew ) { nScale = nNew; } - - virtual USHORT GetVersion(USHORT nFileVersion) const; - virtual int operator==( const SfxPoolItem& ) const; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; - - static void StoreFont( SvStream&, const Font& ); - static Font CreateFont( SvStream&, USHORT nVer ); - - USHORT& GetValidMask() { return nValidMask; } - USHORT GetValidMask() const { return nValidMask; } - USHORT IsValid( USHORT nFlag ) const { return nValidMask & nFlag; } - void SetValid( USHORT nFlag, BOOL bValid ) - { - if ( bValid ) - nValidMask |= nFlag; - else - nValidMask &= ~nFlag; - } - void CopyValidProperties( const SvxBulletItem& rCopyFrom ); -}; - - -#endif diff --git a/svx/inc/charhiddenitem.hxx b/svx/inc/charhiddenitem.hxx deleted file mode 100644 index c11abea5145d..000000000000 --- a/svx/inc/charhiddenitem.hxx +++ /dev/null @@ -1,64 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: charhiddenitem.hxx,v $ - * $Revision: 1.6 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_CHARHIDDENITEM_HXX -#define _SVX_CHARHIDDENITEM_HXX - -// include --------------------------------------------------------------- - -#include <svl/poolitem.hxx> -#include <svl/eitem.hxx> -#include "svx/svxdllapi.h" - -// class SvxCharHiddenItem ------------------------------------------------- -/* - [Description] - This item marks text as hidden -*/ - -class SVX_DLLPUBLIC SvxCharHiddenItem : public SfxBoolItem -{ -public: - TYPEINFO(); - - SvxCharHiddenItem( const BOOL bHidden /*= FALSE*/, const USHORT nId ); - - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; - - inline SvxCharHiddenItem& operator=(const SvxCharHiddenItem& rHidden) { - SetValue(rHidden.GetValue()); - return *this; - } -}; - -#endif diff --git a/svx/inc/chrtitem.hxx b/svx/inc/chrtitem.hxx index ffaa10c71360..1cb9c2068f01 100644 --- a/svx/inc/chrtitem.hxx +++ b/svx/inc/chrtitem.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: chrtitem.hxx,v $ - * $Revision: 1.9 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/clipboardctl.hxx b/svx/inc/clipboardctl.hxx index 3e76dc7a5fe1..22480ab1e728 100644 --- a/svx/inc/clipboardctl.hxx +++ b/svx/inc/clipboardctl.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: clipboardctl.hxx,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/clipfmtitem.hxx b/svx/inc/clipfmtitem.hxx index b304c0796bfc..74687d56d38b 100644 --- a/svx/inc/clipfmtitem.hxx +++ b/svx/inc/clipfmtitem.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: clipfmtitem.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/connctrl.hxx b/svx/inc/connctrl.hxx index ad21b4f2ef21..468fffcc43b7 100644 --- a/svx/inc/connctrl.hxx +++ b/svx/inc/connctrl.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: connctrl.hxx,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/databaseregistrationui.hxx b/svx/inc/databaseregistrationui.hxx index 0bded1307815..123e5af7d5a8 100644 --- a/svx/inc/databaseregistrationui.hxx +++ b/svx/inc/databaseregistrationui.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: databaseregistrationui.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/dbexch.hrc b/svx/inc/dbexch.hrc index 2f47ca1a2bd5..faa2274987cd 100644 --- a/svx/inc/dbexch.hrc +++ b/svx/inc/dbexch.hrc @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: dbexch.hrc,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/dgdefs_.hxx b/svx/inc/dgdefs_.hxx index accc5e2a67d0..bf030e26d751 100644 --- a/svx/inc/dgdefs_.hxx +++ b/svx/inc/dgdefs_.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: dgdefs_.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/dialcontrol.hxx b/svx/inc/dialcontrol.hxx index 386a8dd4c706..3b63ac1f4b4d 100644 --- a/svx/inc/dialcontrol.hxx +++ b/svx/inc/dialcontrol.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: dialcontrol.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/dialdll.hxx b/svx/inc/dialdll.hxx index 49b534244b4f..d76ff286eb9a 100644 --- a/svx/inc/dialdll.hxx +++ b/svx/inc/dialdll.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: dialdll.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/dlgutil.hxx b/svx/inc/dlgutil.hxx index 9cf995814674..9f0d5190daed 100644 --- a/svx/inc/dlgutil.hxx +++ b/svx/inc/dlgutil.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: dlgutil.hxx,v $ - * $Revision: 1.11 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -31,100 +28,17 @@ #define _SVX_DLGUTIL_HXX // include --------------------------------------------------------------- -#ifndef _FIELD_HXX -#include <vcl/field.hxx> -#endif -#include <svl/poolitem.hxx> -#include <svl/intitem.hxx> -#include "svx/svxdllapi.h" +#include <svtools/unitconv.hxx> +#include <svx/svxdllapi.h> // macro ----------------------------------------------------------------- // typedef --------------------------------------------------------------- -typedef long (*FUNC_CONVERT)(long); - // Functions ------------------------------------------------------------- +class SfxItemSet; -// HM- und LanguageStrings aus der Resource laden -SVX_DLLPUBLIC String GetLanguageString( LanguageType eType ); -SVX_DLLPUBLIC String GetDicInfoStr( const String& rName, const USHORT nLang, - const BOOL bNeg ); - -// FieldUnit im MetricField oder -Box umsetzen -SVX_DLLPUBLIC void SetFieldUnit( MetricField& rCtrl, - FieldUnit eUnit, BOOL bAll = FALSE ); -SVX_DLLPUBLIC void SetFieldUnit( MetricBox& rCtrl, - FieldUnit eUnit, BOOL bAll = FALSE ); - -SVX_DLLPUBLIC FieldUnit GetModuleFieldUnit( const SfxItemSet* pSet = NULL ); - -// Metriken umrechnen -SVX_DLLPUBLIC long CalcToUnit( float nIn, SfxMapUnit eUnit ); -SVX_DLLPUBLIC long CalcToPoint( long nIn, SfxMapUnit eUnit, USHORT nFaktor ); - -SVX_DLLPUBLIC long ItemToControl( long nIn, SfxMapUnit eItem, SfxFieldUnit eCtrl ); -long ControlToItem( long nIn, SfxFieldUnit eCtrl, SfxMapUnit eItem ); - -SVX_DLLPUBLIC FieldUnit MapToFieldUnit( const SfxMapUnit eUnit ); -MapUnit FieldToMapUnit( const SfxFieldUnit eUnit ); - -long ConvertValueToMap( long nVal, SfxMapUnit eUnit ); -long ConvertValueToUnit( long nVal, SfxMapUnit eUnit ); - -SVX_DLLPUBLIC void SetMetricValue( MetricField& rField, - long lCoreValue, SfxMapUnit eUnit ); -SVX_DLLPUBLIC long GetCoreValue( const MetricField& rField, SfxMapUnit eUnit ); - -// to Twips -long CMToTwips( long nIn ); -long MMToTwips( long nIn ); -long InchToTwips( long nIn ); -SVX_DLLPUBLIC long PointToTwips( long nIn ); -long PicaToTwips( long nIn ); - -// to CM -long TwipsToCM( long nIn ); -long InchToCM( long nIn ); -long MMToCM( long nIn ); -long PointToCM( long nIn ); -long PicaToCM( long nIn ); - -// to MM -long TwipsToMM( long nIn ); -long CMToMM( long nIn ); -long InchToMM( long nIn ); -long PointToMM( long nIn ); -long PicaToMM( long nIn ); - -// to Inch -long TwipsToInch(long nIn ); -long CMToInch(long nIn ); -long MMToInch(long nIn ); -long PointToInch(long nIn ); -long PicaToInch(long nIn ); - -// to Point -long TwipsToPoint(long nIn ); -long InchToPoint(long nIn ); -long CMToPoint(long nIn ); -long MMToPoint(long nIn ); -long PicaToPoint(long nIn ); - -// To Pica -long TwipsToPica(long nIn ); -long InchToPica(long nIn ); -long PointToPica(long nIn ); -long CMToPica(long nIn ); -long MMToPica(long nIn ); - -// generische Wandlung -long TransformMetric( long nVal, FieldUnit aOld, FieldUnit aNew ); - -// replacement of the SfxIniManager -String ConvertPosSizeToIniString( const Point& rPos, const Size& rSize ); -sal_Bool ConvertIniStringToPosSize( const String& rIniStr, Point& rPos, Size& rSize ); - +SVX_DLLPUBLIC FieldUnit GetModuleFieldUnit( const SfxItemSet& ); #define OUTPUT_DRAWMODE_COLOR (DRAWMODE_DEFAULT) #define OUTPUT_DRAWMODE_CONTRAST (DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT) diff --git a/svx/inc/dragmt3d.hxx b/svx/inc/dragmt3d.hxx index 69c324ce1f62..635a78a29f70 100644 --- a/svx/inc/dragmt3d.hxx +++ b/svx/inc/dragmt3d.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: dragmt3d.hxx,v $ - * $Revision: 1.8.18.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/drawitem.hxx b/svx/inc/drawitem.hxx index f9bb93b47136..9bfdb5cfd87a 100644 --- a/svx/inc/drawitem.hxx +++ b/svx/inc/drawitem.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: drawitem.hxx,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/drawuiks.hxx b/svx/inc/drawuiks.hxx index 893a5400f485..19b7fe3cba97 100644 --- a/svx/inc/drawuiks.hxx +++ b/svx/inc/drawuiks.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: drawuiks.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/editstat.hxx b/svx/inc/editstat.hxx deleted file mode 100644 index 71f65dbe6657..000000000000 --- a/svx/inc/editstat.hxx +++ /dev/null @@ -1,153 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: editstat.hxx,v $ - * $Revision: 1.7 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _EDITSTAT_HXX -#define _EDITSTAT_HXX - -#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_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 - -// Nur fuer Update: -#define EE_CNTRL_AUTOCENTER EE_CNTRL_AUTOPAGESIZE -#define EE_STAT_GROWY EE_STAT_TEXTHEIGHTCHANGED - -/* - EE_STAT_CRSRLEFTPARA zur Zeit bei Cursorbewegungen und Return. -*/ - -inline void SetFlags( ULONG& rBits, const ULONG nMask, FASTBOOL bOn ) -{ - if ( bOn ) - rBits |= nMask; - else - rBits &= ~nMask; -} - -class EditStatus -{ -protected: - ULONG nStatusBits; - ULONG nControlBits; - USHORT nPrevPara; // fuer EE_STAT_CRSRLEFTPARA - -public: - EditStatus() { nStatusBits = 0; nControlBits = 0; nPrevPara = 0xFFFF; } - - void Clear() { nStatusBits = 0; } - void SetControlBits( ULONG nMask, FASTBOOL bOn ) - { SetFlags( nControlBits, nMask, bOn ); } - - ULONG GetStatusWord() const { return nStatusBits; } - ULONG& GetStatusWord() { return nStatusBits; } - - ULONG GetControlWord() const { return nControlBits; } - ULONG& GetControlWord() { return nControlBits; } - - 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 - -struct SpellCallbackInfo -{ - USHORT nCommand; - String aWord; - LanguageType eLanguage; - - SpellCallbackInfo( USHORT nCMD, const String& rWord ) - : aWord( rWord ) - { - nCommand = nCMD; - eLanguage = LANGUAGE_DONTKNOW; - } - - SpellCallbackInfo( USHORT nCMD, LanguageType eLang ) - { - nCommand = nCMD; - eLanguage = eLang; - } -}; - -#endif // _EDITSTAT_HXX - diff --git a/svx/inc/editund2.hxx b/svx/inc/editund2.hxx deleted file mode 100644 index 65c83dd4f0e8..000000000000 --- a/svx/inc/editund2.hxx +++ /dev/null @@ -1,79 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: editund2.hxx,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _EDITUND2_HXX -#define _EDITUND2_HXX - -#include "svx/svxdllapi.h" -#include <svl/undo.hxx> - -class ImpEditEngine; - -class SVX_DLLPUBLIC EditUndoManager : public SfxUndoManager -{ - using SfxUndoManager::Undo; - using SfxUndoManager::Redo; - -private: - ImpEditEngine* pImpEE; -public: - EditUndoManager( ImpEditEngine* pImpEE ); - - virtual BOOL Undo( USHORT nCount=1 ); - virtual BOOL Redo( USHORT nCount=1 ); -}; - -// ----------------------------------------------------------------------- -// EditUndo -// ------------------------------------------------------------------------ -class SVX_DLLPUBLIC EditUndo : public SfxUndoAction -{ -private: - USHORT nId; - ImpEditEngine* pImpEE; - -public: - TYPEINFO(); - EditUndo( USHORT nI, ImpEditEngine* pImpEE ); - virtual ~EditUndo(); - - ImpEditEngine* GetImpEditEngine() const { return pImpEE; } - - virtual void Undo() = 0; - virtual void Redo() = 0; - - virtual BOOL CanRepeat(SfxRepeatTarget&) const; - virtual String GetComment() const; - virtual USHORT GetId() const; -}; - -#endif // _EDITUND2_HXX - - diff --git a/svx/inc/edtspell.hxx b/svx/inc/edtspell.hxx deleted file mode 100644 index 15e180342d85..000000000000 --- a/svx/inc/edtspell.hxx +++ /dev/null @@ -1,188 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: edtspell.hxx,v $ - * $Revision: 1.10 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _EDTSPELL_HXX -#define _EDTSPELL_HXX - -#include <svx/svxbox.hxx> -#include <svx/svxenum.hxx> -#include <svx/splwrap.hxx> -#include <svx/svxacorr.hxx> -#include <com/sun/star/uno/Reference.h> -#include "svx/svxdllapi.h" - -namespace com { namespace sun { namespace star { namespace linguistic2 { - class XSpellChecker1; -}}}} - - -class EditView; -class ImpEditEngine; -class ContentNode; - -class EditSpellWrapper : public SvxSpellWrapper -{ -private: - EditView* pEditView; - void CheckSpellTo(); - -protected: - virtual void SpellStart( SvxSpellArea eArea ); - virtual BOOL SpellContinue(); // Bereich pruefen - virtual void ReplaceAll( const String &rNewText, INT16 nLanguage ); - virtual void SpellEnd(); - virtual BOOL SpellMore(); - virtual BOOL HasOtherCnt(); - virtual void ScrollArea(); - virtual void ChangeWord( const String& rNewWord, const USHORT nLang ); - virtual void ChangeThesWord( const String& rNewWord ); - virtual void AutoCorrect( const String& rOldWord, const String& rNewWord ); - -public: - EditSpellWrapper( Window* pWin, - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellChecker1 > &xChecker, - BOOL bIsStart, - BOOL bIsAllRight, EditView* pView ); - -}; - - -struct WrongRange -{ - USHORT nStart; - USHORT nEnd; - - WrongRange( USHORT nS, USHORT nE ) { nStart = nS; nEnd = nE; } -}; - -SV_DECL_VARARR( WrongRanges, WrongRange, 4, 4 ) -#define NOT_INVALID 0xFFFF - -class WrongList : private WrongRanges -{ -private: - USHORT nInvalidStart; - USHORT nInvalidEnd; - - BOOL DbgIsBuggy() const; - -public: - WrongList(); - ~WrongList(); - - BOOL IsInvalid() const { return nInvalidStart != NOT_INVALID; } - void SetValid() { nInvalidStart = NOT_INVALID; nInvalidEnd = 0; } - void MarkInvalid( USHORT nS, USHORT nE ) - { - if ( ( nInvalidStart == NOT_INVALID ) || ( nInvalidStart > nS ) ) - nInvalidStart = nS; - if ( nInvalidEnd < nE ) - nInvalidEnd = nE; - } - - USHORT Count() const { return WrongRanges::Count(); } - - // Wenn man weiss was man tut: - WrongRange& GetObject( USHORT n ) const { return WrongRanges::GetObject( n ); } - void InsertWrong( const WrongRange& rWrong, USHORT nPos ); - - USHORT GetInvalidStart() const { return nInvalidStart; } - USHORT& GetInvalidStart() { return nInvalidStart; } - - USHORT GetInvalidEnd() const { return nInvalidEnd; } - USHORT& GetInvalidEnd() { return nInvalidEnd; } - - void TextInserted( USHORT nPos, USHORT nChars, BOOL bPosIsSep ); - void TextDeleted( USHORT nPos, USHORT nChars ); - - void ResetRanges() { Remove( 0, Count() ); } - BOOL HasWrongs() const { return Count() != 0; } - void InsertWrong( USHORT nStart, USHORT nEnd, BOOL bClearRange ); - BOOL NextWrong( USHORT& rnStart, USHORT& rnEnd ) const; - BOOL HasWrong( USHORT nStart, USHORT nEnd ) const; - BOOL HasAnyWrong( USHORT nStart, USHORT nEnd ) const; - void ClearWrongs( USHORT nStart, USHORT nEnd, const ContentNode* pNode ); - void MarkWrongsInvalid(); - - WrongList* Clone() const; - - // #i102062# - bool operator==(const WrongList& rCompare) const; -}; - -inline void WrongList::InsertWrong( const WrongRange& rWrong, USHORT nPos ) -{ - WrongRanges::Insert( rWrong, nPos ); -#ifdef DBG_UTIL - DBG_ASSERT( !DbgIsBuggy(), "Insert: WrongList kaputt!" ); -#endif -} - - - -class SVX_DLLPUBLIC EdtAutoCorrDoc : public SvxAutoCorrDoc -{ - ImpEditEngine* pImpEE; - ContentNode* pCurNode; - USHORT nCursor; - - BOOL bAllowUndoAction; - BOOL bUndoAction; - -protected: - void ImplStartUndoAction(); - -public: - EdtAutoCorrDoc( ImpEditEngine* pImpEE, ContentNode* pCurNode, USHORT nCrsr, xub_Unicode cIns ); - ~EdtAutoCorrDoc(); - - virtual BOOL Delete( USHORT nStt, USHORT nEnd ); - virtual BOOL Insert( USHORT nPos, const String& rTxt ); - virtual BOOL Replace( USHORT nPos, const String& rTxt ); - - virtual BOOL SetAttr( USHORT nStt, USHORT nEnd, USHORT nSlotId, SfxPoolItem& ); - virtual BOOL SetINetAttr( USHORT nStt, USHORT nEnd, const String& rURL ); - - virtual BOOL HasSymbolChars( USHORT nStt, USHORT nEnd ); - - virtual const String* GetPrevPara( BOOL bAtNormalPos ); - - virtual BOOL ChgAutoCorrWord( USHORT& rSttPos, USHORT nEndPos, - SvxAutoCorrect& rACorrect, const String** ppPara ); - - virtual LanguageType GetLanguage( USHORT nPos, BOOL bPrevPara = FALSE ) const; - - USHORT GetCursor() const { return nCursor; } - -}; - -#endif // EDTSPELL - diff --git a/svx/inc/eerdll.hxx b/svx/inc/eerdll.hxx deleted file mode 100644 index 331cd1eeb6ff..000000000000 --- a/svx/inc/eerdll.hxx +++ /dev/null @@ -1,61 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: eerdll.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _EERDLL_HXX -#define _EERDLL_HXX - -class GlobalEditData; - -#include <tools/resid.hxx> -#include <tools/shl.hxx> - -class EditResId: public ResId -{ -public: - EditResId( USHORT nId ); -}; - -class EditDLL -{ - ResMgr* pResMgr; - GlobalEditData* pGlobalData; - -public: - EditDLL(); - ~EditDLL(); - - ResMgr* GetResMgr() const { return pResMgr; } - GlobalEditData* GetGlobalData() const { return pGlobalData; } - static EditDLL* Get(); -}; - -#define EE_DLL() EditDLL::Get() - -#endif //_EERDLL_HXX diff --git a/svx/inc/extrusioncontrols.hxx b/svx/inc/extrusioncontrols.hxx index b707cae39f98..4560c7463bc9 100644 --- a/svx/inc/extrusioncontrols.hxx +++ b/svx/inc/extrusioncontrols.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: extrusioncontrols.hxx,v $ - * $Revision: 1.10 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/flagsdef.hxx b/svx/inc/flagsdef.hxx index 08c4e8deda60..43fd292ddb36 100644 --- a/svx/inc/flagsdef.hxx +++ b/svx/inc/flagsdef.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: flagsdef.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/float3d.hrc b/svx/inc/float3d.hrc index 1241c437a007..259317275e8b 100644 --- a/svx/inc/float3d.hrc +++ b/svx/inc/float3d.hrc @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: float3d.hrc,v $ - * $Revision: 1.8 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/flstitem.hxx b/svx/inc/flstitem.hxx deleted file mode 100644 index f41970cc79da..000000000000 --- a/svx/inc/flstitem.hxx +++ /dev/null @@ -1,82 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: flstitem.hxx,v $ - * $Revision: 1.7 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_FLSTITEM_HXX -#define _SVX_FLSTITEM_HXX - -// include --------------------------------------------------------------- - -#include <svl/poolitem.hxx> -#include <rtl/ustring.hxx> -#include <com/sun/star/uno/Sequence.h> -#include "svx/svxdllapi.h" - -// class SvxFontListItem ------------------------------------------------- - -class FontList; - -/* - [Beschreibung] - - Dieses Item dient als Transport-Medium fuer eine FontListe. - Die Fontliste wird nicht kopiert und nicht geloescht! -*/ - -class SVX_DLLPUBLIC SvxFontListItem : public SfxPoolItem -{ -private: - const FontList* pFontList; - com::sun::star::uno::Sequence< rtl::OUString > aFontNameSeq; - -public: - TYPEINFO(); - - SvxFontListItem( const FontList* pFontLst, - const USHORT nId ); - SvxFontListItem( const SvxFontListItem& rItem ); - - virtual int operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - - virtual sal_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; } -}; - - - - -#endif - - diff --git a/svx/inc/fmgridif.hxx b/svx/inc/fmgridif.hxx index 39b108026654..886db3280d60 100644 --- a/svx/inc/fmgridif.hxx +++ b/svx/inc/fmgridif.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fmgridif.hxx,v $ - * $Revision: 1.13 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc index ef445ab11f82..ab9aa9f8ce1b 100644 --- a/svx/inc/fmhelp.hrc +++ b/svx/inc/fmhelp.hrc @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fmhelp.hrc,v $ - * $Revision: 1.17 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/fmobjfac.hxx b/svx/inc/fmobjfac.hxx index c5a8b01f1f87..7d10ea2ab7b4 100644 --- a/svx/inc/fmobjfac.hxx +++ b/svx/inc/fmobjfac.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fmobjfac.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/fontitem.hxx b/svx/inc/fontitem.hxx deleted file mode 100644 index c6d0087382a5..000000000000 --- a/svx/inc/fontitem.hxx +++ /dev/null @@ -1,123 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: fontitem.hxx,v $ - * $Revision: 1.11 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_FONTITEM_HXX -#define _SVX_FONTITEM_HXX - -// include --------------------------------------------------------------- - -#include <svl/poolitem.hxx> -#include <tools/string.hxx> -#ifndef _FONT_HXX //autogen -#include <vcl/font.hxx> -#endif -#include "svx/svxdllapi.h" - -class SvXMLUnitConverter; -namespace rtl -{ - class OUString; -} - -// class SvxFontItem ----------------------------------------------------- - -/* - [Beschreibung] - Dieses Item beschreibt einen Font. -*/ - -class SVX_DLLPUBLIC SvxFontItem : public SfxPoolItem -{ - String aFamilyName; - String aStyleName; - FontFamily eFamily; - FontPitch ePitch; - rtl_TextEncoding eTextEncoding; - - static BOOL bEnableStoreUnicodeNames; - -public: - TYPEINFO(); - - SvxFontItem( const USHORT nId ); - SvxFontItem( const FontFamily eFam, const String& rFamilyName, - const String& rStyleName, - const FontPitch eFontPitch /*= PITCH_DONTKNOW*/, - const rtl_TextEncoding eFontTextEncoding /*= RTL_TEXTENCODING_DONTKNOW*/, - const USHORT nId ); - - // "pure virtual Methoden" vom SfxPoolItem - 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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_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; - - // ZugriffsMethoden: - inline String &GetFamilyName() { return aFamilyName; } - inline const String &GetFamilyName() const { return aFamilyName; } - - inline String &GetStyleName() { return aStyleName; } - inline const String &GetStyleName() const { return aStyleName; } - - inline FontFamily &GetFamily() { return eFamily; } - inline FontFamily GetFamily() const { return eFamily; } - - inline FontPitch &GetPitch() { return ePitch; } - inline FontPitch GetPitch() const { return ePitch; } - - inline rtl_TextEncoding &GetCharSet() { return eTextEncoding; } - inline rtl_TextEncoding GetCharSet() const { return eTextEncoding; } - - inline SvxFontItem& operator=(const SvxFontItem& rFont) - { - aFamilyName = rFont.GetFamilyName(); - aStyleName = rFont.GetStyleName(); - eFamily = rFont.GetFamily(); - ePitch = rFont.GetPitch(); - eTextEncoding = rFont.GetCharSet(); - return *this; - } - - static void EnableStoreUnicodeNames( BOOL bEnable ); - -}; - -SVX_DLLPUBLIC void GetDefaultFonts( SvxFontItem& rLatin, SvxFontItem& rAsian, - SvxFontItem& rComplex ); - -#endif // #ifndef _SVX_FONTITEM_HXX - - diff --git a/svx/inc/fontlb.hxx b/svx/inc/fontlb.hxx index 6a853618c401..813b01ba390f 100644 --- a/svx/inc/fontlb.hxx +++ b/svx/inc/fontlb.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fontlb.hxx,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/fontworkgallery.hrc b/svx/inc/fontworkgallery.hrc index 8d7847824d81..e03c04d0f1ca 100644 --- a/svx/inc/fontworkgallery.hrc +++ b/svx/inc/fontworkgallery.hrc @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fontworkgallery.hrc,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/fontworkgallery.hxx b/svx/inc/fontworkgallery.hxx index 3ceb365d32f0..9f6b1f9f4b2f 100644 --- a/svx/inc/fontworkgallery.hxx +++ b/svx/inc/fontworkgallery.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fontworkgallery.hxx,v $ - * $Revision: 1.11 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/forbiddencharacterstable.hxx b/svx/inc/forbiddencharacterstable.hxx deleted file mode 100644 index d59c93c58994..000000000000 --- a/svx/inc/forbiddencharacterstable.hxx +++ /dev/null @@ -1,73 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: forbiddencharacterstable.hxx,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _FORBIDDENCHARACTERSTABLE_HXX -#define _FORBIDDENCHARACTERSTABLE_HXX - -#ifndef _TABLE_HXX //autogen -#include <tools/table.hxx> -#endif - -#include <vos/refernce.hxx> -#include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/i18n/ForbiddenCharacters.hpp> -#include "svx/svxdllapi.h" - -namespace com { -namespace sun { -namespace star { -namespace lang { - class XMultiServiceFactory; -}}}} - -struct ForbiddenCharactersInfo -{ - com::sun::star::i18n::ForbiddenCharacters aForbiddenChars; - BOOL bTemporary; -}; - -DECLARE_TABLE( SvxForbiddenCharactersTableImpl, ForbiddenCharactersInfo* ) - -class SVX_DLLPUBLIC SvxForbiddenCharactersTable : public SvxForbiddenCharactersTableImpl, public vos::OReference -{ -private: - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMSF; - -public: - SvxForbiddenCharactersTable( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMSF, USHORT nISize = 4, USHORT nGrow = 4 ); - ~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 ); -}; - -#endif // _FORBIDDENCHARACTERSTABLE_HXX - diff --git a/svx/inc/formatpaintbrushctrl.hxx b/svx/inc/formatpaintbrushctrl.hxx index 5d8ef7b6f673..b380e051daf8 100644 --- a/svx/inc/formatpaintbrushctrl.hxx +++ b/svx/inc/formatpaintbrushctrl.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: formatpaintbrushctrl.hxx,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/fwdtitem.hxx b/svx/inc/fwdtitem.hxx deleted file mode 100644 index 8a02474f525c..000000000000 --- a/svx/inc/fwdtitem.hxx +++ /dev/null @@ -1,111 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: fwdtitem.hxx,v $ - * $Revision: 1.6 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_FWDTITEM_HXX -#define _SVX_FWDTITEM_HXX - -// include --------------------------------------------------------------- - - -#include <svl/poolitem.hxx> - - -// class SvxFontWidthItem ----------------------------------------------- - - -/* [Beschreibung] - - Dieses Item beschreibt die Font-Breite. -*/ - -class SvxFontWidthItem : public SfxPoolItem -{ - UINT16 nWidth; // 0 = default - USHORT nProp; // default 100% -public: - TYPEINFO(); - - SvxFontWidthItem( const USHORT nSz /*= 0*/, - const USHORT nPropWidth /*= 100*/, - const USHORT nId ); - - // "pure virtual Methoden" vom SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_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 int ScaleMetrics( long nMult, long nDiv ); - virtual int HasMetrics() const; - - inline SvxFontWidthItem& operator=(const SvxFontWidthItem& rItem ) - { - SetWidthValue( rItem.GetWidth() ); - SetProp( rItem.GetProp() ); - return *this; - } - - void SetWidth( UINT16 nNewWidth, const USHORT nNewProp = 100 ) - { - DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" ); - nWidth = UINT16(( (UINT32)nNewWidth * nNewProp ) / 100 ); - nProp = nNewProp; - } - - UINT16 GetWidth() const { return nWidth; } - - void SetWidthValue( UINT16 nNewWidth ) - { - DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" ); - nWidth = nNewWidth; - } - - void SetProp( const USHORT nNewProp ) - { - DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" ); - nProp = nNewProp; - } - - USHORT GetProp() const { return nProp; } -}; - - - - - -#endif - - diff --git a/svx/inc/galbrws.hxx b/svx/inc/galbrws.hxx index 30733d955b10..f54901db543d 100644 --- a/svx/inc/galbrws.hxx +++ b/svx/inc/galbrws.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: galbrws.hxx,v $ - * $Revision: 1.11 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx index 119146fe62e7..38f6daffee19 100644 --- a/svx/inc/galbrws2.hxx +++ b/svx/inc/galbrws2.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: galbrws2.hxx,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/galctrl.hxx b/svx/inc/galctrl.hxx index 2a986ea60ba8..3acf53dbeddb 100644 --- a/svx/inc/galctrl.hxx +++ b/svx/inc/galctrl.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: galctrl.hxx,v $ - * $Revision: 1.8 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -45,7 +42,7 @@ #include <svtools/transfer.hxx> #include <svtools/valueset.hxx> #include <svtools/brwbox.hxx> -#include <goodies/grfmgr.hxx> +#include <svtools/grfmgr.hxx> #include "svx/galmisc.hxx" #include "svx/svxdllapi.h" diff --git a/svx/inc/gallery.hrc b/svx/inc/gallery.hrc index 556399b2a5f3..852b1f14c7de 100644 --- a/svx/inc/gallery.hrc +++ b/svx/inc/gallery.hrc @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: gallery.hrc,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/gallery.hxx b/svx/inc/gallery.hxx index 64b87184a0e7..68a5c68539f1 100644 --- a/svx/inc/gallery.hxx +++ b/svx/inc/gallery.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: gallery.hxx,v $ - * $Revision: 1.11 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx index e2a5bee41dd6..6996cc18692e 100644 --- a/svx/inc/galobj.hxx +++ b/svx/inc/galobj.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: galobj.hxx,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/galtheme.hrc b/svx/inc/galtheme.hrc index d8b047cdf5f5..483c397983ed 100644 --- a/svx/inc/galtheme.hrc +++ b/svx/inc/galtheme.hrc @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: galtheme.hrc,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/galtheme.hxx b/svx/inc/galtheme.hxx index 96834327a203..aa77bba25d26 100644 --- a/svx/inc/galtheme.hxx +++ b/svx/inc/galtheme.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: galtheme.hxx,v $ - * $Revision: 1.11.216.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/globl3d.hxx b/svx/inc/globl3d.hxx index 67af6269c0d7..1560f96dc1f5 100644 --- a/svx/inc/globl3d.hxx +++ b/svx/inc/globl3d.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: globl3d.hxx,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/globlac.hrc b/svx/inc/globlac.hrc index 99316da00be3..f72d4c1d31a8 100644 --- a/svx/inc/globlac.hrc +++ b/svx/inc/globlac.hrc @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: globlac.hrc,v $ - * $Revision: 1.15 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc index d40ca4de1876..f9ee36de1ab0 100644 --- a/svx/inc/globlmn_tmpl.hrc +++ b/svx/inc/globlmn_tmpl.hrc @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: globlmn_tmpl.hrc,v $ - * $Revision: 1.11.212.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/grafctrl.hxx b/svx/inc/grafctrl.hxx index ea5a7236f6fe..0c68f73f48f6 100644 --- a/svx/inc/grafctrl.hxx +++ b/svx/inc/grafctrl.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: grafctrl.hxx,v $ - * $Revision: 1.9 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc index bc36634e24c3..6d9153818cde 100644 --- a/svx/inc/helpid.hrc +++ b/svx/inc/helpid.hrc @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: helpid.hrc,v $ - * $Revision: 1.78 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -37,8 +34,6 @@ // Help-Ids -------------------------------------------------------------- #define HID_ALIGN_TBX (HID_SVX_START + 1) -#define HID_AUTOCORR_HELP_END (HID_SVX_START + 2) -#define HID_AUTOCORR_HELP_START (HID_SVX_START + 3) #define HID_BMPMASK_CTL_PIPETTE (HID_SVX_START + 4) #define HID_BMPMASK_CTL_QCOL_1 (HID_SVX_START + 5) #define HID_BMPMASK_TBI_PIPETTE (HID_SVX_START + 6) @@ -122,7 +117,7 @@ #define HID_GRFFILTER_SMOOTH (HID_SVX_START + 84) #define HID_GRFFILTER_SOBEL (HID_SVX_START + 85) #define HID_GRFFILTER_SOLARIZE (HID_SVX_START + 86) -#define HID_HYPHENATE (HID_SVX_START + 87) + #define HID_IMAPDLG_ACTIVE (HID_SVX_START + 88) #define HID_IMAPDLG_APPLY (HID_SVX_START + 89) #define HID_IMAPDLG_CIRCLE (HID_SVX_START + 90) @@ -226,7 +221,7 @@ #define HID_SVX_TP_DOCRECOVERY_SAVE (HID_SVX_START + 188) #define HID_SVX_TP_ERR_REP_SEND (HID_SVX_START + 189) #define HID_SVX_TP_ERR_REP_WELCOME (HID_SVX_START + 190) -#define HID_THES_LANGUAGE (HID_SVX_START + 191) + #define HID_VALUESET_EXTRUSION_DIRECTION (HID_SVX_START + 192) #define HID_VALUESET_EXTRUSION_LIGHTING (HID_SVX_START + 193) #define HID_WIN_FONTWORK_ALIGN (HID_SVX_START + 194) diff --git a/svx/inc/hlnkitem.hxx b/svx/inc/hlnkitem.hxx index a820be6562f1..b9540e8845ca 100644 --- a/svx/inc/hlnkitem.hxx +++ b/svx/inc/hlnkitem.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: hlnkitem.hxx,v $ - * $Revision: 1.6.216.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/htmlcfg.hxx b/svx/inc/htmlcfg.hxx deleted file mode 100644 index 5fa8bdb6071a..000000000000 --- a/svx/inc/htmlcfg.hxx +++ /dev/null @@ -1,104 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: htmlcfg.hxx,v $ - * $Revision: 1.6 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_HTMLCFG_HXX -#define _SVX_HTMLCFG_HXX - -// ----------------------------------------------------------------------- - -#include <tools/solar.h> -#include <unotools/configitem.hxx> -#include "svx/svxdllapi.h" - -#define HTML_FONT_COUNT 7 - -// !!!be aware!!!: the following defines are _not_ used as values in the configuration file -// this is because of compatibility reasons -#define HTML_CFG_HTML32 0 // Html 3.2 -#define HTML_CFG_MSIE_40 1 // Internet Explorer 4.0 -#define HTML_CFG_MSIE HTML_CFG_MSIE_40 -#define HTML_CFG_WRITER 2 // Writer -#define HTML_CFG_NS40 3 // Netscape 4.0 -#define HTML_CFG_MSIE_40_OLD 4 // Internet Explorer 4.0 - alter Wert - -#define HTML_CFG_MAX HTML_CFG_NS40 - -struct HtmlOptions_Impl; -// ----------------------------------------------------------------------- - -class SVX_DLLPUBLIC SvxHtmlOptions : public utl::ConfigItem -{ - HtmlOptions_Impl*pImp; - const com::sun::star::uno::Sequence<rtl::OUString>& GetPropertyNames(); - -public: - SvxHtmlOptions(); - ~SvxHtmlOptions(); - - virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames); - - USHORT GetFontSize(USHORT nPos) const; - void SetFontSize(USHORT nPos, USHORT nSize); - - BOOL IsImportUnknown() const; - void SetImportUnknown(BOOL bSet); - - USHORT GetExportMode() const; - void SetExportMode(USHORT nSet); - - BOOL IsStarBasic() const; - void SetStarBasic(BOOL bSet); - - BOOL IsStarBasicWarning() const; - void SetStarBasicWarning(BOOL bSet); - - BOOL IsSaveGraphicsLocal() const; - void SetSaveGraphicsLocal(BOOL bSet); - - BOOL IsPrintLayoutExtension() const; - void SetPrintLayoutExtension(BOOL bSet); - - BOOL IsIgnoreFontFamily() const; - void SetIgnoreFontFamily(BOOL bSet); - - sal_Bool IsDefaultTextEncoding() const; - rtl_TextEncoding GetTextEncoding() const; - void SetTextEncoding( rtl_TextEncoding ); - static SvxHtmlOptions* Get(); - - BOOL IsNumbersEnglishUS() const; - void SetNumbersEnglishUS(BOOL bSet); -}; - -#endif - - - - diff --git a/svx/inc/htmlmode.hxx b/svx/inc/htmlmode.hxx index 7548effbd690..a1c5bf0cdf11 100644 --- a/svx/inc/htmlmode.hxx +++ b/svx/inc/htmlmode.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: htmlmode.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/hyperdlg.hxx b/svx/inc/hyperdlg.hxx index 1e78d0f2ba93..fc129763e63f 100644 --- a/svx/inc/hyperdlg.hxx +++ b/svx/inc/hyperdlg.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: hyperdlg.hxx,v $ - * $Revision: 1.10 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/imapdlg.hxx b/svx/inc/imapdlg.hxx index 2c3c19e27b31..d1a6961453a5 100644 --- a/svx/inc/imapdlg.hxx +++ b/svx/inc/imapdlg.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: imapdlg.hxx,v $ - * $Revision: 1.11 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/insctrl.hxx b/svx/inc/insctrl.hxx index b12eac36d78a..e7fa02c70d91 100644 --- a/svx/inc/insctrl.hxx +++ b/svx/inc/insctrl.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: insctrl.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/layctrl.hxx b/svx/inc/layctrl.hxx index 5c96ceaee3bb..1bbdc714b7c9 100644 --- a/svx/inc/layctrl.hxx +++ b/svx/inc/layctrl.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: layctrl.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/lboxctrl.hxx b/svx/inc/lboxctrl.hxx index 17e0b8182c0c..36c82c64f44b 100644 --- a/svx/inc/lboxctrl.hxx +++ b/svx/inc/lboxctrl.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: lboxctrl.hxx,v $ - * $Revision: 1.11 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/lightdlg.hxx b/svx/inc/lightdlg.hxx index 0330ae22dacc..0e9afebb42b5 100644 --- a/svx/inc/lightdlg.hxx +++ b/svx/inc/lightdlg.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: lightdlg.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/linectrl.hxx b/svx/inc/linectrl.hxx index 82c042e08d1f..43c96f128671 100644 --- a/svx/inc/linectrl.hxx +++ b/svx/inc/linectrl.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: linectrl.hxx,v $ - * $Revision: 1.9 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/linkmgr.hxx b/svx/inc/linkmgr.hxx deleted file mode 100644 index b65c91ce7ebd..000000000000 --- a/svx/inc/linkmgr.hxx +++ /dev/null @@ -1,101 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: linkmgr.hxx,v $ - * $Revision: 1.7 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVXLINKMGR_HXX -#define _SVXLINKMGR_HXX - - -#include <sfx2/linkmgr.hxx> -#include "svx/svxdllapi.h" - -class Graphic; -class Size; - -// Damit der Link ueber den Status der zu ladenen Grafik informierten werden -// verschickt das FileObject ein SvData, mit der FormatId -// "RegisterStatusInfoId" und ein einem String als Datentraeger. Dieser -// enthaelt den folgenden enum. -enum LinkState -{ - STATE_LOAD_OK, - STATE_LOAD_ERROR, - STATE_LOAD_ABORT -}; - -class SVX_DLLPUBLIC SvxLinkManager : public ::sfx2::SvLinkManager -{ - SvxLinkManager( const SvxLinkManager& ); - SvxLinkManager& operator=( const SvxLinkManager& ); - -public: - SvxLinkManager( SfxObjectShell * pCacheCont ); - - // den Link mit einem PseudoObject verbinden und in die Liste eintragen - BOOL InsertFileLink( sfx2::SvBaseLink&, - USHORT nFileType, - const String& rTxt, - const String* pFilterNm = 0, - const String* pRange = 0 ); - - // falls am Link schon alles eingestellt ist ! - BOOL InsertFileLink( sfx2::SvBaseLink& ); - - // erfrage die Strings fuer den Dialog - virtual BOOL GetDisplayNames( const sfx2::SvBaseLink*, - String* pType, - String* pFile = 0, - String* pLink = 0, - String* pFilter = 0 ) const; - - virtual sfx2::SvLinkSourceRef CreateObj( sfx2::SvBaseLink * ); - - // eine Uebertragung wird abgebrochen, also alle DownloadMedien canceln - // (ist zur Zeit nur fuer die FileLinks interressant!) - void CancelTransfers(); - - static void SetTransferPriority( sfx2::SvBaseLink& rLink, USHORT nPrio ); - - // um Status Informationen aus dem FileObject an den BaseLink zu - // senden, gibt es eine eigene ClipBoardId. Das SvData-Object hat - // dann die entsprechenden Informationen als String. - // Wird zur Zeit fuer FileObject in Verbindung mit JavaScript benoetigt - // - das braucht Informationen ueber Load/Abort/Error - static ULONG RegisterStatusInfoId(); - - // if the mimetype says graphic/bitmap/gdimetafile then get the - // graphic from the Any. Return says no errors - static BOOL GetGraphicFromAny( const String& rMimeType, - const ::com::sun::star::uno::Any & rValue, - Graphic& rGrf ); - -}; - - -#endif - diff --git a/svx/inc/makefile.mk b/svx/inc/makefile.mk index 357b21f5a8d3..37a079a68aa8 100644 --- a/svx/inc/makefile.mk +++ b/svx/inc/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.5 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/measctrl.hxx b/svx/inc/measctrl.hxx index 1a553fc0a232..d45dc134cf19 100644 --- a/svx/inc/measctrl.hxx +++ b/svx/inc/measctrl.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: measctrl.hxx,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/modctrl.hxx b/svx/inc/modctrl.hxx index 5c44f478c4ee..fd9e085c826e 100644 --- a/svx/inc/modctrl.hxx +++ b/svx/inc/modctrl.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: modctrl.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/nlbkitem.hxx b/svx/inc/nlbkitem.hxx deleted file mode 100644 index db3298c3d5b1..000000000000 --- a/svx/inc/nlbkitem.hxx +++ /dev/null @@ -1,76 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: nlbkitem.hxx,v $ - * $Revision: 1.6 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_NLBKITEM_HXX -#define _SVX_NLBKITEM_HXX - -// include --------------------------------------------------------------- - - -#include <svl/eitem.hxx> -#include "svx/svxdllapi.h" - -// class SvxNoLinebreakItem ---------------------------------------------- - - -/* [Beschreibung] - - PB: ??? -*/ - -class SVX_DLLPUBLIC SvxNoLinebreakItem : public SfxBoolItem -{ -public: - TYPEINFO(); - - SvxNoLinebreakItem( const BOOL bBreak /*= TRUE*/, - const USHORT nId ); - - // "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, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; - - inline SvxNoLinebreakItem& operator=(const SvxNoLinebreakItem& rLB) - { - SetValue( rLB.GetValue() ); - return *this; - } -}; - - - -#endif - - diff --git a/svx/inc/numvset.hxx b/svx/inc/numvset.hxx index 8887afb34e51..d174e1d6fba5 100644 --- a/svx/inc/numvset.hxx +++ b/svx/inc/numvset.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: numvset.hxx,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/objfac3d.hxx b/svx/inc/objfac3d.hxx index 25bdc2fe4bbd..6ce30853f441 100644 --- a/svx/inc/objfac3d.hxx +++ b/svx/inc/objfac3d.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: objfac3d.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/ofaitem.hxx b/svx/inc/ofaitem.hxx index 7701cb82206b..50f18ccb9ed9 100644 --- a/svx/inc/ofaitem.hxx +++ b/svx/inc/ofaitem.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ofaitem.hxx,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/opaqitem.hxx b/svx/inc/opaqitem.hxx deleted file mode 100644 index 07a5cbb4fd36..000000000000 --- a/svx/inc/opaqitem.hxx +++ /dev/null @@ -1,84 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: opaqitem.hxx,v $ - * $Revision: 1.9 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_OPAQITEM_HXX -#define _SVX_OPAQITEM_HXX - -// include --------------------------------------------------------------- - -#include <svl/eitem.hxx> -#include "svx/svxdllapi.h" - -class SvXMLUnitConverter; -namespace rtl -{ - class OUString; -} - -// class SvxOpaqueItem --------------------------------------------------- - - -/* -[Beschreibung] -Dieses Item beschreibt eine logische Variable "Undurchsichtig ja oder nein". -*/ - -class SVX_DLLPUBLIC SvxOpaqueItem : public SfxBoolItem -{ -public: - TYPEINFO(); - - SvxOpaqueItem( const USHORT nId , const BOOL bOpa = TRUE ); - inline SvxOpaqueItem &operator=( const SvxOpaqueItem &rCpy ); - - // "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, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; -}; - -inline SvxOpaqueItem::SvxOpaqueItem( const USHORT nId, const BOOL bOpa ) - : SfxBoolItem( nId, bOpa ) -{} - -inline SvxOpaqueItem &SvxOpaqueItem::operator=( const SvxOpaqueItem &rCpy ) -{ - SetValue( rCpy.GetValue() ); - return *this; -} - - - -#endif - diff --git a/svx/inc/opengrf.hxx b/svx/inc/opengrf.hxx deleted file mode 100644 index e32ce7d1b243..000000000000 --- a/svx/inc/opengrf.hxx +++ /dev/null @@ -1,74 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: opengrf.hxx,v $ - * $Revision: 1.9 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_OPENGRF_HXX -#define _SVX_OPENGRF_HXX - -#include <memory> // auto_ptr -#include <svtools/filter.hxx> -#include "svx/svxdllapi.h" - - -struct SvxOpenGrf_Impl; - -class SVX_DLLPUBLIC SvxOpenGraphicDialog -{ -public: - SvxOpenGraphicDialog ( const String& rTitle ); - ~SvxOpenGraphicDialog (); - - short Execute(); - - void SetPath( const String& rPath ); - void SetPath( const String& rPath, sal_Bool bLinkState ); - String GetPath() const; - - int GetGraphic(Graphic&) const; - - void EnableLink(sal_Bool); - void AsLink(sal_Bool); - sal_Bool IsAsLink() const; - - String GetCurrentFilter() const; - void SetCurrentFilter(const String&); - - /// Set dialog help id at FileDlgHelper - void SetControlHelpIds( const INT16* _pControlId, const INT32* _pHelpId ); - /// Set control help ids at FileDlgHelper - void SetDialogHelpId( const INT32 _nHelpId ); -private: - // disable copy and assignment - SVX_DLLPRIVATE SvxOpenGraphicDialog (const SvxOpenGraphicDialog&); - SVX_DLLPRIVATE SvxOpenGraphicDialog& operator = ( const SvxOpenGraphicDialog & ); - - const std::auto_ptr< SvxOpenGrf_Impl > mpImpl; -}; - -#endif // _SVX_OPENGRF_HXX - diff --git a/svx/inc/optextbr.hrc b/svx/inc/optextbr.hrc deleted file mode 100644 index 9524ab69fbb1..000000000000 --- a/svx/inc/optextbr.hrc +++ /dev/null @@ -1,59 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: optextbr.hrc,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_OPTEXTBR_HRC -#define _SVX_OPTEXTBR_HRC - -// defines --------------------------------------------------------------- - -#define CB_EXTBRW_ON 10 -#define FT_EXTBRW_EXCEPTION 11 -#define ED_EXTBRW_EXCEPTION 12 -#define LB_EXTBRW_EXCEPTION 13 -#define PB_EXTBRW_ADD 14 -#define PB_EXTBRW_DELETE 15 -#define PB_EXTBRW_IEOPTIONS 16 -#define CB_EXTBRW_NOHINT 17 -#define ED_EXTBRW_FILE 18 -#define PB_EXTBRW_FILE 19 -#define CB_EXTBRW_FILE 20 - -#define STR_EXTBRW_FILE 30 - -#define IMG_EXTBRW_WARNING 10 -#define FT_EXTBRW_WARNING 11 -#define CB_EXTBRW_DISABLE 12 -#define GB_EXTBRW_WARNING 13 -#define BTN_EXTBRW_YES 14 -#define BTN_EXTBRW_NO 15 - -#endif // #ifndef _SVX_OPTEXTBR_HRC - -// ******************************************************************* EOF - diff --git a/svx/inc/optgenrl.hxx b/svx/inc/optgenrl.hxx index a30a111dce49..50520aac0204 100644 --- a/svx/inc/optgenrl.hxx +++ b/svx/inc/optgenrl.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: optgenrl.hxx,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/optgrid.hxx b/svx/inc/optgrid.hxx index e91530f33cd5..6dd2a5f9371d 100644 --- a/svx/inc/optgrid.hxx +++ b/svx/inc/optgrid.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: optgrid.hxx,v $ - * $Revision: 1.13 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/optitems.hxx b/svx/inc/optitems.hxx deleted file mode 100644 index 6e951c0100f4..000000000000 --- a/svx/inc/optitems.hxx +++ /dev/null @@ -1,123 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: optitems.hxx,v $ - * $Revision: 1.7 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_OPTITEMS_HXX -#define _SVX_OPTITEMS_HXX - -// include --------------------------------------------------------------- - -#include <svl/poolitem.hxx> -#include <com/sun/star/uno/Reference.hxx> -#include "svx/svxdllapi.h" - -// forward --------------------------------------------------------------- -namespace com{namespace sun{namespace star{ -namespace beans{ -// class XPropertySet; -} -namespace linguistic2{ - class XSpellChecker1; -}}}} - - -// class SfxSpellCheckItem ----------------------------------------------- - - - -class SVX_DLLPUBLIC SfxSpellCheckItem: public SfxPoolItem -{ -public: - TYPEINFO(); - - SfxSpellCheckItem( ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellChecker1 > &xChecker, - sal_uInt16 nWhich ); - SfxSpellCheckItem( const SfxSpellCheckItem& rItem ); - - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; - - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; - - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellChecker1 > - GetXSpellChecker() const { return xSpellCheck; } - -private: - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellChecker1 > xSpellCheck; -}; - - -// class SfxHyphenRegionItem --------------------------------------------- - - - -class SVX_DLLPUBLIC SfxHyphenRegionItem: public SfxPoolItem -{ - sal_uInt8 nMinLead; - sal_uInt8 nMinTrail; - -public: - TYPEINFO(); - - SfxHyphenRegionItem( const sal_uInt16 nId ); - SfxHyphenRegionItem( const SfxHyphenRegionItem& rItem ); - - 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; - - inline sal_uInt8 &GetMinLead() { return nMinLead; } - inline sal_uInt8 GetMinLead() const { return nMinLead; } - - inline sal_uInt8 &GetMinTrail() { return nMinTrail; } - inline sal_uInt8 GetMinTrail() const { return nMinTrail; } - - inline SfxHyphenRegionItem& operator=( const SfxHyphenRegionItem& rNew ) - { - nMinLead = rNew.GetMinLead(); - nMinTrail = rNew.GetMinTrail(); - return *this; - } -}; - - - -#endif - diff --git a/svx/inc/orienthelper.hxx b/svx/inc/orienthelper.hxx index 3bbbaac77e9a..7508740b62d6 100644 --- a/svx/inc/orienthelper.hxx +++ b/svx/inc/orienthelper.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: orienthelper.hxx,v $ - * $Revision: 1.5.274.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/passwd.hxx b/svx/inc/passwd.hxx index 1128337da480..9a6b14f0144a 100644 --- a/svx/inc/passwd.hxx +++ b/svx/inc/passwd.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: passwd.hxx,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/pch/precompiled_svx.cxx b/svx/inc/pch/precompiled_svx.cxx index 70dd166aea8f..71c3408c6f31 100644 --- a/svx/inc/pch/precompiled_svx.cxx +++ b/svx/inc/pch/precompiled_svx.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: precompiled_svx.cxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index fe961050250e..235544f22f28 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: precompiled_svx.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -740,7 +737,7 @@ #include "sfx2/sfxstatuslistener.hxx" #include "sfx2/sfxuno.hxx" #include "sfx2/shell.hxx" -#include "sfx2/srchdefs.hxx" +#include "svl/srchdefs.hxx" #include "sfx2/tplpitem.hxx" #include "sfx2/viewfrm.hxx" #include "sot/clsids.hxx" diff --git a/svx/inc/pfiledlg.hxx b/svx/inc/pfiledlg.hxx index aa48385cdbd3..646575ac4e0c 100644 --- a/svx/inc/pfiledlg.hxx +++ b/svx/inc/pfiledlg.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: pfiledlg.hxx,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/pgrditem.hxx b/svx/inc/pgrditem.hxx deleted file mode 100644 index e1c886829d17..000000000000 --- a/svx/inc/pgrditem.hxx +++ /dev/null @@ -1,67 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: pgrditem.hxx,v $ - * $Revision: 1.6 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_PGRDITEM_HXX -#define _SVX_PGRDITEM_HXX - -// include --------------------------------------------------------------- - -#include <svl/eitem.hxx> -#include "svx/svxdllapi.h" - -// class SvxParaGridItem ------------------------------------------------- - - -/* - [Beschreibung] - Paragraph snap to grid -*/ - -class SVX_DLLPUBLIC SvxParaGridItem : public SfxBoolItem -{ -public: - TYPEINFO(); - - SvxParaGridItem( const BOOL bSnapToGrid /*= TRUE*/, - const USHORT nId ); - - // "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 SfxItemPresentation GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; -}; - -#endif - - diff --git a/svx/inc/postattr.hxx b/svx/inc/postattr.hxx index 425f3f84bf76..840312cf0c46 100644 --- a/svx/inc/postattr.hxx +++ b/svx/inc/postattr.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: postattr.hxx,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/prntitem.hxx b/svx/inc/prntitem.hxx deleted file mode 100644 index f9b91e12a2a7..000000000000 --- a/svx/inc/prntitem.hxx +++ /dev/null @@ -1,82 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: prntitem.hxx,v $ - * $Revision: 1.8 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_PRNTITEM_HXX -#define _SVX_PRNTITEM_HXX - -// include --------------------------------------------------------------- - -#include <svl/eitem.hxx> -#include "svx/svxdllapi.h" - - - -// class SvxPrintItem ---------------------------------------------------- - - -/* -[Beschreibung] -Dieses Item beschreibt eine logische Variable "Drucken ja oder nein". -*/ - - -class SVX_DLLPUBLIC SvxPrintItem : public SfxBoolItem -{ -public: - TYPEINFO(); - - SvxPrintItem( const USHORT nId , const BOOL bPrt = TRUE ); - inline SvxPrintItem &operator=( const SvxPrintItem &rCpy ); - - // "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, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; -}; - -inline SvxPrintItem::SvxPrintItem( const USHORT nId, const BOOL bPrt ) - : SfxBoolItem( nId, bPrt ) -{} - -inline SvxPrintItem &SvxPrintItem::operator=( const SvxPrintItem &rCpy ) -{ - SetValue( rCpy.GetValue() ); - return *this; -} - - - - -#endif - diff --git a/svx/inc/protitem.hxx b/svx/inc/protitem.hxx deleted file mode 100644 index bb6646f9445a..000000000000 --- a/svx/inc/protitem.hxx +++ /dev/null @@ -1,108 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: protitem.hxx,v $ - * $Revision: 1.9 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_PROTITEM_HXX -#define _SVX_PROTITEM_HXX - -// include --------------------------------------------------------------- - - -#include <svl/poolitem.hxx> -#include "svx/svxdllapi.h" - -class SvXMLUnitConverter; -namespace rtl -{ - class OUString; -} - -// class SvxProtectItem -------------------------------------------------- - - -/* -[Beschreibung] -Dieses Item beschreibt, ob Inhalt, Groesse oder Position geschuetzt werden -sollen. -*/ - -class SVX_DLLPUBLIC SvxProtectItem : public SfxPoolItem -{ - BOOL bCntnt :1; //Inhalt geschuetzt - BOOL bSize :1; //Groesse geschuetzt - BOOL bPos :1; //Position geschuetzt - -public: - TYPEINFO(); - - inline SvxProtectItem( const USHORT nId ); - inline SvxProtectItem &operator=( const SvxProtectItem &rCpy ); - - // "pure virtual Methoden" vom SfxPoolItem - 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 &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; - - BOOL IsCntntProtected() const { return bCntnt; } - BOOL IsSizeProtected() const { return bSize; } - BOOL IsPosProtected() const { return bPos; } - void SetCntntProtect( BOOL bNew ) { bCntnt = bNew; } - void SetSizeProtect ( BOOL bNew ) { bSize = bNew; } - void SetPosProtect ( BOOL bNew ) { bPos = bNew; } - - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); -}; - -inline SvxProtectItem::SvxProtectItem( const USHORT nId ) - : SfxPoolItem( nId ) -{ - bCntnt = bSize = bPos = FALSE; -} - -inline SvxProtectItem &SvxProtectItem::operator=( const SvxProtectItem &rCpy ) -{ - bCntnt = rCpy.IsCntntProtected(); - bSize = rCpy.IsSizeProtected(); - bPos = rCpy.IsPosProtected(); - return *this; -} - - - - -#endif - diff --git a/svx/inc/prtqry.hxx b/svx/inc/prtqry.hxx index 2c75d4386785..ce7ae239215f 100644 --- a/svx/inc/prtqry.hxx +++ b/svx/inc/prtqry.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: prtqry.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/pszctrl.hxx b/svx/inc/pszctrl.hxx index c4ebbb3c239a..54ec2788521f 100644 --- a/svx/inc/pszctrl.hxx +++ b/svx/inc/pszctrl.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: pszctrl.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -46,6 +43,7 @@ class SVX_DLLPUBLIC SvxPosSizeStatusBarControl : public SfxStatusBarControl { private: SvxPosSizeStatusBarControl_Impl* pImp; + SVX_DLLPRIVATE String GetMetricStr_Impl( long nVal ); public: SFX_DECL_STATUSBAR_CONTROL(); diff --git a/svx/inc/relfld.hxx b/svx/inc/relfld.hxx index aa1bed70f025..02d9ca20a5d3 100644 --- a/svx/inc/relfld.hxx +++ b/svx/inc/relfld.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: relfld.hxx,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/rotmodit.hxx b/svx/inc/rotmodit.hxx index f88b8a2b35ef..8177713e6013 100644 --- a/svx/inc/rotmodit.hxx +++ b/svx/inc/rotmodit.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: rotmodit.hxx,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/rubydialog.hxx b/svx/inc/rubydialog.hxx index 9606558fa05a..e8deecfed145 100644 --- a/svx/inc/rubydialog.hxx +++ b/svx/inc/rubydialog.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: rubydialog.hxx,v $ - * $Revision: 1.15 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/rulritem.hxx b/svx/inc/rulritem.hxx index 7d035acef427..f6b81e1eedb8 100644 --- a/svx/inc/rulritem.hxx +++ b/svx/inc/rulritem.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: rulritem.hxx,v $ - * $Revision: 1.10 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/sdrpaintwindow.hxx b/svx/inc/sdrpaintwindow.hxx index c0fa23610625..fef8c2e604d0 100644 --- a/svx/inc/sdrpaintwindow.hxx +++ b/svx/inc/sdrpaintwindow.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrpaintwindow.hxx,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/selctrl.hxx b/svx/inc/selctrl.hxx index 96fd8c8f3d9f..5d7fac4f4a5e 100644 --- a/svx/inc/selctrl.hxx +++ b/svx/inc/selctrl.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: selctrl.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/sjctrl.hxx b/svx/inc/sjctrl.hxx index 358df9af3671..16de32f733dc 100644 --- a/svx/inc/sjctrl.hxx +++ b/svx/inc/sjctrl.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sjctrl.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/srchcfg.hxx b/svx/inc/srchcfg.hxx deleted file mode 100644 index c5e4bd74fe60..000000000000 --- a/svx/inc/srchcfg.hxx +++ /dev/null @@ -1,85 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: srchcfg.hxx,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_SRCHCFG_HXX -#define _SVX_SRCHCFG_HXX - -#include <unotools/configitem.hxx> -#include <com/sun/star/uno/Sequence.h> -#include "svx/svxdllapi.h" - -//----------------------------------------------------------------------------- -struct SvxSearchConfig_Impl; -struct SvxSearchEngineData -{ - rtl::OUString sEngineName; - - rtl::OUString sAndPrefix; - rtl::OUString sAndSuffix; - rtl::OUString sAndSeparator; - sal_Int32 nAndCaseMatch; - - rtl::OUString sOrPrefix; - rtl::OUString sOrSuffix; - rtl::OUString sOrSeparator; - sal_Int32 nOrCaseMatch; - - rtl::OUString sExactPrefix; - rtl::OUString sExactSuffix; - rtl::OUString sExactSeparator; - sal_Int32 nExactCaseMatch; - - SvxSearchEngineData() : - nAndCaseMatch(0), - nOrCaseMatch(0), - nExactCaseMatch(0){} - - sal_Bool operator==(const SvxSearchEngineData& rData); -}; -class SVX_DLLPUBLIC SvxSearchConfig : public utl::ConfigItem -{ - SvxSearchConfig_Impl* pImpl; - -public: - SvxSearchConfig(sal_Bool bEnableNotify = sal_True); - virtual ~SvxSearchConfig(); - - void Load(); - virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames); - - sal_uInt16 Count(); - const SvxSearchEngineData& GetData(sal_uInt16 nPos); - const SvxSearchEngineData* GetData(const rtl::OUString& rEngineName); - void SetData(const SvxSearchEngineData& rData); - void RemoveData(const rtl::OUString& rEngineName); -}; - -#endif - diff --git a/svx/inc/srchdlg.hxx b/svx/inc/srchdlg.hxx index cd4006e86690..29aec84fae24 100644 --- a/svx/inc/srchdlg.hxx +++ b/svx/inc/srchdlg.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: srchdlg.hxx,v $ - * $Revision: 1.18 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -34,34 +31,20 @@ #include <svtools/stdctrl.hxx> -#ifndef _COMBOBOX_HXX //autogen #include <vcl/combobox.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> -#endif #include <sfx2/childwin.hxx> #include <sfx2/basedlgs.hxx> #include <svl/svarray.hxx> #define _SVSTDARR_STRINGSDTOR #include <svl/svstdarr.hxx> #include <svtools/svmedit.hxx> -#include <sfx2/srchdefs.hxx> +#include <svl/srchdefs.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/srchitem.hxx b/svx/inc/srchitem.hxx index c31cdfb25fc5..fceb5f009953 100644 --- a/svx/inc/srchitem.hxx +++ b/svx/inc/srchitem.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: srchitem.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -30,7 +27,7 @@ #ifndef _SVX_SRCHITEM_HXX #define _SVX_SRCHITEM_HXX -#include <sfx2/srchitem.hxx> +#include <svl/srchitem.hxx> #endif diff --git a/svx/inc/svdglob.hxx b/svx/inc/svdglob.hxx index 4526579d0658..588869ff9890 100644 --- a/svx/inc/svdglob.hxx +++ b/svx/inc/svdglob.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdglob.hxx,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx index e424b4b9305e..be3a9ba22cef 100644 --- a/svx/inc/svdibrow.hxx +++ b/svx/inc/svdibrow.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdibrow.hxx,v $ - * $Revision: 1.9 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svditer.hxx b/svx/inc/svditer.hxx index 92325f281c92..8ab6c32ea061 100644 --- a/svx/inc/svditer.hxx +++ b/svx/inc/svditer.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svditer.hxx,v $ - * $Revision: 1.9.246.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svdpomv.hxx b/svx/inc/svdpomv.hxx index 8ff09cc19e7c..5ed76f739c68 100644 --- a/svx/inc/svdpomv.hxx +++ b/svx/inc/svdpomv.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdpomv.hxx,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svdshort.hxx b/svx/inc/svdshort.hxx index dfe5bc1d9179..2b28525cbb51 100644 --- a/svx/inc/svdshort.hxx +++ b/svx/inc/svdshort.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdshort.hxx,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svdstr.hrc b/svx/inc/svdstr.hrc index 280a9dba6122..f1c19b4e0895 100644 --- a/svx/inc/svdstr.hrc +++ b/svx/inc/svdstr.hrc @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdstr.hrc,v $ - * $Revision: 1.18.212.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svdviter.hxx b/svx/inc/svdviter.hxx index 16ab018dc851..884733bc2d84 100644 --- a/svx/inc/svdviter.hxx +++ b/svx/inc/svdviter.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdviter.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svimbase.hxx b/svx/inc/svimbase.hxx index ab7c5d6556d0..3d43e5fb9aac 100644 --- a/svx/inc/svimbase.hxx +++ b/svx/inc/svimbase.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svimbase.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/AccessibleComponentBase.hxx b/svx/inc/svx/AccessibleComponentBase.hxx deleted file mode 100644 index b58e651edc49..000000000000 --- a/svx/inc/svx/AccessibleComponentBase.hxx +++ /dev/null @@ -1,150 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: AccessibleComponentBase.hxx,v $ - * $Revision: 1.3 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -#ifndef _SVX_ACCESSIBILITY_ACCESSIBLE_EXTENDED_COMPONENT_BASE_HXX -#define _SVX_ACCESSIBILITY_ACCESSIBLE_EXTENDED_COMPONENT_BASE_HXX - - -#include <com/sun/star/accessibility/XAccessible.hpp> -#include <com/sun/star/accessibility/XAccessibleExtendedComponent.hpp> -#include <com/sun/star/awt/XFocusListener.hpp> -#include "svx/svxdllapi.h" - -namespace accessibility { - -/** @descr - This base class provides (will provice) a base implementation of the - <type>XAccessibleComponent</type> and the - <type>XAccessibleExtendedComponent</type> for all shapes. For - more detailed documentation about the methods refer to the interface - descriptions of <type>XAccessible</type>, - <type>XAccessibleContext</type>, <type>XInterface</type>, - <type>XServiceInfo</type>, and <type>XTypeProvider</type>. -*/ -class SVX_DLLPUBLIC AccessibleComponentBase - : public ::com::sun::star::accessibility::XAccessibleExtendedComponent -{ -public: - //===== internal ======================================================== - AccessibleComponentBase (void); - virtual ~AccessibleComponentBase (void); - - - //===== XAccessibleComponent ================================================ - - /** The default implementation uses the result of - <member>getBounds</member> to determine whether the given point lies - inside this object. - */ - virtual sal_Bool SAL_CALL containsPoint ( - 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 - getAccessibleAtPoint ( - const ::com::sun::star::awt::Point& aPoint) - throw (::com::sun::star::uno::RuntimeException); - - /** The default implementation returns an empty rectangle. - */ - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds (void) - throw (::com::sun::star::uno::RuntimeException); - - /** The default implementation uses the result of - <member>getBounds</member> to determine the location. - */ - 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) - 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) - throw (::com::sun::star::uno::RuntimeException); - - /** The default implementation ignores this call. - */ - virtual void SAL_CALL addFocusListener ( - const ::com::sun::star::uno::Reference< - ::com::sun::star::awt::XFocusListener >& xListener) - throw (::com::sun::star::uno::RuntimeException); - - /** The default implementation ignores this call. - */ - virtual void SAL_CALL removeFocusListener (const ::com::sun::star::uno::Reference< - ::com::sun::star::awt::XFocusListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); - - /** The default implementation does nothing. - */ - 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) - throw (::com::sun::star::uno::RuntimeException); - - /** Returns white as the default background color. - */ - 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) - throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTitledBorderText (void) - throw (::com::sun::star::uno::RuntimeException); - 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); - -}; - -} // end of namespace accessibility - -#endif diff --git a/svx/inc/svx/AccessibleContextBase.hxx b/svx/inc/svx/AccessibleContextBase.hxx deleted file mode 100644 index 009c9b4fa619..000000000000 --- a/svx/inc/svx/AccessibleContextBase.hxx +++ /dev/null @@ -1,405 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: AccessibleContextBase.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVX_ACCESSIBILITY_ACCESSIBLE_CONTEXT_BASE_HXX -#define _SVX_ACCESSIBILITY_ACCESSIBLE_CONTEXT_BASE_HXX - -#include <svx/ChildrenManager.hxx> -#include <com/sun/star/accessibility/XAccessible.hpp> -#include <com/sun/star/accessibility/XAccessibleContext.hpp> -#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp> -#include <com/sun/star/accessibility/XAccessibleStateSet.hpp> -#include <com/sun/star/accessibility/XAccessibleRelationSet.hpp> -#include <com/sun/star/accessibility/AccessibleEventObject.hpp> -#include <com/sun/star/accessibility/AccessibleEventId.hpp> -#ifndef _COM_SUN_STAR_ACCESSIBILITY_IllegalAccessibleComponentStateException_HPP_ -#include <com/sun/star/accessibility/IllegalAccessibleComponentStateException.hpp> -#endif -#include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/lang/XComponent.hpp> -#include <cppuhelper/weak.hxx> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> -#include <com/sun/star/lang/IndexOutOfBoundsException.hpp> -#include <com/sun/star/lang/DisposedException.hpp> -#include <osl/mutex.hxx> -#include <cppuhelper/compbase4.hxx> -#include "svx/svxdllapi.h" - - -namespace accessibility { - -struct MutexOwner {mutable ::osl::Mutex maMutex;}; - -/** @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 SVX_DLLPUBLIC AccessibleContextBase - : public MutexOwner, - public cppu::WeakComponentImplHelper4< - ::com::sun::star::accessibility::XAccessible, - ::com::sun::star::accessibility::XAccessibleContext, - ::com::sun::star::accessibility::XAccessibleEventBroadcaster, - ::com::sun::star::lang::XServiceInfo - > -{ -public: - - //===== internal ======================================================== - - /** The origin of the accessible name or description. - */ - enum StringOrigin { - ManuallySet, - FromShape, - AutomaticallyCreated, - NotSet - }; - - AccessibleContextBase ( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, - const sal_Int16 aRole); - virtual ~AccessibleContextBase (void); - - - /** Call all accessiblity event listeners to inform them about the - specified event. - @param aEventId - Id of the event type. - @param rNewValue - New value of the modified attribute. Pass empty structure if - not applicable. - @param rOldValue - Old value of the modified attribute. Pass empty structure if - not applicable. - */ - void CommitChange (sal_Int16 aEventId, - const ::com::sun::star::uno::Any& rNewValue, - const ::com::sun::star::uno::Any& rOldValue); - - /** Set a new description and, provided that the new name differs from - the old one, broadcast an accessibility event. - @param rsDescription - The new description. - @param eDescriptionOrigin - The origin of the description. This is used to determine - whether the given description overrules the existing one. An - origin with a lower numerical value overrides one with a higher - value. - */ - void SetAccessibleDescription ( - const ::rtl::OUString& rsDescription, - StringOrigin eDescriptionOrigin) - throw (::com::sun::star::uno::RuntimeException); - - /** Set a new description and, provided that the new name differs from - the old one, broadcast an accessibility event. - @param rsName - The new name. - @param eNameOrigin - The origin of the name. This is used to determine whether the - given name overrules the existing one. An origin with a lower - numerical value overrides one with a higher value. - */ - void SetAccessibleName ( - const ::rtl::OUString& rsName, - StringOrigin eNameOrigin) - throw (::com::sun::star::uno::RuntimeException); - - /** Set the specified state (turn it on) and send events to all - listeners to inform them of the change. - - @param aState - The state to turn on. - - @return - If the specified state changed its value due to this call - <TRUE/> is returned, otherwise <FALSE/>. - */ - virtual sal_Bool SetState (sal_Int16 aState); - - /** Reset the specified state (turn it off) and send events to all - listeners to inform them of the change. - - @param aState - The state to turn off. - - @return - If the specified state changed its value due to this call - <TRUE/> is returned, otherwise <FALSE/>. - */ - virtual sal_Bool ResetState (sal_Int16 aState); - - /** Return the state of the specified state. - - @param aState - The state for which to return its value. - - @return - A value of <TRUE/> indicates that the state is set. A <FALSE/> - value indicates an unset state. - */ - sal_Bool GetState (sal_Int16 aState); - - /** Replace the current relation set with the specified one. Send - events for relations that are not in both sets. - - @param rRelationSet - The new relation set that replaces the old one. - */ - virtual void SetRelationSet ( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleRelationSet>& rxRelationSet) - throw (::com::sun::star::uno::RuntimeException); - - - //===== XAccessible ===================================================== - - /// 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. - virtual sal_Int32 SAL_CALL - getAccessibleChildCount (void) throw (::com::sun::star::uno::RuntimeException); - - /// 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. - 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 - getAccessibleIndexInParent (void) - throw (::com::sun::star::uno::RuntimeException); - - /// Return this object's role. - virtual sal_Int16 SAL_CALL - getAccessibleRole (void) - throw (::com::sun::star::uno::RuntimeException); - - /// Return this object's description. - virtual ::rtl::OUString SAL_CALL - getAccessibleDescription (void) - throw (::com::sun::star::uno::RuntimeException); - - /// 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. - 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. - 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 - parent yet/anymore. - */ - virtual ::com::sun::star::lang::Locale SAL_CALL - getLocale (void) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::accessibility::IllegalAccessibleComponentStateException); - - //===== XComponent ======================================================== - - using WeakComponentImplHelperBase::addEventListener; - using WeakComponentImplHelperBase::removeEventListener; - - //===== XAccessibleEventBroadcaster ======================================== - - virtual void SAL_CALL - addEventListener ( - 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) - throw (::com::sun::star::uno::RuntimeException); - - - //===== XServiceInfo ==================================================== - - /** 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. - */ - virtual sal_Bool SAL_CALL - supportsService (const ::rtl::OUString& sServiceName) - throw (::com::sun::star::uno::RuntimeException); - - /** Returns a list of all supported services. In this case that is just - the AccessibleContext service. - */ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL - getSupportedServiceNames (void) - throw (::com::sun::star::uno::RuntimeException); - - - //===== XTypeProvider =================================================== - - /** 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. - */ - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId (void) - throw (::com::sun::star::uno::RuntimeException); - -protected: - /** The state set. - */ - ::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::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 - than once for a single object. - @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 - more than once. - @return - Descriptive string. Not necessarily unique. - */ - virtual ::rtl::OUString - CreateAccessibleDescription (void) - throw (::com::sun::star::uno::RuntimeException); - - void FireEvent (const ::com::sun::star::accessibility::AccessibleEventObject& aEvent); - - /** Check whether or not the object has been disposed (or is in the - state of beeing disposed). If that is the case then - DisposedException is thrown to inform the (indirect) caller of the - foul deed. - */ - void ThrowIfDisposed (void) - throw (::com::sun::star::lang::DisposedException); - - /** Check whether or not the object has been disposed (or is in the - state of beeing disposed). - - @return sal_True, if the object is disposed or in the course - of being disposed. Otherwise, sal_False is returned. - */ - sal_Bool IsDisposed (void); - - /** sets the role as returned by XaccessibleContext::getAccessibleRole - - <p>Caution: This is only to be used in the construction phase (means within - the ctor or late ctor), <em>never</em> when the object is still alive and part - of an Accessibility hierarchy.</p> - */ - void SetAccessibleRole( sal_Int16 _nRole ); - -private: - /// 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 - be set from the outside. Furthermore, it changes according the the - draw page's display mode. - */ - ::rtl::OUString msDescription; - - /** The origin of the description is used to determine whether new - descriptions given to the SetAccessibleDescription is ignored or - whether that replaces the old value in msDescription. - */ - StringOrigin meDescriptionOrigin; - - /** Name of this object. It changes according the the draw page's - display mode. - */ - ::rtl::OUString msName; - - /** The origin of the name is used to determine whether new - name given to the SetAccessibleName is ignored or - whether that replaces the old value in msName. - */ - StringOrigin meNameOrigin; - - /** client id in the AccessibleEventNotifier queue - */ - sal_uInt32 mnClientId; - - /** This is the role of this object. - */ - sal_Int16 maRole; -}; - -} - -#endif diff --git a/svx/inc/svx/AccessibleControlShape.hxx b/svx/inc/svx/AccessibleControlShape.hxx index 82a56aafb2bf..60158c0a55d3 100644 --- a/svx/inc/svx/AccessibleControlShape.hxx +++ b/svx/inc/svx/AccessibleControlShape.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: AccessibleControlShape.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/AccessibleGraphicShape.hxx b/svx/inc/svx/AccessibleGraphicShape.hxx index 69508126206d..09cee5c069ad 100644 --- a/svx/inc/svx/AccessibleGraphicShape.hxx +++ b/svx/inc/svx/AccessibleGraphicShape.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: AccessibleGraphicShape.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/AccessibleOLEShape.hxx b/svx/inc/svx/AccessibleOLEShape.hxx index c0dc76239baf..27cd0f5fe237 100644 --- a/svx/inc/svx/AccessibleOLEShape.hxx +++ b/svx/inc/svx/AccessibleOLEShape.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: AccessibleOLEShape.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/AccessibleShape.hxx b/svx/inc/svx/AccessibleShape.hxx index 018737934c74..e1979294b2d8 100755 --- a/svx/inc/svx/AccessibleShape.hxx +++ b/svx/inc/svx/AccessibleShape.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: AccessibleShape.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -32,9 +29,10 @@ #ifndef _SVX_ACCESSIBILITY_ACCESSIBLE_SHAPE_HXX #define _SVX_ACCESSIBILITY_ACCESSIBLE_SHAPE_HXX -#include <svx/AccessibleContextBase.hxx> -#include <svx/AccessibleComponentBase.hxx> +#include <editeng/AccessibleContextBase.hxx> +#include <editeng/AccessibleComponentBase.hxx> #include <svx/IAccessibleViewForwarderListener.hxx> +#include <com/sun/star/document/XEventListener.hpp> #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/XAccessibleExtendedComponent.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> @@ -43,6 +41,7 @@ #include <com/sun/star/lang/XUnoTunnel.hpp> #include <svx/AccessibleTextHelper.hxx> #include "svx/svxdllapi.h" +#include "ChildrenManager.hxx" class SdrObject; diff --git a/svx/inc/svx/AccessibleShapeInfo.hxx b/svx/inc/svx/AccessibleShapeInfo.hxx index 855a6d2db5d8..3aa8908087dd 100644 --- a/svx/inc/svx/AccessibleShapeInfo.hxx +++ b/svx/inc/svx/AccessibleShapeInfo.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: AccessibleShapeInfo.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/AccessibleShapeTreeInfo.hxx b/svx/inc/svx/AccessibleShapeTreeInfo.hxx index 5af035bf27cb..f43f0666a437 100644 --- a/svx/inc/svx/AccessibleShapeTreeInfo.hxx +++ b/svx/inc/svx/AccessibleShapeTreeInfo.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: AccessibleShapeTreeInfo.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/AccessibleTableShape.hxx b/svx/inc/svx/AccessibleTableShape.hxx index 2788a3a5d005..9f3edef84a3c 100644 --- a/svx/inc/svx/AccessibleTableShape.hxx +++ b/svx/inc/svx/AccessibleTableShape.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: AccessibleTableShape.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/AccessibleTextHelper.hxx b/svx/inc/svx/AccessibleTextHelper.hxx index cd3698472299..1d0b8cdf8cfb 100644 --- a/svx/inc/svx/AccessibleTextHelper.hxx +++ b/svx/inc/svx/AccessibleTextHelper.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: AccessibleTextHelper.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/ChildrenManager.hxx b/svx/inc/svx/ChildrenManager.hxx index 9e1633db58f5..131f834eac03 100644 --- a/svx/inc/svx/ChildrenManager.hxx +++ b/svx/inc/svx/ChildrenManager.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ChildrenManager.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx b/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx index 411a16d60e31..fa529bca8494 100755..100644 --- a/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx +++ b/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: EnhancedCustomShapeFunctionParser.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/IAccessibleParent.hxx b/svx/inc/svx/IAccessibleParent.hxx index 014f49e9486e..be97a49e982b 100644 --- a/svx/inc/svx/IAccessibleParent.hxx +++ b/svx/inc/svx/IAccessibleParent.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: IAccessibleParent.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/IAccessibleViewForwarder.hxx b/svx/inc/svx/IAccessibleViewForwarder.hxx index b4ca06e2b0ef..e9d099edf4a9 100644 --- a/svx/inc/svx/IAccessibleViewForwarder.hxx +++ b/svx/inc/svx/IAccessibleViewForwarder.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: IAccessibleViewForwarder.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/IAccessibleViewForwarderListener.hxx b/svx/inc/svx/IAccessibleViewForwarderListener.hxx index f72788b16d54..6c876a64bc70 100644 --- a/svx/inc/svx/IAccessibleViewForwarderListener.hxx +++ b/svx/inc/svx/IAccessibleViewForwarderListener.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: IAccessibleViewForwarderListener.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/ShapeTypeHandler.hxx b/svx/inc/svx/ShapeTypeHandler.hxx index 5b99c246e8ee..1b8a7b6947c6 100755 --- a/svx/inc/svx/ShapeTypeHandler.hxx +++ b/svx/inc/svx/ShapeTypeHandler.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ShapeTypeHandler.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/SmartTagCtl.hxx b/svx/inc/svx/SmartTagCtl.hxx index 62cd24df6ff9..9498f03d6978 100644 --- a/svx/inc/svx/SmartTagCtl.hxx +++ b/svx/inc/svx/SmartTagCtl.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: SmartTagCtl.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/SmartTagItem.hxx b/svx/inc/svx/SmartTagItem.hxx index a3f040d8d594..ed69a25787dd 100644 --- a/svx/inc/svx/SmartTagItem.hxx +++ b/svx/inc/svx/SmartTagItem.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: SmartTagItem.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/SmartTagMgr.hxx b/svx/inc/svx/SmartTagMgr.hxx index ef9ed696ba80..3dc7233bbc4e 100644 --- a/svx/inc/svx/SmartTagMgr.hxx +++ b/svx/inc/svx/SmartTagMgr.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: SmartTagMgr.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/SpellDialogChildWindow.hxx b/svx/inc/svx/SpellDialogChildWindow.hxx index bf5c4c3c2476..034b6372f6f1 100644 --- a/svx/inc/svx/SpellDialogChildWindow.hxx +++ b/svx/inc/svx/SpellDialogChildWindow.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: SpellDialogChildWindow.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -32,7 +29,7 @@ #define SVX_SPELL_DIALOG_CHILD_WINDOW_HXX #include <sfx2/childwin.hxx> -#include <svx/SpellPortions.hxx> +#include <editeng/SpellPortions.hxx> #include "svx/svxdllapi.h" #include <vcl/image.hxx> diff --git a/svx/inc/svx/SpellPortions.hxx b/svx/inc/svx/SpellPortions.hxx deleted file mode 100644 index 97c79998a536..000000000000 --- a/svx/inc/svx/SpellPortions.hxx +++ /dev/null @@ -1,98 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: SpellPortions.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef SVX_SPELL_PORTIONS_HXX -#define SVX_SPELL_PORTIONS_HXX - -#include <i18npool/lang.h> -#include <rtl/ustring.hxx> -#include <com/sun/star/uno/Reference.h> -#include <com/sun/star/linguistic2/SingleProofreadingError.hpp> -#include <com/sun/star/linguistic2/XProofreader.hpp> -#include <vector> - -namespace com{ namespace sun{ namespace star{ namespace linguistic2{ - class XSpellAlternatives; -}}}} - -namespace svx{ -/** contains a portion of text that has the same language attributes applied - and belongs to the same script type. - */ -struct SpellPortion -{ - /** contains the text of the portion. - */ - rtl::OUString sText; - /** Marks the portion as field, footnote symbol or any other special content that - 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 - for them. - */ - bool bIsHidden; - /** contains the language applied to the text. It has to match the script type. - */ - LanguageType eLanguage; - /** for wrong words this reference is filled with the error informations otherwise - 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 - */ - bool bIsGrammarError; - /** contains the grammar error information - */ - com::sun::star::linguistic2::SingleProofreadingError aGrammarError; - /** provides access to the grammar checker interface - */ - ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XProofreader > xGrammarChecker; - /** marks portion as to-be-ignored. This is a return parameter. - */ - /** contains the proposed dialog title if the proof reading component provides one. - */ - rtl::OUString sDialogTitle; - - bool bIgnoreThisError; - SpellPortion() : - bIsField(false), - bIsHidden(false), - eLanguage(LANGUAGE_DONTKNOW), - bIsGrammarError(false), - bIgnoreThisError(false) - { - aGrammarError.nErrorStart = aGrammarError.nErrorLength = aGrammarError.nErrorType = 0; - } -}; -typedef std::vector<SpellPortion> SpellPortions; -}//namespace svx -#endif diff --git a/svx/inc/svx/SvxShapeTypes.hxx b/svx/inc/svx/SvxShapeTypes.hxx index cf5ec424f792..b4c76f19354b 100644 --- a/svx/inc/svx/SvxShapeTypes.hxx +++ b/svx/inc/svx/SvxShapeTypes.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: SvxShapeTypes.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/adjitem.hxx b/svx/inc/svx/adjitem.hxx deleted file mode 100644 index b29a356ded63..000000000000 --- a/svx/inc/svx/adjitem.hxx +++ /dev/null @@ -1,150 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: adjitem.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_ADJITEM_HXX -#define _SVX_ADJITEM_HXX - -// include --------------------------------------------------------------- - -#include <svl/eitem.hxx> -#include <svx/svxenum.hxx> - -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#include <svx/eeitem.hxx> -#include "svx/svxdllapi.h" - -class SvXMLUnitConverter; -namespace rtl -{ - class OUString; -} - -// class SvxAdjustItem --------------------------------------------------- - -/* -[Beschreibung] -Dieses Item beschreibt die Zeilenausrichtung. -*/ -#define ADJUST_LASTBLOCK_VERSION ((USHORT)0x0001) - -class SVX_DLLPUBLIC SvxAdjustItem : public SfxEnumItemInterface -{ - BOOL bLeft : 1; - BOOL bRight : 1; - BOOL bCenter : 1; - BOOL bBlock : 1; - - // nur aktiv, wenn bBlock - BOOL bOneBlock : 1; - BOOL bLastCenter : 1; - BOOL bLastBlock : 1; - - friend SvStream& operator<<( SvStream&, SvxAdjustItem& ); //$ ostream -public: - TYPEINFO(); - - SvxAdjustItem( const SvxAdjust eAdjst /*= SVX_ADJUST_LEFT*/, - const USHORT nId ); - - // "pure virtual Methoden" vom SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; - - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_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; - - inline void SetOneWord( const SvxAdjust eType ) - { - bOneBlock = eType == SVX_ADJUST_BLOCK; - } - - inline void SetLastBlock( const SvxAdjust eType ) - { - bLastBlock = eType == SVX_ADJUST_BLOCK; - bLastCenter = eType == SVX_ADJUST_CENTER; - } - - inline void SetAdjust( const SvxAdjust eType ) - { - bLeft = eType == SVX_ADJUST_LEFT; - bRight = eType == SVX_ADJUST_RIGHT; - bCenter = eType == SVX_ADJUST_CENTER; - bBlock = eType == SVX_ADJUST_BLOCK; - } - - inline SvxAdjust GetLastBlock() const - { - SvxAdjust eRet = SVX_ADJUST_LEFT; - - if ( bLastBlock ) - eRet = SVX_ADJUST_BLOCK; - else if( bLastCenter ) - eRet = SVX_ADJUST_CENTER; - return eRet; - } - - inline SvxAdjust GetOneWord() const - { - SvxAdjust eRet = SVX_ADJUST_LEFT; - - if ( bBlock && bOneBlock ) - eRet = SVX_ADJUST_BLOCK; - return eRet; - } - - inline SvxAdjust GetAdjust() const - { - SvxAdjust eRet = SVX_ADJUST_LEFT; - - if ( bRight ) - eRet = SVX_ADJUST_RIGHT; - else if ( bCenter ) - eRet = SVX_ADJUST_CENTER; - else if ( bBlock ) - eRet = SVX_ADJUST_BLOCK; - return eRet; - } -}; - -#endif - diff --git a/svx/inc/svx/akrnitem.hxx b/svx/inc/svx/akrnitem.hxx deleted file mode 100644 index cd581ced8cfa..000000000000 --- a/svx/inc/svx/akrnitem.hxx +++ /dev/null @@ -1,80 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: akrnitem.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_AKRNITEM_HXX -#define _SVX_AKRNITEM_HXX - -// include --------------------------------------------------------------- - -#include <svl/eitem.hxx> -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#include "svx/svxdllapi.h" - -class SvXMLUnitConverter; -namespace rtl -{ - class OUString; -} - -// class SvxAutoKernItem ------------------------------------------------- - -/* - [Beschreibung] - Attribut fuer Pair-Kerning. -*/ - -class SVX_DLLPUBLIC SvxAutoKernItem : public SfxBoolItem -{ -public: - TYPEINFO(); - - SvxAutoKernItem( const BOOL bAutoKern /*= FALSE*/, - const USHORT nId ); - - // "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, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; - - inline SvxAutoKernItem& operator=(const SvxAutoKernItem& rAutoKern) - { - SetValue( rAutoKern.GetValue() ); - return *this; - } -}; - -#endif - diff --git a/svx/inc/svx/algitem.hxx b/svx/inc/svx/algitem.hxx index 71900afca1ab..d12e646da9b2 100644 --- a/svx/inc/svx/algitem.hxx +++ b/svx/inc/svx/algitem.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: algitem.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -35,7 +32,7 @@ #include <svx/svxids.hrc> #include <svl/poolitem.hxx> #include <svl/eitem.hxx> -#include <svx/svxenum.hxx> +#include <editeng/svxenum.hxx> #include "svx/svxdllapi.h" class SvStream; diff --git a/svx/inc/svx/blnkitem.hxx b/svx/inc/svx/blnkitem.hxx deleted file mode 100644 index 1c4c3eb3985d..000000000000 --- a/svx/inc/svx/blnkitem.hxx +++ /dev/null @@ -1,78 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: blnkitem.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_BLNKITEM_HXX -#define _SVX_BLNKITEM_HXX - -// include --------------------------------------------------------------- - -#include <svl/poolitem.hxx> -#include <svl/eitem.hxx> -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#include "svx/svxdllapi.h" - -class SvXMLUnitConverter; -namespace rtl -{ - class OUString; -} - -// class SvxBlinkItem ------------------------------------------------- - -/* - [Beschreibung] - Dieses Item beschreibt, ob geblinkt werden soll. -*/ - -class SVX_DLLPUBLIC SvxBlinkItem : public SfxBoolItem -{ -public: - TYPEINFO(); - - SvxBlinkItem( const BOOL bBlink /*= FALSE*/, const USHORT nId ); - - // "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, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; - - inline SvxBlinkItem& operator=(const SvxBlinkItem& rBlink) { - SetValue(rBlink.GetValue()); - return *this; - } -}; - -#endif - diff --git a/svx/inc/svx/bmpmask.hxx b/svx/inc/svx/bmpmask.hxx index a1e5f9bafcad..1387b17267c2 100644 --- a/svx/inc/svx/bmpmask.hxx +++ b/svx/inc/svx/bmpmask.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: bmpmask.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/borderline.hxx b/svx/inc/svx/borderline.hxx deleted file mode 100644 index 77fae1f676d0..000000000000 --- a/svx/inc/svx/borderline.hxx +++ /dev/null @@ -1,137 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: borderline.hxx,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef SVX_BORDERLINE_HXX -#define SVX_BORDERLINE_HXX - -#include <tools/color.hxx> -#include <svl/poolitem.hxx> -#include "svx/svxdllapi.h" - -// Line defaults in twips (former Writer defaults): - -#define DEF_LINE_WIDTH_0 1 -#define DEF_LINE_WIDTH_1 20 -#define DEF_LINE_WIDTH_2 50 -#define DEF_LINE_WIDTH_3 80 -#define DEF_LINE_WIDTH_4 100 -#define DEF_LINE_WIDTH_5 10 - -#define DEF_MAX_LINE_WIDHT DEF_LINE_WIDTH_4 -#define DEF_MAX_LINE_DIST DEF_LINE_WIDTH_2 - -#define DEF_DOUBLE_LINE0_OUT DEF_LINE_WIDTH_0 -#define DEF_DOUBLE_LINE0_IN DEF_LINE_WIDTH_0 -#define DEF_DOUBLE_LINE0_DIST DEF_LINE_WIDTH_1 - -#define DEF_DOUBLE_LINE1_OUT DEF_LINE_WIDTH_1 -#define DEF_DOUBLE_LINE1_IN DEF_LINE_WIDTH_1 -#define DEF_DOUBLE_LINE1_DIST DEF_LINE_WIDTH_1 - -#define DEF_DOUBLE_LINE2_OUT DEF_LINE_WIDTH_2 -#define DEF_DOUBLE_LINE2_IN DEF_LINE_WIDTH_2 -#define DEF_DOUBLE_LINE2_DIST DEF_LINE_WIDTH_2 - -#define DEF_DOUBLE_LINE3_OUT DEF_LINE_WIDTH_2 -#define DEF_DOUBLE_LINE3_IN DEF_LINE_WIDTH_1 -#define DEF_DOUBLE_LINE3_DIST DEF_LINE_WIDTH_2 - -#define DEF_DOUBLE_LINE4_OUT DEF_LINE_WIDTH_1 -#define DEF_DOUBLE_LINE4_IN DEF_LINE_WIDTH_2 -#define DEF_DOUBLE_LINE4_DIST DEF_LINE_WIDTH_1 - -#define DEF_DOUBLE_LINE5_OUT DEF_LINE_WIDTH_3 -#define DEF_DOUBLE_LINE5_IN DEF_LINE_WIDTH_2 -#define DEF_DOUBLE_LINE5_DIST DEF_LINE_WIDTH_2 - -#define DEF_DOUBLE_LINE6_OUT DEF_LINE_WIDTH_2 -#define DEF_DOUBLE_LINE6_IN DEF_LINE_WIDTH_3 -#define DEF_DOUBLE_LINE6_DIST DEF_LINE_WIDTH_2 - -#define DEF_DOUBLE_LINE7_OUT DEF_LINE_WIDTH_0 -#define DEF_DOUBLE_LINE7_IN DEF_LINE_WIDTH_0 -#define DEF_DOUBLE_LINE7_DIST DEF_LINE_WIDTH_2 - -#define DEF_DOUBLE_LINE8_OUT DEF_LINE_WIDTH_1 -#define DEF_DOUBLE_LINE8_IN DEF_LINE_WIDTH_0 -#define DEF_DOUBLE_LINE8_DIST DEF_LINE_WIDTH_2 - -#define DEF_DOUBLE_LINE9_OUT DEF_LINE_WIDTH_2 -#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 - -// ============================================================================ - -class SVX_DLLPUBLIC SvxBorderLine -{ -protected: - Color aColor; - USHORT nOutWidth; - USHORT nInWidth; - USHORT nDistance; - -public: - SvxBorderLine( const Color *pCol = 0, USHORT nOut = 0, USHORT nIn = 0, USHORT nDist = 0 ); - SvxBorderLine( const SvxBorderLine& r ); - - 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; } - - 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 ScaleMetrics( long nMult, long nDiv ); - - 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 isEmpty() const { return (0 == nOutWidth && 0 == nInWidth && 0 == nDistance); } - bool isDouble() const { return (0 != nOutWidth && 0 != nInWidth); } - sal_uInt16 getWidth() const { return nOutWidth + nInWidth + nDistance; } -}; - -// ============================================================================ - -#endif - diff --git a/svx/inc/svx/boxitem.hxx b/svx/inc/svx/boxitem.hxx deleted file mode 100644 index 4b45eb0377c8..000000000000 --- a/svx/inc/svx/boxitem.hxx +++ /dev/null @@ -1,229 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: boxitem.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_BOXITEM_HXX -#define _SVX_BOXITEM_HXX - -#include <svl/poolitem.hxx> -#include <svx/borderline.hxx> -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#include "svx/svxdllapi.h" - -namespace rtl { class OUString; } - -// class SvxBoxItem ------------------------------------------------------ - -/* -[Beschreibung] -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_4DISTS_VERSION ((USHORT)1) - -class SVX_DLLPUBLIC SvxBoxItem : public SfxPoolItem -{ - SvxBorderLine *pTop, - *pBottom, - *pLeft, - *pRight; - USHORT nTopDist, - nBottomDist, - nLeftDist, - nRightDist; - -public: - TYPEINFO(); - - SvxBoxItem( const USHORT nId ); - SvxBoxItem( const SvxBoxItem &rCpy ); - ~SvxBoxItem(); - SvxBoxItem &operator=( const SvxBoxItem& rBox ); - - // "pure virtual Methoden" vom SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_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 int ScaleMetrics( long nMult, long nDiv ); - virtual int 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* GetLine( USHORT nLine ) const; - - //Die Pointer werden kopiert! - void SetLine( const SvxBorderLine* pNew, USHORT nLine ); - - USHORT GetDistance( USHORT nLine ) const; - USHORT GetDistance() const; - - 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; -}; - -inline void SvxBoxItem::SetDistance( USHORT nNew ) -{ - nTopDist = nBottomDist = nLeftDist = nRightDist = nNew; -} - -// class SvxBoxInfoItem -------------------------------------------------- - -/* -[Beschreibung] -Noch ein Item fuer die Umrandung. Dieses Item hat lediglich SS-Funktionalitaet. -Einerseits wird dem allgemeinen Dialog mit diesem Item mitgeteilt, welche -Moeglichkeiten er anbieten soll. -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 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 SVX_DLLPUBLIC SvxBoxInfoItem : public SfxPoolItem -{ - SvxBorderLine* pHori; //innere horizontale Linie - SvxBorderLine* pVert; //innere vertikale Linie - - bool mbEnableHor; /// true = Enable inner horizonal line. - bool mbEnableVer; /// true = Enable inner vertical line. - - /* - 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 - 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. - - BYTE nValidFlags; // 0000 0000 - // VALID_TOP - // VALID_BOTTOM - // VALID_LEFT - // VALID_RIGHT - // VALID_HORI - // VALID_VERT - // VALID_DIST - // VALID_DISABLE - - USHORT nDefDist; // Der Default- bzw. Minimalabstand. - -public: - TYPEINFO(); - - SvxBoxInfoItem( const USHORT nId ); - SvxBoxInfoItem( const SvxBoxInfoItem &rCpy ); - ~SvxBoxInfoItem(); - SvxBoxInfoItem &operator=( const SvxBoxInfoItem &rCpy ); - - // "pure virtual Methoden" vom SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_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 int ScaleMetrics( long nMult, long nDiv ); - virtual int HasMetrics() const; - - const SvxBorderLine* GetHori() const { return pHori; } - const SvxBorderLine* GetVert() const { return pVert; } - - //Die Pointer werden kopiert! - void SetLine( const SvxBorderLine* pNew, USHORT nLine ); - - BOOL IsTable() const { return mbEnableHor && mbEnableVer; } - void SetTable( BOOL bNew ) { mbEnableHor = mbEnableVer = bNew; } - - inline bool IsHorEnabled() const { return mbEnableHor; } - inline void EnableHor( bool bEnable ) { mbEnableHor = bEnable; } - 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 IsValid( BYTE nValid ) const - { return ( nValidFlags & nValid ) == nValid; } - void SetValid( BYTE nValid, BOOL bValid = TRUE ) - { bValid ? ( nValidFlags |= nValid ) - : ( nValidFlags &= ~nValid ); } - void ResetFlags(); -}; -#endif - diff --git a/svx/inc/svx/brkitem.hxx b/svx/inc/svx/brkitem.hxx deleted file mode 100644 index f2241fc08d60..000000000000 --- a/svx/inc/svx/brkitem.hxx +++ /dev/null @@ -1,109 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: brkitem.hxx,v $ - * $Revision: 1.4.216.1 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_BRKITEM_HXX -#define _SVX_BRKITEM_HXX - -// include --------------------------------------------------------------- - -#include <svl/eitem.hxx> -#include <svx/svxenum.hxx> -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#include "svx/svxdllapi.h" - -namespace rtl -{ - class OUString; -} - -// class SvxFmtBreakItem ------------------------------------------------- - -/* - [Beschreibung] - Dieses Item beschreibt ein Umbruch-Attribut - Automatisch?, Seiten- oder Spaltenumbruch, davor oder danach? -*/ -#define FMTBREAK_NOAUTO ((USHORT)0x0001) - -class SVX_DLLPUBLIC SvxFmtBreakItem : public SfxEnumItem -{ -public: - TYPEINFO(); - - inline SvxFmtBreakItem( const SvxBreak eBrk /*= SVX_BREAK_NONE*/, - const USHORT nWhich ); - inline SvxFmtBreakItem( const SvxFmtBreakItem& rBreak ); - inline SvxFmtBreakItem& operator=( const SvxFmtBreakItem& rCpy ); - - // "pure virtual Methoden" vom SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_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 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 ) - {SfxEnumItem::SetValue(nNewVal); } - SvxBreak GetBreak() const { return SvxBreak( GetValue() ); } - void SetBreak( const SvxBreak eNew ) - { SetValue( (USHORT)eNew ); } -}; - - -inline SvxFmtBreakItem::SvxFmtBreakItem( const SvxBreak eBreak, - const USHORT _nWhich ) : - SfxEnumItem( _nWhich, (USHORT)eBreak ) -{} - -inline SvxFmtBreakItem::SvxFmtBreakItem( const SvxFmtBreakItem& rBreak ) : - SfxEnumItem( rBreak ) -{} - -inline SvxFmtBreakItem& SvxFmtBreakItem::operator=( - const SvxFmtBreakItem& rBreak ) -{ - SetValue( rBreak.GetValue() ); - return *this; -} - -#endif - diff --git a/svx/inc/svx/brshitem.hxx b/svx/inc/svx/brshitem.hxx deleted file mode 100644 index 7952ae3ec2ff..000000000000 --- a/svx/inc/svx/brshitem.hxx +++ /dev/null @@ -1,148 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: brshitem.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_BRSHITEM_HXX -#define _SVX_BRSHITEM_HXX - -// include --------------------------------------------------------------- - -#include <svl/poolitem.hxx> -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#include <vcl/wall.hxx> -#include <tools/link.hxx> -#include "svx/svxdllapi.h" - -// class SvxBrushItem ---------------------------------------------------- - -class Graphic; -class GraphicObject; -class SfxObjectShell; -class CntWallpaperItem; -namespace rtl -{ - class OUString; -} - -#define BRUSH_GRAPHIC_VERSION ((USHORT)0x0001) - -enum SvxGraphicPosition -{ - GPOS_NONE, - GPOS_LT, GPOS_MT, GPOS_RT, - GPOS_LM, GPOS_MM, GPOS_RM, - GPOS_LB, GPOS_MB, GPOS_RB, - GPOS_AREA, GPOS_TILED -}; - -#define PARA_DEST_PARA 0 -#define PARA_DEST_CHAR 1 - -class SvxBrushItem_Impl; -class SVX_DLLPUBLIC SvxBrushItem : public SfxPoolItem -{ - Color aColor; - SvxBrushItem_Impl* pImpl; - String* pStrLink; - String* pStrFilter; - SvxGraphicPosition eGraphicPos; - BOOL bLoadAgain; - - void ApplyGraphicTransparency_Impl(); - DECL_STATIC_LINK( SvxBrushItem, DoneHdl_Impl, void *); - // wird nur von Create benutzt - SvxBrushItem( SvStream& rStrm, - USHORT nVersion, USHORT nWhich ); - -public: - TYPEINFO(); - - SvxBrushItem( USHORT nWhich ); - SvxBrushItem( const Color& rColor, USHORT nWhich ); - - SvxBrushItem( const Graphic& rGraphic, - SvxGraphicPosition ePos, USHORT nWhich ); - SvxBrushItem( const GraphicObject& rGraphicObj, - SvxGraphicPosition ePos, USHORT nWhich ); - SvxBrushItem( const String& rLink, const String& rFilter, - SvxGraphicPosition ePos, USHORT nWhich ); - SvxBrushItem( const SvxBrushItem& ); - SvxBrushItem( const CntWallpaperItem&, USHORT nWhich ); - - ~SvxBrushItem(); - -public: - - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; - - virtual int operator==( const SfxPoolItem& ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_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; - - 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; } - - void PurgeGraphic() const; - void PurgeMedium() const; - - const Graphic* GetGraphic( SfxObjectShell* pSh = 0) const; - const GraphicObject* GetGraphicObject( SfxObjectShell* pSh = 0) 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 ); - - SvxBrushItem& operator=( const SvxBrushItem& rItem); - - //static void InitSfxLink(); - static SvxGraphicPosition WallpaperStyle2GraphicPos( WallpaperStyle eStyle ); - static WallpaperStyle GraphicPos2WallpaperStyle( SvxGraphicPosition ePos ); - CntWallpaperItem* CreateCntWallpaperItem() const; -}; - -#endif // #ifndef _SVX_BRSHITEM_HXX - diff --git a/svx/inc/svx/camera3d.hxx b/svx/inc/svx/camera3d.hxx index 829ba26f2b83..89c76c797622 100644 --- a/svx/inc/svx/camera3d.hxx +++ b/svx/inc/svx/camera3d.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: camera3d.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/charmap.hxx b/svx/inc/svx/charmap.hxx index 304e67c5a5f0..5111462f6fc3 100644 --- a/svx/inc/svx/charmap.hxx +++ b/svx/inc/svx/charmap.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: charmap.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/charreliefitem.hxx b/svx/inc/svx/charreliefitem.hxx deleted file mode 100644 index 95685902ad9c..000000000000 --- a/svx/inc/svx/charreliefitem.hxx +++ /dev/null @@ -1,86 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: charreliefitem.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_CHARRELIEFITEM_HXX -#define _SVX_CHARRELIEFITEM_HXX - -// include --------------------------------------------------------------- - -#include <svl/eitem.hxx> -#include <vcl/fntstyle.hxx> -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#include "svx/svxdllapi.h" - -// class SvxCharRotateItem ---------------------------------------------- - -/* [Description] - - This item defines a character relief and has currently the values - emboss, relief. - -*/ - -class SVX_DLLPUBLIC SvxCharReliefItem : public SfxEnumItem -{ -public: - TYPEINFO(); - - 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 String GetValueTextByPos( USHORT nPos ) const; - virtual USHORT GetValueCount() const; - - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - String &rText, - const IntlWrapper * = 0 ) const; - - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, - BYTE nMemberId ); - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, - BYTE nMemberId ) const; - - inline SvxCharReliefItem& operator=( const SvxCharReliefItem& rItem ) - { - SetValue( rItem.GetValue() ); - return *this; - } -}; - -#endif - diff --git a/svx/inc/svx/charrotateitem.hxx b/svx/inc/svx/charrotateitem.hxx deleted file mode 100644 index 62bae4b7caa5..000000000000 --- a/svx/inc/svx/charrotateitem.hxx +++ /dev/null @@ -1,98 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: charrotateitem.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_CHARROTATEITEM_HXX -#define _SVX_CHARROTATEITEM_HXX - -// include --------------------------------------------------------------- - -#include <svl/intitem.hxx> -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#include "svx/svxdllapi.h" - -// class SvxCharRotateItem ---------------------------------------------- - -/* [Description] - - This item defines a character rotation value (0,1 degree). Currently - character can only be rotated 90,0 and 270,0 degrees. - The flag FitToLine defines only a UI-Information - - if true it must also create a SvxCharScaleItem. - -*/ - -class SVX_DLLPUBLIC SvxCharRotateItem : public SfxUInt16Item -{ - sal_Bool bFitToLine; -public: - TYPEINFO(); - - SvxCharRotateItem( sal_uInt16 nValue /*= 0*/, - 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 SfxItemPresentation GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - String &rText, - const IntlWrapper * = 0 ) const; - - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, - BYTE nMemberId ); - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, - BYTE nMemberId ) const; - - inline SvxCharRotateItem& operator=( const SvxCharRotateItem& rItem ) - { - SetValue( rItem.GetValue() ); - SetFitToLine( rItem.IsFitToLine() ); - return *this; - } - - 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(); } - - sal_Bool IsFitToLine() const { return bFitToLine; } - void SetFitToLine( sal_Bool b ) { bFitToLine = b; } -}; - -#endif - diff --git a/svx/inc/svx/charscaleitem.hxx b/svx/inc/svx/charscaleitem.hxx deleted file mode 100644 index ed957424731c..000000000000 --- a/svx/inc/svx/charscaleitem.hxx +++ /dev/null @@ -1,86 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: charscaleitem.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_CHARSCALEITEM_HXX -#define _SVX_CHARSCALEITEM_HXX - -// include --------------------------------------------------------------- - -#ifndef _SFXENUMITEM_HXX -#include <svl/intitem.hxx> -#endif -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#include "svx/svxdllapi.h" - -// class SvxCharScaleItem ---------------------------------------------- - -/* [Description] - - This item defines a character scaling factor as percent value. - A value of 100 is identical to 100% and means normal width - A value of 50 is identical to 50% and means 1/2 width. - -*/ - -class SVX_DLLPUBLIC SvxCharScaleWidthItem : public SfxUInt16Item -{ -public: - TYPEINFO(); - - 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 SfxItemPresentation GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - String &rText, - const IntlWrapper * = 0 ) const; - - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, - BYTE nMemberId ); - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, - BYTE nMemberId ) const; - - inline SvxCharScaleWidthItem& operator=(const SvxCharScaleWidthItem& rItem ) - { - SetValue( rItem.GetValue() ); - return *this; - } - -}; - -#endif - diff --git a/svx/inc/svx/checklbx.hxx b/svx/inc/svx/checklbx.hxx index a2bd8ea2e65c..b72b134e48d8 100644 --- a/svx/inc/svx/checklbx.hxx +++ b/svx/inc/svx/checklbx.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: checklbx.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/cmapitem.hxx b/svx/inc/svx/cmapitem.hxx deleted file mode 100644 index cec4d6e538c6..000000000000 --- a/svx/inc/svx/cmapitem.hxx +++ /dev/null @@ -1,95 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: cmapitem.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_CMAPITEM_HXX -#define _SVX_CMAPITEM_HXX - -// include --------------------------------------------------------------- - -#include <svl/eitem.hxx> -#include <svx/svxenum.hxx> -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#include "svx/svxdllapi.h" - -class SvXMLUnitConverter; -namespace rtl -{ - class OUString; -} - -// class SvxCaseMapItem -------------------------------------------------- - -/* [Beschreibung] - - Dieses Item beschreibt die Schrift-Ausrichtung (Versalien, Kapitaelchen,...). -*/ - -class SVX_DLLPUBLIC SvxCaseMapItem : public SfxEnumItem -{ -public: - TYPEINFO(); - - SvxCaseMapItem( const SvxCaseMap eMap /*= SVX_CASEMAP_NOT_MAPPED*/, - const USHORT nId ); - - // "pure virtual Methoden" vom SfxPoolItem + SfxEnumItem - 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 String GetValueTextByPos( USHORT nPos ) const; - virtual USHORT GetValueCount() const; - - // MS VC4.0 kommt durcheinander - void SetValue( USHORT nNewVal ) - {SfxEnumItem::SetValue(nNewVal); } - - inline SvxCaseMapItem& operator=(const SvxCaseMapItem& rMap) - { - SetValue( rMap.GetValue() ); - return *this; - } - - // enum cast - SvxCaseMap GetCaseMap() const - { return (SvxCaseMap)GetValue(); } - void SetCaseMap( SvxCaseMap eNew ) - { SetValue( (USHORT)eNew ); } - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); -}; - -#endif - diff --git a/svx/inc/svx/cntritem.hxx b/svx/inc/svx/cntritem.hxx deleted file mode 100644 index da5d48bf06ea..000000000000 --- a/svx/inc/svx/cntritem.hxx +++ /dev/null @@ -1,74 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: cntritem.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_ITEM_HXX -#define _SVX_ITEM_HXX - -// include --------------------------------------------------------------- - -#include <svl/eitem.hxx> -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#include "svx/svxdllapi.h" - -// class SvxContourItem -------------------------------------------------- - -/* - [Beschreibung] - Dieses Item beschreibt, ob Konturschrift eingestellt ist. -*/ - -class SVX_DLLPUBLIC SvxContourItem : public SfxBoolItem -{ -public: - TYPEINFO(); - - SvxContourItem( const BOOL bContoured /*= FALSE*/, - const USHORT nId ); - - // "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, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; - - inline SvxContourItem& operator=(const SvxContourItem& rCont) - { - SetValue(rCont.GetValue()); - return *this; - } -}; - -#endif - diff --git a/svx/inc/svx/colrctrl.hxx b/svx/inc/svx/colrctrl.hxx index 9a908afa4588..e6908d98c152 100644 --- a/svx/inc/svx/colrctrl.hxx +++ b/svx/inc/svx/colrctrl.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: colrctrl.hxx,v $ - * $Revision: 1.3.76.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/colritem.hxx b/svx/inc/svx/colritem.hxx deleted file mode 100644 index aea4918850d3..000000000000 --- a/svx/inc/svx/colritem.hxx +++ /dev/null @@ -1,103 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: colritem.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_COLRITEM_HXX -#define _SVX_COLRITEM_HXX - -// include --------------------------------------------------------------- - -#include <svl/poolitem.hxx> -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#ifndef _SV_COLOR_HXX //autogen -#include <tools/color.hxx> -#endif -#include "svx/svxdllapi.h" - -class SvXMLUnitConverter; -namespace rtl -{ - class OUString; -} - -// class SvxColorItem ---------------------------------------------------- - -/* [Beschreibung] - - Dieses Item beschreibt eine Farbe. -*/ - -#define VERSION_USEAUTOCOLOR 1 - -class SVX_DLLPUBLIC SvxColorItem : public SfxPoolItem -{ -private: - Color mColor; - -public: - TYPEINFO(); - - SvxColorItem( const USHORT nId ); - SvxColorItem( const Color& aColor, const USHORT nId ); - SvxColorItem( SvStream& rStrm, const USHORT nId ); - SvxColorItem( const SvxColorItem& rCopy ); - ~SvxColorItem(); - - // "pure virtual Methoden" vom SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_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; - - inline SvxColorItem& operator=(const SvxColorItem& rColor) - { - SetValue( rColor.GetValue() ); - return *this; - } - - const Color& GetValue() const - { - return mColor; - } - void SetValue( const Color& rNewCol ); - -}; - -#endif - diff --git a/svx/inc/svx/contdlg.hxx b/svx/inc/svx/contdlg.hxx index 625f10af397d..034ec5485536 100644 --- a/svx/inc/svx/contdlg.hxx +++ b/svx/inc/svx/contdlg.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: contdlg.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/crsditem.hxx b/svx/inc/svx/crsditem.hxx deleted file mode 100644 index 945ae086f36e..000000000000 --- a/svx/inc/svx/crsditem.hxx +++ /dev/null @@ -1,99 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: crsditem.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_CRSDITEM_HXX -#define _SVX_CRSDITEM_HXX - -// include --------------------------------------------------------------- - -#include <vcl/vclenum.hxx> -#include <svl/eitem.hxx> -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#include "svx/svxdllapi.h" - -class SvXMLUnitConverter; -namespace rtl -{ - class OUString; -} - -// class SvxCrossedOutItem ----------------------------------------------- - -/* - [Beschreibung] - Dieses Item beschreibt, ob und wie durchstrichen ist. -*/ - -class SVX_DLLPUBLIC SvxCrossedOutItem : public SfxEnumItem -{ -public: - TYPEINFO(); - - SvxCrossedOutItem( const FontStrikeout eSt /*= STRIKEOUT_NONE*/, - const USHORT nId ); - - // "pure virtual Methoden" vom SfxPoolItem - 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 String GetValueTextByPos( USHORT nPos ) const; - virtual USHORT GetValueCount() const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); - - // MS VC4.0 kommt durcheinander - void SetValue( USHORT nNewVal ) - {SfxEnumItem::SetValue(nNewVal); } - - virtual int HasBoolValue() const; - virtual BOOL GetBoolValue() const; - virtual void SetBoolValue( BOOL bVal ); - - inline SvxCrossedOutItem& operator=(const SvxCrossedOutItem& rCross) - { - SetValue( rCross.GetValue() ); - return *this; - } - - // enum cast - FontStrikeout GetStrikeout() const - { return (FontStrikeout)GetValue(); } - void SetStrikeout( FontStrikeout eNew ) - { SetValue( (USHORT)eNew ); } -}; - -#endif // #ifndef _SVX_CRSDITEM_HXX - diff --git a/svx/inc/svx/cscoitem.hxx b/svx/inc/svx/cscoitem.hxx deleted file mode 100644 index 120fe62a0ea2..000000000000 --- a/svx/inc/svx/cscoitem.hxx +++ /dev/null @@ -1,78 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: cscoitem.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_CSCOITEM_HXX -#define _SVX_CSCOITEM_HXX - -// include --------------------------------------------------------------- - -#include <tools/string.hxx> -#include <svx/colritem.hxx> -#include "svx/svxdllapi.h" - -// class SvxCharSetColorItem --------------------------------------------- - -/* [Beschreibung] - - PB: wird nur intern im Reader des Writers benoetigt -*/ - -class SVX_DLLPUBLIC SvxCharSetColorItem : public SvxColorItem -{ - rtl_TextEncoding eFrom; -public: - TYPEINFO(); - - SvxCharSetColorItem( const USHORT nId ); - SvxCharSetColorItem( const Color& aColor, const rtl_TextEncoding eFrom, - const USHORT nId ); - - // "pure virtual Methoden" vom SfxPoolItem - 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; - - inline rtl_TextEncoding& GetCharSet() { return eFrom; } - inline rtl_TextEncoding GetCharSet() const { return eFrom; } - - inline SvxCharSetColorItem& operator=(const SvxCharSetColorItem& rColor) - { - SetValue( rColor.GetValue() ); - eFrom = rColor.GetCharSet(); - return *this; - } -}; - -#endif - diff --git a/svx/inc/svx/ctredlin.hxx b/svx/inc/svx/ctredlin.hxx index a56e0ed29867..abedd54f0c00 100644 --- a/svx/inc/svx/ctredlin.hxx +++ b/svx/inc/svx/ctredlin.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ctredlin.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/cube3d.hxx b/svx/inc/svx/cube3d.hxx index 3985ab6ca594..886aa74da70e 100644 --- a/svx/inc/svx/cube3d.hxx +++ b/svx/inc/svx/cube3d.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: cube3d.hxx,v $ - * $Revision: 1.4.18.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/dataaccessdescriptor.hxx b/svx/inc/svx/dataaccessdescriptor.hxx index 335adc3f50db..f765b1fce2b9 100644 --- a/svx/inc/svx/dataaccessdescriptor.hxx +++ b/svx/inc/svx/dataaccessdescriptor.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: dataaccessdescriptor.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/databaselocationinput.hxx b/svx/inc/svx/databaselocationinput.hxx index 650aa26bb857..694a679bb7a9 100644 --- a/svx/inc/svx/databaselocationinput.hxx +++ b/svx/inc/svx/databaselocationinput.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: databaselocationinput.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/dbaexchange.hxx b/svx/inc/svx/dbaexchange.hxx index abd9ec7e8012..a5a178f68389 100644 --- a/svx/inc/svx/dbaexchange.hxx +++ b/svx/inc/svx/dbaexchange.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: dbaexchange.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/dbaobjectex.hxx b/svx/inc/svx/dbaobjectex.hxx index 356d2d74f1b1..a1c7867e0a5d 100644 --- a/svx/inc/svx/dbaobjectex.hxx +++ b/svx/inc/svx/dbaobjectex.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: dbaobjectex.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/dbcharsethelper.hxx b/svx/inc/svx/dbcharsethelper.hxx index 444538db33f0..40ec31c37d85 100755 --- a/svx/inc/svx/dbcharsethelper.hxx +++ b/svx/inc/svx/dbcharsethelper.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: dbcharsethelper.hxx,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/dbtoolsclient.hxx b/svx/inc/svx/dbtoolsclient.hxx index ff606c99da7e..0894540d1972 100755 --- a/svx/inc/svx/dbtoolsclient.hxx +++ b/svx/inc/svx/dbtoolsclient.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: dbtoolsclient.hxx,v $ - * $Revision: 1.18 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/def3d.hxx b/svx/inc/svx/def3d.hxx index 4c67a969e925..57f68cd7805b 100644 --- a/svx/inc/svx/def3d.hxx +++ b/svx/inc/svx/def3d.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: def3d.hxx,v $ - * $Revision: 1.3.226.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/deflt3d.hxx b/svx/inc/svx/deflt3d.hxx index e8993b6d7fba..cfd05a652fe0 100644 --- a/svx/inc/svx/deflt3d.hxx +++ b/svx/inc/svx/deflt3d.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: deflt3d.hxx,v $ - * $Revision: 1.3.216.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/dialmgr.hxx b/svx/inc/svx/dialmgr.hxx index e2ba9c3b1e0e..8c29edc04620 100644 --- a/svx/inc/svx/dialmgr.hxx +++ b/svx/inc/svx/dialmgr.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: dialmgr.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc index c7cddf48e27c..d193652b57fc 100644 --- a/svx/inc/svx/dialogs.hrc +++ b/svx/inc/svx/dialogs.hrc @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: dialogs.hrc,v $ - * $Revision: 1.15 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -41,8 +38,6 @@ #define RID_SVX_FIRSTFREE 305 // some strings also used in CUI -#define RID_SVXSTR_PAPERBIN (RID_SVX_START + 145) -#define RID_SVXSTR_PAPERBIN_SETTINGS (RID_SVX_START + 149) #define RID_SVXERRCTX (RID_SVX_START + 351) #define RID_SVXSTR_COLOR (RID_SVX_START + 179) #define RID_SVXSTR_TRANSPARENT (RID_SVX_START + 190) @@ -179,20 +174,6 @@ #define RID_SVXPAGE_HEADER (RID_SVX_START + 27) #define RID_SVXQBX_DELETE_HEADFOOT (RID_SVX_START + 28) -// ResId fuer die Linguistik-Dialoge -#define RID_SVXDLG_HYPHENATE (RID_SVX_START + 30) -#define RID_SVXDLG_THESAURUS (RID_SVX_START + 31) -#define RID_SVXDLG_THES_LANGUAGE (RID_SVX_START + 38) - -// ResIds fuer HM-QueryBoxen und Error-Strings -#define RID_SVXQB_THESAURUS (RID_SVX_START + 33) -#define RID_SVXQB_CONTINUE (RID_SVX_START + 34) -#define RID_SVXQB_BODYTEXT (RID_SVX_START + 35) -#define RID_SVXQB_SPECIAL (RID_SVX_START + 36) -#define RID_SVXQB_SPECIAL_FORCED (RID_SVX_START + 37) -// + 38 ist vergeben, siehe RID_SVXDLG_THES_LANGUAGE -#define RID_SVXQB_BW_CONTINUE (RID_SVX_START + 39) - // ResId's fuer Dialoge aus StarDraw #define RID_SVXPAGE_POSITION (RID_SVX_START + 46) #define RID_SVXPAGE_SIZE (RID_SVX_START + 47) @@ -427,65 +408,12 @@ #define RID_SVXSTR_SEARCH (RID_SVX_START + 81) #define RID_SVXSTR_REPLACE (RID_SVX_START + 82) -// Strings fuer die HM-Strings -#define RID_SVXSTR_HMSTATUS_BEGIN (RID_SVX_START + 90) -#define RID_SVXSTR_HMSTATUS_OK (RID_SVX_START + 90) -#define RID_SVXSTR_HMSTATUS_DONTUSE (RID_SVX_START + 91) -#define RID_SVXSTR_HMSTATUS_WRONG (RID_SVX_START + 92) -#define RID_SVXSTR_HMSTATUS_CAPERROR (RID_SVX_START + 93) -#define RID_SVXSTR_HMERR_CHECKINSTALL (RID_SVX_START + 94) -#define RID_SVXSTR_HMERR_ADDWORD (RID_SVX_START + 95) -#define RID_SVXSTR_HMSTATUS_INVALID_LANG (RID_SVX_START + 96) - -// paper formats -#define RID_SVXSTR_PAPER_A0 (RID_SVX_START + 100) -#define RID_SVXSTR_PAPER_A1 (RID_SVX_START + 101) -#define RID_SVXSTR_PAPER_A2 (RID_SVX_START + 102) -#define RID_SVXSTR_PAPER_A3 (RID_SVX_START + 103) -#define RID_SVXSTR_PAPER_A4 (RID_SVX_START + 104) -#define RID_SVXSTR_PAPER_A5 (RID_SVX_START + 105) -#define RID_SVXSTR_PAPER_B4_ISO (RID_SVX_START + 106) -#define RID_SVXSTR_PAPER_B5_ISO (RID_SVX_START + 107) -#define RID_SVXSTR_PAPER_LETTER (RID_SVX_START + 108) -#define RID_SVXSTR_PAPER_LEGAL (RID_SVX_START + 109) -#define RID_SVXSTR_PAPER_TABLOID (RID_SVX_START + 110) -#define RID_SVXSTR_PAPER_USER (RID_SVX_START + 111) -#define RID_SVXSTR_PAPER_B6_ISO (RID_SVX_START + 112) -#define RID_SVXSTR_PAPER_C4 (RID_SVX_START + 113) -#define RID_SVXSTR_PAPER_C5 (RID_SVX_START + 114) -#define RID_SVXSTR_PAPER_C6 (RID_SVX_START + 115) -#define RID_SVXSTR_PAPER_C65 (RID_SVX_START + 116) -#define RID_SVXSTR_PAPER_DL (RID_SVX_START + 117) -#define RID_SVXSTR_PAPER_DIA (RID_SVX_START + 118) -#define RID_SVXSTR_PAPER_SCREEN (RID_SVX_START + 119) -#define RID_SVXSTR_PAPER_C (RID_SVX_START + 120) -#define RID_SVXSTR_PAPER_D (RID_SVX_START + 121) -#define RID_SVXSTR_PAPER_E (RID_SVX_START + 122) -#define RID_SVXSTR_PAPER_EXECUTIVE (RID_SVX_START + 123) -#define RID_SVXSTR_PAPER_LEGAL2 (RID_SVX_START + 124) -#define RID_SVXSTR_PAPER_MONARCH (RID_SVX_START + 125) -#define RID_SVXSTR_PAPER_COM675 (RID_SVX_START + 126) -#define RID_SVXSTR_PAPER_COM9 (RID_SVX_START + 127) -#define RID_SVXSTR_PAPER_COM10 (RID_SVX_START + 128) -#define RID_SVXSTR_PAPER_COM11 (RID_SVX_START + 129) -#define RID_SVXSTR_PAPER_COM12 (RID_SVX_START + 130) -#define RID_SVXSTR_PAPER_KAI16 (RID_SVX_START + 131) -#define RID_SVXSTR_PAPER_KAI32 (RID_SVX_START + 132) -#define RID_SVXSTR_PAPER_KAI32BIG (RID_SVX_START + 133) -#define RID_SVXSTR_PAPER_B4_JIS (RID_SVX_START + 134) -#define RID_SVXSTR_PAPER_B5_JIS (RID_SVX_START + 135) -#define RID_SVXSTR_PAPER_B6_JIS (RID_SVX_START + 136) - #define RID_SVXSTR_FULLSIZE (RID_SVX_START + 144) // ResIds fuer die verschiedenen Strings des PageDlgs #define RID_SVXSTR_CALC_PAGE (RID_SVX_START + 146) #define RID_SVXSTR_DRAW_PAGE (RID_SVX_START + 147) -// HM_ERR -#define RID_SVXSTR_HMERR_THESAURUS (RID_SVX_START + 150) -#define RID_SVXSTR_HMERR_HYPH (RID_SVX_START + 151) - // Strings der ToolBox-Controls aus tbcontrl.cxx #define RID_SVXSTR_FILLPATTERN (RID_SVX_START + 191) #define RID_SVXSTR_FRAME (RID_SVX_START + 192) @@ -529,13 +457,6 @@ #define RID_SVXSTR_RULER_TAB_DECIMAL (RID_SVX_START + 247) #define RID_SVXSTR_RULER_TAB_CENTER (RID_SVX_START + 248) -// File-/Grafik-Link String, Dialog Name -#define RID_SVXSTR_FILELINK (RID_SVX_START + 255) -#define RID_SVXSTR_GRAFIKLINK (RID_SVX_START + 256) -#define RID_SVXSTR_EDITGRFLINK (RID_SVX_START + 257) -#define RID_SVXSTR_GRFLINKPROGRESS (RID_SVX_START + 258) -#define RID_SVXGRF_GRAPHICLOAD (RID_SVX_START + 259) - // Schlie"ssen (im TabDialog Line/Area) #define RID_SVXSTR_CLOSE (RID_SVX_START + 260) @@ -803,14 +724,6 @@ #define RID_SVXSTR_HATCH_START RID_SVXSTR_HATCH0 #define RID_SVXSTR_HATCH_END RID_SVXSTR_HATCH10 -// strings for error messsages of OpenGraphics dialog -#define RID_SVXSTR_GRFILTER_OPENERROR (RID_SVX_START + 683) -#define RID_SVXSTR_GRFILTER_IOERROR (RID_SVX_START + 684) -#define RID_SVXSTR_GRFILTER_FORMATERROR (RID_SVX_START + 685) -#define RID_SVXSTR_GRFILTER_VERSIONERROR (RID_SVX_START + 686) -#define RID_SVXSTR_GRFILTER_FILTERERROR (RID_SVX_START + 687) -#define RID_SVXSTR_GRFILTER_TOOBIG (RID_SVX_START + 688) - // Default-Bitmap-Names #define RID_SVXSTR_BMP0_DEF (RID_SVX_START + 691) #define RID_SVXSTR_BMP1_DEF (RID_SVX_START + 692) @@ -926,11 +839,6 @@ #define RID_SVXSTR_QRY_PRINT_ALL (RID_SVX_START + 804) #define RID_SVXSTR_QRY_PRINT_SELECTION (RID_SVX_START + 805) -// strings for error messsages in dictionary updates -#define RID_SVXSTR_DIC_ERR_UNKNOWN (RID_SVX_START + 810) -#define RID_SVXSTR_DIC_ERR_FULL (RID_SVX_START + 811) -#define RID_SVXSTR_DIC_ERR_READONLY (RID_SVX_START + 812) - // strings for graphic attributes/undo #define RID_SVXSTR_GRAFCROP (RID_SVX_START + 820) #define RID_SVXSTR_UNDO_GRAFMODE (RID_SVX_START + 821) diff --git a/svx/inc/svx/dlgctl3d.hxx b/svx/inc/svx/dlgctl3d.hxx index 4ee362978429..aa85b4e6a391 100644 --- a/svx/inc/svx/dlgctl3d.hxx +++ b/svx/inc/svx/dlgctl3d.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: dlgctl3d.hxx,v $ - * $Revision: 1.4.226.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/dlgctrl.hxx b/svx/inc/svx/dlgctrl.hxx index af3551c83301..28b1bf1b9b6f 100644 --- a/svx/inc/svx/dlgctrl.hxx +++ b/svx/inc/svx/dlgctrl.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: dlgctrl.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/dstribut_enum.hxx b/svx/inc/svx/dstribut_enum.hxx index 9866a8e9107b..23001f888e70 100644 --- a/svx/inc/svx/dstribut_enum.hxx +++ b/svx/inc/svx/dstribut_enum.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: dstribut_enum.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/e3ditem.hxx b/svx/inc/svx/e3ditem.hxx index cc90da3aff9e..b8aea314372b 100644 --- a/svx/inc/svx/e3ditem.hxx +++ b/svx/inc/svx/e3ditem.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: e3ditem.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/e3dsceneupdater.hxx b/svx/inc/svx/e3dsceneupdater.hxx index a68a8e66e43e..ad38491945d5 100644 --- a/svx/inc/svx/e3dsceneupdater.hxx +++ b/svx/inc/svx/e3dsceneupdater.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: e3dsceneupdater.hxx,v $ - * $Revision: 1.1.2.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/e3dundo.hxx b/svx/inc/svx/e3dundo.hxx index 9edcafafdf46..f5081eeccfa0 100644 --- a/svx/inc/svx/e3dundo.hxx +++ b/svx/inc/svx/e3dundo.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: e3dundo.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/editdata.hxx b/svx/inc/svx/editdata.hxx deleted file mode 100644 index 8e3c9f853961..000000000000 --- a/svx/inc/svx/editdata.hxx +++ /dev/null @@ -1,391 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: editdata.hxx,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MyEDITDATA, wegen exportiertem EditData -#ifndef _MyEDITDATA_HXX -#define _MyEDITDATA_HXX - -#include <tools/string.hxx> -#include "svx/svxdllapi.h" - -#include <svl/svarray.hxx> - -class SfxItemSet; -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 EEHorizontalTextDirection { EE_HTEXTDIR_DEFAULT, EE_HTEXTDIR_L2R, EE_HTEXTDIR_R2L }; -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 - -// 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 - -class EditView; -class EditEngine; -class ImpEditView; -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 - -struct EPosition -{ - USHORT nPara; - xub_StrLen nIndex; - - EPosition() : - nPara( EE_PARA_NOT_FOUND ), - nIndex( EE_INDEX_NOT_FOUND ) - { - } - - EPosition( USHORT nPara_, xub_StrLen nPos_ ) : - nPara( nPara_ ), - nIndex( nPos_ ) - { - } -}; - -struct ESelection -{ - USHORT nStartPara; - xub_StrLen nStartPos; - USHORT nEndPara; - xub_StrLen nEndPos; - - ESelection() : nStartPara( 0 ), nStartPos( 0 ), nEndPara( 0 ), nEndPos( 0 ) {} - - ESelection( USHORT nStPara, xub_StrLen nStPos, USHORT nEPara, xub_StrLen nEPos ) : - nStartPara( nStPara ), - nStartPos( nStPos ), - nEndPara( nEPara ), - nEndPos( nEPos ) - { - } - - ESelection( USHORT nPara, xub_StrLen nPos ) : - nStartPara( nPara ), - nStartPos( nPos ), - nEndPara( nPara ), - nEndPos( nPos ) - { - } - - 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; -}; - -inline BOOL ESelection::HasRange() const -{ - return ( nStartPara != nEndPara ) || ( nStartPos != nEndPos ); -} - -inline sal_Bool ESelection::IsZero() const -{ - return ( ( nStartPara == 0 ) && ( nStartPos == 0 ) && - ( nEndPara == 0 ) && ( nEndPos == 0 ) ); -} - -inline sal_Bool ESelection::IsEqual( const ESelection& rS ) const -{ - return ( ( nStartPara == rS.nStartPara ) && ( nStartPos == rS.nStartPos ) && - ( nEndPara == rS.nEndPara ) && ( nEndPos == rS.nEndPos ) ); -} - -inline sal_Bool ESelection::IsLess( const ESelection& rS ) const -{ - // Selektion muss justiert sein. - // => Nur pueffen, ob Ende von 'this' < Start von rS - - if ( ( nEndPara < rS.nStartPara ) || - ( ( nEndPara == rS.nStartPara ) && ( nEndPos < rS.nStartPos ) && !IsEqual( rS ) ) ) - { - return sal_True; - } - return sal_False; -} - -inline sal_Bool ESelection::IsGreater( const ESelection& rS ) const -{ - // Selektion muss justiert sein. - // => Nur pueffen, ob Ende von 'this' > Start von rS - - if ( ( nStartPara > rS.nEndPara ) || - ( ( nStartPara == rS.nEndPara ) && ( nStartPos > rS.nEndPos ) && !IsEqual( rS ) ) ) - { - return sal_True; - } - return sal_False; -} - -inline void ESelection::Adjust() -{ - sal_Bool bSwap = sal_False; - if ( nStartPara > nEndPara ) - bSwap = sal_True; - else if ( ( nStartPara == nEndPara ) && ( nStartPos > nEndPos ) ) - bSwap = sal_True; - - if ( bSwap ) - { - sal_uInt16 nSPar = nStartPara; sal_uInt16 nSPos = nStartPos; - nStartPara = nEndPara; nStartPos = nEndPos; - nEndPara = nSPar; nEndPos = nSPos; - } -} - -struct SVX_DLLPUBLIC EFieldInfo -{ - SvxFieldItem* pFieldItem; - String aCurrentText; - EPosition aPosition; - - EFieldInfo(); - EFieldInfo( const SvxFieldItem& rFieldItem, USHORT nPara, USHORT nPos ); - ~EFieldInfo(); - - EFieldInfo( const EFieldInfo& ); - EFieldInfo& operator= ( const 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 // - - }; - -struct ImportInfo -{ - SvParser* pParser; - ESelection aSelection; - ImportState eState; - - int nToken; - short nTokenValue; - - String aText; - - 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 - -struct ParagraphInfos -{ - ParagraphInfos() - : nParaHeight( 0 ) - , nLines( 0 ) - , nFirstLineStartX( 0 ) - , nFirstLineOffset( 0 ) - , nFirstLineHeight( 0 ) - , nFirstLineTextHeight ( 0 ) - , nFirstLineMaxAscent( 0 ) - , bValid( 0 ) - {} - USHORT nParaHeight; - USHORT nLines; - - USHORT nFirstLineStartX; - - USHORT nFirstLineOffset; - USHORT nFirstLineHeight; - USHORT nFirstLineTextHeight; - USHORT nFirstLineMaxAscent; - - BOOL bValid; // Bei einer Abfrage waehrend der Formatierung ungueltig! -}; - -struct EECharAttrib -{ - const SfxPoolItem* pAttr; - - USHORT nPara; - xub_StrLen nStart; - xub_StrLen nEnd; -}; - -SV_DECL_VARARR_VISIBILITY( EECharAttribArray, EECharAttrib, 0, 4, SVX_DLLPUBLIC ) - -struct MoveParagraphsInfo -{ - USHORT nStartPara; - USHORT nEndPara; - USHORT nDestPara; - - MoveParagraphsInfo( USHORT nS, USHORT nE, USHORT nD ) - { nStartPara = nS; nEndPara = nE; nDestPara = nD; } -}; - -#define EE_ACTION_PASTE 1 -#define EE_ACTION_DROP 2 - -struct PasteOrDropInfos -{ - USHORT nAction; - USHORT nStartPara; - USHORT nEndPara; - - PasteOrDropInfos() : nAction(0), nStartPara(0xFFFF), nEndPara(0xFFFF) {} -}; - -enum EENotifyType -{ - /// EditEngine text was modified - EE_NOTIFY_TEXTMODIFIED, - - /// A paragraph was inserted into the EditEngine - EE_NOTIFY_PARAGRAPHINSERTED, - - /// A paragraph was removed from the EditEngine - EE_NOTIFY_PARAGRAPHREMOVED, - - /// Multiple paragraphs have been removed from the EditEngine - EE_NOTIFY_PARAGRAPHSMOVED, - - /// The height of at least one paragraph has changed - EE_NOTIFY_TEXTHEIGHTCHANGED, - - /// The view area of the EditEngine scrolled - EE_NOTIFY_TEXTVIEWSCROLLED, - - /// The selection and/or the cursor position has changed - EE_NOTIFY_TEXTVIEWSELECTIONCHANGED, - - /** Denotes the beginning of a collected amount of EditEngine - notification events. This event itself is not queued, but sent - immediately - */ - EE_NOTIFY_BLOCKNOTIFICATION_START, - - /** Denotes the end of a collected amount of EditEngine - notification events. After this event, the queue is empty, and - a high-level operation such as "insert paragraph" is finished - */ - EE_NOTIFY_BLOCKNOTIFICATION_END, - - /// Denotes the beginning of a high-level action triggered by a key press - EE_NOTIFY_INPUT_START, - - /// Denotes the end of a high-level action triggered by a key press - EE_NOTIFY_INPUT_END -}; - -struct EENotify -{ - EENotifyType eNotificationType; - EditEngine* pEditEngine; - EditView* pEditView; - - USHORT nParagraph; // only valid in PARAGRAPHINSERTED/EE_NOTIFY_PARAGRAPHREMOVED - - USHORT nParam1; - USHORT nParam2; - - EENotify( EENotifyType eType ) - { eNotificationType = eType; pEditEngine = NULL; pEditView = NULL; nParagraph = EE_PARA_NOT_FOUND; nParam1 = 0; nParam2 = 0; } -}; - -#endif // _MyEDITDATA_HXX diff --git a/svx/inc/svx/editeng.hxx b/svx/inc/svx/editeng.hxx deleted file mode 100644 index 65168297274e..000000000000 --- a/svx/inc/svx/editeng.hxx +++ /dev/null @@ -1,488 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: editeng.hxx,v $ - * $Revision: 1.8.14.2 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -// MyEDITENG, wegen exportiertem EditEng -#ifndef _MyEDITENG_HXX -#define _MyEDITENG_HXX - -class ImpEditEngine; -class EditView; -class OutputDevice; -class EditUndo; -class SvxFont; -class SfxUndoManager; -class SfxItemPool; -class SfxStyleSheet; -class String; -class SfxStyleSheetPool; -class SvxSearchItem; -class SvxFieldItem; -class SvxCharSetColorItem; -class SfxUndoAction; -class MapMode; -class Color; -class Font; -class KeyEvent; -class PolyPolygon; -class Size; -class Point; -class Rectangle; -class SvStream; -class Link; -class OutputDevice; -class SvUShorts; -class SfxPoolItem; -class SvxNumBulletItem; -class SvxBulletItem; -class SvxLRSpaceItem; -class SvKeyValueIterator; -class SvxForbiddenCharactersTable; -class SvxNumberFormat; -class FontList; - -#include <vos/ref.hxx> -#include <vector> -#include <com/sun/star/uno/Reference.h> - -namespace com { namespace sun { namespace star { - namespace linguistic2 { - class XSpellChecker1; - class XHyphenator; - } - namespace datatransfer { - class XTransferable; - } - namespace lang { - struct Locale; - } -}}} -namespace svx{ -struct SpellPortion; -typedef std::vector<SpellPortion> SpellPortions; -} - -namespace basegfx { class B2DPolyPolygon; } -#include <rsc/rscsfx.hxx> -#ifndef _EDITDATA_HXX -#include <svx/editdata.hxx> -#endif -#include <i18npool/lang.h> -#include "svx/svxdllapi.h" - -#include <tools/rtti.hxx> // wegen typedef TypeId - -#include <svx/eedata.hxx> -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 - -#define GETATTRIBS_STYLESHEET (sal_uInt8)0x01 -#define GETATTRIBS_PARAATTRIBS (sal_uInt8)0x02 -#define GETATTRIBS_CHARATTRIBS (sal_uInt8)0x04 -#define GETATTRIBS_ALL (sal_uInt8)0xFF - -class SVX_DLLPUBLIC EditEngine -{ - friend class EditView; - friend class ImpEditView; - friend class EditDbg; - friend class Outliner; - -private: - ImpEditEngine* pImpEditEngine; - - SVX_DLLPRIVATE EditEngine( const EditEngine& ); - SVX_DLLPRIVATE EditEngine& operator=( const EditEngine& ); - -//#if 0 // _SOLAR__PRIVATE - SVX_DLLPRIVATE BOOL PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pView ); -//#endif - -protected: - - -public: - EditEngine( SfxItemPool* pItemPool ); - virtual ~EditEngine(); - - const SfxItemSet& GetEmptyItemSet(); - - void SetDefTab( USHORT nDefTab ); - USHORT GetDefTab() const; - - void SetRefDevice( OutputDevice* pRefDef ); - OutputDevice* GetRefDevice() const; - - void SetRefMapMode( const MapMode& rMapMode ); - MapMode GetRefMapMode(); - - void SetUpdateMode( BOOL bUpdate ); - BOOL GetUpdateMode() 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 SetPaperSize( const Size& rSize ); - const Size& GetPaperSize() const; - - void SetVertical( BOOL bVertical ); - BOOL IsVertical() const; - - void SetFixedCellHeight( BOOL bUseFixedCellHeight ); - BOOL IsFixedCellHeight() const; - - void SetDefaultHorizontalTextDirection( EEHorizontalTextDirection eHTextDir ); - EEHorizontalTextDirection GetDefaultHorizontalTextDirection() const; - - USHORT GetScriptType( const ESelection& rSelection ) const; - LanguageType GetLanguage( USHORT nPara, USHORT nPos ) const; - - void TransliterateText( const ESelection& rSelection, sal_Int32 nTransliterationMode ); - - void SetAsianCompressionMode( USHORT nCompression ); - USHORT GetAsianCompressionMode() const; - - void SetKernAsianPunctuation( BOOL bEnabled ); - BOOL IsKernAsianPunctuation() const; - - 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(); - - const Size& GetMinAutoPaperSize() const; - void SetMinAutoPaperSize( 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( USHORT nParagraph ) const; - xub_StrLen GetTextLen( USHORT nParagraph ) const; - sal_uInt32 GetTextHeight( USHORT nParagraph ) const; - - USHORT GetParagraphCount() 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 ); - EPosition FindDocPosition( const Point& rDocPos ) const; - Rectangle GetCharacterBounds( const EPosition& rPos ) const; - - String GetWord( USHORT nPara, xub_StrLen nIndex ); - - ESelection GetWord( const ESelection& rSelection, USHORT nWordType ) const; - ESelection WordLeft( const ESelection& rSelection, USHORT nWordType ) const; - ESelection WordRight( const ESelection& rSelection, USHORT nWordType ) const; - ESelection CursorLeft( const ESelection& rSelection, USHORT nCharacterIteratorMode ) const; - ESelection CursorRight( const ESelection& rSelection, USHORT nCharacterIteratorMode ) const; - - 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 ); - - 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); - - virtual void SetParaAttribs( USHORT nPara, const SfxItemSet& rSet ); - virtual const SfxItemSet& GetParaAttribs( USHORT nPara ) 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 ); - - BOOL HasParaAttrib( USHORT nPara, USHORT nWhich ) const; - const SfxPoolItem& GetParaAttrib( USHORT nPara, USHORT nWhich ); - - 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 ); - - SfxUndoManager& GetUndoManager(); - void UndoActionStart( USHORT nId ); - void UndoActionEnd( USHORT nId ); - BOOL IsInUndo(); - - 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; - - void ClearModifyFlag(); - void SetModified(); - BOOL IsModified() const; - - void SetModifyHdl( const Link& rLink ); - Link GetModifyHdl() const; - - BOOL IsInSelectionMode() const; - void StopSelectionMode(); - - 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 ); - - // 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 ); - -// ULONG: Fehlercode des Streams. - ULONG Read( SvStream& rInput, const String& rBaseURL, EETextFormat, SvKeyValueIterator* pHTTPHeaderAttrs = NULL ); - ULONG Write( SvStream& rOutput, EETextFormat ); - - void SetStatusEventHdl( const Link& rLink ); - Link GetStatusEventHdl() const; - - void SetNotifyHdl( const Link& rLink ); - Link GetNotifyHdl() const; - - void SetImportHdl( const Link& rLink ); - Link GetImportHdl() const; - - // Flat-Mode: Keine Zeichenformatierung auswerten => Fuer Outliner - BOOL IsFlatMode() const; - void SetFlatMode( BOOL bFlat ); - - 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 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 SetStyleSheetPool( SfxStyleSheetPool* pSPool ); - SfxStyleSheetPool* GetStyleSheetPool(); - - void SetStyleSheet( USHORT nPara, SfxStyleSheet* pStyle ); - SfxStyleSheet* GetStyleSheet( USHORT nPara ) const; - - void SetWordDelimiters( const String& rDelimiters ); - String GetWordDelimiters() const; - - void SetGroupChars( const String& rChars ); - String GetGroupChars() const; - - void EnablePasteSpecial( BOOL bEnable ); - BOOL IsPasteSpecialEnabled() const; - - void EnableIdleFormatter( BOOL bEnable ); - BOOL IsIdleFormatterEnabled() const; - - void EraseVirtualDevice(); - - void SetSpeller( ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellChecker1 > &xSpeller ); - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellChecker1 > - GetSpeller(); - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XHyphenator > - GetHyphenator() const; - void SetHyphenator( ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XHyphenator >& xHyph ); - - void SetForbiddenCharsTable( vos::ORef<SvxForbiddenCharactersTable> xForbiddenChars ); - vos::ORef<SvxForbiddenCharactersTable> GetForbiddenCharsTable() const; - - void SetDefaultLanguage( LanguageType eLang ); - LanguageType GetDefaultLanguage() const; - - BOOL HasOnlineSpellErrors() const; - void CompleteOnlineSpelling(); - - void SetBigTextObjectStart( USHORT nStartAtPortionCount ); - USHORT GetBigTextObjectStart() const; - BOOL ShouldCreateBigTextObject() const; - - // Zum schnellen Vorab-Pruefen ohne View: - EESpellState HasSpellErrors(); - BOOL HasText( const SvxSearchItem& rSearchItem ); - - //initialize sentence spelling - void StartSpelling(EditView& rEditView, sal_Bool bMultipleDoc); - //spell and return a sentence - bool SpellSentence(EditView& rEditView, ::svx::SpellPortions& rToFill, bool bIsGrammarChecking ); - // put spell position to start of current sentence - void PutSpellingToSentenceStart( EditView& rEditView ); - //applies a changed sentence - void ApplyChangedSentence(EditView& rEditView, const ::svx::SpellPortions& rNewPortions, bool bIsGrammarChecking ); - //deinitialize sentence spelling - void EndSpelling(); - - // for text conversion (see also HasSpellErrors) - sal_Bool HasConvertibleTextPortion( LanguageType nLang ); - virtual BOOL ConvertNextDocument(); - - BOOL UpdateFields(); - void RemoveFields( BOOL bKeepFieldText, TypeId aType = NULL ); - - USHORT GetFieldCount( USHORT nPara ) const; - EFieldInfo GetFieldInfo( USHORT nPara, USHORT nField ) const; - - BOOL IsRightToLeft( USHORT nPara ) const; - - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > - CreateTransferable( const ESelection& rSelection ) const; - - // MT: Can't create new virtual functions like for ParagraphInserted/Deleted, musst be compatible in SRC638, change later... - void SetBeginMovingParagraphsHdl( const Link& rLink ); - void SetEndMovingParagraphsHdl( const Link& rLink ); - 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 ParagraphConnected( USHORT nLeftParagraph, USHORT nRightParagraph ); - virtual void ParaAttribsChanged( USHORT nParagraph ); - virtual void StyleSheetChanged( SfxStyleSheet* pStyle ); - virtual void ParagraphHeightChanged( USHORT nPara ); - - // #101498# - virtual void DrawingText( - const Point& rStartPos, const String& rText, USHORT nTextStart, USHORT nTextLen, const sal_Int32* pDXArray, - const SvxFont& rFont, USHORT nPara, xub_StrLen nIndex, BYTE nRightToLeft, - const EEngineData::WrongSpellVector* pWrongSpellVector, - const SvxFieldData* pFieldData, - bool bEndOfLine, - bool bEndOfParagraph, - bool bEndOfBullet, - const ::com::sun::star::lang::Locale* pLocale, - 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 ); - - // 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 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; - - /** 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; - - /// specifies if auto-correction should capitalize the first word or not (default is on) - void SetFirstWordCapitalization( BOOL bCapitalize ); - BOOL IsFirstWordCapitalization() const; -}; - -#endif // _MyEDITENG_HXX diff --git a/svx/inc/svx/editobj.hxx b/svx/inc/svx/editobj.hxx deleted file mode 100644 index 31a62225ced1..000000000000 --- a/svx/inc/svx/editobj.hxx +++ /dev/null @@ -1,129 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: editobj.hxx,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _EDITOBJ_HXX -#define _EDITOBJ_HXX - -#include <tools/stream.hxx> -#include <tools/debug.hxx> -#include <rsc/rscsfx.hxx> -#include <svl/itemset.hxx> -#include <svx/eeitem.hxx> -#include "svx/svxdllapi.h" - -DBG_NAMEEX( EE_EditTextObject ) - -class SfxItemPool; -class SfxStyleSheetPool; -class SvxFieldItem; -class EECharAttribArray; - -#define EDTOBJ_SETTINGS_ULITEMSUMMATION 0x00000001 -#define EDTOBJ_SETTINGS_ULITEMFIRSTPARA 0x00000002 - -class SVX_DLLPUBLIC EditTextObject -{ -private: - USHORT nWhich; - SVX_DLLPRIVATE EditTextObject& operator=( const EditTextObject& ); - -protected: - EditTextObject( USHORT nWhich ); - EditTextObject( const EditTextObject& r ); - - virtual void StoreData( SvStream& rOStream ) const; - virtual void CreateData( SvStream& rIStream ); - -public: - virtual ~EditTextObject(); - - USHORT Which() const { return nWhich; } - - 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 BOOL IsVertical() const; - virtual void SetVertical( BOOL bVertical ); - - virtual USHORT GetScriptType() const; - - virtual USHORT GetVersion() const; // Solange der Outliner keine Recordlaenge speichert - - virtual EditTextObject* Clone() const = 0; - - BOOL Store( SvStream& rOStream ) const; - static EditTextObject* Create( SvStream& rIStream, - SfxItemPool* pGlobalTextObjectPool = 0 ); - void Skip( SvStream& rIStream ); - - 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 BOOL HasPortionInfo() const; - virtual void ClearPortionInfo(); - - virtual BOOL HasOnlineSpellErrors() 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 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 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, - const XubString& rNewName, SfxStyleFamily eNewFamily ); - virtual void ChangeStyleSheetName( SfxStyleFamily eFamily, const XubString& rOldName, const XubString& rNewName ); - - bool operator==( const EditTextObject& rCompare ) const; - - // #i102062# - bool isWrongListEqual(const EditTextObject& rCompare) const; -}; - -#endif // _EDITOBJ_HXX diff --git a/svx/inc/svx/editview.hxx b/svx/inc/svx/editview.hxx deleted file mode 100644 index 79deaab4dc36..000000000000 --- a/svx/inc/svx/editview.hxx +++ /dev/null @@ -1,251 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: editview.hxx,v $ - * $Revision: 1.4.198.1 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -// MyEDITVIEW, wegen exportiertem EditView -#ifndef _MyEDITVIEW_HXX -#define _MyEDITVIEW_HXX - -#include <rsc/rscsfx.hxx> -#include <i18npool/lang.h> -#include <tools/color.hxx> -#include <tools/gen.hxx> - -class EditEngine; -class ImpEditEngine; -class ImpEditView; -class SvxSearchItem; -class SvxFieldItem; -class Window; -class Pointer; -class Cursor; -class KeyEvent; -class MouseEvent; -class DropEvent; -class CommandEvent; -class Rectangle; -class Link; -class Pair; -class Point; -class Range; -class SvStream; -class SvKeyValueIterator; -class SfxStyleSheet; -class Font; -class FontList; - -#ifndef _EDITDATA_HXX -#include <svx/editdata.hxx> -#endif -#include <com/sun/star/uno/Reference.h> -#include "svx/svxdllapi.h" - -namespace com { -namespace sun { -namespace star { -namespace datatransfer { - class XTransferable; -}}}} - -class SVX_DLLPUBLIC EditView -{ - friend class EditEngine; - friend class ImpEditEngine; - friend class EditSelFunctionSet; - -public: // brauche ich fuer Undo - ImpEditView* GetImpEditView() const { return pImpEditView; } - ImpEditEngine* GetImpEditEngine() const; - -private: - ImpEditView* pImpEditView; - - SVX_DLLPRIVATE EditView( const EditView& ); - SVX_DLLPRIVATE EditView& operator=( const EditView& ); - -public: - EditView( EditEngine* pEng, Window* pWindow ); - virtual ~EditView(); - - void SetEditEngine( EditEngine* pEditEngine ); - EditEngine* GetEditEngine() 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 ShowCursor( BOOL bGotoCursor = TRUE, BOOL bForceVisCursor = TRUE ); - void HideCursor(); - - EESelectionMode GetSelectionMode() const; - void SetSelectionMode( EESelectionMode eMode ); - - void SetReadOnly( BOOL bReadOnly ); - BOOL IsReadOnly() const; - - BOOL HasSelection() const; - ESelection GetSelection() const; - void SetSelection( const ESelection& rNewSel ); - BOOL SelectCurrentWord(); - - void IndentBlock(); - void UnindentBlock(); - - BOOL IsInsertMode() const; - void SetInsertMode( BOOL bInsert ); - - void ReplaceSelected( const String& rStr ); - String GetSelected(); - void DeleteSelected(); - - USHORT GetSelectedScriptType() const; - - // Position der VisArea im Ausgabefenster. - // Eine Groessenaenderung betrifft auch die VisArea - 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 SetPointer( const Pointer& rPointer ); - const Pointer& GetPointer() const; - - void SetCursor( const Cursor& rCursor ); - Cursor* GetCursor() const; - - void InsertText( const String& rNew, BOOL bSelect = FALSE ); - - BOOL PostKeyEvent( const KeyEvent& rKeyEvent ); - - 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(); - - void Cut(); - void Copy(); - void Paste(); - void PasteSpecial(); - - void EnablePaste( BOOL bEnable ); - BOOL IsPasteEnabled() const; - - void Undo(); - void Redo(); - - // speziell fuer Olli - 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 ); - void RemoveAttribs( BOOL bRemoveParaAttribs = FALSE, 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 ); - - void SetBackgroundColor( const Color& rColor ); - Color GetBackgroundColor() const; - - void SetControlWord( sal_uInt32 nWord ); - sal_uInt32 GetControlWord() const; - - 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(); - - SfxStyleSheet* GetStyleSheet() const; - void SetStyleSheet( SfxStyleSheet* pStyle ); - - void SetAnchorMode( EVAnchorMode eMode ); - EVAnchorMode GetAnchorMode() const; - - BOOL MatchGroup(); - - void CompleteAutoCorrect(); - - 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 ); - - 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; - - const SvxFieldItem* GetFieldAtSelection() const; - - String GetWordUnderMousePointer() const; - String GetWordUnderMousePointer( Rectangle& rWordRect ) 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; -}; - -#endif // _MyEDITVIEW_HXX diff --git a/svx/inc/svx/eedata.hxx b/svx/inc/svx/eedata.hxx deleted file mode 100644 index 33e542746d56..000000000000 --- a/svx/inc/svx/eedata.hxx +++ /dev/null @@ -1,78 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: eedata.hxx,v $ - * - * $Revision: 1.2 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _EEDATA_HXX -#define _EEDATA_HXX - -////////////////////////////////////////////////////////////////////////////// -// extended data definitions for EditEngine portion stripping (StripPortions() -// support). These may be mapped to some primitive definitions from Drawinglayer -// later. -#include <vector> - -namespace EEngineData -{ - // spell checking wrong vector containing the redlining data - class WrongSpellClass - { - public: - sal_uInt32 nStart; - sal_uInt32 nEnd; - - WrongSpellClass(sal_uInt32 nS, sal_uInt32 nE) : nStart(nS), nEnd(nE) {} - }; - - typedef std::vector< WrongSpellClass > WrongSpellVector; - - // text marking vector containing the EOC, EOW and EOS TEXT definitions - enum TextMarkingType - { - EndOfCaracter = 0, - EndOfWord = 1, - EndOfSentence = 2 - }; - - class TextMarkingClass - { - public: - TextMarkingType eType; - sal_uInt32 nIndex; - - TextMarkingClass(TextMarkingType eT, sal_uInt32 nI) : eType(eT), nIndex(nI) {} - }; - - typedef std::vector< TextMarkingClass > TextMarkingVector; - -} // end of namespace EditEngine - -#endif // _EEDATA_HXX - -////////////////////////////////////////////////////////////////////////////// -// eof diff --git a/svx/inc/svx/eeitem.hxx b/svx/inc/svx/eeitem.hxx deleted file mode 100644 index 53202b795170..000000000000 --- a/svx/inc/svx/eeitem.hxx +++ /dev/null @@ -1,102 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: eeitem.hxx,v $ - * $Revision: 1.3.212.1 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _EEITEM_HXX -#define _EEITEM_HXX - -#define EE_ITEMS_START 3989 - -// Absatzattribute: -#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_END (EE_ITEMS_START+15) - -// Zeichenattribute: -#define EE_CHAR_START (EE_ITEMS_START+16) -#define EE_CHAR_COLOR (EE_ITEMS_START+16) -#define EE_CHAR_FONTINFO (EE_ITEMS_START+17) -#define EE_CHAR_FONTHEIGHT (EE_ITEMS_START+18) -#define EE_CHAR_FONTWIDTH (EE_ITEMS_START+19) -#define EE_CHAR_WEIGHT (EE_ITEMS_START+20) -#define EE_CHAR_UNDERLINE (EE_ITEMS_START+21) -#define EE_CHAR_STRIKEOUT (EE_ITEMS_START+22) -#define EE_CHAR_ITALIC (EE_ITEMS_START+23) -#define EE_CHAR_OUTLINE (EE_ITEMS_START+24) -#define EE_CHAR_SHADOW (EE_ITEMS_START+25) -#define EE_CHAR_ESCAPEMENT (EE_ITEMS_START+26) -#define EE_CHAR_PAIRKERNING (EE_ITEMS_START+27) -#define EE_CHAR_KERNING (EE_ITEMS_START+28) -#define EE_CHAR_WLM (EE_ITEMS_START+29) -#define EE_CHAR_LANGUAGE (EE_ITEMS_START+30) -#define EE_CHAR_LANGUAGE_CJK (EE_ITEMS_START+31) -#define EE_CHAR_LANGUAGE_CTL (EE_ITEMS_START+32) -#define EE_CHAR_FONTINFO_CJK (EE_ITEMS_START+33) -#define EE_CHAR_FONTINFO_CTL (EE_ITEMS_START+34) -#define EE_CHAR_FONTHEIGHT_CJK (EE_ITEMS_START+35) -#define EE_CHAR_FONTHEIGHT_CTL (EE_ITEMS_START+36) -#define EE_CHAR_WEIGHT_CJK (EE_ITEMS_START+37) -#define EE_CHAR_WEIGHT_CTL (EE_ITEMS_START+38) -#define EE_CHAR_ITALIC_CJK (EE_ITEMS_START+39) -#define EE_CHAR_ITALIC_CTL (EE_ITEMS_START+40) -#define EE_CHAR_EMPHASISMARK (EE_ITEMS_START+41) -#define EE_CHAR_RELIEF (EE_ITEMS_START+42) -#define EE_CHAR_RUBI_DUMMY (EE_ITEMS_START+43) -#define EE_CHAR_XMLATTRIBS (EE_ITEMS_START+44) -#define EE_CHAR_OVERLINE (EE_ITEMS_START+45) -#define EE_CHAR_END (EE_ITEMS_START+45) - - -#define EE_FEATURE_START (EE_ITEMS_START+46) -#define EE_FEATURE_TAB (EE_ITEMS_START+46) -#define EE_FEATURE_LINEBR (EE_ITEMS_START+47) -#define EE_FEATURE_NOTCONV (EE_ITEMS_START+48) -#define EE_FEATURE_FIELD (EE_ITEMS_START+49) -#define EE_FEATURE_END (EE_ITEMS_START+49) - -#define EE_ITEMS_END (EE_ITEMS_START+49) - -#define EDITITEMCOUNT ( EE_ITEMS_END - EE_ITEMS_START + 1 ) - -#endif // _EEITEM_HXX diff --git a/svx/inc/svx/eeitemid.hxx b/svx/inc/svx/eeitemid.hxx deleted file mode 100644 index 088762f7fe10..000000000000 --- a/svx/inc/svx/eeitemid.hxx +++ /dev/null @@ -1,139 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: eeitemid.hxx,v $ - * $Revision: 1.3.212.1 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _EEITEMID_HXX -#define _EEITEMID_HXX - -#include <svx/eeitem.hxx> - -#ifdef ITEMID_FONT -#undef ITEMID_FONT -#endif -#ifdef ITEMID_FONTHEIGHT -#undef ITEMID_FONTHEIGHT -#endif -#ifdef ITEMID_COLOR -#undef ITEMID_COLOR -#endif -#ifdef ITEMID_WEIGHT -#undef ITEMID_WEIGHT -#endif -#ifdef ITEMID_POSTURE -#undef ITEMID_POSTURE -#endif -#ifdef ITEMID_SHADOWED -#undef ITEMID_SHADOWED -#endif -#ifdef ITEMID_CONTOUR -#undef ITEMID_CONTOUR -#endif -#ifdef ITEMID_CROSSEDOUT -#undef ITEMID_CROSSEDOUT -#endif -#ifdef ITEMID_UNDERLINE -#undef ITEMID_UNDERLINE -#endif -#ifdef ITEMID_OVERLINE -#undef ITEMID_OVERLINE -#endif -#ifdef ITEMID_LANGUAGE -#undef ITEMID_LANGUAGE -#endif -#ifdef ITEMID_ADJUST -#undef ITEMID_ADJUST -#endif -#ifdef ITEMID_WORDLINEMODE -#undef ITEMID_WORDLINEMODE -#endif -#ifdef ITEMID_CHARSETCOLOR -#undef ITEMID_CHARSETCOLOR -#endif -#ifdef ITEMID_SEARCH -#undef ITEMID_SEARCH -#endif -#ifdef ITEMID_BRUSH -#undef ITEMID_BRUSH -#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 - -// 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_TABSTOP EE_PARA_TABS - -#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_FIELD EE_FEATURE_FIELD - -#define ITEMID_SEARCH 0 - -#endif //_EEITEMID_HXX - diff --git a/svx/inc/svx/emphitem.hxx b/svx/inc/svx/emphitem.hxx deleted file mode 100644 index c6956a819dc3..000000000000 --- a/svx/inc/svx/emphitem.hxx +++ /dev/null @@ -1,94 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: emphitem.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_EMPHITEM_HXX -#define _SVX_EMPHITEM_HXX - -// include --------------------------------------------------------------- - -#include <vcl/vclenum.hxx> -#include <svl/intitem.hxx> -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#include "svx/svxdllapi.h" - -class SvXMLUnitConverter; -namespace rtl -{ - class OUString; -} - -// class SvxEmphasisMarkItem ---------------------------------------------- - -/* [Beschreibung] - - Dieses Item beschreibt die Font-Betonung. -*/ - -class SVX_DLLPUBLIC SvxEmphasisMarkItem : public SfxUInt16Item -{ -public: - TYPEINFO(); - - SvxEmphasisMarkItem( const FontEmphasisMark eVal /*= EMPHASISMARK_NONE*/, - const USHORT nId ); - - // "pure virtual Methoden" vom SfxPoolItem + SfxEnumItem - 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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, - BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, - BYTE nMemberId = 0 ); - - inline SvxEmphasisMarkItem& operator=(const SvxEmphasisMarkItem& rItem ) - { - SetValue( rItem.GetValue() ); - return *this; - } - - // enum cast - FontEmphasisMark GetEmphasisMark() const - { return (FontEmphasisMark)GetValue(); } - void SetEmphasisMark( FontEmphasisMark eNew ) - { SetValue( (USHORT)eNew ); } -}; - -#endif // #ifndef _SVX_EMPHITEM_HXX - diff --git a/svx/inc/svx/escpitem.hxx b/svx/inc/svx/escpitem.hxx deleted file mode 100644 index f96c3479dd0f..000000000000 --- a/svx/inc/svx/escpitem.hxx +++ /dev/null @@ -1,120 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: escpitem.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_ESCPITEM_HXX -#define _SVX_ESCPITEM_HXX - -// include --------------------------------------------------------------- - -#include <svl/eitem.hxx> -#include <svx/svxenum.hxx> -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#include "svx/svxdllapi.h" - -class SvXMLUnitConverter; -namespace rtl -{ - class OUString; -} - -// 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_AUTO_SUB -101 - -/* [Beschreibung] - - Dieses Item beschreibt die Schrift-Position. -*/ - -class SVX_DLLPUBLIC SvxEscapementItem : public SfxEnumItemInterface -{ - short nEsc; - BYTE nProp; -public: - TYPEINFO(); - - SvxEscapementItem( const USHORT nId ); - SvxEscapementItem( const SvxEscapement eEscape, - const USHORT nId ); - SvxEscapementItem( const short nEsc, const BYTE nProp, - const USHORT nId ); - - // "pure virtual Methoden" vom SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; - - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_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; - - inline void SetEscapement( const SvxEscapement eNew ) - { - if( SVX_ESCAPEMENT_OFF == eNew ) - nEsc = 0, nProp = 100; - else - if( SVX_ESCAPEMENT_SUPERSCRIPT == eNew ) - nEsc = DFLT_ESC_SUPER, nProp = DFLT_ESC_PROP; - else - nEsc = DFLT_ESC_SUB, nProp = DFLT_ESC_PROP; - } - inline SvxEscapement GetEscapement() const { return static_cast< SvxEscapement >( GetEnumValue() ); } - - inline short &GetEsc() { return nEsc; } - inline short GetEsc() const { return nEsc; } - - inline BYTE &GetProp() { return nProp; } - inline BYTE GetProp() const { return nProp; } - - inline SvxEscapementItem& operator=(const SvxEscapementItem& rEsc) - { - nEsc = rEsc.GetEsc(); - nProp = rEsc.GetProp(); - return *this; - } - - virtual USHORT GetValueCount() const; - virtual String GetValueTextByPos( USHORT nPos ) const; - virtual USHORT GetEnumValue() const; - virtual void SetEnumValue( USHORT nNewVal ); -}; - -#endif - diff --git a/svx/inc/svx/exthelpid.hrc b/svx/inc/svx/exthelpid.hrc index bd7b2b1c31aa..68cd1b224650 100644 --- a/svx/inc/svx/exthelpid.hrc +++ b/svx/inc/svx/exthelpid.hrc @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: helpid.hrc,v $ - * $Revision: 1.78 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -41,7 +38,7 @@ // Help-Ids -------------------------------------------------------------- #define HID_GALLERY_ACTUALIZE (HID_SVX_EXT0_START + 0) -#define HID_GALLERY_TITLE (HID_SVX_EXT0_START + 1)
+#define HID_GALLERY_TITLE (HID_SVX_EXT0_START + 1) // please adjust ACT_SVX_EXT_HID_END2 below if you add entries here! diff --git a/svx/inc/svx/extrud3d.hxx b/svx/inc/svx/extrud3d.hxx index ee0c38af9fdd..621ec9125e6e 100644 --- a/svx/inc/svx/extrud3d.hxx +++ b/svx/inc/svx/extrud3d.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: extrud3d.hxx,v $ - * $Revision: 1.4.18.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/extrusionbar.hxx b/svx/inc/svx/extrusionbar.hxx index 7bdf512cce2b..44a2c5e2f917 100644 --- a/svx/inc/svx/extrusionbar.hxx +++ b/svx/inc/svx/extrusionbar.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: extrusionbar.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/f3dchild.hxx b/svx/inc/svx/f3dchild.hxx index 1f1237ae3c6a..853280d16f28 100644 --- a/svx/inc/svx/f3dchild.hxx +++ b/svx/inc/svx/f3dchild.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: f3dchild.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/fhgtitem.hxx b/svx/inc/svx/fhgtitem.hxx deleted file mode 100644 index e77457a94e61..000000000000 --- a/svx/inc/svx/fhgtitem.hxx +++ /dev/null @@ -1,122 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: fhgtitem.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_FHGTITEM_HXX -#define _SVX_FHGTITEM_HXX - -// include --------------------------------------------------------------- - -#include <svl/poolitem.hxx> -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#include "svx/svxdllapi.h" - -class SvXMLUnitConverter; -namespace rtl -{ - class OUString; -} - -// class SvxFontHeightItem ----------------------------------------------- - -// Achtung: Twips-Werte - -/* [Beschreibung] - - Dieses Item beschreibt die Font-Hoehe. -*/ - -#define FONTHEIGHT_16_VERSION ((USHORT)0x0001) -#define FONTHEIGHT_UNIT_VERSION ((USHORT)0x0002) - -class SVX_DLLPUBLIC SvxFontHeightItem : public SfxPoolItem -{ - UINT32 nHeight; - USHORT nProp; // default 100% - SfxMapUnit ePropUnit; // Percent, Twip, ... -public: - TYPEINFO(); - - SvxFontHeightItem( const ULONG nSz /*= 240*/, const USHORT nPropHeight /*= 100*/, - const USHORT nId ); - - // "pure virtual Methoden" vom SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_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 nItemVersion) const; - virtual int ScaleMetrics( long nMult, long nDiv ); - virtual int HasMetrics() const; - - inline SvxFontHeightItem& operator=(const SvxFontHeightItem& rSize) - { - SetHeightValue( rSize.GetHeight() ); - SetProp( rSize.GetProp(), ePropUnit ); - return *this; - } - - void SetHeight( UINT32 nNewHeight, const USHORT nNewProp = 100, - SfxMapUnit eUnit = SFX_MAPUNIT_RELATIVE ); - - void SetHeight( UINT32 nNewHeight, USHORT nNewProp, - SfxMapUnit eUnit, SfxMapUnit eCoreUnit ); - - UINT32 GetHeight() const { return nHeight; } - - void SetHeightValue( UINT32 nNewHeight ) - { - DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" ); - nHeight = nNewHeight; - } - - void SetProp( const USHORT nNewProp, - SfxMapUnit eUnit = SFX_MAPUNIT_RELATIVE ) - { - DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" ); - nProp = nNewProp; - ePropUnit = eUnit; - } - - USHORT GetProp() const { return nProp; } - - SfxMapUnit GetPropUnit() const { return ePropUnit; } // Percent, Twip, ... -}; - -#endif - diff --git a/svx/inc/svx/fillctrl.hxx b/svx/inc/svx/fillctrl.hxx index 7fb21f9d7b63..51ee743ca093 100644 --- a/svx/inc/svx/fillctrl.hxx +++ b/svx/inc/svx/fillctrl.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fillctrl.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/flditem.hxx b/svx/inc/svx/flditem.hxx deleted file mode 100644 index 1d14870d33d3..000000000000 --- a/svx/inc/svx/flditem.hxx +++ /dev/null @@ -1,430 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: flditem.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_FLDITEM_HXX -#define _SVX_FLDITEM_HXX - -#include <i18npool/lang.h> -#include <tools/time.hxx> -#include <tools/date.hxx> -#include <svl/poolitem.hxx> -#include <tools/pstm.hxx> -#include "svx/svxdllapi.h" - -class SvNumberFormatter; -class MetaAction; - -// class SvxFieldItem --------------------------------------------------- - - - -class SVX_DLLPUBLIC SvxFieldData : public SvPersistBase -{ -public: - SV_DECL_PERSIST1( SvxFieldData, SvPersistBase, 1 ) - - SvxFieldData(); - virtual ~SvxFieldData(); - - virtual SvxFieldData* Clone() const; - virtual int operator==( const SvxFieldData& ) const; - - virtual MetaAction* createBeginComment() const; - virtual MetaAction* createEndComment() const; -}; - -/* -[Beschreibung] -In diesem Item wird ein Feld (SvxFieldData) gespeichert. -Das Feld gehoert dem Item. -Das Feld selbst wird durch eine Ableitung von SvxFieldData bestimmt. (RTTI) -*/ - -class SVX_DLLPUBLIC SvxFieldItem : public SfxPoolItem -{ -private: - SvxFieldData* pField; - - SVX_DLLPRIVATE SvxFieldItem( SvxFieldData* pField, const USHORT nId ); - -public: - TYPEINFO(); - - SvxFieldItem( const SvxFieldData& rField, const USHORT nId ); - 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; - - 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_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 - -enum SvxDateType { SVXDATETYPE_FIX, SVXDATETYPE_VAR }; -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 - }; - -class SVX_DLLPUBLIC SvxDateField : public SvxFieldData -{ - sal_uInt32 nFixDate; - SvxDateType eType; - SvxDateFormat eFormat; - -public: - SV_DECL_PERSIST1( SvxDateField, SvxFieldData, SVX_DATEFIELD ) - - SvxDateField(); - SvxDateField( const Date& rDate, - SvxDateType eType = SVXDATETYPE_VAR, - SvxDateFormat eFormat = SVXDATEFORMAT_STDSMALL ); - - 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; } - - SvxDateFormat GetFormat() const { return eFormat; } - void SetFormat( SvxDateFormat eFmt ) { eFormat = eFmt; } - - // deprecated, to be removed - 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 ); - - 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 - }; - -class SVX_DLLPUBLIC SvxURLField : public SvxFieldData -{ -private: - SvxURLFormat eFormat; - XubString aURL; // URL-Adresse - XubString aRepresentation; // Was wird dargestellt - XubString aTargetFrame; // In welchem Frame - -public: - SV_DECL_PERSIST1( SvxURLField, SvxFieldData, SVX_URLFIELD ) - - 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& GetRepresentation() const { return aRepresentation; } - void SetRepresentation( const XubString& rRep ) { aRepresentation= rRep; } - - const XubString& GetTargetFrame() const { return aTargetFrame; } - void SetTargetFrame( const XubString& rFrm ) { aTargetFrame = rFrm; } - - SvxURLFormat GetFormat() const { return eFormat; } - void SetFormat( SvxURLFormat eFmt ) { eFormat = eFmt; } - - virtual SvxFieldData* Clone() const; - virtual int operator==( const SvxFieldData& ) const; - - virtual MetaAction* createBeginComment() const; -}; - -class SVX_DLLPUBLIC SvxPageField : public SvxFieldData -{ -public: - SV_DECL_PERSIST1( SvxPageField, SvxFieldData, SVX_PAGEFIELD ) - SvxPageField() {} - virtual SvxFieldData* Clone() const; - virtual int operator==( const SvxFieldData& ) const; - - virtual MetaAction* createBeginComment() const; -}; - -class SVX_DLLPUBLIC SvxPagesField : public SvxFieldData -{ -public: - SV_DECL_PERSIST1( SvxPagesField, SvxFieldData, SVX_PAGESFIELD ) - SvxPagesField() {} - virtual SvxFieldData* Clone() const; - virtual int operator==( const SvxFieldData& ) const; -}; - -class SVX_DLLPUBLIC SvxTimeField : public SvxFieldData -{ -public: - SV_DECL_PERSIST1( SvxTimeField, SvxFieldData, SVX_TIMEFIELD ) - SvxTimeField() {} - virtual SvxFieldData* Clone() const; - virtual int operator==( const SvxFieldData& ) const; - - virtual MetaAction* createBeginComment() const; -}; - -class SVX_DLLPUBLIC SvxFileField : public SvxFieldData -{ -public: - SV_DECL_PERSIST1( SvxFileField, SvxFieldData, SVX_FILEFIELD ) - SvxFileField() {} - virtual SvxFieldData* Clone() const; - virtual int operator==( const SvxFieldData& ) const; -}; - -class SVX_DLLPUBLIC SvxTableField : public SvxFieldData -{ -public: - SV_DECL_PERSIST1( SvxTableField, SvxFieldData, SVX_TABLEFIELD ) - SvxTableField() {} - 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 - 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 - }; - -class SVX_DLLPUBLIC SvxExtTimeField : public SvxFieldData -{ -private: - sal_uInt32 nFixTime; - SvxTimeType eType; - SvxTimeFormat eFormat; - -public: - SV_DECL_PERSIST1( SvxExtTimeField, SvxFieldData, SVX_EXT_TIMEFIELD ) - SvxExtTimeField(); - SvxExtTimeField( const Time& rTime, - SvxTimeType eType = SVXTIMETYPE_VAR, - SvxTimeFormat eFormat = SVXTIMEFORMAT_STANDARD ); - - 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; } - - SvxTimeFormat GetFormat() const { return eFormat; } - void SetFormat( SvxTimeFormat eFmt ) { eFormat = eFmt; } - - // deprecated, to be removed - 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 MetaAction* createBeginComment() const; -}; - - -enum SvxFileType { SVXFILETYPE_FIX, SVXFILETYPE_VAR }; -enum SvxFileFormat { SVXFILEFORMAT_NAME_EXT, // Dateiname mit Extension - SVXFILEFORMAT_FULLPATH, // vollstndiger Pfad - SVXFILEFORMAT_PATH, // nur Pfad - SVXFILEFORMAT_NAME // nur Dateiname - }; - - - -class SVX_DLLPUBLIC SvxExtFileField : public SvxFieldData -{ -private: - XubString aFile; - SvxFileType eType; - SvxFileFormat eFormat; - -public: - SV_DECL_PERSIST1( SvxExtFileField, SvxFieldData, SVX_EXT_FILEFIELD ) - SvxExtFileField(); - SvxExtFileField( const XubString& rString, - SvxFileType eType = SVXFILETYPE_VAR, - SvxFileFormat eFormat = SVXFILEFORMAT_FULLPATH ); - - String GetFile() const { return aFile; } - void SetFile( const XubString& rString ) { aFile = rString; } - - SvxFileType GetType() const { return eType; } - void SetType( SvxFileType eTp ) { eType = eTp; } - - SvxFileFormat GetFormat() const { return eFormat; } - void SetFormat( SvxFileFormat eFmt ) { eFormat = eFmt; } - - XubString GetFormatted() const; - - virtual SvxFieldData* Clone() const; - virtual int operator==( const SvxFieldData& ) const; -}; - - -enum SvxAuthorType { SVXAUTHORTYPE_FIX, SVXAUTHORTYPE_VAR }; -enum SvxAuthorFormat { SVXAUTHORFORMAT_FULLNAME, // vollstndiger Name - SVXAUTHORFORMAT_NAME, // nur Nachname - SVXAUTHORFORMAT_FIRSTNAME, // nur Vorname - SVXAUTHORFORMAT_SHORTNAME // Initialen - }; - -class SVX_DLLPUBLIC SvxAuthorField : public SvxFieldData -{ -private: - XubString aName; - XubString aFirstName; - XubString aShortName; - SvxAuthorType eType; - SvxAuthorFormat eFormat; - -public: - SV_DECL_PERSIST1( SvxAuthorField, SvxFieldData, SVX_AUTHORFIELD ) - SvxAuthorField(); - SvxAuthorField( - const XubString& rFirstName, - const XubString& rLastName, - const XubString& rShortName, - SvxAuthorType eType = SVXAUTHORTYPE_VAR, - SvxAuthorFormat eFormat = SVXAUTHORFORMAT_FULLNAME ); - - 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 GetShortName() const { return aShortName; } - void SetShortName( const XubString& rString ) { aShortName = rString; } - - SvxAuthorType GetType() const { return eType; } - void SetType( SvxAuthorType eTp ) { eType = eTp; } - - SvxAuthorFormat GetFormat() const { return eFormat; } - void SetFormat( SvxAuthorFormat eFmt ) { eFormat = eFmt; } - - XubString GetFormatted() 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 - value is stored at the page */ -class SVX_DLLPUBLIC SvxHeaderField : public SvxFieldData -{ -public: - SV_DECL_PERSIST1( SvxHeaderField, SvxFieldData, SVX_HEADERFIELD ) - SvxHeaderField() {} - 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 - value is stored at the page */ -class SVX_DLLPUBLIC SvxFooterField : public SvxFieldData -{ -public: - SV_DECL_PERSIST1( SvxFooterField, SvxFieldData, SVX_FOOTERFIELD ) - SvxFooterField() {} - 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 - value is stored at the page */ -class SVX_DLLPUBLIC SvxDateTimeField : public SvxFieldData -{ -public: - SV_DECL_PERSIST1( SvxDateTimeField, SvxFieldData, SVX_DATEFIMEFIELD ) - SvxDateTimeField() {} - - static String GetFormatted( Date& rDate, Time& rTime, int eFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage ); - - virtual SvxFieldData* Clone() const; - virtual int operator==( const SvxFieldData& ) const; -}; - - - - -#endif - diff --git a/svx/inc/svx/float3d.hxx b/svx/inc/svx/float3d.hxx index 889701764413..432d78b211ad 100644 --- a/svx/inc/svx/float3d.hxx +++ b/svx/inc/svx/float3d.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: float3d.hxx,v $ - * $Revision: 1.3.226.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/fmdmod.hxx b/svx/inc/svx/fmdmod.hxx index 69b01019032a..26af5971be03 100644 --- a/svx/inc/svx/fmdmod.hxx +++ b/svx/inc/svx/fmdmod.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fmdmod.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/fmdpage.hxx b/svx/inc/svx/fmdpage.hxx index a9f2783d643a..70fe7eb74eaf 100644 --- a/svx/inc/svx/fmdpage.hxx +++ b/svx/inc/svx/fmdpage.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fmdpage.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/fmglob.hxx b/svx/inc/svx/fmglob.hxx index e0ba5cc12e37..c361e13a759a 100644 --- a/svx/inc/svx/fmglob.hxx +++ b/svx/inc/svx/fmglob.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fmglob.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/fmgridcl.hxx b/svx/inc/svx/fmgridcl.hxx index f8e04c4c405c..c0e9e7e34d78 100644 --- a/svx/inc/svx/fmgridcl.hxx +++ b/svx/inc/svx/fmgridcl.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fmgridcl.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/fmmodel.hxx b/svx/inc/svx/fmmodel.hxx index f831729b5006..9d8ad2ca9e64 100644 --- a/svx/inc/svx/fmmodel.hxx +++ b/svx/inc/svx/fmmodel.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fmmodel.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/fmpage.hxx b/svx/inc/svx/fmpage.hxx index 1b5de5eabf08..4195f776f3c2 100644 --- a/svx/inc/svx/fmpage.hxx +++ b/svx/inc/svx/fmpage.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fmpage.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/fmsearch.hxx b/svx/inc/svx/fmsearch.hxx index 85e5e94f33ee..b2722c7016b9 100644 --- a/svx/inc/svx/fmsearch.hxx +++ b/svx/inc/svx/fmsearch.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fmsearch.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/fmshell.hxx b/svx/inc/svx/fmshell.hxx index 9f180156367f..0688beec65b3 100644 --- a/svx/inc/svx/fmshell.hxx +++ b/svx/inc/svx/fmshell.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fmshell.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/fmtools.hxx b/svx/inc/svx/fmtools.hxx index b74f00aa236c..36fa180fa348 100644 --- a/svx/inc/svx/fmtools.hxx +++ b/svx/inc/svx/fmtools.hxx @@ -2,7 +2,7 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * diff --git a/svx/inc/svx/fmview.hxx b/svx/inc/svx/fmview.hxx index 3b965967ed42..34f0ea62a8bf 100644 --- a/svx/inc/svx/fmview.hxx +++ b/svx/inc/svx/fmview.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fmview.hxx,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/fntctl.hxx b/svx/inc/svx/fntctl.hxx index 924ae78c4182..f28e158df1df 100644 --- a/svx/inc/svx/fntctl.hxx +++ b/svx/inc/svx/fntctl.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fntctl.hxx,v $ - * $Revision: 1.4.76.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/fntctrl.hxx b/svx/inc/svx/fntctrl.hxx index a0de3b2d3048..2b49e413e7be 100644 --- a/svx/inc/svx/fntctrl.hxx +++ b/svx/inc/svx/fntctrl.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fntctrl.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -33,7 +30,7 @@ // include --------------------------------------------------------------- #include <vcl/window.hxx> -#include <svx/svxfont.hxx> +#include <editeng/svxfont.hxx> #include "svx/svxdllapi.h" #ifndef _RTL_USTRING_HXX_ diff --git a/svx/inc/svx/fntszctl.hxx b/svx/inc/svx/fntszctl.hxx index 2fb576a98793..dfeec808e602 100644 --- a/svx/inc/svx/fntszctl.hxx +++ b/svx/inc/svx/fntszctl.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fntszctl.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/fontwork.hxx b/svx/inc/svx/fontwork.hxx index f4d9146018a8..73f0ac5dd712 100644 --- a/svx/inc/svx/fontwork.hxx +++ b/svx/inc/svx/fontwork.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fontwork.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/fontworkbar.hxx b/svx/inc/svx/fontworkbar.hxx index f1b2b48ae09a..95d5135075bb 100644 --- a/svx/inc/svx/fontworkbar.hxx +++ b/svx/inc/svx/fontworkbar.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fontworkbar.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/forbiddenruleitem.hxx b/svx/inc/svx/forbiddenruleitem.hxx deleted file mode 100644 index 24010eacc5ed..000000000000 --- a/svx/inc/svx/forbiddenruleitem.hxx +++ /dev/null @@ -1,75 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: forbiddenruleitem.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_FORBIDDENRULEITEM_HXX -#define _SVX_FORBIDDENRULEITEM_HXX - -// include --------------------------------------------------------------- - -#include <svl/eitem.hxx> -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#include "svx/svxdllapi.h" - -// class SvxForbiddenRuleItem ----------------------------------------- - -/* [Description] - - This item describe how to handle the last character of a line. -*/ - -class SVX_DLLPUBLIC SvxForbiddenRuleItem : public SfxBoolItem -{ -public: - TYPEINFO(); - - 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 SfxItemPresentation GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - String &rText, - const IntlWrapper * = 0 ) const; - - inline SvxForbiddenRuleItem& operator=( - const SvxForbiddenRuleItem& rItem ) - { - SetValue( rItem.GetValue() ); - return *this; - } -}; - -#endif - diff --git a/svx/inc/svx/framebordertype.hxx b/svx/inc/svx/framebordertype.hxx index 7f3ce1327ee1..f720c215fffc 100644 --- a/svx/inc/svx/framebordertype.hxx +++ b/svx/inc/svx/framebordertype.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: framebordertype.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/framelink.hxx b/svx/inc/svx/framelink.hxx index 012e0f103ac3..9d5e2cd3b1c6 100644 --- a/svx/inc/svx/framelink.hxx +++ b/svx/inc/svx/framelink.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: framelink.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/framelinkarray.hxx b/svx/inc/svx/framelinkarray.hxx index c1aec01eb017..cebb4e0395e4 100644 --- a/svx/inc/svx/framelinkarray.hxx +++ b/svx/inc/svx/framelinkarray.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: framelinkarray.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/frmdir.hxx b/svx/inc/svx/frmdir.hxx deleted file mode 100644 index 04cdcc78ee23..000000000000 --- a/svx/inc/svx/frmdir.hxx +++ /dev/null @@ -1,63 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: frmdir.hxx,v $ - * $Revision: 1.3 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVX_FRMDIR_HXX -#define _SVX_FRMDIR_HXX - -// ---------------------------------------------------------------------------- - -/** Defines possible text directions in frames. */ -enum SvxFrameDirection -{ - /** Horizontal, from left to right, from top to bottom - (typical for western languages). */ - FRMDIR_HORI_LEFT_TOP, - - /** Horizontal, from right to left, from top to bottom - (typical for ararbic/hebrew languages). */ - FRMDIR_HORI_RIGHT_TOP, - - /** Vertical, from top to bottom, from right to left - (typical for asian languages). */ - FRMDIR_VERT_TOP_RIGHT, - - /** Vertical, from top to bottom, from left to right - (typical for mongol language). */ - FRMDIR_VERT_TOP_LEFT, - - /** Use the value from the environment, can only be used in frames. */ - FRMDIR_ENVIRONMENT -}; - -// ---------------------------------------------------------------------------- - -#endif // #ifndef _SVX_FRMDIR_HXX - - diff --git a/svx/inc/svx/frmdiritem.hxx b/svx/inc/svx/frmdiritem.hxx deleted file mode 100644 index e82638c94d95..000000000000 --- a/svx/inc/svx/frmdiritem.hxx +++ /dev/null @@ -1,86 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: frmdiritem.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_FRMDIRITEM_HXX -#define _SVX_FRMDIRITEM_HXX - -// include --------------------------------------------------------------- - -#include <svl/intitem.hxx> -#include <svx/frmdir.hxx> -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#include "svx/svxdllapi.h" - -// class SvxFrameDirectionItem ---------------------------------------------- - -/* [Description] - - This item defines a frame direction, which place the content inside - a frame. It exist different kind of directions which are used to the - layout text for Western, CJK and CTL languages. -*/ - -class SVX_DLLPUBLIC SvxFrameDirectionItem : public SfxUInt16Item -{ -public: - TYPEINFO(); - - SvxFrameDirectionItem( USHORT nWhich ); - SvxFrameDirectionItem( SvxFrameDirection nValue /*= FRMDIR_HORI_LEFT_TOP*/, - 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 SfxItemPresentation GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - String &rText, - const IntlWrapper * = 0 ) const; - - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, - BYTE nMemberId ); - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, - BYTE nMemberId ) const; - - inline SvxFrameDirectionItem& operator=( const SvxFrameDirectionItem& rItem ) - { - SetValue( rItem.GetValue() ); - return *this; - } -}; - -#endif // #ifndef _SVX_FRMDIRITEM_HXX - diff --git a/svx/inc/svx/frmdirlbox.hxx b/svx/inc/svx/frmdirlbox.hxx index 872d6ddd5423..24eb27362e45 100644 --- a/svx/inc/svx/frmdirlbox.hxx +++ b/svx/inc/svx/frmdirlbox.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: frmdirlbox.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -35,7 +32,7 @@ #include <vcl/lstbox.hxx> #endif #include <sfx2/itemconnect.hxx> -#include <svx/frmdir.hxx> +#include <editeng/frmdir.hxx> #include "svx/svxdllapi.h" class SvxFrameDirectionItem; diff --git a/svx/inc/svx/frmsel.hxx b/svx/inc/svx/frmsel.hxx index fa7208de1a31..b342c58809bb 100644 --- a/svx/inc/svx/frmsel.hxx +++ b/svx/inc/svx/frmsel.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: frmsel.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/gallery1.hxx b/svx/inc/svx/gallery1.hxx index 04ae4814c91d..7b58456a8889 100644 --- a/svx/inc/svx/gallery1.hxx +++ b/svx/inc/svx/gallery1.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: gallery1.hxx,v $ - * $Revision: 1.8.216.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/galmisc.hxx b/svx/inc/svx/galmisc.hxx index 752c7cc005d7..dd8b08fc8fad 100644 --- a/svx/inc/svx/galmisc.hxx +++ b/svx/inc/svx/galmisc.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: galmisc.hxx,v $ - * $Revision: 1.19 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/graphctl.hxx b/svx/inc/svx/graphctl.hxx index 7dc65effaf1e..f71f7fe6c43c 100644 --- a/svx/inc/svx/graphctl.hxx +++ b/svx/inc/svx/graphctl.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: graphctl.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/grfcrop.hxx b/svx/inc/svx/grfcrop.hxx index 7281bc559b4d..fd4ccc175135 100644 --- a/svx/inc/svx/grfcrop.hxx +++ b/svx/inc/svx/grfcrop.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: grfcrop.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/grfflt.hxx b/svx/inc/svx/grfflt.hxx index 608a6561e97c..88c31fe42d13 100644 --- a/svx/inc/svx/grfflt.hxx +++ b/svx/inc/svx/grfflt.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: grfflt.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -40,7 +37,7 @@ #include <vcl/dialog.hxx> #include <vcl/group.hxx> #include <vcl/salbtype.hxx> -#include <goodies/grfmgr.hxx> +#include <svtools/grfmgr.hxx> #include <svx/graphctl.hxx> #include <svx/dlgctrl.hxx> #include <svx/rectenum.hxx> diff --git a/svx/inc/svx/gridctrl.hxx b/svx/inc/svx/gridctrl.hxx index 834ea17eaa1f..6334137bc221 100644 --- a/svx/inc/svx/gridctrl.hxx +++ b/svx/inc/svx/gridctrl.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: gridctrl.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/hangulhanja.hxx b/svx/inc/svx/hangulhanja.hxx deleted file mode 100644 index e4eefce17ea3..000000000000 --- a/svx/inc/svx/hangulhanja.hxx +++ /dev/null @@ -1,307 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: hangulhanja.hxx,v $ - * $Revision: 1.3 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef SVX_HANGUL_HANJA_CONVERSION_HXX -#define SVX_HANGUL_HANJA_CONVERSION_HXX - -#include <vcl/window.hxx> -#include <svx/svxenum.hxx> - -#include <memory> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/lang/Locale.hpp> -#include <com/sun/star/uno/Sequence.hxx> -#include "svx/svxdllapi.h" - -//............................................................................. -namespace svx -{ -//............................................................................. - - class HangulHanjaConversion_Impl; - - //========================================================================= - //= HangulHanjaConversion - //========================================================================= - /** encapsulates Hangul-Hanja conversion functionality - - <p>terminology: - <ul><li>A <b>text <em>portion</em></b> is some (potentially large) piece of text - which is to be analyzed for convertible sub-strings.</li> - <li>A <b>text <em>unit</em></b> is a sub string in a text portion, which is - to be converted as a whole.</li> - </ul> - For instance, you could have two independent selections within your document, which are then - two text portions. A text unit would be single Hangul/Hanja words within a portion, or even - single Hangul syllabills when "replace by character" is enabled. - </p> - */ - class SVX_DLLPUBLIC HangulHanjaConversion - { - friend class HangulHanjaConversion_Impl; - - 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 - }; - - enum ConversionType // does not specify direction... - { - eConvHangulHanja, // Korean Hangul/Hanja conversion - eConvSimplifiedTraditional // Chinese simplified / Chinese traditional conversion - }; - - // 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 - { - eHangulToHanja, - eHanjaToHangul - }; - - enum ConversionFormat - { - eSimpleConversion, // used for simplified / traditional Chinese as well - eHangulBracketed, - eHanjaBracketed, - eRubyHanjaAbove, - eRubyHanjaBelow, - eRubyHangulAbove, - eRubyHangulBelow - }; - - private: - ::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; - - // Forbidden and not implemented. - HangulHanjaConversion (const HangulHanjaConversion &); - HangulHanjaConversion & operator= (const HangulHanjaConversion &); - - public: - HangulHanjaConversion( - Window* _pUIParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB, - const ::com::sun::star::lang::Locale& _rSourceLocale, - const ::com::sun::star::lang::Locale& _rTargetLocale, - const Font* _pTargetFont, - sal_Int32 nOptions, - sal_Bool _bIsInteractive - ); - - virtual ~HangulHanjaConversion( ); - - // converts the whole document - void ConvertDocument(); - - LanguageType GetSourceLanguage() const; - LanguageType GetTargetLanguage() const; - const Font * GetTargetFont() const; - sal_Int32 GetConversionOptions() const; - sal_Bool IsInteractive() const; - - // chinese text conversion - static inline sal_Bool IsSimplified( LanguageType nLang ); - static inline sal_Bool IsTraditional( LanguageType nLang ); - static inline sal_Bool IsChinese( LanguageType nLang ); - static inline sal_Bool IsSimilarChinese( LanguageType nLang1, LanguageType nLang2 ); - - // used to specify that the conversion direction states from the - // last incarnation should be used as - // 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 sal_Bool IsUseSavedConversionDirectionState(); - - protected: - /** retrieves the next text portion which is to be analyzed - - <p>pseudo-abstract, needs to be overridden</p> - - @param _rNextPortion - upon return, this must contain the next text portion - @param _rLangOfPortion - upon return, this must contain the language for the found text portion. - (necessary for Chinese translation since there are 5 language variants - too look for even if the 'source' language usually is only 'simplified' - or 'traditional'.) - */ - virtual void GetNextPortion( - ::rtl::OUString& /* [out] */ _rNextPortion, - LanguageType& /* [out] */ _rLangOfPortion, - sal_Bool /* [in] */ _bAllowImplicitChangesForNotConvertibleText ); - - /** announces a new "current unit" - - <p>This will be called whenever it is necessary to interactively ask the user for - a conversion. In such a case, a range within the current portion (see <member>GetNextPortion</member>) - is presented to the user for chosing a substitution. Additionally, this method is called, - so that derived classes can e.g. highlight this text range in a document view.</p> - - <p>Note that the indexes are relative to the most recent replace action. See - <member>ReplaceUnit</member> for details.</p> - - @param _nUnitStart - the start index of the unit - - @param _nUnitEnd - the start index (exclusively!) of the unit. - - @param _bAllowImplicitChangesForNotConvertibleText - allows implicit changes other than the text itself for the - text parts not being convertible. - Used for chinese translation to attribute all not convertible - text (e.g. western text, empty paragraphs, spaces, ...) to - the target language and target font of the conversion. - This is to ensure that after the conversion any new text entered - anywhere in the document will have the target language (of course - CJK Language only) and target font (CJK font only) set. - - @see GetNextPortion - */ - virtual void HandleNewUnit( const sal_Int32 _nUnitStart, const sal_Int32 _nUnitEnd ); - - /** replaces a text unit within a text portion with a new text - - <p>pseudo-abstract, needs to be overridden</p> - - <p>Note an important thing about the indicies: They are always relative to the <em>previous - call</em> of ReplaceUnit. This means whe you get a call to ReplaceUnit, and replace some text - in your document, than you have to remember the document position immediately <em>behind</em> - the changed text. In a next call to ReplaceUnit, an index of <em>0</em> will denote exactly - this position behind the previous replacement<br/> - The reaons for this is that this class here does not know anything about your document structure, - so after a replacement took place, it's impossible to address anything in the range from the - beginning of the portion up to the replaced text.<br/> - In the very first call to ReplaceUnit, an index of <em>0</em> denotes the very first position of - the current portion.</p> - - <p>If the language of the text to be replaced is different from - 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 - that language.</p> - - @param _nUnitStart - the start index of the range to replace - - @param _nUnitEnd - the end index (exclusively!) of the range to replace. E.g., an index - pair (4,5) indicates a range of length 1. - - @param _rOrigText - the original text to be replaced (as returned by GetNextPortion). - Since in Chinese conversion the original text is needed as well - in order to only do the minimal necassry text changes and to keep - as much attributes as possible this is supplied here as well. - - @param _rReplaceWith - The replacement text - - @param _rOffsets - 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 - 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 - _rOffsets is replacing the character at index i in the original - text for all valid index values of i. - - @param _eAction - replacement action to take - - @param pNewUnitLanguage - if the replacement unit is required to have a new language that - is specified here. If the language is to be left unchanged this - is the 0 pointer. - */ - virtual void ReplaceUnit( - const sal_Int32 _nUnitStart, const sal_Int32 _nUnitEnd, - const ::rtl::OUString& _rOrigText, - const ::rtl::OUString& _rReplaceWith, - const ::com::sun::star::uno::Sequence< sal_Int32 > &_rOffsets, - ReplacementAction _eAction, - LanguageType *pNewUnitLanguage - ); - - /** specifies if rubies are supported by the document implementing - this class. - - @return - <TRUE/> if rubies are supported. - */ - virtual sal_Bool HasRubySupport() const; - }; - - sal_Bool HangulHanjaConversion::IsSimplified( LanguageType nLang ) - { - return nLang == LANGUAGE_CHINESE_SIMPLIFIED || - nLang == LANGUAGE_CHINESE_SINGAPORE; - } - - sal_Bool HangulHanjaConversion::IsTraditional( LanguageType nLang ) - { - return nLang == LANGUAGE_CHINESE_TRADITIONAL || - nLang == LANGUAGE_CHINESE_HONGKONG || - nLang == LANGUAGE_CHINESE_MACAU; - } - - sal_Bool HangulHanjaConversion::IsChinese( LanguageType nLang ) - { - return IsTraditional( nLang ) || IsSimplified( nLang ); - } - - sal_Bool HangulHanjaConversion::IsSimilarChinese( LanguageType nLang1, LanguageType nLang2 ) - { - return (IsTraditional(nLang1) && IsTraditional(nLang2)) || - (IsSimplified(nLang1) && IsSimplified(nLang2)); - } - -//............................................................................. -} // namespace svx -//............................................................................. - -#endif // SVX_HANGUL_HANJA_CONVERSION_HXX diff --git a/svx/inc/svx/hdft.hxx b/svx/inc/svx/hdft.hxx index 27a95ff92b6c..b3c425b85b93 100644 --- a/svx/inc/svx/hdft.hxx +++ b/svx/inc/svx/hdft.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: hdft.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/helperhittest3d.hxx b/svx/inc/svx/helperhittest3d.hxx index 0364fd6622fc..eae61aa253c5 100644 --- a/svx/inc/svx/helperhittest3d.hxx +++ b/svx/inc/svx/helperhittest3d.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: helperhittest3d.hxx,v $ - * $Revision: 1.1.2.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/hngpnctitem.hxx b/svx/inc/svx/hngpnctitem.hxx deleted file mode 100644 index dad568857bab..000000000000 --- a/svx/inc/svx/hngpnctitem.hxx +++ /dev/null @@ -1,75 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: hngpnctitem.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_HNGPNCTITEM_HXX -#define _SVX_HNGPNCTITEM_HXX - -// include --------------------------------------------------------------- - -#include <svl/eitem.hxx> -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#include "svx/svxdllapi.h" - -// class SvxHangingPunctuationItem ----------------------------------------- - -/* [Description] - - This item describe how to handle the last character of a line. -*/ - -class SVX_DLLPUBLIC SvxHangingPunctuationItem : public SfxBoolItem -{ -public: - TYPEINFO(); - - 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 SfxItemPresentation GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - String &rText, - const IntlWrapper * = 0 ) const; - - inline SvxHangingPunctuationItem& operator=( - const SvxHangingPunctuationItem& rItem ) - { - SetValue( rItem.GetValue() ); - return *this; - } -}; - -#endif - diff --git a/svx/inc/svx/hyznitem.hxx b/svx/inc/svx/hyznitem.hxx deleted file mode 100644 index 0c6f46e09e8c..000000000000 --- a/svx/inc/svx/hyznitem.hxx +++ /dev/null @@ -1,112 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: hyznitem.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_HYZNITEM_HXX -#define _SVX_HYZNITEM_HXX - -// include --------------------------------------------------------------- - -#include <svl/poolitem.hxx> -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#include "svx/svxdllapi.h" - -class SvXMLUnitConverter; -namespace rtl -{ - class OUString; -} - -// class SvxHyphenZoneItem ----------------------------------------------- - -/* -[Beschreibung] -Dieses Item beschreibt ein Silbentrennungsattribut (Automatisch?, Anzahl der -Zeichen am Zeilenende und -anfang). -*/ - -class SVX_DLLPUBLIC SvxHyphenZoneItem : public SfxPoolItem -{ - BOOL bHyphen: 1; - BOOL bPageEnd: 1; - BYTE nMinLead; - BYTE nMinTrail; - BYTE nMaxHyphens; - - friend SvStream & operator<<( SvStream & aS, SvxHyphenZoneItem & ); - -public: - TYPEINFO(); - - SvxHyphenZoneItem( const BOOL bHyph /*= FALSE*/, - const USHORT nId ); - - // "pure virtual Methoden" vom SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_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; - - inline void SetHyphen( const BOOL bNew ) { bHyphen = bNew; } - inline BOOL IsHyphen() const { return bHyphen; } - - inline void SetPageEnd( const BOOL bNew ) { bPageEnd = bNew; } - inline BOOL IsPageEnd() const { return bPageEnd; } - - inline BYTE &GetMinLead() { return nMinLead; } - inline BYTE GetMinLead() const { return nMinLead; } - - inline BYTE &GetMinTrail() { return nMinTrail; } - inline BYTE GetMinTrail() const { return nMinTrail; } - - inline BYTE &GetMaxHyphens() { return nMaxHyphens; } - inline BYTE GetMaxHyphens() const { return nMaxHyphens; } - - inline SvxHyphenZoneItem &operator=( const SvxHyphenZoneItem &rNew ) - { - bHyphen = rNew.IsHyphen(); - bPageEnd = rNew.IsPageEnd(); - nMinLead = rNew.GetMinLead(); - nMinTrail = rNew.GetMinTrail(); - nMaxHyphens = rNew.GetMaxHyphens(); - return *this; - } -}; - -#endif - diff --git a/svx/inc/svx/ifaceids.hxx b/svx/inc/svx/ifaceids.hxx index e24386c9774d..a2be904d89a3 100644 --- a/svx/inc/svx/ifaceids.hxx +++ b/svx/inc/svx/ifaceids.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ifaceids.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/impgrf.hxx b/svx/inc/svx/impgrf.hxx deleted file mode 100644 index d99bbd04d1ea..000000000000 --- a/svx/inc/svx/impgrf.hxx +++ /dev/null @@ -1,65 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: impgrf.hxx,v $ - * $Revision: 1.7 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_IMPGRF_HXX -#define _SVX_IMPGRF_HXX - -// include --------------------------------------------------------------- - -#include <svtools/filter.hxx> - -#ifndef _BUTTON_HXX //autogen -#include <vcl/button.hxx> -#endif -#include "svx/svxdllapi.h" - -// Funktionen ------------------------------------------------------------ - -// returnt einen static Graphic-Filter, wird einmalig angelegt, -// steht immer zur Verfuegung, DARF NIE geloescht werden!!!! -SVX_DLLPUBLIC GraphicFilter* GetGrfFilter(); -SVX_DLLPUBLIC int LoadGraphic( const String& rPath, const String& rFilter, - Graphic& rGraphic, - GraphicFilter* pFilter = NULL, - USHORT* pDeterminedFormat = NULL ); - -// class SvxImportGraphicDialog ------------------------------------------ -#ifndef SV_NODIALOG - -#define ENABLE_STANDARD ((USHORT)0x0001) // Standard-Button -#define ENABLE_LINK ((USHORT)0x0002) // Verkn"upfungs-Box -#define ENABLE_STD_AND_LINK (ENABLE_STANDARD | ENABLE_LINK) -#define ENABLE_PROPERTY ((USHORT)0x0004) // Eigenschaften-Button -#define ENABLE_ALL ((USHORT)0x0007) // alle -#define ENABLE_PROP_WITHOUTLINK ((USHORT)0x0008) // Eigenschaften ohne Link -#define ENABLE_EMPTY_FILENAMES ((USHORT)0x0010) // Leere Dateinamen zulassen - -#endif // SV_NODIALOG - -#endif diff --git a/svx/inc/svx/ipolypolygoneditorcontroller.hxx b/svx/inc/svx/ipolypolygoneditorcontroller.hxx index 39b156b929ea..6c3a35218df6 100644 --- a/svx/inc/svx/ipolypolygoneditorcontroller.hxx +++ b/svx/inc/svx/ipolypolygoneditorcontroller.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ipolypolygoneditorcontroller.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/itemtype.hxx b/svx/inc/svx/itemtype.hxx deleted file mode 100644 index a01bea487147..000000000000 --- a/svx/inc/svx/itemtype.hxx +++ /dev/null @@ -1,83 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: itemtype.hxx,v $ - * $Revision: 1.3 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_ITEMTYPE_HXX -#define _SVX_ITEMTYPE_HXX - -// include --------------------------------------------------------------- - -#ifndef _SVXITEMS_HRC -#include <svx/svxitems.hrc> -#endif - -// forward --------------------------------------------------------------- -#include <tools/string.hxx> -#include <tools/resid.hxx> -#include <tools/bigint.hxx> -#include <svx/dialmgr.hxx> -#include <svl/poolitem.hxx> -#include <tools/shl.hxx> -#include "svx/svxdllapi.h" - -class Color; -class XColorTable; -class IntlWrapper; -// static and prototypes ------------------------------------------------- - -static const sal_Unicode cDelim = ','; -static const sal_Unicode cpDelim[] = { ',' , ' ', '\0' }; - -SVX_DLLPUBLIC String GetSvxString( USHORT nId ); -SVX_DLLPUBLIC String GetMetricText( long nVal, SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, const IntlWrapper * pIntl ); -#ifndef SVX_LIGHT -String GetColorString( const Color& rCol ); -#endif -SVX_DLLPUBLIC USHORT GetMetricId( SfxMapUnit eUnit ); - -// ----------------------------------------------------------------------- - -inline String GetBoolString( BOOL bVal ) -{ - return String( ResId( bVal ? RID_SVXITEMS_TRUE - : RID_SVXITEMS_FALSE, DIALOG_MGR() ) ); -} - -// ----------------------------------------------------------------------- - -inline long Scale( long nVal, long nMult, long nDiv ) -{ - BigInt aVal( nVal ); - aVal *= nMult; - aVal += nDiv/2; - aVal /= nDiv; - return aVal; -} - -#endif - diff --git a/svx/inc/svx/itemwin.hxx b/svx/inc/svx/itemwin.hxx index 64dfcfe1933b..8f6506b90e66 100644 --- a/svx/inc/svx/itemwin.hxx +++ b/svx/inc/svx/itemwin.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: itemwin.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/keepitem.hxx b/svx/inc/svx/keepitem.hxx deleted file mode 100644 index f12f6a79e413..000000000000 --- a/svx/inc/svx/keepitem.hxx +++ /dev/null @@ -1,84 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: keepitem.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_KEEPITEM_HXX -#define _SVX_KEEPITEM_HXX - -// include --------------------------------------------------------------- - -#include <svl/eitem.hxx> -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#include "svx/svxdllapi.h" - -namespace rtl -{ - class OUString; -} - -// class SvxFmtKeepItem ------------------------------------------------ - -/* -[Beschreibung] -Dieses Item beschreibt eine logische Variable "Absaetze zusammenhalten?". -*/ - -class SVX_DLLPUBLIC SvxFmtKeepItem : public SfxBoolItem -{ -public: - TYPEINFO(); - - inline SvxFmtKeepItem( const BOOL bKeep /*= FALSE*/, - const USHORT _nWhich ); - 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 SfxItemPresentation GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; -}; - -inline SvxFmtKeepItem::SvxFmtKeepItem( const BOOL bKeep, const USHORT _nWhich ) : - SfxBoolItem( _nWhich, bKeep ) -{} - -inline SvxFmtKeepItem& SvxFmtKeepItem::operator=( const SvxFmtKeepItem& rKeep ) -{ - SetValue( rKeep.GetValue() ); - return *this; -} - -#endif - diff --git a/svx/inc/svx/kernitem.hxx b/svx/inc/svx/kernitem.hxx deleted file mode 100644 index 9e6f5b81da2b..000000000000 --- a/svx/inc/svx/kernitem.hxx +++ /dev/null @@ -1,86 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: kernitem.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_KERNITEM_HXX -#define _SVX_KERNITEM_HXX - -// include --------------------------------------------------------------- - -#include <svl/intitem.hxx> -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#include "svx/svxdllapi.h" - -class SvXMLUnitConverter; -namespace rtl -{ - class OUString; -} - -// class SvxKerningItem -------------------------------------------------- - -// Achtung: Twips-Werte -// Twips: 0 = kein Kerning - -/* [Beschreibung] - - Dieses Item beschreibt die Schrift-Laufweite. -*/ - -class SVX_DLLPUBLIC SvxKerningItem : public SfxInt16Item -{ -public: - TYPEINFO(); - - SvxKerningItem( const short nKern /*= 0*/, const USHORT nId ); - - // "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 int ScaleMetrics( long nMult, long nDiv ); - virtual int HasMetrics() const; - - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; - - inline SvxKerningItem& operator=(const SvxKerningItem& rKern) { - SetValue( rKern.GetValue() ); - 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 ); -}; - -#endif - diff --git a/svx/inc/svx/langbox.hxx b/svx/inc/svx/langbox.hxx index 476d78c53d03..0c4efa6b7231 100644 --- a/svx/inc/svx/langbox.hxx +++ b/svx/inc/svx/langbox.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: langbox.hxx,v $ - * $Revision: 1.4.242.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -60,6 +57,9 @@ class SvtLanguageTable; // opposed to Arabic-Egypt. +// load language strings from resource +SVX_DLLPUBLIC String GetDicInfoStr( const String& rName, const USHORT nLang, BOOL bNeg ); + class SVX_DLLPUBLIC SvxLanguageBox : public ListBox { public: diff --git a/svx/inc/svx/langitem.hxx b/svx/inc/svx/langitem.hxx deleted file mode 100644 index 5345fede13f7..000000000000 --- a/svx/inc/svx/langitem.hxx +++ /dev/null @@ -1,90 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: langitem.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_LANGITEM_HXX -#define _SVX_LANGITEM_HXX - -// include --------------------------------------------------------------- - -#include <svl/eitem.hxx> -#include <i18npool/lang.h> -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#include "svx/svxdllapi.h" - -class SvXMLUnitConverter; -namespace rtl -{ - class OUString; -} - -// class SvxLanguageItem ------------------------------------------------- - -/* [Beschreibung] - - Dieses Item beschreibt eine Sprache. -*/ - -class SVX_DLLPUBLIC SvxLanguageItem : public SfxEnumItem -{ -public: - TYPEINFO(); - - SvxLanguageItem( const LanguageType eLang /*= LANGUAGE_GERMAN*/, - const USHORT nId ); - - // "pure virtual Methoden" vom SfxPoolItem - 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 GetValueCount() const; - - inline SvxLanguageItem& operator=(const SvxLanguageItem& rLang) - { - SetValue( rLang.GetValue() ); - return *this; - } - - // enum cast - LanguageType GetLanguage() const - { return (LanguageType)GetValue(); } - void SetLanguage( const LanguageType eLang ) - { SetValue( (USHORT)eLang ); } - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); -}; - -#endif - diff --git a/svx/inc/svx/lathe3d.hxx b/svx/inc/svx/lathe3d.hxx index a0474fef522d..0a72b826ee0c 100644 --- a/svx/inc/svx/lathe3d.hxx +++ b/svx/inc/svx/lathe3d.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: lathe3d.hxx,v $ - * $Revision: 1.4.18.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/lcolitem.hxx b/svx/inc/svx/lcolitem.hxx deleted file mode 100644 index cd110dd19d3a..000000000000 --- a/svx/inc/svx/lcolitem.hxx +++ /dev/null @@ -1,69 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: lcolitem.hxx,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_LCOLITEM_HXX -#define _SVX_LCOLITEM_HXX - -// include --------------------------------------------------------------- - -#include <svx/colritem.hxx> -#include <svx/svxids.hrc> -#include "svx/svxdllapi.h" - -/* - * dummy-Item fuer ToolBox-Controller: - * - */ - -class SVX_DLLPUBLIC SvxLineColorItem : public SvxColorItem -{ -public: - TYPEINFO(); - - SvxLineColorItem( const USHORT nId ); - SvxLineColorItem( const Color& aColor, const USHORT nId ); - SvxLineColorItem( SvStream& rStrm, const USHORT nId ); - SvxLineColorItem( const SvxLineColorItem& rCopy ); - ~SvxLineColorItem(); - - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - String &rText, - const IntlWrapper * pIntlWrapper = 0 ) - const; - - inline SvxLineColorItem& operator=(const SvxLineColorItem& rColor) - { return (SvxLineColorItem&)SvxColorItem:: - operator=((const SvxColorItem&)rColor); } - -}; - -#endif - diff --git a/svx/inc/svx/lrspitem.hxx b/svx/inc/svx/lrspitem.hxx deleted file mode 100644 index 1f54209cc82a..000000000000 --- a/svx/inc/svx/lrspitem.hxx +++ /dev/null @@ -1,185 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: lrspitem.hxx,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_LRSPITEM_HXX -#define _SVX_LRSPITEM_HXX - -// include --------------------------------------------------------------- - -#include <svl/poolitem.hxx> -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#include "svx/svxdllapi.h" - -namespace rtl -{ - class OUString; -} - -// class SvxLRSpaceItem -------------------------------------------------- - -/* -[Beschreibung] -Linker/Rechter Rand sowie Erstzeileneinzug - -SvxLRSpaceItem bietet zwei Schnittstellen zur Befragung des linken -Randes und des Erstzeileneinzuges an. Die Get-Methoden liefern -die Member zurueck, wie sie das Layout bisher auch erwartete: -Der linke Rand verschiebt sich beim negativem Erstzeileneinzug -nach links. Die SetTxt/GetTxt-Methoden setzen voraus, dass der -linke Rand der 0-Punkt des Erstzeileneinzugs darstellt: - - UI UI LAYOUT UI/TEXT UI/TEXT (Wo?) -SetTxtLeft SetTxtFirst GetLeft GetTxtLeft GetTxtFirst (Was?) - 500 -500 0 500 -500 (Wieviel?) - 500 0 500 500 0 - 500 +500 500 500 +500 - 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) - -class SVX_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 - - USHORT nPropFirstLineOfst, nPropLeftMargin, nPropRightMargin; - BOOL bAutoFirst : 1; // Automatische Berechnung der Erstzeileneinzugs - - void AdjustLeft(); // nLeftMargin und nTxtLeft werden angepasst. - -public: - TYPEINFO(); - - SvxLRSpaceItem( const USHORT nId ); - SvxLRSpaceItem( const long nLeft, const long nRight, - const long nTLeft /*= 0*/, const short nOfset /*= 0*/, - const USHORT nId ); - inline SvxLRSpaceItem& operator=( const SvxLRSpaceItem &rCpy ); - - // "pure virtual Methoden" vom SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; - - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_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 int ScaleMetrics( long nMult, long nDiv ); - virtual int HasMetrics() const; - - // Die "Layout-Schnittstelle": - inline void SetLeft ( const long nL, const USHORT nProp = 100 ); - inline void SetRight( const long nR, const USHORT nProp = 100 ); - - // abfragen / direktes setzen der absoluten Werte - inline long GetLeft() const { return nLeftMargin; } - inline long GetRight() const { return nRightMargin;} - inline void SetLeftValue( const long nL ) { nTxtLeft = nLeftMargin = nL; } - inline void SetRightValue( const long nR ) { nRightMargin = nR; } - inline BOOL IsAutoFirst() const { return bAutoFirst; } - inline void SetAutoFirst( const BOOL bNew ) { bAutoFirst = bNew; } - - // abfragen / setzen der Prozent-Werte - inline void SetPropLeft( const USHORT nProp = 100 ) - { nPropLeftMargin = nProp; } - inline void SetPropRight( const USHORT nProp = 100 ) - { nPropRightMargin = nProp;} - inline USHORT GetPropLeft() const { return nPropLeftMargin; } - inline USHORT GetPropRight() const { return nPropRightMargin;} - - // Die "UI/Text-Schnittstelle": - inline void SetTxtLeft( const long nL, const USHORT nProp = 100 ); - inline long GetTxtLeft() const { return nTxtLeft; } - - inline void SetTxtFirstLineOfst( const short nF, const USHORT nProp = 100 ); - inline short GetTxtFirstLineOfst() const { return nFirstLineOfst; } - inline void SetPropTxtFirstLineOfst( const USHORT nProp = 100 ) - { nPropFirstLineOfst = nProp; } - inline USHORT GetPropTxtFirstLineOfst() const - { return nPropFirstLineOfst; } - inline void SetTxtFirstLineOfstValue( const short nValue ) - { nFirstLineOfst = nValue; } -}; - -inline SvxLRSpaceItem &SvxLRSpaceItem::operator=( const SvxLRSpaceItem &rCpy ) -{ - nFirstLineOfst = rCpy.nFirstLineOfst; - nTxtLeft = rCpy.nTxtLeft; - nLeftMargin = rCpy.nLeftMargin; - nRightMargin = rCpy.nRightMargin; - nPropFirstLineOfst = rCpy.nPropFirstLineOfst; - nPropLeftMargin = rCpy.nPropLeftMargin; - nPropRightMargin = rCpy.nPropRightMargin; - bAutoFirst = rCpy.bAutoFirst; - return *this; -} - -inline void SvxLRSpaceItem::SetLeft( const long nL, const USHORT nProp ) -{ - nLeftMargin = (nL * nProp) / 100; - nTxtLeft = nLeftMargin; - nPropLeftMargin = nProp; -} -inline void SvxLRSpaceItem::SetRight( const long nR, const USHORT nProp ) -{ - nRightMargin = (nR * nProp) / 100; - nPropRightMargin = nProp; -} -inline void SvxLRSpaceItem::SetTxtFirstLineOfst( const short nF, - const USHORT nProp ) -{ - nFirstLineOfst = short((long(nF) * nProp ) / 100); - nPropFirstLineOfst = nProp; - AdjustLeft(); -} - -inline void SvxLRSpaceItem::SetTxtLeft( const long nL, const USHORT nProp ) -{ - nTxtLeft = (nL * nProp) / 100; - nPropLeftMargin = nProp; - AdjustLeft(); -} - -#endif - diff --git a/svx/inc/svx/lspcitem.hxx b/svx/inc/svx/lspcitem.hxx deleted file mode 100644 index e73a3aed11f7..000000000000 --- a/svx/inc/svx/lspcitem.hxx +++ /dev/null @@ -1,130 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: lspcitem.hxx,v $ - * $Revision: 1.4.216.1 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_LSPCITEM_HXX -#define _SVX_LSPCITEM_HXX - -// include --------------------------------------------------------------- - -#include <svl/eitem.hxx> -#include <svx/svxenum.hxx> - -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#include "svx/svxdllapi.h" - -class SvXMLUnitConverter; -namespace rtl -{ - class OUString; -} - -// class SvxLineSpacingItem ---------------------------------------------- - -/* -[Beschreibung] -Dieses Item beschreibt den Abstand zwischen den Zeilen. -*/ - -#define LINE_SPACE_DEFAULT_HEIGHT 200 -class SVX_DLLPUBLIC SvxLineSpacingItem : public SfxEnumItemInterface -{ - friend SvStream& operator<<( SvStream&, SvxLineSpacingItem& ); //$ ostream - - short nInterLineSpace; - USHORT nLineHeight; - BYTE nPropLineSpace; - SvxLineSpace eLineSpace; - SvxInterLineSpace eInterLineSpace; - -public: - TYPEINFO(); - - // Der Writer verlaesst sich auf eine Default-Hoehe von 200! - // Eigentlich wuerde ich alle Werte mit 0 initialisieren, aber wer kann - // die Folgen beim Writer absehen ? - // => lieber einen krummen Wert als Default, aber der Programmierer - // sieht, dass dort etwas besonderes passiert. - - SvxLineSpacingItem( USHORT nHeight /*= LINE_SPACE_DEFAULT_HEIGHT*/, const USHORT nId ); - - // "pure virtual Methoden" vom SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_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; - - // Methoden zum Abfragen und Aendern - // Interlinespace wird zur Hoehe addiert. - inline short GetInterLineSpace() const { return nInterLineSpace; } - inline void SetInterLineSpace( const short nSpace ) - { - nInterLineSpace = nSpace; - eInterLineSpace = SVX_INTER_LINE_SPACE_FIX; - } - - // Bestimmt absolute oder minimale Zeilenhoehe. - inline USHORT GetLineHeight() const { return nLineHeight; } - inline void SetLineHeight( const USHORT nHeight ) - { - nLineHeight = nHeight; - eLineSpace = SVX_LINE_SPACE_MIN; - } - - // Vergroessert oder verkleinert die Zeilenhoehe. - BYTE GetPropLineSpace() const { return nPropLineSpace; } - inline void SetPropLineSpace( const BYTE nProp ) - { - nPropLineSpace = nProp; - eInterLineSpace = SVX_INTER_LINE_SPACE_PROP; - } - - inline SvxLineSpace &GetLineSpaceRule() { return eLineSpace; } - inline SvxLineSpace GetLineSpaceRule() const { return eLineSpace; } - - 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 ); -}; - -#endif - diff --git a/svx/inc/svx/msdffdef.hxx b/svx/inc/svx/msdffdef.hxx index 400eb4be9e54..6869a97e424a 100644 --- a/svx/inc/svx/msdffdef.hxx +++ b/svx/inc/svx/msdffdef.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: msdffdef.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/mutxhelp.hxx b/svx/inc/svx/mutxhelp.hxx deleted file mode 100644 index 559eed80914f..000000000000 --- a/svx/inc/svx/mutxhelp.hxx +++ /dev/null @@ -1,47 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: mutxhelp.hxx,v $ - * $Revision: 1.3 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVX_MUTXHELP_HXX -#define _SVX_MUTXHELP_HXX - -#include <osl/mutex.hxx> - -class SvxMutexHelper -{ -private: - ::osl::Mutex maMutex; - -public: - ::osl::Mutex& getMutex() { return maMutex; } -}; - -#endif - - diff --git a/svx/inc/svx/nhypitem.hxx b/svx/inc/svx/nhypitem.hxx deleted file mode 100644 index 6cca0508a53d..000000000000 --- a/svx/inc/svx/nhypitem.hxx +++ /dev/null @@ -1,74 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: nhypitem.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_NHYPITEM_HXX -#define _SVX_NHYPITEM_HXX - -// include --------------------------------------------------------------- - -#include <svl/eitem.hxx> -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#include "svx/svxdllapi.h" - -// class SvxNoHyphenItem ------------------------------------------------- - -/* [Beschreibung] - - PB: ??? -*/ - -class SVX_DLLPUBLIC SvxNoHyphenItem : public SfxBoolItem -{ -public: - TYPEINFO(); - - SvxNoHyphenItem( const BOOL bHyphen /*= TRUE*/, - const USHORT nId ); - - // "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, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; - - inline SvxNoHyphenItem& operator=(const SvxNoHyphenItem& rNHH) - { - SetValue( rNHH.GetValue() ); - return *this; - } -}; - -#endif - diff --git a/svx/inc/svx/numdef.hxx b/svx/inc/svx/numdef.hxx deleted file mode 100644 index 72e5edcde5b7..000000000000 --- a/svx/inc/svx/numdef.hxx +++ /dev/null @@ -1,33 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: numdef.hxx,v $ - * $Revision: 1.3 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#define SVX_MAX_NUM 10 // max. moegliche Numerierungsebenen -#define SVX_DEF_BULLET (0xF000 + 149)// Charakter fuer Aufzaehlungen - diff --git a/svx/inc/svx/numfmtsh.hxx b/svx/inc/svx/numfmtsh.hxx index 7aee6f6bbb65..493cdb6b10d2 100644 --- a/svx/inc/svx/numfmtsh.hxx +++ b/svx/inc/svx/numfmtsh.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: numfmtsh.hxx,v $ - * $Revision: 1.3.242.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/numinf.hxx b/svx/inc/svx/numinf.hxx index b1525a8f56a6..167cb094d1e1 100644 --- a/svx/inc/svx/numinf.hxx +++ b/svx/inc/svx/numinf.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: numinf.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/numitem.hxx b/svx/inc/svx/numitem.hxx deleted file mode 100644 index 86f1eee764a7..000000000000 --- a/svx/inc/svx/numitem.hxx +++ /dev/null @@ -1,402 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: numitem.hxx,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_NUMITEM_HXX -#define _SVX_NUMITEM_HXX - -// include --------------------------------------------------------------- - -#include <tools/link.hxx> -#include <tools/string.hxx> -#include <svl/poolitem.hxx> -#include <svx/svxenum.hxx> -#include <tools/gen.hxx> -#ifndef _SVX_NUMDEF_HXX //autogen -#include <svx/numdef.hxx> -#endif -#ifndef _SV_COLOR_HXX //autogen -#include <tools/color.hxx> -#endif -#include <cppuhelper/weakref.hxx> -#include <com/sun/star/lang/Locale.hpp> -#include <com/sun/star/uno/Reference.h> -#include <com/sun/star/style/NumberingType.hpp> -#include <unotools/fontcvt.hxx> -#include "svx/svxdllapi.h" - -class SvxBrushItem; -class Font; -class Graphic; -class SvxNodeNum; -class BitmapEx; -namespace com{namespace sun{ namespace star{ - namespace text{ - class XNumberingFormatter; - } -}}} - -// ----------------------------------------------------------------------- -//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 SVX_NO_NUMLEVEL 0x20 - -#define LINK_TOKEN 0x80 //indicate linked bitmaps - for use in dialog only -class SVX_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? - -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; - - 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;} - - sal_Bool IsTxtFmt() const - { - return com::sun::star::style::NumberingType::NUMBER_NONE != nNumType && - com::sun::star::style::NumberingType::CHAR_SPECIAL != nNumType && - com::sun::star::style::NumberingType::BITMAP != nNumType; - } -}; - -class SVX_DLLPUBLIC SvxNumberFormat : public SvxNumberType -{ -public: - // --> OD 2008-01-08 #newlistlevelattrs# - enum SvxNumPositionAndSpaceMode - { - LABEL_WIDTH_AND_POSITION, - LABEL_ALIGNMENT - }; - enum SvxNumLabelFollowedBy - { - LISTTAB, - SPACE, - NOTHING - }; - // <-- - -private: - String sPrefix; - String sSuffix; - - SvxAdjust eNumAdjust; - - 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 - - // --> OD 2008-01-08 #newlistlevelattrs# - // mode indicating, if the position and spacing of the list label is - // determined by the former attributes (nFirstLineOffset, nAbsLSpace, - // nLSpace and nCharTextDistance) called position and spacing via label - // width and position (LABEL_WIDTH_AND_POSITION) or by the new attributes - // (meLabelFollowedBy, mnListtabPos, mnFirstLineIndent and mnIndentAt) - // called position and spacing via label alignment. - // Note 1: Attribute <eNumAdjust> is relevant for both modes. - // Note 2: The values of the former attributes are treated as 0, if mode - // 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 - - // --> OD 2008-01-08 #newlistlevelattrs# - // specifies what follows the list label before the text of the first line - // of the list item starts - SvxNumLabelFollowedBy meLabelFollowedBy; - // specifies an additional list tab stop position for meLabelFollowedBy = LISTTAB - long mnListtabPos; - // specifies the first line indent - long mnFirstLineIndent; - // specifies the indent before the text, e.g. in L2R-layout the left margin - long mnIndentAt; - // <-- - - SvxBrushItem* pGraphicBrush; // - sal_Int16 eVertOrient; // vert. Ausrichtung einer Bitmap - - Size aGraphicSize; // immer! in 1/100 mm - Font* pBulletFont; // Pointer auf den BulletFont - - String sCharStyleName; // Zeichenvorlage - - BitmapEx* pScaledImageCache; // Image scaled to aGraphicSize, only cached for WINDOW/VDEV - - DECL_STATIC_LINK( SvxNumberFormat, GraphicArrived, void * ); - virtual void NotifyGraphicArrived(); -public: - // --> OD 2008-01-09 #newlistlevelattrs# - SvxNumberFormat( sal_Int16 nNumberingType, - SvxNumPositionAndSpaceMode ePositionAndSpaceMode = LABEL_WIDTH_AND_POSITION ); - // <-- - SvxNumberFormat(const SvxNumberFormat& rFormat); - SvxNumberFormat(SvStream &rStream); - virtual ~SvxNumberFormat(); - - SvStream& Store(SvStream &rStream, FontToSubsFontConverter pConverter); - - SvxNumberFormat& operator=( const SvxNumberFormat& ); - 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 SetSuffix(const String& rSet) { sSuffix = rSet;} - const String& GetSuffix() const { return sSuffix;} - - 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 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 ); - virtual void SetVertOrient(sal_Int16 eSet); - virtual sal_Int16 GetVertOrient() const; - void SetGraphicSize(const Size& rSet) {aGraphicSize = rSet;} - const Size& GetGraphicSize() const {return aGraphicSize;} - - // --> OD 2008-01-09 #newlistlevelattrs# - SvxNumPositionAndSpaceMode GetPositionAndSpaceMode() const; - void SetPositionAndSpaceMode( SvxNumPositionAndSpaceMode ePositionAndSpaceMode ); - // <-- - - void SetLSpace(short nSet) {nLSpace = nSet;} - // --> OD 2008-01-09 #newlistlevelattrs# - short GetLSpace() const; - // <-- - void SetAbsLSpace(short nSet) {nAbsLSpace = nSet;} - // --> OD 2008-01-09 #newlistlevelattrs# - short GetAbsLSpace() const; - // <-- - void SetFirstLineOffset(short nSet) { nFirstLineOffset = nSet;} - // --> OD 2008-01-09 #newlistlevelattrs# - short GetFirstLineOffset() const; - // <-- - void SetCharTextDistance(short nSet) { nCharTextDistance = nSet; } - // --> OD 2008-01-09 #newlistlevelattrs# - short GetCharTextDistance() const; - // <-- - - // --> OD 2008-01-09 #newlistlevelattrs# - void SetLabelFollowedBy( const SvxNumLabelFollowedBy eLabelFollowedBy ); - SvxNumLabelFollowedBy GetLabelFollowedBy() const; - void SetListtabPos( const long nListtabPos ); - long GetListtabPos() const; - void SetFirstLineIndent( const long nFirstLineIndent ); - long GetFirstLineIndent() const; - void SetIndentAt( const long nIndentAt ); - long GetIndentAt() const; - // <-- - - static Size GetGraphicSizeMM100(const Graphic* pGraphic); - static String CreateRomanString( ULONG nNo, BOOL bUpper ); -}; - -enum SvxNumRuleType -{ - SVX_RULETYPE_NUMBERING, - SVX_RULETYPE_OUTLINE_NUMBERING, - SVX_RULETYPE_PRESENTATION_NUMBERING, - SVX_RULETYPE_END -}; - -class SVX_DLLPUBLIC SvxNumRule -{ - 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 - - static sal_Int32 nRefCount; - com::sun::star::lang::Locale aLocale; -public: - // --> OD 2008-02-11 #newlistlevelattrs# - SvxNumRule( ULONG nFeatures, - USHORT nLevels, - BOOL bCont, - SvxNumRuleType eType = SVX_RULETYPE_NUMBERING, - SvxNumberFormat::SvxNumPositionAndSpaceMode - eDefaultNumberFormatPositionAndSpaceMode - = SvxNumberFormat::LABEL_WIDTH_AND_POSITION ); - // <-- - SvxNumRule(const SvxNumRule& rCopy); - SvxNumRule(SvStream &rStream); - virtual ~SvxNumRule(); - - int operator==( const SvxNumRule& ) const; - int operator!=( const SvxNumRule& rRule ) const {return !(*this == rRule);} - - 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); - - BOOL IsContinuousNumbering()const - {return bContinuousNumbering;} - void SetContinuousNumbering(BOOL bSet) - {bContinuousNumbering = bSet;} - - 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; } - - String MakeNumString( const SvxNodeNum&, BOOL bInclStrings = TRUE ) const; - - SvxNumRuleType GetNumRuleType() const { return eNumberingType; } - void SetNumRuleType( const SvxNumRuleType& rType ) { eNumberingType = rType; } - - BOOL UnLinkGraphics(); -}; -/* -----------------27.10.98 13:04------------------- - * - * --------------------------------------------------*/ -class SVX_DLLPUBLIC SvxNumBulletItem : public SfxPoolItem -{ - SvxNumRule* pNumRule; -public: - SvxNumBulletItem(SvxNumRule& rRule); - SvxNumBulletItem(SvxNumRule& rRule, USHORT nWhich ); - SvxNumBulletItem(const SvxNumBulletItem& rCopy); - virtual ~SvxNumBulletItem(); - - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT) const; - USHORT GetVersion( USHORT nFileVersion ) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; - virtual int operator==( const SfxPoolItem& ) const; - - SvxNumRule* GetNumRule() const {return pNumRule;} - - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_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 - -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; } - - BOOL IsStart() const { return bStartNum; } - void SetStart( BOOL bFlag = TRUE ) { bStartNum = bFlag; } - - USHORT GetSetValue() const { return nSetValue; } - void SetSetValue( USHORT nVal ) { nSetValue = nVal; } - - const USHORT* GetLevelVal() const { return nLevelVal; } - USHORT* GetLevelVal() { return nLevelVal; } -}; - -SvxNodeNum::SvxNodeNum( BYTE nLevel, USHORT nSetVal ) - : nSetValue( nSetVal ), nMyLevel( nLevel ), bStartNum( FALSE ) -{ - memset( nLevelVal, 0, sizeof( nLevelVal ) ); -} - -inline SvxNodeNum& SvxNodeNum::operator=( const SvxNodeNum& rCpy ) -{ - nSetValue = rCpy.nSetValue; - nMyLevel = rCpy.nMyLevel; - bStartNum = rCpy.bStartNum; - - memcpy( nLevelVal, rCpy.nLevelVal, sizeof( nLevelVal ) ); - return *this; -} - -/* -------------------------------------------------- - * - * --------------------------------------------------*/ -SvxNumRule* SvxConvertNumRule( const SvxNumRule* pRule, USHORT nLevel, SvxNumRuleType eType ); - -#endif - diff --git a/svx/inc/svx/obj3d.hxx b/svx/inc/svx/obj3d.hxx index 30a22938f888..6d8b354db8be 100644 --- a/svx/inc/svx/obj3d.hxx +++ b/svx/inc/svx/obj3d.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: obj3d.hxx,v $ - * $Revision: 1.5.18.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/orphitem.hxx b/svx/inc/svx/orphitem.hxx deleted file mode 100644 index 676e245c3770..000000000000 --- a/svx/inc/svx/orphitem.hxx +++ /dev/null @@ -1,80 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: orphitem.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_ORPHITEM_HXX -#define _SVX_ORPHITEM_HXX - -// include --------------------------------------------------------------- - -#include <svl/intitem.hxx> -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif - -class SvXMLUnitConverter; -namespace rtl -{ - class OUString; -} -#include "svx/svxdllapi.h" - -// class SvxOrphansItem -------------------------------------------------- - -/* -[Beschreibung] -Dieses Item beschreibt die Anzahl der Zeilen fuer die Schusterjungenregelung. -*/ - -class SVX_DLLPUBLIC SvxOrphansItem: public SfxByteItem -{ - friend SvStream & operator<<( SvStream & aS, SvxOrphansItem & ); -public: - TYPEINFO(); - - SvxOrphansItem( const BYTE nL /*= 0*/, const USHORT nId ); - - // "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, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; - - inline SvxOrphansItem& operator=( const SvxOrphansItem& rOrphans ) - { - SetValue( rOrphans.GetValue() ); - return *this; - } -}; - -#endif - diff --git a/svx/inc/svx/outliner.hxx b/svx/inc/svx/outliner.hxx deleted file mode 100644 index e87ed9bd6114..000000000000 --- a/svx/inc/svx/outliner.hxx +++ /dev/null @@ -1,1050 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: outliner.hxx,v $ - * $Revision: 1.6.16.2 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _OUTLINER_HXX -#define _OUTLINER_HXX - -#include <tools/gen.hxx> -#include <tools/string.hxx> -#include <tools/debug.hxx> - -#include <svl/brdcst.hxx> - -#include <svx/editdata.hxx> -#include <i18npool/lang.h> -#include <tools/color.hxx> -#include <vcl/graph.hxx> -#include <tools/list.hxx> -#include <tools/link.hxx> -#include <rsc/rscsfx.hxx> -#include "svx/svxdllapi.h" - -#include <goodies/grfmgr.hxx> - -#include <tools/rtti.hxx> // wegen typedef TypeId -#include <vector> - -class OutlinerEditEng; -class Outliner; -class EditView; -class EditUndo; -class ParagraphList; -class OutlinerParaObject; -class SvStream; -class SvxBulletItem; -class SvxFont; -class SvxSearchItem; -class SvxFieldItem; -class OLUndoRemove; -class Window; -class KeyEvent; -class MouseEvent; -class Pointer; -class CommandEvent; -class MapMode; -class OutputDevice; -class PolyPolygon; -class SfxStyleSheetPool; -class SfxStyleSheet; -class SfxItemPool; -class SfxItemSet; -class SvxNumBulletItem; -class SvxNumberFormat; -class SvxLRSpaceItem; -class SfxUndoManager; -class EditEngine; -class SvKeyValueIterator; -class SvxForbiddenCharactersTable; -#include <com/sun/star/uno/Reference.h> - -#include <vos/ref.hxx> -#include <svx/svxfont.hxx> -#include <svx/eedata.hxx> -#include <svx/paragraphdata.hxx> - -class SvxFieldData; -////////////////////////////////////////////////////////////////////////////// - -namespace com { namespace sun { namespace star { namespace linguistic2 { - class XSpellChecker1; - class XHyphenator; -}}}} -namespace svx{ -struct SpellPortion; -typedef std::vector<SpellPortion> SpellPortions; -} - -namespace basegfx { class B2DPolyPolygon; } - -// nur interner Gebrauch! -#define PARAFLAG_DROPTARGET 0x1000 -#define PARAFLAG_DROPTARGET_EMPTY 0x2000 -#define PARAFLAG_HOLDDEPTH 0x4000 -#define PARAFLAG_SETBULLETTEXT 0x8000 -#define PARAFLAG_ISPAGE 0x0100 - -// Undo-Action-Ids -#define OLUNDO_DEPTH EDITUNDO_USER -// #define OLUNDO_HEIGHT EDITUNDO_USER+1 -#define OLUNDO_EXPAND EDITUNDO_USER+2 -#define OLUNDO_COLLAPSE EDITUNDO_USER+3 -// #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 - -class Paragraph : protected ParagraphData -{ -private: - friend class Outliner; - friend class ParagraphList; - friend class OutlinerView; - friend class OutlinerParaObject; - friend class OutlinerEditEng; - friend class OLUndoDepth; - friend class OutlinerUndoCheckPara; - friend class OutlinerUndoChangeParaFlags; - - Paragraph& operator=(const Paragraph& rPara ); - - 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; } - - Paragraph( sal_Int16 nDepth ); - Paragraph( const Paragraph& ); - Paragraph( const ParagraphData& ); - ~Paragraph(); - - sal_Int16 GetDepth() const { return nDepth; } - - sal_Int16 GetNumberingStartValue() const { return mnNumberingStartValue; } - void SetNumberingStartValue( sal_Int16 nNumberingStartValue ); - - 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; } -}; - -struct ParaRange -{ - 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) ); } -}; - -inline void ParaRange::Adjust() -{ - if ( nStartPara > nEndPara ) - { - USHORT nTmp = nStartPara; - nStartPara = nEndPara; - nEndPara = nTmp; - } -} - -#define OL_ROOTPARENT (Paragraph*)NULL - -class SVX_DLLPUBLIC OutlinerView -{ - friend class Outliner; - -private: - - Outliner* pOwner; - EditView* pEditView; - - // Drag & Drop - BOOL bBeginDragAtMove_OLDMEMBER; - BOOL bInDragMode; - Point aDDStartPosRef; - Point aDDStartPosPix; - ULONG nDDStartPara; - ULONG nDDStartParaVisChildCount; - ULONG nDDCurPara; - USHORT nDDStartDepth; - USHORT nDDCurDepth; - USHORT nDDMaxDepth; - BOOL bDDChangingDepth; - BOOL bDDCursorVisible; - long* pHorTabArrDoc; - long nDDScrollLRBorderWidthWin; // Left Right - long nDDScrollTBBorderWidthWin; // Top Bottom - long nDDScrollLROffs; - long nDDScrollTDOffs; - - void* pDummy; - ULONG nDummy; - - enum MouseTarget { - MouseText = 0, - MouseBullet = 1, - MouseHypertext = 2, // ausserhalb OutputArea - MouseOutside = 3, // ausserhalb OutputArea - MouseDontKnow = 4 - }; - MouseTarget OLD_ePrevMouseTarget; - -#ifdef _OUTLINER_CXX - - SVX_DLLPRIVATE void ImplExpandOrCollaps( USHORT nStartPara, USHORT nEndPara, BOOL bExpand ); - - SVX_DLLPRIVATE ULONG ImpCheckMousePos( const Point& rPosPixel, MouseTarget& reTarget); - SVX_DLLPRIVATE void ImpToggleExpand( Paragraph* pParentPara ); - SVX_DLLPRIVATE ParaRange ImpGetSelectedParagraphs( BOOL bIncludeHiddenChilds ); - SVX_DLLPRIVATE void ImpHideDDCursor(); - SVX_DLLPRIVATE void ImpShowDDCursor(); - SVX_DLLPRIVATE void ImpPaintDDCursor(); - - SVX_DLLPRIVATE void ImpDragScroll( const Point& rPosPix ); - SVX_DLLPRIVATE void ImpScrollLeft(); - SVX_DLLPRIVATE void ImpScrollRight(); - SVX_DLLPRIVATE void ImpScrollUp(); - SVX_DLLPRIVATE void ImpScrollDown(); - - SVX_DLLPRIVATE ULONG ImpGetInsertionPara( const Point& rPosPixel ); - SVX_DLLPRIVATE Point ImpGetDocPos( const Point& rPosPixel ); - SVX_DLLPRIVATE Pointer ImpGetMousePointer( MouseTarget eTarget ); - SVX_DLLPRIVATE USHORT ImpInitPaste( ULONG& rStart ); - SVX_DLLPRIVATE void ImpPasted( ULONG nStart, ULONG nPrevParaCount, USHORT nSize); - SVX_DLLPRIVATE USHORT ImpCalcSelectedPages( BOOL bIncludeFirstSelected ); - SVX_DLLPRIVATE BOOL ImpIsIndentingPages(); - -#endif - -public: - OutlinerView( Outliner* pOut, Window* pWindow ); - virtual ~OutlinerView(); - - EditView& GetEditView() const { return *pEditView; } - - void Scroll( long nHorzScroll, long nVertScroll ); - - void Paint( const Rectangle& rRect ); - BOOL PostKeyEvent( const KeyEvent& rKEvt ); - BOOL MouseButtonDown( const MouseEvent& ); - BOOL MouseButtonUp( const MouseEvent& ); - BOOL MouseMove( const MouseEvent& ); - - void ShowCursor( BOOL bGotoCursor = TRUE ); - void HideCursor(); - - void SetOutliner( Outliner* pOutliner ); - Outliner* GetOutliner() const { return pOwner; } - - void SetWindow( Window* pWindow ); - Window* GetWindow() const; - - void SetReadOnly( BOOL bReadOnly ); - BOOL IsReadOnly() const; - - void SetOutputArea( const Rectangle& rRect ); - Rectangle GetOutputArea() const; - - Rectangle GetVisArea() const; - - List* CreateSelectionList(); - - // gibt Anzahl selektierter Absaetze zurueck - // MT 07/00: Who needs this? - ULONG Select( Paragraph* pParagraph, - BOOL bSelect=TRUE, - BOOL bWChilds=TRUE); - - 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! - - BOOL AdjustHeight( long nDY ); - void AdjustDepth( Paragraph* pPara, short nDX, - BOOL bWithChilds = FALSE ); - void AdjustHeight( Paragraph* pPara, long nDY, - BOOL bWithChilds=FALSE ); - - ULONG Read( SvStream& rInput, const String& rBaseURL, EETextFormat eFormat, BOOL bSelect = FALSE, SvKeyValueIterator* pHTTPHeaderAttrs = NULL ); - ULONG Write( SvStream& rOutput, EETextFormat eFormat ); - - void InsertText( const String& rNew, BOOL bSelect = FALSE ); - void InsertText( const OutlinerParaObject& rParaObj ); - void Expand(); - void Collapse(); - void Expand( Paragraph* ); - void Collapse( Paragraph* ); - void ExpandAll(); - void CollapseAll(); - - void SetBackgroundColor( const Color& rColor ); - Color GetBackgroundColor(); - - SfxItemSet GetAttribs(); - - void Cut(); - void Copy(); - void Paste(); - void PasteSpecial(); - void EnablePaste( BOOL bEnable ); - - void Undo(); - void Redo(); - - void SetStyleSheet( SfxStyleSheet* ); - SfxStyleSheet* GetStyleSheet() const; - - void SetControlWord( ULONG nWord ); - ULONG GetControlWord() const; - - void SetAnchorMode( EVAnchorMode eMode ); - EVAnchorMode GetAnchorMode() const; - - Pointer GetPointer( const Point& rPosPixel ); - void Command( const CommandEvent& rCEvt ); - void RemoveCharAttribs( ULONG nPara, USHORT nWhich = 0 ); - - void CompleteAutoCorrect(); - - 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 ); - - void TransliterateText( sal_Int32 nTransliterationMode ); - - ESelection GetSelection(); - - USHORT GetSelectedScriptType() const; - - void SetVisArea( const Rectangle& rRec ); - void SetSelection( const ESelection& ); - - void RemoveAttribs( BOOL bRemoveParaAttribs = FALSE, USHORT nWhich = 0, BOOL bKeepLanguages = FALSE ); - void RemoveAttribsKeepLanguages( BOOL bRemoveParaAttribs ); - BOOL HasSelection() const; - - void InsertField( const SvxFieldItem& rFld ); - const SvxFieldItem* GetFieldUnderMousePointer() 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 - or disables numbering for the selected paragraphs if the numbering of the first paragraph is on - */ - void ToggleBullets(); - - /** enables numbering for the selected paragraphs that are not enabled and ignore all selected - paragraphs that already have numbering enabled. - */ - void EnableBullets(); - - BOOL IsCursorAtWrongSpelledWord( BOOL bMarkIfWrong = FALSE ); - BOOL IsWrongSpelledWordAtPos( const Point& rPosPixel, BOOL bMarkIfWrong = FALSE ); - void SpellIgnoreWord(); - void ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack = 0 ); - - void SetInvalidateMore( USHORT nPixel ); - USHORT GetInvalidateMore() const; - - String GetSurroundingText() const;
- Selection GetSurroundingTextSelection() const; -}; - -//#if 0 // _SOLAR__PRIVATE -DECLARE_LIST(ViewList,OutlinerView*) -//#else -//typedef List ViewList; -//#endif - -class SVX_DLLPUBLIC DrawPortionInfo -{ -public: - const Point& mrStartPos; - const String& mrText; - sal_uInt16 mnTextStart; - sal_uInt16 mnTextLen; - sal_uInt16 mnPara; - xub_StrLen mnIndex; - const SvxFont& mrFont; - const sal_Int32* mpDXArray; - - const EEngineData::WrongSpellVector* mpWrongSpellVector; - const SvxFieldData* mpFieldData; - const ::com::sun::star::lang::Locale* mpLocale; - const Color maOverlineColor; - const Color maTextLineColor; - - // #101498# BiDi level needs to be transported, too. - BYTE mnBiDiLevel; - - // bitfield - unsigned mbEndOfLine : 1; - unsigned mbEndOfParagraph : 1; - unsigned mbEndOfBullet : 1; - - BYTE GetBiDiLevel() const { return mnBiDiLevel; } - sal_Bool IsRTL() const; - - DrawPortionInfo( - const Point& rPos, - const String& rTxt, - sal_uInt16 nTxtStart, - sal_uInt16 nTxtLen, - const SvxFont& rFnt, - sal_uInt16 nPar, - xub_StrLen nIdx, - const sal_Int32* pDXArr, - const EEngineData::WrongSpellVector* pWrongSpellVector, - const SvxFieldData* pFieldData, - const ::com::sun::star::lang::Locale* pLocale, - const Color& rOverlineColor, - const Color& rTextLineColor, - BYTE nBiDiLevel, - bool bEndOfLine, - bool bEndOfParagraph, - bool bEndOfBullet) - : mrStartPos(rPos), - mrText(rTxt), - mnTextStart(nTxtStart), - mnTextLen(nTxtLen), - mnPara(nPar), - mnIndex(nIdx), - mrFont(rFnt), - mpDXArray(pDXArr), - mpWrongSpellVector(pWrongSpellVector), - mpFieldData(pFieldData), - mpLocale(pLocale), - maOverlineColor(rOverlineColor), - maTextLineColor(rTextLineColor), - mnBiDiLevel(nBiDiLevel), - mbEndOfLine(bEndOfLine), - mbEndOfParagraph(bEndOfParagraph), - mbEndOfBullet(bEndOfBullet) - {} -}; - -class SVX_DLLPUBLIC DrawBulletInfo -{ -public: - const GraphicObject maBulletGraphicObject; - Point maBulletPosition; - Size maBulletSize; - - DrawBulletInfo( - const GraphicObject& rBulletGraphicObject, - const Point& rBulletPosition, - const Size& rBulletSize) - : maBulletGraphicObject(rBulletGraphicObject), - maBulletPosition(rBulletPosition), - maBulletSize(rBulletSize) - {} -}; - -struct SVX_DLLPUBLIC PaintFirstLineInfo -{ - USHORT mnPara; - const Point& mrStartPos; - long mnBaseLineY; - const Point& mrOrigin; - short mnOrientation; - OutputDevice* mpOutDev; - - PaintFirstLineInfo( USHORT nPara, const Point& rStartPos, long nBaseLineY, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev ) - : mnPara( nPara ), mrStartPos( rStartPos ), mnBaseLineY( nBaseLineY ), mrOrigin( rOrigin ), mnOrientation( nOrientation ), mpOutDev( pOutDev ) - {} -}; - -class SdrPage; - -class EditFieldInfo -{ -private: - Outliner* pOutliner; - const SvxFieldItem& rFldItem; - - Color* pTxtColor; - Color* pFldColor; - - String aRepresentation; - - USHORT nPara; - xub_StrLen nPos; - BOOL bSimpleClick; - - EditFieldInfo(); - EditFieldInfo( const EditFieldInfo& ); - - SdrPage* mpSdrPage; - -public: - EditFieldInfo( Outliner* pOutl, const SvxFieldItem& rFItem, USHORT nPa, xub_StrLen nPo ) - : rFldItem( rFItem ) - { - pOutliner = pOutl; - nPara = nPa; nPos = nPo; - pTxtColor = 0; pFldColor = 0; bSimpleClick = FALSE; - mpSdrPage = 0; - } - ~EditFieldInfo() - { - delete pTxtColor; - delete pFldColor; - } - - Outliner* GetOutliner() const { return pOutliner; } - - const SvxFieldItem& GetField() const { return rFldItem; } - - Color* GetTxtColor() const { return pTxtColor; } - void SetTxtColor( const Color& rColor ) - { delete pTxtColor; pTxtColor = new Color( rColor ); } - - Color* GetFldColor() const { return pFldColor; } - void SetFldColor( const Color& rColor ) - { delete pFldColor; pFldColor = new Color( rColor ); } - void ClearFldColor() - { delete pFldColor; pFldColor = 0; } - - USHORT GetPara() const { return nPara; } - xub_StrLen GetPos() const { return nPos; } - - BOOL IsSimpleClick() const { return bSimpleClick; } - void SetSimpleClick( BOOL bSimple ) { bSimpleClick = bSimple; } - - const String& GetRepresentation() const { return aRepresentation; } - String& GetRepresentation() { return aRepresentation; } - void SetRepresentation( const String& rStr ) { aRepresentation = rStr; } - - void SetSdrPage( SdrPage* pPage ) { mpSdrPage = pPage; } - SdrPage* GetSdrPage() const { return mpSdrPage; } -}; - -struct EBulletInfo -{ - BOOL bVisible; - USHORT nType; // see SvxNumberType - String aText; - SvxFont aFont; - Graphic aGraphic; - USHORT nParagraph; - Rectangle aBounds; - - 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_USERMASK 0x00FF - -#define OUTLINERMODE_SUBTITLE (0x0100|OUTLINERMODE_TEXTOBJECT) -#define OUTLINERMODE_NOTE (0x0200|OUTLINERMODE_TEXTOBJECT) - -class SVX_DLLPUBLIC Outliner : public SfxBroadcaster -{ - friend class OutlinerView; - friend class OutlinerEditEng; - friend class OutlinerParaObject; - friend class OLUndoExpand; - friend class OutlinerUndoChangeDepth; - friend class OutlinerUndoCheckPara; - friend class OutlinerUndoChangeParaFlags; - - OutlinerEditEng* pEditEngine; - - ParagraphList* pParaList; - ViewList aViewList; - - Paragraph* pHdlParagraph; - ULONG mnFirstSelPage; - Link aDrawPortionHdl; - Link aDrawBulletHdl; - Link aExpandHdl; - Link aParaInsertedHdl; - Link aParaRemovingHdl; - Link aDepthChangedHdl; - Link aWidthArrReqHdl; - Link aBeginMovingHdl; - Link aEndMovingHdl; - Link aIndentingPagesHdl; - Link aRemovingPagesHdl; - Link aFieldClickedHdl; - Link aCalcFieldValueHdl; - Link maPaintFirstLineHdl; - Link maBeginPasteOrDropHdl; - Link maEndPasteOrDropHdl; - - sal_Int16 nDepthChangedHdlPrevDepth; - USHORT mnDepthChangeHdlPrevFlags; - sal_Int16 nMaxDepth; - const sal_Int16 nMinDepth; - USHORT nFirstPage; - - USHORT nOutlinerMode; - - BOOL bIsExpanding; // Nur in Expand/Collaps-Hdl gueltig, mal umstellen - BOOL bFirstParaIsEmpty; - BOOL bBlockInsCallback; - BOOL bStrippingPortions; - BOOL bPasting; - - 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 ); - 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 ImplBlockInsertionCallbacks( BOOL b ); - - 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 ); - - void ImpTextPasted( ULONG nStartPara, USHORT nCount ); - long ImpCalcMaxBulletWidth( USHORT nPara, const SvxBulletItem& rBullet ); - Font ImpCalcBulletFont( USHORT nPara ) const; - Rectangle ImpCalcBulletArea( USHORT nPara, BOOL bAdjust, BOOL bReturnPaperPos ); - 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; } - void ImplCheckDepth( sal_Int16& rnDepth ) const; -#endif - -protected: - void ParagraphInserted( USHORT nParagraph ); - void ParagraphDeleted( USHORT nParagraph ); - void ParaAttribsChanged( USHORT nParagraph ); - - virtual void StyleSheetChanged( SfxStyleSheet* pStyle ); - - void InvalidateBullet( Paragraph* pPara, ULONG nPara ); - void PaintBullet( USHORT nPara, const Point& rStartPos, - const Point& rOrigin, short nOrientation, - OutputDevice* pOutDev ); - - // used by OutlinerEditEng. Allows Outliner objects to provide - // bullet access to the EditEngine. - virtual const SvxNumberFormat* GetNumberFormat( USHORT nPara ) const; - -public: - - Outliner( SfxItemPool* pPool, USHORT nOutlinerMode ); - virtual ~Outliner(); - - void Init( USHORT nOutlinerMode ); - USHORT GetMode() const { return nOutlinerMode; } - - void SetVertical( BOOL bVertical ); - BOOL IsVertical() const; - - void SetFixedCellHeight( BOOL bUseFixedCellHeight ); - BOOL IsFixedCellHeight() const; - - void SetDefaultHorizontalTextDirection( EEHorizontalTextDirection eHTextDir ); - EEHorizontalTextDirection GetDefaultHorizontalTextDirection() const; - - USHORT GetScriptType( const ESelection& rSelection ) const; - LanguageType GetLanguage( USHORT nPara, USHORT nPos ) const; - - void SetAsianCompressionMode( USHORT nCompressionMode ); - USHORT GetAsianCompressionMode() const; - - void SetKernAsianPunctuation( BOOL bEnabled ); - BOOL IsKernAsianPunctuation() const; - - void SetAddExtLeading( BOOL b ); - BOOL IsAddExtLeading() const; - - ULONG InsertView( OutlinerView* pView, ULONG nIndex=LIST_APPEND); - OutlinerView* RemoveView( OutlinerView* pView ); - OutlinerView* RemoveView( ULONG nIndex ); - OutlinerView* GetView( ULONG nIndex ) const; - ULONG GetViewCount() const; - - Paragraph* Insert( const String& rText, ULONG nAbsPos = LIST_APPEND, sal_Int16 nDepth = 0 ); - void SetText( const OutlinerParaObject& ); - void AddText( const OutlinerParaObject& ); - void SetText( const String& rText, Paragraph* pParagraph ); - String GetText( Paragraph* pPara, ULONG nParaCount=1 ) const; - - OutlinerParaObject* CreateParaObject( USHORT nStartPara = 0, USHORT nParaCount = 0xFFFF ) const; - - const SfxItemSet& GetEmptyItemSet() const; - - void SetRefMapMode( const MapMode& ); - MapMode GetRefMapMode() const; - - void SetBackgroundColor( const Color& rColor ); - Color GetBackgroundColor() const; - - sal_Int16 GetMinDepth() const { return -1; } - - void SetMaxDepth( sal_Int16 nDepth, BOOL bCheckParas = FALSE ); - sal_Int16 GetMaxDepth() const { return nMaxDepth; } - - void SetUpdateMode( BOOL bUpdate ); - BOOL GetUpdateMode() const; - - void Clear(); - - void RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich ); - - ULONG GetParagraphCount() const; - Paragraph* GetParagraph( ULONG nAbsPos ) const; - - BOOL HasParent( Paragraph* pParagraph ) const; - BOOL HasChilds( Paragraph* pParagraph ) const; - ULONG GetChildCount( Paragraph* pParent ) const; - BOOL IsExpanded( Paragraph* pPara ) const; -// Paragraph* GetParagraph( Paragraph* pParent, ULONG nRelPos ) const; - Paragraph* GetParent( Paragraph* pParagraph ) 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 ); - - void SetVisible( Paragraph* pPara, BOOL bVisible ); - BOOL IsVisible( Paragraph* pPara ) const { return pPara->IsVisible(); } - - void EnableUndo( BOOL bEnable ); - BOOL IsUndoEnabled() const; - void UndoActionStart( USHORT nId ); - void UndoActionEnd( USHORT nId ); - void InsertUndo( EditUndo* pUndo ); - BOOL IsInUndo(); - - void ClearModifyFlag(); - BOOL IsModified() const; - - Paragraph* GetHdlParagraph() const { return pHdlParagraph; } - BOOL IsExpanding() const { return bIsExpanding; } - - virtual void ExpandHdl(); - void SetExpandHdl( const Link& rLink ) { aExpandHdl = rLink; } - Link GetExpandHdl() const { return aExpandHdl; } - - virtual void ParagraphInsertedHdl(); - void SetParaInsertedHdl(const Link& rLink){aParaInsertedHdl=rLink;} - Link GetParaInsertedHdl() const { return aParaInsertedHdl; } - - virtual void ParagraphRemovingHdl(); - void SetParaRemovingHdl(const Link& rLink){aParaRemovingHdl=rLink;} - Link GetParaRemovingHdl() const { return aParaRemovingHdl; } - - virtual void DepthChangedHdl(); - void SetDepthChangedHdl(const Link& rLink){aDepthChangedHdl=rLink;} - Link GetDepthChangedHdl() const { return aDepthChangedHdl; } - sal_Int16 GetPrevDepth() const { return nDepthChangedHdlPrevDepth; } - USHORT GetPrevFlags() const { return mnDepthChangeHdlPrevFlags; } - - virtual long RemovingPagesHdl( OutlinerView* ); - void SetRemovingPagesHdl(const Link& rLink){aRemovingPagesHdl=rLink;} - Link GetRemovingPagesHdl() const { return aRemovingPagesHdl; } - virtual long IndentingPagesHdl( OutlinerView* ); - void SetIndentingPagesHdl(const Link& rLink){aIndentingPagesHdl=rLink;} - Link GetIndentingPagesHdl() const { return aIndentingPagesHdl; } - // nur gueltig in den beiden oberen Handlern - USHORT GetSelPageCount() const { return nDepthChangedHdlPrevDepth; } - // nur gueltig in den beiden oberen Handlern - ULONG GetFirstSelPage() const { return mnFirstSelPage; } - - void SetCalcFieldValueHdl(const Link& rLink ) { aCalcFieldValueHdl= rLink; } - Link GetCalcFieldValueHdl() const { return aCalcFieldValueHdl; } - - void SetFieldClickedHdl(const Link& rLink ) { aFieldClickedHdl= rLink; } - Link GetFieldClickedHdl() const { return aFieldClickedHdl; } - - void SetDrawPortionHdl(const Link& rLink){aDrawPortionHdl=rLink;} - Link GetDrawPortionHdl() const { return aDrawPortionHdl; } - - 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 SetModifyHdl( const Link& rLink ); - Link GetModifyHdl() const; - - void SetNotifyHdl( const Link& rLink ); - Link GetNotifyHdl() const; - - void SetStatusEventHdl( const Link& rLink ); - Link GetStatusEventHdl() const; - - void Draw( OutputDevice* pOutDev, const Rectangle& rOutRect ); - void Draw( OutputDevice* pOutDev, const Rectangle& rOutRect, const Point& rStartDocPos ); - void Draw( OutputDevice* pOutDev, const Point& rStartPos, short nOrientation = 0 ); - - const Size& GetPaperSize() const; - void SetPaperSize( const Size& rSize ); - - 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(); - - const Size& GetMinAutoPaperSize() const; - void SetMinAutoPaperSize( const Size& rSz ); - - const Size& GetMaxAutoPaperSize() const; - void SetMaxAutoPaperSize( const Size& rSz ); - - void SetDefTab( USHORT nTab ); - USHORT GetDefTab() const; - - BOOL IsFlatMode() const; - void SetFlatMode( BOOL bFlat ); - - void EnableAutoColor( BOOL b ); - BOOL IsAutoColorEnabled() const; - - void ForceAutoColor( BOOL b ); - BOOL IsForceAutoColor() const; - - EBulletInfo GetBulletInfo( USHORT nPara ); - - void SetWordDelimiters( const String& rDelimiters ); - String GetWordDelimiters() const; - String GetWord( USHORT nPara, xub_StrLen nIndex ); - - void StripPortions(); - - // #101498# - virtual void DrawingText( - const Point& rStartPos, const String& rText, USHORT nTextStart, USHORT nTextLen, - const sal_Int32* pDXArray, const SvxFont& rFont, USHORT nPara, xub_StrLen nIndex, BYTE nRightToLeft, - const EEngineData::WrongSpellVector* pWrongSpellVector, - const SvxFieldData* pFieldData, - bool bEndOfLine, - bool bEndOfParagraph, - bool bEndOfBullet, - const ::com::sun::star::lang::Locale* pLocale, - const Color& rOverlineColor, - const Color& rTextLineColor); - - Size CalcTextSize(); - - Point GetDocPos( Paragraph* pPara ); - - void SetStyleSheetPool( SfxStyleSheetPool* pSPool ); - SfxStyleSheetPool* GetStyleSheetPool(); - - BOOL IsInSelectionMode() const; - - void SetStyleSheet( ULONG nPara, SfxStyleSheet* pStyle ); - SfxStyleSheet* GetStyleSheet( ULONG nPara ); - - void SetParaAttribs( USHORT nPara, const SfxItemSet& ); - SfxItemSet GetParaAttribs( USHORT nPara ); - - void Remove( Paragraph* pPara, ULONG nParaCount ); - 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; - - // gibt ein Array mit den Bulletbreiten der n Einrueckebenen - // zurueck. Letzter Wert muss -1 sein. Wird vom Outliner geloescht. - Link GetWidthArrReqHdl() const{ return aWidthArrReqHdl; } - void SetWidthArrReqHdl(const Link& rLink){aWidthArrReqHdl=rLink; } - - void SetControlWord( ULONG nWord ); - ULONG GetControlWord() const; - - Link GetBeginMovingHdl() const { return aBeginMovingHdl; } - void SetBeginMovingHdl(const Link& rLink) {aBeginMovingHdl=rLink;} - Link GetEndMovingHdl() const {return aEndMovingHdl;} - void SetEndMovingHdl( const Link& rLink){aEndMovingHdl=rLink;} - - ULONG GetLineCount( ULONG nParagraph ) const; - USHORT GetLineLen( ULONG nParagraph, USHORT nLine ) const; - ULONG GetLineHeight( ULONG nParagraph, ULONG nLine = 0 ); - - // nFormat muss ein Wert aus dem enum EETextFormat sein (wg.CLOOKS) - ULONG Read( SvStream& rInput, const String& rBaseURL, USHORT, SvKeyValueIterator* pHTTPHeaderAttrs = NULL ); - - SfxUndoManager& GetUndoManager(); - - void QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel ); - void QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel ); - void QuickInsertLineBreak( const ESelection& rSel ); - - // nur fuer EditEngine-Modus - void QuickInsertText( const String& rText, const ESelection& rSel ); - void QuickDelete( const ESelection& rSel ); - void QuickRemoveCharAttribs( USHORT nPara, USHORT nWhich = 0 ); - void QuickFormatDoc( BOOL bFull = FALSE ); - - BOOL UpdateFields(); - 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< - ::com::sun::star::linguistic2::XSpellChecker1 > &xSpeller ); - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellChecker1 > - GetSpeller(); - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XHyphenator > - GetHyphenator() const; - void SetHyphenator( ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XHyphenator >& xHyph ); - - void SetForbiddenCharsTable( vos::ORef<SvxForbiddenCharactersTable> xForbiddenChars ); - vos::ORef<SvxForbiddenCharactersTable> GetForbiddenCharsTable() const; - - // Depricated - void SetDefaultLanguage( LanguageType eLang ); - LanguageType GetDefaultLanguage() const; - - BOOL HasOnlineSpellErrors() const; - void CompleteOnlineSpelling(); - - EESpellState HasSpellErrors(); - BOOL HasText( const SvxSearchItem& rSearchItem ); - virtual BOOL SpellNextDocument(); - - // for text conversion - sal_Bool HasConvertibleTextPortion( LanguageType nLang ); - virtual BOOL ConvertNextDocument(); - - void SetEditTextObjectPool( SfxItemPool* pPool ); - SfxItemPool* GetEditTextObjectPool() const; - - void SetRefDevice( OutputDevice* pRefDev ); - OutputDevice* GetRefDevice() const; - - USHORT GetFirstLineOffset( ULONG nParagraph ); - - 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 ); - - void SetGlobalCharStretching( USHORT nX = 100, USHORT nY = 100 ); - void GetGlobalCharStretching( USHORT& rX, USHORT& rY ); - void DoStretchChars( USHORT nX, USHORT nY ); - void EraseVirtualDevice(); - - void SetBigTextObjectStart( USHORT nStartAtPortionCount ); - USHORT GetBigTextObjectStart() const; - BOOL ShouldCreateBigTextObject() const; - - const EditEngine& GetEditEngine() const { return *((EditEngine*)pEditEngine); } - - // this is needed for StarOffice Api - void SetLevelDependendStyleSheet( USHORT nPara ); - - USHORT GetOutlinerMode() const { return nOutlinerMode & OUTLINERMODE_USERMASK; } - - void StartSpelling(EditView& rEditView, sal_Bool bMultipleDoc); - //spell and return a sentence - bool SpellSentence(EditView& rEditView, ::svx::SpellPortions& rToFill, bool bIsGrammarChecking ); - // put spell position to start of current sentence - void PutSpellingToSentenceStart( EditView& rEditView ); - //applies a changed sentence - void ApplyChangedSentence(EditView& rEditView, const ::svx::SpellPortions& rNewPortions, bool bIsGrammarChecking ); - 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; - - /** 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; - - /** sets a link that is called before a drop or paste operation. */ - void SetBeginPasteOrDropHdl( const Link& rLink ); - Link GetBeginPasteOrDropHdl() const { return maBeginPasteOrDropHdl; } - - /** sets a link that is called after a drop or paste operation. */ - void SetEndPasteOrDropHdl( const Link& rLink ); - Link GetEndPasteOrDropHdl() const { return maEndPasteOrDropHdl; } - - virtual sal_Int16 GetNumberingStartValue( sal_uInt16 nPara ); - virtual void SetNumberingStartValue( sal_uInt16 nPara, sal_Int16 nNumberingStartValue ); - - virtual sal_Bool IsParaIsNumberingRestart( sal_uInt16 nPara ); - virtual void SetParaIsNumberingRestart( sal_uInt16 nPara, sal_Bool bParaIsNumberingRestart ); -}; - -#endif - diff --git a/svx/inc/svx/outlobj.hxx b/svx/inc/svx/outlobj.hxx deleted file mode 100644 index 0311fa914422..000000000000 --- a/svx/inc/svx/outlobj.hxx +++ /dev/null @@ -1,99 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: outlobj.hxx,v $ - * $Revision: 1.5.78.1 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _OUTLOBJ_HXX -#define _OUTLOBJ_HXX - -////////////////////////////////////////////////////////////////////////////// - -#include <tools/solar.h> -#include <tools/string.hxx> -#include <rsc/rscsfx.hxx> -#include <svx/paragraphdata.hxx> -#include "svx/svxdllapi.h" - -class EditTextObject; -class ImplOutlinerParaObject; - -////////////////////////////////////////////////////////////////////////////// - -class SVX_DLLPUBLIC OutlinerParaObject -{ -private: - ImplOutlinerParaObject* mpImplOutlinerParaObject; - - void ImplMakeUnique(); - -public: - // constructors/destructor - OutlinerParaObject( - const EditTextObject& rEditTextObject, - const ParagraphDataVector& rParagraphDataVector = ParagraphDataVector(), - bool bIsEditDoc = true); - OutlinerParaObject(const OutlinerParaObject& rCandidate); - ~OutlinerParaObject(); - - // assignment operator - OutlinerParaObject& operator=(const OutlinerParaObject& rCandidate); - - // compare operator - bool operator==(const OutlinerParaObject& rCandidate) const; - bool operator!=(const OutlinerParaObject& rCandidate) const { return !operator==(rCandidate); } - - // #i102062# - bool isWrongListEqual(const OutlinerParaObject& rCompare) const; - - // outliner mode access - sal_uInt16 GetOutlinerMode() const; - void SetOutlinerMode(sal_uInt16 nNew); - - // vertical access - bool IsVertical() const; - void SetVertical(bool bNew); - - // data read access - sal_uInt32 Count() const; - sal_Int16 GetDepth(sal_uInt16 nPara) const; - const EditTextObject& GetTextObject() const; - bool IsEditDoc() const; - const ParagraphData& GetParagraphData(sal_uInt32 nIndex) const; - - // portion info support - void ClearPortionInfo(); - - // StyleSheet support - bool ChangeStyleSheets(const XubString& rOldName, SfxStyleFamily eOldFamily, const XubString& rNewName, SfxStyleFamily eNewFamily); - void ChangeStyleSheetName(SfxStyleFamily eFamily, const XubString& rOldName, const XubString& rNewName); - void SetStyleSheets(sal_uInt16 nLevel, const XubString rNewName, const SfxStyleFamily& rNewFamily); -}; - -////////////////////////////////////////////////////////////////////////////// - -#endif diff --git a/svx/inc/svx/pagectrl.hxx b/svx/inc/svx/pagectrl.hxx index 60a65c9c3b47..74a79d8e3a0d 100644 --- a/svx/inc/svx/pagectrl.hxx +++ b/svx/inc/svx/pagectrl.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: pagectrl.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/pageitem.hxx b/svx/inc/svx/pageitem.hxx index a9f611474a1b..97a325751ca4 100644 --- a/svx/inc/svx/pageitem.hxx +++ b/svx/inc/svx/pageitem.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: pageitem.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/paperinf.hxx b/svx/inc/svx/paperinf.hxx deleted file mode 100644 index 9e2503a56ea8..000000000000 --- a/svx/inc/svx/paperinf.hxx +++ /dev/null @@ -1,76 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: paperinf.hxx,v $ - * $Revision: 1.3 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_PAPERINF_HXX -#define _SVX_PAPERINF_HXX - -// INCLUDE --------------------------------------------------------------- - -#include <vcl/print.hxx> -#include <vcl/mapmod.hxx> -#include <svx/svxenum.hxx> -#include "svx/svxdllapi.h" - -// forward --------------------------------------------------------------- - -class Printer; -class Size; -class String; - -// class SvxPaperInfo ----------------------------------------------------- - -class SVX_DLLPUBLIC SvxPaperInfo -{ -public: - static Size GetDefaultPaperSize( MapUnit eUnit = MAP_TWIP ); - static Size GetPaperSize( Paper ePaper, MapUnit eUnit = MAP_TWIP ); - static Size GetPaperSize( const Printer* pPrinter ); - static Paper GetSvxPaper( const Size &rSize, MapUnit eUnit = MAP_TWIP, bool bSloppy = FALSE ); - static long GetSloppyPaperDimension( long nSize, MapUnit eUnit = MAP_TWIP ); - static String GetName( Paper ePaper ); -}; - -// INLINE ----------------------------------------------------------------- - -inline Size &Swap(Size &rSize) -{ - const long lVal = rSize.Width(); - rSize.Width() = rSize.Height(); - rSize.Height() = lVal; - return rSize; -} - -inline Size &LandscapeSwap(Size &rSize) -{ - if ( rSize.Height() > rSize.Width() ) - Swap( rSize ); - return rSize; -} - -#endif diff --git a/svx/inc/svx/paragraphdata.hxx b/svx/inc/svx/paragraphdata.hxx deleted file mode 100644 index ddd98a15e176..000000000000 --- a/svx/inc/svx/paragraphdata.hxx +++ /dev/null @@ -1,75 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: outlobj.hxx,v $ - * $Revision: 1.5.78.1 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _PARAGRAPH_DATA_HXX -#define _PARAGRAPH_DATA_HXX - -#include <tools/solar.h> -#include <vector> - -////////////////////////////////////////////////////////////////////////////// -// MT 07/00: Only for internal use, oder some kind like hPara for the few -// functions where you need it outside ( eg. moving paragraphs... ) -// -// AW: Unfortunately NOT only local (formally in outliner.hxx), but also -// used in outlobj.hxx. Moved to own header - -class ParagraphData -{ - friend class Paragraph; - friend class OutlinerParaObject; - -protected: - sal_Int16 nDepth; - sal_Int16 mnNumberingStartValue; - sal_Bool mbParaIsNumberingRestart; - -public: - ParagraphData( const ParagraphData& ); - ParagraphData(); - - ParagraphData& operator=( const ParagraphData& ); - - // compare operator - bool operator==(const ParagraphData& rCandidate) const; - - // data read access - sal_Int16 getDepth() const { return nDepth; } -}; - -////////////////////////////////////////////////////////////////////////////// - -typedef ::std::vector< ParagraphData > ParagraphDataVector; - -////////////////////////////////////////////////////////////////////////////// - -#endif // _PARAGRAPH_DATA_HXX - -// eof diff --git a/svx/inc/svx/paraprev.hxx b/svx/inc/svx/paraprev.hxx index ac167c6e818e..25f454daee6d 100644 --- a/svx/inc/svx/paraprev.hxx +++ b/svx/inc/svx/paraprev.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: paraprev.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -33,7 +30,7 @@ // include --------------------------------------------------------------- #include <vcl/window.hxx> -#include <svx/svxenum.hxx> +#include <editeng/svxenum.hxx> #include "svx/svxdllapi.h" // enum ------------------------------------------------------------------ diff --git a/svx/inc/svx/paravertalignitem.hxx b/svx/inc/svx/paravertalignitem.hxx deleted file mode 100644 index a7026422cc97..000000000000 --- a/svx/inc/svx/paravertalignitem.hxx +++ /dev/null @@ -1,86 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: paravertalignitem.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_PARAVERTALIGNITEM_HXX -#define _SVX_PARAVERTALIGNITEM_HXX - -// include --------------------------------------------------------------- - -#include <svl/intitem.hxx> -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#include "svx/svxdllapi.h" - -// class SvxParaVertAlignItem ---------------------------------------------- - -/* [Description] - - This item defines the character alignment in the lines of a paragraph. - Currently the alignment can be none (i.e. baseline), top, center or bottom. - -*/ - -class SVX_DLLPUBLIC SvxParaVertAlignItem : public SfxUInt16Item -{ -public: - enum { AUTOMATIC, BASELINE, TOP, CENTER, BOTTOM }; - TYPEINFO(); - - 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 SfxItemPresentation GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - String &rText, - const IntlWrapper * = 0 ) const; - - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, - BYTE nMemberId ); - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, - BYTE nMemberId ) const; - - inline SvxParaVertAlignItem& operator=( const SvxParaVertAlignItem& rItem ) - { - SetValue( rItem.GetValue() ); - return *this; - } - - virtual int operator==( const SfxPoolItem& ) const; - -}; - -#endif - diff --git a/svx/inc/svx/pbinitem.hxx b/svx/inc/svx/pbinitem.hxx deleted file mode 100644 index f6a490cd8316..000000000000 --- a/svx/inc/svx/pbinitem.hxx +++ /dev/null @@ -1,83 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: pbinitem.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_PBINITEM_HXX -#define _SVX_PBINITEM_HXX - -// include --------------------------------------------------------------- - -#include <svl/intitem.hxx> -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#include "svx/svxdllapi.h" - -// define ---------------------------------------------------------------- - -#define PAPERBIN_PRINTER_SETTINGS ((BYTE)0xFF) - -// class SvxPaperBinItem ------------------------------------------------- - -/* [Beschreibung] - - Dieses Item beschreibt die Auswahl eines Papierschachts des Drucker. -*/ - -class SVX_DLLPUBLIC SvxPaperBinItem : public SfxByteItem -{ -public: - TYPEINFO(); - - inline SvxPaperBinItem( const USHORT nId , - const BYTE nTray = PAPERBIN_PRINTER_SETTINGS ); - inline SvxPaperBinItem &operator=( const SvxPaperBinItem &rCpy ); - - // "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, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; -}; - -inline SvxPaperBinItem::SvxPaperBinItem( const USHORT nId, const BYTE nT ) - : SfxByteItem( nId, nT ) -{} - -inline SvxPaperBinItem &SvxPaperBinItem::operator=( - const SvxPaperBinItem &rCpy ) -{ - SetValue( rCpy.GetValue() ); - return *this; -} - -#endif - diff --git a/svx/inc/svx/pmdlitem.hxx b/svx/inc/svx/pmdlitem.hxx deleted file mode 100644 index edbf627c516b..000000000000 --- a/svx/inc/svx/pmdlitem.hxx +++ /dev/null @@ -1,92 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: pmdlitem.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_PMDLITEM_HXX -#define _SVX_PMDLITEM_HXX - -// include --------------------------------------------------------------- - -#include <svl/stritem.hxx> -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#include "svx/svxdllapi.h" - -// class SvxPageModelItem ------------------------------------------------ - -/* -[Beschreibung] -Dieses Item enthaelt einen Namen einer Seitenvorlage. -*/ - -class SVX_DLLPUBLIC SvxPageModelItem : public SfxStringItem -{ -private: - BOOL bAuto; - -public: - TYPEINFO(); - - inline SvxPageModelItem( USHORT nWh ); - inline SvxPageModelItem( const String& rModel, BOOL bA /*= FALSE*/, - USHORT nWh ); - inline SvxPageModelItem& operator=( const SvxPageModelItem& rModel ); - - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; - - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); - BOOL IsAuto() const { return bAuto; } -}; - -inline SvxPageModelItem::SvxPageModelItem( USHORT nWh ) - : bAuto( FALSE ) -{ - SetWhich( nWh ); -} - -inline SvxPageModelItem::SvxPageModelItem( const String& rModel, BOOL bA, - USHORT nWh ) : - SfxStringItem( nWh, rModel ), - bAuto( bA ) -{} - -inline SvxPageModelItem& SvxPageModelItem::operator=( const SvxPageModelItem& rModel ) -{ - SetValue( rModel.GetValue() ); - return *this; -} - -#endif - diff --git a/svx/inc/svx/polygn3d.hxx b/svx/inc/svx/polygn3d.hxx index 5bc9f9b8fb15..644baf65eb88 100644 --- a/svx/inc/svx/polygn3d.hxx +++ b/svx/inc/svx/polygn3d.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: polygn3d.hxx,v $ - * $Revision: 1.4.18.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/polypolygoneditor.hxx b/svx/inc/svx/polypolygoneditor.hxx index 6201a5827843..adc8eb0cbeaf 100644 --- a/svx/inc/svx/polypolygoneditor.hxx +++ b/svx/inc/svx/polypolygoneditor.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: polypolygoneditor.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/polysc3d.hxx b/svx/inc/svx/polysc3d.hxx index 3fe0a997c358..d33a12b671c1 100644 --- a/svx/inc/svx/polysc3d.hxx +++ b/svx/inc/svx/polysc3d.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: polysc3d.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/postitem.hxx b/svx/inc/svx/postitem.hxx deleted file mode 100644 index b662f64116b5..000000000000 --- a/svx/inc/svx/postitem.hxx +++ /dev/null @@ -1,95 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: postitem.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_POSTITEM_HXX -#define _SVX_POSTITEM_HXX - -// include --------------------------------------------------------------- - -#include <vcl/vclenum.hxx> -#include <svl/eitem.hxx> -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#include "svx/svxdllapi.h" - -class SvXMLUnitConverter; -namespace rtl -{ - class OUString; -} - -// class SvxPostureItem -------------------------------------------------- - -/* - [Beschreibung] - Dieses Item beschreibt die Font-Stellung (Italic) -*/ - -class SVX_DLLPUBLIC SvxPostureItem : public SfxEnumItem -{ -public: - TYPEINFO(); - - SvxPostureItem( const FontItalic ePost /*= ITALIC_NONE*/, - const USHORT nId ); - - // "pure virtual Methoden" vom SfxPoolItem + SwEnumItem - 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 String GetValueTextByPos( USHORT nPos ) const; - virtual USHORT GetValueCount() const; - - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_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 ); - - inline SvxPostureItem& operator=(const SvxPostureItem& rPost) { - SetValue( rPost.GetValue() ); - return *this; - } - - // enum cast - FontItalic GetPosture() const - { return (FontItalic)GetValue(); } - void SetPosture( FontItalic eNew ) - { SetValue( (USHORT)eNew ); } -}; - -#endif // #ifndef _SVX_POSTITEM_HXX - diff --git a/svx/inc/svx/prszitem.hxx b/svx/inc/svx/prszitem.hxx deleted file mode 100644 index f075358f7a24..000000000000 --- a/svx/inc/svx/prszitem.hxx +++ /dev/null @@ -1,74 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: prszitem.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_PRSZITEM_HXX -#define _SVX_PRSZITEM_HXX - -// include --------------------------------------------------------------- - -#include <svl/intitem.hxx> -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#include "svx/svxdllapi.h" - -// class SvxPropSizeItem ------------------------------------------------- - -/* [Beschreibung] - - Dieses Item beschreibt die relative Schriftgroesse. -*/ - -class SVX_DLLPUBLIC SvxPropSizeItem : public SfxUInt16Item -{ -public: - TYPEINFO(); - - SvxPropSizeItem( const USHORT nPercent /*= 100*/, - const USHORT nID ); - - // "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, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; - - inline SvxPropSizeItem& operator=(const SvxPropSizeItem& rPropSize) - { - SetValue( rPropSize.GetValue() ); - return *this; - } -}; - -#endif - diff --git a/svx/inc/svx/rectenum.hxx b/svx/inc/svx/rectenum.hxx index a4570d392ac9..98a00c3a1154 100644 --- a/svx/inc/svx/rectenum.hxx +++ b/svx/inc/svx/rectenum.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: rectenum.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/ruler.hxx b/svx/inc/svx/ruler.hxx index 200f7f997471..d27f3a079495 100644 --- a/svx/inc/svx/ruler.hxx +++ b/svx/inc/svx/ruler.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ruler.hxx,v $ - * $Revision: 1.4.76.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/scene3d.hxx b/svx/inc/svx/scene3d.hxx index 718225aa990b..4bae0dcf9d00 100644 --- a/svx/inc/svx/scene3d.hxx +++ b/svx/inc/svx/scene3d.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: scene3d.hxx,v $ - * $Revision: 1.5.18.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -32,7 +29,7 @@ #define _E3D_SCENE3D_HXX #include <svx/camera3d.hxx> -#include <goodies/b3dtrans.hxx> +#include <tools/b3dtrans.hxx> #include <tools/time.hxx> #include <svx/svxdllapi.h> #include <svx/obj3d.hxx> diff --git a/svx/inc/svx/scriptspaceitem.hxx b/svx/inc/svx/scriptspaceitem.hxx deleted file mode 100644 index 660d3c9c2019..000000000000 --- a/svx/inc/svx/scriptspaceitem.hxx +++ /dev/null @@ -1,76 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: scriptspaceitem.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_SRIPTSPACEITEM_HXX -#define _SVX_SRIPTSPACEITEM_HXX - -// include --------------------------------------------------------------- - -#include <svl/eitem.hxx> -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#include "svx/svxdllapi.h" - -// class SvxScriptSpaceItem ---------------------------------------------- - -/* [Description] - - This item describe the scriptype of the selected text and is only - used for the user interface. -*/ - -class SVX_DLLPUBLIC SvxScriptSpaceItem : public SfxBoolItem -{ -public: - TYPEINFO(); - - 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 SfxItemPresentation GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - String &rText, - const IntlWrapper * = 0 ) const; - - inline SvxScriptSpaceItem& operator=(const SvxScriptSpaceItem& rItem ) - { - SetValue( rItem.GetValue() ); - return *this; - } - -}; - -#endif - diff --git a/svx/inc/svx/scripttypeitem.hxx b/svx/inc/svx/scripttypeitem.hxx deleted file mode 100644 index 75af8bcd8397..000000000000 --- a/svx/inc/svx/scripttypeitem.hxx +++ /dev/null @@ -1,97 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: scripttypeitem.hxx,v $ - * $Revision: 1.3 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_SCRIPTTYPEITEM_HXX -#define _SVX_SCRIPTTYPEITEM_HXX - -// include --------------------------------------------------------------- - -#include <svl/intitem.hxx> -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#include <svl/languageoptions.hxx> -#include "svx/svxdllapi.h" - -// class SvxScriptTypeItem ---------------------------------------------- - -/* [Description] - - This item describe the scriptype of the selected text and is only - used for the user interface. -*/ - -SVX_DLLPUBLIC USHORT GetI18NScriptTypeOfLanguage( USHORT nLang ); -USHORT GetItemScriptType( short nI18NType ); -short GetI18NScriptType( USHORT nItemType ); - -class SvxScriptTypeItem : public SfxUInt16Item -{ -public: - TYPEINFO(); - - SvxScriptTypeItem( sal_uInt16 nType = SCRIPTTYPE_LATIN ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - -}; - -class SVX_DLLPUBLIC SvxScriptSetItem : public SfxSetItem -{ -public: - TYPEINFO(); - - SvxScriptSetItem( USHORT nSlotId, SfxItemPool& rPool ); - - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream &, USHORT nVersion ) const; - - static const SfxPoolItem* GetItemOfScriptSet( const SfxItemSet& rSet, - USHORT nWhich ); - inline const SfxPoolItem* GetItemOfScriptSet( USHORT _nWhich ) const - { return SvxScriptSetItem::GetItemOfScriptSet( GetItemSet(), _nWhich ); } - - static const SfxPoolItem* GetItemOfScript( USHORT nSlotId, const SfxItemSet& rSet, USHORT nScript ); - - const SfxPoolItem* GetItemOfScript( USHORT nScript ) const; - - void PutItemForScriptType( USHORT nScriptType, const SfxPoolItem& rItem ); - - static void GetWhichIds( USHORT nSlotId, const SfxItemSet& rSet, USHORT& rLatin, USHORT& rAsian, USHORT& rComplex); - - void GetWhichIds( USHORT& rLatin, USHORT& rAsian, USHORT& rComplex) const; - - static void GetSlotIds( USHORT nSlotId, USHORT& rLatin, USHORT& rAsian, - USHORT& rComplex ); - inline void GetSlotIds( USHORT& rLatin, USHORT& rAsian, - USHORT& rComplex ) const - { GetSlotIds( Which(), rLatin, rAsian, rComplex ); } -}; - -#endif - diff --git a/svx/inc/svx/sdangitm.hxx b/svx/inc/svx/sdangitm.hxx index 27205b49ec8b..f78a98081efb 100644 --- a/svx/inc/svx/sdangitm.hxx +++ b/svx/inc/svx/sdangitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdangitm.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdasaitm.hxx b/svx/inc/svx/sdasaitm.hxx index 9678dec88968..882c25a1fdaf 100644 --- a/svx/inc/svx/sdasaitm.hxx +++ b/svx/inc/svx/sdasaitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdasaitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdasitm.hxx b/svx/inc/svx/sdasitm.hxx index 2499a857b965..0eee8e872453 100644 --- a/svx/inc/svx/sdasitm.hxx +++ b/svx/inc/svx/sdasitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdasitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sderitm.hxx b/svx/inc/svx/sderitm.hxx index 4c3a45ff1728..37c63a2cbc35 100644 --- a/svx/inc/svx/sderitm.hxx +++ b/svx/inc/svx/sderitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sderitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdgcoitm.hxx b/svx/inc/svx/sdgcoitm.hxx index e888cffc988d..8ed0c2a0bb04 100644 --- a/svx/inc/svx/sdgcoitm.hxx +++ b/svx/inc/svx/sdgcoitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdgcoitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdgcpitm.hxx b/svx/inc/svx/sdgcpitm.hxx index 4df0e005111d..9980db89a858 100644 --- a/svx/inc/svx/sdgcpitm.hxx +++ b/svx/inc/svx/sdgcpitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdgcpitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdggaitm.hxx b/svx/inc/svx/sdggaitm.hxx index c20ec38e78d1..13026e67988b 100644 --- a/svx/inc/svx/sdggaitm.hxx +++ b/svx/inc/svx/sdggaitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdggaitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdginitm.hxx b/svx/inc/svx/sdginitm.hxx index 10f57c5dc333..ca43ea6b2b31 100644 --- a/svx/inc/svx/sdginitm.hxx +++ b/svx/inc/svx/sdginitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdginitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdgluitm.hxx b/svx/inc/svx/sdgluitm.hxx index 07306d4bccdb..41f81f168b24 100644 --- a/svx/inc/svx/sdgluitm.hxx +++ b/svx/inc/svx/sdgluitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdgluitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdgmoitm.hxx b/svx/inc/svx/sdgmoitm.hxx index 0f27c6ef8ba4..77577b31b7d2 100644 --- a/svx/inc/svx/sdgmoitm.hxx +++ b/svx/inc/svx/sdgmoitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdgmoitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -31,7 +28,7 @@ #ifndef _SDGMOITM_HXX #define _SDGMOITM_HXX -#include <goodies/grfmgr.hxx> +#include <svtools/grfmgr.hxx> #include <svl/eitem.hxx> #include <svx/svddef.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdgtritm.hxx b/svx/inc/svx/sdgtritm.hxx index 21be16fc1834..47359d9b6bbf 100644 --- a/svx/inc/svx/sdgtritm.hxx +++ b/svx/inc/svx/sdgtritm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdgtritm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdmetitm.hxx b/svx/inc/svx/sdmetitm.hxx index b4f39d5fa76f..6e74cba29a59 100644 --- a/svx/inc/svx/sdmetitm.hxx +++ b/svx/inc/svx/sdmetitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdmetitm.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdooitm.hxx b/svx/inc/svx/sdooitm.hxx index d8af5ef51428..415cfd151bc9 100644 --- a/svx/inc/svx/sdooitm.hxx +++ b/svx/inc/svx/sdooitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdooitm.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdprcitm.hxx b/svx/inc/svx/sdprcitm.hxx index b9e17365629f..59f31998b71a 100644 --- a/svx/inc/svx/sdprcitm.hxx +++ b/svx/inc/svx/sdprcitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdprcitm.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/animation/animationstate.hxx b/svx/inc/svx/sdr/animation/animationstate.hxx index 01a1fe961e39..3728d1724cd2 100644 --- a/svx/inc/svx/sdr/animation/animationstate.hxx +++ b/svx/inc/svx/sdr/animation/animationstate.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: animationstate.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/animation/objectanimator.hxx b/svx/inc/svx/sdr/animation/objectanimator.hxx index 3fcb52463bc8..adc7f8ffebaf 100644 --- a/svx/inc/svx/sdr/animation/objectanimator.hxx +++ b/svx/inc/svx/sdr/animation/objectanimator.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: objectanimator.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/animation/scheduler.hxx b/svx/inc/svx/sdr/animation/scheduler.hxx index 03fc8eccd9b4..21547ed51da0 100644 --- a/svx/inc/svx/sdr/animation/scheduler.hxx +++ b/svx/inc/svx/sdr/animation/scheduler.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: scheduler.hxx,v $ - * $Revision: 1.8 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/attribute/sdrallattribute.hxx b/svx/inc/svx/sdr/attribute/sdrallattribute.hxx index a699c7f9a198..40ad89119d51 100644 --- a/svx/inc/svx/sdr/attribute/sdrallattribute.hxx +++ b/svx/inc/svx/sdr/attribute/sdrallattribute.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrallattribute.hxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/attribute/sdrformtextattribute.hxx b/svx/inc/svx/sdr/attribute/sdrformtextattribute.hxx index 77273bd9cb03..d812549bffcf 100644 --- a/svx/inc/svx/sdr/attribute/sdrformtextattribute.hxx +++ b/svx/inc/svx/sdr/attribute/sdrformtextattribute.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrtextattribute.hxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/attribute/sdrformtextoutlineattribute.hxx b/svx/inc/svx/sdr/attribute/sdrformtextoutlineattribute.hxx index 8e11c97ed5c3..d2c6d45b3873 100644 --- a/svx/inc/svx/sdr/attribute/sdrformtextoutlineattribute.hxx +++ b/svx/inc/svx/sdr/attribute/sdrformtextoutlineattribute.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrtextattribute.hxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx b/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx index 1759eb18d319..6f113192c891 100644 --- a/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx +++ b/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrtextattribute.hxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -34,7 +30,7 @@ #include <sal/types.h> #include <svx/xenum.hxx> -#include <svx/outlobj.hxx> +#include <editeng/outlobj.hxx> #include <svx/sdtaitm.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/inc/svx/sdr/contact/displayinfo.hxx b/svx/inc/svx/sdr/contact/displayinfo.hxx index 13336bb3175a..777e0abdd09b 100644 --- a/svx/inc/svx/sdr/contact/displayinfo.hxx +++ b/svx/inc/svx/sdr/contact/displayinfo.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: displayinfo.hxx,v $ - * $Revision: 1.15 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/contact/objectcontact.hxx b/svx/inc/svx/sdr/contact/objectcontact.hxx index c0388f152643..d88ea3dc2a12 100644 --- a/svx/inc/svx/sdr/contact/objectcontact.hxx +++ b/svx/inc/svx/sdr/contact/objectcontact.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: objectcontact.hxx,v $ - * $Revision: 1.13 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx b/svx/inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx index 0d15458e3571..3f7211aa9dc0 100644 --- a/svx/inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx +++ b/svx/inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: objectcontactofobjlistpainter.hxx,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/contact/objectcontactofpageview.hxx b/svx/inc/svx/sdr/contact/objectcontactofpageview.hxx index 10227d557dde..fc0a51c9eea8 100644 --- a/svx/inc/svx/sdr/contact/objectcontactofpageview.hxx +++ b/svx/inc/svx/sdr/contact/objectcontactofpageview.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: objectcontactofpageview.hxx,v $ - * $Revision: 1.13 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/contact/objectcontacttools.hxx b/svx/inc/svx/sdr/contact/objectcontacttools.hxx index 28ef32117ff3..b7f22868ec57 100644 --- a/svx/inc/svx/sdr/contact/objectcontacttools.hxx +++ b/svx/inc/svx/sdr/contact/objectcontacttools.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: objectcontacttools.hxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/contact/viewcontact.hxx b/svx/inc/svx/sdr/contact/viewcontact.hxx index ef1b3d6128e8..f4675f2728fc 100644 --- a/svx/inc/svx/sdr/contact/viewcontact.hxx +++ b/svx/inc/svx/sdr/contact/viewcontact.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: viewcontact.hxx,v $ - * $Revision: 1.12 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3d.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3d.hxx index 831a359d9c9f..b8e30b320a79 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofe3d.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofe3d.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: viewcontactofe3d.hxx,v $ - * - * $Revision: 1.2.18.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dcube.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dcube.hxx index 96ea1169d865..cccb51a4b8cc 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofe3dcube.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofe3dcube.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: viewcontactofe3dcube.hxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dextrude.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dextrude.hxx index 83658c291613..4fa152af362d 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofe3dextrude.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofe3dextrude.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: viewcontactofe3dextrude.hxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dlathe.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dlathe.hxx index 7c84bb2299d9..5c8502348b00 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofe3dlathe.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofe3dlathe.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: viewcontactofe3dlathe.hxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx index 6834697ca678..f681655888aa 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: viewcontactofe3dpolygon.hxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dscene.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dscene.hxx index 415526b07d77..beb88046dbe8 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofe3dscene.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofe3dscene.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: viewcontactofe3dscene.hxx,v $ - * $Revision: 1.5.18.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dsphere.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dsphere.hxx index 1f91097eebde..68a64e888d91 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofe3dsphere.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofe3dsphere.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: viewcontactofe3dsphere.hxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/contact/viewcontactofgraphic.hxx b/svx/inc/svx/sdr/contact/viewcontactofgraphic.hxx index 136f43aed0aa..b207c3e7fbde 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofgraphic.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofgraphic.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: viewcontactofgraphic.hxx,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/contact/viewcontactofgroup.hxx b/svx/inc/svx/sdr/contact/viewcontactofgroup.hxx index 3304158d4355..189f69a7311b 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofgroup.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofgroup.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: viewcontactofgroup.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx b/svx/inc/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx index e86cbcbc3da1..c408f1373e4c 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: viewcontactofmasterpagedescriptor.hxx,v $ - * $Revision: 1.11 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx index ceae7fbc5af8..54d188d198cc 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: viewcontactofpageobj.hxx,v $ - * $Revision: 1.8 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx index df1e48f5598a..5171ce75204f 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: viewcontactofsdrcaptionobj.hxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrcircobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrcircobj.hxx index 932431928c70..3d0ed6b56a59 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofsdrcircobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdrcircobj.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: viewcontactofsdrcircobj.hxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdredgeobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdredgeobj.hxx index f1241cba3c71..97ccf16c8c0a 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofsdredgeobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdredgeobj.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: viewcontactofsdredgeobj.hxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx index 1b8b978af6c3..97f258b2cda5 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: viewcontactofsdrmeasureobj.hxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx index 1bb38972b779..975ce214f3e8 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: viewcontactofsdrmediaobj.hxx,v $ - * $Revision: 1.8 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrobj.hxx index 7db0d450e9d6..c9ac57389799 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofsdrobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdrobj.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: viewcontactofsdrobj.hxx,v $ - * $Revision: 1.12 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx index f1b515e8a198..b58356283e57 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: viewcontactofsdrobjcustomshape.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx index 27235de9e097..76ff4f8e5632 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: viewcontactofsdrole2obj.hxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrpage.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrpage.hxx index 833e23384af2..54ddb9c299b3 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofsdrpage.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdrpage.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: viewcontactofsdrpage.hxx,v $ - * $Revision: 1.10 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrpathobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrpathobj.hxx index 6bb4671492d6..1d2127a3ab80 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofsdrpathobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdrpathobj.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: viewcontactofsdrpathobj.hxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrrectobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrrectobj.hxx index 850a5b6fce22..dddedd4e9f5b 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofsdrrectobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdrrectobj.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: viewcontactofsdrrectobj.hxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/contact/viewcontactoftextobj.hxx b/svx/inc/svx/sdr/contact/viewcontactoftextobj.hxx index 1b158ade9538..933199761f5a 100644 --- a/svx/inc/svx/sdr/contact/viewcontactoftextobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactoftextobj.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: viewcontactoftextobj.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx b/svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx index 06efd4eb787b..d0263ce60506 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: viewcontactofunocontrol.hxx,v $ - * $Revision: 1.8 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/contact/viewcontactofvirtobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofvirtobj.hxx index 5373a6bc7c0b..7aef09535149 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofvirtobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofvirtobj.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: viewcontactofvirtobj.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/contact/viewobjectcontact.hxx b/svx/inc/svx/sdr/contact/viewobjectcontact.hxx index 0e52c6d6285b..3917caebef0e 100644 --- a/svx/inc/svx/sdr/contact/viewobjectcontact.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontact.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: viewobjectcontact.hxx,v $ - * $Revision: 1.9 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofe3d.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofe3d.hxx index 2b2e01a6eb29..9306f76a5371 100644 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofe3d.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofe3d.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: viewobjectcontactofe3d.hxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofe3dscene.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofe3dscene.hxx index 622fc7b92c1b..49d35b90d03f 100644 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofe3dscene.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofe3dscene.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: viewobjectcontactofe3dscene.hxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofgraphic.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofgraphic.hxx index 2664278749af..ee0620353765 100644 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofgraphic.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofgraphic.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: viewobjectcontactofgraphic.hxx,v $ - * - * $Revision: 1.2.18.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofgroup.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofgroup.hxx index 902ce95a9fc4..064b87844e0c 100644 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofgroup.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofgroup.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: viewobjectcontactofgroup.hxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx index d0bc75c7c18a..3cb7ba2a7f84 100644 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: viewobjectcontactofmasterpagedescriptor.hxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofpageobj.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofpageobj.hxx index 79e610c3bc21..747f25cba3b6 100644 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofpageobj.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofpageobj.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: viewobjectcontactofpageobj.hxx,v $ - * - * $Revision: 1.2.18.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx index 6ea75e3cfa28..d0fcfd6698f9 100644 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: viewobjectcontactofsdrmediaobj.hxx,v $ - * $Revision: 1.9.18.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrobj.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrobj.hxx index 50f6723372ae..88245c46399e 100644 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrobj.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrobj.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: viewobjectcontactofsdrobj.hxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx index 23c667767275..db3020023198 100644 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: viewobjectcontactofsdrole2obj.hxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrpage.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrpage.hxx index 6e1e9254d64a..379112a35d30 100644 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrpage.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrpage.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: viewobjectcontactofsdrpage.hxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx index 109f86fe458b..9e70771e5844 100644 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: viewobjectcontactofunocontrol.hxx,v $ - * $Revision: 1.9 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -66,7 +63,6 @@ namespace sdr { namespace contact { public: ViewObjectContactOfUnoControl( ObjectContact& _rObjectContact, ViewContactOfUnoControl& _rViewContact ); - /// determines whether an XControl already exists, and is currently visible bool isControlVisible() const; diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactredirector.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactredirector.hxx index c5b01284ccc0..00f18751fb81 100644 --- a/svx/inc/svx/sdr/contact/viewobjectcontactredirector.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactredirector.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: viewobjectcontactredirector.hxx,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/event/eventhandler.hxx b/svx/inc/svx/sdr/event/eventhandler.hxx index 0f0ac6b2b377..f8c07c2d84e5 100644 --- a/svx/inc/svx/sdr/event/eventhandler.hxx +++ b/svx/inc/svx/sdr/event/eventhandler.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: eventhandler.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx b/svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx index 23a720467710..dd22a50480de 100644 --- a/svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx +++ b/svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: overlayanimatedbitmapex.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx b/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx index 96295d0f9f80..aa52efd03c41 100644 --- a/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx +++ b/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: overlaybitmapex.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/overlay/overlaycrosshair.hxx b/svx/inc/svx/sdr/overlay/overlaycrosshair.hxx index 35223ce44d04..13e45fa47baf 100644 --- a/svx/inc/svx/sdr/overlay/overlaycrosshair.hxx +++ b/svx/inc/svx/sdr/overlay/overlaycrosshair.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: overlaycrosshair.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx b/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx index aeb4c416f058..ce17ef86d881 100644 --- a/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx +++ b/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: overlaybitmap.cxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/overlay/overlayhelpline.hxx b/svx/inc/svx/sdr/overlay/overlayhelpline.hxx index 44baf5101e02..c8f26639f032 100644 --- a/svx/inc/svx/sdr/overlay/overlayhelpline.hxx +++ b/svx/inc/svx/sdr/overlay/overlayhelpline.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: overlayhelpline.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/overlay/overlayline.hxx b/svx/inc/svx/sdr/overlay/overlayline.hxx index 5c052b778fce..3df8dc0f4f05 100644 --- a/svx/inc/svx/sdr/overlay/overlayline.hxx +++ b/svx/inc/svx/sdr/overlay/overlayline.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: overlayline.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/overlay/overlaymanager.hxx b/svx/inc/svx/sdr/overlay/overlaymanager.hxx index 557a06a5f722..379086211cbf 100644 --- a/svx/inc/svx/sdr/overlay/overlaymanager.hxx +++ b/svx/inc/svx/sdr/overlay/overlaymanager.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: overlaymanager.hxx,v $ - * - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx b/svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx index 9ced6a4d18ec..fb21fa328232 100644 --- a/svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx +++ b/svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: overlaymanagerbuffered.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/overlay/overlayobject.hxx b/svx/inc/svx/sdr/overlay/overlayobject.hxx index ae31df8f6dee..0200e859d370 100644 --- a/svx/inc/svx/sdr/overlay/overlayobject.hxx +++ b/svx/inc/svx/sdr/overlay/overlayobject.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: overlayobject.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/overlay/overlayobjectcell.hxx b/svx/inc/svx/sdr/overlay/overlayobjectcell.hxx index 2f40c9385674..5d43983a57b0 100644 --- a/svx/inc/svx/sdr/overlay/overlayobjectcell.hxx +++ b/svx/inc/svx/sdr/overlay/overlayobjectcell.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: overlayobjectcell.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx b/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx index 3f665f203e5d..181ccdfb7831 100644 --- a/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx +++ b/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: overlayobjectlist.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx b/svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx index d7dc72df4d59..7107a92c286c 100644 --- a/svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx +++ b/svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: overlaypolypolygon.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx b/svx/inc/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx index e94cfefcf327..049dfefe585d 100644 --- a/svx/inc/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx +++ b/svx/inc/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: overlaysdrobject.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/overlay/overlayrollingrectangle.hxx b/svx/inc/svx/sdr/overlay/overlayrollingrectangle.hxx index 3120f02d950b..0dec8ac62fd9 100644 --- a/svx/inc/svx/sdr/overlay/overlayrollingrectangle.hxx +++ b/svx/inc/svx/sdr/overlay/overlayrollingrectangle.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: overlayrollingrectangle.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/overlay/overlayselection.hxx b/svx/inc/svx/sdr/overlay/overlayselection.hxx index 17f32ee419e9..4372929d4317 100644 --- a/svx/inc/svx/sdr/overlay/overlayselection.hxx +++ b/svx/inc/svx/sdr/overlay/overlayselection.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: overlayline.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/overlay/overlaytools.hxx b/svx/inc/svx/sdr/overlay/overlaytools.hxx index 830f3dc12586..4142e326a910 100644 --- a/svx/inc/svx/sdr/overlay/overlaytools.hxx +++ b/svx/inc/svx/sdr/overlay/overlaytools.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: overlayobject.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/overlay/overlaytriangle.hxx b/svx/inc/svx/sdr/overlay/overlaytriangle.hxx index 97b391047ba7..5479f65984ea 100644 --- a/svx/inc/svx/sdr/overlay/overlaytriangle.hxx +++ b/svx/inc/svx/sdr/overlay/overlaytriangle.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: overlaytriangle.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/primitive2d/primitiveFactory2d.hxx b/svx/inc/svx/sdr/primitive2d/primitiveFactory2d.hxx index aa3785995b25..09ba09a12f04 100644 --- a/svx/inc/svx/sdr/primitive2d/primitiveFactory2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/primitiveFactory2d.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: primitiveFactory2d.hxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx b/svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx index e4a8fa01902f..b1394fe7aa10 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrattributecreator.hxx,v $ - * - * $Revision: 1.2.18.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx index 177c42bfff17..e55d5e16b86f 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrcaptionprimitive2d.hxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx index 5523480f1f51..8367e2f4d2f1 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrconnectorprimitive2d.hxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx index 72035eb99569..a259dc1d7282 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrcustomshapeprimitive2d.hxx,v $ - * - * $Revision: 1.2.18.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -61,8 +57,8 @@ namespace drawinglayer // making exceptions with shadow generation unsigned mb3DShape : 1; - // #SJ# Allow text clipping against TextBox in special cases (used for SC)
- unsigned mbForceTextClipToTextRange : 1;
+ // #SJ# Allow text clipping against TextBox in special cases (used for SC) + unsigned mbForceTextClipToTextRange : 1; protected: // local decomposition. diff --git a/svx/inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx b/svx/inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx index 0f46c2809597..3b0ad25700f2 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrdecompositiontools.hxx,v $ - * - * $Revision: 1.2.18.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx index 1d11c27ede71..1ba1eb62187a 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrellipseprimitive2d.hxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx index 787c230d7b3d..1089253bc60d 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrgrafprimitive2d.hxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -36,7 +32,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <drawinglayer/attribute/sdrattribute.hxx> #include <svx/sdr/attribute/sdrallattribute.hxx> -#include <goodies/grfmgr.hxx> +#include <svtools/grfmgr.hxx> ////////////////////////////////////////////////////////////////////////////// // predefines diff --git a/svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx index 3e998f23fd2b..dba0992a558c 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrmeasureprimitive2d.hxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx index 2deaf474e12e..966527a7ec42 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrole2primitive2d.hxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx index ff04a6a5e79b..9aa5c854abfd 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrcaptionprimitive2d.hxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx index d6de666d901f..de4d761cd706 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrpathprimitive2d.hxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx b/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx index 2d419e9cd45d..a1319c13b638 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: primitiveFactory2d.hxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx index 816956b188fe..9df61ec5a9e0 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrrectangleprimitive2d.hxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx index ec35ff75f36d..a6e963c7ef13 100644 --- a/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrtextprimitive2d.hxx,v $ - * - * $Revision: 1.2.18.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -36,8 +32,8 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <com/sun/star/drawing/XDrawPage.hpp> -#include <svx/outlobj.hxx> -#include <tools/color.hxx>
+#include <editeng/outlobj.hxx> +#include <tools/color.hxx> #include <svx/sdr/attribute/sdrformtextattribute.hxx> #include <tools/weakbase.hxx> #include <svx/sdtaitm.hxx> diff --git a/svx/inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx b/svx/inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx index d1b857f510c3..53707f18fa4b 100644 --- a/svx/inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svx_primitivetypes2d.hxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/primitive3d/sdrattributecreator3d.hxx b/svx/inc/svx/sdr/primitive3d/sdrattributecreator3d.hxx index c7f37a16e274..809d3f71b11c 100644 --- a/svx/inc/svx/sdr/primitive3d/sdrattributecreator3d.hxx +++ b/svx/inc/svx/sdr/primitive3d/sdrattributecreator3d.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrattributecreator3d.hxx,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/properties/attributeproperties.hxx b/svx/inc/svx/sdr/properties/attributeproperties.hxx index 5bdcda6e8116..a8df62b52a67 100644 --- a/svx/inc/svx/sdr/properties/attributeproperties.hxx +++ b/svx/inc/svx/sdr/properties/attributeproperties.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: attributeproperties.hxx,v $ - * $Revision: 1.8 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/properties/captionproperties.hxx b/svx/inc/svx/sdr/properties/captionproperties.hxx index 2b6665777650..124bc19b67f1 100644 --- a/svx/inc/svx/sdr/properties/captionproperties.hxx +++ b/svx/inc/svx/sdr/properties/captionproperties.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: captionproperties.hxx,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/properties/circleproperties.hxx b/svx/inc/svx/sdr/properties/circleproperties.hxx index 7d8441e9e476..57efd50b0e01 100644 --- a/svx/inc/svx/sdr/properties/circleproperties.hxx +++ b/svx/inc/svx/sdr/properties/circleproperties.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: circleproperties.hxx,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/properties/connectorproperties.hxx b/svx/inc/svx/sdr/properties/connectorproperties.hxx index 1fbde6564c67..30752f149200 100644 --- a/svx/inc/svx/sdr/properties/connectorproperties.hxx +++ b/svx/inc/svx/sdr/properties/connectorproperties.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: connectorproperties.hxx,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/properties/customshapeproperties.hxx b/svx/inc/svx/sdr/properties/customshapeproperties.hxx index 7cd70fb7b408..8adbf10107d9 100644 --- a/svx/inc/svx/sdr/properties/customshapeproperties.hxx +++ b/svx/inc/svx/sdr/properties/customshapeproperties.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: customshapeproperties.hxx,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/properties/defaultproperties.hxx b/svx/inc/svx/sdr/properties/defaultproperties.hxx index 769edfea868d..58aceccadf1a 100644 --- a/svx/inc/svx/sdr/properties/defaultproperties.hxx +++ b/svx/inc/svx/sdr/properties/defaultproperties.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: defaultproperties.hxx,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/properties/e3dcompoundproperties.hxx b/svx/inc/svx/sdr/properties/e3dcompoundproperties.hxx index 9b2d121f10c7..085da6720382 100644 --- a/svx/inc/svx/sdr/properties/e3dcompoundproperties.hxx +++ b/svx/inc/svx/sdr/properties/e3dcompoundproperties.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: e3dcompoundproperties.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/properties/e3dextrudeproperties.hxx b/svx/inc/svx/sdr/properties/e3dextrudeproperties.hxx index c9401dfdf97d..f6baf589d642 100644 --- a/svx/inc/svx/sdr/properties/e3dextrudeproperties.hxx +++ b/svx/inc/svx/sdr/properties/e3dextrudeproperties.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: e3dextrudeproperties.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/properties/e3dlatheproperties.hxx b/svx/inc/svx/sdr/properties/e3dlatheproperties.hxx index 934b585fb72b..37810b36de0e 100644 --- a/svx/inc/svx/sdr/properties/e3dlatheproperties.hxx +++ b/svx/inc/svx/sdr/properties/e3dlatheproperties.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: e3dlatheproperties.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/properties/e3dproperties.hxx b/svx/inc/svx/sdr/properties/e3dproperties.hxx index b87411764b63..957e37cac0b6 100644 --- a/svx/inc/svx/sdr/properties/e3dproperties.hxx +++ b/svx/inc/svx/sdr/properties/e3dproperties.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: e3dproperties.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/properties/e3dsceneproperties.hxx b/svx/inc/svx/sdr/properties/e3dsceneproperties.hxx index e84263128482..0ef471999fb6 100644 --- a/svx/inc/svx/sdr/properties/e3dsceneproperties.hxx +++ b/svx/inc/svx/sdr/properties/e3dsceneproperties.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: e3dsceneproperties.hxx,v $ - * $Revision: 1.6.226.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/properties/e3dsphereproperties.hxx b/svx/inc/svx/sdr/properties/e3dsphereproperties.hxx index f949fd574c38..73b68b04e418 100644 --- a/svx/inc/svx/sdr/properties/e3dsphereproperties.hxx +++ b/svx/inc/svx/sdr/properties/e3dsphereproperties.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: e3dsphereproperties.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/properties/emptyproperties.hxx b/svx/inc/svx/sdr/properties/emptyproperties.hxx index 85bb97dfeb07..8cab0b03ca41 100644 --- a/svx/inc/svx/sdr/properties/emptyproperties.hxx +++ b/svx/inc/svx/sdr/properties/emptyproperties.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: emptyproperties.hxx,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/properties/graphicproperties.hxx b/svx/inc/svx/sdr/properties/graphicproperties.hxx index 9dd9a2b1539c..b3e04a67da55 100644 --- a/svx/inc/svx/sdr/properties/graphicproperties.hxx +++ b/svx/inc/svx/sdr/properties/graphicproperties.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: graphicproperties.hxx,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/properties/groupproperties.hxx b/svx/inc/svx/sdr/properties/groupproperties.hxx index d5addc240945..f91f91db42d4 100644 --- a/svx/inc/svx/sdr/properties/groupproperties.hxx +++ b/svx/inc/svx/sdr/properties/groupproperties.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: groupproperties.hxx,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/properties/itemsettools.hxx b/svx/inc/svx/sdr/properties/itemsettools.hxx index 1e72a849ed56..d52189ae93cc 100644 --- a/svx/inc/svx/sdr/properties/itemsettools.hxx +++ b/svx/inc/svx/sdr/properties/itemsettools.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: itemsettools.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/properties/measureproperties.hxx b/svx/inc/svx/sdr/properties/measureproperties.hxx index d6c5adb0253e..a204ebfe9949 100644 --- a/svx/inc/svx/sdr/properties/measureproperties.hxx +++ b/svx/inc/svx/sdr/properties/measureproperties.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: measureproperties.hxx,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/properties/pageproperties.hxx b/svx/inc/svx/sdr/properties/pageproperties.hxx index d235ca067933..d85686b3bc5b 100644 --- a/svx/inc/svx/sdr/properties/pageproperties.hxx +++ b/svx/inc/svx/sdr/properties/pageproperties.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: pageproperties.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/properties/properties.hxx b/svx/inc/svx/sdr/properties/properties.hxx index 2c4512236cb7..311c2ccfd1a5 100644 --- a/svx/inc/svx/sdr/properties/properties.hxx +++ b/svx/inc/svx/sdr/properties/properties.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: properties.hxx,v $ - * $Revision: 1.8 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/properties/rectangleproperties.hxx b/svx/inc/svx/sdr/properties/rectangleproperties.hxx index e9a2a41bcbb3..ea61a3bdf1b2 100644 --- a/svx/inc/svx/sdr/properties/rectangleproperties.hxx +++ b/svx/inc/svx/sdr/properties/rectangleproperties.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: rectangleproperties.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/properties/textproperties.hxx b/svx/inc/svx/sdr/properties/textproperties.hxx index 77a19818f55a..9a891f424461 100644 --- a/svx/inc/svx/sdr/properties/textproperties.hxx +++ b/svx/inc/svx/sdr/properties/textproperties.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: textproperties.hxx,v $ - * $Revision: 1.8 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdr/table/tabledesign.hxx b/svx/inc/svx/sdr/table/tabledesign.hxx index 80c6fa048e25..a062ec5210fb 100644 --- a/svx/inc/svx/sdr/table/tabledesign.hxx +++ b/svx/inc/svx/sdr/table/tabledesign.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: tabledesign.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdrcomment.hxx b/svx/inc/svx/sdrcomment.hxx index 10f5d0b59a76..1c087d3f445d 100644 --- a/svx/inc/svx/sdrcomment.hxx +++ b/svx/inc/svx/sdrcomment.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrcomment.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdrhittesthelper.hxx b/svx/inc/svx/sdrhittesthelper.hxx index 037f7fa813a5..cc57aec9cfb6 100644 --- a/svx/inc/svx/sdrhittesthelper.hxx +++ b/svx/inc/svx/sdrhittesthelper.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdetc.hxx,v $ - * $Revision: 1.4.152.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdrmasterpagedescriptor.hxx b/svx/inc/svx/sdrmasterpagedescriptor.hxx index b0593ab48774..14409698db9e 100644 --- a/svx/inc/svx/sdrmasterpagedescriptor.hxx +++ b/svx/inc/svx/sdrmasterpagedescriptor.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrmasterpagedescriptor.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdrobjectuser.hxx b/svx/inc/svx/sdrobjectuser.hxx index a3b9bf084a66..6d3112d15484 100644 --- a/svx/inc/svx/sdrobjectuser.hxx +++ b/svx/inc/svx/sdrobjectuser.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrobjectuser.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdrpageuser.hxx b/svx/inc/svx/sdrpageuser.hxx index 96cea320c857..d3f35e059fbd 100644 --- a/svx/inc/svx/sdrpageuser.hxx +++ b/svx/inc/svx/sdrpageuser.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrpageuser.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdrpagewindow.hxx b/svx/inc/svx/sdrpagewindow.hxx index 87806b4a72e4..a3e50fadc599 100644 --- a/svx/inc/svx/sdrpagewindow.hxx +++ b/svx/inc/svx/sdrpagewindow.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrpagewindow.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdshcitm.hxx b/svx/inc/svx/sdshcitm.hxx index 5d3930d2a5e8..0c8812c96575 100644 --- a/svx/inc/svx/sdshcitm.hxx +++ b/svx/inc/svx/sdshcitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdshcitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdshitm.hxx b/svx/inc/svx/sdshitm.hxx index 00873b1182c3..95f98ce943f6 100644 --- a/svx/inc/svx/sdshitm.hxx +++ b/svx/inc/svx/sdshitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdshitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdshtitm.hxx b/svx/inc/svx/sdshtitm.hxx index 4ab36d118cff..34a2cf4eb924 100644 --- a/svx/inc/svx/sdshtitm.hxx +++ b/svx/inc/svx/sdshtitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdshtitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdsxyitm.hxx b/svx/inc/svx/sdsxyitm.hxx index 2eace3120bd5..3afc487b3a26 100644 --- a/svx/inc/svx/sdsxyitm.hxx +++ b/svx/inc/svx/sdsxyitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdsxyitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdtaaitm.hxx b/svx/inc/svx/sdtaaitm.hxx index 27b8cde80a10..c10b75a8ffc7 100644 --- a/svx/inc/svx/sdtaaitm.hxx +++ b/svx/inc/svx/sdtaaitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdtaaitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdtacitm.hxx b/svx/inc/svx/sdtacitm.hxx index b34aaa5c2c0a..6459924bab5b 100644 --- a/svx/inc/svx/sdtacitm.hxx +++ b/svx/inc/svx/sdtacitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdtacitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdtaditm.hxx b/svx/inc/svx/sdtaditm.hxx index bff071dab476..2317f41bdbe1 100644 --- a/svx/inc/svx/sdtaditm.hxx +++ b/svx/inc/svx/sdtaditm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdtaditm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdtagitm.hxx b/svx/inc/svx/sdtagitm.hxx index b20d780195da..e76ddb8ec7c4 100644 --- a/svx/inc/svx/sdtagitm.hxx +++ b/svx/inc/svx/sdtagitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdtagitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdtaiitm.hxx b/svx/inc/svx/sdtaiitm.hxx index 6379f94a3bcf..a7e5d9506dcb 100644 --- a/svx/inc/svx/sdtaiitm.hxx +++ b/svx/inc/svx/sdtaiitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdtaiitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdtaitm.hxx b/svx/inc/svx/sdtaitm.hxx index ca816c5581ed..6caba22c1ffc 100644 --- a/svx/inc/svx/sdtaitm.hxx +++ b/svx/inc/svx/sdtaitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdtaitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdtakitm.hxx b/svx/inc/svx/sdtakitm.hxx index ef91d76f0374..f303692644ee 100644 --- a/svx/inc/svx/sdtakitm.hxx +++ b/svx/inc/svx/sdtakitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdtakitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdtayitm.hxx b/svx/inc/svx/sdtayitm.hxx index 84d82d561522..68069fffa11f 100644 --- a/svx/inc/svx/sdtayitm.hxx +++ b/svx/inc/svx/sdtayitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdtayitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdtcfitm.hxx b/svx/inc/svx/sdtcfitm.hxx index 928422ba51dc..1763b24bd937 100644 --- a/svx/inc/svx/sdtcfitm.hxx +++ b/svx/inc/svx/sdtcfitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdtcfitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdtditm.hxx b/svx/inc/svx/sdtditm.hxx index 15c1bdd0b7ec..5bd53138bd85 100644 --- a/svx/inc/svx/sdtditm.hxx +++ b/svx/inc/svx/sdtditm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdtditm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdtfchim.hxx b/svx/inc/svx/sdtfchim.hxx index d8fa20507980..dbfbfab2aeac 100644 --- a/svx/inc/svx/sdtfchim.hxx +++ b/svx/inc/svx/sdtfchim.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdtfchim.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdtfsitm.hxx b/svx/inc/svx/sdtfsitm.hxx index 467107d49812..324b8f8d0143 100644 --- a/svx/inc/svx/sdtfsitm.hxx +++ b/svx/inc/svx/sdtfsitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdtfsitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdtmfitm.hxx b/svx/inc/svx/sdtmfitm.hxx index e30d85be1034..9cd82fc5870c 100644 --- a/svx/inc/svx/sdtmfitm.hxx +++ b/svx/inc/svx/sdtmfitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdtmfitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sdynitm.hxx b/svx/inc/svx/sdynitm.hxx index 88826007ef90..6486cda18e31 100644 --- a/svx/inc/svx/sdynitm.hxx +++ b/svx/inc/svx/sdynitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdynitm.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/selectioncontroller.hxx b/svx/inc/svx/selectioncontroller.hxx index b9c04b54c0dc..bd26f9f2df42 100644 --- a/svx/inc/svx/selectioncontroller.hxx +++ b/svx/inc/svx/selectioncontroller.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: selectioncontroller.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/shaditem.hxx b/svx/inc/svx/shaditem.hxx deleted file mode 100644 index 90c33aef2410..000000000000 --- a/svx/inc/svx/shaditem.hxx +++ /dev/null @@ -1,117 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: shaditem.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_SHADITEM_HXX -#define _SVX_SHADITEM_HXX - -// include --------------------------------------------------------------- - -#include <tools/color.hxx> -#include <svl/eitem.hxx> -#include <svx/svxenum.hxx> -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#include "svx/svxdllapi.h" - -namespace rtl -{ - class OUString; -} - -// class SvxShadowItem --------------------------------------------------- - -/* [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) - -class SVX_DLLPUBLIC SvxShadowItem : public SfxEnumItemInterface -{ - Color aShadowColor; - USHORT nWidth; - SvxShadowLocation eLocation; -public: - TYPEINFO(); - - SvxShadowItem( const USHORT nId , - const Color *pColor = 0, const USHORT nWidth = 100 /*5pt*/, - const SvxShadowLocation eLoc = SVX_SHADOW_NONE ); - - inline SvxShadowItem& operator=( const SvxShadowItem& rFmtShadow ); - - // "pure virtual Methoden" vom SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_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 int ScaleMetrics( long nMult, long nDiv ); - virtual int HasMetrics() const; - - const Color& GetColor() const { return aShadowColor;} - void SetColor( const Color &rNew ) { aShadowColor = rNew; } - - USHORT GetWidth() const { return nWidth; } - SvxShadowLocation GetLocation() const { return eLocation; } - - void SetWidth( USHORT nNew ) { nWidth = nNew; } - void SetLocation( SvxShadowLocation eNew ) { eLocation = eNew; } - - //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 ); -}; - -inline SvxShadowItem &SvxShadowItem::operator=( const SvxShadowItem& rFmtShadow ) -{ - aShadowColor = rFmtShadow.aShadowColor; - nWidth = rFmtShadow.GetWidth(); - eLocation = rFmtShadow.GetLocation(); - return *this; -} - -#endif // #ifndef _SVX_SHADITEM_HXX - diff --git a/svx/inc/svx/shapeproperty.hxx b/svx/inc/svx/shapeproperty.hxx index 267b5e229d08..9b08d9c741b4 100755 --- a/svx/inc/svx/shapeproperty.hxx +++ b/svx/inc/svx/shapeproperty.hxx @@ -1,28 +1,29 @@ /************************************************************************* -* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* -* Copyright 2009 by Sun Microsystems, Inc. -* -* OpenOffice.org - a multi-platform office productivity suite -* -* This file is part of OpenOffice.org. -* -* OpenOffice.org is free software: you can redistribute it and/or modify -* it under the terms of the GNU Lesser General Public License version 3 -* only, as published by the Free Software Foundation. -* -* OpenOffice.org is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU Lesser General Public License version 3 for more details -* (a copy is included in the LICENSE file that accompanied this code). -* -* You should have received a copy of the GNU Lesser General Public License -* version 3 along with OpenOffice.org. If not, see -* <http://www.openoffice.org/license.html> -* for a copy of the LGPLv3 License. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * ************************************************************************/ -
+ #ifndef SVX_SHAPEPROPERTY_HXX #define SVX_SHAPEPROPERTY_HXX diff --git a/svx/inc/svx/shapepropertynotifier.hxx b/svx/inc/svx/shapepropertynotifier.hxx index b5598e5fb0da..573af71bdc2a 100644 --- a/svx/inc/svx/shapepropertynotifier.hxx +++ b/svx/inc/svx/shapepropertynotifier.hxx @@ -1,28 +1,29 @@ /************************************************************************* -* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* -* Copyright 2009 by Sun Microsystems, Inc. -* -* OpenOffice.org - a multi-platform office productivity suite -* -* This file is part of OpenOffice.org. -* -* OpenOffice.org is free software: you can redistribute it and/or modify -* it under the terms of the GNU Lesser General Public License version 3 -* only, as published by the Free Software Foundation. -* -* OpenOffice.org is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU Lesser General Public License version 3 for more details -* (a copy is included in the LICENSE file that accompanied this code). -* -* You should have received a copy of the GNU Lesser General Public License -* version 3 along with OpenOffice.org. If not, see -* <http://www.openoffice.org/license.html> -* for a copy of the LGPLv3 License. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * ************************************************************************/ -
+ #ifndef SVX_PROPERTYCHANGENOTIFIER_HXX #define SVX_PROPERTYCHANGENOTIFIER_HXX diff --git a/svx/inc/svx/shdditem.hxx b/svx/inc/svx/shdditem.hxx deleted file mode 100644 index f37f58ba048c..000000000000 --- a/svx/inc/svx/shdditem.hxx +++ /dev/null @@ -1,80 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: shdditem.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_SHDDITEM_HXX -#define _SVX_SHDDITEM_HXX - -// include --------------------------------------------------------------- - -#include <svl/eitem.hxx> -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#include "svx/svxdllapi.h" - -class SvXMLUnitConverter; -namespace rtl -{ - class OUString; -} - -// class SvxShadowedItem ------------------------------------------------- - -/* - [Beschreibung] - Dieses Item beschreibt, ob und wie schattiert ist. -*/ - -class SVX_DLLPUBLIC SvxShadowedItem : public SfxBoolItem -{ -public: - TYPEINFO(); - - SvxShadowedItem( const BOOL bShadowed /*= FALSE*/, - const USHORT nId ); - - // "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, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; - - inline SvxShadowedItem& operator=(const SvxShadowedItem& rShadow) { - SetValue(rShadow.GetValue()); - return *this; - } - -}; - -#endif - diff --git a/svx/inc/svx/simptabl.hxx b/svx/inc/svx/simptabl.hxx index 84f6b6bc2321..1f5543e9e484 100644 --- a/svx/inc/svx/simptabl.hxx +++ b/svx/inc/svx/simptabl.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: simptabl.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sizeitem.hxx b/svx/inc/svx/sizeitem.hxx deleted file mode 100644 index d99ed038a600..000000000000 --- a/svx/inc/svx/sizeitem.hxx +++ /dev/null @@ -1,89 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: sizeitem.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_SIZEITEM_HXX -#define _SVX_SIZEITEM_HXX - -// include --------------------------------------------------------------- - -#include <tools/gen.hxx> -#include <svl/poolitem.hxx> -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#include "svx/svxdllapi.h" - -// class SvxSizeItem ----------------------------------------------------- - -/* -[Beschreibung] -Dieses Item beschreibt eine zweidimensionale Groesse (Size). -*/ - -class SVX_DLLPUBLIC SvxSizeItem : public SfxPoolItem -{ - - Size aSize; - -public: - TYPEINFO(); - - SvxSizeItem( const USHORT nId ); - SvxSizeItem( const USHORT nId, const Size& rSize); - - inline SvxSizeItem& operator=( const SvxSizeItem &rCpy ); - - // "pure virtual Methoden" vom SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_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 int ScaleMetrics( long nMult, long nDiv ); - virtual int HasMetrics() const; - - const Size& GetSize() const { return aSize; } - void SetSize(const Size& rSize) { aSize = rSize; } -}; - -inline SvxSizeItem& SvxSizeItem::operator=( const SvxSizeItem &rCpy ) -{ - aSize = rCpy.aSize; - return *this; -} - -#endif - diff --git a/svx/inc/svx/sphere3d.hxx b/svx/inc/svx/sphere3d.hxx index 9c11b6537354..29813105374f 100644 --- a/svx/inc/svx/sphere3d.hxx +++ b/svx/inc/svx/sphere3d.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sphere3d.hxx,v $ - * $Revision: 1.4.18.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/splitcelldlg.hxx b/svx/inc/svx/splitcelldlg.hxx index 3bdc00e58ad2..bd1d3e8f60d0 100644 --- a/svx/inc/svx/splitcelldlg.hxx +++ b/svx/inc/svx/splitcelldlg.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: splitcelldlg.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/spltitem.hxx b/svx/inc/svx/spltitem.hxx deleted file mode 100644 index 7cf18a02ca93..000000000000 --- a/svx/inc/svx/spltitem.hxx +++ /dev/null @@ -1,87 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: spltitem.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_SPLTITEM_HXX -#define _SVX_SPLTITEM_HXX - -// include --------------------------------------------------------------- - -#include <svl/eitem.hxx> -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#include "svx/svxdllapi.h" - -class SvXMLUnitConverter; -namespace rtl -{ - class OUString; -} - -// class SvxFmtSplitItem ------------------------------------------------- - -/* -[Beschreibung] -Dieses Item beschreibt eine logische Variable "Absatz trennen ja oder nein". -*/ - -class SVX_DLLPUBLIC SvxFmtSplitItem : public SfxBoolItem -{ -public: - TYPEINFO(); - ~SvxFmtSplitItem(); - - inline SvxFmtSplitItem( const BOOL bSplit /*= TRUE*/, - const USHORT nWh ); - 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 SfxItemPresentation GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; -}; - -inline SvxFmtSplitItem::SvxFmtSplitItem( const BOOL bSplit, const USHORT nWh ) : - SfxBoolItem( nWh, bSplit ) -{} - -inline SvxFmtSplitItem& SvxFmtSplitItem::operator=( - const SvxFmtSplitItem& rSplit ) -{ - SetValue( rSplit.GetValue() ); - return *this; -} - -#endif - diff --git a/svx/inc/svx/splwrap.hxx b/svx/inc/svx/splwrap.hxx deleted file mode 100644 index e9b71d12320f..000000000000 --- a/svx/inc/svx/splwrap.hxx +++ /dev/null @@ -1,162 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: splwrap.hxx,v $ - * $Revision: 1.3 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_SPLWRAP_HXX -#define _SVX_SPLWRAP_HXX - -// include --------------------------------------------------------------- - -#include <svx/svxenum.hxx> -#include <tools/string.hxx> -#include <com/sun/star/uno/Reference.hxx> -#include "svx/svxdllapi.h" - -// forward --------------------------------------------------------------- - -namespace com { namespace sun { namespace star { namespace linguistic2 { - class XDictionary; - class XSpellChecker1; - class XHyphenator; -}}}} - -class Window; - -// misc functions --------------------------------------------------------------- - -void SVX_DLLPUBLIC SvxPrepareAutoCorrect( String &rOldText, String &rNewText ); - -/*-------------------------------------------------------------------- - Beschreibung: Der SpellWrapper - --------------------------------------------------------------------*/ - -class SVX_DLLPUBLIC SvxSpellWrapper { -private: - friend class SvxSpellCheckDialog; - friend class SvxHyphenWordDialog; - - Window* pWin; - ::com::sun::star::uno::Reference< - ::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 - // aufnehmen und nicht den Dialog starten. - - SVX_DLLPRIVATE sal_Bool SpellNext(); // naechsten Bereich anwaehlen - SVX_DLLPRIVATE sal_Bool FindSpellError(); // Suche nach Fehlern ( ueber Bereiche hinweg ) - -public: - SvxSpellWrapper( Window* pWn, - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellChecker1 > &xSpellChecker, - const sal_Bool bStart = sal_False, const sal_Bool bIsAllRight = sal_False, - const sal_Bool bOther = sal_False, const sal_Bool bRevAllow = sal_True ); - SvxSpellWrapper( Window* pWn, - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XHyphenator > &xHyphenator, - const sal_Bool bStart = sal_False, const sal_Bool bOther = sal_False ); - - virtual ~SvxSpellWrapper(); - - static sal_Int16 CheckSpellLang( - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellChecker1 > xSpell, - sal_Int16 nLang ); - static sal_Int16 CheckHyphLang( - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XHyphenator > xHyph, - sal_Int16 nLang ); - - static void ShowLanguageErrors(); - - 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 ::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; } - // kann evtl entfallen in ONE_LINGU: - 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 - { if ( nNew != nOldLang ) { SetLanguage( nNew ); nOldLang = nNew; } } - 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< - ::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 - // 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 ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionary > - GetAllRightDic() const; - virtual void SpellEnd(); // Bereich abschliessen - virtual void ScrollArea(); // ScrollArea einstellen - // Wort ersetzen - virtual void ChangeWord( const String& rNewWord, const sal_uInt16 nLang ); - virtual String GetThesWord(); - // Wort via Thesaurus ersetzen - virtual void ChangeThesWord( const String& rNewWord ); - virtual void SetLanguage( const sal_uInt16 nLang ); // Sprache aendern - virtual void AutoCorrect( const String& rAktStr, const String& rNewStr ); - virtual void InsertHyphen( const sal_uInt16 nPos ); // Hyphen einfuegen - -}; - -#endif diff --git a/svx/inc/svx/stddlg.hxx b/svx/inc/svx/stddlg.hxx index 9a4d2dc77a3a..c56cac58f4ae 100644 --- a/svx/inc/svx/stddlg.hxx +++ b/svx/inc/svx/stddlg.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: stddlg.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/strarray.hxx b/svx/inc/svx/strarray.hxx index 894115677e93..08f4975f1e35 100644 --- a/svx/inc/svx/strarray.hxx +++ b/svx/inc/svx/strarray.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: strarray.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/subtoolboxcontrol.hxx b/svx/inc/svx/subtoolboxcontrol.hxx index 538daabf6fe9..36b0676fece4 100644 --- a/svx/inc/svx/subtoolboxcontrol.hxx +++ b/svx/inc/svx/subtoolboxcontrol.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: subtoolboxcontrol.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svdattr.hxx b/svx/inc/svx/svdattr.hxx index 6149916f0d6c..4c4ddde2912d 100644 --- a/svx/inc/svx/svdattr.hxx +++ b/svx/inc/svx/svdattr.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdattr.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svdattrx.hxx b/svx/inc/svx/svdattrx.hxx index 08fd8c68d2d7..7fba70ed1ed2 100644 --- a/svx/inc/svx/svdattrx.hxx +++ b/svx/inc/svx/svdattrx.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdattrx.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svdcrtv.hxx b/svx/inc/svx/svdcrtv.hxx index 7637034b71a4..15640bb17cba 100644 --- a/svx/inc/svx/svdcrtv.hxx +++ b/svx/inc/svx/svdcrtv.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdcrtv.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svddef.hxx b/svx/inc/svx/svddef.hxx index b0c3d66a6344..a758e9c1dba7 100644 --- a/svx/inc/svx/svddef.hxx +++ b/svx/inc/svx/svddef.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svddef.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svddrag.hxx b/svx/inc/svx/svddrag.hxx index 8fc6b2527192..4b24c69bafcd 100644 --- a/svx/inc/svx/svddrag.hxx +++ b/svx/inc/svx/svddrag.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svddrag.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svddrgmt.hxx b/svx/inc/svx/svddrgmt.hxx index 91112a7dd287..9a32905bf37c 100644 --- a/svx/inc/svx/svddrgmt.hxx +++ b/svx/inc/svx/svddrgmt.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svddrgmt.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svddrgv.hxx b/svx/inc/svx/svddrgv.hxx index 3e03f437909a..9ad7a412dcc3 100644 --- a/svx/inc/svx/svddrgv.hxx +++ b/svx/inc/svx/svddrgv.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svddrgv.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svdedtv.hxx b/svx/inc/svx/svdedtv.hxx index 1db0df84bf75..98e76bf28969 100644 --- a/svx/inc/svx/svdedtv.hxx +++ b/svx/inc/svx/svdedtv.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdedtv.hxx,v $ - * $Revision: 1.3.148.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svdedxv.hxx b/svx/inc/svx/svdedxv.hxx index 293e50896044..505c52f8064a 100644 --- a/svx/inc/svx/svdedxv.hxx +++ b/svx/inc/svx/svdedxv.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdedxv.hxx,v $ - * $Revision: 1.4.76.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svdetc.hxx b/svx/inc/svx/svdetc.hxx index c0327d83457d..527c1ac17bf8 100644 --- a/svx/inc/svx/svdetc.hxx +++ b/svx/inc/svx/svdetc.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdetc.hxx,v $ - * $Revision: 1.4.152.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -38,7 +35,7 @@ #include <vcl/outdev.hxx> #endif #include <tools/shl.hxx> -#include <svx/outliner.hxx> +#include <editeng/outliner.hxx> #include "svx/svxdllapi.h" //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/svx/inc/svx/svdfield.hxx b/svx/inc/svx/svdfield.hxx index 7dc65651247c..cf79131a72cd 100644 --- a/svx/inc/svx/svdfield.hxx +++ b/svx/inc/svx/svdfield.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdfield.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -31,45 +28,9 @@ #ifndef _SVDFIELD_HXX #define _SVDFIELD_HXX -#include <svx/eeitem.hxx> - -#ifndef _FLDITEM_HXX -#ifndef ITEMID_FIELD -#ifndef _EDITDATA_HXX -#include <svx/editdata.hxx> /* das include wird wg. EE_FEATURE_FIELD benoetigt */ -#endif -#define ITEMID_FIELD EE_FEATURE_FIELD /* wird fuer #include <svx/flditem.hxx> benoetigt */ -#endif -#include <svx/flditem.hxx> -#endif #include "svx/svxdllapi.h" -//////////////////////////////////////////////////////////////////////////////////////////////////// -// Do not remove this, it is still used in src536a! void SVX_DLLPUBLIC SdrRegisterFieldClasses(); -//////////////////////////////////////////////////////////////////////////////////////////////////// - -#define SDR_MEASUREFIELD 50 - -class SdrMeasureObj; - -enum SdrMeasureFieldKind {SDRMEASUREFIELD_VALUE,SDRMEASUREFIELD_UNIT,SDRMEASUREFIELD_ROTA90BLANCS}; - -class SVX_DLLPUBLIC SdrMeasureField: public SvxFieldData { - SdrMeasureFieldKind eMeasureFieldKind; -public: - SV_DECL_PERSIST1(SdrMeasureField,SvxFieldData,SDR_MEASUREFIELD) - SdrMeasureField(): eMeasureFieldKind(SDRMEASUREFIELD_VALUE) {} - SdrMeasureField(SdrMeasureFieldKind eNewKind): eMeasureFieldKind(eNewKind) {} - virtual ~SdrMeasureField(); - virtual SvxFieldData* Clone() const; - virtual int operator==(const SvxFieldData&) const; - SdrMeasureFieldKind GetMeasureFieldKind() const { return eMeasureFieldKind; } - void SetMeasureFieldKind(SdrMeasureFieldKind eNewKind) { eMeasureFieldKind=eNewKind; } - void TakeRepresentation(const SdrMeasureObj& rObj, XubString& rStr) const; -}; - -//////////////////////////////////////////////////////////////////////////////////////////////////// #endif //_SVDFIELD_HXX diff --git a/svx/inc/svx/svdglev.hxx b/svx/inc/svx/svdglev.hxx index 69283fb6479a..88cd48974f9c 100644 --- a/svx/inc/svx/svdglev.hxx +++ b/svx/inc/svx/svdglev.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdglev.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svdglue.hxx b/svx/inc/svx/svdglue.hxx index c7c3af816fac..965aaf25225e 100644 --- a/svx/inc/svx/svdglue.hxx +++ b/svx/inc/svx/svdglue.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdglue.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svdhdl.hxx b/svx/inc/svx/svdhdl.hxx index 8d7d4552ea6c..d4b4d5d3369e 100644 --- a/svx/inc/svx/svdhdl.hxx +++ b/svx/inc/svx/svdhdl.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdhdl.hxx,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svdhlpln.hxx b/svx/inc/svx/svdhlpln.hxx index 925fb0f6b8af..1d5677ec95f6 100644 --- a/svx/inc/svx/svdhlpln.hxx +++ b/svx/inc/svx/svdhlpln.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdhlpln.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svdlayer.hxx b/svx/inc/svx/svdlayer.hxx index 82899e232c8e..492df9a12212 100644 --- a/svx/inc/svx/svdlayer.hxx +++ b/svx/inc/svx/svdlayer.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdlayer.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svdmark.hxx b/svx/inc/svx/svdmark.hxx index 111fd45d3bda..d67704b19c7d 100644 --- a/svx/inc/svx/svdmark.hxx +++ b/svx/inc/svx/svdmark.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdmark.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx index a9abeac76fc2..fc8d401f94e7 100644 --- a/svx/inc/svx/svdmodel.hxx +++ b/svx/inc/svx/svdmodel.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdmodel.hxx,v $ - * $Revision: 1.9 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -37,9 +34,7 @@ #include <tools/link.hxx> #include <tools/contnr.hxx> #include <tools/weakbase.hxx> -#ifndef _MAPMOD_HXX //autogen #include <vcl/mapmod.hxx> -#endif #include <svl/brdcst.hxx> #include <tools/string.hxx> #include <tools/datetime.hxx> @@ -86,7 +81,6 @@ class SfxRepeatTarget; class SfxStyleSheet; class SfxUndoAction; class SfxUndoManager; -class SvxLinkManager; class XBitmapList; class XBitmapTable; class XColorTable; @@ -107,6 +101,9 @@ class SdrUndoFactory; namespace comphelper{ class IEmbeddedHelper; } +namespace sfx2{ + class LinkManager; +} //////////////////////////////////////////////////////////////////////////////////////////////////// #define SDR_SWAPGRAPHICSMODE_NONE 0x00000000 @@ -215,7 +212,7 @@ protected: ULONG nProgressOfs; // -Handler rtl::Reference< SfxStyleSheetBasePool > mxStyleSheetPool; SfxStyleSheet* pDefaultStyleSheet; - SvxLinkManager* pLinkManager; // LinkManager + sfx2::LinkManager* pLinkManager; // LinkManager Container* pUndoStack; Container* pRedoStack; SdrUndoGroup* pAktUndoGroup; // Fuer mehrstufige @@ -403,8 +400,8 @@ public: SfxStyleSheet* GetDefaultStyleSheet() const { return pDefaultStyleSheet; } void SetDefaultStyleSheet(SfxStyleSheet* pDefSS) { pDefaultStyleSheet = pDefSS; } - SvxLinkManager* GetLinkManager() { return pLinkManager; } - void SetLinkManager(SvxLinkManager* pLinkMgr) { pLinkManager = pLinkMgr; } + sfx2::LinkManager* GetLinkManager() { return pLinkManager; } + void SetLinkManager( sfx2::LinkManager* pLinkMgr ) { pLinkManager = pLinkMgr; } ::comphelper::IEmbeddedHelper* GetPersist() const { return m_pEmbeddedHelper; } void ClearPersist() { m_pEmbeddedHelper = 0; } diff --git a/svx/inc/svx/svdmrkv.hxx b/svx/inc/svx/svdmrkv.hxx index 88d0b941273d..eecbc1f2c4f3 100644 --- a/svx/inc/svx/svdmrkv.hxx +++ b/svx/inc/svx/svdmrkv.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdmrkv.hxx,v $ - * $Revision: 1.6.76.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svdoashp.hxx b/svx/inc/svx/svdoashp.hxx index f65afc0b4efe..442b1dae7793 100644 --- a/svx/inc/svx/svdoashp.hxx +++ b/svx/inc/svx/svdoashp.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdoashp.hxx,v $ - * $Revision: 1.6.90.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -179,7 +176,7 @@ public: virtual UINT16 GetObjIdentifier() const; virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual void SetModel(SdrModel* pNewModel);
+ virtual void SetModel(SdrModel* pNewModel); virtual void RecalcSnapRect(); diff --git a/svx/inc/svx/svdoattr.hxx b/svx/inc/svx/svdoattr.hxx index 3bcce26ea45e..9b10ec3b3405 100644 --- a/svx/inc/svx/svdoattr.hxx +++ b/svx/inc/svx/svdoattr.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdoattr.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx index cc21e645e4d2..7d2f5b483e5b 100644 --- a/svx/inc/svx/svdobj.hxx +++ b/svx/inc/svx/svdobj.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdobj.hxx,v $ - * $Revision: 1.9.16.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svdocapt.hxx b/svx/inc/svx/svdocapt.hxx index 37bfd5ed2f9b..c2857e026ce1 100644 --- a/svx/inc/svx/svdocapt.hxx +++ b/svx/inc/svx/svdocapt.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdocapt.hxx,v $ - * $Revision: 1.4.18.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svdocirc.hxx b/svx/inc/svx/svdocirc.hxx index 3f6a589d2cd7..8ed5406d2cbf 100644 --- a/svx/inc/svx/svdocirc.hxx +++ b/svx/inc/svx/svdocirc.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdocirc.hxx,v $ - * $Revision: 1.5.18.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svdoedge.hxx b/svx/inc/svx/svdoedge.hxx index 227afd9ab027..654e2fd6ddf2 100644 --- a/svx/inc/svx/svdoedge.hxx +++ b/svx/inc/svx/svdoedge.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdoedge.hxx,v $ - * $Revision: 1.5.18.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svdograf.hxx b/svx/inc/svx/svdograf.hxx index 238f6953af7a..47bd6f2ad38a 100644 --- a/svx/inc/svx/svdograf.hxx +++ b/svx/inc/svx/svdograf.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdograf.hxx,v $ - * $Revision: 1.5.18.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -34,7 +31,7 @@ #include <com/sun/star/io/XInputStream.hpp> #include <vcl/graph.hxx> #include <svx/svdorect.hxx> -#include <goodies/grfmgr.hxx> +#include <svtools/grfmgr.hxx> #include "svx/svxdllapi.h" ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/inc/svx/svdogrp.hxx b/svx/inc/svx/svdogrp.hxx index 5f243d451f90..28abd0453869 100644 --- a/svx/inc/svx/svdogrp.hxx +++ b/svx/inc/svx/svdogrp.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdogrp.hxx,v $ - * $Revision: 1.3.226.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svdomeas.hxx b/svx/inc/svx/svdomeas.hxx index 406c5badbcb0..e48016096fc3 100644 --- a/svx/inc/svx/svdomeas.hxx +++ b/svx/inc/svx/svdomeas.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdomeas.hxx,v $ - * $Revision: 1.5.18.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -33,6 +30,7 @@ #include <svx/svdotext.hxx> #include "svx/svxdllapi.h" +#include <editeng/measfld.hxx> //************************************************************ // Vorausdeklarationen @@ -86,6 +84,7 @@ protected: protected: void ImpTakeAttr(ImpMeasureRec& rRec) const; + void TakeRepresentation( XubString& rStr, SdrMeasureFieldKind eMeasureFieldKind ) const; void ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly& rPol) const; basegfx::B2DPolyPolygon ImpCalcXPoly(const ImpMeasurePoly& rPol) const; void ImpEvalDrag(ImpMeasureRec& rRec, const SdrDragStat& rDrag) const; diff --git a/svx/inc/svx/svdomedia.hxx b/svx/inc/svx/svdomedia.hxx index 4b612dcf7e9e..c5fd58727869 100644 --- a/svx/inc/svx/svdomedia.hxx +++ b/svx/inc/svx/svdomedia.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdomedia.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svdoole2.hxx b/svx/inc/svx/svdoole2.hxx index 2b5a19f7b60b..6cb95ae9c504 100644 --- a/svx/inc/svx/svdoole2.hxx +++ b/svx/inc/svx/svdoole2.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdoole2.hxx,v $ - * $Revision: 1.5.60.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svdopage.hxx b/svx/inc/svx/svdopage.hxx index b138b7c12be9..328ea97faf6b 100644 --- a/svx/inc/svx/svdopage.hxx +++ b/svx/inc/svx/svdopage.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdopage.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svdopath.hxx b/svx/inc/svx/svdopath.hxx index 382f968f19b2..665d84a2a168 100644 --- a/svx/inc/svx/svdopath.hxx +++ b/svx/inc/svx/svdopath.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdopath.hxx,v $ - * $Revision: 1.4.18.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svdorect.hxx b/svx/inc/svx/svdorect.hxx index d8b0d2767553..8deac2350e6c 100644 --- a/svx/inc/svx/svdorect.hxx +++ b/svx/inc/svx/svdorect.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdorect.hxx,v $ - * $Revision: 1.5.18.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svdotable.hxx b/svx/inc/svx/svdotable.hxx index a524ce757898..a11b31ab9b57 100644 --- a/svx/inc/svx/svdotable.hxx +++ b/svx/inc/svx/svdotable.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdotable.hxx,v $ - * $Revision: 1.4.18.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svdotext.hxx b/svx/inc/svx/svdotext.hxx index 6ffa4ab5bd22..b48227f0e1e6 100644 --- a/svx/inc/svx/svdotext.hxx +++ b/svx/inc/svx/svdotext.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdotext.hxx,v $ - * $Revision: 1.5.18.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svdouno.hxx b/svx/inc/svx/svdouno.hxx index 83019f6b1cc5..c30f22064674 100644 --- a/svx/inc/svx/svdouno.hxx +++ b/svx/inc/svx/svdouno.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdouno.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svdoutl.hxx b/svx/inc/svx/svdoutl.hxx index 286e19ec6dea..cc7015197b23 100644 --- a/svx/inc/svx/svdoutl.hxx +++ b/svx/inc/svx/svdoutl.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdoutl.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -31,7 +28,7 @@ #ifndef _SVDOUTL_HXX #define _SVDOUTL_HXX -#include <svx/outliner.hxx> +#include <editeng/outliner.hxx> #include "svx/svxdllapi.h" #include <svx/svdobj.hxx> diff --git a/svx/inc/svx/svdovirt.hxx b/svx/inc/svx/svdovirt.hxx index 190576fc68c6..da0066b70ae7 100644 --- a/svx/inc/svx/svdovirt.hxx +++ b/svx/inc/svx/svdovirt.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdovirt.hxx,v $ - * $Revision: 1.4.18.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svdpage.hxx b/svx/inc/svx/svdpage.hxx index 3523308b6e8f..f11d41970451 100644 --- a/svx/inc/svx/svdpage.hxx +++ b/svx/inc/svx/svdpage.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdpage.hxx,v $ - * $Revision: 1.8 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svdpagv.hxx b/svx/inc/svx/svdpagv.hxx index 2d6323cc5a5d..4ad30c2958f3 100644 --- a/svx/inc/svx/svdpagv.hxx +++ b/svx/inc/svx/svdpagv.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdpagv.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svdpntv.hxx b/svx/inc/svx/svdpntv.hxx index 014afacb0706..bd6c7ea554cc 100755..100644 --- a/svx/inc/svx/svdpntv.hxx +++ b/svx/inc/svx/svdpntv.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdpntv.hxx,v $ - * $Revision: 1.8 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svdpoev.hxx b/svx/inc/svx/svdpoev.hxx index 9f79c1fcec44..c6628c28a790 100644 --- a/svx/inc/svx/svdpoev.hxx +++ b/svx/inc/svx/svdpoev.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdpoev.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svdpool.hxx b/svx/inc/svx/svdpool.hxx index d6cf4f8543b6..6c764262c5b0 100644 --- a/svx/inc/svx/svdpool.hxx +++ b/svx/inc/svx/svdpool.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdpool.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svdsnpv.hxx b/svx/inc/svx/svdsnpv.hxx index bf93d6b179a3..2d15f50a204e 100644 --- a/svx/inc/svx/svdsnpv.hxx +++ b/svx/inc/svx/svdsnpv.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdsnpv.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svdsob.hxx b/svx/inc/svx/svdsob.hxx index 02fa14129e38..64d437d4c608 100644 --- a/svx/inc/svx/svdsob.hxx +++ b/svx/inc/svx/svdsob.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdsob.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svdtext.hxx b/svx/inc/svx/svdtext.hxx index d745bbe170de..6774236d197c 100644 --- a/svx/inc/svx/svdtext.hxx +++ b/svx/inc/svx/svdtext.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdtext.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svdtrans.hxx b/svx/inc/svx/svdtrans.hxx index 7e21ef848c9b..36116e821369 100644 --- a/svx/inc/svx/svdtrans.hxx +++ b/svx/inc/svx/svdtrans.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdtrans.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svdtypes.hxx b/svx/inc/svx/svdtypes.hxx index f7c15bae9b3f..9c895e3f5302 100644 --- a/svx/inc/svx/svdtypes.hxx +++ b/svx/inc/svx/svdtypes.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdtypes.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svdundo.hxx b/svx/inc/svx/svdundo.hxx index 803b454a6f0c..3ef31455b6e7 100644 --- a/svx/inc/svx/svdundo.hxx +++ b/svx/inc/svx/svdundo.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdundo.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svdview.hxx b/svx/inc/svx/svdview.hxx index 1fe40e40df41..66fd720db37a 100644 --- a/svx/inc/svx/svdview.hxx +++ b/svx/inc/svx/svdview.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdview.hxx,v $ - * $Revision: 1.5.76.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svdxcgv.hxx b/svx/inc/svx/svdxcgv.hxx index ed15dfd70c77..9bdd6e005cc3 100644 --- a/svx/inc/svx/svdxcgv.hxx +++ b/svx/inc/svx/svdxcgv.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svdxcgv.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svx3ditems.hxx b/svx/inc/svx/svx3ditems.hxx index 998b20a7a751..e39c39f3e513 100644 --- a/svx/inc/svx/svx3ditems.hxx +++ b/svx/inc/svx/svx3ditems.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svx3ditems.hxx,v $ - * $Revision: 1.4.226.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -34,7 +31,7 @@ #include <svl/eitem.hxx> -#include <svx/colritem.hxx> +#include <editeng/colritem.hxx> #include <svx/e3ditem.hxx> #include <svx/viewpt3d.hxx> #include <svx/svddef.hxx> diff --git a/svx/inc/svx/svxacorr.hxx b/svx/inc/svx/svxacorr.hxx deleted file mode 100644 index 5d61f303972d..000000000000 --- a/svx/inc/svx/svxacorr.hxx +++ /dev/null @@ -1,396 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: svxacorr.hxx,v $ - * $Revision: 1.3 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _MySVXACORR_HXX -#define _MySVXACORR_HXX - -#include <com/sun/star/embed/XStorage.hpp> -#include <tools/rtti.hxx> -#include <svl/svarray.hxx> -#include <i18npool/lang.h> -#include <tools/time.hxx> -#include <tools/date.hxx> -#include <tools/string.hxx> -#include <svx/swafopt.hxx> -#include "svx/svxdllapi.h" - -class CharClass; -class SfxPoolItem; -class SvxAutoCorrect; -class SvStringsISortDtor; -class SfxObjectShell; -class SvxAutoCorrLanguageTable_Impl; -class SvxAutoCorrLastFileAskTable_Impl; -class SotStorageRef; -class SotStorage; - -// 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 ChgFractionSymbol= 0x00000004; // 1/2, 1/4, .. ersetzen -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 IngnoreDoubleSpace= 0x00000800; // 2 Spaces ignorieren -const long ChgSglQuotes = 0x00001000; // einfache Quotes ersetzen - -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 - -// nur eine Mappingklasse -class SVX_DLLPUBLIC SvxAutoCorrDoc -{ -public: - SvxAutoCorrDoc() {} - virtual ~SvxAutoCorrDoc(); - - virtual BOOL Delete( xub_StrLen nStt, xub_StrLen nEnd ) = 0; - virtual BOOL Insert( xub_StrLen nPos, const String& rTxt ) = 0; - virtual BOOL Replace( xub_StrLen nPos, const String& rTxt ) = 0; - - virtual BOOL SetAttr( xub_StrLen nStt, xub_StrLen nEnd, USHORT nSlotId, - SfxPoolItem& ) = 0; - - virtual BOOL SetINetAttr( xub_StrLen nStt, xub_StrLen nEnd, const String& rURL ) = 0; - - // returne den Text eines vorherigen Absatzes. - // 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!!!!) - 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 - // gerufen. Dann koennen die Worte ggfs. in die Ausnahmelisten - // aufgenommen werden. - virtual void SaveCpltSttWord( ULONG nFlag, xub_StrLen nPos, - const String& rExceptWord, - sal_Unicode cChar ); - - // welche Sprache gilt an der Position? - virtual LanguageType GetLanguage( xub_StrLen nPos, BOOL bPrevPara = FALSE ) const; -}; - - -class SVX_DLLPUBLIC SvxAutocorrWord -{ - String sShort, sLong; - 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; } -}; - -typedef SvxAutocorrWord* SvxAutocorrWordPtr; -SV_DECL_PTRARR_SORT_DEL_VISIBILITY( SvxAutocorrWordList, SvxAutocorrWordPtr, 10, 10 , SVX_DLLPUBLIC) - -class SVX_DLLPUBLIC SvxAutoCorrectLanguageLists -{ - String sShareAutoCorrFile, sUserAutoCorrFile; - // falls die AutoCorr Datei neuer ist - Date aModifiedDate; - Time aModifiedTime, aLastCheckTime; - - LanguageType eLanguage; //LANGUAGE_DONTKNOW fuer alle Sprachen verwenden - SvStringsISortDtor* pCplStt_ExcptLst; - SvStringsISortDtor* pWrdStt_ExcptLst; - SvxAutocorrWordList* pAutocorr_List; - SvxAutoCorrect& rAutoCorrect; - - long nFlags; - - BOOL IsFileChanged_Imp(); - void LoadXMLExceptList_Imp( SvStringsISortDtor*& rpLst, - const sal_Char* pStrmName, - SotStorageRef& rStg); - void SaveExceptList_Imp( const SvStringsISortDtor& rLst, - const sal_Char* pStrmName, - SotStorageRef& rStg, - BOOL bConvert = FALSE); - - BOOL MakeBlocklist_Imp( SotStorage& rStg ); - void RemoveStream_Imp( const String& rName ); - void MakeUserStorage_Impl(); - -public: - SvxAutoCorrectLanguageLists( SvxAutoCorrect& rParent, - const String& rShareAutoCorrectFile, - const String& rUserAutoCorrectFile, - LanguageType eLang); - ~SvxAutoCorrectLanguageLists(); - - // Lade, Setze, Gebe - die Ersetzungsliste - SvxAutocorrWordList* LoadAutocorrWordList(); - void SetAutocorrWordList( SvxAutocorrWordList* pList ); - const SvxAutocorrWordList* GetAutocorrWordList(); - - // Lade, Setze, Gebe - die Ausnahmeliste fuer Grossbuchstabe am - // Satzanfang - SvStringsISortDtor* LoadCplSttExceptList(); - void SaveCplSttExceptList(); - void SetCplSttExceptList( SvStringsISortDtor* pList ); - SvStringsISortDtor* GetCplSttExceptList(); - BOOL AddToCplSttExceptList(const String& rNew); - - // Lade, Setze, Gebe die Ausnahmeliste fuer 2 Grossbuchstaben am - // Wortanfang - SvStringsISortDtor* LoadWrdSttExceptList(); - void SaveWrdSttExceptList(); - void SetWrdSttExceptList( SvStringsISortDtor* pList ); - SvStringsISortDtor* GetWrdSttExceptList(); - BOOL AddToWrdSttExceptList(const String& rNew); - - // Speichern von Wortersetzungen: - // 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!) - BOOL PutText( const String& rShort, SfxObjectShell& ); - // - loesche einen Eintrag - BOOL DeleteText( const String& rShort ); -}; - - -class SVX_DLLPUBLIC SvxAutoCorrect -{ - friend class SvxAutoCorrectLanguageLists; - - String sShareAutoCorrFile, sUserAutoCorrFile; - - SvxSwAutoFmtFlags aSwFlags; // StarWriter AutoFormat-Flags - - // alle Sprachen in einer Tabelle - SvxAutoCorrLanguageTable_Impl* pLangTable; - SvxAutoCorrLastFileAskTable_Impl* pLastFileTable; - CharClass* pCharClass; - - LanguageType eCharClassLang; - - long nFlags; - sal_Unicode cStartDQuote, cEndDQuote, cStartSQuote, cEndSQuote, - c1Div2, c1Div4, c3Div4, - cEmDash, cEnDash; - - - // private methods - SvxAutoCorrectLanguageLists& _GetLanguageList( LanguageType eLang ); - - void _GetCharClass( LanguageType eLang ); - -protected: - // - 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! -public: - //The method below is changed from private to public by BerryJia for Bug95846 Time:2002-8-13 15:50 - sal_Unicode GetQuote( sal_Unicode cInsChar, BOOL bSttQuote, - LanguageType eLang ) const; - virtual BOOL GetLongText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rStg, const String& rFileName, const String& rShort, String& rLong ); - - TYPEINFO(); - - SvxAutoCorrect( const String& rShareAutocorrFile, - const String& rUserAutocorrFile ); - SvxAutoCorrect( const SvxAutoCorrect& ); - virtual ~SvxAutoCorrect(); - - // fuehre eine AutoKorrektur aus. - // returnt was ausgefuehrt wurde; entsprechend den obigen Flags - ULONG AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt, - xub_StrLen nPos, sal_Unicode cInsChar, BOOL bInsert ); - - // return fuer die Autotext Expandierung das vorherige Wort, was dem - // AutoCorrect - Algorythmus entspricht. - BOOL GetPrevAutoCorrWord( SvxAutoCorrDoc& rDoc, const String& rTxt, - xub_StrLen nPos, String& rWord ) const; - - // suche das oder die Worte in der ErsetzungsTabelle. - // rText - ueberpruefe in diesem Text die Worte der Liste - // 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 - 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; } - - 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 ); - void InsertQuote( SvxAutoCorrDoc& rDoc, xub_StrLen nInsPos, - sal_Unicode cInsChar, BOOL bSttQuote, BOOL bIns ); - - // erfrage / setze den Namen der AutoKorrektur-Datei - // defaultet auf "autocorr.dat" - String GetAutoCorrFileName( LanguageType eLang = LANGUAGE_SYSTEM, - BOOL bNewFile = FALSE, - BOOL bTstUserExist = FALSE ) const; - void SetUserAutoCorrFileName( const String& rNew ); - void SetShareAutoCorrFileName( const String& rNew ); - - // erfrage / setze die aktuellen Einstellungen der AutoKorrektur - 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 ); - - // Lade, Setze, Gebe - die Ersetzungsliste - SvxAutocorrWordList* LoadAutocorrWordList( - LanguageType eLang = LANGUAGE_SYSTEM ) - { return _GetLanguageList( eLang ).LoadAutocorrWordList(); } - const SvxAutocorrWordList* GetAutocorrWordList( - LanguageType eLang = LANGUAGE_SYSTEM ) - { return _GetLanguageList( eLang ).GetAutocorrWordList(); } - - // Speichern von Wortersetzungen: - // 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!) - BOOL PutText( const String& rShort, SfxObjectShell& rShell, - LanguageType eLang = LANGUAGE_SYSTEM ) - { return _GetLanguageList( eLang ).PutText(rShort, rShell ); } - - // - loesche einen Eintrag - BOOL DeleteText( const String& rShort, LanguageType eLang = LANGUAGE_SYSTEM); - - // Lade, Setze, Gebe - die Ausnahmeliste fuer Grossbuchstabe am - // Satzanfang - void SaveCplSttExceptList( LanguageType eLang = LANGUAGE_SYSTEM ); - SvStringsISortDtor* LoadCplSttExceptList( - LanguageType eLang = LANGUAGE_SYSTEM) - { return _GetLanguageList( eLang ).LoadCplSttExceptList(); } - const SvStringsISortDtor* GetCplSttExceptList( - LanguageType eLang = LANGUAGE_SYSTEM ) - { return _GetLanguageList( eLang ).GetCplSttExceptList(); } - - // fuegt ein einzelnes Wort hinzu. Die Liste wird sofort - // in die Datei geschrieben! - BOOL AddCplSttException( const String& rNew, - LanguageType eLang = LANGUAGE_SYSTEM ); - - // Lade, Setze, Gebe die Ausnahmeliste fuer 2 Grossbuchstaben am - // Wortanfang - void SaveWrdSttExceptList( LanguageType eLang = LANGUAGE_SYSTEM ); - SvStringsISortDtor* LoadWrdSttExceptList( - LanguageType eLang = LANGUAGE_SYSTEM ) - { return _GetLanguageList( eLang ).LoadWrdSttExceptList(); } - const SvStringsISortDtor* GetWrdSttExceptList( - LanguageType eLang = LANGUAGE_SYSTEM ) - { 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); - - //ueber die Sprachen nach dem Eintrag suchen - BOOL FindInWrdSttExceptList( LanguageType eLang, const String& sWord ); - BOOL FindInCplSttExceptList( LanguageType eLang, const String& sWord, - BOOL bAbbreviation = FALSE); - - // die einzelnen Methoden fuer die Autokorrektur - BOOL FnCptlSttWrd( SvxAutoCorrDoc&, const String&, - xub_StrLen nSttPos, xub_StrLen nEndPos, - LanguageType eLang = LANGUAGE_SYSTEM ); - BOOL FnChgFractionSymbol( SvxAutoCorrDoc&, const String&, - xub_StrLen nSttPos, xub_StrLen nEndPos ); - BOOL FnChgOrdinalNumber( SvxAutoCorrDoc&, const String&, - xub_StrLen nSttPos, xub_StrLen nEndPos, - LanguageType eLang = LANGUAGE_SYSTEM ); - BOOL FnChgToEnEmDash( SvxAutoCorrDoc&, const String&, - xub_StrLen nSttPos, xub_StrLen nEndPos, - LanguageType eLang = LANGUAGE_SYSTEM ); - BOOL FnSetINetAttr( SvxAutoCorrDoc&, const String&, - xub_StrLen nSttPos, xub_StrLen nEndPos, - LanguageType eLang = LANGUAGE_SYSTEM ); - BOOL FnChgWeightUnderl( SvxAutoCorrDoc&, const String&, - xub_StrLen nSttPos, xub_StrLen nEndPos, - LanguageType eLang = LANGUAGE_SYSTEM ); - BOOL FnCptlSttSntnc( SvxAutoCorrDoc&, const String&, BOOL bNormalPos, - xub_StrLen nSttPos, xub_StrLen nEndPos, - LanguageType eLang = LANGUAGE_SYSTEM); - - 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 ); - - CharClass& GetCharClass( LanguageType eLang ) - { - if( !pCharClass || eLang != eCharClassLang ) - _GetCharClass( eLang ); - return *pCharClass; - } -}; - -#endif - diff --git a/svx/inc/svx/svxbox.hxx b/svx/inc/svx/svxbox.hxx deleted file mode 100644 index f5b1bd21c148..000000000000 --- a/svx/inc/svx/svxbox.hxx +++ /dev/null @@ -1,205 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: svxbox.hxx,v $ - * $Revision: 1.3 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_BOX_HXX -#define _SVX_BOX_HXX - -// include --------------------------------------------------------------- - -#include <svl/svarray.hxx> -#include <tools/string.hxx> - -#ifndef _LSTBOX_HXX //autogen -#include <vcl/lstbox.hxx> -#endif - -#ifndef _COMBOBOX_HXX //autogen -#include <vcl/combobox.hxx> -#endif - -// forward --------------------------------------------------------------- - -class SvxBoxEntry; -class SvxListBase; - -//#if 0 // _SOLAR__PRIVATE -SV_DECL_PTRARR( SvxEntryLst, SvxBoxEntry*, 10, 10 ) -//#else -//typedef SvPtrarr SvxEntryLst; -//#endif - -// class SvxBoxEntry ----------------------------------------------------- - -class SvxBoxEntry -{ - friend class SvxListBox; - friend class SvxComboBox; - -public: - SvxBoxEntry( const String& aName, USHORT nId=0 ); - SvxBoxEntry( const SvxBoxEntry& rOrg ); - SvxBoxEntry(); - - String aName; - USHORT nId; - -private: - BOOL bModified; - BOOL bNew; -}; - -// class SvxListBox ------------------------------------------------------ - -class SvxListBox : public ListBox -{ - using ListBox::InsertEntry; - using ListBox::RemoveEntry; - using ListBox::GetEntryPos; - using ListBox::IsEntrySelected; - using ListBox::SelectEntry; - -public: - SvxListBox( Window* pParent, WinBits nBits = WB_BORDER ); - SvxListBox( Window* pParent, const ResId& rId ); - ~SvxListBox(); - - void InsertNewEntry( const SvxBoxEntry& rEntry ); - void InsertEntry( const SvxBoxEntry& rEntry, - USHORT nId = LISTBOX_ENTRY_NOTFOUND ); - - void RemoveEntry( USHORT nPos ); - void RemoveEntry( const SvxBoxEntry& rEntry ); - - void Clear(); - - USHORT GetEntryPos( const SvxBoxEntry& rEntry ) const; - const SvxBoxEntry& GetSvxBoxEntry( USHORT nIdx ) const; - - inline BOOL IsEntrySelected( const SvxBoxEntry& rEntry ) const; - const SvxBoxEntry& GetSelectSvxBoxEntry( USHORT nIdx = 0 ) const; - inline void SelectEntry( const SvxBoxEntry& rEntry, - BOOL bSelect = TRUE ); - - void ModifyEntry( USHORT nPos, const String& aName ); - USHORT GetModifiedCount() const; - const SvxBoxEntry& GetModifiedEntry( USHORT nPos ) const; - - USHORT GetRemovedCount() const; - const SvxBoxEntry& GetRemovedEntry( USHORT nPos ) const; - - USHORT GetNewCount() const; - const SvxBoxEntry& GetNewEntry( USHORT nPos ) const; - -private: - SvxEntryLst aEntryLst; - SvxEntryLst aDelEntryLst; - SvxBoxEntry aDefault; - - void InitListBox(); - void InsertSorted( SvxBoxEntry* pEntry ); -}; - -// inlines --------------------------------------------------------------- - -inline BOOL SvxListBox::IsEntrySelected( const SvxBoxEntry& aEntry ) const - { return ListBox::IsEntrySelected( aEntry.aName ); } - -inline void SvxListBox::SelectEntry( const SvxBoxEntry& aEntry, BOOL bSelect ) - { ListBox::SelectEntry( aEntry.aName, bSelect ); } - -// enum SvxComboBoxStyle ------------------------------------------------- - -enum SvxComboBoxStyle -{ - SVX_CBS_UPPER = 0x01, - SVX_CBS_LOWER = 0x02, - SVX_CBS_ALL = 0x04, - SVX_CBS_FILENAME = 0x08, -#ifdef WIN - SVX_CBS_SW_FILENAME = SVX_CBS_FILENAME | SVX_CBS_LOWER -#else - SVX_CBS_SW_FILENAME = SVX_CBS_FILENAME -#endif -}; - -// class SvxComboBox ----------------------------------------------------- - -class SvxComboBox : public ComboBox -{ - using ComboBox::InsertEntry; - using ComboBox::RemoveEntry; - using ComboBox::GetEntryPos; - using Window::SetStyle; - -public: - SvxComboBox( Window* pParent, - WinBits nBits = WB_BORDER, USHORT nStyleBits = SVX_CBS_ALL ); - SvxComboBox( Window* pParent, const ResId& rId, USHORT nStyleBits = SVX_CBS_ALL ); - ~SvxComboBox(); - - void InsertNewEntry( const SvxBoxEntry& ); - void InsertEntry( const SvxBoxEntry& ); - - void RemoveEntry( USHORT nPos ); - void RemoveEntry( const SvxBoxEntry& rEntry ); - - void Clear(); - - USHORT GetEntryPos( const SvxBoxEntry& rEntry ) const; - const SvxBoxEntry& GetEntry( USHORT nIdx ) const; - - void ModifyEntry( USHORT nPos, const String& aName ); - USHORT GetModifiedCount() const; - const SvxBoxEntry& GetModifiedEntry( USHORT nPos ) const; - - USHORT GetRemovedCount() const; - const SvxBoxEntry& GetRemovedEntry( USHORT nPos ) const; - - USHORT GetNewCount() const; - const SvxBoxEntry& GetNewEntry( USHORT nPos ) const; - - USHORT GetStyle() const { return nStyle; } - void SetStyle( const USHORT nSt ) { nStyle = nSt; } - - String GetText() const; - -private: - SvxEntryLst aEntryLst; - SvxEntryLst aDelEntryLst; - SvxBoxEntry aDefault; - USHORT nStyle; - - virtual void KeyInput( const KeyEvent& rKEvt ); - - void InitComboBox(); - void InsertSorted( SvxBoxEntry* pEntry ); -}; - -#endif - diff --git a/svx/inc/svx/svxdlg.hxx b/svx/inc/svx/svxdlg.hxx index 23db741f0991..df11041b38a8 100644 --- a/svx/inc/svx/svxdlg.hxx +++ b/svx/inc/svx/svxdlg.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svxdlg.hxx,v $ - * $Revision: 1.8 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -32,10 +29,11 @@ // include --------------------------------------------------------------- #include <sfx2/sfxdlg.hxx> -#include <svx/hangulhanja.hxx> //add for HangulHanjaConversionDialog +#include <editeng/edtdlg.hxx> + class SdrModel; class SdrView; -using namespace svx; + #include <svx/dstribut_enum.hxx> #include <svx/rectenum.hxx> //add for enum RECT_POINT #include <com/sun/star/container/XIndexContainer.hpp> //add for FmShowColsDialog @@ -47,6 +45,8 @@ namespace linguistic2{ class XDictionary; class XSpellChecker1; class XSpellChecker; + class XThesaurus; + class XHyphenator; }}}} class SvxSpellWrapper; //add for SvxSpellCheckDialog typedef SfxTabPage* (*CreateSvxDistributePage)(Window *pParent, const SfxItemSet &rAttrSet, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer); @@ -61,6 +61,8 @@ class SearchAttrItemList; class FmFormShell; class Graphic; class SdrObject; +class SvxSpellWrapper; + namespace svx{ class SpellDialogChildWindow;} #define EMPTY_FRAME_REF com::sun::star::uno::Reference < com::sun::star::frame::XFrame >() @@ -73,33 +75,6 @@ public: virtual SvxDistributeVertical GetDistributeVer() const = 0; }; -class AbstractHangulHanjaConversionDialog : public VclAbstractTerminatedDialog //add for HangulHanjaConversionDialog -{ - public: - virtual void EnableRubySupport( sal_Bool _bVal ) = 0; - virtual void SetByCharacter( sal_Bool _bByCharacter ) = 0; - virtual void SetConversionDirectionState( sal_Bool _bTryBothDirections, HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ) = 0; - virtual void SetConversionFormat( 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 HangulHanjaConversion::ConversionDirection GetDirection( HangulHanjaConversion::ConversionDirection _eDefaultDirection ) const = 0; - 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 HangulHanjaConversion::ConversionFormat GetConversionFormat( ) const =0; - virtual void FocusSuggestion( )= 0; - virtual String GetCurrentSuggestion( ) const =0; -}; - class AbstractFmShowColsDialog : public VclAbstractDialog //add for FmShowColsDialog { public: @@ -356,12 +331,12 @@ public: //------------------------------------------------------------- -class SVX_DLLPUBLIC SvxAbstractDialogFactory : public SfxAbstractDialogFactory +class SVX_DLLPUBLIC SvxAbstractDialogFactory : public SfxAbstractDialogFactory, public EditAbstractDialogFactory { public: static SvxAbstractDialogFactory* Create(); - // define dtor as this will create typeinfo in svx library + // define dtor as this will create typeinfo and in svx library and export vtable virtual ~SvxAbstractDialogFactory(); virtual SfxAbstractTabDialog* CreateTextTabDialog( Window* pParent, @@ -378,9 +353,6 @@ public: SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone, SvxDistributeVertical eVer = SvxDistributeVerticalNone)= 0; - virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( Window* _pParent, //add for HangulHanjaConversionDialog CHINA001 - HangulHanjaConversion::ConversionDirection _ePrimaryDirection ) = 0; - virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( Window* pParent ) = 0; virtual AbstractSvxZoomDialog * CreateSvxZoomDialog( Window* pParent, //add for SvxZoomDialog diff --git a/svx/inc/svx/svxdllapi.h b/svx/inc/svx/svxdllapi.h index bb3fd5619e9d..65670e9344f5 100644 --- a/svx/inc/svx/svxdllapi.h +++ b/svx/inc/svx/svxdllapi.h @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svxdllapi.h,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/svxenum.hxx b/svx/inc/svx/svxenum.hxx deleted file mode 100644 index 01a7d80d1351..000000000000 --- a/svx/inc/svx/svxenum.hxx +++ /dev/null @@ -1,221 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: svxenum.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_SVXENUM_HXX -#define _SVX_SVXENUM_HXX - -// ----------------------------------------------------------------------- - -enum SvxCaseMap -{ - SVX_CASEMAP_NOT_MAPPED, - SVX_CASEMAP_VERSALIEN, - SVX_CASEMAP_GEMEINE, - SVX_CASEMAP_TITEL, - SVX_CASEMAP_KAPITAELCHEN, - SVX_CASEMAP_END -}; - -enum SvxEscapement -{ - SVX_ESCAPEMENT_OFF, - SVX_ESCAPEMENT_SUPERSCRIPT, - SVX_ESCAPEMENT_SUBSCRIPT, - SVX_ESCAPEMENT_END -}; - -enum SvxShadowLocation -{ - SVX_SHADOW_NONE, - SVX_SHADOW_TOPLEFT, - SVX_SHADOW_TOPRIGHT, - SVX_SHADOW_BOTTOMLEFT, - SVX_SHADOW_BOTTOMRIGHT, - SVX_SHADOW_END -}; - -enum SvxTabAdjust -{ - SVX_TAB_ADJUST_LEFT = 0, - SVX_TAB_ADJUST_RIGHT, - SVX_TAB_ADJUST_DECIMAL, - SVX_TAB_ADJUST_CENTER, - SVX_TAB_ADJUST_DEFAULT, - SVX_TAB_ADJUST_END -}; - -enum SvxLineSpace -{ - SVX_LINE_SPACE_AUTO, - SVX_LINE_SPACE_FIX, - SVX_LINE_SPACE_MIN, - SVX_LINE_SPACE_END -}; - -enum SvxInterLineSpace -{ - SVX_INTER_LINE_SPACE_OFF, - SVX_INTER_LINE_SPACE_PROP, - SVX_INTER_LINE_SPACE_FIX, - SVX_INTER_LINE_SPACE_END -}; - -enum SvxAdjust -{ - SVX_ADJUST_LEFT, - SVX_ADJUST_RIGHT, - SVX_ADJUST_BLOCK, - SVX_ADJUST_CENTER, - SVX_ADJUST_BLOCKLINE, - SVX_ADJUST_END -}; - -enum SvxSpecialLineSpace -{ - SVX_LINESPACE_USER, - SVX_LINESPACE_ONE_LINE, - SVX_LINESPACE_ONE_POINT_FIVE_LINES, - SVX_LINESPACE_TWO_LINES, - SVX_LINESPACE_END -}; - -enum SvxBreak -{ - SVX_BREAK_NONE, - SVX_BREAK_COLUMN_BEFORE, - SVX_BREAK_COLUMN_AFTER, - SVX_BREAK_COLUMN_BOTH, - SVX_BREAK_PAGE_BEFORE, - SVX_BREAK_PAGE_AFTER, - SVX_BREAK_PAGE_BOTH, - SVX_BREAK_END -}; - -enum SvxCellHorJustify -{ - SVX_HOR_JUSTIFY_STANDARD, - SVX_HOR_JUSTIFY_LEFT, - SVX_HOR_JUSTIFY_CENTER, - SVX_HOR_JUSTIFY_RIGHT, - SVX_HOR_JUSTIFY_BLOCK, - SVX_HOR_JUSTIFY_REPEAT -}; - -enum SvxCellVerJustify -{ - SVX_VER_JUSTIFY_STANDARD, - SVX_VER_JUSTIFY_TOP, - SVX_VER_JUSTIFY_CENTER, - SVX_VER_JUSTIFY_BOTTOM -}; - -enum SvxCellOrientation -{ - SVX_ORIENTATION_STANDARD, - SVX_ORIENTATION_TOPBOTTOM, - SVX_ORIENTATION_BOTTOMTOP, - SVX_ORIENTATION_STACKED -}; - -enum SvxDrawToolEnum -{ - SVX_SNAP_DRAW_SELECT, - // - SVX_SNAP_DRAW_LINE, - SVX_SNAP_DRAW_RECT, - SVX_SNAP_DRAW_ELLIPSE, - SVX_SNAP_DRAW_POLYGON_NOFILL, - SVX_SNAP_DRAW_BEZIER_NOFILL, - SVX_SNAP_DRAW_FREELINE_NOFILL, - SVX_SNAP_DRAW_ARC, - SVX_SNAP_DRAW_PIE, - SVX_SNAP_DRAW_CIRCLECUT, - SVX_SNAP_DRAW_TEXT, - SVX_SNAP_DRAW_TEXT_VERTICAL, - SVX_SNAP_DRAW_TEXT_MARQUEE, - SVX_SNAP_DRAW_CAPTION, - SVX_SNAP_DRAW_CAPTION_VERTICAL -}; - -enum SvxDrawAlignEnum -{ - SVX_OBJECT_ALIGN_LEFT, - SVX_OBJECT_ALIGN_CENTER, - SVX_OBJECT_ALIGN_RIGHT, - SVX_OBJECT_ALIGN_UP, - SVX_OBJECT_ALIGN_MIDDLE, - SVX_OBJECT_ALIGN_DOWN -}; - -enum SvxDrawBezierEnum -{ - SVX_BEZIER_MOVE, - SVX_BEZIER_INSERT, - SVX_BEZIER_DELETE, - SVX_BEZIER_CUTLINE, - SVX_BEZIER_CONVERT, - SVX_BEZIER_EDGE, - SVX_BEZIER_SMOOTH, - SVX_BEZIER_SYMMTR, - SVX_BEZIER_CLOSE, - SVX_BEZIER_ELIMINATE_POINTS -}; - -enum SvxSpellArea -{ - SVX_SPELL_BODY = 0, - SVX_SPELL_BODY_END, - SVX_SPELL_BODY_START, - SVX_SPELL_OTHER -}; - -enum SvxFrameAnchor -{ - SVX_FLY_AT_CNTNT, //Absatzgebundener Rahmen - SVX_FLY_IN_CNTNT, //Zeichengebundener Rahmen - SVX_FLY_PAGE //Seitengebundener Rahmen -}; - -enum SvxExtNumType -{ - SVX_NUM_CHARS_UPPER_LETTER, // zaehlt von a-z, aa - az, ba - bz, ... - SVX_NUM_CHARS_LOWER_LETTER, - SVX_NUM_ROMAN_UPPER, - 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_BITMAP, - SVX_NUM_CHARS_UPPER_LETTER_N, // zaehlt von a-z, aa-zz, aaa-zzz - SVX_NUM_CHARS_LOWER_LETTER_N -}; - - -#endif diff --git a/svx/inc/svx/svxfont.hxx b/svx/inc/svx/svxfont.hxx deleted file mode 100644 index cab43c06628c..000000000000 --- a/svx/inc/svx/svxfont.hxx +++ /dev/null @@ -1,129 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: svxfont.hxx,v $ - * $Revision: 1.3 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_SVXFONT_HXX -#define _SVX_SVXFONT_HXX - -#include <limits.h> // USHRT_MAX -#include <svx/svxenum.hxx> -#include <i18npool/lang.h> -#include <vcl/font.hxx> -#include "svx/svxdllapi.h" - -class SvxDoCapitals; -class OutputDevice; -class Printer; - -class SVX_DLLPUBLIC SvxFont : public Font -{ - LanguageType eLang; // Language - SvxCaseMap eCaseMap; // Textauszeichnung - short nEsc; // Grad der Hoch-/Tiefstellung - BYTE nPropr; // Grad der Verkleinerung der Fonthoehe - short nKern; // Kerning in Pt - -public: - SvxFont(); - SvxFont( const Font &rFont ); - SvxFont( const SvxFont &rFont ); - - // Methoden fuer die Hoch-/Tiefstellung - inline short GetEscapement() const { return nEsc; } - inline void SetEscapement( const short nNewEsc ) { nEsc = nNewEsc; } - - inline BYTE GetPropr() const { return nPropr; } - inline void SetPropr( const BYTE nNewPropr ) { nPropr = nNewPropr; } - inline void SetProprRel( const BYTE nNewPropr ) - { SetPropr( (BYTE)( (long)nNewPropr * (long)nPropr / 100L ) ); } - - // Kerning - inline short GetFixKerning() const { return nKern; } - inline void SetFixKerning( const short nNewKern ) { nKern = nNewKern; } - - inline SvxCaseMap GetCaseMap() const { return eCaseMap; } - inline void SetCaseMap( const SvxCaseMap eNew ) { eCaseMap = eNew; } - - inline LanguageType GetLanguage() const { return eLang; } - inline void SetLanguage( const LanguageType eNewLan ) - { eLang = eNewLan; Font::SetLanguage(eNewLan); } - - // Is-Methoden: - inline BOOL IsCaseMap() const { return SVX_CASEMAP_NOT_MAPPED != eCaseMap; } - inline BOOL IsCapital() const { return SVX_CASEMAP_KAPITAELCHEN == eCaseMap; } - inline BOOL IsKern() const { return 0 != nKern; } - inline BOOL IsEsc() const { return 0 != nEsc; } - - // Versalien, Gemeine etc. beruecksichtigen - String CalcCaseMap( const String &rTxt ) const; - -// Der folgende Bereich wird nicht von jedem benoetigt, er kann deshalb -// ausgeklammert werden. -#ifndef REDUCEDSVXFONT - // Kapitaelchenbearbeitung - void DoOnCapitals( SvxDoCapitals &rDo, - const USHORT nPartLen = USHRT_MAX ) const; - - void SetPhysFont( OutputDevice *pOut ) const; - Font ChgPhysFont( OutputDevice *pOut ) const; - - Size GetCapitalSize( const OutputDevice *pOut, const String &rTxt, - const USHORT nIdx, const USHORT nLen) const; - void DrawCapital( OutputDevice *pOut, const Point &rPos, const String &rTxt, - const USHORT nIdx, const USHORT nLen ) const; - - Size GetPhysTxtSize( const OutputDevice *pOut, const String &rTxt, - const USHORT nIdx, const USHORT nLen ) const; - - Size GetPhysTxtSize( const OutputDevice *pOut, const String &rTxt ); - - Size GetTxtSize( const OutputDevice *pOut, const String &rTxt, - const USHORT nIdx = 0, const USHORT nLen = STRING_LEN ); - - void DrawText( OutputDevice *pOut, const Point &rPos, const String &rTxt, - const USHORT nIdx = 0, const USHORT nLen = STRING_LEN ) const; - - void QuickDrawText( OutputDevice *pOut, const Point &rPos, const String &rTxt, - const USHORT nIdx = 0, const USHORT nLen = STRING_LEN, const sal_Int32* pDXArray = NULL ) const; - - Size QuickGetTextSize( const OutputDevice *pOut, const String &rTxt, - const USHORT nIdx, const USHORT nLen, sal_Int32* pDXArray = NULL ) const; - - void DrawPrev( OutputDevice* pOut, Printer* pPrinter, - const Point &rPos, const String &rTxt, - const USHORT nIdx = 0, const USHORT nLen = STRING_LEN ) const; - -#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 ); -}; - -#endif // #ifndef _SVX_SVXFONT_HXX - diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc index 5c541b3b24dd..b53b5f6dac26 100644 --- a/svx/inc/svx/svxids.hrc +++ b/svx/inc/svx/svxids.hrc @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svxids.hrc,v $ - * $Revision: 1.10.132.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -35,7 +32,7 @@ #include <svl/solar.hrc> #include <sfx2/sfx.hrc> #include <sfx2/sfxsids.hrc> - +#include <editeng/editids.hrc> #include <svx/unomid.hxx> // solange noch im sfxids.hrc definiert ------------------------------------- @@ -44,18 +41,12 @@ #undef SID_INSERT_FRAME #endif -// ID-Bereiche -------------------------------------------------------------- - -// Slot-Id's -#define SID_SVX_END (SID_LIB_START + 1199) - // -------------------------------------------------------------------------- // Member-Id's // -------------------------------------------------------------------------- #define MID_APPFLAG 0x20 #define MID_AUTOBREAK 0x21 -#define MID_BG_COLOR 0x22 #define MID_BREAKxxx 0x22 #define MID_BRUSHSTYLE 0x23 #define MID_CELLTYPE 0x24 @@ -63,32 +54,26 @@ #define MID_COMMAND 0x26 #define MID_CONTENT 0x27 #define MID_DESCNAMExxx 0x28 -#define MID_DISTANCE 0x29 + #define MID_ESCAPEMENT 0x2a #define MID_FAMILY 0x2b -#define MID_FG_COLOR 0x2c #define MID_FIRSTLINE_OFFSET 0x2d -#define MID_FLAGS 0x2e #define MID_FONTFAMILY 0x2f #define MID_FONTFAMILYNAME 0x30 #define MID_FONTPITCH 0x31 #define MID_FONTSTYLE 0x32 #define MID_PERCENT 0x33 #define MID_HYPHEN 0x34 -#define MID_INNER_WIDTH 0x35 #define MID_INTER_LINESPACE 0x36 #define MID_INTER_SPACE 0x37 #define MID_LANDSCAPE 0x38 #define MID_LEFT_MARGIN 0x3a -#define MID_LINESPACE 0x3b -#define MID_LOCATION 0x3c #define MID_LOWER 0x3d #define MID_MAXHYPHENS 0x3e #define MID_MINLEAD 0x3f #define MID_MINTRAIL 0x40 #define MID_NUMTYPExxx 0x41 -#define MID_OUTER_WIDTH 0x41 #define MID_PAGEEND 0x42 #define MID_POS 0x43 #define MID_PROPORTIONAL 0x44 @@ -97,7 +82,6 @@ #define MID_RIGHT_MARGIN 0x47 #define MID_ROW_DIRECTION 0x48 #define MID_SIZE 0x4a -#define MID_TRANSPARENT 0x4b #define MID_TYPE 0x4c #define MID_UPPER 0x4d #define MID_USExxx 0x4e @@ -426,59 +410,14 @@ // -------------------------------------------------------------------------- #define SID_ATTR_ZOOM ( SID_SVX_START + 0 ) -#define SID_ATTR_BRUSH ( SID_SVX_START + 1 ) -#define SID_ATTR_TABSTOP ( SID_SVX_START + 2 ) -#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 ) -> sfxsids.hrc -//#define SID_ATTR_CHAR_FONT ( SID_SVX_START + 7 ) -> sfxsids.hrc -//#define SID_ATTR_CHAR_POSTURE ( SID_SVX_START + 8 ) -> sfxsids.hrc -//#define SID_ATTR_CHAR_WEIGHT ( SID_SVX_START + 9 ) -> sfxsids.hrc -//#define SID_ATTR_CHAR_SHADOWED ( SID_SVX_START + 10 ) -> sfxsids.hrc -//#define SID_ATTR_CHAR_WORDLINEMODE ( SID_SVX_START + 11 ) -> sfxsids.hrc -//#define SID_ATTR_CHAR_CONTOUR ( SID_SVX_START + 12 ) -> sfxsids.hrc -//#define SID_ATTR_CHAR_STRIKEOUT ( SID_SVX_START + 13 ) -> sfxsids.hrc -//#define SID_ATTR_CHAR_UNDERLINE ( SID_SVX_START + 14 ) -> sfxsids.hrc -//#define SID_ATTR_CHAR_FONTHEIGHT ( SID_SVX_START + 15 ) -> sfxsids.hrc -//#define SID_ATTR_CHAR_PROPSIZE ( SID_SVX_START + 16 ) -> sfxsids.hrc -//#define SID_ATTR_CHAR_COLOR ( SID_SVX_START + 17 ) -> sfxsids.hrc -//#define SID_ATTR_CHAR_KERNING ( SID_SVX_START + 18 ) -> sfxsids.hrc -//#define SID_ATTR_CHAR_CASEMAP ( SID_SVX_START + 19 ) -> sfxsids.hrc -//#define SID_ATTR_CHAR_LANGUAGE ( SID_SVX_START + 20 ) -> sfxsids.hrc -//#define SID_ATTR_CHAR_ESCAPEMENT ( SID_SVX_START + 21 ) -> sfxsids.hrc -//#define SID_ATTR_CHAR_FONTLIST ( SID_SVX_START + 22 ) -> sfxsids.hrc + #define SID_ATTR_BORDER_INNER ( SID_SVX_START + 23 ) -#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 ) -#define SID_ATTR_PARA_ADJUST ( SID_SVX_START + 27 ) -#define SID_ATTR_PARA_ADJUST_LEFT ( SID_SVX_START + 28 ) -#define SID_TEXT_ALIGNLEFT SID_ATTR_PARA_ADJUST_LEFT -#define SID_ATTR_PARA_ADJUST_RIGHT ( SID_SVX_START + 29 ) -#define SID_TEXT_ALIGNRIGHT SID_ATTR_PARA_ADJUST_RIGHT -#define SID_ATTR_PARA_ADJUST_CENTER ( SID_SVX_START + 30 ) -#define SID_TEXT_ALIGNCENTER SID_ATTR_PARA_ADJUST_CENTER -#define SID_ATTR_PARA_ADJUST_BLOCK ( SID_SVX_START + 31 ) -#define SID_TEXT_ALIGNBLOCK SID_ATTR_PARA_ADJUST_BLOCK -#define SID_ATTR_PARA_ADJUST_BLOCKLINE ( SID_SVX_START + 32 ) -#define SID_ATTR_PARA_LINESPACE ( SID_SVX_START + 33 ) -#define SID_ATTR_PARA_LINESPACE_10 ( SID_SVX_START + 34 ) -#define SID_ATTR_PARA_LINESPACE_15 ( SID_SVX_START + 35 ) -#define SID_ATTR_PARA_LINESPACE_20 ( SID_SVX_START + 36 ) -#define SID_ATTR_PARA_PAGEBREAK ( SID_SVX_START + 37 ) -#define SID_ATTR_PARA_HYPHENZONE ( SID_SVX_START + 38 ) -#define SID_ATTR_PARA_SPLIT ( SID_SVX_START + 39 ) -#define SID_ATTR_PARA_ORPHANS ( SID_SVX_START + 40 ) -#define SID_ATTR_PARA_WIDOWS ( SID_SVX_START + 41 ) -#define SID_ATTR_PARA_ULSPACE ( SID_SVX_START + 42 ) -#define SID_ATTR_PARA_LRSPACE ( SID_SVX_START + 43 ) + + #define SID_ATTR_POSTIT_AUTHOR ( SID_SVX_START + 44 ) #define SID_ATTR_POSTIT_DATE ( SID_SVX_START + 45 ) #define SID_ATTR_POSTIT_TEXT ( SID_SVX_START + 46 ) #define SID_ATTR_SEARCH ( SID_SVX_START + 47 ) -#define SID_ATTR_LRSPACE ( SID_SVX_START + 48 ) -#define SID_ATTR_ULSPACE ( SID_SVX_START + 49 ) #define SID_ATTR_PAGE ( SID_SVX_START + 50 ) #define SID_ATTR_PAGE_SIZE ( SID_SVX_START + 51 ) #define SID_ATTR_PAGE_MAXSIZE ( SID_SVX_START + 52 ) @@ -492,10 +431,6 @@ #define SID_ATTR_PAGE_DYNAMIC ( SID_SVX_START + 61 ) #define SID_ATTR_PAGE_SHARED ( SID_SVX_START + 62 ) #define SID_ATTR_PAGE_BSP ( SID_SVX_START + 63 ) -//#define SID_ATTR_CHAR_MAPTYPE ( SID_SVX_START + 64 ) -> sfxsids.hrc -#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 ) -> sfxsids.hrc #define SID_ATTR_DBSESS_SERVERTYPE ( SID_SVX_START + 70 ) #define SID_ATTR_DBSESS_SERVEROPTS ( SID_SVX_START + 71 ) #define SID_ATTR_DBSESS_USERNAME ( SID_SVX_START + 72 ) @@ -504,12 +439,6 @@ #define SID_ATTR_DBSESS_SAVEUSER ( SID_SVX_START + 75 ) #define SID_ATTR_DBSESS_SERVERNAME ( SID_SVX_START + 76 ) #define SID_ATTR_DBSESS_ENABLETYPE ( SID_SVX_START + 77 ) -#define SID_RULER_NULL_OFFSET ( SID_SVX_START + 79 ) -#define SID_RULER_BORDERS ( SID_SVX_START + 80 ) -#define SID_RULER_OBJECT ( SID_SVX_START + 81 ) -#define SID_RULER_PAGE_POS ( SID_SVX_START + 82 ) -#define SID_RULER_ACT_LINE_ONLY ( SID_SVX_START + 83 ) -#define SID_RULER_LR_MIN_MAX ( SID_SVX_START + 84 ) #define SID_ATTR_NUMBERFORMAT_VALUE ( SID_SVX_START + 85 ) #define SID_ATTR_NUMBERFORMAT_INFO ( SID_SVX_START + 86 ) #define SID_ATTR_TRANSFORM ( SID_SVX_START + 87 ) @@ -521,6 +450,12 @@ #define SID_ATTR_TRANSFORM_ROT_X ( SID_SVX_START + 93 ) #define SID_ATTR_TRANSFORM_ROT_Y ( SID_SVX_START + 94 ) #define SID_ATTR_TRANSFORM_ANGLE ( SID_SVX_START + 95 ) +#define SID_RULER_NULL_OFFSET ( SID_SVX_START + 79 ) +#define SID_RULER_BORDERS ( SID_SVX_START + 80 ) +#define SID_RULER_OBJECT ( SID_SVX_START + 81 ) +#define SID_RULER_PAGE_POS ( SID_SVX_START + 82 ) +#define SID_RULER_ACT_LINE_ONLY ( SID_SVX_START + 83 ) +#define SID_RULER_LR_MIN_MAX ( SID_SVX_START + 84 ) //#define SID_ZOOM_TOOLBOX ( SID_SVX_START + 96 ) -> sfxsids.hrc //#define SID_ZOOM_OUT ( SID_SVX_START + 97 ) -> sfxsids.hrc //#define SID_ZOOM_IN ( SID_SVX_START + 98 ) -> sfxsids.hrc @@ -671,7 +606,6 @@ #define SID_SPELL_DIALOG ( SID_SVX_START + 243 ) #define SID_INSERT_DRAW ( SID_SVX_START + 244 ) #define SID_THESAURUS ( SID_SVX_START + 245 ) -#define SID_ATTR_PARA_BULLET ( SID_SVX_START + 250 ) #define SID_AUTOCOMPLETEWORD ( SID_SVX_START + 251 ) #define SID_DRAW_TEXT ( SID_SVX_START + 253 ) #define SID_DRAW_CAPTION ( SID_SVX_START + 254 ) @@ -720,10 +654,8 @@ #define SID_PARA_DLG ( SID_SVX_START + 297 ) #define SID_ATTR_GRID_OPTIONS ( SID_SVX_START + 298 ) #define SID_ATTR_FILL_SHADOW ( SID_SVX_START + 299 ) -#define SID_ATTR_PARA_OUTLLEVEL ( SID_SVX_START + 300 ) #define SID_ATTR_LINEEND_STYLE ( SID_SVX_START + 301 ) #define SID_ATTR_TRANSFORM_SLANT ( SID_SVX_START + 302 ) // !!! -//#define SID_ATTR_CHAR_FONTWIDTH ( SID_SVX_START + 303 ) -> sfxsids.hrc #define SID_ATTR_TRANSFORM_SHEAR ( SID_SVX_START + 304 ) #define SID_ATTR_TRANSFORM_SHEAR_X ( SID_SVX_START + 305 ) #define SID_ATTR_TRANSFORM_SHEAR_Y ( SID_SVX_START + 306 ) @@ -768,7 +700,6 @@ //#define SID_HYPERLINK_INSERT ( SID_SVX_START + 360 ) -> sfxsids.hrc //#define SID_HYPERLINK_GETLINK ( SID_SVX_START + 361 ) -> sfxsids.hrc //#define SID_HYPERLINK_SETLINK ( SID_SVX_START + 362 ) -> sfxsids.hrc -#define SID_FIELD ( SID_SVX_START + 363 ) #define SID_NO_GRAPHICS ( SID_SVX_START + 364 ) #define SID_IMPORT_GRAPH_LASTURL ( SID_SVX_START + 365 ) //#define SID_NAVIGATOR ( SID_SVX_START + 366 ) -> sfxsids.hrc @@ -816,7 +747,6 @@ #define SID_ATTR_3D_AMBIENTINTENSITY ( SID_SVX_START + 410 ) /* --> Slots mit --> koennen demnaechst entfallen ( heute 12.03.1998 ) */ #define SID_ATTR_3D_AMBIENTCOLOR ( SID_SVX_START + 411 ) #define SID_IMPORT_GRAPH_LINK ( SID_SVX_START + 412 ) -#define SID_ATTR_PARA_REGISTER ( SID_SVX_START + 413 ) #define SID_HTML_MODE ( SID_SVX_START + 414 ) #define SID_RULER_PROTECT ( SID_SVX_START + 415 ) //#define SID_INET_DLG ( SID_SVX_START + 416 ) -> sfxsids.hrc @@ -863,7 +793,6 @@ #define SID_GROUP ( SID_SVX_START + 454 ) #define SID_UNGROUP ( SID_SVX_START + 455 ) #define SID_SET_DEFAULT ( SID_SVX_START + 456 ) -#define SID_ATTR_PARA_PAGENUM ( SID_SVX_START + 457 ) #define SID_BEZIER ( SID_SVX_START + 458 ) #define SID_ATTR_3D_DOUBLE_SIDED ( SID_SVX_START + 459 ) #define SID_ATTR_ALIGN_INDENT ( SID_SVX_START + 460 ) @@ -887,11 +816,7 @@ #define SID_GRFFILTER_POPART ( SID_SVX_START + 478 ) #define SID_GRFFILTER_SEPIA ( SID_SVX_START + 479 ) #define SID_GRFFILTER_SOLARIZE ( SID_SVX_START + 480 ) -//#define SID_ATTR_CHAR_COLOR_EXT ( SID_SVX_START + 488 ) -> sfxsids.hrc -//#define SID_ATTR_CHAR_COLOR_BACKGROUND ( SID_SVX_START + 489 ) -> sfxsids.hrc -//#define SID_ATTR_CHAR_COLOR_BACKGROUND_EXT ( SID_SVX_START + 490 ) -> sfxsids.hrc #define SID_COLL_CLEAR ( SID_SVX_START + 536 ) -//#define SID_ATTR_CHAR_COLOR2 ( SID_SVX_START + 537 ) -> sfxsids.hrc #define SID_SHOW_ADDRESS ( SID_SVX_START + 538 ) #define SID_APP_ENTERWAIT ( SID_SVX_START + 550 ) #define SID_APP_LEAVEWAIT ( SID_SVX_START + 551 ) @@ -922,11 +847,10 @@ #define SID_TAB_REMOVE_ALL ( SID_SVX_START + 583 ) #define SID_TAB_REMOVE_BY_INDEX ( SID_SVX_START + 584 ) #define SID_OFA_VW_CREATE ( SID_SVX_START + 585 ) -#define SID_ATTR_PARA_NUMRULE ( SID_SVX_START + 587 ) #define SID_OFA_REL_DESIGNVIEW ( SID_SVX_START + 588 ) #define SID_OFA_MANUAL_SQL ( SID_SVX_START + 589 ) #define SID_PARA_BACKGRND_DESTINATION ( SID_SVX_START + 590 ) -#define SID_ATTR_BRUSH_CHAR ( SID_SVX_START + 591 ) + #define SID_FMSLOTS_START ( SID_SVX_START + 592 ) #define SID_FM_CONFIG ( SID_SVX_START + 593 ) #define SID_FM_PUSHBUTTON ( SID_SVX_START + 594 ) @@ -1117,7 +1041,6 @@ #define SID_HLINKBAR_BOOKMARK ( SID_SVX_START + 852 ) #define SID_HLINKBAR_SEARCH ( SID_SVX_START + 853 ) #define SID_HLINKBAR_TARGET ( SID_SVX_START + 854 ) -#define SID_ATTR_NUMBERING_RULE ( SID_SVX_START + 855 ) #define SID_PARAM_NUM_PRESET ( SID_SVX_START + 856 ) #define SID_PARAM_CUR_NUMBER ( SID_SVX_START + 857 ) #define SID_PARAM_CHILD_LEVELS ( SID_SVX_START + 858 ) @@ -1136,38 +1059,17 @@ #define SID_ATTR_GRAF_RESERVE3 ( SID_SVX_START + 873 ) #define SID_ATTR_GRAF_RESERVE4 ( SID_SVX_START + 874 ) #define SID_ATTR_GRAF_RESERVE5 ( SID_SVX_START + 875 ) -#define SID_ATTR_CHAR_CHARSETCOLOR ( SID_SVX_START + 877 ) //#define SID_COMP_BIBLIOGRAPHY ( SID_SVX_START + 880 ) -> sfxsids.hrc #define SID_ATTR_GRAF_KEEP_ZOOM ( SID_SVX_START + 882 ) #define SID_ATTR_GRAF_CROP ( SID_SVX_START + 883 ) #define SID_ATTR_GRAF_FRMSIZE ( SID_SVX_START + 884 ) #define SID_ATTR_GRAF_FRMSIZE_PERCENT ( SID_SVX_START + 885 ) #define SID_ATTR_GRAF_GRAPHIC ( SID_SVX_START + 886 ) -#define SID_ATTR_CHAR_CJK_FONT ( SID_SVX_START + 887 ) -#define SID_ATTR_CHAR_CJK_FONTHEIGHT ( SID_SVX_START + 888 ) -#define SID_ATTR_CHAR_CJK_LANGUAGE ( SID_SVX_START + 889 ) -#define SID_ATTR_CHAR_CJK_POSTURE ( SID_SVX_START + 890 ) -#define SID_ATTR_CHAR_CJK_WEIGHT ( SID_SVX_START + 891 ) -#define SID_ATTR_CHAR_CTL_FONT ( SID_SVX_START + 892 ) -#define SID_ATTR_CHAR_CTL_FONTHEIGHT ( SID_SVX_START + 893 ) -#define SID_ATTR_CHAR_CTL_LANGUAGE ( SID_SVX_START + 894 ) -#define SID_ATTR_CHAR_CTL_POSTURE ( SID_SVX_START + 895 ) -#define SID_ATTR_CHAR_CTL_WEIGHT ( SID_SVX_START + 896 ) -#define SID_ATTR_CHAR_TWO_LINES ( SID_SVX_START + 897 ) -#define SID_ATTR_CHAR_CJK_RUBY ( SID_SVX_START + 898 ) -#define SID_ATTR_CHAR_EMPHASISMARK ( SID_SVX_START + 899 ) -#define SID_ATTR_CHAR_SCRIPTTYPE ( SID_SVX_START + 900 ) -#define SID_ATTR_PARA_SCRIPTSPACE ( SID_SVX_START + 901 ) -#define SID_ATTR_PARA_HANGPUNCTUATION ( SID_SVX_START + 902 ) -#define SID_ATTR_PARA_FORBIDDEN_RULES ( SID_SVX_START + 903 ) #define SID_ASIAN_DLG ( SID_SVX_START + 904 ) -#define SID_DRAW_TEXT_VERTICAL ( SID_SVX_START + 905 ) -#define SID_ATTR_CHAR_VERTICAL SID_DRAW_TEXT_VERTICAL +#define SID_DRAW_TEXT_VERTICAL SID_ATTR_CHAR_VERTICAL #define SID_DRAW_CAPTION_VERTICAL ( SID_SVX_START + 906 ) #define SID_TEXTDIRECTION_LEFT_TO_RIGHT ( SID_SVX_START + 907 ) #define SID_TEXTDIRECTION_TOP_TO_BOTTOM ( SID_SVX_START + 908 ) -#define SID_ATTR_CHAR_ROTATED ( SID_SVX_START + 910 ) -#define SID_ATTR_CHAR_SCALEWIDTH ( SID_SVX_START + 911 ) #define SID_TRANSLITERATE_UPPER ( SID_SVX_START + 912 ) #define SID_TRANSLITERATE_LOWER ( SID_SVX_START + 913 ) #define SID_TRANSLITERATE_HALFWIDTH ( SID_SVX_START + 914 ) @@ -1175,12 +1077,10 @@ #define SID_TRANSLITERATE_HIRAGANA ( SID_SVX_START + 916 ) #define SID_TRANSLITERATE_KATAGANA ( SID_SVX_START + 917 ) #define SID_MN_SUB_TRANSLITERATE ( SID_SVX_START + 918 ) -#define SID_ATTR_CHAR_WIDTH_FIT_TO_LINE ( SID_SVX_START + 919 ) -#define SID_ATTR_CHAR_RELIEF ( SID_SVX_START + 920 ) #define SID_LANGUAGE_OPTIONS ( SID_SVX_START + 921 ) #define SID_GETUNDOSTRINGS ( SID_SVX_START + 923 ) #define SID_GETREDOSTRINGS ( SID_SVX_START + 924 ) -#define SID_PARA_VERTALIGN ( SID_SVX_START + 925 ) + #define SID_INSERT_IMAGECONTROL ( SID_SVX_START + 926 ) #define SID_INSERT_PROGRESSBAR ( SID_SVX_START + 927 ) #define SID_INSERT_HFIXEDLINE ( SID_SVX_START + 928 ) @@ -1199,14 +1099,9 @@ #define SID_INSERT_PATTERNFIELD ( SID_SVX_START + 941 ) #define SID_INSERT_FILECONTROL ( SID_SVX_START + 942 ) #define SID_SHOW_PROPERTYBROWSER ( SID_SVX_START + 943 ) -#define SID_ATTR_FRAMEDIRECTION ( SID_SVX_START + 944 ) -#define SID_ATTR_PARA_SNAPTOGRID ( SID_SVX_START + 945 ) #define SID_ATTR_TABSTOP_VERTICAL ( SID_SVX_START + 946 ) -#define SID_ATTR_PARA_LRSPACE_VERTICAL ( SID_SVX_START + 947 ) #define SID_RULER_BORDERS_VERTICAL ( SID_SVX_START + 948 ) #define SID_ATTR_ALIGN_ASIANVERTICAL ( SID_SVX_START + 949 ) -#define SID_ATTR_PARA_LEFT_TO_RIGHT ( SID_SVX_START + 950 ) -#define SID_ATTR_PARA_RIGHT_TO_LEFT ( SID_SVX_START + 951 ) #define SID_RULER_TEXT_RIGHT_TO_LEFT ( SID_SVX_START + 952 ) #define SID_ATTR_HDFT_DYNAMIC_SPACING ( SID_SVX_START + 953 ) #define SID_ATTR_NUMBERFORMAT_ADD_AUTO ( SID_SVX_START + 954 ) @@ -1244,16 +1139,10 @@ #define SID_FONTWORK_KERN_CHARACTER_PAIRS ( SID_SVX_START + 986 ) #define SID_DRAW_FONTWORK ( SID_SVX_START + 987 ) #define SID_DRAW_FONTWORK_VERTICAL ( SID_SVX_START + 988 ) -#define SID_ATTR_CHAR_HIDDEN ( SID_SVX_START + 989 ) #define SID_ATTR_BORDER_CONNECT ( SID_SVX_START + 990 ) #define SID_SW_FOLLOW_TEXT_FLOW ( SID_SVX_START + 991 ) /* #i18732# - slot-id for new option IsFollowingTextFlow' */ #define SID_RULER_ROWS ( SID_SVX_START + 992 ) #define SID_RULER_ROWS_VERTICAL ( SID_SVX_START + 993 ) -#define SID_ATTR_CHAR_LATIN_FONT ( SID_SVX_START + 994 ) -#define SID_ATTR_CHAR_LATIN_FONTHEIGHT ( SID_SVX_START + 995 ) -#define SID_ATTR_CHAR_LATIN_LANGUAGE ( SID_SVX_START + 996 ) -#define SID_ATTR_CHAR_LATIN_POSTURE ( SID_SVX_START + 997 ) -#define SID_ATTR_CHAR_LATIN_WEIGHT ( SID_SVX_START + 998 ) #define SID_ATTR_TRANSFORM_HORI_POSITION ( SID_SVX_START + 999 ) #define SID_ATTR_TRANSFORM_VERT_POSITION ( SID_SVX_START + 1000 ) #define SID_SHOW_ITEMBROWSER ( SID_SVX_START + 1001 ) @@ -1349,7 +1238,6 @@ #define SID_TABLE_STYLE_SETTINGS (SID_SVX_START+1089) #define SID_CHAR_DLG_PREVIEW_STRING (SID_SVX_START+1090) #define SID_RECHECK_DOCUMENT (SID_SVX_START+1091) -#define SID_ATTR_PARA_OUTLINE_LEVEL (SID_SVX_START+1092) #define SID_OBJECT_MIRROR (SID_SVX_START+1093) #define SID_DELETE_POSTIT (SID_SVX_START+1094) diff --git a/svx/inc/svx/svxitems.hrc b/svx/inc/svx/svxitems.hrc index 5d554cf67ebf..3f3e4aaa8613 100644 --- a/svx/inc/svx/svxitems.hrc +++ b/svx/inc/svx/svxitems.hrc @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svxitems.hrc,v $ - * $Revision: 1.3.212.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -32,13 +29,7 @@ // include ------------------------------------------------------------------ -#ifndef _SOLAR_HRC #include <svl/solar.hrc> -#endif - -// BOOL --------------------------------------------------------------------- -#define RID_SVXITEMS_TRUE (RID_SVXITEMS_START + 0) -#define RID_SVXITEMS_FALSE (RID_SVXITEMS_START + 1) // Extras ------------------------------------------------------------------- #define RID_SVXITEMS_EXTRAS_CHARCOLOR (RID_SVXITEMS_START + 2) @@ -68,24 +59,6 @@ #define RID_SVXITEMS_SEARCHAPP_DRAW (RID_SVXITEMS_START + 27) #define RID_SVXITEMS_SEARCHAPP_BASE (RID_SVXITEMS_START + 28) -// enum SvxBreak ------------------------------------------------------------ -#define RID_SVXITEMS_BREAK_BEGIN (RID_SVXITEMS_START + 30) -#define RID_SVXITEMS_BREAK_NONE (RID_SVXITEMS_START + 30) -#define RID_SVXITEMS_BREAK_COLUMN_BEFORE (RID_SVXITEMS_START + 31) -#define RID_SVXITEMS_BREAK_COLUMN_AFTER (RID_SVXITEMS_START + 32) -#define RID_SVXITEMS_BREAK_COLUMN_BOTH (RID_SVXITEMS_START + 33) -#define RID_SVXITEMS_BREAK_PAGE_BEFORE (RID_SVXITEMS_START + 34) -#define RID_SVXITEMS_BREAK_PAGE_AFTER (RID_SVXITEMS_START + 35) -#define RID_SVXITEMS_BREAK_PAGE_BOTH (RID_SVXITEMS_START + 36) - -// enum SvxShadowLocation --------------------------------------------------- -#define RID_SVXITEMS_SHADOW_BEGIN (RID_SVXITEMS_START + 40) -#define RID_SVXITEMS_SHADOW_NONE (RID_SVXITEMS_START + 40) -#define RID_SVXITEMS_SHADOW_TOPLEFT (RID_SVXITEMS_START + 41) -#define RID_SVXITEMS_SHADOW_TOPRIGHT (RID_SVXITEMS_START + 42) -#define RID_SVXITEMS_SHADOW_BOTTOMLEFT (RID_SVXITEMS_START + 43) -#define RID_SVXITEMS_SHADOW_BOTTOMRIGHT (RID_SVXITEMS_START + 44) - // enum BrushStyle ---------------------------------------------------------- #define RID_SVXITEMS_BRUSHSTYLE_BEGIN (RID_SVXITEMS_START + 45) #define RID_SVXITEMS_BRUSHSTYLE_NULL (RID_SVXITEMS_START + 45) @@ -101,41 +74,6 @@ #define RID_SVXITEMS_BRUSHSTYLE_75 (RID_SVXITEMS_START + 55) #define RID_SVXITEMS_BRUSHSTYLE_BITMAP (RID_SVXITEMS_START + 56) -// enum ColorName ----------------------------------------------------------- -#define RID_SVXITEMS_COLOR_BEGIN (RID_SVXITEMS_START + 60) -#define RID_SVXITEMS_COLOR (RID_SVXITEMS_START + 60) -#define RID_SVXITEMS_COLOR_BLACK (RID_SVXITEMS_START + 61) -#define RID_SVXITEMS_COLOR_BLUE (RID_SVXITEMS_START + 62) -#define RID_SVXITEMS_COLOR_GREEN (RID_SVXITEMS_START + 63) -#define RID_SVXITEMS_COLOR_CYAN (RID_SVXITEMS_START + 64) -#define RID_SVXITEMS_COLOR_RED (RID_SVXITEMS_START + 65) -#define RID_SVXITEMS_COLOR_MAGENTA (RID_SVXITEMS_START + 66) -#define RID_SVXITEMS_COLOR_BROWN (RID_SVXITEMS_START + 67) -#define RID_SVXITEMS_COLOR_GRAY (RID_SVXITEMS_START + 68) -#define RID_SVXITEMS_COLOR_LIGHTGRAY (RID_SVXITEMS_START + 69) -#define RID_SVXITEMS_COLOR_LIGHTBLUE (RID_SVXITEMS_START + 70) -#define RID_SVXITEMS_COLOR_LIGHTGREEN (RID_SVXITEMS_START + 71) -#define RID_SVXITEMS_COLOR_LIGHTCYAN (RID_SVXITEMS_START + 72) -#define RID_SVXITEMS_COLOR_LIGHTRED (RID_SVXITEMS_START + 73) -#define RID_SVXITEMS_COLOR_LIGHTMAGENTA (RID_SVXITEMS_START + 74) -#define RID_SVXITEMS_COLOR_YELLOW (RID_SVXITEMS_START + 75) -#define RID_SVXITEMS_COLOR_WHITE (RID_SVXITEMS_START + 76) -#define RID_SVXITEMS_COLOR_MENUBAR (RID_SVXITEMS_START + 77) -#define RID_SVXITEMS_COLOR_MENUBARTEXT (RID_SVXITEMS_START + 78) -#define RID_SVXITEMS_COLOR_POPUPMENU (RID_SVXITEMS_START + 79) -#define RID_SVXITEMS_COLOR_POPUPMENUTEXT (RID_SVXITEMS_START + 80) -#define RID_SVXITEMS_COLOR_WINDOWTEXT (RID_SVXITEMS_START + 81) -#define RID_SVXITEMS_COLOR_WINDOWWORKSPACE (RID_SVXITEMS_START + 82) -#define RID_SVXITEMS_COLOR_HIGHLIGHT (RID_SVXITEMS_START + 83) -#define RID_SVXITEMS_COLOR_HIGHLIGHTTEXT (RID_SVXITEMS_START + 84) -#define RID_SVXITEMS_COLOR_3DTEXT (RID_SVXITEMS_START + 85) -#define RID_SVXITEMS_COLOR_3DFACE (RID_SVXITEMS_START + 86) -#define RID_SVXITEMS_COLOR_3DLIGHT (RID_SVXITEMS_START + 87) -#define RID_SVXITEMS_COLOR_3DSHADOW (RID_SVXITEMS_START + 88) -#define RID_SVXITEMS_COLOR_SCROLLBAR (RID_SVXITEMS_START + 89) -#define RID_SVXITEMS_COLOR_FIELD (RID_SVXITEMS_START + 90) -#define RID_SVXITEMS_COLOR_FIELDTEXT (RID_SVXITEMS_START + 91) - // enum FontFamily ------------------------------------------------------- #define RID_SVXITEMS_FONTFAMILY_BEGIN (RID_SVXITEMS_START + 100) #define RID_SVXITEMS_FONTFAMILY_DONTKNOW (RID_SVXITEMS_START + 100) @@ -152,36 +90,6 @@ #define RID_SVXITEMS_FONTPITCH_FIXED (RID_SVXITEMS_START + 111) #define RID_SVXITEMS_FONTPITCH_VARIABLE (RID_SVXITEMS_START + 112) -// enum FontItalic ------------------------------------------------------- -#define RID_SVXITEMS_ITALIC_BEGIN (RID_SVXITEMS_START + 115) -#define RID_SVXITEMS_ITALIC_NONE (RID_SVXITEMS_START + 115) -#define RID_SVXITEMS_ITALIC_OBLIQUE (RID_SVXITEMS_START + 116) -#define RID_SVXITEMS_ITALIC_NORMAL (RID_SVXITEMS_START + 117) - -// enum FontWeight ------------------------------------------------------- -#define RID_SVXITEMS_WEIGHT_BEGIN (RID_SVXITEMS_START + 120) -#define RID_SVXITEMS_WEIGHT_DONTKNOW (RID_SVXITEMS_START + 120) -#define RID_SVXITEMS_WEIGHT_THIN (RID_SVXITEMS_START + 121) -#define RID_SVXITEMS_WEIGHT_ULTRALIGHT (RID_SVXITEMS_START + 122) -#define RID_SVXITEMS_WEIGHT_LIGHT (RID_SVXITEMS_START + 123) -#define RID_SVXITEMS_WEIGHT_SEMILIGHT (RID_SVXITEMS_START + 124) -#define RID_SVXITEMS_WEIGHT_NORMAL (RID_SVXITEMS_START + 125) -#define RID_SVXITEMS_WEIGHT_MEDIUM (RID_SVXITEMS_START + 126) -#define RID_SVXITEMS_WEIGHT_SEMIBOLD (RID_SVXITEMS_START + 127) -#define RID_SVXITEMS_WEIGHT_BOLD (RID_SVXITEMS_START + 128) -#define RID_SVXITEMS_WEIGHT_ULTRABOLD (RID_SVXITEMS_START + 129) -#define RID_SVXITEMS_WEIGHT_BLACK (RID_SVXITEMS_START + 130) - -// enum FontStrikeout ---------------------------------------------------- -#define RID_SVXITEMS_STRIKEOUT_BEGIN (RID_SVXITEMS_START + 135) -#define RID_SVXITEMS_STRIKEOUT_NONE (RID_SVXITEMS_START + 135) -#define RID_SVXITEMS_STRIKEOUT_SINGLE (RID_SVXITEMS_START + 136) -#define RID_SVXITEMS_STRIKEOUT_DOUBLE (RID_SVXITEMS_START + 137) -#define RID_SVXITEMS_STRIKEOUT_DONTKNOW (RID_SVXITEMS_START + 138) -#define RID_SVXITEMS_STRIKEOUT_BOLD (RID_SVXITEMS_START + 139) -#define RID_SVXITEMS_STRIKEOUT_SLASH (RID_SVXITEMS_START + 140) -#define RID_SVXITEMS_STRIKEOUT_X (RID_SVXITEMS_START + 141) - // enum CharSet ---------------------------------------------------------- #define RID_SVXITEMS_CHARSET_BEGIN (RID_SVXITEMS_START + 145) #define RID_SVXITEMS_CHARSET_DONTKNOW (RID_SVXITEMS_START + 145) @@ -196,208 +104,6 @@ #define RID_SVXITEMS_CHARSET_SYSTEM (RID_SVXITEMS_START + 154) #define RID_SVXITEMS_CHARSET_SYMBOL (RID_SVXITEMS_START + 155) -// enum CASEMAP ---------------------------------------------------------- -#define RID_SVXITEMS_CASEMAP_BEGIN (RID_SVXITEMS_START + 160) -#define RID_SVXITEMS_CASEMAP_NONE (RID_SVXITEMS_START + 160) -#define RID_SVXITEMS_CASEMAP_VERSALIEN (RID_SVXITEMS_START + 161) -#define RID_SVXITEMS_CASEMAP_GEMEINE (RID_SVXITEMS_START + 162) -#define RID_SVXITEMS_CASEMAP_TITEL (RID_SVXITEMS_START + 163) -#define RID_SVXITEMS_CASEMAP_KAPITAELCHEN (RID_SVXITEMS_START + 164) - -// enum ESCAPEMENT ------------------------------------------------------- -#define RID_SVXITEMS_ESCAPEMENT_BEGIN (RID_SVXITEMS_START + 166) -#define RID_SVXITEMS_ESCAPEMENT_OFF (RID_SVXITEMS_START + 166) -#define RID_SVXITEMS_ESCAPEMENT_SUPER (RID_SVXITEMS_START + 167) -#define RID_SVXITEMS_ESCAPEMENT_SUB (RID_SVXITEMS_START + 168) -#define RID_SVXITEMS_ESCAPEMENT_AUTO (RID_SVXITEMS_START + 169) - -// enum FontUnderline - used for underline ------------------------------- -#define RID_SVXITEMS_UL_BEGIN (RID_SVXITEMS_START + 170) -#define RID_SVXITEMS_UL_NONE (RID_SVXITEMS_START + 170) -#define RID_SVXITEMS_UL_SINGLE (RID_SVXITEMS_START + 171) -#define RID_SVXITEMS_UL_DOUBLE (RID_SVXITEMS_START + 172) -#define RID_SVXITEMS_UL_DOTTED (RID_SVXITEMS_START + 173) -#define RID_SVXITEMS_UL_DONTKNOW (RID_SVXITEMS_START + 174) -#define RID_SVXITEMS_UL_DASH (RID_SVXITEMS_START + 175) -#define RID_SVXITEMS_UL_LONGDASH (RID_SVXITEMS_START + 176) -#define RID_SVXITEMS_UL_DASHDOT (RID_SVXITEMS_START + 177) -#define RID_SVXITEMS_UL_DASHDOTDOT (RID_SVXITEMS_START + 178) -#define RID_SVXITEMS_UL_SMALLWAVE (RID_SVXITEMS_START + 179) -#define RID_SVXITEMS_UL_WAVE (RID_SVXITEMS_START + 180) -#define RID_SVXITEMS_UL_DOUBLEWAVE (RID_SVXITEMS_START + 181) -#define RID_SVXITEMS_UL_BOLD (RID_SVXITEMS_START + 182) -#define RID_SVXITEMS_UL_BOLDDOTTED (RID_SVXITEMS_START + 183) -#define RID_SVXITEMS_UL_BOLDDASH (RID_SVXITEMS_START + 184) -#define RID_SVXITEMS_UL_BOLDLONGDASH (RID_SVXITEMS_START + 185) -#define RID_SVXITEMS_UL_BOLDDASHDOT (RID_SVXITEMS_START + 186) -#define RID_SVXITEMS_UL_BOLDDASHDOTDOT (RID_SVXITEMS_START + 187) -#define RID_SVXITEMS_UL_BOLDWAVE (RID_SVXITEMS_START + 188) - -// enum FontUnderline - used for overline -------------------------------- -#define RID_SVXITEMS_OL_BEGIN (RID_SVXITEMS_START + 200) -#define RID_SVXITEMS_OL_NONE (RID_SVXITEMS_START + 200) -#define RID_SVXITEMS_OL_SINGLE (RID_SVXITEMS_START + 201) -#define RID_SVXITEMS_OL_DOUBLE (RID_SVXITEMS_START + 202) -#define RID_SVXITEMS_OL_DOTTED (RID_SVXITEMS_START + 203) -#define RID_SVXITEMS_OL_DONTKNOW (RID_SVXITEMS_START + 204) -#define RID_SVXITEMS_OL_DASH (RID_SVXITEMS_START + 205) -#define RID_SVXITEMS_OL_LONGDASH (RID_SVXITEMS_START + 206) -#define RID_SVXITEMS_OL_DASHDOT (RID_SVXITEMS_START + 207) -#define RID_SVXITEMS_OL_DASHDOTDOT (RID_SVXITEMS_START + 208) -#define RID_SVXITEMS_OL_SMALLWAVE (RID_SVXITEMS_START + 209) -#define RID_SVXITEMS_OL_WAVE (RID_SVXITEMS_START + 210) -#define RID_SVXITEMS_OL_DOUBLEWAVE (RID_SVXITEMS_START + 211) -#define RID_SVXITEMS_OL_BOLD (RID_SVXITEMS_START + 212) -#define RID_SVXITEMS_OL_BOLDDOTTED (RID_SVXITEMS_START + 213) -#define RID_SVXITEMS_OL_BOLDDASH (RID_SVXITEMS_START + 214) -#define RID_SVXITEMS_OL_BOLDLONGDASH (RID_SVXITEMS_START + 215) -#define RID_SVXITEMS_OL_BOLDDASHDOT (RID_SVXITEMS_START + 216) -#define RID_SVXITEMS_OL_BOLDDASHDOTDOT (RID_SVXITEMS_START + 217) -#define RID_SVXITEMS_OL_BOLDWAVE (RID_SVXITEMS_START + 218) - -// enum SvxAdjust ----------------------------------------------------------- -#define RID_SVXITEMS_ADJUST_BEGIN (RID_SVXITEMS_START + 230) -#define RID_SVXITEMS_ADJUST_LEFT (RID_SVXITEMS_START + 230) -#define RID_SVXITEMS_ADJUST_RIGHT (RID_SVXITEMS_START + 231) -#define RID_SVXITEMS_ADJUST_BLOCK (RID_SVXITEMS_START + 232) -#define RID_SVXITEMS_ADJUST_CENTER (RID_SVXITEMS_START + 233) -#define RID_SVXITEMS_ADJUST_BLOCKLINE (RID_SVXITEMS_START + 234) - -// enum SvxAdjust ----------------------------------------------------------- -#define RID_SVXITEMS_TAB_DECIMAL_CHAR (RID_SVXITEMS_START + 243) -#define RID_SVXITEMS_TAB_FILL_CHAR (RID_SVXITEMS_START + 244) -#define RID_SVXITEMS_TAB_ADJUST_BEGIN (RID_SVXITEMS_START + 245) -#define RID_SVXITEMS_TAB_ADJUST_LEFT (RID_SVXITEMS_START + 245) -#define RID_SVXITEMS_TAB_ADJUST_RIGHT (RID_SVXITEMS_START + 246) -#define RID_SVXITEMS_TAB_ADJUST_DECIMAL (RID_SVXITEMS_START + 247) -#define RID_SVXITEMS_TAB_ADJUST_CENTER (RID_SVXITEMS_START + 248) -#define RID_SVXITEMS_TAB_ADJUST_DEFAULT (RID_SVXITEMS_START + 249) - -// type names of slots; needed for attribute list on search & replace dialogue -#define RID_ATTR_BEGIN (RID_SVXITEMS_START + 250) -#define RID_ATTR_ZOOM (RID_ATTR_BEGIN + 0) -#define RID_ATTR_BRUSH (RID_ATTR_BEGIN + 1) -#define RID_ATTR_TABSTOP (RID_ATTR_BEGIN + 2) -#define RID_ATTR_TABSTOP_DEFAULTS (RID_ATTR_BEGIN + 3) -#define RID_ATTR_TABSTOP_POS (RID_ATTR_BEGIN + 4) -#define RID_ATTR_TABSTOP_OFFSET (RID_ATTR_BEGIN + 5) -#define RID_ATTR_CHAR (RID_ATTR_BEGIN + 6) -#define RID_ATTR_CHAR_FONT (RID_ATTR_BEGIN + 7) -#define RID_ATTR_CHAR_POSTURE (RID_ATTR_BEGIN + 8) -#define RID_ATTR_CHAR_WEIGHT (RID_ATTR_BEGIN + 9) -#define RID_ATTR_CHAR_SHADOWED (RID_ATTR_BEGIN + 10) -#define RID_ATTR_CHAR_WORDLINEMODE (RID_ATTR_BEGIN + 11) -#define RID_ATTR_CHAR_CONTOUR (RID_ATTR_BEGIN + 12) -#define RID_ATTR_CHAR_STRIKEOUT (RID_ATTR_BEGIN + 13) -#define RID_ATTR_CHAR_UNDERLINE (RID_ATTR_BEGIN + 14) -#define RID_ATTR_CHAR_FONTHEIGHT (RID_ATTR_BEGIN + 15) -#define RID_ATTR_CHAR_PROPSIZE (RID_ATTR_BEGIN + 16) -#define RID_ATTR_CHAR_COLOR (RID_ATTR_BEGIN + 17) -#define RID_ATTR_CHAR_KERNING (RID_ATTR_BEGIN + 18) -#define RID_ATTR_CHAR_CASEMAP (RID_ATTR_BEGIN + 19) -#define RID_ATTR_CHAR_LANGUAGE (RID_ATTR_BEGIN + 20) -#define RID_ATTR_CHAR_ESCAPEMENT (RID_ATTR_BEGIN + 21) -#define RID_ATTR_CHAR_FONTLIST (RID_ATTR_BEGIN + 22) -#define RID_ATTR_BORDER_INNER (RID_ATTR_BEGIN + 23) -#define RID_ATTR_BORDER_OUTER (RID_ATTR_BEGIN + 24) -#define RID_ATTR_BORDER_SHADOW (RID_ATTR_BEGIN + 25) -#define RID_ATTR_PARA (RID_ATTR_BEGIN + 26) -#define RID_ATTR_PARA_ADJUST (RID_ATTR_BEGIN + 27) -#define RID_ATTR_PARA_ADJUST_LEFT (RID_ATTR_BEGIN + 28) -#define RID_ATTR_PARA_ADJUST_RIGHT (RID_ATTR_BEGIN + 29) -#define RID_ATTR_PARA_ADJUST_CENTER (RID_ATTR_BEGIN + 30) -#define RID_ATTR_PARA_ADJUST_BLOCK (RID_ATTR_BEGIN + 31) -#define RID_ATTR_PARA_ADJUST_BLOCKLINE (RID_ATTR_BEGIN + 32) -#define RID_ATTR_PARA_LINESPACE (RID_ATTR_BEGIN + 33) -#define RID_ATTR_PARA_LINESPACE_10 (RID_ATTR_BEGIN + 34) -#define RID_ATTR_PARA_LINESPACE_15 (RID_ATTR_BEGIN + 35) -#define RID_ATTR_PARA_LINESPACE_20 (RID_ATTR_BEGIN + 36) -#define RID_ATTR_PARA_PAGEBREAK (RID_ATTR_BEGIN + 37) -#define RID_ATTR_PARA_HYPHENZONE (RID_ATTR_BEGIN + 38) -#define RID_ATTR_PARA_SPLIT (RID_ATTR_BEGIN + 39) -#define RID_ATTR_PARA_WIDOWS (RID_ATTR_BEGIN + 40) -#define RID_ATTR_PARA_ORPHANS (RID_ATTR_BEGIN + 41) -#define RID_ATTR_PARA_ULSPACE (RID_ATTR_BEGIN + 42) -#define RID_ATTR_PARA_LRSPACE (RID_ATTR_BEGIN + 43) -#define RID_ATTR_POSTIT_AUTHOR (RID_ATTR_BEGIN + 44) -#define RID_ATTR_POSTIT_DATE (RID_ATTR_BEGIN + 45) -#define RID_ATTR_POSTIT_TEXT (RID_ATTR_BEGIN + 46) -#define RID_ATTR_SEARCH (RID_ATTR_BEGIN + 47) -#define RID_ATTR_LRSPACE (RID_ATTR_BEGIN + 48) -#define RID_ATTR_ULSPACE (RID_ATTR_BEGIN + 49) -#define RID_ATTR_PAGE (RID_ATTR_BEGIN + 50) -#define RID_ATTR_PAGE_SIZE (RID_ATTR_BEGIN + 51) -#define RID_ATTR_PAGE_MAXSIZE (RID_ATTR_BEGIN + 52) -#define RID_ATTR_PAGE_PAPERTRAY (RID_ATTR_BEGIN + 53) -#define RID_ATTR_PAGE_PAPERBIN (RID_ATTR_BEGIN + 54) -#define RID_ATTR_PAGE_APP (RID_ATTR_BEGIN + 55) -#define RID_ATTR_PAGE_EXT1 (RID_ATTR_BEGIN + 56) -#define RID_ATTR_PAGE_EXT2 (RID_ATTR_BEGIN + 57) -#define RID_ATTR_PAGE_HEADERSET (RID_ATTR_BEGIN + 58) -#define RID_ATTR_PAGE_FOOTERSET (RID_ATTR_BEGIN + 59) -#define RID_ATTR_PAGE_ON (RID_ATTR_BEGIN + 60) -#define RID_ATTR_PAGE_DYNAMIC (RID_ATTR_BEGIN + 61) -#define RID_ATTR_PAGE_SHARED (RID_ATTR_BEGIN + 62) -#define RID_ATTR_PAGE_BSP (RID_ATTR_BEGIN + 63) -#define RID_ATTR_CHAR_MAPTYPE (RID_ATTR_BEGIN + 64) -#define RID_ATTR_PARA_MODEL (RID_ATTR_BEGIN + 65) -#define RID_ATTR_PARA_KEEP (RID_ATTR_BEGIN + 66) -#define RID_ATTR_CHAR_BLINK (RID_ATTR_BEGIN + 67) -#define RID_ATTR_CHAR_CHARSETCOLOR (RID_ATTR_BEGIN + 68) -#define RID_ATTR_CHAR_OVERLINE (RID_ATTR_BEGIN + 69) - -#define RID_ATTR_FLASH (RID_ATTR_BEGIN + 406) -#define RID_ATTR_PARA_REGISTER (RID_ATTR_BEGIN + 413) -#define RID_ATTR_BRUSH_CHAR (RID_ATTR_BEGIN + 591) - -#define RID_ATTR_CHAR_CJK_FONT (RID_ATTR_BEGIN + 887) -#define RID_ATTR_CHAR_CJK_FONTHEIGHT (RID_ATTR_BEGIN + 888) -#define RID_ATTR_CHAR_CJK_LANGUAGE (RID_ATTR_BEGIN + 889) -#define RID_ATTR_CHAR_CJK_POSTURE (RID_ATTR_BEGIN + 890) -#define RID_ATTR_CHAR_CJK_WEIGHT (RID_ATTR_BEGIN + 891) -#define RID_ATTR_CHAR_CTL_FONT (RID_ATTR_BEGIN + 892) -#define RID_ATTR_CHAR_CTL_FONTHEIGHT (RID_ATTR_BEGIN + 893) -#define RID_ATTR_CHAR_CTL_LANGUAGE (RID_ATTR_BEGIN + 894) -#define RID_ATTR_CHAR_CTL_POSTURE (RID_ATTR_BEGIN + 895) -#define RID_ATTR_CHAR_CTL_WEIGHT (RID_ATTR_BEGIN + 896) -#define RID_ATTR_CHAR_TWO_LINES (RID_ATTR_BEGIN + 897) -#define RID_ATTR_CHAR_EMPHASISMARK (RID_ATTR_BEGIN + 899) - -#define RID_ATTR_PARA_SCRIPTSPACE (RID_ATTR_BEGIN + 901) -#define RID_ATTR_PARA_HANGPUNCTUATION (RID_ATTR_BEGIN + 902) -#define RID_ATTR_PARA_FORBIDDEN_RULES (RID_ATTR_BEGIN + 903) -#define RID_ATTR_CHAR_ROTATED (RID_ATTR_BEGIN + 910) -#define RID_ATTR_CHAR_SCALEWIDTH (RID_ATTR_BEGIN + 911) -#define RID_ATTR_CHAR_RELIEF (RID_ATTR_BEGIN + 920) -#define RID_PARA_VERTALIGN (RID_ATTR_BEGIN + 925) - - -// Umrandungslinien -#define RID_SINGLE_LINE0 (RID_SVXITEMS_START + 360) -#define RID_SINGLE_LINE1 (RID_SVXITEMS_START + 361) -#define RID_SINGLE_LINE2 (RID_SVXITEMS_START + 362) -#define RID_SINGLE_LINE3 (RID_SVXITEMS_START + 363) -#define RID_SINGLE_LINE4 (RID_SVXITEMS_START + 364) -#define RID_DOUBLE_LINE0 (RID_SVXITEMS_START + 365) -#define RID_DOUBLE_LINE1 (RID_SVXITEMS_START + 366) -#define RID_DOUBLE_LINE2 (RID_SVXITEMS_START + 367) -#define RID_DOUBLE_LINE3 (RID_SVXITEMS_START + 368) -#define RID_DOUBLE_LINE4 (RID_SVXITEMS_START + 369) -#define RID_DOUBLE_LINE5 (RID_SVXITEMS_START + 370) -#define RID_DOUBLE_LINE6 (RID_SVXITEMS_START + 371) -#define RID_DOUBLE_LINE7 (RID_SVXITEMS_START + 372) -#define RID_DOUBLE_LINE8 (RID_SVXITEMS_START + 373) -#define RID_DOUBLE_LINE9 (RID_SVXITEMS_START + 374) -#define RID_DOUBLE_LINE10 (RID_SVXITEMS_START + 375) - -// Metric-Texte -#define RID_SVXITEMS_METRIC_MM (RID_SVXITEMS_START + 380) -#define RID_SVXITEMS_METRIC_CM (RID_SVXITEMS_START + 381) -#define RID_SVXITEMS_METRIC_INCH (RID_SVXITEMS_START + 382) -#define RID_SVXITEMS_METRIC_POINT (RID_SVXITEMS_START + 383) -#define RID_SVXITEMS_METRIC_TWIP (RID_SVXITEMS_START + 384) -#define RID_SVXITEMS_METRIC_PIXEL (RID_SVXITEMS_START + 385) - // enum SvxCellHorJustify #define RID_SVXITEMS_HORJUST_STANDARD (RID_SVXITEMS_START + 400) #define RID_SVXITEMS_HORJUST_LEFT (RID_SVXITEMS_START + 401) @@ -419,46 +125,12 @@ #define RID_SVXITEMS_ORI_STACKED (RID_SVXITEMS_START + 413) // Id's fuer BoolItems -#define RID_SVXITEMS_SHADOWED_TRUE (RID_SVXITEMS_START + 415) -#define RID_SVXITEMS_SHADOWED_FALSE (RID_SVXITEMS_START + 416) -#define RID_SVXITEMS_AUTOKERN_TRUE (RID_SVXITEMS_START + 417) -#define RID_SVXITEMS_AUTOKERN_FALSE (RID_SVXITEMS_START + 418) -#define RID_SVXITEMS_WORDLINE_TRUE (RID_SVXITEMS_START + 419) -#define RID_SVXITEMS_WORDLINE_FALSE (RID_SVXITEMS_START + 420) -#define RID_SVXITEMS_CONTOUR_TRUE (RID_SVXITEMS_START + 421) -#define RID_SVXITEMS_CONTOUR_FALSE (RID_SVXITEMS_START + 422) -#define RID_SVXITEMS_NOLINEBREAK_TRUE (RID_SVXITEMS_START + 423) -#define RID_SVXITEMS_NOLINEBREAK_FALSE (RID_SVXITEMS_START + 424) -#define RID_SVXITEMS_NOHYPHEN_TRUE (RID_SVXITEMS_START + 425) -#define RID_SVXITEMS_NOHYPHEN_FALSE (RID_SVXITEMS_START + 426) -#define RID_SVXITEMS_PRINT_TRUE (RID_SVXITEMS_START + 427) -#define RID_SVXITEMS_PRINT_FALSE (RID_SVXITEMS_START + 428) -#define RID_SVXITEMS_OPAQUE_TRUE (RID_SVXITEMS_START + 429) -#define RID_SVXITEMS_OPAQUE_FALSE (RID_SVXITEMS_START + 430) -#define RID_SVXITEMS_FMTKEEP_TRUE (RID_SVXITEMS_START + 431) -#define RID_SVXITEMS_FMTKEEP_FALSE (RID_SVXITEMS_START + 432) -#define RID_SVXITEMS_FMTSPLIT_TRUE (RID_SVXITEMS_START + 433) -#define RID_SVXITEMS_FMTSPLIT_FALSE (RID_SVXITEMS_START + 434) -#define RID_SVXITEMS_PROT_CONTENT_TRUE (RID_SVXITEMS_START + 435) -#define RID_SVXITEMS_PROT_CONTENT_FALSE (RID_SVXITEMS_START + 436) -#define RID_SVXITEMS_PROT_SIZE_TRUE (RID_SVXITEMS_START + 437) -#define RID_SVXITEMS_PROT_SIZE_FALSE (RID_SVXITEMS_START + 438) -#define RID_SVXITEMS_PROT_POS_TRUE (RID_SVXITEMS_START + 439) -#define RID_SVXITEMS_PROT_POS_FALSE (RID_SVXITEMS_START + 440) -#define RID_SVXITEMS_TRANSPARENT_TRUE (RID_SVXITEMS_START + 441) -#define RID_SVXITEMS_TRANSPARENT_FALSE (RID_SVXITEMS_START + 442) #define RID_SVXITEMS_BOXINF_TABLE_TRUE (RID_SVXITEMS_START + 443) #define RID_SVXITEMS_BOXINF_TABLE_FALSE (RID_SVXITEMS_START + 444) #define RID_SVXITEMS_BOXINF_DIST_TRUE (RID_SVXITEMS_START + 445) #define RID_SVXITEMS_BOXINF_DIST_FALSE (RID_SVXITEMS_START + 446) #define RID_SVXITEMS_BOXINF_MDIST_TRUE (RID_SVXITEMS_START + 447) #define RID_SVXITEMS_BOXINF_MDIST_FALSE (RID_SVXITEMS_START + 448) -#define RID_SVXITEMS_HYPHEN_TRUE (RID_SVXITEMS_START + 449) -#define RID_SVXITEMS_HYPHEN_FALSE (RID_SVXITEMS_START + 450) -#define RID_SVXITEMS_PAGE_END_TRUE (RID_SVXITEMS_START + 451) -#define RID_SVXITEMS_PAGE_END_FALSE (RID_SVXITEMS_START + 452) -#define RID_SVXITEMS_BLINK_TRUE (RID_SVXITEMS_START + 453) -#define RID_SVXITEMS_BLINK_FALSE (RID_SVXITEMS_START + 454) // Complete-Texte ----------------------------------------------------------- @@ -466,20 +138,6 @@ #define RID_SVXITEMS_MARGIN_TOP (RID_SVXITEMS_START + 481) #define RID_SVXITEMS_MARGIN_RIGHT (RID_SVXITEMS_START + 482) #define RID_SVXITEMS_MARGIN_BOTTOM (RID_SVXITEMS_START + 483) -#define RID_SVXITEMS_SIZE_WIDTH (RID_SVXITEMS_START + 484) -#define RID_SVXITEMS_SIZE_HEIGHT (RID_SVXITEMS_START + 485) -#define RID_SVXITEMS_LRSPACE_LEFT (RID_SVXITEMS_START + 486) -#define RID_SVXITEMS_LRSPACE_FLINE (RID_SVXITEMS_START + 487) -#define RID_SVXITEMS_LRSPACE_RIGHT (RID_SVXITEMS_START + 488) -#define RID_SVXITEMS_SHADOW_COMPLETE (RID_SVXITEMS_START + 489) -#define RID_SVXITEMS_BORDER_COMPLETE (RID_SVXITEMS_START + 490) -#define RID_SVXITEMS_BORDER_TOP (RID_SVXITEMS_START + 491) -#define RID_SVXITEMS_BORDER_BOTTOM (RID_SVXITEMS_START + 492) -#define RID_SVXITEMS_BORDER_LEFT (RID_SVXITEMS_START + 493) -#define RID_SVXITEMS_BORDER_RIGHT (RID_SVXITEMS_START + 494) -#define RID_SVXITEMS_BORDER_DISTANCE (RID_SVXITEMS_START + 495) -#define RID_SVXITEMS_ULSPACE_UPPER (RID_SVXITEMS_START + 496) -#define RID_SVXITEMS_ULSPACE_LOWER (RID_SVXITEMS_START + 497) #define RID_SVXITEMS_PAGE_COMPLETE (RID_SVXITEMS_START + 498) #define RID_SVXITEMS_PAGE_NUM_BEGIN (RID_SVXITEMS_START + 499) #define RID_SVXITEMS_PAGE_NUM_CHR_UPPER (RID_SVXITEMS_START + 499) @@ -494,85 +152,19 @@ #define RID_SVXITEMS_PAGE_USAGE_RIGHT (RID_SVXITEMS_START + 508) #define RID_SVXITEMS_PAGE_USAGE_ALL (RID_SVXITEMS_START + 509) #define RID_SVXITEMS_PAGE_USAGE_MIRROR (RID_SVXITEMS_START + 510) -#define RID_SVXITEMS_LINES (RID_SVXITEMS_START + 511) -#define RID_SVXITEMS_WIDOWS_COMPLETE (RID_SVXITEMS_START + 512) -#define RID_SVXITEMS_ORPHANS_COMPLETE (RID_SVXITEMS_START + 513) -#define RID_SVXITEMS_HYPHEN_MINLEAD (RID_SVXITEMS_START + 514) -#define RID_SVXITEMS_HYPHEN_MINTRAIL (RID_SVXITEMS_START + 515) -#define RID_SVXITEMS_HYPHEN_MAX (RID_SVXITEMS_START + 516) -#define RID_SVXITEMS_PAGEMODEL_COMPLETE (RID_SVXITEMS_START + 517) -#define RID_SVXITEMS_KERNING_COMPLETE (RID_SVXITEMS_START + 518) -#define RID_SVXITEMS_KERNING_EXPANDED (RID_SVXITEMS_START + 519) -#define RID_SVXITEMS_KERNING_CONDENSED (RID_SVXITEMS_START + 520) #define RID_SVXITEMS_AUTHOR_COMPLETE (RID_SVXITEMS_START + 521) #define RID_SVXITEMS_DATE_COMPLETE (RID_SVXITEMS_START + 522) #define RID_SVXITEMS_TEXT_COMPLETE (RID_SVXITEMS_START + 523) #define RID_SVXITEMS_BACKGROUND_COLOR (RID_SVXITEMS_START + 524) #define RID_SVXITEMS_PATTERN_COLOR (RID_SVXITEMS_START + 525) -#define RID_SVXITEMS_GRAPHIC (RID_SVXITEMS_START + 526) #define RID_SVXITEMS_BRUSH_CHAR (RID_SVXITEMS_START + 527) -#define RID_SVXITEMS_BORDER_NONE (RID_SVXITEMS_START + 528) - -// enum FontEmphasisMark --------------------------------------------------- -#define RID_SVXITEMS_EMPHASIS_BEGIN_STYLE (RID_SVXITEMS_START + 530) -#define RID_SVXITEMS_EMPHASIS_NONE_STYLE (RID_SVXITEMS_START + 530) -#define RID_SVXITEMS_EMPHASIS_DOT_STYLE (RID_SVXITEMS_START + 531) -#define RID_SVXITEMS_EMPHASIS_CIRCLE_STYLE (RID_SVXITEMS_START + 532) -#define RID_SVXITEMS_EMPHASIS_DISC_STYLE (RID_SVXITEMS_START + 533) -#define RID_SVXITEMS_EMPHASIS_ACCENT_STYLE (RID_SVXITEMS_START + 534) - -#define RID_SVXITEMS_EMPHASIS_ABOVE_POS (RID_SVXITEMS_START + 540) -#define RID_SVXITEMS_EMPHASIS_BELOW_POS (RID_SVXITEMS_START + 541) - -#define RID_SVXITEMS_TWOLINES_OFF (RID_SVXITEMS_START + 545) -#define RID_SVXITEMS_TWOLINES (RID_SVXITEMS_START + 546) - -#define RID_SVXITEMS_SCRPTSPC_OFF (RID_SVXITEMS_START + 550) -#define RID_SVXITEMS_SCRPTSPC_ON (RID_SVXITEMS_START + 551) -#define RID_SVXITEMS_HNGPNCT_OFF (RID_SVXITEMS_START + 552) -#define RID_SVXITEMS_HNGPNCT_ON (RID_SVXITEMS_START + 553) - -#define RID_SVXITEMS_FORBIDDEN_RULE_OFF (RID_SVXITEMS_START + 554) -#define RID_SVXITEMS_FORBIDDEN_RULE_ON (RID_SVXITEMS_START + 555) - -#define RID_SVXITEMS_CHARROTATE_OFF (RID_SVXITEMS_START + 556) -#define RID_SVXITEMS_CHARROTATE (RID_SVXITEMS_START + 557) -#define RID_SVXITEMS_CHARROTATE_FITLINE (RID_SVXITEMS_START + 558) - -#define RID_SVXITEMS_CHARSCALE_OFF (RID_SVXITEMS_START + 559) -#define RID_SVXITEMS_CHARSCALE (RID_SVXITEMS_START + 560) - -#define RID_SVXITEMS_RELIEF_BEGIN (RID_SVXITEMS_START + 561) -#define RID_SVXITEMS_RELIEF_NONE (RID_SVXITEMS_START + 561) -#define RID_SVXITEMS_RELIEF_EMBOSSED (RID_SVXITEMS_START + 562) -#define RID_SVXITEMS_RELIEF_ENGRAVED (RID_SVXITEMS_START + 563) -#define RID_SVXITEMS_RELIEF_END (RID_SVXITEMS_START + 564) - -#define RID_SVXITEMS_PARAVERTALIGN_AUTO (RID_SVXITEMS_START + 565) -#define RID_SVXITEMS_PARAVERTALIGN_BASELINE (RID_SVXITEMS_START + 566) -#define RID_SVXITEMS_PARAVERTALIGN_TOP (RID_SVXITEMS_START + 567) -#define RID_SVXITEMS_PARAVERTALIGN_CENTER (RID_SVXITEMS_START + 568) -#define RID_SVXITEMS_PARAVERTALIGN_BOTTOM (RID_SVXITEMS_START + 569) - -#define RID_SVXITEMS_FRMDIR_BEGIN (RID_SVXITEMS_START + 570) -#define RID_SVXITEMS_FRMDIR_HORI_LEFT_TOP (RID_SVXITEMS_START + 570) -#define RID_SVXITEMS_FRMDIR_HORI_RIGHT_TOP (RID_SVXITEMS_START + 571) -#define RID_SVXITEMS_FRMDIR_VERT_TOP_RIGHT (RID_SVXITEMS_START + 572) -#define RID_SVXITEMS_FRMDIR_VERT_TOP_LEFT (RID_SVXITEMS_START + 573) -#define RID_SVXITEMS_FRMDIR_ENVIRONMENT (RID_SVXITEMS_START + 574) -#define RID_SVXITEMS_FRMDIR_END (RID_SVXITEMS_START + 574) - -#define RID_SVXITEMS_PARASNAPTOGRID_ON (RID_SVXITEMS_START + 575) -#define RID_SVXITEMS_PARASNAPTOGRID_OFF (RID_SVXITEMS_START + 576) - -#define RID_SVXITEMS_CHARHIDDEN_FALSE (RID_SVXITEMS_START + 577) -#define RID_SVXITEMS_CHARHIDDEN_TRUE (RID_SVXITEMS_START + 578) +#define RID_ATTR_NAMES (RID_SVXITEMS_START + 528) // Ueberlaufpruefung -------------------------------------------------------- // Resource-Id's -#define ACT_RID_SVXITEMS_END RID_SVXITEMS_CHARHIDDEN_TRUE +#define ACT_RID_SVXITEMS_END RID_ATTR_NAMES #if ACT_RID_SVXITEMS_END > RID_SVXITEMS_END #error Resource-Ueberlauf in #line, #file #endif diff --git a/svx/inc/svx/swafopt.hxx b/svx/inc/svx/swafopt.hxx deleted file mode 100644 index 86f569e46221..000000000000 --- a/svx/inc/svx/swafopt.hxx +++ /dev/null @@ -1,109 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: swafopt.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVXSWAFOPT_HXX -#define _SVXSWAFOPT_HXX - -#include <vcl/font.hxx> -#include "svx/svxdllapi.h" - -class SvStringsISortDtor; -class SmartTagMgr; - -// Klasse fuer Optionen vom Autoformat -struct SVX_DLLPUBLIC SvxSwAutoFmtFlags -{ - Font aBulletFont; - Font aByInputBulletFont; - const SvStringsISortDtor* pAutoCmpltList; // only valid inside the Dialog!!! - SmartTagMgr* pSmartTagMgr; - - sal_Unicode cBullet; - sal_Unicode cByInputBullet; - - USHORT nAutoCmpltWordLen, nAutoCmpltListLen; - USHORT nAutoCmpltExpandKey; - - BYTE nRightMargin; - - BOOL bReplaceQuote : 1; - BOOL bAutoCorrect : 1; - BOOL bCptlSttSntnc : 1; - BOOL bCptlSttWrd : 1; - BOOL bChkFontAttr : 1; - - BOOL bChgUserColl : 1; - BOOL bChgEnumNum : 1; - - BOOL bAFmtByInput : 1; - BOOL bDelEmptyNode : 1; - BOOL bSetNumRule : 1; - - BOOL bChgFracionSymbol : 1; - BOOL bChgOrdinalNumber : 1; - BOOL bChgToEnEmDash : 1; - BOOL bChgWeightUnderl : 1; - BOOL bSetINetAttr : 1; - - BOOL bSetBorder : 1; - BOOL bCreateTable : 1; - BOOL bReplaceStyles : 1; - BOOL bDummy : 1; - - BOOL bWithRedlining : 1; - - BOOL bRightMargin : 1; - - BOOL bAutoCompleteWords : 1; - BOOL bAutoCmpltCollectWords : 1; - BOOL bAutoCmpltEndless : 1; -// -- under NT hier starts a new long - BOOL bAutoCmpltAppendBlanc : 1; - BOOL bAutoCmpltShowAsTip : 1; - - BOOL bAFmtDelSpacesAtSttEnd : 1; - BOOL bAFmtDelSpacesBetweenLines : 1; - BOOL bAFmtByInpDelSpacesAtSttEnd : 1; - BOOL bAFmtByInpDelSpacesBetweenLines : 1; - - BOOL bAutoCmpltKeepList : 1; - - // some dummies for any new options - BOOL bDummy6 : 1, - bDummy7 : 1, - bDummy8 : 1 - ; - - SvxSwAutoFmtFlags(); - SvxSwAutoFmtFlags( const SvxSwAutoFmtFlags& rAFFlags ) { *this = rAFFlags; } - SvxSwAutoFmtFlags& operator=( const SvxSwAutoFmtFlags& ); -}; - -#endif - diff --git a/svx/inc/svx/sxallitm.hxx b/svx/inc/svx/sxallitm.hxx index ea86f273b062..590e0b114d4c 100644 --- a/svx/inc/svx/sxallitm.hxx +++ b/svx/inc/svx/sxallitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sxallitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sxcaitm.hxx b/svx/inc/svx/sxcaitm.hxx index 91af4754956f..647d6bc0d807 100644 --- a/svx/inc/svx/sxcaitm.hxx +++ b/svx/inc/svx/sxcaitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sxcaitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sxcecitm.hxx b/svx/inc/svx/sxcecitm.hxx index 229f80394ce7..adf69962b8a3 100644 --- a/svx/inc/svx/sxcecitm.hxx +++ b/svx/inc/svx/sxcecitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sxcecitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sxcgitm.hxx b/svx/inc/svx/sxcgitm.hxx index 2999265cdc2b..e4daddc12974 100644 --- a/svx/inc/svx/sxcgitm.hxx +++ b/svx/inc/svx/sxcgitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sxcgitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sxciaitm.hxx b/svx/inc/svx/sxciaitm.hxx index 3a338ab15b27..f04a672a791b 100644 --- a/svx/inc/svx/sxciaitm.hxx +++ b/svx/inc/svx/sxciaitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sxciaitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sxcikitm.hxx b/svx/inc/svx/sxcikitm.hxx index c94263e55d17..e5c7ac2d1724 100644 --- a/svx/inc/svx/sxcikitm.hxx +++ b/svx/inc/svx/sxcikitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sxcikitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sxcllitm.hxx b/svx/inc/svx/sxcllitm.hxx index 583b9255cffa..65011beff599 100644 --- a/svx/inc/svx/sxcllitm.hxx +++ b/svx/inc/svx/sxcllitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sxcllitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sxctitm.hxx b/svx/inc/svx/sxctitm.hxx index 35d496179e2a..7cc2cefc8a55 100644 --- a/svx/inc/svx/sxctitm.hxx +++ b/svx/inc/svx/sxctitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sxctitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sxekitm.hxx b/svx/inc/svx/sxekitm.hxx index a763a90e4b1f..1a881af22b01 100644 --- a/svx/inc/svx/sxekitm.hxx +++ b/svx/inc/svx/sxekitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sxekitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sxelditm.hxx b/svx/inc/svx/sxelditm.hxx index e2f0750da65f..aa60cf8d030c 100644 --- a/svx/inc/svx/sxelditm.hxx +++ b/svx/inc/svx/sxelditm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sxelditm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sxenditm.hxx b/svx/inc/svx/sxenditm.hxx index 3bf449c1c260..442dc52bbaa1 100644 --- a/svx/inc/svx/sxenditm.hxx +++ b/svx/inc/svx/sxenditm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sxenditm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sxfiitm.hxx b/svx/inc/svx/sxfiitm.hxx index 72a258d2fa70..514b6ec9a713 100644 --- a/svx/inc/svx/sxfiitm.hxx +++ b/svx/inc/svx/sxfiitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sxfiitm.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sxlayitm.hxx b/svx/inc/svx/sxlayitm.hxx index 972bed84e8de..ed476ade709e 100644 --- a/svx/inc/svx/sxlayitm.hxx +++ b/svx/inc/svx/sxlayitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sxlayitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sxlogitm.hxx b/svx/inc/svx/sxlogitm.hxx index f7e1c2b1ab1f..9ef4903329c7 100644 --- a/svx/inc/svx/sxlogitm.hxx +++ b/svx/inc/svx/sxlogitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sxlogitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sxmbritm.hxx b/svx/inc/svx/sxmbritm.hxx index cc129c485bc6..1f28844a0910 100644 --- a/svx/inc/svx/sxmbritm.hxx +++ b/svx/inc/svx/sxmbritm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sxmbritm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sxmfsitm.hxx b/svx/inc/svx/sxmfsitm.hxx index 4d9f245e54b1..2e50d05aabf2 100644 --- a/svx/inc/svx/sxmfsitm.hxx +++ b/svx/inc/svx/sxmfsitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sxmfsitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sxmkitm.hxx b/svx/inc/svx/sxmkitm.hxx index ae537a976e25..2e1a7fd74b5a 100644 --- a/svx/inc/svx/sxmkitm.hxx +++ b/svx/inc/svx/sxmkitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sxmkitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sxmlhitm.hxx b/svx/inc/svx/sxmlhitm.hxx index 3d7057bc7215..1d4ffb5cfb05 100644 --- a/svx/inc/svx/sxmlhitm.hxx +++ b/svx/inc/svx/sxmlhitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sxmlhitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sxmoitm.hxx b/svx/inc/svx/sxmoitm.hxx index d9b888045b13..091c66ec49ac 100644 --- a/svx/inc/svx/sxmoitm.hxx +++ b/svx/inc/svx/sxmoitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sxmoitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sxmovitm.hxx b/svx/inc/svx/sxmovitm.hxx index c32def94fc79..360adfc52e1a 100644 --- a/svx/inc/svx/sxmovitm.hxx +++ b/svx/inc/svx/sxmovitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sxmovitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sxmsitm.hxx b/svx/inc/svx/sxmsitm.hxx index 96f2ffd8b84c..b58b30091569 100644 --- a/svx/inc/svx/sxmsitm.hxx +++ b/svx/inc/svx/sxmsitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sxmsitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sxmspitm.hxx b/svx/inc/svx/sxmspitm.hxx index 6590ba33ab0b..3af212ffbad1 100644 --- a/svx/inc/svx/sxmspitm.hxx +++ b/svx/inc/svx/sxmspitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sxmspitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sxmsuitm.hxx b/svx/inc/svx/sxmsuitm.hxx index 1bcacf2dea47..bc572a8319ff 100644 --- a/svx/inc/svx/sxmsuitm.hxx +++ b/svx/inc/svx/sxmsuitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sxmsuitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sxmtaitm.hxx b/svx/inc/svx/sxmtaitm.hxx index 33d5e14ad8ea..e9b35bc425bc 100644 --- a/svx/inc/svx/sxmtaitm.hxx +++ b/svx/inc/svx/sxmtaitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sxmtaitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sxmtfitm.hxx b/svx/inc/svx/sxmtfitm.hxx index ce859e00a460..c971f69f652f 100644 --- a/svx/inc/svx/sxmtfitm.hxx +++ b/svx/inc/svx/sxmtfitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sxmtfitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sxmtpitm.hxx b/svx/inc/svx/sxmtpitm.hxx index a708c9429678..f056c4cc732e 100644 --- a/svx/inc/svx/sxmtpitm.hxx +++ b/svx/inc/svx/sxmtpitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sxmtpitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sxmtritm.hxx b/svx/inc/svx/sxmtritm.hxx index 970c0f79adf6..c74c26f66535 100644 --- a/svx/inc/svx/sxmtritm.hxx +++ b/svx/inc/svx/sxmtritm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sxmtritm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sxmuitm.hxx b/svx/inc/svx/sxmuitm.hxx index 9f721f67fef2..d8c65975c92a 100644 --- a/svx/inc/svx/sxmuitm.hxx +++ b/svx/inc/svx/sxmuitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sxmuitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sxoneitm.hxx b/svx/inc/svx/sxoneitm.hxx index d6d960d34636..00285b23265a 100644 --- a/svx/inc/svx/sxoneitm.hxx +++ b/svx/inc/svx/sxoneitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sxoneitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sxonitm.hxx b/svx/inc/svx/sxonitm.hxx index ce5c5e72cfd1..35fa8b54dc28 100644 --- a/svx/inc/svx/sxonitm.hxx +++ b/svx/inc/svx/sxonitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sxonitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sxopitm.hxx b/svx/inc/svx/sxopitm.hxx index 7c88482c8b71..947660e71cc0 100644 --- a/svx/inc/svx/sxopitm.hxx +++ b/svx/inc/svx/sxopitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sxopitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sxraitm.hxx b/svx/inc/svx/sxraitm.hxx index 46a22da5c421..d0c48d8109ea 100644 --- a/svx/inc/svx/sxraitm.hxx +++ b/svx/inc/svx/sxraitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sxraitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sxreaitm.hxx b/svx/inc/svx/sxreaitm.hxx index f7f7f27fc7cf..ea539f63d12b 100644 --- a/svx/inc/svx/sxreaitm.hxx +++ b/svx/inc/svx/sxreaitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sxreaitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sxreoitm.hxx b/svx/inc/svx/sxreoitm.hxx index d6f5fd7f6deb..1d090c4b7277 100644 --- a/svx/inc/svx/sxreoitm.hxx +++ b/svx/inc/svx/sxreoitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sxreoitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sxroaitm.hxx b/svx/inc/svx/sxroaitm.hxx index e093c80b4ab2..739e3d653f24 100644 --- a/svx/inc/svx/sxroaitm.hxx +++ b/svx/inc/svx/sxroaitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sxroaitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sxrooitm.hxx b/svx/inc/svx/sxrooitm.hxx index d5e44da7a11c..955ce2bdf6d4 100644 --- a/svx/inc/svx/sxrooitm.hxx +++ b/svx/inc/svx/sxrooitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sxrooitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sxsaitm.hxx b/svx/inc/svx/sxsaitm.hxx index 2897b7699aae..095e017d22e7 100644 --- a/svx/inc/svx/sxsaitm.hxx +++ b/svx/inc/svx/sxsaitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sxsaitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sxsalitm.hxx b/svx/inc/svx/sxsalitm.hxx index 05a8f6a411d0..c189934afbb3 100644 --- a/svx/inc/svx/sxsalitm.hxx +++ b/svx/inc/svx/sxsalitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sxsalitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sxsiitm.hxx b/svx/inc/svx/sxsiitm.hxx index 6eb6ab03cd55..e3f11e57bc3a 100644 --- a/svx/inc/svx/sxsiitm.hxx +++ b/svx/inc/svx/sxsiitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sxsiitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sxsoitm.hxx b/svx/inc/svx/sxsoitm.hxx index 4b26efff7bbc..2a0139f9372a 100644 --- a/svx/inc/svx/sxsoitm.hxx +++ b/svx/inc/svx/sxsoitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sxsoitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/sxtraitm.hxx b/svx/inc/svx/sxtraitm.hxx index 8575d29e4c91..bbea7b712c06 100644 --- a/svx/inc/svx/sxtraitm.hxx +++ b/svx/inc/svx/sxtraitm.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sxtraitm.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/tabarea.hxx b/svx/inc/svx/tabarea.hxx index 712866d53c3b..873dbc576f7c 100644 --- a/svx/inc/svx/tabarea.hxx +++ b/svx/inc/svx/tabarea.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: tabarea.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/tabline.hxx b/svx/inc/svx/tabline.hxx index 09b579c541c0..7ccc189b0083 100644 --- a/svx/inc/svx/tabline.hxx +++ b/svx/inc/svx/tabline.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: tabline.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/tbcontrl.hxx b/svx/inc/svx/tbcontrl.hxx index e531ebfad54b..0fb270351df9 100644 --- a/svx/inc/svx/tbcontrl.hxx +++ b/svx/inc/svx/tbcontrl.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: tbcontrl.hxx,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/tbxcolorupdate.hxx b/svx/inc/svx/tbxcolorupdate.hxx index 9281366c0ef7..892a03257e5b 100644 --- a/svx/inc/svx/tbxcolorupdate.hxx +++ b/svx/inc/svx/tbxcolorupdate.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: tbxcolorupdate.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/thesdlg.hxx b/svx/inc/svx/thesdlg.hxx deleted file mode 100644 index 4ca5376ad8a7..000000000000 --- a/svx/inc/svx/thesdlg.hxx +++ /dev/null @@ -1,137 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: thesdlg.hxx,v $ - * $Revision: 1.3 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_THESDLG_HXX -#define _SVX_THESDLG_HXX -// include --------------------------------------------------------------- - -#ifndef _EDIT_HXX //autogen -#include <vcl/edit.hxx> -#endif -#ifndef _BUTTON_HXX //autogen -#include <vcl/button.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen -#include <vcl/lstbox.hxx> -#endif -#ifndef _FIXED_HXX //autogen -#include <vcl/fixed.hxx> -#endif -#include <svx/stddlg.hxx> -#include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/beans/PropertyValues.hpp> -#include "svx/svxdllapi.h" - -// forward --------------------------------------------------------------- - -struct ThesDlg_Impl; - -class SvxThesaurusLanguageDlg_Impl; - -namespace com { namespace sun { namespace star { - namespace linguistic2 { - class XThesaurus; - class XMeaning; - } - namespace lang { - struct Locale; - } -}}} - -// class SvxThesaurusDialog ---------------------------------------------- - -class SVX_DLLPUBLIC SvxThesaurusDialog : public SvxStandardDialog -{ -public: - friend class SvxThesaurusLanguageDlg_Impl; - - SvxThesaurusDialog( Window* pParent, - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XThesaurus > xThesaurus, - const String &rWord, sal_Int16 nLanguage ); - ~SvxThesaurusDialog(); - - String GetWord() { return aReplaceEdit.GetText(); } - - sal_uInt16 GetLanguage() const; - -private: - FixedText aWordText; - ListBox aWordLB; - FixedText aReplaceText; - Edit aReplaceEdit; - FixedText aMeanText; - ListBox aMeanLB; - FixedText aSynonymText; - ListBox aSynonymLB; - FixedLine aVarFL; - - OKButton aOkBtn; - CancelButton aCancelBtn; - PushButton aLookUpBtn; - PushButton aLangBtn; - HelpButton aHelpBtn; - - String aErrStr; - - ThesDlg_Impl* pImpl; // always != NULL - - SVX_DLLPRIVATE virtual void Apply(); - -#ifdef _SVX_THESDLG_CXX - SVX_DLLPRIVATE void UpdateSynonymBox_Impl(); - SVX_DLLPRIVATE void UpdateMeaningBox_Impl( - ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XMeaning > > *pMeaningSeq = NULL ); - SVX_DLLPRIVATE void Init_Impl(sal_Int16 nLanguage); - - ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XMeaning > > SAL_CALL - queryMeanings_Impl( - ::rtl::OUString& rTerm, - const ::com::sun::star::lang::Locale& rLocale, - const ::com::sun::star::beans::PropertyValues& rProperties ) - throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); - - // Handler - DECL_LINK( SelectHdl_Impl, ListBox * ); - DECL_LINK( SynonymHdl_Impl, ListBox * ); - DECL_LINK( LookUpHdl_Impl, Button * ); - DECL_LINK( LanguageHdl_Impl, Button * ); - DECL_LINK( EntryHdl_Impl, ListBox * ); - DECL_LINK( SpellErrorHdl_Impl, void * ); -#endif -}; - -#endif - diff --git a/svx/inc/svx/tstpitem.hxx b/svx/inc/svx/tstpitem.hxx deleted file mode 100644 index b910b1b1e704..000000000000 --- a/svx/inc/svx/tstpitem.hxx +++ /dev/null @@ -1,191 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: tstpitem.hxx,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_TSPTITEM_HXX -#define _SVX_TSPTITEM_HXX - -// include --------------------------------------------------------------- - -#include <svl/poolitem.hxx> -#include <svx/svxenum.hxx> -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#include "svx/svxdllapi.h" - -// class SvxTabStop ------------------------------------------------------ - -#define SVX_TAB_DEFCOUNT 10 -#define SVX_TAB_DEFDIST 1134 // 2cm in twips -#define SVX_TAB_NOTFOUND USHRT_MAX -#define cDfltDecimalChar (sal_Unicode(0x00)) // aus IntlWrapper besorgen -#define cDfltFillChar (sal_Unicode(' ')) - -class SVX_DLLPUBLIC SvxTabStop -{ -private: - long nTabPos; - - SvxTabAdjust eAdjustment; - mutable sal_Unicode m_cDecimal; - sal_Unicode cFill; - - SVX_DLLPRIVATE friend SvStream& operator<<( SvStream&, SvxTabStop& ); - - void fillDecimal() const; - -public: - SvxTabStop(); -#if (_MSC_VER < 1300) - SvxTabStop( const long nPos, - const SvxTabAdjust eAdjst = SVX_TAB_ADJUST_LEFT, - const sal_Unicode cDec = cDfltDecimalChar, - const sal_Unicode cFil = cDfltFillChar ); -#else - SvxTabStop::SvxTabStop( const long nPos, - const SvxTabAdjust eAdjst = SVX_TAB_ADJUST_LEFT, - const sal_Unicode cDec = cDfltDecimalChar, - const sal_Unicode cFil = cDfltFillChar ); -#endif - - long& GetTabPos() { return nTabPos; } - long GetTabPos() const { return nTabPos; } - - SvxTabAdjust& GetAdjustment() { return eAdjustment; } - SvxTabAdjust GetAdjustment() const { return eAdjustment; } - - sal_Unicode& GetDecimal() { fillDecimal(); return m_cDecimal; } - sal_Unicode GetDecimal() const { fillDecimal(); return m_cDecimal; } - - sal_Unicode& GetFill() { return cFill; } - sal_Unicode GetFill() const { return cFill; } - - String GetValueString() const; - - // das "alte" operator==() - BOOL IsEqual( const SvxTabStop& rTS ) const - { - return ( nTabPos == rTS.nTabPos && - eAdjustment == rTS.eAdjustment && - m_cDecimal == rTS.m_cDecimal && - cFill == rTS.cFill ); - } - - // Fuer das SortedArray: - BOOL operator==( const SvxTabStop& rTS ) const - { return nTabPos == rTS.nTabPos; } - BOOL operator <( const SvxTabStop& rTS ) const - { return nTabPos < rTS.nTabPos; } - - SvxTabStop& operator=( const SvxTabStop& rTS ) - { - nTabPos = rTS.nTabPos; - eAdjustment = rTS.eAdjustment; - m_cDecimal = rTS.m_cDecimal; - cFill = rTS.cFill; - return *this; - } -}; - -// class SvxTabStopItem -------------------------------------------------- - -SV_DECL_VARARR_SORT_VISIBILITY( SvxTabStopArr, SvxTabStop, SVX_TAB_DEFCOUNT, 1, SVX_DLLPUBLIC ) - -/* -[Beschreibung] -Dieses Item beschreibt eine Liste von TabStops. -*/ - -class SVX_DLLPUBLIC SvxTabStopItem : public SfxPoolItem, private SvxTabStopArr -{ -//friend class SvxTabStopObject_Impl; - -public: - TYPEINFO(); - - SvxTabStopItem( USHORT nWhich ); - SvxTabStopItem( const USHORT nTabs, - const USHORT nDist, - const SvxTabAdjust eAdjst /*= SVX_TAB_ADJUST_DEFAULT*/, - USHORT nWhich ); - SvxTabStopItem( const SvxTabStopItem& rTSI ); - - // Liefert Index-Position des Tabs zurueck oder TAB_NOTFOUND - USHORT GetPos( const SvxTabStop& rTab ) const; - - // Liefert Index-Position des Tabs an nPos zurueck oder TAB_NOTFOUND - USHORT GetPos( const long nPos ) const; - - // entprivatisiert: - USHORT Count() const { return SvxTabStopArr::Count(); } - BOOL Insert( const SvxTabStop& rTab ); - void Insert( const SvxTabStopItem* pTabs, USHORT nStart = 0, - USHORT nEnd = USHRT_MAX ); - void Remove( SvxTabStop& rTab ) - { SvxTabStopArr::Remove( rTab ); } - void Remove( const USHORT nPos, const USHORT nLen = 1 ) - { SvxTabStopArr::Remove( nPos, nLen ); } - - // Zuweisungsoperator, Gleichheitsoperator (vorsicht: teuer!) - SvxTabStopItem& operator=( const SvxTabStopItem& rTSI ); - - // this is already included in SfxPoolItem declaration - //int operator!=( const SvxTabStopItem& rTSI ) const - // { return !( operator==( rTSI ) ); } - - // SortedArrays liefern nur Stackobjekte zurueck! - const SvxTabStop& operator[]( const USHORT nPos ) const - { - DBG_ASSERT( GetStart() && - nPos < Count(), "op[]" ); - return *( GetStart() + nPos ); - } - const SvxTabStop* GetStart() const - { return SvxTabStopArr::GetData(); } - - // "pure virtual Methoden" vom SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_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; - - using SvxTabStopArr::Insert; - using SvxTabStopArr::Remove; -}; - -#endif - diff --git a/svx/inc/svx/twolinesitem.hxx b/svx/inc/svx/twolinesitem.hxx deleted file mode 100644 index 5c0094db0f42..000000000000 --- a/svx/inc/svx/twolinesitem.hxx +++ /dev/null @@ -1,96 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: twolinesitem.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_TWOLINESITEM_HXX -#define _SVX_TWOLINESITEM_HXX - -#include <sal/types.h> -#include <svl/poolitem.hxx> -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#include "svx/svxdllapi.h" - -class SvXMLUnitConverter; -namespace rtl -{ - class OUString; -} - -class SVX_DLLPUBLIC SvxTwoLinesItem : public SfxPoolItem -{ - sal_Unicode cStartBracket, cEndBracket; - sal_Bool bOn; -public: - TYPEINFO(); - SvxTwoLinesItem( sal_Bool bOn /*= TRUE*/, - sal_Unicode nStartBracket /*= 0*/, - sal_Unicode nEndBracket /*= 0*/, - sal_uInt16 nId ); - SvxTwoLinesItem( const SvxTwoLinesItem& rAttr ); - virtual ~SvxTwoLinesItem(); - - // "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 SfxItemPresentation GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - String &rText, - const IntlWrapper* pIntl = 0 ) const; - - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, - BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, - BYTE nMemberId = 0 ); - - virtual USHORT GetVersion( USHORT nFFVer ) const; - - SvxTwoLinesItem& operator=( const SvxTwoLinesItem& rCpy ) - { - SetValue( rCpy.GetValue() ); - SetStartBracket( rCpy.GetStartBracket() ); - SetEndBracket( rCpy.GetEndBracket() ); - return *this; - } - - 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 GetEndBracket() const { return cEndBracket; } - void SetEndBracket( sal_Unicode c ) { cEndBracket = c; } -}; - -#endif - diff --git a/svx/inc/svx/ucsubset.hrc b/svx/inc/svx/ucsubset.hrc index a201ecf9fbb3..50f7e62162e6 100644 --- a/svx/inc/svx/ucsubset.hrc +++ b/svx/inc/svx/ucsubset.hrc @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ucsubset.hrc,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/ucsubset.hxx b/svx/inc/svx/ucsubset.hxx index 3e9de786063d..0d6e35bcaf38 100644 --- a/svx/inc/svx/ucsubset.hxx +++ b/svx/inc/svx/ucsubset.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ucsubset.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/udlnitem.hxx b/svx/inc/svx/udlnitem.hxx deleted file mode 100644 index 33d5d59e3ff6..000000000000 --- a/svx/inc/svx/udlnitem.hxx +++ /dev/null @@ -1,139 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: udlnitem.hxx,v $ - * $Revision: 1.4.212.1 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_UDLNITEM_HXX -#define _SVX_UDLNITEM_HXX - -// include --------------------------------------------------------------- - -#include <svl/eitem.hxx> -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#include <vcl/vclenum.hxx> -#include <tools/color.hxx> -#include "svx/svxdllapi.h" - -class SvXMLUnitConverter; -namespace rtl -{ - class OUString; -} - -// class SvxTextLineItem ------------------------------------------------ - -/* Value container for underline and overline font effects */ - -class SVX_DLLPUBLIC SvxTextLineItem : public SfxEnumItem -{ - Color mColor; -public: - TYPEINFO(); - - SvxTextLineItem( const FontUnderline eSt, - const USHORT nId ); - - // "pure virtual Methoden" vom SfxPoolItem - 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 String GetValueTextByPos( USHORT nPos ) const; - virtual USHORT GetValueCount() const; - - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, - BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, - BYTE nMemberId = 0 ); - - // MS VC4.0 kommt durcheinander - void SetValue( USHORT nNewVal ) - {SfxEnumItem::SetValue(nNewVal); } - virtual int HasBoolValue() const; - virtual BOOL GetBoolValue() const; - virtual void SetBoolValue( BOOL bVal ); - - virtual int operator==( const SfxPoolItem& ) const; - - inline SvxTextLineItem& operator=(const SvxTextLineItem& rTextLine) - { - SetValue( rTextLine.GetValue() ); - SetColor( rTextLine.GetColor() ); - return *this; - } - - // enum cast - FontUnderline GetLineStyle() const - { return (FontUnderline)GetValue(); } - void SetLineStyle( FontUnderline eNew ) - { SetValue((USHORT) eNew); } - - const Color& GetColor() const { return mColor; } - void SetColor( const Color& rCol ) { mColor = rCol; } -}; - -// class SvxUnderlineItem ------------------------------------------------ - -/* Value container for underline font effects */ - -class SVX_DLLPUBLIC SvxUnderlineItem : public SvxTextLineItem -{ -public: - TYPEINFO(); - - SvxUnderlineItem( const FontUnderline eSt, - const USHORT nId ); - - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual String GetValueTextByPos( USHORT nPos ) const; -}; - -// class SvxOverlineItem ------------------------------------------------ - -/* Value container for overline font effects */ - -class SVX_DLLPUBLIC SvxOverlineItem : public SvxTextLineItem -{ -public: - TYPEINFO(); - - SvxOverlineItem( const FontUnderline eSt, - const USHORT nId ); - - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual String GetValueTextByPos( USHORT nPos ) const; -}; - -#endif // #ifndef _SVX_UDLNITEM_HXX diff --git a/svx/inc/svx/ulspitem.hxx b/svx/inc/svx/ulspitem.hxx deleted file mode 100644 index 9c57a445a0a7..000000000000 --- a/svx/inc/svx/ulspitem.hxx +++ /dev/null @@ -1,119 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: ulspitem.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_ULSPITEM_HXX -#define _SVX_ULSPITEM_HXX - -// include --------------------------------------------------------------- - -#include <svl/poolitem.hxx> -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#include "svx/svxdllapi.h" - -namespace rtl -{ - class OUString; -} - -// class SvxULSpaceItem -------------------------------------------------- - -/* -[Beschreibung] -Dieses Item beschreibt den oberen und unteren Rand einer Seite oder Absatz. -*/ - -#define ULSPACE_16_VERSION ((USHORT)0x0001) - -class SVX_DLLPUBLIC SvxULSpaceItem : public SfxPoolItem -{ - USHORT nUpper; //Oberer Rand - USHORT nLower; //Unterer Rand - USHORT nPropUpper, nPropLower; // relativ oder absolut (=100%) -public: - TYPEINFO(); - - SvxULSpaceItem( const USHORT nId ); - SvxULSpaceItem( const USHORT nUp, const USHORT nLow, - const USHORT nId ); - inline SvxULSpaceItem& operator=( const SvxULSpaceItem &rCpy ); - - // "pure virtual Methoden" vom SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; - - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_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 int ScaleMetrics( long nMult, long nDiv ); - virtual int HasMetrics() const; - - inline void SetUpper( const USHORT nU, const USHORT nProp = 100 ); - inline void SetLower( const USHORT nL, const USHORT nProp = 100 ); - - void SetUpperValue( const USHORT nU ) { nUpper = nU; } - void SetLowerValue( const USHORT nL ) { nLower = nL; } - void SetPropUpper( const USHORT nU ) { nPropUpper = nU; } - void SetPropLower( const USHORT nL ) { nPropLower = nL; } - - USHORT GetUpper() const { return nUpper; } - USHORT GetLower() const { return nLower; } - USHORT GetPropUpper() const { return nPropUpper; } - USHORT GetPropLower() const { return nPropLower; } -}; - -inline SvxULSpaceItem &SvxULSpaceItem::operator=( const SvxULSpaceItem &rCpy ) -{ - nUpper = rCpy.GetUpper(); - nLower = rCpy.GetLower(); - nPropUpper = rCpy.GetPropUpper(); - nPropLower = rCpy.GetPropLower(); - return *this; -} - -inline void SvxULSpaceItem::SetUpper( const USHORT nU, const USHORT nProp ) -{ - nUpper = USHORT((ULONG(nU) * nProp ) / 100); nPropUpper = nProp; -} -inline void SvxULSpaceItem::SetLower( const USHORT nL, const USHORT nProp ) -{ - nLower = USHORT((ULONG(nL) * nProp ) / 100); nPropLower = nProp; -} - -#endif - diff --git a/svx/inc/svx/unoedsrc.hxx b/svx/inc/svx/unoedsrc.hxx deleted file mode 100644 index 6c3025072e3c..000000000000 --- a/svx/inc/svx/unoedsrc.hxx +++ /dev/null @@ -1,554 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: unoedsrc.hxx,v $ - * $Revision: 1.6 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVX_UNOEDSRC_HXX -#define _SVX_UNOEDSRC_HXX - -#include <com/sun/star/accessibility/TextSegment.hpp> - -#include <tools/solar.h> -#include <i18npool/lang.h> -#include <tools/link.hxx> -#include <tools/gen.hxx> -#include <vcl/mapmod.hxx> -#include <tools/string.hxx> -#ifndef _SV_COLOR_HXX //autogen -#include <tools/color.hxx> -#endif -#include <svl/poolitem.hxx> -#include <svl/itempool.hxx> -#include "svx/svxdllapi.h" - -#include <list> - -struct ESelection; -struct EFieldInfo; -struct EBulletInfo; -class OutputDevice; -class String; -class SfxItemSet; -class SvUShorts; -class SvxTextForwarder; -class SvxViewForwarder; -class SvxEditViewForwarder; -class SvxFieldItem; -class SfxBroadcaster; -class EECharAttribArray; -class SvxUnoTextRangeBase; - -typedef std::list< SvxUnoTextRangeBase* > SvxUnoTextRangeBaseList; - -/** 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 - EditEngine with the content of a cell, note page or page template. -*/ -class SVX_DLLPUBLIC SvxEditSource -{ -public: - virtual ~SvxEditSource(); - - /// Returns a new reference to the same object. This is a shallow copy - 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; - - /** Query the view forwarder - - @return the view forwarder, or NULL if the underlying object - is dead, or if no view is available - - @derive default implementation provided, overriding is optional - */ - virtual SvxViewForwarder* GetViewForwarder(); - - /** Query the edit view forwarder - - @param bCreate - Determines whether an EditView should be created, if there is - none active. If set to sal_True, and the underlying object is - not in EditMode, the text forwarder changes and the object is - set to EditMode. - - @return the edit view forwarder, or NULL if the underlying - object is dead, or if no view is available (if bCreate is - sal_False, NULL is also returned if the object is not in - EditMode) - - @derive default implementation provided, overriding is optional - - @attention If this method is called with bCreate equal to - sal_True, all previously returned text forwarder can become - invalid - */ - virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate = sal_False ); - - /// Write back data to model - 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; - - /** adds the given SvxUnoTextRangeBase to the text object - capsulated by this SvxEditSource. This allows the text - object to inform all created text ranges about changes - and also allows to re use already created instances. - All SvxUnoTextRangeBase must remove itself with - removeRange() before theire deleted. */ - virtual void addRange( SvxUnoTextRangeBase* pNewRange ); - - /** removes the given SvxUnoTextRangeBase from the text - object capsulated by this SvxEditSource. This text range - will not be informed any longer of changes on the underlying - text and will also not re used anymore. */ - virtual void removeRange( SvxUnoTextRangeBase* pOldRange ); - - /** returns a const list of all text ranges that are registered - for the underlying text object. */ - virtual const SvxUnoTextRangeBaseList& getRanges() const; -}; - - -/** 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 - SvxEditSource::UpdateData(). This copies back the data to the model's - EditTextObject/OutlinerParaObject. - */ -class SVX_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 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 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 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; - - /** Query state of forwarder - - @return sal_False, if no longer valid - */ - virtual BOOL IsValid() const = 0; - - /** Query language of character at given position on the underlying edit engine - - @param nPara[0 .. n-1] - Index of paragraph to query language in - - @param nIndex[0 .. m-1] - Index of character to query language of - */ - 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; - - /** Query information for given field number in the underlying edit engine - - @param nPara[0 .. n-1] - Index of paragraph to query field info in - - @param nField[0 .. m-1] - Index of field to query information of - */ - virtual EFieldInfo GetFieldInfo( USHORT nPara, USHORT nField ) const = 0; - - /** Query information regarding bullets for given paragraph on the underlying edit engine - - @param nPara[0 .. n-1] - Index of paragraph to query bullet info on - */ - virtual EBulletInfo GetBulletInfo( USHORT nPara ) const = 0; - - /** Query the bounding rectangle of the given character - - @param nPara[0 .. n] - Index of paragraph to query the bounds in. <p>The virtual - character after the last character of the represented text, - i.e. the one at position n is a special case. Because it does - not represent an existing character its bounding box is - defined in relation to preceding characters. It should be - rougly equivalent to the bounding box of some character when - inserted at the end of the text. Its height typically being - the maximal height of all the characters in the text or the - height of the preceding character, its width being at least - one pixel so that the bounding box is not degenerate.<br> - - @param nIndex[0 .. m-1] - Index of character to query the bounds of - - @return rectangle in logical coordinates, relative to upper - 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; - - /** Query the bounding rectangle of the given paragraph - - @param nPara[0 .. n-1] - Index of paragraph to query the bounds of - - @return rectangle in logical coordinates, relative to upper - 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; - - /** Query the map mode of the underlying EditEngine/Outliner - - @return the map mode used on the EditEngine/Outliner. The - values returned by GetParaBounds() and GetCharBounds() are to - be interpreted in this map mode, the point given to - GetIndexAtPoint() is interpreted in this map mode. - */ - virtual MapMode GetMapMode() const = 0; - - /** Query the reference output device of the underlying EditEngine/Outliner - - @return the OutputDevice used from the EditEngine/Outliner to - format the text. It should be used when performing e.g. font - calculations, since this is usually a printer with fonts and - resolution different from the screen. - */ - 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 - - @param rPoint - Point to query text position of. Is interpreted in logical - coordinates, relativ to the upper left corner of the text, and - in the map mode given by GetMapMode() - - @param rPara[0 .. n-1] - Index of paragraph the point is within - - @param rIndex[0 .. m-1] - Index of character the point is over - - @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; - - /** Get the start and the end index of the word at the given index - - An index value on a word leads from the first character of - that word up to and including the last space before the next - word. The index values returned do not contain any leading or - trailing white-space. If the input indices are invalid, - sal_False is returned. - - @param nPara[0 .. n-1] - Index of paragraph to start the search in - - @param nIndex[0 .. m-1] - Index of character to query the search on - - @param rStart - Start index (in the same paragraph) - - @param rEnd - End index (in the same paragraph), this point to the last - character still contained in the query - - @return sal_True, if the result is non-empty - */ - virtual sal_Bool GetWordIndices( USHORT nPara, USHORT nIndex, USHORT& rStart, USHORT& rEnd ) const = 0; - - /** Query range of similar attributes - - Please note that the range returned is half-open: [nStartIndex,nEndIndex) - - @param nStartIndex - Herein, the start index of the range of similar attributes is returned - - @param nEndIndex - Herein, the end index (exclusive) of the range of similar attributes is returned - - @param nIndex - The character index from which the range of similar attributed characters is requested - - @return sal_True, if the range has been successfully determined - */ - virtual sal_Bool GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, USHORT nPara, USHORT nIndex ) const = 0; - - /** Query number of lines in the formatted paragraph - - @param nPara[0 .. n-1] - Index of paragraph to query number of lines in - - @return number of lines in given paragraph - - */ - virtual USHORT GetLineCount( USHORT nPara ) const = 0; - - /** Query line length - - @param nPara[0 .. n-1] - Index of paragraph to query line length in - - @param nLine[0 .. m-1] - Index of line in paragraph to query line length of - - */ - 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 - - @param nLine[0 .. m-1] - Index of line in paragraph to query line length of - - */ - 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] - Index of paragraph to query line length in - - @param nIndex[0 .. m-1] - Index of of the chara in the paragraph text - - @returns [0 .. k-1] - The line number of the chara in the paragraph - */ - virtual USHORT GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const = 0; - - /** Delete given text range and reformat text - - @param rSelection - The text range to be deleted - - @return sal_True if text has been successfully deleted - */ - virtual sal_Bool Delete( const ESelection& rSelection ) = 0; - - /** Insert/Replace given text in given range and reformat text - - @param rText - Text to insert/replace - - @param rSel - Selection where text should be replaced. The empty selection inserts - - @return sal_True if text has been successfully inserted - */ - virtual sal_Bool InsertText( const String& rText, const ESelection& rSel ) = 0; - - /** Updates the formatting - - @see EditEngine::QuickFormatDoc() for details - - @return sal_True if text have been successfully reformatted - */ - virtual sal_Bool QuickFormatDoc( BOOL bFull=FALSE ) = 0; - - /** Get the outline depth of given paragraph - - @param nPara - Index of the paragraph to query the depth of - - @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; - - /** Set the outline depth of given paragraph - - @param nPara - Index of the paragraph to set the depth of - - @param nNewDepth - The depth to set on the given paragraph. The range is - [0,n), where n is the maximal outline level. - - @return TRUE, if depth could be successfully set. Reasons for - 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_Int16 GetNumberingStartValue( sal_uInt16 nPara ); - virtual void SetNumberingStartValue( sal_uInt16 nPara, sal_Int16 nNumberingStartValue ); - - virtual sal_Bool IsParaIsNumberingRestart( sal_uInt16 nPara ); - virtual void SetParaIsNumberingRestart( sal_uInt16 nPara, sal_Bool bParaIsNumberingRestart ); -}; - -/** Encapsulates the document view for the purpose of unified - EditEngine/Outliner access. - - This one has to be different from the SvxEditViewForwarder, since - the latter is only valid in edit mode. - */ -class SVX_DLLPUBLIC SvxViewForwarder -{ -public: - virtual ~SvxViewForwarder(); - - /** Query state of forwarder - - @return sal_False, if no longer valid - */ - virtual BOOL IsValid() const = 0; - - /** Query visible area of the view containing the text - - @return the visible rectangle of the text, i.e. the part of - the EditEngine or Outliner that is currently on screen. The - 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; - - /** Convert from logical, EditEngine-relative coordinates to screen coordinates - - @param rPoint - Point in logical, EditEngine-relative coordinates. - - @param rMapMode - The map mode to interpret the coordinates in. - - @return the point in screen coordinates - */ - virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const = 0; - - /** Convert from screen to logical, EditEngine-relative coordinates - - @param rPoint - Point in screen coordinates - - @param rMapMode - The map mode to interpret the coordinates in. - - @return the point in logical coordinates. - */ - virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const = 0; - -}; - - -/** Encapsulates EditView and OutlinerView for the purpose of unified - EditEngine/Outliner access - */ -class SvxEditViewForwarder : public SvxViewForwarder -{ -public: - - /** Query current selection. - - @param rSelection - Contains the current selection after method call - - @return sal_False, if there is no view or no selection (the empty selection _is_ a selection) - - */ - virtual sal_Bool GetSelection( ESelection& rSelection ) const = 0; - - /** Set selection in view. - - @param rSelection - The selection to set - - @return sal_False, if there is no view or selection is invalid - */ - virtual sal_Bool SetSelection( const ESelection& rSelection ) = 0; - - /** Copy current selection to clipboard. - - @return sal_False if no selection or no view (the empty selection _is_ a selection) - */ - virtual sal_Bool Copy() = 0; - - /** Cut current selection to clipboard. - - @eturn sal_False if no selection or no view (the empty selection _is_ a selection) - */ - virtual sal_Bool Cut() = 0; - - /** Paste clipboard into current selection. - - @return sal_False if no view or no selection (the empty selection _is_ a selection) - */ - virtual sal_Bool Paste() = 0; - -}; - -#endif - diff --git a/svx/inc/svx/unofield.hxx b/svx/inc/svx/unofield.hxx deleted file mode 100644 index ad819e1b9dbe..000000000000 --- a/svx/inc/svx/unofield.hxx +++ /dev/null @@ -1,137 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: unofield.hxx,v $ - * $Revision: 1.3 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVX_UNOFIELD_HXX -#define _SVX_UNOFIELD_HXX - -#include <com/sun/star/lang/XUnoTunnel.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/beans/XPropertySetInfo.hpp> -#include <com/sun/star/text/XTextField.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <cppuhelper/component.hxx> -#include "svx/svxdllapi.h" - -#include <comphelper/servicehelper.hxx> - -#include <svx/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 - -class SvxUnoFieldData_Impl; -class SfxItemPropertySet; -class SvxFieldData; - -class SVX_DLLPUBLIC SvxUnoTextField : public SvxMutexHelper, - public ::cppu::OComponentHelper, - public ::com::sun::star::text::XTextField, - public ::com::sun::star::beans::XPropertySet, - public ::com::sun::star::lang::XServiceInfo, - public ::com::sun::star::lang::XUnoTunnel -{ -private: - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > mxAnchor; - const SfxItemPropertySet* mpPropSet; - sal_Int32 mnServiceId; - SvxUnoFieldData_Impl* mpImpl; - -protected: - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > maTypeSequence; - -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(); - - // Intern - virtual sal_Int32 GetFieldId( const SvxFieldData* pFieldData ) const throw(); - SvxFieldData* CreateFieldData() const throw(); - void SetAnchor( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > xAnchor ) { mxAnchor = xAnchor; } - - UNO3_GETIMPLEMENTATION_DECL( SvxUnoTextField ) - - // ::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); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); - - // ::com::sun::star::lang::XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); - - // XTextField - virtual ::rtl::OUString SAL_CALL getPresentation( sal_Bool bShowCommand ) throw(::com::sun::star::uno::RuntimeException); - - // XTextContent - virtual void SAL_CALL attach( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xTextRange ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor( ) throw(::com::sun::star::uno::RuntimeException); - - // ::com::sun::star::lang::XComponent - virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException); - - // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - - // OComponentHelper - virtual void SAL_CALL disposing(); - - // XServiceInfo - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); -}; - -#endif - diff --git a/svx/inc/svx/unofored.hxx b/svx/inc/svx/unofored.hxx deleted file mode 100644 index a9c72f766a35..000000000000 --- a/svx/inc/svx/unofored.hxx +++ /dev/null @@ -1,102 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: unofored.hxx,v $ - * $Revision: 1.6 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVX_UNOFORED_HXX -#define _SVX_UNOFORED_HXX - -#include <svx/editeng.hxx> -#include <svx/unoedsrc.hxx> -#include "svx/svxdllapi.h" - -// SvxEditEngineForwarder - SvxTextForwarder fuer EditEngine - -class SVX_DLLPUBLIC SvxEditEngineForwarder : public SvxTextForwarder -{ -private: - EditEngine& rEditEngine; - -public: - SvxEditEngineForwarder( EditEngine& rEngine ); - 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 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 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 BOOL IsValid() 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 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 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); -}; - -#endif - diff --git a/svx/inc/svx/unoforou.hxx b/svx/inc/svx/unoforou.hxx deleted file mode 100644 index 75adcc620a47..000000000000 --- a/svx/inc/svx/unoforou.hxx +++ /dev/null @@ -1,131 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: unoforou.hxx,v $ - * $Revision: 1.7 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVX_UNOFOROU_HXX -#define _SVX_UNOFOROU_HXX - -#include <svx/unoedsrc.hxx> -#include "svx/svxdllapi.h" - -#include <svx/editdata.hxx> - -class Outliner; -class SdrObject; - -// SvxOutlinerForwarder - SvxTextForwarder fuer Outliner - -class SVX_DLLPUBLIC SvxOutlinerForwarder : public SvxTextForwarder -{ -private: - Outliner& rOutliner; - SdrObject* pSdrObject; - - /** 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; - - /** this pointer may be null or point to an item set for the paragraph - mnParaAttribsCache */ - mutable SfxItemSet* mpParaAttribsCache; - - /** if we have a cached para attribute item set, this is the paragraph of it */ - mutable USHORT mnParaAttribsCache; - -public: - SvxOutlinerForwarder( Outliner& rOutl, SdrObject* pSdrObj = 0 ); - 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 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 SfxItemPool* GetPool() const; - - virtual XubString CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor ); - virtual BOOL IsValid() const; - - 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 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 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_Int16 GetNumberingStartValue( sal_uInt16 nPara ); - virtual void SetNumberingStartValue( sal_uInt16 nPara, sal_Int16 nNumberingStartValue ); - - 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(); - - 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); -}; - -#endif - diff --git a/svx/inc/svx/unoipset.hxx b/svx/inc/svx/unoipset.hxx deleted file mode 100644 index ffc9f834f7b4..000000000000 --- a/svx/inc/svx/unoipset.hxx +++ /dev/null @@ -1,80 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: unoipset.hxx,v $ - * $Revision: 1.3 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVX_UNOIPSET_HXX_ -#define _SVX_UNOIPSET_HXX_ - -#include <com/sun/star/beans/XPropertySetInfo.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include "svx/svxdllapi.h" -#include <svl/itemprop.hxx> - -class SvxIDPropertyCombineList; -class SdrItemPool; -class SfxItemSet; -class SvxShape; - -class SVX_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; - -public: - SvxItemPropertySet( const SfxItemPropertyMapEntry *pMap, sal_Bool bConvertTwips = sal_False ); - ~SvxItemPropertySet(); - - // Methoden, die direkt mit dem ItemSet arbeiten - ::com::sun::star::uno::Any getPropertyValue( const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet ) const; - void setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const ::com::sun::star::uno::Any& rVal, SfxItemSet& rSet ) const; - - // Methoden, die stattdessen Any benutzen - ::com::sun::star::uno::Any getPropertyValue( const SfxItemPropertySimpleEntry* pMap ) const; - void setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const ::com::sun::star::uno::Any& rVal ) const; - - // Properties von einem anderen Set uebernehmen - void ObtainSettingsFromPropertySet(const SvxItemPropertySet& rPropSet, SfxItemSet& rSet, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xSet )const; - sal_Bool AreThereOwnUsrAnys() const { return (pCombiList ? sal_True : sal_False); } - ::com::sun::star::uno::Any* GetUsrAnyForID(sal_uInt16 nWID) const; - void AddUsrAnyForID(const ::com::sun::star::uno::Any& rAny, sal_uInt16 nWID); - - com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > getPropertySetInfo() const; - const SfxItemPropertyMapEntry* getPropertyMapEntries() const {return _pMap;} - //void setPropertyMap( const SfxItemPropertyMapEntry *pMap ) { _pMap = pMap; } - const SfxItemPropertyMap* getPropertyMap()const { return &m_aPropertyMap;} - const SfxItemPropertySimpleEntry* getPropertyMapEntry(const ::rtl::OUString &rName) const; - - static com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > getPropertySetInfo( const SfxItemPropertyMapEntry* pMap ); -}; - -#endif // _SVX_UNOIPSET_HXX_ - diff --git a/svx/inc/svx/unomid.hxx b/svx/inc/svx/unomid.hxx index f4c44d228b04..283a38d15bbe 100644 --- a/svx/inc/svx/unomid.hxx +++ b/svx/inc/svx/unomid.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: unomid.hxx,v $ - * $Revision: 1.3.212.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -29,82 +26,6 @@ ************************************************************************/ #ifndef _SVX_UNOMID_HXX #define _SVX_UNOMID_HXX -//LRSpaceItem -#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_FIRST_LINE_REL_INDENT 9 -#define MID_FIRST_AUTO 10 -#define MID_TXT_LMARGIN 11 - -//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 - -//SvxBoolItem -#define MID_BOLD 0 -#define MID_WEIGHT 1 - -//SvxPostureItem -#define MID_ITALIC 0 -#define MID_POSTURE 1 - -//SvxFontHeightItem -#define MID_FONTHEIGHT 1 -#define MID_FONTHEIGHT_PROP 2 -#define MID_FONTHEIGHT_DIFF 3 - -//SvxFontWidthItem -#define MID_FONTWIDTH 0 -#define MID_FONTWIDTH_PROP 1 - -//SvxTextLineItem -#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_CROSS_OUT 1 - -//SvxExcapementItem -#define MID_ESC 0 -#define MID_ESC_HEIGHT 1 -#define MID_AUTO_ESC 2 - -//SvxLanguageItem -#define MID_LANGUAGE 0 -#define MID_COUNTRY 1 -#define MID_LANG_COUNTRY 2 - -//BrushItem -#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_TRANSPARENCY 8 -#define MID_BACK_COLOR_R_G_B 9 -#define MID_BACK_COLOR_TRANSPARENCY 10 - -//ProtectItem -#define MID_PROTECT_CONTENT 0 -#define MID_PROTECT_SIZE 1 -#define MID_PROTECT_POSITION 2 //AdjustItem #define MID_PARA_ADJUST 0 @@ -124,21 +45,6 @@ #define MID_MARGIN_UP_MARGIN 4 #define MID_MARGIN_LO_MARGIN 5 -//SvxBoxItem -#define LEFT_BORDER 1 -#define RIGHT_BORDER 2 -#define TOP_BORDER 3 -#define BOTTOM_BORDER 4 -#define BORDER_DISTANCE 5 -#define LEFT_BORDER_DISTANCE 6 -#define RIGHT_BORDER_DISTANCE 7 -#define TOP_BORDER_DISTANCE 8 -#define BOTTOM_BORDER_DISTANCE 9 -#define MID_LEFT_BORDER 10 -#define MID_RIGHT_BORDER 11 -#define MID_TOP_BORDER 12 -#define MID_BOTTOM_BORDER 13 - #define ALL_BORDER 10 #define ALL_BORDER_PADDING 11 #define LEFT_BORDER_PADDING 12 @@ -151,70 +57,13 @@ #define TOP_BORDER_LINE_WIDTH 19 #define BOTTOM_BORDER_LINE_WIDTH 20 -//SvxFontItem -// Don't use 0 as it used for the whole struct -#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 - -//SvxHyphenZoneItem -#define MID_IS_HYPHEN 0 -#define MID_HYPHEN_MIN_LEAD 1 -#define MID_HYPHEN_MIN_TRAIL 2 -#define MID_HYPHEN_MAX_HYPHENS 3 - -//SvxFmtBreakItem -#define MID_BREAK_BEFORE 0 -#define MID_BREAK_AFTER 1 - -//SvxCaseMapItem -#define MID_CASEMAP_VARIANT 0 -#define MID_CASEMAP_TRANS 1 - -//SvxLineSpaceItem -#define MID_LS_FIXED 0 -#define MID_LS_MINIMUM 1 -#define MID_LS_DISTANCE 2 - -//SvxLanguageItem -#define MID_LANG_INT 0 -#define MID_LANG_LOCALE 1 - -//NameOrIndex -#define MID_NAME 16 -#define MID_GRAFURL 32 - // XFillBitmapItem (is also a NameOrIndex) #define MID_BITMAP 8 -//SvxTwoLinesItem -#define MID_TWOLINES 0 -#define MID_START_BRACKET 1 -#define MID_END_BRACKET 2 - -//SvxEmphasisMarkItem -#define MID_EMPHASIS 0 - -//SvxCharRotateItem -#define MID_ROTATE 0 -#define MID_FITTOLINE 1 - -// SvxCharReliefItem -#define MID_RELIEF 0 - -// SvxTabStop -#define MID_TABSTOPS 0 -#define MID_STD_TAB 1 - // SvxHorJustifyItem #define MID_HORJUST_HORJUST 0 #define MID_HORJUST_ADJUST 1 -// SvxPageModelItem -#define MID_AUTO 1 - // SvxZoomItem #define MID_VALUE 2 @@ -225,11 +74,6 @@ #define MID_END_Y 4 #define MID_LIMIT 5 -// SvxBoxInfoItem -#define MID_HORIZONTAL 1 -#define MID_VERTICAL 2 -#define MID_VALIDFLAGS 4 - // SvxColumnItem #define MID_COLUMNARRAY 7 #define MID_ACTUAL 4 @@ -269,4 +113,5 @@ #define MID_LINEDASH_DISTANCE 7 #define MID_LEFT 3 + #endif diff --git a/svx/inc/svx/unomod.hxx b/svx/inc/svx/unomod.hxx index e4f9e33d4c5f..9b55428aa76f 100644 --- a/svx/inc/svx/unomod.hxx +++ b/svx/inc/svx/unomod.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: unomod.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -33,10 +30,14 @@ #include <com/sun/star/document/EventObject.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/container/XIndexReplace.hpp> #include "svx/svxdllapi.h" class SdrHint; class SdrModel; +class SdrModel; + +SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > SvxCreateNumRule( SdrModel* pModel ) throw(); class SVX_DLLPUBLIC SvxUnoDrawMSFactory : public ::com::sun::star::lang::XMultiServiceFactory { diff --git a/svx/inc/svx/unomodel.hxx b/svx/inc/svx/unomodel.hxx index 70e27f06ac43..dd60be206c2e 100644 --- a/svx/inc/svx/unomodel.hxx +++ b/svx/inc/svx/unomodel.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: unomodel.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/unopage.hxx b/svx/inc/svx/unopage.hxx index 83671f2934f8..5c227112342b 100644 --- a/svx/inc/svx/unopage.hxx +++ b/svx/inc/svx/unopage.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: unopage.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -45,7 +42,7 @@ #include <cppuhelper/weak.hxx> #include <cppuhelper/weakagg.hxx> #include <svl/lstner.hxx> -#include <svx/mutxhelp.hxx> +#include <editeng/mutxhelp.hxx> #include "svx/svxdllapi.h" #include <cppuhelper/implbase5.hxx> diff --git a/svx/inc/svx/unoprnms.hxx b/svx/inc/svx/unoprnms.hxx deleted file mode 100644 index 7f28e5677043..000000000000 --- a/svx/inc/svx/unoprnms.hxx +++ /dev/null @@ -1,379 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: unoprnms.hxx,v $ - * $Revision: 1.4.148.1 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#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_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_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" - -// #i68101# -#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_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" - -// #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_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_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" - -// #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_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_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_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_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" - -// 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" -// Ende der veralteten Properties - -#endif - - diff --git a/svx/inc/svx/unoprov.hxx b/svx/inc/svx/unoprov.hxx index 3c7f87f58fbd..34cb60371582 100644 --- a/svx/inc/svx/unoprov.hxx +++ b/svx/inc/svx/unoprov.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: unoprov.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -32,12 +29,13 @@ #define SVX_UNOPROV_HXX #include <com/sun/star/lang/XServiceInfo.hpp> -#include <svx/svdpool.hxx> #include <svl/itemprop.hxx> #include <tools/list.hxx> #include "svx/svxdllapi.h" class SvxItemPropertySet; +class SfxItemPool; + /*********************************************************************** * class UHashMap * ***********************************************************************/ @@ -110,7 +108,7 @@ public: SvxUnoPropertyMapProvider(); ~SvxUnoPropertyMapProvider(); const SfxItemPropertyMapEntry* GetMap(UINT16 nPropertyId); - const SvxItemPropertySet* GetPropertySet(UINT16 nPropertyId); + const SvxItemPropertySet* GetPropertySet(UINT16 nPropertyId, SfxItemPool& rPool); }; /*********************************************************************** @@ -124,34 +122,9 @@ extern SvxUnoPropertyMapProvider aSvxMapProvider; extern UHashMapEntry pSdrShapeIdentifierMap[]; extern UHashMap aSdrShapeIdentifierMap; -#define SFX_METRIC_ITEM (0x40) #define E3D_INVENTOR_FLAG (0x80000000) -#include <svx/unoipset.hxx> - -/*********************************************************************** -* class SvxServiceInfoHelper * -***********************************************************************/ - -/** this class provides a basic helper for classes suporting the XServiceInfo Interface. - * - * you can overload the <code>getSupprotedServiceNames</code> to implement a XServiceInfo. - * you can use the static helper methods to combine your services with that of parent - * or aggregatet classes. - */ -class SVX_DLLPUBLIC SvxServiceInfoHelper : public ::com::sun::star::lang::XServiceInfo -{ -public: - // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); - - // helper - static ::com::sun::star::uno::Sequence< ::rtl::OUString > concatSequences( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rSeq1, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rSeq2 ) throw(); - static void addToSequence( ::com::sun::star::uno::Sequence< ::rtl::OUString >& rSeq,UINT16 nServices, /* sal_Char* */... ) throw(); - static sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& SupportedServices ) throw(); -}; +#include <editeng/unoipset.hxx> /*********************************************************************** * class SvxPropertySetInfoPool * diff --git a/svx/inc/svx/unoshape.hxx b/svx/inc/svx/unoshape.hxx index ec81d8beaa1c..6b749c05be61 100644 --- a/svx/inc/svx/unoshape.hxx +++ b/svx/inc/svx/unoshape.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: unoshape.hxx,v $ - * $Revision: 1.9 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -50,13 +47,14 @@ #include <tools/gen.hxx> #include <tools/weakbase.hxx> #include <svl/lstner.hxx> -#include <svx/unoipset.hxx> +#include <editeng/unoipset.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/weakagg.hxx> #include <cppuhelper/interfacecontainer.h> #include <osl/mutex.hxx> #include "svx/svxdllapi.h" #include <rtl/ref.hxx> +#include <com/sun/star/uno/Any.hxx> #include <svx/svdouno.hxx> @@ -86,6 +84,15 @@ protected: struct SvxShapeImpl; class SvxShapeMaster; +class SvxItemPropertySet; +class SvxItemPropertySimpleEntry; +class SfxItemSet; + +void SVX_DLLPUBLIC SvxItemPropertySet_setPropertyValue( const SvxItemPropertySet& rPropSet, const SfxItemPropertySimpleEntry* pMap, + const com::sun::star::uno::Any& rVal, SfxItemSet& rSet ); + +com::sun::star::uno::Any SVX_DLLPUBLIC SvxItemPropertySet_getPropertyValue( const SvxItemPropertySet& rPropSet, const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet ); + // WARNING: if you update the supported interfaces, // also update SvxShape::_getTypes() @@ -324,7 +331,7 @@ private: SVX_DLLPRIVATE void impl_construct(); }; -#include <svx/unotext.hxx> +#include <editeng/unotext.hxx> class SVX_DLLPUBLIC SvxShapeText : public SvxShape, public SvxUnoTextBase { diff --git a/svx/inc/svx/unoshprp.hxx b/svx/inc/svx/unoshprp.hxx index e23b24a21957..27196079db07 100644..100755 --- a/svx/inc/svx/unoshprp.hxx +++ b/svx/inc/svx/unoshprp.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: unoshprp.hxx,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -40,9 +37,7 @@ #include <com/sun/star/drawing/Hatch.hpp> #include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/drawing/LineDash.hpp> -#ifndef _COM_SUN_STAR_DRAWING_LINEJOINT_Hpp_ #include <com/sun/star/drawing/LineJoint.hpp> -#endif #include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/awt/Rectangle.hpp> @@ -79,9 +74,9 @@ #define _SVX_USE_UNOGLOBALS_ #include <svx/unoprov.hxx> -#include <svx/unoprnms.hxx> +#include <editeng/unoprnms.hxx> #include <svx/unomid.hxx> -#include <svx/unotext.hxx> +#include <editeng/unotext.hxx> #include <svl/itemprop.hxx> #include <svx/svxids.hrc> @@ -94,7 +89,6 @@ #endif #endif -#define OWN_ATTR_VALUE_START (3900) #define OWN_ATTR_VALUE_START_TEXT (OWN_ATTR_VALUE_START+0) // the next 10 entries are reserved for text #define OWN_ATTR_VALUE_POLYGONKIND (OWN_ATTR_VALUE_START+10) #define OWN_ATTR_VALUE_POLYPOLYGON (OWN_ATTR_VALUE_START+11) @@ -192,9 +186,7 @@ #define OWN_ATTR_STYLE (OWN_ATTR_VALUE_START+87) -#define OWN_ATTR_EDGE_POLYPOLYGONBEZIER (OWN_ATTR_VALUE_START+88) - -#define OWN_ATTR_VALUE_END OWN_ATTR_EDGE_POLYPOLYGONBEZIER // WARNING: ee items start at 3991! +#define OWN_ATTR_EDGE_POLYPOLYGONBEZIER (OWN_ATTR_VALUE_START+88) // maximum is OWN_ATTR_VALUE_START+88, see svl/inc/svl/solar.hrc // #FontWork# #define FONTWORK_PROPERTIES \ diff --git a/svx/inc/svx/unoshtxt.hxx b/svx/inc/svx/unoshtxt.hxx index 6027191d222e..c06d3955b442 100644 --- a/svx/inc/svx/unoshtxt.hxx +++ b/svx/inc/svx/unoshtxt.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: unoshtxt.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -32,7 +29,7 @@ #define SVX_UNOSHTXT_HXX #include <memory> -#include <svx/unoedsrc.hxx> +#include <editeng/unoedsrc.hxx> #include "svx/svxdllapi.h" namespace com { namespace sun { namespace star { diff --git a/svx/inc/svx/unotext.hxx b/svx/inc/svx/unotext.hxx deleted file mode 100644 index 46e26dbbc0a8..000000000000 --- a/svx/inc/svx/unotext.hxx +++ /dev/null @@ -1,683 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: unotext.hxx,v $ - * $Revision: 1.6.84.1 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVX_UNOTEXT_HXX -#define _SVX_UNOTEXT_HXX - -#include <tools/link.hxx> -#include <com/sun/star/container/XNameContainer.hpp> -#include <com/sun/star/text/XTextRange.hpp> -#include <com/sun/star/text/XText.hpp> -#ifndef _SMART_COM_SUN_STAR_CONTAINER_XENUMERATIONACCESS -#include <com/sun/star/container/XEnumerationAccess.hpp> -#endif -#include <com/sun/star/text/XTextRangeMover.hpp> -#include <com/sun/star/text/XTextCursor.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/beans/XPropertyState.hpp> -#include <com/sun/star/beans/XMultiPropertySet.hpp> -#include <com/sun/star/text/XTextRangeCompare.hpp> -#include <com/sun/star/beans/XMultiPropertyStates.hpp> -#include <com/sun/star/text/XTextAppend.hpp> -#include <com/sun/star/text/XTextCopy.hpp> -#include <cppuhelper/weak.hxx> -#include <cppuhelper/weakagg.hxx> -#include <svl/itemprop.hxx> -#include <svx/editdata.hxx> -#include <svx/unoedsrc.hxx> -#include <svl/itemset.hxx> -#include <svl/itempool.hxx> -#include <svx/svxenum.hxx> -#include <svx/outliner.hxx> -#include <svx/unoforou.hxx> - -#include <svx/unoprnms.hxx> -#include <svx/eeitem.hxx> -#include <com/sun/star/text/XTextField.hpp> -#include <com/sun/star/container/XIndexReplace.hpp> -#include <com/sun/star/awt/FontSlant.hpp> -#include <com/sun/star/awt/FontDescriptor.hpp> -#include <com/sun/star/style/LineSpacing.hpp> -#include <com/sun/star/style/TabStop.hpp> -#include <com/sun/star/lang/XUnoTunnel.hpp> -#include <com/sun/star/text/XTextRange.hpp> -#include <cppuhelper/interfacecontainer.h> -#include <osl/mutex.hxx> -#include "svx/svxdllapi.h" - -#include <comphelper/servicehelper.hxx> - -#ifndef SEQTYPE - #if defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500) - #define SEQTYPE(x) (new ::com::sun::star::uno::Type( x )) - #else - #define SEQTYPE(x) &(x) - #endif -#endif - -#include <svx/unoprov.hxx> -#include <svx/unomid.hxx> - -#define WID_FONTDESC 3900 -#define WID_NUMLEVEL 3901 -#define WID_PORTIONTYPE 3903 -#define WID_NUMBERINGSTARTVALUE 3904 -#define WID_PARAISNUMBERINGRESTART 3905 - -#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 } - -#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("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 } - -#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 } - -#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 } - -class SvxEditSource; -class SvxTextForwarder; -class SvxFieldItem; -class SvxTextEditSource; -class SvxFieldData; -struct ESelection; - -SVX_DLLPUBLIC void GetSelection( struct ESelection& rSel, SvxTextForwarder* pForwarder ) throw(); -SVX_DLLPUBLIC void CheckSelection( struct ESelection& rSel, SvxTextForwarder* pForwarder ) throw(); - -// ==================================================================== -// Diese Klasse implementiert eine SvxEditSource und einen SvxTextForwarder -// und macht ansonsten rein garnichts -// ==================================================================== - -class SvxDummyTextSource : public SvxEditSource, public SvxTextForwarder -{ -public: - - // SvxEditSource - virtual ~SvxDummyTextSource(); - 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 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 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 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 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); -}; - -namespace accessibility -{ - class AccessibleEditableTextPara; -} - -// ==================================================================== -class SVX_DLLPUBLIC SvxUnoTextRangeBase : public ::com::sun::star::text::XTextRange, - public ::com::sun::star::beans::XPropertySet, - public ::com::sun::star::beans::XMultiPropertySet, - public ::com::sun::star::beans::XMultiPropertyStates, - public ::com::sun::star::beans::XPropertyState, - public ::com::sun::star::lang::XServiceInfo, - public ::com::sun::star::text::XTextRangeCompare, - public ::com::sun::star::lang::XUnoTunnel - -{ - friend class SvxUnoTextRangeEnumeration; - friend class accessibility::AccessibleEditableTextPara; - -protected: - 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); - virtual ::com::sun::star::uno::Any SAL_CALL _getPropertyValue( const ::rtl::OUString& PropertyName, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - - virtual void SAL_CALL _setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues, sal_Int32 nPara = -1 ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL _getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, sal_Int32 nPara = -1 ) throw (::com::sun::star::uno::RuntimeException); - - virtual ::com::sun::star::beans::PropertyState SAL_CALL _getPropertyState( const SfxItemPropertySimpleEntry* pMap, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::beans::PropertyState SAL_CALL _getPropertyState( const ::rtl::OUString& PropertyName, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL _getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - // returns true if property found or false if unknown property - virtual sal_Bool _getOnePropertyStates(const SfxItemSet* pSet, const SfxItemPropertySimpleEntry* pMap, ::com::sun::star::beans::PropertyState& rState); - - virtual void SAL_CALL _setPropertyToDefault( const ::rtl::OUString& PropertyName, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void _setPropertyToDefault( SvxTextForwarder* pForwarder, const SfxItemPropertySimpleEntry* pMap, sal_Int32 nPara ) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException ); - void SetEditSource( SvxEditSource* _pEditSource ) throw(); - - virtual void getPropertyValue( const SfxItemPropertySimpleEntry* pMap, com::sun::star::uno::Any& rAny, const SfxItemSet& rSet ) throw(::com::sun::star::beans::UnknownPropertyException ); - virtual void setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const com::sun::star::uno::Any& rValue, const ESelection& rSelection, const SfxItemSet& rOldSet, SfxItemSet& rNewSet ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::IllegalArgumentException ); - -public: - SvxUnoTextRangeBase( const SvxItemPropertySet* _pSet ) throw(); - SvxUnoTextRangeBase( const SvxEditSource* pSource, const SvxItemPropertySet* _pSet ) throw(); - SvxUnoTextRangeBase( const SvxUnoTextRangeBase& rRange ) throw(); - virtual ~SvxUnoTextRangeBase() throw(); - - // Internal - 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(); - - //const SfxItemPropertyMapEntry* getPropertyMapEntries() const throw() { return maPropSet.getPropertyMapEntries(); } - const SvxItemPropertySet* getPropertySet() const throw() { return mpPropSet; } - 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, SvxTextEditSource* 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, SvxTextEditSource* pEditSource = NULL ) throw( ::com::sun::star::uno::RuntimeException ); - - void attachField( const SvxFieldData* pData ) throw(); - - UNO3_GETIMPLEMENTATION_DECL( SvxUnoTextRangeBase ) - - // ::com::sun::star::text::XTextRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( const ::rtl::OUString& aString ) throw(::com::sun::star::uno::RuntimeException); - - // ::com::sun::star::beans::XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - - // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - - // ::com::sun::star::beans::XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - - // ::com::sun::star::beans::XMultiPropertyStates - //virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - - // XTextRangeCompare - virtual ::sal_Int16 SAL_CALL compareRegionStarts( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xR1, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xR2 ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Int16 SAL_CALL compareRegionEnds( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xR1, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xR2 ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - - // ::com::sun::star::lang::XServiceInfo - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static( ) SAL_THROW(()); -}; - -// ==================================================================== - -class SvxUnoTextBase; -class SVX_DLLPUBLIC SvxUnoTextRange : public SvxUnoTextRangeBase, - public ::com::sun::star::lang::XTypeProvider, - public ::cppu::OWeakAggObject -{ - friend class SvxUnoTextRangeEnumeration; -private: - ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > xParentText; - sal_Bool mbPortion; - -protected: - static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > maTypeSequence; - -public: - SvxUnoTextRange( const SvxUnoTextBase& rParent, sal_Bool bPortion = sal_False ) throw(); - virtual ~SvxUnoTextRange() 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); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); - - // ::com::sun::star::text::XTextRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText() throw(::com::sun::star::uno::RuntimeException); - - // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - - // ::com::sun::star::lang::XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); -}; - -class SVX_DLLPUBLIC SvxUnoTextBase : public SvxUnoTextRangeBase, - public ::com::sun::star::text::XTextAppend, - public ::com::sun::star::text::XTextCopy, - public ::com::sun::star::container::XEnumerationAccess, - public ::com::sun::star::text::XTextRangeMover, - public ::com::sun::star::lang::XTypeProvider -{ -protected: - ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > xParentText; - static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > maTypeSequence; - -public: - SvxUnoTextBase( ) throw(); - SvxUnoTextBase( const SvxItemPropertySet* _pSet ) throw(); - SvxUnoTextBase( const SvxEditSource* pSource, const SvxItemPropertySet* _pSet ) throw(); - SvxUnoTextBase( const SvxEditSource* pSource, const SvxItemPropertySet* _pSet, ::com::sun::star::uno::Reference < ::com::sun::star::text::XText > xParent ) throw(); - SvxUnoTextBase( const SvxUnoTextBase& rText ) throw(); - virtual ~SvxUnoTextBase() throw(); - - UNO3_GETIMPLEMENTATION_DECL( SvxUnoTextBase ) - - ESelection InsertField( const SvxFieldItem& rField ) throw(); - static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getStaticTypes() throw(); - - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > createTextCursorBySelection( const ESelection& rSel ); - - // ::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); - - // ::com::sun::star::text::XSimpleText - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursorByRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& aTextPosition ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, const ::rtl::OUString& aString, sal_Bool bAbsorb ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - - // ::com::sun::star::text::XText - virtual void SAL_CALL insertTextContent( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >& xContent, sal_Bool bAbsorb ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeTextContent( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >& xContent ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( const ::rtl::OUString& aString ) throw(::com::sun::star::uno::RuntimeException); - - // ::com::sun::star::text::XTextRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw(::com::sun::star::uno::RuntimeException); - - // ::com::sun::star::container::XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration( ) throw(::com::sun::star::uno::RuntimeException); - - // ::com::sun::star::container::XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException); - - // ::com::sun::star::text::XTextRangeMover - virtual void SAL_CALL moveTextRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, sal_Int16 nParagraphs ) throw(::com::sun::star::uno::RuntimeException); - - // com::sun::star::text::XParagraphAppend (new import API) - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL appendParagraph( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& CharacterAndParagraphProperties ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL finishParagraph( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& CharacterAndParagraphProperties ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - - // com::sun::star::text::XTextPortionAppend (new import API) - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL appendTextPortion( const ::rtl::OUString& Text, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& CharacterAndParagraphProperties ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - - // 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); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static( ) SAL_THROW(()); - - // ::com::sun::star::lang::XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); -}; - -// ==================================================================== -class SVX_DLLPUBLIC SvxUnoText : public SvxUnoTextBase, - public ::cppu::OWeakAggObject -{ -public: - SvxUnoText( ) throw(); - SvxUnoText( const SvxItemPropertySet* _pSet ) throw(); - SvxUnoText( const SvxEditSource* pSource, const SvxItemPropertySet* _pSet, ::com::sun::star::uno::Reference < ::com::sun::star::text::XText > xParent ) throw(); - SvxUnoText( const SvxUnoText& rText ) throw(); - virtual ~SvxUnoText() throw(); - - // Internal - UNO3_GETIMPLEMENTATION_DECL( SvxUnoText ) - - // ::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); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); - - // ::com::sun::star::lang::XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); -}; - -// ==================================================================== - -#include <cppuhelper/implbase1.hxx> - -class SvxUnoTextContentEnumeration : public ::cppu::WeakAggImplHelper1< ::com::sun::star::container::XEnumeration > -{ -private: - ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > mxParentText; - SvxEditSource* mpEditSource; - sal_uInt16 mnNextParagraph; - const SvxUnoTextBase& mrText; - -public: - SvxUnoTextContentEnumeration( const SvxUnoTextBase& _rText ) throw(); - virtual ~SvxUnoTextContentEnumeration() throw(); - - // ::com::sun::star::container::XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL nextElement( ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); -}; - -// ==================================================================== -#include <com/sun/star/text/XTextContent.hpp> - -class SvUShorts; -class SvxUnoTextContent : public SvxUnoTextRangeBase, - public ::com::sun::star::text::XTextContent, - public ::com::sun::star::container::XEnumerationAccess, - public ::com::sun::star::lang::XTypeProvider, - public ::cppu::OWeakAggObject -{ - friend class SvxUnoTextContentEnumeration; -private: - ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > mxParentText; - sal_uInt16 mnParagraph; - const SvxUnoTextBase& mrParentText; - - // for xComponent - ::osl::Mutex maDisposeContainerMutex; - ::cppu::OInterfaceContainerHelper maDisposeListeners; - bool mbDisposing; - -protected: - static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > maTypeSequence; - - using SvxUnoTextRangeBase::setPropertyValue; - using SvxUnoTextRangeBase::getPropertyValue; - -public: - SvxUnoTextContent() throw(); - SvxUnoTextContent( const SvxUnoTextBase& rText, sal_uInt16 nPara ) throw(); - SvxUnoTextContent( const SvxUnoTextContent& rContent ) 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); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); - - // ::com::sun::star::text::XTextRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText( ) throw(::com::sun::star::uno::RuntimeException); - - // ::com::sun::star::text::XTextContent -> ::com::sun::star::lang::XComponent - virtual void SAL_CALL attach( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xTextRange ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor( ) throw(::com::sun::star::uno::RuntimeException); - - // ::com::sun::star::lang::XComponent - virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException); - - // ::com::sun::star::container::XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration( ) throw(::com::sun::star::uno::RuntimeException); - - // ::com::sun::star::container::XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); - - // ::com::sun::star::beans::XPropertySet - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - - // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); - - // ::com::sun::star::beans::XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::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); - - // ::com::sun::star::lang::XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); -}; - -// ==================================================================== - -class SvxUnoTextRangeEnumeration : public ::cppu::WeakAggImplHelper1< ::com::sun::star::container::XEnumeration > -{ -private: - SvxEditSource* mpEditSource; - ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > mxParentText; - const SvxUnoTextBase& mrParentText; - sal_uInt16 mnParagraph; - SvUShorts* mpPortions; - sal_uInt16 mnNextPortion; - -public: - SvxUnoTextRangeEnumeration( const SvxUnoTextBase& rText, sal_uInt16 nPara ) throw(); - virtual ~SvxUnoTextRangeEnumeration() throw(); - - // ::com::sun::star::container::XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL nextElement( ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); -}; - -// ==================================================================== - -class SVX_DLLPUBLIC SvxUnoTextCursor : public SvxUnoTextRangeBase, - public ::com::sun::star::text::XTextCursor, - public ::com::sun::star::lang::XTypeProvider, - public ::cppu::OWeakAggObject -{ -private: - ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > mxParentText; - -protected: - static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > maTypeSequence; - -public: - SvxUnoTextCursor( const SvxUnoTextBase& rText ) throw(); - SvxUnoTextCursor( const SvxUnoTextCursor& rCursor ) throw(); - virtual ~SvxUnoTextCursor() 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); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); - - // ::com::sun::star::text::XTextRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText() throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( const ::rtl::OUString& aString ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw(::com::sun::star::uno::RuntimeException); - - // ::com::sun::star::text::XTextCursor -> ::com::sun::star::text::XTextRange - virtual void SAL_CALL collapseToStart( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL collapseToEnd( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isCollapsed( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL goLeft( sal_Int16 nCount, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL goRight( sal_Int16 nCount, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL gotoStart( sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL gotoEnd( sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL gotoRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException); - - // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); - - // ::com::sun::star::lang::XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); - -}; - -SVX_DLLPUBLIC const SvxItemPropertySet* ImplGetSvxUnoOutlinerTextCursorSvxPropertySet(); -SVX_DLLPUBLIC const SfxItemPropertyMapEntry* ImplGetSvxUnoOutlinerTextCursorPropertyMap(); -SVX_DLLPUBLIC const SvxItemPropertySet* ImplGetSvxTextPortionSvxPropertySet(); -SVX_DLLPUBLIC const SfxItemPropertyMapEntry* ImplGetSvxTextPortionPropertyMap(); - -#endif diff --git a/svx/inc/svx/unoviwed.hxx b/svx/inc/svx/unoviwed.hxx deleted file mode 100644 index 03878243d841..000000000000 --- a/svx/inc/svx/unoviwed.hxx +++ /dev/null @@ -1,65 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: unoviwed.hxx,v $ - * $Revision: 1.3 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVX_UNOVIWED_HXX -#define _SVX_UNOVIWED_HXX - -#include <svx/unoedsrc.hxx> - -#include <svx/editdata.hxx> - -class EditView; - -/// Specialization for Calc -class SvxEditEngineViewForwarder : public SvxEditViewForwarder -{ -private: - EditView& mrView; - -public: - SvxEditEngineViewForwarder( EditView& rView ); - virtual ~SvxEditEngineViewForwarder(); - - 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 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(); - -}; - -#endif - diff --git a/svx/inc/svx/unoviwou.hxx b/svx/inc/svx/unoviwou.hxx deleted file mode 100644 index b2949f05f9d7..000000000000 --- a/svx/inc/svx/unoviwou.hxx +++ /dev/null @@ -1,71 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: unoviwou.hxx,v $ - * $Revision: 1.3 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVX_UNOVIWOU_HXX -#define _SVX_UNOVIWOU_HXX - -#include <svx/unoedsrc.hxx> -#include "svx/svxdllapi.h" - -class OutlinerView; - -/// Specialization for Draw/Impress -class SVX_DLLPUBLIC SvxDrawOutlinerViewForwarder : public SvxEditViewForwarder -{ -private: - OutlinerView& mrOutlinerView; - Point maTextShapeTopLeft; - - SVX_DLLPRIVATE Point GetTextOffset() const; - -public: - explicit SvxDrawOutlinerViewForwarder( OutlinerView& rOutl ); - SvxDrawOutlinerViewForwarder( OutlinerView& rOutl, const Point& rShapePosTopLeft ); - virtual ~SvxDrawOutlinerViewForwarder(); - - 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 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 - /// allow EditEngine offset calculations - void SetShapePos( const Point& rShapePosTopLeft ); -}; - -#endif - diff --git a/svx/inc/svx/view3d.hxx b/svx/inc/svx/view3d.hxx index b6b25e923300..ec17badd0052 100644 --- a/svx/inc/svx/view3d.hxx +++ b/svx/inc/svx/view3d.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: view3d.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/viewlayoutitem.hxx b/svx/inc/svx/viewlayoutitem.hxx index a58e83c1a38b..fe79fc2641e0 100644 --- a/svx/inc/svx/viewlayoutitem.hxx +++ b/svx/inc/svx/viewlayoutitem.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: viewlayoutitem.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/viewpt3d.hxx b/svx/inc/svx/viewpt3d.hxx index bd6f2f5310ef..a26f559b23b2 100644 --- a/svx/inc/svx/viewpt3d.hxx +++ b/svx/inc/svx/viewpt3d.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: viewpt3d.hxx,v $ - * $Revision: 1.3.226.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/volume3d.hxx b/svx/inc/svx/volume3d.hxx index 6fa2ee7211e5..42e90a9955a6 100644 --- a/svx/inc/svx/volume3d.hxx +++ b/svx/inc/svx/volume3d.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: volume3d.hxx,v $ - * $Revision: 1.3.226.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/wghtitem.hxx b/svx/inc/svx/wghtitem.hxx deleted file mode 100644 index 2a63885e3e42..000000000000 --- a/svx/inc/svx/wghtitem.hxx +++ /dev/null @@ -1,95 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: wghtitem.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_WGHTITEM_HXX -#define _SVX_WGHTITEM_HXX - -// include --------------------------------------------------------------- - -#include <vcl/vclenum.hxx> -#include <svl/eitem.hxx> -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#include "svx/svxdllapi.h" - -class SvXMLUnitConverter; -namespace rtl -{ - class OUString; -} - -// class SvxWeightItem --------------------------------------------------- - -/* [Beschreibung] - - Dieses Item beschreibt die Font-Staerke. -*/ - -class SVX_DLLPUBLIC SvxWeightItem : public SfxEnumItem -{ -public: - TYPEINFO(); - - SvxWeightItem( const FontWeight eWght /*= WEIGHT_NORMAL*/, - const USHORT nId ); - - // "pure virtual Methoden" vom SfxPoolItem + SfxEnumItem - 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 String GetValueTextByPos( USHORT nPos ) const; - virtual USHORT GetValueCount() const; - - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_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 ); - - inline SvxWeightItem& operator=(const SvxWeightItem& rWeight) { - SetValue( rWeight.GetValue() ); - return *this; - } - - // enum cast - FontWeight GetWeight() const - { return (FontWeight)GetValue(); } - void SetWeight( FontWeight eNew ) - { SetValue( (USHORT)eNew ); } -}; - -#endif // #ifndef _SVX_WGHTITEM_HXX - diff --git a/svx/inc/svx/widwitem.hxx b/svx/inc/svx/widwitem.hxx deleted file mode 100644 index 682e3bea5c39..000000000000 --- a/svx/inc/svx/widwitem.hxx +++ /dev/null @@ -1,81 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: widwitem.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_WIDWITEM_HXX -#define _SVX_WIDWITEM_HXX - -// include --------------------------------------------------------------- - -#include <svl/intitem.hxx> - -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#include "svx/svxdllapi.h" - -class SvXMLUnitConverter; -namespace rtl -{ - class OUString; -} - -// class SvxWidowsItem --------------------------------------------------- - -/* -[Beschreibung] -Dieses Item beschreibt die Anzahl der Zeilen fuer die Hurenkinderregelung. -*/ - -class SVX_DLLPUBLIC SvxWidowsItem: public SfxByteItem -{ - friend SvStream & operator<<( SvStream & aS, SvxWidowsItem & ); -public: - TYPEINFO(); - - SvxWidowsItem( const BYTE nL /*= 0*/, const USHORT nId ); - - // "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, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; - - inline SvxWidowsItem& operator=( const SvxWidowsItem& rWidows ) - { - SetValue( rWidows.GetValue() ); - return *this; - } -}; - -#endif - diff --git a/svx/inc/svx/writingmodeitem.hxx b/svx/inc/svx/writingmodeitem.hxx deleted file mode 100644 index 0e481479a611..000000000000 --- a/svx/inc/svx/writingmodeitem.hxx +++ /dev/null @@ -1,72 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: writingmodeitem.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_WRITINGMODEITEM_HXX -#define _SVX_WRITINGMODEITEM_HXX - -// include --------------------------------------------------------------- - -#include <com/sun/star/text/WritingMode.hpp> -#include <svl/intitem.hxx> -#include <svx/svddef.hxx> -#include "svx/svxdllapi.h" - -// class SvxWritingModeItem ---------------------------------------------- - -class SVX_DLLPUBLIC SvxWritingModeItem : public SfxUInt16Item -{ -public: - TYPEINFO(); - - SvxWritingModeItem( ::com::sun::star::text::WritingMode eValue /*= com::sun::star::text::WritingMode_LR_TB*/, - USHORT nWhich /*= SDRATTR_TEXTDIRECTION*/ ); - virtual ~SvxWritingModeItem(); - - 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 SfxItemPresentation GetPresentation( SfxItemPresentation ePres, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - String &rText, - const IntlWrapper * = 0 ) const; - - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, - BYTE nMemberId ); - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, - BYTE nMemberId ) const; -}; - -#endif // #ifndef _SVX_WRITINGMODEITEM_HXX - diff --git a/svx/inc/svx/wrlmitem.hxx b/svx/inc/svx/wrlmitem.hxx deleted file mode 100644 index aa5116125d28..000000000000 --- a/svx/inc/svx/wrlmitem.hxx +++ /dev/null @@ -1,81 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: wrlmitem.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_WRLMITEM_HXX -#define _SVX_WRLMITEM_HXX - -// include --------------------------------------------------------------- - -#include <svl/eitem.hxx> -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif -#include "svx/svxdllapi.h" - -class SvXMLUnitConverter; -namespace rtl -{ - class OUString; -} - -// class SvxWordLineModeItem --------------------------------------------- - -/* [Beschreibung] - - Dieses Item beschreibt, ob Unterstrichen und Durchgestrichen auf - Wortgrenzen beschraenkt ist. -*/ - -class SVX_DLLPUBLIC SvxWordLineModeItem : public SfxBoolItem -{ -public: - TYPEINFO(); - - SvxWordLineModeItem( const BOOL bWordLineMode /*= FALSE*/, - const USHORT nId ); - - // "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, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, - String &rText, const IntlWrapper * = 0 ) const; - - inline SvxWordLineModeItem& operator=( const SvxWordLineModeItem& rWLM ) - { - SetValue( rWLM.GetValue() ); - return *this; - } -}; - -#endif - diff --git a/svx/inc/svx/xbitmap.hxx b/svx/inc/svx/xbitmap.hxx index 4e0f16d21b20..f3b2d98c138d 100644 --- a/svx/inc/svx/xbitmap.hxx +++ b/svx/inc/svx/xbitmap.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xbitmap.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -35,7 +32,7 @@ #ifndef _BITMAP_HXX //autogen #include <vcl/bitmap.hxx> #endif -#include <goodies/grfmgr.hxx> +#include <svtools/grfmgr.hxx> #include <svx/xenum.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/xbtmpit.hxx b/svx/inc/svx/xbtmpit.hxx index 8249486263f9..5b0a214b67ed 100644 --- a/svx/inc/svx/xbtmpit.hxx +++ b/svx/inc/svx/xbtmpit.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xbtmpit.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xcolit.hxx b/svx/inc/svx/xcolit.hxx index e8d041079652..d1827a37ad8c 100644 --- a/svx/inc/svx/xcolit.hxx +++ b/svx/inc/svx/xcolit.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xcolit.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xdash.hxx b/svx/inc/svx/xdash.hxx index 0530b5934bf9..3005c2a1b752 100644 --- a/svx/inc/svx/xdash.hxx +++ b/svx/inc/svx/xdash.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xdash.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xdef.hxx b/svx/inc/svx/xdef.hxx index a195d9012c10..963e4935c617 100644 --- a/svx/inc/svx/xdef.hxx +++ b/svx/inc/svx/xdef.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xdef.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xenum.hxx b/svx/inc/svx/xenum.hxx index d0f82fd7ac52..e5b5d8adc5a8 100644 --- a/svx/inc/svx/xenum.hxx +++ b/svx/inc/svx/xenum.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xenum.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xfillit.hxx b/svx/inc/svx/xfillit.hxx index 6ac90e8a8a93..7556140bbbf6 100644 --- a/svx/inc/svx/xfillit.hxx +++ b/svx/inc/svx/xfillit.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xfillit.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xfillit0.hxx b/svx/inc/svx/xfillit0.hxx index 4fbc0686a5ba..40ddb71dd717 100644 --- a/svx/inc/svx/xfillit0.hxx +++ b/svx/inc/svx/xfillit0.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xfillit0.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xflasit.hxx b/svx/inc/svx/xflasit.hxx index f5ca7bc9efff..2c3df96a8ec2 100644 --- a/svx/inc/svx/xflasit.hxx +++ b/svx/inc/svx/xflasit.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xflasit.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xflbckit.hxx b/svx/inc/svx/xflbckit.hxx index aecae3acdeb4..8d94d3ec23cd 100644 --- a/svx/inc/svx/xflbckit.hxx +++ b/svx/inc/svx/xflbckit.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xflbckit.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xflbmpit.hxx b/svx/inc/svx/xflbmpit.hxx index 231bab10f122..d06d0f6622e4 100644 --- a/svx/inc/svx/xflbmpit.hxx +++ b/svx/inc/svx/xflbmpit.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xflbmpit.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xflbmsli.hxx b/svx/inc/svx/xflbmsli.hxx index a0f88b111331..adf1c25ca109 100644 --- a/svx/inc/svx/xflbmsli.hxx +++ b/svx/inc/svx/xflbmsli.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xflbmsli.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xflbmsxy.hxx b/svx/inc/svx/xflbmsxy.hxx index 254428badb6c..d4de1a3d81c2 100644 --- a/svx/inc/svx/xflbmsxy.hxx +++ b/svx/inc/svx/xflbmsxy.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xflbmsxy.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xflbmtit.hxx b/svx/inc/svx/xflbmtit.hxx index db969aa650c5..75477624e690 100644 --- a/svx/inc/svx/xflbmtit.hxx +++ b/svx/inc/svx/xflbmtit.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xflbmtit.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xflboxy.hxx b/svx/inc/svx/xflboxy.hxx index 2dfd12f6d6dc..498704376eaf 100644 --- a/svx/inc/svx/xflboxy.hxx +++ b/svx/inc/svx/xflboxy.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xflboxy.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xflbstit.hxx b/svx/inc/svx/xflbstit.hxx index a91c44d02831..1f5c79df977b 100644 --- a/svx/inc/svx/xflbstit.hxx +++ b/svx/inc/svx/xflbstit.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xflbstit.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xflbtoxy.hxx b/svx/inc/svx/xflbtoxy.hxx index 2f6744e4c022..35d401eb9c6a 100644 --- a/svx/inc/svx/xflbtoxy.hxx +++ b/svx/inc/svx/xflbtoxy.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xflbtoxy.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xflclit.hxx b/svx/inc/svx/xflclit.hxx index 39a382bd5e60..a3b03b48d30b 100644 --- a/svx/inc/svx/xflclit.hxx +++ b/svx/inc/svx/xflclit.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xflclit.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xflftrit.hxx b/svx/inc/svx/xflftrit.hxx index 1e77f2a6d2e0..c501a153b66a 100644 --- a/svx/inc/svx/xflftrit.hxx +++ b/svx/inc/svx/xflftrit.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xflftrit.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xflgrit.hxx b/svx/inc/svx/xflgrit.hxx index fd0a7a202c81..4725a2d7383f 100644 --- a/svx/inc/svx/xflgrit.hxx +++ b/svx/inc/svx/xflgrit.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xflgrit.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xflhtit.hxx b/svx/inc/svx/xflhtit.hxx index 212977c87a1f..01dadc6405f9 100644 --- a/svx/inc/svx/xflhtit.hxx +++ b/svx/inc/svx/xflhtit.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xflhtit.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xfltrit.hxx b/svx/inc/svx/xfltrit.hxx index 5b78342d1ebf..ee44a24e791c 100644 --- a/svx/inc/svx/xfltrit.hxx +++ b/svx/inc/svx/xfltrit.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xfltrit.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xftadit.hxx b/svx/inc/svx/xftadit.hxx index a29dfb8540a8..575121c5eaf1 100644 --- a/svx/inc/svx/xftadit.hxx +++ b/svx/inc/svx/xftadit.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xftadit.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xftdiit.hxx b/svx/inc/svx/xftdiit.hxx index fc47ac7b6c7d..a549c74648b5 100644 --- a/svx/inc/svx/xftdiit.hxx +++ b/svx/inc/svx/xftdiit.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xftdiit.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xftmrit.hxx b/svx/inc/svx/xftmrit.hxx index f0d7fc1ac362..b920bc7fc8f0 100644 --- a/svx/inc/svx/xftmrit.hxx +++ b/svx/inc/svx/xftmrit.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xftmrit.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xftouit.hxx b/svx/inc/svx/xftouit.hxx index 19fe8db664bd..6a46c1f0cabf 100644 --- a/svx/inc/svx/xftouit.hxx +++ b/svx/inc/svx/xftouit.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xftouit.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xftsfit.hxx b/svx/inc/svx/xftsfit.hxx index ccb021d21431..40fc477a86bf 100644 --- a/svx/inc/svx/xftsfit.hxx +++ b/svx/inc/svx/xftsfit.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xftsfit.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xftshcit.hxx b/svx/inc/svx/xftshcit.hxx index 7f767d163278..bccac9df40bb 100644 --- a/svx/inc/svx/xftshcit.hxx +++ b/svx/inc/svx/xftshcit.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xftshcit.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xftshit.hxx b/svx/inc/svx/xftshit.hxx index 973a12095dd9..a63aab17dbc2 100644 --- a/svx/inc/svx/xftshit.hxx +++ b/svx/inc/svx/xftshit.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xftshit.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xftshtit.hxx b/svx/inc/svx/xftshtit.hxx index 7d7744640533..97789eeed5f2 100644 --- a/svx/inc/svx/xftshtit.hxx +++ b/svx/inc/svx/xftshtit.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xftshtit.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xftshxy.hxx b/svx/inc/svx/xftshxy.hxx index 7f83e8e826b2..a9918da33577 100644 --- a/svx/inc/svx/xftshxy.hxx +++ b/svx/inc/svx/xftshxy.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xftshxy.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xftstit.hxx b/svx/inc/svx/xftstit.hxx index dd9b14e1f75d..78d3dac329c6 100644 --- a/svx/inc/svx/xftstit.hxx +++ b/svx/inc/svx/xftstit.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xftstit.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xgrad.hxx b/svx/inc/svx/xgrad.hxx index d5dc739000f1..b7bf350d3ddb 100644 --- a/svx/inc/svx/xgrad.hxx +++ b/svx/inc/svx/xgrad.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xgrad.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xgrscit.hxx b/svx/inc/svx/xgrscit.hxx index 3cf97e3c7ce0..c08590d7840a 100644 --- a/svx/inc/svx/xgrscit.hxx +++ b/svx/inc/svx/xgrscit.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xgrscit.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xhatch.hxx b/svx/inc/svx/xhatch.hxx index ba40d4514df8..731f8084f8a0 100644 --- a/svx/inc/svx/xhatch.hxx +++ b/svx/inc/svx/xhatch.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xhatch.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xit.hxx b/svx/inc/svx/xit.hxx index b864cf0d20c0..6f82da63e0b9 100644 --- a/svx/inc/svx/xit.hxx +++ b/svx/inc/svx/xit.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xit.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xlineit.hxx b/svx/inc/svx/xlineit.hxx index 46e8d34e32bc..ac70a901d4fb 100644 --- a/svx/inc/svx/xlineit.hxx +++ b/svx/inc/svx/xlineit.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xlineit.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xlineit0.hxx b/svx/inc/svx/xlineit0.hxx index 41754785f0bf..e21b45d426dd 100644 --- a/svx/inc/svx/xlineit0.hxx +++ b/svx/inc/svx/xlineit0.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xlineit0.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xlinjoit.hxx b/svx/inc/svx/xlinjoit.hxx index 97b4bb2ac276..ced38d815614 100644 --- a/svx/inc/svx/xlinjoit.hxx +++ b/svx/inc/svx/xlinjoit.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xlinjoit.hxx,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xlnasit.hxx b/svx/inc/svx/xlnasit.hxx index 413de684537b..d2eb6594c585 100644 --- a/svx/inc/svx/xlnasit.hxx +++ b/svx/inc/svx/xlnasit.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xlnasit.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xlnclit.hxx b/svx/inc/svx/xlnclit.hxx index f3622b32ce90..71af958c588b 100644 --- a/svx/inc/svx/xlnclit.hxx +++ b/svx/inc/svx/xlnclit.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xlnclit.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xlndsit.hxx b/svx/inc/svx/xlndsit.hxx index 4315161b34eb..70f8e33aac83 100644 --- a/svx/inc/svx/xlndsit.hxx +++ b/svx/inc/svx/xlndsit.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xlndsit.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xlnedcit.hxx b/svx/inc/svx/xlnedcit.hxx index 0adabb2862e5..c40253a2f4a5 100644 --- a/svx/inc/svx/xlnedcit.hxx +++ b/svx/inc/svx/xlnedcit.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xlnedcit.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xlnedit.hxx b/svx/inc/svx/xlnedit.hxx index 46ef12ee2937..99609e6e55df 100644 --- a/svx/inc/svx/xlnedit.hxx +++ b/svx/inc/svx/xlnedit.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xlnedit.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xlnedwit.hxx b/svx/inc/svx/xlnedwit.hxx index 13735ae5f7d6..1ca29d361178 100644 --- a/svx/inc/svx/xlnedwit.hxx +++ b/svx/inc/svx/xlnedwit.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xlnedwit.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xlnstcit.hxx b/svx/inc/svx/xlnstcit.hxx index c7d65bf1f106..df544c9b0d8e 100644 --- a/svx/inc/svx/xlnstcit.hxx +++ b/svx/inc/svx/xlnstcit.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xlnstcit.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xlnstit.hxx b/svx/inc/svx/xlnstit.hxx index 1d6af8690acd..f360dd3205e4 100644 --- a/svx/inc/svx/xlnstit.hxx +++ b/svx/inc/svx/xlnstit.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xlnstit.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xlnstwit.hxx b/svx/inc/svx/xlnstwit.hxx index a5899b7743cc..86b5aa579325 100644 --- a/svx/inc/svx/xlnstwit.hxx +++ b/svx/inc/svx/xlnstwit.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xlnstwit.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xlntrit.hxx b/svx/inc/svx/xlntrit.hxx index 2590ea304e3b..a79a1c0daba2 100644 --- a/svx/inc/svx/xlntrit.hxx +++ b/svx/inc/svx/xlntrit.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xlntrit.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xlnwtit.hxx b/svx/inc/svx/xlnwtit.hxx index 11f832716a08..4649a515c69a 100644 --- a/svx/inc/svx/xlnwtit.hxx +++ b/svx/inc/svx/xlnwtit.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xlnwtit.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xpoly.hxx b/svx/inc/svx/xpoly.hxx index 4911e1545174..409d957cae84 100644 --- a/svx/inc/svx/xpoly.hxx +++ b/svx/inc/svx/xpoly.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xpoly.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xpool.hxx b/svx/inc/svx/xpool.hxx index 10fb329b6216..1834eff0d5bb 100644 --- a/svx/inc/svx/xpool.hxx +++ b/svx/inc/svx/xpool.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xpool.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xsetit.hxx b/svx/inc/svx/xsetit.hxx index 02dc65747540..f8405490bac9 100644 --- a/svx/inc/svx/xsetit.hxx +++ b/svx/inc/svx/xsetit.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xsetit.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xsflclit.hxx b/svx/inc/svx/xsflclit.hxx index 802d247180a8..1c8b33cc278d 100644 --- a/svx/inc/svx/xsflclit.hxx +++ b/svx/inc/svx/xsflclit.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xsflclit.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xtable.hxx b/svx/inc/svx/xtable.hxx index 885cdab72a16..7ef8e659b08f 100644 --- a/svx/inc/svx/xtable.hxx +++ b/svx/inc/svx/xtable.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xtable.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xtextit.hxx b/svx/inc/svx/xtextit.hxx index 3cc0fbccc152..0d4630b2a0a2 100644 --- a/svx/inc/svx/xtextit.hxx +++ b/svx/inc/svx/xtextit.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xtextit.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/xtextit0.hxx b/svx/inc/svx/xtextit0.hxx index 3edf5114e8f9..dc7013853de4 100644 --- a/svx/inc/svx/xtextit0.hxx +++ b/svx/inc/svx/xtextit0.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xtextit0.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/zoomitem.hxx b/svx/inc/svx/zoomitem.hxx index 75aafc540ee3..a1a0eeebffbe 100644 --- a/svx/inc/svx/zoomitem.hxx +++ b/svx/inc/svx/zoomitem.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: zoomitem.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/zoomsliderctrl.hxx b/svx/inc/svx/zoomsliderctrl.hxx index d7406bd0a4e0..eef8ec40ccac 100644 --- a/svx/inc/svx/zoomsliderctrl.hxx +++ b/svx/inc/svx/zoomsliderctrl.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: zoomsliderctrl.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svx/zoomslideritem.hxx b/svx/inc/svx/zoomslideritem.hxx index c58cd255ae8d..163e1c8ec155 100644 --- a/svx/inc/svx/zoomslideritem.hxx +++ b/svx/inc/svx/zoomslideritem.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: zoomslideritem.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svxempty.hxx b/svx/inc/svxempty.hxx index e2f507c444e7..2e8d34d39071 100644 --- a/svx/inc/svxempty.hxx +++ b/svx/inc/svxempty.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svxempty.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svxerr.hxx b/svx/inc/svxerr.hxx index 6904cab57e46..0fd197f1a5f5 100644 --- a/svx/inc/svxerr.hxx +++ b/svx/inc/svxerr.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svxerr.hxx,v $ - * $Revision: 1.8 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -39,7 +36,8 @@ #define ERRCODE_SVX_LINGU_THESAURUSNOTEXISTS (1UL | ERRCODE_AREA_SVX | \ ERRCODE_CLASS_NOTEXISTS) -#define ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS (2UL | ERRCODE_AREA_SVX) +// moved to editeng lib +//#define ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS (2UL | ERRCODE_AREA_SVX) #define ERRCODE_SVX_LINGU_LINGUNOTEXISTS (3UL | ERRCODE_AREA_SVX | \ ERRCODE_CLASS_NOTEXISTS ) @@ -52,8 +50,9 @@ #define ERRCODE_SVX_GRAPHIC_NOTREADABLE (7UL | ERRCODE_AREA_SVX | \ ERRCODE_CLASS_READ ) -#define ERRCODE_SVX_GRAPHIC_WRONG_FILEFORMAT (8UL | ERRCODE_AREA_SVX | \ - ERRCODE_CLASS_READ ) +// moved to editeng lib +//#define ERRCODE_SVX_GRAPHIC_WRONG_FILEFORMAT (8UL | ERRCODE_AREA_SVX | ERRCODE_CLASS_READ ) + #define ERRCODE_SVX_LINGU_NOLANGUAGE (9UL | ERRCODE_AREA_SVX | \ ERRCODE_CLASS_NOTEXISTS ) #define ERRCODE_SVX_FORMS_NOIOSERVICES (10UL | ERRCODE_AREA_SVX ) diff --git a/svx/inc/svxgrahicitem.hxx b/svx/inc/svxgrahicitem.hxx index 9e2dca690d94..fdd757b1a91b 100644 --- a/svx/inc/svxgrahicitem.hxx +++ b/svx/inc/svxgrahicitem.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svxgrahicitem.hxx,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/svxrtf.hxx b/svx/inc/svxrtf.hxx deleted file mode 100644 index 7dfa141b259a..000000000000 --- a/svx/inc/svxrtf.hxx +++ /dev/null @@ -1,481 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: svxrtf.hxx,v $ - * $Revision: 1.24.208.1 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVXRTF_HXX -#define _SVXRTF_HXX - -#ifndef _TABLE_HXX //autogen -#include <tools/table.hxx> -#endif -#include <tools/string.hxx> -#include <svl/itemset.hxx> -#include <svtools/parrtf.hxx> - -#define _SVSTDARR_USHORTS -#include <svl/svstdarr.hxx> -#include "svx/svxdllapi.h" - - -class Font; -class Color; -class Graphic; -class DateTime; -struct SvxRTFStyleType; -class SvxRTFItemStackType; -class SvxRTFItemStackList; - -namespace com { namespace sun { namespace star { - namespace document { - class XDocumentProperties; - } - namespace util { - struct DateTime; - } -} } } - - -// Mapper-Klassen fuer die verschiedenen Anforderungen an Doc-Positionen -// Swg - NodePosition ist ein SwIndex, der intern veraendert wird -// EditEngine - ULONG auf Liste von Absaetzen -// ..... - -class SvxNodeIdx -{ -public: - virtual ~SvxNodeIdx() {} - virtual ULONG GetIdx() const = 0; - virtual SvxNodeIdx* Clone() const = 0; // erzeuge von sich eine Kopie -}; - -class SvxPosition -{ -public: - virtual ~SvxPosition() {} - - 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 -}; - - -typedef Color* ColorPtr; -SV_DECL_PTRARR( SvxRTFColorTbl, ColorPtr, 16, 4 ) -DECLARE_TABLE( SvxRTFFontTbl, Font* ) -DECLARE_TABLE( SvxRTFStyleTbl, SvxRTFStyleType* ) -typedef SvxRTFItemStackType* SvxRTFItemStackTypePtr; -SV_DECL_PTRARR_DEL( SvxRTFItemStackList, SvxRTFItemStackTypePtr, 1, 1 ) -SV_DECL_PTRARR_STACK( SvxRTFItemStack, SvxRTFItemStackTypePtr, 0, 1 ) - -// einige Hilfsklassen fuer den RTF-Parser -struct SvxRTFStyleType -{ - SfxItemSet aAttrSet; // die Attribute vom Style (+Ableitung!) - String sName; - USHORT nBasedOn, nNext; - BOOL bBasedOnIsSet; //$flr #117411# - BYTE nOutlineNo; - BOOL bIsCharFmt; - - SvxRTFStyleType( SfxItemPool& rPool, const USHORT* pWhichRange ); -}; - - -// Bitmap - Mode - -struct SVX_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 - } eStyle; - - enum RTF_BMPMODE - { - BINARY_MODE, - HEX_MODE - } nMode; - - 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; - - SvxRTFPictureType() { ResetValues(); } - // alle Werte auf default; wird nach einlesen der Bitmap aufgerufen ! - void ResetValues(); -}; - -// Hier sind die Ids fuer alle Charakter-Attribute, die vom SvxParser -// erkannt und in einem SfxItemSet gesetzt werden koennen. -// Die Ids werden ueber die SlotIds vom POOL richtig gesetzt. -struct RTFPlainAttrMapIds -{ - USHORT nCaseMap, - nBgColor, - nColor, - nContour, - nCrossedOut, - nEscapement, - nFont, - nFontHeight, - nKering, - nLanguage, - nPosture, - nShadowed, - nUnderline, - nOverline, - nWeight, - nWordlineMode, - nAutoKerning, - nCJKFont, - nCJKFontHeight, - nCJKLanguage, - nCJKPosture, - nCJKWeight, - nCTLFont, - nCTLFontHeight, - nCTLLanguage, - nCTLPosture, - nCTLWeight, - nEmphasis, - nTwoLines, - nCharScaleX, - nHorzVert, - nRuby, - nRelief, - nHidden - ; - RTFPlainAttrMapIds( const SfxItemPool& rPool ); -}; - -// Hier sind die Ids fuer alle Paragraph-Attribute, die vom SvxParser -// erkannt und in einem SfxItemSet gesetzt werden koennen. -// Die Ids werden ueber die SlotIds vom POOL richtig gesetzt. -struct RTFPardAttrMapIds -{ - USHORT nLinespacing, - nAdjust, - nTabStop, - nHyphenzone, - nLRSpace, - nULSpace, - nBrush, - nBox, - nShadow, - nOutlineLvl, - nSplit, - nKeep, - nFontAlign, - nScriptSpace, - nHangPunct, - nForbRule, - nDirection - ; - RTFPardAttrMapIds( const SfxItemPool& rPool ); -}; - - - -// ----------------------------------------------------------------------- - - -class SVX_DLLPUBLIC SvxRTFParser : public SvRTFParser -{ - SvStream &rStrm; - SvxRTFColorTbl aColorTbl; - SvxRTFFontTbl aFontTbl; - SvxRTFStyleTbl aStyleTbl; - SvxRTFItemStack aAttrStack; - SvxRTFItemStackList aAttrSetList; - - SvUShorts aPlainMap; - SvUShorts aPardMap; - SvUShorts aWhichMap; - String sBaseURL; - - SvxPosition* pInsPos; - SfxItemPool* pAttrPool; - Color* pDfltColor; - 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. - // FALSE - in RightToLeft char run def. - BOOL bIsInReadStyleTab : 1; // TRUE - in ReadStyleTable - - void ClearColorTbl(); - void ClearFontTbl(); - void ClearStyleTbl(); - void ClearAttrStack(); - - SvxRTFItemStackTypePtr _GetAttrSet( int bCopyAttr=FALSE ); // neue ItemStackType anlegen - void _ClearStyleAttr( SvxRTFItemStackType& rStkType ); - - // setzt alle Attribute, die unterschiedlich zum aktuellen sind - void SetAttrSet( SfxItemSet& rAttrSet, SvxPosition& rSttPos ); - void SetAttrSet( SvxRTFItemStackType &rSet ); - void SetDefault( int nToken, int nValue ); - - // pard / plain abarbeiten - void RTFPardPlain( int bPard, SfxItemSet** ppSet ); - - void BuildWhichTbl(); - - enum RTF_CharTypeDef - { - NOTDEF_CHARTYPE, - LOW_CHARTYPE, - HIGH_CHARTYPE, - DOUBLEBYTE_CHARTYPE - }; - - // set latin/asian/complex character attributes - void SetScriptAttr( - RTF_CharTypeDef eType, SfxItemSet& rSet, SfxPoolItem& rItem ); - -protected: - virtual void EnterEnvironment(); - virtual void LeaveEnvironment(); - virtual void ResetPard(); - virtual void InsertPara() = 0; - - - String& DelCharAtEnd( String& rStr, const sal_Unicode cDel ); - - // wird fuer jedes Token gerufen, das in CallParser erkannt wird - virtual void NextToken( int nToken ); - - virtual void ReadBitmapData(); - virtual void ReadOLEData(); - - void ReadStyleTable(); - void ReadColorTable(); - void ReadFontTable(); - void ReadAttr( int nToken, SfxItemSet* pSet ); - void ReadTabAttr( int nToken, SfxItemSet& rSet ); - - // Dokument-Info lesen - ::com::sun::star::util::DateTime GetDateTimeStamp( ); - String& GetTextToEndGroup( String& rStr ); - virtual void ReadInfo( const sal_Char* pChkForVerNo = 0 ); - - 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 - - - virtual void InsertText() = 0; - virtual void MovePos( int bForward = TRUE ) = 0; - virtual void SetEndPrevPara( SvxNodeIdx*& rpNodePos, - xub_StrLen& rCntPos )=0; - virtual void SetAttrInDoc( SvxRTFItemStackType &rSet ); - // fuer Tokens, die im ReadAttr nicht ausgewertet werden - virtual void UnknownAttrToken( int nToken, SfxItemSet* pSet ); - - // falls jemand keine Twips haben moechte - virtual void CalcValue(); - - SvxRTFParser( SfxItemPool& rAttrPool, - SvStream& rIn, - ::com::sun::star::uno::Reference< - ::com::sun::star::document::XDocumentProperties> i_xDocProps, - 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; } - - // erfrage/setze die aktuelle Einfuegeposition - SvxPosition& GetInsPos() const { return *pInsPos; } - void SetInsPos( const SvxPosition& rNew ); - - 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; } - - const String& GetBaseURL() const { return sBaseURL; } - - // lesen die GrafikDaten und fuelle damit die Grafik und die - // die PicDaten. - // Return - TRUE: die Grafik ist gueltig - BOOL ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType ); - // wandel die ASCII-HexCodes in binaere Zeichen um. Werden - // ungueltige Daten gefunden (Zeichen ausser 0-9|a-f|A-F, so - // wird USHRT_MAX returnt, ansonsten die Anzahl der umgewandelten Ze. - xub_StrLen HexToBin( String& rToken ); - -public: - - virtual SvParserState CallParser(); // Aufruf des Parsers - - inline const Color& GetColor( USHORT nId ) const; - 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; } - // um andere WhichIds fuer einen anderen Pool zusetzen. - RTFPardAttrMapIds& GetPardMap() - { return (RTFPardAttrMapIds&)*aPardMap.GetData(); } - RTFPlainAttrMapIds& GetPlainMap() - { 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 ); - - // fuers asynchrone lesen aus dem SvStream - virtual void Continue( int nToken ); - - // get RTF default ItemSets. Must be used by pard/plain tokens or in - // reset of Style-Items - const SfxItemSet& GetRTFDefaults(); - virtual bool UncompressableStackEntry(const SvxRTFItemStackType &rSet) const; -}; - -// der Stack fuer die Attribute: -// diese Klasse darf nur vom SvxRTFParser benutzt werden! -class SVX_DLLPUBLIC SvxRTFItemStackType -{ - friend class SvxRTFParser; - friend class SvxRTFItemStackList; - - SfxItemSet aAttrSet; - SvxNodeIdx *pSttNd, *pEndNd; - xub_StrLen nSttCnt, nEndCnt; - SvxRTFItemStackList* pChildList; - USHORT nStyleNo; - - SvxRTFItemStackType( SfxItemPool&, const USHORT* pWhichRange, - const SvxPosition& ); - ~SvxRTFItemStackType(); - - void Add( SvxRTFItemStackTypePtr ); - void Compress( const SvxRTFParser& ); - -public: - SvxRTFItemStackType( const SvxRTFItemStackType&, const SvxPosition&, - int bCopyAttr = FALSE ); - //cmc, I'm very suspicios about SetStartPos, it doesn't change - //its children's starting position, and the implementation looks - //bad, consider this deprecated. - void SetStartPos( const SvxPosition& rPos ); - - void MoveFullNode(const SvxNodeIdx &rOldNode, - const SvxNodeIdx &rNewNode); - - ULONG GetSttNodeIdx() const { return pSttNd->GetIdx(); } - ULONG GetEndNodeIdx() const { return pEndNd->GetIdx(); } - - const SvxNodeIdx& GetSttNode() const { return *pSttNd; } - const SvxNodeIdx& GetEndNode() const { return *pEndNd; } - - xub_StrLen GetSttCnt() const { return nSttCnt; } - xub_StrLen GetEndCnt() const { return nEndCnt; } - - SfxItemSet& GetAttrSet() { return aAttrSet; } - const SfxItemSet& GetAttrSet() const { return aAttrSet; } - - USHORT StyleNo() const { return nStyleNo; } - - void SetRTFDefaults( const SfxItemSet& rDefaults ); -}; - - -// ----------- Inline Implementierungen -------------- - -inline const Color& SvxRTFParser::GetColor( USHORT nId ) const -{ - ColorPtr pColor = (ColorPtr)pDfltColor; - if( nId < aColorTbl.Count() ) - pColor = aColorTbl[ nId ]; - return *pColor; -} - -inline SfxItemSet& SvxRTFParser::GetAttrSet() -{ - SvxRTFItemStackTypePtr pTmp; - if( bNewGroup || 0 == ( pTmp = aAttrStack.Top()) ) - pTmp = _GetAttrSet(); - return pTmp->aAttrSet; -} - - -#endif - //_SVXRTF_HXX - diff --git a/svx/inc/swframeexample.hxx b/svx/inc/swframeexample.hxx index 642d030c19bc..843ff2a487af 100644 --- a/svx/inc/swframeexample.hxx +++ b/svx/inc/swframeexample.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: swframeexample.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/swframeposstrings.hxx b/svx/inc/swframeposstrings.hxx index a7918f0db633..7ba005dc1e76 100644 --- a/svx/inc/swframeposstrings.hxx +++ b/svx/inc/swframeposstrings.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: swframeposstrings.hxx,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/swframevalidation.hxx b/svx/inc/swframevalidation.hxx index bef91f64c1f1..600479718050 100644 --- a/svx/inc/swframevalidation.hxx +++ b/svx/inc/swframevalidation.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile$ - * $Revision$ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/tbunocontroller.hxx b/svx/inc/tbunocontroller.hxx index 95f17a495318..fa7329a525e1 100644 --- a/svx/inc/tbunocontroller.hxx +++ b/svx/inc/tbunocontroller.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: tbunocontroller.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/tbxalign.hxx b/svx/inc/tbxalign.hxx index 13fb4c8ae107..669b03e87c73 100644 --- a/svx/inc/tbxalign.hxx +++ b/svx/inc/tbxalign.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: tbxalign.hxx,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/tbxcolor.hxx b/svx/inc/tbxcolor.hxx index db04cfbf7119..848c015c2995 100644 --- a/svx/inc/tbxcolor.hxx +++ b/svx/inc/tbxcolor.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: tbxcolor.hxx,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/tbxctl.hxx b/svx/inc/tbxctl.hxx index 44e72b455b48..39bfc09cf8b1 100644 --- a/svx/inc/tbxctl.hxx +++ b/svx/inc/tbxctl.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: tbxctl.hxx,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/tbxcustomshapes.hxx b/svx/inc/tbxcustomshapes.hxx index 324de17b75d5..21aa3ea871ed 100644 --- a/svx/inc/tbxcustomshapes.hxx +++ b/svx/inc/tbxcustomshapes.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: tbxcustomshapes.hxx,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/tbxdraw.hxx b/svx/inc/tbxdraw.hxx index 6bfa49349573..8f071f38792b 100644 --- a/svx/inc/tbxdraw.hxx +++ b/svx/inc/tbxdraw.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: tbxdraw.hxx,v $ - * $Revision: 1.8 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/textconv.hxx b/svx/inc/textconv.hxx deleted file mode 100644 index afd539d97c38..000000000000 --- a/svx/inc/textconv.hxx +++ /dev/null @@ -1,125 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: textconv.hxx,v $ - * $Revision: 1.12 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _TEXTCONV_HXX -#define _TEXTCONV_HXX - -#include <svx/splwrap.hxx> -#include <svx/svxacorr.hxx> -#include <com/sun/star/uno/Reference.h> -#include <com/sun/star/uno/Sequence.hxx> -#include <svx/hangulhanja.hxx> - -class EditView; -class ImpEditEngine; -class ContentNode; - -class TextConvWrapper : public svx::HangulHanjaConversion -{ - rtl::OUString aConvText; // convertible text part found last time - LanguageType nConvTextLang; // language of aConvText - USHORT nLastPos; // starting position of the last found text portion (word) - USHORT nUnitOffset; // offset of current unit in the current text portion (word) - - ESelection aConvSel; // selection to be converted if - // 'HasRange' is true, other conversion - // starts from the cursor position - - EditView * pEditView; - Window * pWin; - - sal_Bool bStartChk; - sal_Bool bStartDone; - sal_Bool bEndDone; - sal_Bool bAllowChange; // storage for _bAllowImplicitChangesForNotConvertibleText - // paramters value of function GetNextPortion. - // used to transport the value to where it is needed. - - - // from SvxSpellWrapper copied and modified - sal_Bool ConvNext_impl(); // former SpellNext - sal_Bool FindConvText_impl(); // former FindSpellError - sal_Bool ConvMore_impl(); // former SpellMore - - // from EditSpellWrapper copied and modified - void ConvStart_impl( SvxSpellArea eSpell ); // former SpellStart - void ConvEnd_impl(); // former SpellEnd - sal_Bool ConvContinue_impl(); // former SpellContinue - - void SelectNewUnit_impl( const sal_Int32 nUnitStart, - const sal_Int32 nUnitEnd ); - - void ChangeText( const String &rNewText, - const ::rtl::OUString& rOrigText, - const ::com::sun::star::uno::Sequence< sal_Int32 > *pOffsets, - ESelection *pESelection ); - void ChangeText_impl( const String &rNewText, sal_Bool bKeepAttributes ); - - // Forbidden and not implemented. - TextConvWrapper (const TextConvWrapper &); - TextConvWrapper & operator= (const TextConvWrapper &); - -protected: - virtual void GetNextPortion( ::rtl::OUString& /* [out] */ rNextPortion, - LanguageType& /* [out] */ rLangOfPortion, - sal_Bool /* [in] */ _bAllowImplicitChangesForNotConvertibleText ); - virtual void HandleNewUnit( const sal_Int32 nUnitStart, - const sal_Int32 nUnitEnd ); - virtual void ReplaceUnit( - const sal_Int32 nUnitStart, const sal_Int32 nUnitEnd, - const ::rtl::OUString& rOrigText, - const ::rtl::OUString& rReplaceWith, - const ::com::sun::star::uno::Sequence< sal_Int32 > &rOffsets, - ReplacementAction eAction, - LanguageType *pNewUnitLanguage ); - - virtual sal_Bool HasRubySupport() const; - - void SetLanguageAndFont( const ESelection &rESel, - LanguageType nLang, USHORT nLangWhichId, - const Font *pFont, USHORT nFontWhichId ); - - -public: - TextConvWrapper( Window* pWindow, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMSF, - const ::com::sun::star::lang::Locale& rSourceLocale, - const ::com::sun::star::lang::Locale& rTargetLocale, - const Font* pTargetFont, - INT32 nOptions, - sal_Bool bIsInteractive, - BOOL bIsStart, EditView* pView ); - - virtual ~TextConvWrapper(); - - void Convert(); -}; - -#endif - diff --git a/svx/inc/txencbox.hxx b/svx/inc/txencbox.hxx index b956c9b47fe0..e24716f8c953 100644 --- a/svx/inc/txencbox.hxx +++ b/svx/inc/txencbox.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: txencbox.hxx,v $ - * $Revision: 1.8 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -98,12 +95,6 @@ public: */ void FillWithMimeAndSelectBest(); - /** Get the best MIME encoding matching the system locale, or if that isn't - determinable one that matches the UI locale, or UTF8 if everything else - fails. - */ - static rtl_TextEncoding GetBestMimeEncoding(); - const SvxTextEncodingTable* GetTextEncodingTable() const { return m_pEncTable; } diff --git a/svx/inc/txenctab.hxx b/svx/inc/txenctab.hxx index 324d8b469192..e04428717c53 100644 --- a/svx/inc/txenctab.hxx +++ b/svx/inc/txenctab.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: txenctab.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/txtrange.hxx b/svx/inc/txtrange.hxx deleted file mode 100644 index 1b7a05c1f9e5..000000000000 --- a/svx/inc/txtrange.hxx +++ /dev/null @@ -1,121 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: txtrange.hxx,v $ - * $Revision: 1.8 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _MyTXTRANGE_HXX -#define _MyTXTRANGE_HXX - -#ifndef _TXTRANGE_HXX -#define _SVSTDARR_BOOLS -#define _SVSTDARR_LONGS -#include <svl/svstdarr.hxx> -#endif -#include "svx/svxdllapi.h" - -class PolyPolygon; -class Range; -class Rectangle; - -namespace basegfx { - class B2DPolyPolygon; -} - -typedef SvLongs* SvLongsPtr; - -/************************************************************************* -|* -|* class TextRanger -|* -|* Beschreibung -|* Ersterstellung 20.01.97 -|* Letzte Aenderung AMA 20.01.97 -|* -*************************************************************************/ -class SVX_DLLPUBLIC TextRanger -{ - Range *pRangeArr; - 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 - sal_uInt32 nPointCount; // Anzahl der Polygonpunkte - BOOL bSimple : 1; // Nur Aussenkante - BOOL bInner : 1; // TRUE: Objekt beschriften (EditEngine); - // FALSE: Objekt umfliessen (StarWriter); - BOOL bVertical :1; // for vertical writing mode - BOOL bFlag3 :1; - BOOL bFlag4 :1; - BOOL bFlag5 :1; - BOOL bFlag6 :1; - BOOL bFlag7 :1; - TextRanger( const TextRanger& ); // not implemented - const Rectangle& _GetBoundRect(); -public: - TextRanger( const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::B2DPolyPolygon* pLinePolyPolygon, - USHORT nCacheSize, USHORT nLeft, USHORT nRight, - BOOL bSimple, BOOL bInner, BOOL bVert = sal_False ); - ~TextRanger(); - SvLongsPtr GetTextRanges( const Range& rRange ); - USHORT GetRight() const { return nRight; } - USHORT GetLeft() const { return nLeft; } - USHORT GetUpper() const { return nUpper; } - USHORT GetLower() const { return nLower; } - sal_uInt32 GetPointCount() const { return nPointCount; } - BOOL IsSimple() const { return bSimple; } - BOOL IsInner() const { return bInner; } - BOOL IsVertical() const { return bVertical; } - BOOL HasBorder() const { return nRight || nLeft; } - const PolyPolygon& GetPolyPolygon() const { return *mpPolyPolygon; } - const PolyPolygon* GetLinePolygon() const { return mpLinePolyPolygon; } - const Rectangle& GetBoundRect() - { return pBound ? static_cast< const Rectangle& >(*pBound) : _GetBoundRect(); } - void SetUpper( USHORT nNew ){ nUpper = nNew; } - void SetLower( USHORT nNew ){ nLower = nNew; } - void SetVertical( BOOL bNew ); - BOOL IsFlag3() const { return bFlag3; } - void SetFlag3( BOOL bNew ) { bFlag3 = bNew; } - BOOL IsFlag4() const { return bFlag4; } - void SetFlag4( BOOL bNew ) { bFlag4 = bNew; } - BOOL IsFlag5() const { return bFlag5; } - void SetFlag5( BOOL bNew ) { bFlag5 = bNew; } - BOOL IsFlag6() const { return bFlag6; } - void SetFlag6( BOOL bNew ) { bFlag6 = bNew; } - BOOL IsFlag7() const { return bFlag7; } - void SetFlag7( BOOL bNew ) { bFlag7 = bNew; } -}; - - - -#endif // _TXTRANGE_HXX diff --git a/svx/inc/uiks.hxx b/svx/inc/uiks.hxx index 5a332c0ecb92..a143d6537f65 100644 --- a/svx/inc/uiks.hxx +++ b/svx/inc/uiks.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: uiks.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/unoapi.hxx b/svx/inc/unoapi.hxx index 0ea3585d173a..6a990a8d1c70 100644 --- a/svx/inc/unoapi.hxx +++ b/svx/inc/unoapi.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: unoapi.hxx,v $ - * $Revision: 1.12 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -35,7 +32,7 @@ #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/drawing/XDrawPage.hpp> #include <sal/types.h> -#include <goodies/grfmgr.hxx> +#include <svtools/grfmgr.hxx> #include <svl/poolitem.hxx> #include "svx/svxdllapi.h" @@ -63,9 +60,6 @@ SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDraw /** returns the SdrPage from the given StarOffice API wrapper */ SVX_DLLPUBLIC SdrPage* GetSdrPageFromXDrawPage( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > xDrawPage ) throw() ; -/** returns a GraphicObject for this URL */ -SVX_DLLPUBLIC GraphicObject CreateGraphicObjectFromURL( const ::rtl::OUString &rURL ) throw() ; - /** returns the SvxNumBulletItem with the given name from the pool or a null if there is no item with that name */ @@ -104,21 +98,5 @@ SVX_DLLPUBLIC void SvxUnogetApiNameForItem( const sal_Int16 nWhich, const String */ SVX_DLLPUBLIC void SvxUnogetInternalNameForItem( const sal_Int16 nWhich, const rtl::OUString& rApiName, String& rInternalName ) throw(); -/** returns the which id for the given property name. This only works for - properties of shapes (map SVXMAP_SHAPE is used for searching) - - Note: As this function has no access to SvxItemPropertySet but only to - SfxItemPropertyMap, the search in the map is not done via bsearch, but by - linear search. - */ -// os: unused function -//SVX_DLLPUBLIC sal_Int16 SvxUnoGetWhichIdForNamedProperty( const ::rtl::OUString & rPropName ); - -/** converts the given any with a metric to 100th/mm if needed */ -SVX_DLLPUBLIC void SvxUnoConvertToMM( const SfxMapUnit eSourceMapUnit, com::sun::star::uno::Any & rMetric ) throw(); - -/** converts the given any with a metric from 100th/mm to the given metric if needed */ -SVX_DLLPUBLIC void SvxUnoConvertFromMM( const SfxMapUnit eDestinationMapUnit, com::sun::star::uno::Any & rMetric ) throw(); - #endif // _SVX_UNOAPI_HXX_ diff --git a/svx/inc/unoedhlp.hxx b/svx/inc/unoedhlp.hxx deleted file mode 100644 index 317b9c9c7ab2..000000000000 --- a/svx/inc/unoedhlp.hxx +++ /dev/null @@ -1,192 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: unoedhlp.hxx,v $ - * $Revision: 1.8 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVX_UNOEDHLP_HXX -#define _SVX_UNOEDHLP_HXX - -#include <memory> -#include <tools/solar.h> -#include <svtools/textdata.hxx> -#include <svl/hint.hxx> -#include <tools/gen.hxx> -#include "svx/svxdllapi.h" - -struct EENotify; -class EditEngine; - -#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 - case denotes the destination position, the two parameters the - start and the end of the moved paragraph range. - */ -class SVX_DLLPUBLIC SvxEditSourceHint : public TextHint -{ -private: - 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 ); -}; - -/** Helper class for common functionality in edit sources - */ -class SVX_DLLPUBLIC SvxEditSourceHelper -{ -public: - - /** Translates EditEngine notifications into broadcastable hints - - @param aNotify - Notification object send by the EditEngine. - - @return the translated hint - */ - static ::std::auto_ptr<SfxHint> EENotification2Hint( EENotify* aNotify ); - - /** Calculate attribute run for EditEngines - - Please note that the range returned is half-open: [nStartIndex,nEndIndex) - - @param nStartIndex - Herein, the start index of the range of similar attributes is returned - - @param nEndIndex - Herein, the end index (exclusive) of the range of similar attributes is returned - - @param rEE - The EditEngine to query for attributes - - @param nPara - The paragraph the following index value is to be interpreted in - - @param nIndex - The character index from which the range of similar attributed characters is requested - - @return sal_True, if the range has been successfully determined - */ - static sal_Bool GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, const EditEngine& rEE, USHORT nPara, USHORT nIndex ); - - /** Convert point from edit engine to user coordinate space - - As the edit engine internally keeps vertical text unrotated, - all internal edit engine methods return their stuff unrotated, - too. This method rotates and shifts given point appropriately, - if vertical writing is on. - - @param rPoint - Point to transform - - @param rEESize - Paper size of the edit engine - - @param bIsVertical - Whether output text is vertical or not - - @return the possibly transformed point - */ - static Point EEToUserSpace( const Point& rPoint, const Size& rEESize, bool bIsVertical ); - - /** Convert point from user to edit engine coordinate space - - As the edit engine internally keeps vertical text unrotated, - all internal edit engine methods return their stuff unrotated, - too. This method rotates and shifts given point appropriately, - if vertical writing is on. - - @param rPoint - Point to transform - - @param rEESize - Paper size of the edit engine - - @param bIsVertical - Whether output text is vertical or not - - @return the possibly transformed point - */ - static Point UserSpaceToEE( const Point& rPoint, const Size& rEESize, bool bIsVertical ); - - /** Convert rect from edit engine to user coordinate space - - As the edit engine internally keeps vertical text unrotated, - all internal edit engine methods return their stuff unrotated, - too. This method rotates and shifts given rect appropriately, - if vertical writing is on. - - @param rRect - Rectangle to transform - - @param rEESize - Paper size of the edit engine - - @param bIsVertical - Whether output text is vertical or not - - @return the possibly transformed rect - */ - static Rectangle EEToUserSpace( const Rectangle& rRect, const Size& rEESize, bool bIsVertical ); - - /** Convert rect from user to edit engine coordinate space - - As the edit engine internally keeps vertical text unrotated, - all internal edit engine methods return their stuff unrotated, - too. This method rotates and shifts given rect appropriately, - if vertical writing is on. - - @param rRect - Rectangle to transform - - @param rEESize - Paper size of the edit engine - - @param bIsVertical - Whether output text is vertical or not - - @return the possibly transformed rect - */ - static Rectangle UserSpaceToEE( const Rectangle& rRect, const Size& rEESize, bool bIsVertical ); - -}; - -#endif - diff --git a/svx/inc/unofdesc.hxx b/svx/inc/unofdesc.hxx deleted file mode 100644 index d434b090ad75..000000000000 --- a/svx/inc/unofdesc.hxx +++ /dev/null @@ -1,57 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: unofdesc.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef SVX_UNOFDESC_HXX -#define SVX_UNOFDESC_HXX - -#include <com/sun/star/awt/FontDescriptor.hpp> -#include <com/sun/star/beans/PropertyState.hpp> -#include <svl/itemset.hxx> -#include <vcl/font.hxx> -#include "svx/svxdllapi.h" - -class SVX_DLLPUBLIC SvxUnoFontDescriptor -{ -public: - static void ConvertToFont( const ::com::sun::star::awt::FontDescriptor& rDesc, Font& rFont ); - static void ConvertFromFont( const Font& rFont, ::com::sun::star::awt::FontDescriptor& rDesc ); - - static void FillItemSet( const ::com::sun::star::awt::FontDescriptor& rDesc, SfxItemSet& rSet ); - static void FillFromItemSet( const SfxItemSet& rSet, ::com::sun::star::awt::FontDescriptor& rDesc ); - - static com::sun::star::beans::PropertyState getPropertyState( const SfxItemSet& rSet ); - static void setPropertyToDefault( SfxItemSet& rSet ); - static ::com::sun::star::uno::Any getPropertyDefault( SfxItemPool* pPool ); - -}; - - -#endif - diff --git a/svx/inc/unofill.hxx b/svx/inc/unofill.hxx index 4d54d69b8af0..8c1a196b00d7 100644 --- a/svx/inc/unofill.hxx +++ b/svx/inc/unofill.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: unofill.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/unolingu.hxx b/svx/inc/unolingu.hxx deleted file mode 100644 index c2ba7aa60565..000000000000 --- a/svx/inc/unolingu.hxx +++ /dev/null @@ -1,239 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: unolingu.hxx,v $ - * $Revision: 1.17 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _UNO_LINGU_HXX -#define _UNO_LINGU_HXX - -#include <i18npool/lang.h> -#include <tools/string.hxx> -#include <vos/refernce.hxx> -#include <com/sun/star/util/Language.hpp> -#include <com/sun/star/lang/Locale.hpp> -#include <com/sun/star/linguistic2/XLinguServiceManager.hpp> -#include <com/sun/star/linguistic2/XSpellChecker1.hpp> -#include <com/sun/star/linguistic2/XHyphenator.hpp> -#include <com/sun/star/linguistic2/XThesaurus.hpp> -#include <com/sun/star/linguistic2/XDictionaryList.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include "svx/svxdllapi.h" - -class LinguMgrExitLstnr; - -class Window; - -/////////////////////////////////////////////////////////////////////////// -// SvxLinguConfigUpdate -// class to update configuration items when (before!) the linguistic is used. -// -// This class is called by all the dummy implementations to update all of the -// configuration (list of used/available services) when the linguistic is -// accessed for the first time. - -class SvxLinguConfigUpdate -{ - static INT32 nCurrentDataFilesChangedCheckValue; - static INT16 nNeedUpdating; // n == -1 => needs to be checked - // n == 0 => already updated, nothing to be done - // n == 1 => needs to be updated - - static INT32 CalcDataFilesChangedCheckValue(); - -public: - - SVX_DLLPUBLIC static void UpdateAll( sal_Bool bForceCheck = sal_False ); - static BOOL IsNeedUpdateAll( sal_Bool bForceCheck = sal_False ); -}; - -/////////////////////////////////////////////////////////////////////////// - -class SVX_DLLPUBLIC LinguMgr -{ - friend class LinguMgrExitLstnr; - - //static ::VOS::ORefCount aRefCount; - - static ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XLinguServiceManager > xLngSvcMgr; - static ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellChecker1 > xSpell; - static ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XHyphenator > xHyph; - static ::com::sun::star::uno::Reference< - ::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; - - static ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionary > xIgnoreAll; - static ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionary > xChangeAll; - - 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(); - static ::com::sun::star::uno::Reference< - ::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(); - static ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionary > GetStandard(); - static ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionary > GetIgnoreAll(); - static ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionary > GetChangeAll(); - - // disallow access to copy-constructor and assignment-operator - LinguMgr(const LinguMgr &); - LinguMgr & operator = (const LinguMgr &); - -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(); - static ::com::sun::star::uno::Reference< - ::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(); - - 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(); - - // update all configuration entries - static void UpdateAll(); -}; - -/////////////////////////////////////////////////////////////////////////// - -namespace com { namespace sun { namespace star { namespace linguistic2 { - class XHyphenatedWord; -}}}} - - -struct SvxAlternativeSpelling -{ - String aReplacement; - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XHyphenatedWord > xHyphWord; - INT16 nChangedPos, - nChangedLength; - BOOL bIsAltSpelling; - - inline SvxAlternativeSpelling(); -}; - -inline SvxAlternativeSpelling::SvxAlternativeSpelling() : - nChangedPos(-1), nChangedLength(-1), bIsAltSpelling(FALSE) -{ -} - - -SVX_DLLPUBLIC SvxAlternativeSpelling SvxGetAltSpelling( - const ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XHyphenatedWord > & rHyphWord ); - - -/////////////////////////////////////////////////////////////////////////// - -class SVX_DLLPUBLIC SvxDicListChgClamp -{ -private: - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionaryList > xDicList; - - // disallow access to copy-constructor and assignment-operator - SVX_DLLPRIVATE SvxDicListChgClamp(const SvxDicListChgClamp &); - SVX_DLLPRIVATE SvxDicListChgClamp & operator = (const SvxDicListChgClamp &); - -public: - SvxDicListChgClamp( ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionaryList > &rxDicList ); - ~SvxDicListChgClamp(); -}; - -/////////////////////////////////////////////////////////////////////////// - -//TL:TODO: remove those functions or make them inline -SVX_DLLPUBLIC ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellChecker1 > SvxGetSpellChecker(); -SVX_DLLPUBLIC ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XHyphenator > SvxGetHyphenator(); -SVX_DLLPUBLIC ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XThesaurus > SvxGetThesaurus(); -SVX_DLLPUBLIC ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionaryList > SvxGetDictionaryList(); -SVX_DLLPUBLIC ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > SvxGetLinguPropertySet(); -//TL:TODO: remove argument or provide SvxGetIgnoreAllList with the same one -SVX_DLLPUBLIC ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionary > SvxGetOrCreatePosDic( - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionaryList > xDicList ); -SVX_DLLPUBLIC ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionary > SvxGetIgnoreAllList(); -SVX_DLLPUBLIC ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionary > SvxGetChangeAllList(); - -/////////////////////////////////////////////////////////////////////////// -// misc functions -// - -SVX_DLLPUBLIC LanguageType SvxLocaleToLanguage( - const ::com::sun::star::lang::Locale& rLocale ); -SVX_DLLPUBLIC ::com::sun::star::lang::Locale& SvxLanguageToLocale( - ::com::sun::star::lang::Locale& rLocale, LanguageType eLang ); -SVX_DLLPUBLIC ::com::sun::star::lang::Locale SvxCreateLocale( LanguageType eLang ); - - -SVX_DLLPUBLIC short SvxDicError( Window *pParent, sal_Int16 nError ); - - -#endif - - - diff --git a/svx/inc/unomaster.hxx b/svx/inc/unomaster.hxx index 6704bfa6f173..06f716705233 100644 --- a/svx/inc/unomaster.hxx +++ b/svx/inc/unomaster.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: unomaster.hxx,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/unomlstr.hxx b/svx/inc/unomlstr.hxx index 6e80340ed475..eb91531e7f11 100644 --- a/svx/inc/unomlstr.hxx +++ b/svx/inc/unomlstr.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: unomlstr.hxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/unonrule.hxx b/svx/inc/unonrule.hxx deleted file mode 100644 index 70ae33c75d84..000000000000 --- a/svx/inc/unonrule.hxx +++ /dev/null @@ -1,49 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: unonrule.hxx,v $ - * $Revision: 1.8 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVX_UNONRULE_HXX -#define _SVX_UNONRULE_HXX - -#include <com/sun/star/container/XIndexReplace.hpp> -#include <com/sun/star/ucb/XAnyCompare.hpp> -#include "svx/svxdllapi.h" - -class SdrModel; -class SvxNumRule; - -SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > SvxCreateNumRule( const SvxNumRule* pRule ) throw(); -SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > SvxCreateNumRule( SdrModel* pModel ) throw(); -const SvxNumRule& SvxGetNumRule( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > xRule ) throw( ::com::sun::star::lang::IllegalArgumentException ); -bool SvxGetNumRule( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > xRule, SvxNumRule& rNumRule ); -SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompare > SvxCreateNumRuleCompare() throw(); - -#endif - - diff --git a/svx/inc/unopool.hxx b/svx/inc/unopool.hxx index 6330097d3a71..c34105efb448 100644 --- a/svx/inc/unopool.hxx +++ b/svx/inc/unopool.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: unopool.hxx,v $ - * $Revision: 1.8 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/unoshcol.hxx b/svx/inc/unoshcol.hxx index eda96d6775e6..422f6fc24029 100644 --- a/svx/inc/unoshcol.hxx +++ b/svx/inc/unoshcol.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: unoshcol.hxx,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/verttexttbxctrl.hxx b/svx/inc/verttexttbxctrl.hxx index 02185e9b1e23..8c350e31918b 100644 --- a/svx/inc/verttexttbxctrl.hxx +++ b/svx/inc/verttexttbxctrl.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: verttexttbxctrl.hxx,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/wrapfield.hxx b/svx/inc/wrapfield.hxx index 62a797aeda57..1b4d745c55f8 100644 --- a/svx/inc/wrapfield.hxx +++ b/svx/inc/wrapfield.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: wrapfield.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/xattr.hxx b/svx/inc/xattr.hxx index bbd14abf0c99..20035f7743e7 100644 --- a/svx/inc/xattr.hxx +++ b/svx/inc/xattr.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xattr.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/xexch.hxx b/svx/inc/xexch.hxx index 4042303be3ae..ff317f0a7541 100644 --- a/svx/inc/xexch.hxx +++ b/svx/inc/xexch.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xexch.hxx,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/xmlcnitm.hxx b/svx/inc/xmlcnitm.hxx deleted file mode 100644 index 22b6e02955a0..000000000000 --- a/svx/inc/xmlcnitm.hxx +++ /dev/null @@ -1,94 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: xmlcnitm.hxx,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVX_XMLCNITM_HXX -#define _SVX_XMLCNITM_HXX - -#include <svl/poolitem.hxx> -#include "svx/svxdllapi.h" - -class SvXMLNamespaceMap; -namespace rtl { class OUString; } - -//============================================================================ - -class SvXMLAttrContainerData; - -class SVX_DLLPUBLIC SvXMLAttrContainerItem: public SfxPoolItem -{ - SvXMLAttrContainerData *pImpl; - -public: - TYPEINFO(); - - SvXMLAttrContainerItem( sal_uInt16 nWhich = 0 ); - SvXMLAttrContainerItem( const SvXMLAttrContainerItem& ); - virtual ~SvXMLAttrContainerItem(); - - virtual int operator==( const SfxPoolItem& ) const; - using SfxPoolItem::Compare; - virtual int Compare( const SfxPoolItem &rWith ) const; - - virtual SfxItemPresentation GetPresentation( - SfxItemPresentation ePresentation, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresentationMetric, - XubString &rText, - const IntlWrapper *pIntlWrapper = 0 ) const; - - 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 SfxPoolItem *Clone( SfxItemPool * = 0) const - { return new SvXMLAttrContainerItem( *this ); } - - sal_Bool AddAttr( const ::rtl::OUString& rLName, - const ::rtl::OUString& rValue ); - sal_Bool AddAttr( const ::rtl::OUString& rPrefix, - const ::rtl::OUString& rNamespace, - const ::rtl::OUString& rLName, - const ::rtl::OUString& rValue ); - - sal_uInt16 GetAttrCount() const; - ::rtl::OUString GetAttrNamespace( sal_uInt16 i ) const; - ::rtl::OUString GetAttrPrefix( sal_uInt16 i ) const; - const ::rtl::OUString& GetAttrLName( sal_uInt16 i ) const; - const ::rtl::OUString& GetAttrValue( sal_uInt16 i ) const; - - sal_uInt16 GetFirstNamespaceIndex() const; - sal_uInt16 GetNextNamespaceIndex( sal_uInt16 nIdx ) const; - const ::rtl::OUString& GetNamespace( sal_uInt16 i ) const; - const ::rtl::OUString& GetPrefix( sal_uInt16 i ) const; -}; - -#endif // _SVX_XMLCNITM_HXX - diff --git a/svx/inc/xmleohlp.hxx b/svx/inc/xmleohlp.hxx index 3c7a06b57ada..211e17ca1801 100644 --- a/svx/inc/xmleohlp.hxx +++ b/svx/inc/xmleohlp.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xmleohlp.hxx,v $ - * $Revision: 1.14 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/xmlexchg.hxx b/svx/inc/xmlexchg.hxx index 4debd9ba6822..f4820e0eb6fe 100644 --- a/svx/inc/xmlexchg.hxx +++ b/svx/inc/xmlexchg.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xmlexchg.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/xmlgrhlp.hxx b/svx/inc/xmlgrhlp.hxx index 77e6eb0be322..e17c78cd5ccb 100644 --- a/svx/inc/xmlgrhlp.hxx +++ b/svx/inc/xmlgrhlp.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xmlgrhlp.hxx,v $ - * $Revision: 1.17 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -33,7 +30,7 @@ #include <cppuhelper/compbase2.hxx> #include <osl/mutex.hxx> -#include <goodies/grfmgr.hxx> +#include <svtools/grfmgr.hxx> #include <vector> #include <set> #include <utility> diff --git a/svx/inc/xmlsecctrl.hxx b/svx/inc/xmlsecctrl.hxx index 67d58b08e3c1..aa1a38f183bd 100644 --- a/svx/inc/xmlsecctrl.hxx +++ b/svx/inc/xmlsecctrl.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xmlsecctrl.hxx,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/xoutbmp.hxx b/svx/inc/xoutbmp.hxx index 6bbbb0b1073a..726eb2f83d9c 100644 --- a/svx/inc/xoutbmp.hxx +++ b/svx/inc/xoutbmp.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xoutbmp.hxx,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/xpolyimp.hxx b/svx/inc/xpolyimp.hxx index acc13be87c74..a0af47a95cdd 100644 --- a/svx/inc/xpolyimp.hxx +++ b/svx/inc/xpolyimp.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: xpolyimp.hxx,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/svx/inc/zoomctrl.hxx b/svx/inc/zoomctrl.hxx index 9dac61f4ec50..ea3ecdb33025 100644 --- a/svx/inc/zoomctrl.hxx +++ b/svx/inc/zoomctrl.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: zoomctrl.hxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify |