diff options
Diffstat (limited to 'sc/source/ui/inc')
247 files changed, 6665 insertions, 6665 deletions
diff --git a/sc/source/ui/inc/AccessibilityHints.hxx b/sc/source/ui/inc/AccessibilityHints.hxx index dee0c99d4861..6f6de13430d3 100644 --- a/sc/source/ui/inc/AccessibilityHints.hxx +++ b/sc/source/ui/inc/AccessibilityHints.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,10 +34,10 @@ #include <svl/smplhint.hxx> #include <svl/hint.hxx> -#define SC_HINT_ACC_SIMPLE_START SFX_HINT_USER00 -#define SC_HINT_ACC_TABLECHANGED SC_HINT_ACC_SIMPLE_START + 1 -#define SC_HINT_ACC_CURSORCHANGED SC_HINT_ACC_SIMPLE_START + 2 -#define SC_HINT_ACC_VISAREACHANGED SC_HINT_ACC_SIMPLE_START + 3 +#define SC_HINT_ACC_SIMPLE_START SFX_HINT_USER00 +#define SC_HINT_ACC_TABLECHANGED SC_HINT_ACC_SIMPLE_START + 1 +#define SC_HINT_ACC_CURSORCHANGED SC_HINT_ACC_SIMPLE_START + 2 +#define SC_HINT_ACC_VISAREACHANGED SC_HINT_ACC_SIMPLE_START + 3 #define SC_HINT_ACC_ENTEREDITMODE SC_HINT_ACC_SIMPLE_START + 4 #define SC_HINT_ACC_LEAVEEDITMODE SC_HINT_ACC_SIMPLE_START + 5 #define SC_HINT_ACC_MAKEDRAWLAYER SC_HINT_ACC_SIMPLE_START + 6 @@ -49,7 +49,7 @@ class ScAccWinFocusLostHint : public SfxHint xOldAccessible; public: TYPEINFO(); - ScAccWinFocusLostHint( + ScAccWinFocusLostHint( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xOld ); ~ScAccWinFocusLostHint(); @@ -63,7 +63,7 @@ class ScAccWinFocusGotHint : public SfxHint xNewAccessible; public: TYPEINFO(); - ScAccWinFocusGotHint( + ScAccWinFocusGotHint( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xNew ); ~ScAccWinFocusGotHint(); @@ -73,26 +73,26 @@ public: class ScAccGridWinFocusLostHint : public ScAccWinFocusLostHint { - ScSplitPos eOldGridWin; + ScSplitPos eOldGridWin; public: TYPEINFO(); - ScAccGridWinFocusLostHint( ScSplitPos eOldGridWin, + ScAccGridWinFocusLostHint( ScSplitPos eOldGridWin, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xOld ); ~ScAccGridWinFocusLostHint(); - ScSplitPos GetOldGridWin() const { return eOldGridWin; } + ScSplitPos GetOldGridWin() const { return eOldGridWin; } }; class ScAccGridWinFocusGotHint : public ScAccWinFocusGotHint { - ScSplitPos eNewGridWin; + ScSplitPos eNewGridWin; public: TYPEINFO(); ScAccGridWinFocusGotHint( ScSplitPos eNewGridWin, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xNew ); ~ScAccGridWinFocusGotHint(); - ScSplitPos GetNewGridWin() const { return eNewGridWin; } + ScSplitPos GetNewGridWin() const { return eNewGridWin; } }; #endif diff --git a/sc/source/ui/inc/AccessibleCell.hxx b/sc/source/ui/inc/AccessibleCell.hxx index 6d0c1dfb524b..e40636a2660a 100644 --- a/sc/source/ui/inc/AccessibleCell.hxx +++ b/sc/source/ui/inc/AccessibleCell.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,12 +41,12 @@ class ScTabViewShell; class ScAccessibleDocument; -/** @descr +/** @descr This base class provides an implementation of the <code>AccessibleCell</code> service. */ class ScAccessibleCell - : public ScAccessibleCellBase, + : public ScAccessibleCellBase, public accessibility::AccessibleStaticTextBase { public: @@ -90,31 +90,31 @@ public: throw (::com::sun::star::uno::RuntimeException); protected: - /// Return the object's current bounding box relative to the desktop. + /// Return the object's current bounding box relative to the desktop. virtual Rectangle GetBoundingBoxOnScreen(void) const throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current bounding box relative to the parent object. + /// Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException); public: ///===== XAccessibleContext ============================================== - /// Return the number of currently visible children. + /// Return the number of currently visible children. // is overloaded to calculate this on demand virtual sal_Int32 SAL_CALL getAccessibleChildCount(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the specified child or NULL if index is invalid. + /// Return the specified child or NULL if index is invalid. // is overloaded to calculate this on demand virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException); - /// Return the set of current states. + /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet(void) @@ -127,7 +127,7 @@ public: ///===== XServiceInfo ==================================================== - /** Returns an identifier for the implementation of this object. + /** Returns an identifier for the implementation of this object. */ virtual ::rtl::OUString SAL_CALL getImplementationName(void) diff --git a/sc/source/ui/inc/AccessibleCellBase.hxx b/sc/source/ui/inc/AccessibleCellBase.hxx index fb79d76c91a1..1edbe7f1b878 100644 --- a/sc/source/ui/inc/AccessibleCellBase.hxx +++ b/sc/source/ui/inc/AccessibleCellBase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ typedef cppu::ImplHelper1< ::com::sun::star::accessibility::XAccessibleValue> ScAccessibleCellBaseImpl; class ScAccessibleCellBase - : public ScAccessibleContextBase, + : public ScAccessibleContextBase, public ScAccessibleCellBaseImpl { public: @@ -59,12 +59,12 @@ public: ///===== XInterface ===================================================== - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - ::com::sun::star::uno::Type const & rType ) + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( + ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL acquire() throw (); - + virtual void SAL_CALL release() throw (); ///===== XAccessibleComponent ============================================ @@ -72,26 +72,26 @@ public: virtual sal_Bool SAL_CALL isVisible( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getForeground( ) + virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBackground( ) + virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException); ///===== XAccessibleContext ============================================== - /// Return this objects index among the parents children. - virtual sal_Int32 SAL_CALL + /// Return this objects index among the parents children. + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(void) throw (::com::sun::star::uno::RuntimeException); protected: - /// Return this object's description. + /// Return this object's description. virtual ::rtl::OUString SAL_CALL createAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current name. + /// Return the object's current name. virtual ::rtl::OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); @@ -117,7 +117,7 @@ public: ///===== XServiceInfo ==================================================== - /** Returns an identifier for the implementation of this object. + /** Returns an identifier for the implementation of this object. */ virtual ::rtl::OUString SAL_CALL getImplementationName(void) @@ -126,11 +126,11 @@ public: ///===== XTypeProvider =================================================== /// returns the possible types - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL - getTypes() + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL + getTypes() throw (::com::sun::star::uno::RuntimeException); - /** Returns a implementation id. + /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(void) @@ -148,7 +148,7 @@ private: const com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); }; - + #endif diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx index 245122f5b73a..8db6137b2147 100644 --- a/sc/source/ui/inc/AccessibleContextBase.hxx +++ b/sc/source/ui/inc/AccessibleContextBase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ class Rectangle; -/** @descr +/** @descr This base class provides an implementation of the <code>AccessibleContext</code> service. */ @@ -72,7 +72,7 @@ typedef cppu::ImplHelper1< > ScAccessibleContextBaseImplEvent; class ScAccessibleContextBase - : public comphelper::OBaseMutex, + : public comphelper::OBaseMutex, public ScAccessibleContextBaseWeakImpl, public ScAccessibleContextBaseImplEvent, public SfxListener @@ -108,7 +108,7 @@ public: ///===== XAccessible ===================================================== - /// Return the XAccessibleContext. + /// Return the XAccessibleContext. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext(void) throw (::com::sun::star::uno::RuntimeException); @@ -144,62 +144,62 @@ public: virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getForeground( ) + virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBackground( ) + virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException); ///===== XAccessibleContext ============================================== - /// Return the number of currently visible children. + /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL getAccessibleChildCount(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the specified child or NULL if index is invalid. + /// Return the specified child or NULL if index is invalid. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException); - /// Return a reference to the parent. + /// Return a reference to the parent. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleParent(void) throw (::com::sun::star::uno::RuntimeException); - /// Return this objects index among the parents children. - virtual sal_Int32 SAL_CALL + /// Return this objects index among the parents children. + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(void) throw (::com::sun::star::uno::RuntimeException); - /// Return this object's role. + /// Return this object's role. virtual sal_Int16 SAL_CALL getAccessibleRole(void) throw (::com::sun::star::uno::RuntimeException); - /// Return this object's description. + /// Return this object's description. virtual ::rtl::OUString SAL_CALL getAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current name. + /// Return the object's current name. virtual ::rtl::OUString SAL_CALL getAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); - /// Return NULL to indicate that an empty relation set. + /// Return NULL to indicate that an empty relation set. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the set of current states. + /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet(void) throw (::com::sun::star::uno::RuntimeException); - /** Return the parents locale or throw exception if this object has no + /** Return the parents locale or throw exception if this object has no parent yet/anymore. */ virtual ::com::sun::star::lang::Locale SAL_CALL @@ -209,7 +209,7 @@ public: ///===== XAccessibleEventBroadcaster ===================================== - /** Add listener that is informed of future changes of name, + /** Add listener that is informed of future changes of name, description and so on events. */ virtual void SAL_CALL @@ -218,7 +218,7 @@ public: ::com::sun::star::accessibility::XAccessibleEventListener>& xListener) throw (com::sun::star::uno::RuntimeException); - // Remove an existing event listener. + // Remove an existing event listener. virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< @@ -238,13 +238,13 @@ public: ///===== XServiceInfo ==================================================== - /** Returns an identifier for the implementation of this object. + /** Returns an identifier for the implementation of this object. */ virtual ::rtl::OUString SAL_CALL getImplementationName(void) throw (::com::sun::star::uno::RuntimeException); - /** Return whether the specified service is supported by this class. + /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& sServiceName) @@ -264,28 +264,28 @@ public: getTypes() throw (::com::sun::star::uno::RuntimeException); - /** Returns a implementation id. + /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(void) throw (::com::sun::star::uno::RuntimeException); protected: - /// Return this object's description. + /// Return this object's description. virtual ::rtl::OUString SAL_CALL createAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current name. + /// Return the object's current name. virtual ::rtl::OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current bounding box relative to the desktop. + /// Return the object's current bounding box relative to the desktop. virtual Rectangle GetBoundingBoxOnScreen(void) const throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current bounding box relative to the parent object. + /// Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException); @@ -315,18 +315,18 @@ protected: /// Use this method to set initial Description without notification void SetDescription(const rtl::OUString& rDesc) { msDescription = rDesc; } - /// Reference to the parent object. + /// Reference to the parent object. ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> mxParent; private: - /** Description of this object. This is not a constant because it can + /** Description of this object. This is not a constant because it can be set from the outside. Furthermore, it changes according the the draw page's display mode. */ ::rtl::OUString msDescription; - /** Name of this object. It changes according the the draw page's + /** Name of this object. It changes according the the draw page's display mode. */ ::rtl::OUString msName; diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxx index 87cd4f8d7d26..f4eb41dd3c9a 100644 --- a/sc/source/ui/inc/AccessibleCsvControl.hxx +++ b/sc/source/ui/inc/AccessibleCsvControl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/inc/AccessibleDataPilotControl.hxx b/sc/source/ui/inc/AccessibleDataPilotControl.hxx index 7d9c3f470bb8..1b6578c41e16 100644 --- a/sc/source/ui/inc/AccessibleDataPilotControl.hxx +++ b/sc/source/ui/inc/AccessibleDataPilotControl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ class ScDPFieldWindow; class ScAccessibleDataPilotButton; class ScAccessibleDataPilotControl - : public ScAccessibleContextBase + : public ScAccessibleContextBase { public: //===== internal ======================================================== @@ -72,25 +72,25 @@ public: virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getForeground( ) + virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBackground( ) + virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException); ///===== XAccessibleContext ============================================== - /// Return the number of currently visible children. + /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL getAccessibleChildCount(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the specified child or NULL if index is invalid. + /// Return the specified child or NULL if index is invalid. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException); - /// Return the set of current states. + /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet(void) @@ -98,7 +98,7 @@ public: ///===== XServiceInfo ==================================================== - /** Returns an identifier for the implementation of this object. + /** Returns an identifier for the implementation of this object. */ virtual ::rtl::OUString SAL_CALL getImplementationName(void) @@ -106,28 +106,28 @@ public: ///===== XTypeProvider =================================================== - /** Returns a implementation id. + /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(void) throw (::com::sun::star::uno::RuntimeException); protected: - /// Return this object's description. + /// Return this object's description. virtual ::rtl::OUString SAL_CALL createAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current name. + /// Return the object's current name. virtual ::rtl::OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current bounding box relative to the desktop. + /// Return the object's current bounding box relative to the desktop. virtual Rectangle GetBoundingBoxOnScreen(void) const throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current bounding box relative to the parent object. + /// Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException); diff --git a/sc/source/ui/inc/AccessibleDocument.hxx b/sc/source/ui/inc/AccessibleDocument.hxx index fbfa0667f68f..7facaf856d6f 100644 --- a/sc/source/ui/inc/AccessibleDocument.hxx +++ b/sc/source/ui/inc/AccessibleDocument.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ namespace utl class AccessibleRelationSetHelper; } -/** @descr +/** @descr This base class provides an implementation of the <code>AccessibleContext</code> service. */ @@ -61,7 +61,7 @@ typedef cppu::ImplHelper2< ::com::sun::star::accessibility::XAccessibleSelection ScAccessibleDocumentImpl; class ScAccessibleDocument - : public ScAccessibleDocumentBase, + : public ScAccessibleDocumentBase, public ScAccessibleDocumentImpl, public accessibility::IAccessibleViewForwarder { @@ -72,7 +72,7 @@ public: ::com::sun::star::accessibility::XAccessible>& rxParent, ScTabViewShell* pViewShell, ScSplitPos eSplitPos); - + virtual void Init(); @@ -92,12 +92,12 @@ public: ///===== XInterface ===================================================== - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - ::com::sun::star::uno::Type const & rType ) + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( + ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL acquire() throw (); - + virtual void SAL_CALL release() throw (); ///===== XAccessibleComponent ============================================ @@ -112,18 +112,18 @@ public: ///===== XAccessibleContext ============================================== - /// Return the number of currently visible children. + /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL getAccessibleChildCount(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the specified child or NULL if index is invalid. + /// Return the specified child or NULL if index is invalid. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException); - /// Return the set of current states. + /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet(void) @@ -131,42 +131,42 @@ public: ///===== XAccessibleSelection =========================================== - virtual void SAL_CALL - selectAccessibleChild( sal_Int32 nChildIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, + 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 ) + 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( ) + virtual void SAL_CALL + clearAccessibleSelection( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL - selectAllAccessibleChildren( ) + virtual void SAL_CALL + selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL - getSelectedAccessibleChildCount( ) + 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 ) + ::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 nChildIndex ) + virtual void SAL_CALL + deselectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); ///===== XSelectionListener ============================================= - virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) + virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) @@ -174,7 +174,7 @@ public: ///===== XServiceInfo =================================================== - /** Returns an identifier for the implementation of this object. + /** Returns an identifier for the implementation of this object. */ virtual ::rtl::OUString SAL_CALL getImplementationName(void) @@ -189,11 +189,11 @@ public: ///===== XTypeProvider =================================================== /// returns the possible types - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL - getTypes() + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL + getTypes() throw (::com::sun::star::uno::RuntimeException); - /** Returns a implementation id. + /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(void) @@ -212,7 +212,7 @@ public: /** Returns the area of the underlying document that is visible in the * corresponding window. - @return + @return The rectangle of the visible part of the document. The values are, contrary to the base class, in internal coordinates. */ @@ -224,7 +224,7 @@ public: @param rPoint Point in internal coordinates. - @return + @return The same point but in screen coordinates relative to the upper left corner of the (current) screen. */ @@ -236,7 +236,7 @@ public: @param rSize Size in internal coordinates. - @return + @return The same size but in screen coordinates. */ virtual Size LogicToPixel (const Size& rSize) const; @@ -248,7 +248,7 @@ public: Point in screen coordinates relative to the upper left corner of the (current) screen. - @return + @return The same point but in internal coordinates. */ virtual Point PixelToLogic (const Point& rPoint) const; @@ -265,7 +265,7 @@ public: virtual Size PixelToLogic (const Size& rSize) const; ///======== internal ===================================================== - + utl::AccessibleRelationSetHelper* GetRelationSet(const ScAddress* pAddress) const; ::com::sun::star::uno::Reference @@ -273,27 +273,27 @@ public: GetAccessibleSpreadsheet(); protected: - /// Return this object's description. + /// Return this object's description. virtual ::rtl::OUString SAL_CALL createAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current name. + /// Return the object's current name. virtual ::rtl::OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current bounding box relative to the desktop. + /// Return the object's current bounding box relative to the desktop. virtual Rectangle GetBoundingBoxOnScreen(void) const throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current bounding box relative to the parent object. + /// Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException); private: - ScTabViewShell* mpViewShell; - ScSplitPos meSplitPos; + ScTabViewShell* mpViewShell; + ScSplitPos meSplitPos; ScAccessibleSpreadsheet* mpAccessibleSpreadsheet; ScChildrenShapes* mpChildrenShapes; ScAccessibleEditObject* mpTempAccEdit; diff --git a/sc/source/ui/inc/AccessibleDocumentBase.hxx b/sc/source/ui/inc/AccessibleDocumentBase.hxx index eeab25f7af1c..5a5ebdb191b1 100644 --- a/sc/source/ui/inc/AccessibleDocumentBase.hxx +++ b/sc/source/ui/inc/AccessibleDocumentBase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ #include "AccessibleContextBase.hxx" class ScAccessibleDocumentBase - : public ScAccessibleContextBase + : public ScAccessibleContextBase { public: //===== internal ======================================================== @@ -41,7 +41,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent); protected: - virtual ~ScAccessibleDocumentBase (void); + virtual ~ScAccessibleDocumentBase (void); }; diff --git a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx index b524c6f5ffa3..058d92c238a8 100644 --- a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx +++ b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ class ScAccessiblePreviewTable; class ScAccessiblePageHeader; class ScAccessibleDocumentPagePreview - : public ScAccessibleDocumentBase + : public ScAccessibleDocumentBase { public: //===== internal ======================================================== @@ -73,18 +73,18 @@ public: ///===== XAccessibleContext ============================================== - /// Return the number of currently visible children. + /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL getAccessibleChildCount(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the specified child or NULL if index is invalid. + /// Return the specified child or NULL if index is invalid. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException); - /// Return the set of current states. + /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet(void) @@ -92,7 +92,7 @@ public: ///===== XServiceInfo ==================================================== - /** Returns an identifier for the implementation of this object. + /** Returns an identifier for the implementation of this object. */ virtual ::rtl::OUString SAL_CALL getImplementationName(void) @@ -106,7 +106,7 @@ public: ///===== XTypeProvider =================================================== - /** Returns a implementation id. + /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(void) @@ -115,28 +115,28 @@ public: ///===== internal ======================================================== protected: - /// Return this object's description. + /// Return this object's description. virtual ::rtl::OUString SAL_CALL createAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current name. + /// Return the object's current name. virtual ::rtl::OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); public: // needed in ScShapeChilds - /// Return the object's current bounding box relative to the desktop. + /// Return the object's current bounding box relative to the desktop. virtual Rectangle GetBoundingBoxOnScreen(void) const throw (::com::sun::star::uno::RuntimeException); protected: - /// Return the object's current bounding box relative to the parent object. + /// Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException); private: - ScPreviewShell* mpViewShell; + ScPreviewShell* mpViewShell; ScNotesChilds* mpNotesChilds; ScShapeChilds* mpShapeChilds; ScAccessiblePreviewTable* mpTable; diff --git a/sc/source/ui/inc/AccessibleEditObject.hxx b/sc/source/ui/inc/AccessibleEditObject.hxx index 5dd40f7c0d62..690dea145b62 100644 --- a/sc/source/ui/inc/AccessibleEditObject.hxx +++ b/sc/source/ui/inc/AccessibleEditObject.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,19 +46,19 @@ enum EditObjectType EditControl }; -/** @descr +/** @descr This base class provides an implementation of the <code>AccessibleCell</code> service. */ class ScAccessibleEditObject - : public ScAccessibleContextBase + : public ScAccessibleContextBase { public: //===== internal ======================================================== ScAccessibleEditObject( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, - EditView* pEditView, Window* pWin, const rtl::OUString& rName, + EditView* pEditView, Window* pWin, const rtl::OUString& rName, const rtl::OUString& rDescription, EditObjectType eObjectType); protected: @@ -85,43 +85,43 @@ public: throw (::com::sun::star::uno::RuntimeException); protected: - /// Return the object's current bounding box relative to the desktop. + /// Return the object's current bounding box relative to the desktop. virtual Rectangle GetBoundingBoxOnScreen(void) const throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current bounding box relative to the parent object. + /// Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException); public: ///===== XAccessibleContext ============================================== - /// Return the number of currently visible children. + /// Return the number of currently visible children. // is overloaded to calculate this on demand virtual sal_Int32 SAL_CALL getAccessibleChildCount(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the specified child or NULL if index is invalid. + /// Return the specified child or NULL if index is invalid. // is overloaded to calculate this on demand virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException); - /// Return the set of current states. + /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet(void) throw (::com::sun::star::uno::RuntimeException); protected: - /// Return this object's description. + /// Return this object's description. virtual ::rtl::OUString SAL_CALL createAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current name. + /// Return the object's current name. virtual ::rtl::OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); @@ -129,7 +129,7 @@ protected: public: ///===== XAccessibleEventBroadcaster ===================================== - /** Add listener that is informed of future changes of name, + /** Add listener that is informed of future changes of name, description and so on events. */ virtual void SAL_CALL @@ -138,7 +138,7 @@ public: ::com::sun::star::accessibility::XAccessibleEventListener>& xListener) throw (com::sun::star::uno::RuntimeException); - // Remove an existing event listener. + // Remove an existing event listener. virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< @@ -147,7 +147,7 @@ public: ///===== XServiceInfo ==================================================== - /** Returns an identifier for the implementation of this object. + /** Returns an identifier for the implementation of this object. */ virtual ::rtl::OUString SAL_CALL getImplementationName(void) @@ -155,7 +155,7 @@ public: ///===== XTypeProvider =================================================== - /** Returns a implementation id. + /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(void) diff --git a/sc/source/ui/inc/AccessiblePageHeader.hxx b/sc/source/ui/inc/AccessiblePageHeader.hxx index b3598adf7469..acacbc933745 100644 --- a/sc/source/ui/inc/AccessiblePageHeader.hxx +++ b/sc/source/ui/inc/AccessiblePageHeader.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,7 +63,7 @@ public: 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); - virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException); //===== XAccessibleContext ============================================== @@ -94,9 +94,9 @@ protected: virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException); private: - ScPreviewShell* mpViewShell; - sal_Int32 mnIndex; - sal_Bool mbHeader; + ScPreviewShell* mpViewShell; + sal_Int32 mnIndex; + sal_Bool mbHeader; typedef std::vector< ScAccessiblePageHeaderArea* > ScHFAreas; ScHFAreas maAreas; sal_Int32 mnChildCount; diff --git a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx index 3f907e5609ed..c0c3758549d9 100644 --- a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx +++ b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ namespace accessibility class ScPreviewShell; class ScAccessiblePageHeaderArea - : public ScAccessibleContextBase + : public ScAccessibleContextBase { public: //===== internal ======================================================== @@ -53,7 +53,7 @@ public: sal_Bool bHeader, SvxAdjust eAdjust); protected: - virtual ~ScAccessiblePageHeaderArea (void); + virtual ~ScAccessiblePageHeaderArea (void); public: const EditTextObject* GetEditTextObject() const { return mpEditObj; } @@ -73,20 +73,20 @@ public: ///===== XAccessibleContext ============================================== - /// Return the number of currently visible children. + /// Return the number of currently visible children. // is overloaded to calculate this on demand virtual sal_Int32 SAL_CALL getAccessibleChildCount(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the specified child or NULL if index is invalid. + /// Return the specified child or NULL if index is invalid. // is overloaded to calculate this on demand virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException); - /// Return the set of current states. + /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet(void) @@ -94,7 +94,7 @@ public: ///===== XServiceInfo ==================================================== - /** Returns an identifier for the implementation of this object. + /** Returns an identifier for the implementation of this object. */ virtual ::rtl::OUString SAL_CALL getImplementationName(void) @@ -109,7 +109,7 @@ public: ///===== XTypeProvider =================================================== - /** Returns a implementation id. + /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(void) diff --git a/sc/source/ui/inc/AccessiblePreviewCell.hxx b/sc/source/ui/inc/AccessiblePreviewCell.hxx index 02090ad207f9..e4509a64754f 100644 --- a/sc/source/ui/inc/AccessiblePreviewCell.hxx +++ b/sc/source/ui/inc/AccessiblePreviewCell.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,7 +66,7 @@ public: 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); - virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException); //===== XAccessibleContext ============================================== @@ -89,7 +89,7 @@ public: ///===== XTypeProvider =================================================== - /** Returns a implementation id. + /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(void) diff --git a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx index f3e8d7b29ea3..5f013ac62aed 100644 --- a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx +++ b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,12 +72,12 @@ public: ///===== XInterface ===================================================== - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - ::com::sun::star::uno::Type const & rType ) + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( + ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL acquire() throw (); - + virtual void SAL_CALL release() throw (); //===== XAccessibleValue ================================================ @@ -93,7 +93,7 @@ public: 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); - virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException); //===== XAccessibleContext ============================================== @@ -115,11 +115,11 @@ public: ///===== XTypeProvider =================================================== - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL - getTypes() + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL + getTypes() throw (::com::sun::star::uno::RuntimeException); - /** Returns a implementation id. + /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(void) @@ -133,20 +133,20 @@ protected: virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException); private: - ScPreviewShell* mpViewShell; + ScPreviewShell* mpViewShell; accessibility::AccessibleTextHelper* mpTextHelper; - sal_Int32 mnIndex; - ScAddress maCellPos; - sal_Bool mbColumnHeader; - sal_Bool mbRowHeader; - mutable ScPreviewTableInfo* mpTableInfo; + sal_Int32 mnIndex; + ScAddress maCellPos; + sal_Bool mbColumnHeader; + sal_Bool mbRowHeader; + mutable ScPreviewTableInfo* mpTableInfo; sal_Bool IsDefunc( const com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); void CreateTextHelper(); - void FillTableInfo() const; + void FillTableInfo() const; }; diff --git a/sc/source/ui/inc/AccessiblePreviewTable.hxx b/sc/source/ui/inc/AccessiblePreviewTable.hxx index 9dfbcfbd6662..31c55d9bb383 100644 --- a/sc/source/ui/inc/AccessiblePreviewTable.hxx +++ b/sc/source/ui/inc/AccessiblePreviewTable.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,12 +64,12 @@ public: ///===== XInterface ===================================================== - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - ::com::sun::star::uno::Type const & rType ) + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( + ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL acquire() throw (); - + virtual void SAL_CALL release() throw (); //===== XAccessibleTable ================================================ @@ -128,7 +128,7 @@ public: 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); - virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException); //===== XAccessibleContext ============================================== @@ -150,8 +150,8 @@ public: //===== XTypeProvider =================================================== - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL - getTypes() + 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() @@ -168,15 +168,15 @@ protected: virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException); private: - ScPreviewShell* mpViewShell; - sal_Int32 mnIndex; - mutable ScPreviewTableInfo* mpTableInfo; + ScPreviewShell* mpViewShell; + sal_Int32 mnIndex; + mutable ScPreviewTableInfo* mpTableInfo; sal_Bool IsDefunc( const com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); - void FillTableInfo() const; + void FillTableInfo() const; }; diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx b/sc/source/ui/inc/AccessibleSpreadsheet.hxx index 77fae44a37d1..307d9b282db3 100644 --- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx +++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,19 +55,19 @@ class ScTabViewShell; class ScAccessibleDocument; class ScAccessibleCell; -/** @descr +/** @descr This base class provides an implementation of the <code>AccessibleTable</code> service. */ class ScAccessibleSpreadsheet - : public ScAccessibleTableBase + : public ScAccessibleTableBase { public: //===== internal ======================================================== ScAccessibleSpreadsheet( ScAccessibleDocument* pAccDoc, ScTabViewShell* pViewShell, - SCTAB nTab, + SCTAB nTab, ScSplitPos eSplitPos); protected: ScAccessibleSpreadsheet( @@ -170,13 +170,13 @@ public: ///===== XAccessibleContext ============================================== - /// Return NULL to indicate that an empty relation set. + /// Return NULL to indicate that an empty relation set. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the set of current states. + /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet(void) @@ -214,7 +214,7 @@ public: ///===== XServiceInfo ==================================================== - /** Returns an identifier for the implementation of this object. + /** Returns an identifier for the implementation of this object. */ virtual ::rtl::OUString SAL_CALL getImplementationName(void) @@ -228,7 +228,7 @@ public: ///===== XTypeProvider =================================================== - /** Returns a implementation id. + /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(void) @@ -236,7 +236,7 @@ public: ///===== XAccessibleEventBroadcaster ===================================== - /** Add listener that is informed of future changes of name, + /** Add listener that is informed of future changes of name, description and so on events. */ virtual void SAL_CALL @@ -246,26 +246,26 @@ public: throw (com::sun::star::uno::RuntimeException); protected: - /// Return the object's current bounding box relative to the desktop. + /// Return the object's current bounding box relative to the desktop. virtual Rectangle GetBoundingBoxOnScreen(void) const throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current bounding box relative to the parent object. + /// Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException); private: ScTabViewShell* mpViewShell; - ScRangeList* mpMarkedRanges; + ScRangeList* mpMarkedRanges; std::vector<ScMyAddress>* mpSortedMarkedCells; ScAccessibleDocument* mpAccDoc; ScAccessibleCell* mpAccCell; - Rectangle maVisCells; - ScSplitPos meSplitPos; - ScAddress maActiveCell; + Rectangle maVisCells; + ScSplitPos meSplitPos; + ScAddress maActiveCell; SCTAB mnTab; sal_Bool mbIsSpreadsheet; - sal_Bool mbHasSelection; - sal_Bool mbDelIns; + sal_Bool mbHasSelection; + sal_Bool mbDelIns; sal_Bool mbIsFocusSend; sal_Bool IsDefunc( @@ -282,8 +282,8 @@ private: void AddMarkedRange(const ScRange& rRange); ScDocument* GetDocument(ScTabViewShell* pViewShell); - Rectangle GetVisArea(ScTabViewShell* pViewShell, ScSplitPos eSplitPos); - Rectangle GetVisCells(const Rectangle& rVisArea); + Rectangle GetVisArea(ScTabViewShell* pViewShell, ScSplitPos eSplitPos); + Rectangle GetVisCells(const Rectangle& rVisArea); }; diff --git a/sc/source/ui/inc/AccessibleTableBase.hxx b/sc/source/ui/inc/AccessibleTableBase.hxx index e436b623397e..4728443783ec 100644 --- a/sc/source/ui/inc/AccessibleTableBase.hxx +++ b/sc/source/ui/inc/AccessibleTableBase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ class ScTabViewShell; -/** @descr +/** @descr This base class provides an implementation of the <code>AccessibleTable</code> service. */ @@ -192,13 +192,13 @@ public: //===== XAccessibleContext ============================================== - /// Return the number of currently visible children. + /// Return the number of currently visible children. // is overloaded to calculate this on demand virtual sal_Int32 SAL_CALL getAccessibleChildCount(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the specified child or NULL if index is invalid. + /// Return the specified child or NULL if index is invalid. // is overloaded to calculate this on demand virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) @@ -206,24 +206,24 @@ public: ::com::sun::star::lang::IndexOutOfBoundsException); protected: - /// Return this object's description. + /// Return this object's description. virtual ::rtl::OUString SAL_CALL createAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current name. + /// Return the object's current name. virtual ::rtl::OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); public: - /// Return NULL to indicate that an empty relation set. + /// Return NULL to indicate that an empty relation set. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the set of current states. + /// Return the set of current states. // perhaps sometimes to be implemented virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL @@ -267,7 +267,7 @@ public: ///===== XServiceInfo =================================================== - /** Returns an identifier for the implementation of this object. + /** Returns an identifier for the implementation of this object. */ virtual ::rtl::OUString SAL_CALL getImplementationName(void) @@ -280,7 +280,7 @@ public: getTypes() throw (::com::sun::star::uno::RuntimeException); - /** Returns a implementation id. + /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(void) @@ -290,7 +290,7 @@ protected: /// contains the range of the table, because it could be a subrange of the complete table ScRange maRange; - ScDocument* mpDoc; + ScDocument* mpDoc; void CommitTableModelChange(sal_Int32 nStartRow, sal_Int32 nStartCol, sal_Int32 nEndRow, sal_Int32 nEndCol, sal_uInt16 nId); }; diff --git a/sc/source/ui/inc/AccessibleText.hxx b/sc/source/ui/inc/AccessibleText.hxx index eaa68f0e6aa2..9c0f327c89e3 100644 --- a/sc/source/ui/inc/AccessibleText.hxx +++ b/sc/source/ui/inc/AccessibleText.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,9 +53,9 @@ class ScAccessibleTextData : public SfxListener { public: ScAccessibleTextData() {} - virtual ~ScAccessibleTextData() {} + virtual ~ScAccessibleTextData() {} - virtual ScAccessibleTextData* Clone() const = 0; + virtual ScAccessibleTextData* Clone() const = 0; virtual void Notify( SfxBroadcaster& /* rBC */, const SfxHint& /* rHint */ ) {} @@ -64,15 +64,15 @@ public: virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate ) = 0; virtual SfxBroadcaster& GetBroadcaster() const { return maBroadcaster; } - virtual void UpdateData() = 0; - virtual void SetDoUpdate(sal_Bool bValue) = 0; - virtual sal_Bool IsDirty() const = 0; + virtual void UpdateData() = 0; + virtual void SetDoUpdate(sal_Bool bValue) = 0; + virtual sal_Bool IsDirty() const = 0; private: mutable SfxBroadcaster maBroadcaster; // prevent the using of this method of the base class - ScSharedCellEditSource* GetOriginalSource() { return NULL; } + ScSharedCellEditSource* GetOriginalSource() { return NULL; } }; @@ -86,28 +86,28 @@ public: const ScAddress& rP) : ScCellTextData(pDocShellP, rP) {} virtual ~ScAccessibleCellBaseTextData() {} - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { ScCellTextData::Notify(rBC, rHint); } + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { ScCellTextData::Notify(rBC, rHint); } - virtual void UpdateData() { ScCellTextData::UpdateData(); } - virtual void SetDoUpdate(sal_Bool bValue) { ScCellTextData::SetDoUpdate(bValue); } - virtual sal_Bool IsDirty() const { return ScCellTextData::IsDirty(); } + virtual void UpdateData() { ScCellTextData::UpdateData(); } + virtual void SetDoUpdate(sal_Bool bValue) { ScCellTextData::SetDoUpdate(bValue); } + virtual sal_Bool IsDirty() const { return ScCellTextData::IsDirty(); } }; // ============================================================================ -// ScAccessibleCellTextData: shared data between sub objects of a accessible cell text object +// ScAccessibleCellTextData: shared data between sub objects of a accessible cell text object class ScAccessibleCellTextData : public ScAccessibleCellBaseTextData { public: ScAccessibleCellTextData(ScTabViewShell* pViewShell, const ScAddress& rP, ScSplitPos eSplitPos, ScAccessibleCell* pAccCell); - virtual ~ScAccessibleCellTextData(); + virtual ~ScAccessibleCellTextData(); - virtual ScAccessibleTextData* Clone() const; + virtual ScAccessibleTextData* Clone() const; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); virtual SvxTextForwarder* GetTextForwarder(); virtual SvxViewForwarder* GetViewForwarder(); @@ -119,13 +119,13 @@ protected: private: ScViewForwarder* mpViewForwarder; ScEditViewForwarder* mpEditViewForwarder; - ScTabViewShell* mpViewShell; + ScTabViewShell* mpViewShell; ScSplitPos meSplitPos; sal_Bool mbViewEditEngine; ScAccessibleCell* mpAccessibleCell; // prevent the using of this method of the base class - ScSharedCellEditSource* GetOriginalSource() { return NULL; } + ScSharedCellEditSource* GetOriginalSource() { return NULL; } using ScAccessibleCellBaseTextData::GetDocShell; ScDocShell* GetDocShell(ScTabViewShell* pViewShell); @@ -138,19 +138,19 @@ class ScAccessibleEditObjectTextData : public ScAccessibleTextData { public: ScAccessibleEditObjectTextData(EditView* pEditView, Window* pWin); - virtual ~ScAccessibleEditObjectTextData(); + virtual ~ScAccessibleEditObjectTextData(); - virtual ScAccessibleTextData* Clone() const; + virtual ScAccessibleTextData* Clone() const; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); virtual SvxTextForwarder* GetTextForwarder(); virtual SvxViewForwarder* GetViewForwarder(); virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate ); - virtual void UpdateData() { } - virtual void SetDoUpdate(sal_Bool /* bValue */) { } - virtual sal_Bool IsDirty() const { return sal_False; } + virtual void UpdateData() { } + virtual void SetDoUpdate(sal_Bool /* bValue */) { } + virtual sal_Bool IsDirty() const { return sal_False; } DECL_LINK( NotifyHdl, EENotify* ); protected: @@ -158,7 +158,7 @@ protected: ScEditViewForwarder* mpEditViewForwarder; EditView* mpEditView; EditEngine* mpEditEngine; - SvxEditEngineForwarder* mpForwarder; + SvxEditEngineForwarder* mpForwarder; Window* mpWindow; }; @@ -194,11 +194,11 @@ class ScAccessiblePreviewCellTextData : public ScAccessibleCellBaseTextData public: ScAccessiblePreviewCellTextData(ScPreviewShell* pViewShell, const ScAddress& rP); - virtual ~ScAccessiblePreviewCellTextData(); + virtual ~ScAccessiblePreviewCellTextData(); - virtual ScAccessibleTextData* Clone() const; + virtual ScAccessibleTextData* Clone() const; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); virtual SvxTextForwarder* GetTextForwarder(); virtual SvxViewForwarder* GetViewForwarder(); @@ -206,10 +206,10 @@ public: private: ScPreviewViewForwarder* mpViewForwarder; - ScPreviewShell* mpViewShell; + ScPreviewShell* mpViewShell; // prevent the using of this method of the base class - ScSharedCellEditSource* GetOriginalSource() { return NULL; } + ScSharedCellEditSource* GetOriginalSource() { return NULL; } using ScAccessibleCellBaseTextData::GetDocShell; ScDocShell* GetDocShell(ScPreviewShell* pViewShell); @@ -223,11 +223,11 @@ class ScAccessiblePreviewHeaderCellTextData : public ScAccessibleCellBaseTextDat public: ScAccessiblePreviewHeaderCellTextData(ScPreviewShell* pViewShell, const String& rText, const ScAddress& rP, sal_Bool bColHeader, sal_Bool bRowHeader); - virtual ~ScAccessiblePreviewHeaderCellTextData(); + virtual ~ScAccessiblePreviewHeaderCellTextData(); - virtual ScAccessibleTextData* Clone() const; + virtual ScAccessibleTextData* Clone() const; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); virtual SvxTextForwarder* GetTextForwarder(); virtual SvxViewForwarder* GetViewForwarder(); @@ -235,13 +235,13 @@ public: private: ScPreviewViewForwarder* mpViewForwarder; - ScPreviewShell* mpViewShell; - String maText; - sal_Bool mbColHeader; - sal_Bool mbRowHeader; + ScPreviewShell* mpViewShell; + String maText; + sal_Bool mbColHeader; + sal_Bool mbRowHeader; // prevent the using of this method of the base class - ScSharedCellEditSource* GetOriginalSource() { return NULL; } + ScSharedCellEditSource* GetOriginalSource() { return NULL; } using ScAccessibleCellBaseTextData::GetDocShell; ScDocShell* GetDocShell(ScPreviewShell* pViewShell); @@ -259,20 +259,20 @@ public: virtual ScAccessibleTextData* Clone() const; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); virtual SvxTextForwarder* GetTextForwarder(); virtual SvxViewForwarder* GetViewForwarder(); virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool /* bCreate */ ) { return NULL; } - virtual void UpdateData() { } - virtual void SetDoUpdate(sal_Bool /* bValue */) { } - virtual sal_Bool IsDirty() const { return sal_False; } + virtual void UpdateData() { } + virtual void SetDoUpdate(sal_Bool /* bValue */) { } + virtual sal_Bool IsDirty() const { return sal_False; } private: ScPreviewViewForwarder* mpViewForwarder; ScPreviewShell* mpViewShell; - ScEditEngineDefaulter* mpEditEngine; - SvxEditEngineForwarder* mpForwarder; + ScEditEngineDefaulter* mpEditEngine; + SvxEditEngineForwarder* mpForwarder; ScDocShell* mpDocSh; const EditTextObject* mpEditObj; sal_Bool mbHeader; @@ -292,20 +292,20 @@ public: virtual ScAccessibleTextData* Clone() const; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); virtual SvxTextForwarder* GetTextForwarder(); virtual SvxViewForwarder* GetViewForwarder(); virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool /* bCreate */ ) { return NULL; } - virtual void UpdateData() { } - virtual void SetDoUpdate(sal_Bool /* bValue */) { } - virtual sal_Bool IsDirty() const { return sal_False; } + virtual void UpdateData() { } + virtual void SetDoUpdate(sal_Bool /* bValue */) { } + virtual sal_Bool IsDirty() const { return sal_False; } private: ScPreviewViewForwarder* mpViewForwarder; ScPreviewShell* mpViewShell; - ScEditEngineDefaulter* mpEditEngine; - SvxEditEngineForwarder* mpForwarder; + ScEditEngineDefaulter* mpEditEngine; + SvxEditEngineForwarder* mpForwarder; ScDocShell* mpDocSh; String msText; ScAddress maCellPos; diff --git a/sc/source/ui/inc/ChartRangeSelectionListener.hxx b/sc/source/ui/inc/ChartRangeSelectionListener.hxx index 45127b333983..807cba46a98e 100644 --- a/sc/source/ui/inc/ChartRangeSelectionListener.hxx +++ b/sc/source/ui/inc/ChartRangeSelectionListener.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/inc/DrawModelBroadcaster.hxx b/sc/source/ui/inc/DrawModelBroadcaster.hxx index a3c56b722d58..22e6ca85ce46 100644 --- a/sc/source/ui/inc/DrawModelBroadcaster.hxx +++ b/sc/source/ui/inc/DrawModelBroadcaster.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,15 +46,15 @@ class ScDrawModelBroadcaster : public SfxListener, public: - ScDrawModelBroadcaster( SdrModel *pDrawModel ); + ScDrawModelBroadcaster( SdrModel *pDrawModel ); virtual ~ScDrawModelBroadcaster(); - virtual void SAL_CALL addEventListener( const com::sun::star::uno::Reference< com::sun::star::document::XEventListener >& xListener ) + virtual void SAL_CALL addEventListener( const com::sun::star::uno::Reference< com::sun::star::document::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const com::sun::star::uno::Reference< com::sun::star::document::XEventListener >& xListener ) + virtual void SAL_CALL removeEventListener( const com::sun::star::uno::Reference< com::sun::star::document::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); }; #endif diff --git a/sc/source/ui/inc/IAnyRefDialog.hxx b/sc/source/ui/inc/IAnyRefDialog.hxx index 97212be8552e..7a40593d8e51 100644 --- a/sc/source/ui/inc/IAnyRefDialog.hxx +++ b/sc/source/ui/inc/IAnyRefDialog.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ class SAL_NO_VTABLE IAnyRefDialog : public formula::IControlReferenceHandler { public: virtual ~IAnyRefDialog(){} - + //virtual void ShowReference(const String& _sRef) = 0; //virtual void HideReference( BOOL bDoneRefMode = TRUE ) = 0; //virtual void ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ) = 0; @@ -55,7 +55,7 @@ public: virtual void RefInputDone( BOOL bForced = FALSE ) = 0; virtual BOOL IsTableLocked() const = 0; virtual BOOL IsRefInputMode() const = 0; - + virtual BOOL IsDocAllowed( SfxObjectShell* pDocSh ) const = 0; virtual void AddRefEntry() = 0; virtual void SetActive() = 0; diff --git a/sc/source/ui/inc/ScDevChart.hxx b/sc/source/ui/inc/ScDevChart.hxx index 5f60bcec9a3e..cb2c7c42c127 100644 --- a/sc/source/ui/inc/ScDevChart.hxx +++ b/sc/source/ui/inc/ScDevChart.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/inc/acredlin.hrc b/sc/source/ui/inc/acredlin.hrc index b21676ee6ae9..468c57333780 100644 --- a/sc/source/ui/inc/acredlin.hrc +++ b/sc/source/ui/inc/acredlin.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,48 +28,48 @@ #include "sc.hrc" // -> RID_SCDLG_CHANGES #define BTN_OK 1 -#define BTN_CANCEL 2 -#define BTN_HELP 5 +#define BTN_CANCEL 2 +#define BTN_HELP 5 // -#define CTR_REDLINING 10 -#define TP_FILTER 11 -#define TP_VIEW 12 +#define CTR_REDLINING 10 +#define TP_FILTER 11 +#define TP_VIEW 12 -#define FT_ASSIGN 14 -#define ED_ASSIGN 15 -#define RB_ASSIGN 16 +#define FT_ASSIGN 14 +#define ED_ASSIGN 15 +#define RB_ASSIGN 16 #define STR_INSERT_COLS 20 -#define STR_INSERT_ROWS 21 -#define STR_INSERT_TABS 22 -#define STR_DELETE_COLS 23 -#define STR_DELETE_ROWS 24 -#define STR_DELETE_TABS 25 -#define STR_MOVE 26 -#define STR_CONTENT 27 -#define STR_REJECT 28 -#define STR_ACCEPTED 29 -#define STR_REJECTED 30 -#define STR_NO_ENTRY 31 -#define STR_CONTENT_WITH_CHILD 32 -#define STR_CHILD_CONTENT 33 -#define STR_CHILD_ORGCONTENT 34 -#define STR_EMPTY 35 +#define STR_INSERT_ROWS 21 +#define STR_INSERT_TABS 22 +#define STR_DELETE_COLS 23 +#define STR_DELETE_ROWS 24 +#define STR_DELETE_TABS 25 +#define STR_MOVE 26 +#define STR_CONTENT 27 +#define STR_REJECT 28 +#define STR_ACCEPTED 29 +#define STR_REJECTED 30 +#define STR_NO_ENTRY 31 +#define STR_CONTENT_WITH_CHILD 32 +#define STR_CHILD_CONTENT 33 +#define STR_CHILD_ORGCONTENT 34 +#define STR_EMPTY 35 // Bitmaps -#define BMP_STR_CLOSE 41 -#define BMP_STR_OPEN 42 -#define BMP_STR_END 43 -#define BMP_STR_ERROR 44 +#define BMP_STR_CLOSE 41 +#define BMP_STR_OPEN 42 +#define BMP_STR_END 43 +#define BMP_STR_ERROR 44 -#define SC_CHANGES_COMMENT 49 -#define SC_SUB_SORT 50 -#define SC_SORT_ACTION 51 -#define SC_SORT_POSITION 52 -#define SC_SORT_AUTHOR 53 -#define SC_SORT_DATE 54 -#define SC_SORT_COMMENT 55 +#define SC_CHANGES_COMMENT 49 +#define SC_SUB_SORT 50 +#define SC_SORT_ACTION 51 +#define SC_SORT_POSITION 52 +#define SC_SORT_AUTHOR 53 +#define SC_SORT_DATE 54 +#define SC_SORT_COMMENT 55 // diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx index aeff805d72ca..94e557453fd3 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,39 +54,39 @@ class ScViewData; class ScDocument; -#define FLT_DATE_BEFORE 0 -#define FLT_DATE_SINCE 1 -#define FLT_DATE_EQUAL 2 -#define FLT_DATE_NOTEQUAL 3 -#define FLT_DATE_BETWEEN 4 -#define FLT_DATE_SAVE 5 +#define FLT_DATE_BEFORE 0 +#define FLT_DATE_SINCE 1 +#define FLT_DATE_EQUAL 2 +#define FLT_DATE_NOTEQUAL 3 +#define FLT_DATE_BETWEEN 4 +#define FLT_DATE_SAVE 5 class ScViewEntryPtr { private: - String* pAction; - String* pPos; - String* pAuthor; - String* pDate; - String* pComment; - void* pData; + String* pAction; + String* pPos; + String* pAuthor; + String* pDate; + String* pComment; + void* pData; public: - String* GetpAction() {return pAction; } - String* GetpPos() {return pPos; } - String* GetpAuthor() {return pAuthor; } - String* GetpDate() {return pDate; } - String* GetpComment() {return pComment;} - void* GetpData() {return pData; } - - void SetpAction (String* pString) {pAction= pString;} - void SetpPos (String* pString) {pPos = pString;} - void SetpAuthor (String* pString) {pAuthor= pString;} - void SetpDate (String* pString) {pDate = pString;} - void SetpComment(String* pString) {pComment=pString;} - void SetpData (void* pdata) {pData =pdata;} + String* GetpAction() {return pAction; } + String* GetpPos() {return pPos; } + String* GetpAuthor() {return pAuthor; } + String* GetpDate() {return pDate; } + String* GetpComment() {return pComment;} + void* GetpData() {return pData; } + + void SetpAction (String* pString) {pAction= pString;} + void SetpPos (String* pString) {pPos = pString;} + void SetpAuthor (String* pString) {pAuthor= pString;} + void SetpDate (String* pString) {pDate = pString;} + void SetpComment(String* pString) {pComment=pString;} + void SetpData (void* pdata) {pData =pdata;} }; class ScViewEntryPtrList @@ -94,7 +94,7 @@ class ScViewEntryPtrList ScViewEntryPtrList* pNext; ScViewEntryPtrList* pLast; - ScViewEntryPtr* pData; + ScViewEntryPtr* pData; }; @@ -104,16 +104,16 @@ public: ScRedlinData(); ~ScRedlinData(); - SCTAB nTable; - SCCOL nCol; - SCROW nRow; - ULONG nActionNo; - ULONG nInfo; - BOOL bIsRejectable; - BOOL bIsAcceptable; + SCTAB nTable; + SCCOL nCol; + SCROW nRow; + ULONG nActionNo; + ULONG nInfo; + BOOL bIsRejectable; + BOOL bIsAcceptable; }; -typedef long LExpNum; +typedef long LExpNum; //@ Expand-Entrys nicht eindeutig, daher gestrichen //DECLARE_TABLE( ScChgTrackExps, LExpNum) @@ -123,49 +123,49 @@ class ScAcceptChgDlg : public SfxModelessDialog { private: - Timer aSelectionTimer; - Timer aReOpenTimer; - SvxAcceptChgCtr aAcceptChgCtr; - ScViewData* pViewData; - ScDocument* pDoc; - ScRangeName aLocalRangeName; - Selection theCurSel; - SvxTPFilter* pTPFilter; - SvxTPView* pTPView; - SvxRedlinTable* pTheView; // PB 2006/02/02 #i48648 now SvHeaderTabListBox - Size MinSize; - ScRangeList aRangeList; - ScChangeViewSettings aChangeViewSet; - String aStrInsertCols; - String aStrInsertRows; - String aStrInsertTabs; - String aStrDeleteCols; - String aStrDeleteRows; - String aStrDeleteTabs; - String aStrMove; - String aStrContent; - String aStrReject; - String aUnknown; - String aStrAllAccepted; - String aStrAllRejected; - String aStrNoEntry; - String aStrContentWithChild; - String aStrChildContent; - String aStrChildOrgContent; - String aStrEmpty; - ULONG nAcceptCount; - ULONG nRejectCount; - BOOL bAcceptEnableFlag; - BOOL bRejectEnableFlag; - BOOL bNeedsUpdate; - BOOL bIgnoreMsg; - BOOL bNoSelection; - BOOL bHasFilterEntry; - BOOL bUseColor; - //ScChgTrackExps aExpandArray; - - void Init(); - void InitFilter(); + Timer aSelectionTimer; + Timer aReOpenTimer; + SvxAcceptChgCtr aAcceptChgCtr; + ScViewData* pViewData; + ScDocument* pDoc; + ScRangeName aLocalRangeName; + Selection theCurSel; + SvxTPFilter* pTPFilter; + SvxTPView* pTPView; + SvxRedlinTable* pTheView; // PB 2006/02/02 #i48648 now SvHeaderTabListBox + Size MinSize; + ScRangeList aRangeList; + ScChangeViewSettings aChangeViewSet; + String aStrInsertCols; + String aStrInsertRows; + String aStrInsertTabs; + String aStrDeleteCols; + String aStrDeleteRows; + String aStrDeleteTabs; + String aStrMove; + String aStrContent; + String aStrReject; + String aUnknown; + String aStrAllAccepted; + String aStrAllRejected; + String aStrNoEntry; + String aStrContentWithChild; + String aStrChildContent; + String aStrChildOrgContent; + String aStrEmpty; + ULONG nAcceptCount; + ULONG nRejectCount; + BOOL bAcceptEnableFlag; + BOOL bRejectEnableFlag; + BOOL bNeedsUpdate; + BOOL bIgnoreMsg; + BOOL bNoSelection; + BOOL bHasFilterEntry; + BOOL bUseColor; + //ScChgTrackExps aExpandArray; + + void Init(); + void InitFilter(); DECL_LINK( FilterHandle, SvxTPFilter* ); DECL_LINK( RefHandle, SvxTPFilter* ); @@ -189,64 +189,64 @@ private: protected: - virtual void Resize(); - virtual BOOL Close(); + virtual void Resize(); + virtual BOOL Close(); - void RejectFiltered(); - void AcceptFiltered(); + void RejectFiltered(); + void AcceptFiltered(); - BOOL IsValidAction(const ScChangeAction* pScChangeAction); + BOOL IsValidAction(const ScChangeAction* pScChangeAction); - String* MakeTypeString(ScChangeActionType eType); + String* MakeTypeString(ScChangeActionType eType); - SvLBoxEntry* InsertChangeAction(const ScChangeAction* pScChangeAction,ScChangeActionState eState, + SvLBoxEntry* InsertChangeAction(const ScChangeAction* pScChangeAction,ScChangeActionState eState, SvLBoxEntry* pParent=NULL,BOOL bDelMaster=FALSE, BOOL bDisabled=FALSE,ULONG nPos=LIST_APPEND); - SvLBoxEntry* InsertFilteredAction(const ScChangeAction* pScChangeAction,ScChangeActionState eState, + SvLBoxEntry* InsertFilteredAction(const ScChangeAction* pScChangeAction,ScChangeActionState eState, SvLBoxEntry* pParent=NULL,BOOL bDelMaster=FALSE, BOOL bDisabled=FALSE,ULONG nPos=LIST_APPEND); - SvLBoxEntry* InsertChangeActionContent(const ScChangeActionContent* pScChangeAction, + SvLBoxEntry* InsertChangeActionContent(const ScChangeActionContent* pScChangeAction, SvLBoxEntry* pParent,ULONG nSpecial); - void GetDependents( const ScChangeAction* pScChangeAction, + void GetDependents( const ScChangeAction* pScChangeAction, ScChangeActionTable& aActionTable, SvLBoxEntry* pEntry); - BOOL InsertContentChilds(ScChangeActionTable* pActionTable,SvLBoxEntry* pParent); + BOOL InsertContentChilds(ScChangeActionTable* pActionTable,SvLBoxEntry* pParent); - BOOL InsertAcceptedORejected(SvLBoxEntry* pParent); + BOOL InsertAcceptedORejected(SvLBoxEntry* pParent); - BOOL InsertDeletedChilds(const ScChangeAction *pChangeAction, ScChangeActionTable* pActionTable, + BOOL InsertDeletedChilds(const ScChangeAction *pChangeAction, ScChangeActionTable* pActionTable, SvLBoxEntry* pParent); - BOOL InsertChilds(ScChangeActionTable* pActionTable,SvLBoxEntry* pParent); + BOOL InsertChilds(ScChangeActionTable* pActionTable,SvLBoxEntry* pParent); - void AppendChanges(ScChangeTrack* pChanges,ULONG nStartAction, ULONG nEndAction, + void AppendChanges(ScChangeTrack* pChanges,ULONG nStartAction, ULONG nEndAction, ULONG nPos=LIST_APPEND); - void RemoveEntrys(ULONG nStartAction,ULONG nEndAction); - void UpdateEntrys(ScChangeTrack* pChgTrack, ULONG nStartAction,ULONG nEndAction); + void RemoveEntrys(ULONG nStartAction,ULONG nEndAction); + void UpdateEntrys(ScChangeTrack* pChgTrack, ULONG nStartAction,ULONG nEndAction); - void UpdateView(); - void ClearView(); + void UpdateView(); + void ClearView(); - BOOL Expand(ScChangeTrack* pChanges,const ScChangeAction* pScChangeAction, + BOOL Expand(ScChangeTrack* pChanges,const ScChangeAction* pScChangeAction, SvLBoxEntry* pEntry, BOOL bFilter=FALSE); public: ScAcceptChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - ScViewData* ptrViewData); + ScViewData* ptrViewData); ~ScAcceptChgDlg(); - void ReInit(ScViewData* ptrViewData); + void ReInit(ScViewData* ptrViewData); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual long PreNotify( NotifyEvent& rNEvt ); - void Initialize (SfxChildWinInfo* pInfo); + void Initialize (SfxChildWinInfo* pInfo); virtual void FillInfo(SfxChildWinInfo&) const; }; diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx index b10ccf083756..9695abbe6b37 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/sc/source/ui/inc/anyrefdg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,8 +53,8 @@ class ScRangeList; class SfxShell; #include "scmod.hxx" -typedef formula::RefButton ScRefButton; -typedef formula::RefEdit ScRefEdit; +typedef formula::RefButton ScRefButton; +typedef formula::RefEdit ScRefEdit; //-->Added by PengYunQuan for Validity Cell Range Picker class ScFormulaReferenceHelper { @@ -65,7 +65,7 @@ class ScFormulaReferenceHelper formula::RefButton* pRefBtn; // Button dazu Window* m_pWindow; SfxBindings* m_pBindings; - ::std::auto_ptr<Accelerator> + ::std::auto_ptr<Accelerator> pAccel; // fuer Enter/Escape BOOL* pHiddenMarks; // Merkfeld fuer versteckte Controls SCTAB nRefTab; // used for ShowReference @@ -79,9 +79,9 @@ class ScFormulaReferenceHelper BOOL bEnableColorRef; BOOL bHighLightRef; BOOL bAccInserted; - + DECL_LINK( AccelSelectHdl, Accelerator* ); - + public: ScFormulaReferenceHelper(IAnyRefDialog* _pDlg,SfxBindings* _pBindings); ~ScFormulaReferenceHelper(); @@ -107,10 +107,10 @@ public: static void enableInput(BOOL _bInput); //<!--Added by PengYunQuan for Validity Cell Range Picker protected: - Window * GetWindow(){ return m_pWindow; } + Window * GetWindow(){ return m_pWindow; } public: - bool CanInputStart( const ScRefEdit *pEdit ){ return !!pEdit; } - bool CanInputDone( BOOL bForced ){ return pRefEdit && (bForced || !pRefBtn); } + bool CanInputStart( const ScRefEdit *pEdit ){ return !!pEdit; } + bool CanInputDone( BOOL bForced ){ return pRefEdit && (bForced || !pRefBtn); } //<!--Added by PengYunQuan for Validity Cell Range Picker }; //============================================================================ @@ -120,27 +120,27 @@ class SC_DLLPUBLIC ScRefHandler : //public SfxModelessDialog, public IAnyRefDialog { //<!--Added by PengYunQuan for Validity Cell Range Picker - Window & m_rWindow; - bool m_bInRefMode; + Window & m_rWindow; + bool m_bInRefMode; public: - operator Window *(){ return &m_rWindow; } - Window * operator ->() { return static_cast<Window *>(*this); } + operator Window *(){ return &m_rWindow; } + Window * operator ->() { return static_cast<Window *>(*this); } template<class,bool> friend class ScRefHdlrImplBase; //-->Added by PengYunQuan for Validity Cell Range Picker friend class formula::RefButton; friend class formula::RefEdit; private: - ScFormulaReferenceHelper + ScFormulaReferenceHelper m_aHelper; SfxBindings* pMyBindings; - + Window* pActiveWin; Timer aTimer; String aDocName; // document on which the dialog was opened DECL_LINK( UpdateFocusHdl, Timer* ); - + protected: virtual BOOL DoClose( USHORT nId ); @@ -188,8 +188,8 @@ public: public: bool EnterRefMode(); bool LeaveRefMode(); - inline bool CanInputStart( const ScRefEdit *pEdit ); - inline bool CanInputDone( BOOL bForced ); + inline bool CanInputStart( const ScRefEdit *pEdit ); + inline bool CanInputDone( BOOL bForced ); //-->Added by PengYunQuan for Validity Cell Range Picker }; @@ -260,7 +260,7 @@ inline bool ScRefHandler::CanInputStart( const ScRefEdit *pEdit ) return m_aHelper.CanInputStart( pEdit ); } -inline bool ScRefHandler::CanInputDone( BOOL bForced ) +inline bool ScRefHandler::CanInputDone( BOOL bForced ) { return m_aHelper.CanInputDone( bForced ); } diff --git a/sc/source/ui/inc/areasave.hxx b/sc/source/ui/inc/areasave.hxx index c1ba5b4726a0..ae566e01c0a9 100644 --- a/sc/source/ui/inc/areasave.hxx +++ b/sc/source/ui/inc/areasave.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,24 +40,24 @@ class ScAreaLink; class ScAreaLinkSaver : public ScDataObject { private: - String aFileName; - String aFilterName; - String aOptions; - String aSourceArea; - ScRange aDestArea; + String aFileName; + String aFilterName; + String aOptions; + String aSourceArea; + ScRange aDestArea; ULONG nRefresh; public: ScAreaLinkSaver( const ScAreaLink& rSource ); ScAreaLinkSaver( const ScAreaLinkSaver& rCopy ); - virtual ~ScAreaLinkSaver(); + virtual ~ScAreaLinkSaver(); - virtual ScDataObject* Clone() const; + virtual ScDataObject* Clone() const; - BOOL IsEqual( const ScAreaLink& rCompare ) const; - BOOL IsEqualSource( const ScAreaLink& rCompare ) const; + BOOL IsEqual( const ScAreaLink& rCompare ) const; + BOOL IsEqualSource( const ScAreaLink& rCompare ) const; - void WriteToLink( ScAreaLink& rLink ) const; + void WriteToLink( ScAreaLink& rLink ) const; void InsertNewLink( ScDocument* pDoc ) const; }; @@ -67,14 +67,14 @@ class ScAreaLinkSaveCollection : public ScCollection public: ScAreaLinkSaveCollection(); ScAreaLinkSaveCollection( const ScAreaLinkSaveCollection& rCopy ); - virtual ~ScAreaLinkSaveCollection(); + virtual ~ScAreaLinkSaveCollection(); - virtual ScDataObject* Clone() const; + virtual ScDataObject* Clone() const; - ScAreaLinkSaver* operator[](USHORT nIndex) const {return (ScAreaLinkSaver*)At(nIndex);} + ScAreaLinkSaver* operator[](USHORT nIndex) const {return (ScAreaLinkSaver*)At(nIndex);} - BOOL IsEqual( const ScDocument* pDoc ) const; - void Restore( ScDocument* pDoc ) const; + BOOL IsEqual( const ScDocument* pDoc ) const; + void Restore( ScDocument* pDoc ) const; // returns NULL if empty static ScAreaLinkSaveCollection* CreateFromDoc( const ScDocument* pDoc ); diff --git a/sc/source/ui/inc/areasdlg.hxx b/sc/source/ui/inc/areasdlg.hxx index ed579ea065b7..8f59accfe44f 100644 --- a/sc/source/ui/inc/areasdlg.hxx +++ b/sc/source/ui/inc/areasdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,40 +49,40 @@ public: ScPrintAreasDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent ); ~ScPrintAreasDlg(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual void AddRefEntry(); + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); + virtual void AddRefEntry(); - virtual BOOL IsTableLocked() const; + virtual BOOL IsTableLocked() const; - virtual void SetActive(); - virtual void Deactivate(); - virtual BOOL Close(); + virtual void SetActive(); + virtual void Deactivate(); + virtual BOOL Close(); private: - ListBox aLbPrintArea; + ListBox aLbPrintArea; FixedLine aFlPrintArea; - formula::RefEdit aEdPrintArea; - formula::RefButton aRbPrintArea; + formula::RefEdit aEdPrintArea; + formula::RefButton aRbPrintArea; - ListBox aLbRepeatRow; + ListBox aLbRepeatRow; FixedLine aFlRepeatRow; - formula::RefEdit aEdRepeatRow; - formula::RefButton aRbRepeatRow; + formula::RefEdit aEdRepeatRow; + formula::RefButton aRbRepeatRow; - ListBox aLbRepeatCol; + ListBox aLbRepeatCol; FixedLine aFlRepeatCol; - formula::RefEdit aEdRepeatCol; - formula::RefButton aRbRepeatCol; + formula::RefEdit aEdRepeatCol; + formula::RefButton aRbRepeatCol; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; - BOOL bDlgLostFocus; - formula::RefEdit* pRefInputEdit; - ScDocument* pDoc; - ScViewData* pViewData; - SCTAB nCurTab; + BOOL bDlgLostFocus; + formula::RefEdit* pRefInputEdit; + ScDocument* pDoc; + ScViewData* pViewData; + SCTAB nCurTab; #ifdef _AREASDLG_CXX private: @@ -92,10 +92,10 @@ private: BOOL Impl_GetItem( Edit* pEd, SfxStringItem& rItem ); // Handler: - DECL_LINK( Impl_SelectHdl, ListBox* ); - DECL_LINK( Impl_ModifyHdl, formula::RefEdit* ); - DECL_LINK( Impl_BtnHdl, PushButton* ); - DECL_LINK( Impl_GetFocusHdl, Control* ); + DECL_LINK( Impl_SelectHdl, ListBox* ); + DECL_LINK( Impl_ModifyHdl, formula::RefEdit* ); + DECL_LINK( Impl_BtnHdl, PushButton* ); + DECL_LINK( Impl_GetFocusHdl, Control* ); #endif }; diff --git a/sc/source/ui/inc/asciiopt.hxx b/sc/source/ui/inc/asciiopt.hxx index 7581f7f8d072..a65a2c6edd18 100644 --- a/sc/source/ui/inc/asciiopt.hxx +++ b/sc/source/ui/inc/asciiopt.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,17 +48,17 @@ class SC_DLLPUBLIC ScAsciiOptions { private: - BOOL bFixedLen; - String aFieldSeps; - BOOL bMergeFieldSeps; + BOOL bFixedLen; + String aFieldSeps; + BOOL bMergeFieldSeps; bool bQuotedFieldAsText; bool bDetectSpecialNumber; - sal_Unicode cTextSep; - CharSet eCharSet; + sal_Unicode cTextSep; + CharSet eCharSet; LanguageType eLang; - BOOL bCharSetSystem; - long nStartRow; - USHORT nInfoCount; + BOOL bCharSetSystem; + long nStartRow; + USHORT nInfoCount; xub_StrLen* pColStart; //! TODO replace with vector BYTE* pColFormat; //! TODO replace with vector @@ -69,41 +69,41 @@ public: static const sal_Unicode cDefaultTextSep = '"'; - ScAsciiOptions& operator=( const ScAsciiOptions& rCpy ); + ScAsciiOptions& operator=( const ScAsciiOptions& rCpy ); - BOOL operator==( const ScAsciiOptions& rCmp ) const; + BOOL operator==( const ScAsciiOptions& rCmp ) const; - void ReadFromString( const String& rString ); - String WriteToString() const; + void ReadFromString( const String& rString ); + String WriteToString() const; - void InterpretColumnList( const String& rString ); + void InterpretColumnList( const String& rString ); - CharSet GetCharSet() const { return eCharSet; } - BOOL GetCharSetSystem() const { return bCharSetSystem; } - const String& GetFieldSeps() const { return aFieldSeps; } - BOOL IsMergeSeps() const { return bMergeFieldSeps; } + CharSet GetCharSet() const { return eCharSet; } + BOOL GetCharSetSystem() const { return bCharSetSystem; } + const String& GetFieldSeps() const { return aFieldSeps; } + BOOL IsMergeSeps() const { return bMergeFieldSeps; } bool IsQuotedAsText() const { return bQuotedFieldAsText; } bool IsDetectSpecialNumber() const { return bDetectSpecialNumber; } - sal_Unicode GetTextSep() const { return cTextSep; } - BOOL IsFixedLen() const { return bFixedLen; } - USHORT GetInfoCount() const { return nInfoCount; } - const xub_StrLen* GetColStart() const { return pColStart; } - const BYTE* GetColFormat() const { return pColFormat; } - long GetStartRow() const { return nStartRow; } + sal_Unicode GetTextSep() const { return cTextSep; } + BOOL IsFixedLen() const { return bFixedLen; } + USHORT GetInfoCount() const { return nInfoCount; } + const xub_StrLen* GetColStart() const { return pColStart; } + const BYTE* GetColFormat() const { return pColFormat; } + long GetStartRow() const { return nStartRow; } LanguageType GetLanguage() const { return eLang; } - void SetCharSet( CharSet eNew ) { eCharSet = eNew; } - void SetCharSetSystem( BOOL bSet ) { bCharSetSystem = bSet; } - void SetFixedLen( BOOL bSet ) { bFixedLen = bSet; } - void SetFieldSeps( const String& rStr ) { aFieldSeps = rStr; } - void SetMergeSeps( BOOL bSet ) { bMergeFieldSeps = bSet; } + void SetCharSet( CharSet eNew ) { eCharSet = eNew; } + void SetCharSetSystem( BOOL bSet ) { bCharSetSystem = bSet; } + void SetFixedLen( BOOL bSet ) { bFixedLen = bSet; } + void SetFieldSeps( const String& rStr ) { aFieldSeps = rStr; } + void SetMergeSeps( BOOL bSet ) { bMergeFieldSeps = bSet; } void SetQuotedAsText(bool bSet) { bQuotedFieldAsText = bSet; } void SetDetectSpecialNumber(bool bSet) { bDetectSpecialNumber = bSet; } - void SetTextSep( sal_Unicode c ) { cTextSep = c; } - void SetStartRow( long nRow) { nStartRow= nRow; } + void SetTextSep( sal_Unicode c ) { cTextSep = c; } + void SetStartRow( long nRow) { nStartRow= nRow; } void SetLanguage(LanguageType e) { eLang = e; } - void SetColInfo( USHORT nCount, const xub_StrLen* pStart, const BYTE* pFormat ); + void SetColInfo( USHORT nCount, const xub_StrLen* pStart, const BYTE* pFormat ); void SetColumnInfo( const ScCsvExpDataVec& rDataVec ); }; diff --git a/sc/source/ui/inc/attrdlg.hrc b/sc/source/ui/inc/attrdlg.hrc index f43c1cb30b86..5a2cb3af502c 100644 --- a/sc/source/ui/inc/attrdlg.hrc +++ b/sc/source/ui/inc/attrdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -25,23 +25,23 @@ * ************************************************************************/ -#include "sc.hrc" // -> SC_DLG_ATTR +#include "sc.hrc" // -> SC_DLG_ATTR -#define TP_NUMBER 1 -#define TP_FONT 2 -#define TP_ALIGNMENT 3 -#define TP_BORDER 4 -#define TP_BACKGROUND 5 -#define TP_PROTECTION 6 -#define TP_FONTEFF 7 -#define TP_ASIAN 8 +#define TP_NUMBER 1 +#define TP_FONT 2 +#define TP_ALIGNMENT 3 +#define TP_BORDER 4 +#define TP_BACKGROUND 5 +#define TP_PROTECTION 6 +#define TP_FONTEFF 7 +#define TP_ASIAN 8 //================================================ // Zellschutz-TabPage: -#define BTN_PROTECTED 1 -#define BTN_HIDE_FORMULAR 2 -#define BTN_HIDE_ALL 3 +#define BTN_PROTECTED 1 +#define BTN_HIDE_FORMULAR 2 +#define BTN_HIDE_ALL 3 #define FT_HINT 4 #define FL_PROTECTION 5 #define BTN_HIDE_PRINT 6 diff --git a/sc/source/ui/inc/attrdlg.hxx b/sc/source/ui/inc/attrdlg.hxx index 07a2ed16726e..10870234fb1b 100644 --- a/sc/source/ui/inc/attrdlg.hxx +++ b/sc/source/ui/inc/attrdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,13 +49,13 @@ class SfxItemSet; class ScAttrDlg : public SfxTabDialog { public: - ScAttrDlg( SfxViewFrame* pFrame, - Window* pParent, + ScAttrDlg( SfxViewFrame* pFrame, + Window* pParent, const SfxItemSet* pCellAttrs ); ~ScAttrDlg(); protected: - virtual void PageCreated( USHORT nPageId, SfxTabPage& rTabPage ); + virtual void PageCreated( USHORT nPageId, SfxTabPage& rTabPage ); private: DECL_LINK( OkHandler, void* ); // fuer DoppelClick-Beenden in TabPages diff --git a/sc/source/ui/inc/auditsh.hxx b/sc/source/ui/inc/auditsh.hxx index 20d9702aeefa..2d5e9adb23cb 100644 --- a/sc/source/ui/inc/auditsh.hxx +++ b/sc/source/ui/inc/auditsh.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,8 +39,8 @@ class ScViewData; class ScAuditingShell : public SfxShell { private: - ScViewData* pViewData; - USHORT nFunction; + ScViewData* pViewData; + USHORT nFunction; public: TYPEINFO(); @@ -49,8 +49,8 @@ public: ScAuditingShell(ScViewData* pData); ~ScAuditingShell(); - void Execute(SfxRequest& rReq); - void GetState(SfxItemSet& rSet); + void Execute(SfxRequest& rReq); + void GetState(SfxItemSet& rSet); }; diff --git a/sc/source/ui/inc/autofmt.hxx b/sc/source/ui/inc/autofmt.hxx index d8952ee2cbf6..786c0fcadf2e 100644 --- a/sc/source/ui/inc/autofmt.hxx +++ b/sc/source/ui/inc/autofmt.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -88,11 +88,11 @@ private: const String aStrSum; SvNumberFormatter* pNumFmt; //------------------------------------------- - SC_DLLPRIVATE void Init (); - SC_DLLPRIVATE void DoPaint ( const Rectangle& rRect ); - SC_DLLPRIVATE void CalcCellArray ( BOOL bFitWidth ); - SC_DLLPRIVATE void CalcLineMap (); - SC_DLLPRIVATE void PaintCells (); + SC_DLLPRIVATE void Init (); + SC_DLLPRIVATE void DoPaint ( const Rectangle& rRect ); + SC_DLLPRIVATE void CalcCellArray ( BOOL bFitWidth ); + SC_DLLPRIVATE void CalcLineMap (); + SC_DLLPRIVATE void PaintCells (); /* Usage of type size_t instead of SCCOL/SCROW is correct here - used in conjunction with class svx::frame::Array (svx/framelinkarray.hxx), which @@ -111,28 +111,28 @@ private: Font& rCJKFont, Font& rCTLFont ); - SC_DLLPRIVATE String MakeNumberString( String cellString, BOOL bAddDec ); - SC_DLLPRIVATE void DrawFrameLine ( const SvxBorderLine& rLineD, - Point from, - Point to, - BOOL bHorizontal, - const SvxBorderLine& rLineLT, - const SvxBorderLine& rLineL, - const SvxBorderLine& rLineLB, - const SvxBorderLine& rLineRT, - const SvxBorderLine& rLineR, - const SvxBorderLine& rLineRB ); - SC_DLLPRIVATE void CheckPriority ( USHORT nCurLine, - AutoFmtLine eLine, - SvxBorderLine& rLine ); - SC_DLLPRIVATE void GetLines ( USHORT nIndex, AutoFmtLine eLine, - SvxBorderLine& rLineD, - SvxBorderLine& rLineLT, - SvxBorderLine& rLineL, - SvxBorderLine& rLineLB, - SvxBorderLine& rLineRT, - SvxBorderLine& rLineR, - SvxBorderLine& rLineRB ); + SC_DLLPRIVATE String MakeNumberString( String cellString, BOOL bAddDec ); + SC_DLLPRIVATE void DrawFrameLine ( const SvxBorderLine& rLineD, + Point from, + Point to, + BOOL bHorizontal, + const SvxBorderLine& rLineLT, + const SvxBorderLine& rLineL, + const SvxBorderLine& rLineLB, + const SvxBorderLine& rLineRT, + const SvxBorderLine& rLineR, + const SvxBorderLine& rLineRB ); + SC_DLLPRIVATE void CheckPriority ( USHORT nCurLine, + AutoFmtLine eLine, + SvxBorderLine& rLine ); + SC_DLLPRIVATE void GetLines ( USHORT nIndex, AutoFmtLine eLine, + SvxBorderLine& rLineD, + SvxBorderLine& rLineLT, + SvxBorderLine& rLineL, + SvxBorderLine& rLineLB, + SvxBorderLine& rLineRT, + SvxBorderLine& rLineR, + SvxBorderLine& rLineRB ); }; #endif // SC_AUTOFMT_HXX diff --git a/sc/source/ui/inc/autostyl.hxx b/sc/source/ui/inc/autostyl.hxx index 859db2129a27..38345d1cbb5b 100644 --- a/sc/source/ui/inc/autostyl.hxx +++ b/sc/source/ui/inc/autostyl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,16 +39,16 @@ class ScRange; class ScAutoStyleList { private: - ScDocShell* pDocSh; - Timer aTimer; - Timer aInitTimer; - ULONG nTimerStart; - List aEntries; - List aInitials; + ScDocShell* pDocSh; + Timer aTimer; + Timer aInitTimer; + ULONG nTimerStart; + List aEntries; + List aInitials; - void ExecuteEntries(); - void AdjustEntries(ULONG nDiff); - void StartTimer(ULONG nNow); + void ExecuteEntries(); + void AdjustEntries(ULONG nDiff); + void StartTimer(ULONG nNow); DECL_LINK( TimerHdl, Timer* ); DECL_LINK( InitHdl, Timer* ); @@ -56,11 +56,11 @@ public: ScAutoStyleList(ScDocShell* pShell); ~ScAutoStyleList(); - void AddInitial( const ScRange& rRange, const String& rStyle1, + void AddInitial( const ScRange& rRange, const String& rStyle1, ULONG nTimeout, const String& rStyle2 ); - void AddEntry( ULONG nTimeout, const ScRange& rRange, const String& rStyle ); + void AddEntry( ULONG nTimeout, const ScRange& rRange, const String& rStyle ); - void ExecuteAllNow(); + void ExecuteAllNow(); }; diff --git a/sc/source/ui/inc/cbutton.hxx b/sc/source/ui/inc/cbutton.hxx index b74fec6276ae..bdfd0b9de257 100644 --- a/sc/source/ui/inc/cbutton.hxx +++ b/sc/source/ui/inc/cbutton.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,36 +47,36 @@ public: void SetOutputDevice( OutputDevice* pOutputDevice ); - void Draw( const Point& rAt, - const Size& rSize, + void Draw( const Point& rAt, + const Size& rSize, BOOL bState, - BOOL bBtnIn = FALSE ); + BOOL bBtnIn = FALSE ); - void Draw( const Point& rAt, + void Draw( const Point& rAt, BOOL bState, - BOOL bBtnIn = FALSE ) + BOOL bBtnIn = FALSE ) { Draw( rAt, aBtnSize, bState, bBtnIn ); } void Draw( BOOL bState, BOOL bBtnIn = FALSE ) { Draw( aBtnPos, aBtnSize, bState, bBtnIn ); } - void SetOptSizePixel(); + void SetOptSizePixel(); - void SetPosPixel( const Point& rNewPos ) { aBtnPos = rNewPos; } - Point GetPosPixel() const { return aBtnPos; } + void SetPosPixel( const Point& rNewPos ) { aBtnPos = rNewPos; } + Point GetPosPixel() const { return aBtnPos; } - void SetSizePixel( const Size& rNewSize ) { aBtnSize = rNewSize; } - Size GetSizePixel() const { return aBtnSize; } + void SetSizePixel( const Size& rNewSize ) { aBtnSize = rNewSize; } + Size GetSizePixel() const { return aBtnSize; } private: - void ImpDrawArrow( const Rectangle& rRect, + void ImpDrawArrow( const Rectangle& rRect, BOOL bState ); protected: OutputDevice* pOut; - Point aBtnPos; - Size aBtnSize; + Point aBtnPos; + Size aBtnSize; }; diff --git a/sc/source/ui/inc/cellsh.hxx b/sc/source/ui/inc/cellsh.hxx index b5ab5d9abe06..7405692d95be 100644 --- a/sc/source/ui/inc/cellsh.hxx +++ b/sc/source/ui/inc/cellsh.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ private: CellShell_Impl* pImpl; BOOL bPastePossible; - void GetPossibleClipboardFormats( SvxClipboardFmtItem& rFormats ); + void GetPossibleClipboardFormats( SvxClipboardFmtItem& rFormats ); void ExecuteExternalSource( const String& _rFile, const String& _rFilter, const String& _rOptions, const String& _rSource, ULONG _nRefresh, SfxRequest& _rRequest ); @@ -75,32 +75,32 @@ public: SFX_DECL_INTERFACE(SCID_CELL_SHELL) ScCellShell(ScViewData* pData); - virtual ~ScCellShell(); + virtual ~ScCellShell(); - void Execute(SfxRequest &); - void GetState(SfxItemSet &); + void Execute(SfxRequest &); + void GetState(SfxItemSet &); - void ExecuteEdit( SfxRequest& rReq ); - void ExecuteTrans( SfxRequest& rReq ); + void ExecuteEdit( SfxRequest& rReq ); + void ExecuteTrans( SfxRequest& rReq ); - void GetBlockState( SfxItemSet& rSet ); - void GetCellState( SfxItemSet& rSet ); + void GetBlockState( SfxItemSet& rSet ); + void GetCellState( SfxItemSet& rSet ); - void ExecuteDB( SfxRequest& rReq ); - void GetDBState( SfxItemSet& rSet ); + void ExecuteDB( SfxRequest& rReq ); + void GetDBState( SfxItemSet& rSet ); - void ExecImageMap(SfxRequest& rReq); // ImageMap - void GetImageMapState(SfxItemSet& rSet); + void ExecImageMap(SfxRequest& rReq); // ImageMap + void GetImageMapState(SfxItemSet& rSet); - void GetClipState( SfxItemSet& rSet ); - void GetHLinkState( SfxItemSet& rSet ); + void GetClipState( SfxItemSet& rSet ); + void GetHLinkState( SfxItemSet& rSet ); - void ExecuteCursor( SfxRequest& rReq ); - void ExecuteCursorSel( SfxRequest& rReq ); - void ExecutePage( SfxRequest& rReq ); - void ExecutePageSel( SfxRequest& rReq ); - void ExecuteMove( SfxRequest& rReq ); - void GetStateCursor( SfxItemSet& rSet ); + void ExecuteCursor( SfxRequest& rReq ); + void ExecuteCursorSel( SfxRequest& rReq ); + void ExecutePage( SfxRequest& rReq ); + void ExecutePageSel( SfxRequest& rReq ); + void ExecuteMove( SfxRequest& rReq ); + void GetStateCursor( SfxItemSet& rSet ); static void PasteFromClipboard( ScViewData* pViewData, ScTabViewShell* pTabViewShell, bool bShowDialog ); }; diff --git a/sc/source/ui/inc/chartsh.hxx b/sc/source/ui/inc/chartsh.hxx index 0e09211ce346..5ede144c3c9f 100644 --- a/sc/source/ui/inc/chartsh.hxx +++ b/sc/source/ui/inc/chartsh.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ public: SFX_DECL_INTERFACE(SCID_CHART_SHELL) ScChartShell(ScViewData* pData); - virtual ~ScChartShell(); + virtual ~ScChartShell(); }; diff --git a/sc/source/ui/inc/client.hxx b/sc/source/ui/inc/client.hxx index ac39d6d386b5..da5f7db3b2f6 100644 --- a/sc/source/ui/inc/client.hxx +++ b/sc/source/ui/inc/client.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,21 +40,21 @@ class SdrModel; class ScClient : public SfxInPlaceClient { private: - SdrModel* pModel; - SdrGrafObj* pGrafEdit; + SdrModel* pModel; + SdrGrafObj* pGrafEdit; virtual void ObjectAreaChanged(); virtual void RequestNewObjectArea( Rectangle& ); virtual void ViewChanged(); - virtual void MakeVisible(); + virtual void MakeVisible(); public: ScClient( ScTabViewShell* pViewShell, Window* pDraw, SdrModel* pSdrModel, SdrOle2Obj* pObj ); - virtual ~ScClient(); + virtual ~ScClient(); - SdrGrafObj* GetGrafEdit() const { return pGrafEdit; } - void SetGrafEdit(SdrGrafObj* pNew) { pGrafEdit = pNew; } - SdrOle2Obj* GetDrawObj(); + SdrGrafObj* GetGrafEdit() const { return pGrafEdit; } + void SetGrafEdit(SdrGrafObj* pNew) { pGrafEdit = pNew; } + SdrOle2Obj* GetDrawObj(); }; diff --git a/sc/source/ui/inc/colrowba.hxx b/sc/source/ui/inc/colrowba.hxx index b4e1ba481ca0..b46bccbaffc8 100644 --- a/sc/source/ui/inc/colrowba.hxx +++ b/sc/source/ui/inc/colrowba.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,9 +40,9 @@ class ScHeaderSelectionEngine; class ScColBar : public ScHeaderControl { - ScViewData* pViewData; - ScHSplitPos eWhich; - ScHeaderFunctionSet* pFuncSet; + ScViewData* pViewData; + ScHSplitPos eWhich; + ScHeaderFunctionSet* pFuncSet; ScHeaderSelectionEngine* pSelEngine; public: @@ -50,33 +50,33 @@ public: ScHeaderFunctionSet* pFunc, ScHeaderSelectionEngine* pEng ); ~ScColBar(); - virtual SCCOLROW GetPos(); - virtual USHORT GetEntrySize( SCCOLROW nEntryNo ); - virtual String GetEntryText( SCCOLROW nEntryNo ); + virtual SCCOLROW GetPos(); + virtual USHORT GetEntrySize( SCCOLROW nEntryNo ); + virtual String GetEntryText( SCCOLROW nEntryNo ); - virtual BOOL IsLayoutRTL(); // only for columns + virtual BOOL IsLayoutRTL(); // only for columns - virtual void SetEntrySize( SCCOLROW nPos, USHORT nNewSize ); - virtual void HideEntries( SCCOLROW nStart, SCCOLROW nEnd ); + virtual void SetEntrySize( SCCOLROW nPos, USHORT nNewSize ); + virtual void HideEntries( SCCOLROW nStart, SCCOLROW nEnd ); - virtual void SetMarking( BOOL bSet ); - virtual void SelectWindow(); - virtual BOOL IsDisabled(); - virtual BOOL ResizeAllowed(); + virtual void SetMarking( BOOL bSet ); + virtual void SelectWindow(); + virtual BOOL IsDisabled(); + virtual BOOL ResizeAllowed(); - virtual void DrawInvert( long nDragPos ); + virtual void DrawInvert( long nDragPos ); - virtual String GetDragHelp( long nVal ); + virtual String GetDragHelp( long nVal ); - BOOL UseNumericHeader() const; + BOOL UseNumericHeader() const; }; class ScRowBar : public ScHeaderControl { - ScViewData* pViewData; - ScVSplitPos eWhich; - ScHeaderFunctionSet* pFuncSet; + ScViewData* pViewData; + ScVSplitPos eWhich; + ScHeaderFunctionSet* pFuncSet; ScHeaderSelectionEngine* pSelEngine; public: @@ -84,24 +84,24 @@ public: ScHeaderFunctionSet* pFunc, ScHeaderSelectionEngine* pEng ); ~ScRowBar(); - virtual SCCOLROW GetPos(); - virtual USHORT GetEntrySize( SCCOLROW nEntryNo ); - virtual String GetEntryText( SCCOLROW nEntryNo ); + virtual SCCOLROW GetPos(); + virtual USHORT GetEntrySize( SCCOLROW nEntryNo ); + virtual String GetEntryText( SCCOLROW nEntryNo ); - virtual BOOL IsMirrored(); // only for columns - virtual SCROW GetHiddenCount( SCROW nEntryNo ); // only for columns + virtual BOOL IsMirrored(); // only for columns + virtual SCROW GetHiddenCount( SCROW nEntryNo ); // only for columns - virtual void SetEntrySize( SCCOLROW nPos, USHORT nNewSize ); - virtual void HideEntries( SCCOLROW nStart, SCCOLROW nEnd ); + virtual void SetEntrySize( SCCOLROW nPos, USHORT nNewSize ); + virtual void HideEntries( SCCOLROW nStart, SCCOLROW nEnd ); - virtual void SetMarking( BOOL bSet ); - virtual void SelectWindow(); - virtual BOOL IsDisabled(); - virtual BOOL ResizeAllowed(); + virtual void SetMarking( BOOL bSet ); + virtual void SelectWindow(); + virtual BOOL IsDisabled(); + virtual BOOL ResizeAllowed(); - virtual void DrawInvert( long nDragPos ); + virtual void DrawInvert( long nDragPos ); - virtual String GetDragHelp( long nVal ); + virtual String GetDragHelp( long nVal ); }; diff --git a/sc/source/ui/inc/condfrmt.hrc b/sc/source/ui/inc/condfrmt.hrc index 099d82b2fa85..67d587cf8ec9 100644 --- a/sc/source/ui/inc/condfrmt.hrc +++ b/sc/source/ui/inc/condfrmt.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,45 +27,45 @@ #include "sc.hrc" // ->RID_SCDLG_SOLVER -#define CBX_COND1 1 -#define LB_COND1_1 2 -#define LB_COND1_2 3 -#define EDT_COND1_1 4 -#define RB_COND1_1 5 -#define FT_COND1_AND 6 -#define EDT_COND1_2 7 -#define RB_COND1_2 8 -#define FT_COND1_TEMPLATE 9 -#define LB_COND1_TEMPLATE 10 +#define CBX_COND1 1 +#define LB_COND1_1 2 +#define LB_COND1_2 3 +#define EDT_COND1_1 4 +#define RB_COND1_1 5 +#define FT_COND1_AND 6 +#define EDT_COND1_2 7 +#define RB_COND1_2 8 +#define FT_COND1_TEMPLATE 9 +#define LB_COND1_TEMPLATE 10 -#define CBX_COND2 11 -#define LB_COND2_1 12 -#define LB_COND2_2 13 -#define EDT_COND2_1 14 -#define RB_COND2_1 15 -#define FT_COND2_AND 16 -#define EDT_COND2_2 17 -#define RB_COND2_2 18 -#define FT_COND2_TEMPLATE 19 -#define LB_COND2_TEMPLATE 20 +#define CBX_COND2 11 +#define LB_COND2_1 12 +#define LB_COND2_2 13 +#define EDT_COND2_1 14 +#define RB_COND2_1 15 +#define FT_COND2_AND 16 +#define EDT_COND2_2 17 +#define RB_COND2_2 18 +#define FT_COND2_TEMPLATE 19 +#define LB_COND2_TEMPLATE 20 -#define CBX_COND3 21 -#define LB_COND3_1 22 -#define LB_COND3_2 23 -#define EDT_COND3_1 24 -#define RB_COND3_1 25 -#define FT_COND3_AND 26 -#define EDT_COND3_2 27 -#define RB_COND3_2 28 -#define FT_COND3_TEMPLATE 29 -#define LB_COND3_TEMPLATE 30 +#define CBX_COND3 21 +#define LB_COND3_1 22 +#define LB_COND3_2 23 +#define EDT_COND3_1 24 +#define RB_COND3_1 25 +#define FT_COND3_AND 26 +#define EDT_COND3_2 27 +#define RB_COND3_2 28 +#define FT_COND3_TEMPLATE 29 +#define LB_COND3_TEMPLATE 30 #define FL_SEP1 41 #define FL_SEP2 42 #define BTN_OK 31 -#define BTN_CANCEL 32 -#define BTN_HELP 33 +#define BTN_CANCEL 32 +#define BTN_HELP 33 #define BTN_COND1_NEW 34 #define BTN_COND2_NEW 35 diff --git a/sc/source/ui/inc/condfrmt.hxx b/sc/source/ui/inc/condfrmt.hxx index 1cb7b8cc83b0..9b9d4ec980ed 100644 --- a/sc/source/ui/inc/condfrmt.hxx +++ b/sc/source/ui/inc/condfrmt.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ class ScConditionalFormat; //============================================================================ -// class ScConditionalFormat +// class ScConditionalFormat // // Dialog zum Festlegen von bedingten Formaten @@ -52,85 +52,85 @@ public: const ScConditionalFormat* pCurrentFormat ); ~ScConditionalFormatDlg(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual void AddRefEntry(); + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); + virtual void AddRefEntry(); virtual BOOL IsRefInputMode() const; - virtual void SetActive(); - virtual BOOL Close(); + virtual void SetActive(); + virtual BOOL Close(); private: - CheckBox aCbxCond1; - ListBox aLbCond11; - ListBox aLbCond12; - formula::RefEdit aEdtCond11; - formula::RefButton aRbCond11; - FixedText aFtCond1And; - formula::RefEdit aEdtCond12; - formula::RefButton aRbCond12; - FixedText aFtCond1Template; - ListBox aLbCond1Template; + CheckBox aCbxCond1; + ListBox aLbCond11; + ListBox aLbCond12; + formula::RefEdit aEdtCond11; + formula::RefButton aRbCond11; + FixedText aFtCond1And; + formula::RefEdit aEdtCond12; + formula::RefButton aRbCond12; + FixedText aFtCond1Template; + ListBox aLbCond1Template; PushButton aBtnNew1; FixedLine aFlSep1; CheckBox aCbxCond2; - ListBox aLbCond21; - ListBox aLbCond22; - formula::RefEdit aEdtCond21; - formula::RefButton aRbCond21; - FixedText aFtCond2And; - formula::RefEdit aEdtCond22; - formula::RefButton aRbCond22; - FixedText aFtCond2Template; - ListBox aLbCond2Template; + ListBox aLbCond21; + ListBox aLbCond22; + formula::RefEdit aEdtCond21; + formula::RefButton aRbCond21; + FixedText aFtCond2And; + formula::RefEdit aEdtCond22; + formula::RefButton aRbCond22; + FixedText aFtCond2Template; + ListBox aLbCond2Template; PushButton aBtnNew2; FixedLine aFlSep2; - CheckBox aCbxCond3; - ListBox aLbCond31; - ListBox aLbCond32; - formula::RefEdit aEdtCond31; - formula::RefButton aRbCond31; - FixedText aFtCond3And; - formula::RefEdit aEdtCond32; - formula::RefButton aRbCond32; - FixedText aFtCond3Template; - ListBox aLbCond3Template; + CheckBox aCbxCond3; + ListBox aLbCond31; + ListBox aLbCond32; + formula::RefEdit aEdtCond31; + formula::RefButton aRbCond31; + FixedText aFtCond3And; + formula::RefEdit aEdtCond32; + formula::RefButton aRbCond32; + FixedText aFtCond3Template; + ListBox aLbCond3Template; PushButton aBtnNew3; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - - Point aCond1Pos1; - Point aCond1Pos2; - Point aRBtn1Pos1; - Point aRBtn1Pos2; - Size aCond1Size1; - Size aCond1Size2; - Size aCond1Size3; - - Point aCond2Pos1; - Point aCond2Pos2; - Point aRBtn2Pos1; - Point aRBtn2Pos2; - Size aCond2Size1; - Size aCond2Size2; - Size aCond2Size3; - - Point aCond3Pos1; - Point aCond3Pos2; - Point aRBtn3Pos1; - Point aRBtn3Pos2; - Size aCond3Size1; - Size aCond3Size2; - Size aCond3Size3; - - formula::RefEdit* pEdActive; - BOOL bDlgLostFocus; - ScDocument* pDoc; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; + + Point aCond1Pos1; + Point aCond1Pos2; + Point aRBtn1Pos1; + Point aRBtn1Pos2; + Size aCond1Size1; + Size aCond1Size2; + Size aCond1Size3; + + Point aCond2Pos1; + Point aCond2Pos2; + Point aRBtn2Pos1; + Point aRBtn2Pos2; + Size aCond2Size1; + Size aCond2Size2; + Size aCond2Size3; + + Point aCond3Pos1; + Point aCond3Pos2; + Point aRBtn3Pos1; + Point aRBtn3Pos2; + Size aCond3Size1; + Size aCond3Size2; + Size aCond3Size3; + + formula::RefEdit* pEdActive; + BOOL bDlgLostFocus; + ScDocument* pDoc; #ifdef _CONDFRMT_CXX - void GetConditionalFormat( ScConditionalFormat& rCndFmt ); + void GetConditionalFormat( ScConditionalFormat& rCndFmt ); DECL_LINK( ClickCond1Hdl, void * ); DECL_LINK( ChangeCond11Hdl, void * ); diff --git a/sc/source/ui/inc/conflictsdlg.hrc b/sc/source/ui/inc/conflictsdlg.hrc index 7935a6ee21d7..cfd864d5ec0a 100644 --- a/sc/source/ui/inc/conflictsdlg.hrc +++ b/sc/source/ui/inc/conflictsdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx index d7ba96ab526a..86e11e232c63 100644 --- a/sc/source/ui/inc/conflictsdlg.hxx +++ b/sc/source/ui/inc/conflictsdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx index d90a871e8c36..128b8b23f82b 100644 --- a/sc/source/ui/inc/consdlg.hxx +++ b/sc/source/ui/inc/consdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,78 +48,78 @@ class ScConsolidateDlg : public ScAnyRefDlg { public: ScConsolidateDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - const SfxItemSet& rArgSet ); + const SfxItemSet& rArgSet ); ~ScConsolidateDlg(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual BOOL IsRefInputMode() const { return TRUE; } - virtual void SetActive(); + virtual BOOL IsRefInputMode() const { return TRUE; } + virtual void SetActive(); - virtual BOOL Close(); + virtual BOOL Close(); protected: - virtual void Deactivate(); + virtual void Deactivate(); private: - FixedText aFtFunc; - ListBox aLbFunc; + FixedText aFtFunc; + ListBox aLbFunc; - FixedText aFtConsAreas; - MultiListBox aLbConsAreas; + FixedText aFtConsAreas; + MultiListBox aLbConsAreas; - ListBox aLbDataArea; - FixedText aFtDataArea; - formula::RefEdit aEdDataArea; - formula::RefButton aRbDataArea; + ListBox aLbDataArea; + FixedText aFtDataArea; + formula::RefEdit aEdDataArea; + formula::RefButton aRbDataArea; - ListBox aLbDestArea; - FixedText aFtDestArea; - formula::RefEdit aEdDestArea; - formula::RefButton aRbDestArea; + ListBox aLbDestArea; + FixedText aFtDestArea; + formula::RefEdit aEdDestArea; + formula::RefButton aRbDestArea; FixedLine aFlConsBy; - CheckBox aBtnByRow; - CheckBox aBtnByCol; + CheckBox aBtnByRow; + CheckBox aBtnByCol; FixedLine aFlSep; FixedLine aFlOptions; - CheckBox aBtnRefs; + CheckBox aBtnRefs; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - PushButton aBtnAdd; - PushButton aBtnRemove; - MoreButton aBtnMore; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; + PushButton aBtnAdd; + PushButton aBtnRemove; + MoreButton aBtnMore; - String aStrUndefined; + String aStrUndefined; - ScConsolidateParam theConsData; - ScViewData* pViewData; - ScDocument* pDoc; - ScRangeUtil* pRangeUtil; - ScAreaData* pAreaData; - USHORT nAreaDataCount; - USHORT nWhichCons; + ScConsolidateParam theConsData; + ScViewData* pViewData; + ScDocument* pDoc; + ScRangeUtil* pRangeUtil; + ScAreaData* pAreaData; + USHORT nAreaDataCount; + USHORT nWhichCons; - formula::RefEdit* pRefInputEdit; - BOOL bDlgLostFocus; + formula::RefEdit* pRefInputEdit; + BOOL bDlgLostFocus; #ifdef _CONSDLG_CXX private: - void Init (); - void FillAreaLists (); - BOOL VerifyEdit ( formula::RefEdit* pEd ); + void Init (); + void FillAreaLists (); + BOOL VerifyEdit ( formula::RefEdit* pEd ); - DECL_LINK( OkHdl, void* ); - DECL_LINK( ClickHdl, PushButton* ); + DECL_LINK( OkHdl, void* ); + DECL_LINK( ClickHdl, PushButton* ); DECL_LINK( GetFocusHdl, Control* ); - DECL_LINK( ModifyHdl, formula::RefEdit* ); - DECL_LINK( SelectHdl, ListBox* ); + DECL_LINK( ModifyHdl, formula::RefEdit* ); + DECL_LINK( SelectHdl, ListBox* ); - ScSubTotalFunc LbPosToFunc( USHORT nPos ); - USHORT FuncToLbPos( ScSubTotalFunc eFunc ); + ScSubTotalFunc LbPosToFunc( USHORT nPos ); + USHORT FuncToLbPos( ScSubTotalFunc eFunc ); #endif // _CONSDLG_CXX }; diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx index 952215ffbdd6..15ef650afa59 100644 --- a/sc/source/ui/inc/content.hxx +++ b/sc/source/ui/inc/content.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,61 +40,61 @@ class ScDocument; class ScDocShell; class ScAreaLink; -#define SC_CONTENT_ROOT 0 -#define SC_CONTENT_TABLE 1 -#define SC_CONTENT_RANGENAME 2 -#define SC_CONTENT_DBAREA 3 -#define SC_CONTENT_GRAPHIC 4 -#define SC_CONTENT_OLEOBJECT 5 -#define SC_CONTENT_NOTE 6 -#define SC_CONTENT_AREALINK 7 -#define SC_CONTENT_DRAWING 8 -#define SC_CONTENT_COUNT 9 +#define SC_CONTENT_ROOT 0 +#define SC_CONTENT_TABLE 1 +#define SC_CONTENT_RANGENAME 2 +#define SC_CONTENT_DBAREA 3 +#define SC_CONTENT_GRAPHIC 4 +#define SC_CONTENT_OLEOBJECT 5 +#define SC_CONTENT_NOTE 6 +#define SC_CONTENT_AREALINK 7 +#define SC_CONTENT_DRAWING 8 +#define SC_CONTENT_COUNT 9 const ULONG SC_CONTENT_NOCHILD = ~0UL; // -// TreeListBox fuer Inhalte +// TreeListBox fuer Inhalte // class ScContentTree : public SvTreeListBox { - ScNavigatorDlg* pParentWindow; - ImageList aEntryImages; - ImageList aHCEntryImages; - SvLBoxEntry* pRootNodes[SC_CONTENT_COUNT]; - USHORT nRootType; // als Root eingestellt - String aManualDoc; // im Navigator umgeschaltet (Title) - BOOL bHiddenDoc; // verstecktes aktiv? - String aHiddenName; // URL zum Laden - String aHiddenTitle; // fuer Anzeige - ScDocument* pHiddenDocument; // temporaer + ScNavigatorDlg* pParentWindow; + ImageList aEntryImages; + ImageList aHCEntryImages; + SvLBoxEntry* pRootNodes[SC_CONTENT_COUNT]; + USHORT nRootType; // als Root eingestellt + String aManualDoc; // im Navigator umgeschaltet (Title) + BOOL bHiddenDoc; // verstecktes aktiv? + String aHiddenName; // URL zum Laden + String aHiddenTitle; // fuer Anzeige + ScDocument* pHiddenDocument; // temporaer - USHORT pPosList[SC_CONTENT_COUNT]; // fuer die Reihenfolge + USHORT pPosList[SC_CONTENT_COUNT]; // fuer die Reihenfolge - static BOOL bIsInDrag; // static, falls der Navigator im ExecuteDrag geloescht wird + static BOOL bIsInDrag; // static, falls der Navigator im ExecuteDrag geloescht wird ScDocShell* GetManualOrCurrent(); - void InitRoot(USHORT nType); - void ClearType(USHORT nType); - void ClearAll(); - void InsertContent( USHORT nType, const String& rValue ); + void InitRoot(USHORT nType); + void ClearType(USHORT nType); + void ClearAll(); + void InsertContent( USHORT nType, const String& rValue ); void GetDrawNames( USHORT nType ); - void GetTableNames(); - void GetAreaNames(); - void GetDbNames(); - void GetLinkNames(); - void GetGraphicNames(); - void GetOleNames(); - void GetDrawingNames(); - void GetNoteStrings(); + void GetTableNames(); + void GetAreaNames(); + void GetDbNames(); + void GetLinkNames(); + void GetGraphicNames(); + void GetOleNames(); + void GetDrawingNames(); + void GetNoteStrings(); static bool IsPartOfType( USHORT nContentType, USHORT nObjIdentifier ); - BOOL DrawNamesChanged( USHORT nType ); - BOOL NoteStringsChanged(); + BOOL DrawNamesChanged( USHORT nType ); + BOOL NoteStringsChanged(); ScAddress GetNotePos( ULONG nIndex ); const ScAreaLink* GetLink( ULONG nIndex ); @@ -110,7 +110,7 @@ class ScContentTree : public SvTreeListBox @return Index of the entry inside its root or SC_CONTENT_NOCHILD if entry is root. */ ULONG GetChildIndex( SvLBoxEntry* pEntry ) const; - void DoDrag(); + void DoDrag(); ScDocument* GetSourceDocument(); @@ -118,18 +118,18 @@ class ScContentTree : public SvTreeListBox DECL_STATIC_LINK( ScContentTree, ExecDragHdl, void* ); protected: -// virtual BOOL Drop( const DropEvent& rEvt ); -// virtual BOOL QueryDrop( DropEvent& rEvt ); +// virtual BOOL Drop( const DropEvent& rEvt ); +// virtual BOOL QueryDrop( DropEvent& rEvt ); using SvTreeListBox::ExecuteDrop; - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); - virtual void DragFinished( sal_Int8 nAction ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual void DragFinished( sal_Int8 nAction ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void Command( const CommandEvent& rCEvt ); + virtual void RequestHelp( const HelpEvent& rHEvt ); public: ScContentTree( Window* pParent, const ResId& rResId ); @@ -138,28 +138,28 @@ public: virtual void MouseButtonDown( const MouseEvent& rMEvt ); virtual void KeyInput( const KeyEvent& rKEvt ); - void InitWindowBits( BOOL bButtons ); + void InitWindowBits( BOOL bButtons ); void Refresh( USHORT nType = 0 ); - void ToggleRoot(); - void SetRootType( USHORT nNew ); - USHORT GetRootType() const { return nRootType; } + void ToggleRoot(); + void SetRootType( USHORT nNew ); + USHORT GetRootType() const { return nRootType; } - void ActiveDocChanged(); - void ResetManualDoc(); - void SetManualDoc(const String& rName); - BOOL LoadFile(const String& rUrl); - void SelectDoc(const String& rName); + void ActiveDocChanged(); + void ResetManualDoc(); + void SetManualDoc(const String& rName); + BOOL LoadFile(const String& rUrl); + void SelectDoc(const String& rName); - const String& GetHiddenTitle() const { return aHiddenTitle; } + const String& GetHiddenTitle() const { return aHiddenTitle; } /** Applies the navigator settings to the listbox. */ void ApplySettings(); /** Stores the current listbox state in the navigator settings. */ void StoreSettings() const; - static BOOL IsInDrag() { return bIsInDrag; } + static BOOL IsInDrag() { return bIsInDrag; } }; diff --git a/sc/source/ui/inc/corodlg.hxx b/sc/source/ui/inc/corodlg.hxx index fcf692500351..33eb9c883d28 100644 --- a/sc/source/ui/inc/corodlg.hxx +++ b/sc/source/ui/inc/corodlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,9 +46,9 @@ public: BOOL bRow = FALSE ) : ModalDialog( pParent, ScResId( RID_SCDLG_CHARTCOLROW ) ), aFlColRow ( this, ScResId(6) ), - aBtnRow ( this, ScResId(2) ), - aBtnCol ( this, ScResId(1) ), - aBtnOk ( this, ScResId(3) ), + aBtnRow ( this, ScResId(2) ), + aBtnCol ( this, ScResId(1) ), + aBtnOk ( this, ScResId(3) ), aBtnCancel ( this, ScResId(4) ), aBtnHelp ( this, ScResId(5) ) { @@ -62,11 +62,11 @@ public: private: FixedLine aFlColRow; - CheckBox aBtnRow; - CheckBox aBtnCol; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + CheckBox aBtnRow; + CheckBox aBtnCol; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; }; diff --git a/sc/source/ui/inc/crdlg.hxx b/sc/source/ui/inc/crdlg.hxx index 544926756286..00ce4422ebae 100644 --- a/sc/source/ui/inc/crdlg.hxx +++ b/sc/source/ui/inc/crdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,19 +40,19 @@ class ScColOrRowDlg : public ModalDialog { public: - ScColOrRowDlg( Window* pParent, - const String& rStrTitle, - const String& rStrLabel, - BOOL bColDefault = TRUE ); + ScColOrRowDlg( Window* pParent, + const String& rStrTitle, + const String& rStrLabel, + BOOL bColDefault = TRUE ); ~ScColOrRowDlg(); private: FixedLine aFlFrame; - RadioButton aBtnRows; - RadioButton aBtnCols; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + RadioButton aBtnRows; + RadioButton aBtnCols; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; DECL_LINK( OkHdl, OKButton * ); }; diff --git a/sc/source/ui/inc/crnrdlg.hrc b/sc/source/ui/inc/crnrdlg.hrc index 1d27531f9bc1..8e8de3fe32bd 100644 --- a/sc/source/ui/inc/crnrdlg.hrc +++ b/sc/source/ui/inc/crnrdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,19 +28,19 @@ #include "sc.hrc" // -> RID_SCDLG_COLROWNAMERANGES #define BTN_OK 1 -#define BTN_CANCEL 2 -#define BTN_ADD 3 -#define BTN_REMOVE 4 -#define BTN_HELP 5 +#define BTN_CANCEL 2 +#define BTN_ADD 3 +#define BTN_REMOVE 4 +#define BTN_HELP 5 // -#define LB_RANGE 11 +#define LB_RANGE 11 // #define FL_ASSIGN 12 -#define ED_AREA 13 -#define RB_AREA 14 -#define BTN_COLHEAD 15 -#define BTN_ROWHEAD 16 -#define ED_DATA 17 -#define RB_DATA 18 -#define FT_DATA_LABEL 19 +#define ED_AREA 13 +#define RB_AREA 14 +#define BTN_COLHEAD 15 +#define BTN_ROWHEAD 16 +#define ED_DATA 17 +#define RB_DATA 18 +#define FT_DATA_LABEL 19 // diff --git a/sc/source/ui/inc/crnrdlg.hxx b/sc/source/ui/inc/crnrdlg.hxx index bd0d974cd764..f09d05ed4c66 100644 --- a/sc/source/ui/inc/crnrdlg.hxx +++ b/sc/source/ui/inc/crnrdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,51 +46,51 @@ class ScColRowNameRangesDlg : public ScAnyRefDlg { public: ScColRowNameRangesDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - ScViewData* ptrViewData ); + ScViewData* ptrViewData ); ~ScColRowNameRangesDlg(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual BOOL IsRefInputMode() const; - virtual void SetActive(); - virtual BOOL Close(); + virtual BOOL IsRefInputMode() const; + virtual void SetActive(); + virtual BOOL Close(); private: FixedLine aFlAssign; - ListBox aLbRange; + ListBox aLbRange; - formula::RefEdit aEdAssign; - formula::RefButton aRbAssign; - RadioButton aBtnColHead; - RadioButton aBtnRowHead; - FixedText aFtAssign2; - formula::RefEdit aEdAssign2; - formula::RefButton aRbAssign2; + formula::RefEdit aEdAssign; + formula::RefButton aRbAssign; + RadioButton aBtnColHead; + RadioButton aBtnRowHead; + FixedText aFtAssign2; + formula::RefEdit aEdAssign2; + formula::RefButton aRbAssign2; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - PushButton aBtnAdd; - PushButton aBtnRemove; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; + PushButton aBtnAdd; + PushButton aBtnRemove; - ScRange theCurArea; - ScRange theCurData; + ScRange theCurArea; + ScRange theCurData; - ScRangePairListRef xColNameRanges; - ScRangePairListRef xRowNameRanges; + ScRangePairListRef xColNameRanges; + ScRangePairListRef xRowNameRanges; typedef ::std::hash_map< String, ScRange, ScStringHashCode, ::std::equal_to<String> > NameRangeMap; NameRangeMap aRangeMap; - ScViewData* pViewData; - ScDocument* pDoc; - formula::RefEdit* pEdActive; - BOOL bDlgLostFocus; + ScViewData* pViewData; + ScDocument* pDoc; + formula::RefEdit* pEdActive; + BOOL bDlgLostFocus; #ifdef _CRNRDLG_CXX private: - void Init (); - void UpdateNames (); - void UpdateRangeData ( const ScRange& rRange, BOOL bColName ); + void Init (); + void UpdateNames (); + void UpdateRangeData ( const ScRange& rRange, BOOL bColName ); void SetColRowData( const ScRange& rLabelRange,BOOL bRef=FALSE); void AdjustColRowData( const ScRange& rDataRange,BOOL bRef=FALSE); DECL_LINK( CancelBtnHdl, void * ); diff --git a/sc/source/ui/inc/csvcontrol.hxx b/sc/source/ui/inc/csvcontrol.hxx index 68a97150e8e4..e8fc6e51cd10 100644 --- a/sc/source/ui/inc/csvcontrol.hxx +++ b/sc/source/ui/inc/csvcontrol.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/inc/csvgrid.hxx b/sc/source/ui/inc/csvgrid.hxx index c5d5eb58649f..7b6e8d76e4bf 100644 --- a/sc/source/ui/inc/csvgrid.hxx +++ b/sc/source/ui/inc/csvgrid.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/inc/csvruler.hxx b/sc/source/ui/inc/csvruler.hxx index 3d2d01da8b0f..0ffd095ede86 100644 --- a/sc/source/ui/inc/csvruler.hxx +++ b/sc/source/ui/inc/csvruler.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/inc/csvsplits.hxx b/sc/source/ui/inc/csvsplits.hxx index 42d38bcca803..7c7c48ea9db5 100644 --- a/sc/source/ui/inc/csvsplits.hxx +++ b/sc/source/ui/inc/csvsplits.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/inc/csvtablebox.hxx b/sc/source/ui/inc/csvtablebox.hxx index 7837c4519da2..b944bef0c909 100644 --- a/sc/source/ui/inc/csvtablebox.hxx +++ b/sc/source/ui/inc/csvtablebox.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/inc/dapidata.hxx b/sc/source/ui/inc/dapidata.hxx index 588ef43cf72a..5da8703ed08a 100644 --- a/sc/source/ui/inc/dapidata.hxx +++ b/sc/source/ui/inc/dapidata.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,17 +44,17 @@ class ScDataPilotDatabaseDlg : public ModalDialog { private: FixedLine aFlFrame; - FixedText aFtDatabase; - ListBox aLbDatabase; - FixedText aFtObject; - ComboBox aCbObject; - FixedText aFtType; - ListBox aLbType; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + FixedText aFtDatabase; + ListBox aLbDatabase; + FixedText aFtObject; + ComboBox aCbObject; + FixedText aFtType; + ListBox aLbType; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; - void FillObjects(); + void FillObjects(); DECL_LINK( SelectHdl, ListBox* ); @@ -62,7 +62,7 @@ public: ScDataPilotDatabaseDlg( Window* pParent ); ~ScDataPilotDatabaseDlg(); - void GetValues( ScImportSourceDesc& rDesc ); + void GetValues( ScImportSourceDesc& rDesc ); }; diff --git a/sc/source/ui/inc/dapitype.hxx b/sc/source/ui/inc/dapitype.hxx index 25b3453822e0..5d483cb560e9 100644 --- a/sc/source/ui/inc/dapitype.hxx +++ b/sc/source/ui/inc/dapitype.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,19 +42,19 @@ class ScDataPilotSourceTypeDlg : public ModalDialog { private: FixedLine aFlFrame; - RadioButton aBtnSelection; - RadioButton aBtnDatabase; - RadioButton aBtnExternal; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + RadioButton aBtnSelection; + RadioButton aBtnDatabase; + RadioButton aBtnExternal; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; public: ScDataPilotSourceTypeDlg( Window* pParent, BOOL bEnableExternal ); ~ScDataPilotSourceTypeDlg(); - BOOL IsDatabase() const; - BOOL IsExternal() const; + BOOL IsDatabase() const; + BOOL IsExternal() const; }; @@ -62,30 +62,30 @@ class ScDataPilotServiceDlg : public ModalDialog { private: FixedLine aFlFrame; - FixedText aFtService; - ListBox aLbService; - FixedText aFtSource; - Edit aEdSource; - FixedText aFtName; - Edit aEdName; - FixedText aFtUser; - Edit aEdUser; - FixedText aFtPasswd; - Edit aEdPasswd; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + FixedText aFtService; + ListBox aLbService; + FixedText aFtSource; + Edit aEdSource; + FixedText aFtName; + Edit aEdName; + FixedText aFtUser; + Edit aEdUser; + FixedText aFtPasswd; + Edit aEdPasswd; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; public: ScDataPilotServiceDlg( Window* pParent, const com::sun::star::uno::Sequence<rtl::OUString>& rServices ); ~ScDataPilotServiceDlg(); - String GetServiceName() const; - String GetParSource() const; - String GetParName() const; - String GetParUser() const; - String GetParPass() const; + String GetServiceName() const; + String GetParSource() const; + String GetParName() const; + String GetParUser() const; + String GetParPass() const; }; diff --git a/sc/source/ui/inc/datafdlg.hrc b/sc/source/ui/inc/datafdlg.hrc index 577d6e000281..b32e0a9a267f 100644 --- a/sc/source/ui/inc/datafdlg.hrc +++ b/sc/source/ui/inc/datafdlg.hrc @@ -24,7 +24,7 @@ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable * instead of those above. */ -#include "sc.hrc" // -> RID_SCDLG_DATAFORM +#include "sc.hrc" // -> RID_SCDLG_DATAFORM //dataform #define BTN_DATAFORM_NEW 1001 diff --git a/sc/source/ui/inc/dbdocfun.hxx b/sc/source/ui/inc/dbdocfun.hxx index aad57b0502f1..97cc632e37ef 100644 --- a/sc/source/ui/inc/dbdocfun.hxx +++ b/sc/source/ui/inc/dbdocfun.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,49 +74,49 @@ class ScDBDocFunc friend class ScDBFunc; private: - ScDocShell& rDocShell; + ScDocShell& rDocShell; public: ScDBDocFunc( ScDocShell& rDocSh ): rDocShell(rDocSh) {} ~ScDBDocFunc() {} - void UpdateImport( const String& rTarget, const String& rDBName, + void UpdateImport( const String& rTarget, const String& rDBName, const String& rTableName, const String& rStatement, BOOL bNative, BYTE nType, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& xResultSet, const SbaSelectionList* pSelection ); - BOOL DoImport( SCTAB nTab, const ScImportParam& rParam, + BOOL DoImport( SCTAB nTab, const ScImportParam& rParam, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& xResultSet, const SbaSelectionList* pSelection, BOOL bRecord, BOOL bAddrInsert = FALSE ); - BOOL DoImportUno( const ScAddress& rPos, + BOOL DoImportUno( const ScAddress& rPos, const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue>& aArgs ); - static void ShowInBeamer( const ScImportParam& rParam, SfxViewFrame* pFrame ); + static void ShowInBeamer( const ScImportParam& rParam, SfxViewFrame* pFrame ); - BOOL Sort( SCTAB nTab, const ScSortParam& rSortParam, + BOOL Sort( SCTAB nTab, const ScSortParam& rSortParam, BOOL bRecord, BOOL bPaint, BOOL bApi ); - SC_DLLPUBLIC BOOL Query( SCTAB nTab, const ScQueryParam& rQueryParam, + SC_DLLPUBLIC BOOL Query( SCTAB nTab, const ScQueryParam& rQueryParam, const ScRange* pAdvSource, BOOL bRecord, BOOL bApi ); - BOOL DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam, + BOOL DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam, const ScSortParam* pForceNewSort, BOOL bRecord, BOOL bApi ); - BOOL AddDBRange( const String& rName, const ScRange& rRange, BOOL bApi ); - BOOL DeleteDBRange( const String& rName, BOOL bApi ); - BOOL RenameDBRange( const String& rOld, const String& rNew, BOOL bApi ); - BOOL ModifyDBData( const ScDBData& rNewData, BOOL bApi ); // Name unveraendert + BOOL AddDBRange( const String& rName, const ScRange& rRange, BOOL bApi ); + BOOL DeleteDBRange( const String& rName, BOOL bApi ); + BOOL RenameDBRange( const String& rOld, const String& rNew, BOOL bApi ); + BOOL ModifyDBData( const ScDBData& rNewData, BOOL bApi ); // Name unveraendert - BOOL RepeatDB( const String& rDBName, BOOL bRecord, BOOL bApi ); + BOOL RepeatDB( const String& rDBName, BOOL bRecord, BOOL bApi ); - BOOL DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewObj, + BOOL DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewObj, BOOL bRecord, BOOL bApi, BOOL bAllowMove = FALSE ); }; diff --git a/sc/source/ui/inc/dbfunc.hxx b/sc/source/ui/inc/dbfunc.hxx index 9f01774f24b7..5054f1fa10c7 100644 --- a/sc/source/ui/inc/dbfunc.hxx +++ b/sc/source/ui/inc/dbfunc.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,39 +53,39 @@ private: public: ScDBFunc( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ); - virtual ~ScDBFunc(); + virtual ~ScDBFunc(); - // nur UISort wiederholt bei Bedarf die Teilergebnisse + // nur UISort wiederholt bei Bedarf die Teilergebnisse - void UISort( const ScSortParam& rSortParam, + void UISort( const ScSortParam& rSortParam, BOOL bRecord = TRUE ); - void Sort( const ScSortParam& rSortParam, + void Sort( const ScSortParam& rSortParam, BOOL bRecord = TRUE, BOOL bPaint = TRUE ); - SC_DLLPUBLIC void Query( const ScQueryParam& rQueryParam, + SC_DLLPUBLIC void Query( const ScQueryParam& rQueryParam, const ScRange* pAdvSource, BOOL bRecord ); - void DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord = TRUE, + void DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord = TRUE, const ScSortParam* pForceNewSort = NULL ); - void ToggleAutoFilter(); - void HideAutoFilter(); + void ToggleAutoFilter(); + void HideAutoFilter(); - void RepeatDB( BOOL bRecord = TRUE ); + void RepeatDB( BOOL bRecord = TRUE ); - BOOL ImportData( const ScImportParam& rParam, BOOL bRecord = TRUE ); + BOOL ImportData( const ScImportParam& rParam, BOOL bRecord = TRUE ); - void GotoDBArea( const String& rDBName ); + void GotoDBArea( const String& rDBName ); // DB-Bereich vom Cursor - ScDBData* GetDBData( BOOL bMarkArea = TRUE, ScGetDBMode eMode = SC_DB_MAKE, ScGetDBSelection eSel = SC_DBSEL_KEEP, bool bShrinkToData = false, bool bExpandRows = false ); + ScDBData* GetDBData( BOOL bMarkArea = TRUE, ScGetDBMode eMode = SC_DB_MAKE, ScGetDBSelection eSel = SC_DBSEL_KEEP, bool bShrinkToData = false, bool bExpandRows = false ); - void NotifyCloseDbNameDlg( const ScDBCollection& rNewColl, const List& rDelAreaList ); + void NotifyCloseDbNameDlg( const ScDBCollection& rNewColl, const List& rDelAreaList ); - void Consolidate( const ScConsolidateParam& rParam, BOOL bRecord = TRUE ); + void Consolidate( const ScConsolidateParam& rParam, BOOL bRecord = TRUE ); bool MakePivotTable( const ScDPSaveData& rData, const ScRange& rDest, BOOL bNewTable, const ScDPObject& rSource, BOOL bApi = FALSE ); - void DeletePivotTable(); + void DeletePivotTable(); // Wang Xu Ming -- 2009-6-17 // DataPilot Migration ULONG RecalcPivotTable(); @@ -107,25 +107,25 @@ public: void ShowDataPilotSourceData( ScDPObject& rDPObj, const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::DataPilotFieldFilter >& rFilters ); - void MakeOutline( BOOL bColumns, BOOL bRecord = TRUE ); - void RemoveOutline( BOOL bColumns, BOOL bRecord = TRUE ); - void RemoveAllOutlines( BOOL bRecord = TRUE ); - void TestRemoveOutline( BOOL& rCol, BOOL& rRow ); + void MakeOutline( BOOL bColumns, BOOL bRecord = TRUE ); + void RemoveOutline( BOOL bColumns, BOOL bRecord = TRUE ); + void RemoveAllOutlines( BOOL bRecord = TRUE ); + void TestRemoveOutline( BOOL& rCol, BOOL& rRow ); - void AutoOutline( BOOL bRecord = TRUE ); + void AutoOutline( BOOL bRecord = TRUE ); - void SelectLevel( BOOL bColumns, USHORT nLevel, + void SelectLevel( BOOL bColumns, USHORT nLevel, BOOL bRecord = TRUE, BOOL bPaint = TRUE ); - void ShowOutline( BOOL bColumns, USHORT nLevel, USHORT nEntry, + void ShowOutline( BOOL bColumns, USHORT nLevel, USHORT nEntry, BOOL bRecord = TRUE, BOOL bPaint = TRUE ); - void HideOutline( BOOL bColumns, USHORT nLevel, USHORT nEntry, + void HideOutline( BOOL bColumns, USHORT nLevel, USHORT nEntry, BOOL bRecord = TRUE, BOOL bPaint = TRUE ); - void ShowMarkedOutlines( BOOL bRecord = TRUE ); - void HideMarkedOutlines( BOOL bRecord = TRUE ); - BOOL OutlinePossible(BOOL bHide); + void ShowMarkedOutlines( BOOL bRecord = TRUE ); + void HideMarkedOutlines( BOOL bRecord = TRUE ); + BOOL OutlinePossible(BOOL bHide); - void UpdateCharts(BOOL bAllCharts = FALSE); // Default: am Cursor + void UpdateCharts(BOOL bAllCharts = FALSE); // Default: am Cursor static USHORT DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc, BOOL bAllCharts ); }; diff --git a/sc/source/ui/inc/dbnamdlg.hrc b/sc/source/ui/inc/dbnamdlg.hrc index fd0205e3bbed..8062656a10c5 100644 --- a/sc/source/ui/inc/dbnamdlg.hrc +++ b/sc/source/ui/inc/dbnamdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,15 +28,15 @@ #include "sc.hrc" // -> RID_SCDLG_DBNAMES #define BTN_OK 1 -#define BTN_CANCEL 2 -#define BTN_ADD 3 -#define BTN_REMOVE 4 -#define BTN_HELP 5 +#define BTN_CANCEL 2 +#define BTN_ADD 3 +#define BTN_REMOVE 4 +#define BTN_HELP 5 #define FL_NAME 10 -#define ED_NAME 11 +#define ED_NAME 11 #define FL_ASSIGN 12 -#define ED_DBAREA 13 -#define RB_DBAREA 14 +#define ED_DBAREA 13 +#define RB_DBAREA 14 #define FL_OPTIONS 20 #define BTN_HEADER 21 #define BTN_SIZE 22 diff --git a/sc/source/ui/inc/dbnamdlg.hxx b/sc/source/ui/inc/dbnamdlg.hxx index 8c6e61f60943..816a4e5c2b8b 100644 --- a/sc/source/ui/inc/dbnamdlg.hxx +++ b/sc/source/ui/inc/dbnamdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,64 +48,64 @@ class ScDbNameDlg : public ScAnyRefDlg { public: ScDbNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - ScViewData* ptrViewData ); + ScViewData* ptrViewData ); ~ScDbNameDlg(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual BOOL IsRefInputMode() const; - virtual void SetActive(); - virtual BOOL Close(); + virtual BOOL IsRefInputMode() const; + virtual void SetActive(); + virtual BOOL Close(); private: FixedLine aFlName; - ComboBox aEdName; + ComboBox aEdName; FixedLine aFlAssign; - formula::RefEdit aEdAssign; - formula::RefButton aRbAssign; + formula::RefEdit aEdAssign; + formula::RefButton aRbAssign; FixedLine aFlOptions; - CheckBox aBtnHeader; - CheckBox aBtnDoSize; - CheckBox aBtnKeepFmt; - CheckBox aBtnStripData; - ScExpandedFixedText aFTSource; //@18.09.97 erweiterter FixedText - FixedText aFTOperations; - - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - PushButton aBtnAdd; - PushButton aBtnRemove; - MoreButton aBtnMore; - - BOOL bSaved; - - - const String aStrAdd; // "Hinzufuegen" - const String aStrModify; // "Aendern" - const String aStrNoName; // "unbenannt" - const String aStrInvalid; - - String aStrSource; - String aStrOperations; - - ScViewData* pViewData; - ScDocument* pDoc; - BOOL bRefInputMode; + CheckBox aBtnHeader; + CheckBox aBtnDoSize; + CheckBox aBtnKeepFmt; + CheckBox aBtnStripData; + ScExpandedFixedText aFTSource; //@18.09.97 erweiterter FixedText + FixedText aFTOperations; + + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; + PushButton aBtnAdd; + PushButton aBtnRemove; + MoreButton aBtnMore; + + BOOL bSaved; + + + const String aStrAdd; // "Hinzufuegen" + const String aStrModify; // "Aendern" + const String aStrNoName; // "unbenannt" + const String aStrInvalid; + + String aStrSource; + String aStrOperations; + + ScViewData* pViewData; + ScDocument* pDoc; + BOOL bRefInputMode; ScAddress::Details aAddrDetails; - ScDBCollection aLocalDbCol; - ScRange theCurArea; - List aRemoveList; + ScDBCollection aLocalDbCol; + ScRange theCurArea; + List aRemoveList; #ifdef _DBNAMDLG_CXX private: - void Init(); - void UpdateNames(); - void UpdateDBData( const String& rStrName ); - void SetInfoStrings( const ScDBData* pDBData ); + void Init(); + void UpdateNames(); + void UpdateDBData( const String& rStrName ); + void SetInfoStrings( const ScDBData* pDBData ); DECL_LINK( CancelBtnHdl, void * ); DECL_LINK( OkBtnHdl, void * ); diff --git a/sc/source/ui/inc/delcldlg.hxx b/sc/source/ui/inc/delcldlg.hxx index e1bbcc0f9b59..1bb78c3ec283 100644 --- a/sc/source/ui/inc/delcldlg.hxx +++ b/sc/source/ui/inc/delcldlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,13 +43,13 @@ class ScDeleteCellDlg : public ModalDialog { private: FixedLine aFlFrame; - RadioButton aBtnCellsUp; - RadioButton aBtnCellsLeft; - RadioButton aBtnDelRows; - RadioButton aBtnDelCols; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + RadioButton aBtnCellsUp; + RadioButton aBtnCellsLeft; + RadioButton aBtnDelRows; + RadioButton aBtnDelCols; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; public: diff --git a/sc/source/ui/inc/delcodlg.hxx b/sc/source/ui/inc/delcodlg.hxx index 15050229b507..3180cb3cea48 100644 --- a/sc/source/ui/inc/delcodlg.hxx +++ b/sc/source/ui/inc/delcodlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,22 +40,22 @@ class ScDeleteContentsDlg : public ModalDialog { private: FixedLine aFlFrame; - CheckBox aBtnDelAll; - CheckBox aBtnDelStrings; - CheckBox aBtnDelNumbers; - CheckBox aBtnDelDateTime; - CheckBox aBtnDelFormulas; - CheckBox aBtnDelNotes; - CheckBox aBtnDelAttrs; - CheckBox aBtnDelObjects; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + CheckBox aBtnDelAll; + CheckBox aBtnDelStrings; + CheckBox aBtnDelNumbers; + CheckBox aBtnDelDateTime; + CheckBox aBtnDelFormulas; + CheckBox aBtnDelNotes; + CheckBox aBtnDelAttrs; + CheckBox aBtnDelObjects; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; - BOOL bObjectsDisabled; + BOOL bObjectsDisabled; - static BOOL bPreviousAllCheck; - static USHORT nPreviousChecks; + static BOOL bPreviousAllCheck; + static USHORT nPreviousChecks; void DisableChecks( BOOL bDelAllChecked = TRUE ); DECL_LINK( DelAllHdl, void * ); @@ -64,9 +64,9 @@ public: ScDeleteContentsDlg( Window* pParent, USHORT nCheckDefaults = 0 ); ~ScDeleteContentsDlg(); - void DisableObjects(); + void DisableObjects(); - USHORT GetDelContentsCmdBits() const; + USHORT GetDelContentsCmdBits() const; }; diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx index d360750f1bbb..422a716c3add 100644 --- a/sc/source/ui/inc/docfunc.hxx +++ b/sc/source/ui/inc/docfunc.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -168,7 +168,7 @@ public: double fStart, double fStep, double fMax, BOOL bRecord, BOOL bApi ); // FillAuto: rRange wird von Source-Range auf Dest-Range angepasst - SC_DLLPUBLIC BOOL FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir eDir, FillCmd eCmd, FillDateCmd eDateCmd, ULONG nCount, double fStep, double fMax, BOOL bRecord, BOOL bApi ); + SC_DLLPUBLIC BOOL FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir eDir, FillCmd eCmd, FillDateCmd eDateCmd, ULONG nCount, double fStep, double fMax, BOOL bRecord, BOOL bApi ); BOOL FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir eDir, ULONG nCount, BOOL bRecord, BOOL bApi ); diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 6a1fa0ff5098..bf29914feb1d 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -95,49 +95,49 @@ class SC_DLLPUBLIC ScDocShell: public SfxObjectShell, public SfxListener ScDocument aDocument; - String aDdeTextFmt; - String aConvFilterName; //@ #BugId 54198 + String aDdeTextFmt; + String aConvFilterName; //@ #BugId 54198 - double nPrtToScreenFactor; + double nPrtToScreenFactor; //! FontList* pFontList; DocShell_Impl* pImpl; - ScDocFunc* pDocFunc; - - //SfxObjectCreateMode eShellMode; - - BOOL bIsInplace; // wird von der View gesetzt - BOOL bHeaderOn; - BOOL bFooterOn; - BOOL bNoInformLost; - BOOL bIsEmpty; - BOOL bIsInUndo; - BOOL bDocumentModifiedPending; - USHORT nDocumentLock; + ScDocFunc* pDocFunc; + + //SfxObjectCreateMode eShellMode; + + BOOL bIsInplace; // wird von der View gesetzt + BOOL bHeaderOn; + BOOL bFooterOn; + BOOL bNoInformLost; + BOOL bIsEmpty; + BOOL bIsInUndo; + BOOL bDocumentModifiedPending; + USHORT nDocumentLock; sal_Int16 nCanUpdate; // stores the UpdateDocMode from loading a document till update links BOOL bUpdateEnabled; ScDBData* pOldAutoDBRange; - ScSbxDocHelper* pDocHelper; + ScSbxDocHelper* pDocHelper; - ScAutoStyleList* pAutoStyleList; - ScPaintLockData* pPaintLockData; - ScJobSetup* pOldJobSetup; + ScAutoStyleList* pAutoStyleList; + ScPaintLockData* pPaintLockData; + ScJobSetup* pOldJobSetup; ScOptSolverSave* pSolverSaveData; ScSheetSaveData* pSheetSaveData; ScDocShellModificator* pModificator; // #109979#; is used to load XML (created in BeforeXMLLoading and destroyed in AfterXMLLoading) - SC_DLLPRIVATE void InitItems(); - SC_DLLPRIVATE void DoEnterHandler(); + SC_DLLPRIVATE void InitItems(); + SC_DLLPRIVATE void DoEnterHandler(); SC_DLLPRIVATE void InitOptions(bool bForLoading); - SC_DLLPRIVATE void ResetDrawObjectShell(); + SC_DLLPRIVATE void ResetDrawObjectShell(); // SUNWS needs a forward declared friend, otherwise types and members // of the outer class are not accessible. class PrepareSaveGuard; friend class ScDocShell::PrepareSaveGuard; - /** Do things that need to be done before saving to our own format and + /** Do things that need to be done before saving to our own format and necessary clean ups in dtor. */ class PrepareSaveGuard { @@ -150,21 +150,21 @@ class SC_DLLPUBLIC ScDocShell: public SfxObjectShell, public SfxListener SC_DLLPRIVATE BOOL LoadXML( SfxMedium* pMedium, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& ); SC_DLLPRIVATE BOOL SaveXML( SfxMedium* pMedium, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& ); - SC_DLLPRIVATE SCTAB GetSaveTab(); + SC_DLLPRIVATE SCTAB GetSaveTab(); - SC_DLLPRIVATE ULONG DBaseImport( const String& rFullFileName, CharSet eCharSet, + SC_DLLPRIVATE ULONG DBaseImport( const String& rFullFileName, CharSet eCharSet, ScColWidthParam aColWidthParam[MAXCOLCOUNT], ScFlatBoolRowSegments& rRowHeightsRecalc ); - SC_DLLPRIVATE ULONG DBaseExport( const String& rFullFileName, CharSet eCharSet, + SC_DLLPRIVATE ULONG DBaseExport( const String& rFullFileName, CharSet eCharSet, BOOL& bHasMemo ); - SC_DLLPRIVATE static BOOL MoveFile( const INetURLObject& rSource, const INetURLObject& rDest ); - SC_DLLPRIVATE static BOOL KillFile( const INetURLObject& rURL ); - SC_DLLPRIVATE static BOOL IsDocument( const INetURLObject& rURL ); + SC_DLLPRIVATE static BOOL MoveFile( const INetURLObject& rSource, const INetURLObject& rDest ); + SC_DLLPRIVATE static BOOL KillFile( const INetURLObject& rURL ); + SC_DLLPRIVATE static BOOL IsDocument( const INetURLObject& rURL ); - SC_DLLPRIVATE void LockPaint_Impl(BOOL bDoc); - SC_DLLPRIVATE void UnlockPaint_Impl(BOOL bDoc); - SC_DLLPRIVATE void LockDocument_Impl(USHORT nNew); - SC_DLLPRIVATE void UnlockDocument_Impl(USHORT nNew); + SC_DLLPRIVATE void LockPaint_Impl(BOOL bDoc); + SC_DLLPRIVATE void UnlockPaint_Impl(BOOL bDoc); + SC_DLLPRIVATE void LockDocument_Impl(USHORT nNew); + SC_DLLPRIVATE void UnlockDocument_Impl(USHORT nNew); SC_DLLPRIVATE void EnableSharedSettings( bool bEnable ); SC_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > LoadSharedDocument(); @@ -195,7 +195,7 @@ public: virtual SfxUndoManager* GetUndoManager(); - virtual void FillClass( SvGlobalName * pClassName, + virtual void FillClass( SvGlobalName * pClassName, sal_uInt32 * pFormat, String * pAppName, String * pFullTypeName, @@ -210,19 +210,19 @@ public: virtual BOOL Save(); virtual BOOL SaveAs( SfxMedium& rMedium ); virtual BOOL ConvertTo( SfxMedium &rMedium ); - virtual USHORT PrepareClose( BOOL bUI = TRUE, BOOL bForBrowsing = FALSE ); - virtual void PrepareReload(); - virtual BOOL IsInformationLost(); - virtual void LoadStyles( SfxObjectShell &rSource ); - virtual BOOL Insert( SfxObjectShell &rSource, + virtual USHORT PrepareClose( BOOL bUI = TRUE, BOOL bForBrowsing = FALSE ); + virtual void PrepareReload(); + virtual BOOL IsInformationLost(); + virtual void LoadStyles( SfxObjectShell &rSource ); + virtual BOOL Insert( SfxObjectShell &rSource, USHORT nSourceIdx1, USHORT nSourceIdx2, USHORT nSourceIdx3, USHORT &nIdx1, USHORT &nIdx2, USHORT &nIdx3, USHORT &rIdxDeleted ); virtual BOOL SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& ); // SfxInPlaceObject - virtual BOOL DoSaveCompleted( SfxMedium * pNewStor); // SfxObjectShell + virtual BOOL DoSaveCompleted( SfxMedium * pNewStor); // SfxObjectShell virtual sal_Bool QuerySlotExecutable( USHORT nSlotId ); - virtual void Draw( OutputDevice *, const JobSetup & rSetup, + virtual void Draw( OutputDevice *, const JobSetup & rSetup, USHORT nAspect = ASPECT_CONTENT ); virtual void SetVisArea( const Rectangle & rVisArea ); @@ -232,44 +232,44 @@ public: virtual Printer* GetDocumentPrinter(); - virtual void SetModified( BOOL = TRUE ); + virtual void SetModified( BOOL = TRUE ); - void SetVisAreaOrSize( const Rectangle& rVisArea, BOOL bModifyStart ); + void SetVisAreaOrSize( const Rectangle& rVisArea, BOOL bModifyStart ); virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog( Window *pParent, const SfxItemSet &rSet ); - void GetDocStat( ScDocStat& rDocStat ); + void GetDocStat( ScDocStat& rDocStat ); - ScDocument* GetDocument() { return &aDocument; } - ScDocFunc& GetDocFunc() { return *pDocFunc; } + ScDocument* GetDocument() { return &aDocument; } + ScDocFunc& GetDocFunc() { return *pDocFunc; } - SfxPrinter* GetPrinter( BOOL bCreateIfNotExist = TRUE ); - USHORT SetPrinter( SfxPrinter* pNewPrinter, USHORT nDiffFlags = SFX_PRINTER_ALL ); + SfxPrinter* GetPrinter( BOOL bCreateIfNotExist = TRUE ); + USHORT SetPrinter( SfxPrinter* pNewPrinter, USHORT nDiffFlags = SFX_PRINTER_ALL ); - void UpdateFontList(); + void UpdateFontList(); - String CreateObjectName( const String& rPrefix ); + String CreateObjectName( const String& rPrefix ); - ScDrawLayer* MakeDrawLayer(); + ScDrawLayer* MakeDrawLayer(); - void AsciiSave( SvStream& rStream, const ScImportOptions& rOpt ); + void AsciiSave( SvStream& rStream, const ScImportOptions& rOpt ); - void GetSbxState( SfxItemSet &rSet ); - void GetDrawObjState( SfxItemSet &rSet ); + void GetSbxState( SfxItemSet &rSet ); + void GetDrawObjState( SfxItemSet &rSet ); void Execute( SfxRequest& rReq ); void GetState( SfxItemSet &rSet ); - void ExecutePageStyle ( SfxViewShell& rCaller, SfxRequest& rReq, SCTAB nCurTab ); - void GetStatePageStyle( SfxViewShell& rCaller, SfxItemSet& rSet, SCTAB nCurTab ); + void ExecutePageStyle ( SfxViewShell& rCaller, SfxRequest& rReq, SCTAB nCurTab ); + void GetStatePageStyle( SfxViewShell& rCaller, SfxItemSet& rSet, SCTAB nCurTab ); - void CompareDocument( ScDocument& rOtherDoc ); + void CompareDocument( ScDocument& rOtherDoc ); void MergeDocument( ScDocument& rOtherDoc, bool bShared = false, bool bCheckDuplicates = false, ULONG nOffset = 0, ScChangeActionMergeMap* pMergeMap = NULL, bool bInverseMap = false ); bool MergeSharedDocument( ScDocShell* pSharedDocShell ); - ScChangeAction* GetChangeAction( const ScAddress& rPos ); - void SetChangeComment( ScChangeAction* pAction, const String& rComment ); - void ExecuteChangeCommentDialog( ScChangeAction* pAction, Window* pParent,BOOL bPrevNext=TRUE ); + ScChangeAction* GetChangeAction( const ScAddress& rPos ); + void SetChangeComment( ScChangeAction* pAction, const String& rComment ); + void ExecuteChangeCommentDialog( ScChangeAction* pAction, Window* pParent,BOOL bPrevNext=TRUE ); /// Protect/unprotect ChangeTrack and return <TRUE/> if /// protection was successfully changed. /// If bJustQueryIfProtected==TRUE protection is not @@ -277,59 +277,59 @@ public: /// password was entered correctly. BOOL ExecuteChangeProtectionDialog( Window* _pParent, BOOL bJustQueryIfProtected = FALSE ); - void SetPrintZoom( SCTAB nTab, USHORT nScale, USHORT nPages ); - BOOL AdjustPrintZoom( const ScRange& rRange ); + void SetPrintZoom( SCTAB nTab, USHORT nScale, USHORT nPages ); + BOOL AdjustPrintZoom( const ScRange& rRange ); - void LoadStylesArgs( ScDocShell& rSource, BOOL bReplace, BOOL bCellStyles, BOOL bPageStyles ); + void LoadStylesArgs( ScDocShell& rSource, BOOL bReplace, BOOL bCellStyles, BOOL bPageStyles ); - void PageStyleModified( const String& rStyleName, BOOL bApi ); + void PageStyleModified( const String& rStyleName, BOOL bApi ); - void NotifyStyle( const SfxStyleSheetHint& rHint ); - void DoAutoStyle( const ScRange& rRange, const String& rStyle ); + void NotifyStyle( const SfxStyleSheetHint& rHint ); + void DoAutoStyle( const ScRange& rRange, const String& rStyle ); - Window* GetActiveDialogParent(); - void ErrorMessage( USHORT nGlobStrId ); - BOOL IsEditable() const; + Window* GetActiveDialogParent(); + void ErrorMessage( USHORT nGlobStrId ); + BOOL IsEditable() const; - BOOL AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab ); + BOOL AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab ); void UpdateAllRowHeights( const ScMarkData* pTabMark = NULL ); void UpdatePendingRowHeights( SCTAB nUpdateTab, bool bBefore = false ); - void RefreshPivotTables( const ScRange& rSource ); - void DoConsolidate( const ScConsolidateParam& rParam, BOOL bRecord = TRUE ); - void UseScenario( SCTAB nTab, const String& rName, BOOL bRecord = TRUE ); - SCTAB MakeScenario( SCTAB nTab, const String& rName, const String& rComment, + void RefreshPivotTables( const ScRange& rSource ); + void DoConsolidate( const ScConsolidateParam& rParam, BOOL bRecord = TRUE ); + void UseScenario( SCTAB nTab, const String& rName, BOOL bRecord = TRUE ); + SCTAB MakeScenario( SCTAB nTab, const String& rName, const String& rComment, const Color& rColor, USHORT nFlags, ScMarkData& rMark, BOOL bRecord = TRUE ); - void ModifyScenario( SCTAB nTab, const String& rName, const String& rComment, + void ModifyScenario( SCTAB nTab, const String& rName, const String& rComment, const Color& rColor, USHORT nFlags ); ULONG TransferTab( ScDocShell& rSrcDocShell, SCTAB nSrcPos, SCTAB nDestPos, BOOL bInsertNew, BOOL bNotifyAndPaint ); - BOOL MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRecord ); + BOOL MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRecord ); - void DoRecalc( BOOL bApi ); - void DoHardRecalc( BOOL bApi ); + void DoRecalc( BOOL bApi ); + void DoHardRecalc( BOOL bApi ); bool CheckPrint( PrintDialog* pPrintDialog, ScMarkData* pMarkData, bool bForceSelected, bool bIsAPI ); - void PreparePrint( PrintDialog* pPrintDialog, ScMarkData* pMarkData ); - void Print( SfxProgress& rProgress, PrintDialog* pPrintDialog, + void PreparePrint( PrintDialog* pPrintDialog, ScMarkData* pMarkData ); + void Print( SfxProgress& rProgress, PrintDialog* pPrintDialog, ScMarkData* pMarkData, Window* pDialogParent, BOOL bForceSelected, BOOL bIsAPI ); - void UpdateOle( const ScViewData* pViewData, BOOL bSnapSize = FALSE ); - BOOL IsOle(); + void UpdateOle( const ScViewData* pViewData, BOOL bSnapSize = FALSE ); + BOOL IsOle(); - void DBAreaDeleted( SCTAB nTab, SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 ); - ScDBData* GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGetDBSelection eSel ); + void DBAreaDeleted( SCTAB nTab, SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 ); + ScDBData* GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGetDBSelection eSel ); ScDBData* GetOldAutoDBRange(); // has to be deleted by caller! void CancelAutoDBRange(); // called when dialog is cancelled virtual void ReconnectDdeLink(SfxObjectShell& rServer); - void UpdateLinks(); // Link-Eintraege aktuallisieren - BOOL ReloadTabLinks(); // Links ausfuehren (Inhalt aktualisieren) + void UpdateLinks(); // Link-Eintraege aktuallisieren + BOOL ReloadTabLinks(); // Links ausfuehren (Inhalt aktualisieren) virtual void CheckConfigOptions(); @@ -347,38 +347,38 @@ public: void PostDataChanged(); - void UpdatePaintExt( USHORT& rExtFlags, SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab, + void UpdatePaintExt( USHORT& rExtFlags, SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab, SCCOL nEndCol, SCROW nEndRow, SCTAB nEndTab ); - void UpdatePaintExt( USHORT& rExtFlags, const ScRange& rRange ); + void UpdatePaintExt( USHORT& rExtFlags, const ScRange& rRange ); - void SetDocumentModified( BOOL bIsModified = TRUE ); - void SetDrawModified( BOOL bIsModified = TRUE ); + void SetDocumentModified( BOOL bIsModified = TRUE ); + void SetDrawModified( BOOL bIsModified = TRUE ); - void LockPaint(); - void UnlockPaint(); - USHORT GetLockCount() const; - void SetLockCount(USHORT nNew); + void LockPaint(); + void UnlockPaint(); + USHORT GetLockCount() const; + void SetLockCount(USHORT nNew); - void LockDocument(); - void UnlockDocument(); + void LockDocument(); + void UnlockDocument(); DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper* ); - virtual SfxStyleSheetBasePool* GetStyleSheetPool(); + virtual SfxStyleSheetBasePool* GetStyleSheetPool(); - void SetInplace( BOOL bInplace ); - BOOL IsEmpty() const; - void SetEmpty(BOOL bSet); + void SetInplace( BOOL bInplace ); + BOOL IsEmpty() const; + void SetEmpty(BOOL bSet); - BOOL IsInUndo() const { return bIsInUndo; } - void SetInUndo(BOOL bSet); + BOOL IsInUndo() const { return bIsInUndo; } + void SetInUndo(BOOL bSet); - void CalcOutputFactor(); - double GetOutputFactor() const; - void GetPageOnFromPageStyleSet( const SfxItemSet* pStyleSet, - SCTAB nCurTab, - BOOL& rbHeader, - BOOL& rbFooter ); + void CalcOutputFactor(); + double GetOutputFactor() const; + void GetPageOnFromPageStyleSet( const SfxItemSet* pStyleSet, + SCTAB nCurTab, + BOOL& rbHeader, + BOOL& rbFooter ); virtual long DdeGetData( const String& rItem, const String& rMimeType, ::com::sun::star::uno::Any & rValue ); @@ -388,14 +388,14 @@ public: const String& GetDdeTextFmt() const { return aDdeTextFmt; } - SfxBindings* GetViewBindings(); + SfxBindings* GetViewBindings(); ScTabViewShell* GetBestViewShell( BOOL bOnlyVisible = TRUE ); ScSbxDocHelper* GetDocHelperObject() { return pDocHelper; } - void SetDocumentModifiedPending( BOOL bVal ) + void SetDocumentModifiedPending( BOOL bVal ) { bDocumentModifiedPending = bVal; } - BOOL IsDocumentModifiedPending() const + BOOL IsDocumentModifiedPending() const { return bDocumentModifiedPending; } BOOL IsUpdateEnabled() const @@ -403,20 +403,20 @@ public: void SetUpdateEnabled(BOOL bValue) { bUpdateEnabled = bValue; } - OutputDevice* GetRefDevice(); // WYSIWYG: Printer, otherwise VirtualDevice... + OutputDevice* GetRefDevice(); // WYSIWYG: Printer, otherwise VirtualDevice... static ScViewData* GetViewData(); - static SCTAB GetCurTab(); + static SCTAB GetCurTab(); static ScDocShell* GetShellByNum( USHORT nDocNo ); - static String GetOwnFilterName(); + static String GetOwnFilterName(); static String GetHtmlFilterName(); - static String GetWebQueryFilterName(); - static String GetAsciiFilterName(); - static String GetLotusFilterName(); - static String GetDBaseFilterName(); - static String GetDifFilterName(); - static BOOL HasAutomaticTableName( const String& rFilter ); + static String GetWebQueryFilterName(); + static String GetAsciiFilterName(); + static String GetLotusFilterName(); + static String GetDBaseFilterName(); + static String GetDifFilterName(); + static BOOL HasAutomaticTableName( const String& rFilter ); DECL_LINK( RefreshDBDataHdl, ScRefreshTimer* ); @@ -428,7 +428,7 @@ public: const ScOptSolverSave* GetSolverSaveData() const { return pSolverSaveData; } // may be null void SetSolverSaveData( const ScOptSolverSave& rData ); //<!--Added by PengYunQuan for Validity Cell Range Picker - sal_Bool AcceptStateUpdate() const; + sal_Bool AcceptStateUpdate() const; //-->Added by PengYunQuan for Validity Cell Range Picker ScSheetSaveData* GetSheetSaveData(); @@ -460,19 +460,19 @@ SO2_IMPL_REF(ScDocShell) // bAutoCalcShellDisabled nicht gesetzt ist ein SetDocumentModified gerufen. class SC_DLLPUBLIC ScDocShellModificator { - ScDocShell& rDocShell; - ScRefreshTimerProtector aProtector; - BOOL bAutoCalcShellDisabled; - BOOL bIdleDisabled; + ScDocShell& rDocShell; + ScRefreshTimerProtector aProtector; + BOOL bAutoCalcShellDisabled; + BOOL bIdleDisabled; // not implemented ScDocShellModificator( const ScDocShellModificator& ); - ScDocShellModificator& operator=( const ScDocShellModificator& ); + ScDocShellModificator& operator=( const ScDocShellModificator& ); public: ScDocShellModificator( ScDocShell& ); ~ScDocShellModificator(); - void SetDocumentModified(); + void SetDocumentModified(); }; diff --git a/sc/source/ui/inc/dpcontrol.hrc b/sc/source/ui/inc/dpcontrol.hrc index 687f999970ad..9cea30e99d4f 100644 --- a/sc/source/ui/inc/dpcontrol.hrc +++ b/sc/source/ui/inc/dpcontrol.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/inc/dpcontrol.hxx b/sc/source/ui/inc/dpcontrol.hxx index 5c5bcc49982e..912f05058916 100644 --- a/sc/source/ui/inc/dpcontrol.hxx +++ b/sc/source/ui/inc/dpcontrol.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,9 +58,9 @@ class Window; class ScDocument; class ScAccessibleFilterMenu; -/** - * This class takes care of physically drawing field button controls inside - * data pilot tables. +/** + * This class takes care of physically drawing field button controls inside + * data pilot tables. */ class ScDPFieldButton { @@ -105,9 +105,9 @@ class ScMenuFloatingWindow : public PopupMenuFloatingWindow { public: static size_t MENU_NOT_SELECTED; - /** - * Action to perform when an event takes place. Create a sub-class of - * this to implement the desired action. + /** + * Action to perform when an event takes place. Create a sub-class of + * this to implement the desired action. */ class Action { @@ -170,34 +170,34 @@ private: size_t getEnclosingMenuItem(const Point& rPos) const; size_t getSubMenuPos(ScMenuFloatingWindow* pSubMenu); - /** - * Fire a menu highlight event since the accessibility framework needs - * this to track focus on menu items. + /** + * Fire a menu highlight event since the accessibility framework needs + * this to track focus on menu items. */ - void fireMenuHighlightedEvent(); + void fireMenuHighlightedEvent(); - /** - * Make sure that the specified submenu is permanently up, the submenu - * close timer is not active, and the correct menu item associated with + /** + * Make sure that the specified submenu is permanently up, the submenu + * close timer is not active, and the correct menu item associated with * the submenu is highlighted. */ void setSubMenuFocused(ScMenuFloatingWindow* pSubMenu); - /** - * When a menu item of an invisible submenu is selected, we need to make - * sure that all its parent menu(s) are visible, with the right menu item - * highlighted in each of the parents. Calling this method ensures it. + /** + * When a menu item of an invisible submenu is selected, we need to make + * sure that all its parent menu(s) are visible, with the right menu item + * highlighted in each of the parents. Calling this method ensures it. */ void ensureSubMenuVisible(ScMenuFloatingWindow* pSubMenu); - /** - * Dismiss any visible child submenus when a menu item of a parent menu is + /** + * Dismiss any visible child submenus when a menu item of a parent menu is * selected. */ void ensureSubMenuNotVisible(); - /** - * Dismiss all visible popup menus and set focus back to the application + /** + * Dismiss all visible popup menus and set focus back to the application * window. This method is called e.g. when a menu action is fired. */ void terminateAllPopupMenus(); @@ -254,17 +254,17 @@ private: // ============================================================================ -/** - * This class implements a popup window for field button, for quick access - * of hide-item list, and possibly more stuff related to field options. +/** + * This class implements a popup window for field button, for quick access + * of hide-item list, and possibly more stuff related to field options. */ class ScDPFieldPopupWindow : public ScMenuFloatingWindow { public: - /** - * Extended data that the client code may need to store. Create a - * sub-class of this and store data there. - */ + /** + * Extended data that the client code may need to store. Create a + * sub-class of this and store data there. + */ struct ExtendedData {}; explicit ScDPFieldPopupWindow(Window* pParent, ScDocument* pDoc); @@ -285,14 +285,14 @@ public: void getResult(::std::hash_map< ::rtl::OUString, bool, ::rtl::OUStringHash>& rResult); void close(bool bOK); - /** - * Set auxiliary data that the client code might need. Note that this - * popup window class manages its life time; no explicit deletion of the + /** + * Set auxiliary data that the client code might need. Note that this + * popup window class manages its life time; no explicit deletion of the * instance is needed in the client code. */ void setExtendedData(ExtendedData* p); - /** + /** * Get the store auxiliary data, or NULL if no such data is stored. */ ExtendedData* getExtendedData(); diff --git a/sc/source/ui/inc/dpgroupdlg.hxx b/sc/source/ui/inc/dpgroupdlg.hxx index 7a1770ab6844..75c98fa6cd88 100644 --- a/sc/source/ui/inc/dpgroupdlg.hxx +++ b/sc/source/ui/inc/dpgroupdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/inc/drawsh.hxx b/sc/source/ui/inc/drawsh.hxx index e0a9ee9674eb..39db423f44dd 100644 --- a/sc/source/ui/inc/drawsh.hxx +++ b/sc/source/ui/inc/drawsh.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,14 +41,14 @@ class ScDrawView; class ScDrawShell : public SfxShell { - ScViewData* pViewData; + ScViewData* pViewData; DECL_LINK( NameObjectHdl, AbstractSvxNameDialog* ); void SetHlinkForObject( SdrObject* pObj, const rtl::OUString& rHlnk ); protected: - ScViewData* GetViewData() { return pViewData; } + ScViewData* GetViewData() { return pViewData; } public: TYPEINFO(); @@ -57,33 +57,33 @@ public: ScDrawShell(ScViewData* pData); ~ScDrawShell(); - void StateDisableItems( SfxItemSet &rSet ); + void StateDisableItems( SfxItemSet &rSet ); - void ExecDrawAttr(SfxRequest& rReq); - void GetDrawAttrState(SfxItemSet &rSet); - void GetAttrFuncState(SfxItemSet &rSet); + void ExecDrawAttr(SfxRequest& rReq); + void GetDrawAttrState(SfxItemSet &rSet); + void GetAttrFuncState(SfxItemSet &rSet); - void ExecDrawFunc(SfxRequest& rReq); - void GetDrawFuncState(SfxItemSet &rSet); - void GetState(SfxItemSet &rSet); + void ExecDrawFunc(SfxRequest& rReq); + void GetDrawFuncState(SfxItemSet &rSet); + void GetState(SfxItemSet &rSet); - void ExecFormText(SfxRequest& rReq); // StarFontWork - void GetFormTextState(SfxItemSet& rSet); + void ExecFormText(SfxRequest& rReq); // StarFontWork + void GetFormTextState(SfxItemSet& rSet); - void ExecuteHLink(SfxRequest& rReq); // Hyperlink - void GetHLinkState(SfxItemSet& rSet); + void ExecuteHLink(SfxRequest& rReq); // Hyperlink + void GetHLinkState(SfxItemSet& rSet); void ExecFormatPaintbrush(SfxRequest& rReq); void StateFormatPaintbrush(SfxItemSet& rSet); void ExecuteMacroAssign( SdrObject* pObj, Window* pWin ); - void ExecuteLineDlg( SfxRequest& rReq, USHORT nTabPage = 0xffff ); - void ExecuteAreaDlg( SfxRequest& rReq, USHORT nTabPage = 0xffff ); - void ExecuteTextAttrDlg( SfxRequest& rReq, USHORT nTabPage = 0xffff ); + void ExecuteLineDlg( SfxRequest& rReq, USHORT nTabPage = 0xffff ); + void ExecuteAreaDlg( SfxRequest& rReq, USHORT nTabPage = 0xffff ); + void ExecuteTextAttrDlg( SfxRequest& rReq, USHORT nTabPage = 0xffff ); ScDrawView* GetDrawView(); - BOOL AreAllObjectsOnLayer(USHORT nLayerNo,const SdrMarkList& rMark); + BOOL AreAllObjectsOnLayer(USHORT nLayerNo,const SdrMarkList& rMark); }; diff --git a/sc/source/ui/inc/drawutil.hxx b/sc/source/ui/inc/drawutil.hxx index d6bd314e4ef7..88c49d77bc8e 100644 --- a/sc/source/ui/inc/drawutil.hxx +++ b/sc/source/ui/inc/drawutil.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ class ScDocument; class ScDrawUtil { public: - static void CalcScale( ScDocument* pDoc, SCTAB nTab, + static void CalcScale( ScDocument* pDoc, SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, OutputDevice* pDev, const Fraction& rZoomX, const Fraction& rZoomY, double nPPTX, double nPPTY, diff --git a/sc/source/ui/inc/drawview.hxx b/sc/source/ui/inc/drawview.hxx index 408cbe4668b2..5a18babbb0fa 100644 --- a/sc/source/ui/inc/drawview.hxx +++ b/sc/source/ui/inc/drawview.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,22 +41,22 @@ class ScDrawObjData; class ScDrawView: public FmFormView { - ScViewData* pViewData; - OutputDevice* pDev; //! noetig ? - ScDocument* pDoc; - SCTAB nTab; - Fraction aScaleX; // Faktor fuer Drawing-MapMode - Fraction aScaleY; - SdrDropMarkerOverlay* pDropMarker; - SdrObject* pDropMarkObj; - BOOL bInConstruct; - //HMHBOOL bDisableHdl; - - void Construct(); - void UpdateBrowser(); + ScViewData* pViewData; + OutputDevice* pDev; //! noetig ? + ScDocument* pDoc; + SCTAB nTab; + Fraction aScaleX; // Faktor fuer Drawing-MapMode + Fraction aScaleY; + SdrDropMarkerOverlay* pDropMarker; + SdrObject* pDropMarkObj; + BOOL bInConstruct; + //HMHBOOL bDisableHdl; + + void Construct(); + void UpdateBrowser(); protected: - virtual void ModelHasChanged(); + virtual void ModelHasChanged(); // add custom handles (used by other apps, e.g. AnchorPos) virtual void AddCustomHdl(); @@ -65,53 +65,53 @@ protected: public: ScDrawView( OutputDevice* pOut, ScViewData* pData ); - virtual ~ScDrawView(); + virtual ~ScDrawView(); - virtual void MarkListHasChanged(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void MarkListHasChanged(); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); virtual void DoConnect(SdrOle2Obj* pOleObj); - virtual void MakeVisible( const Rectangle& rRect, Window& rWin ); + virtual void MakeVisible( const Rectangle& rRect, Window& rWin ); virtual void DeleteMarked(); - void DrawMarks( OutputDevice* pOut ) const; + void DrawMarks( OutputDevice* pOut ) const; - void MarkDropObj( SdrObject* pObj ); + void MarkDropObj( SdrObject* pObj ); - //HMHBOOL IsDisableHdl() const { return bDisableHdl; } + //HMHBOOL IsDisableHdl() const { return bDisableHdl; } - void SetMarkedToLayer( BYTE nLayerNo ); + void SetMarkedToLayer( BYTE nLayerNo ); - void InvalidateAttribs(); - void InvalidateDrawTextAttrs(); + void InvalidateAttribs(); + void InvalidateDrawTextAttrs(); - BOOL BeginDrag( Window* pWindow, const Point& rStartPos ); - void DoCut(); - void DoCopy(); + BOOL BeginDrag( Window* pWindow, const Point& rStartPos ); + void DoCut(); + void DoCopy(); - void GetScale( Fraction& rFractX, Fraction& rFractY ) const; - void RecalcScale(); - void UpdateWorkArea(); - SCTAB GetTab() const { return nTab; } + void GetScale( Fraction& rFractX, Fraction& rFractY ) const; + void RecalcScale(); + void UpdateWorkArea(); + SCTAB GetTab() const { return nTab; } - void CalcNormScale( Fraction& rFractX, Fraction& rFractY ) const; + void CalcNormScale( Fraction& rFractX, Fraction& rFractY ) const; - void SetAnchor( ScAnchorType ); - ScAnchorType GetAnchor() const; + void SetAnchor( ScAnchorType ); + ScAnchorType GetAnchor() const; - void VCAddWin( Window* pWin ); - void VCRemoveWin( Window* pWin ); + void VCAddWin( Window* pWin ); + void VCRemoveWin( Window* pWin ); - void UpdateIMap( SdrObject* pObj ); + void UpdateIMap( SdrObject* pObj ); - USHORT GetPopupMenuId(); - void UpdateUserViewOptions(); + USHORT GetPopupMenuId(); + void UpdateUserViewOptions(); - void SetMarkedOriginalSize(); + void SetMarkedOriginalSize(); - BOOL SelectObject( const String& rName ); + BOOL SelectObject( const String& rName ); bool HasMarkedControl() const; bool HasMarkedInternal() const; @@ -139,7 +139,7 @@ public: /** Unlocks the internal layer that contains caption objects of cell notes. */ inline void UnlockInternalLayer() { LockInternalLayer( false ); } - SdrEndTextEditKind ScEndTextEdit(); // ruft SetDrawTextUndo(0) + SdrEndTextEditKind ScEndTextEdit(); // ruft SetDrawTextUndo(0) ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > CopyToTransferable(); }; diff --git a/sc/source/ui/inc/drformsh.hxx b/sc/source/ui/inc/drformsh.hxx index ec32afef4d62..de53dc2a74e6 100644 --- a/sc/source/ui/inc/drformsh.hxx +++ b/sc/source/ui/inc/drformsh.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,10 +47,10 @@ public: SFX_DECL_INTERFACE(SCID_FORM_SHELL) ScDrawFormShell(ScViewData* pData); - virtual ~ScDrawFormShell(); + virtual ~ScDrawFormShell(); -// void Execute(SfxRequest &); -// void GetState(SfxItemSet &); +// void Execute(SfxRequest &); +// void GetState(SfxItemSet &); }; #endif diff --git a/sc/source/ui/inc/drtxtob.hxx b/sc/source/ui/inc/drtxtob.hxx index d159ab0ad669..49d0b3badddd 100644 --- a/sc/source/ui/inc/drtxtob.hxx +++ b/sc/source/ui/inc/drtxtob.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ #include "shellids.hxx" -USHORT ScGetFontWorkId(); // statt SvxFontWorkChildWindow::GetChildWindowId() +USHORT ScGetFontWorkId(); // statt SvxFontWorkChildWindow::GetChildWindowId() class ScViewData; class TransferableDataHelper; @@ -46,9 +46,9 @@ class TransferableClipboardListener; class ScDrawTextObjectBar : public SfxShell { - ScViewData* pViewData; + ScViewData* pViewData; TransferableClipboardListener* pClipEvtLstnr; - BOOL bPastePossible; + BOOL bPastePossible; DECL_LINK( ClipboardChanged, TransferableDataHelper* ); @@ -74,11 +74,11 @@ public: BOOL ExecuteParaDlg( const SfxItemSet& rArgs, SfxItemSet& rOutSet ); void ExecuteExtra( SfxRequest &rReq ); - void ExecFormText(SfxRequest& rReq); // StarFontWork + void ExecFormText(SfxRequest& rReq); // StarFontWork void GetFormTextState(SfxItemSet& rSet); private: - void ExecuteGlobal( SfxRequest &rReq ); // von Execute gerufen fuer ganze Objekte + void ExecuteGlobal( SfxRequest &rReq ); // von Execute gerufen fuer ganze Objekte void GetGlobalClipState( SfxItemSet& rSet ); void ExecutePasteContents( SfxRequest &rReq ); BOOL IsNoteEdit(); diff --git a/sc/source/ui/inc/drwtrans.hxx b/sc/source/ui/inc/drwtrans.hxx index de256909fcf7..4e9088c4e4be 100644 --- a/sc/source/ui/inc/drwtrans.hxx +++ b/sc/source/ui/inc/drwtrans.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,31 +48,31 @@ class SdrOle2Obj; class ScDrawTransferObj : public TransferableHelper { private: - SdrModel* pModel; - TransferableDataHelper aOleData; - TransferableObjectDescriptor aObjDesc; -//REMOVE SvEmbeddedObjectRef aDocShellRef; -//REMOVE SvEmbeddedObjectRef aDrawPersistRef; - SfxObjectShellRef aDocShellRef; - SfxObjectShellRef aDrawPersistRef; + SdrModel* pModel; + TransferableDataHelper aOleData; + TransferableObjectDescriptor aObjDesc; +//REMOVE SvEmbeddedObjectRef aDocShellRef; +//REMOVE SvEmbeddedObjectRef aDrawPersistRef; + SfxObjectShellRef aDocShellRef; + SfxObjectShellRef aDrawPersistRef; // extracted from model in ctor: - Size aSrcSize; - INetBookmark* pBookmark; - BOOL bGraphic; - BOOL bGrIsBit; - BOOL bOleObj; + Size aSrcSize; + INetBookmark* pBookmark; + BOOL bGraphic; + BOOL bGrIsBit; + BOOL bOleObj; // source information for drag&drop: // (view is needed to handle drawing obejcts) - SdrView* pDragSourceView; - USHORT nDragSourceFlags; - BOOL bDragWasInternal; + SdrView* pDragSourceView; + USHORT nDragSourceFlags; + BOOL bDragWasInternal; sal_uInt32 nSourceDocID; - void InitDocShell(); -//REMOVE SvInPlaceObjectRef GetSingleObject(); + void InitDocShell(); +//REMOVE SvInPlaceObjectRef GetSingleObject(); SdrOle2Obj* GetSingleObject(); public: @@ -80,23 +80,23 @@ public: const TransferableObjectDescriptor& rDesc ); virtual ~ScDrawTransferObj(); - virtual void AddSupportedFormats(); - virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual sal_Bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, + virtual void AddSupportedFormats(); + virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual sal_Bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual void ObjectReleased(); - virtual void DragFinished( sal_Int8 nDropAction ); + virtual void ObjectReleased(); + virtual void DragFinished( sal_Int8 nDropAction ); - SdrModel* GetModel() { return pModel; } + SdrModel* GetModel() { return pModel; } - void SetDrawPersist( const SfxObjectShellRef& rRef ); - void SetDragSource( ScDrawView* pView ); - void SetDragSourceObj( SdrObject* pObj, SCTAB nTab ); - void SetDragSourceFlags( USHORT nFlags ); - void SetDragWasInternal(); + void SetDrawPersist( const SfxObjectShellRef& rRef ); + void SetDragSource( ScDrawView* pView ); + void SetDragSourceObj( SdrObject* pObj, SCTAB nTab ); + void SetDragSourceFlags( USHORT nFlags ); + void SetDragWasInternal(); - SdrView* GetDragSourceView() { return pDragSourceView; } - USHORT GetDragSourceFlags() const { return nDragSourceFlags; } + SdrView* GetDragSourceView() { return pDragSourceView; } + USHORT GetDragSourceFlags() const { return nDragSourceFlags; } void SetSourceDocID( sal_uInt32 nVal ) { nSourceDocID = nVal; } diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx index 097a67dd02b4..6522e335854e 100644 --- a/sc/source/ui/inc/dwfunctr.hxx +++ b/sc/source/ui/inc/dwfunctr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,11 +39,11 @@ #include <vcl/combobox.hxx> #include "anyrefdg.hxx" -#include "global.hxx" // ScAddress +#include "global.hxx" // ScAddress #include "privsplt.hxx" #include "funcdesc.hxx" -#ifndef LRU_MAX +#ifndef LRU_MAX #define LRU_MAX 10 #endif /************************************************************************* @@ -71,44 +71,44 @@ class ScFunctionDockWin : public SfxDockingWindow, public SfxListener { private: - Timer aTimer; - ScPrivatSplit aPrivatSplit; - ListBox aCatBox; - ListBox aFuncList; - ListBox aDDFuncList; - ListBox* pAllFuncList; - - SfxChildAlignment eSfxNewAlignment; - SfxChildAlignment eSfxOldAlignment; - ImageButton aInsertButton; - FixedText aFiFuncDesc; - USHORT nLeftSlot; - USHORT nRightSlot; - ULONG nMinWidth; - ULONG nMinHeight; - Size aOldSize; - BOOL bSizeFlag; - BOOL bInit; - short nDockMode; - Point aSplitterInitPos; - const ScFuncDesc* pFuncDesc; - USHORT nArgs; - String** pArgArr; + Timer aTimer; + ScPrivatSplit aPrivatSplit; + ListBox aCatBox; + ListBox aFuncList; + ListBox aDDFuncList; + ListBox* pAllFuncList; + + SfxChildAlignment eSfxNewAlignment; + SfxChildAlignment eSfxOldAlignment; + ImageButton aInsertButton; + FixedText aFiFuncDesc; + USHORT nLeftSlot; + USHORT nRightSlot; + ULONG nMinWidth; + ULONG nMinHeight; + Size aOldSize; + BOOL bSizeFlag; + BOOL bInit; + short nDockMode; + Point aSplitterInitPos; + const ScFuncDesc* pFuncDesc; + USHORT nArgs; + String** pArgArr; const ScFuncDesc* aLRUList[LRU_MAX]; - void UpdateFunctionList(); - void UpdateLRUList(); - void DoEnter(BOOL bOk); //@@ ??? - void SetDescription(); - void SetLeftRightSize(); - void SetTopBottonSize(); - void SetMyWidthLeRi(Size &aNewSize); - void SetMyHeightLeRi(Size &aNewSize); - void SetMyWidthToBo(Size &aNewSize); - void SetMyHeightToBo(Size &aNewSize); - void UseSplitterInitPos(); + void UpdateFunctionList(); + void UpdateLRUList(); + void DoEnter(BOOL bOk); //@@ ??? + void SetDescription(); + void SetLeftRightSize(); + void SetTopBottonSize(); + void SetMyWidthLeRi(Size &aNewSize); + void SetMyHeightLeRi(Size &aNewSize); + void SetMyWidthToBo(Size &aNewSize); + void SetMyHeightToBo(Size &aNewSize); + void UseSplitterInitPos(); DECL_LINK( SetSelectionHdl, void* ); DECL_LINK( SelHdl, ListBox* ); @@ -117,19 +117,19 @@ private: protected: - virtual BOOL Close(); - virtual void Resize(); - virtual void Resizing( Size& rSize ); - virtual void SetSize(); - virtual void ToggleFloatingMode(); - virtual void StateChanged( StateChangedType nStateChange ); + virtual BOOL Close(); + virtual void Resize(); + virtual void Resizing( Size& rSize ); + virtual void SetSize(); + virtual void ToggleFloatingMode(); + virtual void StateChanged( StateChangedType nStateChange ); virtual SfxChildAlignment CheckAlignment(SfxChildAlignment, SfxChildAlignment eAlign); public: - ScFunctionDockWin( SfxBindings* pBindings, + ScFunctionDockWin( SfxBindings* pBindings, SfxChildWindow *pCW, Window* pParent, const ResId& rResId ); @@ -137,14 +137,14 @@ public: ~ScFunctionDockWin(); using SfxDockingWindow::Notify; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - void SetSlotIDs( USHORT nLeft, USHORT nRight ) + void SetSlotIDs( USHORT nLeft, USHORT nRight ) { nLeftSlot = nLeft; nRightSlot = nRight; } - void InitLRUList(); - - void Initialize (SfxChildWinInfo* pInfo); + void InitLRUList(); + + void Initialize (SfxChildWinInfo* pInfo); virtual void FillInfo(SfxChildWinInfo&) const; }; diff --git a/sc/source/ui/inc/editable.hxx b/sc/source/ui/inc/editable.hxx index a0519be1b788..d09a9bc54322 100644 --- a/sc/source/ui/inc/editable.hxx +++ b/sc/source/ui/inc/editable.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,8 +40,8 @@ class ScRange; class ScEditableTester { - BOOL bIsEditable; - BOOL bOnlyMatrix; + BOOL bIsEditable; + BOOL bOnlyMatrix; public: // no test in ctor @@ -52,7 +52,7 @@ public: SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); // calls TestSelectedBlock - ScEditableTester( ScDocument* pDoc, + ScEditableTester( ScDocument* pDoc, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScMarkData& rMark ); @@ -69,18 +69,18 @@ public: // Several calls to the Test... methods check if *all* of the ranges // are editable. For several independent checks, Reset() has to be used. - void TestBlock( ScDocument* pDoc, SCTAB nTab, + void TestBlock( ScDocument* pDoc, SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); - void TestSelectedBlock( ScDocument* pDoc, + void TestSelectedBlock( ScDocument* pDoc, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScMarkData& rMark ); - void TestRange( ScDocument* pDoc, const ScRange& rRange ); - void TestSelection( ScDocument* pDoc, const ScMarkData& rMark ); - void TestView( ScViewFunc* pView ); + void TestRange( ScDocument* pDoc, const ScRange& rRange ); + void TestSelection( ScDocument* pDoc, const ScMarkData& rMark ); + void TestView( ScViewFunc* pView ); - BOOL IsEditable() const { return bIsEditable; } - BOOL IsFormatEditable() const { return bIsEditable || bOnlyMatrix; } - USHORT GetMessageId() const; + BOOL IsEditable() const { return bIsEditable; } + BOOL IsFormatEditable() const { return bIsEditable || bOnlyMatrix; } + USHORT GetMessageId() const; }; #endif diff --git a/sc/source/ui/inc/editfield.hxx b/sc/source/ui/inc/editfield.hxx index bfae24f4fd9f..f48fb48eaaed 100644 --- a/sc/source/ui/inc/editfield.hxx +++ b/sc/source/ui/inc/editfield.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/inc/editsh.hxx b/sc/source/ui/inc/editsh.hxx index 5e915aa2a89e..a90967cb3804 100644 --- a/sc/source/ui/inc/editsh.hxx +++ b/sc/source/ui/inc/editsh.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,11 +46,11 @@ class TransferableClipboardListener; class ScEditShell : public SfxShell { private: - EditView* pEditView; - ScViewData* pViewData; + EditView* pEditView; + ScViewData* pViewData; TransferableClipboardListener* pClipEvtLstnr; - BOOL bPastePossible; - BOOL bIsInsertMode; + BOOL bPastePossible; + BOOL bIsInsertMode; const SvxURLField* GetURLField(); ScInputHandler* GetMyInputHdl(); @@ -64,19 +64,19 @@ public: ScEditShell(EditView* pView, ScViewData* pData); ~ScEditShell(); - void SetEditView(EditView* pView); + void SetEditView(EditView* pView); EditView* GetEditView() {return pEditView;} - void Execute(SfxRequest& rReq); - void ExecuteTrans(SfxRequest& rReq); - void GetState(SfxItemSet &rSet); - void GetClipState(SfxItemSet& rSet); + void Execute(SfxRequest& rReq); + void ExecuteTrans(SfxRequest& rReq); + void GetState(SfxItemSet &rSet); + void GetClipState(SfxItemSet& rSet); - void ExecuteAttr(SfxRequest& rReq); - void GetAttrState(SfxItemSet &rSet); + void ExecuteAttr(SfxRequest& rReq); + void GetAttrState(SfxItemSet &rSet); - void ExecuteUndo(SfxRequest& rReq); - void GetUndoState(SfxItemSet &rSet); + void ExecuteUndo(SfxRequest& rReq); + void GetUndoState(SfxItemSet &rSet); String GetSelectionText( BOOL bWholeWord ); }; diff --git a/sc/source/ui/inc/expftext.hxx b/sc/source/ui/inc/expftext.hxx index e0d7717037fe..2fec3026780b 100644 --- a/sc/source/ui/inc/expftext.hxx +++ b/sc/source/ui/inc/expftext.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,7 +27,7 @@ ************************************************************************/ #ifndef _SC_EXPFTEXT_HXX -#define _SC_EXPFTEXT_HXX +#define _SC_EXPFTEXT_HXX #include <vcl/fixed.hxx> #include "scdllapi.h" diff --git a/sc/source/ui/inc/fieldwnd.hxx b/sc/source/ui/inc/fieldwnd.hxx index bc7ccfe135cc..bcad1a4d2e4c 100644 --- a/sc/source/ui/inc/fieldwnd.hxx +++ b/sc/source/ui/inc/fieldwnd.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/inc/filldlg.hxx b/sc/source/ui/inc/filldlg.hxx index ddd5621c558f..e32a17659029 100644 --- a/sc/source/ui/inc/filldlg.hxx +++ b/sc/source/ui/inc/filldlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,75 +45,75 @@ class ScDocument; class ScFillSeriesDlg : public ModalDialog { public: - ScFillSeriesDlg( Window* pParent, - ScDocument& rDocument, - FillDir eFillDir, - FillCmd eFillCmd, - FillDateCmd eFillDateCmd, - String aStartStr, - double fStep, - double fMax, - USHORT nPossDir ); + ScFillSeriesDlg( Window* pParent, + ScDocument& rDocument, + FillDir eFillDir, + FillCmd eFillCmd, + FillDateCmd eFillDateCmd, + String aStartStr, + double fStep, + double fMax, + USHORT nPossDir ); ~ScFillSeriesDlg(); - FillDir GetFillDir() const { return theFillDir; } - FillCmd GetFillCmd() const { return theFillCmd; } - FillDateCmd GetFillDateCmd() const { return theFillDateCmd; } - double GetStart() const { return fStartVal; } - double GetStep() const { return fIncrement; } - double GetMax() const { return fEndVal; } + FillDir GetFillDir() const { return theFillDir; } + FillCmd GetFillCmd() const { return theFillCmd; } + FillDateCmd GetFillDateCmd() const { return theFillDateCmd; } + double GetStart() const { return fStartVal; } + double GetStep() const { return fIncrement; } + double GetMax() const { return fEndVal; } - String GetStartStr() const { return aEdStartVal.GetText(); } + String GetStartStr() const { return aEdStartVal.GetText(); } - void SetEdStartValEnabled(BOOL bFlag=FALSE); + void SetEdStartValEnabled(BOOL bFlag=FALSE); private: FixedLine aFlDirection; - RadioButton aBtnDown; - RadioButton aBtnRight; - RadioButton aBtnUp; - RadioButton aBtnLeft; + RadioButton aBtnDown; + RadioButton aBtnRight; + RadioButton aBtnUp; + RadioButton aBtnLeft; FixedLine aFlSep1; FixedLine aFlType; - RadioButton aBtnArithmetic; - RadioButton aBtnGeometric; - RadioButton aBtnDate; - RadioButton aBtnAutoFill; + RadioButton aBtnArithmetic; + RadioButton aBtnGeometric; + RadioButton aBtnDate; + RadioButton aBtnAutoFill; FixedLine aFlSep2; FixedLine aFlTimeUnit; - RadioButton aBtnDay; - RadioButton aBtnDayOfWeek; - RadioButton aBtnMonth; - RadioButton aBtnYear; + RadioButton aBtnDay; + RadioButton aBtnDayOfWeek; + RadioButton aBtnMonth; + RadioButton aBtnYear; - BOOL bStartValFlag; - FixedText aFtStartVal; - Edit aEdStartVal; - String aStartStrVal; + BOOL bStartValFlag; + FixedText aFtStartVal; + Edit aEdStartVal; + String aStartStrVal; - FixedText aFtEndVal; - Edit aEdEndVal; + FixedText aFtEndVal; + Edit aEdEndVal; - FixedText aFtIncrement; - Edit aEdIncrement; + FixedText aFtIncrement; + Edit aEdIncrement; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; - const String errMsgInvalidVal; + const String errMsgInvalidVal; //---------------------------------------------------------- - ScDocument& rDoc; - FillDir theFillDir; - FillCmd theFillCmd; - FillDateCmd theFillDateCmd; - double fStartVal; - double fIncrement; - double fEndVal; + ScDocument& rDoc; + FillDir theFillDir; + FillCmd theFillCmd; + FillDateCmd theFillDateCmd; + double fStartVal; + double fIncrement; + double fEndVal; #ifdef _FILLDLG_CXX private: diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx index 44ea68f8e9c9..1088de59fa00 100644 --- a/sc/source/ui/inc/filtdlg.hxx +++ b/sc/source/ui/inc/filtdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,37 +51,37 @@ class TypedScStrCollection; // Gemeinsame Resource-Objekte: #define _COMMON_FILTER_RSCOBJS \ - CheckBox aBtnCase; \ - CheckBox aBtnRegExp; \ - CheckBox aBtnHeader; \ - CheckBox aBtnUnique; \ - CheckBox aBtnCopyResult; \ - ListBox aLbCopyArea; \ - formula::RefEdit aEdCopyArea; \ - formula::RefButton aRbCopyArea; \ - CheckBox aBtnDestPers; \ - FixedText aFtDbAreaLabel; \ - FixedInfo aFtDbArea; \ - const String aStrUndefined; \ - const String aStrNoName; \ - const String aStrNone; + CheckBox aBtnCase; \ + CheckBox aBtnRegExp; \ + CheckBox aBtnHeader; \ + CheckBox aBtnUnique; \ + CheckBox aBtnCopyResult; \ + ListBox aLbCopyArea; \ + formula::RefEdit aEdCopyArea; \ + formula::RefButton aRbCopyArea; \ + CheckBox aBtnDestPers; \ + FixedText aFtDbAreaLabel; \ + FixedInfo aFtDbArea; \ + const String aStrUndefined; \ + const String aStrNoName; \ + const String aStrNone; #define _INIT_COMMON_FILTER_RSCOBJS \ - aBtnCase ( this, ScResId( BTN_CASE ) ), \ - aBtnRegExp ( this, ScResId( BTN_REGEXP ) ), \ - aBtnHeader ( this, ScResId( BTN_HEADER ) ), \ - aBtnUnique ( this, ScResId( BTN_UNIQUE ) ), \ - aBtnCopyResult ( this, ScResId( BTN_COPY_RESULT ) ), \ - aLbCopyArea ( this, ScResId( LB_COPY_AREA ) ), \ + aBtnCase ( this, ScResId( BTN_CASE ) ), \ + aBtnRegExp ( this, ScResId( BTN_REGEXP ) ), \ + aBtnHeader ( this, ScResId( BTN_HEADER ) ), \ + aBtnUnique ( this, ScResId( BTN_UNIQUE ) ), \ + aBtnCopyResult ( this, ScResId( BTN_COPY_RESULT ) ), \ + aLbCopyArea ( this, ScResId( LB_COPY_AREA ) ), \ aEdCopyArea ( this, this, ScResId( ED_COPY_AREA ) ), \ - aRbCopyArea ( this, ScResId( RB_COPY_AREA ), &aEdCopyArea, this ), \ - aBtnDestPers ( this, ScResId( BTN_DEST_PERS ) ), \ - aFtDbAreaLabel ( this, ScResId( FT_DBAREA_LABEL ) ), \ - aFtDbArea ( this, ScResId( FT_DBAREA ) ), \ - aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ), \ - aStrNoName ( ScGlobal::GetRscString(STR_DB_NONAME) ), \ - aStrNone ( ScResId( SCSTR_NONE ) ), + aRbCopyArea ( this, ScResId( RB_COPY_AREA ), &aEdCopyArea, this ), \ + aBtnDestPers ( this, ScResId( BTN_DEST_PERS ) ), \ + aFtDbAreaLabel ( this, ScResId( FT_DBAREA_LABEL ) ), \ + aFtDbArea ( this, ScResId( FT_DBAREA ) ), \ + aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ), \ + aStrNoName ( ScGlobal::GetRscString(STR_DB_NONAME) ), \ + aStrNone ( ScResId( SCSTR_NONE ) ), //============================================================================ @@ -89,46 +89,46 @@ class ScFilterDlg : public ScAnyRefDlg { public: ScFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - const SfxItemSet& rArgSet ); + const SfxItemSet& rArgSet ); ~ScFilterDlg(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual BOOL IsRefInputMode() const; - virtual void SetActive(); + virtual BOOL IsRefInputMode() const; + virtual void SetActive(); - virtual BOOL Close(); - void SliderMoved(); - USHORT GetSliderPos(); - void RefreshEditRow( USHORT nOffset ); + virtual BOOL Close(); + void SliderMoved(); + USHORT GetSliderPos(); + void RefreshEditRow( USHORT nOffset ); private: FixedLine aFlCriteria; //---------------------------- - ListBox aLbConnect1; - ListBox aLbField1; - ListBox aLbCond1; - ComboBox aEdVal1; + ListBox aLbConnect1; + ListBox aLbField1; + ListBox aLbCond1; + ComboBox aEdVal1; //---------------------------- - ListBox aLbConnect2; - ListBox aLbField2; - ListBox aLbCond2; - ComboBox aEdVal2; + ListBox aLbConnect2; + ListBox aLbField2; + ListBox aLbCond2; + ComboBox aEdVal2; //---------------------------- - ListBox aLbConnect3; - ListBox aLbField3; - ListBox aLbCond3; - ComboBox aEdVal3; + ListBox aLbConnect3; + ListBox aLbField3; + ListBox aLbCond3; + ComboBox aEdVal3; //---------------------------- - ListBox aLbConnect4; - ListBox aLbField4; - ListBox aLbCond4; - ComboBox aEdVal4; + ListBox aLbConnect4; + ListBox aLbField4; + ListBox aLbCond4; + ComboBox aEdVal4; //---------------------------- - FixedText aFtConnect; - FixedText aFtField; - FixedText aFtCond; - FixedText aFtVal; + FixedText aFtConnect; + FixedText aFtField; + FixedText aFtCond; + FixedText aFtVal; FixedLine aFlSeparator; ScrollBar aScrollBar; @@ -141,56 +141,56 @@ private: _COMMON_FILTER_RSCOBJS - const String aStrEmpty; - const String aStrNotEmpty; - const String aStrRow; - const String aStrColumn; + const String aStrEmpty; + const String aStrNotEmpty; + const String aStrRow; + const String aStrColumn; - ScFilterOptionsMgr* pOptionsMgr; + ScFilterOptionsMgr* pOptionsMgr; - const USHORT nWhichQuery; - const ScQueryParam theQueryData; - ScQueryItem* pOutItem; - ScViewData* pViewData; - ScDocument* pDoc; - SCTAB nSrcTab; + const USHORT nWhichQuery; + const ScQueryParam theQueryData; + ScQueryItem* pOutItem; + ScViewData* pViewData; + ScDocument* pDoc; + SCTAB nSrcTab; - ComboBox* aValueEdArr[4]; - ListBox* aFieldLbArr[4]; - ListBox* aCondLbArr[4]; - ListBox* aConnLbArr[4]; + ComboBox* aValueEdArr[4]; + ListBox* aFieldLbArr[4]; + ListBox* aCondLbArr[4]; + ListBox* aConnLbArr[4]; bool mbHasDates[MAXQUERY]; BOOL bRefreshExceptQuery[MAXQUERY]; - USHORT nFieldCount; - BOOL bRefInputMode; + USHORT nFieldCount; + BOOL bRefInputMode; - TypedScStrCollection* pEntryLists[MAXCOLCOUNT]; - USHORT nHeaderPos[MAXCOLCOUNT]; + TypedScStrCollection* pEntryLists[MAXCOLCOUNT]; + USHORT nHeaderPos[MAXCOLCOUNT]; // Hack: RefInput-Kontrolle - Timer* pTimer; + Timer* pTimer; #ifdef _FILTDLG_CXX private: - void Init ( const SfxItemSet& rArgSet ); - void FillFieldLists (); - void FillAreaList (); - void UpdateValueList ( USHORT nList ); - void UpdateHdrInValueList( USHORT nList ); - void ClearValueList ( USHORT nList ); - USHORT GetFieldSelPos ( SCCOL nField ); - ScQueryItem* GetOutputItem (); + void Init ( const SfxItemSet& rArgSet ); + void FillFieldLists (); + void FillAreaList (); + void UpdateValueList ( USHORT nList ); + void UpdateHdrInValueList( USHORT nList ); + void ClearValueList ( USHORT nList ); + USHORT GetFieldSelPos ( SCCOL nField ); + ScQueryItem* GetOutputItem (); // Handler: - DECL_LINK( LbSelectHdl, ListBox* ); + DECL_LINK( LbSelectHdl, ListBox* ); DECL_LINK( ValModifyHdl, ComboBox* ); - DECL_LINK( CheckBoxHdl, CheckBox* ); - DECL_LINK( EndDlgHdl, Button* ); + DECL_LINK( CheckBoxHdl, CheckBox* ); + DECL_LINK( EndDlgHdl, Button* ); DECL_LINK( MoreClickHdl, MoreButton* ); DECL_LINK( ScrollHdl, ScrollBar* ); // Hack: RefInput-Kontrolle - DECL_LINK( TimeOutHdl, Timer* ); + DECL_LINK( TimeOutHdl, Timer* ); #endif }; @@ -200,21 +200,21 @@ class ScSpecialFilterDlg : public ScAnyRefDlg { public: ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - const SfxItemSet& rArgSet ); + const SfxItemSet& rArgSet ); ~ScSpecialFilterDlg(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual BOOL IsRefInputMode() const; - virtual void SetActive(); + virtual BOOL IsRefInputMode() const; + virtual void SetActive(); - virtual BOOL Close(); + virtual BOOL Close(); private: - ListBox aLbFilterArea; - FixedText aFtFilterArea; - formula::RefEdit aEdFilterArea; - formula::RefButton aRbFilterArea; + ListBox aLbFilterArea; + FixedText aFtFilterArea; + formula::RefEdit aEdFilterArea; + formula::RefButton aRbFilterArea; FixedLine aFlOptions; @@ -225,34 +225,34 @@ private: HelpButton aBtnHelp; MoreButton aBtnMore; - ScFilterOptionsMgr* pOptionsMgr; + ScFilterOptionsMgr* pOptionsMgr; - const USHORT nWhichQuery; - const ScQueryParam theQueryData; - ScQueryItem* pOutItem; - ScViewData* pViewData; - ScDocument* pDoc; + const USHORT nWhichQuery; + const ScQueryParam theQueryData; + ScQueryItem* pOutItem; + ScViewData* pViewData; + ScDocument* pDoc; - formula::RefEdit* pRefInputEdit; - BOOL bRefInputMode; + formula::RefEdit* pRefInputEdit; + BOOL bRefInputMode; // Hack: RefInput-Kontrolle - Timer* pTimer; + Timer* pTimer; #ifdef _SFILTDLG_CXX private: - void Init( const SfxItemSet& rArgSet ); - ScQueryItem* GetOutputItem( const ScQueryParam& rParam, + void Init( const SfxItemSet& rArgSet ); + ScQueryItem* GetOutputItem( const ScQueryParam& rParam, const ScRange& rSource ); // Handler DECL_LINK( FilterAreaSelHdl, ListBox* ); DECL_LINK( FilterAreaModHdl, formula::RefEdit* ); - DECL_LINK( EndDlgHdl, Button* ); + DECL_LINK( EndDlgHdl, Button* ); DECL_LINK( ScrollHdl, ScrollBar* ); // Hack: RefInput-Kontrolle - DECL_LINK( TimeOutHdl, Timer* ); + DECL_LINK( TimeOutHdl, Timer* ); #endif }; diff --git a/sc/source/ui/inc/filter.hrc b/sc/source/ui/inc/filter.hrc index 508c5af9aab5..9d708c9799c5 100644 --- a/sc/source/ui/inc/filter.hrc +++ b/sc/source/ui/inc/filter.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -24,59 +24,59 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "sc.hrc" // -> RID_SCDLG_FILTER +#include "sc.hrc" // -> RID_SCDLG_FILTER // -> RID_SCDLG_SPEC_FILTER // -> RID_SCDLG_PIVOTFILTER // allgemein -#define BTN_OK 1 -#define BTN_CANCEL 1 -#define BTN_HELP 1 +#define BTN_OK 1 +#define BTN_CANCEL 1 +#define BTN_HELP 1 #define BTN_MORE 1 -#define BTN_UNIQUE 1 -#define BTN_CASE 2 -#define BTN_REGEXP 3 -#define BTN_HEADER 4 -#define BTN_COPY_RESULT 5 -#define LB_COPY_AREA 6 -#define ED_COPY_AREA 7 -#define RB_COPY_AREA 8 +#define BTN_UNIQUE 1 +#define BTN_CASE 2 +#define BTN_REGEXP 3 +#define BTN_HEADER 4 +#define BTN_COPY_RESULT 5 +#define LB_COPY_AREA 6 +#define ED_COPY_AREA 7 +#define RB_COPY_AREA 8 #define FL_OPTIONS 9 -#define FT_DBAREA_LABEL 10 -#define FT_DBAREA 11 -#define BTN_DEST_PERS 12 +#define FT_DBAREA_LABEL 10 +#define FT_DBAREA 11 +#define BTN_DEST_PERS 12 // Filter: -#define FT_OP 20 -#define FT_FIELD 21 -#define FT_COND 22 -#define FT_VAL 23 -#define LB_FIELD1 24 -#define LB_FIELD2 25 -#define LB_FIELD3 26 -#define LB_OP1 27 -#define LB_OP2 28 -#define LB_COND1 29 -#define LB_COND2 30 -#define LB_COND3 31 -#define ED_VAL1 32 -#define ED_VAL2 33 -#define ED_VAL3 34 +#define FT_OP 20 +#define FT_FIELD 21 +#define FT_COND 22 +#define FT_VAL 23 +#define LB_FIELD1 24 +#define LB_FIELD2 25 +#define LB_FIELD3 26 +#define LB_OP1 27 +#define LB_OP2 28 +#define LB_COND1 29 +#define LB_COND2 30 +#define LB_COND3 31 +#define ED_VAL1 32 +#define ED_VAL2 33 +#define ED_VAL3 34 #define FL_CRITERIA 35 #define FL_SEPARATOR 36 -#define LB_OP3 37 -#define LB_FIELD4 38 -#define LB_COND4 39 -#define ED_VAL4 40 +#define LB_OP3 37 +#define LB_FIELD4 38 +#define LB_COND4 39 +#define ED_VAL4 40 #define LB_SCROLL 41 -#define LB_OP4 42 +#define LB_OP4 42 // Spezialfilter -#define FT_CRITERIA_AREA 50 -#define LB_CRITERIA_AREA 51 -#define ED_CRITERIA_AREA 52 -#define RB_CRITERIA_AREA 53 +#define FT_CRITERIA_AREA 50 +#define LB_CRITERIA_AREA 51 +#define ED_CRITERIA_AREA 52 +#define RB_CRITERIA_AREA 53 diff --git a/sc/source/ui/inc/foptmgr.hxx b/sc/source/ui/inc/foptmgr.hxx index 18164f1b7d35..55387daa5763 100644 --- a/sc/source/ui/inc/foptmgr.hxx +++ b/sc/source/ui/inc/foptmgr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,60 +52,60 @@ class ScViewData; class ScFilterOptionsMgr { public: - ScFilterOptionsMgr( Dialog* ptrDlg, - ScViewData* ptrViewData, - const ScQueryParam& refQueryData, - MoreButton& refBtnMore, - CheckBox& refBtnCase, - CheckBox& refBtnRegExp, - CheckBox& refBtnHeader, - CheckBox& refBtnUnique, - CheckBox& refBtnCopyResult, - CheckBox& refBtnDestPers, - ListBox& refLbCopyArea, - Edit& refEdCopyArea, - formula::RefButton& refRbCopyArea, - FixedText& refFtDbAreaLabel, - FixedInfo& refFtDbArea, + ScFilterOptionsMgr( Dialog* ptrDlg, + ScViewData* ptrViewData, + const ScQueryParam& refQueryData, + MoreButton& refBtnMore, + CheckBox& refBtnCase, + CheckBox& refBtnRegExp, + CheckBox& refBtnHeader, + CheckBox& refBtnUnique, + CheckBox& refBtnCopyResult, + CheckBox& refBtnDestPers, + ListBox& refLbCopyArea, + Edit& refEdCopyArea, + formula::RefButton& refRbCopyArea, + FixedText& refFtDbAreaLabel, + FixedInfo& refFtDbArea, FixedLine& refFlOptions, - const String& refStrNoName, - const String& refStrUndefined ); + const String& refStrNoName, + const String& refStrUndefined ); ~ScFilterOptionsMgr(); - BOOL VerifyPosStr ( const String& rPosStr ) const; + BOOL VerifyPosStr ( const String& rPosStr ) const; private: - Dialog* pDlg; - ScViewData* pViewData; - ScDocument* pDoc; - - MoreButton& rBtnMore; - CheckBox& rBtnCase; - CheckBox& rBtnRegExp; - CheckBox& rBtnHeader; - CheckBox& rBtnUnique; - CheckBox& rBtnCopyResult; - CheckBox& rBtnDestPers; - ListBox& rLbCopyPos; - Edit& rEdCopyPos; - formula::RefButton& rRbCopyPos; - FixedText& rFtDbAreaLabel; - FixedInfo& rFtDbArea; + Dialog* pDlg; + ScViewData* pViewData; + ScDocument* pDoc; + + MoreButton& rBtnMore; + CheckBox& rBtnCase; + CheckBox& rBtnRegExp; + CheckBox& rBtnHeader; + CheckBox& rBtnUnique; + CheckBox& rBtnCopyResult; + CheckBox& rBtnDestPers; + ListBox& rLbCopyPos; + Edit& rEdCopyPos; + formula::RefButton& rRbCopyPos; + FixedText& rFtDbAreaLabel; + FixedInfo& rFtDbArea; FixedLine& rFlOptions; - const String& rStrNoName; - const String& rStrUndefined; + const String& rStrNoName; + const String& rStrUndefined; - const ScQueryParam& rQueryData; + const ScQueryParam& rQueryData; #ifdef _FOPTMGR_CXX private: void Init(); // Handler: - DECL_LINK( EdPosModifyHdl, Edit* ); - DECL_LINK( LbPosSelHdl, ListBox* ); - DECL_LINK( BtnCopyResultHdl, CheckBox* ); + DECL_LINK( EdPosModifyHdl, Edit* ); + DECL_LINK( LbPosSelHdl, ListBox* ); + DECL_LINK( BtnCopyResultHdl, CheckBox* ); #endif }; diff --git a/sc/source/ui/inc/formatsh.hxx b/sc/source/ui/inc/formatsh.hxx index 7dc1919ea30e..890e25158dfd 100644 --- a/sc/source/ui/inc/formatsh.hxx +++ b/sc/source/ui/inc/formatsh.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ class ScFormatShell: public SfxShell protected: - ScViewData* GetViewData(){return pViewData;} + ScViewData* GetViewData(){return pViewData;} const ScViewData* GetViewData() const {return pViewData;} public: @@ -51,24 +51,24 @@ public: SFX_DECL_INTERFACE(SCID_FORMAT_SHELL) ScFormatShell(ScViewData* pData); - virtual ~ScFormatShell(); + virtual ~ScFormatShell(); - void ExecuteNumFormat( SfxRequest& rReq ); - void GetNumFormatState( SfxItemSet& rSet ); + void ExecuteNumFormat( SfxRequest& rReq ); + void GetNumFormatState( SfxItemSet& rSet ); - void ExecuteAttr( SfxRequest& rReq ); - void GetAttrState( SfxItemSet& rSet ); + void ExecuteAttr( SfxRequest& rReq ); + void GetAttrState( SfxItemSet& rSet ); - void ExecuteAlignment( SfxRequest& rReq ); + void ExecuteAlignment( SfxRequest& rReq ); - void ExecuteTextAttr( SfxRequest& rReq ); - void GetTextAttrState( SfxItemSet& rSet ); + void ExecuteTextAttr( SfxRequest& rReq ); + void GetTextAttrState( SfxItemSet& rSet ); - void GetAlignState( SfxItemSet& rSet ); - void GetBorderState( SfxItemSet& rSet ); + void GetAlignState( SfxItemSet& rSet ); + void GetBorderState( SfxItemSet& rSet ); - void ExecuteStyle( SfxRequest& rReq ); - void GetStyleState( SfxItemSet& rSet ); + void ExecuteStyle( SfxRequest& rReq ); + void GetStyleState( SfxItemSet& rSet ); void ExecuteTextDirection( SfxRequest& rReq ); void GetTextDirectionState( SfxItemSet& rSet ); diff --git a/sc/source/ui/inc/formdata.hxx b/sc/source/ui/inc/formdata.hxx index 395809357763..f5abbf80bccb 100644 --- a/sc/source/ui/inc/formdata.hxx +++ b/sc/source/ui/inc/formdata.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,22 +43,22 @@ public: ScFormEditData(); virtual ~ScFormEditData(); - ScInputHandler* GetInputHandler() { return pInputHandler;} - ScDocShell* GetDocShell() { return pScDocShell;} + ScInputHandler* GetInputHandler() { return pInputHandler;} + ScDocShell* GetDocShell() { return pScDocShell;} - void SetInputHandler(ScInputHandler* pHdl) { pInputHandler=pHdl;} - void SetDocShell(ScDocShell* pSds) { pScDocShell=pSds;} + void SetInputHandler(ScInputHandler* pHdl) { pInputHandler=pHdl;} + void SetDocShell(ScDocShell* pSds) { pScDocShell=pSds;} - virtual void SaveValues(); + virtual void SaveValues(); private: ScFormEditData( const ScFormEditData& ); -// const ScFormEditData& operator=( const ScFormEditData& r ); +// const ScFormEditData& operator=( const ScFormEditData& r ); - ScInputHandler* pInputHandler; - ScDocShell* pScDocShell; + ScInputHandler* pInputHandler; + ScDocShell* pScDocShell; }; diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx index ea8298bea0ef..168c07bccb90 100644 --- a/sc/source/ui/inc/formula.hxx +++ b/sc/source/ui/inc/formula.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ #define SC_FORMULA_HXX #include "anyrefdg.hxx" -#include "global.hxx" // ScAddress +#include "global.hxx" // ScAddress #include <svtools/stdctrl.hxx> #include <vcl/lstbox.hxx> #include <vcl/group.hxx> @@ -67,12 +67,12 @@ class ScFormulaDlg : public formula::FormulaDlg, public formula::IFormulaEditorHelper { ScFormulaReferenceHelper m_aHelper; - ScFormulaCell* pCell; + ScFormulaCell* pCell; ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaParser> m_xParser; ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaOpCodeMapper> m_xOpCodeMapper; - static ScDocument* pDoc; - static ScAddress aCursorPos; + static ScDocument* pDoc; + static ScAddress aCursorPos; public: ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScViewData* pViewData ,formula::IFunctionManager* _pFunctionMgr); @@ -83,7 +83,7 @@ public: virtual void fill(); virtual bool calculateValue(const String& _sExpression,String& _rResult); virtual void doClose(BOOL _bOk); - virtual void insertEntryToLRUList(const formula::IFunctionDescription* pDesc); + virtual void insertEntryToLRUList(const formula::IFunctionDescription* pDesc); virtual void showReference(const String& _sFormula); virtual void dispatch(BOOL _bOK,BOOL _bMartixChecked); virtual void setDispatcherLock( BOOL bLock ); @@ -103,7 +103,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaOpCodeMapper> getFormulaOpCodeMapper() const; virtual ::com::sun::star::table::CellAddress getReferencePosition() const; - virtual BOOL Close(); + virtual BOOL Close(); // sc::IAnyRefDialog virtual void ShowReference(const String& _sRef); @@ -123,9 +123,9 @@ public: protected: virtual void RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ); - ULONG FindFocusWin(Window *pWin); - void SaveLRUEntry(const ScFuncDesc* pFuncDesc); - void HighlightFunctionParas(const String& aFormula); + ULONG FindFocusWin(Window *pWin); + void SaveLRUEntry(const ScFuncDesc* pFuncDesc); + void HighlightFunctionParas(const String& aFormula); BOOL IsInputHdl(ScInputHandler* pHdl); ScInputHandler* GetNextInputHandler(ScDocShell* pDocShell,PtrTabViewShell* ppViewSh); diff --git a/sc/source/ui/inc/fuconarc.hxx b/sc/source/ui/inc/fuconarc.hxx index 29a058d5196b..40ebb26b241a 100644 --- a/sc/source/ui/inc/fuconarc.hxx +++ b/sc/source/ui/inc/fuconarc.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,8 +50,8 @@ class FuConstArc : public FuConstruct virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren // #98185# Create default drawing objects via keyboard virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); @@ -59,6 +59,6 @@ class FuConstArc : public FuConstruct -#endif // _SD_FUCONARC_HXX +#endif // _SD_FUCONARC_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/fuconcustomshape.hxx b/sc/source/ui/inc/fuconcustomshape.hxx index 0a64a8a91aab..e01242eae2b2 100644 --- a/sc/source/ui/inc/fuconcustomshape.hxx +++ b/sc/source/ui/inc/fuconcustomshape.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,8 +48,8 @@ public: virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren // #98185# Create default drawing objects via keyboard virtual SdrObject* CreateDefaultObject( const sal_uInt16 nID, const Rectangle& rRectangle ); diff --git a/sc/source/ui/inc/fuconpol.hxx b/sc/source/ui/inc/fuconpol.hxx index caf92263c394..95ad7b6af87a 100644 --- a/sc/source/ui/inc/fuconpol.hxx +++ b/sc/source/ui/inc/fuconpol.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,14 +52,14 @@ class FuConstPolygon : public FuConstruct virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren // #98185# Create default drawing objects via keyboard virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); }; -#endif // _FUCONPOL_HXX +#endif // _FUCONPOL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/fuconrec.hxx b/sc/source/ui/inc/fuconrec.hxx index b447bc846c0a..724cf4fd6550 100644 --- a/sc/source/ui/inc/fuconrec.hxx +++ b/sc/source/ui/inc/fuconrec.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,8 +50,8 @@ class FuConstRectangle : public FuConstruct virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren // #98185# Create default drawing objects via keyboard virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); @@ -59,6 +59,6 @@ class FuConstRectangle : public FuConstruct -#endif // _SD_FUCONREC_HXX +#endif // _SD_FUCONREC_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/fuconstr.hxx b/sc/source/ui/inc/fuconstr.hxx index 66c55a981caf..bda74eec7753 100644 --- a/sc/source/ui/inc/fuconstr.hxx +++ b/sc/source/ui/inc/fuconstr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ /************************************************************************/ -#define MIN_FREEHAND_DISTANCE 10 +#define MIN_FREEHAND_DISTANCE 10 /************************************************************************* @@ -59,12 +59,12 @@ class FuConstruct : public FuDraw BOOL SimpleMouseButtonUp(const MouseEvent& rMEvt); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren }; -#endif // _SD_FUCONSTR_HXX +#endif // _SD_FUCONSTR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/fuconuno.hxx b/sc/source/ui/inc/fuconuno.hxx index 3e1c90924e16..bc68a5825eb2 100644 --- a/sc/source/ui/inc/fuconuno.hxx +++ b/sc/source/ui/inc/fuconuno.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,8 +55,8 @@ public: virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren // #98185# Create default drawing objects via keyboard virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); @@ -64,6 +64,6 @@ public: -#endif // _SD_FUCONCTL_HXX +#endif // _SD_FUCONCTL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/fudraw.hxx b/sc/source/ui/inc/fudraw.hxx index 5c0ac0c204c4..7ab6415cef42 100644 --- a/sc/source/ui/inc/fudraw.hxx +++ b/sc/source/ui/inc/fudraw.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,12 +69,12 @@ class FuDraw : public FuPoor BOOL IsSizingOrMovingNote( const MouseEvent& rMEvt ) const; private: - void DoModifiers(const MouseEvent& rMEvt); - void ResetModifiers(); + void DoModifiers(const MouseEvent& rMEvt); + void ResetModifiers(); }; -#endif // _SD_FUDRAW_HXX +#endif // _SD_FUDRAW_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/fuedipo.hxx b/sc/source/ui/inc/fuedipo.hxx index 3b27834f7a56..8e3bed4150b6 100644 --- a/sc/source/ui/inc/fuedipo.hxx +++ b/sc/source/ui/inc/fuedipo.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,12 +51,12 @@ class FuEditPoints : public FuDraw virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren }; -#endif // _SD_FUEDIPO_HXX +#endif // _SD_FUEDIPO_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/fuinsert.hxx b/sc/source/ui/inc/fuinsert.hxx index 2964971244d6..009096a5d4e2 100644 --- a/sc/source/ui/inc/fuinsert.hxx +++ b/sc/source/ui/inc/fuinsert.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,8 +39,8 @@ class FuInsertGraphic : public FuPoor SdrModel* pDoc, SfxRequest& rReq); virtual ~FuInsertGraphic(); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren }; /************************************************************************/ @@ -52,8 +52,8 @@ class FuInsertOLE : public FuPoor SdrModel* pDoc, SfxRequest& rReq); virtual ~FuInsertOLE(); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren }; /************************************************************************/ @@ -65,8 +65,8 @@ class FuInsertChart : public FuPoor SdrModel* pDoc, SfxRequest& rReq); virtual ~FuInsertChart(); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren }; /************************************************************************/ @@ -78,10 +78,10 @@ class FuInsertMedia : public FuPoor SdrModel* pDoc, SfxRequest& rReq); virtual ~FuInsertMedia(); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren }; -#endif // _SD_FUINSERT_HXX +#endif // _SD_FUINSERT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/fumark.hxx b/sc/source/ui/inc/fumark.hxx index 61d287ea30f4..25b2ec84def5 100644 --- a/sc/source/ui/inc/fumark.hxx +++ b/sc/source/ui/inc/fumark.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ #define SC_FUMARK_HXX #include "fupoor.hxx" -#include "rangelst.hxx" // ScRangeListRef +#include "rangelst.hxx" // ScRangeListRef /************************************************************************* @@ -42,11 +42,11 @@ class FuMarkRect : public FuPoor { protected: - Point aBeginPos; - Rectangle aZoomRect; - BOOL bVisible; - BOOL bStartDrag; - ScRangeListRef aSourceRange; + Point aBeginPos; + Rectangle aZoomRect; + BOOL bVisible; + BOOL bStartDrag; + ScRangeListRef aSourceRange; public: FuMarkRect(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView, diff --git a/sc/source/ui/inc/funcpage.hxx b/sc/source/ui/inc/funcpage.hxx index 799f5e260645..45198a31a3a2 100644 --- a/sc/source/ui/inc/funcpage.hxx +++ b/sc/source/ui/inc/funcpage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ #define SC_FUNCPAGE_HXX #include "funcutl.hxx" -#include "global.hxx" // ScAddress +#include "global.hxx" // ScAddress #include <svtools/stdctrl.hxx> #include <vcl/lstbox.hxx> #include <vcl/group.hxx> @@ -64,8 +64,8 @@ class ScListBox : public ListBox { protected: - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ); + virtual long PreNotify( NotifyEvent& rNEvt ); public: ScListBox( Window* pParent, const ResId& rResId ); @@ -79,15 +79,15 @@ class ScFuncPage : public TabPage { private: - Link aDoubleClickLink; - Link aSelectionLink; - FixedText aFtCategory; - ListBox aLbCategory; - FixedText aFtFunction; - ScListBox aLbFunction; - ImageButton aIBFunction; + Link aDoubleClickLink; + Link aSelectionLink; + FixedText aFtCategory; + ListBox aLbCategory; + FixedText aFtFunction; + ScListBox aLbFunction; + ImageButton aIBFunction; - const ScFuncDesc* aLRUList[LRU_MAX]; + const ScFuncDesc* aLRUList[LRU_MAX]; DECL_LINK( SelHdl, ListBox* ); @@ -95,24 +95,24 @@ private: protected: - void UpdateFunctionList(); - void InitLRUList(); + void UpdateFunctionList(); + void InitLRUList(); public: ScFuncPage( Window* pParent); - void SetCategory(USHORT nCat); - void SetFunction(USHORT nFunc); - void SetFocus(); - USHORT GetCategory(); - USHORT GetFunction(); - USHORT GetFunctionEntryCount(); + void SetCategory(USHORT nCat); + void SetFunction(USHORT nFunc); + void SetFocus(); + USHORT GetCategory(); + USHORT GetFunction(); + USHORT GetFunctionEntryCount(); - USHORT GetFuncPos(const ScFuncDesc*); - const ScFuncDesc* GetFuncDesc( USHORT nPos ) const; - String GetSelFunctionName() const; + USHORT GetFuncPos(const ScFuncDesc*); + const ScFuncDesc* GetFuncDesc( USHORT nPos ) const; + String GetSelFunctionName() const; void SetDoubleClickHdl( const Link& rLink ) { aDoubleClickLink = rLink; } const Link& GetDoubleClickHdl() const { return aDoubleClickLink; } diff --git a/sc/source/ui/inc/funcutl.hxx b/sc/source/ui/inc/funcutl.hxx index afa8e1f5c853..76c168ccabae 100644 --- a/sc/source/ui/inc/funcutl.hxx +++ b/sc/source/ui/inc/funcutl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ #include <vcl/scrbar.hxx> #include <vcl/fixed.hxx> #include <svtools/svmedit.hxx> -#include "anyrefdg.hxx" // formula::RefButton +#include "anyrefdg.hxx" // formula::RefButton //============================================================================ @@ -43,14 +43,14 @@ class ValWnd : public Window public: ValWnd( Window* pParent, const ResId& rId ); - void SetValue( const String& rStrVal ); + void SetValue( const String& rStrVal ); protected: - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ); private: - String aStrValue; - Rectangle aRectOut; + String aStrValue; + Rectangle aRectOut; }; @@ -61,18 +61,18 @@ class ScEditBox : public Control { private: - MultiLineEdit* pMEdit; - Link aSelChangedLink; - Selection aOldSel; - BOOL bMouseFlag; + MultiLineEdit* pMEdit; + Link aSelChangedLink; + Selection aOldSel; + BOOL bMouseFlag; DECL_LINK( ChangedHdl, ScEditBox* ); protected: - virtual long PreNotify( NotifyEvent& rNEvt ); - virtual void SelectionChanged(); - virtual void Resize(); - virtual void GetFocus(); + virtual long PreNotify( NotifyEvent& rNEvt ); + virtual void SelectionChanged(); + virtual void Resize(); + virtual void GetFocus(); public: @@ -80,12 +80,12 @@ public: ~ScEditBox(); - MultiLineEdit* GetEdit() {return pMEdit;} + MultiLineEdit* GetEdit() {return pMEdit;} void SetSelChangedHdl( const Link& rLink ) { aSelChangedLink = rLink; } const Link& GetSelChangedHdl() const { return aSelChangedLink; } - void UpdateOldSel(); + void UpdateOldSel(); }; @@ -98,17 +98,17 @@ class ArgEdit : public formula::RefEdit public: ArgEdit( Window* pParent, const ResId& rResId ); - void Init( ArgEdit* pPrevEdit, ArgEdit* pNextEdit, + void Init( ArgEdit* pPrevEdit, ArgEdit* pNextEdit, ScrollBar& rArgSlider, USHORT nArgCount ); protected: - virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ); private: - ArgEdit* pEdPrev; - ArgEdit* pEdNext; - ScrollBar* pSlider; - USHORT nArgs; + ArgEdit* pEdPrev; + ArgEdit* pEdNext; + ScrollBar* pSlider; + USHORT nArgs; }; @@ -119,53 +119,53 @@ class ArgInput { private: - Link aFxClickLink; - Link aRefClickLink; - Link aFxFocusLink; - Link aRefFocusLink; - Link aEdFocusLink; - Link aEdModifyLink; - - FixedText* pFtArg; - ImageButton* pBtnFx; - ArgEdit* pEdArg; - formula::RefButton* pRefBtn; - - DECL_LINK( FxBtnClickHdl, ImageButton* ); - DECL_LINK( RefBtnClickHdl,formula::RefButton* ); - DECL_LINK( FxBtnFocusHdl, ImageButton* ); - DECL_LINK( RefBtnFocusHdl,formula::RefButton* ); - DECL_LINK( EdFocusHdl, ArgEdit* ); - DECL_LINK( EdModifyHdl,ArgEdit* ); + Link aFxClickLink; + Link aRefClickLink; + Link aFxFocusLink; + Link aRefFocusLink; + Link aEdFocusLink; + Link aEdModifyLink; + + FixedText* pFtArg; + ImageButton* pBtnFx; + ArgEdit* pEdArg; + formula::RefButton* pRefBtn; + + DECL_LINK( FxBtnClickHdl, ImageButton* ); + DECL_LINK( RefBtnClickHdl,formula::RefButton* ); + DECL_LINK( FxBtnFocusHdl, ImageButton* ); + DECL_LINK( RefBtnFocusHdl,formula::RefButton* ); + DECL_LINK( EdFocusHdl, ArgEdit* ); + DECL_LINK( EdModifyHdl,ArgEdit* ); protected: - virtual void FxClick(); - virtual void RefClick(); - virtual void FxFocus(); - virtual void RefFocus(); - virtual void EdFocus(); - virtual void EdModify(); + virtual void FxClick(); + virtual void RefClick(); + virtual void FxFocus(); + virtual void RefFocus(); + virtual void EdFocus(); + virtual void EdModify(); public: ArgInput(); - void InitArgInput ( FixedText* pftArg, - ImageButton* pbtnFx, - ArgEdit* pedArg, - formula::RefButton* prefBtn); + void InitArgInput ( FixedText* pftArg, + ImageButton* pbtnFx, + ArgEdit* pedArg, + formula::RefButton* prefBtn); - void SetArgName(const String &aArg); - String GetArgName(); - void SetArgNameFont(const Font&); + void SetArgName(const String &aArg); + String GetArgName(); + void SetArgNameFont(const Font&); - void SetArgVal(const String &aVal); - String GetArgVal(); + void SetArgVal(const String &aVal); + String GetArgVal(); - void SetArgSelection (const Selection& rSel ); + void SetArgSelection (const Selection& rSel ); - ArgEdit* GetArgEdPtr() {return pEdArg;} + ArgEdit* GetArgEdPtr() {return pEdArg;} void SetFxClickHdl( const Link& rLink ) { aFxClickLink = rLink; } diff --git a/sc/source/ui/inc/fupoor.hxx b/sc/source/ui/inc/fupoor.hxx index 279d6e1873cf..a0939828e67c 100644 --- a/sc/source/ui/inc/fupoor.hxx +++ b/sc/source/ui/inc/fupoor.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,10 +42,10 @@ class Dialog; // #98185# Create default drawing objects via keyboard class SdrObject; -// Return-Werte fuer Command -#define SC_CMD_NONE 0 -#define SC_CMD_USED 1 -#define SC_CMD_IGNORE 2 +// Return-Werte fuer Command +#define SC_CMD_NONE 0 +#define SC_CMD_USED 1 +#define SC_CMD_IGNORE 2 /************************************************************************* |* @@ -56,28 +56,28 @@ class SdrObject; class FuPoor { protected: - ScDrawView* pView; - ScTabViewShell* pViewShell; - Window* pWindow; - SdrModel* pDrDoc; + ScDrawView* pView; + ScTabViewShell* pViewShell; + Window* pWindow; + SdrModel* pDrDoc; - SfxRequest aSfxRequest; - Dialog* pDialog; + SfxRequest aSfxRequest; + Dialog* pDialog; - Timer aScrollTimer; // fuer Autoscrolling + Timer aScrollTimer; // fuer Autoscrolling DECL_LINK( ScrollHdl, Timer * ); void ForceScroll(const Point& aPixPos); - Timer aDragTimer; // fuer Drag&Drop + Timer aDragTimer; // fuer Drag&Drop DECL_LINK( DragTimerHdl, Timer * ); DECL_LINK( DragHdl, void * ); - BOOL bIsInDragMode; - Point aMDPos; // Position von MouseButtonDown + BOOL bIsInDragMode; + Point aMDPos; // Position von MouseButtonDown // #95491# member to hold state of the mouse buttons for creation // of own MouseEvents (like in ScrollHdl) private: - sal_uInt16 mnCode; + sal_uInt16 mnCode; public: FuPoor(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView, @@ -106,19 +106,19 @@ public: virtual BYTE Command(const CommandEvent& rCEvt); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren - virtual void ScrollStart() {} // diese Funktionen werden von - virtual void ScrollEnd() {} // ForceScroll aufgerufen + virtual void ScrollStart() {} // diese Funktionen werden von + virtual void ScrollEnd() {} // ForceScroll aufgerufen void SetWindow(Window* pWin) { pWindow = pWin; } USHORT GetSlotID() const { return( aSfxRequest.GetSlot() ); } - BOOL IsDetectiveHit( const Point& rLogicPos ); + BOOL IsDetectiveHit( const Point& rLogicPos ); - void StopDragTimer(); + void StopDragTimer(); // #98185# Create default drawing objects via keyboard virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); @@ -133,6 +133,6 @@ public: -#endif // _SD_FUPOOR_HXX +#endif // _SD_FUPOOR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/fusel.hxx b/sc/source/ui/inc/fusel.hxx index 20887a6d151a..993275a39207 100644 --- a/sc/source/ui/inc/fusel.hxx +++ b/sc/source/ui/inc/fusel.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,18 +59,18 @@ public: virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); virtual BYTE Command(const CommandEvent& rCEvt); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren void ActivateNoteHandles(SdrObject* pObj); protected: -// Outliner* pOutliner; -// OutlinerView* pOutlinerView; - BOOL bVCAction; +// Outliner* pOutliner; +// OutlinerView* pOutlinerView; + BOOL bVCAction; private: - BOOL TestDetective( SdrPageView* pPV, const Point& rPos ); // -> fusel2 + BOOL TestDetective( SdrPageView* pPV, const Point& rPos ); // -> fusel2 bool IsNoteCaptionMarked() const; bool IsNoteCaptionClicked( const Point& rPos ) const; @@ -78,6 +78,6 @@ private: -#endif // _SD_FUSEL_HXX +#endif // _SD_FUSEL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/futext.hxx b/sc/source/ui/inc/futext.hxx index aa1290ae28e1..273ba41cb41c 100644 --- a/sc/source/ui/inc/futext.hxx +++ b/sc/source/ui/inc/futext.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,8 +43,8 @@ class SdrOutliner; class FuText : public FuConstruct { protected: -// USHORT nOldObjectBar; - SdrTextObj* pTextObj; +// USHORT nOldObjectBar; + SdrTextObj* pTextObj; public: FuText(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView, @@ -57,17 +57,17 @@ public: virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren virtual void ForcePointer(const MouseEvent* pMEvt); virtual void SelectionHasChanged(); - void SetInEditMode( SdrObject* pObj = NULL, const Point* pMousePixel = NULL, + void SetInEditMode( SdrObject* pObj = NULL, const Point* pMousePixel = NULL, BOOL bCursorToEnd = FALSE, const KeyEvent* pInitialKey = NULL ); - void StopEditMode(BOOL bTextDirection = FALSE); - void StopDragMode(SdrObject* pObject); + void StopEditMode(BOOL bTextDirection = FALSE); + void StopDragMode(SdrObject* pObject); // #98185# Create default drawing objects via keyboard virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); diff --git a/sc/source/ui/inc/graphsh.hxx b/sc/source/ui/inc/graphsh.hxx index 64c3e053368b..76899f235cba 100644 --- a/sc/source/ui/inc/graphsh.hxx +++ b/sc/source/ui/inc/graphsh.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,13 +46,13 @@ public: SFX_DECL_INTERFACE(SCID_GRAPHIC_SHELL) ScGraphicShell(ScViewData* pData); - virtual ~ScGraphicShell(); + virtual ~ScGraphicShell(); - void Execute(SfxRequest& rReq); - void GetAttrState(SfxItemSet &rSet); + void Execute(SfxRequest& rReq); + void GetAttrState(SfxItemSet &rSet); - void ExecuteFilter(SfxRequest& rReq); - void GetFilterState(SfxItemSet &rSet); + void ExecuteFilter(SfxRequest& rReq); + void GetFilterState(SfxItemSet &rSet); }; #endif diff --git a/sc/source/ui/inc/gridmerg.hxx b/sc/source/ui/inc/gridmerg.hxx index d8cd2d16b7b4..bc95f05abce0 100644 --- a/sc/source/ui/inc/gridmerg.hxx +++ b/sc/source/ui/inc/gridmerg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,26 +36,26 @@ class OutputDevice; class ScGridMerger { private: - OutputDevice* pDev; - long nOneX; - long nOneY; - long nFixStart; - long nFixEnd; - long nVarStart; - long nVarDiff; - long nCount; - BOOL bVertical; - BOOL bOptimize; + OutputDevice* pDev; + long nOneX; + long nOneY; + long nFixStart; + long nFixEnd; + long nVarStart; + long nVarDiff; + long nCount; + BOOL bVertical; + BOOL bOptimize; - void AddLine( long nStart, long nEnd, long nPos ); + void AddLine( long nStart, long nEnd, long nPos ); public: ScGridMerger( OutputDevice* pOutDev, long nOnePixelX, long nOnePixelY ); ~ScGridMerger(); - void AddHorLine( long nX1, long nX2, long nY ); - void AddVerLine( long nX, long nY1, long nY2 ); - void Flush(); + void AddHorLine( long nX1, long nX2, long nY ); + void AddVerLine( long nX, long nY1, long nY2 ); + void Flush(); }; diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index 294287aada3e..4bd6cede84ef 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,36 +60,36 @@ class SdrHdlList; class ScTransferObj; struct SpellCallbackInfo; - // Maus-Status (nMouseStatus) + // Maus-Status (nMouseStatus) -#define SC_GM_NONE 0 -#define SC_GM_TABDOWN 1 -#define SC_GM_DBLDOWN 2 -#define SC_GM_FILTER 3 -#define SC_GM_IGNORE 4 -#define SC_GM_WATERUNDO 5 -#define SC_GM_URLDOWN 6 +#define SC_GM_NONE 0 +#define SC_GM_TABDOWN 1 +#define SC_GM_DBLDOWN 2 +#define SC_GM_FILTER 3 +#define SC_GM_IGNORE 4 +#define SC_GM_WATERUNDO 5 +#define SC_GM_URLDOWN 6 - // Page-Drag-Modus + // Page-Drag-Modus -#define SC_PD_NONE 0 -#define SC_PD_RANGE_L 1 -#define SC_PD_RANGE_R 2 -#define SC_PD_RANGE_T 4 -#define SC_PD_RANGE_B 8 -#define SC_PD_RANGE_TL (SC_PD_RANGE_T|SC_PD_RANGE_L) -#define SC_PD_RANGE_TR (SC_PD_RANGE_T|SC_PD_RANGE_R) -#define SC_PD_RANGE_BL (SC_PD_RANGE_B|SC_PD_RANGE_L) -#define SC_PD_RANGE_BR (SC_PD_RANGE_B|SC_PD_RANGE_R) -#define SC_PD_BREAK_H 16 -#define SC_PD_BREAK_V 32 +#define SC_PD_NONE 0 +#define SC_PD_RANGE_L 1 +#define SC_PD_RANGE_R 2 +#define SC_PD_RANGE_T 4 +#define SC_PD_RANGE_B 8 +#define SC_PD_RANGE_TL (SC_PD_RANGE_T|SC_PD_RANGE_L) +#define SC_PD_RANGE_TR (SC_PD_RANGE_T|SC_PD_RANGE_R) +#define SC_PD_RANGE_BL (SC_PD_RANGE_B|SC_PD_RANGE_L) +#define SC_PD_RANGE_BR (SC_PD_RANGE_B|SC_PD_RANGE_R) +#define SC_PD_BREAK_H 16 +#define SC_PD_BREAK_V 32 class ScHideTextCursor { private: - ScViewData* pViewData; - ScSplitPos eWhich; + ScViewData* pViewData; + ScSplitPos eWhich; public: ScHideTextCursor( ScViewData* pData, ScSplitPos eW ); @@ -102,12 +102,12 @@ namespace sdr { namespace overlay { class OverlayObjectList; }} class ScGridWindow : public Window, public DropTargetHelper, public DragSourceHelper { - // ScFilterListBox wird immer fuer Auswahlliste benutzt + // ScFilterListBox wird immer fuer Auswahlliste benutzt friend class ScFilterListBox; private: // #114409# - ::sdr::overlay::OverlayObjectList* mpOOCursors; + ::sdr::overlay::OverlayObjectList* mpOOCursors; ::sdr::overlay::OverlayObjectList* mpOOSelection; ::sdr::overlay::OverlayObjectList* mpOOSelectionBorder; ::sdr::overlay::OverlayObjectList* mpOOAutoFill; @@ -117,9 +117,9 @@ private: ::boost::shared_ptr<Rectangle> mpAutoFillRect; - /** - * Stores current visible column and row ranges, used to avoid expensive - * operations on objects that are outside visible area. + /** + * Stores current visible column and row ranges, used to avoid expensive + * operations on objects that are outside visible area. */ struct VisibleRange { @@ -135,185 +135,185 @@ private: VisibleRange maVisibleRange; private: - ScViewData* pViewData; - ScSplitPos eWhich; - ScHSplitPos eHWhich; - ScVSplitPos eVWhich; + ScViewData* pViewData; + ScSplitPos eWhich; + ScHSplitPos eHWhich; + ScVSplitPos eVWhich; - ScNoteMarker* pNoteMarker; + ScNoteMarker* pNoteMarker; - ScFilterListBox* pFilterBox; - FloatingWindow* pFilterFloat; + ScFilterListBox* pFilterBox; + FloatingWindow* pFilterFloat; ::std::auto_ptr<ScDPFieldPopupWindow> mpDPFieldPopup; ::std::auto_ptr<ScDPFieldButton> mpFilterButton; - USHORT nCursorHideCount; + USHORT nCursorHideCount; - BOOL bMarking; + BOOL bMarking; - USHORT nButtonDown; - BOOL bEEMouse; // Edit-Engine hat Maus - BYTE nMouseStatus; + USHORT nButtonDown; + BOOL bEEMouse; // Edit-Engine hat Maus + BYTE nMouseStatus; BYTE nNestedButtonState; // track nested button up/down calls - BOOL bDPMouse; // DataPilot-D&D (neue Pivottabellen) - long nDPField; - ScDPObject* pDragDPObj; //! name? - - BOOL bRFMouse; // RangeFinder-Drag - BOOL bRFSize; - USHORT nRFIndex; - SCsCOL nRFAddX; - SCsROW nRFAddY; - - USHORT nPagebreakMouse; // Pagebreak-Modus Drag - SCCOLROW nPagebreakBreak; - SCCOLROW nPagebreakPrev; - ScRange aPagebreakSource; - ScRange aPagebreakDrag; - BOOL bPagebreakDrawn; - - BYTE nPageScript; - - long nLastClickX; - long nLastClickY; - - BOOL bDragRect; - SCCOL nDragStartX; - SCROW nDragStartY; - SCCOL nDragEndX; - SCROW nDragEndY; + BOOL bDPMouse; // DataPilot-D&D (neue Pivottabellen) + long nDPField; + ScDPObject* pDragDPObj; //! name? + + BOOL bRFMouse; // RangeFinder-Drag + BOOL bRFSize; + USHORT nRFIndex; + SCsCOL nRFAddX; + SCsROW nRFAddY; + + USHORT nPagebreakMouse; // Pagebreak-Modus Drag + SCCOLROW nPagebreakBreak; + SCCOLROW nPagebreakPrev; + ScRange aPagebreakSource; + ScRange aPagebreakDrag; + BOOL bPagebreakDrawn; + + BYTE nPageScript; + + long nLastClickX; + long nLastClickY; + + BOOL bDragRect; + SCCOL nDragStartX; + SCROW nDragStartY; + SCCOL nDragEndX; + SCROW nDragEndY; InsCellCmd meDragInsertMode; - USHORT nCurrentPointer; + USHORT nCurrentPointer; - BOOL bIsInScroll; - BOOL bIsInPaint; + BOOL bIsInScroll; + BOOL bIsInPaint; - ScDDComboBoxButton aComboButton; + ScDDComboBoxButton aComboButton; - Point aCurMousePos; + Point aCurMousePos; - USHORT nPaintCount; - Rectangle aRepaintPixel; - BOOL bNeedsRepaint; + USHORT nPaintCount; + Rectangle aRepaintPixel; + BOOL bNeedsRepaint; - BOOL bAutoMarkVisible; - ScAddress aAutoMarkPos; + BOOL bAutoMarkVisible; + ScAddress aAutoMarkPos; - BOOL bListValButton; - ScAddress aListValPos; + BOOL bListValButton; + ScAddress aListValPos; - Rectangle aInvertRect; + Rectangle aInvertRect; DECL_LINK( PopupModeEndHdl, FloatingWindow* ); DECL_LINK( PopupSpellingHdl, SpellCallbackInfo* ); - BOOL TestMouse( const MouseEvent& rMEvt, BOOL bAction ); + BOOL TestMouse( const MouseEvent& rMEvt, BOOL bAction ); - BOOL DoPageFieldSelection( SCCOL nCol, SCROW nRow ); + BOOL DoPageFieldSelection( SCCOL nCol, SCROW nRow ); bool DoAutoFilterButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt ); - void DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt ); + void DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt ); - void DPMouseMove( const MouseEvent& rMEvt ); - void DPMouseButtonUp( const MouseEvent& rMEvt ); - void DPTestMouse( const MouseEvent& rMEvt, BOOL bMove ); + void DPMouseMove( const MouseEvent& rMEvt ); + void DPMouseButtonUp( const MouseEvent& rMEvt ); + void DPTestMouse( const MouseEvent& rMEvt, BOOL bMove ); - /** - * Check if the mouse click is on a field popup button. - * - * @return bool true if the field popup menu has been launched and no + /** + * Check if the mouse click is on a field popup button. + * + * @return bool true if the field popup menu has been launched and no * further mouse event handling is necessary, false otherwise. */ bool DPTestFieldPopupArrow(const MouseEvent& rMEvt, const ScAddress& rPos, ScDPObject* pDPObj); void DPLaunchFieldPopupMenu( const Point& rScrPos, const Size& rScrSize, const ScAddress& rPos, ScDPObject* pDPObj); - void RFMouseMove( const MouseEvent& rMEvt, BOOL bUp ); + void RFMouseMove( const MouseEvent& rMEvt, BOOL bUp ); - void PagebreakMove( const MouseEvent& rMEvt, BOOL bUp ); + void PagebreakMove( const MouseEvent& rMEvt, BOOL bUp ); - void UpdateDragRect( BOOL bShowRange, const Rectangle& rPosRect ); + void UpdateDragRect( BOOL bShowRange, const Rectangle& rPosRect ); - BOOL IsAutoFilterActive( SCCOL nCol, SCROW nRow, SCTAB nTab ); - void ExecFilter( ULONG nSel, SCCOL nCol, SCROW nRow, + BOOL IsAutoFilterActive( SCCOL nCol, SCROW nRow, SCTAB nTab ); + void ExecFilter( ULONG nSel, SCCOL nCol, SCROW nRow, const String& aValue, bool bCheckForDates ); - void FilterSelect( ULONG nSel ); + void FilterSelect( ULONG nSel ); - void ExecDataSelect( SCCOL nCol, SCROW nRow, const String& rStr ); + void ExecDataSelect( SCCOL nCol, SCROW nRow, const String& rStr ); - void ExecPageFieldSelect( SCCOL nCol, SCROW nRow, BOOL bHasSelection, const String& rStr ); + void ExecPageFieldSelect( SCCOL nCol, SCROW nRow, BOOL bHasSelection, const String& rStr ); - BOOL HasScenarioButton( const Point& rPosPixel, ScRange& rScenRange ); + BOOL HasScenarioButton( const Point& rPosPixel, ScRange& rScenRange ); - BOOL DropScroll( const Point& rMousePos ); + BOOL DropScroll( const Point& rMousePos ); - sal_Int8 AcceptPrivateDrop( const AcceptDropEvent& rEvt ); - sal_Int8 ExecutePrivateDrop( const ExecuteDropEvent& rEvt ); - sal_Int8 DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPosX, SCROW nDestPosY, + sal_Int8 AcceptPrivateDrop( const AcceptDropEvent& rEvt ); + sal_Int8 ExecutePrivateDrop( const ExecuteDropEvent& rEvt ); + sal_Int8 DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPosX, SCROW nDestPosY, const Point& rLogicPos, sal_Int8 nDndAction ); void HandleMouseButtonDown( const MouseEvent& rMEvt ); - BOOL DrawMouseButtonDown(const MouseEvent& rMEvt); - BOOL DrawMouseButtonUp(const MouseEvent& rMEvt); - BOOL DrawMouseMove(const MouseEvent& rMEvt); - BOOL DrawKeyInput(const KeyEvent& rKEvt); - BOOL DrawCommand(const CommandEvent& rCEvt); - BOOL DrawHasMarkedObj(); - void DrawEndAction(); - void DrawMarkDropObj( SdrObject* pObj ); - SdrObject* GetEditObject(); - BOOL IsMyModel(SdrEditView* pSdrView); - //void DrawStartTimer(); - - void DrawRedraw( ScOutputData& rOutputData, ScUpdateMode eMode, ULONG nLayer ); + BOOL DrawMouseButtonDown(const MouseEvent& rMEvt); + BOOL DrawMouseButtonUp(const MouseEvent& rMEvt); + BOOL DrawMouseMove(const MouseEvent& rMEvt); + BOOL DrawKeyInput(const KeyEvent& rKEvt); + BOOL DrawCommand(const CommandEvent& rCEvt); + BOOL DrawHasMarkedObj(); + void DrawEndAction(); + void DrawMarkDropObj( SdrObject* pObj ); + SdrObject* GetEditObject(); + BOOL IsMyModel(SdrEditView* pSdrView); + //void DrawStartTimer(); + + void DrawRedraw( ScOutputData& rOutputData, ScUpdateMode eMode, ULONG nLayer ); void DrawSdrGrid( const Rectangle& rDrawingRect, OutputDevice* pContentDev ); - //BOOL DrawBeforeScroll(); - void DrawAfterScroll(/*BOOL bVal*/); - //void DrawMarks(); - //BOOL NeedDrawMarks(); - void DrawComboButton( const Point& rCellPos, - long nCellSizeX, - long nCellSizeY, + //BOOL DrawBeforeScroll(); + void DrawAfterScroll(/*BOOL bVal*/); + //void DrawMarks(); + //BOOL NeedDrawMarks(); + void DrawComboButton( const Point& rCellPos, + long nCellSizeX, + long nCellSizeY, BOOL bArrowState, - BOOL bBtnIn = FALSE ); - Rectangle GetListValButtonRect( const ScAddress& rButtonPos ); + BOOL bBtnIn = FALSE ); + Rectangle GetListValButtonRect( const ScAddress& rButtonPos ); void DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, OutputDevice* pContentDev ); - BOOL GetEditUrl( const Point& rPos, + BOOL GetEditUrl( const Point& rPos, String* pName=0, String* pUrl=0, String* pTarget=0 ); - BOOL GetEditUrlOrError( BOOL bSpellErr, const Point& rPos, + BOOL GetEditUrlOrError( BOOL bSpellErr, const Point& rPos, String* pName=0, String* pUrl=0, String* pTarget=0 ); - BOOL HitRangeFinder( const Point& rMouse, BOOL& rCorner, USHORT* pIndex = NULL, + BOOL HitRangeFinder( const Point& rMouse, BOOL& rCorner, USHORT* pIndex = NULL, SCsCOL* pAddX = NULL, SCsROW* pAddY = NULL ); - USHORT HitPageBreak( const Point& rMouse, ScRange* pSource = NULL, + USHORT HitPageBreak( const Point& rMouse, ScRange* pSource = NULL, SCCOLROW* pBreak = NULL, SCCOLROW* pPrev = NULL ); - void PasteSelection( const Point& rPosPixel ); + void PasteSelection( const Point& rPosPixel ); - void SelectForContextMenu( const Point& rPosPixel, SCsCOL nCellX, SCsROW nCellY ); + void SelectForContextMenu( const Point& rPosPixel, SCsCOL nCellX, SCsROW nCellY ); void GetSelectionRects( ::std::vector< Rectangle >& rPixelRects ); protected: using Window::Resize; - virtual void Resize( const Size& rSize ); - virtual void PrePaint(); - virtual void Paint( const Rectangle& rRect ); - virtual void KeyInput(const KeyEvent& rKEvt); - virtual void GetFocus(); - virtual void LoseFocus(); + virtual void Resize( const Size& rSize ); + virtual void PrePaint(); + virtual void Paint( const Rectangle& rRect ); + virtual void KeyInput(const KeyEvent& rKEvt); + virtual void GetFocus(); + virtual void LoseFocus(); - virtual void RequestHelp( const HelpEvent& rEvt ); - virtual void Command( const CommandEvent& rCEvt ); + virtual void RequestHelp( const HelpEvent& rEvt ); + virtual void Command( const CommandEvent& rCEvt ); virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); public: ScGridWindow( Window* pParent, ScViewData* pData, ScSplitPos eWhichPos ); @@ -323,75 +323,75 @@ public: ::sdr::overlay::OverlayManager* getOverlayManager(); void flushOverlayManager(); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ); virtual long PreNotify( NotifyEvent& rNEvt ); - virtual void Tracking( const TrackingEvent& rTEvt ); + virtual void Tracking( const TrackingEvent& rTEvt ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); - void FakeButtonUp(); + void FakeButtonUp(); - Point GetMousePosPixel() const; - void UpdateStatusPosSize(); + Point GetMousePosPixel() const; + void UpdateStatusPosSize(); - void ClickExtern(); + void ClickExtern(); - void SetPointer( const Pointer& rPointer ); + void SetPointer( const Pointer& rPointer ); - void MoveMouseStatus( ScGridWindow &rDestWin ); + void MoveMouseStatus( ScGridWindow &rDestWin ); - void ScrollPixel( long nDifX, long nDifY ); - void UpdateEditViewPos(); + void ScrollPixel( long nDifX, long nDifY ); + void UpdateEditViewPos(); - void UpdateFormulas(); + void UpdateFormulas(); - void DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect ); - void DoScenarioMenue( const ScRange& rScenRange ); + void DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect ); + void DoScenarioMenue( const ScRange& rScenRange ); void LaunchPageFieldMenu( SCCOL nCol, SCROW nRow ); void LaunchDPFieldMenu( SCCOL nCol, SCROW nRow ); ::com::sun::star::sheet::DataPilotFieldOrientation GetDPFieldOrientation( SCCOL nCol, SCROW nRow ) const; - void DrawButtons( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, + void DrawButtons( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScTableInfo& rTabInfo, OutputDevice* pContentDev ); using Window::Draw; - void Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, + void Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMode eMode = SC_UPDATE_ALL ); - void InvertSimple( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, + void InvertSimple( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, BOOL bTestMerge = FALSE, BOOL bRepeat = FALSE ); - void CreateAnchorHandle(SdrHdlList& rHdl, const ScAddress& rAddress); + void CreateAnchorHandle(SdrHdlList& rHdl, const ScAddress& rAddress); - void HideCursor(); - void ShowCursor(); - void DrawCursor(); - void DrawAutoFillMark(); - void UpdateAutoFillMark(BOOL bMarked, const ScRange& rMarkRange); + void HideCursor(); + void ShowCursor(); + void DrawCursor(); + void DrawAutoFillMark(); + void UpdateAutoFillMark(BOOL bMarked, const ScRange& rMarkRange); - void UpdateListValPos( BOOL bVisible, const ScAddress& rPos ); + void UpdateListValPos( BOOL bVisible, const ScAddress& rPos ); - BOOL ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, BOOL bKeyboard ); - void HideNoteMarker(); + BOOL ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, BOOL bKeyboard ); + void HideNoteMarker(); - MapMode GetDrawMapMode( BOOL bForce = FALSE ); + MapMode GetDrawMapMode( BOOL bForce = FALSE ); - void ContinueDrag(); + void ContinueDrag(); - void StopMarking(); - void UpdateInputContext(); + void StopMarking(); + void UpdateInputContext(); - void CheckInverted() { if (nPaintCount) bNeedsRepaint = TRUE; } + void CheckInverted() { if (nPaintCount) bNeedsRepaint = TRUE; } - void DoInvertRect( const Rectangle& rPixel ); + void DoInvertRect( const Rectangle& rPixel ); - void CheckNeedsRepaint(); + void CheckNeedsRepaint(); void UpdateDPFromFieldPopupMenu(); void UpdateVisibleRange(); diff --git a/sc/source/ui/inc/groupdlg.hxx b/sc/source/ui/inc/groupdlg.hxx index 557044f16a3e..f77b827c0ad8 100644 --- a/sc/source/ui/inc/groupdlg.hxx +++ b/sc/source/ui/inc/groupdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,20 +40,20 @@ class ScGroupDlg : public ModalDialog { public: ScGroupDlg( Window* pParent, - USHORT nResId, - BOOL bUnGroup = FALSE, - BOOL bRows = TRUE ); + USHORT nResId, + BOOL bUnGroup = FALSE, + BOOL bRows = TRUE ); ~ScGroupDlg(); BOOL GetColsChecked() const; private: FixedLine aFlFrame; - RadioButton aBtnRows; - RadioButton aBtnCols; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + RadioButton aBtnRows; + RadioButton aBtnCols; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; }; diff --git a/sc/source/ui/inc/hdrcont.hxx b/sc/source/ui/inc/hdrcont.hxx index c4cc590fc7ed..10eb08c92496 100644 --- a/sc/source/ui/inc/hdrcont.hxx +++ b/sc/source/ui/inc/hdrcont.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,102 +36,102 @@ // --------------------------------------------------------------------------- -#define HDR_HORIZONTAL 0 -#define HDR_VERTICAL 1 +#define HDR_HORIZONTAL 0 +#define HDR_VERTICAL 1 -#define HDR_SIZE_OPTIMUM 0xFFFF +#define HDR_SIZE_OPTIMUM 0xFFFF // Groesse des Sliders -#define HDR_SLIDERSIZE 2 +#define HDR_SLIDERSIZE 2 class ScHeaderControl : public Window { private: - SelectionEngine* pSelEngine; - Font aNormFont; - Font aBoldFont; - BOOL bBoldSet; + SelectionEngine* pSelEngine; + Font aNormFont; + Font aBoldFont; + BOOL bBoldSet; - USHORT nFlags; - BOOL bVertical; // Vertikal = Zeilenheader + USHORT nFlags; + BOOL bVertical; // Vertikal = Zeilenheader - long nWidth; - long nSmallWidth; - long nBigWidth; + long nWidth; + long nSmallWidth; + long nBigWidth; - SCCOLROW nSize; + SCCOLROW nSize; - SCCOLROW nMarkStart; - SCCOLROW nMarkEnd; - BOOL bMarkRange; + SCCOLROW nMarkStart; + SCCOLROW nMarkEnd; + BOOL bMarkRange; - BOOL bDragging; // Groessen aendern - SCCOLROW nDragNo; - long nDragStart; - long nDragPos; - BOOL bDragMoved; + BOOL bDragging; // Groessen aendern + SCCOLROW nDragNo; + long nDragStart; + long nDragPos; + BOOL bDragMoved; - BOOL bIgnoreMove; + BOOL bIgnoreMove; - long GetScrPos( SCCOLROW nEntryNo ); - SCCOLROW GetMousePos( const MouseEvent& rMEvt, BOOL& rBorder ); + long GetScrPos( SCCOLROW nEntryNo ); + SCCOLROW GetMousePos( const MouseEvent& rMEvt, BOOL& rBorder ); bool IsSelectionAllowed(SCCOLROW nPos) const; - void ShowDragHelp(); + void ShowDragHelp(); - void DoPaint( SCCOLROW nStart, SCCOLROW nEnd ); + void DoPaint( SCCOLROW nStart, SCCOLROW nEnd ); void DrawShadedRect( long nStart, long nEnd, const Color& rBaseColor ); protected: - // von Window ueberladen + // von Window ueberladen - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void Tracking( const TrackingEvent& rTEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void Tracking( const TrackingEvent& rTEvt ); - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void RequestHelp( const HelpEvent& rHEvt ); - // neue Methoden + // neue Methoden - virtual SCCOLROW GetPos() = 0; // aktuelle Position (Scrolling) - virtual USHORT GetEntrySize( SCCOLROW nEntryNo ) = 0; // Breite / Hoehe (Pixel) - virtual String GetEntryText( SCCOLROW nEntryNo ) = 0; + virtual SCCOLROW GetPos() = 0; // aktuelle Position (Scrolling) + virtual USHORT GetEntrySize( SCCOLROW nEntryNo ) = 0; // Breite / Hoehe (Pixel) + virtual String GetEntryText( SCCOLROW nEntryNo ) = 0; virtual SCCOLROW GetHiddenCount( SCCOLROW nEntryNo ); - virtual BOOL IsLayoutRTL(); - virtual BOOL IsMirrored(); + virtual BOOL IsLayoutRTL(); + virtual BOOL IsMirrored(); - virtual void SetEntrySize( SCCOLROW nPos, USHORT nNewWidth ) = 0; - virtual void HideEntries( SCCOLROW nStart, SCCOLROW nEnd ) = 0; + virtual void SetEntrySize( SCCOLROW nPos, USHORT nNewWidth ) = 0; + virtual void HideEntries( SCCOLROW nStart, SCCOLROW nEnd ) = 0; - virtual void SetMarking( BOOL bSet ); - virtual void SelectWindow(); - virtual BOOL IsDisabled(); - virtual BOOL ResizeAllowed(); - virtual String GetDragHelp( long nVal ); + virtual void SetMarking( BOOL bSet ); + virtual void SelectWindow(); + virtual BOOL IsDisabled(); + virtual BOOL ResizeAllowed(); + virtual String GetDragHelp( long nVal ); - virtual void DrawInvert( long nDragPos ); - virtual void Command( const CommandEvent& rCEvt ); + virtual void DrawInvert( long nDragPos ); + virtual void Command( const CommandEvent& rCEvt ); public: ScHeaderControl( Window* pParent, SelectionEngine* pSelectionEngine, SCCOLROW nNewSize, USHORT nNewFlags ); ~ScHeaderControl(); - void SetIgnoreMove(BOOL bSet) { bIgnoreMove = bSet; } + void SetIgnoreMove(BOOL bSet) { bIgnoreMove = bSet; } - void StopMarking(); + void StopMarking(); - void SetMark( BOOL bNewSet, SCCOLROW nNewStart, SCCOLROW nNewEnd ); + void SetMark( BOOL bNewSet, SCCOLROW nNewStart, SCCOLROW nNewEnd ); - long GetWidth() const { return nWidth; } - long GetSmallWidth() const { return nSmallWidth; } - long GetBigWidth() const { return nBigWidth; } - void SetWidth( long nNew ); + long GetWidth() const { return nWidth; } + long GetSmallWidth() const { return nSmallWidth; } + long GetBigWidth() const { return nBigWidth; } + void SetWidth( long nNew ); }; diff --git a/sc/source/ui/inc/hfedtdlg.hxx b/sc/source/ui/inc/hfedtdlg.hxx index 335fe9618b50..b4eb019a85db 100644 --- a/sc/source/ui/inc/hfedtdlg.hxx +++ b/sc/source/ui/inc/hfedtdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,11 +42,11 @@ class ScHFEditDlg : public SfxTabDialog { SvxNumType eNumType; public: - ScHFEditDlg( SfxViewFrame* pFrame, - Window* pParent, - const SfxItemSet& rCoreSet, - const String& rPageStyle, - USHORT nResId = RID_SCDLG_HFEDIT ); + ScHFEditDlg( SfxViewFrame* pFrame, + Window* pParent, + const SfxItemSet& rCoreSet, + const String& rPageStyle, + USHORT nResId = RID_SCDLG_HFEDIT ); ~ScHFEditDlg(); diff --git a/sc/source/ui/inc/highred.hrc b/sc/source/ui/inc/highred.hrc index 426c9ba29ee2..726c9a870fb8 100644 --- a/sc/source/ui/inc/highred.hrc +++ b/sc/source/ui/inc/highred.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,22 +27,22 @@ #include "sc.hrc" // -> RID_SCDLG_CHANGES -#define BTN_OK 1 -#define BTN_CANCEL 2 -#define BTN_HELP 5 +#define BTN_OK 1 +#define BTN_CANCEL 2 +#define BTN_HELP 5 -#define CB_HIGHLIGHT_ACCEPT 6 -#define CB_HIGHLIGHT_REJECT 7 +#define CB_HIGHLIGHT_ACCEPT 6 +#define CB_HIGHLIGHT_REJECT 7 // #define FL_FILTER 10 -#define TP_FILTER 11 -#define TP_VIEW 12 -#define CB_HIGHLIGHT 13 +#define TP_FILTER 11 +#define TP_VIEW 12 +#define CB_HIGHLIGHT 13 -#define FT_ASSIGN 14 -#define ED_ASSIGN 15 -#define RB_ASSIGN 16 +#define FT_ASSIGN 14 +#define ED_ASSIGN 15 +#define RB_ASSIGN 16 @@ -51,20 +51,20 @@ #define STR_INSERT_COLS 20 -#define STR_INSERT_ROWS 21 -#define STR_INSERT_TABS 22 -#define STR_DELETE_COLS 23 -#define STR_DELETE_ROWS 24 -#define STR_DELETE_TABS 25 -#define STR_MOVE 26 -#define STR_CONTENT 27 -#define STR_REJECT 28 +#define STR_INSERT_ROWS 21 +#define STR_INSERT_TABS 22 +#define STR_DELETE_COLS 23 +#define STR_DELETE_ROWS 24 +#define STR_DELETE_TABS 25 +#define STR_MOVE 26 +#define STR_CONTENT 27 +#define STR_REJECT 28 // Bitmaps -#define BMP_STR_CLOSE 31 -#define BMP_STR_OPEN 32 -#define BMP_STR_END 33 -#define BMP_STR_ERROR 34 +#define BMP_STR_CLOSE 31 +#define BMP_STR_OPEN 32 +#define BMP_STR_END 33 +#define BMP_STR_ERROR 34 // diff --git a/sc/source/ui/inc/highred.hxx b/sc/source/ui/inc/highred.hxx index 090905c481e8..48192bb6db36 100644 --- a/sc/source/ui/inc/highred.hxx +++ b/sc/source/ui/inc/highred.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,13 +50,13 @@ class ScViewData; class ScDocument; -#ifndef FLT_DATE_BEFORE -#define FLT_DATE_BEFORE 0 -#define FLT_DATE_SINCE 1 -#define FLT_DATE_EQUAL 2 -#define FLT_DATE_NOTEQUAL 3 -#define FLT_DATE_BETWEEN 4 -#define FLT_DATE_SAVE 5 +#ifndef FLT_DATE_BEFORE +#define FLT_DATE_BEFORE 0 +#define FLT_DATE_SINCE 1 +#define FLT_DATE_EQUAL 2 +#define FLT_DATE_NOTEQUAL 3 +#define FLT_DATE_BETWEEN 4 +#define FLT_DATE_SAVE 5 #endif //================================================================== @@ -65,28 +65,28 @@ class ScHighlightChgDlg : public ScAnyRefDlg { private: - CheckBox aHighlightBox; + CheckBox aHighlightBox; FixedLine aFlFilter; - SvxTPFilter aFilterCtr; - CheckBox aCbAccept; - CheckBox aCbReject; + SvxTPFilter aFilterCtr; + CheckBox aCbAccept; + CheckBox aCbReject; - OKButton aOkButton; - CancelButton aCancelButton; - HelpButton aHelpButton; + OKButton aOkButton; + CancelButton aCancelButton; + HelpButton aHelpButton; - formula::RefEdit aEdAssign; - formula::RefButton aRbAssign; + formula::RefEdit aEdAssign; + formula::RefButton aRbAssign; - ScViewData* pViewData; - ScDocument* pDoc; - ScRangeName aLocalRangeName; - Selection theCurSel; - Size MinSize; - ScRangeList aRangeList; - ScChangeViewSettings aChangeViewSet; + ScViewData* pViewData; + ScDocument* pDoc; + ScRangeName aLocalRangeName; + Selection theCurSel; + Size MinSize; + ScRangeList aRangeList; + ScChangeViewSettings aChangeViewSet; - void Init(); + void Init(); DECL_LINK( RefHandle, SvxTPFilter* ); DECL_LINK(HighLightHandle, CheckBox*); @@ -95,18 +95,18 @@ private: protected: - virtual void RefInputDone( BOOL bForced = FALSE ); + virtual void RefInputDone( BOOL bForced = FALSE ); public: ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - ScViewData* ptrViewData); + ScViewData* ptrViewData); ~ScHighlightChgDlg(); - virtual void SetActive(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual BOOL Close(); - virtual BOOL IsRefInputMode() const; + virtual void SetActive(); + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); + virtual BOOL Close(); + virtual BOOL IsRefInputMode() const; }; diff --git a/sc/source/ui/inc/hintwin.hxx b/sc/source/ui/inc/hintwin.hxx index f199698178bc..ab514a95d9dc 100644 --- a/sc/source/ui/inc/hintwin.hxx +++ b/sc/source/ui/inc/hintwin.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,15 +34,15 @@ class ScHintWindow : public Window { private: - String aTitle; - String aMessage; - Point aTextStart; - long nTextHeight; - Font aTextFont; - Font aHeadFont; + String aTitle; + String aMessage; + Point aTextStart; + long nTextHeight; + Font aTextFont; + Font aHeadFont; protected: - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ); public: ScHintWindow( Window* pParent, const String& rTit, const String& rMsg ); diff --git a/sc/source/ui/inc/hiranges.hxx b/sc/source/ui/inc/hiranges.hxx index a79bfad079c4..84c70d1a52a8 100644 --- a/sc/source/ui/inc/hiranges.hxx +++ b/sc/source/ui/inc/hiranges.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,8 +37,8 @@ struct ScHighlightEntry { - ScRange aRef; - Color aColor; + ScRange aRef; + Color aColor; ScHighlightEntry( const ScRange& rR, const Color& rC ) : aRef(rR), aColor(rC) {} @@ -46,14 +46,14 @@ struct ScHighlightEntry class ScHighlightRanges { - List aEntries; + List aEntries; public: ScHighlightRanges(); ~ScHighlightRanges(); - ULONG Count() const { return aEntries.Count(); } - void Insert( ScHighlightEntry* pNew ) { aEntries.Insert(pNew, LIST_APPEND); } + ULONG Count() const { return aEntries.Count(); } + void Insert( ScHighlightEntry* pNew ) { aEntries.Insert(pNew, LIST_APPEND); } ScHighlightEntry* GetObject( ULONG nIndex ) const { return (ScHighlightEntry*)aEntries.GetObject(nIndex); } }; diff --git a/sc/source/ui/inc/imoptdlg.hxx b/sc/source/ui/inc/imoptdlg.hxx index 49f574bbf055..576409598f9d 100644 --- a/sc/source/ui/inc/imoptdlg.hxx +++ b/sc/source/ui/inc/imoptdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,38 +61,38 @@ public: { SetTextEncoding( nEnc ); } ScImportOptions( const ScImportOptions& rCpy ) - : nFieldSepCode (rCpy.nFieldSepCode), - nTextSepCode (rCpy.nTextSepCode), - aStrFont (rCpy.aStrFont), - eCharSet (rCpy.eCharSet), - bFixedWidth (rCpy.bFixedWidth), - bSaveAsShown (rCpy.bSaveAsShown) + : nFieldSepCode (rCpy.nFieldSepCode), + nTextSepCode (rCpy.nTextSepCode), + aStrFont (rCpy.aStrFont), + eCharSet (rCpy.eCharSet), + bFixedWidth (rCpy.bFixedWidth), + bSaveAsShown (rCpy.bSaveAsShown) {} ScImportOptions& operator=( const ScImportOptions& rCpy ) { - nFieldSepCode = rCpy.nFieldSepCode; - nTextSepCode = rCpy.nTextSepCode; - aStrFont = rCpy.aStrFont; - eCharSet = rCpy.eCharSet; - bFixedWidth = rCpy.bFixedWidth; + nFieldSepCode = rCpy.nFieldSepCode; + nTextSepCode = rCpy.nTextSepCode; + aStrFont = rCpy.aStrFont; + eCharSet = rCpy.eCharSet; + bFixedWidth = rCpy.bFixedWidth; bSaveAsShown = rCpy.bSaveAsShown; return *this; } - BOOL operator==( const ScImportOptions& rCmp ) + BOOL operator==( const ScImportOptions& rCmp ) { return - nFieldSepCode == rCmp.nFieldSepCode - && nTextSepCode == rCmp.nTextSepCode - && eCharSet == rCmp.eCharSet - && aStrFont == rCmp.aStrFont - && bFixedWidth == rCmp.bFixedWidth + nFieldSepCode == rCmp.nFieldSepCode + && nTextSepCode == rCmp.nTextSepCode + && eCharSet == rCmp.eCharSet + && aStrFont == rCmp.aStrFont + && bFixedWidth == rCmp.bFixedWidth && bSaveAsShown == rCmp.bSaveAsShown; } - String BuildString() const; + String BuildString() const; - void SetTextEncoding( rtl_TextEncoding nEnc ); + void SetTextEncoding( rtl_TextEncoding nEnc ); sal_Unicode nFieldSepCode; sal_Unicode nTextSepCode; diff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxx index 31ffe717817b..63452795bbec 100644 --- a/sc/source/ui/inc/impex.hxx +++ b/sc/source/ui/inc/impex.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ class ScAsciiOptions; struct ScExportTextOptions { enum NewlineConversion { ToSystem, ToSpace, None }; - ScExportTextOptions( NewlineConversion eNewlineConversion = ToSystem, sal_Unicode cSeparatorConvertTo = 0, bool bAddQuotes = false ) : + ScExportTextOptions( NewlineConversion eNewlineConversion = ToSystem, sal_Unicode cSeparatorConvertTo = 0, bool bAddQuotes = false ) : meNewlineConversion( eNewlineConversion ), mcSeparatorConvertTo( cSeparatorConvertTo ), mbAddQuotes( bAddQuotes ) {} NewlineConversion meNewlineConversion; @@ -57,24 +57,24 @@ class SC_DLLPUBLIC ScImportExport ScDocument* pDoc; ScDocument* pUndoDoc; ScRange aRange; - String aStreamPath; + String aStreamPath; String aNonConvertibleChars; - ULONG nSizeLimit; - sal_Unicode cSep; // Separator - sal_Unicode cStr; // String Delimiter - BOOL bFormulas; // Formeln im Text? - BOOL bIncludeFiltered; // include filtered rows? (default true) - BOOL bAll; // keine Selektion - BOOL bSingle; // Einfachselektion - BOOL bUndo; // Mit Undo? - BOOL bOverflow; // zuviele Zeilen/Spalten + ULONG nSizeLimit; + sal_Unicode cSep; // Separator + sal_Unicode cStr; // String Delimiter + BOOL bFormulas; // Formeln im Text? + BOOL bIncludeFiltered; // include filtered rows? (default true) + BOOL bAll; // keine Selektion + BOOL bSingle; // Einfachselektion + BOOL bUndo; // Mit Undo? + BOOL bOverflow; // zuviele Zeilen/Spalten bool mbApi; ScExportTextOptions mExportTextOptions; - ScAsciiOptions* pExtOptions; // erweiterte Optionen + ScAsciiOptions* pExtOptions; // erweiterte Optionen - BOOL StartPaste(); // Protect-Check, Undo einrichten - void EndPaste(); // Undo/Redo-Aktionen, Repaint + BOOL StartPaste(); // Protect-Check, Undo einrichten + void EndPaste(); // Undo/Redo-Aktionen, Repaint BOOL Doc2Text( SvStream& ); BOOL Text2Doc( SvStream& ); BOOL Doc2Sylk( SvStream& ); @@ -83,13 +83,13 @@ class SC_DLLPUBLIC ScImportExport BOOL Doc2RTF( SvStream& ); BOOL Doc2Dif( SvStream& ); BOOL Dif2Doc( SvStream& ); - BOOL ExtText2Doc( SvStream& ); // mit pExtOptions + BOOL ExtText2Doc( SvStream& ); // mit pExtOptions BOOL RTF2Doc( SvStream&, const String& rBaseURL ); BOOL HTML2Doc( SvStream&, const String& rBaseURL ); public: - ScImportExport( ScDocument* ); // Gesamtdokument - ScImportExport( ScDocument*, const String& ); // Bereichs/Zellangabe + ScImportExport( ScDocument* ); // Gesamtdokument + ScImportExport( ScDocument*, const String& ); // Bereichs/Zellangabe ScImportExport( ScDocument*, const ScAddress& ); ScImportExport( ScDocument*, const ScRange& ); ~ScImportExport(); @@ -98,20 +98,20 @@ public: BOOL IsDoubleRef() const { return BOOL( !( bAll || bSingle ) ); } BOOL IsSingleRef() const { return bSingle; } - BOOL IsNoRef() const { return bAll; } - BOOL IsRef() const { return BOOL( !bAll ); } + BOOL IsNoRef() const { return bAll; } + BOOL IsRef() const { return BOOL( !bAll ); } const ScRange& GetRange() const { return aRange; } - BOOL IsUndo() const { return bUndo; } - void SetUndo( BOOL b ) { bUndo = b; } + BOOL IsUndo() const { return bUndo; } + void SetUndo( BOOL b ) { bUndo = b; } static BOOL IsFormatSupported( ULONG nFormat ); static const sal_Unicode* ScanNextFieldFromString( const sal_Unicode* p, String& rField, sal_Unicode cStr, const sal_Unicode* pSeps, bool bMergeSeps, bool& rbIsQuoted ); - static void WriteUnicodeOrByteString( SvStream& rStrm, const String& rString, BOOL bZero = FALSE ); - static void WriteUnicodeOrByteEndl( SvStream& rStrm ); - static inline BOOL IsEndianSwap( const SvStream& rStrm ); + static void WriteUnicodeOrByteString( SvStream& rStrm, const String& rString, BOOL bZero = FALSE ); + static void WriteUnicodeOrByteEndl( SvStream& rStrm ); + static inline BOOL IsEndianSwap( const SvStream& rStrm ); //! only if stream is only used in own (!) memory static inline void SetNoEndianSwap( SvStream& rStrm ); @@ -125,10 +125,10 @@ public: BOOL IsIncludeFiltered() const { return bIncludeFiltered; } void SetIncludeFiltered( BOOL b ) { bIncludeFiltered = b; } - void SetSizeLimit( ULONG nNew ) { nSizeLimit = nNew; } // momentan nur fuer Ascii + void SetSizeLimit( ULONG nNew ) { nSizeLimit = nNew; } // momentan nur fuer Ascii - void SetStreamPath( const String& rPath ) { aStreamPath = rPath; } - const String& GetStreamPath() const { return aStreamPath; } + void SetStreamPath( const String& rPath ) { aStreamPath = rPath; } + const String& GetStreamPath() const { return aStreamPath; } BOOL ImportString( const ::rtl::OUString&, ULONG=FORMAT_STRING ); BOOL ExportString( ::rtl::OUString&, ULONG=FORMAT_STRING ); @@ -142,7 +142,7 @@ public: BOOL ExportData( const String& rMimeType, ::com::sun::star::uno::Any & rValue ); - BOOL IsOverflow() const { return bOverflow; } // nach dem Importieren + BOOL IsOverflow() const { return bOverflow; } // nach dem Importieren const String& GetNonConvertibleChars() const { return aNonConvertibleChars; } diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx index b6fb5eead65a..d3a30b018bbe 100644 --- a/sc/source/ui/inc/inputhdl.hxx +++ b/sc/source/ui/inc/inputhdl.hxx @@ -54,78 +54,78 @@ class CommandEvent; struct ESelection; //======================================================================== -// ScInputHandler +// ScInputHandler //======================================================================== class ScInputHandler { private: - ScInputWindow* pInputWin; - - ScEditEngineDefaulter* pEngine; // editierte Daten in der Tabelle - EditView* pTableView; // aktive EditView dazu - EditView* pTopView; // EditView in der Eingabezeile - - TypedScStrCollection* pColumnData; - TypedScStrCollection* pFormulaData; - TypedScStrCollection* pFormulaDataPara; - Window* pTipVisibleParent; - ULONG nTipVisible; - Window* pTipVisibleSecParent; + ScInputWindow* pInputWin; + + ScEditEngineDefaulter* pEngine; // editierte Daten in der Tabelle + EditView* pTableView; // aktive EditView dazu + EditView* pTopView; // EditView in der Eingabezeile + + TypedScStrCollection* pColumnData; + TypedScStrCollection* pFormulaData; + TypedScStrCollection* pFormulaDataPara; + Window* pTipVisibleParent; + ULONG nTipVisible; + Window* pTipVisibleSecParent; ULONG nTipVisibleSec; - String aManualTip; - String aAutoSearch; - USHORT nAutoPos; - BOOL bUseTab; // Blaettern moeglich - - BOOL bTextValid; // Text noch nicht in Edit-Engine - String aCurrentText; - - String aFormText; // fuer Funktions-Autopilot - xub_StrLen nFormSelStart; // Selektion fuer Funktions-Autopilot - xub_StrLen nFormSelEnd; - - USHORT nAutoPar; // autom.parentheses than can be overwritten - - ScAddress aCursorPos; - ScInputMode eMode; - BOOL bModified; - BOOL bSelIsRef; - BOOL bFormulaMode; - BOOL bInRangeUpdate; - BOOL bParenthesisShown; - BOOL bCreatingFuncView; - BOOL bInEnterHandler; - BOOL bCommandErrorShown; - BOOL bInOwnChange; - - BOOL bProtected; - BOOL bCellHasPercentFormat; - ULONG nValidation; + String aManualTip; + String aAutoSearch; + USHORT nAutoPos; + BOOL bUseTab; // Blaettern moeglich + + BOOL bTextValid; // Text noch nicht in Edit-Engine + String aCurrentText; + + String aFormText; // fuer Funktions-Autopilot + xub_StrLen nFormSelStart; // Selektion fuer Funktions-Autopilot + xub_StrLen nFormSelEnd; + + USHORT nAutoPar; // autom.parentheses than can be overwritten + + ScAddress aCursorPos; + ScInputMode eMode; + BOOL bModified; + BOOL bSelIsRef; + BOOL bFormulaMode; + BOOL bInRangeUpdate; + BOOL bParenthesisShown; + BOOL bCreatingFuncView; + BOOL bInEnterHandler; + BOOL bCommandErrorShown; + BOOL bInOwnChange; + + BOOL bProtected; + BOOL bCellHasPercentFormat; + ULONG nValidation; SvxCellHorJustify eAttrAdjust; - Fraction aScaleX; // fuer Ref-MapMode - Fraction aScaleY; + Fraction aScaleX; // fuer Ref-MapMode + Fraction aScaleY; - ScTabViewShell* pRefViewSh; - ScTabViewShell* pActiveViewSh; + ScTabViewShell* pRefViewSh; + ScTabViewShell* pActiveViewSh; - const ScPatternAttr* pLastPattern; - SfxItemSet* pEditDefaults; - BOOL bLastIsSymbol; + const ScPatternAttr* pLastPattern; + SfxItemSet* pEditDefaults; + BOOL bLastIsSymbol; - ScInputHdlState* pLastState; - Timer* pDelayTimer; + ScInputHdlState* pLastState; + Timer* pDelayTimer; - ScRangeFindList* pRangeFindList; + ScRangeFindList* pRangeFindList; - static BOOL bAutoComplete; // aus App-Optionen - static BOOL bOptLoaded; + static BOOL bAutoComplete; // aus App-Optionen + static BOOL bOptLoaded; #ifdef _INPUTHDL_CXX private: - void UpdateActiveView(); - void SyncViews( EditView* pSourceView = NULL ); + void UpdateActiveView(); + void SyncViews( EditView* pSourceView = NULL ); /** * @param cTyped typed character. If 0, look at existing document content * for text or number. @@ -134,30 +134,30 @@ private: * @return true if the new edit mode has been started. */ bool StartTable( sal_Unicode cTyped, bool bFromCommand, bool bInputActivated ); - void RemoveSelection(); - void UpdateFormulaMode(); - void InvalidateAttribs(); - void ImplCreateEditEngine(); - DECL_LINK( DelayTimer, Timer* ); - void GetColData(); - void UseColData(); - void NextAutoEntry( BOOL bBack ); - void UpdateAdjust( sal_Unicode cTyped ); - void GetFormulaData(); - void UseFormulaData(); - void NextFormulaEntry( BOOL bBack ); - void PasteFunctionData(); - void PasteManualTip(); - EditView* GetFuncEditView(); - void RemoveAdjust(); - void RemoveRangeFinder(); - void DeleteRangeFinder(); - void UpdateParenthesis(); - void UpdateAutoCorrFlag(); - void ResetAutoPar(); - void AutoParAdded(); - BOOL CursorAtClosingPar(); - void SkipClosingPar(); + void RemoveSelection(); + void UpdateFormulaMode(); + void InvalidateAttribs(); + void ImplCreateEditEngine(); + DECL_LINK( DelayTimer, Timer* ); + void GetColData(); + void UseColData(); + void NextAutoEntry( BOOL bBack ); + void UpdateAdjust( sal_Unicode cTyped ); + void GetFormulaData(); + void UseFormulaData(); + void NextFormulaEntry( BOOL bBack ); + void PasteFunctionData(); + void PasteManualTip(); + EditView* GetFuncEditView(); + void RemoveAdjust(); + void RemoveRangeFinder(); + void DeleteRangeFinder(); + void UpdateParenthesis(); + void UpdateAutoCorrFlag(); + void ResetAutoPar(); + void AutoParAdded(); + BOOL CursorAtClosingPar(); + void SkipClosingPar(); DECL_LINK( ModifyHdl, void* ); DECL_LINK( ShowHideTipVisibleParentListener, VclWindowEvent* ); DECL_LINK( ShowHideTipVisibleSecParentListener, VclWindowEvent* ); @@ -165,104 +165,104 @@ private: public: ScInputHandler(); - virtual ~ScInputHandler(); + virtual ~ScInputHandler(); - void SetMode( ScInputMode eNewMode ); - BOOL IsInputMode() const { return (eMode != SC_INPUT_NONE); } - BOOL IsEditMode() const { return (eMode != SC_INPUT_NONE && + void SetMode( ScInputMode eNewMode ); + BOOL IsInputMode() const { return (eMode != SC_INPUT_NONE); } + BOOL IsEditMode() const { return (eMode != SC_INPUT_NONE && eMode != SC_INPUT_TYPE); } - BOOL IsTopMode() const { return (eMode == SC_INPUT_TOP); } + BOOL IsTopMode() const { return (eMode == SC_INPUT_TOP); } - const String& GetEditString(); - const String& GetFormString() const { return aFormText; } + const String& GetEditString(); + const String& GetFormString() const { return aFormText; } - BOOL GetTextAndFields( ScEditEngineDefaulter& rDestEngine ); + BOOL GetTextAndFields( ScEditEngineDefaulter& rDestEngine ); - BOOL KeyInput( const KeyEvent& rKEvt, BOOL bStartEdit = FALSE ); - void EnterHandler( BYTE nBlockMode = 0 ); - void CancelHandler(); - void SetReference( const ScRange& rRef, ScDocument* pDoc ); - void AddRefEntry(); + BOOL KeyInput( const KeyEvent& rKEvt, BOOL bStartEdit = FALSE ); + void EnterHandler( BYTE nBlockMode = 0 ); + void CancelHandler(); + void SetReference( const ScRange& rRef, ScDocument* pDoc ); + void AddRefEntry(); - BOOL InputCommand( const CommandEvent& rCEvt, BOOL bForce ); + BOOL InputCommand( const CommandEvent& rCEvt, BOOL bForce ); - void InsertFunction( const String& rFuncName, BOOL bAddPar = TRUE ); - void ClearText(); + void InsertFunction( const String& rFuncName, BOOL bAddPar = TRUE ); + void ClearText(); - void InputSelection( EditView* pView ); - void InputChanged( EditView* pView, BOOL bFromNotify = FALSE ); + void InputSelection( EditView* pView ); + void InputChanged( EditView* pView, BOOL bFromNotify = FALSE ); - void ViewShellGone(ScTabViewShell* pViewSh); - void SetRefViewShell(ScTabViewShell* pRefVsh) {pRefViewSh=pRefVsh;} + void ViewShellGone(ScTabViewShell* pViewSh); + void SetRefViewShell(ScTabViewShell* pRefVsh) {pRefViewSh=pRefVsh;} - void NotifyChange( const ScInputHdlState* pState, BOOL bForce = FALSE, + void NotifyChange( const ScInputHdlState* pState, BOOL bForce = FALSE, ScTabViewShell* pSourceSh = NULL, BOOL bStopEditing = TRUE); void UpdateCellAdjust( SvxCellHorJustify eJust ); - void ResetDelayTimer(); //BugId 54702 + void ResetDelayTimer(); //BugId 54702 - void HideTip(); + void HideTip(); void HideTipBelow(); void ShowTipCursor(); - void ShowTip( const String& rText ); // am Cursor - void ShowTipBelow( const String& rText ); + void ShowTip( const String& rText ); // am Cursor + void ShowTipBelow( const String& rText ); - void SetRefScale( const Fraction& rX, const Fraction& rY ); - void UpdateRefDevice(); + void SetRefScale( const Fraction& rX, const Fraction& rY ); + void UpdateRefDevice(); - EditView* GetActiveView(); - EditView* GetTableView() { return pTableView; } - EditView* GetTopView() { return pTopView; } + EditView* GetActiveView(); + EditView* GetTableView() { return pTableView; } + EditView* GetTopView() { return pTopView; } - BOOL DataChanging( sal_Unicode cTyped = 0, BOOL bFromCommand = FALSE ); - void DataChanged( BOOL bFromTopNotify = FALSE ); + BOOL DataChanging( sal_Unicode cTyped = 0, BOOL bFromCommand = FALSE ); + void DataChanged( BOOL bFromTopNotify = FALSE ); - BOOL TakesReturn() const { return ( nTipVisible != 0 ); } + BOOL TakesReturn() const { return ( nTipVisible != 0 ); } - void SetModified() { bModified = TRUE; } + void SetModified() { bModified = TRUE; } - BOOL GetSelIsRef() const { return bSelIsRef; } - void SetSelIsRef(BOOL bSet) { bSelIsRef = bSet; } + BOOL GetSelIsRef() const { return bSelIsRef; } + void SetSelIsRef(BOOL bSet) { bSelIsRef = bSet; } - void ShowRefFrame(); + void ShowRefFrame(); - ScRangeFindList* GetRangeFindList() { return pRangeFindList; } + ScRangeFindList* GetRangeFindList() { return pRangeFindList; } - void UpdateRange( USHORT nIndex, const ScRange& rNew ); + void UpdateRange( USHORT nIndex, const ScRange& rNew ); // Kommunikation mit Funktionsautopilot - void InputGetSelection ( xub_StrLen& rStart, xub_StrLen& rEnd ); - void InputSetSelection ( xub_StrLen nStart, xub_StrLen nEnd ); - void InputReplaceSelection ( const String& rStr ); - String InputGetFormulaStr (); + void InputGetSelection ( xub_StrLen& rStart, xub_StrLen& rEnd ); + void InputSetSelection ( xub_StrLen nStart, xub_StrLen nEnd ); + void InputReplaceSelection ( const String& rStr ); + String InputGetFormulaStr (); - BOOL IsFormulaMode() const { return bFormulaMode; } - ScInputWindow* GetInputWindow() { return pInputWin; } - void SetInputWindow( ScInputWindow* pNew ) { pInputWin = pNew; } - void StopInputWinEngine( BOOL bAll ); + BOOL IsFormulaMode() const { return bFormulaMode; } + ScInputWindow* GetInputWindow() { return pInputWin; } + void SetInputWindow( ScInputWindow* pNew ) { pInputWin = pNew; } + void StopInputWinEngine( BOOL bAll ); - BOOL IsInEnterHandler() const { return bInEnterHandler; } - BOOL IsInOwnChange() const { return bInOwnChange; } + BOOL IsInEnterHandler() const { return bInEnterHandler; } + BOOL IsInOwnChange() const { return bInOwnChange; } - BOOL IsModalMode( SfxObjectShell* pDocSh ); + BOOL IsModalMode( SfxObjectShell* pDocSh ); - void ForgetLastPattern(); + void ForgetLastPattern(); - void UpdateSpellSettings( BOOL bFromStartTab = FALSE ); + void UpdateSpellSettings( BOOL bFromStartTab = FALSE ); - void FormulaPreview(); + void FormulaPreview(); - Size GetTextSize(); // in 1/100mm + Size GetTextSize(); // in 1/100mm // eigentlich private, fuer SID_INPUT_SUM public - void InitRangeFinder( const String& rFormula ); + void InitRangeFinder( const String& rFormula ); - static void SetAutoComplete(BOOL bSet) { bAutoComplete = bSet; } + static void SetAutoComplete(BOOL bSet) { bAutoComplete = bSet; } }; //======================================================================== -// ScInputHdlState +// ScInputHdlState //======================================================================== class ScInputHdlState { @@ -277,22 +277,22 @@ public: ScInputHdlState( const ScInputHdlState& rCpy ); ~ScInputHdlState(); - ScInputHdlState& operator= ( const ScInputHdlState& r ); - int operator==( const ScInputHdlState& r ) const; - int operator!=( const ScInputHdlState& r ) const + ScInputHdlState& operator= ( const ScInputHdlState& r ); + int operator==( const ScInputHdlState& r ) const; + int operator!=( const ScInputHdlState& r ) const { return !operator==( r ); } - const ScAddress& GetPos() const { return aCursorPos; } - const ScAddress& GetStartPos() const { return aStartPos; } - const ScAddress& GetEndPos() const { return aEndPos; } - const String& GetString() const { return aString; } - const EditTextObject* GetEditData() const { return pEditData; } + const ScAddress& GetPos() const { return aCursorPos; } + const ScAddress& GetStartPos() const { return aStartPos; } + const ScAddress& GetEndPos() const { return aEndPos; } + const String& GetString() const { return aString; } + const EditTextObject* GetEditData() const { return pEditData; } private: - ScAddress aCursorPos; - ScAddress aStartPos; - ScAddress aEndPos; - String aString; + ScAddress aCursorPos; + ScAddress aStartPos; + ScAddress aEndPos; + String aString; EditTextObject* pEditData; }; diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index 46dbe9eb920a..5d7dcf781696 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,27 +47,27 @@ class ScRangeList; //======================================================================== -class ScTextWnd : public Window, public DragSourceHelper // edit window +class ScTextWnd : public Window, public DragSourceHelper // edit window { public: ScTextWnd( Window* pParent ); - virtual ~ScTextWnd(); + virtual ~ScTextWnd(); - void SetTextString( const String& rString ); - const String& GetTextString() const; + void SetTextString( const String& rString ); + const String& GetTextString() const; - BOOL IsInputActive(); - EditView* GetEditView(); + BOOL IsInputActive(); + EditView* GetEditView(); // fuer FunktionsAutopiloten - void MakeDialogEditView(); + void MakeDialogEditView(); - void StartEditEngine(); - void StopEditEngine( BOOL bAll ); + void StartEditEngine(); + void StopEditEngine( BOOL bAll ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); - void SetFormulaMode( BOOL bSet ); + void SetFormulaMode( BOOL bSet ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); @@ -77,36 +77,36 @@ public: DECL_LINK( NotifyHdl, EENotify* ); protected: - virtual void Paint( const Rectangle& rRec ); - virtual void Resize(); + virtual void Paint( const Rectangle& rRec ); + virtual void Resize(); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void KeyInput(const KeyEvent& rKEvt); - virtual void GetFocus(); - virtual void LoseFocus(); + virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void Command( const CommandEvent& rCEvt ); + virtual void KeyInput(const KeyEvent& rKEvt); + virtual void GetFocus(); + virtual void LoseFocus(); - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); - virtual String GetText() const; + virtual String GetText() const; private: - void ImplInitSettings(); - void UpdateAutoCorrFlag(); + void ImplInitSettings(); + void UpdateAutoCorrFlag(); private: typedef ::std::vector< ScAccessibleEditLineTextData* > AccTextDataVector; - String aString; - Font aTextFont; - ScEditEngineDefaulter* pEditEngine; // erst bei Bedarf angelegt - EditView* pEditView; + String aString; + Font aTextFont; + ScEditEngineDefaulter* pEditEngine; // erst bei Bedarf angelegt + EditView* pEditView; AccTextDataVector maAccTextDatas; // #i105267# text datas may be cloned, remember all copies - BOOL bIsRTL; - BOOL bIsInsertMode; - BOOL bFormulaMode; + BOOL bIsRTL; + BOOL bIsInsertMode; + BOOL bFormulaMode; // #102710#; this flag should be true if a key input or a command is handled // it prevents the call of InputChanged in the ModifyHandler of the EditEngine @@ -115,98 +115,98 @@ private: //======================================================================== -class ScPosWnd : public ComboBox, public SfxListener // Positionsanzeige +class ScPosWnd : public ComboBox, public SfxListener // Positionsanzeige { private: - String aPosStr; - Accelerator* pAccel; + String aPosStr; + Accelerator* pAccel; ULONG nTipVisible; - BOOL bFormulaMode; - BOOL bTopHadFocus; + BOOL bFormulaMode; + BOOL bTopHadFocus; public: ScPosWnd( Window* pParent ); - virtual ~ScPosWnd(); + virtual ~ScPosWnd(); - void SetPos( const String& rPosStr ); // angezeigter Text - void SetFormulaMode( BOOL bSet ); + void SetPos( const String& rPosStr ); // angezeigter Text + void SetFormulaMode( BOOL bSet ); protected: - virtual void Select(); + virtual void Select(); virtual void Modify(); - virtual long Notify( NotifyEvent& rNEvt ); + virtual long Notify( NotifyEvent& rNEvt ); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); private: - void FillRangeNames(); - void FillFunctions(); - void DoEnter(); + void FillRangeNames(); + void FillFunctions(); + void DoEnter(); void HideTip(); - void ReleaseFocus_Impl(); + void ReleaseFocus_Impl(); }; //======================================================================== -class ScInputWindow : public ToolBox // Parent-Toolbox +class ScInputWindow : public ToolBox // Parent-Toolbox { public: ScInputWindow( Window* pParent, SfxBindings* pBind ); - virtual ~ScInputWindow(); + virtual ~ScInputWindow(); - virtual void Resize(); + virtual void Resize(); virtual void Select(); - void SetFuncString( const String& rString, BOOL bDoEdit = TRUE ); - void SetPosString( const String& rStr ); - void SetTextString( const String& rString ); + void SetFuncString( const String& rString, BOOL bDoEdit = TRUE ); + void SetPosString( const String& rStr ); + void SetTextString( const String& rString ); - void SetOkCancelMode(); - void SetSumAssignMode(); - void EnableButtons( BOOL bEnable = TRUE ); + void SetOkCancelMode(); + void SetSumAssignMode(); + void EnableButtons( BOOL bEnable = TRUE ); - void SetFormulaMode( BOOL bSet ); + void SetFormulaMode( BOOL bSet ); - BOOL IsInputActive(); - EditView* GetEditView(); + BOOL IsInputActive(); + EditView* GetEditView(); - void TextGrabFocus(); - void TextInvalidate(); - void SwitchToTextWin(); + void TextGrabFocus(); + void TextInvalidate(); + void SwitchToTextWin(); - void PosGrabFocus(); + void PosGrabFocus(); // Fuer FunktionsAutopiloten - void MakeDialogEditView(); + void MakeDialogEditView(); - void StopEditEngine( BOOL bAll ); + void StopEditEngine( BOOL bAll ); - void SetInputHandler( ScInputHandler* pNew ); + void SetInputHandler( ScInputHandler* pNew ); - ScInputHandler* GetInputHandler(){ return pInputHdl;} + ScInputHandler* GetInputHandler(){ return pInputHdl;} - void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + void StateChanged( StateChangedType nType ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); protected: - virtual void SetText( const String& rString ); - virtual String GetText() const; + virtual void SetText( const String& rString ); + virtual String GetText() const; sal_Bool UseSubTotal( ScRangeList* pRangeList ) const; private: - ScPosWnd aWndPos; - ScTextWnd aTextWindow; - ScInputHandler* pInputHdl; + ScPosWnd aWndPos; + ScTextWnd aTextWindow; + ScInputHandler* pInputHdl; SfxBindings* pBindings; - String aTextOk; - String aTextCancel; - String aTextSum; - String aTextEqual; - BOOL bIsOkCancelMode; + String aTextOk; + String aTextCancel; + String aTextSum; + String aTextEqual; + BOOL bIsOkCancelMode; }; //================================================================== @@ -214,10 +214,10 @@ private: class ScInputWindowWrapper : public SfxChildWindow { public: - ScInputWindowWrapper( Window* pParent, - USHORT nId, - SfxBindings* pBindings, - SfxChildWinInfo* pInfo ); + ScInputWindowWrapper( Window* pParent, + USHORT nId, + SfxBindings* pBindings, + SfxChildWinInfo* pInfo ); SFX_DECL_CHILDWINDOW(ScInputWindowWrapper); }; diff --git a/sc/source/ui/inc/inscldlg.hxx b/sc/source/ui/inc/inscldlg.hxx index 7c3965ef981c..cadebb76358f 100644 --- a/sc/source/ui/inc/inscldlg.hxx +++ b/sc/source/ui/inc/inscldlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,13 +42,13 @@ class ScInsertCellDlg : public ModalDialog { private: FixedLine aFlFrame; - RadioButton aBtnCellsDown; - RadioButton aBtnCellsRight; - RadioButton aBtnInsRows; - RadioButton aBtnInsCols; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + RadioButton aBtnCellsDown; + RadioButton aBtnCellsRight; + RadioButton aBtnInsRows; + RadioButton aBtnInsCols; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; public: ScInsertCellDlg( Window* pParent,BOOL bDisallowCellMove = FALSE ); diff --git a/sc/source/ui/inc/inscodlg.hxx b/sc/source/ui/inc/inscodlg.hxx index 5888c1e72209..877e36330c66 100644 --- a/sc/source/ui/inc/inscodlg.hxx +++ b/sc/source/ui/inc/inscodlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,68 +40,68 @@ class ScInsertContentsDlg : public ModalDialog { public: - ScInsertContentsDlg( Window* pParent, - USHORT nCheckDefaults = 0, - const String* pStrTitle = NULL ); + ScInsertContentsDlg( Window* pParent, + USHORT nCheckDefaults = 0, + const String* pStrTitle = NULL ); ~ScInsertContentsDlg(); - USHORT GetInsContentsCmdBits() const; - USHORT GetFormulaCmdBits() const; - BOOL IsSkipEmptyCells() const {return aBtnSkipEmptyCells.IsChecked();} - BOOL IsTranspose() const {return aBtnTranspose.IsChecked();} - BOOL IsLink() const {return aBtnLink.IsChecked();} - InsCellCmd GetMoveMode(); + USHORT GetInsContentsCmdBits() const; + USHORT GetFormulaCmdBits() const; + BOOL IsSkipEmptyCells() const {return aBtnSkipEmptyCells.IsChecked();} + BOOL IsTranspose() const {return aBtnTranspose.IsChecked();} + BOOL IsLink() const {return aBtnLink.IsChecked();} + InsCellCmd GetMoveMode(); - void SetOtherDoc( BOOL bSet ); - void SetFillMode( BOOL bSet ); - void SetChangeTrack( BOOL bSet ); - void SetCellShiftDisabled( int nDisable ); + void SetOtherDoc( BOOL bSet ); + void SetFillMode( BOOL bSet ); + void SetChangeTrack( BOOL bSet ); + void SetCellShiftDisabled( int nDisable ); private: FixedLine aFlFrame; - CheckBox aBtnInsAll; - CheckBox aBtnInsStrings; - CheckBox aBtnInsNumbers; - CheckBox aBtnInsDateTime; - CheckBox aBtnInsFormulas; - CheckBox aBtnInsNotes; - CheckBox aBtnInsAttrs; - CheckBox aBtnInsObjects; + CheckBox aBtnInsAll; + CheckBox aBtnInsStrings; + CheckBox aBtnInsNumbers; + CheckBox aBtnInsDateTime; + CheckBox aBtnInsFormulas; + CheckBox aBtnInsNotes; + CheckBox aBtnInsAttrs; + CheckBox aBtnInsObjects; FixedLine aFlSep1; FixedLine aFlOptions; - CheckBox aBtnSkipEmptyCells; - CheckBox aBtnTranspose; - CheckBox aBtnLink; + CheckBox aBtnSkipEmptyCells; + CheckBox aBtnTranspose; + CheckBox aBtnLink; FixedLine aFlOperation; - RadioButton aRbNoOp; - RadioButton aRbAdd; - RadioButton aRbSub; - RadioButton aRbMul; - RadioButton aRbDiv; + RadioButton aRbNoOp; + RadioButton aRbAdd; + RadioButton aRbSub; + RadioButton aRbMul; + RadioButton aRbDiv; FixedLine aFlSep2; FixedLine aFlMove; - RadioButton aRbMoveNone; - RadioButton aRbMoveDown; - RadioButton aRbMoveRight; - - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - - BOOL bOtherDoc; - BOOL bFillMode; - BOOL bChangeTrack; - BOOL bMoveDownDisabled; - BOOL bMoveRightDisabled; - - static BOOL bPreviousAllCheck; - static USHORT nPreviousChecks; - static USHORT nPreviousChecks2; - static USHORT nPreviousFormulaChecks; - static USHORT nPreviousMoveMode; // enum InsCellCmd + RadioButton aRbMoveNone; + RadioButton aRbMoveDown; + RadioButton aRbMoveRight; + + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; + + BOOL bOtherDoc; + BOOL bFillMode; + BOOL bChangeTrack; + BOOL bMoveDownDisabled; + BOOL bMoveRightDisabled; + + static BOOL bPreviousAllCheck; + static USHORT nPreviousChecks; + static USHORT nPreviousChecks2; + static USHORT nPreviousFormulaChecks; + static USHORT nPreviousMoveMode; // enum InsCellCmd void DisableChecks( BOOL bInsAllChecked = TRUE ); void TestModes(); diff --git a/sc/source/ui/inc/instbdlg.hrc b/sc/source/ui/inc/instbdlg.hrc index 08bff85388dd..1b3388761029 100644 --- a/sc/source/ui/inc/instbdlg.hrc +++ b/sc/source/ui/inc/instbdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,24 +29,24 @@ //#define RID_SCDLG_INSERT_TABLE 300 -#define BTN_OK 1 -#define BTN_CANCEL 2 -#define BTN_HELP 3 +#define BTN_OK 1 +#define BTN_CANCEL 2 +#define BTN_HELP 3 -#define FL_POSITION 10 -#define RB_BEFORE 11 -#define RB_BEHIND 12 +#define FL_POSITION 10 +#define RB_BEFORE 11 +#define RB_BEHIND 12 -#define FL_TABLE 20 -#define RB_NEW 21 -#define FT_COUNT 22 -#define NF_COUNT 23 -#define FT_NAME 24 -#define ED_TABNAME 25 -#define RB_FROMFILE 26 -#define LB_TABLES 27 -#define BTN_BROWSE 28 -#define CB_LINK 29 -#define FT_PATH 30 +#define FL_TABLE 20 +#define RB_NEW 21 +#define FT_COUNT 22 +#define NF_COUNT 23 +#define FT_NAME 24 +#define ED_TABNAME 25 +#define RB_FROMFILE 26 +#define LB_TABLES 27 +#define BTN_BROWSE 28 +#define CB_LINK 29 +#define FT_PATH 30 diff --git a/sc/source/ui/inc/instbdlg.hxx b/sc/source/ui/inc/instbdlg.hxx index d0ae51329feb..7fedbcc88d19 100644 --- a/sc/source/ui/inc/instbdlg.hxx +++ b/sc/source/ui/inc/instbdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,35 +60,35 @@ public: ScInsertTableDlg( Window* pParent, ScViewData& rViewData, SCTAB nTabCount, bool bFromFile ); ~ScInsertTableDlg(); - virtual short Execute(); // ueberladen, um Dialog-Parent zu setzen + virtual short Execute(); // ueberladen, um Dialog-Parent zu setzen - BOOL GetTablesFromFile() { return aBtnFromFile.IsChecked(); } - BOOL GetTablesAsLink() { return aBtnLink.IsChecked(); } + BOOL GetTablesFromFile() { return aBtnFromFile.IsChecked(); } + BOOL GetTablesAsLink() { return aBtnLink.IsChecked(); } - const String* GetFirstTable( USHORT* pN = NULL ); - const String* GetNextTable( USHORT* pN = NULL ); - ScDocShell* GetDocShellTables() { return pDocShTables; } - BOOL IsTableBefore() { return aBtnBefore.IsChecked(); } - SCTAB GetTableCount() { return nTableCount;} + const String* GetFirstTable( USHORT* pN = NULL ); + const String* GetNextTable( USHORT* pN = NULL ); + ScDocShell* GetDocShellTables() { return pDocShTables; } + BOOL IsTableBefore() { return aBtnBefore.IsChecked(); } + SCTAB GetTableCount() { return nTableCount;} private: - RadioButton aBtnBefore; - RadioButton aBtnBehind; - FixedLine aFlPos; - RadioButton aBtnNew; - RadioButton aBtnFromFile; - FixedText aFtCount; - NumericField aNfCount; - FixedText aFtName; - Edit aEdName; - MultiListBox aLbTables; - ScExpandedFixedText aFtPath; - PushButton aBtnBrowse; - CheckBox aBtnLink; - FixedLine aFlTable; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + RadioButton aBtnBefore; + RadioButton aBtnBehind; + FixedLine aFlPos; + RadioButton aBtnNew; + RadioButton aBtnFromFile; + FixedText aFtCount; + NumericField aNfCount; + FixedText aFtName; + Edit aEdName; + MultiListBox aLbTables; + ScExpandedFixedText aFtPath; + PushButton aBtnBrowse; + CheckBox aBtnLink; + FixedLine aFlTable; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; Timer aBrowseTimer; ScViewData& rViewData; @@ -98,16 +98,16 @@ private: SfxObjectShellRef aDocShTablesRef; bool bMustClose; - USHORT nSelTabIndex; // fuer GetFirstTable() / GetNextTable() - String aStrCurSelTable; - SCTAB nTableCount; + USHORT nSelTabIndex; // fuer GetFirstTable() / GetNextTable() + String aStrCurSelTable; + SCTAB nTableCount; #ifdef SC_INSTBDLG_CXX void Init_Impl( bool bFromFile ); - void SetNewTable_Impl(); - void SetFromTo_Impl(); - void FillTables_Impl( ScDocument* pSrcDoc ); - void DoEnable_Impl(); + void SetNewTable_Impl(); + void SetFromTo_Impl(); + void FillTables_Impl( ScDocument* pSrcDoc ); + void DoEnable_Impl(); DECL_LINK( BrowseHdl_Impl, PushButton* ); DECL_LINK( ChoiceHdl_Impl, RadioButton* ); diff --git a/sc/source/ui/inc/invmerge.hxx b/sc/source/ui/inc/invmerge.hxx index ebe03a91988f..893e4145ce7a 100644 --- a/sc/source/ui/inc/invmerge.hxx +++ b/sc/source/ui/inc/invmerge.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,21 +38,21 @@ class Window; class ScInvertMerger { private: - Window* pWin; + Window* pWin; ::std::vector< Rectangle >* pRects; - Rectangle aTotalRect; - Rectangle aLineRect; + Rectangle aTotalRect; + Rectangle aLineRect; - void FlushLine(); - void FlushTotal(); + void FlushLine(); + void FlushTotal(); public: ScInvertMerger( Window* pWindow ); ScInvertMerger( ::std::vector< Rectangle >* pRectangles ); ~ScInvertMerger(); - void AddRect( const Rectangle& rRect ); - void Flush(); + void AddRect( const Rectangle& rRect ); + void Flush(); }; diff --git a/sc/source/ui/inc/lbseldlg.hxx b/sc/source/ui/inc/lbseldlg.hxx index f6e8946737d8..17fa0b0ca05e 100644 --- a/sc/source/ui/inc/lbseldlg.hxx +++ b/sc/source/ui/inc/lbseldlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,19 +44,19 @@ class ScSelEntryDlg : public ModalDialog { private: FixedLine aFlLbTitle; - ListBox aLb; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + ListBox aLb; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; DECL_LINK( DblClkHdl, void * ); public: - ScSelEntryDlg( Window* pParent, - USHORT nResId, + ScSelEntryDlg( Window* pParent, + USHORT nResId, const String& aTitle, const String& aLbTitle, - List& aEntryList ); + List& aEntryList ); ~ScSelEntryDlg(); String GetSelectEntry() const; diff --git a/sc/source/ui/inc/linkarea.hrc b/sc/source/ui/inc/linkarea.hrc index bc906fdb14ad..f0e9ae7120f2 100644 --- a/sc/source/ui/inc/linkarea.hrc +++ b/sc/source/ui/inc/linkarea.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,16 +27,16 @@ #include <sc.hrc> -#define BTN_OK 1 -#define BTN_CANCEL 2 -#define BTN_HELP 3 -#define FL_LOCATION 4 -#define CB_URL 5 -#define BTN_BROWSE 6 -#define FT_HINT 7 -#define FT_RANGES 8 -#define LB_RANGES 9 -#define BTN_RELOAD 10 -#define NF_DELAY 11 -#define FT_SECONDS 12 +#define BTN_OK 1 +#define BTN_CANCEL 2 +#define BTN_HELP 3 +#define FL_LOCATION 4 +#define CB_URL 5 +#define BTN_BROWSE 6 +#define FT_HINT 7 +#define FT_RANGES 8 +#define LB_RANGES 9 +#define BTN_RELOAD 10 +#define NF_DELAY 11 +#define FT_SECONDS 12 diff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxx index 513cd6d19175..4c287372be5e 100644 --- a/sc/source/ui/inc/linkarea.hxx +++ b/sc/source/ui/inc/linkarea.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,10 +39,10 @@ #include <svtools/stdctrl.hxx> #include <svtools/inettbc.hxx> -//REMOVE #ifndef SO2_DECL_SVEMBEDDEDOBJECT_DEFINED -//REMOVE #define SO2_DECL_SVEMBEDDEDOBJECT_DEFINED -//REMOVE SO2_DECL_REF(SvEmbeddedObject) -//REMOVE #endif +//REMOVE #ifndef SO2_DECL_SVEMBEDDEDOBJECT_DEFINED +//REMOVE #define SO2_DECL_SVEMBEDDEDOBJECT_DEFINED +//REMOVE SO2_DECL_REF(SvEmbeddedObject) +//REMOVE #endif namespace sfx2 { class DocumentInserter; } namespace sfx2 { class FileDialogHelper; } @@ -54,18 +54,18 @@ class ScDocShell; class ScLinkedAreaDlg : public ModalDialog { private: - FixedLine aFlLocation; - SvtURLBox aCbUrl; - PushButton aBtnBrowse; - FixedInfo aTxtHint; - FixedText aFtRanges; - MultiListBox aLbRanges; - CheckBox aBtnReload; - NumericField aNfDelay; - FixedText aFtSeconds; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + FixedLine aFlLocation; + SvtURLBox aCbUrl; + PushButton aBtnBrowse; + FixedInfo aTxtHint; + FixedText aFtRanges; + MultiListBox aLbRanges; + CheckBox aBtnReload; + NumericField aNfDelay; + FixedText aFtSeconds; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; ScDocShell* pSourceShell; sfx2::DocumentInserter* pDocInserter; @@ -79,26 +79,26 @@ private: DECL_LINK( ReloadHdl, CheckBox* ); DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper* ); - void UpdateSourceRanges(); - void UpdateEnable(); - void LoadDocument( const String& rFile, const String& rFilter, + void UpdateSourceRanges(); + void UpdateEnable(); + void LoadDocument( const String& rFile, const String& rFilter, const String& rOptions ); public: ScLinkedAreaDlg( Window* pParent ); ~ScLinkedAreaDlg(); - void InitFromOldLink( const String& rFile, const String& rFilter, + void InitFromOldLink( const String& rFile, const String& rFilter, const String& rOptions, const String& rSource, ULONG nRefresh ); - virtual short Execute(); // overwritten to set dialog parent + virtual short Execute(); // overwritten to set dialog parent - String GetURL(); - String GetFilter(); // may be empty - String GetOptions(); // filter options - String GetSource(); // separated by ";" - ULONG GetRefresh(); // 0 if disabled + String GetURL(); + String GetFilter(); // may be empty + String GetOptions(); // filter options + String GetSource(); // separated by ";" + ULONG GetRefresh(); // 0 if disabled }; #endif diff --git a/sc/source/ui/inc/lnktrans.hxx b/sc/source/ui/inc/lnktrans.hxx index 23b89f0d2d41..0f345bea6541 100644 --- a/sc/source/ui/inc/lnktrans.hxx +++ b/sc/source/ui/inc/lnktrans.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,19 +35,19 @@ class ScLinkTransferObj : public TransferableHelper { private: - String aLinkURL; - String aLinkText; + String aLinkURL; + String aLinkText; public: ScLinkTransferObj(); virtual ~ScLinkTransferObj(); - void SetLinkURL( const String& rURL, const String& rText ); + void SetLinkURL( const String& rURL, const String& rText ); - virtual void AddSupportedFormats(); - virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual void ObjectReleased(); - virtual void DragFinished( sal_Int8 nDropAction ); + virtual void AddSupportedFormats(); + virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual void ObjectReleased(); + virtual void DragFinished( sal_Int8 nDropAction ); }; #endif diff --git a/sc/source/ui/inc/mediash.hxx b/sc/source/ui/inc/mediash.hxx index 58fccaae74f2..2bdffb9a7c7b 100644 --- a/sc/source/ui/inc/mediash.hxx +++ b/sc/source/ui/inc/mediash.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,10 +46,10 @@ public: SFX_DECL_INTERFACE(SCID_MEDIA_SHELL) ScMediaShell(ScViewData* pData); - virtual ~ScMediaShell(); + virtual ~ScMediaShell(); - void ExecuteMedia(SfxRequest& rReq); - void GetMediaState(SfxItemSet &rSet); + void ExecuteMedia(SfxRequest& rReq); + void GetMediaState(SfxItemSet &rSet); }; #endif diff --git a/sc/source/ui/inc/miscdlgs.hrc b/sc/source/ui/inc/miscdlgs.hrc index 00b1658849d6..160c7b026ec1 100644 --- a/sc/source/ui/inc/miscdlgs.hrc +++ b/sc/source/ui/inc/miscdlgs.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -25,7 +25,7 @@ * ************************************************************************/ -#include "sc.hrc" // -> RID_SCDLG_DELCELL +#include "sc.hrc" // -> RID_SCDLG_DELCELL // -> RID_SCDLG_INSCELL // -> RID_SCDLG_DELCONT // -> RID_SCDLG_INSCONT @@ -52,41 +52,41 @@ // allgemein #define BTN_OK 100 -#define BTN_CANCEL 102 +#define BTN_CANCEL 102 #define BTN_HELP 103 -#define BTN_MORE 104 -#define BTN_ADD 105 -#define BTN_REMOVE 106 -#define FT_LABEL 110 +#define BTN_MORE 104 +#define BTN_ADD 105 +#define BTN_REMOVE 106 +#define FT_LABEL 110 #define FL_FRAME 112 -#define STR_BTN_CLOSE 200 +#define STR_BTN_CLOSE 200 // Zellen loeschen/einfuegen Dialog #define BTN_CELLSUP 10 #define BTN_CELLSDOWN 11 #define BTN_CELLSRIGHT 12 -#define BTN_CELLSLEFT 13 +#define BTN_CELLSLEFT 13 #define BTN_DELROWS 14 #define BTN_DELCOLS 15 #define BTN_INSROWS 16 #define BTN_INSCOLS 17 // Inhalte loeschen/einfuegen Dialog -#define BTN_DELALL 10 -#define BTN_DELSTRINGS 11 -#define BTN_DELNUMBERS 12 -#define BTN_DELDATETIME 13 -#define BTN_DELFORMULAS 14 -#define BTN_DELATTRS 15 -#define BTN_DELNOTES 16 -#define BTN_DELOBJECTS 17 -#define BTN_INSALL 20 -#define BTN_INSSTRINGS 21 -#define BTN_INSNUMBERS 22 -#define BTN_INSDATETIME 23 -#define BTN_INSFORMULAS 24 -#define BTN_INSATTRS 25 -#define BTN_INSNOTES 26 +#define BTN_DELALL 10 +#define BTN_DELSTRINGS 11 +#define BTN_DELNUMBERS 12 +#define BTN_DELDATETIME 13 +#define BTN_DELFORMULAS 14 +#define BTN_DELATTRS 15 +#define BTN_DELNOTES 16 +#define BTN_DELOBJECTS 17 +#define BTN_INSALL 20 +#define BTN_INSSTRINGS 21 +#define BTN_INSNUMBERS 22 +#define BTN_INSDATETIME 23 +#define BTN_INSFORMULAS 24 +#define BTN_INSATTRS 25 +#define BTN_INSNOTES 26 #define BTN_OP_NOOP 27 #define BTN_OP_ADD 28 #define BTN_OP_SUB 29 @@ -97,28 +97,28 @@ #define BTN_TRANSPOSE 34 #define BTN_LINK 35 #define FL_OPTIONS 36 -#define BTN_MV_NONE 37 -#define BTN_MV_DOWN 38 -#define BTN_MV_RIGHT 39 +#define BTN_MV_NONE 37 +#define BTN_MV_DOWN 38 +#define BTN_MV_RIGHT 39 #define FL_MOVE 40 #define BTN_INSOBJECTS 41 #define FL_SEP1 51 #define FL_SEP2 52 // Tabelle einfuegen/loeschen -#define FT_DEST 1 -#define LB_DEST 2 -#define FT_INSERT 3 -#define LB_INSERT 4 -#define BTN_COPY 5 +#define FT_DEST 1 +#define LB_DEST 2 +#define FT_INSERT 3 +#define LB_INSERT 4 +#define BTN_COPY 5 #define STR_NEWDOC 6 // Eingabe eines Strings -#define ED_INPUT 10 +#define ED_INPUT 10 // Eingabe einer Metrik -#define ED_VALUE 1 -#define BTN_DEFVAL 1 +#define ED_VALUE 1 +#define BTN_DEFVAL 1 // Auswahl aus einer (String-)ListBox #define FL_ENTRYLIST 10 @@ -143,44 +143,44 @@ #define BTN_MONTH 24 #define BTN_YEAR 25 #define FT_INCREMENT 30 -#define ED_INCREMENT 39 -#define FT_END_VALUE 40 -#define ED_END_VALUES 49 -#define STR_VALERR 50 -#define FT_START_VALUE 51 -#define ED_START_VALUES 52 +#define ED_INCREMENT 39 +#define FT_END_VALUE 40 +#define ED_END_VALUES 49 +#define STR_VALERR 50 +#define FT_START_VALUE 51 +#define ED_START_VALUES 52 // Autoformat -#define LB_FORMAT 1 +#define LB_FORMAT 1 #define FL_FORMAT 9 -#define WND_PREVIEW 19 -#define BTN_NUMFORMAT 20 -#define BTN_BORDER 21 -#define BTN_FONT 23 -#define BTN_PATTERN 24 -#define BTN_ALIGNMENT 25 -#define BTN_ADJUST 26 -#define BTN_RENAME 27 +#define WND_PREVIEW 19 +#define BTN_NUMFORMAT 20 +#define BTN_BORDER 21 +#define BTN_FONT 23 +#define BTN_PATTERN 24 +#define BTN_ALIGNMENT 25 +#define BTN_ADJUST 26 +#define BTN_RENAME 27 #define FL_FORMATTING 29 -#define STR_ADD_TITLE 100 -#define STR_ADD_LABEL 101 -#define STR_DEL_TITLE 102 -#define STR_DEL_MSG 103 -#define STR_RENAME_TITLE 104 +#define STR_ADD_TITLE 100 +#define STR_ADD_LABEL 101 +#define STR_DEL_TITLE 102 +#define STR_DEL_MSG 103 +#define STR_RENAME_TITLE 104 // Autoformat-Preview: -#define STR_JAN 121 -#define STR_FEB 122 -#define STR_MAR 123 -#define STR_NORTH 124 -#define STR_MID 125 -#define STR_SOUTH 126 -#define STR_SUM 127 +#define STR_JAN 121 +#define STR_FEB 122 +#define STR_MAR 123 +#define STR_NORTH 124 +#define STR_MID 125 +#define STR_SOUTH 126 +#define STR_SUM 127 // Gruppierung setzen/aufheben: -#define BTN_GROUP_COLS 1 -#define BTN_GROUP_ROWS 3 -#define STR_GROUP 1 -#define STR_UNGROUP 2 +#define BTN_GROUP_COLS 1 +#define BTN_GROUP_ROWS 3 +#define STR_GROUP 1 +#define STR_UNGROUP 2 // Tab Bg Color #define TAB_BG_COLOR_CT_BORDER 1 diff --git a/sc/source/ui/inc/msgpool.hxx b/sc/source/ui/inc/msgpool.hxx index 76b5036b4000..6ae9cf8c828d 100644 --- a/sc/source/ui/inc/msgpool.hxx +++ b/sc/source/ui/inc/msgpool.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,20 +48,20 @@ class ScDocumentPool; class ScMessagePool: public SfxItemPool { - SfxStringItem aGlobalStringItem; - SvxSearchItem aGlobalSearchItem; - ScSortItem aGlobalSortItem; - ScQueryItem aGlobalQueryItem; - ScSubTotalItem aGlobalSubTotalItem; - ScConsolidateItem aGlobalConsolidateItem; - ScPivotItem aGlobalPivotItem; - ScSolveItem aGlobalSolveItem; - ScUserListItem aGlobalUserListItem; + SfxStringItem aGlobalStringItem; + SvxSearchItem aGlobalSearchItem; + ScSortItem aGlobalSortItem; + ScQueryItem aGlobalQueryItem; + ScSubTotalItem aGlobalSubTotalItem; + ScConsolidateItem aGlobalConsolidateItem; + ScPivotItem aGlobalPivotItem; + ScSolveItem aGlobalSolveItem; + ScUserListItem aGlobalUserListItem; - SfxBoolItem aPrintWarnItem; + SfxBoolItem aPrintWarnItem; - SfxPoolItem** ppPoolDefaults; - ScDocumentPool* pDocPool; + SfxPoolItem** ppPoolDefaults; + ScDocumentPool* pDocPool; public: ScMessagePool(); @@ -69,7 +69,7 @@ protected: virtual ~ScMessagePool(); public: - virtual SfxMapUnit GetMetric( USHORT nWhich ) const; + virtual SfxMapUnit GetMetric( USHORT nWhich ) const; }; diff --git a/sc/source/ui/inc/mtrindlg.hxx b/sc/source/ui/inc/mtrindlg.hxx index 1dedf6ae258d..f86b368bc4ea 100644 --- a/sc/source/ui/inc/mtrindlg.hxx +++ b/sc/source/ui/inc/mtrindlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,29 +40,29 @@ class ScMetricInputDlg : public ModalDialog { public: - ScMetricInputDlg( Window* pParent, - USHORT nResId, // Ableitung fuer jeden Dialog! - long nCurrent, - long nDefault, - FieldUnit eFUnit = FUNIT_MM, - USHORT nDecimals = 2, - long nMaximum = 1000, - long nMinimum = 0, - long nFirst = 1, + ScMetricInputDlg( Window* pParent, + USHORT nResId, // Ableitung fuer jeden Dialog! + long nCurrent, + long nDefault, + FieldUnit eFUnit = FUNIT_MM, + USHORT nDecimals = 2, + long nMaximum = 1000, + long nMinimum = 0, + long nFirst = 1, long nLast = 100 ); ~ScMetricInputDlg(); long GetInputValue( FieldUnit eUnit = FUNIT_TWIP ) const; private: - FixedText aFtEditTitle; - MetricField aEdValue; - CheckBox aBtnDefVal; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - long nDefaultValue; - long nCurrentValue; + FixedText aFtEditTitle; + MetricField aEdValue; + CheckBox aBtnDefVal; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; + long nDefaultValue; + long nCurrentValue; void CalcPositions(); DECL_LINK( SetDefValHdl, CheckBox * ); diff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxx index 27963f335bcb..1260737512a5 100644 --- a/sc/source/ui/inc/mvtabdlg.hxx +++ b/sc/source/ui/inc/mvtabdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,28 +47,28 @@ public: ScMoveTableDlg( Window* pParent ); ~ScMoveTableDlg(); - USHORT GetSelectedDocument () const; - SCTAB GetSelectedTable () const; - BOOL GetCopyTable () const; - void SetCopyTable (BOOL bFlag=TRUE); - void EnableCopyTable (BOOL bFlag=TRUE); + USHORT GetSelectedDocument () const; + SCTAB GetSelectedTable () const; + BOOL GetCopyTable () const; + void SetCopyTable (BOOL bFlag=TRUE); + void EnableCopyTable (BOOL bFlag=TRUE); private: - FixedText aFtDoc; - ListBox aLbDoc; - FixedText aFtTable; - ListBox aLbTable; - CheckBox aBtnCopy; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + FixedText aFtDoc; + ListBox aLbDoc; + FixedText aFtTable; + ListBox aLbTable; + CheckBox aBtnCopy; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; - USHORT nDocument; - SCTAB nTable; - BOOL bCopyTable; + USHORT nDocument; + SCTAB nTable; + BOOL bCopyTable; //-------------------------------------- - void Init (); - void InitDocListBox (); + void Init (); + void InitDocListBox (); DECL_LINK( OkHdl, void * ); DECL_LINK( SelHdl, ListBox * ); }; diff --git a/sc/source/ui/inc/namecrea.hxx b/sc/source/ui/inc/namecrea.hxx index 852a3ce9c85c..0719f68adade 100644 --- a/sc/source/ui/inc/namecrea.hxx +++ b/sc/source/ui/inc/namecrea.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,17 +38,17 @@ class ScNameCreateDlg : public ModalDialog { protected: FixedLine aFixedLine; - CheckBox aTopBox; - CheckBox aLeftBox; - CheckBox aBottomBox; - CheckBox aRightBox; - OKButton aOKButton; - CancelButton aCancelButton; - HelpButton aHelpButton; + CheckBox aTopBox; + CheckBox aLeftBox; + CheckBox aBottomBox; + CheckBox aRightBox; + OKButton aOKButton; + CancelButton aCancelButton; + HelpButton aHelpButton; public: ScNameCreateDlg( Window * pParent, USHORT nFlags ); - USHORT GetFlags() const; + USHORT GetFlags() const; }; diff --git a/sc/source/ui/inc/namedlg.hrc b/sc/source/ui/inc/namedlg.hrc index b2eec6879ec3..5381df425e90 100644 --- a/sc/source/ui/inc/namedlg.hrc +++ b/sc/source/ui/inc/namedlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,25 +28,25 @@ #include "sc.hrc" // -> RID_SCDLG_NAMES #define BTN_OK 1 -#define BTN_CANCEL 2 -#define BTN_ADD 3 -#define BTN_REMOVE 4 -#define BTN_HELP 5 -#define BTN_MORE 6 +#define BTN_CANCEL 2 +#define BTN_ADD 3 +#define BTN_REMOVE 4 +#define BTN_HELP 5 +#define BTN_MORE 6 // #define FL_NAME 11 -#define ED_NAME 12 +#define ED_NAME 12 #define FL_ASSIGN 13 -#define ED_ASSIGN 15 -#define RB_ASSIGN 16 +#define ED_ASSIGN 15 +#define RB_ASSIGN 16 // -#define STR_ADD 21 -#define STR_MODIFY 22 +#define STR_ADD 21 +#define STR_MODIFY 22 #define STR_INVALIDSYMBOL 23 // -#define BTN_CRITERIA 31 -#define BTN_PRINTAREA 32 -#define BTN_COLHEADER 33 -#define BTN_ROWHEADER 34 -#define FL_TYPE 35 +#define BTN_CRITERIA 31 +#define BTN_PRINTAREA 32 +#define BTN_COLHEADER 33 +#define BTN_ROWHEADER 34 +#define FL_TYPE 35 diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx index 627fc8d3fee0..4ae250bec005 100644 --- a/sc/source/ui/inc/namedlg.hxx +++ b/sc/source/ui/inc/namedlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,35 +46,35 @@ class ScNameDlg : public ScAnyRefDlg { private: FixedLine aFlName; - ComboBox aEdName; + ComboBox aEdName; FixedLine aFlAssign; - formula::RefEdit aEdAssign; - formula::RefButton aRbAssign; - - FixedLine aFlType; - CheckBox aBtnPrintArea; - CheckBox aBtnColHeader; - CheckBox aBtnCriteria; - CheckBox aBtnRowHeader; - - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - PushButton aBtnAdd; - PushButton aBtnRemove; - MoreButton aBtnMore; - BOOL bSaved; - - const String aStrAdd; // "Hinzufuegen" - const String aStrModify; // "Aendern" - const String errMsgInvalidSym; - - ScViewData* pViewData; - ScDocument* pDoc; - ScRangeName aLocalRangeName; - const ScAddress theCursorPos; - Selection theCurSel; + formula::RefEdit aEdAssign; + formula::RefButton aRbAssign; + + FixedLine aFlType; + CheckBox aBtnPrintArea; + CheckBox aBtnColHeader; + CheckBox aBtnCriteria; + CheckBox aBtnRowHeader; + + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; + PushButton aBtnAdd; + PushButton aBtnRemove; + MoreButton aBtnMore; + BOOL bSaved; + + const String aStrAdd; // "Hinzufuegen" + const String aStrModify; // "Aendern" + const String errMsgInvalidSym; + + ScViewData* pViewData; + ScDocument* pDoc; + ScRangeName aLocalRangeName; + const ScAddress theCursorPos; + Selection theCurSel; #ifdef _NAMEDLG_CXX private: @@ -95,20 +95,20 @@ private: protected: - virtual void RefInputDone( BOOL bForced = FALSE ); + virtual void RefInputDone( BOOL bForced = FALSE ); public: ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - ScViewData* ptrViewData, - const ScAddress& aCursorPos ); + ScViewData* ptrViewData, + const ScAddress& aCursorPos ); ~ScNameDlg(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual BOOL IsRefInputMode() const; + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); + virtual BOOL IsRefInputMode() const; - virtual void SetActive(); - virtual BOOL Close(); + virtual void SetActive(); + virtual BOOL Close(); }; diff --git a/sc/source/ui/inc/namepast.hxx b/sc/source/ui/inc/namepast.hxx index 3c3547666f8f..b006b4146307 100644 --- a/sc/source/ui/inc/namepast.hxx +++ b/sc/source/ui/inc/namepast.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,16 +44,16 @@ class ScNamePasteDlg : public ModalDialog DECL_LINK( ListDblClickHdl, ListBox * ); protected: - FixedText aLabelText; - ListBox aNameList; - OKButton aOKButton; - CancelButton aCancelButton; - HelpButton aHelpButton; - PushButton aInsListButton; + FixedText aLabelText; + ListBox aNameList; + OKButton aOKButton; + CancelButton aCancelButton; + HelpButton aHelpButton; + PushButton aInsListButton; public: ScNamePasteDlg( Window * pParent, const ScRangeName* pList, BOOL bInsList=TRUE ); - String GetSelectedName() const; + String GetSelectedName() const; }; diff --git a/sc/source/ui/inc/navcitem.hxx b/sc/source/ui/inc/navcitem.hxx index 90bef19cc410..366511e484d0 100644 --- a/sc/source/ui/inc/navcitem.hxx +++ b/sc/source/ui/inc/navcitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ public: ScNavigatorDlg& rDlg, SfxBindings& rBindings ); protected: - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pItem ); private: diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index 6b804589e145..4eaad27040c2 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,15 +53,15 @@ class ScRange; //======================================================================== -#define SC_DROPMODE_URL 0 -#define SC_DROPMODE_LINK 1 -#define SC_DROPMODE_COPY 2 +#define SC_DROPMODE_URL 0 +#define SC_DROPMODE_LINK 1 +#define SC_DROPMODE_COPY 2 -enum NavListMode { NAV_LMODE_NONE = 0x4000, - NAV_LMODE_AREAS = 0x2000, - NAV_LMODE_DBAREAS = 0x1000, - NAV_LMODE_DOCS = 0x800, - NAV_LMODE_SCENARIOS = 0x400 }; +enum NavListMode { NAV_LMODE_NONE = 0x4000, + NAV_LMODE_AREAS = 0x2000, + NAV_LMODE_DBAREAS = 0x1000, + NAV_LMODE_DOCS = 0x800, + NAV_LMODE_SCENARIOS = 0x400 }; //======================================================================== // class ScScenarioListBox ----------------------------------------------- @@ -113,23 +113,23 @@ public: ScScenarioWindow( Window* pParent,const String& aQH_List,const String& aQH_Comment); ~ScScenarioWindow(); - void NotifyState( const SfxPoolItem* pState ); - void SetComment( const String& rComment ) + void NotifyState( const SfxPoolItem* pState ); + void SetComment( const String& rComment ) { aEdComment.SetText( rComment ); } - void SetSizePixel( const Size& rNewSize ); + void SetSizePixel( const Size& rNewSize ); protected: - virtual void Paint( const Rectangle& rRec ); + virtual void Paint( const Rectangle& rRec ); private: - ScScenarioListBox aLbScenario; - MultiLineEdit aEdComment; + ScScenarioListBox aLbScenario; + MultiLineEdit aEdComment; }; //================================================================== -// class ColumnEdit +// class ColumnEdit //================================================================== class ColumnEdit : public SpinField { @@ -137,32 +137,32 @@ public: ColumnEdit( ScNavigatorDlg* pParent, const ResId& rResId ); ~ColumnEdit(); - SCCOL GetCol() { return nCol; } - void SetCol( SCCOL nColNo ); + SCCOL GetCol() { return nCol; } + void SetCol( SCCOL nColNo ); protected: - virtual long Notify( NotifyEvent& rNEvt ); - virtual void LoseFocus(); - virtual void Up(); - virtual void Down(); - virtual void First(); - virtual void Last(); + virtual long Notify( NotifyEvent& rNEvt ); + virtual void LoseFocus(); + virtual void Up(); + virtual void Down(); + virtual void First(); + virtual void Last(); private: ScNavigatorDlg& rDlg; - SCCOL nCol; - USHORT nKeyGroup; - - void EvalText (); - void ExecuteCol (); - SCCOL AlphaToNum ( String& rStr ); - SCCOL NumStrToAlpha ( String& rStr ); - SCCOL NumToAlpha ( SCCOL nColNo, String& rStr ); + SCCOL nCol; + USHORT nKeyGroup; + + void EvalText (); + void ExecuteCol (); + SCCOL AlphaToNum ( String& rStr ); + SCCOL NumStrToAlpha ( String& rStr ); + SCCOL NumToAlpha ( SCCOL nColNo, String& rStr ); }; //================================================================== -// class RowEdit +// class RowEdit //================================================================== class RowEdit : public NumericField { @@ -170,22 +170,22 @@ public: RowEdit( ScNavigatorDlg* pParent, const ResId& rResId ); ~RowEdit(); - SCROW GetRow() { return (SCROW)GetValue(); } - void SetRow( SCROW nRow ){ SetValue( nRow ); } + SCROW GetRow() { return (SCROW)GetValue(); } + void SetRow( SCROW nRow ){ SetValue( nRow ); } protected: - virtual long Notify( NotifyEvent& rNEvt ); - virtual void LoseFocus(); + virtual long Notify( NotifyEvent& rNEvt ); + virtual void LoseFocus(); private: ScNavigatorDlg& rDlg; - void ExecuteRow(); + void ExecuteRow(); }; //================================================================== -// class ScDocListBox +// class ScDocListBox //================================================================== class ScDocListBox : public ListBox { @@ -194,7 +194,7 @@ public: ~ScDocListBox(); protected: - virtual void Select(); + virtual void Select(); private: ScNavigatorDlg& rDlg; @@ -202,7 +202,7 @@ private: //================================================================== -// class CommandToolBox +// class CommandToolBox //================================================================== class CommandToolBox : public ToolBox { @@ -214,20 +214,20 @@ public: void UpdateButtons(); void InitImageList(); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); DECL_LINK( ToolBoxDropdownClickHdl, ToolBox* ); protected: - virtual void Select(); - virtual void Click(); + virtual void Select(); + virtual void Click(); private: ScNavigatorDlg& rDlg; }; //================================================================== -// class ScNavigatorDlg +// class ScNavigatorDlg //================================================================== class ScNavigatorDlg : public Window, public SfxListener @@ -241,28 +241,28 @@ friend class CommandToolBox; friend class ScContentTree; private: - SfxBindings& rBindings; // must be first member + SfxBindings& rBindings; // must be first member - ImageList aCmdImageList; // must be before aTbxCmd + ImageList aCmdImageList; // must be before aTbxCmd ImageList aCmdImageListH; - FixedInfo aFtCol; - ColumnEdit aEdCol; - FixedInfo aFtRow; - RowEdit aEdRow; - CommandToolBox aTbxCmd; - ScContentTree aLbEntries; + FixedInfo aFtCol; + ColumnEdit aEdCol; + FixedInfo aFtRow; + RowEdit aEdRow; + CommandToolBox aTbxCmd; + ScContentTree aLbEntries; ScScenarioWindow aWndScenarios; - ScDocListBox aLbDocuments; + ScDocListBox aLbDocuments; - Timer aContentTimer; + Timer aContentTimer; - String aTitleBase; - String aStrDragMode; - String aStrDisplay; - String aStrActive; - String aStrNotActive; - String aStrHidden; - String aStrActiveWin; + String aTitleBase; + String aStrDragMode; + String aStrDisplay; + String aStrActive; + String aStrNotActive; + String aStrHidden; + String aStrActiveWin; SfxChildWindowContext* pContextWin; Size aInitSize; @@ -270,77 +270,77 @@ private: ScViewData* pViewData; long nBorderOffset; - long nListModeHeight; - long nInitListHeight; - NavListMode eListMode; - USHORT nDropMode; - SCCOL nCurCol; - SCROW nCurRow; - SCTAB nCurTab; - BOOL bFirstBig; + long nListModeHeight; + long nInitListHeight; + NavListMode eListMode; + USHORT nDropMode; + SCCOL nCurCol; + SCROW nCurRow; + SCTAB nCurTab; + BOOL bFirstBig; ScNavigatorControllerItem** ppBoundItems; DECL_LINK( TimeHdl, Timer* ); - void DoResize(); + void DoResize(); SfxBindings& GetBindings() { return rBindings; } - void SetCurrentCell( SCCOL nCol, SCROW Row ); - void SetCurrentCellStr( const String rName ); - void SetCurrentTable( SCTAB nTab ); - void SetCurrentTableStr( const String rName ); - void SetCurrentObject( const String rName ); - void SetCurrentDoc( const String& rDocName ); + void SetCurrentCell( SCCOL nCol, SCROW Row ); + void SetCurrentCellStr( const String rName ); + void SetCurrentTable( SCTAB nTab ); + void SetCurrentTableStr( const String rName ); + void SetCurrentObject( const String rName ); + void SetCurrentDoc( const String& rDocName ); ScTabViewShell* GetTabViewShell() const; ScNavigatorSettings* GetNavigatorSettings(); BOOL GetViewData(); - void UpdateColumn ( const SCCOL* pCol = NULL ); - void UpdateRow ( const SCROW* pRow = NULL ); - void UpdateTable ( const SCTAB* pTab = NULL ); - void UpdateAll (); + void UpdateColumn ( const SCCOL* pCol = NULL ); + void UpdateRow ( const SCROW* pRow = NULL ); + void UpdateTable ( const SCTAB* pTab = NULL ); + void UpdateAll (); - void GetDocNames(const String* pSelEntry = NULL); + void GetDocNames(const String* pSelEntry = NULL); - void SetListMode ( NavListMode eMode, BOOL bSetSize = TRUE ); - void ShowList ( BOOL bShow, BOOL bSetSize ); - void ShowScenarios ( BOOL bShow, BOOL bSetSize ); + void SetListMode ( NavListMode eMode, BOOL bSetSize = TRUE ); + void ShowList ( BOOL bShow, BOOL bSetSize ); + void ShowScenarios ( BOOL bShow, BOOL bSetSize ); - void SetDropMode(USHORT nNew); - USHORT GetDropMode() const { return nDropMode; } + void SetDropMode(USHORT nNew); + USHORT GetDropMode() const { return nDropMode; } - const String& GetStrDragMode() const { return aStrDragMode; } - const String& GetStrDisplay() const { return aStrDisplay; } + const String& GetStrDragMode() const { return aStrDragMode; } + const String& GetStrDisplay() const { return aStrDisplay; } - void CheckDataArea (); - void MarkDataArea (); - void UnmarkDataArea (); - void StartOfDataArea (); - void EndOfDataArea (); + void CheckDataArea (); + void MarkDataArea (); + void UnmarkDataArea (); + void StartOfDataArea (); + void EndOfDataArea (); static void ReleaseFocus(); protected: - virtual void Resize(); - virtual void Paint( const Rectangle& rRec ); - virtual void Resizing( Size& rSize ); + virtual void Resize(); + virtual void Paint( const Rectangle& rRec ); + virtual void Resizing( Size& rSize ); public: ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, Window* pParent ); ~ScNavigatorDlg(); using Window::Notify; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - void CursorPosChanged(); + void CursorPosChanged(); virtual SfxChildAlignment CheckAlignment(SfxChildAlignment,SfxChildAlignment); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); }; //================================================================== @@ -348,14 +348,14 @@ public: class ScNavigatorDialogWrapper: public SfxChildWindowContext { public: - ScNavigatorDialogWrapper( Window* pParent, - USHORT nId, - SfxBindings* pBindings, - SfxChildWinInfo* pInfo ); + ScNavigatorDialogWrapper( Window* pParent, + USHORT nId, + SfxBindings* pBindings, + SfxChildWinInfo* pInfo ); SFX_DECL_CHILDWINDOWCONTEXT(ScNavigatorDialogWrapper) - virtual void Resizing( Size& rSize ); + virtual void Resizing( Size& rSize ); private: ScNavigatorDlg* pNavigator; diff --git a/sc/source/ui/inc/navsett.hxx b/sc/source/ui/inc/navsett.hxx index 3666a6be981a..1b9fff2bbfa8 100644 --- a/sc/source/ui/inc/navsett.hxx +++ b/sc/source/ui/inc/navsett.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/inc/notemark.hxx b/sc/source/ui/inc/notemark.hxx index 03626bfeafb7..11eb7c152f22 100644 --- a/sc/source/ui/inc/notemark.hxx +++ b/sc/source/ui/inc/notemark.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,23 +40,23 @@ class SdrObject; class ScNoteMarker { private: - Window* pWindow; - Window* pRightWin; - Window* pBottomWin; - Window* pDiagWin; - ScDocument* pDoc; - ScAddress aDocPos; - String aUserText; + Window* pWindow; + Window* pRightWin; + Window* pBottomWin; + Window* pDiagWin; + ScDocument* pDoc; + ScAddress aDocPos; + String aUserText; Rectangle aVisRect; - Timer aTimer; - MapMode aMapMode; - BOOL bLeft; - BOOL bByKeyboard; + Timer aTimer; + MapMode aMapMode; + BOOL bLeft; + BOOL bByKeyboard; - Rectangle aRect; - SdrModel* pModel; - SdrObject* pObject; - BOOL bVisible; + Rectangle aRect; + SdrModel* pModel; + SdrObject* pObject; + BOOL bVisible; DECL_LINK( TimeHdl, Timer* ); @@ -66,11 +66,11 @@ public: const MapMode& rMap, BOOL bLeftEdge, BOOL bForce, BOOL bKeyboard ); ~ScNoteMarker(); - void Draw(); - void InvalidateWin(); + void Draw(); + void InvalidateWin(); - ScAddress GetDocPos() const { return aDocPos; } - BOOL IsByKeyboard() const { return bByKeyboard; } + ScAddress GetDocPos() const { return aDocPos; } + BOOL IsByKeyboard() const { return bByKeyboard; } }; diff --git a/sc/source/ui/inc/oleobjsh.hxx b/sc/source/ui/inc/oleobjsh.hxx index 0d3e5c8d86a8..214c320b3024 100644 --- a/sc/source/ui/inc/oleobjsh.hxx +++ b/sc/source/ui/inc/oleobjsh.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ public: SFX_DECL_INTERFACE(SCID_OLEOBJECT_SHELL) ScOleObjectShell(ScViewData* pData); - virtual ~ScOleObjectShell(); + virtual ~ScOleObjectShell(); }; diff --git a/sc/source/ui/inc/olinefun.hxx b/sc/source/ui/inc/olinefun.hxx index 809db33df06d..3f9db1cc88ed 100644 --- a/sc/source/ui/inc/olinefun.hxx +++ b/sc/source/ui/inc/olinefun.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,26 +40,26 @@ class ScRange; class ScOutlineDocFunc { private: - ScDocShell& rDocShell; + ScDocShell& rDocShell; public: ScOutlineDocFunc( ScDocShell& rDocSh ): rDocShell(rDocSh) {} ~ScOutlineDocFunc() {} - BOOL MakeOutline( const ScRange& rRange, BOOL bColumns, BOOL bRecord, BOOL bApi ); - BOOL RemoveOutline( const ScRange& rRange, BOOL bColumns, BOOL bRecord, BOOL bApi ); - BOOL RemoveAllOutlines( SCTAB nTab, BOOL bRecord, BOOL bApi ); - BOOL AutoOutline( const ScRange& rRange, BOOL bRecord, BOOL bApi ); + BOOL MakeOutline( const ScRange& rRange, BOOL bColumns, BOOL bRecord, BOOL bApi ); + BOOL RemoveOutline( const ScRange& rRange, BOOL bColumns, BOOL bRecord, BOOL bApi ); + BOOL RemoveAllOutlines( SCTAB nTab, BOOL bRecord, BOOL bApi ); + BOOL AutoOutline( const ScRange& rRange, BOOL bRecord, BOOL bApi ); - BOOL SelectLevel( SCTAB nTab, BOOL bColumns, USHORT nLevel, + BOOL SelectLevel( SCTAB nTab, BOOL bColumns, USHORT nLevel, BOOL bRecord, BOOL bPaint, BOOL bApi ); - BOOL ShowMarkedOutlines( const ScRange& rRange, BOOL bRecord, BOOL bApi ); - BOOL HideMarkedOutlines( const ScRange& rRange, BOOL bRecord, BOOL bApi ); + BOOL ShowMarkedOutlines( const ScRange& rRange, BOOL bRecord, BOOL bApi ); + BOOL HideMarkedOutlines( const ScRange& rRange, BOOL bRecord, BOOL bApi ); - BOOL ShowOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, USHORT nEntry, + BOOL ShowOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, USHORT nEntry, BOOL bRecord, BOOL bPaint, BOOL bApi ); - BOOL HideOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, USHORT nEntry, + BOOL HideOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, USHORT nEntry, BOOL bRecord, BOOL bPaint, BOOL bApi ); }; diff --git a/sc/source/ui/inc/olinewin.hxx b/sc/source/ui/inc/olinewin.hxx index 266e67dd0999..abe893a94d61 100644 --- a/sc/source/ui/inc/olinewin.hxx +++ b/sc/source/ui/inc/olinewin.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/inc/opredlin.hrc b/sc/source/ui/inc/opredlin.hrc index 2b52d8b46118..212ee87878bf 100644 --- a/sc/source/ui/inc/opredlin.hrc +++ b/sc/source/ui/inc/opredlin.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -24,15 +24,15 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "sc.hrc" // -> RID_SCPAGE_OPREDLINE +#include "sc.hrc" // -> RID_SCPAGE_OPREDLINE -#define FT_CONTENT 1 -#define FT_REMOVE 2 -#define FT_INSERT 3 -#define FT_MOVE 4 -#define GB_COLORCHGS 1 -#define CLB_CONTENT 1 -#define CLB_REMOVE 2 -#define CLB_INSERT 3 -#define CLB_MOVE 4 -#define STR_AUTHOR 1 +#define FT_CONTENT 1 +#define FT_REMOVE 2 +#define FT_INSERT 3 +#define FT_MOVE 4 +#define GB_COLORCHGS 1 +#define CLB_CONTENT 1 +#define CLB_REMOVE 2 +#define CLB_INSERT 3 +#define CLB_MOVE 4 +#define STR_AUTHOR 1 diff --git a/sc/source/ui/inc/opredlin.hxx b/sc/source/ui/inc/opredlin.hxx index f6c3a2212ca9..b1bf9107c5bf 100644 --- a/sc/source/ui/inc/opredlin.hxx +++ b/sc/source/ui/inc/opredlin.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,16 +49,16 @@ class ScRedlineOptionsTabPage : public SfxTabPage { - FixedText aContentFT; - ColorListBox aContentColorLB; - FixedText aRemoveFT; - ColorListBox aRemoveColorLB; - FixedText aInsertFT; - ColorListBox aInsertColorLB; - FixedText aMoveFT; - ColorListBox aMoveColorLB; + FixedText aContentFT; + ColorListBox aContentColorLB; + FixedText aRemoveFT; + ColorListBox aRemoveColorLB; + FixedText aInsertFT; + ColorListBox aInsertColorLB; + FixedText aMoveFT; + ColorListBox aMoveColorLB; FixedLine aChangedGB; - String aAuthorStr; + String aAuthorStr; DECL_LINK( ColorHdl, ColorListBox *pColorLB ); @@ -67,10 +67,10 @@ public: ScRedlineOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); ~ScRedlineOptionsTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; #endif diff --git a/sc/source/ui/inc/optdlg.hrc b/sc/source/ui/inc/optdlg.hrc index e03f3e807037..d409ad32ed24 100644 --- a/sc/source/ui/inc/optdlg.hrc +++ b/sc/source/ui/inc/optdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,7 +28,7 @@ #include "sc.hrc" -#define TP_GENERAL 1 +#define TP_GENERAL 1 #define TP_SAVE 2 #define TP_PATH 3 #define TP_SPELL 4 @@ -41,60 +41,60 @@ #define TP_CONTENT 11 #define TP_LAYOUT 12 #define TP_INPUT 13 -#define TP_CHANGES 14 +#define TP_CHANGES 14 #define TP_FORMULA 15 // TP_CALC: -#define BTN_ITERATE 1 -#define FT_STEPS 2 -#define FT_EPS 3 -#define ED_STEPS 4 -#define ED_EPS 5 -#define GB_ZREFS 6 -#define ED_PREC 7 -#define FT_PREC 8 -#define BTN_DATESTD 9 -#define BTN_DATESC10 10 -#define BTN_DATE1904 11 -#define FT_VALUE 13 -#define GB_DATE 14 +#define BTN_ITERATE 1 +#define FT_STEPS 2 +#define FT_EPS 3 +#define ED_STEPS 4 +#define ED_EPS 5 +#define GB_ZREFS 6 +#define ED_PREC 7 +#define FT_PREC 8 +#define BTN_DATESTD 9 +#define BTN_DATESC10 10 +#define BTN_DATE1904 11 +#define FT_VALUE 13 +#define GB_DATE 14 #define BTN_CASE 15 #define FT_CASE 16 -#define BTN_CALC 17 -#define BTN_MATCH 18 -#define BTN_LOOKUP 19 +#define BTN_CALC 17 +#define BTN_MATCH 18 +#define BTN_LOOKUP 19 #define BTN_REGEX 20 #define BTN_GENERAL_PREC 21 // TP_VIEW: -#define BTN_VSCROLL 1 -#define BTN_HSCROLL 2 -#define BTN_REGISTER 3 -#define BTN_OUTLINER 4 -#define BTN_HEADERFOOTER 5 -#define BTN_GRID 6 +#define BTN_VSCROLL 1 +#define BTN_HSCROLL 2 +#define BTN_REGISTER 3 +#define BTN_OUTLINER 4 +#define BTN_HEADERFOOTER 5 +#define BTN_GRID 6 #define BTN_SYNTAX 7 -#define LB_GRIDCOLOR 9 -#define GB_ELEMENTS 10 +#define LB_GRIDCOLOR 9 +#define GB_ELEMENTS 10 #define BTN_HELPLINES 11 #define BTN_FORMULAS 20 #define BTN_NULLVALS 21 #define BTN_NOTES 22 -#define GB_CONTENTS 23 +#define GB_CONTENTS 23 // TP_USERLISTS: -#define FT_LISTS 1 -#define LB_LISTS 1 -#define FT_ENTRIES 2 -#define ED_ENTRIES 2 -#define FT_COPYFROM 3 -#define ED_COPYFROM 3 -#define BTN_NEW 1 -#define BTN_ADD 2 -#define BTN_REMOVE 3 -#define BTN_COPY 4 +#define FT_LISTS 1 +#define LB_LISTS 1 +#define FT_ENTRIES 2 +#define ED_ENTRIES 2 +#define FT_COPYFROM 3 +#define ED_COPYFROM 3 +#define BTN_NEW 1 +#define BTN_ADD 2 +#define BTN_REMOVE 3 +#define BTN_COPY 4 #define STR_QUERYREMOVE 5 #define STR_DISMISS 6 #define STR_COPYLIST 7 @@ -102,61 +102,61 @@ #define STR_COPYERR 9 // TP_PRINT: -#define FL_PAGES 1 -#define BTN_SKIPEMPTYPAGES 2 -#define FL_SHEETS 2 -#define BTN_SELECTEDSHEETS 4 +#define FL_PAGES 1 +#define BTN_SKIPEMPTYPAGES 2 +#define FL_SHEETS 2 +#define BTN_SELECTEDSHEETS 4 // TP_LCONTENT -#define GB_DISPLAY 20 +#define GB_DISPLAY 20 #define CB_FORMULA 21 -#define CB_NIL 22 -#define CB_ANNOT 23 -#define CB_VALUE 24 -#define CB_ANCHOR 25 -#define GB_OBJECT 26 -#define FT_OBJGRF 27 -#define LB_OBJGRF 28 +#define CB_NIL 22 +#define CB_ANNOT 23 +#define CB_VALUE 24 +#define CB_ANCHOR 25 +#define GB_OBJECT 26 +#define FT_OBJGRF 27 +#define LB_OBJGRF 28 #define FT_DIAGRAM 29 #define LB_DIAGRAM 30 -#define FT_DRAW 31 -#define LB_DRAW 32 -#define CB_CLIP 33 +#define FT_DRAW 31 +#define LB_DRAW 32 +#define CB_CLIP 33 #define GB_ZOOM 34 #define CB_SYNCZOOM 35 // TP_LAYOUT #define GB_LINK 1 -#define RB_ALWAYS 2 -#define RB_REQUEST 3 -#define RB_NEVER 4 -#define CB_DOCONLY 5 -#define CB_MERGE_PARA_DIST 6 -#define GB_COMPAT 7 -#define CB_AUTO_UPDATE_FIELDS 8 -#define CB_AUTO_UPDATE_CHARTS 9 -#define FT_UPDATE_LINKS 10 +#define RB_ALWAYS 2 +#define RB_REQUEST 3 +#define RB_NEVER 4 +#define CB_DOCONLY 5 +#define CB_MERGE_PARA_DIST 6 +#define GB_COMPAT 7 +#define CB_AUTO_UPDATE_FIELDS 8 +#define CB_AUTO_UPDATE_CHARTS 9 +#define FT_UPDATE_LINKS 10 #define GB_WINDOW 50 -#define CB_ROWCOLHEADER 51 -#define CB_HSCROLL 52 -#define CB_VSCROLL 53 -#define CB_TBLREG 54 -#define CB_OUTLINE 55 -#define GB_LINES 56 -#define CB_GRID 57 -#define FT_COLOR 58 -#define LB_COLOR 59 -#define CB_GUIDELINE 60 -#define GB_UNIT 61 -#define LB_UNIT 62 -#define ST_UNIT 63 -#define GB_TAB 64 -#define MF_TAB 65 -#define CB_PAGEBREAKS 66 -#define CB_HANDLES 67 -#define CB_BIGHANDLES 68 +#define CB_ROWCOLHEADER 51 +#define CB_HSCROLL 52 +#define CB_VSCROLL 53 +#define CB_TBLREG 54 +#define CB_OUTLINE 55 +#define GB_LINES 56 +#define CB_GRID 57 +#define FT_COLOR 58 +#define LB_COLOR 59 +#define CB_GUIDELINE 60 +#define GB_UNIT 61 +#define LB_UNIT 62 +#define ST_UNIT 63 +#define GB_TAB 64 +#define MF_TAB 65 +#define CB_PAGEBREAKS 66 +#define CB_HANDLES 67 +#define CB_BIGHANDLES 68 #define FT_TAB 69 #define FT_UNIT 70 #define FL_SEPARATOR1 71 @@ -165,15 +165,15 @@ #define FL_H_SEPARATOR 74 // TP_INPUT -#define GB_OPTIONS 70 -#define CB_ALIGN 71 -#define LB_ALIGN 72 -#define CB_EDITMODE 73 -#define CB_FORMAT 74 -#define CB_RFIND 75 -#define CB_EXPREF 76 -#define CB_MARKHDR 77 -#define CB_TEXTFMT 78 +#define GB_OPTIONS 70 +#define CB_ALIGN 71 +#define LB_ALIGN 72 +#define CB_EDITMODE 73 +#define CB_FORMAT 74 +#define CB_RFIND 75 +#define CB_EXPREF 76 +#define CB_MARKHDR 77 +#define CB_TEXTFMT 78 #define CB_REPLWARN 79 diff --git a/sc/source/ui/inc/optload.hrc b/sc/source/ui/inc/optload.hrc index 992bb8c737e4..e43e10284da7 100644 --- a/sc/source/ui/inc/optload.hrc +++ b/sc/source/ui/inc/optload.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -24,17 +24,17 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "sc.hrc" // -> RID_SCPAGE_OPREDLINE +#include "sc.hrc" // -> RID_SCPAGE_OPREDLINE -#define GB_LINK 1 -#define RB_ALWAYS 2 -#define RB_REQUEST 3 -#define RB_NEVER 4 -#define CB_DOCONLY 5 -#define CB_MERGE_PARA_DIST 6 -#define GB_COMPAT 7 -#define CB_AUTO_UPDATE_FIELDS 8 -#define CB_AUTO_UPDATE_CHARTS 9 -#define FT_UPDATE_LINKS 10 +#define GB_LINK 1 +#define RB_ALWAYS 2 +#define RB_REQUEST 3 +#define RB_NEVER 4 +#define CB_DOCONLY 5 +#define CB_MERGE_PARA_DIST 6 +#define GB_COMPAT 7 +#define CB_AUTO_UPDATE_FIELDS 8 +#define CB_AUTO_UPDATE_CHARTS 9 +#define FT_UPDATE_LINKS 10 diff --git a/sc/source/ui/inc/optload.hxx b/sc/source/ui/inc/optload.hxx index 26ffb04cb3be..1a0584eedf3f 100644 --- a/sc/source/ui/inc/optload.hxx +++ b/sc/source/ui/inc/optload.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,28 +38,28 @@ class ScDocument; class ScLoadOptPage : public SfxTabPage { private: - FixedText aLinkFT; - RadioButton aAlwaysRB; - RadioButton aRequestRB; - RadioButton aNeverRB; - CheckBox aDocOnlyCB; - GroupBox aLinkGB; + FixedText aLinkFT; + RadioButton aAlwaysRB; + RadioButton aRequestRB; + RadioButton aNeverRB; + CheckBox aDocOnlyCB; + GroupBox aLinkGB; ScDocument *pDoc; - DECL_LINK( UpdateHdl, CheckBox* ); + DECL_LINK( UpdateHdl, CheckBox* ); public: ScLoadOptPage( Window* pParent, const SfxItemSet& rSet ); ~ScLoadOptPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - void SetDocument(ScDocument*); + void SetDocument(ScDocument*); - virtual BOOL FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); }; #endif diff --git a/sc/source/ui/inc/optsolver.hrc b/sc/source/ui/inc/optsolver.hrc index 9df8eea1d7f4..88051bacdc64 100644 --- a/sc/source/ui/inc/optsolver.hrc +++ b/sc/source/ui/inc/optsolver.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,30 +57,30 @@ #define FL_CONDITIONS 1 #define FL_BUTTONS 2 -#define IB_OBJECTIVECELL 1 -#define IB_TARGET 2 -#define IB_VARIABLECELLS 3 -#define IB_LEFT1 4 -#define IB_LEFT2 5 -#define IB_LEFT3 6 -#define IB_LEFT4 7 -#define IB_RIGHT1 8 -#define IB_RIGHT2 9 -#define IB_RIGHT3 10 -#define IB_RIGHT4 11 -#define IB_DELETE1 12 -#define IB_DELETE2 13 -#define IB_DELETE3 14 -#define IB_DELETE4 15 +#define IB_OBJECTIVECELL 1 +#define IB_TARGET 2 +#define IB_VARIABLECELLS 3 +#define IB_LEFT1 4 +#define IB_LEFT2 5 +#define IB_LEFT3 6 +#define IB_LEFT4 7 +#define IB_RIGHT1 8 +#define IB_RIGHT2 9 +#define IB_RIGHT3 10 +#define IB_RIGHT4 11 +#define IB_DELETE1 12 +#define IB_DELETE2 13 +#define IB_DELETE3 14 +#define IB_DELETE4 15 #define LB_OP1 1 #define LB_OP2 2 #define LB_OP3 3 #define LB_OP4 4 -#define RB_MAX 1 -#define RB_MIN 2 -#define RB_VALUE 3 +#define RB_MAX 1 +#define RB_MIN 2 +#define RB_VALUE 3 #define SB_SCROLL 1 diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx index f81fbf05cd1f..d599b5a213b1 100644 --- a/sc/source/ui/inc/optsolver.hxx +++ b/sc/source/ui/inc/optsolver.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx index bf4440e04d7b..ab60aad6f94e 100644 --- a/sc/source/ui/inc/output.hxx +++ b/sc/source/ui/inc/output.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,16 +57,16 @@ class SdrPaintWindow; // --------------------------------------------------------------------------- -#define SC_SCENARIO_HSPACE 60 -#define SC_SCENARIO_VSPACE 50 +#define SC_SCENARIO_HSPACE 60 +#define SC_SCENARIO_VSPACE 50 // --------------------------------------------------------------------------- -#define SC_OBJECTS_NONE 0 -#define SC_OBJECTS_DRAWING 1 -#define SC_OBJECTS_OLE 2 -#define SC_OBJECTS_CHARTS 4 -#define SC_OBJECTS_ALL ( SC_OBJECTS_DRAWING | SC_OBJECTS_OLE | SC_OBJECTS_CHARTS ) +#define SC_OBJECTS_NONE 0 +#define SC_OBJECTS_DRAWING 1 +#define SC_OBJECTS_OLE 2 +#define SC_OBJECTS_CHARTS 4 +#define SC_OBJECTS_ALL ( SC_OBJECTS_DRAWING | SC_OBJECTS_OLE | SC_OBJECTS_CHARTS ) enum ScOutputType { OUTTYPE_WINDOW, OUTTYPE_PRINTER }; @@ -83,87 +83,87 @@ private: bool mbRightClip; }; - OutputDevice* pDev; // Device - OutputDevice* pRefDevice; // printer if used for preview - OutputDevice* pFmtDevice; // reference for text formatting + OutputDevice* pDev; // Device + OutputDevice* pRefDevice; // printer if used for preview + OutputDevice* pFmtDevice; // reference for text formatting ScTableInfo& mrTabInfo; - RowInfo* pRowInfo; // Info-Block - SCSIZE nArrCount; // belegte Zeilen im Info-Block - ScDocument* pDoc; // Dokument - SCTAB nTab; // Tabelle - long nScrX; // Ausgabe Startpos. (Pixel) + RowInfo* pRowInfo; // Info-Block + SCSIZE nArrCount; // belegte Zeilen im Info-Block + ScDocument* pDoc; // Dokument + SCTAB nTab; // Tabelle + long nScrX; // Ausgabe Startpos. (Pixel) long nScrY; - long nScrW; // Ausgabe Groesse (Pixel) + long nScrW; // Ausgabe Groesse (Pixel) long nScrH; - long nMirrorW; // Visible output width for mirroring (default: nScrW) - SCCOL nX1; // Start-/Endkoordinaten - SCROW nY1; // ( incl. versteckte ) + long nMirrorW; // Visible output width for mirroring (default: nScrW) + SCCOL nX1; // Start-/Endkoordinaten + SCROW nY1; // ( incl. versteckte ) SCCOL nX2; SCROW nY2; - SCCOL nVisX1; // Start-/Endkoordinaten - SCROW nVisY1; // ( sichtbarer Bereich ) + SCCOL nVisX1; // Start-/Endkoordinaten + SCROW nVisY1; // ( sichtbarer Bereich ) SCCOL nVisX2; SCROW nVisY2; - ScOutputType eType; // Bildschirm/Drucker ... - double nPPTX; // Pixel per Twips + ScOutputType eType; // Bildschirm/Drucker ... + double nPPTX; // Pixel per Twips double nPPTY; -// USHORT nZoom; // Zoom-Faktor (Prozent) - fuer GetFont +// USHORT nZoom; // Zoom-Faktor (Prozent) - fuer GetFont Fraction aZoomX; Fraction aZoomY; - SdrObject* pEditObj; // beim Painten auslassen + SdrObject* pEditObj; // beim Painten auslassen - ScTabViewShell* pViewShell; // zum Connecten von sichtbaren Plug-Ins + ScTabViewShell* pViewShell; // zum Connecten von sichtbaren Plug-Ins // #114135# - FmFormView* pDrawView; // SdrView to paint to + FmFormView* pDrawView; // SdrView to paint to - BOOL bEditMode; // InPlace editierte Zelle - nicht ausgeben + BOOL bEditMode; // InPlace editierte Zelle - nicht ausgeben SCCOL nEditCol; SCROW nEditRow; - BOOL bMetaFile; // Ausgabe auf Metafile (nicht in Pixeln!) - BOOL bSingleGrid; // beim Gitter bChanged auswerten + BOOL bMetaFile; // Ausgabe auf Metafile (nicht in Pixeln!) + BOOL bSingleGrid; // beim Gitter bChanged auswerten - BOOL bPagebreakMode; // Seitenumbruch-Vorschau - BOOL bSolidBackground; // weiss statt transparent + BOOL bPagebreakMode; // Seitenumbruch-Vorschau + BOOL bSolidBackground; // weiss statt transparent BOOL bUseStyleColor; BOOL bForceAutoColor; - BOOL bSyntaxMode; // Syntax-Highlighting + BOOL bSyntaxMode; // Syntax-Highlighting Color* pValueColor; Color* pTextColor; Color* pFormulaColor; - Color aGridColor; + Color aGridColor; - BOOL bShowNullValues; - BOOL bShowFormulas; - BOOL bShowSpellErrors; // Spell-Errors in EditObjekten anzeigen - BOOL bMarkClipped; + BOOL bShowNullValues; + BOOL bShowFormulas; + BOOL bShowSpellErrors; // Spell-Errors in EditObjekten anzeigen + BOOL bMarkClipped; - BOOL bSnapPixel; + BOOL bSnapPixel; - BOOL bAnyRotated; // intern - BOOL bAnyClipped; // intern - BOOL bTabProtected; - BYTE nTabTextDirection; // EEHorizontalTextDirection values - BOOL bLayoutRTL; + BOOL bAnyRotated; // intern + BOOL bAnyClipped; // intern + BOOL bTabProtected; + BYTE nTabTextDirection; // EEHorizontalTextDirection values + BOOL bLayoutRTL; // #i74769# use SdrPaintWindow direct, remember it during BeginDrawLayers/EndDrawLayers - SdrPaintWindow* mpTargetPaintWindow; + SdrPaintWindow* mpTargetPaintWindow; // private methods - BOOL GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY, + BOOL GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY, SCCOL& rOverX, SCROW& rOverY, BOOL bVisRowChanged ); - BOOL IsEmptyCellText( RowInfo* pThisRowInfo, SCCOL nX, SCROW nY ); - void GetVisibleCell( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell*& rpCell ); + BOOL IsEmptyCellText( RowInfo* pThisRowInfo, SCCOL nX, SCROW nY ); + void GetVisibleCell( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell*& rpCell ); - BOOL IsAvailable( SCCOL nX, SCROW nY ); + BOOL IsAvailable( SCCOL nX, SCROW nY ); - void GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY, + void GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY, SCCOL nCellX, SCROW nCellY, long nNeeded, const ScPatternAttr& rPattern, USHORT nHorJustify, bool bCellIsValue, @@ -176,12 +176,12 @@ private: long& rEngineWidth, long& rEngineHeight, long& rNeededPixel, bool& rLeftClip, bool& rRightClip ); - void SetSyntaxColor( Font* pFont, ScBaseCell* pCell ); - void SetEditSyntaxColor( EditEngine& rEngine, ScBaseCell* pCell ); + void SetSyntaxColor( Font* pFont, ScBaseCell* pCell ); + void SetEditSyntaxColor( EditEngine& rEngine, ScBaseCell* pCell ); - double GetStretch(); + double GetStretch(); - void DrawRotatedFrame( const Color* pForceColor ); // pixel + void DrawRotatedFrame( const Color* pForceColor ); // pixel public: ScOutputData( OutputDevice* pNewDev, ScOutputType eNewType, @@ -196,47 +196,47 @@ public: void SetContentDevice( OutputDevice* pContentDev ); - void SetRefDevice( OutputDevice* pRDev ) { pRefDevice = pFmtDevice = pRDev; } - void SetFmtDevice( OutputDevice* pRDev ) { pFmtDevice = pRDev; } - void SetEditObject( SdrObject* pObj ) { pEditObj = pObj; } - void SetViewShell( ScTabViewShell* pSh ) { pViewShell = pSh; } + void SetRefDevice( OutputDevice* pRDev ) { pRefDevice = pFmtDevice = pRDev; } + void SetFmtDevice( OutputDevice* pRDev ) { pFmtDevice = pRDev; } + void SetEditObject( SdrObject* pObj ) { pEditObj = pObj; } + void SetViewShell( ScTabViewShell* pSh ) { pViewShell = pSh; } // #114135# - void SetDrawView( FmFormView* pNew ) { pDrawView = pNew; } - - void SetSolidBackground( BOOL bSet ) { bSolidBackground = bSet; } - void SetUseStyleColor( BOOL bSet ) { bUseStyleColor = bSet; } - - void SetEditCell( SCCOL nCol, SCROW nRow ); - void SetSyntaxMode( BOOL bNewMode ); - void SetMetaFileMode( BOOL bNewMode ); - void SetSingleGrid( BOOL bNewMode ); - void SetGridColor( const Color& rColor ); - void SetMarkClipped( BOOL bSet ); - void SetShowNullValues ( BOOL bSet = TRUE ); - void SetShowFormulas ( BOOL bSet = TRUE ); - void SetShowSpellErrors( BOOL bSet = TRUE ); - void SetMirrorWidth( long nNew ); - long GetScrW() const { return nScrW; } - long GetScrH() const { return nScrH; } - - void SetSnapPixel( BOOL bSet = TRUE ); - - void DrawGrid( BOOL bGrid, BOOL bPage ); - void DrawStrings( BOOL bPixelToLogic = FALSE ); + void SetDrawView( FmFormView* pNew ) { pDrawView = pNew; } + + void SetSolidBackground( BOOL bSet ) { bSolidBackground = bSet; } + void SetUseStyleColor( BOOL bSet ) { bUseStyleColor = bSet; } + + void SetEditCell( SCCOL nCol, SCROW nRow ); + void SetSyntaxMode( BOOL bNewMode ); + void SetMetaFileMode( BOOL bNewMode ); + void SetSingleGrid( BOOL bNewMode ); + void SetGridColor( const Color& rColor ); + void SetMarkClipped( BOOL bSet ); + void SetShowNullValues ( BOOL bSet = TRUE ); + void SetShowFormulas ( BOOL bSet = TRUE ); + void SetShowSpellErrors( BOOL bSet = TRUE ); + void SetMirrorWidth( long nNew ); + long GetScrW() const { return nScrW; } + long GetScrH() const { return nScrH; } + + void SetSnapPixel( BOOL bSet = TRUE ); + + void DrawGrid( BOOL bGrid, BOOL bPage ); + void DrawStrings( BOOL bPixelToLogic = FALSE ); void DrawDocumentBackground(); - void DrawBackground(); - void DrawShadow(); - void DrawExtraShadow(BOOL bLeft, BOOL bTop, BOOL bRight, BOOL bBottom); - void DrawFrame(); + void DrawBackground(); + void DrawShadow(); + void DrawExtraShadow(BOOL bLeft, BOOL bTop, BOOL bRight, BOOL bBottom); + void DrawFrame(); // with logic MapMode set! - void DrawEdit(BOOL bPixelToLogic); + void DrawEdit(BOOL bPixelToLogic); - void FindRotated(); - void DrawRotated(BOOL bPixelToLogic); // logisch + void FindRotated(); + void DrawRotated(BOOL bPixelToLogic); // logisch - void DrawClear(); + void DrawClear(); // #i72502# printer only command set Point PrePrintDrawingLayer(long nLogStX, long nLogStY ); @@ -244,27 +244,27 @@ public: void PrintDrawingLayer(const sal_uInt16 nLayer, const Point& rMMOffset); // nur Bildschirm: - void DrawingSingle(const sal_uInt16 nLayer); - void DrawSelectiveObjects(const sal_uInt16 nLayer); + void DrawingSingle(const sal_uInt16 nLayer); + void DrawSelectiveObjects(const sal_uInt16 nLayer); - BOOL SetChangedClip(); // FALSE = nix + BOOL SetChangedClip(); // FALSE = nix PolyPolygon GetChangedArea(); - void FindChanged(); - void SetPagebreakMode( ScPageBreakData* pPageData ); + void FindChanged(); + void SetPagebreakMode( ScPageBreakData* pPageData ); #ifdef OLD_SELECTION_PAINT void DrawMark( Window* pWin ); -#endif - void DrawRefMark( SCCOL nRefStartX, SCROW nRefStartY, +#endif + void DrawRefMark( SCCOL nRefStartX, SCROW nRefStartY, SCCOL nRefEndX, SCROW nRefEndY, const Color& rColor, BOOL bHandle ); - void DrawOneChange( SCCOL nRefStartX, SCROW nRefStartY, + void DrawOneChange( SCCOL nRefStartX, SCROW nRefStartY, SCCOL nRefEndX, SCROW nRefEndY, const Color& rColor, USHORT nType ); - void DrawChangeTrack(); - void DrawClipMarks(); + void DrawChangeTrack(); + void DrawClipMarks(); - void DrawNoteMarks(); + void DrawNoteMarks(); void AddPDFNotes(); }; diff --git a/sc/source/ui/inc/pagedata.hxx b/sc/source/ui/inc/pagedata.hxx index 31ce7a5db38c..674bb38bc581 100644 --- a/sc/source/ui/inc/pagedata.hxx +++ b/sc/source/ui/inc/pagedata.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,55 +39,55 @@ class ScDocShell; class ScPrintRangeData { private: - ScRange aPrintRange; - size_t nPagesX; - SCCOL* pPageEndX; - size_t nPagesY; - SCROW* pPageEndY; - long nFirstPage; - BOOL bTopDown; - BOOL bAutomatic; + ScRange aPrintRange; + size_t nPagesX; + SCCOL* pPageEndX; + size_t nPagesY; + SCROW* pPageEndY; + long nFirstPage; + BOOL bTopDown; + BOOL bAutomatic; public: ScPrintRangeData(); ~ScPrintRangeData(); - void SetPrintRange( const ScRange& rNew ) { aPrintRange = rNew; } - const ScRange& GetPrintRange() const { return aPrintRange; } + void SetPrintRange( const ScRange& rNew ) { aPrintRange = rNew; } + const ScRange& GetPrintRange() const { return aPrintRange; } - void SetPagesX( size_t nCount, const SCCOL* pEnd ); - void SetPagesY( size_t nCount, const SCROW* pEnd ); + void SetPagesX( size_t nCount, const SCCOL* pEnd ); + void SetPagesY( size_t nCount, const SCROW* pEnd ); - size_t GetPagesX() const { return nPagesX; } - const SCCOL* GetPageEndX() const { return pPageEndX; } - size_t GetPagesY() const { return nPagesY; } - const SCROW* GetPageEndY() const { return pPageEndY; } + size_t GetPagesX() const { return nPagesX; } + const SCCOL* GetPageEndX() const { return pPageEndX; } + size_t GetPagesY() const { return nPagesY; } + const SCROW* GetPageEndY() const { return pPageEndY; } - void SetFirstPage( long nNew ) { nFirstPage = nNew; } - long GetFirstPage() const { return nFirstPage; } - void SetTopDown( BOOL bSet ) { bTopDown = bSet; } - BOOL IsTopDown() const { return bTopDown; } - void SetAutomatic( BOOL bSet ) { bAutomatic = bSet; } - BOOL IsAutomatic() const { return bAutomatic; } + void SetFirstPage( long nNew ) { nFirstPage = nNew; } + long GetFirstPage() const { return nFirstPage; } + void SetTopDown( BOOL bSet ) { bTopDown = bSet; } + BOOL IsTopDown() const { return bTopDown; } + void SetAutomatic( BOOL bSet ) { bAutomatic = bSet; } + BOOL IsAutomatic() const { return bAutomatic; } }; class ScPageBreakData { private: - size_t nAlloc; - size_t nUsed; - ScPrintRangeData* pData; // Array + size_t nAlloc; + size_t nUsed; + ScPrintRangeData* pData; // Array public: ScPageBreakData(size_t nMax); ~ScPageBreakData(); - size_t GetCount() const { return nUsed; } - ScPrintRangeData& GetData(size_t i); + size_t GetCount() const { return nUsed; } + ScPrintRangeData& GetData(size_t i); - BOOL IsEqual( const ScPageBreakData& rOther ) const; + BOOL IsEqual( const ScPageBreakData& rOther ) const; - void AddPages(); + void AddPages(); }; diff --git a/sc/source/ui/inc/parawin.hxx b/sc/source/ui/inc/parawin.hxx index 36fac42a01ca..5272fb819c7f 100644 --- a/sc/source/ui/inc/parawin.hxx +++ b/sc/source/ui/inc/parawin.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ #define SC_PARAWIN_HXX #include "funcutl.hxx" -#include "global.hxx" // ScAddress +#include "global.hxx" // ScAddress #include <svtools/stdctrl.hxx> #include <vcl/lstbox.hxx> #include <vcl/group.hxx> @@ -50,53 +50,53 @@ class ScFuncDesc; //============================================================================ -#define NOT_FOUND 0xffff +#define NOT_FOUND 0xffff //============================================================================ class ScParaWin : public TabPage { private: - Link aScrollLink; - Link aFxLink; - Link aArgModifiedLink; + Link aScrollLink; + Link aFxLink; + Link aArgModifiedLink; ::std::vector<USHORT> aVisibleArgMapping; - const ScFuncDesc* pFuncDesc; - ScAnyRefDlg* pMyParent; - USHORT nArgs; // unsuppressed arguments - Font aFntBold; - Font aFntLight; - - FixedInfo aFtEditDesc; - FixedText aFtArgName; - FixedInfo aFtArgDesc; - - ImageButton aBtnFx1; - FixedText aFtArg1; - ArgEdit aEdArg1; - formula::RefButton aRefBtn1; - ImageButton aBtnFx2; - FixedText aFtArg2; - ArgEdit aEdArg2; - formula::RefButton aRefBtn2; - ImageButton aBtnFx3; - FixedText aFtArg3; - ArgEdit aEdArg3; - formula::RefButton aRefBtn3; - ImageButton aBtnFx4; - FixedText aFtArg4; - ArgEdit aEdArg4; - formula::RefButton aRefBtn4; - ScrollBar aSlider; - BOOL bRefMode; - - USHORT nEdFocus; - USHORT nActiveLine; - - ArgInput aArgInput[4]; - String aDefaultString; - SvStrings aParaArray; + const ScFuncDesc* pFuncDesc; + ScAnyRefDlg* pMyParent; + USHORT nArgs; // unsuppressed arguments + Font aFntBold; + Font aFntLight; + + FixedInfo aFtEditDesc; + FixedText aFtArgName; + FixedInfo aFtArgDesc; + + ImageButton aBtnFx1; + FixedText aFtArg1; + ArgEdit aEdArg1; + formula::RefButton aRefBtn1; + ImageButton aBtnFx2; + FixedText aFtArg2; + ArgEdit aEdArg2; + formula::RefButton aRefBtn2; + ImageButton aBtnFx3; + FixedText aFtArg3; + ArgEdit aEdArg3; + formula::RefButton aRefBtn3; + ImageButton aBtnFx4; + FixedText aFtArg4; + ArgEdit aEdArg4; + formula::RefButton aRefBtn4; + ScrollBar aSlider; + BOOL bRefMode; + + USHORT nEdFocus; + USHORT nActiveLine; + + ArgInput aArgInput[4]; + String aDefaultString; + SvStrings aParaArray; DECL_LINK( ScrollHdl, ScrollBar* ); DECL_LINK( ModifyHdl, ArgInput* ); DECL_LINK( GetEdFocusHdl, ArgInput* ); @@ -105,52 +105,52 @@ private: protected: - virtual void SliderMoved(); - virtual void ArgumentModified(); - virtual void FxClick(); + virtual void SliderMoved(); + virtual void ArgumentModified(); + virtual void FxClick(); - void InitArgInput( USHORT nPos, FixedText& rFtArg, ImageButton& rBtnFx, + void InitArgInput( USHORT nPos, FixedText& rFtArg, ImageButton& rBtnFx, ArgEdit& rEdArg, formula::RefButton& rRefBtn); - void DelParaArray(); - void SetArgumentDesc(const String& aText); - void SetArgumentText(const String& aText); + void DelParaArray(); + void SetArgumentDesc(const String& aText); + void SetArgumentText(const String& aText); - void SetArgName (USHORT no,const String &aArg); - void SetArgNameFont (USHORT no,const Font&); - void SetArgVal (USHORT no,const String &aArg); + void SetArgName (USHORT no,const String &aArg); + void SetArgNameFont (USHORT no,const Font&); + void SetArgVal (USHORT no,const String &aArg); - void HideParaLine(USHORT no); - void ShowParaLine(USHORT no); - void UpdateArgDesc( USHORT nArg ); - void UpdateArgInput( USHORT nOffset, USHORT i ); + void HideParaLine(USHORT no); + void ShowParaLine(USHORT no); + void UpdateArgDesc( USHORT nArg ); + void UpdateArgInput( USHORT nOffset, USHORT i ); public: ScParaWin(ScAnyRefDlg* pParent,Point aPos); ~ScParaWin(); - void SetFunctionDesc(const ScFuncDesc* pFDesc); - void SetArgumentOffset(USHORT nOffset); - void SetEditDesc(const String& aText); - void UpdateParas(); - void ClearAll(); + void SetFunctionDesc(const ScFuncDesc* pFDesc); + void SetArgumentOffset(USHORT nOffset); + void SetEditDesc(const String& aText); + void UpdateParas(); + void ClearAll(); - BOOL IsRefMode() {return bRefMode;} - void SetRefMode(BOOL bFlag) {bRefMode=bFlag;} + BOOL IsRefMode() {return bRefMode;} + void SetRefMode(BOOL bFlag) {bRefMode=bFlag;} - USHORT GetActiveLine(); - void SetActiveLine(USHORT no); - formula::RefEdit* GetActiveEdit(); - String GetActiveArgName(); + USHORT GetActiveLine(); + void SetActiveLine(USHORT no); + formula::RefEdit* GetActiveEdit(); + String GetActiveArgName(); - String GetArgument(USHORT no); - void SetArgument(USHORT no, const String& aString); - void SetArgumentFonts(const Font&aBoldFont,const Font&aLightFont); + String GetArgument(USHORT no); + void SetArgument(USHORT no, const String& aString); + void SetArgumentFonts(const Font&aBoldFont,const Font&aLightFont); - void SetEdFocus(USHORT nEditLine); //Sichtbare Editzeilen - USHORT GetSliderPos(); - void SetSliderPos(USHORT nSliderPos); + void SetEdFocus(USHORT nEditLine); //Sichtbare Editzeilen + USHORT GetSliderPos(); + void SetSliderPos(USHORT nSliderPos); void SetScrollHdl( const Link& rLink ) { aScrollLink = rLink; } const Link& GetScrollHdl() const { return aScrollLink; } diff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx index 64df881086db..5baf841dae7e 100644 --- a/sc/source/ui/inc/pfiltdlg.hxx +++ b/sc/source/ui/inc/pfiltdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,77 +55,77 @@ class ScPivotFilterDlg : public ModalDialog { public: ScPivotFilterDlg( Window* pParent, - const SfxItemSet& rArgSet, SCTAB nSourceTab ); + const SfxItemSet& rArgSet, SCTAB nSourceTab ); ~ScPivotFilterDlg(); - const ScQueryItem& GetOutputItem(); + const ScQueryItem& GetOutputItem(); private: FixedLine aFlCriteria; //---------------------------- - ListBox aLbField1; - ListBox aLbCond1; - ComboBox aEdVal1; + ListBox aLbField1; + ListBox aLbCond1; + ComboBox aEdVal1; //---------------------------- - ListBox aLbConnect1; - ListBox aLbField2; - ListBox aLbCond2; - ComboBox aEdVal2; + ListBox aLbConnect1; + ListBox aLbField2; + ListBox aLbCond2; + ComboBox aEdVal2; //---------------------------- - ListBox aLbConnect2; - ListBox aLbField3; - ListBox aLbCond3; - ComboBox aEdVal3; + ListBox aLbConnect2; + ListBox aLbField3; + ListBox aLbCond3; + ComboBox aEdVal3; //---------------------------- - FixedText aFtConnect; - FixedText aFtField; - FixedText aFtCond; - FixedText aFtVal; + FixedText aFtConnect; + FixedText aFtField; + FixedText aFtCond; + FixedText aFtVal; FixedLine aFlOptions; - CheckBox aBtnCase; - CheckBox aBtnRegExp; - CheckBox aBtnUnique; - FixedText aFtDbAreaLabel; - FixedInfo aFtDbArea; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - MoreButton aBtnMore; - const String aStrUndefined; - const String aStrNoName; - const String aStrNone; - const String aStrEmpty; - const String aStrNotEmpty; - const String aStrRow; - const String aStrColumn; - - const USHORT nWhichQuery; - const ScQueryParam theQueryData; - ScQueryItem* pOutItem; - ScViewData* pViewData; - ScDocument* pDoc; - SCTAB nSrcTab; - - USHORT nFieldCount; - ComboBox* aValueEdArr[3]; - ListBox* aFieldLbArr[3]; - ListBox* aCondLbArr[3]; - - TypedScStrCollection* pEntryLists[MAXCOLCOUNT]; + CheckBox aBtnCase; + CheckBox aBtnRegExp; + CheckBox aBtnUnique; + FixedText aFtDbAreaLabel; + FixedInfo aFtDbArea; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; + MoreButton aBtnMore; + const String aStrUndefined; + const String aStrNoName; + const String aStrNone; + const String aStrEmpty; + const String aStrNotEmpty; + const String aStrRow; + const String aStrColumn; + + const USHORT nWhichQuery; + const ScQueryParam theQueryData; + ScQueryItem* pOutItem; + ScViewData* pViewData; + ScDocument* pDoc; + SCTAB nSrcTab; + + USHORT nFieldCount; + ComboBox* aValueEdArr[3]; + ListBox* aFieldLbArr[3]; + ListBox* aCondLbArr[3]; + + TypedScStrCollection* pEntryLists[MAXCOLCOUNT]; #ifdef _PFILTDLG_CXX private: - void Init ( const SfxItemSet& rArgSet ); - void FillFieldLists (); - void UpdateValueList ( USHORT nList ); - void ClearValueList ( USHORT nList ); - USHORT GetFieldSelPos ( SCCOL nField ); + void Init ( const SfxItemSet& rArgSet ); + void FillFieldLists (); + void UpdateValueList ( USHORT nList ); + void ClearValueList ( USHORT nList ); + USHORT GetFieldSelPos ( SCCOL nField ); // Handler: DECL_LINK( LbSelectHdl, ListBox* ); DECL_LINK( ValModifyHdl, ComboBox* ); - DECL_LINK( CheckBoxHdl, CheckBox* ); + DECL_LINK( CheckBoxHdl, CheckBox* ); #endif }; diff --git a/sc/source/ui/inc/pfuncache.hxx b/sc/source/ui/inc/pfuncache.hxx index 9ab60717c635..d5694773c7ef 100644 --- a/sc/source/ui/inc/pfuncache.hxx +++ b/sc/source/ui/inc/pfuncache.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,19 +55,19 @@ enum ScPrintSelectionMode class ScPrintSelectionStatus { - ScPrintSelectionMode eMode; - ScRangeList aRanges; + ScPrintSelectionMode eMode; + ScRangeList aRanges; ScPrintOptions aOptions; public: ScPrintSelectionStatus() : eMode(SC_PRINTSEL_INVALID) {} ~ScPrintSelectionStatus() {} - void SetMode(ScPrintSelectionMode eNew) { eMode = eNew; } - void SetRanges(const ScRangeList& rNew) { aRanges = rNew; } + void SetMode(ScPrintSelectionMode eNew) { eMode = eNew; } + void SetRanges(const ScRangeList& rNew) { aRanges = rNew; } void SetOptions(const ScPrintOptions& rNew) { aOptions = rNew; } - BOOL operator==(const ScPrintSelectionStatus& rOther) const + BOOL operator==(const ScPrintSelectionStatus& rOther) const { return eMode == rOther.eMode && aRanges == rOther.aRanges && aOptions == rOther.aOptions; } ScPrintSelectionMode GetMode() const { return eMode; } @@ -97,11 +97,11 @@ struct ScPrintPageLocation class ScPrintFuncCache { - ScPrintSelectionStatus aSelection; - ScDocShell* pDocSh; - long nTotalPages; - long nPages[MAXTABCOUNT]; - long nFirstAttr[MAXTABCOUNT]; + ScPrintSelectionStatus aSelection; + ScDocShell* pDocSh; + long nTotalPages; + long nPages[MAXTABCOUNT]; + long nFirstAttr[MAXTABCOUNT]; std::vector<ScPrintPageLocation> aLocations; bool bLocInitialized; @@ -110,16 +110,16 @@ public: const ScPrintSelectionStatus& rStatus ); ~ScPrintFuncCache(); - BOOL IsSameSelection( const ScPrintSelectionStatus& rStatus ) const; + BOOL IsSameSelection( const ScPrintSelectionStatus& rStatus ) const; void InitLocations( const ScMarkData& rMark, OutputDevice* pDev ); bool FindLocation( const ScAddress& rCell, ScPrintPageLocation& rLocation ) const; - long GetPageCount() const { return nTotalPages; } - long GetFirstAttr( SCTAB nTab ) const { return nFirstAttr[nTab]; } - SCTAB GetTabForPage( long nPage ) const; - long GetTabStart( SCTAB nTab ) const; - long GetDisplayStart( SCTAB nTab ) const; + long GetPageCount() const { return nTotalPages; } + long GetFirstAttr( SCTAB nTab ) const { return nFirstAttr[nTab]; } + SCTAB GetTabForPage( long nPage ) const; + long GetTabStart( SCTAB nTab ) const; + long GetDisplayStart( SCTAB nTab ) const; }; #endif diff --git a/sc/source/ui/inc/pgbrksh.hxx b/sc/source/ui/inc/pgbrksh.hxx index bca834c27eb0..ca9bc3d67853 100644 --- a/sc/source/ui/inc/pgbrksh.hxx +++ b/sc/source/ui/inc/pgbrksh.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/inc/pivotsh.hxx b/sc/source/ui/inc/pivotsh.hxx index fff0f99ad388..d5a2d4ed8476 100644 --- a/sc/source/ui/inc/pivotsh.hxx +++ b/sc/source/ui/inc/pivotsh.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,11 +46,11 @@ public: ScPivotShell( ScTabViewShell* pView ); ~ScPivotShell(); - void Execute ( SfxRequest& rReq ); - void GetState( SfxItemSet& rSet ); + void Execute ( SfxRequest& rReq ); + void GetState( SfxItemSet& rSet ); private: - ScTabViewShell* pViewShell; + ScTabViewShell* pViewShell; ScDPObject* GetCurrDPObject(); }; diff --git a/sc/source/ui/inc/pntlock.hxx b/sc/source/ui/inc/pntlock.hxx index 1633a160632d..18c090e8dde5 100644 --- a/sc/source/ui/inc/pntlock.hxx +++ b/sc/source/ui/inc/pntlock.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,33 +34,33 @@ class ScPaintLockData { private: - ScRangeListRef xRangeList; - USHORT nMode; - USHORT nLevel; - USHORT nDocLevel; - USHORT nParts; - BOOL bModified; + ScRangeListRef xRangeList; + USHORT nMode; + USHORT nLevel; + USHORT nDocLevel; + USHORT nParts; + BOOL bModified; public: ScPaintLockData(USHORT nNewMode); ~ScPaintLockData(); - void AddRange( const ScRange& rRange, USHORT nP ); + void AddRange( const ScRange& rRange, USHORT nP ); - void SetModified() { bModified = TRUE; } - void IncLevel(sal_Bool bDoc) + void SetModified() { bModified = TRUE; } + void IncLevel(sal_Bool bDoc) { if (bDoc) ++nDocLevel; else ++nLevel; } - void DecLevel(sal_Bool bDoc) + void DecLevel(sal_Bool bDoc) { if (bDoc) --nDocLevel; else --nLevel; } - const ScRangeListRef& GetRangeList() const { return xRangeList; } - USHORT GetParts() const { return nParts; } - USHORT GetLevel(sal_Bool bDoc) const + const ScRangeListRef& GetRangeList() const { return xRangeList; } + USHORT GetParts() const { return nParts; } + USHORT GetLevel(sal_Bool bDoc) const { return bDoc ? nDocLevel : nLevel; } - BOOL GetModified() const { return bModified; } + BOOL GetModified() const { return bModified; } // fuer Wiederherstellen nach Reset - void SetLevel(USHORT nNew, sal_Bool bDoc) + void SetLevel(USHORT nNew, sal_Bool bDoc) { if (bDoc) nDocLevel = nNew; else nLevel = nNew; } }; diff --git a/sc/source/ui/inc/popmenu.hxx b/sc/source/ui/inc/popmenu.hxx index ee5bb314f213..72db6f61f98a 100644 --- a/sc/source/ui/inc/popmenu.hxx +++ b/sc/source/ui/inc/popmenu.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,15 +35,15 @@ class SC_DLLPUBLIC ScPopupMenu : public PopupMenu { private: - USHORT nSel; - BOOL bHit; + USHORT nSel; + BOOL bHit; protected: virtual void Select(); public: ScPopupMenu() : nSel(0),bHit(FALSE) {} ScPopupMenu(const ResId& rRes) : PopupMenu(rRes),nSel(0),bHit(FALSE) {} - USHORT GetSelected() const { return nSel; } - BOOL WasHit() const { return bHit; } + USHORT GetSelected() const { return nSel; } + BOOL WasHit() const { return bHit; } }; diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx index 870441a574c0..648fd47e10f3 100644 --- a/sc/source/ui/inc/preview.hxx +++ b/sc/source/ui/inc/preview.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ #include <vcl/window.hxx> -#include "printfun.hxx" // ScPrintState +#include "printfun.hxx" // ScPrintState class ScDocShell; class ScPreviewShell; @@ -40,37 +40,37 @@ class ScPreview : public Window { private: // eingestellt: - long nPageNo; // Seite im Dokument - USHORT nZoom; // eingestellter Zoom - Point aOffset; // positiv + long nPageNo; // Seite im Dokument + USHORT nZoom; // eingestellter Zoom + Point aOffset; // positiv // berechnet: - BOOL bValid; // folgende Werte gueltig - SCTAB nTabCount; - SCTAB nTabsTested; // fuer wieviele Tabellen ist nPages gueltig? - long nPages[MAXTABCOUNT]; - long nFirstAttr[MAXTABCOUNT]; - SCTAB nTab; // Tabelle - long nTabPage; // Seite von Tabelle - long nTabStart; // erste Seite der Tabelle (wirklich) - long nDisplayStart; // dito, relativ zum Anfang der Zaehlung - Date aDate; - Time aTime; - long nTotalPages; - Size aPageSize; // fuer GetOptimalZoom - BOOL bStateValid; - BOOL bLocationValid; - ScPrintState aState; - ScPreviewLocationData* pLocationData; // stores table layout for accessibility API - FmFormView* pDrawView; + BOOL bValid; // folgende Werte gueltig + SCTAB nTabCount; + SCTAB nTabsTested; // fuer wieviele Tabellen ist nPages gueltig? + long nPages[MAXTABCOUNT]; + long nFirstAttr[MAXTABCOUNT]; + SCTAB nTab; // Tabelle + long nTabPage; // Seite von Tabelle + long nTabStart; // erste Seite der Tabelle (wirklich) + long nDisplayStart; // dito, relativ zum Anfang der Zaehlung + Date aDate; + Time aTime; + long nTotalPages; + Size aPageSize; // fuer GetOptimalZoom + BOOL bStateValid; + BOOL bLocationValid; + ScPrintState aState; + ScPreviewLocationData* pLocationData; // stores table layout for accessibility API + FmFormView* pDrawView; SCTAB nCurTab; // intern: - BOOL bInPaint; - BOOL bInGetState; - ScDocShell* pDocShell; - ScPreviewShell* pViewShell; + BOOL bInPaint; + BOOL bInGetState; + ScDocShell* pDocShell; + ScPreviewShell* pViewShell; BOOL bLeftRulerMove; BOOL bRightRulerMove; @@ -78,7 +78,7 @@ private: BOOL bBottomRulerMove; BOOL bHeaderRulerMove; BOOL bFooterRulerMove; - + BOOL bLeftRulerChange; BOOL bRightRulerChange; BOOL bTopRulerChange; @@ -98,13 +98,13 @@ private: long nHeaderHeight; long nFooterHeight; - void TestLastPage(); - void CalcPages( SCTAB nToWhichTab ); - void RecalcPages(); - void UpdateDrawView(); - void DoPrint( ScPreviewLocationData* pFillLocation ); + void TestLastPage(); + void CalcPages( SCTAB nToWhichTab ); + void RecalcPages(); + void UpdateDrawView(); + void DoPrint( ScPreviewLocationData* pFillLocation ); - void InvalidateLocationData( ULONG nId ); + void InvalidateLocationData( ULONG nId ); using Window::SetZoom; @@ -127,13 +127,13 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ); - void DataChanged(BOOL bNewTime = FALSE); // statt Invalidate rufen - void DoInvalidate(); + void DataChanged(BOOL bNewTime = FALSE); // statt Invalidate rufen + void DoInvalidate(); - void SetXOffset( long nX ); - void SetYOffset( long nY ); - void SetZoom(USHORT nNewZoom); - void SetPageNo( long nPage ); + void SetXOffset( long nX ); + void SetYOffset( long nY ); + void SetZoom(USHORT nNewZoom); + void SetPageNo( long nPage ); BOOL GetPageMargins()const { return bPageMargin; } void SetPageMargins( BOOL bVal ) { bPageMargin = bVal; } @@ -143,22 +143,22 @@ public: const ScPreviewLocationData& GetLocationData(); - String GetPosString(); + String GetPosString(); - long GetPageNo() const { return nPageNo; } - USHORT GetZoom() const { return nZoom; } - Point GetOffset() const { return aOffset; } + long GetPageNo() const { return nPageNo; } + USHORT GetZoom() const { return nZoom; } + Point GetOffset() const { return aOffset; } - SCTAB GetTab() { if (!bValid) { CalcPages(0); RecalcPages(); } return nTab; } - long GetTotalPages() { if (!bValid) { CalcPages(0); RecalcPages(); } return nTotalPages; } + SCTAB GetTab() { if (!bValid) { CalcPages(0); RecalcPages(); } return nTab; } + long GetTotalPages() { if (!bValid) { CalcPages(0); RecalcPages(); } return nTotalPages; } - BOOL AllTested() const { return bValid && nTabsTested >= nTabCount; } + BOOL AllTested() const { return bValid && nTabsTested >= nTabCount; } - USHORT GetOptimalZoom(BOOL bWidthOnly); - long GetFirstPage(SCTAB nTab); + USHORT GetOptimalZoom(BOOL bWidthOnly); + long GetFirstPage(SCTAB nTab); - void CalcAll() { CalcPages(MAXTAB); } - void SetInGetState(BOOL bSet) { bInGetState = bSet; } + void CalcAll() { CalcPages(MAXTAB); } + void SetInGetState(BOOL bSet) { bInGetState = bSet; } DECL_STATIC_LINK( ScPreview, InvalidateHdl, void* ); static void StaticInvalidate(); diff --git a/sc/source/ui/inc/prevloc.hxx b/sc/source/ui/inc/prevloc.hxx index fdba3a6f66ab..9dc2782de1da 100644 --- a/sc/source/ui/inc/prevloc.hxx +++ b/sc/source/ui/inc/prevloc.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ #include <sal/types.h> -#define SC_PREVIEW_MAXRANGES 4 +#define SC_PREVIEW_MAXRANGES 4 #define SC_PREVIEW_RANGE_EDGE 0 #define SC_PREVIEW_RANGE_REPCOL 1 #define SC_PREVIEW_RANGE_REPROW 2 @@ -51,10 +51,10 @@ class ScDocument; struct ScPreviewColRowInfo { - BOOL bIsHeader; + BOOL bIsHeader; SCCOLROW nDocIndex; - long nPixelStart; - long nPixelEnd; + long nPixelStart; + long nPixelEnd; void Set( BOOL bHeader, SCCOLROW nIndex, long nStart, long nEnd ) { @@ -67,81 +67,81 @@ struct ScPreviewColRowInfo class ScPreviewTableInfo { - SCTAB nTab; - SCCOL nCols; - SCROW nRows; - ScPreviewColRowInfo* pColInfo; - ScPreviewColRowInfo* pRowInfo; + SCTAB nTab; + SCCOL nCols; + SCROW nRows; + ScPreviewColRowInfo* pColInfo; + ScPreviewColRowInfo* pRowInfo; public: ScPreviewTableInfo(); ~ScPreviewTableInfo(); - SCTAB GetTab() const { return nTab; } - SCCOL GetCols() const { return nCols; } - SCROW GetRows() const { return nRows; } - const ScPreviewColRowInfo* GetColInfo() const { return pColInfo; } - const ScPreviewColRowInfo* GetRowInfo() const { return pRowInfo; } + SCTAB GetTab() const { return nTab; } + SCCOL GetCols() const { return nCols; } + SCROW GetRows() const { return nRows; } + const ScPreviewColRowInfo* GetColInfo() const { return pColInfo; } + const ScPreviewColRowInfo* GetRowInfo() const { return pRowInfo; } - void SetTab( SCTAB nNewTab ); - void SetColInfo( SCCOL nCount, ScPreviewColRowInfo* pNewInfo ); - void SetRowInfo( SCROW nCount, ScPreviewColRowInfo* pNewInfo ); - void LimitToArea( const Rectangle& rPixelArea ); + void SetTab( SCTAB nNewTab ); + void SetColInfo( SCCOL nCount, ScPreviewColRowInfo* pNewInfo ); + void SetRowInfo( SCROW nCount, ScPreviewColRowInfo* pNewInfo ); + void LimitToArea( const Rectangle& rPixelArea ); }; class ScPreviewLocationData { OutputDevice* pWindow; - ScDocument* pDoc; - MapMode aCellMapMode; - MapMode aDrawMapMode[SC_PREVIEW_MAXRANGES]; - Rectangle aDrawRectangle[SC_PREVIEW_MAXRANGES]; - sal_uInt8 aDrawRangeId[SC_PREVIEW_MAXRANGES]; - USHORT nDrawRanges; - SCTAB nPrintTab; - List aEntries; + ScDocument* pDoc; + MapMode aCellMapMode; + MapMode aDrawMapMode[SC_PREVIEW_MAXRANGES]; + Rectangle aDrawRectangle[SC_PREVIEW_MAXRANGES]; + sal_uInt8 aDrawRangeId[SC_PREVIEW_MAXRANGES]; + USHORT nDrawRanges; + SCTAB nPrintTab; + List aEntries; - Rectangle GetOffsetPixel( const ScAddress& rCellPos, const ScRange& rRange ) const; + Rectangle GetOffsetPixel( const ScAddress& rCellPos, const ScRange& rRange ) const; public: ScPreviewLocationData( ScDocument* pDocument, OutputDevice* pWin ); ~ScPreviewLocationData(); - void SetCellMapMode( const MapMode& rMapMode ); - void SetPrintTab( SCTAB nNew ); - void Clear(); - void AddCellRange( const Rectangle& rRect, const ScRange& rRange, BOOL bRepCol, BOOL bRepRow, + void SetCellMapMode( const MapMode& rMapMode ); + void SetPrintTab( SCTAB nNew ); + void Clear(); + void AddCellRange( const Rectangle& rRect, const ScRange& rRange, BOOL bRepCol, BOOL bRepRow, const MapMode& rDrawMap ); - void AddColHeaders( const Rectangle& rRect, SCCOL nStartCol, SCCOL nEndCol, BOOL bRepCol ); - void AddRowHeaders( const Rectangle& rRect, SCROW nStartRow, SCROW nEndRow, BOOL bRepRow ); - void AddHeaderFooter( const Rectangle& rRect, BOOL bHeader, BOOL bLeft ); - void AddNoteMark( const Rectangle& rRect, const ScAddress& rPos ); - void AddNoteText( const Rectangle& rRect, const ScAddress& rPos ); + void AddColHeaders( const Rectangle& rRect, SCCOL nStartCol, SCCOL nEndCol, BOOL bRepCol ); + void AddRowHeaders( const Rectangle& rRect, SCROW nStartRow, SCROW nEndRow, BOOL bRepRow ); + void AddHeaderFooter( const Rectangle& rRect, BOOL bHeader, BOOL bLeft ); + void AddNoteMark( const Rectangle& rRect, const ScAddress& rPos ); + void AddNoteText( const Rectangle& rRect, const ScAddress& rPos ); - SCTAB GetPrintTab() const { return nPrintTab; } + SCTAB GetPrintTab() const { return nPrintTab; } - // Get info on visible columns/rows in the visible area - void GetTableInfo( const Rectangle& rVisiblePixel, ScPreviewTableInfo& rInfo ) const; + // Get info on visible columns/rows in the visible area + void GetTableInfo( const Rectangle& rVisiblePixel, ScPreviewTableInfo& rInfo ) const; - USHORT GetDrawRanges() const { return nDrawRanges; } - void GetDrawRange( USHORT nPos, Rectangle& rPixelRect, MapMode& rMapMode, sal_uInt8& rRangeId ) const; + USHORT GetDrawRanges() const { return nDrawRanges; } + void GetDrawRange( USHORT nPos, Rectangle& rPixelRect, MapMode& rMapMode, sal_uInt8& rRangeId ) const; - BOOL GetHeaderPosition( Rectangle& rHeaderRect ) const; - BOOL GetFooterPosition( Rectangle& rFooterRect ) const; - BOOL IsHeaderLeft() const; - BOOL IsFooterLeft() const; + BOOL GetHeaderPosition( Rectangle& rHeaderRect ) const; + BOOL GetFooterPosition( Rectangle& rFooterRect ) const; + BOOL IsHeaderLeft() const; + BOOL IsFooterLeft() const; - long GetNoteCountInRange( const Rectangle& rVisiblePixel, BOOL bNoteMarks ) const; - BOOL GetNoteInRange( const Rectangle& rVisiblePixel, long nIndex, BOOL bNoteMarks, + long GetNoteCountInRange( const Rectangle& rVisiblePixel, BOOL bNoteMarks ) const; + BOOL GetNoteInRange( const Rectangle& rVisiblePixel, long nIndex, BOOL bNoteMarks, ScAddress& rCellPos, Rectangle& rNoteRect ) const; - Rectangle GetNoteInRangeOutputRect(const Rectangle& rVisiblePixel, BOOL bNoteMarks, + Rectangle GetNoteInRangeOutputRect(const Rectangle& rVisiblePixel, BOOL bNoteMarks, const ScAddress& aCellPos) const; - // Check if any cells (including column/row headers) are in the visible area - BOOL HasCellsInRange( const Rectangle& rVisiblePixel ) const; + // Check if any cells (including column/row headers) are in the visible area + BOOL HasCellsInRange( const Rectangle& rVisiblePixel ) const; - BOOL GetCellPosition( const ScAddress& rCellPos, Rectangle& rCellRect ) const; + BOOL GetCellPosition( const ScAddress& rCellPos, Rectangle& rCellRect ) const; // returns the rectangle where the EditEngine draws the text of a Header Cell // if bColHeader is true it returns the rectangle of the header of the column in rCellPos diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx index 861fba46d892..944ada80a46c 100644 --- a/sc/source/ui/inc/prevwsh.hxx +++ b/sc/source/ui/inc/prevwsh.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,40 +50,40 @@ class CommandEvent; class ScPreviewShell: public SfxViewShell { - ScDocShell* pDocShell; + ScDocShell* pDocShell; - ScPreview* pPreview; // Ausgabe-Fenster - ScrollBar* pHorScroll; - ScrollBar* pVerScroll; - Window* pCorner; + ScPreview* pPreview; // Ausgabe-Fenster + ScrollBar* pHorScroll; + ScrollBar* pVerScroll; + Window* pCorner; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSourceData; // ViewData - BYTE nSourceDesignMode; // form design mode from TabView - SvxZoomType eZoom; + BYTE nSourceDesignMode; // form design mode from TabView + SvxZoomType eZoom; long nMaxVertPos; - SfxBroadcaster* pAccessibilityBroadcaster; + SfxBroadcaster* pAccessibilityBroadcaster; private: - void Construct( Window* pParent ); + void Construct( Window* pParent ); DECL_LINK(ScrollHandler, ScrollBar* ); - void DoScroll( USHORT nMode ); + void DoScroll( USHORT nMode ); protected: - virtual void Activate(BOOL bMDI); - virtual void Deactivate(BOOL bMDI); + virtual void Activate(BOOL bMDI); + virtual void Deactivate(BOOL bMDI); - virtual void AdjustPosSizePixel( const Point &rPos, const Size &rSize ); + virtual void AdjustPosSizePixel( const Point &rPos, const Size &rSize ); - virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ); - virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ); + virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ); + virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ); - virtual Size GetOptimalSizePixel() const; + virtual Size GetOptimalSizePixel() const; virtual String GetDescription() const; - virtual void WriteUserData(String &, BOOL bBrowse = FALSE); - virtual void ReadUserData(const String &, BOOL bBrowse = FALSE); + virtual void WriteUserData(String &, BOOL bBrowse = FALSE); + virtual void ReadUserData(const String &, BOOL bBrowse = FALSE); virtual void WriteUserDataSequence (::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); virtual void ReadUserDataSequence (const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); @@ -94,43 +94,43 @@ public: SFX_DECL_INTERFACE(SCID_PREVIEW_SHELL) SFX_DECL_VIEWFACTORY(ScPreviewShell); - ScPreviewShell( SfxViewFrame* pViewFrame, - SfxViewShell* pOldSh ); + ScPreviewShell( SfxViewFrame* pViewFrame, + SfxViewShell* pOldSh ); - virtual ~ScPreviewShell(); + virtual ~ScPreviewShell(); - void InitStartTable(SCTAB nTab); + void InitStartTable(SCTAB nTab); - void UpdateScrollBars(); - BOOL ScrollCommand( const CommandEvent& rCEvt ); + void UpdateScrollBars(); + BOOL ScrollCommand( const CommandEvent& rCEvt ); - void Execute( SfxRequest& rReq ); - void GetState( SfxItemSet& rSet ); + void Execute( SfxRequest& rReq ); + void GetState( SfxItemSet& rSet ); - void FillFieldData( ScHeaderFieldData& rData ); + void FillFieldData( ScHeaderFieldData& rData ); ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue > GetSourceData() const { return aSourceData; } - BYTE GetSourceDesignMode() const { return nSourceDesignMode; } + BYTE GetSourceDesignMode() const { return nSourceDesignMode; } virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - virtual SfxPrinter* GetPrinter( BOOL bCreate = FALSE ); + virtual SfxPrinter* GetPrinter( BOOL bCreate = FALSE ); virtual USHORT SetPrinter( SfxPrinter* pNewPrinter, USHORT nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false ); - virtual PrintDialog* CreatePrintDialog( Window* pParent ); + virtual PrintDialog* CreatePrintDialog( Window* pParent ); virtual SfxTabPage* CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions ); - virtual void PreparePrint( PrintDialog* pPrintDialog = NULL ); + virtual void PreparePrint( PrintDialog* pPrintDialog = NULL ); virtual ErrCode DoPrint( SfxPrinter *pPrinter, PrintDialog *pPrintDialog, BOOL bSilent, BOOL bIsAPI ); virtual USHORT Print( SfxProgress& rProgress, BOOL bIsAPI, PrintDialog* pPrintDialog = NULL ); - void AddAccessibilityObject( SfxListener& rObject ); - void RemoveAccessibilityObject( SfxListener& rObject ); - void BroadcastAccessibility( const SfxHint &rHint ); - BOOL HasAccessibilityObjects(); + void AddAccessibilityObject( SfxListener& rObject ); + void RemoveAccessibilityObject( SfxListener& rObject ); + void BroadcastAccessibility( const SfxHint &rHint ); + BOOL HasAccessibilityObjects(); const ScPreviewLocationData& GetLocationData(); - ScDocument* GetDocument(); - ScPreview* GetPreview() { return pPreview; } + ScDocument* GetDocument(); + ScPreview* GetPreview() { return pPreview; } }; diff --git a/sc/source/ui/inc/printfun.hxx b/sc/source/ui/inc/printfun.hxx index 41d33d693607..31c467e8ac02 100644 --- a/sc/source/ui/inc/printfun.hxx +++ b/sc/source/ui/inc/printfun.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,27 +53,27 @@ class SvxBrushItem; class SvxShadowItem; class FmFormView; -#define RANGENO_NORANGE USHRT_MAX +#define RANGENO_NORANGE USHRT_MAX -#define PRINT_HEADER_WIDTH (1.0 * TWIPS_PER_CM) -#define PRINT_HEADER_HEIGHT (12.8 * TWIPS_PER_POINT) -#define PRINT_HEADER_FONTHEIGHT 200 +#define PRINT_HEADER_WIDTH (1.0 * TWIPS_PER_CM) +#define PRINT_HEADER_HEIGHT (12.8 * TWIPS_PER_POINT) +#define PRINT_HEADER_FONTHEIGHT 200 - // Einstellungen fuer Kopf-/Fusszeilen + // Einstellungen fuer Kopf-/Fusszeilen struct ScPrintHFParam { - BOOL bEnable; - BOOL bDynamic; - BOOL bShared; - long nHeight; // insgesamt (Hoehe+Abstand+Rahmen) - long nManHeight; // eingestellte Groesse (Min. bei dynamisch) - USHORT nDistance; - USHORT nLeft; // Raender - USHORT nRight; + BOOL bEnable; + BOOL bDynamic; + BOOL bShared; + long nHeight; // insgesamt (Hoehe+Abstand+Rahmen) + long nManHeight; // eingestellte Groesse (Min. bei dynamisch) + USHORT nDistance; + USHORT nLeft; // Raender + USHORT nRight; const ScPageHFItem* pLeft; const ScPageHFItem* pRight; - const SvxBoxItem* pBorder; + const SvxBoxItem* pBorder; const SvxBrushItem* pBack; const SvxShadowItem* pShadow; }; @@ -86,147 +86,147 @@ class ScJobSetup public: ScJobSetup( SfxPrinter* pPrinter ); - Size aUserSize; - MapMode aUserMapMode; - Paper ePaper; + Size aUserSize; + MapMode aUserMapMode; + Paper ePaper; Orientation eOrientation; - USHORT nPaperBin; + USHORT nPaperBin; }; -struct ScPrintState // Variablen aus ScPrintFunc retten +struct ScPrintState // Variablen aus ScPrintFunc retten { - SCTAB nPrintTab; - SCCOL nStartCol; - SCROW nStartRow; - SCCOL nEndCol; - SCROW nEndRow; - USHORT nZoom; - size_t nPagesX; - size_t nPagesY; - long nTabPages; - long nTotalPages; - long nPageStart; - long nDocPages; + SCTAB nPrintTab; + SCCOL nStartCol; + SCROW nStartRow; + SCCOL nEndCol; + SCROW nEndRow; + USHORT nZoom; + size_t nPagesX; + size_t nPagesY; + long nTabPages; + long nTotalPages; + long nPageStart; + long nDocPages; }; class ScPageRowEntry { private: - SCROW nStartRow; - SCROW nEndRow; - size_t nPagesX; - BOOL* pHidden; - //! Anzahl wirklich sichtbarer cachen??? + SCROW nStartRow; + SCROW nEndRow; + size_t nPagesX; + BOOL* pHidden; + //! Anzahl wirklich sichtbarer cachen??? public: - ScPageRowEntry() { nStartRow = nEndRow = 0; nPagesX = 0; pHidden = NULL; } - ~ScPageRowEntry() { delete[] pHidden; } + ScPageRowEntry() { nStartRow = nEndRow = 0; nPagesX = 0; pHidden = NULL; } + ~ScPageRowEntry() { delete[] pHidden; } ScPageRowEntry(const ScPageRowEntry& r); const ScPageRowEntry& operator=(const ScPageRowEntry& r); - SCROW GetStartRow() const { return nStartRow; } - SCROW GetEndRow() const { return nEndRow; } - size_t GetPagesX() const { return nPagesX; } - void SetStartRow(SCROW n) { nStartRow = n; } - void SetEndRow(SCROW n) { nEndRow = n; } + SCROW GetStartRow() const { return nStartRow; } + SCROW GetEndRow() const { return nEndRow; } + size_t GetPagesX() const { return nPagesX; } + void SetStartRow(SCROW n) { nStartRow = n; } + void SetEndRow(SCROW n) { nEndRow = n; } - void SetPagesX(size_t nNew); - void SetHidden(size_t nX); - BOOL IsHidden(size_t nX) const; + void SetPagesX(size_t nNew); + void SetHidden(size_t nX); + BOOL IsHidden(size_t nX) const; - size_t CountVisible() const; + size_t CountVisible() const; }; class ScPrintFunc { private: - ScDocShell* pDocShell; - ScDocument* pDoc; - SfxPrinter* pPrinter; - OutputDevice* pDev; - FmFormView* pDrawView; - - MapMode aOldPrinterMode; // MapMode vor dem Aufruf - - Point aSrcOffset; // Papier-1/100 mm - Point aOffset; // mit Faktor aus Seitenformat skaliert - USHORT nManualZoom; // Zoom in Preview (Prozent) - BOOL bClearWin; // Ausgabe vorher loeschen - BOOL bUseStyleColor; - BOOL bIsRender; - - SCTAB nPrintTab; - long nPageStart; // Offset fuer erste Seite - long nDocPages; // Seiten im Dokument - - const ScRange* pUserArea; // Selektion, wenn im Dialog eingestellt - - const SfxItemSet* pParamSet; // eingestellte Vorlage - BOOL bState; // aus State-struct erzeugt - - // Parameter aus Vorlage: - USHORT nLeftMargin; - USHORT nTopMargin; - USHORT nRightMargin; - USHORT nBottomMargin; - BOOL bCenterHor; - BOOL bCenterVer; - BOOL bLandscape; - BOOL bSourceRangeValid; - - USHORT nPageUsage; - Size aPageSize; // Drucker-Twips - const SvxBoxItem* pBorderItem; + ScDocShell* pDocShell; + ScDocument* pDoc; + SfxPrinter* pPrinter; + OutputDevice* pDev; + FmFormView* pDrawView; + + MapMode aOldPrinterMode; // MapMode vor dem Aufruf + + Point aSrcOffset; // Papier-1/100 mm + Point aOffset; // mit Faktor aus Seitenformat skaliert + USHORT nManualZoom; // Zoom in Preview (Prozent) + BOOL bClearWin; // Ausgabe vorher loeschen + BOOL bUseStyleColor; + BOOL bIsRender; + + SCTAB nPrintTab; + long nPageStart; // Offset fuer erste Seite + long nDocPages; // Seiten im Dokument + + const ScRange* pUserArea; // Selektion, wenn im Dialog eingestellt + + const SfxItemSet* pParamSet; // eingestellte Vorlage + BOOL bState; // aus State-struct erzeugt + + // Parameter aus Vorlage: + USHORT nLeftMargin; + USHORT nTopMargin; + USHORT nRightMargin; + USHORT nBottomMargin; + BOOL bCenterHor; + BOOL bCenterVer; + BOOL bLandscape; + BOOL bSourceRangeValid; + + USHORT nPageUsage; + Size aPageSize; // Drucker-Twips + const SvxBoxItem* pBorderItem; const SvxBrushItem* pBackgroundItem; const SvxShadowItem* pShadowItem; - ScRange aLastSourceRange; - ScPrintHFParam aHdr; - ScPrintHFParam aFtr; - ScPageTableParam aTableParam; - ScPageAreaParam aAreaParam; - - // berechnete Werte: - USHORT nZoom; - BOOL bPrintCurrentTable; - BOOL bMultiArea; - long nTabPages; - long nTotalPages; - - Rectangle aPageRect; // Dokument-Twips - - MapMode aLogicMode; // in DoPrint gesetzt - MapMode aOffsetMode; - MapMode aTwipMode; - double nScaleX; - double nScaleY; - - SCCOL nRepeatStartCol; - SCCOL nRepeatEndCol; - SCROW nRepeatStartRow; - SCROW nRepeatEndRow; - - SCCOL nStartCol; - SCROW nStartRow; - SCCOL nEndCol; - SCROW nEndRow; - - SCCOL* pPageEndX; // Seitenaufteilung + ScRange aLastSourceRange; + ScPrintHFParam aHdr; + ScPrintHFParam aFtr; + ScPageTableParam aTableParam; + ScPageAreaParam aAreaParam; + + // berechnete Werte: + USHORT nZoom; + BOOL bPrintCurrentTable; + BOOL bMultiArea; + long nTabPages; + long nTotalPages; + + Rectangle aPageRect; // Dokument-Twips + + MapMode aLogicMode; // in DoPrint gesetzt + MapMode aOffsetMode; + MapMode aTwipMode; + double nScaleX; + double nScaleY; + + SCCOL nRepeatStartCol; + SCCOL nRepeatEndCol; + SCROW nRepeatStartRow; + SCROW nRepeatEndRow; + + SCCOL nStartCol; + SCROW nStartRow; + SCCOL nEndCol; + SCROW nEndRow; + + SCCOL* pPageEndX; // Seitenaufteilung SCROW* pPageEndY; - ScPageRowEntry* pPageRows; - size_t nPagesX; - size_t nPagesY; - size_t nTotalY; + ScPageRowEntry* pPageRows; + size_t nPagesX; + size_t nPagesY; + size_t nTotalY; - ScHeaderEditEngine* pEditEngine; - SfxItemSet* pEditDefaults; + ScHeaderEditEngine* pEditEngine; + SfxItemSet* pEditDefaults; - ScHeaderFieldData aFieldData; + ScHeaderFieldData aFieldData; - List aNotePosList; // Reihenfolge der Notizen + List aNotePosList; // Reihenfolge der Notizen - ScPageBreakData* pPageData; // zum Eintragen der Umbrueche etc. + ScPageBreakData* pPageData; // zum Eintragen der Umbrueche etc. public: ScPrintFunc( ScDocShell* pShell, SfxPrinter* pNewPrinter, SCTAB nTab, @@ -256,48 +256,48 @@ public: const ScPrintOptions* pOptions ); ~ScPrintFunc(); - static void DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double nPrintFactor, + static void DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double nPrintFactor, const Rectangle& rBound, ScViewData* pViewData, BOOL bMetaFile ); - void SetDrawView( FmFormView* pNew ); + void SetDrawView( FmFormView* pNew ); - void SetOffset( const Point& rOfs ); - void SetManualZoom( USHORT nNewZoom ); - void SetDateTime( const Date& rDate, const Time& rTime ); + void SetOffset( const Point& rOfs ); + void SetManualZoom( USHORT nNewZoom ); + void SetDateTime( const Date& rDate, const Time& rTime ); - void SetClearFlag( BOOL bFlag ); - void SetUseStyleColor( BOOL bFlag ); - void SetRenderFlag( BOOL bFlag ); + void SetClearFlag( BOOL bFlag ); + void SetUseStyleColor( BOOL bFlag ); + void SetRenderFlag( BOOL bFlag ); void SetExclusivelyDrawOleAndDrawObjects();//for printing selected objects without surrounding cell contents - BOOL UpdatePages(); + BOOL UpdatePages(); - void ApplyPrintSettings(); // aus DoPrint() schon gerufen - long DoPrint( const MultiSelection& rPageRanges, + void ApplyPrintSettings(); // aus DoPrint() schon gerufen + long DoPrint( const MultiSelection& rPageRanges, /*long nStartPage, long nDisplayStart, BOOL bDoPrint, SfxProgress* pProgress, ScPreviewLocationData* pLocationData );*/ long nStartPage, long nDisplayStart, BOOL bDoPrint = TRUE, SfxProgress* pProgress = NULL, ScPreviewLocationData* pLocationData = NULL); - // Werte abfragen - sofort + // Werte abfragen - sofort - Size GetPageSize() const { return aPageSize; } - Size GetDataSize() const; - void GetScaleData( Size& rPhysSize, long& rDocHdr, long& rDocFtr ); - long GetFirstPageNo() const { return aTableParam.nFirstPageNo; } + Size GetPageSize() const { return aPageSize; } + Size GetDataSize() const; + void GetScaleData( Size& rPhysSize, long& rDocHdr, long& rDocFtr ); + long GetFirstPageNo() const { return aTableParam.nFirstPageNo; } - // letzte Werte abfragen - nach DoPrint !!! + // letzte Werte abfragen - nach DoPrint !!! - double GetScaleX() const { return nScaleX; } - double GetScaleY() const { return nScaleY; } - long GetTotalPages() const { return nTotalPages; } - USHORT GetZoom() const { return nZoom; } + double GetScaleX() const { return nScaleX; } + double GetScaleY() const { return nScaleY; } + long GetTotalPages() const { return nTotalPages; } + USHORT GetZoom() const { return nZoom; } - void ResetBreaks( SCTAB nTab ); + void ResetBreaks( SCTAB nTab ); - void GetPrintState( ScPrintState& rState ); - BOOL GetLastSourceRange( ScRange& rRange ) const; + void GetPrintState( ScPrintState& rState ); + BOOL GetLastSourceRange( ScRange& rRange ) const; USHORT GetLeftMargin() const{return nLeftMargin;} USHORT GetRightMargin() const{return nRightMargin;} USHORT GetTopMargin() const{return nTopMargin;} @@ -310,55 +310,55 @@ public: ScPrintHFParam GetFooter(){return aFtr;} private: - void Construct( const ScPrintOptions* pOptions ); - void InitParam( const ScPrintOptions* pOptions ); - void CalcZoom( USHORT nRangeNo ); - void CalcPages(); - long CountPages(); - long CountNotePages(); + void Construct( const ScPrintOptions* pOptions ); + void InitParam( const ScPrintOptions* pOptions ); + void CalcZoom( USHORT nRangeNo ); + void CalcPages(); + long CountPages(); + long CountNotePages(); - BOOL AdjustPrintArea( BOOL bNew ); + BOOL AdjustPrintArea( BOOL bNew ); - Size GetDocPageSize(); + Size GetDocPageSize(); - long TextHeight( const EditTextObject* pObject ); - void MakeEditEngine(); - void UpdateHFHeight( ScPrintHFParam& rParam ); + long TextHeight( const EditTextObject* pObject ); + void MakeEditEngine(); + void UpdateHFHeight( ScPrintHFParam& rParam ); - void InitModes(); + void InitModes(); - BOOL IsLeft( long nPageNo ); - BOOL IsMirror( long nPageNo ); - void ReplaceFields( long nPageNo ); // aendert Text in pEditEngine - void MakeTableString(); // setzt aTableStr + BOOL IsLeft( long nPageNo ); + BOOL IsMirror( long nPageNo ); + void ReplaceFields( long nPageNo ); // aendert Text in pEditEngine + void MakeTableString(); // setzt aTableStr - void PrintPage( long nPageNo, + void PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, BOOL bDoPrint, ScPreviewLocationData* pLocationData ); - void PrintArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, + void PrintArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, long nScrX, long nScrY, BOOL bShLeft, BOOL bShTop, BOOL bShRight, BOOL bShBottom ); - void LocateArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, + void LocateArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, long nScrX, long nScrY, BOOL bRepCol, BOOL bRepRow, ScPreviewLocationData& rLocationData ); - void PrintColHdr( SCCOL nX1, SCCOL nX2, long nScrX, long nScrY ); - void PrintRowHdr( SCROW nY1, SCROW nY2, long nScrX, long nScrY ); - void LocateColHdr( SCCOL nX1, SCCOL nX2, long nScrX, long nScrY, + void PrintColHdr( SCCOL nX1, SCCOL nX2, long nScrX, long nScrY ); + void PrintRowHdr( SCROW nY1, SCROW nY2, long nScrX, long nScrY ); + void LocateColHdr( SCCOL nX1, SCCOL nX2, long nScrX, long nScrY, BOOL bRepCol, ScPreviewLocationData& rLocationData ); - void LocateRowHdr( SCROW nY1, SCROW nY2, long nScrX, long nScrY, + void LocateRowHdr( SCROW nY1, SCROW nY2, long nScrX, long nScrY, BOOL bRepRow, ScPreviewLocationData& rLocationData ); - void PrintHF( long nPageNo, BOOL bHeader, long nStartY, + void PrintHF( long nPageNo, BOOL bHeader, long nStartY, BOOL bDoPrint, ScPreviewLocationData* pLocationData ); - long PrintNotes( long nPageNo, long nNoteStart, BOOL bDoPrint, ScPreviewLocationData* pLocationData ); - long DoNotes( long nNoteStart, BOOL bDoPrint, ScPreviewLocationData* pLocationData ); + long PrintNotes( long nPageNo, long nNoteStart, BOOL bDoPrint, ScPreviewLocationData* pLocationData ); + long DoNotes( long nNoteStart, BOOL bDoPrint, ScPreviewLocationData* pLocationData ); - void DrawBorder( long nScrX, long nScrY, long nScrW, long nScrH, + void DrawBorder( long nScrX, long nScrY, long nScrW, long nScrH, const SvxBoxItem* pBorderData, const SvxBrushItem* pBackground, const SvxShadowItem* pShadow ); - void FillPageData(); + void FillPageData(); }; diff --git a/sc/source/ui/inc/privsplt.hxx b/sc/source/ui/inc/privsplt.hxx index f7c9f325c06b..282b02beb139 100644 --- a/sc/source/ui/inc/privsplt.hxx +++ b/sc/source/ui/inc/privsplt.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,7 +27,7 @@ ************************************************************************/ #ifndef SC_PRIVSPLT_HXX -#define SC_PRIVSPLT_HXX +#define SC_PRIVSPLT_HXX #include <vcl/ctrl.hxx> @@ -37,47 +37,47 @@ class ScPrivatSplit : public Control { private: - Link aCtrModifiedLink; - BOOL aMovingFlag; - Pointer aWinPointer; - SC_SPLIT_DIRECTION eScSplit; - short nOldX; - short nOldY; - short nNewX; - short nNewY; - short nMinPos; - short nMaxPos; - Range aXMovingRange; - Range aYMovingRange; - short nDeltaX; - short nDeltaY; + Link aCtrModifiedLink; + BOOL aMovingFlag; + Pointer aWinPointer; + SC_SPLIT_DIRECTION eScSplit; + short nOldX; + short nOldY; + short nNewX; + short nNewY; + short nMinPos; + short nMaxPos; + Range aXMovingRange; + Range aYMovingRange; + short nDeltaX; + short nDeltaY; using Control::ImplInitSettings; - void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); + void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); protected: - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt); + virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt); public: ScPrivatSplit( Window* pWindow, const ResId& rResId, SC_SPLIT_DIRECTION eScSplit); - virtual short GetDeltaX(); - virtual short GetDeltaY(); + virtual short GetDeltaX(); + virtual short GetDeltaY(); virtual void CtrModified(); - void SetYRange(Range cRgeY); + void SetYRange(Range cRgeY); - void MoveSplitTo(Point aPos); + void MoveSplitTo(Point aPos); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void StateChanged( StateChangedType nType ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); void SetCtrModifiedHdl( const Link& rLink ) { aCtrModifiedLink = rLink; } const Link& GetCtrModifiedHdl() const { return aCtrModifiedLink; } diff --git a/sc/source/ui/inc/protectiondlg.hrc b/sc/source/ui/inc/protectiondlg.hrc index 52e57040922c..7bee7725a617 100644 --- a/sc/source/ui/inc/protectiondlg.hrc +++ b/sc/source/ui/inc/protectiondlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/inc/protectiondlg.hxx b/sc/source/ui/inc/protectiondlg.hxx index 9fbedaffad07..44419bc4bf9b 100644 --- a/sc/source/ui/inc/protectiondlg.hxx +++ b/sc/source/ui/inc/protectiondlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx index 773f73679235..c85eb1b6829c 100644 --- a/sc/source/ui/inc/pvfundlg.hxx +++ b/sc/source/ui/inc/pvfundlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -225,8 +225,8 @@ public: virtual short Execute(); - /** - * @return String internal name of the selected field. Note that this may + /** + * @return String internal name of the selected field. Note that this may * be different from the name displayed in the dialog if the field * has a layout name. */ diff --git a/sc/source/ui/inc/pvlaydlg.hxx b/sc/source/ui/inc/pvlaydlg.hxx index d9ae44cca438..56516139aa2a 100644 --- a/sc/source/ui/inc/pvlaydlg.hxx +++ b/sc/source/ui/inc/pvlaydlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/inc/redcom.hxx b/sc/source/ui/inc/redcom.hxx index f24478b96c35..5cc3e8400092 100644 --- a/sc/source/ui/inc/redcom.hxx +++ b/sc/source/ui/inc/redcom.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,9 +38,9 @@ class ScRedComDialog { private: - ScChangeAction *pChangeAction; - ScDocShell *pDocShell; - String aComment; + ScChangeAction *pChangeAction; + ScDocShell *pDocShell; + String aComment; AbstractSvxPostItDialog* pDlg; DECL_LINK( PrevHdl, AbstractSvxPostItDialog* ); @@ -48,8 +48,8 @@ private: protected: - void ReInit(ScChangeAction *); - void SelectCell(); + void ReInit(ScChangeAction *); + void SelectCell(); ScChangeAction *FindPrev(ScChangeAction *pAction); ScChangeAction *FindNext(ScChangeAction *pAction); diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx index 0be78421455b..cc0960306482 100644 --- a/sc/source/ui/inc/reffact.hxx +++ b/sc/source/ui/inc/reffact.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,11 +34,11 @@ #include "dbfunc.hxx" #define DECL_WRAPPER(Class) \ - class Class : public SfxChildWindow \ - { \ - public: \ - Class( Window*, USHORT, SfxBindings*, SfxChildWinInfo* ); \ - SFX_DECL_CHILDWINDOW(Class); \ + class Class : public SfxChildWindow \ + { \ + public: \ + Class( Window*, USHORT, SfxBindings*, SfxChildWinInfo* ); \ + SFX_DECL_CHILDWINDOW(Class); \ }; @@ -68,7 +68,7 @@ DECL_WRAPPER(ScArgumentDlgWrapper) class ScAcceptChgDlgWrapper: public SfxChildWindow { public: - ScAcceptChgDlgWrapper( Window*, + ScAcceptChgDlgWrapper( Window*, USHORT, SfxBindings*, SfxChildWinInfo* ); @@ -81,38 +81,38 @@ class ScAcceptChgDlgWrapper: public SfxChildWindow class ScSimpleRefDlgWrapper: public SfxChildWindow { public: - ScSimpleRefDlgWrapper( Window*, + ScSimpleRefDlgWrapper( Window*, USHORT, SfxBindings*, SfxChildWinInfo* ); SFX_DECL_CHILDWINDOW(Class); - static void SetDefaultPosSize(Point aPos, Size aSize, BOOL bSet=TRUE); - virtual String GetRefString(); - virtual void SetRefString(const String& rStr); - void SetCloseHdl( const Link& rLink ); - void SetUnoLinks( const Link& rDone, const Link& rAbort, + static void SetDefaultPosSize(Point aPos, Size aSize, BOOL bSet=TRUE); + virtual String GetRefString(); + virtual void SetRefString(const String& rStr); + void SetCloseHdl( const Link& rLink ); + void SetUnoLinks( const Link& rDone, const Link& rAbort, const Link& rChange ); void SetFlags( BOOL bCloseOnButtonUp, BOOL bSingleCell, BOOL bMultiSelection ); - static void SetAutoReOpen(BOOL bFlag); + static void SetAutoReOpen(BOOL bFlag); - void StartRefInput(); + void StartRefInput(); }; //<!--Added by PengYunQuan for Validity Cell Range Picker class SC_DLLPUBLIC ScValidityRefChildWin : public SfxChildWindow { - bool m_bVisibleLock:1; - bool m_bFreeWindowLock:1; + bool m_bVisibleLock:1; + bool m_bFreeWindowLock:1; Window * m_pSavedWndParent; -public: +public: ScValidityRefChildWin( Window*, USHORT, SfxBindings*, SfxChildWinInfo* ); - SFX_DECL_CHILDWINDOW(ScValidityRefChildWin); + SFX_DECL_CHILDWINDOW(ScValidityRefChildWin); ~ScValidityRefChildWin(); - bool LockVisible( bool bLock ){ bool bVis = m_bVisibleLock; m_bVisibleLock = bLock; return bVis; } - bool LockFreeWindow( bool bLock ){ bool bFreeWindow = m_bFreeWindowLock; m_bFreeWindowLock = bLock; return bFreeWindow; } - void Hide(){ if( !m_bVisibleLock) SfxChildWindow::Hide(); } + bool LockVisible( bool bLock ){ bool bVis = m_bVisibleLock; m_bVisibleLock = bLock; return bVis; } + bool LockFreeWindow( bool bLock ){ bool bFreeWindow = m_bFreeWindowLock; m_bFreeWindowLock = bLock; return bFreeWindow; } + void Hide(){ if( !m_bVisibleLock) SfxChildWindow::Hide(); } void Show( USHORT nFlags ){ if( !m_bVisibleLock ) SfxChildWindow::Show( nFlags ); } }; //-->Added by PengYunQuan for Validity Cell Range Picker diff --git a/sc/source/ui/inc/refundo.hxx b/sc/source/ui/inc/refundo.hxx index 8abbd5155342..7603e7d9e8b4 100644 --- a/sc/source/ui/inc/refundo.hxx +++ b/sc/source/ui/inc/refundo.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,22 +46,22 @@ class ScUnoRefList; class ScRefUndoData { private: - ScDBCollection* pDBCollection; - ScRangeName* pRangeName; - ScPrintRangeSaver* pPrintRanges; - ScDPCollection* pDPCollection; - ScConditionalFormatList* pCondFormList; - ScDetOpList* pDetOpList; - ScChartListenerCollection* pChartListenerCollection; - ScAreaLinkSaveCollection* pAreaLinks; + ScDBCollection* pDBCollection; + ScRangeName* pRangeName; + ScPrintRangeSaver* pPrintRanges; + ScDPCollection* pDPCollection; + ScConditionalFormatList* pCondFormList; + ScDetOpList* pDetOpList; + ScChartListenerCollection* pChartListenerCollection; + ScAreaLinkSaveCollection* pAreaLinks; ScUnoRefList* pUnoRefs; public: ScRefUndoData( const ScDocument* pDoc ); ~ScRefUndoData(); - void DeleteUnchanged( const ScDocument* pDoc ); - void DoUndo( ScDocument* pDoc, BOOL bUndoRefFirst ); + void DeleteUnchanged( const ScDocument* pDoc ); + void DoUndo( ScDocument* pDoc, BOOL bUndoRefFirst ); }; diff --git a/sc/source/ui/inc/retypepassdlg.hrc b/sc/source/ui/inc/retypepassdlg.hrc index f027b6bc7ded..76f7a1231613 100644 --- a/sc/source/ui/inc/retypepassdlg.hrc +++ b/sc/source/ui/inc/retypepassdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/inc/retypepassdlg.hxx b/sc/source/ui/inc/retypepassdlg.hxx index 92a41599821f..11e7b81ca10c 100644 --- a/sc/source/ui/inc/retypepassdlg.hxx +++ b/sc/source/ui/inc/retypepassdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/inc/rfindlst.hxx b/sc/source/ui/inc/rfindlst.hxx index 03867631aa24..1175d931861e 100644 --- a/sc/source/ui/inc/rfindlst.hxx +++ b/sc/source/ui/inc/rfindlst.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,10 +37,10 @@ struct ScRangeFindData { - ScRange aRef; - USHORT nFlags; - xub_StrLen nSelStart; - xub_StrLen nSelEnd; + ScRange aRef; + USHORT nFlags; + xub_StrLen nSelStart; + xub_StrLen nSelEnd; ScRangeFindData( const ScRange& rR, USHORT nF, xub_StrLen nS, xub_StrLen nE ) : aRef(rR), nFlags(nF), nSelStart(nS), nSelEnd(nE) {} @@ -48,23 +48,23 @@ struct ScRangeFindData class ScRangeFindList { - List aEntries; - String aDocName; - BOOL bHidden; + List aEntries; + String aDocName; + BOOL bHidden; public: ScRangeFindList(const String& rName); ~ScRangeFindList(); - ULONG Count() const { return aEntries.Count(); } - void Insert( ScRangeFindData* pNew ) { aEntries.Insert(pNew, LIST_APPEND); } + ULONG Count() const { return aEntries.Count(); } + void Insert( ScRangeFindData* pNew ) { aEntries.Insert(pNew, LIST_APPEND); } ScRangeFindData* GetObject( ULONG nIndex ) const { return (ScRangeFindData*)aEntries.GetObject(nIndex); } - void SetHidden( BOOL bSet ) { bHidden = bSet; } + void SetHidden( BOOL bSet ) { bHidden = bSet; } - const String& GetDocName() const { return aDocName; } - BOOL IsHidden() const { return bHidden; } + const String& GetDocName() const { return aDocName; } + BOOL IsHidden() const { return bHidden; } static ColorData GetColorName( USHORT nIndex ); }; diff --git a/sc/source/ui/inc/scendlg.hxx b/sc/source/ui/inc/scendlg.hxx index fac5b33220e7..031ab3470f64 100644 --- a/sc/source/ui/inc/scendlg.hxx +++ b/sc/source/ui/inc/scendlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,23 +53,23 @@ public: private: FixedLine aFlName; - Edit aEdName; + Edit aEdName; FixedLine aFlComment; - MultiLineEdit aEdComment; + MultiLineEdit aEdComment; FixedLine aFlOptions; - CheckBox aCbShowFrame; - ColorListBox aLbColor; - //CheckBox aCbPrintFrame; - CheckBox aCbTwoWay; - //CheckBox aCbAttrib; - //CheckBox aCbValue; - CheckBox aCbCopyAll; + CheckBox aCbShowFrame; + ColorListBox aLbColor; + //CheckBox aCbPrintFrame; + CheckBox aCbTwoWay; + //CheckBox aCbAttrib; + //CheckBox aCbValue; + CheckBox aCbCopyAll; CheckBox aCbProtect; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - const String aDefScenarioName; - BOOL bIsEdit; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; + const String aDefScenarioName; + BOOL bIsEdit; DECL_LINK( OkHdl, OKButton * ); DECL_LINK( EnableHdl, CheckBox * ); diff --git a/sc/source/ui/inc/scui_def.hxx b/sc/source/ui/inc/scui_def.hxx index 564b9f6eb362..8fe583383ea3 100644 --- a/sc/source/ui/inc/scui_def.hxx +++ b/sc/source/ui/inc/scui_def.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,28 +32,28 @@ #define SCRET_COLS 0x42 #define SCRET_ROWS 0x43 -#define FDS_OPT_NONE 0 // from filldlg.hxx -#define FDS_OPT_HORZ 1 // from filldlg.hxx -#define FDS_OPT_VERT 2 // from filldlg.hxx +#define FDS_OPT_NONE 0 // from filldlg.hxx +#define FDS_OPT_HORZ 1 // from filldlg.hxx +#define FDS_OPT_VERT 2 // from filldlg.hxx -#define INS_CONT_NOEMPTY 0x0100 //from inscodlg.hxx -#define INS_CONT_TRANS 0x0200 //from inscodlg.hxx -#define INS_CONT_LINK 0x0400 //from inscodlg.hxx +#define INS_CONT_NOEMPTY 0x0100 //from inscodlg.hxx +#define INS_CONT_TRANS 0x0200 //from inscodlg.hxx +#define INS_CONT_LINK 0x0400 //from inscodlg.hxx -#define SC_CELL_SHIFT_DISABLE_DOWN 0x01 //from inscodlg.hxx -#define SC_CELL_SHIFT_DISABLE_RIGHT 0x02 //from inscodlg.hxx +#define SC_CELL_SHIFT_DISABLE_DOWN 0x01 //from inscodlg.hxx +#define SC_CELL_SHIFT_DISABLE_RIGHT 0x02 //from inscodlg.hxx -#define NAME_TOP 1 //from namecrea.hxx -#define NAME_LEFT 2 //from namecrea.hxx -#define NAME_BOTTOM 4 //from namecrea.hxx -#define NAME_RIGHT 8 //from namecrea.hxx +#define NAME_TOP 1 //from namecrea.hxx +#define NAME_LEFT 2 //from namecrea.hxx +#define NAME_BOTTOM 4 //from namecrea.hxx +#define NAME_RIGHT 8 //from namecrea.hxx -#define BTN_PASTE_NAME 100 // from namepast.hxx -#define BTN_PASTE_LIST 101 // from namepast.hxx +#define BTN_PASTE_NAME 100 // from namepast.hxx +#define BTN_PASTE_LIST 101 // from namepast.hxx #define BTN_EXTEND_RANGE 150 #define BTN_CURRENT_SELECTION 151 -#define SCRET_REMOVE 0x42 //from subtdlg.hxx +#define SCRET_REMOVE 0x42 //from subtdlg.hxx #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxx index 5e512e3f8763..9b113ddd5968 100644 --- a/sc/source/ui/inc/scuiasciiopt.hxx +++ b/sc/source/ui/inc/scuiasciiopt.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/inc/scuiautofmt.hxx b/sc/source/ui/inc/scuiautofmt.hxx index 69c5f5cb6bd8..f0bbc720d128 100644 --- a/sc/source/ui/inc/scuiautofmt.hxx +++ b/sc/source/ui/inc/scuiautofmt.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,8 +32,8 @@ class ScAutoFormatDlg : public ModalDialog { public: - ScAutoFormatDlg( Window* pParent, - ScAutoFormat* pAutoFormat, + ScAutoFormatDlg( Window* pParent, + ScAutoFormat* pAutoFormat, const ScAutoFormatData* pSelFormatData, ScDocument* pDoc ); ~ScAutoFormatDlg(); @@ -43,38 +43,38 @@ public: private: FixedLine aFlFormat; - ListBox aLbFormat; - ScAutoFmtPreview* pWndPreview; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - PushButton aBtnAdd; - PushButton aBtnRemove; - MoreButton aBtnMore; + ListBox aLbFormat; + ScAutoFmtPreview* pWndPreview; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; + PushButton aBtnAdd; + PushButton aBtnRemove; + MoreButton aBtnMore; FixedLine aFlFormatting; - CheckBox aBtnNumFormat; - CheckBox aBtnBorder; - CheckBox aBtnFont; - CheckBox aBtnPattern; - CheckBox aBtnAlignment; - CheckBox aBtnAdjust; - PushButton aBtnRename; - String aStrTitle; - String aStrLabel; - String aStrClose; - String aStrDelTitle; - String aStrDelMsg; - String aStrRename; + CheckBox aBtnNumFormat; + CheckBox aBtnBorder; + CheckBox aBtnFont; + CheckBox aBtnPattern; + CheckBox aBtnAlignment; + CheckBox aBtnAdjust; + PushButton aBtnRename; + String aStrTitle; + String aStrLabel; + String aStrClose; + String aStrDelTitle; + String aStrDelMsg; + String aStrRename; //------------------------ - ScAutoFormat* pFormat; - const ScAutoFormatData* pSelFmtData; - USHORT nIndex; - BOOL bCoreDataChanged; - BOOL bFmtInserted; + ScAutoFormat* pFormat; + const ScAutoFormatData* pSelFmtData; + USHORT nIndex; + BOOL bCoreDataChanged; + BOOL bFmtInserted; - void Init (); - void UpdateChecks (); + void Init (); + void UpdateChecks (); //------------------------ DECL_LINK( CheckHdl, Button * ); DECL_LINK( AddHdl, void * ); diff --git a/sc/source/ui/inc/scuiimoptdlg.hxx b/sc/source/ui/inc/scuiimoptdlg.hxx index 605dec3cd7f6..3013e8385e21 100644 --- a/sc/source/ui/inc/scuiimoptdlg.hxx +++ b/sc/source/ui/inc/scuiimoptdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,10 +39,10 @@ class ScDelimiterTable; class ScImportOptionsDlg : public ModalDialog { public: - ScImportOptionsDlg( Window* pParent, + ScImportOptionsDlg( Window* pParent, BOOL bAscii = TRUE, - const ScImportOptions* pOptions = NULL, - const String* pStrTitle = NULL, + const ScImportOptions* pOptions = NULL, + const String* pStrTitle = NULL, BOOL bMultiByte = FALSE, BOOL bOnlyDbtoolsEncodings = FALSE, BOOL bImport = TRUE ); @@ -53,20 +53,20 @@ public: private: FixedLine aFlFieldOpt; - FixedText aFtFont; - SvxTextEncodingBox aLbFont; - FixedText aFtFieldSep; - ComboBox aEdFieldSep; - FixedText aFtTextSep; - ComboBox aEdTextSep; + FixedText aFtFont; + SvxTextEncodingBox aLbFont; + FixedText aFtFieldSep; + ComboBox aEdFieldSep; + FixedText aFtTextSep; + ComboBox aEdTextSep; CheckBox aCbFixed; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - CheckBox aCbShown; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; + CheckBox aCbShown; - ScDelimiterTable* pFieldSepTab; - ScDelimiterTable* pTextSepTab; + ScDelimiterTable* pFieldSepTab; + ScDelimiterTable* pTextSepTab; private: USHORT GetCodeFromCombo( const ComboBox& rEd ) const; diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx index 6c0d3768d7c3..e70e1384b488 100644 --- a/sc/source/ui/inc/scuitphfedit.hxx +++ b/sc/source/ui/inc/scuitphfedit.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,19 +34,19 @@ //=================================================================== enum ScHFEntryId { - eNoneEntry , - ePageEntry , + eNoneEntry , + ePageEntry , ePagesEntry , eSheetEntry , eConfidentialEntry , eFileNamePageEntry , eExtFileNameEntry , - ePageSheetEntry , - ePageFileNameEntry , - ePageExtFileNameEntry , - eUserNameEntry , - eCreatedByEntry , - eEntryCount + ePageSheetEntry , + ePageFileNameEntry , + ePageExtFileNameEntry , + eUserNameEntry , + eCreatedByEntry , + eEntryCount }; class ScHeaderEditEngine; @@ -60,42 +60,42 @@ class ScAccessibleEditObject; class ScHFEditPage : public SfxTabPage { public: - virtual BOOL FillItemSet ( SfxItemSet& rCoreSet ); - virtual void Reset ( const SfxItemSet& rCoreSet ); + virtual BOOL FillItemSet ( SfxItemSet& rCoreSet ); + virtual void Reset ( const SfxItemSet& rCoreSet ); - void SetNumType(SvxNumType eNumType); - void ClearTextAreas(); + void SetNumType(SvxNumType eNumType); + void ClearTextAreas(); protected: - ScHFEditPage( Window* pParent, - USHORT nResId, - const SfxItemSet& rCoreSet, - USHORT nWhich, bool bHeader ); - virtual ~ScHFEditPage(); + ScHFEditPage( Window* pParent, + USHORT nResId, + const SfxItemSet& rCoreSet, + USHORT nWhich, bool bHeader ); + virtual ~ScHFEditPage(); private: - FixedText aFtLeft; - ScEditWindow aWndLeft; - FixedText aFtCenter; - ScEditWindow aWndCenter; - FixedText aFtRight; - ScEditWindow aWndRight; - FixedText maFtDefinedHF; + FixedText aFtLeft; + ScEditWindow aWndLeft; + FixedText aFtCenter; + ScEditWindow aWndCenter; + FixedText aFtRight; + ScEditWindow aWndRight; + FixedText maFtDefinedHF; ListBox maLbDefined; - FixedText maFtCustomHF; - ImageButton aBtnText; - ScExtIButton aBtnFile; - ImageButton aBtnTable; - ImageButton aBtnPage; - ImageButton aBtnLastPage; - ImageButton aBtnDate; - ImageButton aBtnTime; - FixedLine aFlInfo; - FixedInfo aFtInfo; - ScPopupMenu aPopUpFile; - - USHORT nWhich; - String aCmdArr[6]; + FixedText maFtCustomHF; + ImageButton aBtnText; + ScExtIButton aBtnFile; + ImageButton aBtnTable; + ImageButton aBtnPage; + ImageButton aBtnLastPage; + ImageButton aBtnDate; + ImageButton aBtnTime; + FixedLine aFlInfo; + FixedInfo aFtInfo; + ScPopupMenu aPopUpFile; + + USHORT nWhich; + String aCmdArr[6]; private: #ifdef _TPHFEDIT_CXX @@ -119,8 +119,8 @@ private: class ScRightHeaderEditPage : public ScHFEditPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet ); - static USHORT* GetRanges(); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet ); + static USHORT* GetRanges(); private: ScRightHeaderEditPage( Window* pParent, const SfxItemSet& rSet ); @@ -131,8 +131,8 @@ private: class ScLeftHeaderEditPage : public ScHFEditPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet ); - static USHORT* GetRanges(); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet ); + static USHORT* GetRanges(); private: ScLeftHeaderEditPage( Window* pParent, const SfxItemSet& rSet ); @@ -143,8 +143,8 @@ private: class ScRightFooterEditPage : public ScHFEditPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet ); - static USHORT* GetRanges(); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet ); + static USHORT* GetRanges(); private: ScRightFooterEditPage( Window* pParent, const SfxItemSet& rSet ); @@ -155,8 +155,8 @@ private: class ScLeftFooterEditPage : public ScHFEditPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet ); - static USHORT* GetRanges(); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet ); + static USHORT* GetRanges(); private: ScLeftFooterEditPage( Window* pParent, const SfxItemSet& rSet ); diff --git a/sc/source/ui/inc/select.hxx b/sc/source/ui/inc/select.hxx index 7fdd0e780e54..b920c6373833 100644 --- a/sc/source/ui/inc/select.hxx +++ b/sc/source/ui/inc/select.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ #include <vcl/seleng.hxx> -#include "viewdata.hxx" // ScSplitPos +#include "viewdata.hxx" // ScSplitPos // --------------------------------------------------------------------------- @@ -42,76 +42,76 @@ class ScViewData; class ScViewSelectionEngine : public SelectionEngine { private: - ScSplitPos eWhich; + ScSplitPos eWhich; public: ScViewSelectionEngine( Window* pWindow, ScTabView* pView, ScSplitPos eSplitPos ); - ScSplitPos GetWhich() const { return eWhich; } - void SetWhich(ScSplitPos eNew) { eWhich = eNew; } + ScSplitPos GetWhich() const { return eWhich; } + void SetWhich(ScSplitPos eNew) { eWhich = eNew; } }; -class ScViewFunctionSet : public FunctionSet // View (Gridwin / Tastatur) +class ScViewFunctionSet : public FunctionSet // View (Gridwin / Tastatur) { private: - ScViewData* pViewData; - ScViewSelectionEngine* pEngine; + ScViewData* pViewData; + ScViewSelectionEngine* pEngine; - BOOL bAnchor; - BOOL bStarted; - ScAddress aAnchorPos; + BOOL bAnchor; + BOOL bStarted; + ScAddress aAnchorPos; - ScSplitPos GetWhich(); + ScSplitPos GetWhich(); public: ScViewFunctionSet( ScViewData* pNewViewData ); - void SetSelectionEngine( ScViewSelectionEngine* pSelEngine ); + void SetSelectionEngine( ScViewSelectionEngine* pSelEngine ); - void SetAnchor( SCCOL nPosX, SCROW nPosY ); - void SetAnchorFlag( BOOL bSet ); + void SetAnchor( SCCOL nPosX, SCROW nPosY ); + void SetAnchorFlag( BOOL bSet ); - virtual void BeginDrag(); - virtual void CreateAnchor(); - virtual void DestroyAnchor(); - virtual BOOL SetCursorAtPoint( const Point& rPointPixel, BOOL bDontSelectAtCursor = FALSE ); - virtual BOOL IsSelectionAtPoint( const Point& rPointPixel ); - virtual void DeselectAtPoint( const Point& rPointPixel ); - virtual void DeselectAll(); + virtual void BeginDrag(); + virtual void CreateAnchor(); + virtual void DestroyAnchor(); + virtual BOOL SetCursorAtPoint( const Point& rPointPixel, BOOL bDontSelectAtCursor = FALSE ); + virtual BOOL IsSelectionAtPoint( const Point& rPointPixel ); + virtual void DeselectAtPoint( const Point& rPointPixel ); + virtual void DeselectAll(); - BOOL SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScroll ); + BOOL SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScroll ); }; // --------------------------------------------------------------------------- -class ScHeaderFunctionSet : public FunctionSet // Spalten- / Zeilenkoepfe +class ScHeaderFunctionSet : public FunctionSet // Spalten- / Zeilenkoepfe { private: - ScViewData* pViewData; - BOOL bColumn; // Col- / Rowbar - ScSplitPos eWhich; + ScViewData* pViewData; + BOOL bColumn; // Col- / Rowbar + ScSplitPos eWhich; - BOOL bAnchor; - SCCOLROW nCursorPos; + BOOL bAnchor; + SCCOLROW nCursorPos; public: ScHeaderFunctionSet( ScViewData* pNewViewData ); - void SetColumn( BOOL bSet ); - void SetWhich( ScSplitPos eNew ); + void SetColumn( BOOL bSet ); + void SetWhich( ScSplitPos eNew ); - virtual void BeginDrag(); - virtual void CreateAnchor(); - virtual void DestroyAnchor(); - virtual BOOL SetCursorAtPoint( const Point& rPointPixel, BOOL bDontSelectAtCursor = FALSE ); - virtual BOOL IsSelectionAtPoint( const Point& rPointPixel ); - virtual void DeselectAtPoint( const Point& rPointPixel ); - virtual void DeselectAll(); + virtual void BeginDrag(); + virtual void CreateAnchor(); + virtual void DestroyAnchor(); + virtual BOOL SetCursorAtPoint( const Point& rPointPixel, BOOL bDontSelectAtCursor = FALSE ); + virtual BOOL IsSelectionAtPoint( const Point& rPointPixel ); + virtual void DeselectAtPoint( const Point& rPointPixel ); + virtual void DeselectAll(); - void SetAnchorFlag(BOOL bSet) { bAnchor = bSet; } + void SetAnchorFlag(BOOL bSet) { bAnchor = bSet; } }; diff --git a/sc/source/ui/inc/selectionstate.hxx b/sc/source/ui/inc/selectionstate.hxx index f60b334bfed5..7b1addb8eb84 100644 --- a/sc/source/ui/inc/selectionstate.hxx +++ b/sc/source/ui/inc/selectionstate.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/inc/seltrans.hxx b/sc/source/ui/inc/seltrans.hxx index 4fda9372a05e..2ca51d96dfc7 100644 --- a/sc/source/ui/inc/seltrans.hxx +++ b/sc/source/ui/inc/seltrans.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,32 +50,32 @@ enum ScSelectionTransferMode class ScSelectionTransferObj : public TransferableHelper { private: - ScTabView* pView; - ScSelectionTransferMode eMode; - ScTransferObj* pCellData; - ScDrawTransferObj* pDrawData; + ScTabView* pView; + ScSelectionTransferMode eMode; + ScTransferObj* pCellData; + ScDrawTransferObj* pDrawData; ScSelectionTransferObj( ScTabView* pSource, ScSelectionTransferMode eNewMode ); - void CreateCellData(); - void CreateDrawData(); + void CreateCellData(); + void CreateDrawData(); public: // creates an object if the view has a valid selection, // returns NULL otherwise static ScSelectionTransferObj* CreateFromView( ScTabView* pSource ); - virtual ~ScSelectionTransferObj(); - - void ForgetView(); - BOOL StillValid(); - ScTabView* GetView() const { return pView; } + virtual ~ScSelectionTransferObj(); - ScTransferObj* GetCellData(); - ScDrawTransferObj* GetDrawData(); + void ForgetView(); + BOOL StillValid(); + ScTabView* GetView() const { return pView; } + + ScTransferObj* GetCellData(); + ScDrawTransferObj* GetDrawData(); - virtual void AddSupportedFormats(); - virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual void ObjectReleased(); + virtual void AddSupportedFormats(); + virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual void ObjectReleased(); }; #endif diff --git a/sc/source/ui/inc/servobj.hxx b/sc/source/ui/inc/servobj.hxx index 975781f05169..9080aed8d7e2 100644 --- a/sc/source/ui/inc/servobj.hxx +++ b/sc/source/ui/inc/servobj.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,12 +52,12 @@ class ScServerObject : public ::sfx2::SvLinkSource, public SfxListener { private: ScServerObjectSvtListenerForwarder aForwarder; - ScDocShell* pDocSh; - ScRange aRange; - String aItemStr; - BOOL bRefreshListener; + ScDocShell* pDocSh; + ScRange aRange; + String aItemStr; + BOOL bRefreshListener; - void Clear(); + void Clear(); public: ScServerObject( ScDocShell* pShell, const String& rItem ); diff --git a/sc/source/ui/inc/sharedocdlg.hrc b/sc/source/ui/inc/sharedocdlg.hrc index cc38e81bbddb..adf2ed06a31c 100644 --- a/sc/source/ui/inc/sharedocdlg.hrc +++ b/sc/source/ui/inc/sharedocdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/inc/sharedocdlg.hxx b/sc/source/ui/inc/sharedocdlg.hxx index e15fde82102b..47ac9ceac897 100644 --- a/sc/source/ui/inc/sharedocdlg.hxx +++ b/sc/source/ui/inc/sharedocdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/inc/shtabdlg.hxx b/sc/source/ui/inc/shtabdlg.hxx index b4e2c1037509..5734c661e966 100644 --- a/sc/source/ui/inc/shtabdlg.hxx +++ b/sc/source/ui/inc/shtabdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,8 +59,8 @@ public: /** Inserts a string into the ListBox. */ void Insert( const String& rString, BOOL bSelected ); - USHORT GetSelectEntryCount() const; - String GetSelectEntry(USHORT nPos) const; + USHORT GetSelectEntryCount() const; + String GetSelectEntry(USHORT nPos) const; USHORT GetSelectEntryPos(USHORT nPos) const; }; diff --git a/sc/source/ui/inc/simpref.hrc b/sc/source/ui/inc/simpref.hrc index d6fb6d4412eb..058abc26475d 100644 --- a/sc/source/ui/inc/simpref.hrc +++ b/sc/source/ui/inc/simpref.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,10 +28,10 @@ #include "sc.hrc" // -> RID_SCDLG_SIMPLEREF #define BTN_OK 1 -#define BTN_CANCEL 2 -#define BTN_ADD 3 -#define BTN_HELP 4 -#define FT_ASSIGN 10 -#define ED_ASSIGN 11 -#define RB_ASSIGN 12 +#define BTN_CANCEL 2 +#define BTN_ADD 3 +#define BTN_HELP 4 +#define FT_ASSIGN 10 +#define ED_ASSIGN 11 +#define RB_ASSIGN 12 diff --git a/sc/source/ui/inc/simpref.hxx b/sc/source/ui/inc/simpref.hxx index eadc59d90470..34d1165ca689 100644 --- a/sc/source/ui/inc/simpref.hxx +++ b/sc/source/ui/inc/simpref.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,31 +49,31 @@ class ScDocument; class ScSimpleRefDlg: public ScAnyRefDlg { private: - Link aCloseHdl; - Link aDoneHdl; - Link aAbortedHdl; - Link aChangeHdl; - - FixedText aFtAssign; - formula::RefEdit aEdAssign; - formula::RefButton aRbAssign; - - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - - ScViewData* pViewData; - ScDocument* pDoc; - BOOL bRefInputMode; - - ScRange theCurArea; - BOOL bCloseFlag; - BOOL bAutoReOpen; - BOOL bCloseOnButtonUp; - BOOL bSingleCell; + Link aCloseHdl; + Link aDoneHdl; + Link aAbortedHdl; + Link aChangeHdl; + + FixedText aFtAssign; + formula::RefEdit aEdAssign; + formula::RefButton aRbAssign; + + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; + + ScViewData* pViewData; + ScDocument* pDoc; + BOOL bRefInputMode; + + ScRange theCurArea; + BOOL bCloseFlag; + BOOL bAutoReOpen; + BOOL bCloseOnButtonUp; + BOOL bSingleCell; BOOL bMultiSelection; - void Init(); + void Init(); DECL_LINK( CancelBtnHdl, void * ); DECL_LINK( OkBtnHdl, void * ); @@ -81,32 +81,32 @@ private: protected: - virtual void RefInputDone( BOOL bForced = FALSE ); + virtual void RefInputDone( BOOL bForced = FALSE ); public: ScSimpleRefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - ScViewData* ptrViewData ); + ScViewData* ptrViewData ); ~ScSimpleRefDlg(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual BOOL IsRefInputMode() const; - virtual void SetActive(); - virtual BOOL Close(); + virtual BOOL IsRefInputMode() const; + virtual void SetActive(); + virtual BOOL Close(); - void StartRefInput(); + void StartRefInput(); - virtual String GetRefString() const; - virtual void SetRefString(const String &rStr); + virtual String GetRefString() const; + virtual void SetRefString(const String &rStr); virtual void FillInfo(SfxChildWinInfo&) const; - void SetCloseHdl( const Link& rLink ); - void SetUnoLinks( const Link& rDone, const Link& rAbort, + void SetCloseHdl( const Link& rLink ); + void SetUnoLinks( const Link& rDone, const Link& rAbort, const Link& rChange ); void SetFlags( BOOL bSetCloseOnButtonUp, BOOL bSetSingleCell, BOOL bSetMultiSelection ); - void SetAutoReOpen(BOOL bFlag) {bAutoReOpen=bFlag;} + void SetAutoReOpen(BOOL bFlag) {bAutoReOpen=bFlag;} }; diff --git a/sc/source/ui/inc/sizedev.hxx b/sc/source/ui/inc/sizedev.hxx index eb7a251fdd86..5beff55c99f7 100644 --- a/sc/source/ui/inc/sizedev.hxx +++ b/sc/source/ui/inc/sizedev.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,20 +36,20 @@ class ScDocShell; class ScSizeDeviceProvider { - OutputDevice* pDevice; - BOOL bOwner; - double nPPTX; - double nPPTY; - MapMode aOldMapMode; + OutputDevice* pDevice; + BOOL bOwner; + double nPPTX; + double nPPTY; + MapMode aOldMapMode; public: ScSizeDeviceProvider( ScDocShell* pDocSh ); ~ScSizeDeviceProvider(); - OutputDevice* GetDevice() const { return pDevice; } - double GetPPTX() const { return nPPTX; } - double GetPPTY() const { return nPPTY; } - BOOL IsPrinter() const { return !bOwner; } + OutputDevice* GetDevice() const { return pDevice; } + double GetPPTX() const { return nPPTX; } + double GetPPTY() const { return nPPTY; } + BOOL IsPrinter() const { return !bOwner; } }; #endif diff --git a/sc/source/ui/inc/solveroptions.hrc b/sc/source/ui/inc/solveroptions.hrc index e3be150ccd1b..0cf4e05617c3 100644 --- a/sc/source/ui/inc/solveroptions.hrc +++ b/sc/source/ui/inc/solveroptions.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/inc/solveroptions.hxx b/sc/source/ui/inc/solveroptions.hxx index 0d28b9e6f5ea..7a44c1cac6c2 100644 --- a/sc/source/ui/inc/solveroptions.hxx +++ b/sc/source/ui/inc/solveroptions.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/inc/solverutil.hxx b/sc/source/ui/inc/solverutil.hxx index a447cec257fd..ff2c332391c3 100644 --- a/sc/source/ui/inc/solverutil.hxx +++ b/sc/source/ui/inc/solverutil.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/inc/solvrdlg.hrc b/sc/source/ui/inc/solvrdlg.hrc index 7139abd2a5f6..a04fa5aafb22 100644 --- a/sc/source/ui/inc/solvrdlg.hrc +++ b/sc/source/ui/inc/solvrdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,20 +27,20 @@ #include "sc.hrc" // ->RID_SCDLG_SOLVER -#define ED_FORMULACELL 1 -#define ED_TARGETVAL 2 -#define ED_VARCELL 3 -#define FT_FORMULACELL 1 -#define FT_TARGETVAL 2 -#define FT_VARCELL 3 -#define RB_FORMULACELL 1 -#define RB_VARCELL 2 +#define ED_FORMULACELL 1 +#define ED_TARGETVAL 2 +#define ED_VARCELL 3 +#define FT_FORMULACELL 1 +#define FT_TARGETVAL 2 +#define FT_VARCELL 3 +#define RB_FORMULACELL 1 +#define RB_VARCELL 2 #define FL_VARIABLES 1 -#define BTN_OK 1 -#define BTN_CANCEL 2 -#define BTN_HELP 1 -#define STR_INVALIDVAL 1 -#define STR_INVALIDVAR 2 -#define STR_INVALIDFORM 3 -#define STR_NOFORMULA 4 +#define BTN_OK 1 +#define BTN_CANCEL 2 +#define BTN_HELP 1 +#define STR_INVALIDVAL 1 +#define STR_INVALIDVAR 2 +#define STR_INVALIDFORM 3 +#define STR_NOFORMULA 4 diff --git a/sc/source/ui/inc/solvrdlg.hxx b/sc/source/ui/inc/solvrdlg.hxx index a7f4cf8cec0d..6a00a2027dc8 100644 --- a/sc/source/ui/inc/solvrdlg.hxx +++ b/sc/source/ui/inc/solvrdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,51 +58,51 @@ public: ScAddress aCursorPos ); ~ScSolverDlg(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); virtual BOOL IsRefInputMode() const; - virtual void SetActive(); - virtual BOOL Close(); + virtual void SetActive(); + virtual BOOL Close(); private: FixedLine aFlVariables; - FixedText aFtFormulaCell; - formula::RefEdit aEdFormulaCell; - formula::RefButton aRBFormulaCell; + FixedText aFtFormulaCell; + formula::RefEdit aEdFormulaCell; + formula::RefButton aRBFormulaCell; - FixedText aFtTargetVal; - Edit aEdTargetVal; + FixedText aFtTargetVal; + Edit aEdTargetVal; - FixedText aFtVariableCell; - formula::RefEdit aEdVariableCell; - formula::RefButton aRBVariableCell; + FixedText aFtVariableCell; + formula::RefEdit aEdVariableCell; + formula::RefButton aRBVariableCell; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; - ScAddress theFormulaCell; - ScAddress theVariableCell; - String theTargetValStr; + ScAddress theFormulaCell; + ScAddress theVariableCell; + String theTargetValStr; - ScDocument* pDoc; - const SCTAB nCurTab; - formula::RefEdit* pEdActive; - BOOL bDlgLostFocus; - const String errMsgInvalidVar; - const String errMsgInvalidForm; - const String errMsgNoFormula; - const String errMsgInvalidVal; + ScDocument* pDoc; + const SCTAB nCurTab; + formula::RefEdit* pEdActive; + BOOL bDlgLostFocus; + const String errMsgInvalidVar; + const String errMsgInvalidForm; + const String errMsgNoFormula; + const String errMsgInvalidVal; #ifdef _SOLVRDLG_CXX - void Init(); - BOOL CheckTargetValue( String& rStrVal ); - void RaiseError( ScSolverErr eError ); + void Init(); + BOOL CheckTargetValue( String& rStrVal ); + void RaiseError( ScSolverErr eError ); DECL_LINK( BtnHdl, PushButton* ); DECL_LINK( GetFocusHdl, Control* ); DECL_LINK( LoseFocusHdl, Control* ); -#endif // _SOLVERDLG_CXX +#endif // _SOLVERDLG_CXX }; #endif // SC_SOLVRDLG_HXX diff --git a/sc/source/ui/inc/sortdlg.hrc b/sc/source/ui/inc/sortdlg.hrc index d079ea560779..2e55f447778e 100644 --- a/sc/source/ui/inc/sortdlg.hrc +++ b/sc/source/ui/inc/sortdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,33 +35,33 @@ // -> SCSTR_FIELD /* -#define RID_SCDLG_SORT 256 -#define RID_SCPAGE_SORT_FIELDS 257 -#define RID_SCPAGE_SORT_OPTIONS 258 +#define RID_SCDLG_SORT 256 +#define RID_SCPAGE_SORT_FIELDS 257 +#define RID_SCPAGE_SORT_OPTIONS 258 #define RID_SCDLG_SORT_WARNING */ -#define TP_FIELDS 1 -#define TP_OPTIONS 2 +#define TP_FIELDS 1 +#define TP_OPTIONS 2 // TP_SORT_FIELDS: #define FL_SORT1 1 #define FL_SORT2 2 #define FL_SORT3 3 -#define LB_SORT1 4 -#define LB_SORT2 5 -#define LB_SORT3 6 -#define BTN_UP1 7 -#define BTN_UP2 8 -#define BTN_UP3 9 -#define BTN_DOWN1 10 -#define BTN_DOWN2 11 -#define BTN_DOWN3 12 +#define LB_SORT1 4 +#define LB_SORT2 5 +#define LB_SORT3 6 +#define BTN_UP1 7 +#define BTN_UP2 8 +#define BTN_UP3 9 +#define BTN_DOWN1 10 +#define BTN_DOWN2 11 +#define BTN_DOWN3 12 // TP_SORT_OPTIONS: -#define FL_DIRECTION 1 -#define LB_SORT_USER 2 -#define LB_OUTAREA 3 +#define FL_DIRECTION 1 +#define LB_SORT_USER 2 +#define LB_OUTAREA 3 #define ED_OUTAREA 4 //#define FT_AREA_LABEL 5 //#define FT_AREA 6 @@ -78,7 +78,7 @@ #define LB_LANGUAGE 17 #define FT_ALGORITHM 18 #define LB_ALGORITHM 19 -#define BTN_NATURALSORT 20 +#define BTN_NATURALSORT 20 //#define RID_SCDLG_SORT_WARNING #define FT_TEXT 1 diff --git a/sc/source/ui/inc/sortdlg.hxx b/sc/source/ui/inc/sortdlg.hxx index 7812b2a24499..66a43fd4e53b 100644 --- a/sc/source/ui/inc/sortdlg.hxx +++ b/sc/source/ui/inc/sortdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,25 +47,25 @@ class ScSortDlg : public SfxTabDialog { public: - ScSortDlg( Window* pParent, + ScSortDlg( Window* pParent, const SfxItemSet* pArgSet ); ~ScSortDlg(); - void SetHeaders( BOOL bHeaders ); - void SetByRows ( BOOL bByRows ); - BOOL GetHeaders() const; - BOOL GetByRows () const; + void SetHeaders( BOOL bHeaders ); + void SetByRows ( BOOL bByRows ); + BOOL GetHeaders() const; + BOOL GetByRows () const; private: - BOOL bIsHeaders; - BOOL bIsByRows; + BOOL bIsHeaders; + BOOL bIsByRows; }; -inline void ScSortDlg::SetHeaders( BOOL bHeaders ) { bIsHeaders = bHeaders; } -inline void ScSortDlg::SetByRows ( BOOL bByRows ) { bIsByRows = bByRows; } -inline BOOL ScSortDlg::GetHeaders() const { return bIsHeaders; } -inline BOOL ScSortDlg::GetByRows () const { return bIsByRows; } +inline void ScSortDlg::SetHeaders( BOOL bHeaders ) { bIsHeaders = bHeaders; } +inline void ScSortDlg::SetByRows ( BOOL bByRows ) { bIsByRows = bByRows; } +inline BOOL ScSortDlg::GetHeaders() const { return bIsHeaders; } +inline BOOL ScSortDlg::GetByRows () const { return bIsByRows; } class ScSortWarningDlg : public ModalDialog { diff --git a/sc/source/ui/inc/spelldialog.hxx b/sc/source/ui/inc/spelldialog.hxx index d525c62597f1..5a423bc66c87 100644 --- a/sc/source/ui/inc/spelldialog.hxx +++ b/sc/source/ui/inc/spelldialog.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/inc/spelleng.hxx b/sc/source/ui/inc/spelleng.hxx index e351c8ff2212..6c77586f3500 100644 --- a/sc/source/ui/inc/spelleng.hxx +++ b/sc/source/ui/inc/spelleng.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/inc/spellparam.hxx b/sc/source/ui/inc/spellparam.hxx index 77ebb2476091..ab780866b240 100644 --- a/sc/source/ui/inc/spellparam.hxx +++ b/sc/source/ui/inc/spellparam.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/inc/strindlg.hxx b/sc/source/ui/inc/strindlg.hxx index af022443a80a..70700987998f 100644 --- a/sc/source/ui/inc/strindlg.hxx +++ b/sc/source/ui/inc/strindlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ class ScStringInputDlg : public ModalDialog { public: - ScStringInputDlg( Window* pParent, + ScStringInputDlg( Window* pParent, const String& rTitle, const String& rEditTitle, const String& rDefault, @@ -55,9 +55,9 @@ public: private: FixedText aFtEditTitle; Edit aEdInput; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; }; #include <layout/layout-post.hxx> diff --git a/sc/source/ui/inc/styledlg.hrc b/sc/source/ui/inc/styledlg.hrc index 4a954bb3afc1..6ce7ef4ac422 100644 --- a/sc/source/ui/inc/styledlg.hrc +++ b/sc/source/ui/inc/styledlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,9 +30,9 @@ #define TP_BORDER 5 #define TP_BACKGROUND 6 #define TP_PROTECTION 7 -#define TP_PAGE_STD 8 +#define TP_PAGE_STD 8 #define TP_PAGE_HEADER 9 -#define TP_PAGE_FOOTER 10 +#define TP_PAGE_FOOTER 10 #define TP_TABLE 11 #define TP_FONTEFF 12 #define TP_ASIAN 13 diff --git a/sc/source/ui/inc/styledlg.hxx b/sc/source/ui/inc/styledlg.hxx index ed39fbf51b2b..09a6ff191db3 100644 --- a/sc/source/ui/inc/styledlg.hxx +++ b/sc/source/ui/inc/styledlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,14 +41,14 @@ class SfxStyleSheetBase; class ScStyleDlg : public SfxStyleDialog { public: - ScStyleDlg( Window* pParent, - SfxStyleSheetBase& rStyleBase, - USHORT nRscId ); + ScStyleDlg( Window* pParent, + SfxStyleSheetBase& rStyleBase, + USHORT nRscId ); ~ScStyleDlg(); protected: - virtual void PageCreated( USHORT nPageId, SfxTabPage& rTabPage ); - virtual const SfxItemSet* GetRefreshedSet(); + virtual void PageCreated( USHORT nPageId, SfxTabPage& rTabPage ); + virtual const SfxItemSet* GetRefreshedSet(); private: USHORT nDlgRsc; diff --git a/sc/source/ui/inc/submenu.hrc b/sc/source/ui/inc/submenu.hrc index 4e5ad6d28d9e..1a77b40842f7 100644 --- a/sc/source/ui/inc/submenu.hrc +++ b/sc/source/ui/inc/submenu.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -25,44 +25,44 @@ * ************************************************************************/ -// IDs fuer Untermenues +// IDs fuer Untermenues -// 1 ist nicht erlaubt ???? -#define SUBMENU_EDIT 2 -#define SUBMENU_FILL 3 -#define SUBMENU_DELBREAK 4 -#define SUBMENU_VIEW 5 -#define SUBMENU_INSERT 6 -#define SUBMENU_INSBREAK 7 -#define SUBMENU_NAME 8 -#define SUBMENU_INSOBJ 9 -#define SUBMENU_DATA 10 -#define SUBMENU_FILTER 11 -#define SUBMENU_OUTLINE 12 -#define SUBMENU_PIVOT 13 -#define SUBMENU_EXTRA 14 -#define SUBMENU_AUDIT 15 -#define SUBMENU_PROTECT 16 -#define SUBMENU_ROW 17 -#define SUBMENU_COL 18 -#define SUBMENU_TAB 19 -#define SUBMENU_MERGE 20 -#define SUBMENU_AREA 21 -#define SUBMENU_MIRROR 22 -#define SUBMENU_OBJARRANGE 23 -#define SUBMENU_ANCHOR 24 -#define SUBMENU_POPARRANGE 25 -#define SUBMENU_OLEARRANGE 26 -#define SUBMENU_MAIL 27 -#define SUBMENU_OPTIONS 28 -#define SUBMENU_TOOLBARS 29 -#define SUBMENU_GRAPHIC 30 -#define SUBMENU_SPELLING 31 -#define SUBMENU_CELLCONT 32 -#define SUBMENU_OBJMIRROR 33 -#define SUBMENU_OBJALIGN 34 -#define SUBMENU_OBJANCHOR 35 -#define SUBMENU_SENDTO 36 -#define SUBMENU_CHANGES 37 +// 1 ist nicht erlaubt ???? +#define SUBMENU_EDIT 2 +#define SUBMENU_FILL 3 +#define SUBMENU_DELBREAK 4 +#define SUBMENU_VIEW 5 +#define SUBMENU_INSERT 6 +#define SUBMENU_INSBREAK 7 +#define SUBMENU_NAME 8 +#define SUBMENU_INSOBJ 9 +#define SUBMENU_DATA 10 +#define SUBMENU_FILTER 11 +#define SUBMENU_OUTLINE 12 +#define SUBMENU_PIVOT 13 +#define SUBMENU_EXTRA 14 +#define SUBMENU_AUDIT 15 +#define SUBMENU_PROTECT 16 +#define SUBMENU_ROW 17 +#define SUBMENU_COL 18 +#define SUBMENU_TAB 19 +#define SUBMENU_MERGE 20 +#define SUBMENU_AREA 21 +#define SUBMENU_MIRROR 22 +#define SUBMENU_OBJARRANGE 23 +#define SUBMENU_ANCHOR 24 +#define SUBMENU_POPARRANGE 25 +#define SUBMENU_OLEARRANGE 26 +#define SUBMENU_MAIL 27 +#define SUBMENU_OPTIONS 28 +#define SUBMENU_TOOLBARS 29 +#define SUBMENU_GRAPHIC 30 +#define SUBMENU_SPELLING 31 +#define SUBMENU_CELLCONT 32 +#define SUBMENU_OBJMIRROR 33 +#define SUBMENU_OBJALIGN 34 +#define SUBMENU_OBJANCHOR 35 +#define SUBMENU_SENDTO 36 +#define SUBMENU_CHANGES 37 #define SUBMENU_EDIT_TABLE 38 #define MN_TEMPLATES 39 diff --git a/sc/source/ui/inc/subtdlg.hrc b/sc/source/ui/inc/subtdlg.hrc index 66c63df48953..9970491e5df3 100644 --- a/sc/source/ui/inc/subtdlg.hrc +++ b/sc/source/ui/inc/subtdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ */ // TabDialog -#define BTN_REMOVE 1 +#define BTN_REMOVE 1 #define PAGE_GROUP1 2 #define PAGE_GROUP2 3 #define PAGE_GROUP3 4 diff --git a/sc/source/ui/inc/subtdlg.hxx b/sc/source/ui/inc/subtdlg.hxx index 8cff085ae0f0..614889066c09 100644 --- a/sc/source/ui/inc/subtdlg.hxx +++ b/sc/source/ui/inc/subtdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,10 +41,10 @@ class ScSubTotalDlg : public SfxTabDialog { public: - ScSubTotalDlg( Window* pParent, - const SfxItemSet* pArgSet ); + ScSubTotalDlg( Window* pParent, + const SfxItemSet* pArgSet ); private: - PushButton aBtnRemove; + PushButton aBtnRemove; DECL_LINK( RemoveHdl, PushButton * ); }; diff --git a/sc/source/ui/inc/tabbgcolordlg.hxx b/sc/source/ui/inc/tabbgcolordlg.hxx index e46c1e83f7e8..ec8b6f66a7a7 100644 --- a/sc/source/ui/inc/tabbgcolordlg.hxx +++ b/sc/source/ui/inc/tabbgcolordlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/inc/tabcont.hxx b/sc/source/ui/inc/tabcont.hxx index c9892ecbceec..18c583f441b3 100644 --- a/sc/source/ui/inc/tabcont.hxx +++ b/sc/source/ui/inc/tabcont.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,37 +38,37 @@ class ScViewData; // --------------------------------------------------------------------------- -// initial size -#define SC_TABBAR_DEFWIDTH 270 +// initial size +#define SC_TABBAR_DEFWIDTH 270 class ScTabControl : public TabBar, public DropTargetHelper, public DragSourceHelper { private: - ScViewData* pViewData; + ScViewData* pViewData; USHORT nMouseClickPageId; /// Last page ID after mouse button down/up USHORT nSelPageIdByMouse; /// Selected page ID, if selected with mouse BOOL bErrorShown; - void DoDrag( const Region& rRegion ); + void DoDrag( const Region& rRegion ); - USHORT GetMaxId() const; - SCTAB GetPrivatDropPos(const Point& rPos ); + USHORT GetMaxId() const; + SCTAB GetPrivatDropPos(const Point& rPos ); protected: - virtual void Select(); - virtual void Command( const CommandEvent& rCEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void Select(); + virtual void Command( const CommandEvent& rCEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); - virtual long StartRenaming(); - virtual long AllowRenaming(); - virtual void EndRenaming(); + virtual long StartRenaming(); + virtual long AllowRenaming(); + virtual void EndRenaming(); virtual void Mirror(); public: @@ -78,8 +78,8 @@ public: using TabBar::StartDrag; void UpdateInputContext(); - void UpdateStatus(); - void ActivateView(BOOL bActivate); + void UpdateStatus(); + void ActivateView(BOOL bActivate); void SetSheetLayoutRTL( BOOL bSheetRTL ); }; diff --git a/sc/source/ui/inc/tabopdlg.hrc b/sc/source/ui/inc/tabopdlg.hrc index 5ae127b63e73..a2d3b7633cf9 100644 --- a/sc/source/ui/inc/tabopdlg.hrc +++ b/sc/source/ui/inc/tabopdlg.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,24 +27,24 @@ #include "sc.hrc" // ->RID_SCDLG_TABOP -#define ED_FORMULARANGE 1 -#define ED_ROWCELL 2 -#define ED_COLCELL 3 -#define FT_FORMULARANGE 1 -#define FT_ROWCELL 2 -#define FT_COLCELL 3 -#define RB_FORMULARANGE 1 -#define RB_ROWCELL 2 -#define RB_COLCELL 3 +#define ED_FORMULARANGE 1 +#define ED_ROWCELL 2 +#define ED_COLCELL 3 +#define FT_FORMULARANGE 1 +#define FT_ROWCELL 2 +#define FT_COLCELL 3 +#define RB_FORMULARANGE 1 +#define RB_ROWCELL 2 +#define RB_COLCELL 3 #define FL_VARIABLES 1 -#define BTN_OK 1 -#define BTN_CANCEL 2 -#define BTN_HELP 1 -#define STR_NOFORMULA 1 -#define STR_NOCOLROW 2 -#define STR_WRONGFORMULA 3 -#define STR_WRONGROWCOL 4 -#define STR_NOCOLFORMULA 5 -#define STR_NOROWFORMULA 6 +#define BTN_OK 1 +#define BTN_CANCEL 2 +#define BTN_HELP 1 +#define STR_NOFORMULA 1 +#define STR_NOCOLROW 2 +#define STR_WRONGFORMULA 3 +#define STR_WRONGROWCOL 4 +#define STR_NOCOLFORMULA 5 +#define STR_NOROWFORMULA 6 diff --git a/sc/source/ui/inc/tabopdlg.hxx b/sc/source/ui/inc/tabopdlg.hxx index c0f06f060184..0c8a666f5490 100644 --- a/sc/source/ui/inc/tabopdlg.hxx +++ b/sc/source/ui/inc/tabopdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,58 +55,58 @@ class ScTabOpDlg : public ScAnyRefDlg { public: ScTabOpDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - ScDocument* pDocument, - const ScRefAddress& rCursorPos ); + ScDocument* pDocument, + const ScRefAddress& rCursorPos ); ~ScTabOpDlg(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual BOOL IsRefInputMode() const { return TRUE; } - virtual void SetActive(); + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); + virtual BOOL IsRefInputMode() const { return TRUE; } + virtual void SetActive(); - virtual BOOL Close(); + virtual BOOL Close(); private: FixedLine aFlVariables; - FixedText aFtFormulaRange; - formula::RefEdit aEdFormulaRange; - formula::RefButton aRBFormulaRange; - - FixedText aFtRowCell; - formula::RefEdit aEdRowCell; - formula::RefButton aRBRowCell; - - FixedText aFtColCell; - formula::RefEdit aEdColCell; - formula::RefButton aRBColCell; - - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - - ScRefAddress theFormulaCell; - ScRefAddress theFormulaEnd; - ScRefAddress theRowCell; - ScRefAddress theColCell; - - ScDocument* pDoc; - const SCTAB nCurTab; - formula::RefEdit* pEdActive; - BOOL bDlgLostFocus; - const String errMsgNoFormula; - const String errMsgNoColRow; - const String errMsgWrongFormula; - const String errMsgWrongRowCol; - const String errMsgNoColFormula; - const String errMsgNoRowFormula; + FixedText aFtFormulaRange; + formula::RefEdit aEdFormulaRange; + formula::RefButton aRBFormulaRange; + + FixedText aFtRowCell; + formula::RefEdit aEdRowCell; + formula::RefButton aRBRowCell; + + FixedText aFtColCell; + formula::RefEdit aEdColCell; + formula::RefButton aRBColCell; + + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; + + ScRefAddress theFormulaCell; + ScRefAddress theFormulaEnd; + ScRefAddress theRowCell; + ScRefAddress theColCell; + + ScDocument* pDoc; + const SCTAB nCurTab; + formula::RefEdit* pEdActive; + BOOL bDlgLostFocus; + const String errMsgNoFormula; + const String errMsgNoColRow; + const String errMsgWrongFormula; + const String errMsgWrongRowCol; + const String errMsgNoColFormula; + const String errMsgNoRowFormula; #ifdef _TABOPDLG_CXX - void Init(); - void RaiseError( ScTabOpErr eError ); + void Init(); + void RaiseError( ScTabOpErr eError ); DECL_LINK( BtnHdl, PushButton* ); DECL_LINK( GetFocusHdl, Control* ); DECL_LINK( LoseFocusHdl, Control* ); -#endif // _TABOPDLG_CXX +#endif // _TABOPDLG_CXX }; #endif // SC_TABOPDLG_HXX diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx index 22ddc43e52c2..8075370709dc 100644 --- a/sc/source/ui/inc/tabpages.hxx +++ b/sc/source/ui/inc/tabpages.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,43 +38,43 @@ class ScTabPageProtection : public SfxTabPage { public: - static SfxTabPage* Create ( Window* pParent, - const SfxItemSet& rAttrSet ); - static USHORT* GetRanges (); - virtual BOOL FillItemSet ( SfxItemSet& rCoreAttrs ); - virtual void Reset ( const SfxItemSet& ); + static SfxTabPage* Create ( Window* pParent, + const SfxItemSet& rAttrSet ); + static USHORT* GetRanges (); + virtual BOOL FillItemSet ( SfxItemSet& rCoreAttrs ); + virtual void Reset ( const SfxItemSet& ); protected: using SfxTabPage::DeactivatePage; - virtual int DeactivatePage ( SfxItemSet* pSet = NULL ); + virtual int DeactivatePage ( SfxItemSet* pSet = NULL ); private: - ScTabPageProtection( Window* pParent, - const SfxItemSet& rCoreAttrs ); + ScTabPageProtection( Window* pParent, + const SfxItemSet& rCoreAttrs ); ~ScTabPageProtection(); private: FixedLine aFlProtect; - TriStateBox aBtnHideCell; - TriStateBox aBtnProtect; - TriStateBox aBtnHideFormula; - FixedInfo aTxtHint; + TriStateBox aBtnHideCell; + TriStateBox aBtnProtect; + TriStateBox aBtnHideFormula; + FixedInfo aTxtHint; FixedLine aFlPrint; - TriStateBox aBtnHidePrint; - FixedInfo aTxtHint2; + TriStateBox aBtnHidePrint; + FixedInfo aTxtHint2; // aktueller Status: - BOOL bTriEnabled; // wenn vorher Dont-Care - BOOL bDontCare; // alles auf TriState - BOOL bProtect; // einzelne Einstellungen ueber TriState sichern - BOOL bHideForm; - BOOL bHideCell; - BOOL bHidePrint; + BOOL bTriEnabled; // wenn vorher Dont-Care + BOOL bDontCare; // alles auf TriState + BOOL bProtect; // einzelne Einstellungen ueber TriState sichern + BOOL bHideForm; + BOOL bHideCell; + BOOL bHidePrint; // Handler: DECL_LINK( ButtonClickHdl, TriStateBox* pBox ); - void UpdateButtons(); + void UpdateButtons(); }; diff --git a/sc/source/ui/inc/tabpopsh.hxx b/sc/source/ui/inc/tabpopsh.hxx index b9db71011897..241a68d6bfb8 100644 --- a/sc/source/ui/inc/tabpopsh.hxx +++ b/sc/source/ui/inc/tabpopsh.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,8 +43,8 @@ public: ScTabPopShell(SfxItemPool& rItemPool); ~ScTabPopShell(); - void DummyExec( SfxRequest& rReq ); - void DummyState( SfxItemSet& rSet ); + void DummyExec( SfxRequest& rReq ); + void DummyState( SfxItemSet& rSet ); }; diff --git a/sc/source/ui/inc/tabsplit.hxx b/sc/source/ui/inc/tabsplit.hxx index 9a369a0dd36f..52a5b7559ebe 100644 --- a/sc/source/ui/inc/tabsplit.hxx +++ b/sc/source/ui/inc/tabsplit.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,22 +37,22 @@ class ScViewData; class ScTabSplitter : public Splitter { private: - ScViewData* pViewData; - BOOL bFixed; + ScViewData* pViewData; + BOOL bFixed; protected: - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void Splitting( Point& rSplitPos ); + virtual void Splitting( Point& rSplitPos ); public: ScTabSplitter( Window* pParent, WinBits nWinStyle, ScViewData* pData ); ~ScTabSplitter(); - void SetFixed(BOOL bSet); + void SetFixed(BOOL bSet); }; diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index 8a4d79220cfd..e459c93398f0 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,10 +30,10 @@ #include <vcl/scrbar.hxx> -//REMOVE #ifndef SO2_DECL_SVINPLACECLIENT_DEFINED -//REMOVE #define SO2_DECL_SVINPLACECLIENT_DEFINED -//REMOVE SO2_DECL_REF(SvInPlaceClient) -//REMOVE #endif +//REMOVE #ifndef SO2_DECL_SVINPLACECLIENT_DEFINED +//REMOVE #define SO2_DECL_SVINPLACECLIENT_DEFINED +//REMOVE SO2_DECL_REF(SvInPlaceClient) +//REMOVE #endif #include <sfx2/ipclient.hxx> @@ -66,28 +66,28 @@ namespace chart2 { namespace data { struct HighlightedRange; }}}}} -#define SPLIT_HANDLE_SIZE 3 -#define SC_FORCEMODE_NONE 0xff +#define SPLIT_HANDLE_SIZE 3 +#define SC_FORCEMODE_NONE 0xff // --------------------------------------------------------------------------- -// Hilfs - Fenster +// Hilfs - Fenster class ScCornerButton : public Window { private: - ScViewData* pViewData; - BOOL bAdd; + ScViewData* pViewData; + BOOL bAdd; protected: - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void Paint( const Rectangle& rRect ); + virtual void Resize(); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); public: ScCornerButton( Window* pParent, ScViewData* pData, BOOL bAdditional ); ~ScCornerButton(); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void StateChanged( StateChangedType nType ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); }; @@ -96,106 +96,106 @@ public: class ScTabView { private: - Window* pFrameWin; // als erstes !!! - ScViewData aViewData; // muss ganz vorne stehen ! + Window* pFrameWin; // als erstes !!! + ScViewData aViewData; // muss ganz vorne stehen ! - ScViewSelectionEngine* pSelEngine; - ScViewFunctionSet aFunctionSet; + ScViewSelectionEngine* pSelEngine; + ScViewFunctionSet aFunctionSet; ScHeaderSelectionEngine* pHdrSelEng; - ScHeaderFunctionSet aHdrFunc; + ScHeaderFunctionSet aHdrFunc; SfxInPlaceClient* pIPClient; - ScDrawView* pDrawView; + ScDrawView* pDrawView; - Size aFrameSize; // wie bei DoResize uebergeben - Point aBorderPos; + Size aFrameSize; // wie bei DoResize uebergeben + Point aBorderPos; - BOOL bDrawSelMode; // nur Zeichenobjekte selektieren ? + BOOL bDrawSelMode; // nur Zeichenobjekte selektieren ? - FuPoor* pDrawActual; - FuPoor* pDrawOld; + FuPoor* pDrawActual; + FuPoor* pDrawOld; - ScGridWindow* pGridWin[4]; - ScColBar* pColBar[2]; - ScRowBar* pRowBar[2]; - ScOutlineWindow* pColOutline[2]; - ScOutlineWindow* pRowOutline[2]; - ScTabSplitter* pHSplitter; - ScTabSplitter* pVSplitter; - ScTabControl* pTabControl; - ScrollBar aVScrollTop; - ScrollBar aVScrollBottom; // anfangs sichtbar - ScrollBar aHScrollLeft; // anfangs sichtbar - ScrollBar aHScrollRight; - ScCornerButton aCornerButton; - ScCornerButton aTopButton; - ScrollBarBox aScrollBarBox; + ScGridWindow* pGridWin[4]; + ScColBar* pColBar[2]; + ScRowBar* pRowBar[2]; + ScOutlineWindow* pColOutline[2]; + ScOutlineWindow* pRowOutline[2]; + ScTabSplitter* pHSplitter; + ScTabSplitter* pVSplitter; + ScTabControl* pTabControl; + ScrollBar aVScrollTop; + ScrollBar aVScrollBottom; // anfangs sichtbar + ScrollBar aHScrollLeft; // anfangs sichtbar + ScrollBar aHScrollRight; + ScCornerButton aCornerButton; + ScCornerButton aTopButton; + ScrollBarBox aScrollBarBox; - ScHintWindow* pInputHintWindow; // Eingabemeldung bei Gueltigkeit + ScHintWindow* pInputHintWindow; // Eingabemeldung bei Gueltigkeit - ScPageBreakData* pPageBreakData; // fuer Seitenumbruch-Modus - ScHighlightRanges* pHighlightRanges; + ScPageBreakData* pPageBreakData; // fuer Seitenumbruch-Modus + ScHighlightRanges* pHighlightRanges; ScDocument* pBrushDocument; // cell formats for format paint brush SfxItemSet* pDrawBrushSet; // drawing object attributes for paint brush BOOL bLockPaintBrush; // keep for more than one use? - Timer aScrollTimer; - ScGridWindow* pTimerWindow; - MouseEvent aTimerMEvt; + Timer aScrollTimer; + ScGridWindow* pTimerWindow; + MouseEvent aTimerMEvt; - ULONG nTipVisible; + ULONG nTipVisible; - BOOL bDragging; // fuer Scrollbars - long nPrevDragPos; + BOOL bDragging; // fuer Scrollbars + long nPrevDragPos; - BOOL bIsBlockMode; // Block markieren - BOOL bBlockNeg; // wird Markierung aufgehoben? - BOOL bBlockCols; // werden ganze Spalten markiert? - BOOL bBlockRows; // werden ganze Zeilen markiert? + BOOL bIsBlockMode; // Block markieren + BOOL bBlockNeg; // wird Markierung aufgehoben? + BOOL bBlockCols; // werden ganze Spalten markiert? + BOOL bBlockRows; // werden ganze Zeilen markiert? - SCCOL nBlockStartX; + SCCOL nBlockStartX; SCCOL nBlockStartXOrig; - SCCOL nBlockEndX; + SCCOL nBlockEndX; - SCROW nBlockStartY; + SCROW nBlockStartY; SCROW nBlockStartYOrig; - SCROW nBlockEndY; + SCROW nBlockEndY; - SCTAB nBlockStartZ; - SCTAB nBlockEndZ; + SCTAB nBlockStartZ; + SCTAB nBlockEndZ; SCCOL nOldCurX; SCROW nOldCurY; double mfPendingTabBarWidth; // Tab bar width relative to frame window width. - BOOL bMinimized; - BOOL bInUpdateHeader; - BOOL bInActivatePart; - BOOL bInZoomUpdate; - BOOL bMoveIsShift; + BOOL bMinimized; + BOOL bInUpdateHeader; + BOOL bInActivatePart; + BOOL bInZoomUpdate; + BOOL bMoveIsShift; - void Init(); + void Init(); - void DoAddWin( ScGridWindow* pWin ); + void DoAddWin( ScGridWindow* pWin ); - void InitScrollBar( ScrollBar& rScrollBar, long nMaxVal ); - DECL_LINK( ScrollHdl, ScrollBar* ); - DECL_LINK( EndScrollHdl, ScrollBar* ); + void InitScrollBar( ScrollBar& rScrollBar, long nMaxVal ); + DECL_LINK( ScrollHdl, ScrollBar* ); + DECL_LINK( EndScrollHdl, ScrollBar* ); - DECL_LINK( SplitHdl, Splitter* ); - void DoHSplit(long nSplitPos); - void DoVSplit(long nSplitPos); + DECL_LINK( SplitHdl, Splitter* ); + void DoHSplit(long nSplitPos); + void DoVSplit(long nSplitPos); - DECL_LINK( TimerHdl, Timer* ); + DECL_LINK( TimerHdl, Timer* ); - void UpdateVarZoom(); + void UpdateVarZoom(); - static void SetScrollBar( ScrollBar& rScroll, long nRangeMax, long nVisible, long nPos, BOOL bLayoutRTL ); - static long GetScrollBarPos( ScrollBar& rScroll, BOOL bLayoutRTL ); + static void SetScrollBar( ScrollBar& rScroll, long nRangeMax, long nVisible, long nPos, BOOL bLayoutRTL ); + static long GetScrollBarPos( ScrollBar& rScroll, BOOL bLayoutRTL ); void GetPageMoveEndPosition(SCsCOL nMovX, SCsROW nMovY, SCsCOL& rPageX, SCsROW& rPageY); void GetAreaMoveEndPosition(SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, @@ -205,44 +205,44 @@ private: void SkipCursorVertical(SCsCOL& rCurX, SCsROW& rCurY, SCsROW nOldY, SCsROW nMovY); protected: - void UpdateHeaderWidth( const ScVSplitPos* pWhich = NULL, + void UpdateHeaderWidth( const ScVSplitPos* pWhich = NULL, const SCROW* pPosY = NULL ); - void HideTip(); - void ShowRefTip(); + void HideTip(); + void ShowRefTip(); - void ZoomChanged(); - void UpdateShow(); + void ZoomChanged(); + void UpdateShow(); void UpdateVisibleRange(); - void GetBorderSize( SvBorder& rBorder, const Size& rSize ); + void GetBorderSize( SvBorder& rBorder, const Size& rSize ); - void ResetDrawDragMode(); - BOOL IsDrawTextEdit() const; - void DrawEnableAnim(BOOL bSet); - //HMHvoid DrawShowMarkHdl(BOOL bShow); + void ResetDrawDragMode(); + BOOL IsDrawTextEdit() const; + void DrawEnableAnim(BOOL bSet); + //HMHvoid DrawShowMarkHdl(BOOL bShow); - void MakeDrawView( BYTE nForceDesignMode = SC_FORCEMODE_NONE ); + void MakeDrawView( BYTE nForceDesignMode = SC_FORCEMODE_NONE ); - void HideNoteMarker(); + void HideNoteMarker(); - void UpdateIMap( SdrObject* pObj ); + void UpdateIMap( SdrObject* pObj ); public: ScTabView( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ); ~ScTabView(); - void MakeDrawLayer(); + void MakeDrawLayer(); - void HideListBox(); + void HideListBox(); - BOOL HasHintWindow() const { return pInputHintWindow != NULL; } - void RemoveHintWindow(); - void TestHintWindow(); + BOOL HasHintWindow() const { return pInputHintWindow != NULL; } + void RemoveHintWindow(); + void TestHintWindow(); - DECL_LINK( TabBarResize, void* ); + DECL_LINK( TabBarResize, void* ); /** Sets an absolute tab bar width (in pixels). */ - void SetTabBarWidth( long nNewWidth ); + void SetTabBarWidth( long nNewWidth ); /** Sets a relative tab bar width. @param fRelTabBarWidth Tab bar width relative to frame window width (0.0 ... 1.0). */ void SetRelTabBarWidth( double fRelTabBarWidth ); @@ -256,262 +256,262 @@ public: /** Returns the pending tab bar width relative to the frame window width (0.0 ... 1.0). */ double GetPendingRelTabBarWidth() const; - void DoResize( const Point& rOffset, const Size& rSize, BOOL bInner = FALSE ); - void RepeatResize( BOOL bUpdateFix = TRUE ); - void UpdateFixPos(); - Point GetGridOffset() const; + void DoResize( const Point& rOffset, const Size& rSize, BOOL bInner = FALSE ); + void RepeatResize( BOOL bUpdateFix = TRUE ); + void UpdateFixPos(); + Point GetGridOffset() const; - BOOL IsDrawSelMode() const { return bDrawSelMode; } - void SetDrawSelMode(BOOL bNew) { bDrawSelMode = bNew; } + BOOL IsDrawSelMode() const { return bDrawSelMode; } + void SetDrawSelMode(BOOL bNew) { bDrawSelMode = bNew; } - void SetDrawFuncPtr(FuPoor* pFuncPtr) { pDrawActual = pFuncPtr; } - void SetDrawFuncOldPtr(FuPoor* pFuncPtr) { pDrawOld = pFuncPtr; } - FuPoor* GetDrawFuncPtr() { return pDrawActual; } - FuPoor* GetDrawFuncOldPtr() { return pDrawOld; } + void SetDrawFuncPtr(FuPoor* pFuncPtr) { pDrawActual = pFuncPtr; } + void SetDrawFuncOldPtr(FuPoor* pFuncPtr) { pDrawOld = pFuncPtr; } + FuPoor* GetDrawFuncPtr() { return pDrawActual; } + FuPoor* GetDrawFuncOldPtr() { return pDrawOld; } - void DrawDeselectAll(); - void DrawMarkListHasChanged(); - void UpdateAnchorHandles(); + void DrawDeselectAll(); + void DrawMarkListHasChanged(); + void UpdateAnchorHandles(); - ScPageBreakData* GetPageBreakData() { return pPageBreakData; } - ScHighlightRanges* GetHighlightRanges() { return pHighlightRanges; } + ScPageBreakData* GetPageBreakData() { return pPageBreakData; } + ScHighlightRanges* GetHighlightRanges() { return pHighlightRanges; } - void UpdatePageBreakData( BOOL bForcePaint = FALSE ); + void UpdatePageBreakData( BOOL bForcePaint = FALSE ); - void DrawMarkRect( const Rectangle& rRect ); + void DrawMarkRect( const Rectangle& rRect ); - ScViewData* GetViewData() { return &aViewData; } - const ScViewData* GetViewData() const { return &aViewData; } + ScViewData* GetViewData() { return &aViewData; } + const ScViewData* GetViewData() const { return &aViewData; } - ScViewFunctionSet* GetFunctionSet() { return &aFunctionSet; } - ScViewSelectionEngine* GetSelEngine() { return pSelEngine; } + ScViewFunctionSet* GetFunctionSet() { return &aFunctionSet; } + ScViewSelectionEngine* GetSelEngine() { return pSelEngine; } - BOOL SelMouseButtonDown( const MouseEvent& rMEvt ); + BOOL SelMouseButtonDown( const MouseEvent& rMEvt ); - ScDrawView* GetScDrawView() { return pDrawView; } - SdrView* GetSdrView(); // gegen CLOKs + ScDrawView* GetScDrawView() { return pDrawView; } + SdrView* GetSdrView(); // gegen CLOKs - BOOL IsMinimized() const { return bMinimized; } + BOOL IsMinimized() const { return bMinimized; } - void TabChanged(); - void SetZoom( const Fraction& rNewX, const Fraction& rNewY, BOOL bAll ); + void TabChanged(); + void SetZoom( const Fraction& rNewX, const Fraction& rNewY, BOOL bAll ); SC_DLLPUBLIC void RefreshZoom(); - void SetPagebreakMode( BOOL bSet ); + void SetPagebreakMode( BOOL bSet ); - void UpdateLayerLocks(); + void UpdateLayerLocks(); - void UpdateDrawTextOutliner(); - void DigitLanguageChanged(); + void UpdateDrawTextOutliner(); + void DigitLanguageChanged(); - void UpdateInputLine(); + void UpdateInputLine(); - void InitRefMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ScRefType eType, + void InitRefMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ScRefType eType, BOOL bPaint = TRUE ); - void DoneRefMode( BOOL bContinue = FALSE ); - void UpdateRef( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ ); - void StopRefMode(); + void DoneRefMode( BOOL bContinue = FALSE ); + void UpdateRef( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ ); + void StopRefMode(); - void StopMarking(); - void FakeButtonUp( ScSplitPos eWhich ); + void StopMarking(); + void FakeButtonUp( ScSplitPos eWhich ); - Window* GetActiveWin(); - Window* GetWindowByPos( ScSplitPos ePos ); + Window* GetActiveWin(); + Window* GetWindowByPos( ScSplitPos ePos ); - ScSplitPos FindWindow( Window* pWindow ) const; + ScSplitPos FindWindow( Window* pWindow ) const; - void SetActivePointer( const Pointer& rPointer ); + void SetActivePointer( const Pointer& rPointer ); - void ActiveGrabFocus(); + void ActiveGrabFocus(); - void ClickCursor( SCCOL nPosX, SCROW nPosY, BOOL bControl ); + void ClickCursor( SCCOL nPosX, SCROW nPosY, BOOL bControl ); - SC_DLLPUBLIC void SetCursor( SCCOL nPosX, SCROW nPosY, BOOL bNew = FALSE ); + SC_DLLPUBLIC void SetCursor( SCCOL nPosX, SCROW nPosY, BOOL bNew = FALSE ); - SC_DLLPUBLIC void CellContentChanged(); - void SelectionChanged(); - void CursorPosChanged(); - void UpdateInputContext(); + SC_DLLPUBLIC void CellContentChanged(); + void SelectionChanged(); + void CursorPosChanged(); + void UpdateInputContext(); - void CheckSelectionTransfer(); + void CheckSelectionTransfer(); - void InvertHorizontal( ScVSplitPos eWhich, long nDragPos ); - void InvertVertical( ScHSplitPos eWhich, long nDragPos ); + void InvertHorizontal( ScVSplitPos eWhich, long nDragPos ); + void InvertVertical( ScHSplitPos eWhich, long nDragPos ); - Point GetInsertPos(); + Point GetInsertPos(); Point GetChartInsertPos( const Size& rSize, const ScRange& rCellRange ); Point GetChartDialogPos( const Size& rDialogSize, const Rectangle& rLogicChart ); - void UpdateAutoFillMark(); + void UpdateAutoFillMark(); - void HideCursor(); // nur aktiver Teil - void ShowCursor(); - void HideAllCursors(); - void ShowAllCursors(); + void HideCursor(); // nur aktiver Teil + void ShowCursor(); + void HideAllCursors(); + void ShowAllCursors(); - void AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, + void AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, const ScSplitPos* pWhich = NULL ); SvxZoomType GetZoomType() const; void SetZoomType( SvxZoomType eNew, BOOL bAll ); - USHORT CalcZoom( SvxZoomType eType, USHORT nOldZoom ); + USHORT CalcZoom( SvxZoomType eType, USHORT nOldZoom ); -// void CalcZoom( SvxZoomType eType, USHORT& rZoom, SCCOL& rCol, SCROW& rRow ); +// void CalcZoom( SvxZoomType eType, USHORT& rZoom, SCCOL& rCol, SCROW& rRow ); sal_Bool HasPageFieldDataAtCursor() const; - void StartDataSelect(); + void StartDataSelect(); - // MoveCursorAbs - absolut - // MoveCursorRel - einzelne Zellen - // MoveCursorPage - Bildschirmseite - // MoveCursorArea - Datenblock - // MoveCursorEnd - links oben / benutzter Bereich + // MoveCursorAbs - absolut + // MoveCursorRel - einzelne Zellen + // MoveCursorPage - Bildschirmseite + // MoveCursorArea - Datenblock + // MoveCursorEnd - links oben / benutzter Bereich - SC_DLLPUBLIC void MoveCursorAbs( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, + SC_DLLPUBLIC void MoveCursorAbs( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, BOOL bShift, BOOL bControl, BOOL bKeepOld = FALSE, BOOL bKeepSel = FALSE ); - void MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, + void MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, BOOL bShift, BOOL bKeepSel = FALSE ); - void MoveCursorPage( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, + void MoveCursorPage( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, BOOL bShift, BOOL bKeepSel = FALSE ); - void MoveCursorArea( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, + void MoveCursorArea( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, BOOL bShift, BOOL bKeepSel = FALSE ); - void MoveCursorEnd( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, + void MoveCursorEnd( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, BOOL bShift, BOOL bKeepSel = FALSE ); - void MoveCursorScreen( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, BOOL bShift ); + void MoveCursorScreen( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, BOOL bShift ); - void MoveCursorEnter( BOOL bShift ); // Shift fuer Richtung (kein Markieren) + void MoveCursorEnter( BOOL bShift ); // Shift fuer Richtung (kein Markieren) BOOL MoveCursorKeyInput( const KeyEvent& rKeyEvent ); - void FindNextUnprot( BOOL bShift, BOOL bInSelection = TRUE ); + void FindNextUnprot( BOOL bShift, BOOL bInSelection = TRUE ); SC_DLLPUBLIC void SetTabNo( SCTAB nTab, BOOL bNew = FALSE, BOOL bExtendSelection = FALSE ); void SelectNextTab( short nDir, BOOL bExtendSelection = FALSE ); - void ActivateView( BOOL bActivate, BOOL bFirst ); - void ActivatePart( ScSplitPos eWhich ); - BOOL IsInActivatePart() const { return bInActivatePart; } + void ActivateView( BOOL bActivate, BOOL bFirst ); + void ActivatePart( ScSplitPos eWhich ); + BOOL IsInActivatePart() const { return bInActivatePart; } - void SetTimer( ScGridWindow* pWin, const MouseEvent& rMEvt ); - void ResetTimer(); + void SetTimer( ScGridWindow* pWin, const MouseEvent& rMEvt ); + void ResetTimer(); - void ScrollX( long nDeltaX, ScHSplitPos eWhich, BOOL bUpdBars = TRUE ); - void ScrollY( long nDeltaY, ScVSplitPos eWhich, BOOL bUpdBars = TRUE ); - SC_DLLPUBLIC void ScrollLines( long nDeltaX, long nDeltaY ); // aktives + void ScrollX( long nDeltaX, ScHSplitPos eWhich, BOOL bUpdBars = TRUE ); + void ScrollY( long nDeltaY, ScVSplitPos eWhich, BOOL bUpdBars = TRUE ); + SC_DLLPUBLIC void ScrollLines( long nDeltaX, long nDeltaY ); // aktives - BOOL ScrollCommand( const CommandEvent& rCEvt, ScSplitPos ePos ); + BOOL ScrollCommand( const CommandEvent& rCEvt, ScSplitPos ePos ); - void ScrollToObject( SdrObject* pDrawObj ); - void MakeVisible( const Rectangle& rHMMRect ); + void ScrollToObject( SdrObject* pDrawObj ); + void MakeVisible( const Rectangle& rHMMRect ); // Zeichnen - void InvertBlockMark(SCCOL nBlockStartX, SCROW nBlockStartY, + void InvertBlockMark(SCCOL nBlockStartX, SCROW nBlockStartY, SCCOL nBlockEndX, SCROW nBlockEndY); - void PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, + void PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, ScUpdateMode eMode = SC_UPDATE_ALL ); - void PaintGrid(); + void PaintGrid(); - void PaintTopArea( SCCOL nStartCol, SCCOL nEndCol ); - void PaintTop(); + void PaintTopArea( SCCOL nStartCol, SCCOL nEndCol ); + void PaintTop(); - void PaintLeftArea( SCROW nStartRow, SCROW nEndRow ); - void PaintLeft(); + void PaintLeftArea( SCROW nStartRow, SCROW nEndRow ); + void PaintLeft(); - BOOL PaintExtras(); + BOOL PaintExtras(); - void RecalcPPT(); + void RecalcPPT(); - void CreateAnchorHandles(SdrHdlList& rHdl, const ScAddress& rAddress); + void CreateAnchorHandles(SdrHdlList& rHdl, const ScAddress& rAddress); void UpdateCopySourceOverlay(); void UpdateSelectionOverlay(); void UpdateShrinkOverlay(); void UpdateAllOverlays(); - void UpdateFormulas(); - void InterpretVisible(); - void CheckNeedsRepaint(); + void UpdateFormulas(); + void InterpretVisible(); + void CheckNeedsRepaint(); - void PaintRangeFinder( long nNumber = -1 ); - void AddHighlightRange( const ScRange& rRange, const Color& rColor ); - void ClearHighlightRanges(); + void PaintRangeFinder( long nNumber = -1 ); + void AddHighlightRange( const ScRange& rRange, const Color& rColor ); + void ClearHighlightRanges(); - void DoChartSelection( const ::com::sun::star::uno::Sequence< + void DoChartSelection( const ::com::sun::star::uno::Sequence< ::com::sun::star::chart2::data::HighlightedRange > & rHilightRanges ); - long GetGridWidth( ScHSplitPos eWhich ); - long GetGridHeight( ScVSplitPos eWhich ); + long GetGridWidth( ScHSplitPos eWhich ); + long GetGridHeight( ScVSplitPos eWhich ); - void UpdateScrollBars(); - void SetNewVisArea(); + void UpdateScrollBars(); + void SetNewVisArea(); - void InvalidateAttribs(); + void InvalidateAttribs(); - void MakeEditView( ScEditEngineDefaulter* pEngine, SCCOL nCol, SCROW nRow ); - void KillEditView( BOOL bNoPaint ); - void UpdateEditView(); + void MakeEditView( ScEditEngineDefaulter* pEngine, SCCOL nCol, SCROW nRow ); + void KillEditView( BOOL bNoPaint ); + void UpdateEditView(); - // Bloecke + // Bloecke - void SelectAll( BOOL bContinue = FALSE ); - void SelectAllTables(); + void SelectAll( BOOL bContinue = FALSE ); + void SelectAllTables(); void DeselectAllTables(); - void MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, + void MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, BOOL bCols = FALSE, BOOL bRows = FALSE, BOOL bCellSelection = FALSE ); - void InitBlockMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, + void InitBlockMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, BOOL bTestNeg = FALSE, BOOL bCols = FALSE, BOOL bRows = FALSE ); - void InitOwnBlockMode(); - void DoneBlockMode( BOOL bContinue = FALSE ); + void InitOwnBlockMode(); + void DoneBlockMode( BOOL bContinue = FALSE ); - BOOL IsBlockMode() const { return bIsBlockMode; } + BOOL IsBlockMode() const { return bIsBlockMode; } void ExpandBlock(SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode); void ExpandBlockPage(SCsCOL nMovX, SCsROW nMovY); void ExpandBlockArea(SCsCOL nMovX, SCsROW nMovY); - void MarkColumns(); - void MarkRows(); - void MarkDataArea( BOOL bIncludeCursor = TRUE ); - void MarkMatrixFormula(); - void Unmark(); + void MarkColumns(); + void MarkRows(); + void MarkDataArea( BOOL bIncludeCursor = TRUE ); + void MarkMatrixFormula(); + void Unmark(); void MarkRange( const ScRange& rRange, BOOL bSetCursor = TRUE, BOOL bContinue = FALSE ); - BOOL IsMarking( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; + BOOL IsMarking( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; - void PaintMarks( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); - void PaintBlock( BOOL bReset = FALSE ); + void PaintMarks( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); + void PaintBlock( BOOL bReset = FALSE ); void SetMarkData( const ScMarkData& rNew ); void MarkDataChanged(); - void LockModifiers( USHORT nModifiers ); - USHORT GetLockedModifiers() const; - void ViewOptionsHasChanged( BOOL bHScrollChanged, + void LockModifiers( USHORT nModifiers ); + USHORT GetLockedModifiers() const; + void ViewOptionsHasChanged( BOOL bHScrollChanged, BOOL bGraphicsChanged = FALSE); - Point GetMousePosPixel(); + Point GetMousePosPixel(); - void SnapSplitPos( Point& rScreenPosPixel ); - void FreezeSplitters( BOOL bFreeze ); - void RemoveSplit(); - void SplitAtCursor(); - void SplitAtPixel( const Point& rPixel, BOOL bHor, BOOL bVer ); - void InvalidateSplit(); + void SnapSplitPos( Point& rScreenPosPixel ); + void FreezeSplitters( BOOL bFreeze ); + void RemoveSplit(); + void SplitAtCursor(); + void SplitAtPixel( const Point& rPixel, BOOL bHor, BOOL bVer ); + void InvalidateSplit(); - void ErrorMessage( USHORT nGlobStrId ); - Window* GetParentOrChild( USHORT nChildId ); + void ErrorMessage( USHORT nGlobStrId ); + Window* GetParentOrChild( USHORT nChildId ); - void EnableRefInput(BOOL bFlag=TRUE); + void EnableRefInput(BOOL bFlag=TRUE); - Window* GetFrameWin() const { return pFrameWin; } + Window* GetFrameWin() const { return pFrameWin; } BOOL HasPaintBrush() const { return pBrushDocument || pDrawBrushSet; } ScDocument* GetBrushDocument() const { return pBrushDocument; } diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index b4685657f577..1834959121c6 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,9 +34,9 @@ #include <sfx2/viewfac.hxx> #include <editeng/svxenum.hxx> #include "scdllapi.h" -#include "dbfunc.hxx" // -> tabview +#include "dbfunc.hxx" // -> tabview #include "target.hxx" -#include "rangelst.hxx" // ScRangeListRef +#include "rangelst.hxx" // ScRangeListRef #include "shellids.hxx" #include "tabprotection.hxx" // for ScPasswordHash @@ -101,92 +101,92 @@ enum ObjectSelectionType class ScTabViewShell: public SfxViewShell, public ScDBFunc { private: - static USHORT nInsertCtrlState; - static USHORT nInsCellsCtrlState; - static USHORT nInsObjCtrlState; + static USHORT nInsertCtrlState; + static USHORT nInsCellsCtrlState; + static USHORT nInsObjCtrlState; SvxHtmlOptions aHTMLOpt; - ObjectSelectionType eCurOST; - USHORT nDrawSfxId; - USHORT nCtrlSfxId; - USHORT nFormSfxId; + ObjectSelectionType eCurOST; + USHORT nDrawSfxId; + USHORT nCtrlSfxId; + USHORT nFormSfxId; String sDrawCustom; // current custom shape type - ScDrawShell* pDrawShell; - ScDrawTextObjectBar* pDrawTextShell; - ScEditShell* pEditShell; - ScPivotShell* pPivotShell; - ScAuditingShell* pAuditingShell; - ScDrawFormShell* pDrawFormShell; - ScCellShell* pCellShell; - ScOleObjectShell* pOleObjectShell; - ScChartShell* pChartShell; - ScGraphicShell* pGraphicShell; - ScMediaShell* pMediaShell; - ScPageBreakShell* pPageBreakShell; - svx::ExtrusionBar* pExtrusionBarShell; - svx::FontworkBar* pFontworkBarShell; - - FmFormShell* pFormShell; - - ScInputHandler* pInputHandler; // fuer OLE-Eingabezeile - - SvxBorderLine* pCurFrameLine; + ScDrawShell* pDrawShell; + ScDrawTextObjectBar* pDrawTextShell; + ScEditShell* pEditShell; + ScPivotShell* pPivotShell; + ScAuditingShell* pAuditingShell; + ScDrawFormShell* pDrawFormShell; + ScCellShell* pCellShell; + ScOleObjectShell* pOleObjectShell; + ScChartShell* pChartShell; + ScGraphicShell* pGraphicShell; + ScMediaShell* pMediaShell; + ScPageBreakShell* pPageBreakShell; + svx::ExtrusionBar* pExtrusionBarShell; + svx::FontworkBar* pFontworkBarShell; + + FmFormShell* pFormShell; + + ScInputHandler* pInputHandler; // fuer OLE-Eingabezeile + + SvxBorderLine* pCurFrameLine; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor > xDisProvInterceptor; - Point aWinPos; + Point aWinPos; - ScTabViewTarget aTarget; - ScArea* pPivotSource; - ScDPObject* pDialogDPObject; + ScTabViewTarget aTarget; + ScArea* pPivotSource; + ScDPObject* pDialogDPObject; ScNavigatorSettings* pNavSettings; // used in first Activate - BOOL bFirstActivate; - - BOOL bActiveDrawSh; - BOOL bActiveDrawTextSh; - BOOL bActivePivotSh; - BOOL bActiveAuditingSh; - BOOL bActiveDrawFormSh; - BOOL bActiveOleObjectSh; - BOOL bActiveChartSh; - BOOL bActiveGraphicSh; - BOOL bActiveMediaSh; - BOOL bActiveEditSh; + BOOL bFirstActivate; + + BOOL bActiveDrawSh; + BOOL bActiveDrawTextSh; + BOOL bActivePivotSh; + BOOL bActiveAuditingSh; + BOOL bActiveDrawFormSh; + BOOL bActiveOleObjectSh; + BOOL bActiveChartSh; + BOOL bActiveGraphicSh; + BOOL bActiveMediaSh; + BOOL bActiveEditSh; BOOL bFormShellAtTop; // does the FormShell need to be on top? - BOOL bDontSwitch; // EditShell nicht abschalten - BOOL bInFormatDialog; // fuer GetSelectionText - BOOL bPrintSelected; // for result of SvxPrtQryBox + BOOL bDontSwitch; // EditShell nicht abschalten + BOOL bInFormatDialog; // fuer GetSelectionText + BOOL bPrintSelected; // for result of SvxPrtQryBox - BOOL bReadOnly; // um Status-Aenderungen zu erkennen + BOOL bReadOnly; // um Status-Aenderungen zu erkennen - SbxObject* pScSbxObject; + SbxObject* pScSbxObject; - BOOL bChartAreaValid; // wenn Chart aufgezogen wird - String aEditChartName; - ScRangeListRef aChartSource; - Rectangle aChartPos; - SCTAB nChartDestTab; - USHORT nCurRefDlgId; + BOOL bChartAreaValid; // wenn Chart aufgezogen wird + String aEditChartName; + ScRangeListRef aChartSource; + Rectangle aChartPos; + SCTAB nChartDestTab; + USHORT nCurRefDlgId; - SfxBroadcaster* pAccessibilityBroadcaster; + SfxBroadcaster* pAccessibilityBroadcaster; - static const int MASTERENUMCOMMANDS = 6; - String aCurrShapeEnumCommand[ MASTERENUMCOMMANDS ]; + static const int MASTERENUMCOMMANDS = 6; + String aCurrShapeEnumCommand[ MASTERENUMCOMMANDS ]; private: - void Construct( BYTE nForceDesignMode = SC_FORCEMODE_NONE ); + void Construct( BYTE nForceDesignMode = SC_FORCEMODE_NONE ); - SfxShell* GetMySubShell() const; + SfxShell* GetMySubShell() const; - void DoReadUserData( const String& rData ); + void DoReadUserData( const String& rData ); void DoReadUserDataSequence( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rSettings ); @@ -198,30 +198,30 @@ private: DECL_LINK( HtmlOptionsHdl, void * ); protected: - virtual void Activate(BOOL bMDI); - virtual void Deactivate(BOOL bMDI); - virtual USHORT PrepareClose( BOOL bUI = TRUE, BOOL bForBrowsing = FALSE ); + virtual void Activate(BOOL bMDI); + virtual void Deactivate(BOOL bMDI); + virtual USHORT PrepareClose( BOOL bUI = TRUE, BOOL bForBrowsing = FALSE ); - virtual void ShowCursor(bool bOn); + virtual void ShowCursor(bool bOn); - virtual void Move(); // Benachrichtigung + virtual void Move(); // Benachrichtigung - virtual void AdjustPosSizePixel( const Point &rPos, const Size &rSize ); // alt + virtual void AdjustPosSizePixel( const Point &rPos, const Size &rSize ); // alt - virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ); // neu - virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ); - virtual void SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY ); + virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ); // neu + virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ); + virtual void SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY ); - virtual void QueryObjAreaPixel( Rectangle& rRect ) const; + virtual void QueryObjAreaPixel( Rectangle& rRect ) const; - virtual Size GetOptimalSizePixel() const; + virtual Size GetOptimalSizePixel() const; virtual String GetSelectionText( BOOL bWholeWord ); - virtual BOOL HasSelection( BOOL bText ) const; + virtual BOOL HasSelection( BOOL bText ) const; virtual String GetDescription() const; - virtual void WriteUserData(String &, BOOL bBrowse = FALSE); - virtual void ReadUserData(const String &, BOOL bBrowse = FALSE); + virtual void WriteUserData(String &, BOOL bBrowse = FALSE); + virtual void ReadUserData(const String &, BOOL bBrowse = FALSE); virtual void WriteUserDataSequence (::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); virtual void ReadUserDataSequence (const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); @@ -242,181 +242,181 @@ public: // aus einer allgemeinen Shell konstruieren und // soviel wie moeglich uebernehmen (SliderPos etc.): - ScTabViewShell( SfxViewFrame* pViewFrame, - SfxViewShell* pOldSh ); + ScTabViewShell( SfxViewFrame* pViewFrame, + SfxViewShell* pOldSh ); - virtual ~ScTabViewShell(); + virtual ~ScTabViewShell(); SC_DLLPUBLIC Window* GetDialogParent(); bool IsRefInputMode() const; - void ExecuteInputDirect(); + void ExecuteInputDirect(); - ScInputHandler* GetInputHandler() const; - void UpdateInputHandler( BOOL bForce = FALSE, BOOL bStopEditing = TRUE ); + ScInputHandler* GetInputHandler() const; + void UpdateInputHandler( BOOL bForce = FALSE, BOOL bStopEditing = TRUE ); void UpdateInputHandlerCellAdjust( SvxCellHorJustify eJust ); - BOOL TabKeyInput(const KeyEvent& rKEvt); - BOOL SfxKeyInput(const KeyEvent& rKEvt); + BOOL TabKeyInput(const KeyEvent& rKEvt); + BOOL SfxKeyInput(const KeyEvent& rKEvt); - void SetActive(); + void SetActive(); - SvxBorderLine* GetDefaultFrameLine() const { return pCurFrameLine; } - void SetDefaultFrameLine(const SvxBorderLine* pLine ); + SvxBorderLine* GetDefaultFrameLine() const { return pCurFrameLine; } + void SetDefaultFrameLine(const SvxBorderLine* pLine ); - SC_DLLPUBLIC void Execute( SfxRequest& rReq ); - SC_DLLPUBLIC void GetState( SfxItemSet& rSet ); + SC_DLLPUBLIC void Execute( SfxRequest& rReq ); + SC_DLLPUBLIC void GetState( SfxItemSet& rSet ); - void ExecuteTable( SfxRequest& rReq ); - void GetStateTable( SfxItemSet& rSet ); + void ExecuteTable( SfxRequest& rReq ); + void GetStateTable( SfxItemSet& rSet ); - void WindowChanged(); - void ExecDraw(SfxRequest&); - void ExecDrawIns(SfxRequest& rReq); - void GetDrawState(SfxItemSet &rSet); - void GetDrawInsState(SfxItemSet &rSet); - void ExecGallery(SfxRequest& rReq); // StarGallery - void GetGalleryState(SfxItemSet& rSet); + void WindowChanged(); + void ExecDraw(SfxRequest&); + void ExecDrawIns(SfxRequest& rReq); + void GetDrawState(SfxItemSet &rSet); + void GetDrawInsState(SfxItemSet &rSet); + void ExecGallery(SfxRequest& rReq); // StarGallery + void GetGalleryState(SfxItemSet& rSet); - void ExecChildWin(SfxRequest& rReq); - void GetChildWinState( SfxItemSet& rSet ); + void ExecChildWin(SfxRequest& rReq); + void GetChildWinState( SfxItemSet& rSet ); - void ExecImageMap( SfxRequest& rReq ); - void GetImageMapState( SfxItemSet& rSet ); + void ExecImageMap( SfxRequest& rReq ); + void GetImageMapState( SfxItemSet& rSet ); - void ExecTbx( SfxRequest& rReq ); - void GetTbxState( SfxItemSet& rSet ); + void ExecTbx( SfxRequest& rReq ); + void GetTbxState( SfxItemSet& rSet ); - void ExecuteSave( SfxRequest& rReq ); - void GetSaveState( SfxItemSet& rSet ); - void ExecSearch( SfxRequest& rReq ); + void ExecuteSave( SfxRequest& rReq ); + void GetSaveState( SfxItemSet& rSet ); + void ExecSearch( SfxRequest& rReq ); - SC_DLLPUBLIC void ExecuteUndo(SfxRequest& rReq); - void GetUndoState(SfxItemSet &rSet); + SC_DLLPUBLIC void ExecuteUndo(SfxRequest& rReq); + void GetUndoState(SfxItemSet &rSet); - void ExecuteSbx( SfxRequest& rReq ); - void GetSbxState( SfxItemSet& rSet ); + void ExecuteSbx( SfxRequest& rReq ); + void GetSbxState( SfxItemSet& rSet ); - void ExecuteObject(SfxRequest& rReq); - void GetObjectState(SfxItemSet &rSet); + void ExecuteObject(SfxRequest& rReq); + void GetObjectState(SfxItemSet &rSet); - void ExecDrawOpt(SfxRequest& rReq); - void GetDrawOptState(SfxItemSet &rSet); + void ExecDrawOpt(SfxRequest& rReq); + void GetDrawOptState(SfxItemSet &rSet); - void SetDrawShell( BOOL bActive ); - void SetDrawTextShell( BOOL bActive ); + void SetDrawShell( BOOL bActive ); + void SetDrawTextShell( BOOL bActive ); - void SetPivotShell( BOOL bActive ); - ScArea* GetPivotSource(){return pPivotSource;} - void SetPivotSource(ScArea* pSrc){pPivotSource=pSrc;} - void SetDialogDPObject( const ScDPObject* pObj ); + void SetPivotShell( BOOL bActive ); + ScArea* GetPivotSource(){return pPivotSource;} + void SetPivotSource(ScArea* pSrc){pPivotSource=pSrc;} + void SetDialogDPObject( const ScDPObject* pObj ); const ScDPObject* GetDialogDPObject() const { return pDialogDPObject; } - BOOL GetDontSwitch(){return bDontSwitch;} - void SetDontSwitch(BOOL bFlag){bDontSwitch=bFlag;} + BOOL GetDontSwitch(){return bDontSwitch;} + void SetDontSwitch(BOOL bFlag){bDontSwitch=bFlag;} - void SetAuditShell( BOOL bActive ); - void SetDrawFormShell( BOOL bActive ); - void SetEditShell(EditView* pView, BOOL bActive ); - void SetOleObjectShell( BOOL bActive ); - void SetChartShell( BOOL bActive ); - void SetGraphicShell( BOOL bActive ); - void SetMediaShell( BOOL bActive ); + void SetAuditShell( BOOL bActive ); + void SetDrawFormShell( BOOL bActive ); + void SetEditShell(EditView* pView, BOOL bActive ); + void SetOleObjectShell( BOOL bActive ); + void SetChartShell( BOOL bActive ); + void SetGraphicShell( BOOL bActive ); + void SetMediaShell( BOOL bActive ); - void SetDrawShellOrSub(); - void SetCurSubShell( ObjectSelectionType eOST, BOOL bForce = FALSE ); + void SetDrawShellOrSub(); + void SetCurSubShell( ObjectSelectionType eOST, BOOL bForce = FALSE ); void SetFormShellAtTop( BOOL bSet ); ObjectSelectionType GetCurObjectSelectionType(); - virtual ErrCode DoVerb(long nVerb); + virtual ErrCode DoVerb(long nVerb); - void StopEditShell(); - BOOL IsDrawTextShell() const; - BOOL IsAuditShell() const; + void StopEditShell(); + BOOL IsDrawTextShell() const; + BOOL IsAuditShell() const; - void SetDrawTextUndo( SfxUndoManager* pUndoMgr ); + void SetDrawTextUndo( SfxUndoManager* pUndoMgr ); - void FillFieldData( ScHeaderFieldData& rData ); + void FillFieldData( ScHeaderFieldData& rData ); - void SetChartArea( const ScRangeListRef& rSource, const Rectangle& rDest ); - BOOL GetChartArea( ScRangeListRef& rSource, Rectangle& rDest, SCTAB& rTab ) const; + void SetChartArea( const ScRangeListRef& rSource, const Rectangle& rDest ); + BOOL GetChartArea( ScRangeListRef& rSource, Rectangle& rDest, SCTAB& rTab ) const; - void SetEditChartName(const String& aStr){aEditChartName=aStr;} + void SetEditChartName(const String& aStr){aEditChartName=aStr;} virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); ScNavigatorSettings* GetNavigatorSettings(); // Drucken: - virtual SfxPrinter* GetPrinter( BOOL bCreate = FALSE ); - virtual USHORT SetPrinter( SfxPrinter* pNewPrinter, + virtual SfxPrinter* GetPrinter( BOOL bCreate = FALSE ); + virtual USHORT SetPrinter( SfxPrinter* pNewPrinter, USHORT nDiffFlags = SFX_PRINTER_ALL, bool bIsApi=false ); - virtual PrintDialog* CreatePrintDialog( Window* pParent ); + virtual PrintDialog* CreatePrintDialog( Window* pParent ); virtual SfxTabPage* CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions ); - virtual void PreparePrint( PrintDialog* pPrintDialog = NULL ); - virtual ErrCode DoPrint( SfxPrinter *pPrinter, + virtual void PreparePrint( PrintDialog* pPrintDialog = NULL ); + virtual ErrCode DoPrint( SfxPrinter *pPrinter, PrintDialog *pPrintDialog, BOOL bSilent, BOOL bIsAPI ); virtual USHORT Print( SfxProgress& rProgress, BOOL bIsAPI, PrintDialog* pPrintDialog = NULL ); - void ConnectObject( SdrOle2Obj* pObj ); - BOOL ActivateObject( SdrOle2Obj* pObj, long nVerb ); + void ConnectObject( SdrOle2Obj* pObj ); + BOOL ActivateObject( SdrOle2Obj* pObj, long nVerb ); void DeactivateOle(); SC_DLLPUBLIC static ScTabViewShell* GetActiveViewShell(); - SfxModelessDialog* CreateRefDialog( SfxBindings* pB, SfxChildWindow* pCW, + SfxModelessDialog* CreateRefDialog( SfxBindings* pB, SfxChildWindow* pCW, SfxChildWinInfo* pInfo, Window* pParent, USHORT nSlotId ); - void UpdateOleZoom(); + void UpdateOleZoom(); inline SbxObject* GetScSbxObject() const { return pScSbxObject; } - inline void SetScSbxObject( SbxObject* pOb ) + inline void SetScSbxObject( SbxObject* pOb ) { pScSbxObject = pOb; } - FmFormShell* GetFormShell() const { return pFormShell; } + FmFormShell* GetFormShell() const { return pFormShell; } - void InsertURL( const String& rName, const String& rURL, const String& rTarget, + void InsertURL( const String& rName, const String& rURL, const String& rTarget, USHORT nMode ); - void InsertURLButton( const String& rName, const String& rURL, const String& rTarget, + void InsertURLButton( const String& rName, const String& rURL, const String& rTarget, const Point* pInsPos = NULL ); - void InsertURLField( const String& rName, const String& rURL, const String& rTarget ); + void InsertURLField( const String& rName, const String& rURL, const String& rTarget ); - BOOL SelectObject( const String& rName ); + BOOL SelectObject( const String& rName ); - void SetInFormatDialog(BOOL bFlag) {bInFormatDialog=bFlag;} + void SetInFormatDialog(BOOL bFlag) {bInFormatDialog=bFlag;} BOOL IsInFormatDialog() {return bInFormatDialog;} - void ForceMove() { Move(); } + void ForceMove() { Move(); } - void MakeNumberInfoItem ( ScDocument* pDoc, - ScViewData* pViewData, - SvxNumberInfoItem** ppItem ); + void MakeNumberInfoItem ( ScDocument* pDoc, + ScViewData* pViewData, + SvxNumberInfoItem** ppItem ); - void UpdateNumberFormatter ( ScDocument* pDoc, - const SvxNumberInfoItem& rInfoItem ); + void UpdateNumberFormatter ( ScDocument* pDoc, + const SvxNumberInfoItem& rInfoItem ); - void ExecuteCellFormatDlg ( SfxRequest& rReq, USHORT nTabPage = 0xffff ); + void ExecuteCellFormatDlg ( SfxRequest& rReq, USHORT nTabPage = 0xffff ); - BOOL GetFunction( String& rFuncStr, sal_uInt16 nErrCode = 0 ); + BOOL GetFunction( String& rFuncStr, sal_uInt16 nErrCode = 0 ); - void StartSimpleRefDialog( const String& rTitle, const String& rInitVal, + void StartSimpleRefDialog( const String& rTitle, const String& rInitVal, BOOL bCloseOnButtonUp, BOOL bSingleCell, BOOL bMultiSelection ); - void StopSimpleRefDialog(); + void StopSimpleRefDialog(); - void SetCurRefDlgId( USHORT nNew ); + void SetCurRefDlgId( USHORT nNew ); - void AddAccessibilityObject( SfxListener& rObject ); - void RemoveAccessibilityObject( SfxListener& rObject ); - void BroadcastAccessibility( const SfxHint &rHint ); - BOOL HasAccessibilityObjects(); + void AddAccessibilityObject( SfxListener& rObject ); + void RemoveAccessibilityObject( SfxListener& rObject ); + void BroadcastAccessibility( const SfxHint &rHint ); + BOOL HasAccessibilityObjects(); bool ExecuteRetypePassDlg(ScPasswordHash eDesiredHash); diff --git a/sc/source/ui/inc/target.hxx b/sc/source/ui/inc/target.hxx index f01793b80206..0c0fa423a4e9 100644 --- a/sc/source/ui/inc/target.hxx +++ b/sc/source/ui/inc/target.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,15 +36,15 @@ class ScTabViewShell; class ScTabViewTarget : public SfxRepeatTarget { private: - ScTabViewShell* pViewShell; + ScTabViewShell* pViewShell; public: TYPEINFO(); ScTabViewTarget( ScTabViewShell* pShell ) : pViewShell( pShell ) {} - virtual ~ScTabViewTarget(); + virtual ~ScTabViewTarget(); - ScTabViewShell* GetViewShell() const { return pViewShell; } + ScTabViewShell* GetViewShell() const { return pViewShell; } }; diff --git a/sc/source/ui/inc/tbinsert.hrc b/sc/source/ui/inc/tbinsert.hrc index 44c0d295cfc6..b80e6fb5863b 100644 --- a/sc/source/ui/inc/tbinsert.hrc +++ b/sc/source/ui/inc/tbinsert.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -25,8 +25,8 @@ * ************************************************************************/ -#define RID_TOOLBOX_INSERT 1 -#define RID_TOOLBOX_INSCELLS 2 -#define RID_TOOLBOX_INSOBJ 3 +#define RID_TOOLBOX_INSERT 1 +#define RID_TOOLBOX_INSCELLS 2 +#define RID_TOOLBOX_INSOBJ 3 diff --git a/sc/source/ui/inc/tbinsert.hxx b/sc/source/ui/inc/tbinsert.hxx index 605710063872..0a0ec8296719 100644 --- a/sc/source/ui/inc/tbinsert.hxx +++ b/sc/source/ui/inc/tbinsert.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,10 +37,10 @@ class ScTbxInsertCtrl : public SfxToolBoxControl { - USHORT nLastSlotId; + USHORT nLastSlotId; using SfxToolBoxControl::Select; - virtual void Select( BOOL bMod1 = FALSE ); + virtual void Select( BOOL bMod1 = FALSE ); public: SFX_DECL_TOOLBOX_CONTROL(); @@ -48,9 +48,9 @@ public: ScTbxInsertCtrl( USHORT nSlotId, USHORT nId, ToolBox& rBox ); ~ScTbxInsertCtrl(); - virtual SfxPopupWindowType GetPopupWindowType() const; - virtual SfxPopupWindow* CreatePopupWindow(); - virtual void StateChanged( USHORT nSID, + virtual SfxPopupWindowType GetPopupWindowType() const; + virtual SfxPopupWindow* CreatePopupWindow(); + virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); }; @@ -61,17 +61,17 @@ public: /* class ScTbxInsertPopup : public SfxPopupWindow { - SfxToolBoxManager aTbx; - ResId aRIdWinTemp; - ResId aRIdTbxTemp; + SfxToolBoxManager aTbx; + ResId aRIdWinTemp; + ResId aRIdTbxTemp; - Link aTbxClickHdl; + Link aTbxClickHdl; DECL_LINK( TbxSelectHdl, ToolBox* ); DECL_LINK( TbxClickHdl, ToolBox* ); protected: - virtual void PopupModeEnd(); + virtual void PopupModeEnd(); public: ScTbxInsertPopup( USHORT nId, WindowAlign eAlign, diff --git a/sc/source/ui/inc/tbzoomsliderctrl.hxx b/sc/source/ui/inc/tbzoomsliderctrl.hxx index 32581f1dc792..af7572b997f4 100644 --- a/sc/source/ui/inc/tbzoomsliderctrl.hxx +++ b/sc/source/ui/inc/tbzoomsliderctrl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,7 +65,7 @@ private: void DoPaint( const Rectangle& rRect ); public: - ScZoomSliderWnd( Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, + ScZoomSliderWnd( Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame , USHORT nCurrentZoom ); ~ScZoomSliderWnd(); void UpdateFromItem( const SvxZoomSliderItem* pZoomSliderItem ); diff --git a/sc/source/ui/inc/textdlgs.hxx b/sc/source/ui/inc/textdlgs.hxx index 24b68650ce16..79e93fa67261 100644 --- a/sc/source/ui/inc/textdlgs.hxx +++ b/sc/source/ui/inc/textdlgs.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,16 +34,16 @@ class SfxObjectShell; // -// Zeichen-Tab-Dialog +// Zeichen-Tab-Dialog // class ScCharDlg : public SfxTabDialog { private: - const SfxItemSet& rOutAttrs; - const SfxObjectShell& rDocShell; + const SfxItemSet& rOutAttrs; + const SfxObjectShell& rDocShell; - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); public: ScCharDlg( Window* pParent, const SfxItemSet* pAttr, @@ -52,15 +52,15 @@ public: }; // -// Absatz-Tab-Dialog +// Absatz-Tab-Dialog // class ScParagraphDlg : public SfxTabDialog { private: - const SfxItemSet& rOutAttrs; + const SfxItemSet& rOutAttrs; - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); public: ScParagraphDlg( Window* pParent, const SfxItemSet* pAttr ); diff --git a/sc/source/ui/inc/textimportoptions.hrc b/sc/source/ui/inc/textimportoptions.hrc index 93c554ef5c45..eb981c1c4dc7 100644 --- a/sc/source/ui/inc/textimportoptions.hrc +++ b/sc/source/ui/inc/textimportoptions.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/inc/textimportoptions.hxx b/sc/source/ui/inc/textimportoptions.hxx index c36c8fa5096d..84091358b531 100644 --- a/sc/source/ui/inc/textimportoptions.hxx +++ b/sc/source/ui/inc/textimportoptions.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx index 12e12c8750b8..796b6fba3913 100644 --- a/sc/source/ui/inc/tpcalc.hxx +++ b/sc/source/ui/inc/tpcalc.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,51 +44,51 @@ class ScDocOptions; class ScTpCalcOptions : public SfxTabPage { public: - static SfxTabPage* Create ( Window* pParent, - const SfxItemSet& rCoreSet ); - static USHORT* GetRanges (); - virtual BOOL FillItemSet ( SfxItemSet& rCoreSet ); - virtual void Reset ( const SfxItemSet& rCoreSet ); + static SfxTabPage* Create ( Window* pParent, + const SfxItemSet& rCoreSet ); + static USHORT* GetRanges (); + virtual BOOL FillItemSet ( SfxItemSet& rCoreSet ); + virtual void Reset ( const SfxItemSet& rCoreSet ); using SfxTabPage::DeactivatePage; - virtual int DeactivatePage ( SfxItemSet* pSet = NULL ); + virtual int DeactivatePage ( SfxItemSet* pSet = NULL ); private: - ScTpCalcOptions( Window* pParent, - const SfxItemSet& rCoreSet ); + ScTpCalcOptions( Window* pParent, + const SfxItemSet& rCoreSet ); ~ScTpCalcOptions(); private: FixedLine aGbZRefs; CheckBox aBtnIterate; - FixedText aFtSteps; - NumericField aEdSteps; - FixedText aFtEps; + FixedText aFtSteps; + NumericField aEdSteps; + FixedText aFtEps; ScDoubleField aEdEps; FixedLine aSeparatorFL; FixedLine aGbDate; RadioButton aBtnDateStd; - RadioButton aBtnDateSc10; - RadioButton aBtnDate1904; + RadioButton aBtnDateSc10; + RadioButton aBtnDate1904; FixedLine aHSeparatorFL; CheckBox aBtnCase; - CheckBox aBtnCalc; - CheckBox aBtnMatch; + CheckBox aBtnCalc; + CheckBox aBtnMatch; CheckBox aBtnRegex; - CheckBox aBtnLookUp; - CheckBox aBtnGeneralPrec; + CheckBox aBtnLookUp; + CheckBox aBtnGeneralPrec; - FixedText aFtPrec; - NumericField aEdPrec; + FixedText aFtPrec; + NumericField aEdPrec; - ScDocOptions* pOldOptions; - ScDocOptions* pLocalOptions; - USHORT nWhichCalc; + ScDocOptions* pOldOptions; + ScDocOptions* pLocalOptions; + USHORT nWhichCalc; #ifdef _TPCALC_CXX private: - void Init(); + void Init(); //------------------------------------ // Handler: diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx index 5b7576320b13..7b1c5419572b 100644 --- a/sc/source/ui/inc/tphf.hxx +++ b/sc/source/ui/inc/tphf.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,13 +39,13 @@ class ScStyleDlg; class ScHFPage : public SvxHFPage { public: - virtual ~ScHFPage(); + virtual ~ScHFPage(); - virtual void Reset( const SfxItemSet& rSet ); - virtual BOOL FillItemSet( SfxItemSet& rOutSet ); + virtual void Reset( const SfxItemSet& rSet ); + virtual BOOL FillItemSet( SfxItemSet& rOutSet ); - void SetPageStyle( const String& rName ) { aStrPageStyle = rName; } - void SetStyleDlg ( const ScStyleDlg* pDlg ) { pStyleDlg = pDlg; } + void SetPageStyle( const String& rName ) { aStrPageStyle = rName; } + void SetStyleDlg ( const ScStyleDlg* pDlg ) { pStyleDlg = pDlg; } protected: ScHFPage( Window* pParent, @@ -57,15 +57,15 @@ protected: // using SvxHFPage::DeactivatePage; virtual void ActivatePage(); virtual void DeactivatePage(); - virtual void ActivatePage( const SfxItemSet& rSet ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual void ActivatePage( const SfxItemSet& rSet ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ); private: - PushButton aBtnEdit; - SfxItemSet aDataSet; - String aStrPageStyle; - USHORT nPageUsage; - const ScStyleDlg* pStyleDlg; + PushButton aBtnEdit; + SfxItemSet aDataSet; + String aStrPageStyle; + USHORT nPageUsage; + const ScStyleDlg* pStyleDlg; #ifdef _TPHF_CXX private: @@ -80,8 +80,8 @@ private: class ScHeaderPage : public ScHFPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - static USHORT* GetRanges(); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); + static USHORT* GetRanges(); private: ScHeaderPage( Window* pParent, const SfxItemSet& rSet ); @@ -92,8 +92,8 @@ private: class ScFooterPage : public ScHFPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - static USHORT* GetRanges(); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); + static USHORT* GetRanges(); private: ScFooterPage( Window* pParent, const SfxItemSet& rSet ); diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx index c9dfa06cc3b6..00154cfa89f0 100644 --- a/sc/source/ui/inc/tphfedit.hxx +++ b/sc/source/ui/inc/tphfedit.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,32 +68,32 @@ public: ~ScEditWindow(); using Control::SetFont; - void SetFont( const ScPatternAttr& rPattern ); + void SetFont( const ScPatternAttr& rPattern ); using Control::SetText; - void SetText( const EditTextObject& rTextObject ); - EditTextObject* CreateTextObject(); - void SetCharAttriutes(); + void SetText( const EditTextObject& rTextObject ); + EditTextObject* CreateTextObject(); + void SetCharAttriutes(); - void InsertField( const SvxFieldItem& rFld ); + void InsertField( const SvxFieldItem& rFld ); - void SetNumType(SvxNumType eNumType); + void SetNumType(SvxNumType eNumType); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); inline ScHeaderEditEngine* GetEditEngine() const {return pEdEngine;} protected: - virtual void Paint( const Rectangle& rRec ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void GetFocus(); + virtual void Paint( const Rectangle& rRec ); + virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void Command( const CommandEvent& rCEvt ); + virtual void GetFocus(); virtual void LoseFocus(); private: - ScHeaderEditEngine* pEdEngine; - EditView* pEdView; + ScHeaderEditEngine* pEdEngine; + EditView* pEdView; ScEditWindowLocation eLocation; bool mbRTL; @@ -106,33 +106,33 @@ class SC_DLLPUBLIC ScExtIButton : public ImageButton { private: - Timer aTimer; - ScPopupMenu* pPopupMenu; - Link aMLink; - USHORT nSelected; + Timer aTimer; + ScPopupMenu* pPopupMenu; + Link aMLink; + USHORT nSelected; SC_DLLPRIVATE DECL_LINK( TimerHdl, Timer*); protected: - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt); - virtual void Click(); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt); + virtual void Click(); - virtual void StartPopup(); + virtual void StartPopup(); public: ScExtIButton(Window* pParent, const ResId& rResId ); - void SetPopupMenu(ScPopupMenu* pPopUp); + void SetPopupMenu(ScPopupMenu* pPopUp); - USHORT GetSelected(); + USHORT GetSelected(); void SetMenuHdl( const Link& rLink ) { aMLink = rLink; } const Link& GetMenuHdl() const { return aMLink; } - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual long PreNotify( NotifyEvent& rNEvt ); }; #endif // SC_TPHFEDIT_HXX diff --git a/sc/source/ui/inc/tpprint.hxx b/sc/source/ui/inc/tpprint.hxx index bbd2f471c1e9..2e60d9018be9 100644 --- a/sc/source/ui/inc/tpprint.hxx +++ b/sc/source/ui/inc/tpprint.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,21 +36,21 @@ class ScTpPrintOptions : public SfxTabPage { - FixedLine aPagesFL; - CheckBox aSkipEmptyPagesCB; - FixedLine aSheetsFL; - CheckBox aSelectedSheetsCB; + FixedLine aPagesFL; + CheckBox aSkipEmptyPagesCB; + FixedLine aSheetsFL; + CheckBox aSelectedSheetsCB; ScTpPrintOptions( Window* pParent, const SfxItemSet& rCoreSet ); ~ScTpPrintOptions(); public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet ); - static USHORT* GetRanges(); - virtual BOOL FillItemSet( SfxItemSet& rCoreSet ); - virtual void Reset( const SfxItemSet& rCoreSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet ); + static USHORT* GetRanges(); + virtual BOOL FillItemSet( SfxItemSet& rCoreSet ); + virtual void Reset( const SfxItemSet& rCoreSet ); using SfxTabPage::DeactivatePage; - virtual int DeactivatePage( SfxItemSet* pSet = NULL ); + virtual int DeactivatePage( SfxItemSet* pSet = NULL ); }; #endif diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx index f34d1236210a..fff158322a13 100644 --- a/sc/source/ui/inc/tpsort.hxx +++ b/sc/source/ui/inc/tpsort.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ //------------------------------------------------------------------------ // +1 because one field is reserved for the "- undefined -" entry -#define SC_MAXFIELDS MAXCOLCOUNT+1 +#define SC_MAXFIELDS MAXCOLCOUNT+1 class ScViewData; class ScSortDlg; @@ -56,66 +56,66 @@ struct ScSortParam; class ScTabPageSortFields : public SfxTabPage { public: - ScTabPageSortFields( Window* pParent, - const SfxItemSet& rArgSet ); + ScTabPageSortFields( Window* pParent, + const SfxItemSet& rArgSet ); ~ScTabPageSortFields(); - static SfxTabPage* Create ( Window* pParent, - const SfxItemSet& rArgSet ); - static USHORT* GetRanges (); - virtual BOOL FillItemSet ( SfxItemSet& rArgSet ); - virtual void Reset ( const SfxItemSet& rArgSet ); + static SfxTabPage* Create ( Window* pParent, + const SfxItemSet& rArgSet ); + static USHORT* GetRanges (); + virtual BOOL FillItemSet ( SfxItemSet& rArgSet ); + virtual void Reset ( const SfxItemSet& rArgSet ); protected: // fuer Datenaustausch (sollte noch umgestellt werden!) -// virtual void ActivatePage ( const SfxItemSet& rSet ); +// virtual void ActivatePage ( const SfxItemSet& rSet ); using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - virtual void ActivatePage (); - virtual int DeactivatePage ( SfxItemSet* pSet = 0); + virtual void ActivatePage (); + virtual int DeactivatePage ( SfxItemSet* pSet = 0); private: FixedLine aFlSort1; - ListBox aLbSort1; - RadioButton aBtnUp1; - RadioButton aBtnDown1; + ListBox aLbSort1; + RadioButton aBtnUp1; + RadioButton aBtnDown1; FixedLine aFlSort2; - ListBox aLbSort2; - RadioButton aBtnUp2; - RadioButton aBtnDown2; + ListBox aLbSort2; + RadioButton aBtnUp2; + RadioButton aBtnDown2; FixedLine aFlSort3; - ListBox aLbSort3; - RadioButton aBtnUp3; - RadioButton aBtnDown3; - - String aStrUndefined; - String aStrColumn; - String aStrRow; - - const USHORT nWhichSort; - ScSortDlg* pDlg; - ScViewData* pViewData; - const ScSortParam& rSortData; - SCCOLROW nFieldArr[SC_MAXFIELDS]; - USHORT nFieldCount; - SCCOL nFirstCol; - SCROW nFirstRow; - BOOL bHasHeader; - BOOL bSortByRows; - - ListBox* aSortLbArr[3]; - RadioButton* aDirBtnArr[3][2]; + ListBox aLbSort3; + RadioButton aBtnUp3; + RadioButton aBtnDown3; + + String aStrUndefined; + String aStrColumn; + String aStrRow; + + const USHORT nWhichSort; + ScSortDlg* pDlg; + ScViewData* pViewData; + const ScSortParam& rSortData; + SCCOLROW nFieldArr[SC_MAXFIELDS]; + USHORT nFieldCount; + SCCOL nFirstCol; + SCROW nFirstRow; + BOOL bHasHeader; + BOOL bSortByRows; + + ListBox* aSortLbArr[3]; + RadioButton* aDirBtnArr[3][2]; FixedLine* aFlArr[3]; #ifdef _TPSORT_CXX private: - void Init (); - void DisableField ( USHORT nField ); - void EnableField ( USHORT nField ); - void FillFieldLists (); - USHORT GetFieldSelPos ( SCCOLROW nField ); + void Init (); + void DisableField ( USHORT nField ); + void EnableField ( USHORT nField ); + void FillFieldLists (); + USHORT GetFieldSelPos ( SCCOLROW nField ); // Handler ------------------------ DECL_LINK( SelectHdl, ListBox * ); @@ -140,32 +140,32 @@ class CollatorWrapper; class ScTabPageSortOptions : public SfxTabPage { public: - ScTabPageSortOptions( Window* pParent, - const SfxItemSet& rArgSet ); + ScTabPageSortOptions( Window* pParent, + const SfxItemSet& rArgSet ); ~ScTabPageSortOptions(); #undef SfxTabPage #define SfxTabPage ::SfxTabPage - static SfxTabPage* Create ( Window* pParent, - const SfxItemSet& rArgSet ); - static USHORT* GetRanges (); - virtual BOOL FillItemSet ( SfxItemSet& rArgSet ); - virtual void Reset ( const SfxItemSet& rArgSet ); + static SfxTabPage* Create ( Window* pParent, + const SfxItemSet& rArgSet ); + static USHORT* GetRanges (); + virtual BOOL FillItemSet ( SfxItemSet& rArgSet ); + virtual void Reset ( const SfxItemSet& rArgSet ); protected: // fuer Datenaustausch (sollte noch umgestellt werden!) -// virtual void ActivatePage ( const SfxItemSet& rSet ); +// virtual void ActivatePage ( const SfxItemSet& rSet ); using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - virtual void ActivatePage (); - virtual int DeactivatePage ( SfxItemSet* pSet = 0); + virtual void ActivatePage (); + virtual int DeactivatePage ( SfxItemSet* pSet = 0); private: CheckBox aBtnCase; CheckBox aBtnHeader; CheckBox aBtnFormats; - CheckBox aBtnNaturalSort; + CheckBox aBtnNaturalSort; CheckBox aBtnCopyResult; ListBox aLbOutPos; @@ -191,26 +191,26 @@ private: String aStrNoName; String aStrAreaLabel; - const USHORT nWhichSort; - const ScSortParam& rSortData; - ScViewData* pViewData; - ScDocument* pDoc; - ScSortDlg* pDlg; - ScAddress theOutPos; + const USHORT nWhichSort; + const ScSortParam& rSortData; + ScViewData* pViewData; + ScDocument* pDoc; + ScSortDlg* pDlg; + ScAddress theOutPos; - CollatorRessource* pColRes; - CollatorWrapper* pColWrap; + CollatorRessource* pColRes; + CollatorWrapper* pColWrap; #ifdef _TPSORT_CXX private: - void Init (); - void FillUserSortListBox (); - void FillOutPosList (); + void Init (); + void FillUserSortListBox (); + void FillOutPosList (); // Handler ------------------------ DECL_LINK( EnableHdl, CheckBox * ); DECL_LINK( SelOutPosHdl, ListBox * ); - void EdOutPosModHdl ( Edit* pEd ); + void EdOutPosModHdl ( Edit* pEd ); DECL_LINK( SortDirHdl, RadioButton * ); DECL_LINK( FillAlgorHdl, void * ); #endif diff --git a/sc/source/ui/inc/tpstat.hxx b/sc/source/ui/inc/tpstat.hxx index 4016e682176b..10fa3998b8e9 100644 --- a/sc/source/ui/inc/tpstat.hxx +++ b/sc/source/ui/inc/tpstat.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx index 1a2bd22c4a5b..99efeb57b694 100644 --- a/sc/source/ui/inc/tpsubt.hxx +++ b/sc/source/ui/inc/tpsubt.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ //------------------------------------------------------------------------ // +1 because one field is reserved for the "- none -" entry -#define SC_MAXFIELDS MAXCOLCOUNT+1 +#define SC_MAXFIELDS MAXCOLCOUNT+1 class ScViewData; class ScDocument; @@ -54,35 +54,35 @@ protected: public: virtual ~ScTpSubTotalGroup(); - static USHORT* GetRanges (); - BOOL DoReset ( USHORT nGroupNo, - const SfxItemSet& rArgSet ); - BOOL DoFillItemSet ( USHORT nGroupNo, - SfxItemSet& rArgSet ); + static USHORT* GetRanges (); + BOOL DoReset ( USHORT nGroupNo, + const SfxItemSet& rArgSet ); + BOOL DoFillItemSet ( USHORT nGroupNo, + SfxItemSet& rArgSet ); protected: - FixedText aFtGroup; - ListBox aLbGroup; - FixedText aFtColumns; - SvxCheckListBox aLbColumns; - FixedText aFtFunctions; - ListBox aLbFunctions; - const String aStrNone; - const String aStrColumn; - - ScViewData* pViewData; - ScDocument* pDoc; - - const USHORT nWhichSubTotals; - const ScSubTotalParam& rSubTotalData; - SCCOL nFieldArr[SC_MAXFIELDS]; - const USHORT nFieldCount; + FixedText aFtGroup; + ListBox aLbGroup; + FixedText aFtColumns; + SvxCheckListBox aLbColumns; + FixedText aFtFunctions; + ListBox aLbFunctions; + const String aStrNone; + const String aStrColumn; + + ScViewData* pViewData; + ScDocument* pDoc; + + const USHORT nWhichSubTotals; + const ScSubTotalParam& rSubTotalData; + SCCOL nFieldArr[SC_MAXFIELDS]; + const USHORT nFieldCount; private: - void Init (); - void FillListBoxes (); - ScSubTotalFunc LbPosToFunc ( USHORT nPos ); - USHORT FuncToLbPos ( ScSubTotalFunc eFunc ); - USHORT GetFieldSelPos ( SCCOL nField ); + void Init (); + void FillListBoxes (); + ScSubTotalFunc LbPosToFunc ( USHORT nPos ); + USHORT FuncToLbPos ( ScSubTotalFunc eFunc ); + USHORT GetFieldSelPos ( SCCOL nField ); // Handler ------------------------ DECL_LINK( SelectHdl, ListBox * ); @@ -94,16 +94,16 @@ private: class ScTpSubTotalGroup1 : public ScTpSubTotalGroup { protected: - ScTpSubTotalGroup1( Window* pParent, - const SfxItemSet& rArgSet ); + ScTpSubTotalGroup1( Window* pParent, + const SfxItemSet& rArgSet ); public: virtual ~ScTpSubTotalGroup1(); - static SfxTabPage* Create ( Window* pParent, - const SfxItemSet& rArgSet ); - virtual BOOL FillItemSet ( SfxItemSet& rArgSet ); - virtual void Reset ( const SfxItemSet& rArgSet ); + static SfxTabPage* Create ( Window* pParent, + const SfxItemSet& rArgSet ); + virtual BOOL FillItemSet ( SfxItemSet& rArgSet ); + virtual void Reset ( const SfxItemSet& rArgSet ); }; //------------------------------------------------------------------------ @@ -111,16 +111,16 @@ public: class ScTpSubTotalGroup2 : public ScTpSubTotalGroup { protected: - ScTpSubTotalGroup2( Window* pParent, - const SfxItemSet& rArgSet ); + ScTpSubTotalGroup2( Window* pParent, + const SfxItemSet& rArgSet ); public: virtual ~ScTpSubTotalGroup2(); - static SfxTabPage* Create ( Window* pParent, - const SfxItemSet& rArgSet ); - virtual BOOL FillItemSet ( SfxItemSet& rArgSet ); - virtual void Reset ( const SfxItemSet& rArgSet ); + static SfxTabPage* Create ( Window* pParent, + const SfxItemSet& rArgSet ); + virtual BOOL FillItemSet ( SfxItemSet& rArgSet ); + virtual void Reset ( const SfxItemSet& rArgSet ); }; //------------------------------------------------------------------------ @@ -128,16 +128,16 @@ public: class ScTpSubTotalGroup3 : public ScTpSubTotalGroup { protected: - ScTpSubTotalGroup3( Window* pParent, - const SfxItemSet& rArgSet ); + ScTpSubTotalGroup3( Window* pParent, + const SfxItemSet& rArgSet ); public: virtual ~ScTpSubTotalGroup3(); - static SfxTabPage* Create ( Window* pParent, - const SfxItemSet& rArgSet ); - virtual BOOL FillItemSet ( SfxItemSet& rArgSet ); - virtual void Reset ( const SfxItemSet& rArgSet ); + static SfxTabPage* Create ( Window* pParent, + const SfxItemSet& rArgSet ); + virtual BOOL FillItemSet ( SfxItemSet& rArgSet ); + virtual void Reset ( const SfxItemSet& rArgSet ); }; //======================================================================== @@ -146,38 +146,38 @@ public: class ScTpSubTotalOptions : public SfxTabPage { protected: - ScTpSubTotalOptions( Window* pParent, + ScTpSubTotalOptions( Window* pParent, const SfxItemSet& rArgSet ); public: virtual ~ScTpSubTotalOptions(); - static USHORT* GetRanges (); - static SfxTabPage* Create ( Window* pParent, - const SfxItemSet& rArgSet ); - virtual BOOL FillItemSet ( SfxItemSet& rArgSet ); - virtual void Reset ( const SfxItemSet& rArgSet ); + static USHORT* GetRanges (); + static SfxTabPage* Create ( Window* pParent, + const SfxItemSet& rArgSet ); + virtual BOOL FillItemSet ( SfxItemSet& rArgSet ); + virtual void Reset ( const SfxItemSet& rArgSet ); private: FixedLine aFlGroup; - CheckBox aBtnPagebreak; - CheckBox aBtnCase; - CheckBox aBtnSort; + CheckBox aBtnPagebreak; + CheckBox aBtnCase; + CheckBox aBtnSort; FixedLine aFlSort; - RadioButton aBtnAscending; - RadioButton aBtnDescending; - CheckBox aBtnFormats; - CheckBox aBtnUserDef; - ListBox aLbUserDef; + RadioButton aBtnAscending; + RadioButton aBtnDescending; + CheckBox aBtnFormats; + CheckBox aBtnUserDef; + ListBox aLbUserDef; - ScViewData* pViewData; - ScDocument* pDoc; - const USHORT nWhichSubTotals; - const ScSubTotalParam& rSubTotalData; + ScViewData* pViewData; + ScDocument* pDoc; + const USHORT nWhichSubTotals; + const ScSubTotalParam& rSubTotalData; private: - void Init (); - void FillUserSortListBox (); + void Init (); + void FillUserSortListBox (); // Handler ------------------------ DECL_LINK( CheckHdl, CheckBox * ); diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx index 007fb3f795c1..d891050ddf34 100644 --- a/sc/source/ui/inc/tptable.hxx +++ b/sc/source/ui/inc/tptable.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,13 +56,13 @@ public: class ScTablePage : public SfxTabPage { public: - static SfxTabPage* Create ( Window* pParent, - const SfxItemSet& rCoreSet ); - static USHORT* GetRanges (); - virtual BOOL FillItemSet ( SfxItemSet& rCoreSet ); - virtual void Reset ( const SfxItemSet& rCoreSet ); + static SfxTabPage* Create ( Window* pParent, + const SfxItemSet& rCoreSet ); + static USHORT* GetRanges (); + virtual BOOL FillItemSet ( SfxItemSet& rCoreSet ); + virtual void Reset ( const SfxItemSet& rCoreSet ); using SfxTabPage::DeactivatePage; - virtual int DeactivatePage ( SfxItemSet* pSet = NULL ); + virtual int DeactivatePage ( SfxItemSet* pSet = NULL ); virtual void DataChanged ( const DataChangedEvent& rDCEvt ); private: @@ -73,25 +73,25 @@ private: private: FixedLine aFlPageDir; - RadioButton aBtnTopDown; - RadioButton aBtnLeftRight; + RadioButton aBtnTopDown; + RadioButton aBtnLeftRight; FixedImage aBmpPageDir; Image aImgLeftRight; Image aImgTopDown; Image aImgLeftRightHC; Image aImgTopDownHC; - CheckBox aBtnPageNo; - NumericField aEdPageNo; + CheckBox aBtnPageNo; + NumericField aEdPageNo; FixedLine aFlPrint; - CheckBox aBtnHeaders; - CheckBox aBtnGrid; - CheckBox aBtnNotes; - CheckBox aBtnObjects; - CheckBox aBtnCharts; - CheckBox aBtnDrawings; - CheckBox aBtnFormulas; - CheckBox aBtnNullVals; + CheckBox aBtnHeaders; + CheckBox aBtnGrid; + CheckBox aBtnNotes; + CheckBox aBtnObjects; + CheckBox aBtnCharts; + CheckBox aBtnDrawings; + CheckBox aBtnFormulas; + CheckBox aBtnNullVals; FixedLine aFlScale; FixedText aFtScaleMode; diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx index 2e277a14af8d..998b88706ec3 100644 --- a/sc/source/ui/inc/tpusrlst.hxx +++ b/sc/source/ui/inc/tpusrlst.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,70 +45,70 @@ class ScRangeUtil; class ScTpUserLists : public SfxTabPage { public: - static SfxTabPage* Create ( Window* pParent, - const SfxItemSet& rAttrSet ); - static USHORT* GetRanges (); - virtual BOOL FillItemSet ( SfxItemSet& rCoreAttrs ); - virtual void Reset ( const SfxItemSet& rCoreAttrs ); + static SfxTabPage* Create ( Window* pParent, + const SfxItemSet& rAttrSet ); + static USHORT* GetRanges (); + virtual BOOL FillItemSet ( SfxItemSet& rCoreAttrs ); + virtual void Reset ( const SfxItemSet& rCoreAttrs ); using SfxTabPage::DeactivatePage; - virtual int DeactivatePage ( SfxItemSet* pSet = NULL ); + virtual int DeactivatePage ( SfxItemSet* pSet = NULL ); private: - ScTpUserLists( Window* pParent, - const SfxItemSet& rArgSet ); + ScTpUserLists( Window* pParent, + const SfxItemSet& rArgSet ); ~ScTpUserLists(); private: - FixedText aFtLists; - ListBox aLbLists; - FixedText aFtEntries; - MultiLineEdit aEdEntries; - FixedText aFtCopyFrom; - Edit aEdCopyFrom; - PushButton aBtnNew; - PushButton aBtnAdd; - PushButton aBtnRemove; - PushButton aBtnCopy; - - const String aStrQueryRemove; - const String aStrNew; - const String aStrCancel; - const String aStrAdd; - const String aStrModify; - const String aStrCopyList; - const String aStrCopyFrom; - const String aStrCopyErr; - - const USHORT nWhichUserLists; - ScUserList* pUserLists; - - ScDocument* pDoc; - ScViewData* pViewData; - ScRangeUtil* pRangeUtil; - String aStrSelectedArea; - - BOOL bModifyMode; - BOOL bCancelMode; - BOOL bCopyDone; - USHORT nCancelPos; + FixedText aFtLists; + ListBox aLbLists; + FixedText aFtEntries; + MultiLineEdit aEdEntries; + FixedText aFtCopyFrom; + Edit aEdCopyFrom; + PushButton aBtnNew; + PushButton aBtnAdd; + PushButton aBtnRemove; + PushButton aBtnCopy; + + const String aStrQueryRemove; + const String aStrNew; + const String aStrCancel; + const String aStrAdd; + const String aStrModify; + const String aStrCopyList; + const String aStrCopyFrom; + const String aStrCopyErr; + + const USHORT nWhichUserLists; + ScUserList* pUserLists; + + ScDocument* pDoc; + ScViewData* pViewData; + ScRangeUtil* pRangeUtil; + String aStrSelectedArea; + + BOOL bModifyMode; + BOOL bCancelMode; + BOOL bCopyDone; + USHORT nCancelPos; #ifdef _TPUSRLST_CXX private: - void Init (); - USHORT UpdateUserListBox (); - void UpdateEntries ( USHORT nList ); - void MakeListStr ( String& rListStr ); - void AddNewList ( const String& rEntriesStr ); - void RemoveList ( USHORT nList ); - void ModifyList ( USHORT nSelList, + void Init (); + USHORT UpdateUserListBox (); + void UpdateEntries ( USHORT nList ); + void MakeListStr ( String& rListStr ); + void AddNewList ( const String& rEntriesStr ); + void RemoveList ( USHORT nList ); + void ModifyList ( USHORT nSelList, const String& rEntriesStr ); - void CopyListFromArea ( const ScRefAddress& rStartPos, + void CopyListFromArea ( const ScRefAddress& rStartPos, const ScRefAddress& rEndPos ); // Handler: - DECL_LINK( LbSelectHdl, ListBox* ); - DECL_LINK( BtnClickHdl, PushButton* ); - DECL_LINK( EdEntriesModHdl, MultiLineEdit* ); + DECL_LINK( LbSelectHdl, ListBox* ); + DECL_LINK( BtnClickHdl, PushButton* ); + DECL_LINK( EdEntriesModHdl, MultiLineEdit* ); #endif }; diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx index 43a75433adda..b56989eff4a9 100644 --- a/sc/source/ui/inc/tpview.hxx +++ b/sc/source/ui/inc/tpview.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,13 +47,13 @@ class ScViewOptions; class ScTpContentOptions : public SfxTabPage { FixedLine aLinesGB; - CheckBox aGridCB; - FixedText aColorFT; - ColorListBox aColorLB; - CheckBox aBreakCB; - CheckBox aGuideLineCB; - CheckBox aHandleCB; - CheckBox aBigHandleCB; + CheckBox aGridCB; + FixedText aColorFT; + ColorListBox aColorLB; + CheckBox aBreakCB; + CheckBox aGuideLineCB; + CheckBox aHandleCB; + CheckBox aBigHandleCB; FixedLine aSeparator1FL; @@ -80,11 +80,11 @@ class ScTpContentOptions : public SfxTabPage FixedLine aSeparator2FL; FixedLine aWindowGB; - CheckBox aRowColHeaderCB; - CheckBox aHScrollCB; - CheckBox aVScrollCB; - CheckBox aTblRegCB; - CheckBox aOutlineCB; + CheckBox aRowColHeaderCB; + CheckBox aHScrollCB; + CheckBox aVScrollCB; + CheckBox aTblRegCB; + CheckBox aOutlineCB; ScViewOptions* pLocalOptions; @@ -93,19 +93,19 @@ class ScTpContentOptions : public SfxTabPage DECL_LINK( SelLbObjHdl, ListBox* ); DECL_LINK( CBHdl, CheckBox* ); - ScTpContentOptions( Window* pParent, - const SfxItemSet& rArgSet ); + ScTpContentOptions( Window* pParent, + const SfxItemSet& rArgSet ); ~ScTpContentOptions(); public: - static SfxTabPage* Create ( Window* pParent, - const SfxItemSet& rCoreSet ); - virtual BOOL FillItemSet ( SfxItemSet& rCoreSet ); - virtual void Reset ( const SfxItemSet& rCoreSet ); + static SfxTabPage* Create ( Window* pParent, + const SfxItemSet& rCoreSet ); + virtual BOOL FillItemSet ( SfxItemSet& rCoreSet ); + virtual void Reset ( const SfxItemSet& rCoreSet ); using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - virtual void ActivatePage( const SfxItemSet& ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual void ActivatePage( const SfxItemSet& ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ); }; @@ -129,16 +129,16 @@ class ScTpLayoutOptions : public SfxTabPage RadioButton aNeverRB; FixedLine aOptionsGB; - CheckBox aAlignCB; - ListBox aAlignLB; - CheckBox aEditModeCB; - CheckBox aFormatCB; + CheckBox aAlignCB; + ListBox aAlignLB; + CheckBox aEditModeCB; + CheckBox aFormatCB; CheckBox aExpRefCB; - CheckBox aMarkHdrCB; - CheckBox aTextFmtCB; + CheckBox aMarkHdrCB; + CheckBox aTextFmtCB; CheckBox aReplWarnCB; - SvxStringArray aUnitArr; + SvxStringArray aUnitArr; DECL_LINK( CBHdl, CheckBox* ); @@ -147,21 +147,21 @@ class ScTpLayoutOptions : public SfxTabPage ScDocument *pDoc; - DECL_LINK( UpdateHdl, CheckBox* ); + DECL_LINK( UpdateHdl, CheckBox* ); - ScTpLayoutOptions( Window* pParent, - const SfxItemSet& rArgSet ); + ScTpLayoutOptions( Window* pParent, + const SfxItemSet& rArgSet ); ~ScTpLayoutOptions(); public: - static SfxTabPage* Create ( Window* pParent, - const SfxItemSet& rCoreSet ); - virtual BOOL FillItemSet ( SfxItemSet& rCoreSet ); - virtual void Reset ( const SfxItemSet& rCoreSet ); + static SfxTabPage* Create ( Window* pParent, + const SfxItemSet& rCoreSet ); + virtual BOOL FillItemSet ( SfxItemSet& rCoreSet ); + virtual void Reset ( const SfxItemSet& rCoreSet ); using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - virtual void ActivatePage( const SfxItemSet& ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual void ActivatePage( const SfxItemSet& ); + virtual int DeactivatePage( SfxItemSet* pSet = 0 ); void SetDocument(ScDocument* pPtr){pDoc = pPtr;} diff --git a/sc/source/ui/inc/transobj.hxx b/sc/source/ui/inc/transobj.hxx index 04a2eac1df29..4e0f9c96a82b 100644 --- a/sc/source/ui/inc/transobj.hxx +++ b/sc/source/ui/inc/transobj.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,26 +48,26 @@ namespace com { namespace sun { namespace star { class ScTransferObj : public TransferableHelper { private: - ScDocument* pDoc; - ScRange aBlock; - SCROW nNonFiltered; // non-filtered rows - TransferableDataHelper aOleData; - TransferableObjectDescriptor aObjDesc; -//REMOVE SvEmbeddedObjectRef aDocShellRef; -//REMOVE SvEmbeddedObjectRef aDrawPersistRef; - SfxObjectShellRef aDocShellRef; - SfxObjectShellRef aDrawPersistRef; + ScDocument* pDoc; + ScRange aBlock; + SCROW nNonFiltered; // non-filtered rows + TransferableDataHelper aOleData; + TransferableObjectDescriptor aObjDesc; +//REMOVE SvEmbeddedObjectRef aDocShellRef; +//REMOVE SvEmbeddedObjectRef aDrawPersistRef; + SfxObjectShellRef aDocShellRef; + SfxObjectShellRef aDrawPersistRef; com::sun::star::uno::Reference<com::sun::star::sheet::XSheetCellRanges> xDragSourceRanges; - SCCOL nDragHandleX; - SCROW nDragHandleY; - SCTAB nVisibleTab; - USHORT nDragSourceFlags; - BOOL bDragWasInternal; - BOOL bUsedForLink; + SCCOL nDragHandleX; + SCROW nDragHandleY; + SCTAB nVisibleTab; + USHORT nDragSourceFlags; + BOOL bDragWasInternal; + BOOL bUsedForLink; bool bHasFiltered; // if has filtered rows - void InitDocShell(); - static void StripRefs( ScDocument* pDoc, SCCOL nStartX, SCROW nStartY, + void InitDocShell(); + static void StripRefs( ScDocument* pDoc, SCCOL nStartX, SCROW nStartY, SCCOL nEndX, SCROW nEndY, ScDocument* pDestDoc=0, SCCOL nSubX=0, SCROW nSubY=0 ); @@ -79,35 +79,35 @@ public: ScTransferObj( ScDocument* pClipDoc, const TransferableObjectDescriptor& rDesc ); virtual ~ScTransferObj(); - virtual void AddSupportedFormats(); - virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual sal_Bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, + virtual void AddSupportedFormats(); + virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual sal_Bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual void ObjectReleased(); - virtual void DragFinished( sal_Int8 nDropAction ); + virtual void ObjectReleased(); + virtual void DragFinished( sal_Int8 nDropAction ); - ScDocument* GetDocument() { return pDoc; } // owned by ScTransferObj - const ScRange& GetRange() const { return aBlock; } - SCROW GetNonFilteredRows() const { return nNonFiltered; } - SCCOL GetDragHandleX() const { return nDragHandleX; } - SCROW GetDragHandleY() const { return nDragHandleY; } - SCTAB GetVisibleTab() const { return nVisibleTab; } - USHORT GetDragSourceFlags() const { return nDragSourceFlags; } + ScDocument* GetDocument() { return pDoc; } // owned by ScTransferObj + const ScRange& GetRange() const { return aBlock; } + SCROW GetNonFilteredRows() const { return nNonFiltered; } + SCCOL GetDragHandleX() const { return nDragHandleX; } + SCROW GetDragHandleY() const { return nDragHandleY; } + SCTAB GetVisibleTab() const { return nVisibleTab; } + USHORT GetDragSourceFlags() const { return nDragSourceFlags; } bool HasFilteredRows() const { return bHasFiltered; } - ScDocShell* GetSourceDocShell(); - ScDocument* GetSourceDocument(); - ScMarkData GetSourceMarkData(); + ScDocShell* GetSourceDocShell(); + ScDocument* GetSourceDocument(); + ScMarkData GetSourceMarkData(); - void SetDrawPersist( const SfxObjectShellRef& rRef ); - void SetDragHandlePos( SCCOL nX, SCROW nY ); - void SetVisibleTab( SCTAB nNew ); - void SetDragSource( ScDocShell* pSourceShell, const ScMarkData& rMark ); - void SetDragSourceFlags( USHORT nFlags ); - void SetDragWasInternal(); + void SetDrawPersist( const SfxObjectShellRef& rRef ); + void SetDragHandlePos( SCCOL nX, SCROW nY ); + void SetVisibleTab( SCTAB nNew ); + void SetDragSource( ScDocShell* pSourceShell, const ScMarkData& rMark ); + void SetDragSourceFlags( USHORT nFlags ); + void SetDragWasInternal(); static SC_DLLPUBLIC ScTransferObj* GetOwnClipboard( Window* pUIWin ); - static SfxObjectShell* SetDrawClipDoc( BOOL bAnyOle ); // update ScGlobal::pDrawClipDocShellRef + static SfxObjectShell* SetDrawClipDoc( BOOL bAnyOle ); // update ScGlobal::pDrawClipDocShellRef virtual sal_Int64 SAL_CALL getSomething( const com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( com::sun::star::uno::RuntimeException ); static const com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); }; diff --git a/sc/source/ui/inc/ui_pch.hxx b/sc/source/ui/inc/ui_pch.hxx index 2e5f418ea5bd..c2d363f49917 100644 --- a/sc/source/ui/inc/ui_pch.hxx +++ b/sc/source/ui/inc/ui_pch.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,7 +26,7 @@ * ************************************************************************/ -// ItemID-Defines etc. muessen immer ganz vorne stehen +// ItemID-Defines etc. muessen immer ganz vorne stehen #include "scitems.hxx" diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx index 4c6ae0914780..a06398ce54a8 100644 --- a/sc/source/ui/inc/uiitems.hxx +++ b/sc/source/ui/inc/uiitems.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ class ScInputStatusItem : public SfxPoolItem ScAddress aStartPos; ScAddress aEndPos; String aString; - EditTextObject* pEditData; + EditTextObject* pEditData; public: TYPEINFO(); @@ -70,27 +70,27 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - const ScAddress& GetPos() const { return aCursorPos; } + const ScAddress& GetPos() const { return aCursorPos; } const ScAddress& GetStartPos() const { return aStartPos; } - const ScAddress& GetEndPos() const { return aEndPos; } + const ScAddress& GetEndPos() const { return aEndPos; } SCTAB GetTab() const { return aCursorPos.Tab(); } SCCOL GetCol() const { return aCursorPos.Col(); } SCROW GetRow() const { return aCursorPos.Row(); } SCCOL GetStartCol() const { return aStartPos.Col(); } SCROW GetStartRow() const { return aStartPos.Row(); } - SCCOL GetEndCol() const { return aEndPos.Col(); } - SCROW GetEndRow() const { return aEndPos.Row(); } + SCCOL GetEndCol() const { return aEndPos.Col(); } + SCROW GetEndRow() const { return aEndPos.Row(); } const String& GetString() const { return aString; } - const EditTextObject* GetEditData() const { return pEditData; } + const EditTextObject* GetEditData() const { return pEditData; } }; -#define SC_TAB_INSERTED 1 -#define SC_TAB_DELETED 2 -#define SC_TAB_MOVED 3 -#define SC_TAB_COPIED 4 -#define SC_TAB_HIDDEN 5 +#define SC_TAB_INSERTED 1 +#define SC_TAB_DELETED 2 +#define SC_TAB_MOVED 3 +#define SC_TAB_COPIED 4 +#define SC_TAB_HIDDEN 5 class ScTablesHint : public SfxHint { @@ -103,15 +103,15 @@ public: ScTablesHint(USHORT nNewId, SCTAB nTable1, SCTAB nTable2=0); ~ScTablesHint(); - USHORT GetId() const { return nId; } - SCTAB GetTab1() const { return nTab1; } - SCTAB GetTab2() const { return nTab2; } + USHORT GetId() const { return nId; } + SCTAB GetTab1() const { return nTab1; } + SCTAB GetTab2() const { return nTab2; } }; class ScEditViewHint : public SfxHint { - ScEditEngineDefaulter* pEditEngine; - ScAddress aCursorPos; + ScEditEngineDefaulter* pEditEngine; + ScAddress aCursorPos; public: TYPEINFO(); @@ -121,7 +121,7 @@ public: SCCOL GetCol() const { return aCursorPos.Col(); } SCROW GetRow() const { return aCursorPos.Row(); } SCTAB GetTab() const { return aCursorPos.Tab(); } - ScEditEngineDefaulter* GetEngine() const { return pEditEngine; } + ScEditEngineDefaulter* GetEngine() const { return pEditEngine; } private: ScEditViewHint(); // disabled @@ -137,8 +137,8 @@ public: ScIndexHint(USHORT nNewId, USHORT nIdx); ~ScIndexHint(); - USHORT GetId() const { return nId; } - USHORT GetIndex() const { return nIndex; } + USHORT GetId() const { return nId; } + USHORT GetIndex() const { return nIndex; } }; //---------------------------------------------------------------------------- @@ -148,11 +148,11 @@ class SC_DLLPUBLIC ScSortItem : public SfxPoolItem { public: TYPEINFO(); - ScSortItem( USHORT nWhich, - ScViewData* ptrViewData, - const ScSortParam* pSortData ); - ScSortItem( USHORT nWhich, - const ScSortParam* pSortData ); + ScSortItem( USHORT nWhich, + ScViewData* ptrViewData, + const ScSortParam* pSortData ); + ScSortItem( USHORT nWhich, + const ScSortParam* pSortData ); ScSortItem( const ScSortItem& rItem ); ~ScSortItem(); @@ -161,12 +161,12 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberUd ) const; - ScViewData* GetViewData () const { return pViewData; } - const ScSortParam& GetSortData () const { return theSortData; } + ScViewData* GetViewData () const { return pViewData; } + const ScSortParam& GetSortData () const { return theSortData; } private: - ScViewData* pViewData; - ScSortParam theSortData; + ScViewData* pViewData; + ScSortParam theSortData; }; //---------------------------------------------------------------------------- @@ -176,11 +176,11 @@ class SC_DLLPUBLIC ScQueryItem : public SfxPoolItem { public: TYPEINFO(); - ScQueryItem( USHORT nWhich, - ScViewData* ptrViewData, - const ScQueryParam* pQueryData ); - ScQueryItem( USHORT nWhich, - const ScQueryParam* pQueryData ); + ScQueryItem( USHORT nWhich, + ScViewData* ptrViewData, + const ScQueryParam* pQueryData ); + ScQueryItem( USHORT nWhich, + const ScQueryParam* pQueryData ); ScQueryItem( const ScQueryItem& rItem ); ~ScQueryItem(); @@ -188,17 +188,17 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - ScViewData* GetViewData () const { return pViewData; } - const ScQueryParam& GetQueryData() const { return theQueryData; } + ScViewData* GetViewData () const { return pViewData; } + const ScQueryParam& GetQueryData() const { return theQueryData; } - BOOL GetAdvancedQuerySource(ScRange& rSource) const; - void SetAdvancedQuerySource(const ScRange* pSource); + BOOL GetAdvancedQuerySource(ScRange& rSource) const; + void SetAdvancedQuerySource(const ScRange* pSource); private: - ScViewData* pViewData; - ScQueryParam theQueryData; - BOOL bIsAdvanced; - ScRange aAdvSource; + ScViewData* pViewData; + ScQueryParam theQueryData; + BOOL bIsAdvanced; + ScRange aAdvSource; }; //---------------------------------------------------------------------------- @@ -208,12 +208,12 @@ class SC_DLLPUBLIC ScSubTotalItem : public SfxPoolItem { public: TYPEINFO(); - ScSubTotalItem( USHORT nWhich, - ScViewData* ptrViewData, - const ScSubTotalParam* pSubTotalData ); - ScSubTotalItem( USHORT nWhich, - const ScSubTotalParam* pSubTotalData ); - ScSubTotalItem( const ScSubTotalItem& rItem ); + ScSubTotalItem( USHORT nWhich, + ScViewData* ptrViewData, + const ScSubTotalParam* pSubTotalData ); + ScSubTotalItem( USHORT nWhich, + const ScSubTotalParam* pSubTotalData ); + ScSubTotalItem( const ScSubTotalItem& rItem ); ~ScSubTotalItem(); virtual String GetValueText() const; @@ -221,12 +221,12 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberUd ) const; - ScViewData* GetViewData () const { return pViewData; } - const ScSubTotalParam& GetSubTotalData() const { return theSubTotalData; } + ScViewData* GetViewData () const { return pViewData; } + const ScSubTotalParam& GetSubTotalData() const { return theSubTotalData; } private: - ScViewData* pViewData; - ScSubTotalParam theSubTotalData; + ScViewData* pViewData; + ScSubTotalParam theSubTotalData; }; //---------------------------------------------------------------------------- @@ -244,11 +244,11 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - void SetUserList ( const ScUserList& rUserList ); - ScUserList* GetUserList () const { return pUserList; } + void SetUserList ( const ScUserList& rUserList ); + ScUserList* GetUserList () const { return pUserList; } private: - ScUserList* pUserList; + ScUserList* pUserList; }; //---------------------------------------------------------------------------- @@ -258,9 +258,9 @@ class ScConsolidateItem : public SfxPoolItem { public: TYPEINFO(); - ScConsolidateItem( USHORT nWhich, + ScConsolidateItem( USHORT nWhich, const ScConsolidateParam* pParam ); - ScConsolidateItem( const ScConsolidateItem& rItem ); + ScConsolidateItem( const ScConsolidateItem& rItem ); ~ScConsolidateItem(); virtual String GetValueText() const; @@ -270,7 +270,7 @@ public: const ScConsolidateParam& GetData() const { return theConsData; } private: - ScConsolidateParam theConsData; + ScConsolidateParam theConsData; }; //---------------------------------------------------------------------------- @@ -282,21 +282,21 @@ public: TYPEINFO(); ScPivotItem( USHORT nWhich, const ScDPSaveData* pData, const ScRange* pRange, BOOL bNew ); - ScPivotItem( const ScPivotItem& rItem ); + ScPivotItem( const ScPivotItem& rItem ); ~ScPivotItem(); virtual String GetValueText() const; virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - const ScDPSaveData& GetData() const { return *pSaveData; } - const ScRange& GetDestRange() const { return aDestRange; } - BOOL IsNewSheet() const { return bNewSheet; } + const ScDPSaveData& GetData() const { return *pSaveData; } + const ScRange& GetDestRange() const { return aDestRange; } + BOOL IsNewSheet() const { return bNewSheet; } private: - ScDPSaveData* pSaveData; - ScRange aDestRange; - BOOL bNewSheet; + ScDPSaveData* pSaveData; + ScRange aDestRange; + BOOL bNewSheet; }; //---------------------------------------------------------------------------- @@ -306,9 +306,9 @@ class ScSolveItem : public SfxPoolItem { public: TYPEINFO(); - ScSolveItem( USHORT nWhich, + ScSolveItem( USHORT nWhich, const ScSolveParam* pParam ); - ScSolveItem( const ScSolveItem& rItem ); + ScSolveItem( const ScSolveItem& rItem ); ~ScSolveItem(); virtual String GetValueText() const; @@ -318,7 +318,7 @@ public: const ScSolveParam& GetData() const { return theSolveData; } private: - ScSolveParam theSolveData; + ScSolveParam theSolveData; }; //---------------------------------------------------------------------------- @@ -328,9 +328,9 @@ class ScTabOpItem : public SfxPoolItem { public: TYPEINFO(); - ScTabOpItem( USHORT nWhich, + ScTabOpItem( USHORT nWhich, const ScTabOpParam* pParam ); - ScTabOpItem( const ScTabOpItem& rItem ); + ScTabOpItem( const ScTabOpItem& rItem ); ~ScTabOpItem(); virtual String GetValueText() const; @@ -340,7 +340,7 @@ public: const ScTabOpParam& GetData() const { return theTabOpData; } private: - ScTabOpParam theTabOpData; + ScTabOpParam theTabOpData; }; //---------------------------------------------------------------------------- @@ -351,7 +351,7 @@ class ScCondFrmtItem : public SfxPoolItem public: TYPEINFO(); ScCondFrmtItem( USHORT nWhich, -//! const ScConditionalFormat* pCondFrmt ); +//! const ScConditionalFormat* pCondFrmt ); const ScConditionalFormat& rCondFrmt ); ScCondFrmtItem( const ScCondFrmtItem& rItem ); ~ScCondFrmtItem(); @@ -360,10 +360,10 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - const ScConditionalFormat& GetData() const { return theCondFrmtData; } + const ScConditionalFormat& GetData() const { return theCondFrmtData; } private: - ScConditionalFormat theCondFrmtData; + ScConditionalFormat theCondFrmtData; }; diff --git a/sc/source/ui/inc/undobase.hxx b/sc/source/ui/inc/undobase.hxx index 385f0892f5c3..d00f1fba00d1 100644 --- a/sc/source/ui/inc/undobase.hxx +++ b/sc/source/ui/inc/undobase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,21 +46,21 @@ class ScSimpleUndo: public SfxUndoAction public: TYPEINFO(); ScSimpleUndo( ScDocShell* pDocSh ); - virtual ~ScSimpleUndo(); + virtual ~ScSimpleUndo(); - virtual BOOL Merge( SfxUndoAction *pNextAction ); + virtual BOOL Merge( SfxUndoAction *pNextAction ); protected: - ScDocShell* pDocShell; - SfxUndoAction* pDetectiveUndo; + ScDocShell* pDocShell; + SfxUndoAction* pDetectiveUndo; - void BeginUndo(); - void EndUndo(); - void BeginRedo(); - void EndRedo(); + void BeginUndo(); + void EndUndo(); + void BeginRedo(); + void EndRedo(); - static void ShowTable( SCTAB nTab ); - static void ShowTable( const ScRange& rRange ); + static void ShowTable( SCTAB nTab ); + static void ShowTable( const ScRange& rRange ); }; //---------------------------------------------------------------------------- @@ -73,20 +73,20 @@ public: TYPEINFO(); ScBlockUndo( ScDocShell* pDocSh, const ScRange& rRange, ScBlockUndoMode eBlockMode ); - virtual ~ScBlockUndo(); + virtual ~ScBlockUndo(); protected: - ScRange aBlockRange; - SdrUndoAction* pDrawUndo; - ScBlockUndoMode eMode; + ScRange aBlockRange; + SdrUndoAction* pDrawUndo; + ScBlockUndoMode eMode; - void BeginUndo(); - void EndUndo(); -// void BeginRedo(); - void EndRedo(); + void BeginUndo(); + void EndUndo(); +// void BeginRedo(); + void EndRedo(); - BOOL AdjustHeight(); - void ShowBlock(); + BOOL AdjustHeight(); + void ShowBlock(); }; //---------------------------------------------------------------------------- @@ -117,28 +117,28 @@ public: enum ScMoveUndoMode { SC_UNDO_REFFIRST, SC_UNDO_REFLAST }; -class ScMoveUndo: public ScSimpleUndo // mit Referenzen +class ScMoveUndo: public ScSimpleUndo // mit Referenzen { public: TYPEINFO(); ScMoveUndo( ScDocShell* pDocSh, ScDocument* pRefDoc, ScRefUndoData* pRefData, ScMoveUndoMode eRefMode ); - virtual ~ScMoveUndo(); + virtual ~ScMoveUndo(); protected: - SdrUndoAction* pDrawUndo; - ScDocument* pRefUndoDoc; - ScRefUndoData* pRefUndoData; - ScMoveUndoMode eMode; + SdrUndoAction* pDrawUndo; + ScDocument* pRefUndoDoc; + ScRefUndoData* pRefUndoData; + ScMoveUndoMode eMode; - void BeginUndo(); - void EndUndo(); -// void BeginRedo(); -// void EndRedo(); + void BeginUndo(); + void EndUndo(); +// void BeginRedo(); +// void EndRedo(); private: - void UndoRef(); + void UndoRef(); }; //---------------------------------------------------------------------------- diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx index a6eb727a7554..b07fb0172b1e 100644 --- a/sc/source/ui/inc/undoblk.hxx +++ b/sc/source/ui/inc/undoblk.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,29 +61,29 @@ public: const ScRange& rRange, SCTAB nNewCount, SCTAB* pNewTabs, SCTAB* pNewScenarios, InsCellCmd eNewCmd, ScDocument* pUndoDocument, ScRefUndoData* pRefData, BOOL bNewPartOfPaste ); - virtual ~ScUndoInsertCells(); + virtual ~ScUndoInsertCells(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat( SfxRepeatTarget& rTarget ); - virtual BOOL CanRepeat( SfxRepeatTarget& rTarget ) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat( SfxRepeatTarget& rTarget ); + virtual BOOL CanRepeat( SfxRepeatTarget& rTarget ) const; - virtual String GetComment() const; + virtual String GetComment() const; - virtual BOOL Merge( SfxUndoAction *pNextAction ); + virtual BOOL Merge( SfxUndoAction *pNextAction ); private: - ScRange aEffRange; + ScRange aEffRange; SCTAB nCount; SCTAB* pTabs; SCTAB* pScenarios; - ULONG nEndChangeAction; - InsCellCmd eCmd; - BOOL bPartOfPaste; - SfxUndoAction* pPasteUndo; + ULONG nEndChangeAction; + InsCellCmd eCmd; + BOOL bPartOfPaste; + SfxUndoAction* pPasteUndo; - void DoChange ( const BOOL bUndo ); - void SetChangeTrack(); + void DoChange ( const BOOL bUndo ); + void SetChangeTrack(); }; @@ -92,28 +92,28 @@ class ScUndoDeleteCells: public ScMoveUndo public: TYPEINFO(); ScUndoDeleteCells( ScDocShell* pNewDocShell, - const ScRange& rRange, SCTAB nNewCount, SCTAB* pNewTabs, SCTAB* pNewScenarios, + const ScRange& rRange, SCTAB nNewCount, SCTAB* pNewTabs, SCTAB* pNewScenarios, DelCellCmd eNewCmd, ScDocument* pUndoDocument, ScRefUndoData* pRefData ); - virtual ~ScUndoDeleteCells(); + virtual ~ScUndoDeleteCells(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScRange aEffRange; + ScRange aEffRange; SCTAB nCount; SCTAB* pTabs; SCTAB* pScenarios; - ULONG nStartChangeAction; - ULONG nEndChangeAction; - DelCellCmd eCmd; + ULONG nStartChangeAction; + ULONG nEndChangeAction; + DelCellCmd eCmd; - void DoChange ( const BOOL bUndo ); - void SetChangeTrack(); + void DoChange ( const BOOL bUndo ); + void SetChangeTrack(); }; @@ -125,26 +125,26 @@ public: BOOL bNewRows, BOOL bNeedsRefresh, SCTAB nNewTab, const SCCOLROW* pRng, SCCOLROW nRngCnt, ScDocument* pUndoDocument, ScRefUndoData* pRefData ); - virtual ~ScUndoDeleteMulti(); + virtual ~ScUndoDeleteMulti(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - BOOL bRows; + BOOL bRows; BOOL bRefresh; - SCTAB nTab; - SCCOLROW* pRanges; - SCCOLROW nRangeCnt; - ULONG nStartChangeAction; - ULONG nEndChangeAction; + SCTAB nTab; + SCCOLROW* pRanges; + SCCOLROW nRangeCnt; + ULONG nStartChangeAction; + ULONG nEndChangeAction; - void DoChange() const; - void SetChangeTrack(); + void DoChange() const; + void SetChangeTrack(); }; @@ -157,24 +157,24 @@ public: ScAddress aOldEnd, // end position without adjustment const ScMarkData& rMark, // selected sheets ScDocument* pNewUndoDoc ); - virtual ~ScUndoCut(); + virtual ~ScUndoCut(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: ScMarkData aMarkData; - ScDocument* pUndoDoc; - ScRange aExtendedRange; - ULONG nStartChangeAction; - ULONG nEndChangeAction; + ScDocument* pUndoDoc; + ScRange aExtendedRange; + ULONG nStartChangeAction; + ULONG nEndChangeAction; - void DoChange( const BOOL bUndo ); - void SetChangeTrack(); + void DoChange( const BOOL bUndo ); + void SetChangeTrack(); }; @@ -208,29 +208,29 @@ public: ScRefUndoData* pRefData, void* pFill1, void* pFill2, void* pFill3, BOOL bRedoIsFilled = TRUE, const ScUndoPasteOptions* pOptions = NULL ); - virtual ~ScUndoPaste(); + virtual ~ScUndoPaste(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScMarkData aMarkData; - ScDocument* pUndoDoc; - ScDocument* pRedoDoc; - USHORT nFlags; - ScRefUndoData* pRefUndoData; - ScRefUndoData* pRefRedoData; - ULONG nStartChangeAction; - ULONG nEndChangeAction; - BOOL bRedoFilled; + ScMarkData aMarkData; + ScDocument* pUndoDoc; + ScDocument* pRedoDoc; + USHORT nFlags; + ScRefUndoData* pRefUndoData; + ScRefUndoData* pRefRedoData; + ULONG nStartChangeAction; + ULONG nEndChangeAction; + BOOL bRedoFilled; ScUndoPasteOptions aPasteOptions; - void DoChange( const BOOL bUndo ); - void SetChangeTrack(); + void DoChange( const BOOL bUndo ); + void SetChangeTrack(); }; @@ -242,27 +242,27 @@ public: const ScRange& rRange, ScAddress aNewDestPos, BOOL bNewCut, ScDocument* pUndoDocument, ScRefUndoData* pRefData, BOOL bScenario ); - virtual ~ScUndoDragDrop(); + virtual ~ScUndoDragDrop(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScRange aSrcRange; - ScRange aDestRange; - ULONG nStartChangeAction; - ULONG nEndChangeAction; - BOOL bCut; - BOOL bKeepScenarioFlags; + ScRange aSrcRange; + ScRange aDestRange; + ULONG nStartChangeAction; + ULONG nEndChangeAction; + BOOL bCut; + BOOL bKeepScenarioFlags; - void PaintArea( ScRange aRange, USHORT nExtFlags ) const; - void DoUndo( ScRange aRange ) const; + void PaintArea( ScRange aRange, USHORT nExtFlags ) const; + void DoUndo( ScRange aRange ) const; - void SetChangeTrack(); + void SetChangeTrack(); }; @@ -275,27 +275,27 @@ public: const ScRange& rRange, ScDocument* pNewUndoDoc, BOOL bNewMulti, USHORT nNewFlags, BOOL bObjects ); - virtual ~ScUndoDeleteContents(); + virtual ~ScUndoDeleteContents(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScRange aRange; - ScMarkData aMarkData; - ScDocument* pUndoDoc; // Blockmarkierung und geloeschte Daten - SdrUndoAction* pDrawUndo; // geloeschte Objekte - ULONG nStartChangeAction; - ULONG nEndChangeAction; - USHORT nFlags; - BOOL bMulti; // Mehrfachselektion + ScRange aRange; + ScMarkData aMarkData; + ScDocument* pUndoDoc; // Blockmarkierung und geloeschte Daten + SdrUndoAction* pDrawUndo; // geloeschte Objekte + ULONG nStartChangeAction; + ULONG nEndChangeAction; + USHORT nFlags; + BOOL bMulti; // Mehrfachselektion - void DoChange( const BOOL bUndo ); - void SetChangeTrack(); + void DoChange( const BOOL bUndo ); + void SetChangeTrack(); }; @@ -309,30 +309,30 @@ public: SCCOL nEndX, SCROW nEndY, SCTAB nEndZ, ScDocument* pNewUndoDoc, BOOL bNewMulti, SCTAB nSrc, USHORT nFlg, USHORT nFunc, BOOL bSkip, BOOL bLink ); - virtual ~ScUndoFillTable(); + virtual ~ScUndoFillTable(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScRange aRange; - ScMarkData aMarkData; - ScDocument* pUndoDoc; // Blockmarkierung und geloeschte Daten - ULONG nStartChangeAction; - ULONG nEndChangeAction; - USHORT nFlags; - USHORT nFunction; - SCTAB nSrcTab; - BOOL bMulti; // Mehrfachselektion - BOOL bSkipEmpty; - BOOL bAsLink; + ScRange aRange; + ScMarkData aMarkData; + ScDocument* pUndoDoc; // Blockmarkierung und geloeschte Daten + ULONG nStartChangeAction; + ULONG nEndChangeAction; + USHORT nFlags; + USHORT nFunction; + SCTAB nSrcTab; + BOOL bMulti; // Mehrfachselektion + BOOL bSkipEmpty; + BOOL bAsLink; - void DoChange( const BOOL bUndo ); - void SetChangeTrack(); + void DoChange( const BOOL bUndo ); + void SetChangeTrack(); }; @@ -348,27 +348,27 @@ public: const ScPatternAttr* pNewApply, const SvxBoxItem* pNewOuter = NULL, const SvxBoxInfoItem* pNewInner = NULL ); - virtual ~ScUndoSelectionAttr(); + virtual ~ScUndoSelectionAttr(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; ScEditDataArray* GetDataArray(); private: - ScMarkData aMarkData; - ScRange aRange; + ScMarkData aMarkData; + ScRange aRange; ScEditDataArray aDataArray; - ScDocument* pUndoDoc; - BOOL bMulti; - ScPatternAttr* pApplyPattern; - SvxBoxItem* pLineOuter; - SvxBoxInfoItem* pLineInner; + ScDocument* pUndoDoc; + BOOL bMulti; + ScPatternAttr* pApplyPattern; + SvxBoxItem* pLineOuter; + SvxBoxInfoItem* pLineInner; - void DoChange( const BOOL bUndo ); + void DoChange( const BOOL bUndo ); void ChangeEditData( const bool bUndo ); }; @@ -386,29 +386,29 @@ public: ScOutlineTable* pNewUndoTab, ScSizeMode eNewMode, USHORT nNewSizeTwips, BOOL bNewWidth ); - virtual ~ScUndoWidthOrHeight(); + virtual ~ScUndoWidthOrHeight(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; virtual String GetComment() const; private: - ScMarkData aMarkData; - SCCOLROW nStart; - SCCOLROW nEnd; - SCTAB nStartTab; - SCTAB nEndTab; - ScDocument* pUndoDoc; - ScOutlineTable* pUndoTab; - SCCOLROW nRangeCnt; - SCCOLROW* pRanges; - USHORT nNewSize; - BOOL bWidth; - ScSizeMode eMode; - SdrUndoAction* pDrawUndo; + ScMarkData aMarkData; + SCCOLROW nStart; + SCCOLROW nEnd; + SCTAB nStartTab; + SCTAB nEndTab; + ScDocument* pUndoDoc; + ScOutlineTable* pUndoTab; + SCCOLROW nRangeCnt; + SCCOLROW* pRanges; + USHORT nNewSize; + BOOL bWidth; + ScSizeMode eMode; + SdrUndoAction* pDrawUndo; }; @@ -423,30 +423,30 @@ public: FillCmd eNewFillCmd, FillDateCmd eNewFillDateCmd, double fNewStartValue, double fNewStepValue, double fNewMaxValue, USHORT nMaxShIndex ); - virtual ~ScUndoAutoFill(); + virtual ~ScUndoAutoFill(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScRange aSource; - ScMarkData aMarkData; - ScDocument* pUndoDoc; - FillDir eFillDir; - FillCmd eFillCmd; - FillDateCmd eFillDateCmd; - double fStartValue; - double fStepValue; - double fMaxValue; - ULONG nStartChangeAction; - ULONG nEndChangeAction; - USHORT nMaxSharedIndex; + ScRange aSource; + ScMarkData aMarkData; + ScDocument* pUndoDoc; + FillDir eFillDir; + FillCmd eFillCmd; + FillDateCmd eFillDateCmd; + double fStartValue; + double fStepValue; + double fMaxValue; + ULONG nStartChangeAction; + ULONG nEndChangeAction; + USHORT nMaxSharedIndex; - void SetChangeTrack(); + void SetChangeTrack(); }; @@ -456,22 +456,22 @@ public: TYPEINFO(); ScUndoMerge( ScDocShell* pNewDocShell, const ScCellMergeOption& rOption, bool bMergeContents, ScDocument* pUndoDoc, SdrUndoAction* pDrawUndo); - virtual ~ScUndoMerge(); + virtual ~ScUndoMerge(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: ScCellMergeOption maOption; bool mbMergeContents; // Merge contents in Redo(). - ScDocument* mpUndoDoc; // wenn Daten zusammengefasst + ScDocument* mpUndoDoc; // wenn Daten zusammengefasst SdrUndoAction* mpDrawUndo; - void DoChange( bool bUndo ) const; + void DoChange( bool bUndo ) const; }; @@ -483,20 +483,20 @@ public: const ScRange& rRange, ScDocument* pNewUndoDoc, const ScMarkData& rMark, BOOL bNewSize, USHORT nNewFormatNo ); - virtual ~ScUndoAutoFormat(); + virtual ~ScUndoAutoFormat(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScDocument* pUndoDoc; // geloeschte Daten - ScMarkData aMarkData; - BOOL bSize; - USHORT nFormatNo; + ScDocument* pUndoDoc; // geloeschte Daten + ScMarkData aMarkData; + BOOL bSize; + USHORT nFormatNo; }; @@ -509,25 +509,25 @@ public: SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, const String& rNewUndoStr, ScDocument* pNewUndoDoc, const SvxSearchItem* pItem ); - virtual ~ScUndoReplace(); + virtual ~ScUndoReplace(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScAddress aCursorPos; - ScMarkData aMarkData; - String aUndoStr; // Daten bei Einfachmarkierung - ScDocument* pUndoDoc; // Blockmarkierung und geloeschte Daten - SvxSearchItem* pSearchItem; - ULONG nStartChangeAction; - ULONG nEndChangeAction; + ScAddress aCursorPos; + ScMarkData aMarkData; + String aUndoStr; // Daten bei Einfachmarkierung + ScDocument* pUndoDoc; // Blockmarkierung und geloeschte Daten + SvxSearchItem* pSearchItem; + ULONG nStartChangeAction; + ULONG nEndChangeAction; - void SetChangeTrack(); + void SetChangeTrack(); }; @@ -544,23 +544,23 @@ public: const ScRefAddress& rRowCell, const ScRefAddress& rColCell, BYTE nMode ); - virtual ~ScUndoTabOp(); + virtual ~ScUndoTabOp(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScRange aRange; - ScDocument* pUndoDoc; // geloeschte Daten - ScRefAddress theFormulaCell; - ScRefAddress theFormulaEnd; - ScRefAddress theRowCell; - ScRefAddress theColCell; - BYTE nMode; + ScRange aRange; + ScDocument* pUndoDoc; // geloeschte Daten + ScRefAddress theFormulaCell; + ScRefAddress theFormulaEnd; + ScRefAddress theRowCell; + ScRefAddress theColCell; + BYTE nMode; }; @@ -634,20 +634,20 @@ public: ScUndoListNames( ScDocShell* pNewDocShell, const ScRange& rRange, ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc ); - virtual ~ScUndoListNames(); + virtual ~ScUndoListNames(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScDocument* pUndoDoc; - ScDocument* pRedoDoc; + ScDocument* pUndoDoc; + ScDocument* pRedoDoc; - void DoChange( ScDocument* pSrcDoc ) const; + void DoChange( ScDocument* pSrcDoc ) const; }; @@ -659,20 +659,20 @@ public: const ScMarkData& rMark, const ScArea& rDestArea, ScDocument* pNewUndoDoc, const String& rNewName ); - virtual ~ScUndoUseScenario(); + virtual ~ScUndoUseScenario(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; virtual String GetComment() const; private: - ScDocument* pUndoDoc; - ScRange aRange; - ScMarkData aMarkData; - String aName; + ScDocument* pUndoDoc; + ScRange aRange; + ScMarkData aMarkData; + String aName; }; @@ -685,23 +685,23 @@ public: const ScRange& rRange, const String& rName, ScDocument* pNewUndoDoc ); - virtual ~ScUndoSelectionStyle(); + virtual ~ScUndoSelectionStyle(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; - virtual USHORT GetId() const; + virtual String GetComment() const; + virtual USHORT GetId() const; private: - ScMarkData aMarkData; - ScDocument* pUndoDoc; - String aStyleName; - ScRange aRange; + ScMarkData aMarkData; + ScDocument* pUndoDoc; + String aStyleName; + ScRange aRange; - void DoChange( const BOOL bUndo ); + void DoChange( const BOOL bUndo ); }; @@ -711,18 +711,18 @@ public: TYPEINFO(); ScUndoRefreshLink( ScDocShell* pNewDocShell, ScDocument* pNewUndoDoc ); - virtual ~ScUndoRefreshLink(); + virtual ~ScUndoRefreshLink(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScDocument* pUndoDoc; - ScDocument* pRedoDoc; + ScDocument* pUndoDoc; + ScDocument* pRedoDoc; }; @@ -734,23 +734,23 @@ public: const ScRange& rArea, ScDocument* pNewUndoDoc, const String& rForm ); - virtual ~ScUndoEnterMatrix(); + virtual ~ScUndoEnterMatrix(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScDocument* pUndoDoc; - String aFormula; + ScDocument* pUndoDoc; + String aFormula; formula::FormulaGrammar::AddressConvention eConv; - ULONG nStartChangeAction; - ULONG nEndChangeAction; + ULONG nStartChangeAction; + ULONG nEndChangeAction; - void SetChangeTrack(); + void SetChangeTrack(); }; @@ -763,22 +763,22 @@ public: const String& rFlt, const String& rOpt, const String& rArea, const ScRange& rDestRange, ULONG nRefreshDelay ); - virtual ~ScUndoInsertAreaLink(); + virtual ~ScUndoInsertAreaLink(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - String aDocName; - String aFltName; - String aOptions; - String aAreaName; - ScRange aRange; - ULONG nRefreshDelay; + String aDocName; + String aFltName; + String aOptions; + String aAreaName; + ScRange aRange; + ULONG nRefreshDelay; }; @@ -791,26 +791,26 @@ public: const String& rFlt, const String& rOpt, const String& rArea, const ScRange& rDestRange, ULONG nRefreshDelay ); - virtual ~ScUndoRemoveAreaLink(); + virtual ~ScUndoRemoveAreaLink(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - String aDocName; - String aFltName; - String aOptions; - String aAreaName; - ScRange aRange; - ULONG nRefreshDelay; + String aDocName; + String aFltName; + String aOptions; + String aAreaName; + ScRange aRange; + ULONG nRefreshDelay; }; -class ScUndoUpdateAreaLink : public ScSimpleUndo //! auch BlockUndo umstellen? +class ScUndoUpdateAreaLink : public ScSimpleUndo //! auch BlockUndo umstellen? { public: TYPEINFO(); @@ -825,33 +825,33 @@ public: ULONG nNewRD, ScDocument* pUndo, ScDocument* pRedo, BOOL bDoInsert ); - virtual ~ScUndoUpdateAreaLink(); + virtual ~ScUndoUpdateAreaLink(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - String aOldDoc; - String aOldFlt; - String aOldOpt; - String aOldArea; - ScRange aOldRange; - String aNewDoc; - String aNewFlt; - String aNewOpt; - String aNewArea; - ScRange aNewRange; - ScDocument* pUndoDoc; - ScDocument* pRedoDoc; - ULONG nOldRefresh; - ULONG nNewRefresh; - BOOL bWithInsert; - - void DoChange( const BOOL bUndo ) const; + String aOldDoc; + String aOldFlt; + String aOldOpt; + String aOldArea; + ScRange aOldRange; + String aNewDoc; + String aNewFlt; + String aNewOpt; + String aNewArea; + ScRange aNewRange; + ScDocument* pUndoDoc; + ScDocument* pRedoDoc; + ULONG nOldRefresh; + ULONG nNewRefresh; + BOOL bWithInsert; + + void DoChange( const BOOL bUndo ) const; }; @@ -861,19 +861,19 @@ public: TYPEINFO(); ScUndoIndent( ScDocShell* pNewDocShell, const ScMarkData& rMark, ScDocument* pNewUndoDoc, BOOL bIncrement ); - virtual ~ScUndoIndent(); + virtual ~ScUndoIndent(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScMarkData aMarkData; - ScDocument* pUndoDoc; - BOOL bIsIncrement; + ScMarkData aMarkData; + ScDocument* pUndoDoc; + BOOL bIsIncrement; }; @@ -883,19 +883,19 @@ public: TYPEINFO(); ScUndoTransliterate( ScDocShell* pNewDocShell, const ScMarkData& rMark, ScDocument* pNewUndoDoc, sal_Int32 nType ); - virtual ~ScUndoTransliterate(); + virtual ~ScUndoTransliterate(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScMarkData aMarkData; - ScDocument* pUndoDoc; - sal_Int32 nTransliterationType; + ScMarkData aMarkData; + ScDocument* pUndoDoc; + sal_Int32 nTransliterationType; }; @@ -905,19 +905,19 @@ public: TYPEINFO(); ScUndoClearItems( ScDocShell* pNewDocShell, const ScMarkData& rMark, ScDocument* pNewUndoDoc, const USHORT* pW ); - virtual ~ScUndoClearItems(); + virtual ~ScUndoClearItems(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScMarkData aMarkData; - ScDocument* pUndoDoc; - USHORT* pWhich; + ScMarkData aMarkData; + ScDocument* pUndoDoc; + USHORT* pWhich; }; @@ -927,18 +927,18 @@ public: TYPEINFO(); ScUndoRemoveBreaks( ScDocShell* pNewDocShell, SCTAB nNewTab, ScDocument* pNewUndoDoc ); - virtual ~ScUndoRemoveBreaks(); + virtual ~ScUndoRemoveBreaks(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - SCTAB nTab; - ScDocument* pUndoDoc; + SCTAB nTab; + ScDocument* pUndoDoc; }; @@ -949,20 +949,20 @@ public: ScUndoRemoveMerge( ScDocShell* pNewDocShell, const ScCellMergeOption& rOption, ScDocument* pNewUndoDoc ); - virtual ~ScUndoRemoveMerge(); + virtual ~ScUndoRemoveMerge(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: void SetCurTab(); ScCellMergeOption maOption; - ScDocument* pUndoDoc; + ScDocument* pUndoDoc; }; @@ -975,20 +975,20 @@ public: ScDocument* pNewUndoDoc, const SvxBoxItem& rNewOuter, const SvxBoxInfoItem& rNewInner ); - virtual ~ScUndoBorder(); + virtual ~ScUndoBorder(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScDocument* pUndoDoc; - ScRangeList* pRanges; - SvxBoxItem* pOuter; - SvxBoxInfoItem* pInner; + ScDocument* pUndoDoc; + ScRangeList* pRanges; + SvxBoxItem* pOuter; + SvxBoxInfoItem* pInner; }; diff --git a/sc/source/ui/inc/undocell.hxx b/sc/source/ui/inc/undocell.hxx index 0def8a3d67ba..0d00af997d74 100644 --- a/sc/source/ui/inc/undocell.hxx +++ b/sc/source/ui/inc/undocell.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,14 +53,14 @@ public: SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab, const ScPatternAttr* pOldPat, const ScPatternAttr* pNewPat, const ScPatternAttr* pApplyPat, BOOL bAutomatic ); - virtual ~ScUndoCursorAttr(); + virtual ~ScUndoCursorAttr(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; /** once the objects are passed to this class, their life-cycle is managed by this class; the calling function must pass new'ed @@ -68,17 +68,17 @@ public: void SetEditData( EditTextObject* pOld, EditTextObject* pNew ); private: - SCCOL nCol; - SCROW nRow; - SCTAB nTab; - ScPatternAttr* pOldPattern; - ScPatternAttr* pNewPattern; - ScPatternAttr* pApplyPattern; + SCCOL nCol; + SCROW nRow; + SCTAB nTab; + ScPatternAttr* pOldPattern; + ScPatternAttr* pNewPattern; + ScPatternAttr* pApplyPattern; ::boost::shared_ptr<EditTextObject> pOldEditData; ::boost::shared_ptr<EditTextObject> pNewEditData; - BOOL bIsAutomatic; + BOOL bIsAutomatic; - void DoChange( const ScPatternAttr* pWhichPattern, const ::boost::shared_ptr<EditTextObject>& pEditData ) const; + void DoChange( const ScPatternAttr* pWhichPattern, const ::boost::shared_ptr<EditTextObject>& pEditData ) const; }; @@ -91,30 +91,30 @@ public: SCTAB nNewCount, SCTAB* pNewTabs, ScBaseCell** ppOldData, BOOL* pHasForm, ULONG* pOldForm, const String& rNewStr, EditTextObject* pObj = NULL ); - virtual ~ScUndoEnterData(); + virtual ~ScUndoEnterData(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - String aNewString; - SCTAB* pTabs; - ScBaseCell** ppOldCells; - BOOL* pHasFormat; - ULONG* pOldFormats; - EditTextObject* pNewEditData; - ULONG nEndChangeAction; - SCCOL nCol; - SCROW nRow; - SCTAB nTab; - SCTAB nCount; // markierte Tabellen - - void DoChange() const; - void SetChangeTrack(); + String aNewString; + SCTAB* pTabs; + ScBaseCell** ppOldCells; + BOOL* pHasFormat; + ULONG* pOldFormats; + EditTextObject* pNewEditData; + ULONG nEndChangeAction; + SCCOL nCol; + SCROW nRow; + SCTAB nTab; + SCTAB nCount; // markierte Tabellen + + void DoChange() const; + void SetChangeTrack(); }; @@ -125,23 +125,23 @@ public: ScUndoEnterValue( ScDocShell* pNewDocShell, const ScAddress& rNewPos, ScBaseCell* pUndoCell, double nVal, BOOL bHeight ); - virtual ~ScUndoEnterValue(); + virtual ~ScUndoEnterValue(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScAddress aPos; - ScBaseCell* pOldCell; - double nValue; - ULONG nEndChangeAction; - BOOL bNeedHeight; + ScAddress aPos; + ScBaseCell* pOldCell; + double nValue; + ULONG nEndChangeAction; + BOOL bNeedHeight; - void SetChangeTrack(); + void SetChangeTrack(); }; @@ -152,23 +152,23 @@ public: ScUndoPutCell( ScDocShell* pNewDocShell, const ScAddress& rNewPos, ScBaseCell* pUndoCell, ScBaseCell* pRedoCell, BOOL bHeight ); - virtual ~ScUndoPutCell(); + virtual ~ScUndoPutCell(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScAddress aPos; - ScBaseCell* pOldCell; - ScBaseCell* pEnteredCell; - ULONG nEndChangeAction; - BOOL bNeedHeight; + ScAddress aPos; + ScBaseCell* pOldCell; + ScBaseCell* pEnteredCell; + ULONG nEndChangeAction; + BOOL bNeedHeight; - void SetChangeTrack(); + void SetChangeTrack(); }; @@ -179,23 +179,23 @@ public: ScUndoPageBreak( ScDocShell* pNewDocShell, SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab, BOOL bNewColumn, BOOL bNewInsert ); - virtual ~ScUndoPageBreak(); + virtual ~ScUndoPageBreak(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - SCCOL nCol; - SCROW nRow; - SCTAB nTab; - BOOL bColumn; // Spalten- oder Zeilenumbruch - BOOL bInsert; // Einfuegen oder Loeschen + SCCOL nCol; + SCROW nRow; + SCTAB nTab; + BOOL bColumn; // Spalten- oder Zeilenumbruch + BOOL bInsert; // Einfuegen oder Loeschen - void DoChange( BOOL bInsert ) const; + void DoChange( BOOL bInsert ) const; }; class ScUndoPrintZoom: public ScSimpleUndo @@ -204,23 +204,23 @@ public: TYPEINFO(); ScUndoPrintZoom( ScDocShell* pNewDocShell, SCTAB nT, USHORT nOS, USHORT nOP, USHORT nNS, USHORT nNP ); - virtual ~ScUndoPrintZoom(); + virtual ~ScUndoPrintZoom(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - SCTAB nTab; - USHORT nOldScale; - USHORT nOldPages; - USHORT nNewScale; - USHORT nNewPages; + SCTAB nTab; + USHORT nOldScale; + USHORT nOldPages; + USHORT nNewScale; + USHORT nNewPages; - void DoChange( BOOL bUndo ); + void DoChange( BOOL bUndo ); }; class ScUndoThesaurus: public ScSimpleUndo @@ -231,28 +231,28 @@ public: SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab, const String& rNewUndoStr, const EditTextObject* pUndoTObj, const String& rNewRedoStr, const EditTextObject* pRedoTObj); - virtual ~ScUndoThesaurus(); + virtual ~ScUndoThesaurus(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - SCCOL nCol; - SCROW nRow; - SCTAB nTab; - String aUndoStr; // Daten bei StringZelle - EditTextObject* pUndoTObject; // bei EditZelle - String aRedoStr; + SCCOL nCol; + SCROW nRow; + SCTAB nTab; + String aUndoStr; // Daten bei StringZelle + EditTextObject* pUndoTObject; // bei EditZelle + String aRedoStr; EditTextObject* pRedoTObject; - ULONG nEndChangeAction; + ULONG nEndChangeAction; - void DoChange( BOOL bUndo, const String& rStr, + void DoChange( BOOL bUndo, const String& rStr, const EditTextObject* pTObj ); - void SetChangeTrack( ScBaseCell* pOldCell ); + void SetChangeTrack( ScBaseCell* pOldCell ); }; // ============================================================================ @@ -307,18 +307,18 @@ class ScUndoShowHideNote : public ScSimpleUndo public: TYPEINFO(); ScUndoShowHideNote( ScDocShell& rDocShell, const ScAddress& rPos, bool bShow ); - virtual ~ScUndoShowHideNote(); + virtual ~ScUndoShowHideNote(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat( SfxRepeatTarget& rTarget ); - virtual BOOL CanRepeat( SfxRepeatTarget& rTarget ) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat( SfxRepeatTarget& rTarget ); + virtual BOOL CanRepeat( SfxRepeatTarget& rTarget ) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScAddress maPos; - bool mbShown; + ScAddress maPos; + bool mbShown; }; // ============================================================================ @@ -330,21 +330,21 @@ public: ScUndoDetective( ScDocShell* pNewDocShell, SdrUndoAction* pDraw, const ScDetOpData* pOperation, ScDetOpList* pUndoList = NULL ); - virtual ~ScUndoDetective(); + virtual ~ScUndoDetective(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - BOOL bIsDelete; - ScDetOpList* pOldList; - USHORT nAction; - ScAddress aPos; - SdrUndoAction* pDrawUndo; + BOOL bIsDelete; + ScDetOpList* pOldList; + USHORT nAction; + ScAddress aPos; + SdrUndoAction* pDrawUndo; }; @@ -354,20 +354,20 @@ public: TYPEINFO(); ScUndoRangeNames( ScDocShell* pNewDocShell, ScRangeName* pOld, ScRangeName* pNew ); - virtual ~ScUndoRangeNames(); + virtual ~ScUndoRangeNames(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScRangeName* pOldRanges; - ScRangeName* pNewRanges; + ScRangeName* pOldRanges; + ScRangeName* pNewRanges; - void DoChange( BOOL bUndo ); + void DoChange( BOOL bUndo ); }; diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx index 05e4b9eff433..5f76bccb5fae 100644 --- a/sc/source/ui/inc/undodat.hxx +++ b/sc/source/ui/inc/undodat.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,8 +30,8 @@ #define SC_UNDODAT_HXX #include "undobase.hxx" -#include "rangeutl.hxx" // ScArea -#include "rangelst.hxx" // ScRangeListRef +#include "rangeutl.hxx" // ScArea +#include "rangelst.hxx" // ScRangeListRef #include "markdata.hxx" #include "sortparam.hxx" #include "queryparam.hxx" @@ -56,24 +56,24 @@ public: SCCOLROW nNewStart, SCCOLROW nNewEnd, SCTAB nNewTab, ScDocument* pNewUndoDoc, BOOL bNewColumns, USHORT nNewLevel, USHORT nNewEntry, BOOL bNewShow ); - virtual ~ScUndoDoOutline(); + virtual ~ScUndoDoOutline(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - SCCOLROW nStart; - SCCOLROW nEnd; - SCTAB nTab; - ScDocument* pUndoDoc; - BOOL bColumns; - USHORT nLevel; - USHORT nEntry; - BOOL bShow; + SCCOLROW nStart; + SCCOLROW nEnd; + SCTAB nTab; + ScDocument* pUndoDoc; + BOOL bColumns; + USHORT nLevel; + USHORT nEntry; + BOOL bShow; }; @@ -86,21 +86,21 @@ public: SCCOL nEndX, SCROW nEndY, SCTAB nEndZ, ScOutlineTable* pNewUndoTab, BOOL bNewColumns, BOOL bNewMake ); - virtual ~ScUndoMakeOutline(); + virtual ~ScUndoMakeOutline(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScAddress aBlockStart; - ScAddress aBlockEnd; - ScOutlineTable* pUndoTable; - BOOL bColumns; - BOOL bMake; + ScAddress aBlockStart; + ScAddress aBlockEnd; + ScOutlineTable* pUndoTable; + BOOL bColumns; + BOOL bMake; }; @@ -112,23 +112,23 @@ public: SCCOLROW nNewStart, SCCOLROW nNewEnd, SCTAB nNewTab, ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab, BOOL bNewColumns, USHORT nNewLevel ); - virtual ~ScUndoOutlineLevel(); + virtual ~ScUndoOutlineLevel(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - SCCOLROW nStart; - SCCOLROW nEnd; - SCTAB nTab; - ScDocument* pUndoDoc; - ScOutlineTable* pUndoTable; - BOOL bColumns; - USHORT nLevel; + SCCOLROW nStart; + SCCOLROW nEnd; + SCTAB nTab; + ScDocument* pUndoDoc; + ScOutlineTable* pUndoTable; + BOOL bColumns; + USHORT nLevel; }; @@ -141,21 +141,21 @@ public: SCCOL nEndX, SCROW nEndY, SCTAB nEndZ, ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab, BOOL bNewShow ); - virtual ~ScUndoOutlineBlock(); + virtual ~ScUndoOutlineBlock(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScAddress aBlockStart; - ScAddress aBlockEnd; - ScDocument* pUndoDoc; - ScOutlineTable* pUndoTable; - BOOL bShow; + ScAddress aBlockStart; + ScAddress aBlockEnd; + ScDocument* pUndoDoc; + ScOutlineTable* pUndoTable; + BOOL bShow; }; @@ -167,20 +167,20 @@ public: SCCOL nStartX, SCROW nStartY, SCTAB nStartZ, SCCOL nEndX, SCROW nEndY, SCTAB nEndZ, ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab ); - virtual ~ScUndoRemoveAllOutlines(); + virtual ~ScUndoRemoveAllOutlines(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScAddress aBlockStart; - ScAddress aBlockEnd; - ScDocument* pUndoDoc; - ScOutlineTable* pUndoTable; + ScAddress aBlockStart; + ScAddress aBlockEnd; + ScDocument* pUndoDoc; + ScOutlineTable* pUndoTable; }; @@ -192,20 +192,20 @@ public: SCCOL nStartX, SCROW nStartY, SCTAB nStartZ, SCCOL nEndX, SCROW nEndY, SCTAB nEndZ, ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab ); - virtual ~ScUndoAutoOutline(); + virtual ~ScUndoAutoOutline(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScAddress aBlockStart; - ScAddress aBlockEnd; - ScDocument* pUndoDoc; - ScOutlineTable* pUndoTable; + ScAddress aBlockStart; + ScAddress aBlockEnd; + ScDocument* pUndoDoc; + ScOutlineTable* pUndoTable; }; @@ -216,26 +216,26 @@ public: ScUndoSubTotals( ScDocShell* pNewDocShell, SCTAB nNewTab, const ScSubTotalParam& rNewParam, SCROW nNewEndY, ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab, -// ScDBData* pNewData, +// ScDBData* pNewData, ScRangeName* pNewUndoRange, ScDBCollection* pNewUndoDB ); - virtual ~ScUndoSubTotals(); + virtual ~ScUndoSubTotals(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - SCTAB nTab; - ScSubTotalParam aParam; // Original uebergebener Parameter - SCROW nNewEndRow; // Ergebnis-Groesse - ScDocument* pUndoDoc; - ScOutlineTable* pUndoTable; -// ScDBData* pUndoDBData; - ScRangeName* pUndoRange; - ScDBCollection* pUndoDB; + SCTAB nTab; + ScSubTotalParam aParam; // Original uebergebener Parameter + SCROW nNewEndRow; // Ergebnis-Groesse + ScDocument* pUndoDoc; + ScOutlineTable* pUndoTable; +// ScDBData* pUndoDBData; + ScRangeName* pUndoRange; + ScDBCollection* pUndoDB; }; @@ -247,23 +247,23 @@ public: const ScSortParam& rParam, BOOL bQuery, ScDocument* pNewUndoDoc, ScDBCollection* pNewUndoDB, const ScRange* pDest = NULL ); - virtual ~ScUndoSort(); + virtual ~ScUndoSort(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - SCTAB nTab; - ScSortParam aSortParam; - BOOL bRepeatQuery; - ScDocument* pUndoDoc; - ScDBCollection* pUndoDB; // wegen Quell- und Zielbereich - BOOL bDestArea; - ScRange aDestRange; + SCTAB nTab; + ScSortParam aSortParam; + BOOL bRepeatQuery; + ScDocument* pUndoDoc; + ScDBCollection* pUndoDB; // wegen Quell- und Zielbereich + BOOL bDestArea; + ScRange aDestRange; }; @@ -275,26 +275,26 @@ public: const ScQueryParam& rParam, ScDocument* pNewUndoDoc, ScDBCollection* pNewUndoDB, const ScRange* pOld, BOOL bSize, const ScRange* pAdvSrc ); - virtual ~ScUndoQuery(); + virtual ~ScUndoQuery(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: SdrUndoAction* pDrawUndo; - SCTAB nTab; - ScQueryParam aQueryParam; - ScDocument* pUndoDoc; - ScDBCollection* pUndoDB; // wegen Quell- und Zielbereich - ScRange aOldDest; - ScRange aAdvSource; - BOOL bIsAdvanced; - BOOL bDestArea; - BOOL bDoSize; + SCTAB nTab; + ScQueryParam aQueryParam; + ScDocument* pUndoDoc; + ScDBCollection* pUndoDB; // wegen Quell- und Zielbereich + ScRange aOldDest; + ScRange aAdvSource; + BOOL bIsAdvanced; + BOOL bDestArea; + BOOL bDoSize; }; @@ -327,14 +327,14 @@ public: TYPEINFO(); ScUndoDBData( ScDocShell* pNewDocShell, ScDBCollection* pNewUndoColl, ScDBCollection* pNewRedoColl ); - virtual ~ScUndoDBData(); + virtual ~ScUndoDBData(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: ScDBCollection* pUndoColl; @@ -351,26 +351,26 @@ public: SCCOL nNewFormula, ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc, ScDBData* pNewUndoData, ScDBData* pNewRedoData ); - virtual ~ScUndoImportData(); + virtual ~ScUndoImportData(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - SCTAB nTab; - ScImportParam aImportParam; - SCCOL nEndCol; - SCROW nEndRow; - ScDocument* pUndoDoc; - ScDocument* pRedoDoc; - ScDBData* pUndoDBData; - ScDBData* pRedoDBData; - SCCOL nFormulaCols; - BOOL bRedoFilled; + SCTAB nTab; + ScImportParam aImportParam; + SCCOL nEndCol; + SCROW nEndRow; + ScDocument* pUndoDoc; + ScDocument* pRedoDoc; + ScDBData* pUndoDBData; + ScDBData* pRedoDBData; + SCCOL nFormulaCols; + BOOL bRedoFilled; }; @@ -384,27 +384,27 @@ public: ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab, ScRangeName* pNewUndoRange, ScDBCollection* pNewUndoDB, const ScRange* pOldQ, const ScRange* pNewQ ); - virtual ~ScUndoRepeatDB(); + virtual ~ScUndoRepeatDB(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScAddress aBlockStart; - ScAddress aBlockEnd; - SCROW nNewEndRow; - ScAddress aCursorPos; - ScDocument* pUndoDoc; - ScOutlineTable* pUndoTable; - ScRangeName* pUndoRange; - ScDBCollection* pUndoDB; - ScRange aOldQuery; - ScRange aNewQuery; - BOOL bQuerySize; + ScAddress aBlockStart; + ScAddress aBlockEnd; + SCROW nNewEndRow; + ScAddress aCursorPos; + ScDocument* pUndoDoc; + ScOutlineTable* pUndoTable; + ScRangeName* pUndoRange; + ScDBCollection* pUndoDB; + ScRange aOldQuery; + ScRange aNewQuery; + BOOL bQuerySize; }; @@ -416,21 +416,21 @@ public: ScDocument* pOldDoc, ScDocument* pNewDoc, const ScDPObject* pOldObj, const ScDPObject* pNewObj, BOOL bMove ); - virtual ~ScUndoDataPilot(); + virtual ~ScUndoDataPilot(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScDocument* pOldUndoDoc; - ScDocument* pNewUndoDoc; - ScDPObject* pOldDPObject; - ScDPObject* pNewDPObject; - BOOL bAllowMove; + ScDocument* pOldUndoDoc; + ScDocument* pNewUndoDoc; + ScDPObject* pOldDPObject; + ScDPObject* pNewDPObject; + BOOL bAllowMove; }; @@ -443,23 +443,23 @@ public: ScDocument* pNewUndoDoc, BOOL bReference, SCROW nInsCount, ScOutlineTable* pTab, ScDBData* pData ); - virtual ~ScUndoConsolidate(); + virtual ~ScUndoConsolidate(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScArea aDestArea; - ScDocument* pUndoDoc; - ScConsolidateParam aParam; - BOOL bInsRef; - SCSIZE nInsertCount; - ScOutlineTable* pUndoTab; - ScDBData* pUndoData; + ScArea aDestArea; + ScDocument* pUndoDoc; + ScConsolidateParam aParam; + BOOL bInsRef; + SCSIZE nInsertCount; + ScOutlineTable* pUndoTab; + ScDBData* pUndoData; }; @@ -473,27 +473,27 @@ public: ScUndoChartData( ScDocShell* pNewDocShell, const String& rName, const ScRangeListRef& rNew, BOOL bColHdr, BOOL bRowHdr, BOOL bAdd ); - virtual ~ScUndoChartData(); + virtual ~ScUndoChartData(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - String aChartName; - ScRangeListRef aOldRangeListRef; - BOOL bOldColHeaders; - BOOL bOldRowHeaders; -// ScRange aNewRange; - ScRangeListRef aNewRangeListRef; - BOOL bNewColHeaders; - BOOL bNewRowHeaders; - BOOL bAddRange; - - void Init(); + String aChartName; + ScRangeListRef aOldRangeListRef; + BOOL bOldColHeaders; + BOOL bOldRowHeaders; +// ScRange aNewRange; + ScRangeListRef aNewRangeListRef; + BOOL bNewColHeaders; + BOOL bNewRowHeaders; + BOOL bAddRange; + + void Init(); }; // amelia @@ -510,28 +510,28 @@ public: ScRefUndoData* pRefData, void* pFill1, void* pFill2, void* pFill3, BOOL bRedoIsFilled = TRUE ); - virtual ~ScUndoDataForm(); + virtual ~ScUndoDataForm(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - ScMarkData aMarkData; - ScDocument* pUndoDoc; - ScDocument* pRedoDoc; - USHORT nFlags; - ScRefUndoData* pRefUndoData; - ScRefUndoData* pRefRedoData; - ULONG nStartChangeAction; - ULONG nEndChangeAction; - BOOL bRedoFilled; - - void DoChange( const BOOL bUndo ); - void SetChangeTrack(); + ScMarkData aMarkData; + ScDocument* pUndoDoc; + ScDocument* pRedoDoc; + USHORT nFlags; + ScRefUndoData* pRefUndoData; + ScRefUndoData* pRefRedoData; + ULONG nStartChangeAction; + ULONG nEndChangeAction; + BOOL bRedoFilled; + + void DoChange( const BOOL bUndo ); + void SetChangeTrack(); }; diff --git a/sc/source/ui/inc/undodraw.hxx b/sc/source/ui/inc/undodraw.hxx index 565766e3bccb..7a7015442e68 100644 --- a/sc/source/ui/inc/undodraw.hxx +++ b/sc/source/ui/inc/undodraw.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,27 +35,27 @@ class ScDocShell; class ScUndoDraw: public SfxUndoAction { - SfxUndoAction* pDrawUndo; - ScDocShell* pDocShell; + SfxUndoAction* pDrawUndo; + ScDocShell* pDocShell; public: TYPEINFO(); ScUndoDraw( SfxUndoAction* pUndo, ScDocShell* pDocSh ); - virtual ~ScUndoDraw(); + virtual ~ScUndoDraw(); - SfxUndoAction* GetDrawUndo() { return pDrawUndo; } - void ForgetDrawUndo(); + SfxUndoAction* GetDrawUndo() { return pDrawUndo; } + void ForgetDrawUndo(); - virtual BOOL IsLinked(); - virtual void SetLinked( BOOL bIsLinked ); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual BOOL Merge( SfxUndoAction *pNextAction ); + virtual BOOL IsLinked(); + virtual void SetLinked( BOOL bIsLinked ); + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual BOOL Merge( SfxUndoAction *pNextAction ); virtual String GetComment() const; - virtual String GetRepeatComment(SfxRepeatTarget&) const; - virtual USHORT GetId() const; + virtual String GetRepeatComment(SfxRepeatTarget&) const; + virtual USHORT GetId() const; }; diff --git a/sc/source/ui/inc/undoolk.hxx b/sc/source/ui/inc/undoolk.hxx index 132c0c1ac70c..373c72266873 100644 --- a/sc/source/ui/inc/undoolk.hxx +++ b/sc/source/ui/inc/undoolk.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,11 +34,11 @@ class SdrUndoAction; class ScDocument; -SdrUndoAction* GetSdrUndoAction ( ScDocument* pDoc ); -void DoSdrUndoAction ( SdrUndoAction* pUndoAction, ScDocument* pDoc ); -void RedoSdrUndoAction ( SdrUndoAction* pUndoAction ); -void DeleteSdrUndoAction ( SdrUndoAction* pUndoAction ); -void EnableDrawAdjust ( ScDocument* pDoc, BOOL bEnable ); +SdrUndoAction* GetSdrUndoAction ( ScDocument* pDoc ); +void DoSdrUndoAction ( SdrUndoAction* pUndoAction, ScDocument* pDoc ); +void RedoSdrUndoAction ( SdrUndoAction* pUndoAction ); +void DeleteSdrUndoAction ( SdrUndoAction* pUndoAction ); +void EnableDrawAdjust ( ScDocument* pDoc, BOOL bEnable ); diff --git a/sc/source/ui/inc/undostyl.hxx b/sc/source/ui/inc/undostyl.hxx index 9e3b3ed9f87e..d247c86642f8 100644 --- a/sc/source/ui/inc/undostyl.hxx +++ b/sc/source/ui/inc/undostyl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,31 +40,31 @@ class SfxStyleSheetBase; class ScStyleSaveData { private: - String aName; - String aParent; - SfxItemSet* pItems; + String aName; + String aParent; + SfxItemSet* pItems; public: ScStyleSaveData(); ScStyleSaveData( const ScStyleSaveData& rOther ); ~ScStyleSaveData(); - ScStyleSaveData& operator=( const ScStyleSaveData& rOther ); + ScStyleSaveData& operator=( const ScStyleSaveData& rOther ); - void InitFromStyle( const SfxStyleSheetBase* pSource ); + void InitFromStyle( const SfxStyleSheetBase* pSource ); - const String& GetName() const { return aName; } - const String& GetParent() const { return aParent; } - const SfxItemSet* GetItems() const { return pItems; } + const String& GetName() const { return aName; } + const String& GetParent() const { return aParent; } + const SfxItemSet* GetItems() const { return pItems; } }; class ScUndoModifyStyle: public ScSimpleUndo { private: - SfxStyleFamily eFamily; - ScStyleSaveData aOldData; - ScStyleSaveData aNewData; + SfxStyleFamily eFamily; + ScStyleSaveData aOldData; + ScStyleSaveData aNewData; - static void DoChange( ScDocShell* pDocSh, + static void DoChange( ScDocShell* pDocSh, const String& rName, SfxStyleFamily eStyleFamily, const ScStyleSaveData& rData ); @@ -74,14 +74,14 @@ public: SfxStyleFamily eFam, const ScStyleSaveData& rOld, const ScStyleSaveData& rNew ); - virtual ~ScUndoModifyStyle(); + virtual ~ScUndoModifyStyle(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; }; class ScUndoApplyPageStyle: public ScSimpleUndo @@ -89,16 +89,16 @@ class ScUndoApplyPageStyle: public ScSimpleUndo public: TYPEINFO(); ScUndoApplyPageStyle( ScDocShell* pDocSh, const String& rNewStyle ); - virtual ~ScUndoApplyPageStyle(); + virtual ~ScUndoApplyPageStyle(); void AddSheetAction( SCTAB nTab, const String& rOld ); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: struct ApplyStyleEntry diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx index 029754663b72..d725386f36dd 100644 --- a/sc/source/ui/inc/undotab.hxx +++ b/sc/source/ui/inc/undotab.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,23 +72,23 @@ public: SCTAB nTabNum, BOOL bApp, const String& rNewName); - virtual ~ScUndoInsertTab(); + virtual ~ScUndoInsertTab(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - String sNewName; - SdrUndoAction* pDrawUndo; - ULONG nEndChangeAction; - SCTAB nTab; - BOOL bAppend; + String sNewName; + SdrUndoAction* pDrawUndo; + ULONG nEndChangeAction; + SCTAB nTab; + BOOL bAppend; - void SetChangeTrack(); + void SetChangeTrack(); }; class ScUndoInsertTables : public ScSimpleUndo @@ -100,52 +100,52 @@ public: SCTAB nTabNum, BOOL bApp, SvStrings *pNewNameList); - virtual ~ScUndoInsertTables(); + virtual ~ScUndoInsertTables(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - SdrUndoAction* pDrawUndo; - SvStrings* pNameList; - ULONG nStartChangeAction; - ULONG nEndChangeAction; - SCTAB nTab; - BOOL bAppend; + SdrUndoAction* pDrawUndo; + SvStrings* pNameList; + ULONG nStartChangeAction; + ULONG nEndChangeAction; + SCTAB nTab; + BOOL bAppend; - void SetChangeTrack(); + void SetChangeTrack(); }; -class ScUndoDeleteTab: public ScMoveUndo // Draw vom Move fuer geloeschte Tabelle +class ScUndoDeleteTab: public ScMoveUndo // Draw vom Move fuer geloeschte Tabelle { public: TYPEINFO(); ScUndoDeleteTab( ScDocShell* pNewDocShell, - const SvShorts &theTabs, //SCTAB nNewTab, + const SvShorts &theTabs, //SCTAB nNewTab, ScDocument* pUndoDocument, ScRefUndoData* pRefData ); - virtual ~ScUndoDeleteTab(); + virtual ~ScUndoDeleteTab(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - SvShorts theTabs; - ULONG nStartChangeAction; - ULONG nEndChangeAction; + SvShorts theTabs; + ULONG nStartChangeAction; + ULONG nEndChangeAction; - void SetChangeTrack(); + void SetChangeTrack(); }; @@ -158,19 +158,19 @@ public: SCTAB nT, const String& rOldName, const String& rNewName); - virtual ~ScUndoRenameTab(); + virtual ~ScUndoRenameTab(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - SCTAB nTab; - String sOldName; - String sNewName; + SCTAB nTab; + String sOldName; + String sNewName; void DoChange( SCTAB nTab, const String& rName ) const; }; @@ -183,18 +183,18 @@ public: ScUndoMoveTab( ScDocShell* pNewDocShell, const SvShorts &aOldTab, const SvShorts &aNewTab); - virtual ~ScUndoMoveTab(); + virtual ~ScUndoMoveTab(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - SvShorts theOldTabs; - SvShorts theNewTabs; + SvShorts theOldTabs; + SvShorts theNewTabs; void DoChange( BOOL bUndo ) const; }; @@ -208,19 +208,19 @@ public: const SvShorts &aOldTab, const SvShorts &aNewTab); - virtual ~ScUndoCopyTab(); + virtual ~ScUndoCopyTab(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - SdrUndoAction* pDrawUndo; - SvShorts theOldTabs; - SvShorts theNewTabs; + SdrUndoAction* pDrawUndo; + SvShorts theOldTabs; + SvShorts theNewTabs; void DoChange() const; }; @@ -244,7 +244,7 @@ public: virtual void Repeat(SfxRepeatTarget& rTarget); virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; -virtual String GetComment() const; +virtual String GetComment() const; private: ScUndoTabColorInfo::List aTabColorList; @@ -263,23 +263,23 @@ public: const String& rN, const String& rC, const Color& rCol, USHORT nF, const ScMarkData& rMark ); - virtual ~ScUndoMakeScenario(); + virtual ~ScUndoMakeScenario(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - SCTAB nSrcTab; - SCTAB nDestTab; - String aName; - String aComment; - Color aColor; - USHORT nFlags; - ScMarkData aMarkData; + SCTAB nSrcTab; + SCTAB nDestTab; + String aName; + String aComment; + Color aColor; + USHORT nFlags; + ScMarkData aMarkData; SdrUndoAction* pDrawUndo; }; @@ -292,21 +292,21 @@ public: ScDocShell* pShell, SCTAB nNewTab, SCTAB nNewCount, BOOL bNewLink ); - virtual ~ScUndoImportTab(); + virtual ~ScUndoImportTab(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - SCTAB nTab; - SCTAB nCount; - BOOL bLink; - ScDocument* pRedoDoc; - SdrUndoAction* pDrawUndo; + SCTAB nTab; + SCTAB nCount; + BOOL bLink; + ScDocument* pRedoDoc; + SdrUndoAction* pDrawUndo; void DoChange() const; }; @@ -316,27 +316,27 @@ class ScUndoRemoveLink : public ScSimpleUndo { public: TYPEINFO(); - ScUndoRemoveLink( // vor dem Loeschen aufrufen! + ScUndoRemoveLink( // vor dem Loeschen aufrufen! ScDocShell* pShell, const String& rDoc ); - virtual ~ScUndoRemoveLink(); + virtual ~ScUndoRemoveLink(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - String aDocName; - String aFltName; - String aOptions; - ULONG nRefreshDelay; - USHORT nCount; - SCTAB* pTabs; - BYTE* pModes; - String* pTabNames; + String aDocName; + String aFltName; + String aOptions; + ULONG nRefreshDelay; + USHORT nCount; + SCTAB* pTabs; + BYTE* pModes; + String* pTabNames; void DoChange( BOOL bLink ) const; }; @@ -349,18 +349,18 @@ public: ScUndoShowHideTab( ScDocShell* pShell, SCTAB nNewTab, BOOL bNewShow ); - virtual ~ScUndoShowHideTab(); + virtual ~ScUndoShowHideTab(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - SCTAB nTab; - BOOL bShow; + SCTAB nTab; + BOOL bShow; void DoChange( BOOL bShow ) const; }; @@ -373,19 +373,19 @@ class ScUndoDocProtect : public ScSimpleUndo { public: ScUndoDocProtect(ScDocShell* pShell, ::std::auto_ptr<ScDocProtection> pProtectSettings); - virtual ~ScUndoDocProtect(); + virtual ~ScUndoDocProtect(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: ::std::auto_ptr<ScDocProtection> mpProtectSettings; - void DoProtect(bool bProtect); + void DoProtect(bool bProtect); }; // ============================================================================ @@ -395,22 +395,22 @@ private: class ScUndoTabProtect : public ScSimpleUndo { public: - ScUndoTabProtect(ScDocShell* pShell, SCTAB nTab, + ScUndoTabProtect(ScDocShell* pShell, SCTAB nTab, ::std::auto_ptr<ScTableProtection> pProtectSettings); - virtual ~ScUndoTabProtect(); + virtual ~ScUndoTabProtect(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: SCTAB mnTab; ::std::auto_ptr<ScTableProtection> mpProtectSettings; - void DoProtect(bool bProtect); + void DoProtect(bool bProtect); }; @@ -420,19 +420,19 @@ public: TYPEINFO(); ScUndoPrintRange( ScDocShell* pShell, SCTAB nNewTab, ScPrintRangeSaver* pOld, ScPrintRangeSaver* pNew ); - virtual ~ScUndoPrintRange(); + virtual ~ScUndoPrintRange(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - SCTAB nTab; - ScPrintRangeSaver* pOldRanges; - ScPrintRangeSaver* pNewRanges; + SCTAB nTab; + ScPrintRangeSaver* pOldRanges; + ScPrintRangeSaver* pNewRanges; void DoChange( BOOL bUndo ); }; @@ -449,25 +449,25 @@ public: const Color& rOCol, const Color& rNCol, USHORT nOF, USHORT nNF ); - virtual ~ScUndoScenarioFlags(); + virtual ~ScUndoScenarioFlags(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - SCTAB nTab; - String aOldName; - String aNewName; - String aOldComment; - String aNewComment; - Color aOldColor; - Color aNewColor; - USHORT nOldFlags; - USHORT nNewFlags; + SCTAB nTab; + String aOldName; + String aNewName; + String aOldComment; + String aNewComment; + Color aOldColor; + Color aNewColor; + USHORT nOldFlags; + USHORT nNewFlags; }; @@ -479,21 +479,21 @@ public: ScDocShell* pNewDocShell, const String& rPN, const String& rON, const String& rNN ); - virtual ~ScUndoRenameObject(); + virtual ~ScUndoRenameObject(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - String aPersistName; // to find object (works only for OLE objects) - String aOldName; - String aNewName; + String aPersistName; // to find object (works only for OLE objects) + String aOldName; + String aNewName; - SdrObject* GetObject(); + SdrObject* GetObject(); }; @@ -502,18 +502,18 @@ class ScUndoLayoutRTL : public ScSimpleUndo public: TYPEINFO(); ScUndoLayoutRTL( ScDocShell* pShell, SCTAB nNewTab, BOOL bNewRTL ); - virtual ~ScUndoLayoutRTL(); + virtual ~ScUndoLayoutRTL(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - virtual String GetComment() const; + virtual String GetComment() const; private: - SCTAB nTab; - BOOL bRTL; + SCTAB nTab; + BOOL bRTL; void DoChange( BOOL bNew ); }; diff --git a/sc/source/ui/inc/undoutil.hxx b/sc/source/ui/inc/undoutil.hxx index 48985a132fe3..c963d6010d1e 100644 --- a/sc/source/ui/inc/undoutil.hxx +++ b/sc/source/ui/inc/undoutil.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ class ScDocument; class ScUndoUtil { public: - // Block markieren (unsichtbar, muss repainted werden) + // Block markieren (unsichtbar, muss repainted werden) static void MarkSimpleBlock( ScDocShell* pDocShell, SCCOL nStartX, SCROW nStartY, SCTAB nStartZ, SCCOL nEndX, SCROW nEndY, SCTAB nEndZ ); @@ -52,12 +52,12 @@ public: static void MarkSimpleBlock( ScDocShell* pDocShell, const ScRange& rRange ); - // Bereich +1 painten + // Bereich +1 painten static void PaintMore( ScDocShell* pDocShell, const ScRange& rRange ); - // DB-Bereich im Dokument suchen ("unbenannt" oder nach Bereich) - // legt neu an, wenn nicht gefunden + // DB-Bereich im Dokument suchen ("unbenannt" oder nach Bereich) + // legt neu an, wenn nicht gefunden static ScDBData* GetOldDBData( ScDBData* pUndoData, ScDocument* pDoc, SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); }; diff --git a/sc/source/ui/inc/validate.hrc b/sc/source/ui/inc/validate.hrc index 45e5dda39c2d..0af2a1481a52 100644 --- a/sc/source/ui/inc/validate.hrc +++ b/sc/source/ui/inc/validate.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,7 +59,7 @@ #define EDT_LIST 29 #define FT_SOURCEHINT 30 //<!--Added by PengYunQuan for Validity Cell Range Picker -#define RB_VALIDITY_REF 88 +#define RB_VALIDITY_REF 88 //-->Added by PengYunQuan for Validity Cell Range Picker /* Position indexes for "Allow" list box. diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index 1f7e714bb6e0..19dd63b84df4 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,51 +41,51 @@ // ============================================================================ //<!--Added by PengYunQuan for Validity Cell Range Picker -struct ScRefHandlerCaller{ +struct ScRefHandlerCaller{ virtual ~ScRefHandlerCaller(){} }; class ScRefHandlerHelper { protected: - ScRefHandlerCaller *m_pHandler; + ScRefHandlerCaller *m_pHandler; void (ScRefHandlerCaller::*m_pSetReferenceHdl)( const ScRange& , ScDocument* ); void (ScRefHandlerCaller::*m_pSetActiveHdl)(); void (ScRefHandlerCaller::*m_pRefInputStartPreHdl)( ScRefEdit* pEdit, ScRefButton* pButton ); void (ScRefHandlerCaller::*m_pRefInputStartPostHdl)( ScRefEdit* pEdit, ScRefButton* pButton ); void (ScRefHandlerCaller::*m_pRefInputDonePreHdl)(); void (ScRefHandlerCaller::*m_pRefInputDonePostHdl)(); - + public: typedef void (ScRefHandlerCaller::*PFUNCSETREFHDLTYPE)( const ScRange& , ScDocument* ); - typedef void (ScRefHandlerCaller::*PCOMMONHDLTYPE)(); - typedef void (ScRefHandlerCaller::*PINPUTSTARTDLTYPE)( ScRefEdit* pEdit, ScRefButton* pButton ); + typedef void (ScRefHandlerCaller::*PCOMMONHDLTYPE)(); + typedef void (ScRefHandlerCaller::*PINPUTSTARTDLTYPE)( ScRefEdit* pEdit, ScRefButton* pButton ); - PFUNCSETREFHDLTYPE SetSetRefHdl( PFUNCSETREFHDLTYPE pNewHdl ) + PFUNCSETREFHDLTYPE SetSetRefHdl( PFUNCSETREFHDLTYPE pNewHdl ) { PFUNCSETREFHDLTYPE pOldHdl = m_pSetReferenceHdl; m_pSetReferenceHdl = pNewHdl; return pOldHdl; } - PCOMMONHDLTYPE SetSetActHdl( PCOMMONHDLTYPE pNewHdl ) + PCOMMONHDLTYPE SetSetActHdl( PCOMMONHDLTYPE pNewHdl ) { PCOMMONHDLTYPE pOldHdl = m_pSetActiveHdl; m_pSetActiveHdl = pNewHdl; return pOldHdl; } - ScRefHandlerCaller *SetHandler( ScRefHandlerCaller *pNewHandler ) + ScRefHandlerCaller *SetHandler( ScRefHandlerCaller *pNewHandler ) { - ScRefHandlerCaller *pOldHandler = m_pHandler; + ScRefHandlerCaller *pOldHandler = m_pHandler; m_pHandler = pNewHandler; return pOldHandler; } - void SetRefInputStartPreHdl( PINPUTSTARTDLTYPE pNewHdl ){ m_pRefInputStartPreHdl = pNewHdl; } - void SetRefInputDonePostHdl( void (ScRefHandlerCaller::*pNewHdl)() ){ m_pRefInputDonePostHdl = pNewHdl; } - void SetRefInputStartPostHdl( PINPUTSTARTDLTYPE pNewHdl ){ m_pRefInputStartPostHdl = pNewHdl; } - void SetRefInputDonePreHdl( void (ScRefHandlerCaller::*pNewHdl)() ){ m_pRefInputDonePreHdl = pNewHdl; } + void SetRefInputStartPreHdl( PINPUTSTARTDLTYPE pNewHdl ){ m_pRefInputStartPreHdl = pNewHdl; } + void SetRefInputDonePostHdl( void (ScRefHandlerCaller::*pNewHdl)() ){ m_pRefInputDonePostHdl = pNewHdl; } + void SetRefInputStartPostHdl( PINPUTSTARTDLTYPE pNewHdl ){ m_pRefInputStartPostHdl = pNewHdl; } + void SetRefInputDonePreHdl( void (ScRefHandlerCaller::*pNewHdl)() ){ m_pRefInputDonePreHdl = pNewHdl; } - ScRefHandlerHelper():m_pHandler(NULL), m_pSetReferenceHdl( NULL ), m_pSetActiveHdl(NULL), m_pRefInputStartPreHdl( NULL ), m_pRefInputStartPostHdl( NULL ), m_pRefInputDonePreHdl( NULL ), m_pRefInputDonePostHdl( NULL ){} + ScRefHandlerHelper():m_pHandler(NULL), m_pSetReferenceHdl( NULL ), m_pSetActiveHdl(NULL), m_pRefInputStartPreHdl( NULL ), m_pRefInputStartPostHdl( NULL ), m_pRefInputDonePreHdl( NULL ), m_pRefInputDonePostHdl( NULL ){} }; //-->Added by PengYunQuan for Validity Cell Range Picker @@ -96,17 +96,17 @@ class ScValidationDlg :public ScRefHdlrImpl<ScValidationDlg, SfxTabDialog, false //-->Modified by PengYunQuan for Validity Cell Range Picker { //<!--Added by PengYunQuan for Validity Cell Range Picker - typedef ScRefHdlrImpl<ScValidationDlg, SfxTabDialog, false> ScValidationDlgBase; + typedef ScRefHdlrImpl<ScValidationDlg, SfxTabDialog, false> ScValidationDlgBase; //Start_Moddify by liliang 03/26/2008 SODC_13677_2 DECL_LINK( OkHdl, Button * ); //End_Moddify by liliang 03/26/2008 SODC_13677_2 - bool m_bOwnRefHdlr:1; + bool m_bOwnRefHdlr:1; ScTabViewShell *m_pTabVwSh; - bool m_bRefInputting:1; - bool EnterRefStatus(); - bool LeaveRefStatus(); + bool m_bRefInputting:1; + bool EnterRefStatus(); + bool LeaveRefStatus(); //-->Added by PengYunQuan for Validity Cell Range Picker public: //<!--Modified by PengYunQuan for Validity Cell Range Picker @@ -116,13 +116,13 @@ public: //<!--Added by PengYunQuan for Validity Cell Range Picker virtual ~ScValidationDlg(); inline static ScValidationDlg * Find1AliveObject( Window *pAncestor ); - bool IsAlive(); - inline ScTabViewShell * GetTabViewShell(); + bool IsAlive(); + inline ScTabViewShell * GetTabViewShell(); - bool SetupRefDlg(); - bool RemoveRefDlg( BOOL bRestoreModal = TRUE ); + bool SetupRefDlg(); + bool RemoveRefDlg( BOOL bRestoreModal = TRUE ); - virtual void SetModal( BOOL bModal ){ ScValidationDlgBase::SetModalInputMode( bModal ); } + virtual void SetModal( BOOL bModal ){ ScValidationDlgBase::SetModalInputMode( bModal ); } virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) { @@ -136,7 +136,7 @@ public: (m_pHandler->*m_pSetActiveHdl)(); } - void CloseRefDialog() + void CloseRefDialog() { DBG_ASSERT( false, "should not execute here!!!when the edit kill focus, should remove refhandler.\r\n" ); @@ -146,7 +146,7 @@ public: Close(); } - bool IsRefInputting(){ return m_bRefInputting; } + bool IsRefInputting(){ return m_bRefInputting; } virtual void RefInputStart( ScRefEdit* pEdit, ScRefButton* pButton = NULL ) { @@ -244,8 +244,8 @@ private: //<!--Added by PengYunQuan for Validity Cell Range Picker DECL_LINK( EditSetFocusHdl, Edit *); DECL_LINK( KillFocusHdl, Window *); - void OnClick( Button *pBtn ); - ScRefEdit *m_pRefEdit; + void OnClick( Button *pBtn ); + ScRefEdit *m_pRefEdit; class ScRefButtonEx:public ::ScRefButton { void Click(); @@ -255,18 +255,18 @@ private: friend class ScRefButtonEx; void SetReferenceHdl( const ScRange& , ScDocument* ); void SetActiveHdl(); - void RefInputStartPreHdl( ScRefEdit* pEdit, ScRefButton* pButton ); - void RefInputDonePreHdl(); - void RefInputDonePostHdl(); + void RefInputStartPreHdl( ScRefEdit* pEdit, ScRefButton* pButton ); + void RefInputDonePreHdl(); + void RefInputDonePostHdl(); ScValidationDlg * GetValidationDlg(); //TYPEINFO(); - void TidyListBoxes(); + void TidyListBoxes(); public: - USHORT GetAllowEntryPos(); - String GetMinText(); - void SetupRefDlg(); - void RemoveRefDlg(); + USHORT GetAllowEntryPos(); + String GetMinText(); + void SetupRefDlg(); + void RemoveRefDlg(); //-->Added by PengYunQuan for Validity Cell Range Picker }; @@ -276,16 +276,16 @@ public: class ScTPValidationHelp : public SfxTabPage { private: - TriStateBox aTsbHelp; + TriStateBox aTsbHelp; FixedLine aFlContent; - FixedText aFtTitle; - Edit aEdtTitle; - FixedText aFtInputHelp; - MultiLineEdit aEdInputHelp; + FixedText aFtTitle; + Edit aEdtTitle; + FixedText aFtInputHelp; + MultiLineEdit aEdInputHelp; const SfxItemSet& mrArgSet; - void Init(); + void Init(); // Handler ------------------------ // DECL_LINK( SelectHdl, ListBox * ); @@ -294,10 +294,10 @@ public: ScTPValidationHelp( Window* pParent, const SfxItemSet& rArgSet ); ~ScTPValidationHelp(); - static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - static USHORT* GetRanges (); - virtual BOOL FillItemSet ( SfxItemSet& rArgSet ); - virtual void Reset ( const SfxItemSet& rArgSet ); + static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); + static USHORT* GetRanges (); + virtual BOOL FillItemSet ( SfxItemSet& rArgSet ); + virtual void Reset ( const SfxItemSet& rArgSet ); }; //================================================================== @@ -305,19 +305,19 @@ public: class ScTPValidationError : public SfxTabPage { private: - TriStateBox aTsbShow; + TriStateBox aTsbShow; FixedLine aFlContent; - FixedText aFtAction; - ListBox aLbAction; - PushButton aBtnSearch; - FixedText aFtTitle; - Edit aEdtTitle; - FixedText aFtError; - MultiLineEdit aEdError; + FixedText aFtAction; + ListBox aLbAction; + PushButton aBtnSearch; + FixedText aFtTitle; + Edit aEdtTitle; + FixedText aFtError; + MultiLineEdit aEdError; const SfxItemSet& mrArgSet; - void Init(); + void Init(); // Handler ------------------------ DECL_LINK( SelectActionHdl, ListBox * ); @@ -327,10 +327,10 @@ public: ScTPValidationError( Window* pParent, const SfxItemSet& rArgSet ); ~ScTPValidationError(); - static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - static USHORT* GetRanges (); - virtual BOOL FillItemSet ( SfxItemSet& rArgSet ); - virtual void Reset ( const SfxItemSet& rArgSet ); + static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); + static USHORT* GetRanges (); + virtual BOOL FillItemSet ( SfxItemSet& rArgSet ); + virtual void Reset ( const SfxItemSet& rArgSet ); }; //<!--Added by PengYunQuan for Validity Cell Range Picker diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index e754c8346294..bd3893afb3d4 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,16 +36,16 @@ // --------------------------------------------------------------------------- -#define SC_SLIDER_SIZE 2 -#define SC_SMALL3DSHADOW COL_BLACK -#define SC_SIZE_NONE 65535 +#define SC_SLIDER_SIZE 2 +#define SC_SMALL3DSHADOW COL_BLACK +#define SC_SIZE_NONE 65535 const SCCOL SC_TABSTART_NONE = SCCOL_MAX; -#define SC_FILL_NONE 0 -#define SC_FILL_FILL 1 -#define SC_FILL_EMBED_LT 2 -#define SC_FILL_EMBED_RB 3 -#define SC_FILL_MATRIX 4 +#define SC_FILL_NONE 0 +#define SC_FILL_FILL 1 +#define SC_FILL_EMBED_LT 2 +#define SC_FILL_EMBED_RB 3 +#define SC_FILL_MATRIX 4 enum ScSplitMode { SC_SPLIT_NONE = 0, SC_SPLIT_NORMAL, SC_SPLIT_FIX }; @@ -58,10 +58,10 @@ inline ScVSplitPos WhichV( ScSplitPos ePos ); inline ScSplitPos Which( ScHSplitPos eHPos ); inline ScSplitPos Which( ScVSplitPos eVPos ); -// Bildschirmverhalten bei Cursorbewegungen: +// Bildschirmverhalten bei Cursorbewegungen: enum ScFollowMode { SC_FOLLOW_NONE, SC_FOLLOW_LINE, SC_FOLLOW_FIX, SC_FOLLOW_JUMP }; -// Mausmodi um Bereiche zu selektieren +// Mausmodi um Bereiche zu selektieren enum ScRefType { SC_REFTYPE_NONE, SC_REFTYPE_REF, SC_REFTYPE_FILL, SC_REFTYPE_EMBED_LT, SC_REFTYPE_EMBED_RB }; @@ -114,7 +114,7 @@ class ScViewData; //-------------------------------------------------------------------------- -class ScViewDataTable // Daten pro Tabelle +class ScViewDataTable // Daten pro Tabelle { friend class ScViewData; private: @@ -124,32 +124,32 @@ private: Fraction aPageZoomX; // zoom in page break preview mode Fraction aPageZoomY; - long nTPosX[2]; // MapMode - Offset (Twips) - long nTPosY[2]; - long nMPosX[2]; // MapMode - Offset (1/100 mm) - long nMPosY[2]; - long nPixPosX[2]; // Offset in Pixeln - long nPixPosY[2]; - long nHSplitPos; - long nVSplitPos; - - ScSplitMode eHSplitMode; - ScSplitMode eVSplitMode; - ScSplitPos eWhichActive; - - SCCOL nFixPosX; // Zellposition des Splitters beim Fixieren - SCROW nFixPosY; - - SCCOL nCurX; - SCROW nCurY; - SCCOL nOldCurX; - SCROW nOldCurY; - SCCOL nPosX[2]; - SCROW nPosY[2]; + long nTPosX[2]; // MapMode - Offset (Twips) + long nTPosY[2]; + long nMPosX[2]; // MapMode - Offset (1/100 mm) + long nMPosY[2]; + long nPixPosX[2]; // Offset in Pixeln + long nPixPosY[2]; + long nHSplitPos; + long nVSplitPos; + + ScSplitMode eHSplitMode; + ScSplitMode eVSplitMode; + ScSplitPos eWhichActive; + + SCCOL nFixPosX; // Zellposition des Splitters beim Fixieren + SCROW nFixPosY; + + SCCOL nCurX; + SCROW nCurY; + SCCOL nOldCurX; + SCROW nOldCurY; + SCCOL nPosX[2]; + SCROW nPosY[2]; bool bShowGrid; // per-sheet show grid-lines option. - BOOL bOldCurValid; // "virtuelle" Cursorpos. bei zusammengefassten + BOOL bOldCurValid; // "virtuelle" Cursorpos. bei zusammengefassten ScViewDataTable(); ~ScViewDataTable(); @@ -168,26 +168,26 @@ private: class SC_DLLPUBLIC ScViewData { private: - double nPPTX, nPPTY; // Scaling-Faktoren + double nPPTX, nPPTY; // Scaling-Faktoren - ScViewDataTable* pTabData[MAXTABCOUNT]; - ScViewDataTable* pThisTab; // Daten der angezeigten Tabelle - ScDocShell* pDocShell; - ScDocument* pDoc; - ScDBFunc* pView; - ScTabViewShell* pViewShell; - EditView* pEditView[4]; // gehoert dem Fenster - ScViewOptions* pOptions; - EditView* pSpellingView; + ScViewDataTable* pTabData[MAXTABCOUNT]; + ScViewDataTable* pThisTab; // Daten der angezeigten Tabelle + ScDocShell* pDocShell; + ScDocument* pDoc; + ScDBFunc* pView; + ScTabViewShell* pViewShell; + EditView* pEditView[4]; // gehoert dem Fenster + ScViewOptions* pOptions; + EditView* pSpellingView; - ScMarkData aMarkData; + ScMarkData aMarkData; - long nEditMargin; + long nEditMargin; - Size aScenButSize; // Groesse eines Szenario-Buttons + Size aScenButSize; // Groesse eines Szenario-Buttons - Size aScrSize; - MapMode aLogicMode; // skalierter 1/100mm-MapMode + Size aScrSize; + MapMode aLogicMode; // skalierter 1/100mm-MapMode SvxZoomType eDefZoomType; // default zoom and type for missing TabData Fraction aDefZoomX; @@ -195,44 +195,44 @@ private: Fraction aDefPageZoomX; // zoom in page break preview mode Fraction aDefPageZoomY; - ScRefType eRefType; - - SCTAB nTabNo; // angezeigte Tabelle - SCTAB nRefTabNo; // Tabelle auf die sich RefInput bezieht - SCCOL nRefStartX; - SCROW nRefStartY; - SCTAB nRefStartZ; - SCCOL nRefEndX; - SCROW nRefEndY; - SCTAB nRefEndZ; - SCCOL nFillStartX; // Fill-Cursor - SCROW nFillStartY; - SCCOL nFillEndX; - SCROW nFillEndY; - SCCOL nEditCol; // Position dazu - SCROW nEditRow; - SCCOL nEditStartCol; - SCCOL nEditEndCol; // Ende der Edit-View - SCROW nEditEndRow; - SCCOL nTabStartCol; // fuer Enter nach Tab - ScRange aDelRange; // fuer AutoFill-Loeschen + ScRefType eRefType; + + SCTAB nTabNo; // angezeigte Tabelle + SCTAB nRefTabNo; // Tabelle auf die sich RefInput bezieht + SCCOL nRefStartX; + SCROW nRefStartY; + SCTAB nRefStartZ; + SCCOL nRefEndX; + SCROW nRefEndY; + SCTAB nRefEndZ; + SCCOL nFillStartX; // Fill-Cursor + SCROW nFillStartY; + SCCOL nFillEndX; + SCROW nFillEndY; + SCCOL nEditCol; // Position dazu + SCROW nEditRow; + SCCOL nEditStartCol; + SCCOL nEditEndCol; // Ende der Edit-View + SCROW nEditEndRow; + SCCOL nTabStartCol; // fuer Enter nach Tab + ScRange aDelRange; // fuer AutoFill-Loeschen ScPasteFlags nPasteFlags; ScSplitPos eEditActivePart; // the part that was active when edit mode was started - BOOL bEditActive[4]; // aktiv? - BOOL bActive; // aktives Fenster ? - BOOL bIsRefMode; // Referenzeingabe - BOOL bDelMarkValid; // nur gueltig bei SC_REFTYPE_FILL - BYTE nFillMode; // Modus - BOOL bPagebreak; // Seitenumbruch-Vorschaumodus + BOOL bEditActive[4]; // aktiv? + BOOL bActive; // aktives Fenster ? + BOOL bIsRefMode; // Referenzeingabe + BOOL bDelMarkValid; // nur gueltig bei SC_REFTYPE_FILL + BYTE nFillMode; // Modus + BOOL bPagebreak; // Seitenumbruch-Vorschaumodus - BOOL bSelCtrlMouseClick; // special selection handling for ctrl-mouse-click + BOOL bSelCtrlMouseClick; // special selection handling for ctrl-mouse-click SC_DLLPRIVATE DECL_LINK (EmptyEditHdl, EditStatus*); SC_DLLPRIVATE DECL_LINK (EditEngineHdl, EditStatus*); - SC_DLLPRIVATE void CalcPPT(); + SC_DLLPRIVATE void CalcPPT(); SC_DLLPRIVATE void CreateTabData( SCTAB nNewTab ); SC_DLLPRIVATE void CreateTabData( std::vector< SCTAB >& rvTabs ); SC_DLLPRIVATE void CreateSelectedTabData(); @@ -242,82 +242,82 @@ public: ScViewData( const ScViewData& rViewData ); ~ScViewData(); - void InitData( ScDocument* pDocument ); + void InitData( ScDocument* pDocument ); - ScDocShell* GetDocShell() const { return pDocShell; } - ScDBFunc* GetView() const { return pView; } - ScTabViewShell* GetViewShell() const { return pViewShell; } + ScDocShell* GetDocShell() const { return pDocShell; } + ScDBFunc* GetView() const { return pView; } + ScTabViewShell* GetViewShell() const { return pViewShell; } SfxObjectShell* GetSfxDocShell() const; - SfxBindings& GetBindings(); // from ViewShell's ViewFrame - SfxDispatcher& GetDispatcher(); // from ViewShell's ViewFrame + SfxBindings& GetBindings(); // from ViewShell's ViewFrame + SfxDispatcher& GetDispatcher(); // from ViewShell's ViewFrame - ScMarkData& GetMarkData() { return aMarkData; } + ScMarkData& GetMarkData() { return aMarkData; } const ScMarkData& GetMarkData() const { return aMarkData; } - Window* GetDialogParent(); // von tabvwsh weitergeleitet - Window* GetActiveWin(); // von View - ScDrawView* GetScDrawView(); // von View - BOOL IsMinimized(); // von View + Window* GetDialogParent(); // von tabvwsh weitergeleitet + Window* GetActiveWin(); // von View + ScDrawView* GetScDrawView(); // von View + BOOL IsMinimized(); // von View - void UpdateInputHandler( BOOL bForce = FALSE, BOOL bStopEditing = TRUE ); + void UpdateInputHandler( BOOL bForce = FALSE, BOOL bStopEditing = TRUE ); - void WriteUserData(String& rData); - void ReadUserData(const String& rData); + void WriteUserData(String& rData); + void ReadUserData(const String& rData); void WriteExtOptions( ScExtDocOptions& rOpt ) const; void ReadExtOptions( const ScExtDocOptions& rOpt ); - void WriteUserDataSequence(com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue>& rSettings); - void ReadUserDataSequence(const com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue>& rSettings); - - ScDocument* GetDocument() const; - - void SetViewShell( ScTabViewShell* pViewSh ); - - BOOL IsActive() const { return bActive; } - void Activate(BOOL bActivate) { bActive = bActivate; } - - void UpdateThis(); - - void InsertTab( SCTAB nTab ); - void DeleteTab( SCTAB nTab ); - void CopyTab( SCTAB nSrcTab, SCTAB nDestTab ); - void MoveTab( SCTAB nSrcTab, SCTAB nDestTab ); - - SCTAB GetRefTabNo() const { return nRefTabNo; } - void SetRefTabNo( SCTAB nNewTab ) { nRefTabNo = nNewTab; } - - SCTAB GetTabNo() const { return nTabNo; } - ScSplitPos GetActivePart() const { return pThisTab->eWhichActive; } - SCCOL GetPosX( ScHSplitPos eWhich ) const { return pThisTab->nPosX[eWhich]; } - SCROW GetPosY( ScVSplitPos eWhich ) const { return pThisTab->nPosY[eWhich]; } - SCCOL GetCurX() const { return pThisTab->nCurX; } - SCROW GetCurY() const { return pThisTab->nCurY; } - BOOL HasOldCursor() const { return pThisTab->bOldCurValid; } - SCCOL GetOldCurX() const; - SCROW GetOldCurY() const; - ScSplitMode GetHSplitMode() const { return pThisTab->eHSplitMode; } - ScSplitMode GetVSplitMode() const { return pThisTab->eVSplitMode; } - long GetHSplitPos() const { return pThisTab->nHSplitPos; } - long GetVSplitPos() const { return pThisTab->nVSplitPos; } - SCCOL GetFixPosX() const { return pThisTab->nFixPosX; } - SCROW GetFixPosY() const { return pThisTab->nFixPosY; } - BOOL IsPagebreakMode() const { return bPagebreak; } + void WriteUserDataSequence(com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue>& rSettings); + void ReadUserDataSequence(const com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue>& rSettings); + + ScDocument* GetDocument() const; + + void SetViewShell( ScTabViewShell* pViewSh ); + + BOOL IsActive() const { return bActive; } + void Activate(BOOL bActivate) { bActive = bActivate; } + + void UpdateThis(); + + void InsertTab( SCTAB nTab ); + void DeleteTab( SCTAB nTab ); + void CopyTab( SCTAB nSrcTab, SCTAB nDestTab ); + void MoveTab( SCTAB nSrcTab, SCTAB nDestTab ); + + SCTAB GetRefTabNo() const { return nRefTabNo; } + void SetRefTabNo( SCTAB nNewTab ) { nRefTabNo = nNewTab; } + + SCTAB GetTabNo() const { return nTabNo; } + ScSplitPos GetActivePart() const { return pThisTab->eWhichActive; } + SCCOL GetPosX( ScHSplitPos eWhich ) const { return pThisTab->nPosX[eWhich]; } + SCROW GetPosY( ScVSplitPos eWhich ) const { return pThisTab->nPosY[eWhich]; } + SCCOL GetCurX() const { return pThisTab->nCurX; } + SCROW GetCurY() const { return pThisTab->nCurY; } + BOOL HasOldCursor() const { return pThisTab->bOldCurValid; } + SCCOL GetOldCurX() const; + SCROW GetOldCurY() const; + ScSplitMode GetHSplitMode() const { return pThisTab->eHSplitMode; } + ScSplitMode GetVSplitMode() const { return pThisTab->eVSplitMode; } + long GetHSplitPos() const { return pThisTab->nHSplitPos; } + long GetVSplitPos() const { return pThisTab->nVSplitPos; } + SCCOL GetFixPosX() const { return pThisTab->nFixPosX; } + SCROW GetFixPosY() const { return pThisTab->nFixPosY; } + BOOL IsPagebreakMode() const { return bPagebreak; } bool IsPasteMode() const { return nPasteFlags & SC_PASTE_MODE; } bool ShowPasteSource() const { return nPasteFlags & SC_PASTE_BORDER; } - void SetPosX( ScHSplitPos eWhich, SCCOL nNewPosX ); - void SetPosY( ScVSplitPos eWhich, SCROW nNewPosY ); - void SetCurX( SCCOL nNewCurX ) { pThisTab->nCurX = nNewCurX; } - void SetCurY( SCROW nNewCurY ) { pThisTab->nCurY = nNewCurY; } - void SetOldCursor( SCCOL nNewX, SCROW nNewY ); - void ResetOldCursor(); - void SetHSplitMode( ScSplitMode eMode ) { pThisTab->eHSplitMode = eMode; } - void SetVSplitMode( ScSplitMode eMode ) { pThisTab->eVSplitMode = eMode; } - void SetHSplitPos( long nPos ) { pThisTab->nHSplitPos = nPos; } - void SetVSplitPos( long nPos ) { pThisTab->nVSplitPos = nPos; } - void SetFixPosX( SCCOL nPos ) { pThisTab->nFixPosX = nPos; } - void SetFixPosY( SCROW nPos ) { pThisTab->nFixPosY = nPos; } - void SetPagebreakMode( BOOL bSet ); + void SetPosX( ScHSplitPos eWhich, SCCOL nNewPosX ); + void SetPosY( ScVSplitPos eWhich, SCROW nNewPosY ); + void SetCurX( SCCOL nNewCurX ) { pThisTab->nCurX = nNewCurX; } + void SetCurY( SCROW nNewCurY ) { pThisTab->nCurY = nNewCurY; } + void SetOldCursor( SCCOL nNewX, SCROW nNewY ); + void ResetOldCursor(); + void SetHSplitMode( ScSplitMode eMode ) { pThisTab->eHSplitMode = eMode; } + void SetVSplitMode( ScSplitMode eMode ) { pThisTab->eVSplitMode = eMode; } + void SetHSplitPos( long nPos ) { pThisTab->nHSplitPos = nPos; } + void SetVSplitPos( long nPos ) { pThisTab->nVSplitPos = nPos; } + void SetFixPosX( SCCOL nPos ) { pThisTab->nFixPosX = nPos; } + void SetFixPosY( SCROW nPos ) { pThisTab->nFixPosY = nPos; } + void SetPagebreakMode( BOOL bSet ); void SetPasteMode ( ScPasteFlags nFlags ) { nPasteFlags = nFlags; } void SetZoomType( SvxZoomType eNew, BOOL bAll ); @@ -326,188 +326,188 @@ public: void SetZoom( const Fraction& rNewX, const Fraction& rNewY, BOOL bAll ); void RefreshZoom(); - void SetSelCtrlMouseClick( BOOL bTmp ) { bSelCtrlMouseClick = bTmp; } + void SetSelCtrlMouseClick( BOOL bTmp ) { bSelCtrlMouseClick = bTmp; } SvxZoomType GetZoomType() const { return pThisTab->eZoomType; } - const Fraction& GetZoomX() const { return bPagebreak ? pThisTab->aPageZoomX : pThisTab->aZoomX; } - const Fraction& GetZoomY() const { return bPagebreak ? pThisTab->aPageZoomY : pThisTab->aZoomY; } + const Fraction& GetZoomX() const { return bPagebreak ? pThisTab->aPageZoomX : pThisTab->aZoomX; } + const Fraction& GetZoomY() const { return bPagebreak ? pThisTab->aPageZoomY : pThisTab->aZoomY; } void SetShowGrid( bool bShow ); bool GetShowGrid() const { return pThisTab->bShowGrid; } - const MapMode& GetLogicMode( ScSplitPos eWhich ); - const MapMode& GetLogicMode(); // Offset 0 + const MapMode& GetLogicMode( ScSplitPos eWhich ); + const MapMode& GetLogicMode(); // Offset 0 - long GetTPosX( ScHSplitPos eWhich ) const { return pThisTab->nTPosX[eWhich]; } - long GetTPosY( ScVSplitPos eWhich ) const { return pThisTab->nTPosY[eWhich]; } + long GetTPosX( ScHSplitPos eWhich ) const { return pThisTab->nTPosX[eWhich]; } + long GetTPosY( ScVSplitPos eWhich ) const { return pThisTab->nTPosY[eWhich]; } - double GetPPTX() const { return nPPTX; } - double GetPPTY() const { return nPPTY; } + double GetPPTX() const { return nPPTX; } + double GetPPTY() const { return nPPTY; } ScMarkType GetSimpleArea( SCCOL& rStartCol, SCROW& rStartRow, SCTAB& rStartTab, SCCOL& rEndCol, SCROW& rEndRow, SCTAB& rEndTab ) const; ScMarkType GetSimpleArea( ScRange& rRange ) const; /// May modify rNewMark using MarkToSimple(). ScMarkType GetSimpleArea( ScRange & rRange, ScMarkData & rNewMark ) const; - void GetMultiArea( ScRangeListRef& rRange ) const; + void GetMultiArea( ScRangeListRef& rRange ) const; - BOOL SimpleColMarked(); - BOOL SimpleRowMarked(); + BOOL SimpleColMarked(); + BOOL SimpleRowMarked(); - BOOL IsMultiMarked(); + BOOL IsMultiMarked(); - void SetFillMode( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); - void SetDragMode( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, + void SetFillMode( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); + void SetDragMode( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, BYTE nMode ); - void GetFillData( SCCOL& rStartCol, SCROW& rStartRow, + void GetFillData( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow ); - void ResetFillMode(); - BOOL IsAnyFillMode() { return nFillMode != SC_FILL_NONE; } - BOOL IsFillMode() { return nFillMode == SC_FILL_FILL; } - BYTE GetFillMode() { return nFillMode; } + void ResetFillMode(); + BOOL IsAnyFillMode() { return nFillMode != SC_FILL_NONE; } + BOOL IsFillMode() { return nFillMode == SC_FILL_FILL; } + BYTE GetFillMode() { return nFillMode; } // TRUE: Zelle ist zusammengefasst - BOOL GetMergeSizePixel( SCCOL nX, SCROW nY, long& rSizeXPix, long& rSizeYPix ); - BOOL GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWhich, + BOOL GetMergeSizePixel( SCCOL nX, SCROW nY, long& rSizeXPix, long& rSizeYPix ); + BOOL GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWhich, SCsCOL& rPosX, SCsROW& rPosY, BOOL bTestMerge = TRUE, BOOL bRepair = FALSE, BOOL bNextIfLarge = TRUE ); - void GetMouseQuadrant( const Point& rClickPos, ScSplitPos eWhich, + void GetMouseQuadrant( const Point& rClickPos, ScSplitPos eWhich, SCsCOL nPosX, SCsROW nPosY, BOOL& rLeft, BOOL& rTop ); - BOOL IsRefMode() const { return bIsRefMode; } - ScRefType GetRefType() const { return eRefType; } - SCCOL GetRefStartX() const { return nRefStartX; } - SCROW GetRefStartY() const { return nRefStartY; } - SCTAB GetRefStartZ() const { return nRefStartZ; } - SCCOL GetRefEndX() const { return nRefEndX; } - SCROW GetRefEndY() const { return nRefEndY; } - SCTAB GetRefEndZ() const { return nRefEndZ; } + BOOL IsRefMode() const { return bIsRefMode; } + ScRefType GetRefType() const { return eRefType; } + SCCOL GetRefStartX() const { return nRefStartX; } + SCROW GetRefStartY() const { return nRefStartY; } + SCTAB GetRefStartZ() const { return nRefStartZ; } + SCCOL GetRefEndX() const { return nRefEndX; } + SCROW GetRefEndY() const { return nRefEndY; } + SCTAB GetRefEndZ() const { return nRefEndZ; } - void SetRefMode( BOOL bNewMode, ScRefType eNewType ) + void SetRefMode( BOOL bNewMode, ScRefType eNewType ) { bIsRefMode = bNewMode; eRefType = eNewType; } - void SetRefStart( SCCOL nNewX, SCROW nNewY, SCTAB nNewZ ) + void SetRefStart( SCCOL nNewX, SCROW nNewY, SCTAB nNewZ ) { nRefStartX = nNewX; nRefStartY = nNewY; nRefStartZ = nNewZ; } - void SetRefEnd( SCCOL nNewX, SCROW nNewY, SCTAB nNewZ ) + void SetRefEnd( SCCOL nNewX, SCROW nNewY, SCTAB nNewZ ) { nRefEndX = nNewX; nRefEndY = nNewY; nRefEndZ = nNewZ; } - void ResetDelMark() { bDelMarkValid = FALSE; } - void SetDelMark( const ScRange& rRange ) + void ResetDelMark() { bDelMarkValid = FALSE; } + void SetDelMark( const ScRange& rRange ) { aDelRange = rRange; bDelMarkValid = TRUE; } - BOOL GetDelMark( ScRange& rRange ) const + BOOL GetDelMark( ScRange& rRange ) const { rRange = aDelRange; return bDelMarkValid; } - inline void GetMoveCursor( SCCOL& rCurX, SCROW& rCurY ); - - const ScViewOptions& GetOptions() const { return *pOptions; } - void SetOptions( const ScViewOptions& rOpt ); - - BOOL IsGridMode () const { return pOptions->GetOption( VOPT_GRID ); } - void SetGridMode ( BOOL bNewMode ) { pOptions->SetOption( VOPT_GRID, bNewMode ); } - BOOL IsSyntaxMode () const { return pOptions->GetOption( VOPT_SYNTAX ); } - void SetSyntaxMode ( BOOL bNewMode ) { pOptions->SetOption( VOPT_SYNTAX, bNewMode ); } - BOOL IsHeaderMode () const { return pOptions->GetOption( VOPT_HEADER ); } - void SetHeaderMode ( BOOL bNewMode ) { pOptions->SetOption( VOPT_HEADER, bNewMode ); } - BOOL IsTabMode () const { return pOptions->GetOption( VOPT_TABCONTROLS ); } - void SetTabMode ( BOOL bNewMode ) { pOptions->SetOption( VOPT_TABCONTROLS, bNewMode ); } - BOOL IsVScrollMode () const { return pOptions->GetOption( VOPT_VSCROLL ); } - void SetVScrollMode ( BOOL bNewMode ) { pOptions->SetOption( VOPT_VSCROLL, bNewMode ); } - BOOL IsHScrollMode () const { return pOptions->GetOption( VOPT_HSCROLL ); } - void SetHScrollMode ( BOOL bNewMode ) { pOptions->SetOption( VOPT_HSCROLL, bNewMode ); } - BOOL IsOutlineMode () const { return pOptions->GetOption( VOPT_OUTLINER ); } - void SetOutlineMode ( BOOL bNewMode ) { pOptions->SetOption( VOPT_OUTLINER, bNewMode ); } - - void KillEditView(); - void ResetEditView(); - void SetEditEngine( ScSplitPos eWhich, + inline void GetMoveCursor( SCCOL& rCurX, SCROW& rCurY ); + + const ScViewOptions& GetOptions() const { return *pOptions; } + void SetOptions( const ScViewOptions& rOpt ); + + BOOL IsGridMode () const { return pOptions->GetOption( VOPT_GRID ); } + void SetGridMode ( BOOL bNewMode ) { pOptions->SetOption( VOPT_GRID, bNewMode ); } + BOOL IsSyntaxMode () const { return pOptions->GetOption( VOPT_SYNTAX ); } + void SetSyntaxMode ( BOOL bNewMode ) { pOptions->SetOption( VOPT_SYNTAX, bNewMode ); } + BOOL IsHeaderMode () const { return pOptions->GetOption( VOPT_HEADER ); } + void SetHeaderMode ( BOOL bNewMode ) { pOptions->SetOption( VOPT_HEADER, bNewMode ); } + BOOL IsTabMode () const { return pOptions->GetOption( VOPT_TABCONTROLS ); } + void SetTabMode ( BOOL bNewMode ) { pOptions->SetOption( VOPT_TABCONTROLS, bNewMode ); } + BOOL IsVScrollMode () const { return pOptions->GetOption( VOPT_VSCROLL ); } + void SetVScrollMode ( BOOL bNewMode ) { pOptions->SetOption( VOPT_VSCROLL, bNewMode ); } + BOOL IsHScrollMode () const { return pOptions->GetOption( VOPT_HSCROLL ); } + void SetHScrollMode ( BOOL bNewMode ) { pOptions->SetOption( VOPT_HSCROLL, bNewMode ); } + BOOL IsOutlineMode () const { return pOptions->GetOption( VOPT_OUTLINER ); } + void SetOutlineMode ( BOOL bNewMode ) { pOptions->SetOption( VOPT_OUTLINER, bNewMode ); } + + void KillEditView(); + void ResetEditView(); + void SetEditEngine( ScSplitPos eWhich, ScEditEngineDefaulter* pNewEngine, Window* pWin, SCCOL nNewX, SCROW nNewY ); - void GetEditView( ScSplitPos eWhich, EditView*& rViewPtr, SCCOL& rCol, SCROW& rRow ); - BOOL HasEditView( ScSplitPos eWhich ) const + void GetEditView( ScSplitPos eWhich, EditView*& rViewPtr, SCCOL& rCol, SCROW& rRow ); + BOOL HasEditView( ScSplitPos eWhich ) const { return pEditView[eWhich] && bEditActive[eWhich]; } - EditView* GetEditView( ScSplitPos eWhich ) const + EditView* GetEditView( ScSplitPos eWhich ) const { return pEditView[eWhich]; } - void EditGrowX(); - void EditGrowY( BOOL bInitial = FALSE ); + void EditGrowX(); + void EditGrowY( BOOL bInitial = FALSE ); ScSplitPos GetEditActivePart() const { return eEditActivePart; } - SCCOL GetEditViewCol() const { return nEditCol; } - SCROW GetEditViewRow() const { return nEditRow; } - SCCOL GetEditStartCol() const { return nEditStartCol; } - SCROW GetEditStartRow() const { return nEditRow; } // never editing above the cell - SCCOL GetEditEndCol() const { return nEditEndCol; } - SCROW GetEditEndRow() const { return nEditEndRow; } - - Rectangle GetEditArea( ScSplitPos eWhich, SCCOL nPosX, SCROW nPosY, Window* pWin, + SCCOL GetEditViewCol() const { return nEditCol; } + SCROW GetEditViewRow() const { return nEditRow; } + SCCOL GetEditStartCol() const { return nEditStartCol; } + SCROW GetEditStartRow() const { return nEditRow; } // never editing above the cell + SCCOL GetEditEndCol() const { return nEditEndCol; } + SCROW GetEditEndRow() const { return nEditEndRow; } + + Rectangle GetEditArea( ScSplitPos eWhich, SCCOL nPosX, SCROW nPosY, Window* pWin, const ScPatternAttr* pPattern, BOOL bForceToTop ); - void SetTabNo( SCTAB nNewTab ); - void SetActivePart( ScSplitPos eNewActive ); + void SetTabNo( SCTAB nNewTab ); + void SetActivePart( ScSplitPos eNewActive ); - Point GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScSplitPos eWhich, + Point GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScSplitPos eWhich, BOOL bAllowNeg = FALSE ) const; - Point GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScHSplitPos eWhich ) const; - Point GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScVSplitPos eWhich ) const; + Point GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScHSplitPos eWhich ) const; + Point GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScVSplitPos eWhich ) const; - SCCOL CellsAtX( SCsCOL nPosX, SCsCOL nDir, ScHSplitPos eWhichX, USHORT nScrSizeY = SC_SIZE_NONE ) const; - SCROW CellsAtY( SCsROW nPosY, SCsROW nDir, ScVSplitPos eWhichY, USHORT nScrSizeX = SC_SIZE_NONE ) const; + SCCOL CellsAtX( SCsCOL nPosX, SCsCOL nDir, ScHSplitPos eWhichX, USHORT nScrSizeY = SC_SIZE_NONE ) const; + SCROW CellsAtY( SCsROW nPosY, SCsROW nDir, ScVSplitPos eWhichY, USHORT nScrSizeX = SC_SIZE_NONE ) const; - SCCOL VisibleCellsX( ScHSplitPos eWhichX ) const; // angezeigte komplette Zellen - SCROW VisibleCellsY( ScVSplitPos eWhichY ) const; - SCCOL PrevCellsX( ScHSplitPos eWhichX ) const; // Zellen auf der vorgehenden Seite - SCROW PrevCellsY( ScVSplitPos eWhichY ) const; + SCCOL VisibleCellsX( ScHSplitPos eWhichX ) const; // angezeigte komplette Zellen + SCROW VisibleCellsY( ScVSplitPos eWhichY ) const; + SCCOL PrevCellsX( ScHSplitPos eWhichX ) const; // Zellen auf der vorgehenden Seite + SCROW PrevCellsY( ScVSplitPos eWhichY ) const; - BOOL IsOle(); - void SetScreen( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); - void SetScreen( const Rectangle& rVisArea ); - void SetScreenPos( const Point& rVisAreaStart ); + BOOL IsOle(); + void SetScreen( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); + void SetScreen( const Rectangle& rVisArea ); + void SetScreenPos( const Point& rVisAreaStart ); - void UpdateScreenZoom( const Fraction& rNewX, const Fraction& rNewY ); + void UpdateScreenZoom( const Fraction& rNewX, const Fraction& rNewY ); - Size GetScrSize() const { return aScrSize; } + Size GetScrSize() const { return aScrSize; } - void RecalcPixPos(); - Point GetPixPos( ScSplitPos eWhich ) const + void RecalcPixPos(); + Point GetPixPos( ScSplitPos eWhich ) const { return Point( pThisTab->nPixPosX[WhichH(eWhich)], pThisTab->nPixPosY[WhichV(eWhich)] ); } - void SetSpellingView( EditView* pSpView) { pSpellingView = pSpView; } - EditView* GetSpellingView() const { return pSpellingView; } + void SetSpellingView( EditView* pSpView) { pSpellingView = pSpView; } + EditView* GetSpellingView() const { return pSpellingView; } - void UpdateOutlinerFlags( Outliner& rOutl ) const; + void UpdateOutlinerFlags( Outliner& rOutl ) const; - Point GetMousePosPixel(); + Point GetMousePosPixel(); - BOOL UpdateFixX(SCTAB nTab = MAXTAB+1); - BOOL UpdateFixY(SCTAB nTab = MAXTAB+1); + BOOL UpdateFixX(SCTAB nTab = MAXTAB+1); + BOOL UpdateFixY(SCTAB nTab = MAXTAB+1); - SCCOL GetTabStartCol() const { return nTabStartCol; } - void SetTabStartCol(SCCOL nNew) { nTabStartCol = nNew; } + SCCOL GetTabStartCol() const { return nTabStartCol; } + void SetTabStartCol(SCCOL nNew) { nTabStartCol = nNew; } - ScAddress GetCurPos() const; + ScAddress GetCurPos() const; - const Size& GetScenButSize() const { return aScenButSize; } - void SetScenButSize(const Size& rNew) { aScenButSize = rNew; } + const Size& GetScenButSize() const { return aScenButSize; } + void SetScenButSize(const Size& rNew) { aScenButSize = rNew; } - BOOL IsSelCtrlMouseClick() { return bSelCtrlMouseClick; } + BOOL IsSelCtrlMouseClick() { return bSelCtrlMouseClick; } static inline long ToPixel( USHORT nTwips, double nFactor ); - /** while (rScrY <= nEndPixels && rPosY <= nEndRow) add pixels of row - heights converted with nPPTY to rScrY, optimized for row height - segments. Upon return rPosY is the last row evaluated <= nEndRow, rScrY - may be > nEndPixels! + /** while (rScrY <= nEndPixels && rPosY <= nEndRow) add pixels of row + heights converted with nPPTY to rScrY, optimized for row height + segments. Upon return rPosY is the last row evaluated <= nEndRow, rScrY + may be > nEndPixels! */ static void AddPixelsWhile( long & rScrY, long nEndPixels, SCROW & rPosY, SCROW nEndRow, double nPPTY, const ScDocument * pDoc, SCTAB nTabNo ); - /** while (rScrY <= nEndPixels && rPosY >= nStartRow) add pixels of row - heights converted with nPPTY to rScrY, optimized for row height - segments. Upon return rPosY is the last row evaluated >= nStartRow, - rScrY may be > nEndPixels! + /** while (rScrY <= nEndPixels && rPosY >= nStartRow) add pixels of row + heights converted with nPPTY to rScrY, optimized for row height + segments. Upon return rPosY is the last row evaluated >= nStartRow, + rScrY may be > nEndPixels! */ static void AddPixelsWhileBackward( long & rScrY, long nEndPixels, SCROW & rPosY, SCROW nStartRow, double nPPTY, diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx index f231e91d3dd6..0cacc543308d 100644 --- a/sc/source/ui/inc/viewfunc.hxx +++ b/sc/source/ui/inc/viewfunc.hxx @@ -78,231 +78,231 @@ namespace com { namespace sun { namespace star { namespace datatransfer { class class ScViewFunc : public ScTabView { private: - ScAddress aFormatSource; // fuer automatisches Erweitern von Formatierung - ScRange aFormatArea; - BOOL bFormatValid; + ScAddress aFormatSource; // fuer automatisches Erweitern von Formatierung + ScRange aFormatArea; + BOOL bFormatValid; public: ScViewFunc( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ); ~ScViewFunc(); - const ScPatternAttr* GetSelectionPattern (); - void GetSelectionFrame ( SvxBoxItem& rLineOuter, - SvxBoxInfoItem& rLineInner ); + const ScPatternAttr* GetSelectionPattern (); + void GetSelectionFrame ( SvxBoxItem& rLineOuter, + SvxBoxInfoItem& rLineInner ); - BYTE GetSelectionScriptType(); + BYTE GetSelectionScriptType(); - BOOL GetAutoSumArea(ScRangeList& rRangeList); - void EnterAutoSum(const ScRangeList& rRangeList, bool bSubTotal, const ScAddress& rAddr); + BOOL GetAutoSumArea(ScRangeList& rRangeList); + void EnterAutoSum(const ScRangeList& rRangeList, bool bSubTotal, const ScAddress& rAddr); bool AutoSum( const ScRange& rRange, bool bSubTotal, bool bSetCursor, bool bContinue ); String GetAutoSumFormula( const ScRangeList& rRangeList, bool bSubTotal, const ScAddress& rAddr ); - void EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, + void EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, BOOL bRecord = TRUE, const EditTextObject* pData = NULL ); - void EnterValue( SCCOL nCol, SCROW nRow, SCTAB nTab, const double& rValue ); - void EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const EditTextObject* pData, + void EnterValue( SCCOL nCol, SCROW nRow, SCTAB nTab, const double& rValue ); + void EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const EditTextObject* pData, BOOL bRecord = TRUE, BOOL bTestSimple = FALSE ); - void EnterMatrix( const String& rString ); - void EnterBlock( const String& rString, const EditTextObject* pData ); + void EnterMatrix( const String& rString ); + void EnterBlock( const String& rString, const EditTextObject* pData ); - void EnterDataAtCursor( const String& rString ); //! nicht benutzt ? + void EnterDataAtCursor( const String& rString ); //! nicht benutzt ? - SC_DLLPUBLIC void CutToClip( ScDocument* pClipDoc = NULL, BOOL bIncludeObjects = FALSE ); - SC_DLLPUBLIC BOOL CopyToClip( ScDocument* pClipDoc = NULL, BOOL bCut = FALSE, BOOL bApi = FALSE, + SC_DLLPUBLIC void CutToClip( ScDocument* pClipDoc = NULL, BOOL bIncludeObjects = FALSE ); + SC_DLLPUBLIC BOOL CopyToClip( ScDocument* pClipDoc = NULL, BOOL bCut = FALSE, BOOL bApi = FALSE, BOOL bIncludeObjects = FALSE, BOOL bStopEdit = TRUE ); - SC_DLLPUBLIC BOOL CopyToClip( ScDocument* pClipDoc, const ScRange& rRange, BOOL bCut = FALSE, + SC_DLLPUBLIC BOOL CopyToClip( ScDocument* pClipDoc, const ScRange& rRange, BOOL bCut = FALSE, BOOL bApi = FALSE, BOOL bIncludeObjects = FALSE, BOOL bStopEdit = TRUE ); ScTransferObj* CopyToTransferable(); - SC_DLLPUBLIC BOOL PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, + SC_DLLPUBLIC BOOL PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, USHORT nFunction = PASTE_NOFUNC, BOOL bSkipEmpty = FALSE, BOOL bTranspose = FALSE, BOOL bAsLink = FALSE, InsCellCmd eMoveMode = INS_NONE, USHORT nUndoExtraFlags = IDF_NONE, BOOL bAllowDialogs = FALSE ); - void FillTab( USHORT nFlags, USHORT nFunction, BOOL bSkipEmpty, BOOL bAsLink ); + void FillTab( USHORT nFlags, USHORT nFunction, BOOL bSkipEmpty, BOOL bAsLink ); - SC_DLLPUBLIC void PasteFromSystem(); - SC_DLLPUBLIC BOOL PasteFromSystem( ULONG nFormatId, BOOL bApi = FALSE ); + SC_DLLPUBLIC void PasteFromSystem(); + SC_DLLPUBLIC BOOL PasteFromSystem( ULONG nFormatId, BOOL bApi = FALSE ); void PasteFromTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable ); - void PasteDraw(); - void PasteDraw( const Point& rLogicPos, SdrModel* pModel, + void PasteDraw(); + void PasteDraw( const Point& rLogicPos, SdrModel* pModel, BOOL bGroup = FALSE, BOOL bSameDocClipboard = FALSE ); - BOOL PasteOnDrawObject( const ::com::sun::star::uno::Reference< + BOOL PasteOnDrawObject( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable, SdrObject* pHitObj, BOOL bLink ); - BOOL PasteDataFormat( ULONG nFormatId, + BOOL PasteDataFormat( ULONG nFormatId, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable, SCCOL nPosX, SCROW nPosY, Point* pLogicPos = NULL, BOOL bLink = FALSE, BOOL bAllowDialogs = FALSE ); - BOOL PasteFile( const Point&, const String&, BOOL bLink=FALSE ); + BOOL PasteFile( const Point&, const String&, BOOL bLink=FALSE ); BOOL PasteObject( const Point&, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >&, const Size* = NULL, const Graphic* = NULL, const ::rtl::OUString& = ::rtl::OUString(), sal_Int64 nAspect = ::com::sun::star::embed::Aspects::MSOLE_CONTENT ); - BOOL PasteBitmap( const Point&, const Bitmap& ); - BOOL PasteMetaFile( const Point&, const GDIMetaFile& ); - BOOL PasteGraphic( const Point& rPos, const Graphic& rGraphic, + BOOL PasteBitmap( const Point&, const Bitmap& ); + BOOL PasteMetaFile( const Point&, const GDIMetaFile& ); + BOOL PasteGraphic( const Point& rPos, const Graphic& rGraphic, const String& rFile, const String& rFilter ); - BOOL PasteBookmark( ULONG nFormatId, + BOOL PasteBookmark( ULONG nFormatId, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable, SCCOL nPosX, SCROW nPosY ); - BOOL PasteDDE( const ::com::sun::star::uno::Reference< + BOOL PasteDDE( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable ); - BOOL ApplyGraphicToObject( SdrObject* pObject, const Graphic& rGraphic ); + BOOL ApplyGraphicToObject( SdrObject* pObject, const Graphic& rGraphic ); - void InsertBookmark( const String& rDescription, const String& rURL, + void InsertBookmark( const String& rDescription, const String& rURL, SCCOL nPosX, SCROW nPosY, const String* pTarget = NULL, BOOL bTryReplace = FALSE ); - BOOL HasBookmarkAtCursor( SvxHyperlinkItem* pContent ); + BOOL HasBookmarkAtCursor( SvxHyperlinkItem* pContent ); - long DropRequestHdl( Exchange* pExchange ); - BOOL MoveBlockTo( const ScRange& rSource, const ScAddress& rDestPos, + long DropRequestHdl( Exchange* pExchange ); + BOOL MoveBlockTo( const ScRange& rSource, const ScAddress& rDestPos, BOOL bCut, BOOL bRecord, BOOL bPaint, BOOL bApi ); - BOOL LinkBlock( const ScRange& rSource, const ScAddress& rDestPos, BOOL bApi ); + BOOL LinkBlock( const ScRange& rSource, const ScAddress& rDestPos, BOOL bApi ); - void CreateNames( USHORT nFlags ); - USHORT GetCreateNameFlags(); - void InsertNameList(); - BOOL InsertName( const String& rName, const String& rSymbol, + void CreateNames( USHORT nFlags ); + USHORT GetCreateNameFlags(); + void InsertNameList(); + BOOL InsertName( const String& rName, const String& rSymbol, const String& rType ); - void ApplyAttributes( const SfxItemSet* pDialogSet, const SfxItemSet* pOldSet, + void ApplyAttributes( const SfxItemSet* pDialogSet, const SfxItemSet* pOldSet, BOOL bRecord = TRUE ); - void ApplyAttr( const SfxPoolItem& rAttrItem ); - void ApplySelectionPattern( const ScPatternAttr& rAttr, + void ApplyAttr( const SfxPoolItem& rAttrItem ); + void ApplySelectionPattern( const ScPatternAttr& rAttr, BOOL bRecord = TRUE, BOOL bCursorOnly = FALSE ); - void ApplyPatternLines( const ScPatternAttr& rAttr, + void ApplyPatternLines( const ScPatternAttr& rAttr, const SvxBoxItem* pNewOuter, const SvxBoxInfoItem* pNewInner, BOOL bRecord = TRUE ); - void ApplyUserItemSet( const SfxItemSet& rItemSet ); + void ApplyUserItemSet( const SfxItemSet& rItemSet ); - const SfxStyleSheet* GetStyleSheetFromMarked(); - void SetStyleSheetToMarked( SfxStyleSheet* pStyleSheet, + const SfxStyleSheet* GetStyleSheetFromMarked(); + void SetStyleSheetToMarked( SfxStyleSheet* pStyleSheet, BOOL bRecord = TRUE ); - void RemoveStyleSheetInUse( SfxStyleSheet* pStyleSheet ); - void UpdateStyleSheetInUse( SfxStyleSheet* pStyleSheet ); + void RemoveStyleSheetInUse( SfxStyleSheet* pStyleSheet ); + void UpdateStyleSheetInUse( SfxStyleSheet* pStyleSheet ); - void SetNumberFormat( short nFormatType, ULONG nAdd = 0 ); - void SetNumFmtByStr( const String& rCode ); - void ChangeNumFmtDecimals( BOOL bIncrement ); + void SetNumberFormat( short nFormatType, ULONG nAdd = 0 ); + void SetNumFmtByStr( const String& rCode ); + void ChangeNumFmtDecimals( BOOL bIncrement ); - void SetConditionalFormat( const ScConditionalFormat& rNew ); - void SetValidation( const ScValidationData& rNew ); + void SetConditionalFormat( const ScConditionalFormat& rNew ); + void SetValidation( const ScValidationData& rNew ); - void ChangeIndent( BOOL bIncrement ); + void ChangeIndent( BOOL bIncrement ); - void ProtectSheet( SCTAB nTab, const ScTableProtection& rProtect ); + void ProtectSheet( SCTAB nTab, const ScTableProtection& rProtect ); - void Protect( SCTAB nTab, const String& rPassword ); - BOOL Unprotect( SCTAB nTab, const String& rPassword ); + void Protect( SCTAB nTab, const String& rPassword ); + BOOL Unprotect( SCTAB nTab, const String& rPassword ); - void DeleteCells( DelCellCmd eCmd, BOOL bRecord = TRUE ); - BOOL InsertCells( InsCellCmd eCmd, BOOL bRecord = TRUE, BOOL bPartOfPaste = FALSE ); - void DeleteMulti( BOOL bRows, BOOL bRecord = TRUE ); + void DeleteCells( DelCellCmd eCmd, BOOL bRecord = TRUE ); + BOOL InsertCells( InsCellCmd eCmd, BOOL bRecord = TRUE, BOOL bPartOfPaste = FALSE ); + void DeleteMulti( BOOL bRows, BOOL bRecord = TRUE ); - void DeleteContents( USHORT nFlags, BOOL bRecord = TRUE ); + void DeleteContents( USHORT nFlags, BOOL bRecord = TRUE ); - void SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRanges, + void SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRanges, ScSizeMode eMode, USHORT nSizeTwips, BOOL bRecord = TRUE, BOOL bPaint = TRUE, ScMarkData* pMarkData = NULL ); - void SetMarkedWidthOrHeight( BOOL bWidth, ScSizeMode eMode, USHORT nSizeTwips, + void SetMarkedWidthOrHeight( BOOL bWidth, ScSizeMode eMode, USHORT nSizeTwips, BOOL bRecord = TRUE, BOOL bPaint = TRUE ); - void ShowMarkedColumns( BOOL bShow, BOOL bRecord = TRUE ); - void ShowMarkedRows( BOOL bShow, BOOL bRecord = TRUE ); + void ShowMarkedColumns( BOOL bShow, BOOL bRecord = TRUE ); + void ShowMarkedRows( BOOL bShow, BOOL bRecord = TRUE ); - BOOL AdjustBlockHeight( BOOL bPaint = TRUE, ScMarkData* pMarkData = NULL ); - BOOL AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, BOOL bPaint = TRUE ); + BOOL AdjustBlockHeight( BOOL bPaint = TRUE, ScMarkData* pMarkData = NULL ); + BOOL AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, BOOL bPaint = TRUE ); - void ModifyCellSize( ScDirection eDir, BOOL bOptimal ); + void ModifyCellSize( ScDirection eDir, BOOL bOptimal ); - SC_DLLPUBLIC void InsertPageBreak( BOOL bColumn, BOOL bRecord = TRUE, + SC_DLLPUBLIC void InsertPageBreak( BOOL bColumn, BOOL bRecord = TRUE, const ScAddress* pPos = NULL, BOOL bSetModified = TRUE ); - SC_DLLPUBLIC void DeletePageBreak( BOOL bColumn, BOOL bRecord = TRUE, + SC_DLLPUBLIC void DeletePageBreak( BOOL bColumn, BOOL bRecord = TRUE, const ScAddress* pPos = NULL, BOOL bSetModified = TRUE ); - void RemoveManualBreaks(); + void RemoveManualBreaks(); - void SetPrintZoom(USHORT nScale, USHORT nPages); - void AdjustPrintZoom(); + void SetPrintZoom(USHORT nScale, USHORT nPages); + void AdjustPrintZoom(); - BOOL TestMergeCells(); - BOOL TestRemoveMerge(); + BOOL TestMergeCells(); + BOOL TestRemoveMerge(); - BOOL MergeCells( BOOL bApi, BOOL& rDoContents, BOOL bRecord = TRUE, BOOL bCenter = FALSE ); - BOOL RemoveMerge( BOOL bRecord = TRUE ); + BOOL MergeCells( BOOL bApi, BOOL& rDoContents, BOOL bRecord = TRUE, BOOL bCenter = FALSE ); + BOOL RemoveMerge( BOOL bRecord = TRUE ); - void FillSimple( FillDir eDir, BOOL bRecord = TRUE ); - void FillSeries( FillDir eDir, FillCmd eCmd, FillDateCmd eDateCmd, + void FillSimple( FillDir eDir, BOOL bRecord = TRUE ); + void FillSeries( FillDir eDir, FillCmd eCmd, FillDateCmd eDateCmd, double fStart, double fStep, double fMax, BOOL bRecord = TRUE ); - void FillAuto( FillDir eDir, SCCOL nStartCol, SCROW nStartRow, + void FillAuto( FillDir eDir, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, ULONG nCount, BOOL bRecord = TRUE ); - void FillCrossDblClick(); + void FillCrossDblClick(); - void TransliterateText( sal_Int32 nType ); + void TransliterateText( sal_Int32 nType ); ScAutoFormatData* CreateAutoFormatData(); - void AutoFormat( USHORT nFormatNo, BOOL bRecord = TRUE ); + void AutoFormat( USHORT nFormatNo, BOOL bRecord = TRUE ); - void SearchAndReplace( const SvxSearchItem* pSearchItem, + void SearchAndReplace( const SvxSearchItem* pSearchItem, BOOL bAddUndo, BOOL bIsApi ); - void Solve( const ScSolveParam& rParam ); - void TabOp( const ScTabOpParam& rParam, BOOL bRecord = TRUE ); + void Solve( const ScSolveParam& rParam ); + void TabOp( const ScTabOpParam& rParam, BOOL bRecord = TRUE ); - BOOL InsertTable( const String& rName, SCTAB nTabNr, BOOL bRecord = TRUE ); - BOOL InsertTables(SvStrings *pNames, SCTAB nTab, SCTAB nCount, BOOL bRecord = TRUE); + BOOL InsertTable( const String& rName, SCTAB nTabNr, BOOL bRecord = TRUE ); + BOOL InsertTables(SvStrings *pNames, SCTAB nTab, SCTAB nCount, BOOL bRecord = TRUE); - BOOL AppendTable( const String& rName, BOOL bRecord = TRUE ); + BOOL AppendTable( const String& rName, BOOL bRecord = TRUE ); - BOOL DeleteTable( SCTAB nTabNr, BOOL bRecord = TRUE ); - BOOL DeleteTables(const SvShorts &TheTabs, BOOL bRecord = TRUE ); + BOOL DeleteTable( SCTAB nTabNr, BOOL bRecord = TRUE ); + BOOL DeleteTables(const SvShorts &TheTabs, BOOL bRecord = TRUE ); - BOOL RenameTable( const String& rName, SCTAB nTabNr ); - void MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy ); - void ImportTables( ScDocShell* pSrcShell, + BOOL RenameTable( const String& rName, SCTAB nTabNr ); + void MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy ); + void ImportTables( ScDocShell* pSrcShell, SCTAB nCount, const SCTAB* pSrcTabs, BOOL bLink,SCTAB nTab); bool SetTabBgColor( const Color& rColor, SCTAB nTabNr ); bool SetTabBgColor( ScUndoTabColorInfo::List& rUndoSetTabBgColorInfoList ); - void InsertTableLink( const String& rFile, + void InsertTableLink( const String& rFile, const String& rFilter, const String& rOptions, const String& rTabName ); - void InsertAreaLink( const String& rFile, + void InsertAreaLink( const String& rFile, const String& rFilter, const String& rOptions, const String& rSource, ULONG nRefresh ); - void ShowTable( const String& rName ); - void HideTable( SCTAB nTabNr ); + void ShowTable( const String& rName ); + void HideTable( SCTAB nTabNr ); - void MakeScenario( const String& rName, const String& rComment, + void MakeScenario( const String& rName, const String& rComment, const Color& rColor, USHORT nFlags ); - void ExtendScenario(); - void UseScenario( const String& rName ); + void ExtendScenario(); + void UseScenario( const String& rName ); - void InsertSpecialChar( const String& rStr, const Font& rFont ); + void InsertSpecialChar( const String& rStr, const Font& rFont ); - void InsertDummyObject(); - void InsertOleObject(); + void InsertDummyObject(); + void InsertOleObject(); - void InsertDraw(); + void InsertDraw(); - void SetSelectionFrameLines( const SvxBorderLine* pLine, + void SetSelectionFrameLines( const SvxBorderLine* pLine, BOOL bColorOnly ); void SetNoteText( const ScAddress& rPos, const String& rNoteText ); @@ -310,7 +310,7 @@ public: void DoRefConversion( BOOL bRecord = TRUE ); void DoHangulHanjaConversion( BOOL bRecord = TRUE ); - void DoThesaurus( BOOL bRecord = TRUE ); + void DoThesaurus( BOOL bRecord = TRUE ); /** Generic implementation of sheet conversion functions. */ void DoSheetConversion( const ScConversionParam& rParam, BOOL bRecord = TRUE ); @@ -320,25 +320,25 @@ public: const String* pRepCol, const String* pRepRow, BOOL bAddPrint ); - void DetectiveAddPred(); - void DetectiveDelPred(); - void DetectiveAddSucc(); - void DetectiveDelSucc(); - void DetectiveAddError(); - void DetectiveMarkInvalid(); - void DetectiveDelAll(); - void DetectiveRefresh(); + void DetectiveAddPred(); + void DetectiveDelPred(); + void DetectiveAddSucc(); + void DetectiveDelSucc(); + void DetectiveAddError(); + void DetectiveMarkInvalid(); + void DetectiveDelAll(); + void DetectiveRefresh(); void DetectiveMarkPred(); void DetectiveMarkSucc(); void InsertCurrentTime(short nCellFmt, const ::rtl::OUString& rUndoStr); - void ShowNote( bool bShow = true ); - inline void HideNote() { ShowNote( false ); } - void EditNote(); + void ShowNote( bool bShow = true ); + inline void HideNote() { ShowNote( false ); } + void EditNote(); - void ForgetFormatArea() { bFormatValid = FALSE; } - BOOL SelectionEditable( BOOL* pOnlyNotBecauseOfMatrix = NULL ); + void ForgetFormatArea() { bFormatValid = FALSE; } + BOOL SelectionEditable( BOOL* pOnlyNotBecauseOfMatrix = NULL ); // Amelia Wang SC_DLLPUBLIC void DataFormPutData( SCROW nCurrentRow , @@ -349,14 +349,14 @@ public: // interne Hilfsfunktionen protected: - void UpdateLineAttrs( SvxBorderLine& rLine, + void UpdateLineAttrs( SvxBorderLine& rLine, const SvxBorderLine* pDestLine, const SvxBorderLine* pSrcLine, - BOOL bColor ); + BOOL bColor ); private: - void PasteRTF( SCCOL nCol, SCROW nStartRow, + void PasteRTF( SCCOL nCol, SCROW nStartRow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable ); bool PasteMultiRangesFromClip( sal_uInt16 nFlags, ScDocument* pClipDoc, sal_uInt16 nFunction, @@ -364,11 +364,11 @@ private: InsCellCmd eMoveMode, sal_uInt16 nCondFlags, sal_uInt16 nUndoFlags ); void PostPasteFromClip(const ScRange& rPasteRange, const ScMarkData& rMark); - USHORT GetOptimalColWidth( SCCOL nCol, SCTAB nTab, BOOL bFormula ); + USHORT GetOptimalColWidth( SCCOL nCol, SCTAB nTab, BOOL bFormula ); - void StartFormatArea(); - BOOL TestFormatArea( SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bAttrChanged ); - void DoAutoAttributes( SCCOL nCol, SCROW nRow, SCTAB nTab, + void StartFormatArea(); + BOOL TestFormatArea( SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bAttrChanged ); + void DoAutoAttributes( SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bAttrChanged, BOOL bAddUndo ); void MarkAndJumpToRanges(const ScRangeList& rRanges); diff --git a/sc/source/ui/inc/viewutil.hxx b/sc/source/ui/inc/viewutil.hxx index 37290323b920..70603d016d0d 100644 --- a/sc/source/ui/inc/viewutil.hxx +++ b/sc/source/ui/inc/viewutil.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,13 +50,13 @@ enum ScUpdateMode { SC_UPDATE_ALL, SC_UPDATE_CHANGED, SC_UPDATE_MARKS }; // --------------------------------------------------------------------------- -class ScViewUtil // static Methoden +class ScViewUtil // static Methoden { public: - static BOOL ExecuteCharMap( const SvxFontItem& rOldFont, - SfxViewFrame& rFrame, - SvxFontItem& rNewFont, - String& rString ); + static BOOL ExecuteCharMap( const SvxFontItem& rOldFont, + SfxViewFrame& rFrame, + SvxFontItem& rNewFont, + String& rString ); static BOOL IsActionShown( const ScChangeAction& rAction, const ScChangeViewSettings& rSettings, @@ -88,26 +88,26 @@ public: class ScUpdateRect { private: - SCCOL nOldStartX; - SCROW nOldStartY; - SCCOL nOldEndX; - SCROW nOldEndY; - SCCOL nNewStartX; - SCROW nNewStartY; - SCCOL nNewEndX; - SCROW nNewEndY; - SCCOL nContX1; - SCROW nContY1; - SCCOL nContX2; - SCROW nContY2; + SCCOL nOldStartX; + SCROW nOldStartY; + SCCOL nOldEndX; + SCROW nOldEndY; + SCCOL nNewStartX; + SCROW nNewStartY; + SCCOL nNewEndX; + SCROW nNewEndY; + SCCOL nContX1; + SCROW nContY1; + SCCOL nContX2; + SCROW nContY2; public: ScUpdateRect( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 ); - void SetNew( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 ); - BOOL GetDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 ); -#ifdef OLD_SELECTION_PAINT - BOOL GetXorDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, BOOL& rCont ); + void SetNew( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 ); + BOOL GetDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 ); +#ifdef OLD_SELECTION_PAINT + BOOL GetXorDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, BOOL& rCont ); void GetContDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 ); -#endif +#endif }; diff --git a/sc/source/ui/inc/warnbox.hxx b/sc/source/ui/inc/warnbox.hxx index e8f548f606fe..525d883b69c4 100644 --- a/sc/source/ui/inc/warnbox.hxx +++ b/sc/source/ui/inc/warnbox.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite |