diff options
Diffstat (limited to 'sd/source/ui/inc')
273 files changed, 3793 insertions, 3793 deletions
diff --git a/sd/source/ui/inc/3dchld.hxx b/sd/source/ui/inc/3dchld.hxx index 7bb61e3989c6..e39877dad440 100644 --- a/sd/source/ui/inc/3dchld.hxx +++ b/sd/source/ui/inc/3dchld.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,6 +47,6 @@ class Sd3DChildWindow : public SfxChildWindow SFX_DECL_CHILDWINDOW(Sd3DChildWindow); }; -#endif // _SD_3DCHLD_HXX +#endif // _SD_3DCHLD_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx index 53c51b749ac5..da8b8d12dddf 100644 --- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx +++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,18 +73,18 @@ namespace accessibility { <p>This class implements three kinds of listeners: <ol><li>The property change listener is not used directly but exists as - convenience for derived classes. May be moved to those classes + convenience for derived classes. May be moved to those classes instead.</li> <li>As window listener it waits for changes of the window geometry and forwards those as view forwarder changes.</li> <li>As focus listener it keeps track of the focus to give this class and derived classes the oportunity to set and remove the focus to/from shapes.</li> - </ol> + </ol> </p> */ class AccessibleDocumentViewBase - : public AccessibleContextBase, + : public AccessibleContextBase, public AccessibleComponentBase, public AccessibleSelectionBase, public IAccessibleViewForwarderListener, @@ -115,7 +115,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent); - virtual ~AccessibleDocumentViewBase (void); + virtual ~AccessibleDocumentViewBase (void); /** Initialize a new object. Call this method directly after creating a new object. It finished the initialization begun in the constructor @@ -135,7 +135,7 @@ public: windowResized... methods it will be sufficient in most cases just to overload this method. */ - virtual void ViewForwarderChanged (ChangeType aChangeType, + virtual void ViewForwarderChanged (ChangeType aChangeType, const IAccessibleViewForwarder* pViewForwarder); //===== XAccessibleContext ============================================== @@ -164,42 +164,42 @@ public: //===== XAccessibleComponent ============================================ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > SAL_CALL - getAccessibleAtPoint (const ::com::sun::star::awt::Point& aPoint) + 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 ::com::sun::star::awt::Rectangle SAL_CALL getBounds (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Point SAL_CALL getLocation (void) + virtual ::com::sun::star::awt::Point SAL_CALL getLocation (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen (void) + virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Size SAL_CALL getSize (void) + virtual ::com::sun::star::awt::Size SAL_CALL getSize (void) throw (::com::sun::star::uno::RuntimeException); //===== XInterface ====================================================== - + virtual com::sun::star::uno::Any SAL_CALL queryInterface (const com::sun::star::uno::Type & rType) throw (::com::sun::star::uno::RuntimeException); - + virtual void SAL_CALL - acquire (void) + acquire (void) throw (); - + virtual void SAL_CALL release (void) throw (); - - + + //===== 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) @@ -211,7 +211,7 @@ public: //===== XTypeProvider =================================================== - + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL getTypes (void) throw (::com::sun::star::uno::RuntimeException); @@ -233,48 +233,48 @@ public: //===== XWindowListener ================================================= - virtual void SAL_CALL - windowResized (const ::com::sun::star::awt::WindowEvent& e) + virtual void SAL_CALL + windowResized (const ::com::sun::star::awt::WindowEvent& e) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL - windowMoved (const ::com::sun::star::awt::WindowEvent& e) + virtual void SAL_CALL + windowMoved (const ::com::sun::star::awt::WindowEvent& e) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL - windowShown (const ::com::sun::star::lang::EventObject& e) + virtual void SAL_CALL + windowShown (const ::com::sun::star::lang::EventObject& e) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL - windowHidden (const ::com::sun::star::lang::EventObject& e) + virtual void SAL_CALL + windowHidden (const ::com::sun::star::lang::EventObject& e) throw (::com::sun::star::uno::RuntimeException); //===== XFocusListener ================================================= virtual void SAL_CALL focusGained (const ::com::sun::star::awt::FocusEvent& e) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL focusLost (const ::com::sun::star::awt::FocusEvent& e) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException); private: // return the member maMutex; - virtual ::osl::Mutex& + virtual ::osl::Mutex& implGetMutex(); - + // return ourself as context in default case - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > - implGetAccessibleContext() + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > + implGetAccessibleContext() throw ( ::com::sun::star::uno::RuntimeException ); // return sal_False in default case - virtual sal_Bool - implIsSelected( sal_Int32 nAccessibleChildIndex ) + virtual sal_Bool + implIsSelected( sal_Int32 nAccessibleChildIndex ) throw (::com::sun::star::uno::RuntimeException); // return nothing in default case virtual void - implSelect( sal_Int32 nAccessibleChildIndex, sal_Bool bSelect ) + implSelect( sal_Int32 nAccessibleChildIndex, sal_Bool bSelect ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); protected: @@ -290,7 +290,7 @@ protected: mxController; /// Model of the document. - ::com::sun::star::uno::Reference < ::com::sun::star::frame::XModel> + ::com::sun::star::uno::Reference < ::com::sun::star::frame::XModel> mxModel; // Bundle of information that is passed down the shape tree. @@ -303,7 +303,7 @@ protected: <member>SetAccessibleOLEObject</member> method. */ ::com::sun::star::uno::Reference < - ::com::sun::star::accessibility::XAccessible> + ::com::sun::star::accessibility::XAccessible> mxAccessibleOLEObject; Link maWindowLink; @@ -312,7 +312,7 @@ protected: // disposing. virtual void SAL_CALL disposing (void); - /** Create a name string. The current name is not modified and, + /** Create a name string. The current name is not modified and, therefore, no events are send. This method is usually called once by the <member>getAccessibleName</member> method of the base class. @return @@ -322,7 +322,7 @@ protected: CreateAccessibleName () throw (::com::sun::star::uno::RuntimeException); - /** Create a description string. The current description is not + /** Create a description string. The current description is not modified and, therefore, no events are send. This method is usually called once by the <member>getAccessibleDescription</member> method of the base class. @@ -337,7 +337,7 @@ protected: document has been activated. Can be used to send FOCUSED state changes for the currently selected element. - Note: Currently used as a substitute for FocusGained. Should be + Note: Currently used as a substitute for FocusGained. Should be renamed in the future. */ virtual void Activated (void); @@ -346,7 +346,7 @@ protected: this document has been deactivated. Can be used to send FOCUSED state changes for the currently selected element. - Note: Currently used as a substitute for FocusLost. Should be + Note: Currently used as a substitute for FocusLost. Should be renamed in the future. */ virtual void Deactivated (void); diff --git a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx index 2fdacb0601e0..c48b6d84a73c 100644 --- a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx +++ b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ namespace accessibility { Please see the documentation of the base class for further explanations of the individual methods. */ -class AccessibleDrawDocumentView : +class AccessibleDrawDocumentView : public AccessibleDocumentViewBase { public: @@ -55,7 +55,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent); - virtual ~AccessibleDrawDocumentView (void); + virtual ~AccessibleDrawDocumentView (void); /** Complete the initialization begun in the constructor. */ @@ -64,7 +64,7 @@ public: //===== IAccessibleViewForwarderListener ================================ - virtual void ViewForwarderChanged (ChangeType aChangeType, + virtual void ViewForwarderChanged (ChangeType aChangeType, const IAccessibleViewForwarder* pViewForwarder); //===== XAccessibleContext ============================================== @@ -95,7 +95,7 @@ public: protected: //===== XServiceInfo ==================================================== - + virtual ::rtl::OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); @@ -105,8 +105,8 @@ protected: throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool - implIsSelected( sal_Int32 nAccessibleChildIndex ) + virtual sal_Bool + implIsSelected( sal_Int32 nAccessibleChildIndex ) throw (::com::sun::star::uno::RuntimeException); /** Select or deselect the specified child or all children if the given @@ -123,7 +123,7 @@ protected: reps. children. */ virtual void - implSelect( sal_Int32 nAccessibleChildIndex, sal_Bool bSelect ) + implSelect( sal_Int32 nAccessibleChildIndex, sal_Bool bSelect ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); protected: @@ -141,12 +141,12 @@ protected: */ AccessiblePageShape* CreateDrawPageShape (void); - /// Create an accessible name that contains the current view mode. + /// Create an accessible name that contains the current view mode. virtual ::rtl::OUString CreateAccessibleName () throw (::com::sun::star::uno::RuntimeException); - /** Create an accessible description that contains the current + /** Create an accessible description that contains the current view mode. */ virtual ::rtl::OUString @@ -164,7 +164,7 @@ protected: virtual void Deactivated (void); virtual void impl_dispose (void); - + private: void UpdateAccessibleName (void); }; diff --git a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx index 25932045a7c2..01211ce41e05 100644 --- a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx +++ b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,10 +43,10 @@ class SdrOutliner; class SdrView; class Window; -namespace accessibility +namespace accessibility { - /** Implementation of the SvxEditSource interface in the SdOutlineView - + /** Implementation of the SvxEditSource interface in the SdOutlineView + This class connects the SdOutlineView and its EditEngine outliner with the AccessibleTextHelper, which provides all necessary functionality to make the outliner text accessible @@ -54,33 +54,33 @@ namespace accessibility @see SvxEditSource @see SvxViewForwarder */ - class AccessibleOutlineEditSource : public SvxEditSource, public SvxViewForwarder, public SfxBroadcaster, public SfxListener + class AccessibleOutlineEditSource : public SvxEditSource, public SvxViewForwarder, public SfxBroadcaster, public SfxListener { public: /// Create an SvxEditSource interface for the given Outliner - AccessibleOutlineEditSource( - SdrOutliner& rOutliner, - SdrView& rView, - OutlinerView& rOutlView, + AccessibleOutlineEditSource( + SdrOutliner& rOutliner, + SdrView& rView, + OutlinerView& rOutlView, const ::Window& rViewWindow ); virtual ~AccessibleOutlineEditSource(); /// This method is disabled and always returns NULL - virtual SvxEditSource* Clone() const; - virtual SvxTextForwarder* GetTextForwarder(); - virtual SvxViewForwarder* GetViewForwarder(); - virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate = sal_False ); - virtual void UpdateData(); - virtual SfxBroadcaster& GetBroadcaster() const; - - // the view forwarder - virtual BOOL IsValid() const; - virtual Rectangle GetVisArea() const; - virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const; - virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const; + virtual SvxEditSource* Clone() const; + virtual SvxTextForwarder* GetTextForwarder(); + virtual SvxViewForwarder* GetViewForwarder(); + virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate = sal_False ); + virtual void UpdateData(); + virtual SfxBroadcaster& GetBroadcaster() const; + + // the view forwarder + virtual BOOL IsValid() const; + virtual Rectangle GetVisArea() const; + virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const; + virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const; // SfxListener - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); private: @@ -90,13 +90,13 @@ namespace accessibility DECL_LINK( NotifyHdl, EENotify* ); - SdrView& mrView; + SdrView& mrView; const ::Window& mrWindow; - SdrOutliner* mpOutliner; + SdrOutliner* mpOutliner; OutlinerView* mpOutlinerView; - SvxOutlinerForwarder mTextForwarder; - SvxDrawOutlinerViewForwarder mViewForwarder; + SvxOutlinerForwarder mTextForwarder; + SvxDrawOutlinerViewForwarder mViewForwarder; }; diff --git a/sd/source/ui/inc/AccessibleOutlineView.hxx b/sd/source/ui/inc/AccessibleOutlineView.hxx index 003ee0b9f02d..f864e68c2286 100644 --- a/sd/source/ui/inc/AccessibleOutlineView.hxx +++ b/sd/source/ui/inc/AccessibleOutlineView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent); - virtual ~AccessibleOutlineView (void); + virtual ~AccessibleOutlineView (void); /** Complete the initialization begun in the constructor. */ @@ -68,7 +68,7 @@ public: //===== IAccessibleViewForwarderListener ================================ - virtual void ViewForwarderChanged (ChangeType aChangeType, + virtual void ViewForwarderChanged (ChangeType aChangeType, const IAccessibleViewForwarder* pViewForwarder); //===== XAccessibleContext ============================================== @@ -83,24 +83,24 @@ public: //===== XAccessibleEventBroadcaster ======================================== - virtual void SAL_CALL + virtual void SAL_CALL addEventListener ( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleEventListener >& xListener) + const ::com::sun::star::uno::Reference< + ::com::sun::star::accessibility::XAccessibleEventListener >& xListener) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL - removeEventListener ( - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleEventListener >& xListener) + virtual void SAL_CALL + removeEventListener ( + const ::com::sun::star::uno::Reference< + ::com::sun::star::accessibility::XAccessibleEventListener >& xListener) throw (::com::sun::star::uno::RuntimeException); using cppu::WeakComponentImplHelperBase::addEventListener; using cppu::WeakComponentImplHelperBase::removeEventListener; //===== 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) @@ -137,13 +137,13 @@ protected: // This method is called from the component helper base class while disposing. virtual void SAL_CALL disposing (void); - /// Create an accessible name that contains the current view mode. + /// Create an accessible name that contains the current view mode. virtual ::rtl::OUString CreateAccessibleName () throw (::com::sun::star::uno::RuntimeException); - /// Create an accessible description that contains the current - /// view mode. + /// Create an accessible description that contains the current + /// view mode. virtual ::rtl::OUString CreateAccessibleDescription () throw (::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/inc/AccessiblePageShape.hxx b/sd/source/ui/inc/AccessiblePageShape.hxx index 0fe78db1a320..6071359b1a91 100644 --- a/sd/source/ui/inc/AccessiblePageShape.hxx +++ b/sd/source/ui/inc/AccessiblePageShape.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ namespace accessibility { /** A page shape represents the actual page as seen on the screen. */ class AccessiblePageShape - : public AccessibleShape + : public AccessibleShape { public: //===== internal ======================================================== @@ -86,12 +86,12 @@ public: //===== XAccessibleContext ============================================== - /// Returns always 0 because there can be no children. + /// Returns always 0 because there can be no children. virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) throw (); - - /** Return the specified child. + + /** Return the specified child. @param nIndex Index of the requested child. @return @@ -101,31 +101,31 @@ public: Throws always an exception because there are no children. */ virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> SAL_CALL + ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException); //===== XAccessibleComponent ============================================ - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds (void) + virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds (void) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getForeground (void) + virtual sal_Int32 SAL_CALL getForeground (void) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBackground (void) + virtual sal_Int32 SAL_CALL getBackground (void) throw (::com::sun::star::uno::RuntimeException); //===== XComponent ====================================================== - virtual void SAL_CALL - dispose (void) + virtual void SAL_CALL + dispose (void) throw (::com::sun::star::uno::RuntimeException); //===== XServiceInfo ==================================================== - + virtual ::rtl::OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); @@ -137,15 +137,15 @@ public: //===== lang::XEventListener ============================================ - virtual void SAL_CALL - disposing (const ::com::sun::star::lang::EventObject& Source) + virtual void SAL_CALL + disposing (const ::com::sun::star::lang::EventObject& Source) throw (::com::sun::star::uno::RuntimeException); using AccessibleShape::disposing; protected: - /** Create a base name string that contains the accessible name. + /** Create a base name string that contains the accessible name. */ virtual ::rtl::OUString CreateAccessibleBaseName (void) @@ -155,7 +155,7 @@ protected: CreateAccessibleName (void) throw (::com::sun::star::uno::RuntimeException); - /// Create a description string that contains the accessible description. + /// Create a description string that contains the accessible description. virtual ::rtl::OUString CreateAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException); @@ -163,8 +163,8 @@ protected: private: ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage> mxPage; - - /** Don't use the default constructor. Use the public constructor that + + /** Don't use the default constructor. Use the public constructor that takes the original shape and the parent as arguments instead. */ explicit AccessiblePageShape (void); diff --git a/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx b/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx index cc647fb24802..6143704124a0 100644 --- a/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx +++ b/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace accessibility { -/** This class makes Impress shapes accessible. +/** This class makes Impress shapes accessible. */ class AccessiblePresentationGraphicShape - : public AccessibleGraphicShape + : public AccessibleGraphicShape { public: //===== internal ======================================================== @@ -47,8 +47,8 @@ public: virtual ~AccessiblePresentationGraphicShape (void); //===== 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) @@ -56,12 +56,12 @@ public: //===== internal ======================================================== - /// Create a name string that contains the accessible name. + /// Create a name string that contains the accessible name. virtual ::rtl::OUString CreateAccessibleBaseName () throw (::com::sun::star::uno::RuntimeException); - /// Create a description string that contains the accessible description. + /// Create a description string that contains the accessible description. virtual ::rtl::OUString CreateAccessibleDescription () throw (::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx b/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx index 5039c465fa2e..3d80656fa3f2 100644 --- a/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx +++ b/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace accessibility { -/** This class makes Impress shapes accessible. +/** This class makes Impress shapes accessible. */ class AccessiblePresentationOLEShape - : public AccessibleOLEShape + : public AccessibleOLEShape { public: //===== internal ======================================================== @@ -47,8 +47,8 @@ public: virtual ~AccessiblePresentationOLEShape (void); //===== 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) @@ -56,12 +56,12 @@ public: //===== internal ======================================================== - /// Create a name string that contains the accessible name. + /// Create a name string that contains the accessible name. virtual ::rtl::OUString CreateAccessibleBaseName () throw (::com::sun::star::uno::RuntimeException); - /// Create a description string that contains the accessible description. + /// Create a description string that contains the accessible description. virtual ::rtl::OUString CreateAccessibleDescription () throw (::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/inc/AccessiblePresentationShape.hxx b/sd/source/ui/inc/AccessiblePresentationShape.hxx index 3ef837002bc0..0e314da328ba 100644 --- a/sd/source/ui/inc/AccessiblePresentationShape.hxx +++ b/sd/source/ui/inc/AccessiblePresentationShape.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,10 +33,10 @@ namespace accessibility { -/** This class makes Impress shapes accessible. +/** This class makes Impress shapes accessible. */ class AccessiblePresentationShape - : public AccessibleShape + : public AccessibleShape { public: //===== internal ======================================================== @@ -46,8 +46,8 @@ public: virtual ~AccessiblePresentationShape (void); //===== 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) @@ -55,18 +55,18 @@ public: //===== internal ======================================================== - /// Create a name string that contains the accessible name. + /// Create a name string that contains the accessible name. virtual ::rtl::OUString CreateAccessibleBaseName () throw (::com::sun::star::uno::RuntimeException); - /// Create a description string that contains the accessible description. + /// Create a description string that contains the accessible description. virtual ::rtl::OUString CreateAccessibleDescription () throw (::com::sun::star::uno::RuntimeException); private: - /** Don't use the default constructor. Use the public constructor that + /** Don't use the default constructor. Use the public constructor that takes the original shape and the parent as arguments instead. */ AccessiblePresentationShape (void); diff --git a/sd/source/ui/inc/AccessibleScrollPanel.hxx b/sd/source/ui/inc/AccessibleScrollPanel.hxx index 86fb0a9f9d68..b88615559ef0 100644 --- a/sd/source/ui/inc/AccessibleScrollPanel.hxx +++ b/sd/source/ui/inc/AccessibleScrollPanel.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,11 +53,11 @@ public: //===== XAccessibleContext ============================================== - /// Return the number of currently visible children. + /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) throw (::com::sun::star::uno::RuntimeException); - /// Return the specified child or throw exception. + /// Return the specified child or throw exception. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) @@ -66,7 +66,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/sd/source/ui/inc/AccessibleSlideSorterObject.hxx b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx index 9337d1160784..e2b6f68d079b 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ class SlideSorter; namespace accessibility { -typedef ::cppu::WeakComponentImplHelper5< +typedef ::cppu::WeakComponentImplHelper5< ::com::sun::star::accessibility::XAccessible, ::com::sun::star::accessibility::XAccessibleEventBroadcaster, ::com::sun::star::accessibility::XAccessibleContext, @@ -87,7 +87,7 @@ public: /** The page number as given to the constructor. */ sal_uInt16 GetPageNumber (void) const; - + void FireAccessibleEvent ( short nEventId, const ::com::sun::star::uno::Any& rOldValue, @@ -104,14 +104,14 @@ public: getAccessibleContext (void) throw (::com::sun::star::uno::RuntimeException); - + //===== XAccessibleEventBroadcaster ======================================= virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener) throw (::com::sun::star::uno::RuntimeException); - + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< @@ -120,7 +120,7 @@ public: using cppu::WeakComponentImplHelperBase::addEventListener; using cppu::WeakComponentImplHelperBase::removeEventListener; - + //===== XAccessibleContext ============================================== virtual sal_Int32 SAL_CALL @@ -134,7 +134,7 @@ public: getAccessibleParent (void) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent (void) throw (::com::sun::star::uno::RuntimeException); @@ -167,46 +167,46 @@ public: //===== XAccessibleComponent ================================================ virtual sal_Bool SAL_CALL containsPoint ( - const ::com::sun::star::awt::Point& aPoint) + const ::com::sun::star::awt::Point& aPoint) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint ( - const ::com::sun::star::awt::Point& aPoint) + const ::com::sun::star::awt::Point& aPoint) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Point SAL_CALL getLocation (void) + virtual ::com::sun::star::awt::Point SAL_CALL getLocation (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen (void) + virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Size SAL_CALL getSize (void) + virtual ::com::sun::star::awt::Size SAL_CALL getSize (void) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL grabFocus (void) + virtual void SAL_CALL grabFocus (void) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getForeground (void) + virtual sal_Int32 SAL_CALL getForeground (void) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBackground (void) + virtual sal_Int32 SAL_CALL getBackground (void) throw (::com::sun::star::uno::RuntimeException); - + //===== XServiceInfo ==================================================== - /** Returns an identifier for the implementation of this object. + /** Returns an identifier for the implementation of this object. */ virtual ::rtl::OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); - /** Return whether the specified service is supported by this class. + /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL supportsService (const ::rtl::OUString& sServiceName) @@ -235,7 +235,7 @@ private: throw (::com::sun::star::lang::DisposedException); /** Check whether or not the object has been disposed (or is in the - state of beeing disposed). + state of beeing disposed). @return sal_True, if the object is disposed or in the course of being disposed. Otherwise, sal_False is returned. diff --git a/sd/source/ui/inc/AccessibleSlideSorterView.hxx b/sd/source/ui/inc/AccessibleSlideSorterView.hxx index e418b342b193..2bab6373c6ca 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterView.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,7 +55,7 @@ namespace accessibility { class AccessibleSlideSorterObject; -typedef ::cppu::WeakComponentImplHelper6< +typedef ::cppu::WeakComponentImplHelper6< ::com::sun::star::accessibility::XAccessible, ::com::sun::star::accessibility::XAccessibleEventBroadcaster, ::com::sun::star::accessibility::XAccessibleContext, @@ -79,7 +79,7 @@ public: ::Window* pParentWindow); void Init(); - + virtual ~AccessibleSlideSorterView (void); /** This method acts like a dispose call. It sends a disposing to all @@ -99,7 +99,7 @@ public: Index of the child for which to return the implementation object. */ AccessibleSlideSorterObject* GetAccessibleChildImplementation (sal_Int32 nIndex); - + //===== XAccessible ======================================================= virtual ::com::sun::star::uno::Reference< @@ -107,14 +107,14 @@ public: getAccessibleContext (void) throw (::com::sun::star::uno::RuntimeException); - + //===== XAccessibleEventBroadcaster ======================================= virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener) throw (::com::sun::star::uno::RuntimeException); - + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< @@ -123,56 +123,56 @@ public: using cppu::WeakComponentImplHelperBase::addEventListener; using cppu::WeakComponentImplHelperBase::removeEventListener; - + //===== XAccessibleContext ============================================== - /// Return the number of currently visible children. + /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) throw (::com::sun::star::uno::RuntimeException); - /// Return the specified child or throw exception. + /// Return the specified child or throw exception. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - /// Return a reference to the parent. + /// Return a reference to the parent. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleParent (void) throw (::com::sun::star::uno::RuntimeException); - /// Return this objects index among the parents children. - virtual sal_Int32 SAL_CALL + /// Return this objects index among the parents children. + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent (void) throw (::com::sun::star::uno::RuntimeException); - /// Return this object's role. + /// Return this object's role. virtual sal_Int16 SAL_CALL getAccessibleRole (void) throw (::com::sun::star::uno::RuntimeException); - /// Return this object's description. + /// Return this object's description. virtual ::rtl::OUString SAL_CALL getAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current name. + /// Return the object's current name. virtual ::rtl::OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException); - /// Return NULL to indicate that an empty relation set. + /// Return NULL to indicate that an empty relation set. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet (void) throw (::com::sun::star::uno::RuntimeException); - /// Return the set of current states. + /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet (void) throw (::com::sun::star::uno::RuntimeException); - /** Return the parents locale or throw exception if this object has no + /** Return the parents locale or throw exception if this object has no parent yet/anymore. */ virtual ::com::sun::star::lang::Locale SAL_CALL @@ -187,15 +187,15 @@ public: inside this object. */ virtual sal_Bool SAL_CALL containsPoint ( - const ::com::sun::star::awt::Point& aPoint) + const ::com::sun::star::awt::Point& aPoint) throw (::com::sun::star::uno::RuntimeException); /** The default implementation returns an empty reference. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > SAL_CALL + virtual ::com::sun::star::uno::Reference< + ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint ( - const ::com::sun::star::awt::Point& aPoint) + const ::com::sun::star::awt::Point& aPoint) throw (::com::sun::star::uno::RuntimeException); /** The default implementation returns an empty rectangle. @@ -206,82 +206,82 @@ public: /** The default implementation uses the result of <member>getBounds</member> to determine the location. */ - virtual ::com::sun::star::awt::Point SAL_CALL getLocation (void) + virtual ::com::sun::star::awt::Point SAL_CALL getLocation (void) throw (::com::sun::star::uno::RuntimeException); /** The default implementation returns an empty position, i.e. the * result of the default constructor of <type>com::sun::star::awt::Point</type>. */ - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen (void) + virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen (void) throw (::com::sun::star::uno::RuntimeException); /** The default implementation uses the result of <member>getBounds</member> to determine the size. */ - virtual ::com::sun::star::awt::Size SAL_CALL getSize (void) + virtual ::com::sun::star::awt::Size SAL_CALL getSize (void) throw (::com::sun::star::uno::RuntimeException); /** The default implementation does nothing. */ - virtual void SAL_CALL grabFocus (void) + virtual void SAL_CALL grabFocus (void) throw (::com::sun::star::uno::RuntimeException); /** Returns black as the default foreground color. */ - virtual sal_Int32 SAL_CALL getForeground (void) + virtual sal_Int32 SAL_CALL getForeground (void) throw (::com::sun::star::uno::RuntimeException); /** Returns white as the default background color. */ - virtual sal_Int32 SAL_CALL getBackground (void) + virtual sal_Int32 SAL_CALL getBackground (void) throw (::com::sun::star::uno::RuntimeException); - + //===== XAccessibleSelection ============================================== virtual void SAL_CALL selectAccessibleChild (sal_Int32 nChildIndex) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - + virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - + virtual void SAL_CALL clearAccessibleSelection( ) throw (::com::sun::star::uno::RuntimeException); - + virtual void SAL_CALL selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException); - + virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); - + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - + virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - + //===== 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) @@ -293,7 +293,7 @@ public: getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); - + private: class Implementation; ::std::auto_ptr<Implementation> mpImpl; @@ -316,7 +316,7 @@ private: throw (::com::sun::star::lang::DisposedException); /** Check whether or not the object has been disposed (or is in the - state of beeing disposed). + state of beeing disposed). @return sal_True, if the object is disposed or in the course of being disposed. Otherwise, sal_False is returned. diff --git a/sd/source/ui/inc/AccessibleSlideView.hxx b/sd/source/ui/inc/AccessibleSlideView.hxx index 921c64c536a3..8b95307cc7ea 100644 --- a/sd/source/ui/inc/AccessibleSlideView.hxx +++ b/sd/source/ui/inc/AccessibleSlideView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 Window; // - AccessibleSlideViewObject - // ----------------------------- -class AccessibleSlideViewObject : public ::cppu::WeakImplHelper6< +class AccessibleSlideViewObject : public ::cppu::WeakImplHelper6< ::com::sun::star::lang::XUnoTunnel, ::com::sun::star::accessibility::XAccessible, ::com::sun::star::accessibility::XAccessibleEventBroadcaster, @@ -69,8 +69,8 @@ private: AccessibleSlideView* mpManager; /// client id in the AccessibleEventNotifier queue sal_uInt32 mnClientId; - sal_uInt16 mnPage; - sal_Bool mbVisible; + sal_uInt16 mnPage; + sal_Bool mbVisible; sal_Bool mbValid; private: @@ -109,21 +109,21 @@ private: virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getForeground (void) + virtual sal_Int32 SAL_CALL getForeground (void) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBackground (void) + virtual sal_Int32 SAL_CALL getBackground (void) throw (::com::sun::star::uno::RuntimeException); //===== XServiceInfo ==================================================== - /** Returns an identifier for the implementation of this object. + /** Returns an identifier for the implementation of this object. */ virtual ::rtl::OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); - /** Return whether the specified service is supported by this class. + /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL supportsService (const ::rtl::OUString& sServiceName) @@ -138,9 +138,9 @@ private: public: static AccessibleSlideViewObject* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxData ) throw(); - -public: - + +public: + AccessibleSlideViewObject( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxParent, sal_uInt16 nPage, sal_Bool bVisible ); ~AccessibleSlideViewObject(); @@ -152,16 +152,16 @@ public: void Destroyed (void); sal_uInt16 GetPageNum() const { return mnPage; } - - void SetVisible( sal_Bool bVisible ); - sal_Bool IsVisible() const; + + void SetVisible( sal_Bool bVisible ); + sal_Bool IsVisible() const; }; // ----------------------- // - AccessibleSlideView - // ----------------------- -class AccessibleSlideView : public ::cppu::WeakImplHelper7< +class AccessibleSlideView : public ::cppu::WeakImplHelper7< ::com::sun::star::lang::XUnoTunnel, ::com::sun::star::accessibility::XAccessible, ::com::sun::star::accessibility::XAccessibleEventBroadcaster, @@ -175,8 +175,8 @@ public: static AccessibleSlideView* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxData ) throw(); AccessibleSlideView( - SdDrawDocument& rDoc, - ::sd::SlideView& rView, + SdDrawDocument& rDoc, + ::sd::SlideView& rView, ::sd::Window& rParentWindow); virtual ~AccessibleSlideView (void); @@ -191,8 +191,8 @@ public: ::sd::SlideView* GetSlideView() const { return mpView; } ::sd::Window* GetParentWindow() const { return mpParentWindow; } - void SetPageVisible( sal_uInt16 nPage, sal_Bool bVisible ); - void Reset(); + void SetPageVisible( sal_uInt16 nPage, sal_Bool bVisible ); + void Reset(); void FocusHasChanged( USHORT nOldFocusPage, USHORT nNewFocusPage ); @@ -241,10 +241,10 @@ private: virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getForeground (void) + virtual sal_Int32 SAL_CALL getForeground (void) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBackground (void) + virtual sal_Int32 SAL_CALL getBackground (void) throw (::com::sun::star::uno::RuntimeException); // XAccessibleSelection @@ -258,13 +258,13 @@ private: //===== 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) diff --git a/sd/source/ui/inc/AccessibleTreeNode.hxx b/sd/source/ui/inc/AccessibleTreeNode.hxx index 7df371456c0e..5d8d20766d78 100644 --- a/sd/source/ui/inc/AccessibleTreeNode.hxx +++ b/sd/source/ui/inc/AccessibleTreeNode.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,7 +62,7 @@ namespace accessibility { class AccessibleSlideSorterObject; -typedef ::cppu::WeakComponentImplHelper5< +typedef ::cppu::WeakComponentImplHelper5< ::com::sun::star::accessibility::XAccessible, ::com::sun::star::accessibility::XAccessibleEventBroadcaster, ::com::sun::star::accessibility::XAccessibleContext, @@ -96,7 +96,7 @@ public: const ::rtl::OUString& rsName, const ::rtl::OUString& rsDescription, sal_Int16 eRole); - + /** Use this variant of the constructor when the accessible parent is non-standard. @param rxParent @@ -120,7 +120,7 @@ public: const ::rtl::OUString& rsName, const ::rtl::OUString& rsDescription, sal_Int16 eRole); - + void FireAccessibleEvent ( short nEventId, const ::com::sun::star::uno::Any& rOldValue, @@ -135,7 +135,7 @@ public: getAccessibleContext (void) throw (::com::sun::star::uno::RuntimeException); - + //===== XAccessibleEventBroadcaster ======================================= virtual void SAL_CALL @@ -143,7 +143,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener) throw (::com::sun::star::uno::RuntimeException); - + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< @@ -152,56 +152,56 @@ public: using cppu::WeakComponentImplHelperBase::addEventListener; using cppu::WeakComponentImplHelperBase::removeEventListener; - + //===== XAccessibleContext ============================================== - /// Return the number of currently visible children. + /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) throw (::com::sun::star::uno::RuntimeException); - /// Return the specified child or throw exception. + /// Return the specified child or throw exception. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - /// Return a reference to the parent. + /// Return a reference to the parent. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleParent (void) throw (::com::sun::star::uno::RuntimeException); - /// Return this objects index among the parents children. - virtual sal_Int32 SAL_CALL + /// Return this objects index among the parents children. + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent (void) throw (::com::sun::star::uno::RuntimeException); - /// Return this object's role. + /// Return this object's role. virtual sal_Int16 SAL_CALL getAccessibleRole (void) throw (::com::sun::star::uno::RuntimeException); - /// Return this object's description. + /// Return this object's description. virtual ::rtl::OUString SAL_CALL getAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current name. + /// Return the object's current name. virtual ::rtl::OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException); - /// Return NULL to indicate that an empty relation set. + /// Return NULL to indicate that an empty relation set. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet (void) throw (::com::sun::star::uno::RuntimeException); - /// Return the set of current states. + /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet (void) throw (::com::sun::star::uno::RuntimeException); - /** Return the parents locale or throw exception if this object has no + /** Return the parents locale or throw exception if this object has no parent yet/anymore. */ virtual ::com::sun::star::lang::Locale SAL_CALL @@ -212,46 +212,46 @@ public: //===== XAccessibleComponent ================================================ virtual sal_Bool SAL_CALL containsPoint ( - const ::com::sun::star::awt::Point& aPoint) + const ::com::sun::star::awt::Point& aPoint) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > SAL_CALL + virtual ::com::sun::star::uno::Reference< + ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint ( - const ::com::sun::star::awt::Point& aPoint) + const ::com::sun::star::awt::Point& aPoint) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Point SAL_CALL getLocation (void) + virtual ::com::sun::star::awt::Point SAL_CALL getLocation (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen (void) + virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Size SAL_CALL getSize (void) + virtual ::com::sun::star::awt::Size SAL_CALL getSize (void) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL grabFocus (void) + virtual void SAL_CALL grabFocus (void) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getForeground (void) + virtual sal_Int32 SAL_CALL getForeground (void) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBackground (void) + virtual sal_Int32 SAL_CALL getBackground (void) throw (::com::sun::star::uno::RuntimeException); - + //===== XServiceInfo ==================================================== - /** Returns an identifier for the implementation of this object. + /** Returns an identifier for the implementation of this object. */ virtual ::rtl::OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); - /** Return whether the specified service is supported by this class. + /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL supportsService (const ::rtl::OUString& sServiceName) @@ -263,13 +263,13 @@ public: getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); - + protected: ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> mxParent; ::sd::toolpanel::TreeNode& mrTreeNode; ::rtl::Reference< ::utl::AccessibleStateSetHelper> mrStateSet; - + const ::rtl::OUString msName; const ::rtl::OUString msDescription; const sal_Int16 meRole; @@ -285,7 +285,7 @@ protected: throw (::com::sun::star::lang::DisposedException); /** Check whether or not the object has been disposed (or is in the - state of beeing disposed). + state of beeing disposed). @return sal_True, if the object is disposed or in the course of being disposed. Otherwise, sal_False is returned. @@ -303,10 +303,10 @@ protected: void UpdateState( sal_Int16 aState, bool bValue); - + DECL_LINK(StateChangeListener, ::sd::toolpanel::TreeNodeStateChangeEvent*); DECL_LINK(WindowEventListener, VclWindowEvent*); - + private: sal_uInt32 mnClientId; diff --git a/sd/source/ui/inc/AccessibleViewForwarder.hxx b/sd/source/ui/inc/AccessibleViewForwarder.hxx index 7c3fe45abc27..cb475aadb200 100644 --- a/sd/source/ui/inc/AccessibleViewForwarder.hxx +++ b/sd/source/ui/inc/AccessibleViewForwarder.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ class OutputDevice; namespace accessibility { -/** <p>This class provides the means to transform between internal coordinates +/** <p>This class provides the means to transform between internal coordinates and screen coordinates without giving direct access to the underlying view. It represents a certain window. A call to <method>GetVisArea</method> returns the corresponding visible @@ -49,7 +49,7 @@ namespace accessibility { change the validity of the forwarder have to be signaled seperately. */ class AccessibleViewForwarder - : public IAccessibleViewForwarder + : public IAccessibleViewForwarder { public: //===== internal ======================================================== @@ -57,7 +57,7 @@ public: AccessibleViewForwarder (SdrPaintView* pView, OutputDevice& rDevice); virtual ~AccessibleViewForwarder (void); - + //===== IAccessibleViewforwarder ======================================== /** This method informs you about the state of the forwarder. Do not @@ -71,7 +71,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. */ virtual Rectangle GetVisibleArea() const; @@ -82,7 +82,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. */ @@ -94,7 +94,7 @@ public: @param rSize Size in internal coordinates. - @return + @return The same size but in screen coordinates. */ virtual Size LogicToPixel (const Size& rSize) const; @@ -106,7 +106,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; @@ -117,7 +117,7 @@ public: @param rSize Size in screen coordinates. - @return + @return The same size but in internal coordinates. */ virtual Size PixelToLogic (const Size& rSize) const; diff --git a/sd/source/ui/inc/AnimationChildWindow.hxx b/sd/source/ui/inc/AnimationChildWindow.hxx index 8731d6600e09..8d8f3a038885 100644 --- a/sd/source/ui/inc/AnimationChildWindow.hxx +++ b/sd/source/ui/inc/AnimationChildWindow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,13 +37,13 @@ class SfxBindings; namespace sd { -class AnimationChildWindow +class AnimationChildWindow : public SfxChildWindow { public: AnimationChildWindow( - ::Window*, - USHORT, + ::Window*, + USHORT, SfxBindings*, SfxChildWinInfo*); diff --git a/sd/source/ui/inc/BezierObjectBar.hxx b/sd/source/ui/inc/BezierObjectBar.hxx index 764508cd77d5..373c72969886 100644 --- a/sd/source/ui/inc/BezierObjectBar.hxx +++ b/sd/source/ui/inc/BezierObjectBar.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ namespace sd { class View; class ViewShell; -class BezierObjectBar +class BezierObjectBar : public SfxShell { public: diff --git a/sd/source/ui/inc/BreakDlg.hxx b/sd/source/ui/inc/BreakDlg.hxx index 87c9a0f7c718..4d503e5b9198 100644 --- a/sd/source/ui/inc/BreakDlg.hxx +++ b/sd/source/ui/inc/BreakDlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,38 +52,38 @@ class DrawView; |* Dialog zum aufbrechen von Metafiles |* \************************************************************************/ -class BreakDlg +class BreakDlg : public SfxModalDialog { public: BreakDlg ( - ::Window* pWindow, - DrawView* pDrView, - DrawDocShell* pShell, - ULONG nSumActionCount, + ::Window* pWindow, + DrawView* pDrView, + DrawDocShell* pShell, + ULONG nSumActionCount, ULONG nObjCount); virtual ~BreakDlg(); short Execute(); private: - FixedText aFtObjInfo; - FixedText aFtActInfo; - FixedText aFtInsInfo; + FixedText aFtObjInfo; + FixedText aFtActInfo; + FixedText aFtInsInfo; - FixedInfo aFiObjInfo; - FixedInfo aFiActInfo; - FixedInfo aFiInsInfo; + FixedInfo aFiObjInfo; + FixedInfo aFiActInfo; + FixedInfo aFiInsInfo; - CancelButton aBtnCancel; - DrawView* pDrView; + CancelButton aBtnCancel; + DrawView* pDrView; - BOOL bCancel; + BOOL bCancel; - Timer aTimer; + Timer aTimer; SvdProgressInfo *pProgrInfo; - Link aLink; - SfxProgress *mpProgress; + Link aLink; + SfxProgress *mpProgress; DECL_LINK( CancelButtonHdl, void* ); DECL_LINK( UpDate, void* ); diff --git a/sd/source/ui/inc/Client.hxx b/sd/source/ui/inc/Client.hxx index 365c14efa4ba..035e168cd231 100644 --- a/sd/source/ui/inc/Client.hxx +++ b/sd/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 @@ -48,24 +48,24 @@ class ViewShell; class Client : public SfxInPlaceClient { ViewShell* mpViewShell; - SdrOle2Obj* pSdrOle2Obj; - SdrGrafObj* pSdrGrafObj; + SdrOle2Obj* pSdrOle2Obj; + SdrGrafObj* pSdrGrafObj; OutlinerParaObject* pOutlinerParaObj; virtual void ObjectAreaChanged(); virtual void RequestNewObjectArea( Rectangle& ); virtual void ViewChanged(); - virtual void MakeVisible(); + virtual void MakeVisible(); public: Client (SdrOle2Obj* pObj, ViewShell* pSdViewShell, ::Window* pWindow); virtual ~Client (void); - SdrOle2Obj* GetSdrOle2Obj() const { return pSdrOle2Obj; } - void SetSdrGrafObj(SdrGrafObj* pObj) { pSdrGrafObj = pObj; } - SdrGrafObj* GetSdrGrafObj() const { return pSdrGrafObj; } - void SetOutlinerParaObj (OutlinerParaObject* pObj) { pOutlinerParaObj = pObj; } - OutlinerParaObject* GetOutlinerParaObject () const { return pOutlinerParaObj; } + SdrOle2Obj* GetSdrOle2Obj() const { return pSdrOle2Obj; } + void SetSdrGrafObj(SdrGrafObj* pObj) { pSdrGrafObj = pObj; } + SdrGrafObj* GetSdrGrafObj() const { return pSdrGrafObj; } + void SetOutlinerParaObj (OutlinerParaObject* pObj) { pOutlinerParaObj = pObj; } + OutlinerParaObject* GetOutlinerParaObject () const { return pOutlinerParaObj; } }; } // end of namespace sd diff --git a/sd/source/ui/inc/ClientView.hxx b/sd/source/ui/inc/ClientView.hxx index 8bf053dca341..f62d87531c12 100644 --- a/sd/source/ui/inc/ClientView.hxx +++ b/sd/source/ui/inc/ClientView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 DrawViewShell; |* \************************************************************************/ -class ClientView +class ClientView : public DrawView { public: ClientView ( - DrawDocShell* pDocSh, + DrawDocShell* pDocSh, OutputDevice* pOutDev, DrawViewShell* pShell); virtual ~ClientView (void); diff --git a/sd/source/ui/inc/CustomAnimation.hxx b/sd/source/ui/inc/CustomAnimation.hxx index c7eea3966cc7..00f07a6facb0 100644 --- a/sd/source/ui/inc/CustomAnimation.hxx +++ b/sd/source/ui/inc/CustomAnimation.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ class Window; namespace sd { -// extern void showCustomAnimationPane( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawView >& xView ); +// extern void showCustomAnimationPane( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawView >& xView ); extern ::Window* createCustomAnimationPane( ::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ); } diff --git a/sd/source/ui/inc/DialogListBox.hxx b/sd/source/ui/inc/DialogListBox.hxx index 4b1e0cea8178..e663bcf83f5d 100644 --- a/sd/source/ui/inc/DialogListBox.hxx +++ b/sd/source/ui/inc/DialogListBox.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,36 +37,36 @@ namespace sd class DialogListBox : public Control { private: - ScrollBar* mpHScrollBar; - ScrollBar* mpVScrollBar; - ScrollBarBox* mpScrollBarBox; - ::Window* mpChild; - bool mbVScroll; - bool mbHScroll; - bool mbAutoHScroll; - Size maMinSize, maInnerSize; + ScrollBar* mpHScrollBar; + ScrollBar* mpVScrollBar; + ScrollBarBox* mpScrollBarBox; + ::Window* mpChild; + bool mbVScroll; + bool mbHScroll; + bool mbAutoHScroll; + Size maMinSize, maInnerSize; protected: - virtual void GetFocus(); - virtual void StateChanged( StateChangedType nType ); + virtual void GetFocus(); + virtual void StateChanged( StateChangedType nType ); - long Notify( NotifyEvent& rNEvt ); + long Notify( NotifyEvent& rNEvt ); - void ImplResizeControls(); - void ImplCheckScrollBars(); - void ImplInitScrollBars(); - void ImplResizeChild(); + void ImplResizeControls(); + void ImplCheckScrollBars(); + void ImplInitScrollBars(); + void ImplResizeChild(); - DECL_LINK( ScrollBarHdl, ScrollBar* ); + DECL_LINK( ScrollBarHdl, ScrollBar* ); public: DialogListBox( ::Window* pParent, WinBits nWinStyle ); ~DialogListBox(); - void SetChildWindow( ::Window* pChild, const Size& rMinSize ); + void SetChildWindow( ::Window* pChild, const Size& rMinSize ); - ::Window* GetPreferredKeyInputWindow(); - void Resize(); + ::Window* GetPreferredKeyInputWindow(); + void Resize(); }; diff --git a/sd/source/ui/inc/DocumentRenderer.hxx b/sd/source/ui/inc/DocumentRenderer.hxx index 4874ddd745c2..c4f2869e1737 100644 --- a/sd/source/ui/inc/DocumentRenderer.hxx +++ b/sd/source/ui/inc/DocumentRenderer.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,13 +60,13 @@ public: const css::uno::Any& aSelection, const css::uno::Sequence<css::beans::PropertyValue >& xOptions) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - + virtual css::uno::Sequence<css::beans::PropertyValue> SAL_CALL getRenderer ( sal_Int32 nRenderer, const css::uno::Any& rSelection, const css::uno::Sequence<css::beans::PropertyValue>& rxOptions) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - + virtual void SAL_CALL render ( sal_Int32 nRenderer, const css::uno::Any& rSelection, diff --git a/sd/source/ui/inc/DrawController.hxx b/sd/source/ui/inc/DrawController.hxx index 039f1308011e..98e7967c6ecf 100644 --- a/sd/source/ui/inc/DrawController.hxx +++ b/sd/source/ui/inc/DrawController.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -199,20 +199,20 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > SAL_CALL getControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); // XDrawView - virtual void SAL_CALL + virtual void SAL_CALL setCurrentPage ( - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPage > SAL_CALL + ::com::sun::star::drawing::XDrawPage > SAL_CALL getCurrentPage (void) throw(::com::sun::star::uno::RuntimeException); // lang::XEventListener - virtual void SAL_CALL + virtual void SAL_CALL disposing (const ::com::sun::star::lang::EventObject& rEventObject) throw (::com::sun::star::uno::RuntimeException); @@ -224,7 +224,7 @@ public: // XControllerManager - + virtual css::uno::Reference<css::drawing::framework::XConfigurationController> SAL_CALL getConfigurationController (void) throw (::com::sun::star::uno::RuntimeException); @@ -232,8 +232,8 @@ public: virtual css::uno::Reference<css::drawing::framework::XModuleController> SAL_CALL getModuleController (void) throw (::com::sun::star::uno::RuntimeException); - - + + // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething (const com::sun::star::uno::Sequence<sal_Int8>& rId) @@ -244,7 +244,7 @@ protected: contains all property names and types of this object. */ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); - + virtual void FillPropertyTable ( ::std::vector< ::com::sun::star::beans::Property>& rProperties); @@ -257,9 +257,9 @@ protected: sal_Int32 nHandle ) const; /** Convert the value rValue and return the result in rConvertedValue and the - old value in rOldValue. + old value in rOldValue. After this call the vetoable listeners are notified. - + @param rConvertedValue The converted value. Only set if return is true. @param rOldValue @@ -290,7 +290,7 @@ protected: */ void ThrowIfDisposed (void) const throw (::com::sun::star::lang::DisposedException); - + using cppu::OPropertySetHelper::disposing; using cppu::OPropertySetHelper::getFastPropertyValue; diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index ec3a9b33f018..65d28656fe04 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,12 +86,12 @@ public: virtual ~DrawDocShell(); void UpdateRefDevice(); - virtual void Activate( BOOL bMDI ); - virtual void Deactivate( BOOL bMDI ); + virtual void Activate( BOOL bMDI ); + virtual void Deactivate( BOOL bMDI ); virtual BOOL InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); virtual sal_Bool ImportFrom( SfxMedium &rMedium ); - virtual BOOL ConvertFrom( SfxMedium &rMedium ); - virtual BOOL Save(); + virtual BOOL ConvertFrom( SfxMedium &rMedium ); + virtual BOOL Save(); virtual BOOL SaveAsOwnFormat( SfxMedium& rMedium ); virtual BOOL ConvertTo( SfxMedium &rMedium ); virtual BOOL SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); @@ -101,13 +101,13 @@ public: virtual sal_Bool SaveAs( SfxMedium &rMedium ); virtual Rectangle GetVisArea(USHORT nAspect) const; - virtual void Draw(OutputDevice*, const JobSetup& rSetup, USHORT nAspect = ASPECT_CONTENT); + virtual void Draw(OutputDevice*, const JobSetup& rSetup, USHORT nAspect = ASPECT_CONTENT); virtual SfxUndoManager* GetUndoManager(); virtual Printer* GetDocumentPrinter(); virtual void OnDocumentPrinterChanged(Printer* pNewPrinter); virtual SfxStyleSheetBasePool* GetStyleSheetPool(); - virtual void SetOrganizerSearchMask(SfxStyleSheetBasePool* pBasePool) const; - virtual Size GetFirstPageSize(); + virtual void SetOrganizerSearchMask(SfxStyleSheetBasePool* pBasePool) const; + virtual Size GetFirstPageSize(); virtual void FillClass(SvGlobalName* pClassName, sal_uInt32* pFormat, String* pAppName, String* pFullTypeName, String* pShortTypeName, sal_Int32 nFileFormat, sal_Bool bTemplate = sal_False ) const; virtual void SetModified( BOOL = TRUE ); @@ -117,28 +117,28 @@ public: sd::ViewShell* GetViewShell() { return mpViewShell; } ::sd::FrameView* GetFrameView(); - ::sd::FunctionReference GetDocShellFunction() const { return mxDocShellFunction; } + ::sd::FunctionReference GetDocShellFunction() const { return mxDocShellFunction; } void SetDocShellFunction( const ::sd::FunctionReference& xFunction ); SdDrawDocument* GetDoc(); DocumentType GetDocumentType() const { return meDocType; } SfxPrinter* GetPrinter(BOOL bCreate); - void SetPrinter(SfxPrinter *pNewPrinter); - void UpdateFontList(); + void SetPrinter(SfxPrinter *pNewPrinter); + void UpdateFontList(); BOOL IsInDestruction() const { return mbInDestruction; } - void CancelSearching(); + void CancelSearching(); - void Execute( SfxRequest& rReq ); - void GetState(SfxItemSet&); + void Execute( SfxRequest& rReq ); + void GetState(SfxItemSet&); - void Connect(sd::ViewShell* pViewSh); - void Disconnect(sd::ViewShell* pViewSh); - void UpdateTablePointers(); + void Connect(sd::ViewShell* pViewSh); + void Disconnect(sd::ViewShell* pViewSh); + void UpdateTablePointers(); - BOOL GotoBookmark(const String& rBookmark); + BOOL GotoBookmark(const String& rBookmark); Bitmap GetPagePreviewBitmap(SdPage* pPage, USHORT nMaxEdgePixel); @@ -157,17 +157,17 @@ public: a default name of a not-yet-existing slide (e.g. 'Slide 17'), TRUE is returned, but rName is set to an empty string. */ - BOOL CheckPageName(::Window* pWin, String& rName ); + BOOL CheckPageName(::Window* pWin, String& rName ); void SetSlotFilter(BOOL bEnable = FALSE, USHORT nCount = 0, const USHORT* pSIDs = NULL) { mbFilterEnable = bEnable; mnFilterCount = nCount; mpFilterSIDs = pSIDs; } void ApplySlotFilter() const; - UINT16 GetStyleFamily() const { return mnStyleFamily; } - void SetStyleFamily( UINT16 nSF ) { mnStyleFamily = nSF; } + UINT16 GetStyleFamily() const { return mnStyleFamily; } + void SetStyleFamily( UINT16 nSF ) { mnStyleFamily = nSF; } /** executes the SID_OPENDOC slot to let the framework open a document with the given URL and this document as a referer */ - void OpenBookmark( const String& rBookmarkURL ); + void OpenBookmark( const String& rBookmarkURL ); /** checks, if the given name is a valid new name for a slide @@ -206,28 +206,28 @@ public: // #91457# ExecuteSpellPopup now handled by DrawDocShell DECL_LINK( OnlineSpellCallback, SpellCallbackInfo* ); - void ClearUndoBuffer(); + void ClearUndoBuffer(); protected: - SdDrawDocument* mpDoc; - SfxUndoManager* mpUndoManager; - SfxPrinter* mpPrinter; - ::sd::ViewShell* mpViewShell; - FontList* mpFontList; - ::sd::FunctionReference mxDocShellFunction; + SdDrawDocument* mpDoc; + SfxUndoManager* mpUndoManager; + SfxPrinter* mpPrinter; + ::sd::ViewShell* mpViewShell; + FontList* mpFontList; + ::sd::FunctionReference mxDocShellFunction; DocumentType meDocType; - UINT16 mnStyleFamily; + UINT16 mnStyleFamily; const USHORT* mpFilterSIDs; USHORT mnFilterCount; BOOL mbFilterEnable; - BOOL mbSdDataObj; + BOOL mbSdDataObj; BOOL mbInDestruction; - BOOL mbOwnPrinter; + BOOL mbOwnPrinter; BOOL mbNewDocument; - bool mbOwnDocument; // if true, we own mpDoc and will delete it in our d'tor - void Construct(bool bClipboard); + bool mbOwnDocument; // if true, we own mpDoc and will delete it in our d'tor + void Construct(bool bClipboard); virtual void InPlaceActivate( BOOL bActive ); }; diff --git a/sd/source/ui/inc/DrawSubController.hxx b/sd/source/ui/inc/DrawSubController.hxx index 9950296ef63c..3c83bb8cc96f 100644 --- a/sd/source/ui/inc/DrawSubController.hxx +++ b/sd/source/ui/inc/DrawSubController.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index 4943da811f69..be9207f6d1f6 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -100,7 +100,7 @@ public: virtual void Init (bool bIsMainViewShell); virtual void Shutdown (void); - + void PrePaint(); virtual void Paint(const Rectangle& rRect, ::sd::Window* pWin); @@ -122,7 +122,7 @@ public: @param rSize The new size in pixel. */ - // virtual void AdjustPosSizePixel(const Point &rPos, const Size &rSize); + // virtual void AdjustPosSizePixel(const Point &rPos, const Size &rSize); /** Arrange and resize the GUI elements like rulers, sliders, and buttons as well as the actual document view according to the size of @@ -131,7 +131,7 @@ public: */ virtual void ArrangeGUIElements (void); - void HidePage(); + void HidePage(); virtual BOOL KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin); virtual void MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin); @@ -151,77 +151,77 @@ public: virtual void SetZoom( long nZoom ); virtual void SetZoomRect( const Rectangle& rZoomRect ); - void InsertURLField(const String& rURL, const String& rText, const String& rTarget, + void InsertURLField(const String& rURL, const String& rText, const String& rTarget, const Point* pPos); - void InsertURLButton(const String& rURL, const String& rText, const String& rTarget, + void InsertURLButton(const String& rURL, const String& rText, const String& rTarget, const Point* pPos); virtual void SetUIUnit(FieldUnit eUnit); - void SelectionHasChanged(); - void ModelHasChanged(); + void SelectionHasChanged(); + void ModelHasChanged(); virtual void Activate(BOOL bIsMDIActivate); virtual void Deactivate(BOOL IsMDIActivate); virtual void UIActivating( SfxInPlaceClient* ); virtual void UIDeactivated( SfxInPlaceClient* ); - virtual String GetSelectionText( BOOL bCompleteWords = FALSE ); + virtual String GetSelectionText( BOOL bCompleteWords = FALSE ); virtual BOOL HasSelection( BOOL bText = TRUE ) const; - void ExecCtrl(SfxRequest& rReq); - void GetCtrlState(SfxItemSet& rSet); - void GetMenuState(SfxItemSet& rSet); - void GetTableMenuState(SfxItemSet& rSet); + void ExecCtrl(SfxRequest& rReq); + void GetCtrlState(SfxItemSet& rSet); + void GetMenuState(SfxItemSet& rSet); + void GetTableMenuState(SfxItemSet& rSet); /** Set the items of the given item set that are related to switching the editing mode to the correct values. <p>This function also sets the states of the mode buttons (those at the upper right corner) accordingly.</p> */ void GetModeSwitchingMenuState (SfxItemSet &rSet); - void GetAttrState(SfxItemSet& rSet); - void GetSnapItemState(SfxItemSet& rSet); + void GetAttrState(SfxItemSet& rSet); + void GetSnapItemState(SfxItemSet& rSet); - void GetState (SfxItemSet& rSet); + void GetState (SfxItemSet& rSet); void Execute (SfxRequest& rReq); - void ExecStatusBar(SfxRequest& rReq); - void GetStatusBarState(SfxItemSet& rSet); + void ExecStatusBar(SfxRequest& rReq); + void GetStatusBarState(SfxItemSet& rSet); - void ExecOptionsBar(SfxRequest& rReq); - void GetOptionsBarState(SfxItemSet& rSet); + void ExecOptionsBar(SfxRequest& rReq); + void GetOptionsBarState(SfxItemSet& rSet); - void ExecRuler(SfxRequest& rReq); - void GetRulerState(SfxItemSet& rSet); + void ExecRuler(SfxRequest& rReq); + void GetRulerState(SfxItemSet& rSet); - void ExecFormText(SfxRequest& rReq); - void GetFormTextState(SfxItemSet& rSet); + void ExecFormText(SfxRequest& rReq); + void GetFormTextState(SfxItemSet& rSet); - void ExecAnimationWin(SfxRequest& rReq); - void GetAnimationWinState(SfxItemSet& rSet); + void ExecAnimationWin(SfxRequest& rReq); + void GetAnimationWinState(SfxItemSet& rSet); - void ExecNavigatorWin(SfxRequest& rReq); - void GetNavigatorWinState(SfxItemSet& rSet); + void ExecNavigatorWin(SfxRequest& rReq); + void GetNavigatorWinState(SfxItemSet& rSet); - void ExecEffectWin(SfxRequest& rReq); + void ExecEffectWin(SfxRequest& rReq); - void Update3DWindow(); - void AssignFrom3DWindow(); + void Update3DWindow(); + void AssignFrom3DWindow(); - void ExecGallery(SfxRequest& rReq); - void GetGalleryState(SfxItemSet& rSet); + void ExecGallery(SfxRequest& rReq); + void GetGalleryState(SfxItemSet& rSet); - void ExecBmpMask( SfxRequest& rReq ); - void GetBmpMaskState( SfxItemSet& rSet ); + void ExecBmpMask( SfxRequest& rReq ); + void GetBmpMaskState( SfxItemSet& rSet ); - void ExecIMap( SfxRequest& rReq ); - void GetIMapState( SfxItemSet& rSet ); + void ExecIMap( SfxRequest& rReq ); + void GetIMapState( SfxItemSet& rSet ); - void FuTemporary(SfxRequest& rReq); - void FuPermanent(SfxRequest& rReq); - void FuSupport(SfxRequest& rReq); - void FuTable(SfxRequest& rReq); + void FuTemporary(SfxRequest& rReq); + void FuPermanent(SfxRequest& rReq); + void FuSupport(SfxRequest& rReq); + void FuTable(SfxRequest& rReq); - void AttrExec (SfxRequest& rReq); - void AttrState (SfxItemSet& rSet); + void AttrExec (SfxRequest& rReq); + void AttrState (SfxItemSet& rSet); void ExecuteAnnotation (SfxRequest& rRequest); void GetAnnotationState (SfxItemSet& rItemSet); @@ -232,24 +232,24 @@ public: virtual USHORT PrepareClose( BOOL bUI = TRUE, BOOL bForBrowsing = FALSE ); - PageKind GetPageKind() { return mePageKind; } + PageKind GetPageKind() { return mePageKind; } - Point GetMousePos() { return maMousePos; } - BOOL IsMousePosFreezed() { return mbMousePosFreezed; } - void SetMousePosFreezed( BOOL bIn ) { mbMousePosFreezed = bIn; } + Point GetMousePos() { return maMousePos; } + BOOL IsMousePosFreezed() { return mbMousePosFreezed; } + void SetMousePosFreezed( BOOL bIn ) { mbMousePosFreezed = bIn; } - EditMode GetEditMode() const { return meEditMode; } - virtual SdPage* GetActualPage() { return mpActualPage; } + EditMode GetEditMode() const { return meEditMode; } + virtual SdPage* GetActualPage() { return mpActualPage; } /// inherited from sd::ViewShell virtual SdPage* getCurrentPage() const; - void ResetActualPage(); - void ResetActualLayer(); - BOOL SwitchPage(USHORT nPage); - BOOL IsSwitchPageAllowed() const; + void ResetActualPage(); + void ResetActualLayer(); + BOOL SwitchPage(USHORT nPage); + BOOL IsSwitchPageAllowed() const; - BOOL GotoBookmark(const String& rBookmark); + BOOL GotoBookmark(const String& rBookmark); void MakeVisible(const Rectangle& rRect, ::Window& rWin); virtual void ReadFrameViewData(FrameView* pView); @@ -258,22 +258,22 @@ public: virtual ErrCode DoVerb(long nVerb); virtual BOOL ActivateObject(SdrOle2Obj* pObj, long nVerb); - void SetZoomOnPage( BOOL bZoom = TRUE ) { mbZoomOnPage = bZoom; } - BOOL IsZoomOnPage() { return mbZoomOnPage; } - void CheckLineTo (SfxRequest& rReq); - void FuTemp01(SfxRequest& rReq); - void FuTemp02(SfxRequest& rReq); - void FuTemp03(SfxRequest& rReq); - void FuTemp04(SfxRequest& rReq); - void SetChildWindowState( SfxItemSet& rSet ); + void SetZoomOnPage( BOOL bZoom = TRUE ) { mbZoomOnPage = bZoom; } + BOOL IsZoomOnPage() { return mbZoomOnPage; } + void CheckLineTo (SfxRequest& rReq); + void FuTemp01(SfxRequest& rReq); + void FuTemp02(SfxRequest& rReq); + void FuTemp03(SfxRequest& rReq); + void FuTemp04(SfxRequest& rReq); + void SetChildWindowState( SfxItemSet& rSet ); - void UpdateIMapDlg( SdrObject* pObj ); + void UpdateIMapDlg( SdrObject* pObj ); - void LockInput(); - void UnlockInput(); - BOOL IsInputLocked() const { return mnLockCount > 0UL; } + void LockInput(); + void UnlockInput(); + BOOL IsInputLocked() const { return mnLockCount > 0UL; } - USHORT GetCurPageId() { return( maTabControl.GetCurPageId() ); } + USHORT GetCurPageId() { return( maTabControl.GetCurPageId() ); } /** Show controls of the UI or hide them, depending on the given flag. Do not call this method directly. Call the method at ViewShellBase @@ -281,11 +281,11 @@ public: */ virtual void ShowUIControls (bool bVisible = true); - void ScannerEvent( const ::com::sun::star::lang::EventObject& rEventObject ); + void ScannerEvent( const ::com::sun::star::lang::EventObject& rEventObject ); bool IsLayerModeActive (void) const; - USHORT* GetSlotArray() const { return mpSlotArray; } + USHORT* GetSlotArray() const { return mpSlotArray; } virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow, USHORT nPage, USHORT nLayer ); @@ -360,8 +360,8 @@ public: void ModifyLayer( SdrLayer* pLayer, const String& rLayerName, const String& rLayerTitle, const String& rLayerDesc, bool bIsVisible, bool bIsLocked, bool bIsPrintable ); virtual css::uno::Reference<css::drawing::XDrawSubController> CreateSubController (void); - - DrawView* GetDrawView() const { return mpDrawView; } + + DrawView* GetDrawView() const { return mpDrawView; } /** Relocation to a new parent window is not supported for DrawViewShell objects so this method always returns <FALSE/>. @@ -369,22 +369,22 @@ public: virtual bool RelocateToParentWindow (::Window* pParentWindow); protected: - DrawView* mpDrawView; - SdPage* mpActualPage; - Rectangle maMarkRect; - Point maMousePos; - BOOL mbMousePosFreezed; - TabControl maTabControl; - EditMode meEditMode; - PageKind mePageKind; - BOOL mbZoomOnPage; - BOOL mbIsRulerDrag; - ULONG mnLockCount; - Timer maCloseTimer; - BOOL mbReadOnly; - USHORT* mpSlotArray; - - static BOOL mbPipette; + DrawView* mpDrawView; + SdPage* mpActualPage; + Rectangle maMarkRect; + Point maMousePos; + BOOL mbMousePosFreezed; + TabControl maTabControl; + EditMode meEditMode; + PageKind mePageKind; + BOOL mbZoomOnPage; + BOOL mbIsRulerDrag; + ULONG mnLockCount; + Timer maCloseTimer; + BOOL mbReadOnly; + USHORT* mpSlotArray; + + static BOOL mbPipette; DECL_LINK( ClipboardChanged, TransferableDataHelper* ); DECL_LINK( CloseHdl, Timer* pTimer ); @@ -392,8 +392,8 @@ protected: DECL_LINK( NameObjectHdl, AbstractSvxNameDialog* ); DECL_LINK( RenameSlideHdl, AbstractSvxNameDialog* ); - void DeleteActualPage(); - void DeleteActualLayer(); + void DeleteActualPage(); + void DeleteActualLayer(); virtual SvxRuler* CreateHRuler(::sd::Window* pWin, BOOL bIsFirst); virtual SvxRuler* CreateVRuler(::sd::Window* pWin); @@ -406,13 +406,13 @@ protected: void SetupPage( Size &rSize, long nLeft, long nRight, long nUpper, long nLower, BOOL bSize, BOOL bMargin, BOOL bScaleAll ); - USHORT GetIdBySubId( USHORT nSId ); - void MapSlot( USHORT nSId ); - void UpdateToolboxImages( SfxItemSet &rSet, BOOL bPermanent = TRUE ); - USHORT GetMappedSlot( USHORT nSId ); - USHORT GetArrayId( USHORT nSId ); + USHORT GetIdBySubId( USHORT nSId ); + void MapSlot( USHORT nSId ); + void UpdateToolboxImages( SfxItemSet &rSet, BOOL bPermanent = TRUE ); + USHORT GetMappedSlot( USHORT nSId ); + USHORT GetArrayId( USHORT nSId ); - void GetMenuStateSel(SfxItemSet& rSet); + void GetMenuStateSel(SfxItemSet& rSet); private: /** This flag controls whether the layer mode is active, i.e. the layer @@ -446,10 +446,10 @@ private: PageKind ePageKind, SdPage* pPage); - ::com::sun::star::uno::Reference< ::com::sun::star::scanner::XScannerManager > mxScannerManager; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > mxScannerListener; + ::com::sun::star::uno::Reference< ::com::sun::star::scanner::XScannerManager > mxScannerManager; + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > mxScannerListener; TransferableClipboardListener* mpClipEvtLstnr; - BOOL mbPastePossible; + BOOL mbPastePossible; virtual void Notify (SfxBroadcaster& rBC, const SfxHint& rHint); @@ -488,7 +488,7 @@ private: const Point& rMouseLocation); using ViewShell::Notify; - + ::std::auto_ptr< AnnotationManager > mpAnnotationManager; ::std::auto_ptr< ViewOverlayManager > mpViewOverlayManager; }; diff --git a/sd/source/ui/inc/EventMultiplexer.hxx b/sd/source/ui/inc/EventMultiplexer.hxx index 439cc733bcc7..79615390c394 100644 --- a/sd/source/ui/inc/EventMultiplexer.hxx +++ b/sd/source/ui/inc/EventMultiplexer.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,14 +48,14 @@ public: typedef sal_uInt32 EventId; /** The EventMultiplexer itself is being disposed. Called for a live EventMultiplexer. Removing a listener as response is not necessary, - though. + though. */ static const EventId EID_DISPOSING = 0x00000001; - + /** The selection in the center pane has changed. */ static const EventId EID_EDIT_VIEW_SELECTION = 0x00000002; - + /** The selection in the slide sorter has changed, regardless of whether the slide sorter is displayed in the left pane or the center pane. */ @@ -69,7 +69,7 @@ public: pane) has been removed. */ static const EventId EID_MAIN_VIEW_REMOVED = 0x00000010; - + /** A new ViewShell has been made the MainViewShell. */ static const EventId EID_MAIN_VIEW_ADDED = 0x00000020; @@ -102,7 +102,7 @@ public: /** Text editing in one of the shapes in the MainViewShell has started. */ static const EventId EID_BEGIN_TEXT_EDIT = 0x00000800; - + /** Text editing in one of the shapes in the MainViewShell has ended. */ static const EventId EID_END_TEXT_EDIT = 0x00001000; @@ -110,7 +110,7 @@ public: /** A UNO controller has been attached to the UNO frame. */ static const EventId EID_CONTROLLER_ATTACHED = 0x00002000; - + /** A UNO controller has been detached to the UNO frame. */ static const EventId EID_CONTROLLER_DETACHED = 0x00004000; @@ -120,7 +120,7 @@ public: static const EventId EID_SHAPE_CHANGED = 0x00008000; /** A shape has been inserted to a page. The page is available in the - user data. + user data. */ static const EventId EID_SHAPE_INSERTED = 0x00010000; @@ -157,7 +157,7 @@ public: When a listener is registered it can specify the events it wants to be informed of. This can be done with code like the following: - + mrViewShellBase.GetEventMultiplexer().AddEventListener ( LINK(this,MasterPagesSelector,EventMultiplexerListener), tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED @@ -187,7 +187,7 @@ public: be informed about. */ void AddEventListener ( - Link& rCallback, + Link& rCallback, EventMultiplexerEvent::EventId aEventTypeSet); /** Remove an event listener for the specified event types. @@ -198,7 +198,7 @@ public: for. */ void RemoveEventListener ( - Link& rCallback, + Link& rCallback, EventMultiplexerEvent::EventId aEventTypeSet = EID_FULL_SET); /** This method is used for out-of-line events. An event of the diff --git a/sd/source/ui/inc/FormShellManager.hxx b/sd/source/ui/inc/FormShellManager.hxx index 54b20ddfcfea..1e2ee86080a7 100644 --- a/sd/source/ui/inc/FormShellManager.hxx +++ b/sd/source/ui/inc/FormShellManager.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,7 +50,7 @@ class ViewShellBase; The form shell is moved above the view shell when the form shell is activated, i.e. the FormControlActivated handler is called. - + It is moved below the view shell when the main window of the main view shell is focused. diff --git a/sd/source/ui/inc/FrameView.hxx b/sd/source/ui/inc/FrameView.hxx index 857a1486d700..55a259581a98 100644 --- a/sd/source/ui/inc/FrameView.hxx +++ b/sd/source/ui/inc/FrameView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace sd { |* View fuer den MDIFrame |* \************************************************************************/ -class FrameView +class FrameView : public SdrView { public: @@ -121,7 +121,7 @@ public: document is loaded. */ void SetViewShEditModeOnLoad (const EditMode eMode); - + /** Return the value of the edit mode as it was when the document was loaded. */ @@ -135,14 +135,14 @@ public: { mbQuickEdit = bQEdit; } BOOL IsQuickEdit() const { return mbQuickEdit; } - void SetBigHandles( BOOL bOn = TRUE ) { mbBigHandles = bOn; } - BOOL IsBigHandles() const { return mbBigHandles; } + void SetBigHandles( BOOL bOn = TRUE ) { mbBigHandles = bOn; } + BOOL IsBigHandles() const { return mbBigHandles; } - void SetDoubleClickTextEdit( BOOL bOn = TRUE ) { mbDoubleClickTextEdit = bOn; } - BOOL IsDoubleClickTextEdit() const { return mbDoubleClickTextEdit; } + void SetDoubleClickTextEdit( BOOL bOn = TRUE ) { mbDoubleClickTextEdit = bOn; } + BOOL IsDoubleClickTextEdit() const { return mbDoubleClickTextEdit; } - void SetClickChangeRotation( BOOL bOn = TRUE ) { mbClickChangeRotation = bOn; } - BOOL IsClickChangeRotation() const { return mbClickChangeRotation; } + void SetClickChangeRotation( BOOL bOn = TRUE ) { mbClickChangeRotation = bOn; } + BOOL IsClickChangeRotation() const { return mbClickChangeRotation; } /** Remember the type of the view shell that was (or soon will be) previously associated with this frame view. @@ -163,7 +163,7 @@ public: void SetViewShellTypeOnLoad (ViewShell::ShellType eType); ViewShell::ShellType GetViewShellTypeOnLoad (void) const; - + void SetPresentationViewShellId(USHORT nId) { mnPresViewShellId = nId; } USHORT GetPresentationViewShellId() const { return mnPresViewShellId; } @@ -187,41 +187,41 @@ public: virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); private: - USHORT mnRefCount; - VirtualDevice* mpVDev; - BOOL mbRuler; - SetOfByte maVisibleLayers; - SetOfByte maLockedLayers; - SetOfByte maPrintableLayers; + USHORT mnRefCount; + VirtualDevice* mpVDev; + BOOL mbRuler; + SetOfByte maVisibleLayers; + SetOfByte maLockedLayers; + SetOfByte maPrintableLayers; SdrHelpLineList maStandardHelpLines; SdrHelpLineList maNotesHelpLines; SdrHelpLineList maHandoutHelpLines; - BOOL mbNoColors; // Gliederungsmodus - BOOL mbNoAttribs; // Gliederungsmodus - Rectangle maVisArea; // Sichtbarer Bereich - PageKind mePageKind; // Seitentyp (Standard, Notizen, Handzettel) - USHORT mnSelectedPage; // Selektierte Seite - PageKind mePageKindOnLoad; - USHORT mnSelectedPageOnLoad; + BOOL mbNoColors; // Gliederungsmodus + BOOL mbNoAttribs; // Gliederungsmodus + Rectangle maVisArea; // Sichtbarer Bereich + PageKind mePageKind; // Seitentyp (Standard, Notizen, Handzettel) + USHORT mnSelectedPage; // Selektierte Seite + PageKind mePageKindOnLoad; + USHORT mnSelectedPageOnLoad; EditMode meStandardEditMode; // Editmode im Zeichenmodus (Page/MasterPage) EditMode meNotesEditMode; // Editmode im Notizen-Modus (Page/MasterPage) EditMode meHandoutEditMode; // Editmode im Handzettel-Modus (Page/MasterPage) EditMode meEditModeOnLoad; - BOOL mbLayerMode; // Layer an/aus - BOOL mbQuickEdit; // QuickEdit an/aus - BOOL mbBigHandles; // Grosse Handles - BOOL mbDoubleClickTextEdit; // Textmodus nach Doppelklick - BOOL mbClickChangeRotation; // Einfachklick wechselt Selektions-/Rotationsmodus - USHORT mnPresViewShellId; // ViewShell aus der die Pres. gestartet wurde - USHORT mnSlotId; // SlotId, welche initial ausgefuehrt wird + BOOL mbLayerMode; // Layer an/aus + BOOL mbQuickEdit; // QuickEdit an/aus + BOOL mbBigHandles; // Grosse Handles + BOOL mbDoubleClickTextEdit; // Textmodus nach Doppelklick + BOOL mbClickChangeRotation; // Einfachklick wechselt Selektions-/Rotationsmodus + USHORT mnPresViewShellId; // ViewShell aus der die Pres. gestartet wurde + USHORT mnSlotId; // SlotId, welche initial ausgefuehrt wird USHORT mnSlidesPerRow; // Dias pro Reihe auf dem Diatisch - ULONG mnDrawMode; // Drawmode fuer das normale Fenster + ULONG mnDrawMode; // Drawmode fuer das normale Fenster double mnTabCtrlPercent; /** Remember whether the navigator shows all shapes (<TRUE/>) or only the names ones (<FALSE/>). Not persistent. */ bool mbIsNavigatorShowingAllShapes; - + /** The type of the previous view shell. The (default) value ViewShell::ST_NONE indicates that there was no previous view shell. Note that this value is used only temporarily and is not saved or diff --git a/sd/source/ui/inc/GraphicDocShell.hxx b/sd/source/ui/inc/GraphicDocShell.hxx index 4e36f7447862..7f8195bb5aa3 100644 --- a/sd/source/ui/inc/GraphicDocShell.hxx +++ b/sd/source/ui/inc/GraphicDocShell.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/sd/source/ui/inc/GraphicObjectBar.hxx b/sd/source/ui/inc/GraphicObjectBar.hxx index cbb3f212e6c3..499585453ce7 100644 --- a/sd/source/ui/inc/GraphicObjectBar.hxx +++ b/sd/source/ui/inc/GraphicObjectBar.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 View; class ViewShell; -class GraphicObjectBar +class GraphicObjectBar : public SfxShell { public: @@ -49,16 +49,16 @@ public: GraphicObjectBar (ViewShell* pSdViewShell, ::sd::View* pSdView); virtual ~GraphicObjectBar (void); - void GetAttrState( SfxItemSet& rSet ); - void Execute( SfxRequest& rReq ); + void GetAttrState( SfxItemSet& rSet ); + void Execute( SfxRequest& rReq ); - void GetFilterState( SfxItemSet& rSet ); - void ExecuteFilter( SfxRequest& rReq ); + void GetFilterState( SfxItemSet& rSet ); + void ExecuteFilter( SfxRequest& rReq ); protected: ::sd::View* mpView; - ViewShell* mpViewSh; - USHORT nMappedSlotFilter; + ViewShell* mpViewSh; + USHORT nMappedSlotFilter; }; diff --git a/sd/source/ui/inc/GraphicViewShell.hxx b/sd/source/ui/inc/GraphicViewShell.hxx index eda0fbf2ecdf..c6bbd17254f7 100644 --- a/sd/source/ui/inc/GraphicViewShell.hxx +++ b/sd/source/ui/inc/GraphicViewShell.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ public: one view shell to the next. */ GraphicViewShell ( - SfxViewFrame* pFrame, + SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, ::Window* pParentWindow, FrameView* pFrameView = NULL); diff --git a/sd/source/ui/inc/GraphicViewShellBase.hxx b/sd/source/ui/inc/GraphicViewShellBase.hxx index c7f6417395da..cf0d5c182275 100644 --- a/sd/source/ui/inc/GraphicViewShellBase.hxx +++ b/sd/source/ui/inc/GraphicViewShellBase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/sd/source/ui/inc/ImpressViewShellBase.hxx b/sd/source/ui/inc/ImpressViewShellBase.hxx index 852e95a4dc23..62bf183dfcd3 100644 --- a/sd/source/ui/inc/ImpressViewShellBase.hxx +++ b/sd/source/ui/inc/ImpressViewShellBase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/sd/source/ui/inc/LayerDialog.hrc b/sd/source/ui/inc/LayerDialog.hrc index 88323539fb99..74e29a789761 100644 --- a/sd/source/ui/inc/LayerDialog.hrc +++ b/sd/source/ui/inc/LayerDialog.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 @@ -26,4 +26,4 @@ ************************************************************************/ #define FLT_WIN_LAYER_DIALOG 791 -#define TB_LAYERS 1 +#define TB_LAYERS 1 diff --git a/sd/source/ui/inc/LayerDialogChildWindow.hxx b/sd/source/ui/inc/LayerDialogChildWindow.hxx index 71c42d81a419..3b57242c7189 100644 --- a/sd/source/ui/inc/LayerDialogChildWindow.hxx +++ b/sd/source/ui/inc/LayerDialogChildWindow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,8 +41,8 @@ class LayerDialogChildWindow { public: LayerDialogChildWindow ( - ::Window*, - USHORT, + ::Window*, + USHORT, SfxBindings*, SfxChildWinInfo*); virtual ~LayerDialogChildWindow (void); diff --git a/sd/source/ui/inc/LayerDialogContent.hxx b/sd/source/ui/inc/LayerDialogContent.hxx index e9910284c19d..738c4f2a428c 100644 --- a/sd/source/ui/inc/LayerDialogContent.hxx +++ b/sd/source/ui/inc/LayerDialogContent.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,14 +37,14 @@ namespace sd { class ViewShellBase; -class LayerDialogContent +class LayerDialogContent : public SfxDockingWindow { public: LayerDialogContent ( - SfxBindings* pBindings, + SfxBindings* pBindings, SfxChildWindow *pCW, - ::Window* pParent, + ::Window* pParent, const SdResId& rSdResId, ViewShellBase& rBase); virtual ~LayerDialogContent (void); diff --git a/sd/source/ui/inc/LayerTabBar.hxx b/sd/source/ui/inc/LayerTabBar.hxx index 81477d34b88e..233220805306 100644 --- a/sd/source/ui/inc/LayerTabBar.hxx +++ b/sd/source/ui/inc/LayerTabBar.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,15 +43,15 @@ namespace sd { class DrawViewShell; class LayerTabBar - : public TabBar, + : public TabBar, public DropTargetHelper { public: LayerTabBar ( - DrawViewShell* pDrViewSh, + DrawViewShell* pDrViewSh, ::Window* pParent); LayerTabBar ( - DrawViewShell* pDrViewSh, + DrawViewShell* pDrViewSh, ::Window* pParent, const ResId& rResId); virtual ~LayerTabBar (void); @@ -72,21 +72,21 @@ protected: DrawViewShell* pDrViewSh; // TabBar - virtual void Select(); - virtual void DoubleClick(); - virtual void MouseButtonDown(const MouseEvent& rMEvt); - - virtual void Command(const CommandEvent& rCEvt); - - virtual long StartRenaming(); - virtual long AllowRenaming(); - virtual void EndRenaming(); - - virtual void ActivatePage(); + virtual void Select(); + virtual void DoubleClick(); + virtual void MouseButtonDown(const MouseEvent& rMEvt); + + virtual void Command(const CommandEvent& rCEvt); + + virtual long StartRenaming(); + virtual long AllowRenaming(); + virtual void EndRenaming(); + + virtual void ActivatePage(); // DropTargetHelper - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); }; } // end of namespace sd diff --git a/sd/source/ui/inc/MasterPageObserver.hxx b/sd/source/ui/inc/MasterPageObserver.hxx index 4526a1cd1530..821d2703f846 100644 --- a/sd/source/ui/inc/MasterPageObserver.hxx +++ b/sd/source/ui/inc/MasterPageObserver.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,7 +64,7 @@ public: document. */ void UnregisterDocument (SdDrawDocument& rDocument); - + /** Add a listener that is informed of master pages that are newly assigned to slides or become unassigned. @param rEventListener @@ -118,13 +118,13 @@ public: EventType meType; SdDrawDocument& mrDocument; const String& mrMasterPageName; - + MasterPageObserverEvent ( EventType eType, SdDrawDocument& rDocument, const String& rMasterPageName) - : meType(eType), - mrDocument(rDocument), + : meType(eType), + mrDocument(rDocument), mrMasterPageName(rMasterPageName) {} diff --git a/sd/source/ui/inc/MediaObjectBar.hxx b/sd/source/ui/inc/MediaObjectBar.hxx index b384918544d8..67384db6e924 100644 --- a/sd/source/ui/inc/MediaObjectBar.hxx +++ b/sd/source/ui/inc/MediaObjectBar.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 View; class ViewShell; -class MediaObjectBar +class MediaObjectBar : public SfxShell { public: @@ -49,12 +49,12 @@ public: MediaObjectBar (ViewShell* pSdViewShell, ::sd::View* pSdView); virtual ~MediaObjectBar (void); - void GetState( SfxItemSet& rSet ); - void Execute( SfxRequest& rReq ); + void GetState( SfxItemSet& rSet ); + void Execute( SfxRequest& rReq ); protected: ::sd::View* mpView; - ViewShell* mpViewSh; + ViewShell* mpViewSh; }; } // end of namespace sd diff --git a/sd/source/ui/inc/MutexOwner.hxx b/sd/source/ui/inc/MutexOwner.hxx index 3667475bec9e..b7d9fdea3b24 100644 --- a/sd/source/ui/inc/MutexOwner.hxx +++ b/sd/source/ui/inc/MutexOwner.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace sd { satisfy some helper classes from cppuhelper who expect a mutex as argument to their constructor. */ -class MutexOwner +class MutexOwner { protected: mutable ::osl::Mutex maMutex; diff --git a/sd/source/ui/inc/NavigatorChildWindow.hxx b/sd/source/ui/inc/NavigatorChildWindow.hxx index 7eca616dc332..00a2628d2aaa 100644 --- a/sd/source/ui/inc/NavigatorChildWindow.hxx +++ b/sd/source/ui/inc/NavigatorChildWindow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,13 +42,13 @@ namespace sd { |* \************************************************************************/ -class NavigatorChildWindow +class NavigatorChildWindow : public SfxChildWindowContext { public: NavigatorChildWindow ( - ::Window*, - USHORT, + ::Window*, + USHORT, SfxBindings*, SfxChildWinInfo*); diff --git a/sd/source/ui/inc/NotesChildWindow.hrc b/sd/source/ui/inc/NotesChildWindow.hrc index c25109d81a22..30eeb8ffd112 100644 --- a/sd/source/ui/inc/NotesChildWindow.hrc +++ b/sd/source/ui/inc/NotesChildWindow.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/sd/source/ui/inc/NotesChildWindow.hxx b/sd/source/ui/inc/NotesChildWindow.hxx index fc2f8151e2fe..65f59fb167d3 100644 --- a/sd/source/ui/inc/NotesChildWindow.hxx +++ b/sd/source/ui/inc/NotesChildWindow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ class NotesChildWindow public: NotesChildWindow (::Window*, USHORT, SfxBindings*, SfxChildWinInfo*); virtual ~NotesChildWindow (void); - + SFX_DECL_CHILDWINDOW (NotesChildWindow); }; diff --git a/sd/source/ui/inc/OutlineBulletDlg.hxx b/sd/source/ui/inc/OutlineBulletDlg.hxx index 83e452532086..60e766e12199 100644 --- a/sd/source/ui/inc/OutlineBulletDlg.hxx +++ b/sd/source/ui/inc/OutlineBulletDlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 View; |* Bullet-Tab-Dialog |* \************************************************************************/ -class OutlineBulletDlg +class OutlineBulletDlg : public SfxTabDialog { public: OutlineBulletDlg ( - ::Window* pParent, - const SfxItemSet* pAttr, + ::Window* pParent, + const SfxItemSet* pAttr, ::sd::View* pView ); virtual ~OutlineBulletDlg (void); @@ -60,10 +60,10 @@ protected: private: using SfxTabDialog::GetOutputItemSet; - SfxItemSet aInputSet; - SfxItemSet *pOutputSet; - BOOL bTitle; - ::sd::View *pSdView; + SfxItemSet aInputSet; + SfxItemSet *pOutputSet; + BOOL bTitle; + ::sd::View *pSdView; }; } // end of namespace sd diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx index 6f1448fec799..b6a372f9fe96 100644 --- a/sd/source/ui/inc/OutlineView.hxx +++ b/sd/source/ui/inc/OutlineView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,12 +62,12 @@ static const int MAX_OUTLINERVIEWS = 4; |* \************************************************************************/ -class OutlineView +class OutlineView : public ::sd::View { friend class OutlineViewModelChangeGuard; public: - OutlineView (DrawDocShell* pDocSh, + OutlineView (DrawDocShell* pDocSh, ::Window* pWindow, OutlineViewShell* pOutlineViewSh); ~OutlineView (void); @@ -82,30 +82,30 @@ public: TYPEINFO(); - SdrTextObj* GetTitleTextObject(SdrPage* pPage); - SdrTextObj* GetOutlineTextObject(SdrPage* pPage); + SdrTextObj* GetTitleTextObject(SdrPage* pPage); + SdrTextObj* GetOutlineTextObject(SdrPage* pPage); - SdrTextObj* CreateTitleTextObject(SdPage* pPage); - SdrTextObj* CreateOutlineTextObject(SdPage* pPage); + SdrTextObj* CreateTitleTextObject(SdPage* pPage); + SdrTextObj* CreateOutlineTextObject(SdPage* pPage); virtual void AddWindowToPaintView(OutputDevice* pWin); virtual void DeleteWindowFromPaintView(OutputDevice* pWin); - OutlinerView* GetViewByWindow (::Window* pWin) const; + OutlinerView* GetViewByWindow (::Window* pWin) const; SdrOutliner* GetOutliner() { return(mpOutliner) ; } - Paragraph* GetPrevTitle(const Paragraph* pPara); - Paragraph* GetNextTitle(const Paragraph* pPara); - SdPage* GetActualPage(); - SdPage* GetPageForParagraph( Paragraph* pPara ); - Paragraph* GetParagraphForPage( ::Outliner* pOutl, SdPage* pPage ); + Paragraph* GetPrevTitle(const Paragraph* pPara); + Paragraph* GetNextTitle(const Paragraph* pPara); + SdPage* GetActualPage(); + SdPage* GetPageForParagraph( Paragraph* pPara ); + Paragraph* GetParagraphForPage( ::Outliner* pOutl, SdPage* pPage ); /** selects the paragraph for the given page at the outliner view*/ - void SetActualPage( SdPage* pActual ); + void SetActualPage( SdPage* pActual ); virtual void Paint (const Rectangle& rRect, ::sd::Window* pWin); virtual void AdjustPosSizePixel( - const Point &rPos, + const Point &rPos, const Size &rSize, ::sd::Window* pWindow); @@ -122,15 +122,15 @@ public: DECL_LINK( EndDropHdl, void * ); DECL_LINK( PaintingFirstLineHdl, PaintFirstLineInfo* ); - ULONG GetPaperWidth() const { return 2*21000; } // DIN A4 Breite + ULONG GetPaperWidth() const { return 2*21000; } // DIN A4 Breite - BOOL PrepareClose(BOOL bUI = TRUE); + BOOL PrepareClose(BOOL bUI = TRUE); - virtual BOOL GetAttributes( SfxItemSet& rTargetSet, BOOL bOnlyHardAttr=FALSE ) const; - virtual BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll = FALSE); + virtual BOOL GetAttributes( SfxItemSet& rTargetSet, BOOL bOnlyHardAttr=FALSE ) const; + virtual BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll = FALSE); -// virtual BOOL HasMarkedObjUnused() const; - void FillOutliner(); +// virtual BOOL HasMarkedObjUnused() const; + void FillOutliner(); void SetLinks(); void ResetLinks() const; @@ -139,16 +139,16 @@ public: void SetSelectedPages(); virtual sal_Int8 AcceptDrop ( - const AcceptDropEvent& rEvt, - DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, + const AcceptDropEvent& rEvt, + DropTargetHelper& rTargetHelper, + ::sd::Window* pTargetWindow = NULL, + USHORT nPage = SDRPAGE_NOTFOUND, USHORT nLayer = SDRPAGE_NOTFOUND); virtual sal_Int8 ExecuteDrop ( - const ExecuteDropEvent& rEvt, - DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, + const ExecuteDropEvent& rEvt, + DropTargetHelper& rTargetHelper, + ::sd::Window* pTargetWindow = NULL, + USHORT nPage = SDRPAGE_NOTFOUND, USHORT nLayer = SDRPAGE_NOTFOUND); @@ -174,7 +174,7 @@ protected: virtual void OnEndPasteOrDrop( PasteOrDropInfos* pInfos ); private: - /** call this method before you do anything that can modify the outliner + /** call this method before you do anything that can modify the outliner and or the drawing document model. It will create needed undo actions */ void BeginModelChange(); @@ -188,19 +188,19 @@ private: /** updates all changes in the outliner model to the draw model */ void UpdateDocument(); - OutlineViewShell* mpOutlineViewShell; - SdrOutliner* mpOutliner; - OutlinerView* mpOutlinerView[MAX_OUTLINERVIEWS]; + OutlineViewShell* mpOutlineViewShell; + SdrOutliner* mpOutliner; + OutlinerView* mpOutlinerView[MAX_OUTLINERVIEWS]; - List* mpOldParaOrder; - List* mpSelectedParas; + List* mpOldParaOrder; + List* mpSelectedParas; - USHORT mnPagesToProcess; // fuer die Fortschrittsanzeige - USHORT mnPagesProcessed; + USHORT mnPagesToProcess; // fuer die Fortschrittsanzeige + USHORT mnPagesProcessed; - BOOL mbFirstPaint; + BOOL mbFirstPaint; - SfxProgress* mpProgress; + SfxProgress* mpProgress; /** stores the last used high contrast mode. this is changed in onUpdateStyleSettings() @@ -213,7 +213,7 @@ private: Color maDocColor; /** updates the high contrast settings and document color if they changed. - @param bForceUpdate forces the method to set all style settings + @param bForceUpdate forces the method to set all style settings */ void onUpdateStyleSettings( bool bForceUpdate = false ); diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx index 31eb6d124fe6..451dd4632c36 100644 --- a/sd/source/ui/inc/OutlineViewShell.hxx +++ b/sd/source/ui/inc/OutlineViewShell.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -92,11 +92,11 @@ public: virtual void Activate( BOOL IsMDIActivate ); virtual void Deactivate( BOOL IsMDIActivate ); - virtual SdPage* GetActualPage(); + virtual SdPage* GetActualPage(); /// inherited from sd::ViewShell - virtual SdPage* getCurrentPage() const; - + virtual SdPage* getCurrentPage() const; + /** Return a string that describes the currently selected pages. */ String GetPageRangeString (void); @@ -117,7 +117,7 @@ public: virtual void SetZoom(long nZoom); virtual void SetZoomRect(const Rectangle& rZoomRect); - virtual String GetSelectionText( BOOL bCompleteWords = FALSE ); + virtual String GetSelectionText( BOOL bCompleteWords = FALSE ); virtual BOOL HasSelection( BOOL bText = TRUE ) const; void Execute(SfxRequest& rReq); @@ -170,9 +170,9 @@ protected: private: OutlineView* pOlView; - SdPage* pLastPage; // Zur performanten Aufbereitung der Preview + SdPage* pLastPage; // Zur performanten Aufbereitung der Preview TransferableClipboardListener* pClipEvtLstnr; - BOOL bPastePossible; + BOOL bPastePossible; bool mbInitialized; void Construct (DrawDocShell* pDocSh); diff --git a/sd/source/ui/inc/OutlineViewShellBase.hxx b/sd/source/ui/inc/OutlineViewShellBase.hxx index 2f82dd271420..000426a57d27 100644 --- a/sd/source/ui/inc/OutlineViewShellBase.hxx +++ b/sd/source/ui/inc/OutlineViewShellBase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/sd/source/ui/inc/OutlinerIteratorImpl.hxx b/sd/source/ui/inc/OutlinerIteratorImpl.hxx index cf667909a8ac..6b62b4489a35 100644 --- a/sd/source/ui/inc/OutlinerIteratorImpl.hxx +++ b/sd/source/ui/inc/OutlinerIteratorImpl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ class SdDrawDocument; class SdPage; class SdrObjListIter; -namespace sd { +namespace sd { class ViewShell; @@ -52,7 +52,7 @@ class IteratorImplBase; */ class IteratorImplBase { -public: +public: /** The constructor stores the given arguments to be used by the derived classes. @param pDocument @@ -141,14 +141,14 @@ protected: <p>For documentation of the methods please refere to the base class <type>IteratorImplBase</type>.</p> */ -class SelectionIteratorImpl +class SelectionIteratorImpl : public IteratorImplBase { public: SelectionIteratorImpl ( const ::std::vector< SdrObjectWeakRef >& rObjectList, sal_Int32 nObjectIndex, - SdDrawDocument* pDocument, + SdDrawDocument* pDocument, const ::boost::weak_ptr<ViewShell>& rpViewShellWeak, bool bDirectionIsForward); SelectionIteratorImpl (const SelectionIteratorImpl& rObject); @@ -172,7 +172,7 @@ private: @return Returns <TRUE/> when both iterators point to the same object. */ - virtual bool IsEqual (const IteratorImplBase& rIterator, IteratorType aType) const; + virtual bool IsEqual (const IteratorImplBase& rIterator, IteratorType aType) const; IteratorImplBase& operator= (const IteratorImplBase& rIterator); }; @@ -190,16 +190,16 @@ class ViewIteratorImpl : public IteratorImplBase { public: ViewIteratorImpl ( - sal_Int32 nPageIndex, - SdDrawDocument* pDocument, + sal_Int32 nPageIndex, + SdDrawDocument* pDocument, const ::boost::weak_ptr<ViewShell>& rpViewShellWeak, bool bDirectionIsForward); ViewIteratorImpl ( - sal_Int32 nPageIndex, - SdDrawDocument* pDocument, + sal_Int32 nPageIndex, + SdDrawDocument* pDocument, const ::boost::weak_ptr<ViewShell>& rpViewShellWeak, - bool bDirectionIsForward, - PageKind ePageKind, + bool bDirectionIsForward, + PageKind ePageKind, EditMode eEditMode); virtual ~ViewIteratorImpl (void); @@ -250,9 +250,9 @@ class DocumentIteratorImpl : public ViewIteratorImpl public: DocumentIteratorImpl ( sal_Int32 nPageIndex, - PageKind ePageKind, + PageKind ePageKind, EditMode eEditMode, - SdDrawDocument* pDocument, + SdDrawDocument* pDocument, const ::boost::weak_ptr<ViewShell>& rpViewShellWeak, bool bDirectionIsForward); virtual ~DocumentIteratorImpl (void); diff --git a/sd/source/ui/inc/PaneChildWindows.hxx b/sd/source/ui/inc/PaneChildWindows.hxx index 1378d0afc3ed..552d149365b4 100644 --- a/sd/source/ui/inc/PaneChildWindows.hxx +++ b/sd/source/ui/inc/PaneChildWindows.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 PaneChildWindow public: PaneChildWindow ( ::Window* pParentWindow, - USHORT nId, - SfxBindings* pBindings, + USHORT nId, + SfxBindings* pBindings, SfxChildWinInfo* pInfo, const USHORT nDockWinTitleResId, const USHORT nTitleBarResId, @@ -85,8 +85,8 @@ class ToolPanelChildWindow :public PaneChildWindow public: ToolPanelChildWindow( ::Window* i_pParentWindow, - USHORT i_nId, - SfxBindings* i_pBindings, + USHORT i_nId, + SfxBindings* i_pBindings, SfxChildWinInfo* i_pChildWindowInfo ); SFX_DECL_CHILDWINDOW( ToolPanelChildWindow ); diff --git a/sd/source/ui/inc/PaneDockingWindow.hrc b/sd/source/ui/inc/PaneDockingWindow.hrc index eb7c23c075ec..deb2de3613fa 100755 --- a/sd/source/ui/inc/PaneDockingWindow.hrc +++ b/sd/source/ui/inc/PaneDockingWindow.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/sd/source/ui/inc/PaneDockingWindow.hxx b/sd/source/ui/inc/PaneDockingWindow.hxx index 8d9c928708e1..16627f6878cf 100644 --- a/sd/source/ui/inc/PaneDockingWindow.hxx +++ b/sd/source/ui/inc/PaneDockingWindow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/sd/source/ui/inc/PaneShells.hxx b/sd/source/ui/inc/PaneShells.hxx index 28e516267c45..a2e812439414 100644 --- a/sd/source/ui/inc/PaneShells.hxx +++ b/sd/source/ui/inc/PaneShells.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace sd { /** Shell that displays the left pane for Impress. The shell does not do - anything else and has especially no slots. + anything else and has especially no slots. */ -class LeftImpressPaneShell +class LeftImpressPaneShell : public SfxShell { public: @@ -57,9 +57,9 @@ public: /** Shell that displays the left pane for Draw. The shell does not do - anything else and has especially no slots. + anything else and has especially no slots. */ -class LeftDrawPaneShell +class LeftDrawPaneShell : public SfxShell { public: diff --git a/sd/source/ui/inc/PresentationViewShell.hxx b/sd/source/ui/inc/PresentationViewShell.hxx index 4d787708a00f..dcc1768254dd 100644 --- a/sd/source/ui/inc/PresentationViewShell.hxx +++ b/sd/source/ui/inc/PresentationViewShell.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 PresentationViewShell : public DrawViewShell { public: TYPEINFO(); - + SFX_DECL_VIEWFACTORY(PresViewShell); SFX_DECL_INTERFACE( SD_IF_SDPRESVIEWSHELL ) - + PresentationViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, ::Window* pParentWindow, FrameView* pFrameView = NULL); virtual ~PresentationViewShell (void); @@ -66,7 +66,7 @@ protected: private: Rectangle maOldVisArea; - + virtual void Activate (BOOL bIsMDIActivate); virtual void Paint (const Rectangle& rRect, ::sd::Window* pWin); }; diff --git a/sd/source/ui/inc/PresentationViewShellBase.hxx b/sd/source/ui/inc/PresentationViewShellBase.hxx index 8ecde3d1649f..8fdd04380fb8 100644 --- a/sd/source/ui/inc/PresentationViewShellBase.hxx +++ b/sd/source/ui/inc/PresentationViewShellBase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/sd/source/ui/inc/PreviewRenderer.hxx b/sd/source/ui/inc/PreviewRenderer.hxx index 38830c4ccdaa..2db35ea5a988 100644 --- a/sd/source/ui/inc/PreviewRenderer.hxx +++ b/sd/source/ui/inc/PreviewRenderer.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -83,7 +83,7 @@ public: rendered in high contrast mode. */ Image RenderPage ( - const SdPage* pPage, + const SdPage* pPage, const sal_Int32 nWidth, const String& sSubstitutionText, const bool bObeyHighContrastMode = true); @@ -104,7 +104,7 @@ public: rendered in high contrast mode. */ Image RenderPage ( - const SdPage* pPage, + const SdPage* pPage, const Size aPreviewPixelSize, const String& sSubstitutionText, const bool bObeyHighContrastMode = true); @@ -117,7 +117,7 @@ public: Image RenderSubstitution ( const Size& rPreviewPixelSize, const String& sSubstitutionText); - + /** Scale the given bitmap by keeping its aspect ratio to the desired width. Add a frame to it afterwards. */ diff --git a/sd/source/ui/inc/Ruler.hxx b/sd/source/ui/inc/Ruler.hxx index f278c525f22f..fb8c9515ae84 100644 --- a/sd/source/ui/inc/Ruler.hxx +++ b/sd/source/ui/inc/Ruler.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 Window; |* \************************************************************************/ -class Ruler +class Ruler : public SvxRuler { public: Ruler ( - DrawViewShell& rViewSh, - ::Window* pParent, + DrawViewShell& rViewSh, + ::Window* pParent, ::sd::Window* pWin, - USHORT nRulerFlags, + USHORT nRulerFlags, SfxBindings& rBindings, WinBits nWinStyle); virtual ~Ruler (void); @@ -71,10 +71,10 @@ protected: RulerCtrlItem* pCtrlItem; BOOL bHorz; - virtual void MouseButtonDown(const MouseEvent& rMEvt); - virtual void MouseButtonUp(const MouseEvent& rMEvt); - virtual void MouseMove(const MouseEvent& rMEvt); - virtual void Command(const CommandEvent& rCEvt); + virtual void MouseButtonDown(const MouseEvent& rMEvt); + virtual void MouseButtonUp(const MouseEvent& rMEvt); + virtual void MouseMove(const MouseEvent& rMEvt); + virtual void Command(const CommandEvent& rCEvt); virtual void ExtraDown(); }; diff --git a/sd/source/ui/inc/SdUnoDrawView.hxx b/sd/source/ui/inc/SdUnoDrawView.hxx index f0c835f234cf..ebd0791974fa 100644 --- a/sd/source/ui/inc/SdUnoDrawView.hxx +++ b/sd/source/ui/inc/SdUnoDrawView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,7 +50,7 @@ class DrawViewShell; /** This class implements the DrawViewShell specific part of the controller. */ -class SdUnoDrawView +class SdUnoDrawView : private cppu::BaseMutex, public DrawSubControllerInterfaceBase { @@ -62,34 +62,34 @@ public: virtual ~SdUnoDrawView (void) throw(); // XSelectionSupplier - + virtual sal_Bool SAL_CALL select ( const css::uno::Any& aSelection) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException); - + virtual css::uno::Any SAL_CALL getSelection (void) throw(css::uno::RuntimeException); - + virtual void SAL_CALL addSelectionChangeListener ( const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) throw(css::uno::RuntimeException); - + virtual void SAL_CALL removeSelectionChangeListener ( const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) throw(css::uno::RuntimeException); - + // XDrawView - + virtual void SAL_CALL setCurrentPage ( const css::uno::Reference<css::drawing::XDrawPage >& xPage) throw(css::uno::RuntimeException); - + virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage (void) throw(css::uno::RuntimeException); - + // XFastPropertySet virtual void SAL_CALL setFastPropertyValue ( @@ -100,13 +100,13 @@ public: css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException); - + virtual css::uno::Any SAL_CALL getFastPropertyValue ( sal_Int32 nHandle) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); - + // XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/inc/SdUnoOutlineView.hxx b/sd/source/ui/inc/SdUnoOutlineView.hxx index fd2bb2b66201..ad4bfbd9ca91 100644 --- a/sd/source/ui/inc/SdUnoOutlineView.hxx +++ b/sd/source/ui/inc/SdUnoOutlineView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ class View; /** This class implements the OutlineViewShell specific part of the controller. */ -class SdUnoOutlineView +class SdUnoOutlineView : private cppu::BaseMutex, public DrawSubControllerInterfaceBase { @@ -67,29 +67,29 @@ public: const css::uno::Any& aSelection) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException); - + virtual css::uno::Any SAL_CALL getSelection (void) throw(css::uno::RuntimeException); - + virtual void SAL_CALL addSelectionChangeListener ( const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) throw(css::uno::RuntimeException); - + virtual void SAL_CALL removeSelectionChangeListener ( const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) throw(css::uno::RuntimeException); // XDrawView - + virtual void SAL_CALL setCurrentPage ( const css::uno::Reference<css::drawing::XDrawPage >& xPage) throw(css::uno::RuntimeException); - + virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage (void) throw(css::uno::RuntimeException); - + // XFastPropertySet virtual void SAL_CALL setFastPropertyValue ( @@ -100,7 +100,7 @@ public: css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException); - + virtual css::uno::Any SAL_CALL getFastPropertyValue ( sal_Int32 nHandle) throw(css::beans::UnknownPropertyException, @@ -108,10 +108,10 @@ public: css::uno::RuntimeException); // lang::XEventListener - virtual void SAL_CALL + virtual void SAL_CALL disposing (const ::com::sun::star::lang::EventObject& rEventObject) throw (::com::sun::star::uno::RuntimeException); - + // XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/inc/SdUnoSlideView.hxx b/sd/source/ui/inc/SdUnoSlideView.hxx index ef14ddf636ab..c44831c784ac 100644 --- a/sd/source/ui/inc/SdUnoSlideView.hxx +++ b/sd/source/ui/inc/SdUnoSlideView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ class View; /** This class implements the SlideSorter specific part of the controller. */ -class SdUnoSlideView +class SdUnoSlideView : private cppu::BaseMutex, public DrawSubControllerInterfaceBase { @@ -69,25 +69,25 @@ public: virtual sal_Bool SAL_CALL select (const ::com::sun::star::uno::Any& aSelection) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - + virtual ::com::sun::star::uno::Any SAL_CALL getSelection (void) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addSelectionChangeListener ( const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) throw(css::uno::RuntimeException); - + virtual void SAL_CALL removeSelectionChangeListener ( const css::uno::Reference<css::view::XSelectionChangeListener>& rxListener) throw(css::uno::RuntimeException); - + // XDrawView - + virtual void SAL_CALL setCurrentPage ( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage) throw(::com::sun::star::uno::RuntimeException); - + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL getCurrentPage (void) throw(::com::sun::star::uno::RuntimeException); @@ -103,7 +103,7 @@ public: css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException); - + virtual css::uno::Any SAL_CALL getFastPropertyValue ( sal_Int32 nHandle) throw(css::beans::UnknownPropertyException, diff --git a/sd/source/ui/inc/ShellFactory.hxx b/sd/source/ui/inc/ShellFactory.hxx index 02004ea9826f..f6ca72e0a27e 100644 --- a/sd/source/ui/inc/ShellFactory.hxx +++ b/sd/source/ui/inc/ShellFactory.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx index cb0c37f0daf3..a54797dccaac 100644 --- a/sd/source/ui/inc/SlideSorter.hxx +++ b/sd/source/ui/inc/SlideSorter.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,7 +68,7 @@ namespace sd { namespace slidesorter { /** Show previews for all the slides in a document and allow the user to insert or delete slides and modify the order of the slides. - + This class is a facade for the model, view, and controller classes. It is a hub that allows access to the various parts of a slide sorter. @@ -88,7 +88,7 @@ public: shutdown (when that can be detected). */ bool IsValid (void) const; - + /** Create a new slide sorter that is strongly coupled to the given view shell. Use this function for a slide sorter in the left pane. @param rViewShell @@ -172,7 +172,7 @@ public: ViewShellBase* GetViewShellBase (void) const; void Paint (const Rectangle& rRepaintArea); - + /** Place and size the controls and windows. You may want to call this method when something has changed that for instance affects the visibility state of the scroll bars. @@ -187,7 +187,7 @@ public: /** Set the current function at the view shell or, when it is not present, set it at the content window. This method supports the use of functions even when there is no SlideSorterViewShell. - */ + */ void SetCurrentFunction (const FunctionReference& rpFunction); protected: diff --git a/sd/source/ui/inc/SlideSorterChildWindow.hrc b/sd/source/ui/inc/SlideSorterChildWindow.hrc index 541b0bd3a18c..3a827e7bde44 100644 --- a/sd/source/ui/inc/SlideSorterChildWindow.hrc +++ b/sd/source/ui/inc/SlideSorterChildWindow.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/sd/source/ui/inc/SlideSorterChildWindow.hxx b/sd/source/ui/inc/SlideSorterChildWindow.hxx index bf823c465328..443c98bbcd25 100644 --- a/sd/source/ui/inc/SlideSorterChildWindow.hxx +++ b/sd/source/ui/inc/SlideSorterChildWindow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 SlideSorterChildWindow { public: SlideSorterChildWindow ( - ::Window*, - USHORT, - SfxBindings*, + ::Window*, + USHORT, + SfxBindings*, SfxChildWinInfo*); virtual ~SlideSorterChildWindow (void); - + SFX_DECL_CHILDWINDOW (SlideBrowserChildWindow); }; diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx index a72e8ecbc9fc..66768020f769 100644 --- a/sd/source/ui/inc/SlideSorterViewShell.hxx +++ b/sd/source/ui/inc/SlideSorterViewShell.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,7 +55,7 @@ public: SFX_DECL_INTERFACE(SD_IF_SDSLIDESORTERVIEWSHELL) static ::boost::shared_ptr<SlideSorterViewShell> Create( - SfxViewFrame* pFrame, + SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, ::Window* pParentWindow, FrameView* pFrameView); @@ -78,10 +78,10 @@ public: virtual void GetFocus (void); virtual void LoseFocus (void); - virtual SdPage* GetActualPage (void); + virtual SdPage* GetActualPage (void); /// inherited from sd::ViewShell - virtual SdPage* getCurrentPage() const; + virtual SdPage* getCurrentPage() const; void ExecCtrl (SfxRequest& rRequest); virtual void GetCtrlState (SfxItemSet &rSet); @@ -130,15 +130,15 @@ public: sal_Int8 nDropAction); virtual sal_Int8 AcceptDrop ( const AcceptDropEvent& rEvt, - DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, + DropTargetHelper& rTargetHelper, + ::sd::Window* pTargetWindow = NULL, + USHORT nPage = SDRPAGE_NOTFOUND, USHORT nLayer = SDRPAGE_NOTFOUND ); virtual sal_Int8 ExecuteDrop ( - const ExecuteDropEvent& rEvt, + const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, + ::sd::Window* pTargetWindow = NULL, + USHORT nPage = SDRPAGE_NOTFOUND, USHORT nLayer = SDRPAGE_NOTFOUND); typedef ::std::vector<SdPage*> PageSelection; @@ -199,7 +199,7 @@ private: ::boost::shared_ptr<SlideSorter> mpSlideSorter; SlideSorterViewShell ( - SfxViewFrame* pFrame, + SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, ::Window* pParentWindow, FrameView* pFrameView); diff --git a/sd/source/ui/inc/SlideSorterViewShellBase.hxx b/sd/source/ui/inc/SlideSorterViewShellBase.hxx index 07f52353cbaf..5deee7cd483a 100644 --- a/sd/source/ui/inc/SlideSorterViewShellBase.hxx +++ b/sd/source/ui/inc/SlideSorterViewShellBase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/sd/source/ui/inc/SlideView.hxx b/sd/source/ui/inc/SlideView.hxx index c861d7192910..57295d4d8a06 100644 --- a/sd/source/ui/inc/SlideView.hxx +++ b/sd/source/ui/inc/SlideView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,15 +59,15 @@ enum SlideViewFocusMove // - SdSlideView - // --------------- -class SlideView +class SlideView : public ::sd::View { public: TYPEINFO(); SlideView ( - SdDrawDocument* pDoc, - ::Window* pWindow, + SdDrawDocument* pDoc, + ::Window* pWindow, SlideViewShell* pSlideVShell); virtual ~SlideView (void); @@ -90,18 +90,18 @@ public: void Paint(const Rectangle& rRect, OutputDevice* pOut); void DrawSelectionRect(USHORT nPage); - Point CalcPagePos( USHORT nPageNo ) const; + Point CalcPagePos( USHORT nPageNo ) const; Rectangle GetPageArea( USHORT nPageNo ) const; - ULONG GetPageGap() const; + ULONG GetPageGap() const; Rectangle GetFadeIconArea( USHORT nPageNo ) const; SdPage* GetHitPage( const Point& rPos ) const; SdPage* GetFadePage( const Point& rPos ) const; SdPage* GetNearestPage( const Point& rPos ) const; - + void DeleteMarked(); void MoveMarked( USHORT nTargetPage ); - void AddToCache( SdPage* pPage, const Bitmap& rBitmap, long nZoom ); + void AddToCache( SdPage* pPage, const Bitmap& rBitmap, long nZoom ); const GraphicObject* GetFromCache( SdPage* pPage, long& rZoom, long nZoomTolerance ) const; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); @@ -112,29 +112,29 @@ public: virtual void StartDrag( const Point& rDragPt, ::Window* pWindow ); virtual void DragFinished( sal_Int8 nDropAction ); - - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, + + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, + ::sd::Window* pTargetWindow = NULL, + USHORT nPage = SDRPAGE_NOTFOUND, USHORT nLayer = SDRPAGE_NOTFOUND ); virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, + ::sd::Window* pTargetWindow = NULL, + USHORT nPage = SDRPAGE_NOTFOUND, USHORT nLayer = SDRPAGE_NOTFOUND ); - void UpdateAllPages(); + void UpdateAllPages(); private: - Timer aDelayedPaintTimer; - List aDelayedPaints; - SlideViewShell* pSlideViewShell; - BitmapCache* pCache; - VirtualDevice* mpVDev; - USHORT nAllowInvalidateSmph; - USHORT nPagesPerRow; + Timer aDelayedPaintTimer; + List aDelayedPaints; + SlideViewShell* pSlideViewShell; + BitmapCache* pCache; + VirtualDevice* mpVDev; + USHORT nAllowInvalidateSmph; + USHORT nPagesPerRow; USHORT nFocusPage; - BOOL bInPaint; - BOOL bInDelayedPaint; + BOOL bInPaint; + BOOL bInDelayedPaint; DECL_LINK( PaintDelayed, Timer * ); void CreateSlideTransferable (::Window* pWindow, BOOL bDrag); diff --git a/sd/source/ui/inc/SlideViewShell.hxx b/sd/source/ui/inc/SlideViewShell.hxx index 15673024ddce..a8c8a261938d 100644 --- a/sd/source/ui/inc/SlideViewShell.hxx +++ b/sd/source/ui/inc/SlideViewShell.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,12 +67,12 @@ public: The frame view that makes it possible to pass information from one view shell to the next. */ - SlideViewShell(SfxViewFrame* pFrame, + SlideViewShell(SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, ::Window* pParentWindow, FrameView* pFrameView = NULL); - SlideViewShell(SfxViewFrame *pFrame, + SlideViewShell(SfxViewFrame *pFrame, ::Window* pParentWindow, const SlideViewShell& rShell); @@ -88,14 +88,14 @@ public: virtual void ArrangeGUIElements (void); virtual void AddWindow(::sd::Window* pWin) { pSlideView->AddWindowToPaintView((OutputDevice*) pWin); } virtual void RemoveWindow(::sd::Window* pWin) { pSlideView->DeleteWindowFromPaintView((OutputDevice*) pWin); } - + virtual BOOL KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin); virtual void MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin); virtual void MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin); virtual void MouseButtonDown(const MouseEvent& rMEvt, ::sd::Window* pWin); virtual void Command(const CommandEvent& rCEvt, ::sd::Window* pWin); - virtual SdPage* GetActualPage(); + virtual SdPage* GetActualPage(); /** @returns current or selected page or 0. @@ -123,8 +123,8 @@ public: virtual void ReadFrameViewData(FrameView* pView); virtual void WriteFrameViewData(); - virtual void SetZoom(long nZoom); - virtual void SetZoomRect(const Rectangle& rZoomRect); + virtual void SetZoom(long nZoom); + virtual void SetZoomRect(const Rectangle& rZoomRect); virtual BOOL HasSelection( BOOL bText = TRUE ) const; @@ -138,8 +138,8 @@ public: @param nPage When the page number is invalid then the call is ignored. */ - void DrawSelectionRect( USHORT nPage ); - void DrawFocusRect( USHORT nPage ); + void DrawSelectionRect( USHORT nPage ); + void DrawFocusRect( USHORT nPage ); 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 ); @@ -165,11 +165,11 @@ protected: private: SlideView* pSlideView; - Point aDisplayPos; - Size aDisplaySize; + Point aDisplayPos; + Size aDisplaySize; USHORT nCurFocusPage; - bool bSetInitialZoomFactor; - bool bInitializeWinPos; + bool bSetInitialZoomFactor; + bool bInitializeWinPos; void Construct(SdDrawDocument* pDoc); void ImplDrawFocusRect( USHORT nPage, BOOL bVisible ); diff --git a/sd/source/ui/inc/SpellDialogChildWindow.hxx b/sd/source/ui/inc/SpellDialogChildWindow.hxx index f50391a14711..82c66cb40161 100644 --- a/sd/source/ui/inc/SpellDialogChildWindow.hxx +++ b/sd/source/ui/inc/SpellDialogChildWindow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,9 +45,9 @@ class SpellDialogChildWindow { public: SpellDialogChildWindow ( - ::Window* pParent, + ::Window* pParent, USHORT nId, - SfxBindings* pBindings, + SfxBindings* pBindings, SfxChildWinInfo* pInfo); virtual ~SpellDialogChildWindow (void); diff --git a/sd/source/ui/inc/TabControl.hxx b/sd/source/ui/inc/TabControl.hxx index 7a5bd1648e8a..e5c14d020cd8 100644 --- a/sd/source/ui/inc/TabControl.hxx +++ b/sd/source/ui/inc/TabControl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace sd { class DrawViewShell; -class TabControl - : public TabBar, - public DragSourceHelper, - public DropTargetHelper +class TabControl + : public TabBar, + public DragSourceHelper, + public DropTargetHelper { public: TabControl (DrawViewShell* pDrViewSh, ::Window* pParent); @@ -64,29 +64,29 @@ public: void SendDeactivatePageEvent (void); protected: - DrawViewShell* pDrViewSh; - BOOL bInternalMove; + DrawViewShell* pDrViewSh; + BOOL bInternalMove; // TabBar - virtual void Select(); - virtual void DoubleClick(); - virtual void MouseButtonDown(const MouseEvent& rMEvt); - - virtual void Command(const CommandEvent& rCEvt); - - virtual long StartRenaming(); - virtual long AllowRenaming(); - virtual void EndRenaming(); - - virtual void ActivatePage(); - virtual long DeactivatePage(); + virtual void Select(); + virtual void DoubleClick(); + virtual void MouseButtonDown(const MouseEvent& rMEvt); + + virtual void Command(const CommandEvent& rCEvt); + + virtual long StartRenaming(); + virtual long AllowRenaming(); + virtual void EndRenaming(); + + virtual void ActivatePage(); + virtual long DeactivatePage(); // DragSourceHelper - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); // DropTargetHelper - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); DECL_LINK(DeactivatePageHdl, void*); @@ -99,19 +99,19 @@ private: mrParent( rParent ) {} private: - TabControl& mrParent; - - virtual ~TabControlTransferable(); - - virtual void AddSupportedFormats(); - virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual void DragFinished( sal_Int8 nDropAction ); + TabControl& mrParent; + virtual ~TabControlTransferable(); + + virtual void AddSupportedFormats(); + virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual void DragFinished( sal_Int8 nDropAction ); + }; friend class TabControl::TabControlTransferable; - void DragFinished( sal_Int8 nDropAction ); + void DragFinished( sal_Int8 nDropAction ); private: using TabBar::StartDrag; diff --git a/sd/source/ui/inc/TemplateScanner.hxx b/sd/source/ui/inc/TemplateScanner.hxx index 86c862a298cf..deb48ef0562d 100644 --- a/sd/source/ui/inc/TemplateScanner.hxx +++ b/sd/source/ui/inc/TemplateScanner.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -166,7 +166,7 @@ private: */ class FolderDescriptorList; ::boost::scoped_ptr<FolderDescriptorList> mpFolderDescriptors; - + /** Set of state variables used by the methods InitializeFolderScanning(), GatherFolderList(), ScanFolder(), InitializeEntryScanning(), and ScanEntry(). diff --git a/sd/source/ui/inc/TextLogger.hxx b/sd/source/ui/inc/TextLogger.hxx index 7903a5232fea..7a7bc0b066eb 100644 --- a/sd/source/ui/inc/TextLogger.hxx +++ b/sd/source/ui/inc/TextLogger.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/sd/source/ui/inc/TextObjectBar.hxx b/sd/source/ui/inc/TextObjectBar.hxx index 30ee37482a4d..2ef1f2bffc34 100644 --- a/sd/source/ui/inc/TextObjectBar.hxx +++ b/sd/source/ui/inc/TextObjectBar.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 View; class ViewShell; class Window; -class TextObjectBar +class TextObjectBar : public SfxShell { public: @@ -50,7 +50,7 @@ public: SFX_DECL_INTERFACE(SD_IF_SDDRAWTEXTOBJECTBAR) TextObjectBar ( - ViewShell* pSdViewShell, + ViewShell* pSdViewShell, SfxItemPool& rItemPool, ::sd::View* pSdView); virtual ~TextObjectBar (void); diff --git a/sd/source/ui/inc/ToolBarManager.hxx b/sd/source/ui/inc/ToolBarManager.hxx index 04341ef37c42..bdf30db4d09b 100644 --- a/sd/source/ui/inc/ToolBarManager.hxx +++ b/sd/source/ui/inc/ToolBarManager.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -131,7 +131,7 @@ public: const static ::rtl::OUString msBezierObjectBar; // RID_BEZIER_TOOLBOX, 23015 const static ::rtl::OUString msGraphicObjectBar; // RID_DRAW_GRAF_TOOLBOX, 23030 const static ::rtl::OUString msMediaObjectBar; // RID_DRAW_MEDIA_TOOLBOX, 23031 - const static ::rtl::OUString msTableObjectBar; // RID_DRAW_TABLE_TOOLBOX + const static ::rtl::OUString msTableObjectBar; // RID_DRAW_TABLE_TOOLBOX /** The set of tool bar groups. */ diff --git a/sd/source/ui/inc/UpdateLockManager.hxx b/sd/source/ui/inc/UpdateLockManager.hxx index 2f5a4df30c5f..1f12d3dc7b5f 100644 --- a/sd/source/ui/inc/UpdateLockManager.hxx +++ b/sd/source/ui/inc/UpdateLockManager.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index 7b7fe03f2f73..9939b0efbc16 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,7 +68,7 @@ class ViewClipboard; struct SdViewRedrawRec { OutputDevice* mpOut; - Rectangle aRect; + Rectangle aRect; }; @@ -78,17 +78,17 @@ public: TYPEINFO(); View ( - SdDrawDocument* pDrawDoc, - OutputDevice* pOutDev, + SdDrawDocument* pDrawDoc, + OutputDevice* pOutDev, ViewShell* pViewSh=NULL); virtual ~View (void); void CompleteRedraw( OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L); - virtual BOOL GetAttributes( SfxItemSet& rTargetSet, BOOL bOnlyHardAttr=FALSE ) const; - virtual BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll = FALSE); - virtual void MarkListHasChanged(); - virtual void ModelHasChanged(); + virtual BOOL GetAttributes( SfxItemSet& rTargetSet, BOOL bOnlyHardAttr=FALSE ) const; + virtual BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll = FALSE); + virtual void MarkListHasChanged(); + virtual void ModelHasChanged(); virtual void SelectAll(); virtual void DoCut(::Window* pWindow=NULL); virtual void DoCopy(::Window* pWindow=NULL); @@ -98,24 +98,24 @@ public: virtual void StartDrag( const Point& rStartPos, ::Window* pWindow ); virtual void DragFinished( sal_Int8 nDropAction ); virtual sal_Int8 AcceptDrop ( - const AcceptDropEvent& rEvt, + const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, + ::sd::Window* pTargetWindow = NULL, + USHORT nPage = SDRPAGE_NOTFOUND, USHORT nLayer = SDRPAGE_NOTFOUND); virtual sal_Int8 ExecuteDrop ( - const ExecuteDropEvent& rEvt, + const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, + ::sd::Window* pTargetWindow = NULL, + USHORT nPage = SDRPAGE_NOTFOUND, USHORT nLayer = SDRPAGE_NOTFOUND); ::com::sun::star::uno::Reference< - ::com::sun::star::datatransfer::XTransferable> + ::com::sun::star::datatransfer::XTransferable> CreateClipboardDataObject (::sd::View*, ::Window& rWindow); - ::com::sun::star::uno::Reference< + ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable> - CreateDragDataObject (::sd::View*, ::Window& rWindow, + CreateDragDataObject (::sd::View*, ::Window& rWindow, const Point& rDragPos); ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable> @@ -135,15 +135,15 @@ public: bool RestoreDefaultText( SdrTextObj* pTextObj ); - BOOL InsertData( const TransferableDataHelper& rDataHelper, + BOOL InsertData( const TransferableDataHelper& rDataHelper, const Point& rPos, sal_Int8& rDnDAction, BOOL bDrag, ULONG nFormat = 0, USHORT nPage = SDRPAGE_NOTFOUND, USHORT nLayer = SDRLAYER_NOTFOUND ); /** gets the metafile from the given transferable helper and insert it as a graphic shape. @param bOptimize if set to true, the metafile is analyzed and if only one bitmap action is present, then is is inserted as a single graphic. */ - bool InsertMetaFile( TransferableDataHelper& rDataHelper, - const Point& rInsertPos, + bool InsertMetaFile( TransferableDataHelper& rDataHelper, + const Point& rInsertPos, ImageMap* pImageMap, bool bOptimize ); SdrGrafObj* InsertGraphic( const Graphic& rGraphic, @@ -154,23 +154,23 @@ public: bool PasteRTFTable( SotStorageStreamRef xStm, SdrPage* pPage, ULONG nPasteOptions ); - BOOL IsPresObjSelected(BOOL bOnPage=TRUE, BOOL bOnMasterPage=TRUE, BOOL bCheckPresObjListOnly=FALSE, BOOL bCheckLayoutOnly=FALSE) const; + BOOL IsPresObjSelected(BOOL bOnPage=TRUE, BOOL bOnMasterPage=TRUE, BOOL bCheckPresObjListOnly=FALSE, BOOL bCheckLayoutOnly=FALSE) const; - void SetMarkedOriginalSize(); + void SetMarkedOriginalSize(); - void LockRedraw(BOOL bLock); + void LockRedraw(BOOL bLock); - BOOL IsMorphingAllowed() const; - BOOL IsVectorizeAllowed() const; + BOOL IsMorphingAllowed() const; + BOOL IsVectorizeAllowed() const; virtual SfxStyleSheet* GetStyleSheet() const; - BOOL GetExchangeList( List*& rpExchangeList, List* pBookmarkList, USHORT nType ); + BOOL GetExchangeList( List*& rpExchangeList, List* pBookmarkList, USHORT nType ); virtual void onAccessibilityOptionsChanged(); virtual SdrModel* GetMarkedObjModel() const; - virtual BOOL Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, UINT32 nOptions=0); + virtual BOOL Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, UINT32 nOptions=0); using SdrExchangeView::Paste; /** returns true if we have an undo manager and there is an open list undo action */ @@ -211,21 +211,21 @@ protected: virtual void OnBeginPasteOrDrop( PasteOrDropInfos* pInfos ); virtual void OnEndPasteOrDrop( PasteOrDropInfos* pInfos ); - SdDrawDocument* mpDoc; - DrawDocShell* mpDocSh; - ViewShell* mpViewSh; - SdrMarkList* mpDragSrcMarkList; - SdrObject* mpDropMarkerObj; - SdrDropMarkerOverlay* mpDropMarker; - USHORT mnDragSrcPgNum; - Point maDropPos; - ::std::vector< String > maDropFileVector; - sal_Int8 mnAction; - Timer maDropErrorTimer; - Timer maDropInsertFileTimer; - USHORT mnLockRedrawSmph; - List* mpLockedRedraws; - bool mbIsDropAllowed; + SdDrawDocument* mpDoc; + DrawDocShell* mpDocSh; + ViewShell* mpViewSh; + SdrMarkList* mpDragSrcMarkList; + SdrObject* mpDropMarkerObj; + SdrDropMarkerOverlay* mpDropMarker; + USHORT mnDragSrcPgNum; + Point maDropPos; + ::std::vector< String > maDropFileVector; + sal_Int8 mnAction; + Timer maDropErrorTimer; + Timer maDropInsertFileTimer; + USHORT mnLockRedrawSmph; + List* mpLockedRedraws; + bool mbIsDropAllowed; DECL_LINK( DropErrorHdl, Timer* ); DECL_LINK( DropInsertFileHdl, Timer* ); @@ -233,20 +233,20 @@ protected: void ImplClearDrawDropMarker(); - SmartTagSet maSmartTags; + SmartTagSet maSmartTags; private: ::std::auto_ptr<ViewClipboard> mpClipboard; }; -DrawDocShell* View::GetDocSh (void) const +DrawDocShell* View::GetDocSh (void) const { - return mpDocSh; + return mpDocSh; } -SdDrawDocument* View::GetDoc (void) const +SdDrawDocument* View::GetDoc (void) const { - return mpDoc; + return mpDoc; } ViewShell* View::GetViewShell (void) const diff --git a/sd/source/ui/inc/ViewClipboard.hxx b/sd/source/ui/inc/ViewClipboard.hxx index 6dbfe46ba0dc..81eca2cc93f9 100644 --- a/sd/source/ui/inc/ViewClipboard.hxx +++ b/sd/source/ui/inc/ViewClipboard.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index 8f70c35cf8cc..7feada71fdbf 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ class SdPage; class SvxRuler; -class SdrOle2Obj; // fuer die, die Teile von SVDRAW rausdefiniert haben +class SdrOle2Obj; // fuer die, die Teile von SVDRAW rausdefiniert haben class ScrollBarBox; class SdDrawDocument; class ScrollBar; @@ -110,33 +110,33 @@ public: ST_DRAW, // The Draw application. ST_IMPRESS, // Main view of the Impress application. ST_NOTES, - ST_HANDOUT, - ST_OUTLINE, + ST_HANDOUT, + ST_OUTLINE, ST_SLIDE_SORTER, ST_PRESENTATION, ST_TASK_PANE }; static const int MAX_HSPLIT_CNT = 1; static const int MAX_VSPLIT_CNT = 1; - static const int MIN_SCROLLBAR_SIZE = 50; + static const int MIN_SCROLLBAR_SIZE = 50; static const ULONG OUTPUT_DRAWMODE_COLOR = DRAWMODE_DEFAULT; - static const ULONG OUTPUT_DRAWMODE_GRAYSCALE - = DRAWMODE_GRAYLINE | DRAWMODE_GRAYFILL - | DRAWMODE_BLACKTEXT | DRAWMODE_GRAYBITMAP + static const ULONG OUTPUT_DRAWMODE_GRAYSCALE + = DRAWMODE_GRAYLINE | DRAWMODE_GRAYFILL + | DRAWMODE_BLACKTEXT | DRAWMODE_GRAYBITMAP | DRAWMODE_GRAYGRADIENT; - static const int OUTPUT_DRAWMODE_BLACKWHITE - = DRAWMODE_BLACKLINE | DRAWMODE_BLACKTEXT - | DRAWMODE_WHITEFILL | DRAWMODE_GRAYBITMAP + static const int OUTPUT_DRAWMODE_BLACKWHITE + = DRAWMODE_BLACKLINE | DRAWMODE_BLACKTEXT + | DRAWMODE_WHITEFILL | DRAWMODE_GRAYBITMAP | DRAWMODE_WHITEGRADIENT; - static const int OUTPUT_DRAWMODE_CONTRAST - = DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL + static const int OUTPUT_DRAWMODE_CONTRAST + = DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT; TYPEINFO(); ViewShell ( - SfxViewFrame *pFrame, + SfxViewFrame *pFrame, ::Window* pParentWindow, ViewShellBase& rViewShellBase, bool bAllowCenter = true); @@ -223,13 +223,13 @@ public: bar controls are not modified. */ virtual void UpdateScrollBars (void); - void Scroll(long nX, long nY); - void ScrollLines(long nX, long nY); - virtual void SetZoom(long nZoom); - virtual void SetZoomRect(const Rectangle& rZoomRect); - void InitWindows(const Point& rViewOrigin, const Size& rViewSize, + void Scroll(long nX, long nY); + void ScrollLines(long nX, long nY); + virtual void SetZoom(long nZoom); + virtual void SetZoomRect(const Rectangle& rZoomRect); + void InitWindows(const Point& rViewOrigin, const Size& rViewSize, const Point& rWinPos, BOOL bUpdate = FALSE); - void InvalidateWindows(); + void InvalidateWindows(); /** This method is still used by the OutlineViewShell to update the model according to the content of the outline view. This in turn updates the previews in the slide sorter. @@ -238,7 +238,7 @@ public: void DrawMarkRect(const Rectangle& rRect) const; - void ExecReq( SfxRequest &rReq ); + void ExecReq( SfxRequest &rReq ); ZoomList* GetZoomList (void); @@ -259,10 +259,10 @@ public: /** @returns current or selected page or 0. This method will fail in master page mode. - + @deprecated, please use getCurrentPage(); */ - virtual SdPage* GetActualPage() = 0; + virtual SdPage* GetActualPage() = 0; /** @returns current or selected page or 0. @@ -279,13 +279,13 @@ public: void SetOldFunction(const FunctionReference& xFunction); void DeactivateCurrentFunction( bool bPermanent = false ); - void SetPageSizeAndBorder(PageKind ePageKind, const Size& rNewSize, + void SetPageSizeAndBorder(PageKind ePageKind, const Size& rNewSize, long nLeft, long nRight, long nUpper, long nLower, BOOL bScaleAll, Orientation eOrient, USHORT nPaperBin, BOOL bBackgroundFullSize ); - void SetStartShowWithDialog( BOOL bIn = TRUE ) { mbStartShowWithDialog = bIn; } - BOOL IsStartShowWithDialog() const { return mbStartShowWithDialog; } + void SetStartShowWithDialog( BOOL bIn = TRUE ) { mbStartShowWithDialog = bIn; } + BOOL IsStartShowWithDialog() const { return mbStartShowWithDialog; } USHORT GetPrintedHandoutPageNum (void) const { return mnPrintedHandoutPageNum; } void SetPrintedHandoutPageNum (USHORT nPageNumber) {mnPrintedHandoutPageNum=nPageNumber; } @@ -370,7 +370,7 @@ public: The new size in pixel. */ // This is to be replaced by Resize. - // virtual void AdjustPosSizePixel(const Point &rPos, const Size &rSize); + // virtual void AdjustPosSizePixel(const Point &rPos, const Size &rSize); /** Set position and size of the GUI elements that are controllerd by the view shell like rulers and scroll bars as well as the actual @@ -379,8 +379,8 @@ public: */ virtual void ArrangeGUIElements (void); - // virtual void OuterResizePixel(const Point &rPos, const Size &rSize); - // virtual void InnerResizePixel(const Point &rPos, const Size &rSize); + // virtual void OuterResizePixel(const Point &rPos, const Size &rSize); + // virtual void InnerResizePixel(const Point &rPos, const Size &rSize); ViewShellBase& GetViewShellBase (void) const; @@ -408,8 +408,8 @@ public: /** This method is more or less an alias to Deactivate(). It is called before an object of this class is taken from the stack of view - shells. - + shells. + <p>When this method is not called before a view shell is taken from a stack then the Deactivate() call from the SFX as a response to RemoveSubShell() comes to late when the view shell is not on the @@ -474,24 +474,24 @@ protected: /// The active window. ::sd::Window* mpActiveWindow; ::sd::View* mpView; - FrameView* mpFrameView; + FrameView* mpFrameView; - FunctionReference mxCurrentFunction; - FunctionReference mxOldFunction; - ZoomList* mpZoomList; + FunctionReference mxCurrentFunction; + FunctionReference mxOldFunction; + ZoomList* mpZoomList; - Point maViewPos; - Size maViewSize; - Size maScrBarWH; + Point maViewPos; + Size maViewSize; + Size maScrBarWH; - BOOL mbCenterAllowed; // wird an Fenster weitergegeben + BOOL mbCenterAllowed; // wird an Fenster weitergegeben - BOOL mbStartShowWithDialog; // Praesentation wurde ueber Dialog gestartet - USHORT mnPrintedHandoutPageNum; // Page number of the handout page that is to be printed. + BOOL mbStartShowWithDialog; // Praesentation wurde ueber Dialog gestartet + USHORT mnPrintedHandoutPageNum; // Page number of the handout page that is to be printed. USHORT mnPrintedHandoutPageCount; // Page count of the handout pages that are to be printed. - //af BOOL bPrintDirectSelected; // Print only selected objects in direct print - //afString sPageRange; // pagerange if selected objects in direct print + //af BOOL bPrintDirectSelected; // Print only selected objects in direct print + //afString sPageRange; // pagerange if selected objects in direct print /** Area covered by all windows, i.e. the area of the parent window without the controls at the borders like rulers, scroll bars, tab @@ -585,12 +585,12 @@ private: return mpParentWindow; } -::sd::View* ViewShell::GetView (void) const +::sd::View* ViewShell::GetView (void) const { - return mpView; + return mpView; } -SdrView* ViewShell::GetDrawView (void) const +SdrView* ViewShell::GetDrawView (void) const { return static_cast<SdrView*>(mpView); } diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index 18f6a14c2a1f..16584fb45857 100644 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -209,7 +209,7 @@ public: This is done by adding the border used by the ViewShellBase itself with the border used by the main view shell. - @param bForce if true the borders are also updated if old border + @param bForce if true the borders are also updated if old border and new border are same. */ void UpdateBorder ( bool bForce = false ); @@ -250,7 +250,7 @@ public: of that window remains with the called ViewShellBase object. */ ::Window* GetViewWindow (void); - + /** returns the ui descriptive name for the given uno slot. The result is taken from the configuration and not cached, so do not use it excessive (f.e. in status updates) */ ::rtl::OUString RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL ) const; diff --git a/sd/source/ui/inc/ViewShellHint.hxx b/sd/source/ui/inc/ViewShellHint.hxx index b83be387abb7..c72780783ca9 100644 --- a/sd/source/ui/inc/ViewShellHint.hxx +++ b/sd/source/ui/inc/ViewShellHint.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/sd/source/ui/inc/ViewShellImplementation.hxx b/sd/source/ui/inc/ViewShellImplementation.hxx index aad225fba1d0..699047659588 100644 --- a/sd/source/ui/inc/ViewShellImplementation.hxx +++ b/sd/source/ui/inc/ViewShellImplementation.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -128,8 +128,8 @@ public: void AssignLayout ( SfxRequest& rRequest, PageKind ePageKind ); /** Determine the view id of the view shell. This corresponds to the - view id stored in the SfxViewFrame class. - + view id stored in the SfxViewFrame class. + We can not use the view of that class because with the introduction of the multi pane GUI we do not switch the SfxViewShell anymore when switching the view in the center pane. The view id of the diff --git a/sd/source/ui/inc/ViewShellManager.hxx b/sd/source/ui/inc/ViewShellManager.hxx index b7561ea9f744..9a3a7b1f48fc 100644 --- a/sd/source/ui/inc/ViewShellManager.hxx +++ b/sd/source/ui/inc/ViewShellManager.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,7 +56,7 @@ class ViewShellBase; view shells. The FormShell is a special case. With the SetFormShell() method it can be placed directly above or below one of the view shells.</p> - + <p>Shells managed by this class are created by factories or are given directly to Activate... methods. For the sub shells there is one factory for every view shell. Factories are added or removed via the @@ -99,7 +99,7 @@ public: use the ActivateViewShell() method. */ void ActivateShell (SfxShell* pShell); - + /** Deactivate the specified shell, i.e. take it and all of its object bars from the shell stack. @param pShell @@ -146,13 +146,13 @@ public: taken once off the stack and are then moved back on again.) */ void MoveSubShellToTop (const ViewShell& rParentShell, ShellId nId); - + /** Send all sub shells of the specified view shell an Invalidate() call. This does not modify the shell stack. */ void InvalidateAllSubShells ( ViewShell* pViewShell); - + /** Move the specified view shell to the top most position on the stack of view shells in relation to the other view shells. After this the only shells that are higher on the stack are its object bars. @@ -182,7 +182,7 @@ public: whether that is a view shell or a sub shell. */ SfxShell* GetTopShell (void) const; - + /** Use this class to safely lock updates of the view shell stack. */ class UpdateLock diff --git a/sd/source/ui/inc/ViewTabBar.hxx b/sd/source/ui/inc/ViewTabBar.hxx index ed7de6a04e50..ce668bea7650 100644 --- a/sd/source/ui/inc/ViewTabBar.hxx +++ b/sd/source/ui/inc/ViewTabBar.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,7 +70,7 @@ namespace sd { /** Tab control for switching between views in the center pane. */ -class ViewTabBar +class ViewTabBar : private sd::MutexOwner, public ViewTabBarInterfaceBase { @@ -90,12 +90,12 @@ public: //----- drawing::framework::XConfigurationChangeListener ------------------ - virtual void SAL_CALL + virtual void SAL_CALL notifyConfigurationChange ( const ::com::sun::star::drawing::framework::ConfigurationChangeEvent& rEvent) throw (::com::sun::star::uno::RuntimeException); - + //----- XEventListener ---------------------------------------------------- virtual void SAL_CALL disposing( @@ -120,17 +120,17 @@ public: SAL_CALL removeTabBarButton ( const ::com::sun::star::drawing::framework::TabBarButton& rButton) throw (::com::sun::star::uno::RuntimeException); - + virtual sal_Bool SAL_CALL hasTabBarButton ( const ::com::sun::star::drawing::framework::TabBarButton& rButton) throw (::com::sun::star::uno::RuntimeException); - + virtual ::com::sun::star::uno::Sequence<com::sun::star::drawing::framework::TabBarButton> SAL_CALL getTabBarButtons (void) throw (::com::sun::star::uno::RuntimeException); - + //----- XResource --------------------------------------------------------- virtual ::com::sun::star::uno::Reference< @@ -170,7 +170,7 @@ public: const ::com::sun::star::drawing::framework::TabBarButton& rButton); ::com::sun::star::uno::Sequence<com::sun::star::drawing::framework::TabBarButton> GetTabBarButtons (void); - + private: ::boost::shared_ptr< ::TabControl> mpTabControl; ::com::sun::star::uno::Reference< diff --git a/sd/source/ui/inc/ViewTabControl.hxx b/sd/source/ui/inc/ViewTabControl.hxx index 7f4e955a7532..9314791ad7a6 100644 --- a/sd/source/ui/inc/ViewTabControl.hxx +++ b/sd/source/ui/inc/ViewTabControl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace sd { class DrawViewShell; -class TabControl - : public TabBar, - public DragSourceHelper, - public DropTargetHelper +class TabControl + : public TabBar, + public DragSourceHelper, + public DropTargetHelper { public: TabControl (DrawViewShell* pDrViewSh, ::Window* pParent); @@ -64,29 +64,29 @@ public: void SendDeactivatePageEvent (void); protected: - DrawViewShell* pDrViewSh; - BOOL bInternalMove; + DrawViewShell* pDrViewSh; + BOOL bInternalMove; // TabBar - virtual void Select(); - virtual void DoubleClick(); - virtual void MouseButtonDown(const MouseEvent& rMEvt); - - virtual void Command(const CommandEvent& rCEvt); - - virtual long StartRenaming(); - virtual long AllowRenaming(); - virtual void EndRenaming(); - - virtual void ActivatePage(); - virtual long DeactivatePage(); + virtual void Select(); + virtual void DoubleClick(); + virtual void MouseButtonDown(const MouseEvent& rMEvt); + + virtual void Command(const CommandEvent& rCEvt); + + virtual long StartRenaming(); + virtual long AllowRenaming(); + virtual void EndRenaming(); + + virtual void ActivatePage(); + virtual long DeactivatePage(); // DragSourceHelper - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); // DropTargetHelper - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); DECL_LINK(DeactivatePageHdl, void*); @@ -99,19 +99,19 @@ private: mrParent( rParent ) {} private: - TabControl& mrParent; - - virtual ~TabControlTransferable(); - - virtual void AddSupportedFormats(); - virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual void DragFinished( sal_Int8 nDropAction ); + TabControl& mrParent; + virtual ~TabControlTransferable(); + + virtual void AddSupportedFormats(); + virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual void DragFinished( sal_Int8 nDropAction ); + }; friend class TabControl::TabControlTransferable; - void DragFinished( sal_Int8 nDropAction ); + void DragFinished( sal_Int8 nDropAction ); }; diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx index b085cf0ed9ef..986e207ec081 100644 --- a/sd/source/ui/inc/Window.hxx +++ b/sd/source/ui/inc/Window.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ class ViewShell; // #i2237# // removed old stuff here which still forced zoom to be // %BRUSH_SIZE which is outdated now -//#define BRUSH_SIZE 8 +//#define BRUSH_SIZE 8 /** An SdWindow contains the actual working area of ViewShell. @@ -57,26 +57,26 @@ class ViewShell; member of the <type>OutputDevice</type> base class. It is calculated to be an integer percent value. */ -class Window - : public ::Window, +class Window + : public ::Window, public ::DropTargetHelper { public: Window (::Window* pParent); virtual ~Window (void); - void SetViewShell (ViewShell* pViewSh); + void SetViewShell (ViewShell* pViewSh); /** Set the zoom factor to the specified value and center the display - area arround the zoom center. - @param nZoom + area arround the zoom center. + @param nZoom The zoom factor is given as integral percent value. */ - void SetZoomIntegral(long nZoom); + void SetZoomIntegral(long nZoom); /** This internally used method performs the actual adaption of the - window's map mode to the specified zoom factor. - @param nZoom + window's map mode to the specified zoom factor. + @param nZoom The zoom factor is given as integral percent value. @return When the given zoom factor lies outside the valid range enclosed @@ -85,7 +85,7 @@ public: forced into that interval. Therefore the returned value is a valid zoom factor. */ - long SetZoomFactor(long nZoom); + long SetZoomFactor(long nZoom); /** This method is called when the whole page shall be displayed in the window. Position and zoom factor are set so that the given @@ -96,7 +96,7 @@ public: @param rZoomRect The rectangle is expected to be given relative to the upper left corner of the window in logical coordinates (100th of mm). - @return + @return The new zoom factor is returned as integral percent value. */ long SetZoomRect (const Rectangle& rZoomRect); @@ -112,8 +112,8 @@ public: manually or programatically are set to this value if they are smaller. If the currently used zoom factor is smaller than the minimal zoom factor than set the minimal zoom factor as the new current zoom - factor. - + factor. + <p>This calculation is performed only when the <member>bMinZoomAutoCalc</member> is set (to <TRUE/>).</p> */ @@ -144,21 +144,21 @@ public: void UpdateMapMode (void); - double GetVisibleX(); // Interface fuer ScrollBars - double GetVisibleY(); - void SetVisibleXY(double fX, double fY); - double GetVisibleWidth(); - double GetVisibleHeight(); - double GetScrlLineWidth(); - double GetScrlLineHeight(); - double GetScrlPageWidth(); - double GetScrlPageHeight(); + double GetVisibleX(); // Interface fuer ScrollBars + double GetVisibleY(); + void SetVisibleXY(double fX, double fY); + double GetVisibleWidth(); + double GetVisibleHeight(); + double GetScrlLineWidth(); + double GetScrlLineHeight(); + double GetScrlPageWidth(); + double GetScrlPageHeight(); virtual void GrabFocus(); virtual void DataChanged( const DataChangedEvent& rDCEvt ); // DropTargetHelper - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); /** The DropScroll() method is used by AcceptDrop() to scroll the content of the window while dragging and dropping. With this method @@ -200,13 +200,13 @@ protected: virtual long Notify( NotifyEvent& rNEvt ); /** Create an accessibility object that makes this window accessible. - + @return The returned reference is empty if an accessible object could not be created. */ virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> + ::com::sun::star::accessibility::XAccessible> CreateAccessible (void); XubString GetSurroundingText() const; diff --git a/sd/source/ui/inc/WindowUpdater.hxx b/sd/source/ui/inc/WindowUpdater.hxx index 0799823f4c96..63d5138dade1 100644 --- a/sd/source/ui/inc/WindowUpdater.hxx +++ b/sd/source/ui/inc/WindowUpdater.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/sd/source/ui/inc/animobjs.hrc b/sd/source/ui/inc/animobjs.hrc index 5c5c8e7852cc..7542dbe73882 100644 --- a/sd/source/ui/inc/animobjs.hrc +++ b/sd/source/ui/inc/animobjs.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/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx index 0de7dac8ad8a..969cecbb88fe 100644 --- a/sd/source/ui/inc/animobjs.hxx +++ b/sd/source/ui/inc/animobjs.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,8 +74,8 @@ enum BitmapAdjustment class SdDisplay : public Control { private: - BitmapEx aBitmapEx; - Fraction aScale; + BitmapEx aBitmapEx; + Fraction aScale; public: SdDisplay( ::Window* pWin, SdResId Id ); @@ -83,8 +83,8 @@ public: virtual void Paint( const Rectangle& rRect ); - void SetBitmapEx( BitmapEx* pBmpEx ); - void SetScale( const Fraction& rFrac ); + void SetBitmapEx( BitmapEx* pBmpEx ); + void SetScale( const Fraction& rFrac ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); }; @@ -101,59 +101,59 @@ public: ::Window* pParent, const SdResId& rSdResId ); virtual ~AnimationWindow(); - void AddObj( ::sd::View& rView ); - void CreateAnimObj( ::sd::View& rView ); + void AddObj( ::sd::View& rView ); + void CreateAnimObj( ::sd::View& rView ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); protected: - virtual BOOL Close(); - virtual void Resize(); - virtual void FillInfo( SfxChildWinInfo& ) const; + virtual BOOL Close(); + virtual void Resize(); + virtual void FillInfo( SfxChildWinInfo& ) const; private: - SdDisplay aCtlDisplay; - ImageButton aBtnFirst; - ImageButton aBtnReverse; - ImageButton aBtnStop; - ImageButton aBtnPlay; - ImageButton aBtnLast; - NumericField aNumFldBitmap; - TimeField aTimeField; - ListBox aLbLoopCount; - - ImageButton aBtnGetOneObject; - ImageButton aBtnGetAllObjects; - ImageButton aBtnRemoveBitmap; - ImageButton aBtnRemoveAll; - FixedText aFtCount; - FixedInfo aFiCount; - FixedLine aGrpBitmap; - - RadioButton aRbtGroup; - RadioButton aRbtBitmap; - FixedText aFtAdjustment; - ListBox aLbAdjustment; - PushButton aBtnCreateGroup; - FixedLine aGrpAnimation; - - ::Window* pWin; - List aBmpExList; - List aTimeList; + SdDisplay aCtlDisplay; + ImageButton aBtnFirst; + ImageButton aBtnReverse; + ImageButton aBtnStop; + ImageButton aBtnPlay; + ImageButton aBtnLast; + NumericField aNumFldBitmap; + TimeField aTimeField; + ListBox aLbLoopCount; + + ImageButton aBtnGetOneObject; + ImageButton aBtnGetAllObjects; + ImageButton aBtnRemoveBitmap; + ImageButton aBtnRemoveAll; + FixedText aFtCount; + FixedInfo aFiCount; + FixedLine aGrpBitmap; + + RadioButton aRbtGroup; + RadioButton aRbtBitmap; + FixedText aFtAdjustment; + ListBox aLbAdjustment; + PushButton aBtnCreateGroup; + FixedLine aGrpAnimation; + + ::Window* pWin; + List aBmpExList; + List aTimeList; SdDrawDocument* pMyDoc; - BitmapEx* pBitmapEx; + BitmapEx* pBitmapEx; - Size aSize; - Size aFltWinSize; - Size aDisplaySize; - Size aBmpSize; - BOOL bMovie; - BOOL bAllObjects; + Size aSize; + Size aFltWinSize; + Size aDisplaySize; + Size aBmpSize; + BOOL bMovie; + BOOL bAllObjects; - SfxBindings* pBindings; - AnimationControllerItem* pControllerItem; + SfxBindings* pBindings; + AnimationControllerItem* pControllerItem; - ScopeLock maPlayLock; + ScopeLock maPlayLock; //------------------------------------ DECL_LINK( ClickFirstHdl, void * ); @@ -167,11 +167,11 @@ private: DECL_LINK( ModifyBitmapHdl, void * ); DECL_LINK( ModifyTimeHdl, void * ); - void UpdateControl( ULONG nPos, BOOL bDisableCtrls = FALSE ); - void ResetAttrs(); - void WaitInEffect( ULONG nMilliSeconds, ULONG nTime, + void UpdateControl( ULONG nPos, BOOL bDisableCtrls = FALSE ); + void ResetAttrs(); + void WaitInEffect( ULONG nMilliSeconds, ULONG nTime, SfxProgress* pStbMgr ) const; - Fraction GetScale(); + Fraction GetScale(); }; /************************************************************************* diff --git a/sd/source/ui/inc/annotationmanager.hxx b/sd/source/ui/inc/annotationmanager.hxx index 3c68e468f4c9..0d596bd6efcd 100644 --- a/sd/source/ui/inc/annotationmanager.hxx +++ b/sd/source/ui/inc/annotationmanager.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 AnnotationManager public: AnnotationManager( ViewShellBase& rViewShellBase ); ~AnnotationManager(); - + void ExecuteAnnotation (SfxRequest& rRequest); void GetAnnotationState (SfxItemSet& rItemSet); private: ::rtl::Reference< AnnotationManagerImpl > mxImpl; -}; +}; } diff --git a/sd/source/ui/inc/assclass.hxx b/sd/source/ui/inc/assclass.hxx index 9074ab44f9ce..11a765111739 100644 --- a/sd/source/ui/inc/assclass.hxx +++ b/sd/source/ui/inc/assclass.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/sd/source/ui/inc/bmcache.hxx b/sd/source/ui/inc/bmcache.hxx index 3a68e760bcda..3841dc30ba1c 100644 --- a/sd/source/ui/inc/bmcache.hxx +++ b/sd/source/ui/inc/bmcache.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,18 +37,18 @@ class GraphicObject; class BitmapCache { - ULONG nMaxSize; - ULONG nCurSize; - List aEntries; - -public: + ULONG nMaxSize; + ULONG nCurSize; + List aEntries; + +public: BitmapCache(ULONG nMaxSizeKB) : nMaxSize(nMaxSizeKB), nCurSize(0) {} - virtual ~BitmapCache(); + virtual ~BitmapCache(); void Remove(const SdPage* pPage); }; -#endif // _SD_BMCACHE_HXX +#endif // _SD_BMCACHE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/brkdlg.hrc b/sd/source/ui/inc/brkdlg.hrc index 02f2311a39ff..934b50d30ddd 100644 --- a/sd/source/ui/inc/brkdlg.hrc +++ b/sd/source/ui/inc/brkdlg.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,10 +25,10 @@ * ************************************************************************/ #define FT_OBJ_INFO 1 -#define FT_ACT_INFO 2 -#define FT_INS_INFO 3 +#define FT_ACT_INFO 2 +#define FT_INS_INFO 3 #define FI_OBJ_INFO 4 -#define FI_ACT_INFO 5 -#define FI_INS_INFO 6 +#define FI_ACT_INFO 5 +#define FI_INS_INFO 6 #define BTN_CANCEL 7 #define DLG_BREAK 6197 diff --git a/sd/source/ui/inc/bulmaper.hxx b/sd/source/ui/inc/bulmaper.hxx index 53f466b354c6..2e8c0143a2ea 100644 --- a/sd/source/ui/inc/bulmaper.hxx +++ b/sd/source/ui/inc/bulmaper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/sd/source/ui/inc/celltempl.hrc b/sd/source/ui/inc/celltempl.hrc index ee3c596a494d..c82d60452b56 100644 --- a/sd/source/ui/inc/celltempl.hrc +++ b/sd/source/ui/inc/celltempl.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,5 +25,5 @@ * ************************************************************************/ #include <sfx2/sfx.hrc> -#define TAB_CELL_TEMPLATE 910 +#define TAB_CELL_TEMPLATE 910 #define TAB_CONTROL 1 diff --git a/sd/source/ui/inc/celltempl.hxx b/sd/source/ui/inc/celltempl.hxx index 4a25a784d3c3..0e8a0456f77d 100644 --- a/sd/source/ui/inc/celltempl.hxx +++ b/sd/source/ui/inc/celltempl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,13 +41,13 @@ class SdrModel; class SdPresCellTemplateDlg : public SfxStyleDialog { private: - XColorTable* mpColorTab; - XGradientList* mpGradientList; - XHatchList* mpHatchingList; - XBitmapList* mpBitmapList; + XColorTable* mpColorTab; + XGradientList* mpGradientList; + XHatchList* mpHatchingList; + XBitmapList* mpBitmapList; - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); - virtual const SfxItemSet* GetRefreshedSet(); + virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual const SfxItemSet* GetRefreshedSet(); public: SdPresCellTemplateDlg( SdrModel* pModel, Window* pParent, SfxStyleSheetBase& rStyleBase ); diff --git a/sd/source/ui/inc/cfgids.hxx b/sd/source/ui/inc/cfgids.hxx index df2a4dec9cbe..58e4e898e1df 100644 --- a/sd/source/ui/inc/cfgids.hxx +++ b/sd/source/ui/inc/cfgids.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,40 +37,40 @@ #define SDCFG_DRAW (SFX_ITEMTYPE_SD_BEGIN + 3) // Acceleratoren, Menus, ... -#define RID_DRAW_DEFAULTACCEL (SFX_ITEMTYPE_SD_BEGIN + 5) -#define RID_DRAW_DEFAULTMENU (SFX_ITEMTYPE_SD_BEGIN + 6) -#define RID_DRAW_PORTALMENU (SFX_ITEMTYPE_SD_BEGIN + 35) -#define RID_DRAW_STATUSBAR (SFX_ITEMTYPE_SD_BEGIN + 7) +#define RID_DRAW_DEFAULTACCEL (SFX_ITEMTYPE_SD_BEGIN + 5) +#define RID_DRAW_DEFAULTMENU (SFX_ITEMTYPE_SD_BEGIN + 6) +#define RID_DRAW_PORTALMENU (SFX_ITEMTYPE_SD_BEGIN + 35) +#define RID_DRAW_STATUSBAR (SFX_ITEMTYPE_SD_BEGIN + 7) // Acceleratoren, Menus, ... (fuers Draw (Graphic)) -#define RID_GRAPHIC_DEFAULTACCEL (SFX_ITEMTYPE_SD_BEGIN + 8) -#define RID_GRAPHIC_DEFAULTMENU (SFX_ITEMTYPE_SD_BEGIN + 9) -#define RID_GRAPHIC_PORTALMENU (SFX_ITEMTYPE_SD_BEGIN + 36) -//#define RID_GRAPHIC_STATUSBAR (SFX_ITEMTYPE_SD_BEGIN + 30) +#define RID_GRAPHIC_DEFAULTACCEL (SFX_ITEMTYPE_SD_BEGIN + 8) +#define RID_GRAPHIC_DEFAULTMENU (SFX_ITEMTYPE_SD_BEGIN + 9) +#define RID_GRAPHIC_PORTALMENU (SFX_ITEMTYPE_SD_BEGIN + 36) +//#define RID_GRAPHIC_STATUSBAR (SFX_ITEMTYPE_SD_BEGIN + 30) // Toolbars -#define RID_DRAW_DEFAULTTOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 10) -#define RID_DRAW_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 11) -#define RID_SLIDE_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 12) -#define RID_DRAW_OBJ_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 13) -#define RID_SLIDE_OBJ_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 14) -#define RID_BEZIER_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 15) -#define RID_DRAW_TEXT_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 16) -#define RID_OUTLINE_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 17) -#define RID_DRAW_TABLE_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 18) -#define RID_GLUEPOINTS_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 19) -#define RID_DRAW_OPTIONS_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 20) -#define RID_DRAW_COMMONTASK_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 21) -#define RID_FORMLAYER_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 22) -#define RID_DRAW_VIEWER_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 23) +#define RID_DRAW_DEFAULTTOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 10) +#define RID_DRAW_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 11) +#define RID_SLIDE_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 12) +#define RID_DRAW_OBJ_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 13) +#define RID_SLIDE_OBJ_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 14) +#define RID_BEZIER_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 15) +#define RID_DRAW_TEXT_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 16) +#define RID_OUTLINE_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 17) +#define RID_DRAW_TABLE_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 18) +#define RID_GLUEPOINTS_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 19) +#define RID_DRAW_OPTIONS_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 20) +#define RID_DRAW_COMMONTASK_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 21) +#define RID_FORMLAYER_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 22) +#define RID_DRAW_VIEWER_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 23) #define RID_GRAPHIC_VIEWER_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 24) -#define RID_GRAPHIC_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 25) -#define RID_GRAPHIC_OPTIONS_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 26) -#define RID_GRAPHIC_OBJ_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 27) +#define RID_GRAPHIC_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 25) +#define RID_GRAPHIC_OPTIONS_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 26) +#define RID_GRAPHIC_OBJ_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 27) #define RID_GRAPHIC_TEXT_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 28) -#define RID_DRAW_GRAF_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 30) -#define RID_DRAW_MEDIA_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 31) +#define RID_DRAW_GRAF_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 30) +#define RID_DRAW_MEDIA_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 31) #endif diff --git a/sd/source/ui/inc/copydlg.hrc b/sd/source/ui/inc/copydlg.hrc index f0067bd47cee..77a77694c5c4 100644 --- a/sd/source/ui/inc/copydlg.hrc +++ b/sd/source/ui/inc/copydlg.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/sd/source/ui/inc/copydlg.hxx b/sd/source/ui/inc/copydlg.hxx index 6ef5eca2b051..bcb5b86204c4 100644 --- a/sd/source/ui/inc/copydlg.hxx +++ b/sd/source/ui/inc/copydlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ class View; |* Dialog zum Einstellen des Bildschirms |* \************************************************************************/ -class CopyDlg +class CopyDlg : public SfxModalDialog { public: @@ -55,43 +55,43 @@ public: XColorTable* pColTab, ::sd::View* pView ); ~CopyDlg(); - void GetAttr( SfxItemSet& rOutAttrs ); + void GetAttr( SfxItemSet& rOutAttrs ); DECL_LINK( Reset, void* ); private: - FixedText maFtCopies; - NumericField maNumFldCopies; - ImageButton maBtnSetViewData; - - FixedText maFtMoveX; - MetricField maMtrFldMoveX; - FixedText maFtMoveY; - MetricField maMtrFldMoveY; - FixedText maFtAngle; - MetricField maMtrFldAngle; - FixedLine maGrpMovement; - - FixedText maFtWidth; - MetricField maMtrFldWidth; - FixedText maFtHeight; - MetricField maMtrFldHeight; - FixedLine maGrpEnlargement; - - FixedText maFtStartColor; - ColorLB maLbStartColor; - FixedText maFtEndColor; - ColorLB maLbEndColor; - FixedLine maGrpColor; - - OKButton maBtnOK; - CancelButton maBtnCancel; - HelpButton maBtnHelp; - PushButton maBtnSetDefault; - - const SfxItemSet& mrOutAttrs; - XColorTable* mpColorTab; - Fraction maUIScale; - ::sd::View* mpView; + FixedText maFtCopies; + NumericField maNumFldCopies; + ImageButton maBtnSetViewData; + + FixedText maFtMoveX; + MetricField maMtrFldMoveX; + FixedText maFtMoveY; + MetricField maMtrFldMoveY; + FixedText maFtAngle; + MetricField maMtrFldAngle; + FixedLine maGrpMovement; + + FixedText maFtWidth; + MetricField maMtrFldWidth; + FixedText maFtHeight; + MetricField maMtrFldHeight; + FixedLine maGrpEnlargement; + + FixedText maFtStartColor; + ColorLB maLbStartColor; + FixedText maFtEndColor; + ColorLB maLbEndColor; + FixedLine maGrpColor; + + OKButton maBtnOK; + CancelButton maBtnCancel; + HelpButton maBtnHelp; + PushButton maBtnSetDefault; + + const SfxItemSet& mrOutAttrs; + XColorTable* mpColorTab; + Fraction maUIScale; + ::sd::View* mpView; DECL_LINK( SelectColorHdl, void * ); DECL_LINK( SetViewData, void * ); diff --git a/sd/source/ui/inc/custsdlg.hrc b/sd/source/ui/inc/custsdlg.hrc index 2ce79cdae877..2945740b951d 100644 --- a/sd/source/ui/inc/custsdlg.hrc +++ b/sd/source/ui/inc/custsdlg.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 @@ -26,8 +26,8 @@ ************************************************************************/ #include <sfx2/sfx.hrc> -#define DLG_CUSTOMSHOW 843 -#define DLG_DEFINE_CUSTOMSHOW 890 +#define DLG_CUSTOMSHOW 843 +#define DLG_DEFINE_CUSTOMSHOW 890 #define BTN_OK 1 #define BTN_NEW 1 #define BTN_EDIT 2 diff --git a/sd/source/ui/inc/custsdlg.hxx b/sd/source/ui/inc/custsdlg.hxx index 53bfc4c6114b..36d5ea100d1f 100644 --- a/sd/source/ui/inc/custsdlg.hxx +++ b/sd/source/ui/inc/custsdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,22 +45,22 @@ class SdCustomShow; class SdCustomShowDlg : public ModalDialog { private: - ListBox aLbCustomShows; - CheckBox aCbxUseCustomShow; - PushButton aBtnNew; - PushButton aBtnEdit; - PushButton aBtnRemove; - PushButton aBtnCopy; - HelpButton aBtnHelp; - PushButton aBtnStartShow; - OKButton aBtnOK; - - SdDrawDocument& rDoc; - List* pCustomShowList; - SdCustomShow* pCustomShow; - BOOL bModified; - - void CheckState(); + ListBox aLbCustomShows; + CheckBox aCbxUseCustomShow; + PushButton aBtnNew; + PushButton aBtnEdit; + PushButton aBtnRemove; + PushButton aBtnCopy; + HelpButton aBtnHelp; + PushButton aBtnStartShow; + OKButton aBtnOK; + + SdDrawDocument& rDoc; + List* pCustomShowList; + SdCustomShow* pCustomShow; + BOOL bModified; + + void CheckState(); DECL_LINK( ClickButtonHdl, void * ); DECL_LINK( StartShowHdl, Button* ); @@ -69,8 +69,8 @@ public: SdCustomShowDlg( Window* pWindow, SdDrawDocument& rDrawDoc ); ~SdCustomShowDlg(); - BOOL IsModified() const { return( bModified ); } - BOOL IsCustomShow() const; + BOOL IsModified() const { return( bModified ); } + BOOL IsCustomShow() const; }; @@ -79,25 +79,25 @@ public: class SdDefineCustomShowDlg : public ModalDialog { private: - FixedText aFtName; - Edit aEdtName; - FixedText aFtPages; - MultiListBox aLbPages; - PushButton aBtnAdd; - PushButton aBtnRemove; - FixedText aFtCustomPages; - SvTreeListBox aLbCustomPages; - OKButton aBtnOK; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - - SdDrawDocument& rDoc; - SdCustomShow*& rpCustomShow; - BOOL bModified; - String aOldName; - - void CheckState(); - void CheckCustomShow(); + FixedText aFtName; + Edit aEdtName; + FixedText aFtPages; + MultiListBox aLbPages; + PushButton aBtnAdd; + PushButton aBtnRemove; + FixedText aFtCustomPages; + SvTreeListBox aLbCustomPages; + OKButton aBtnOK; + CancelButton aBtnCancel; + HelpButton aBtnHelp; + + SdDrawDocument& rDoc; + SdCustomShow*& rpCustomShow; + BOOL bModified; + String aOldName; + + void CheckState(); + void CheckCustomShow(); DECL_LINK( ClickButtonHdl, void * ); DECL_LINK( OKHdl, Button* ); @@ -108,7 +108,7 @@ public: SdDrawDocument& rDrawDoc, SdCustomShow*& rpCS ); ~SdDefineCustomShowDlg(); - BOOL IsModified() const { return( bModified ); } + BOOL IsModified() const { return( bModified ); } }; #endif // _SD_CUSTSDLG_HXX diff --git a/sd/source/ui/inc/diactrl.hxx b/sd/source/ui/inc/diactrl.hxx index 6b84865ed65d..5b8f24c87849 100644 --- a/sd/source/ui/inc/diactrl.hxx +++ b/sd/source/ui/inc/diactrl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,15 +47,15 @@ class SdPagesField : public SvxMetricField private: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; protected: - virtual void Modify(); + virtual void Modify(); public: - SdPagesField( Window* pParent, + SdPagesField( Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, WinBits nBits = WB_BORDER | WB_SPIN | WB_REPEAT ); ~SdPagesField(); - void UpdatePagesField( const SfxUInt16Item* pItem ); + void UpdatePagesField( const SfxUInt16Item* pItem ); }; //======================================================================== @@ -65,9 +65,9 @@ public: class SdTbxCtlDiaPages : public SfxToolBoxControl { public: - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); - virtual Window* CreateItemWindow( Window *pParent ); + virtual Window* CreateItemWindow( Window *pParent ); SFX_DECL_TOOLBOX_CONTROL(); diff --git a/sd/source/ui/inc/dialogs.hrc b/sd/source/ui/inc/dialogs.hrc index af233ad3b52c..48e2c67d602b 100644 --- a/sd/source/ui/inc/dialogs.hrc +++ b/sd/source/ui/inc/dialogs.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 @@ -26,11 +26,11 @@ ************************************************************************/ /** module unique resource ids for dialogs */ -#define RID_SD_DLG_HEADERFOOTER (1000) -#define RID_SD_DLG_MASTER_LAYOUT (1001) +#define RID_SD_DLG_HEADERFOOTER (1000) +#define RID_SD_DLG_MASTER_LAYOUT (1001) /** module unique resource ids for tabpages */ -#define RID_SD_TABPAGE_HEADERFOOTER (1000) -#define RID_SD_TABPAGE_HEADERFOOTER_SLIDE (1001) -#define RID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT (1002) +#define RID_SD_TABPAGE_HEADERFOOTER (1000) +#define RID_SD_TABPAGE_HEADERFOOTER_SLIDE (1001) +#define RID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT (1002) diff --git a/sd/source/ui/inc/dlg_char.hrc b/sd/source/ui/inc/dlg_char.hrc index dccf0570f1a7..6f9ede93df38 100644 --- a/sd/source/ui/inc/dlg_char.hrc +++ b/sd/source/ui/inc/dlg_char.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,5 +24,5 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define TAB_CHAR 20600 +#define TAB_CHAR 20600 diff --git a/sd/source/ui/inc/dlg_char.hxx b/sd/source/ui/inc/dlg_char.hxx index f5b1c3e7ff27..952db207fba4 100644 --- a/sd/source/ui/inc/dlg_char.hxx +++ b/sd/source/ui/inc/dlg_char.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ class SfxObjectShell; class SdCharDlg : public SfxTabDialog { private: - const SfxItemSet& rOutAttrs; + const SfxItemSet& rOutAttrs; const SfxObjectShell& rDocShell; - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); public: diff --git a/sd/source/ui/inc/dlgass.hrc b/sd/source/ui/inc/dlgass.hrc index 5e406cfbc121..9ce7e72537bc 100644 --- a/sd/source/ui/inc/dlgass.hrc +++ b/sd/source/ui/inc/dlgass.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 @@ -33,56 +33,56 @@ #define CB_PREVIEW 7 #define CB_STARTWITH 8 -#define FB_PAGE1 9 -#define FL_PAGE1_ARTGROUP 10 -#define RB_PAGE1_EMPTY 11 -#define RB_PAGE1_TEMPLATE 12 -#define LB_PAGE1_REGION 13 -#define LB_PAGE1_TEMPLATES 14 -#define RB_PAGE1_OPEN 15 -#define LB_PAGE1_OPEN 16 +#define FB_PAGE1 9 +#define FL_PAGE1_ARTGROUP 10 +#define RB_PAGE1_EMPTY 11 +#define RB_PAGE1_TEMPLATE 12 +#define LB_PAGE1_REGION 13 +#define LB_PAGE1_TEMPLATES 14 +#define RB_PAGE1_OPEN 15 +#define LB_PAGE1_OPEN 16 #define PB_PAGE1_OPEN 17 -#define FB_PAGE2 30 -#define FL_PAGE2_LAYOUT 31 -#define LB_PAGE2_REGION 32 -#define LB_PAGE2_LAYOUT 33 -#define FL_PAGE2_OUTPUTTYPES 34 -#define RB_PAGE2_MEDIUM1 35 -#define RB_PAGE2_MEDIUM2 36 -#define RB_PAGE2_MEDIUM3 37 -#define RB_PAGE2_MEDIUM4 38 -#define RB_PAGE2_MEDIUM5 39 +#define FB_PAGE2 30 +#define FL_PAGE2_LAYOUT 31 +#define LB_PAGE2_REGION 32 +#define LB_PAGE2_LAYOUT 33 +#define FL_PAGE2_OUTPUTTYPES 34 +#define RB_PAGE2_MEDIUM1 35 +#define RB_PAGE2_MEDIUM2 36 +#define RB_PAGE2_MEDIUM3 37 +#define RB_PAGE2_MEDIUM4 38 +#define RB_PAGE2_MEDIUM5 39 -#define FB_PAGE3 40 -#define FL_PAGE3_EFFECT 41 -#define FT_PAGE3_EFFECT 42 -#define LB_PAGE3_EFFECT 43 -#define FT_PAGE3_SPEED 44 -#define LB_PAGE3_SPEED 45 -#define FL_PAGE3_PRESTYPE 46 -#define RB_PAGE3_LIVE 47 -#define RB_PAGE3_KIOSK 48 -#define FT_PAGE3_TIME 49 -#define TMF_PAGE3_TIME 50 -#define FT_PAGE3_BREAK 51 -#define TMF_PAGE3_BREAK 52 -#define CB_PAGE3_LOGO 53 +#define FB_PAGE3 40 +#define FL_PAGE3_EFFECT 41 +#define FT_PAGE3_EFFECT 42 +#define LB_PAGE3_EFFECT 43 +#define FT_PAGE3_SPEED 44 +#define LB_PAGE3_SPEED 45 +#define FL_PAGE3_PRESTYPE 46 +#define RB_PAGE3_LIVE 47 +#define RB_PAGE3_KIOSK 48 +#define FT_PAGE3_TIME 49 +#define TMF_PAGE3_TIME 50 +#define FT_PAGE3_BREAK 51 +#define TMF_PAGE3_BREAK 52 +#define CB_PAGE3_LOGO 53 -#define FB_PAGE4 20 -#define FL_PAGE4_PERSONAL 21 -#define FT_PAGE4_ASKNAME 22 -#define EDT_PAGE4_ASKNAME 23 -#define FT_PAGE4_ASKTOPIC 24 -#define EDT_PAGE4_ASKTOPIC 25 -#define FT_PAGE4_ASKINFORMATION 26 -#define EDT_PAGE4_ASKINFORMATION 27 +#define FB_PAGE4 20 +#define FL_PAGE4_PERSONAL 21 +#define FT_PAGE4_ASKNAME 22 +#define EDT_PAGE4_ASKNAME 23 +#define FT_PAGE4_ASKTOPIC 24 +#define EDT_PAGE4_ASKTOPIC 25 +#define FT_PAGE4_ASKINFORMATION 26 +#define EDT_PAGE4_ASKINFORMATION 27 -#define FB_PAGE5 60 -#define FT_PAGE5_PAGELIST 61 -#define CT_PAGE5_PAGELIST 62 -#define CB_PAGE5_SUMMARY 63 +#define FB_PAGE5 60 +#define FT_PAGE5_PAGELIST 61 +#define CT_PAGE5_PAGELIST 62 +#define CB_PAGE5_SUMMARY 63 -#define STR_CREATE 64 -#define STR_OPEN 65 +#define STR_CREATE 64 +#define STR_OPEN 65 #define DLG_ASS 900 diff --git a/sd/source/ui/inc/dlgass.hxx b/sd/source/ui/inc/dlgass.hxx index ec6493513135..923f204a9f88 100644 --- a/sd/source/ui/inc/dlgass.hxx +++ b/sd/source/ui/inc/dlgass.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/sd/source/ui/inc/dlgctrls.hxx b/sd/source/ui/inc/dlgctrls.hxx index 992f8a98044c..aa8798e9a97e 100644 --- a/sd/source/ui/inc/dlgctrls.hxx +++ b/sd/source/ui/inc/dlgctrls.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,12 +50,12 @@ class SD_DLLPUBLIC FadeEffectLB : public ListBox public: FadeEffectLB( Window* pParent, SdResId Id ); ~FadeEffectLB(); - virtual void Fill(); + virtual void Fill(); -/* void selectEffectFromPage( SdPage* pPage ); */ - void applySelected( SdPage* pSlide ) const; +/* void selectEffectFromPage( SdPage* pPage ); */ + void applySelected( SdPage* pSlide ) const; - FadeEffectLBImpl* mpImpl; + FadeEffectLBImpl* mpImpl; }; #endif // SD_DLGCTRLS_HXX diff --git a/sd/source/ui/inc/dlgfield.hrc b/sd/source/ui/inc/dlgfield.hrc index 61585c8fc17f..9a21f7e152f1 100644 --- a/sd/source/ui/inc/dlgfield.hrc +++ b/sd/source/ui/inc/dlgfield.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/sd/source/ui/inc/dlgfield.hxx b/sd/source/ui/inc/dlgfield.hxx index e5c91aa2bb36..3ebc88fe1229 100644 --- a/sd/source/ui/inc/dlgfield.hxx +++ b/sd/source/ui/inc/dlgfield.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,22 +48,22 @@ class SvxFieldData; class SdModifyFieldDlg : public ModalDialog { private: - RadioButton aRbtFix; - RadioButton aRbtVar; - FixedLine aGrpType; - FixedText maFtLanguage; - SvxLanguageBox maLbLanguage; - FixedText aFtFormat; - ListBox aLbFormat; - OKButton aBtnOK; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - SfxItemSet maInputSet; + RadioButton aRbtFix; + RadioButton aRbtVar; + FixedLine aGrpType; + FixedText maFtLanguage; + SvxLanguageBox maLbLanguage; + FixedText aFtFormat; + ListBox aLbFormat; + OKButton aBtnOK; + CancelButton aBtnCancel; + HelpButton aBtnHelp; + SfxItemSet maInputSet; - const SvxFieldData* pField; + const SvxFieldData* pField; - void FillFormatList(); - void FillControls(); + void FillFormatList(); + void FillControls(); DECL_LINK( LanguageChangeHdl, void * ); @@ -71,12 +71,12 @@ public: SdModifyFieldDlg( Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ); ~SdModifyFieldDlg() {} - SvxFieldData* GetField(); - SfxItemSet GetItemSet(); + SvxFieldData* GetField(); + SfxItemSet GetItemSet(); }; -#endif // _SD_DLGFIELD_HXX +#endif // _SD_DLGFIELD_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/dlgolbul.hrc b/sd/source/ui/inc/dlgolbul.hrc index 0dffa9cb2f07..670b95b0343a 100644 --- a/sd/source/ui/inc/dlgolbul.hrc +++ b/sd/source/ui/inc/dlgolbul.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,4 +24,4 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define TAB_OUTLINEBULLET 20601 +#define TAB_OUTLINEBULLET 20601 diff --git a/sd/source/ui/inc/dlgpage.hrc b/sd/source/ui/inc/dlgpage.hrc index e12333c6310e..9dc0c52361f9 100644 --- a/sd/source/ui/inc/dlgpage.hrc +++ b/sd/source/ui/inc/dlgpage.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,4 +24,4 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define TAB_PAGE 20625 +#define TAB_PAGE 20625 diff --git a/sd/source/ui/inc/dlgpage.hxx b/sd/source/ui/inc/dlgpage.hxx index 16f95eba2c9f..f0dfba1625fc 100644 --- a/sd/source/ui/inc/dlgpage.hxx +++ b/sd/source/ui/inc/dlgpage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,14 +49,14 @@ typedef USHORT ChangeType; class SdPageDlg : public SfxTabDialog { private: - const SfxItemSet& mrOutAttrs; + const SfxItemSet& mrOutAttrs; const SfxObjectShell* mpDocShell; - XColorTable* mpColorTab; - XGradientList* mpGradientList; - XHatchList* mpHatchingList; - XBitmapList* mpBitmapList; + XColorTable* mpColorTab; + XGradientList* mpGradientList; + XHatchList* mpHatchingList; + XBitmapList* mpBitmapList; public: SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet* pAttr, BOOL bAreaPage = TRUE ); diff --git a/sd/source/ui/inc/dlgsnap.hrc b/sd/source/ui/inc/dlgsnap.hrc index 1d7f5bf7c164..f7a20249eeff 100644 --- a/sd/source/ui/inc/dlgsnap.hrc +++ b/sd/source/ui/inc/dlgsnap.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/sd/source/ui/inc/dlgsnap.hxx b/sd/source/ui/inc/dlgsnap.hxx index 163828bc14c9..2813edaf89d4 100644 --- a/sd/source/ui/inc/dlgsnap.hxx +++ b/sd/source/ui/inc/dlgsnap.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,23 +55,23 @@ namespace sd { class SdSnapLineDlg : public ModalDialog { private: - FixedLine aFlPos; - FixedText aFtX; - MetricField aMtrFldX; - FixedText aFtY; - MetricField aMtrFldY; - FixedLine aFlDir; - ImageRadioButton aRbPoint; - ImageRadioButton aRbVert; - ImageRadioButton aRbHorz; - OKButton aBtnOK; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - PushButton aBtnDelete; - long nXValue; - long nYValue; - FieldUnit eUIUnit; - Fraction aUIScale; + FixedLine aFlPos; + FixedText aFtX; + MetricField aMtrFldX; + FixedText aFtY; + MetricField aMtrFldY; + FixedLine aFlDir; + ImageRadioButton aRbPoint; + ImageRadioButton aRbVert; + ImageRadioButton aRbHorz; + OKButton aBtnOK; + CancelButton aBtnCancel; + HelpButton aBtnHelp; + PushButton aBtnDelete; + long nXValue; + long nYValue; + FieldUnit eUIUnit; + Fraction aUIScale; DECL_LINK( ClickHdl, Button * ); @@ -87,6 +87,6 @@ public: -#endif // _SD_DLGSNAP_HXX +#endif // _SD_DLGSNAP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx index 95cd38dccd33..9a0a5debf00b 100644 --- a/sd/source/ui/inc/docprev.hxx +++ b/sd/source/ui/inc/docprev.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,16 +50,16 @@ class SD_DLLPUBLIC SdDocPreviewWin : public Control, public SfxListener { protected: GDIMetaFile* pMetaFile; - BOOL bInEffect; - Link aClickHdl; + BOOL bInEffect; + Link aClickHdl; SfxObjectShell* mpObj; - sal_uInt16 mnShowPage; - Color maDocumentColor; + sal_uInt16 mnShowPage; + Color maDocumentColor; rtl::Reference< sd::SlideShow > mxSlideShow; - virtual void Paint( const Rectangle& rRect ); - static void CalcSizeAndPos( GDIMetaFile* pFile, Size& rSize, Point& rPoint ); - void ImpPaint( GDIMetaFile* pFile, OutputDevice* pVDev ); + virtual void Paint( const Rectangle& rRect ); + static void CalcSizeAndPos( GDIMetaFile* pFile, Size& rSize, Point& rPoint ); + void ImpPaint( GDIMetaFile* pFile, OutputDevice* pVDev ); static const int FRAME; @@ -74,12 +74,12 @@ public: ~SdDocPreviewWin(); void SetObjectShell( SfxObjectShell* pObj, sal_uInt16 nShowPage = 0 ); virtual void Resize(); - void startPreview(); + void startPreview(); - virtual long Notify( NotifyEvent& rNEvt ); + virtual long Notify( NotifyEvent& rNEvt ); - void SetClickHdl( const Link& rLink ) { aClickHdl = rLink; } - const Link& GetClickHdl() const { return aClickHdl; } + void SetClickHdl( const Link& rLink ) { aClickHdl = rLink; } + const Link& GetClickHdl() const { return aClickHdl; } virtual void DataChanged( const DataChangedEvent& rDCEvt ); diff --git a/sd/source/ui/inc/drawview.hxx b/sd/source/ui/inc/drawview.hxx index 57eed72e3c32..206637f9e3b9 100644 --- a/sd/source/ui/inc/drawview.hxx +++ b/sd/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 @@ -53,7 +53,7 @@ public: TYPEINFO(); DrawView ( - DrawDocShell* pDocSh, + DrawDocShell* pDocSh, OutputDevice* pOutDev, DrawViewShell* pShell); virtual ~DrawView (void); @@ -65,9 +65,9 @@ public: virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); - void BlockPageOrderChangedHint(BOOL bBlock); + void BlockPageOrderChangedHint(BOOL bBlock); - BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr = FALSE); + BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr = FALSE); virtual BOOL IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const; virtual void MakeVisible(const Rectangle& rRect, ::Window& rWin); @@ -82,11 +82,11 @@ protected: private: friend class DrawViewRedirector; - DrawDocShell* mpDocShell; - DrawViewShell* mpDrawViewShell; - VirtualDevice* mpVDev; + DrawDocShell* mpDocShell; + DrawViewShell* mpDrawViewShell; + VirtualDevice* mpVDev; - USHORT mnPOCHSmph; // zum blockieren des PageOrderChangedHint + USHORT mnPOCHSmph; // zum blockieren des PageOrderChangedHint }; } // end of namespace sd diff --git a/sd/source/ui/inc/enumdlg.hrc b/sd/source/ui/inc/enumdlg.hrc index 5b3b4e127b06..46db72ad5318 100644 --- a/sd/source/ui/inc/enumdlg.hrc +++ b/sd/source/ui/inc/enumdlg.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/sd/source/ui/inc/filedlg.hxx b/sd/source/ui/inc/filedlg.hxx index ae5aa687db12..2115796323bb 100644 --- a/sd/source/ui/inc/filedlg.hxx +++ b/sd/source/ui/inc/filedlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,14 +45,14 @@ class SdFileDialog_Imp; /******************************************************************************/ /** - The class SdOpenSoundFileDialog wraps the FileDialogHelper, displaying the - FILEOPEN_PLAY dialog template and performing the 'preview' functionality - (playing the selected sound file). The interface is a downstripped version + The class SdOpenSoundFileDialog wraps the FileDialogHelper, displaying the + FILEOPEN_PLAY dialog template and performing the 'preview' functionality + (playing the selected sound file). The interface is a downstripped version of the aforementioned class, with similar semantics. */ class SD_DLLPUBLIC SdOpenSoundFileDialog { - const std::auto_ptr< SdFileDialog_Imp > mpImpl; + const std::auto_ptr< SdFileDialog_Imp > mpImpl; // forbidden and not implemented SdOpenSoundFileDialog (const SdOpenSoundFileDialog &); @@ -62,8 +62,8 @@ public: SdOpenSoundFileDialog(); ~SdOpenSoundFileDialog(); - ErrCode Execute(); - String GetPath() const; + ErrCode Execute(); + String GetPath() const; void SetPath( const String& rPath ); String ReqDisplayDirectory() const; diff --git a/sd/source/ui/inc/fontwork.hrc b/sd/source/ui/inc/fontwork.hrc index 0f7406cd8b7e..693c3ae9f23f 100644 --- a/sd/source/ui/inc/fontwork.hrc +++ b/sd/source/ui/inc/fontwork.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/sd/source/ui/inc/framework/Configuration.hxx b/sd/source/ui/inc/framework/Configuration.hxx index 6367c058581b..8f5dd6c6a913 100644 --- a/sd/source/ui/inc/framework/Configuration.hxx +++ b/sd/source/ui/inc/framework/Configuration.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,7 +73,7 @@ namespace sd { namespace framework { */ class Configuration : private sd::MutexOwner, - public ConfigurationInterfaceBase + public ConfigurationInterfaceBase { public: /** Create a new configuration with a broadcaster that is used to send @@ -92,12 +92,12 @@ public: ::com::sun::star::drawing::framework::XConfigurationControllerBroadcaster>& rxBroadcaster, bool bBroadcastRequestEvents); virtual ~Configuration (void); - + virtual void SAL_CALL disposing (void); // XConfiguration - + virtual void SAL_CALL addResource ( const ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId>& rxResourceId) @@ -107,7 +107,7 @@ public: const ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId>& rxResourceId) throw (::com::sun::star::uno::RuntimeException); - + virtual ::com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::drawing::framework::XResourceId> > SAL_CALL getResources ( const ::com::sun::star::uno::Reference< @@ -121,14 +121,14 @@ public: rxResourceId) throw (::com::sun::star::uno::RuntimeException); - + // XCloneable virtual ::com::sun::star::uno::Reference<com::sun::star::util::XCloneable> SAL_CALL createClone (void) throw (::com::sun::star::uno::RuntimeException); - + // XNamed /** Return a human readable string representation. This is used for @@ -169,7 +169,7 @@ private: ::com::sun::star::drawing::framework::XConfigurationControllerBroadcaster>& rxBroadcaster, bool bBroadcastRequestEvents, const ResourceContainer& rResourceContainer); - + /** Send an event to all interested listeners that a resource has been added or removed. The event is sent to the listeners via the ConfigurationController. diff --git a/sd/source/ui/inc/framework/ConfigurationController.hxx b/sd/source/ui/inc/framework/ConfigurationController.hxx index b4b41d07064d..221ff7cdaff7 100644 --- a/sd/source/ui/inc/framework/ConfigurationController.hxx +++ b/sd/source/ui/inc/framework/ConfigurationController.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -80,7 +80,7 @@ class ConfigurationUpdaterLock; class ConfigurationController : private sd::MutexOwner, private boost::noncopyable, - public ConfigurationControllerInterfaceBase + public ConfigurationControllerInterfaceBase { public: ConfigurationController (void) throw(); @@ -102,18 +102,18 @@ public: void RequestSynchronousUpdate (void); // XConfigurationController - + virtual void SAL_CALL lock (void) throw (css::uno::RuntimeException); virtual void SAL_CALL unlock (void) throw (css::uno::RuntimeException); - + virtual void SAL_CALL requestResourceActivation ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId, css::drawing::framework::ResourceActivationMode eMode) throw (css::uno::RuntimeException); - + virtual void SAL_CALL requestResourceDeactivation ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId) @@ -144,14 +144,14 @@ public: // XConfigurationControllerBroadcaster - + virtual void SAL_CALL addConfigurationChangeListener ( const css::uno::Reference< css::drawing::framework::XConfigurationChangeListener>& rxListener, const ::rtl::OUString& rsEventType, const css::uno::Any& rUserData) throw (css::uno::RuntimeException); - + virtual void SAL_CALL removeConfigurationChangeListener ( const css::uno::Reference< css::drawing::framework::XConfigurationChangeListener>& rxListener) @@ -166,7 +166,7 @@ public: virtual sal_Bool SAL_CALL hasPendingRequests (void) throw (css::uno::RuntimeException); - + virtual void SAL_CALL postChangeRequest ( const css::uno::Reference< css::drawing::framework::XConfigurationChangeRequest>& rxRequest) @@ -174,12 +174,12 @@ public: // XResourceFactoryManager - + virtual void SAL_CALL addResourceFactory( const ::rtl::OUString& sResourceURL, const css::uno::Reference<css::drawing::framework::XResourceFactory>& rxResourceFactory) throw (css::uno::RuntimeException); - + virtual void SAL_CALL removeResourceFactoryForURL( const ::rtl::OUString& sResourceURL) throw (css::uno::RuntimeException); @@ -195,7 +195,7 @@ public: // XInitialization - + virtual void SAL_CALL initialize( const css::uno::Sequence<css::uno::Any>& rArguments) throw (css::uno::Exception, css::uno::RuntimeException); @@ -214,7 +214,7 @@ public: css::uno::Reference< css::drawing::framework::XConfigurationController> mxController; }; - + private: class Implementation; ::boost::scoped_ptr<Implementation> mpImplementation; diff --git a/sd/source/ui/inc/framework/DrawModule.hxx b/sd/source/ui/inc/framework/DrawModule.hxx index 02ffceb7fafd..14865c67479c 100644 --- a/sd/source/ui/inc/framework/DrawModule.hxx +++ b/sd/source/ui/inc/framework/DrawModule.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx index 8c081cc52eed..df5aba21f3e4 100644 --- a/sd/source/ui/inc/framework/FrameworkHelper.hxx +++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -126,14 +126,14 @@ public: /** Mark the FrameworkHelper object for the given ViewShellBase as disposed. A following ReleaseInstance() call will destroy the FrameworkHelper object. - + Do not call this method. It is an internally used method that can not be made private. */ static void DisposeInstance (ViewShellBase& rBase); /** Destroy the FrameworkHelper object for the given ViewShellBase. - + Do not call this method. It is an internally used method that can not be made private. */ @@ -227,7 +227,7 @@ public: */ void RequestTaskPanel ( const ::rtl::OUString& rsTaskPanelURL); - + /** Process a slot call that requests a view shell change. */ void HandleModeChangeSlot ( @@ -253,7 +253,7 @@ public: rCallback. @param rCallback The callback to be called when the resource is activated. - + */ void RunOnResourceActivation( const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId, @@ -269,7 +269,7 @@ public: Do not use this method until there is absolutely no other way. */ void RequestSynchronousUpdate (void); - + /** Block until the specified event is notified by the configuration controller. When the configuration controller is not processing any requests the method returns immediately. @@ -310,7 +310,7 @@ public: CreateResourceId ( const ::rtl::OUString& rsResourceURL, const ::rtl::OUString& rsAnchorURL); - + /** Create a new XResourceId object for the given resource URL and the two given anchor URLs. */ @@ -353,7 +353,7 @@ private: friend class DisposeListener; css::uno::Reference<css::lang::XComponent> mxDisposeListener; - + FrameworkHelper (ViewShellBase& rBase); FrameworkHelper (const FrameworkHelper& rHelper); // Not implemented. FrameworkHelper& operator= (const FrameworkHelper& rHelper); // Not implemented. diff --git a/sd/source/ui/inc/framework/ImpressModule.hxx b/sd/source/ui/inc/framework/ImpressModule.hxx index 0b3aa49f9c08..3d5744e187a2 100644 --- a/sd/source/ui/inc/framework/ImpressModule.hxx +++ b/sd/source/ui/inc/framework/ImpressModule.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/sd/source/ui/inc/framework/ModuleController.hxx b/sd/source/ui/inc/framework/ModuleController.hxx index a9faab1ec97a..9be39f1e83bd 100644 --- a/sd/source/ui/inc/framework/ModuleController.hxx +++ b/sd/source/ui/inc/framework/ModuleController.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -76,7 +76,7 @@ namespace sd { namespace framework { */ class ModuleController : private sd::MutexOwner, - public ModuleControllerInterfaceBase + public ModuleControllerInterfaceBase { public: static css::uno::Reference< @@ -87,15 +87,15 @@ public: virtual void SAL_CALL disposing (void); - + // XModuleController virtual void SAL_CALL requestResource(const ::rtl::OUString& rsResourceURL) throw (css::uno::RuntimeException); - + // XInitialization - + virtual void SAL_CALL initialize( const css::uno::Sequence<css::uno::Any>& aArguments) throw (css::uno::Exception, css::uno::RuntimeException); @@ -108,14 +108,14 @@ private: ::boost::scoped_ptr<ResourceToFactoryMap> mpResourceToFactoryMap; class LoadedFactoryContainer; ::boost::scoped_ptr<LoadedFactoryContainer> mpLoadedFactories; - + ModuleController ( const css::uno::Reference<css::uno::XComponentContext>& rxContext) throw(); ModuleController (void); // Not implemented. ModuleController (const ModuleController&); // Not implemented. virtual ~ModuleController (void) throw(); - + /** Load a list of URL to service mappings from the /org.openoffice.Office.Impress/MultiPaneGUI/Framework/ResourceFactories configuration entry. The mappings are stored in the @@ -126,7 +126,7 @@ private: /** Called for every entry in the ResourceFactories configuration entry. */ void ProcessFactory (const ::std::vector<css::uno::Any>& rValues); - + /** Instantiate all startup services that are found in the /org.openoffice.Office.Impress/MultiPaneGUI/Framework/StartupServices configuration entry. This method is called once when a new diff --git a/sd/source/ui/inc/framework/Pane.hxx b/sd/source/ui/inc/framework/Pane.hxx index 89de980fe5f9..7293bc53dc58 100644 --- a/sd/source/ui/inc/framework/Pane.hxx +++ b/sd/source/ui/inc/framework/Pane.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace sd { namespace framework { This class has two responsibilities: 1. It implements the XPane interface. This is the most important interface of this class for API based views (of which there not that - many yet) because it gives access to the XWindow. + many yet) because it gives access to the XWindow. 2. It gives access to the underlying VCL Window by implementing the XUnoTunnel interface. This is necessary at the moment and in the foreseeable future because many parts of the Draw and Impress views rely @@ -91,7 +91,7 @@ public: virtual ~Pane (void) throw(); virtual void SAL_CALL disposing (void); - + static const ::com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId (void); /** This method is typically used together with the XUnoTunnel to obtain @@ -99,7 +99,7 @@ public: */ virtual ::Window* GetWindow (void); - + //----- XPane ------------------------------------------------------------- /** For a UNO API based implementation of a view this may the most @@ -116,7 +116,7 @@ public: //----- XPane2 ------------------------------------------------------------- - + virtual sal_Bool SAL_CALL isVisible (void) throw (cssu::RuntimeException); @@ -132,7 +132,7 @@ public: //----- XResource --------------------------------------------------------- - + virtual ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> SAL_CALL getResourceId (void) throw (::com::sun::star::uno::RuntimeException); @@ -143,7 +143,7 @@ public: virtual sal_Bool SAL_CALL isAnchorOnly (void) throw (com::sun::star::uno::RuntimeException); - + //----- XUnoTunnel -------------------------------------------------------- virtual sal_Int64 SAL_CALL getSomething (const com::sun::star::uno::Sequence<sal_Int8>& rId) diff --git a/sd/source/ui/inc/framework/PresentationFactory.hxx b/sd/source/ui/inc/framework/PresentationFactory.hxx index 1c770e6b8cbe..140ce0f22222 100644 --- a/sd/source/ui/inc/framework/PresentationFactory.hxx +++ b/sd/source/ui/inc/framework/PresentationFactory.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace sd { namespace framework { */ class PresentationFactory : private sd::MutexOwner, - public PresentationFactoryInterfaceBase + public PresentationFactoryInterfaceBase { public: static const ::rtl::OUString msPresentationViewURL; @@ -73,10 +73,10 @@ public: PresentationFactory ( const css::uno::Reference<css::frame::XController>& rxController); virtual ~PresentationFactory (void); - + virtual void SAL_CALL disposing (void); - + // XResourceFactory virtual css::uno::Reference<css::drawing::framework::XResource> @@ -98,7 +98,7 @@ public: // lang::XEventListener - + virtual void SAL_CALL disposing ( const css::lang::EventObject& rEventObject) throw (css::uno::RuntimeException); diff --git a/sd/source/ui/inc/framework/PresentationModule.hxx b/sd/source/ui/inc/framework/PresentationModule.hxx index 677fed52ab1b..064c4549da4c 100644 --- a/sd/source/ui/inc/framework/PresentationModule.hxx +++ b/sd/source/ui/inc/framework/PresentationModule.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/sd/source/ui/inc/framework/ResourceId.hxx b/sd/source/ui/inc/framework/ResourceId.hxx index fb4913576b7d..cfcf61d152dd 100644 --- a/sd/source/ui/inc/framework/ResourceId.hxx +++ b/sd/source/ui/inc/framework/ResourceId.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -125,7 +125,7 @@ public: URLs. */ const ::std::vector<rtl::OUString>& GetResourceURLs (void) const; - + //===== XResourceId ======================================================= virtual ::rtl::OUString SAL_CALL @@ -164,7 +164,7 @@ public: css::drawing::framework::XResourceId>& rxResourceId, css::drawing::framework::AnchorBindingMode eMode) throw(css::uno::RuntimeException); - + virtual sal_Bool SAL_CALL isBoundToURL ( const ::rtl::OUString& rsAnchorURL, diff --git a/sd/source/ui/inc/framework/ViewShellWrapper.hxx b/sd/source/ui/inc/framework/ViewShellWrapper.hxx index 96c9261d33cf..e2acb35a9eb0 100644 --- a/sd/source/ui/inc/framework/ViewShellWrapper.hxx +++ b/sd/source/ui/inc/framework/ViewShellWrapper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,7 +79,7 @@ public: ::com::sun::star::drawing::framework::XResourceId>& rxViewId, const ::com::sun::star::uno::Reference<com::sun::star::awt::XWindow>& rxWindow); virtual ~ViewShellWrapper (void); - + virtual void SAL_CALL disposing (void); static const ::com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId (void); @@ -104,7 +104,7 @@ public: virtual sal_Bool SAL_CALL isAnchorOnly (void) throw (com::sun::star::uno::RuntimeException); - + // XRelocatableResource virtual sal_Bool SAL_CALL relocateToAnchor ( @@ -118,15 +118,15 @@ public: virtual void SAL_CALL windowResized( const ::com::sun::star::awt::WindowEvent& rEvent) throw (::com::sun::star::uno::RuntimeException); - + virtual void SAL_CALL windowMoved( const ::com::sun::star::awt::WindowEvent& rEvent) throw (::com::sun::star::uno::RuntimeException); - + virtual void SAL_CALL windowShown( const ::com::sun::star::lang::EventObject& rEvent) throw (::com::sun::star::uno::RuntimeException); - + virtual void SAL_CALL windowHidden( const ::com::sun::star::lang::EventObject& rEvent) throw (::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/inc/fuarea.hxx b/sd/source/ui/inc/fuarea.hxx index fd6fc44a24da..afbe9b6a2773 100644 --- a/sd/source/ui/inc/fuarea.hxx +++ b/sd/source/ui/inc/fuarea.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,10 +45,10 @@ public: private: FuArea ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fubullet.hxx b/sd/source/ui/inc/fubullet.hxx index 151e4c173d47..76108e90384c 100644 --- a/sd/source/ui/inc/fubullet.hxx +++ b/sd/source/ui/inc/fubullet.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ public: private: FuBullet ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq); diff --git a/sd/source/ui/inc/fuchar.hxx b/sd/source/ui/inc/fuchar.hxx index fdd006615466..fc02994de1b4 100644 --- a/sd/source/ui/inc/fuchar.hxx +++ b/sd/source/ui/inc/fuchar.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace sd { -class FuChar +class FuChar : public FuPoor { public: @@ -48,10 +48,10 @@ public: private: FuChar ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fucon3d.hxx b/sd/source/ui/inc/fucon3d.hxx index d064843bc969..4ad0430dd930 100644 --- a/sd/source/ui/inc/fucon3d.hxx +++ b/sd/source/ui/inc/fucon3d.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,17 +53,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 // #97016# virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); private: FuConstruct3dObject ( - ViewShell* pViewSh, + ViewShell* pViewSh, ::sd::Window* pWin, - ::sd::View* pView, + ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq); diff --git a/sd/source/ui/inc/fuconarc.hxx b/sd/source/ui/inc/fuconarc.hxx index 135f5e5fcce5..b2f653d4e9bb 100644 --- a/sd/source/ui/inc/fuconarc.hxx +++ b/sd/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 @@ -34,7 +34,7 @@ namespace sd { -class FuConstructArc +class FuConstructArc : public FuConstruct { public: @@ -49,17 +49,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 // #97016# virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); protected: FuConstructArc ( - ViewShell* pViewSh, + ViewShell* pViewSh, ::sd::Window* pWin, - ::sd::View* pView, + ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq); diff --git a/sd/source/ui/inc/fuconbez.hxx b/sd/source/ui/inc/fuconbez.hxx index cdf93ee99390..2a2ea01a66d3 100644 --- a/sd/source/ui/inc/fuconbez.hxx +++ b/sd/source/ui/inc/fuconbez.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ class DrawViewShell; class Window; -class FuConstructBezierPolygon +class FuConstructBezierPolygon : public FuConstruct { public: @@ -56,8 +56,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 virtual void SelectionHasChanged(); @@ -69,15 +69,15 @@ public: protected: FuConstructBezierPolygon ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); USHORT nEditMode; - ::com::sun::star::uno::Any maTargets; // used for creating a path for custom animations + ::com::sun::star::uno::Any maTargets; // used for creating a path for custom animations }; } // end of namespace sd diff --git a/sd/source/ui/inc/fuconcs.hxx b/sd/source/ui/inc/fuconcs.hxx index eaea8ba0fe22..6924db3c4927 100644 --- a/sd/source/ui/inc/fuconcs.hxx +++ b/sd/source/ui/inc/fuconcs.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,7 +60,7 @@ public: virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - virtual void Activate(); // Function aktivieren + virtual void Activate(); // Function aktivieren void SetAttributes( SdrObject* pObj ); @@ -72,9 +72,9 @@ public: protected: FuConstructCustomShape ( - ViewShell* pViewSh, + ViewShell* pViewSh, ::sd::Window* pWin, - ::sd::View* pView, + ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq); diff --git a/sd/source/ui/inc/fuconnct.hxx b/sd/source/ui/inc/fuconnct.hxx index 42377374ea80..0f923cd8639f 100644 --- a/sd/source/ui/inc/fuconnct.hxx +++ b/sd/source/ui/inc/fuconnct.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace sd { -class FuConnectionDlg +class FuConnectionDlg : public FuPoor { public: @@ -45,10 +45,10 @@ public: private: FuConnectionDlg ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fuconrec.hxx b/sd/source/ui/inc/fuconrec.hxx index 140f4f36c1c2..268456a330bd 100644 --- a/sd/source/ui/inc/fuconrec.hxx +++ b/sd/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 @@ -45,7 +45,7 @@ namespace sd { |* \************************************************************************/ -class FuConstructRectangle +class FuConstructRectangle : public FuConstruct { public: @@ -60,8 +60,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 void SetAttributes(SfxItemSet& rAttr, SdrObject* pObj); void SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj); @@ -71,9 +71,9 @@ public: protected: FuConstructRectangle ( - ViewShell* pViewSh, + ViewShell* pViewSh, ::sd::Window* pWin, - ::sd::View* pView, + ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq); diff --git a/sd/source/ui/inc/fuconstr.hxx b/sd/source/ui/inc/fuconstr.hxx index 62b57f733a34..fe04226e6e64 100644 --- a/sd/source/ui/inc/fuconstr.hxx +++ b/sd/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 @@ -43,7 +43,7 @@ namespace sd { |* \************************************************************************/ -class FuConstruct +class FuConstruct : public FuDraw { public: @@ -52,15 +52,15 @@ public: TYPEINFO(); virtual void DoExecute( SfxRequest& rReq ); - + // Mouse- & Key-Events virtual BOOL KeyInput(const KeyEvent& rKEvt); virtual BOOL MouseMove(const MouseEvent& rMEvt); 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 SelectionHasChanged() { bSelectionChanged = TRUE; } @@ -74,10 +74,10 @@ public: const sal_Bool bUseFillStyle, const sal_Bool bUseNoFillStyle ); protected: - FuConstruct (ViewShell* pViewSh, - ::sd::Window* pWin, + FuConstruct (ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); bool bSelectionChanged; @@ -85,6 +85,6 @@ protected: } // end of namespace sd -#endif // _SD_FUCONSTR_HXX +#endif // _SD_FUCONSTR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/fuconuno.hxx b/sd/source/ui/inc/fuconuno.hxx index b9c67003eaa2..e2d6f4d1bfd0 100644 --- a/sd/source/ui/inc/fuconuno.hxx +++ b/sd/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 @@ -40,7 +40,7 @@ namespace sd { |* \************************************************************************/ -class FuConstructUnoControl +class FuConstructUnoControl : public FuConstruct { public: @@ -55,21 +55,21 @@ 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 // #97016# virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); protected: FuConstructUnoControl( - ViewShell* pViewSh, + ViewShell* pViewSh, ::sd::Window* pWin, - ::sd::View* pView, + ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq); - String aOldLayer; + String aOldLayer; private: UINT32 nInventor; diff --git a/sd/source/ui/inc/fucopy.hxx b/sd/source/ui/inc/fucopy.hxx index 809b988ce83e..2b244ef9b45d 100644 --- a/sd/source/ui/inc/fucopy.hxx +++ b/sd/source/ui/inc/fucopy.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace sd { -class FuCopy +class FuCopy : public FuPoor { public: @@ -45,10 +45,10 @@ public: private: FuCopy ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fucushow.hxx b/sd/source/ui/inc/fucushow.hxx index fa3b3f196ed4..783d755efc18 100644 --- a/sd/source/ui/inc/fucushow.hxx +++ b/sd/source/ui/inc/fucushow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace sd { -class FuCustomShowDlg +class FuCustomShowDlg : public FuPoor { public: @@ -44,10 +44,10 @@ public: private: FuCustomShowDlg ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fudraw.hxx b/sd/source/ui/inc/fudraw.hxx index 26c332f392dd..f9321c187c15 100644 --- a/sd/source/ui/inc/fudraw.hxx +++ b/sd/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 @@ -43,7 +43,7 @@ namespace sd { |* \************************************************************************/ -class FuDraw +class FuDraw : public FuPoor { public: @@ -65,7 +65,7 @@ public: virtual void DoubleClick(const MouseEvent& rMEvt); - BOOL SetPointer(SdrObject* pObj, const Point& rPos); + BOOL SetPointer(SdrObject* pObj, const Point& rPos); BOOL SetHelpText(SdrObject* pObj, const Point& rPos, const SdrViewEvent& rVEvt); void SetPermanent(BOOL bSet) { bPermanent = bSet; } @@ -79,25 +79,25 @@ public: virtual bool cancel(); protected: - FuDraw (ViewShell* pViewSh, - ::sd::Window* pWin, + FuDraw (ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); virtual ~FuDraw(); Pointer aNewPointer; Pointer aOldPointer; - BOOL bMBDown; - BOOL bDragHelpLine; - USHORT nHelpLine; + BOOL bMBDown; + BOOL bDragHelpLine; + USHORT nHelpLine; BOOL bPermanent; }; } // end of namespace sd -#endif // _SD_FUDRAW_HXX +#endif // _SD_FUDRAW_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/fudspord.hxx b/sd/source/ui/inc/fudspord.hxx index 3167d95e6f7f..e3186dcd642e 100644 --- a/sd/source/ui/inc/fudspord.hxx +++ b/sd/source/ui/inc/fudspord.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ namespace sd { |* \************************************************************************/ -class FuDisplayOrder +class FuDisplayOrder : public FuPoor { public: @@ -57,28 +57,28 @@ 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 protected: virtual ~FuDisplayOrder (void); void implClearOverlay(); - Pointer maPtr; - SdrObject* mpRefObj; - SdrDropMarkerOverlay* mpOverlay; + Pointer maPtr; + SdrObject* mpRefObj; + SdrDropMarkerOverlay* mpOverlay; private: FuDisplayOrder ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, - SfxRequest& rReq); + SdDrawDocument* pDoc, + SfxRequest& rReq); }; } // end of namespace sd -#endif // _SD_FUDSPORD_HXX +#endif // _SD_FUDSPORD_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/fuediglu.hxx b/sd/source/ui/inc/fuediglu.hxx index 82a9e50fd60f..b5d8a93de352 100644 --- a/sd/source/ui/inc/fuediglu.hxx +++ b/sd/source/ui/inc/fuediglu.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,12 +39,12 @@ namespace sd { |* \************************************************************************/ -class FuEditGluePoints +class FuEditGluePoints : public FuDraw { public: TYPEINFO(); - + static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent ); virtual void DoExecute( SfxRequest& rReq ); @@ -56,15 +56,15 @@ public: virtual BOOL Command(const CommandEvent& rCEvt); virtual void ReceiveRequest(SfxRequest& rReq); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren protected: FuEditGluePoints ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); virtual ~FuEditGluePoints (void); }; diff --git a/sd/source/ui/inc/fuexpand.hxx b/sd/source/ui/inc/fuexpand.hxx index 47ca7580aab0..fb37e32a6ed0 100644 --- a/sd/source/ui/inc/fuexpand.hxx +++ b/sd/source/ui/inc/fuexpand.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace sd { -class FuExpandPage +class FuExpandPage : public FuPoor { public: @@ -44,10 +44,10 @@ class FuExpandPage private: FuExpandPage ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fuformatpaintbrush.hxx b/sd/source/ui/inc/fuformatpaintbrush.hxx index 1eb9a3223fc0..15848af8a691 100644 --- a/sd/source/ui/inc/fuformatpaintbrush.hxx +++ b/sd/source/ui/inc/fuformatpaintbrush.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,12 +61,12 @@ private: FuFormatPaintBrush ( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq); void DoExecute( SfxRequest& rReq ); - + bool HasContentForThisType( UINT32 nObjectInventor, UINT16 nObjectIdentifier ) const; void Paste( bool, bool ); - + void implcancel(); - + ::boost::shared_ptr<SfxItemSet> mpItemSet; bool mbPermanent; bool mbOldIsQuickTextEditMode; diff --git a/sd/source/ui/inc/fugrid.hxx b/sd/source/ui/inc/fugrid.hxx index a86c34f62e07..4e21704f434b 100644 --- a/sd/source/ui/inc/fugrid.hxx +++ b/sd/source/ui/inc/fugrid.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace sd { -class FuGrid +class FuGrid : public FuPoor { public: @@ -46,10 +46,10 @@ public: private: FuGrid ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fuhhconv.hxx b/sd/source/ui/inc/fuhhconv.hxx index 65eab16ea831..c41bd53a5573 100644 --- a/sd/source/ui/inc/fuhhconv.hxx +++ b/sd/source/ui/inc/fuhhconv.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 FuHangulHanjaConversion : public FuPoor static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - void StartConversion( INT16 nSourceLanguage, INT16 nTargetLanguage, + void StartConversion( INT16 nSourceLanguage, INT16 nTargetLanguage, const Font *pTargetFont, INT32 nOptions, BOOL bIsInteractive ); void StartChineseConversion(); @@ -55,15 +55,15 @@ class FuHangulHanjaConversion : public FuPoor protected: ~FuHangulHanjaConversion(); - Outliner* pSdOutliner; - BOOL bOwnOutliner; + Outliner* pSdOutliner; + BOOL bOwnOutliner; private: FuHangulHanjaConversion ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq ); }; diff --git a/sd/source/ui/inc/fuinsert.hxx b/sd/source/ui/inc/fuinsert.hxx index 7a1330318122..e54f7d42c616 100644 --- a/sd/source/ui/inc/fuinsert.hxx +++ b/sd/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 @@ -33,7 +33,7 @@ namespace sd { -class FuInsertGraphic +class FuInsertGraphic : public FuPoor { public: @@ -45,17 +45,17 @@ public: private: FuInsertGraphic ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; /************************************************************************/ -class FuInsertClipboard +class FuInsertClipboard : public FuPoor { public: @@ -66,17 +66,17 @@ public: private: FuInsertClipboard ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; /************************************************************************/ -class FuInsertOLE +class FuInsertOLE : public FuPoor { public: @@ -87,10 +87,10 @@ class FuInsertOLE private: FuInsertOLE ( - ViewShell* pViewSh, + ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; @@ -107,10 +107,10 @@ public: private: FuInsertAVMedia ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fuinsfil.hxx b/sd/source/ui/inc/fuinsfil.hxx index 16d4bb0f346a..0f65f0f894f9 100644 --- a/sd/source/ui/inc/fuinsfil.hxx +++ b/sd/source/ui/inc/fuinsfil.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ struct StyleRequestData; namespace sd { -class FuInsertFile +class FuInsertFile : public FuPoor { public: @@ -50,15 +50,15 @@ public: private: FuInsertFile ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); - + String aLayoutName; // Layoutname der aktuell eingefuegten Seite String aFilterName; // gewaehlter Dateifilter - String aFile; // gewaehlter Dateiname + String aFile; // gewaehlter Dateiname void InsTextOrRTFinOlMode(SfxMedium* pMedium); BOOL InsSDDinOlMode(SfxMedium* pMedium); diff --git a/sd/source/ui/inc/fuline.hxx b/sd/source/ui/inc/fuline.hxx index 77035fb14b2e..936357e695c9 100644 --- a/sd/source/ui/inc/fuline.hxx +++ b/sd/source/ui/inc/fuline.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace sd { -class FuLine +class FuLine : public FuPoor { public: @@ -48,10 +48,10 @@ public: private: FuLine ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fulinend.hxx b/sd/source/ui/inc/fulinend.hxx index 5e44f1b535a9..cda6c5c49e31 100644 --- a/sd/source/ui/inc/fulinend.hxx +++ b/sd/source/ui/inc/fulinend.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace sd { -class FuLineEnd +class FuLineEnd : public FuPoor { public: @@ -48,10 +48,10 @@ public: private: FuLineEnd ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fulink.hxx b/sd/source/ui/inc/fulink.hxx index 03197da354d5..aa675b338c69 100644 --- a/sd/source/ui/inc/fulink.hxx +++ b/sd/source/ui/inc/fulink.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace sd { -class FuLink +class FuLink : public FuPoor { public: @@ -45,10 +45,10 @@ public: private: FuLink ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq ); }; diff --git a/sd/source/ui/inc/fumeasur.hxx b/sd/source/ui/inc/fumeasur.hxx index 7bc6d41c9e00..7781429d0d61 100644 --- a/sd/source/ui/inc/fumeasur.hxx +++ b/sd/source/ui/inc/fumeasur.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace sd { -class FuMeasureDlg +class FuMeasureDlg : public FuPoor { public: @@ -45,10 +45,10 @@ class FuMeasureDlg private: FuMeasureDlg ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fumorph.hxx b/sd/source/ui/inc/fumorph.hxx index 1137823d1f04..32c386065b0f 100644 --- a/sd/source/ui/inc/fumorph.hxx +++ b/sd/source/ui/inc/fumorph.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,15 +37,15 @@ |* \************************************************************************/ class List; -namespace basegfx { +namespace basegfx { class B2DPolyPolygon; class B2DPolygon; - class B2DPoint; + class B2DPoint; } namespace sd { -class FuMorph +class FuMorph : public FuPoor { public: @@ -56,16 +56,16 @@ public: private: FuMorph ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); void ImpInsertPolygons(List& rPolyPolyList3D, BOOL bAttributeFade, const SdrObject* pObj1, const SdrObject* pObj2); - ::basegfx::B2DPolyPolygon* ImpCreateMorphedPolygon( - const ::basegfx::B2DPolyPolygon& rPolyPolyStart, + ::basegfx::B2DPolyPolygon* ImpCreateMorphedPolygon( + const ::basegfx::B2DPolyPolygon& rPolyPolyStart, const ::basegfx::B2DPolyPolygon& rPolyPolyEnd, double fMorphingFactor); sal_Bool ImpMorphPolygons( diff --git a/sd/source/ui/inc/fuoaprms.hxx b/sd/source/ui/inc/fuoaprms.hxx index 6e8990e1fa61..2728e2339f45 100644 --- a/sd/source/ui/inc/fuoaprms.hxx +++ b/sd/source/ui/inc/fuoaprms.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace sd { -class FuObjectAnimationParameters +class FuObjectAnimationParameters : public FuPoor { public: @@ -47,7 +47,7 @@ private: FuObjectAnimationParameters ( ViewShell* pViewSh, ::sd::Window* pWin, - ::sd::View* pView, + ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fuolbull.hxx b/sd/source/ui/inc/fuolbull.hxx index 0d233f7b79ad..06c395570a82 100644 --- a/sd/source/ui/inc/fuolbull.hxx +++ b/sd/source/ui/inc/fuolbull.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ class Window; |* \************************************************************************/ -class FuOutlineBullet +class FuOutlineBullet : public FuPoor { public: @@ -57,10 +57,10 @@ public: private: FuOutlineBullet ( - ViewShell* pViewShell, - ::sd::Window* pWin, + ViewShell* pViewShell, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fuoltext.hxx b/sd/source/ui/inc/fuoltext.hxx index e3a248d5bdec..b1ce15c604c1 100644 --- a/sd/source/ui/inc/fuoltext.hxx +++ b/sd/source/ui/inc/fuoltext.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ class Window; |* Textfunktionen im Outlinermodus |* \************************************************************************/ -class FuOutlineText +class FuOutlineText : public FuOutline { public: @@ -62,8 +62,8 @@ public: virtual void DoCopy(); virtual void DoPaste(); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren /** Call this method when the text in the outliner (may) has changed. It will invalidate some slots of the view frame and update the @@ -73,10 +73,10 @@ public: protected: FuOutlineText ( - ViewShell* pViewShell, - ::sd::Window* pWin, + ViewShell* pViewShell, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fuoutl.hxx b/sd/source/ui/inc/fuoutl.hxx index eb513c58403c..74074ae396ae 100644 --- a/sd/source/ui/inc/fuoutl.hxx +++ b/sd/source/ui/inc/fuoutl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ class Window; |* \************************************************************************/ -class FuOutline +class FuOutline : public FuPoor { public: @@ -62,10 +62,10 @@ public: protected: FuOutline ( - ViewShell* pViewShell, - ::sd::Window* pWindow, + ViewShell* pViewShell, + ::sd::Window* pWindow, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); OutlineViewShell* pOutlineViewShell; diff --git a/sd/source/ui/inc/fupage.hxx b/sd/source/ui/inc/fupage.hxx index c33a2669ec52..eaf7a892936d 100644 --- a/sd/source/ui/inc/fupage.hxx +++ b/sd/source/ui/inc/fupage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ class SdPage; namespace sd { class DrawViewShell; -class FuPage +class FuPage : public FuPoor { public: @@ -47,8 +47,8 @@ class FuPage static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren const SfxItemSet* ExecuteDialog( Window* pParent ); @@ -57,23 +57,23 @@ protected: private: FuPage ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq ); void ApplyItemSet( const SfxItemSet* pArgs ); - SfxRequest& mrReq; - const SfxItemSet* mpArgs; - SdBackgroundObjUndoAction* mpBackgroundObjUndoAction; - Size maSize; - bool mbPageBckgrdDeleted; - bool mbMasterPage; - bool mbDisplayBackgroundTabPage; - SdPage* mpPage; - DrawViewShell* mpDrawViewShell; + SfxRequest& mrReq; + const SfxItemSet* mpArgs; + SdBackgroundObjUndoAction* mpBackgroundObjUndoAction; + Size maSize; + bool mbPageBckgrdDeleted; + bool mbMasterPage; + bool mbDisplayBackgroundTabPage; + SdPage* mpPage; + DrawViewShell* mpDrawViewShell; }; } // end of namespace sd diff --git a/sd/source/ui/inc/fuparagr.hxx b/sd/source/ui/inc/fuparagr.hxx index 886b225d0aba..284eb8964a3a 100644 --- a/sd/source/ui/inc/fuparagr.hxx +++ b/sd/source/ui/inc/fuparagr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace sd { -class FuParagraph +class FuParagraph : public FuPoor { public: @@ -47,10 +47,10 @@ public: private: FuParagraph ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fupoor.hxx b/sd/source/ui/inc/fupoor.hxx index 70112574d1bf..f13d50bb358d 100644 --- a/sd/source/ui/inc/fupoor.hxx +++ b/sd/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 @@ -59,8 +59,8 @@ class Window; class FuPoor : public SimpleReferenceComponent { public: - static const int HITPIX = 2; // Hit-Toleranz in Pixel - static const int DRGPIX = 2; // Drag MinMove in Pixel + static const int HITPIX = 2; // Hit-Toleranz in Pixel + static const int DRGPIX = 2; // Drag MinMove in Pixel TYPEINFO(); @@ -84,27 +84,27 @@ public: // #95491# moved from inline to *.cxx virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - + virtual BOOL Command(const CommandEvent& rCEvt); virtual BOOL RequestHelp(const HelpEvent& rHEvt); virtual void Paint(const Rectangle&, ::sd::Window* ); virtual void ReceiveRequest(SfxRequest& rReq); - 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(::sd::Window* pWin) { mpWindow = pWin; } // #97016# II virtual void SelectionHasChanged(); - USHORT GetSlotID() const { return( nSlotId ); } - USHORT GetSlotValue() const { return( nSlotValue ); } + USHORT GetSlotID() const { return( nSlotId ); } + USHORT GetSlotValue() const { return( nSlotValue ); } - void SetNoScrollUntilInside(BOOL bNoScroll = TRUE) + void SetNoScrollUntilInside(BOOL bNoScroll = TRUE) { bNoScrollUntilInside = bNoScroll; } void StartDelayToScrollTimer (); @@ -135,10 +135,10 @@ protected: @param pViewSh May be NULL. */ - FuPoor (ViewShell* pViewSh, - ::sd::Window* pWin, + FuPoor (ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); virtual ~FuPoor (void); @@ -150,7 +150,7 @@ protected: offset relative to the active layer. With respect to the layer bar control at the lower left of the document window positive values move to the right and negative values move to the left. - + <p>Switching the layer is independant of the view's layer mode. The layers are switched even when the layer mode is turned off and the layer control is not visible.</p> @@ -170,36 +170,36 @@ protected: DrawDocShell* mpDocSh; SdDrawDocument* mpDoc; - USHORT nSlotId; - USHORT nSlotValue; + USHORT nSlotId; + USHORT nSlotValue; - Dialog* pDialog; + 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( DragHdl, Timer * ); - BOOL bIsInDragMode; - Point aMDPos; // Position von MouseButtonDown + BOOL bIsInDragMode; + Point aMDPos; // Position von MouseButtonDown // Flag, um AutoScrolling zu verhindern, bis von ausserhalb in das // Fenster hinein gedragt wurde - BOOL bNoScrollUntilInside; + BOOL bNoScrollUntilInside; // Timer um das scrolling zu verzoegern, wenn aus dem fenster // herausgedraggt wird (ca. 1 sec.) - Timer aDelayToScrollTimer; // fuer Verzoegerung bis scroll - BOOL bScrollable; - BOOL bDelayActive; - BOOL bFirstMouseMove; + Timer aDelayToScrollTimer; // fuer Verzoegerung bis scroll + BOOL bScrollable; + BOOL bDelayActive; + BOOL bFirstMouseMove; // #95491# member to hold state of the mouse buttons for creation // of own MouseEvents (like in ScrollHdl) private: - sal_uInt16 mnCode; + sal_uInt16 mnCode; }; @@ -207,6 +207,6 @@ typedef rtl::Reference< FuPoor > FunctionReference; } // end of namespace sd -#endif // _SD_FUPOOR_HXX +#endif // _SD_FUPOOR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/fuprlout.hxx b/sd/source/ui/inc/fuprlout.hxx index 8d03750c7900..6b89b96b1da1 100644 --- a/sd/source/ui/inc/fuprlout.hxx +++ b/sd/source/ui/inc/fuprlout.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ class View; class ViewShell; class Window; -class FuPresentationLayout +class FuPresentationLayout : public FuPoor { public: @@ -52,10 +52,10 @@ public: private: FuPresentationLayout ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fuprobjs.hxx b/sd/source/ui/inc/fuprobjs.hxx index 949948a32c84..4eba956f3e8d 100644 --- a/sd/source/ui/inc/fuprobjs.hxx +++ b/sd/source/ui/inc/fuprobjs.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ class ViewShell; class Window; -class FuPresentationObjects +class FuPresentationObjects : public FuPoor { public: @@ -52,10 +52,10 @@ public: private: FuPresentationObjects ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fuscale.hxx b/sd/source/ui/inc/fuscale.hxx index 3af6a8fdd4cf..325aa0ccde90 100644 --- a/sd/source/ui/inc/fuscale.hxx +++ b/sd/source/ui/inc/fuscale.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace sd { -class FuScale +class FuScale : public FuPoor { public: @@ -44,10 +44,10 @@ public: private: FuScale ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fusearch.hxx b/sd/source/ui/inc/fusearch.hxx index 3bbededb5331..1b9f5330570e 100644 --- a/sd/source/ui/inc/fusearch.hxx +++ b/sd/source/ui/inc/fusearch.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace sd { class Outliner; -class FuSearch +class FuSearch : public FuPoor { public: @@ -59,9 +59,9 @@ protected: private: FuSearch ( ViewShell* pViewSh, - ::sd::Window* pWin, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fusel.hxx b/sd/source/ui/inc/fusel.hxx index 3aab29ff0c61..5a23f5533e42 100644 --- a/sd/source/ui/inc/fusel.hxx +++ b/sd/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 @@ -40,7 +40,7 @@ class Sound; namespace sd { -class FuSelection +class FuSelection : public FuDraw { public: @@ -55,15 +55,15 @@ 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 SelectionHasChanged(); void SetEditMode(USHORT nMode); USHORT GetEditMode() { return nEditMode; } - BOOL AnimateObj(SdrObject* pObj, const Point& rPos); + BOOL AnimateObj(SdrObject* pObj, const Point& rPos); /** is called when the currenct function should be aborted. <p> This is used when a function gets a KEY_ESCAPE but can also @@ -74,15 +74,15 @@ public: virtual bool cancel(); protected: - FuSelection (ViewShell* pViewSh, - ::sd::Window* pWin, + FuSelection (ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); virtual ~FuSelection(); - BOOL bTempRotation; + BOOL bTempRotation; BOOL bSelectionChanged; BOOL bHideAndAnimate; SdrHdl* pHdl; @@ -109,6 +109,6 @@ private: } // end of namespace sd -#endif // _SD_FUSEL_HXX +#endif // _SD_FUSEL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/fusldlg.hxx b/sd/source/ui/inc/fusldlg.hxx index bc5b99acdfb7..4342058b5035 100644 --- a/sd/source/ui/inc/fusldlg.hxx +++ b/sd/source/ui/inc/fusldlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace sd { -class FuSlideShowDlg +class FuSlideShowDlg : public FuPoor { public: @@ -44,10 +44,10 @@ public: private: FuSlideShowDlg ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fuslhide.hxx b/sd/source/ui/inc/fuslhide.hxx index 587f7387b243..dcceef0dceb4 100644 --- a/sd/source/ui/inc/fuslhide.hxx +++ b/sd/source/ui/inc/fuslhide.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace sd { |* \************************************************************************/ -class FuSlideHide +class FuSlideHide : public FuSlide { public: @@ -50,10 +50,10 @@ public: protected: FuSlideHide ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); virtual ~FuSlideHide (void); }; diff --git a/sd/source/ui/inc/fuslid.hxx b/sd/source/ui/inc/fuslid.hxx index 6e17e21d3941..64312fee2aff 100644 --- a/sd/source/ui/inc/fuslid.hxx +++ b/sd/source/ui/inc/fuslid.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ class Window; |* \************************************************************************/ -class FuSlide +class FuSlide : public FuPoor { public: @@ -63,14 +63,14 @@ public: protected: FuSlide ( - SlideViewShell* pViewSh, + SlideViewShell* pViewSh, ::sd::Window* pWin, - SlideView* pView, - SdDrawDocument* pDoc, + SlideView* pView, + SdDrawDocument* pDoc, SfxRequest& rReq); SlideViewShell* pSlViewShell; - SlideView* pSlView; + SlideView* pSlView; }; } // end of namespace sd diff --git a/sd/source/ui/inc/fuslsel.hxx b/sd/source/ui/inc/fuslsel.hxx index 3e07ad886a29..23b4549299ea 100644 --- a/sd/source/ui/inc/fuslsel.hxx +++ b/sd/source/ui/inc/fuslsel.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,12 +43,12 @@ class Window; struct FSS_IsShowingEffectInfo { - BOOL bIsShowingEffect; // TRUE while we show a fade effect one the slide view - BOOL bDisposed; // TRUE if the FuSlideSelection was deleted during fade effect + BOOL bIsShowingEffect; // TRUE while we show a fade effect one the slide view + BOOL bDisposed; // TRUE if the FuSlideSelection was deleted during fade effect }; -class FuSlideSelection +class FuSlideSelection : public FuSlide { public: @@ -63,13 +63,13 @@ public: virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); virtual void Paint(const Rectangle& rRect, ::sd::Window* pWin); - - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren - + + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren + virtual void ScrollStart(); virtual void ScrollEnd(); - + BOOL IsShowingEffect() const { return pIsShowingEffectInfo && pIsShowingEffectInfo->bIsShowingEffect; } /** is called when the currenct function should be aborted. <p> @@ -82,23 +82,23 @@ public: protected: FuSlideSelection ( - SlideViewShell* pViewSh, + SlideViewShell* pViewSh, ::sd::Window* pWin, - SlideView* pView, + SlideView* pView, SdDrawDocument* pDoc, SfxRequest& rReq); virtual ~FuSlideSelection (void); private: - BOOL bSubstShown; - BOOL bPageHit; - List aSubstList; // Liste mit Ertsatzdarstellungen - Point aDragPos; // hier wird die Seite angefasst - BOOL bDragSelection; - Point aDragSelRectAnchor; // fester Punkt des Selektionsrechtecks - Rectangle aDragSelRect; - Point aPosOfInsertMarker; - FSS_IsShowingEffectInfo* pIsShowingEffectInfo; + BOOL bSubstShown; + BOOL bPageHit; + List aSubstList; // Liste mit Ertsatzdarstellungen + Point aDragPos; // hier wird die Seite angefasst + BOOL bDragSelection; + Point aDragSelRectAnchor; // fester Punkt des Selektionsrechtecks + Rectangle aDragSelRect; + Point aPosOfInsertMarker; + FSS_IsShowingEffectInfo* pIsShowingEffectInfo; void DrawInsertMarker(BOOL bShow); Point CalcPosOfInsertMarker(const Point& rPoint); diff --git a/sd/source/ui/inc/fusnapln.hxx b/sd/source/ui/inc/fusnapln.hxx index ed5b6408487b..ec677511bf3a 100644 --- a/sd/source/ui/inc/fusnapln.hxx +++ b/sd/source/ui/inc/fusnapln.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace sd { -class FuSnapLine +class FuSnapLine : public FuPoor { public: @@ -47,10 +47,10 @@ public: private: FuSnapLine ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fusumry.hxx b/sd/source/ui/inc/fusumry.hxx index c88475e7697f..dc868acbb2fc 100644 --- a/sd/source/ui/inc/fusumry.hxx +++ b/sd/source/ui/inc/fusumry.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace sd { -class FuSummaryPage +class FuSummaryPage : public FuPoor { public: @@ -44,10 +44,10 @@ public: private: FuSummaryPage ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/futempl.hxx b/sd/source/ui/inc/futempl.hxx index 5d63db2f6ec4..91e78d33b4cd 100644 --- a/sd/source/ui/inc/futempl.hxx +++ b/sd/source/ui/inc/futempl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace sd { -class FuTemplate +class FuTemplate : public FuPoor { public: @@ -47,10 +47,10 @@ public: private: FuTemplate ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/futext.hxx b/sd/source/ui/inc/futext.hxx index bd732ab3a534..d169ac700f67 100644 --- a/sd/source/ui/inc/futext.hxx +++ b/sd/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 @@ -47,7 +47,7 @@ namespace sd { |* \************************************************************************/ -class FuText +class FuText : public FuConstruct { public: @@ -65,11 +65,11 @@ public: virtual void ReceiveRequest(SfxRequest& rReq); virtual void DoubleClick(const MouseEvent& rMEvt); - virtual void Activate(); // Function aktivieren - virtual void Deactivate(); // Function deaktivieren + virtual void Activate(); // Function aktivieren + virtual void Deactivate(); // Function deaktivieren void SetInEditMode(const MouseEvent& rMEvt, BOOL bQuickDrag); - BOOL DeleteDefaultText(); + BOOL DeleteDefaultText(); SdrTextObj* GetTextObj() { return static_cast< SdrTextObj* >( mxTextObj.get() ); } DECL_LINK(SpellError, void* ); @@ -88,19 +88,19 @@ public: static void ChangeFontSize( bool, OutlinerView*, const FontList*, ::sd::View* ); protected: - FuText (ViewShell* pViewSh, - ::sd::Window* pWin, + FuText (ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); virtual void disposing(); - SdrObjectWeakRef mxTextObj; + SdrObjectWeakRef mxTextObj; Link aOldLink; BOOL bFirstObjCreated; - SfxRequest& rRequest; + SfxRequest& rRequest; private: // #97016# diff --git a/sd/source/ui/inc/futhes.hxx b/sd/source/ui/inc/futhes.hxx index c829c46f7b27..8c46681a495e 100644 --- a/sd/source/ui/inc/futhes.hxx +++ b/sd/source/ui/inc/futhes.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace sd { -class FuThesaurus +class FuThesaurus : public FuPoor { public: @@ -44,10 +44,10 @@ public: private: FuThesaurus ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/futransf.hxx b/sd/source/ui/inc/futransf.hxx index aca70cf6e0cf..8e2a2281309c 100644 --- a/sd/source/ui/inc/futransf.hxx +++ b/sd/source/ui/inc/futransf.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ namespace sd { -class FuTransform +class FuTransform : public FuPoor { public: @@ -45,10 +45,10 @@ public: private: FuTransform ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/futxtatt.hxx b/sd/source/ui/inc/futxtatt.hxx index 123c0043fcd2..a8d2ac21211a 100644 --- a/sd/source/ui/inc/futxtatt.hxx +++ b/sd/source/ui/inc/futxtatt.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace sd { -class FuTextAttrDlg +class FuTextAttrDlg : public FuPoor { public: @@ -44,10 +44,10 @@ class FuTextAttrDlg private: FuTextAttrDlg ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fuvect.hxx b/sd/source/ui/inc/fuvect.hxx index b29d607ca708..7aa80e057216 100644 --- a/sd/source/ui/inc/fuvect.hxx +++ b/sd/source/ui/inc/fuvect.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace sd { -class FuVectorize +class FuVectorize : public FuPoor { public: @@ -45,10 +45,10 @@ public: private: FuVectorize ( - ViewShell* pViewSh, - ::sd::Window* pWin, + ViewShell* pViewSh, + ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/fuzoom.hxx b/sd/source/ui/inc/fuzoom.hxx index 793f073a9cb9..a97516ebcd80 100644 --- a/sd/source/ui/inc/fuzoom.hxx +++ b/sd/source/ui/inc/fuzoom.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,39 +36,39 @@ namespace sd { extern USHORT SidArrayZoom[]; -class FuZoom +class FuZoom : public FuPoor { public: TYPEINFO(); static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - + // Mouse- & Key-Events virtual BOOL MouseMove(const MouseEvent& rMEvt); 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 protected: virtual ~FuZoom (void); - Point aBeginPosPix; - Point aBeginPos; - Point aEndPos; - Rectangle aZoomRect; - BOOL bVisible; - BOOL bStartDrag; - Pointer aPtr; + Point aBeginPosPix; + Point aBeginPos; + Point aEndPos; + Rectangle aZoomRect; + BOOL bVisible; + BOOL bStartDrag; + Pointer aPtr; private: FuZoom ( - ViewShell* pViewSh, + ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, - SdDrawDocument* pDoc, + SdDrawDocument* pDoc, SfxRequest& rReq); }; diff --git a/sd/source/ui/inc/gluectrl.hxx b/sd/source/ui/inc/gluectrl.hxx index 93cf110f0a47..32ca96be16a4 100644 --- a/sd/source/ui/inc/gluectrl.hxx +++ b/sd/source/ui/inc/gluectrl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 GlueEscDirLB : public ListBox private: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; public: - GlueEscDirLB( Window* pParent, + GlueEscDirLB( Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); ~GlueEscDirLB(); virtual void Select(); - void Fill(); + void Fill(); }; /************************************************************************* @@ -60,12 +60,12 @@ public: class SdTbxCtlGlueEscDir: public SfxToolBoxControl { private: - UINT16 GetEscDirPos( UINT16 nEscDir ); + UINT16 GetEscDirPos( UINT16 nEscDir ); public: virtual void StateChanged( USHORT nSId, SfxItemState eState, const SfxPoolItem* pState ); - virtual Window* CreateItemWindow( Window *pParent ); + virtual Window* CreateItemWindow( Window *pParent ); SFX_DECL_TOOLBOX_CONTROL(); diff --git a/sd/source/ui/inc/headerfooterdlg.hrc b/sd/source/ui/inc/headerfooterdlg.hrc index d79874d42faa..458d8e8e21a5 100644 --- a/sd/source/ui/inc/headerfooterdlg.hrc +++ b/sd/source/ui/inc/headerfooterdlg.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,31 +25,31 @@ * ************************************************************************/ -#define FL_INCLUDE_ON_PAGE 1 -#define CB_DATETIME 2 -#define RB_DATETIME_FIXED 3 -#define TB_DATETIME_FIXED 4 -#define RB_DATETIME_AUTOMATIC 5 -#define CB_DATETIME_FORMAT 6 -#define FT_DATETIME_LANGUAGE 7 -#define CB_DATETIME_LANGUAGE 8 -#define FL_FOOTER 9 -#define CB_FOOTER 10 -#define FT_FOOTER 11 -#define TB_FOOTER_FIXED 12 -#define FL_SLIDENUMBER 13 -#define CB_SLIDENUMBER 14 -#define FL_NOTONTITLE 15 -#define CB_NOTONTITLE 16 -#define BT_APPLYTOALL 17 -#define BT_APPLY 18 -#define BT_CANCEL 19 -#define BT_HELP 20 -#define FL_HEADER 21 -#define CB_HEADER 22 -#define FT_HEADER 23 -#define TB_HEADER_FIXED 24 -#define FL_DATETIME 25 -#define CT_PREVIEW 26 -#define STR_PAGE_NUMBER 27 -#define STR_INCLUDE_ON_PAGE 28 +#define FL_INCLUDE_ON_PAGE 1 +#define CB_DATETIME 2 +#define RB_DATETIME_FIXED 3 +#define TB_DATETIME_FIXED 4 +#define RB_DATETIME_AUTOMATIC 5 +#define CB_DATETIME_FORMAT 6 +#define FT_DATETIME_LANGUAGE 7 +#define CB_DATETIME_LANGUAGE 8 +#define FL_FOOTER 9 +#define CB_FOOTER 10 +#define FT_FOOTER 11 +#define TB_FOOTER_FIXED 12 +#define FL_SLIDENUMBER 13 +#define CB_SLIDENUMBER 14 +#define FL_NOTONTITLE 15 +#define CB_NOTONTITLE 16 +#define BT_APPLYTOALL 17 +#define BT_APPLY 18 +#define BT_CANCEL 19 +#define BT_HELP 20 +#define FL_HEADER 21 +#define CB_HEADER 22 +#define FT_HEADER 23 +#define TB_HEADER_FIXED 24 +#define FL_DATETIME 25 +#define CT_PREVIEW 26 +#define STR_PAGE_NUMBER 27 +#define STR_INCLUDE_ON_PAGE 28 diff --git a/sd/source/ui/inc/headerfooterdlg.hxx b/sd/source/ui/inc/headerfooterdlg.hxx index b3f188e130d3..f49ebcd82246 100644 --- a/sd/source/ui/inc/headerfooterdlg.hxx +++ b/sd/source/ui/inc/headerfooterdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,18 +51,18 @@ private: DECL_LINK( ActivatePageHdl, TabControl * ); DECL_LINK( DeactivatePageHdl, TabControl * ); - TabControl maTabCtrl; + TabControl maTabCtrl; - HeaderFooterTabPage* mpSlideTabPage; - HeaderFooterTabPage* mpNotesHandoutsTabPage; + HeaderFooterTabPage* mpSlideTabPage; + HeaderFooterTabPage* mpNotesHandoutsTabPage; - HeaderFooterSettings maSlideSettings; - HeaderFooterSettings maNotesHandoutSettings; - bool mbNotOnTitle; + HeaderFooterSettings maSlideSettings; + HeaderFooterSettings maNotesHandoutSettings; + bool mbNotOnTitle; - SdDrawDocument* mpDoc; - SdPage* mpCurrentPage; - ViewShell* mpViewShell; + SdDrawDocument* mpDoc; + SdPage* mpCurrentPage; + ViewShell* mpViewShell; void apply( bool bToAll, bool bForceSlides ); void change( SdUndoGroup* pUndoGroup, SdPage* pPage, const HeaderFooterSettings& rNewSettings ); diff --git a/sd/source/ui/inc/ins_paste.hrc b/sd/source/ui/inc/ins_paste.hrc index 500b152c08c8..3a881eac70a7 100644 --- a/sd/source/ui/inc/ins_paste.hrc +++ b/sd/source/ui/inc/ins_paste.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,12 +25,12 @@ * ************************************************************************/ -#define DLG_INSERT_PASTE 678 +#define DLG_INSERT_PASTE 678 -#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 FL_POSITION 1 -#define RB_BEFORE 1 -#define RB_AFTER 2 +#define RB_BEFORE 1 +#define RB_AFTER 2 diff --git a/sd/source/ui/inc/ins_paste.hxx b/sd/source/ui/inc/ins_paste.hxx index 1a35860235c0..a8540cd5d53b 100644 --- a/sd/source/ui/inc/ins_paste.hxx +++ b/sd/source/ui/inc/ins_paste.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,16 +45,16 @@ private: FixedLine aFlPosition; RadioButton aRbBefore; RadioButton aRbAfter; - OKButton aBtnOK; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + OKButton aBtnOK; + CancelButton aBtnCancel; + HelpButton aBtnHelp; public: SdInsertPasteDlg( Window* pWindow ); ~SdInsertPasteDlg(); - BOOL IsInsertBefore() const; + BOOL IsInsertBefore() const; }; #endif // _SD_INS_PASTE_HXX_ diff --git a/sd/source/ui/inc/inspagob.hrc b/sd/source/ui/inc/inspagob.hrc index bba29081f721..f2108abf0c82 100644 --- a/sd/source/ui/inc/inspagob.hrc +++ b/sd/source/ui/inc/inspagob.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/sd/source/ui/inc/inspagob.hxx b/sd/source/ui/inc/inspagob.hxx index b84792d8476f..f787abfb910e 100644 --- a/sd/source/ui/inc/inspagob.hxx +++ b/sd/source/ui/inc/inspagob.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,18 +40,18 @@ class SdDrawDocument; class SdInsertPagesObjsDlg : public ModalDialog { private: - SdPageObjsTLB aLbTree; - CheckBox aCbxLink; - CheckBox aCbxMasters; - OKButton aBtnOk; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + SdPageObjsTLB aLbTree; + CheckBox aCbxLink; + CheckBox aCbxMasters; + OKButton aBtnOk; + CancelButton aBtnCancel; + HelpButton aBtnHelp; - SfxMedium* pMedium; - const SdDrawDocument* mpDoc; - const String& rName; + SfxMedium* pMedium; + const SdDrawDocument* mpDoc; + const String& rName; - void Reset(); + void Reset(); DECL_LINK( SelectObjectHdl, void * ); public: @@ -61,9 +61,9 @@ public: const String& rFileName ); ~SdInsertPagesObjsDlg(); - List* GetList( USHORT nType ); - BOOL IsLink(); - BOOL IsRemoveUnnessesaryMasterPages() const; + List* GetList( USHORT nType ); + BOOL IsLink(); + BOOL IsRemoveUnnessesaryMasterPages() const; }; diff --git a/sd/source/ui/inc/layeroptionsdlg.hrc b/sd/source/ui/inc/layeroptionsdlg.hrc index 63bb1b4105e0..5d94c700f5fa 100644 --- a/sd/source/ui/inc/layeroptionsdlg.hrc +++ b/sd/source/ui/inc/layeroptionsdlg.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/sd/source/ui/inc/layeroptionsdlg.hxx b/sd/source/ui/inc/layeroptionsdlg.hxx index 311a9f59d531..bf58b1ec7cb5 100644 --- a/sd/source/ui/inc/layeroptionsdlg.hxx +++ b/sd/source/ui/inc/layeroptionsdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,26 +43,26 @@ class SfxItemSet; class SdInsertLayerDlg : public ModalDialog { private: - FixedText maFtName; - Edit maEdtName; - FixedText maFtTitle; - Edit maEdtTitle; - FixedText maFtDesc; - MultiLineEdit maEdtDesc; - CheckBox maCbxVisible; - CheckBox maCbxPrintable; - CheckBox maCbxLocked; - FixedLine maFixedLine; - HelpButton maBtnHelp; - OKButton maBtnOK; - CancelButton maBtnCancel; + FixedText maFtName; + Edit maEdtName; + FixedText maFtTitle; + Edit maEdtTitle; + FixedText maFtDesc; + MultiLineEdit maEdtDesc; + CheckBox maCbxVisible; + CheckBox maCbxPrintable; + CheckBox maCbxLocked; + FixedLine maFixedLine; + HelpButton maBtnHelp; + OKButton maBtnOK; + CancelButton maBtnCancel; - const SfxItemSet& mrOutAttrs; + const SfxItemSet& mrOutAttrs; public: SdInsertLayerDlg( Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, String aStr ); - void GetAttr( SfxItemSet& rOutAttrs ); + void GetAttr( SfxItemSet& rOutAttrs ); }; #endif // _SD_LAYER_DLG_HXX_ diff --git a/sd/source/ui/inc/masterlayoutdlg.hrc b/sd/source/ui/inc/masterlayoutdlg.hrc index 635b5cbdef10..23cd99f8a624 100644 --- a/sd/source/ui/inc/masterlayoutdlg.hrc +++ b/sd/source/ui/inc/masterlayoutdlg.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,12 +25,12 @@ * ************************************************************************/ -#define FL_PLACEHOLDERS 1 -#define CB_DATE 2 -#define CB_PAGE_NUMBER 3 -#define CB_HEADER 4 -#define CB_FOOTER 5 -#define BT_OK 6 -#define BT_CANCEL 7 -#define STR_SLIDE_NUMBER 8 +#define FL_PLACEHOLDERS 1 +#define CB_DATE 2 +#define CB_PAGE_NUMBER 3 +#define CB_HEADER 4 +#define CB_FOOTER 5 +#define BT_OK 6 +#define BT_CANCEL 7 +#define STR_SLIDE_NUMBER 8 #define STR_MASTER_LAYOUT_TITLE 9 diff --git a/sd/source/ui/inc/masterlayoutdlg.hxx b/sd/source/ui/inc/masterlayoutdlg.hxx index 73affd4caa9d..86bdef54a46f 100644 --- a/sd/source/ui/inc/masterlayoutdlg.hxx +++ b/sd/source/ui/inc/masterlayoutdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace sd class MasterLayoutDialog : public ModalDialog { private: - SdDrawDocument* mpDoc; - SdPage* mpCurrentPage; + SdDrawDocument* mpDoc; + SdPage* mpCurrentPage; - FixedLine maFLPlaceholders; - CheckBox maCBDate; - CheckBox maCBPageNumber; - CheckBox maCBHeader; - CheckBox maCBFooter; + FixedLine maFLPlaceholders; + CheckBox maCBDate; + CheckBox maCBPageNumber; + CheckBox maCBHeader; + CheckBox maCBFooter; - OKButton maPBOK; - CancelButton maPBCancel; + OKButton maPBOK; + CancelButton maPBCancel; - BOOL mbOldHeader; - BOOL mbOldFooter; - BOOL mbOldDate; - BOOL mbOldPageNumber; + BOOL mbOldHeader; + BOOL mbOldFooter; + BOOL mbOldDate; + BOOL mbOldPageNumber; void applyChanges(); void remove( PresObjKind eKind ); diff --git a/sd/source/ui/inc/morphdlg.hrc b/sd/source/ui/inc/morphdlg.hrc index f9a23c681d7e..8657d2a65b35 100644 --- a/sd/source/ui/inc/morphdlg.hrc +++ b/sd/source/ui/inc/morphdlg.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,12 +24,12 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define DLG_MORPH 653 -#define BTN_OK 1 -#define BTN_CANCEL 1 -#define BTN_HELP 1 -#define GRP_PRESET 1 -#define FT_STEPS 1 -#define MTF_STEPS 1 -#define CBX_ATTRIBUTES 1 -#define CBX_ORIENTATION 2 +#define DLG_MORPH 653 +#define BTN_OK 1 +#define BTN_CANCEL 1 +#define BTN_HELP 1 +#define GRP_PRESET 1 +#define FT_STEPS 1 +#define MTF_STEPS 1 +#define CBX_ATTRIBUTES 1 +#define CBX_ORIENTATION 2 diff --git a/sd/source/ui/inc/morphdlg.hxx b/sd/source/ui/inc/morphdlg.hxx index 387c7df1d7ec..86f72a06d681 100644 --- a/sd/source/ui/inc/morphdlg.hxx +++ b/sd/source/ui/inc/morphdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,34 +45,34 @@ namespace sd { |* \******************************************************************************/ -class MorphDlg +class MorphDlg : public ModalDialog { public: MorphDlg ( - ::Window* pParent, - const SdrObject* pObj1, + ::Window* pParent, + const SdrObject* pObj1, const SdrObject* pObj2); virtual ~MorphDlg (void); - void SaveSettings() const; - USHORT GetFadeSteps() const { return (USHORT) aMtfSteps.GetValue(); } - BOOL IsAttributeFade() const { return aCbxAttributes.IsChecked(); } - BOOL IsOrientationFade() const { return aCbxOrientation.IsChecked(); } + void SaveSettings() const; + USHORT GetFadeSteps() const { return (USHORT) aMtfSteps.GetValue(); } + BOOL IsAttributeFade() const { return aCbxAttributes.IsChecked(); } + BOOL IsOrientationFade() const { return aCbxOrientation.IsChecked(); } private: - FixedLine aGrpPreset; - FixedText aFtSteps; - MetricField aMtfSteps; - CheckBox aCbxAttributes; - CheckBox aCbxOrientation; - OKButton aBtnOK; - CancelButton aBtnCancel; + FixedLine aGrpPreset; + FixedText aFtSteps; + MetricField aMtfSteps; + CheckBox aCbxAttributes; + CheckBox aCbxOrientation; + OKButton aBtnOK; + CancelButton aBtnCancel; HelpButton aBtnHelp; - SdrObject* pSdrObj1; - SdrObject* pSdrObj2; + SdrObject* pSdrObj1; + SdrObject* pSdrObj2; - void LoadSettings(); + void LoadSettings(); }; diff --git a/sd/source/ui/inc/navigatr.hrc b/sd/source/ui/inc/navigatr.hrc index 47812c304890..1791d405f247 100644 --- a/sd/source/ui/inc/navigatr.hrc +++ b/sd/source/ui/inc/navigatr.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/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx index fd05e9ffa99f..72818eb2d6a1 100644 --- a/sd/source/ui/inc/navigatr.hxx +++ b/sd/source/ui/inc/navigatr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,24 +36,24 @@ #include "sdtreelb.hxx" #include "pres.hxx" -#define NAVSTATE_NONE 0x00000000 +#define NAVSTATE_NONE 0x00000000 -#define NAVBTN_PEN_ENABLED 0x00000010 -#define NAVBTN_PEN_DISABLED 0x00000020 -#define NAVBTN_PEN_CHECKED 0x00000040 -#define NAVBTN_PEN_UNCHECKED 0x00000080 +#define NAVBTN_PEN_ENABLED 0x00000010 +#define NAVBTN_PEN_DISABLED 0x00000020 +#define NAVBTN_PEN_CHECKED 0x00000040 +#define NAVBTN_PEN_UNCHECKED 0x00000080 -#define NAVTLB_UPDATE 0x00000100 +#define NAVTLB_UPDATE 0x00000100 -#define NAVBTN_FIRST_ENABLED 0x00001000 -#define NAVBTN_FIRST_DISABLED 0x00002000 -#define NAVBTN_PREV_ENABLED 0x00004000 -#define NAVBTN_PREV_DISABLED 0x00008000 +#define NAVBTN_FIRST_ENABLED 0x00001000 +#define NAVBTN_FIRST_DISABLED 0x00002000 +#define NAVBTN_PREV_ENABLED 0x00004000 +#define NAVBTN_PREV_DISABLED 0x00008000 -#define NAVBTN_LAST_ENABLED 0x00010000 -#define NAVBTN_LAST_DISABLED 0x00020000 -#define NAVBTN_NEXT_ENABLED 0x00040000 -#define NAVBTN_NEXT_DISABLED 0x00080000 +#define NAVBTN_LAST_ENABLED 0x00010000 +#define NAVBTN_LAST_DISABLED 0x00020000 +#define NAVBTN_NEXT_ENABLED 0x00040000 +#define NAVBTN_NEXT_DISABLED 0x00080000 // forward namespace sd { @@ -72,16 +72,16 @@ class NavDocInfo public: NavDocInfo() { mpDocShell = NULL; } - BOOL HasName() { return( (BOOL) bName ); } - BOOL IsActive() { return( (BOOL) bActive ); } + BOOL HasName() { return( (BOOL) bName ); } + BOOL IsActive() { return( (BOOL) bActive ); } - void SetName( BOOL bOn = TRUE ) { bName = bOn; } - void SetActive( BOOL bOn = TRUE ) { bActive = bOn; } + void SetName( BOOL bOn = TRUE ) { bName = bOn; } + void SetActive( BOOL bOn = TRUE ) { bActive = bOn; } private: friend class SdNavigatorWin; - BOOL bName : 1; - BOOL bActive : 1; + BOOL bName : 1; + BOOL bActive : 1; ::sd::DrawDocShell* mpDocShell; }; @@ -98,19 +98,19 @@ public: SfxBindings* pBindings ); virtual ~SdNavigatorWin(); - virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ); - void InitTreeLB( const SdDrawDocument* pDoc ); - void RefreshDocumentLB( const String* pDocName = NULL ); + void InitTreeLB( const SdDrawDocument* pDoc ); + void RefreshDocumentLB( const String* pDocName = NULL ); - BOOL InsertFile(const String& rFileName); + BOOL InsertFile(const String& rFileName); - NavigatorDragType GetNavigatorDragType(); - void SetNavigatorDragType(NavigatorDragType eType) { meDragType = eType; } + NavigatorDragType GetNavigatorDragType(); + void SetNavigatorDragType(NavigatorDragType eType) { meDragType = eType; } protected: - virtual void Resize(); - virtual long Notify(NotifyEvent& rNEvt); + virtual void Resize(); + virtual long Notify(NotifyEvent& rNEvt); private: @@ -118,32 +118,32 @@ private: friend class SdNavigatorControllerItem; friend class SdPageNameControllerItem; - ToolBox maToolbox; - SdPageObjsTLB maTlbObjects; - ListBox maLbDocs; - - ::sd::NavigatorChildWindow* mpChildWinContext; - Size maSize; - Size maMinSize; -// Size maFltWinSize; - BOOL mbDocImported; - String maDropFileName; - NavigatorDragType meDragType; - List* mpDocList; - SfxBindings* mpBindings; - SdNavigatorControllerItem* mpNavigatorCtrlItem; - SdPageNameControllerItem* mpPageNameCtrlItem; - - ImageList maImageList; - ImageList maImageListH; + ToolBox maToolbox; + SdPageObjsTLB maTlbObjects; + ListBox maLbDocs; + + ::sd::NavigatorChildWindow* mpChildWinContext; + Size maSize; + Size maMinSize; +// Size maFltWinSize; + BOOL mbDocImported; + String maDropFileName; + NavigatorDragType meDragType; + List* mpDocList; + SfxBindings* mpBindings; + SdNavigatorControllerItem* mpNavigatorCtrlItem; + SdPageNameControllerItem* mpPageNameCtrlItem; + + ImageList maImageList; + ImageList maImageListH; /** This flag controls whether all shapes or only the named shapes are shown. */ bool mbShowAllShapes; - USHORT GetDragTypeSdResId( NavigatorDragType eDT, BOOL bImage = FALSE ); - NavDocInfo* GetDocInfo(); + USHORT GetDragTypeSdResId( NavigatorDragType eDT, BOOL bImage = FALSE ); + NavDocInfo* GetDocInfo(); DECL_LINK( GetFocusObjectsHdl, void * ); DECL_LINK( SelectToolboxHdl, void * ); @@ -155,9 +155,9 @@ private: DECL_LINK( MenuSelectHdl, Menu * ); DECL_LINK( ShapeFilterCallback, Menu * ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - void SetDragImage(); - void ApplyImageList(); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); + void SetDragImage(); + void ApplyImageList(); }; diff --git a/sd/source/ui/inc/optdlg.hrc b/sd/source/ui/inc/optdlg.hrc index 6c50299c5ab2..8f8e781d4136 100644 --- a/sd/source/ui/inc/optdlg.hrc +++ b/sd/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 @@ -24,11 +24,11 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define TAB_DLG_IMPRESS_OPTIONS 842 -#define TAB_DLG_DRAW_OPTIONS 843 +#define TAB_DLG_IMPRESS_OPTIONS 842 +#define TAB_DLG_DRAW_OPTIONS 843 -#define TP_GENERAL 1 +#define TP_GENERAL 1 #define TP_SAVE 2 #define TP_PATH 3 -#define TP_PRINT 4 +#define TP_PRINT 4 diff --git a/sd/source/ui/inc/optdlg.hxx b/sd/source/ui/inc/optdlg.hxx index dcbe7e40d070..610d9f8077c9 100644 --- a/sd/source/ui/inc/optdlg.hxx +++ b/sd/source/ui/inc/optdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ class SfxItemSet; class SdOptionsDlg : public SfxTabDialog { private: - DocumentType meDocType; + DocumentType meDocType; public: SdOptionsDlg( Window* pParent, const SfxItemSet& rInAttrs, @@ -47,8 +47,8 @@ public: protected: - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); -// virtual SfxItemSet* CreateInputItemSet( USHORT nPageId ); + virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); +// virtual SfxItemSet* CreateInputItemSet( USHORT nPageId ); }; diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index 5d2b98b5952c..cc76a089acdb 100644 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,16 +41,16 @@ // - Option ranges - // ----------------- -#define SD_OPTIONS_NONE 0x00000000 -#define SD_OPTIONS_ALL 0xffffffff +#define SD_OPTIONS_NONE 0x00000000 +#define SD_OPTIONS_ALL 0xffffffff -#define SD_OPTIONS_LAYOUT 0x00000001 +#define SD_OPTIONS_LAYOUT 0x00000001 #define SD_OPTIONS_CONTENTS 0x00000002 -#define SD_OPTIONS_MISC 0x00000004 -#define SD_OPTIONS_SNAP 0x00000008 -#define SD_OPTIONS_ZOOM 0x00000010 -#define SD_OPTIONS_GRID 0x00000020 -#define SD_OPTIONS_PRINT 0x00000040 +#define SD_OPTIONS_MISC 0x00000004 +#define SD_OPTIONS_SNAP 0x00000008 +#define SD_OPTIONS_ZOOM 0x00000010 +#define SD_OPTIONS_GRID 0x00000020 +#define SD_OPTIONS_PRINT 0x00000040 // ------------ // - Forwards - @@ -74,22 +74,22 @@ class SD_DLLPUBLIC SdOptionsItem : public ::utl::ConfigItem private: - const SdOptionsGeneric& mrParent; - + const SdOptionsGeneric& mrParent; + public: SdOptionsItem( const SdOptionsGeneric& rParent, const ::rtl::OUString rSubTree ); virtual ~SdOptionsItem(); - virtual void Commit(); + virtual void Commit(); virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetProperties( + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetProperties( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rNames ); sal_Bool PutProperties( const com::sun::star::uno::Sequence< rtl::OUString >& rNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any>& rValues ); - void SetModified(); + void SetModified(); }; // -------------------- @@ -102,40 +102,40 @@ friend class SdOptionsItem; private: - ::rtl::OUString maSubTree; - SdOptionsItem* mpCfgItem; - USHORT mnConfigId; - BOOL mbInit : 1; - BOOL mbEnableModify : 1; + ::rtl::OUString maSubTree; + SdOptionsItem* mpCfgItem; + USHORT mnConfigId; + BOOL mbInit : 1; + BOOL mbEnableModify : 1; SD_DLLPRIVATE void Commit( SdOptionsItem& rCfgItem ) const; SD_DLLPRIVATE ::com::sun::star::uno::Sequence< ::rtl::OUString > GetPropertyNames() const; -protected: - - void Init() const; - void OptionsChanged() { if( mpCfgItem && mbEnableModify ) mpCfgItem->SetModified(); } +protected: + + void Init() const; + void OptionsChanged() { if( mpCfgItem && mbEnableModify ) mpCfgItem->SetModified(); } protected: - - virtual void GetPropNameArray( const char**& ppNames, ULONG& rCount ) const = 0; - virtual BOOL ReadData( const ::com::sun::star::uno::Any* pValues ) = 0; - virtual BOOL WriteData( ::com::sun::star::uno::Any* pValues ) const = 0; + + virtual void GetPropNameArray( const char**& ppNames, ULONG& rCount ) const = 0; + virtual BOOL ReadData( const ::com::sun::star::uno::Any* pValues ) = 0; + virtual BOOL WriteData( ::com::sun::star::uno::Any* pValues ) const = 0; public: SdOptionsGeneric( USHORT nConfigId, const ::rtl::OUString& rSubTree ); virtual ~SdOptionsGeneric(); - const ::rtl::OUString& GetSubTree() const { return maSubTree; } - USHORT GetConfigId() const { return mnConfigId; } + const ::rtl::OUString& GetSubTree() const { return maSubTree; } + USHORT GetConfigId() const { return mnConfigId; } - void EnableModify( BOOL bModify ) { mbEnableModify = bModify; } + void EnableModify( BOOL bModify ) { mbEnableModify = bModify; } - void Store(); + void Store(); - static bool isMetricSystem(); + static bool isMetricSystem(); }; // ------------------- @@ -146,13 +146,13 @@ class SD_DLLPUBLIC SdOptionsLayout : public SdOptionsGeneric { private: - BOOL bRuler : 1; // Layout/Display/Ruler - BOOL bMoveOutline : 1; // Layout/Display/Contur - BOOL bDragStripes : 1; // Layout/Display/Guide - BOOL bHandlesBezier : 1; // Layout/Display/Bezier - BOOL bHelplines : 1; // Layout/Display/Helpline - UINT16 nMetric; // Layout/Other/MeasureUnit - UINT16 nDefTab; // Layout/Other/TabStop + BOOL bRuler : 1; // Layout/Display/Ruler + BOOL bMoveOutline : 1; // Layout/Display/Contur + BOOL bDragStripes : 1; // Layout/Display/Guide + BOOL bHandlesBezier : 1; // Layout/Display/Bezier + BOOL bHelplines : 1; // Layout/Display/Helpline + UINT16 nMetric; // Layout/Other/MeasureUnit + UINT16 nDefTab; // Layout/Other/TabStop protected: @@ -164,40 +164,40 @@ public: SdOptionsLayout( USHORT nConfigId, BOOL bUseConfig ); virtual ~SdOptionsLayout() {} - BOOL operator==( const SdOptionsLayout& rOpt ) const; + BOOL operator==( const SdOptionsLayout& rOpt ) const; - BOOL IsRulerVisible() const { Init(); return (BOOL) bRuler; } - BOOL IsMoveOutline() const { Init(); return (BOOL) bMoveOutline; } - BOOL IsDragStripes() const { Init(); return (BOOL) bDragStripes; } - BOOL IsHandlesBezier() const { Init(); return (BOOL) bHandlesBezier; } - BOOL IsHelplines() const { Init(); return (BOOL) bHelplines; } + BOOL IsRulerVisible() const { Init(); return (BOOL) bRuler; } + BOOL IsMoveOutline() const { Init(); return (BOOL) bMoveOutline; } + BOOL IsDragStripes() const { Init(); return (BOOL) bDragStripes; } + BOOL IsHandlesBezier() const { Init(); return (BOOL) bHandlesBezier; } + BOOL IsHelplines() const { Init(); return (BOOL) bHelplines; } UINT16 GetMetric() const { Init(); return( ( 0xffff == nMetric ) ? (UINT16)SfxModule::GetCurrentFieldUnit() : nMetric ); } - UINT16 GetDefTab() const { Init(); return nDefTab; } - - void SetRulerVisible( BOOL bOn = TRUE ) { if( bRuler != bOn ) { OptionsChanged(); bRuler = bOn; } } - void SetMoveOutline( BOOL bOn = TRUE ) { if( bMoveOutline != bOn ) { OptionsChanged(); bMoveOutline = bOn; } } - void SetDragStripes( BOOL bOn = TRUE ) { if( bDragStripes != bOn ) { OptionsChanged(); bDragStripes = bOn; } } - void SetHandlesBezier( BOOL bOn = TRUE ) { if( bHandlesBezier != bOn ) { OptionsChanged(); bHandlesBezier = bOn; } } - void SetHelplines( BOOL bOn = TRUE ) { if( bHelplines != bOn ) { OptionsChanged(); bHelplines = bOn; } } - void SetMetric( UINT16 nInMetric ) { if( nMetric != nInMetric ) { OptionsChanged(); nMetric = nInMetric; } } - void SetDefTab( UINT16 nTab ) { if( nDefTab != nTab ) { OptionsChanged(); nDefTab = nTab; } } + UINT16 GetDefTab() const { Init(); return nDefTab; } + + void SetRulerVisible( BOOL bOn = TRUE ) { if( bRuler != bOn ) { OptionsChanged(); bRuler = bOn; } } + void SetMoveOutline( BOOL bOn = TRUE ) { if( bMoveOutline != bOn ) { OptionsChanged(); bMoveOutline = bOn; } } + void SetDragStripes( BOOL bOn = TRUE ) { if( bDragStripes != bOn ) { OptionsChanged(); bDragStripes = bOn; } } + void SetHandlesBezier( BOOL bOn = TRUE ) { if( bHandlesBezier != bOn ) { OptionsChanged(); bHandlesBezier = bOn; } } + void SetHelplines( BOOL bOn = TRUE ) { if( bHelplines != bOn ) { OptionsChanged(); bHelplines = bOn; } } + void SetMetric( UINT16 nInMetric ) { if( nMetric != nInMetric ) { OptionsChanged(); nMetric = nInMetric; } } + void SetDefTab( UINT16 nTab ) { if( nDefTab != nTab ) { OptionsChanged(); nDefTab = nTab; } } }; // ----------------------------------------------------------------------------- -class SD_DLLPUBLIC SdOptionsLayoutItem : public SfxPoolItem +class SD_DLLPUBLIC SdOptionsLayoutItem : public SfxPoolItem { public: - + SdOptionsLayoutItem( USHORT nWhich); SdOptionsLayoutItem( USHORT nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; - - void SetOptions( SdOptions* pOpts ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual int operator==( const SfxPoolItem& ) const; + + void SetOptions( SdOptions* pOpts ) const; - SdOptionsLayout& GetOptionsLayout() { return maOptionsLayout; } + SdOptionsLayout& GetOptionsLayout() { return maOptionsLayout; } private: SdOptionsLayout maOptionsLayout; }; @@ -220,7 +220,7 @@ public: SdOptionsContents( USHORT nConfigId, BOOL bUseConfig ); virtual ~SdOptionsContents() {} - BOOL operator==( const SdOptionsContents& rOpt ) const; + BOOL operator==( const SdOptionsContents& rOpt ) const; }; // ----------------------------------------------------------------------------- @@ -231,14 +231,14 @@ public: SdOptionsContentsItem( USHORT nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual int operator==( const SfxPoolItem& ) const; + + void SetOptions( SdOptions* pOpts ) const; - void SetOptions( SdOptions* pOpts ) const; - - SdOptionsContents& GetOptionsContents() { return maOptionsContents; } + SdOptionsContents& GetOptionsContents() { return maOptionsContents; } private: - SdOptionsContents maOptionsContents; + SdOptionsContents maOptionsContents; }; // ----------------- @@ -250,42 +250,42 @@ class SD_DLLPUBLIC SdOptionsMisc : public SdOptionsGeneric private: // #97016# - ULONG nDefaultObjectSizeWidth; - ULONG nDefaultObjectSizeHeight; - - BOOL bStartWithTemplate : 1; // Misc/NewDoc/AutoPilot - BOOL bMarkedHitMovesAlways : 1; // Misc/ObjectMoveable - BOOL bMoveOnlyDragging : 1; // Currently, not in use !!! - BOOL bCrookNoContortion : 1; // Misc/NoDistort - BOOL bQuickEdit : 1; // Misc/TextObject/QuickEditing - BOOL bMasterPageCache : 1; // Misc/BackgroundCache - BOOL bDragWithCopy : 1; // Misc/CopyWhileMoving - BOOL bPickThrough : 1; // Misc/TextObject/Selectable - BOOL bBigHandles : 1; // Misc/BigHandles - BOOL bDoubleClickTextEdit : 1; // Misc/DclickTextedit - BOOL bClickChangeRotation : 1; // Misc/RotateClick - BOOL bStartWithActualPage : 1; // Misc/Start/CurrentPage - BOOL bSolidDragging : 1; // Misc/ModifyWithAttributes - BOOL bSolidMarkHdl : 1; // /Misc/SimpleHandles - BOOL bSummationOfParagraphs : 1; // misc/SummationOfParagraphs + ULONG nDefaultObjectSizeWidth; + ULONG nDefaultObjectSizeHeight; + + BOOL bStartWithTemplate : 1; // Misc/NewDoc/AutoPilot + BOOL bMarkedHitMovesAlways : 1; // Misc/ObjectMoveable + BOOL bMoveOnlyDragging : 1; // Currently, not in use !!! + BOOL bCrookNoContortion : 1; // Misc/NoDistort + BOOL bQuickEdit : 1; // Misc/TextObject/QuickEditing + BOOL bMasterPageCache : 1; // Misc/BackgroundCache + BOOL bDragWithCopy : 1; // Misc/CopyWhileMoving + BOOL bPickThrough : 1; // Misc/TextObject/Selectable + BOOL bBigHandles : 1; // Misc/BigHandles + BOOL bDoubleClickTextEdit : 1; // Misc/DclickTextedit + BOOL bClickChangeRotation : 1; // Misc/RotateClick + BOOL bStartWithActualPage : 1; // Misc/Start/CurrentPage + BOOL bSolidDragging : 1; // Misc/ModifyWithAttributes + BOOL bSolidMarkHdl : 1; // /Misc/SimpleHandles + BOOL bSummationOfParagraphs : 1; // misc/SummationOfParagraphs // #90356# - BOOL bShowUndoDeleteWarning : 1; // Misc/ShowUndoDeleteWarning + BOOL bShowUndoDeleteWarning : 1; // Misc/ShowUndoDeleteWarning // #i75315# - BOOL bSlideshowRespectZOrder : 1; // Misc/SlideshowRespectZOrder + BOOL bSlideshowRespectZOrder : 1; // Misc/SlideshowRespectZOrder BOOL bShowComments : 1; // Misc/ShowComments + + sal_Bool bPreviewNewEffects; + sal_Bool bPreviewChangedEffects; + sal_Bool bPreviewTransitions; - sal_Bool bPreviewNewEffects; - sal_Bool bPreviewChangedEffects; - sal_Bool bPreviewTransitions; - - sal_Int32 mnDisplay; + sal_Int32 mnDisplay; /** This value controls the device to use for formatting documents. The currently supported values are 0 for the current printer or 1 for the printer independent virtual device the can be retrieved from the modules. */ - USHORT mnPrinterIndependentLayout; // Misc/Compatibility/PrinterIndependentLayout + USHORT mnPrinterIndependentLayout; // Misc/Compatibility/PrinterIndependentLayout // Misc protected: @@ -299,76 +299,76 @@ public: SdOptionsMisc( USHORT nConfigId, BOOL bUseConfig ); virtual ~SdOptionsMisc() {} - BOOL operator==( const SdOptionsMisc& rOpt ) const; - - BOOL IsStartWithTemplate() const { Init(); return (BOOL) bStartWithTemplate; } - BOOL IsMarkedHitMovesAlways() const { Init(); return (BOOL) bMarkedHitMovesAlways; } - BOOL IsMoveOnlyDragging() const { Init(); return (BOOL) bMoveOnlyDragging; } - BOOL IsCrookNoContortion() const { Init(); return (BOOL) bCrookNoContortion; } - BOOL IsQuickEdit() const { Init(); return (BOOL) bQuickEdit; } - BOOL IsMasterPagePaintCaching() const { Init(); return (BOOL) bMasterPageCache; } - BOOL IsDragWithCopy() const { Init(); return (BOOL) bDragWithCopy; } - BOOL IsPickThrough() const { Init(); return (BOOL) bPickThrough; } - BOOL IsBigHandles() const { Init(); return (BOOL) bBigHandles; } - BOOL IsDoubleClickTextEdit() const { Init(); return (BOOL) bDoubleClickTextEdit; } - BOOL IsClickChangeRotation() const { Init(); return (BOOL) bClickChangeRotation; } - BOOL IsStartWithActualPage() const { Init(); return (BOOL) bStartWithActualPage; } - BOOL IsSolidDragging() const { Init(); return (BOOL) bSolidDragging; } - BOOL IsSolidMarkHdl() const { Init(); return (BOOL) bSolidMarkHdl; } - BOOL IsSummationOfParagraphs() const { Init(); return bSummationOfParagraphs != 0; }; - + BOOL operator==( const SdOptionsMisc& rOpt ) const; + + BOOL IsStartWithTemplate() const { Init(); return (BOOL) bStartWithTemplate; } + BOOL IsMarkedHitMovesAlways() const { Init(); return (BOOL) bMarkedHitMovesAlways; } + BOOL IsMoveOnlyDragging() const { Init(); return (BOOL) bMoveOnlyDragging; } + BOOL IsCrookNoContortion() const { Init(); return (BOOL) bCrookNoContortion; } + BOOL IsQuickEdit() const { Init(); return (BOOL) bQuickEdit; } + BOOL IsMasterPagePaintCaching() const { Init(); return (BOOL) bMasterPageCache; } + BOOL IsDragWithCopy() const { Init(); return (BOOL) bDragWithCopy; } + BOOL IsPickThrough() const { Init(); return (BOOL) bPickThrough; } + BOOL IsBigHandles() const { Init(); return (BOOL) bBigHandles; } + BOOL IsDoubleClickTextEdit() const { Init(); return (BOOL) bDoubleClickTextEdit; } + BOOL IsClickChangeRotation() const { Init(); return (BOOL) bClickChangeRotation; } + BOOL IsStartWithActualPage() const { Init(); return (BOOL) bStartWithActualPage; } + BOOL IsSolidDragging() const { Init(); return (BOOL) bSolidDragging; } + BOOL IsSolidMarkHdl() const { Init(); return (BOOL) bSolidMarkHdl; } + BOOL IsSummationOfParagraphs() const { Init(); return bSummationOfParagraphs != 0; }; + /** Return the currently selected printer independent layout mode. - @return + @return Returns 1 for printer independent layout enabled and 0 when it is disabled. Other values are reserved for future use. */ - USHORT GetPrinterIndependentLayout() const { Init(); return mnPrinterIndependentLayout; }; + USHORT GetPrinterIndependentLayout() const { Init(); return mnPrinterIndependentLayout; }; // #90356# - BOOL IsShowUndoDeleteWarning() const { Init(); return (BOOL) bShowUndoDeleteWarning; } - BOOL IsSlideshowRespectZOrder() const { Init(); return (BOOL) bSlideshowRespectZOrder; } + BOOL IsShowUndoDeleteWarning() const { Init(); return (BOOL) bShowUndoDeleteWarning; } + BOOL IsSlideshowRespectZOrder() const { Init(); return (BOOL) bSlideshowRespectZOrder; } // #97016# - ULONG GetDefaultObjectSizeWidth() const { Init(); return nDefaultObjectSizeWidth; } - ULONG GetDefaultObjectSizeHeight() const { Init(); return nDefaultObjectSizeHeight; } - - sal_Bool IsPreviewNewEffects() const { Init(); return bPreviewNewEffects; } - sal_Bool IsPreviewChangedEffects() const { Init(); return bPreviewChangedEffects; } - sal_Bool IsPreviewTransitions() const { Init(); return bPreviewTransitions; } - - sal_Int32 GetDisplay() const { Init(); return mnDisplay; } - void SetDisplay( sal_Int32 nDisplay = 0 ) { if( mnDisplay != nDisplay ) { OptionsChanged(); mnDisplay = nDisplay; } } - - void SetStartWithTemplate( BOOL bOn = TRUE ) { if( bStartWithTemplate != bOn ) { OptionsChanged(); bStartWithTemplate = bOn; } } - void SetMarkedHitMovesAlways( BOOL bOn = TRUE ) { if( bMarkedHitMovesAlways != bOn ) { OptionsChanged(); bMarkedHitMovesAlways = bOn; } } - void SetMoveOnlyDragging( BOOL bOn = TRUE ) { if( bMoveOnlyDragging != bOn ) { OptionsChanged(); bMoveOnlyDragging = bOn; } } - void SetCrookNoContortion( BOOL bOn = TRUE ) { if( bCrookNoContortion != bOn ) { OptionsChanged(); bCrookNoContortion = bOn; } } - void SetQuickEdit( BOOL bOn = TRUE ) { if( bQuickEdit != bOn ) { OptionsChanged(); bQuickEdit = bOn; } } - void SetMasterPagePaintCaching( BOOL bOn = TRUE ) { if( bMasterPageCache != bOn ) { OptionsChanged(); bMasterPageCache = bOn; } } - void SetDragWithCopy( BOOL bOn = TRUE ) { if( bDragWithCopy != bOn ) { OptionsChanged(); bDragWithCopy = bOn; } } - void SetPickThrough( BOOL bOn = TRUE ) { if( bPickThrough != bOn ) { OptionsChanged(); bPickThrough = bOn; } } - void SetBigHandles( BOOL bOn = TRUE ) { if( bBigHandles != bOn ) { OptionsChanged(); bBigHandles = bOn; } } - void SetDoubleClickTextEdit( BOOL bOn = TRUE ) { if( bDoubleClickTextEdit != bOn ) { OptionsChanged(); bDoubleClickTextEdit = bOn; } } - void SetClickChangeRotation( BOOL bOn = TRUE ) { if( bClickChangeRotation != bOn ) { OptionsChanged(); bClickChangeRotation = bOn; } } - void SetStartWithActualPage( BOOL bOn = TRUE ) { if( bStartWithActualPage != bOn ) { OptionsChanged(); bStartWithActualPage = bOn; } } - void SetSummationOfParagraphs( BOOL bOn = TRUE ){ if ( bOn != bSummationOfParagraphs ) { OptionsChanged(); bSummationOfParagraphs = bOn; } } + ULONG GetDefaultObjectSizeWidth() const { Init(); return nDefaultObjectSizeWidth; } + ULONG GetDefaultObjectSizeHeight() const { Init(); return nDefaultObjectSizeHeight; } + + sal_Bool IsPreviewNewEffects() const { Init(); return bPreviewNewEffects; } + sal_Bool IsPreviewChangedEffects() const { Init(); return bPreviewChangedEffects; } + sal_Bool IsPreviewTransitions() const { Init(); return bPreviewTransitions; } + + sal_Int32 GetDisplay() const { Init(); return mnDisplay; } + void SetDisplay( sal_Int32 nDisplay = 0 ) { if( mnDisplay != nDisplay ) { OptionsChanged(); mnDisplay = nDisplay; } } + + void SetStartWithTemplate( BOOL bOn = TRUE ) { if( bStartWithTemplate != bOn ) { OptionsChanged(); bStartWithTemplate = bOn; } } + void SetMarkedHitMovesAlways( BOOL bOn = TRUE ) { if( bMarkedHitMovesAlways != bOn ) { OptionsChanged(); bMarkedHitMovesAlways = bOn; } } + void SetMoveOnlyDragging( BOOL bOn = TRUE ) { if( bMoveOnlyDragging != bOn ) { OptionsChanged(); bMoveOnlyDragging = bOn; } } + void SetCrookNoContortion( BOOL bOn = TRUE ) { if( bCrookNoContortion != bOn ) { OptionsChanged(); bCrookNoContortion = bOn; } } + void SetQuickEdit( BOOL bOn = TRUE ) { if( bQuickEdit != bOn ) { OptionsChanged(); bQuickEdit = bOn; } } + void SetMasterPagePaintCaching( BOOL bOn = TRUE ) { if( bMasterPageCache != bOn ) { OptionsChanged(); bMasterPageCache = bOn; } } + void SetDragWithCopy( BOOL bOn = TRUE ) { if( bDragWithCopy != bOn ) { OptionsChanged(); bDragWithCopy = bOn; } } + void SetPickThrough( BOOL bOn = TRUE ) { if( bPickThrough != bOn ) { OptionsChanged(); bPickThrough = bOn; } } + void SetBigHandles( BOOL bOn = TRUE ) { if( bBigHandles != bOn ) { OptionsChanged(); bBigHandles = bOn; } } + void SetDoubleClickTextEdit( BOOL bOn = TRUE ) { if( bDoubleClickTextEdit != bOn ) { OptionsChanged(); bDoubleClickTextEdit = bOn; } } + void SetClickChangeRotation( BOOL bOn = TRUE ) { if( bClickChangeRotation != bOn ) { OptionsChanged(); bClickChangeRotation = bOn; } } + void SetStartWithActualPage( BOOL bOn = TRUE ) { if( bStartWithActualPage != bOn ) { OptionsChanged(); bStartWithActualPage = bOn; } } + void SetSummationOfParagraphs( BOOL bOn = TRUE ){ if ( bOn != bSummationOfParagraphs ) { OptionsChanged(); bSummationOfParagraphs = bOn; } } /** Set the printer independent layout mode. - @param nOn + @param nOn The default value is to switch printer independent layout on, hence the parameters name. Use 0 for turning it off. Other values are reserved for future use. */ - void SetPrinterIndependentLayout (USHORT nOn = 1 ){ if ( nOn != mnPrinterIndependentLayout ) { OptionsChanged(); mnPrinterIndependentLayout = nOn; } } - void SetSolidDragging( BOOL bOn = TRUE ) { if( bSolidDragging != bOn ) { OptionsChanged(); bSolidDragging = bOn; } } - void SetSolidMarkHdl( BOOL bOn = TRUE ) { if( bSolidMarkHdl != bOn ) { OptionsChanged(); bSolidMarkHdl = bOn; } } + void SetPrinterIndependentLayout (USHORT nOn = 1 ){ if ( nOn != mnPrinterIndependentLayout ) { OptionsChanged(); mnPrinterIndependentLayout = nOn; } } + void SetSolidDragging( BOOL bOn = TRUE ) { if( bSolidDragging != bOn ) { OptionsChanged(); bSolidDragging = bOn; } } + void SetSolidMarkHdl( BOOL bOn = TRUE ) { if( bSolidMarkHdl != bOn ) { OptionsChanged(); bSolidMarkHdl = bOn; } } // #90356# - void SetShowUndoDeleteWarning( BOOL bOn = TRUE ) { if( bShowUndoDeleteWarning != bOn ) { OptionsChanged(); bShowUndoDeleteWarning = bOn; } } - void SetSlideshowRespectZOrder( BOOL bOn = TRUE ) { if( bSlideshowRespectZOrder != bOn ) { OptionsChanged(); bSlideshowRespectZOrder = bOn; } } + void SetShowUndoDeleteWarning( BOOL bOn = TRUE ) { if( bShowUndoDeleteWarning != bOn ) { OptionsChanged(); bShowUndoDeleteWarning = bOn; } } + void SetSlideshowRespectZOrder( BOOL bOn = TRUE ) { if( bSlideshowRespectZOrder != bOn ) { OptionsChanged(); bSlideshowRespectZOrder = bOn; } } // #97016# - void SetDefaultObjectSizeWidth( ULONG nWidth ) { if( nDefaultObjectSizeWidth != nWidth ) { OptionsChanged(); nDefaultObjectSizeWidth = nWidth; } } - void SetDefaultObjectSizeHeight( ULONG nHeight ) { if( nDefaultObjectSizeHeight != nHeight ) { OptionsChanged(); nDefaultObjectSizeHeight = nHeight; } } + void SetDefaultObjectSizeWidth( ULONG nWidth ) { if( nDefaultObjectSizeWidth != nWidth ) { OptionsChanged(); nDefaultObjectSizeWidth = nWidth; } } + void SetDefaultObjectSizeHeight( ULONG nHeight ) { if( nDefaultObjectSizeHeight != nHeight ) { OptionsChanged(); nDefaultObjectSizeHeight = nHeight; } } - void SetPreviewNewEffects( sal_Bool bOn ) { if( bPreviewNewEffects != bOn ) { OptionsChanged(); bPreviewNewEffects = bOn; } } - void SetPreviewChangedEffects( sal_Bool bOn ) { if( bPreviewChangedEffects != bOn ) { OptionsChanged(); bPreviewChangedEffects = bOn; } } - void SetPreviewTransitions( sal_Bool bOn ) { if( bPreviewTransitions != bOn ) { OptionsChanged(); bPreviewTransitions = bOn; } } + void SetPreviewNewEffects( sal_Bool bOn ) { if( bPreviewNewEffects != bOn ) { OptionsChanged(); bPreviewNewEffects = bOn; } } + void SetPreviewChangedEffects( sal_Bool bOn ) { if( bPreviewChangedEffects != bOn ) { OptionsChanged(); bPreviewChangedEffects = bOn; } } + void SetPreviewTransitions( sal_Bool bOn ) { if( bPreviewTransitions != bOn ) { OptionsChanged(); bPreviewTransitions = bOn; } } BOOL IsShowComments() const { Init(); return bShowComments; } void SetShowComments( BOOL bShow ) { if( bShowComments != bShow ) { OptionsChanged(); bShowComments = bShow; } } @@ -383,15 +383,15 @@ public: SdOptionsMiscItem( USHORT nWhich); SdOptionsMiscItem( USHORT nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; - - void SetOptions( SdOptions* pOpts ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual int operator==( const SfxPoolItem& ) const; + + void SetOptions( SdOptions* pOpts ) const; - SdOptionsMisc& GetOptionsMisc() { return maOptionsMisc; } - const SdOptionsMisc& GetOptionsMisc() const { return maOptionsMisc; } + SdOptionsMisc& GetOptionsMisc() { return maOptionsMisc; } + const SdOptionsMisc& GetOptionsMisc() const { return maOptionsMisc; } private: - SdOptionsMisc maOptionsMisc; + SdOptionsMisc maOptionsMisc; }; // ----------------- @@ -402,16 +402,16 @@ class SD_DLLPUBLIC SdOptionsSnap : public SdOptionsGeneric { private: - BOOL bSnapHelplines : 1; // Snap/Object/SnapLine - BOOL bSnapBorder : 1; // Snap/Object/PageMargin - BOOL bSnapFrame : 1; // Snap/Object/ObjectFrame - BOOL bSnapPoints : 1; // Snap/Object/ObjectPoint - BOOL bOrtho : 1; // Snap/Position/CreatingMoving - BOOL bBigOrtho : 1; // Snap/Position/ExtendEdges - BOOL bRotate : 1; // Snap/Position/Rotating - INT16 nSnapArea; // Snap/Object/Range - INT16 nAngle; // Snap/Position/RotatingValue - INT16 nBezAngle; // Snap/Position/PointReduction + BOOL bSnapHelplines : 1; // Snap/Object/SnapLine + BOOL bSnapBorder : 1; // Snap/Object/PageMargin + BOOL bSnapFrame : 1; // Snap/Object/ObjectFrame + BOOL bSnapPoints : 1; // Snap/Object/ObjectPoint + BOOL bOrtho : 1; // Snap/Position/CreatingMoving + BOOL bBigOrtho : 1; // Snap/Position/ExtendEdges + BOOL bRotate : 1; // Snap/Position/Rotating + INT16 nSnapArea; // Snap/Object/Range + INT16 nAngle; // Snap/Position/RotatingValue + INT16 nBezAngle; // Snap/Position/PointReduction protected: @@ -420,33 +420,33 @@ protected: virtual BOOL WriteData( ::com::sun::star::uno::Any* pValues ) const; public: - + SdOptionsSnap( USHORT nConfigId, BOOL bUseConfig ); virtual ~SdOptionsSnap() {} - BOOL operator==( const SdOptionsSnap& rOpt ) const; - - BOOL IsSnapHelplines() const { Init(); return (BOOL) bSnapHelplines; } - BOOL IsSnapBorder() const { Init(); return (BOOL) bSnapBorder; } - BOOL IsSnapFrame() const { Init(); return (BOOL) bSnapFrame; } - BOOL IsSnapPoints() const { Init(); return (BOOL) bSnapPoints; } - BOOL IsOrtho() const { Init(); return (BOOL) bOrtho; } - BOOL IsBigOrtho() const { Init(); return (BOOL) bBigOrtho; } - BOOL IsRotate() const { Init(); return (BOOL) bRotate; } - INT16 GetSnapArea() const { Init(); return nSnapArea; } - INT16 GetAngle() const { Init(); return nAngle; } - INT16 GetEliminatePolyPointLimitAngle() const { Init(); return nBezAngle; } - - void SetSnapHelplines( BOOL bOn = TRUE ) { if( bSnapHelplines != bOn ) { OptionsChanged(); bSnapHelplines = bOn; } } - void SetSnapBorder( BOOL bOn = TRUE ) { if( bSnapBorder != bOn ) { OptionsChanged(); bSnapBorder = bOn; } } - void SetSnapFrame( BOOL bOn = TRUE ) { if( bSnapFrame != bOn ) { OptionsChanged(); bSnapFrame = bOn; } } - void SetSnapPoints( BOOL bOn = TRUE ) { if( bSnapPoints != bOn ) { OptionsChanged(); bSnapPoints = bOn; } } - void SetOrtho( BOOL bOn = TRUE ) { if( bOrtho != bOn ) { OptionsChanged(); bOrtho = bOn; } } - void SetBigOrtho( BOOL bOn = TRUE ) { if( bBigOrtho != bOn ) { OptionsChanged(); bBigOrtho = bOn; } } - void SetRotate( BOOL bOn = TRUE ) { if( bRotate != bOn ) { OptionsChanged(); bRotate = bOn; } } - void SetSnapArea( INT16 nIn ) { if( nSnapArea != nIn ) { OptionsChanged(); nSnapArea = nIn; } } - void SetAngle( INT16 nIn ) { if( nAngle != nIn ) { OptionsChanged(); nAngle = nIn; } } - void SetEliminatePolyPointLimitAngle( INT16 nIn ) { if( nBezAngle != nIn ) { OptionsChanged(); nBezAngle = nIn; } } + BOOL operator==( const SdOptionsSnap& rOpt ) const; + + BOOL IsSnapHelplines() const { Init(); return (BOOL) bSnapHelplines; } + BOOL IsSnapBorder() const { Init(); return (BOOL) bSnapBorder; } + BOOL IsSnapFrame() const { Init(); return (BOOL) bSnapFrame; } + BOOL IsSnapPoints() const { Init(); return (BOOL) bSnapPoints; } + BOOL IsOrtho() const { Init(); return (BOOL) bOrtho; } + BOOL IsBigOrtho() const { Init(); return (BOOL) bBigOrtho; } + BOOL IsRotate() const { Init(); return (BOOL) bRotate; } + INT16 GetSnapArea() const { Init(); return nSnapArea; } + INT16 GetAngle() const { Init(); return nAngle; } + INT16 GetEliminatePolyPointLimitAngle() const { Init(); return nBezAngle; } + + void SetSnapHelplines( BOOL bOn = TRUE ) { if( bSnapHelplines != bOn ) { OptionsChanged(); bSnapHelplines = bOn; } } + void SetSnapBorder( BOOL bOn = TRUE ) { if( bSnapBorder != bOn ) { OptionsChanged(); bSnapBorder = bOn; } } + void SetSnapFrame( BOOL bOn = TRUE ) { if( bSnapFrame != bOn ) { OptionsChanged(); bSnapFrame = bOn; } } + void SetSnapPoints( BOOL bOn = TRUE ) { if( bSnapPoints != bOn ) { OptionsChanged(); bSnapPoints = bOn; } } + void SetOrtho( BOOL bOn = TRUE ) { if( bOrtho != bOn ) { OptionsChanged(); bOrtho = bOn; } } + void SetBigOrtho( BOOL bOn = TRUE ) { if( bBigOrtho != bOn ) { OptionsChanged(); bBigOrtho = bOn; } } + void SetRotate( BOOL bOn = TRUE ) { if( bRotate != bOn ) { OptionsChanged(); bRotate = bOn; } } + void SetSnapArea( INT16 nIn ) { if( nSnapArea != nIn ) { OptionsChanged(); nSnapArea = nIn; } } + void SetAngle( INT16 nIn ) { if( nAngle != nIn ) { OptionsChanged(); nAngle = nIn; } } + void SetEliminatePolyPointLimitAngle( INT16 nIn ) { if( nBezAngle != nIn ) { OptionsChanged(); nBezAngle = nIn; } } }; // ----------------------------------------------------------------------------- @@ -458,14 +458,14 @@ public: SdOptionsSnapItem( USHORT nWhich); SdOptionsSnapItem( USHORT nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual int operator==( const SfxPoolItem& ) const; + + void SetOptions( SdOptions* pOpts ) const; - void SetOptions( SdOptions* pOpts ) const; - - SdOptionsSnap& GetOptionsSnap() { return maOptionsSnap; } + SdOptionsSnap& GetOptionsSnap() { return maOptionsSnap; } private: - SdOptionsSnap maOptionsSnap; + SdOptionsSnap maOptionsSnap; }; // ----------------- @@ -476,8 +476,8 @@ class SdOptionsZoom : public SdOptionsGeneric { private: - INT32 nX; // Zoom/ScaleX - INT32 nY; // Zoom/ScaleY + INT32 nX; // Zoom/ScaleX + INT32 nY; // Zoom/ScaleY protected: @@ -486,14 +486,14 @@ protected: virtual BOOL WriteData( ::com::sun::star::uno::Any* pValues ) const; public: - + SdOptionsZoom( USHORT nConfigId, BOOL bUseConfig ); virtual ~SdOptionsZoom() {} - BOOL operator==( const SdOptionsZoom& rOpt ) const; + BOOL operator==( const SdOptionsZoom& rOpt ) const; - void GetScale( INT32& rX, INT32& rY ) const { Init(); rX = nX; rY = nY; } - void SetScale( INT32 nInX, INT32 nInY ) { if( nX != nInX || nY != nInY ) { OptionsChanged(); nX = nInX; nY = nInY; } } + void GetScale( INT32& rX, INT32& rY ) const { Init(); rX = nX; rY = nY; } + void SetScale( INT32 nInX, INT32 nInY ) { if( nX != nInX || nY != nInY ) { OptionsChanged(); nX = nInX; nY = nInY; } } }; // ----------------------------------------------------------------------------- @@ -515,30 +515,30 @@ public: SdOptionsGrid( USHORT nConfigId, BOOL bUseConfig ); virtual ~SdOptionsGrid(); - void SetDefaults(); - BOOL operator==( const SdOptionsGrid& rOpt ) const; - - UINT32 GetFldDrawX() const { Init(); return SvxOptionsGrid::GetFldDrawX(); } - UINT32 GetFldDivisionX() const { Init(); return SvxOptionsGrid::GetFldDivisionX(); } - UINT32 GetFldDrawY() const { Init(); return SvxOptionsGrid::GetFldDrawY(); } - UINT32 GetFldDivisionY() const { Init(); return SvxOptionsGrid::GetFldDivisionY(); } - UINT32 GetFldSnapX() const { Init(); return SvxOptionsGrid::GetFldSnapX(); } - UINT32 GetFldSnapY() const { Init(); return SvxOptionsGrid::GetFldSnapY(); } - BOOL IsUseGridSnap() const { Init(); return SvxOptionsGrid::GetUseGridSnap(); } - BOOL IsSynchronize() const { Init(); return SvxOptionsGrid::GetSynchronize(); } - BOOL IsGridVisible() const { Init(); return SvxOptionsGrid::GetGridVisible(); } - BOOL IsEqualGrid() const { Init(); return SvxOptionsGrid::GetEqualGrid(); } - - void SetFldDrawX( UINT32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDrawX() ) { OptionsChanged(); SvxOptionsGrid::SetFldDrawX( nSet ); } } - void SetFldDivisionX( UINT32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDivisionX() ) { OptionsChanged(); SvxOptionsGrid::SetFldDivisionX( nSet ); } } - void SetFldDrawY( UINT32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDrawY() ) { OptionsChanged(); SvxOptionsGrid::SetFldDrawY( nSet ); } } - void SetFldDivisionY( UINT32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDivisionY() ) { OptionsChanged(); SvxOptionsGrid::SetFldDivisionY( nSet ); } } - void SetFldSnapX( UINT32 nSet ) { if( nSet != SvxOptionsGrid::GetFldSnapX() ) { OptionsChanged(); SvxOptionsGrid::SetFldSnapX( nSet ); } } - void SetFldSnapY( UINT32 nSet ) { if( nSet != SvxOptionsGrid::GetFldSnapY() ) { OptionsChanged(); SvxOptionsGrid::SetFldSnapY( nSet ); } } - void SetUseGridSnap( BOOL bSet ) { if( bSet != SvxOptionsGrid::GetUseGridSnap() ) { OptionsChanged(); SvxOptionsGrid::SetUseGridSnap( bSet ); } } - void SetSynchronize( BOOL bSet ) { if( bSet != SvxOptionsGrid::GetSynchronize() ) { OptionsChanged(); SvxOptionsGrid::SetSynchronize( bSet ); } } - void SetGridVisible( BOOL bSet ) { if( bSet != SvxOptionsGrid::GetGridVisible() ) { OptionsChanged(); SvxOptionsGrid::SetGridVisible( bSet ); } } - void SetEqualGrid( BOOL bSet ) { if( bSet != SvxOptionsGrid::GetEqualGrid() ) { OptionsChanged(); SvxOptionsGrid::SetEqualGrid( bSet ); } } + void SetDefaults(); + BOOL operator==( const SdOptionsGrid& rOpt ) const; + + UINT32 GetFldDrawX() const { Init(); return SvxOptionsGrid::GetFldDrawX(); } + UINT32 GetFldDivisionX() const { Init(); return SvxOptionsGrid::GetFldDivisionX(); } + UINT32 GetFldDrawY() const { Init(); return SvxOptionsGrid::GetFldDrawY(); } + UINT32 GetFldDivisionY() const { Init(); return SvxOptionsGrid::GetFldDivisionY(); } + UINT32 GetFldSnapX() const { Init(); return SvxOptionsGrid::GetFldSnapX(); } + UINT32 GetFldSnapY() const { Init(); return SvxOptionsGrid::GetFldSnapY(); } + BOOL IsUseGridSnap() const { Init(); return SvxOptionsGrid::GetUseGridSnap(); } + BOOL IsSynchronize() const { Init(); return SvxOptionsGrid::GetSynchronize(); } + BOOL IsGridVisible() const { Init(); return SvxOptionsGrid::GetGridVisible(); } + BOOL IsEqualGrid() const { Init(); return SvxOptionsGrid::GetEqualGrid(); } + + void SetFldDrawX( UINT32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDrawX() ) { OptionsChanged(); SvxOptionsGrid::SetFldDrawX( nSet ); } } + void SetFldDivisionX( UINT32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDivisionX() ) { OptionsChanged(); SvxOptionsGrid::SetFldDivisionX( nSet ); } } + void SetFldDrawY( UINT32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDrawY() ) { OptionsChanged(); SvxOptionsGrid::SetFldDrawY( nSet ); } } + void SetFldDivisionY( UINT32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDivisionY() ) { OptionsChanged(); SvxOptionsGrid::SetFldDivisionY( nSet ); } } + void SetFldSnapX( UINT32 nSet ) { if( nSet != SvxOptionsGrid::GetFldSnapX() ) { OptionsChanged(); SvxOptionsGrid::SetFldSnapX( nSet ); } } + void SetFldSnapY( UINT32 nSet ) { if( nSet != SvxOptionsGrid::GetFldSnapY() ) { OptionsChanged(); SvxOptionsGrid::SetFldSnapY( nSet ); } } + void SetUseGridSnap( BOOL bSet ) { if( bSet != SvxOptionsGrid::GetUseGridSnap() ) { OptionsChanged(); SvxOptionsGrid::SetUseGridSnap( bSet ); } } + void SetSynchronize( BOOL bSet ) { if( bSet != SvxOptionsGrid::GetSynchronize() ) { OptionsChanged(); SvxOptionsGrid::SetSynchronize( bSet ); } } + void SetGridVisible( BOOL bSet ) { if( bSet != SvxOptionsGrid::GetGridVisible() ) { OptionsChanged(); SvxOptionsGrid::SetGridVisible( bSet ); } } + void SetEqualGrid( BOOL bSet ) { if( bSet != SvxOptionsGrid::GetEqualGrid() ) { OptionsChanged(); SvxOptionsGrid::SetEqualGrid( bSet ); } } }; // ----------------------------------------------- @@ -549,7 +549,7 @@ class SdOptionsGridItem : public SvxGridItem public: SdOptionsGridItem( USHORT nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); - void SetOptions( SdOptions* pOpts ) const; + void SetOptions( SdOptions* pOpts ) const; }; // ------------------ @@ -560,27 +560,27 @@ class SD_DLLPUBLIC SdOptionsPrint : public SdOptionsGeneric { private: - BOOL bDraw : 1; // Print/Content/Drawing - BOOL bNotes : 1; // Print/Content/Note - BOOL bHandout : 1; // Print/Content/Handout - BOOL bOutline : 1; // Print/Content/Outline - BOOL bDate : 1; // Print/Other/Date - BOOL bTime : 1; // Print/Other/Time - BOOL bPagename : 1; // Print/Other/PageName - BOOL bHiddenPages : 1; // Print/Other/HiddenPage - BOOL bPagesize : 1; // Print/Page/PageSize - BOOL bPagetile : 1; // Print/Page/PageTile - BOOL bWarningPrinter : 1; // These flags you get - BOOL bWarningSize : 1; // from the common options, - BOOL bWarningOrientation : 1; // currently org.openoffice.Office.Common.xml (class OfaMiscCfg ; sfx2/misccfg.hxx ) - BOOL bBooklet : 1; // Print/Page/Booklet - BOOL bFront : 1; // Print/Page/BookletFront - BOOL bBack : 1; // Print/Page/BookletFront - BOOL bCutPage : 1; // NOT persistent !!! - BOOL bPaperbin : 1; // Print/Other/FromPrinterSetup - BOOL mbHandoutHorizontal : 1; // Order Page previews on Handout Pages horizontal - UINT16 mnHandoutPages; // Number of page previews on handout page (only 1/2/4/6/9 are supported) - UINT16 nQuality; // Print/Other/Quality + BOOL bDraw : 1; // Print/Content/Drawing + BOOL bNotes : 1; // Print/Content/Note + BOOL bHandout : 1; // Print/Content/Handout + BOOL bOutline : 1; // Print/Content/Outline + BOOL bDate : 1; // Print/Other/Date + BOOL bTime : 1; // Print/Other/Time + BOOL bPagename : 1; // Print/Other/PageName + BOOL bHiddenPages : 1; // Print/Other/HiddenPage + BOOL bPagesize : 1; // Print/Page/PageSize + BOOL bPagetile : 1; // Print/Page/PageTile + BOOL bWarningPrinter : 1; // These flags you get + BOOL bWarningSize : 1; // from the common options, + BOOL bWarningOrientation : 1; // currently org.openoffice.Office.Common.xml (class OfaMiscCfg ; sfx2/misccfg.hxx ) + BOOL bBooklet : 1; // Print/Page/Booklet + BOOL bFront : 1; // Print/Page/BookletFront + BOOL bBack : 1; // Print/Page/BookletFront + BOOL bCutPage : 1; // NOT persistent !!! + BOOL bPaperbin : 1; // Print/Other/FromPrinterSetup + BOOL mbHandoutHorizontal : 1; // Order Page previews on Handout Pages horizontal + UINT16 mnHandoutPages; // Number of page previews on handout page (only 1/2/4/6/9 are supported) + UINT16 nQuality; // Print/Other/Quality protected: @@ -589,55 +589,55 @@ protected: virtual BOOL WriteData( ::com::sun::star::uno::Any* pValues ) const; public: - + SdOptionsPrint( USHORT nConfigId, BOOL bUseConfig ); virtual ~SdOptionsPrint() {} - BOOL operator==( const SdOptionsPrint& rOpt ) const; - - BOOL IsDraw() const { Init(); return (BOOL) bDraw; } - BOOL IsNotes() const { Init(); return (BOOL) bNotes; } - BOOL IsHandout() const { Init(); return (BOOL) bHandout; } - BOOL IsOutline() const { Init(); return (BOOL) bOutline; } - BOOL IsDate() const { Init(); return (BOOL) bDate; } - BOOL IsTime() const { Init(); return (BOOL) bTime; } - BOOL IsPagename() const { Init(); return (BOOL) bPagename; } - BOOL IsHiddenPages() const { Init(); return (BOOL) bHiddenPages; } - BOOL IsPagesize() const { Init(); return (BOOL) bPagesize; } - BOOL IsPagetile() const { Init(); return (BOOL) bPagetile; } - BOOL IsWarningPrinter() const { Init(); return (BOOL) bWarningPrinter; } - BOOL IsWarningSize() const { Init(); return (BOOL) bWarningSize; } - BOOL IsWarningOrientation() const { Init(); return (BOOL) bWarningOrientation; } - BOOL IsBooklet() const { Init(); return (BOOL) bBooklet; } - BOOL IsFrontPage() const { Init(); return (BOOL) bFront; } - BOOL IsBackPage() const { Init(); return (BOOL) bBack; } - BOOL IsCutPage() const { Init(); return (BOOL) bCutPage; } - BOOL IsPaperbin() const { Init(); return (BOOL) bPaperbin; } - UINT16 GetOutputQuality() const { Init(); return nQuality; } - BOOL IsHandoutHorizontal() const { Init(); return mbHandoutHorizontal; } - UINT16 GetHandoutPages() const { Init(); return mnHandoutPages; } - - void SetDraw( BOOL bOn = TRUE ) { if( bDraw != bOn ) { OptionsChanged(); bDraw = bOn; } } - void SetNotes( BOOL bOn = TRUE ) { if( bNotes != bOn ) { OptionsChanged(); bNotes = bOn; } } - void SetHandout( BOOL bOn = TRUE ) { if( bHandout != bOn ) { OptionsChanged(); bHandout = bOn; } } - void SetOutline( BOOL bOn = TRUE ) { if( bOutline != bOn ) { OptionsChanged(); bOutline = bOn; } } - void SetDate( BOOL bOn = TRUE ) { if( bDate != bOn ) { OptionsChanged(); bDate = bOn; } } - void SetTime( BOOL bOn = TRUE ) { if( bTime != bOn ) { OptionsChanged(); bTime = bOn; } } - void SetPagename( BOOL bOn = TRUE ) { if( bPagename != bOn ) { OptionsChanged(); bPagename = bOn; } } - void SetHiddenPages( BOOL bOn = TRUE ) { if( bHiddenPages != bOn ) { OptionsChanged(); bHiddenPages = bOn; } } - void SetPagesize( BOOL bOn = TRUE ) { if( bPagesize != bOn ) { OptionsChanged(); bPagesize = bOn; } } - void SetPagetile( BOOL bOn = TRUE ) { if( bPagetile != bOn ) { OptionsChanged(); bPagetile = bOn; } } - void SetWarningPrinter( BOOL bOn = TRUE ) { if( bWarningPrinter != bOn ) { OptionsChanged(); bWarningPrinter = bOn; } } - void SetWarningSize( BOOL bOn = TRUE ) { if( bWarningSize != bOn ) { OptionsChanged(); bWarningSize = bOn; } } - void SetWarningOrientation( BOOL bOn = TRUE ) { if( bWarningOrientation != bOn ) { OptionsChanged(); bWarningOrientation = bOn; } } - void SetBooklet( BOOL bOn = TRUE ) { if( bBooklet != bOn ) { OptionsChanged(); bBooklet = bOn; } } - void SetFrontPage( BOOL bOn = TRUE ) { if( bFront != bOn ) { OptionsChanged(); bFront = bOn; } } - void SetBackPage( BOOL bOn = TRUE ) { if( bBack != bOn ) { OptionsChanged(); bBack = bOn; } } - void SetCutPage( BOOL bOn = TRUE ) { if( bCutPage != bOn ) { OptionsChanged(); bCutPage = bOn; } } - void SetPaperbin( BOOL bOn = TRUE ) { if( bPaperbin != bOn ) { OptionsChanged(); bPaperbin = bOn; } } - void SetOutputQuality( UINT16 nInQuality ) { if( nQuality != nInQuality ) { OptionsChanged(); nQuality = nInQuality; } } - void SetHandoutHorizontal( BOOL bHandoutHorizontal ) { if( mbHandoutHorizontal != bHandoutHorizontal ) { OptionsChanged(); mbHandoutHorizontal = bHandoutHorizontal; } } - void SetHandoutPages( UINT16 nHandoutPages ) { if( nHandoutPages != mnHandoutPages ) { OptionsChanged(); mnHandoutPages = nHandoutPages; } } + BOOL operator==( const SdOptionsPrint& rOpt ) const; + + BOOL IsDraw() const { Init(); return (BOOL) bDraw; } + BOOL IsNotes() const { Init(); return (BOOL) bNotes; } + BOOL IsHandout() const { Init(); return (BOOL) bHandout; } + BOOL IsOutline() const { Init(); return (BOOL) bOutline; } + BOOL IsDate() const { Init(); return (BOOL) bDate; } + BOOL IsTime() const { Init(); return (BOOL) bTime; } + BOOL IsPagename() const { Init(); return (BOOL) bPagename; } + BOOL IsHiddenPages() const { Init(); return (BOOL) bHiddenPages; } + BOOL IsPagesize() const { Init(); return (BOOL) bPagesize; } + BOOL IsPagetile() const { Init(); return (BOOL) bPagetile; } + BOOL IsWarningPrinter() const { Init(); return (BOOL) bWarningPrinter; } + BOOL IsWarningSize() const { Init(); return (BOOL) bWarningSize; } + BOOL IsWarningOrientation() const { Init(); return (BOOL) bWarningOrientation; } + BOOL IsBooklet() const { Init(); return (BOOL) bBooklet; } + BOOL IsFrontPage() const { Init(); return (BOOL) bFront; } + BOOL IsBackPage() const { Init(); return (BOOL) bBack; } + BOOL IsCutPage() const { Init(); return (BOOL) bCutPage; } + BOOL IsPaperbin() const { Init(); return (BOOL) bPaperbin; } + UINT16 GetOutputQuality() const { Init(); return nQuality; } + BOOL IsHandoutHorizontal() const { Init(); return mbHandoutHorizontal; } + UINT16 GetHandoutPages() const { Init(); return mnHandoutPages; } + + void SetDraw( BOOL bOn = TRUE ) { if( bDraw != bOn ) { OptionsChanged(); bDraw = bOn; } } + void SetNotes( BOOL bOn = TRUE ) { if( bNotes != bOn ) { OptionsChanged(); bNotes = bOn; } } + void SetHandout( BOOL bOn = TRUE ) { if( bHandout != bOn ) { OptionsChanged(); bHandout = bOn; } } + void SetOutline( BOOL bOn = TRUE ) { if( bOutline != bOn ) { OptionsChanged(); bOutline = bOn; } } + void SetDate( BOOL bOn = TRUE ) { if( bDate != bOn ) { OptionsChanged(); bDate = bOn; } } + void SetTime( BOOL bOn = TRUE ) { if( bTime != bOn ) { OptionsChanged(); bTime = bOn; } } + void SetPagename( BOOL bOn = TRUE ) { if( bPagename != bOn ) { OptionsChanged(); bPagename = bOn; } } + void SetHiddenPages( BOOL bOn = TRUE ) { if( bHiddenPages != bOn ) { OptionsChanged(); bHiddenPages = bOn; } } + void SetPagesize( BOOL bOn = TRUE ) { if( bPagesize != bOn ) { OptionsChanged(); bPagesize = bOn; } } + void SetPagetile( BOOL bOn = TRUE ) { if( bPagetile != bOn ) { OptionsChanged(); bPagetile = bOn; } } + void SetWarningPrinter( BOOL bOn = TRUE ) { if( bWarningPrinter != bOn ) { OptionsChanged(); bWarningPrinter = bOn; } } + void SetWarningSize( BOOL bOn = TRUE ) { if( bWarningSize != bOn ) { OptionsChanged(); bWarningSize = bOn; } } + void SetWarningOrientation( BOOL bOn = TRUE ) { if( bWarningOrientation != bOn ) { OptionsChanged(); bWarningOrientation = bOn; } } + void SetBooklet( BOOL bOn = TRUE ) { if( bBooklet != bOn ) { OptionsChanged(); bBooklet = bOn; } } + void SetFrontPage( BOOL bOn = TRUE ) { if( bFront != bOn ) { OptionsChanged(); bFront = bOn; } } + void SetBackPage( BOOL bOn = TRUE ) { if( bBack != bOn ) { OptionsChanged(); bBack = bOn; } } + void SetCutPage( BOOL bOn = TRUE ) { if( bCutPage != bOn ) { OptionsChanged(); bCutPage = bOn; } } + void SetPaperbin( BOOL bOn = TRUE ) { if( bPaperbin != bOn ) { OptionsChanged(); bPaperbin = bOn; } } + void SetOutputQuality( UINT16 nInQuality ) { if( nQuality != nInQuality ) { OptionsChanged(); nQuality = nInQuality; } } + void SetHandoutHorizontal( BOOL bHandoutHorizontal ) { if( mbHandoutHorizontal != bHandoutHorizontal ) { OptionsChanged(); mbHandoutHorizontal = bHandoutHorizontal; } } + void SetHandoutPages( UINT16 nHandoutPages ) { if( nHandoutPages != mnHandoutPages ) { OptionsChanged(); mnHandoutPages = nHandoutPages; } } }; // ----------------------------------------------------------------------------- @@ -645,19 +645,19 @@ public: class SD_DLLPUBLIC SdOptionsPrintItem : public SfxPoolItem { public: - + SdOptionsPrintItem( USHORT nWhich); SdOptionsPrintItem( USHORT nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual int operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual int operator==( const SfxPoolItem& ) const; + + void SetOptions( SdOptions* pOpts ) const; - void SetOptions( SdOptions* pOpts ) const; - - SdOptionsPrint& GetOptionsPrint() { return maOptionsPrint; } - const SdOptionsPrint& GetOptionsPrint() const { return maOptionsPrint; } + SdOptionsPrint& GetOptionsPrint() { return maOptionsPrint; } + const SdOptionsPrint& GetOptionsPrint() const { return maOptionsPrint; } private: - SdOptionsPrint maOptionsPrint; + SdOptionsPrint maOptionsPrint; }; // ------------- @@ -667,14 +667,14 @@ private: class SdOptions : public SdOptionsLayout, public SdOptionsContents, public SdOptionsMisc, public SdOptionsSnap, public SdOptionsZoom, public SdOptionsGrid, - public SdOptionsPrint + public SdOptionsPrint { public: - + SdOptions( USHORT nConfigId ); virtual ~SdOptions(); - void StoreConfig( ULONG nOptionRange = SD_OPTIONS_ALL ); + void StoreConfig( ULONG nOptionRange = SD_OPTIONS_ALL ); }; #endif // _SD_OPTSITEM_HXX diff --git a/sd/source/ui/inc/packgdlg.hrc b/sd/source/ui/inc/packgdlg.hrc index fe6546a7082b..df0b6375317c 100644 --- a/sd/source/ui/inc/packgdlg.hrc +++ b/sd/source/ui/inc/packgdlg.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,22 +25,22 @@ * ************************************************************************/ -#define DLG_PACKNGO 939 +#define DLG_PACKNGO 939 -#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 GRP_DOKU 4 -#define CBX_UNLINK 5 -#define GRP_STORE 6 -#define GRP_SEPARATOR 7 -#define CBX_SPANNING 8 -#define LB_STOREMEDIUM 9 +#define GRP_DOKU 4 +#define CBX_UNLINK 5 +#define GRP_STORE 6 +#define GRP_SEPARATOR 7 +#define CBX_SPANNING 8 +#define LB_STOREMEDIUM 9 -#define FT_DOKU_DESCR 10 -#define FT_STORE_DESCR 11 -#define FT_STOREMEDIUM 12 +#define FT_DOKU_DESCR 10 +#define FT_STORE_DESCR 11 +#define FT_STOREMEDIUM 12 -#define MTR_USERDEFINED 13 +#define MTR_USERDEFINED 13 diff --git a/sd/source/ui/inc/paragr.hrc b/sd/source/ui/inc/paragr.hrc index 1510325ce2e1..96815fb6188a 100644 --- a/sd/source/ui/inc/paragr.hrc +++ b/sd/source/ui/inc/paragr.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,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define TAB_PARAGRAPH 20620 +#define TAB_PARAGRAPH 20620 #define CB_NEW_START 1 #define CB_NUMBER_NEW_START 2 diff --git a/sd/source/ui/inc/paragr.hxx b/sd/source/ui/inc/paragr.hxx index af801492672d..6ba6b2d969db 100644 --- a/sd/source/ui/inc/paragr.hxx +++ b/sd/source/ui/inc/paragr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 SdParagraphDlg : public SfxTabDialog { private: - const SfxItemSet& rOutAttrs; + const SfxItemSet& rOutAttrs; public: SdParagraphDlg( Window* pParent, const SfxItemSet* pAttr ); diff --git a/sd/source/ui/inc/pgjump.hxx b/sd/source/ui/inc/pgjump.hxx index 238b77fe410f..a906a8c39f08 100644 --- a/sd/source/ui/inc/pgjump.hxx +++ b/sd/source/ui/inc/pgjump.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/sd/source/ui/inc/present.hrc b/sd/source/ui/inc/present.hrc index fc4d3b68d9f4..6ad233269b6c 100644 --- a/sd/source/ui/inc/present.hrc +++ b/sd/source/ui/inc/present.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 @@ -26,7 +26,7 @@ ************************************************************************/ #include <sfx2/sfx.hrc> -#define DLG_START_PRESENTATION RID_APP_START+3 +#define DLG_START_PRESENTATION RID_APP_START+3 #define BTN_OK 1 #define BTN_CANCEL 1 #define BTN_HELP 1 @@ -39,9 +39,9 @@ #define LB_CUSTOMSHOW 2 #define GRP_KIND 2 -#define RBT_STANDARD 4 -#define RBT_WINDOW 5 -#define RBT_AUTO 6 +#define RBT_STANDARD 4 +#define RBT_WINDOW 5 +#define RBT_AUTO 6 #define FT_PAUSE 1 #define TMF_PAUSE 1 #define CBX_AUTOLOGO 1 diff --git a/sd/source/ui/inc/present.hxx b/sd/source/ui/inc/present.hxx index 65ec34f2ac20..6069edcde65b 100644 --- a/sd/source/ui/inc/present.hxx +++ b/sd/source/ui/inc/present.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,50 +47,50 @@ class SdStartPresentationDlg : public ModalDialog { private: - FixedLine aGrpRange; - RadioButton aRbtAll; - RadioButton aRbtAtDia; - RadioButton aRbtCustomshow; - ListBox aLbDias; - ListBox aLbCustomshow; - - FixedLine aGrpKind; - RadioButton aRbtStandard; - RadioButton aRbtWindow; - RadioButton aRbtAuto; - TimeField aTmfPause; - CheckBox aCbxAutoLogo; - - FixedLine aGrpOptions; - CheckBox aCbxManuel; - CheckBox aCbxMousepointer; - CheckBox aCbxPen; - CheckBox aCbxNavigator; + FixedLine aGrpRange; + RadioButton aRbtAll; + RadioButton aRbtAtDia; + RadioButton aRbtCustomshow; + ListBox aLbDias; + ListBox aLbCustomshow; + + FixedLine aGrpKind; + RadioButton aRbtStandard; + RadioButton aRbtWindow; + RadioButton aRbtAuto; + TimeField aTmfPause; + CheckBox aCbxAutoLogo; + + FixedLine aGrpOptions; + CheckBox aCbxManuel; + CheckBox aCbxMousepointer; + CheckBox aCbxPen; + CheckBox aCbxNavigator; CheckBox aCbxAnimationAllowed; CheckBox aCbxChangePage; - CheckBox aCbxAlwaysOnTop; + CheckBox aCbxAlwaysOnTop; - FixedLine maGrpMonitor; - FixedText maFtMonitor; - ListBox maLBMonitor; + FixedLine maGrpMonitor; + FixedText maFtMonitor; + ListBox maLBMonitor; - OKButton aBtnOK; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + OKButton aBtnOK; + CancelButton aBtnCancel; + HelpButton aBtnHelp; - List* pCustomShowList; - const SfxItemSet& rOutAttrs; - sal_Int32 mnMonitors; + List* pCustomShowList; + const SfxItemSet& rOutAttrs; + sal_Int32 mnMonitors; - String msPrimaryMonitor; - String msMonitor; - String msAllMonitors; + String msPrimaryMonitor; + String msMonitor; + String msAllMonitors; DECL_LINK( ChangeRangeHdl, void * ); DECL_LINK( ClickWindowPresentationHdl, void * ); DECL_LINK( ChangePauseHdl, void * ); - void InitMonitorSettings(); + void InitMonitorSettings(); public: SdStartPresentationDlg( Window* pWindow, @@ -98,7 +98,7 @@ public: List& rPageNames, List* pCSList ); - void GetAttr( SfxItemSet& rOutAttrs ); + void GetAttr( SfxItemSet& rOutAttrs ); }; #endif // _SD_PRESENT_HXX_ diff --git a/sd/source/ui/inc/preview.hrc b/sd/source/ui/inc/preview.hrc index dd9f8756161a..b40f5b654b57 100644 --- a/sd/source/ui/inc/preview.hrc +++ b/sd/source/ui/inc/preview.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/sd/source/ui/inc/prltempl.hrc b/sd/source/ui/inc/prltempl.hrc index 97529b7d9068..cb32af4dfee4 100644 --- a/sd/source/ui/inc/prltempl.hrc +++ b/sd/source/ui/inc/prltempl.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 <sfx2/sfx.hrc> -/* #define TAB_PRES_LAYOUT_TEMPLATE RID_APP_START+??? */ -#define TAB_PRES_LAYOUT_TEMPLATE 844 -#define TAB_PRES_LAYOUT_TEMPLATE_BACKGROUND 846 +/* #define TAB_PRES_LAYOUT_TEMPLATE RID_APP_START+??? */ +#define TAB_PRES_LAYOUT_TEMPLATE 844 +#define TAB_PRES_LAYOUT_TEMPLATE_BACKGROUND 846 #define TAB_CONTROL 1 diff --git a/sd/source/ui/inc/prltempl.hxx b/sd/source/ui/inc/prltempl.hxx index f182f4311dab..7a2141dff7a5 100644 --- a/sd/source/ui/inc/prltempl.hxx +++ b/sd/source/ui/inc/prltempl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,29 +55,29 @@ class SfxStyleSheetBasePool; class SdPresLayoutTemplateDlg : public SfxTabDialog { private: - const SfxObjectShell* mpDocShell; + const SfxObjectShell* mpDocShell; - XColorTable* pColorTab; - XGradientList* pGradientList; - XHatchList* pHatchingList; - XBitmapList* pBitmapList; - XDashList* pDashList; - XLineEndList* pLineEndList; + XColorTable* pColorTab; + XGradientList* pGradientList; + XHatchList* pHatchingList; + XBitmapList* pBitmapList; + XDashList* pDashList; + XLineEndList* pLineEndList; - USHORT nPageType; - USHORT nDlgType; - USHORT nPos; + USHORT nPageType; + USHORT nDlgType; + USHORT nPos; - ChangeType nColorTableState; - ChangeType nBitmapListState; - ChangeType nGradientListState; - ChangeType nHatchingListState; - ChangeType nLineEndListState; - ChangeType nDashListState; + ChangeType nColorTableState; + ChangeType nBitmapListState; + ChangeType nGradientListState; + ChangeType nHatchingListState; + ChangeType nLineEndListState; + ChangeType nDashListState; - PresentationObjects ePO; + PresentationObjects ePO; - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); // fuers Maping mit dem neuen SvxNumBulletItem SfxItemSet aInputSet; diff --git a/sd/source/ui/inc/prntopts.hrc b/sd/source/ui/inc/prntopts.hrc index 04d155f6730d..4698a1c5983f 100644 --- a/sd/source/ui/inc/prntopts.hrc +++ b/sd/source/ui/inc/prntopts.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 @@ -47,10 +47,10 @@ #define GRP_PRINT_EXT 3 #define GRP_PAPERBIN 4 -#define RBT_COLOR 5 -#define RBT_GRAYSCALE 6 -#define RBT_BLACKWHITE 7 -#define GRP_OUTPUT 5 +#define RBT_COLOR 5 +#define RBT_GRAYSCALE 6 +#define RBT_BLACKWHITE 7 +#define GRP_OUTPUT 5 #define FL_SEPARATOR1 6 #define FL_SEPARATOR2 7 diff --git a/sd/source/ui/inc/prntopts.hxx b/sd/source/ui/inc/prntopts.hxx index 291f40e0e7b6..e2221d2cbd41 100644 --- a/sd/source/ui/inc/prntopts.hxx +++ b/sd/source/ui/inc/prntopts.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,34 +53,34 @@ class SdPrintOptions : public SfxTabPage private: FixedLine aGrpPrint; CheckBox aCbxDraw; - CheckBox aCbxNotes; - CheckBox aCbxHandout; - CheckBox aCbxOutline; + CheckBox aCbxNotes; + CheckBox aCbxHandout; + CheckBox aCbxOutline; FixedLine aSeparator1FL; FixedLine aGrpOutput; RadioButton aRbtColor; - RadioButton aRbtGrayscale; - RadioButton aRbtBlackWhite; + RadioButton aRbtGrayscale; + RadioButton aRbtBlackWhite; FixedLine aGrpPrintExt; CheckBox aCbxPagename; - CheckBox aCbxDate; - CheckBox aCbxTime; + CheckBox aCbxDate; + CheckBox aCbxTime; CheckBox aCbxHiddenPages; FixedLine aSeparator2FL; FixedLine aGrpPageoptions; RadioButton aRbtDefault; - RadioButton aRbtPagesize; - RadioButton aRbtPagetile; - RadioButton aRbtBooklet; - CheckBox aCbxFront; - CheckBox aCbxBack; + RadioButton aRbtPagesize; + RadioButton aRbtPagetile; + RadioButton aRbtBooklet; + CheckBox aCbxFront; + CheckBox aCbxBack; - CheckBox aCbxPaperbin; + CheckBox aCbxPaperbin; - const SfxItemSet& rOutAttrs; + const SfxItemSet& rOutAttrs; DECL_LINK( ClickCheckboxHdl, CheckBox * ); DECL_LINK( ClickBookletHdl, CheckBox * ); @@ -92,13 +92,13 @@ public: SdPrintOptions( Window* pParent, const SfxItemSet& rInAttrs); ~SdPrintOptions(); - static SfxTabPage* Create( Window*, const SfxItemSet& ); + static SfxTabPage* Create( Window*, const SfxItemSet& ); virtual BOOL FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); void SetDrawMode(); - virtual void PageCreated (SfxAllItemSet aSet); + virtual void PageCreated (SfxAllItemSet aSet); }; diff --git a/sd/source/ui/inc/pubdlg.hrc b/sd/source/ui/inc/pubdlg.hrc index 8e3c1be2111d..1e54b3a5c125 100644 --- a/sd/source/ui/inc/pubdlg.hrc +++ b/sd/source/ui/inc/pubdlg.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 @@ -26,111 +26,111 @@ ************************************************************************/ -#define PAGE1_BMP 1 -#define PAGE1_TITEL 2 -#define PAGE1_NEW_DESIGN 3 -#define PAGE1_OLD_DESIGN 4 -#define PAGE1_DESIGNS 5 -#define PAGE1_DEL_DESIGN 6 -#define PAGE1_DESC 7 +#define PAGE1_BMP 1 +#define PAGE1_TITEL 2 +#define PAGE1_NEW_DESIGN 3 +#define PAGE1_OLD_DESIGN 4 +#define PAGE1_DESIGNS 5 +#define PAGE1_DEL_DESIGN 6 +#define PAGE1_DESC 7 ////////////////////////////// -#define PAGE2_BMP 20 -#define PAGE2_TITEL 21 -#define PAGE2_STANDARD 22 -#define PAGE2_FRAMES 23 -#define PAGE2_KIOSK 24 -#define PAGE2_WEBCAST 25 - -#define PAGE2_NOFRAMES_FB 26 -#define PAGE2_FRAMES_FB 27 -#define PAGE2_KIOSK_FB 28 -#define PAGE2_WEBCAST_FB 29 - -#define PAGE2_TITEL_HTML 30 -#define PAGE2_CONTENT 31 -#define PAGE2_NOTES 32 - -#define PAGE2_TITEL_KIOSK 33 -#define PAGE2_CHG_DEFAULT 34 -#define PAGE2_CHG_AUTO 35 -#define PAGE2_DURATION_TXT 36 -#define PAGE2_DURATION_TMF 37 -#define PAGE2_ENDLESS 38 - -#define PAGE2_TITEL_WEBCAST 40 -#define PAGE2_ASP 41 -#define PAGE2_PERL 42 -#define PAGE2_INDEX_TXT 43 -#define PAGE2_INDEX 44 -#define PAGE2_URL_TXT 45 -#define PAGE2_URL 46 -#define PAGE2_CGI_TXT 47 -#define PAGE2_CGI 48 -#define PAGE2_VERT 49 +#define PAGE2_BMP 20 +#define PAGE2_TITEL 21 +#define PAGE2_STANDARD 22 +#define PAGE2_FRAMES 23 +#define PAGE2_KIOSK 24 +#define PAGE2_WEBCAST 25 + +#define PAGE2_NOFRAMES_FB 26 +#define PAGE2_FRAMES_FB 27 +#define PAGE2_KIOSK_FB 28 +#define PAGE2_WEBCAST_FB 29 + +#define PAGE2_TITEL_HTML 30 +#define PAGE2_CONTENT 31 +#define PAGE2_NOTES 32 + +#define PAGE2_TITEL_KIOSK 33 +#define PAGE2_CHG_DEFAULT 34 +#define PAGE2_CHG_AUTO 35 +#define PAGE2_DURATION_TXT 36 +#define PAGE2_DURATION_TMF 37 +#define PAGE2_ENDLESS 38 + +#define PAGE2_TITEL_WEBCAST 40 +#define PAGE2_ASP 41 +#define PAGE2_PERL 42 +#define PAGE2_INDEX_TXT 43 +#define PAGE2_INDEX 44 +#define PAGE2_URL_TXT 45 +#define PAGE2_URL 46 +#define PAGE2_CGI_TXT 47 +#define PAGE2_CGI 48 +#define PAGE2_VERT 49 ////////////////////////////// -#define PAGE3_BMP 50 -#define PAGE3_TITEL_1 51 -#define PAGE3_PNG 51 -#define PAGE3_GIF 52 -#define PAGE3_JPG 53 -#define PAGE3_QUALITY_TXT 54 -#define PAGE3_QUALITY 55 -#define PAGE3_TITEL_2 56 -#define PAGE3_RESOLUTION_1 57 -#define PAGE3_RESOLUTION_2 58 -#define PAGE3_RESOLUTION_3 59 -#define PAGE3_TITEL_3 60 -#define PAGE3_SLD_SOUND 61 -#define PAGE3_VERT 62 +#define PAGE3_BMP 50 +#define PAGE3_TITEL_1 51 +#define PAGE3_PNG 51 +#define PAGE3_GIF 52 +#define PAGE3_JPG 53 +#define PAGE3_QUALITY_TXT 54 +#define PAGE3_QUALITY 55 +#define PAGE3_TITEL_2 56 +#define PAGE3_RESOLUTION_1 57 +#define PAGE3_RESOLUTION_2 58 +#define PAGE3_RESOLUTION_3 59 +#define PAGE3_TITEL_3 60 +#define PAGE3_SLD_SOUND 61 +#define PAGE3_VERT 62 #define PAGE3_HIDDEN_SLIDES 63 ////////////////////////////// -#define PAGE4_BMP 65 -#define PAGE4_TITEL_1 66 -#define PAGE4_AUTHOR_TXT 67 -#define PAGE4_AUTHOR 68 -#define PAGE4_EMAIL_TXT 69 -#define PAGE4_EMAIL_EDIT 70 -#define PAGE4_WWW_TXT 71 -#define PAGE4_WWW_EDIT 72 -#define PAGE4_TITEL_2 73 -#define PAGE4_MISC 74 -#define PAGE4_DOWNLOAD 75 -#define PAGE4_CREATED 76 +#define PAGE4_BMP 65 +#define PAGE4_TITEL_1 66 +#define PAGE4_AUTHOR_TXT 67 +#define PAGE4_AUTHOR 68 +#define PAGE4_EMAIL_TXT 69 +#define PAGE4_EMAIL_EDIT 70 +#define PAGE4_WWW_TXT 71 +#define PAGE4_WWW_EDIT 72 +#define PAGE4_TITEL_2 73 +#define PAGE4_MISC 74 +#define PAGE4_DOWNLOAD 75 +#define PAGE4_CREATED 76 ////////////////////////////// -#define PAGE5_BMP 80 -#define PAGE5_TITEL 81 -#define PAGE5_TEXTONLY 82 -#define PAGE5_BUTTONS 83 -#define PAGE5_TITEL_2 84 -#define PAGE5_NOBACK 85 -#define PAGE5_BACKS 86 +#define PAGE5_BMP 80 +#define PAGE5_TITEL 81 +#define PAGE5_TEXTONLY 82 +#define PAGE5_BUTTONS 83 +#define PAGE5_TITEL_2 84 +#define PAGE5_NOBACK 85 +#define PAGE5_BACKS 86 ////////////////////////////// -#define PAGE6_BMP 100 -#define PAGE6_TITEL 101 -#define PAGE6_DEFAULT 102 -#define PAGE6_USER 103 -#define PAGE6_BACK 104 -#define PAGE6_TEXT 105 -#define PAGE6_LINK 106 -#define PAGE6_VLINK 107 -#define PAGE6_ALINK 108 -#define PAGE6_DOCCOLORS 109 -#define PAGE6_USECOLOR 110 -#define PAGE6_PREVIEW 111 +#define PAGE6_BMP 100 +#define PAGE6_TITEL 101 +#define PAGE6_DEFAULT 102 +#define PAGE6_USER 103 +#define PAGE6_BACK 104 +#define PAGE6_TEXT 105 +#define PAGE6_LINK 106 +#define PAGE6_VLINK 107 +#define PAGE6_ALINK 108 +#define PAGE6_DOCCOLORS 109 +#define PAGE6_USECOLOR 110 +#define PAGE6_PREVIEW 111 ////////////////////////////// -//#define PAGE6_PAGE_SND 128 +//#define PAGE6_PAGE_SND 128 ////////////////////////////// @@ -139,7 +139,7 @@ #define BUT_FINISH 202 #define BUT_CANCEL 203 #define BUT_HELP 204 -#define BOTTOM_LINE 205 +#define BOTTOM_LINE 205 ////////////////////////////// @@ -147,7 +147,7 @@ ////////////////////////////// -#define BTN_SAVE 1 -#define BTN_NOSAVE 2 -#define EDT_NAME 3 +#define BTN_SAVE 1 +#define BTN_NOSAVE 2 +#define EDT_NAME 3 #define DLG_DESIGNNAME 740 diff --git a/sd/source/ui/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx index 61a7b0b86a30..1b4c15805521 100644 --- a/sd/source/ui/inc/pubdlg.hxx +++ b/sd/source/ui/inc/pubdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ #define NOOFPAGES 6 -enum HtmlPublishMode { PUBLISH_HTML, PUBLISH_FRAMES, PUBLISH_WEBCAST, PUBLISH_KIOSK }; +enum HtmlPublishMode { PUBLISH_HTML, PUBLISH_FRAMES, PUBLISH_WEBCAST, PUBLISH_KIOSK }; class SfxItemSet; @@ -68,115 +68,115 @@ class SdPublishingDlg : public ModalDialog { private: // page 1 controls - FixedBitmap* pPage1_Bmp; - FixedLine* pPage1_Titel; - RadioButton* pPage1_NewDesign; - RadioButton* pPage1_OldDesign; - ListBox* pPage1_Designs; - PushButton* pPage1_DelDesign; - FixedText* pPage1_Desc; + FixedBitmap* pPage1_Bmp; + FixedLine* pPage1_Titel; + RadioButton* pPage1_NewDesign; + RadioButton* pPage1_OldDesign; + ListBox* pPage1_Designs; + PushButton* pPage1_DelDesign; + FixedText* pPage1_Desc; // page 2 controls - FixedBitmap* pPage2_Bmp; - FixedLine* pPage2_Titel; - RadioButton* pPage2_Standard; - RadioButton* pPage2_Frames; - RadioButton* pPage2_Kiosk; - RadioButton* pPage2_WebCast; - FixedBitmap* pPage2_Standard_FB; - FixedBitmap* pPage2_Frames_FB; - FixedBitmap* pPage2_Kiosk_FB; - FixedBitmap* pPage2_WebCast_FB; - - FixedLine* pPage2_Titel_Html; - CheckBox* pPage2_Content; - CheckBox* pPage2_Notes; - - FixedLine* pPage2_Titel_WebCast; - RadioButton* pPage2_ASP; - RadioButton* pPage2_PERL; - FixedText* pPage2_URL_txt; - Edit* pPage2_URL; - FixedText* pPage2_CGI_txt; - Edit* pPage2_CGI; - FixedText* pPage2_Index_txt; - Edit* pPage2_Index; + FixedBitmap* pPage2_Bmp; + FixedLine* pPage2_Titel; + RadioButton* pPage2_Standard; + RadioButton* pPage2_Frames; + RadioButton* pPage2_Kiosk; + RadioButton* pPage2_WebCast; + FixedBitmap* pPage2_Standard_FB; + FixedBitmap* pPage2_Frames_FB; + FixedBitmap* pPage2_Kiosk_FB; + FixedBitmap* pPage2_WebCast_FB; + + FixedLine* pPage2_Titel_Html; + CheckBox* pPage2_Content; + CheckBox* pPage2_Notes; + + FixedLine* pPage2_Titel_WebCast; + RadioButton* pPage2_ASP; + RadioButton* pPage2_PERL; + FixedText* pPage2_URL_txt; + Edit* pPage2_URL; + FixedText* pPage2_CGI_txt; + Edit* pPage2_CGI; + FixedText* pPage2_Index_txt; + Edit* pPage2_Index; FixedLine* pPage2_Vert; - FixedLine* pPage2_Titel_Kiosk; - RadioButton* pPage2_ChgDefault; - RadioButton* pPage2_ChgAuto; - FixedText* pPage2_Duration_txt; - TimeField* pPage2_Duration; - CheckBox* pPage2_Endless; + FixedLine* pPage2_Titel_Kiosk; + RadioButton* pPage2_ChgDefault; + RadioButton* pPage2_ChgAuto; + FixedText* pPage2_Duration_txt; + TimeField* pPage2_Duration; + CheckBox* pPage2_Endless; // page 3 controls - FixedBitmap* pPage3_Bmp; - FixedLine* pPage3_Titel1; - RadioButton* pPage3_Png; - RadioButton* pPage3_Gif; - RadioButton* pPage3_Jpg; - FixedText* pPage3_Quality_txt; - ComboBox* pPage3_Quality; + FixedBitmap* pPage3_Bmp; + FixedLine* pPage3_Titel1; + RadioButton* pPage3_Png; + RadioButton* pPage3_Gif; + RadioButton* pPage3_Jpg; + FixedText* pPage3_Quality_txt; + ComboBox* pPage3_Quality; FixedLine* pPage3_Vert; - FixedLine* pPage3_Titel2; - RadioButton* pPage3_Resolution_1; - RadioButton* pPage3_Resolution_2; - RadioButton* pPage3_Resolution_3; - FixedLine* pPage3_Titel3; - CheckBox* pPage3_SldSound; - CheckBox* pPage3_HiddenSlides; + FixedLine* pPage3_Titel2; + RadioButton* pPage3_Resolution_1; + RadioButton* pPage3_Resolution_2; + RadioButton* pPage3_Resolution_3; + FixedLine* pPage3_Titel3; + CheckBox* pPage3_SldSound; + CheckBox* pPage3_HiddenSlides; // page 4 controls - FixedBitmap* pPage4_Bmp; - FixedLine* pPage4_Titel1; - FixedText* pPage4_Author_txt; - Edit* pPage4_Author; - FixedText* pPage4_Email_txt; - Edit* pPage4_Email; - FixedText* pPage4_WWW_txt; - Edit* pPage4_WWW; - FixedText* pPage4_Titel2; - MultiLineEdit* pPage4_Misc; - CheckBox* pPage4_Download; -//-/ CheckBox* pPage4_Created; + FixedBitmap* pPage4_Bmp; + FixedLine* pPage4_Titel1; + FixedText* pPage4_Author_txt; + Edit* pPage4_Author; + FixedText* pPage4_Email_txt; + Edit* pPage4_Email; + FixedText* pPage4_WWW_txt; + Edit* pPage4_WWW; + FixedText* pPage4_Titel2; + MultiLineEdit* pPage4_Misc; + CheckBox* pPage4_Download; +//-/ CheckBox* pPage4_Created; // page 5 controls - FixedBitmap* pPage5_Bmp; - FixedLine* pPage5_Titel; - CheckBox* pPage5_TextOnly; - ValueSet* pPage5_Buttons; + FixedBitmap* pPage5_Bmp; + FixedLine* pPage5_Titel; + CheckBox* pPage5_TextOnly; + ValueSet* pPage5_Buttons; // page 6 controls - FixedBitmap* pPage6_Bmp; - FixedLine* pPage6_Titel; - RadioButton* pPage6_Default; - RadioButton* pPage6_User; - PushButton* pPage6_Back; - PushButton* pPage6_Text; - PushButton* pPage6_Link; - PushButton* pPage6_VLink; - PushButton* pPage6_ALink; - RadioButton* pPage6_DocColors; - SdHtmlAttrPreview* pPage6_Preview; + FixedBitmap* pPage6_Bmp; + FixedLine* pPage6_Titel; + RadioButton* pPage6_Default; + RadioButton* pPage6_User; + PushButton* pPage6_Back; + PushButton* pPage6_Text; + PushButton* pPage6_Link; + PushButton* pPage6_VLink; + PushButton* pPage6_ALink; + RadioButton* pPage6_DocColors; + SdHtmlAttrPreview* pPage6_Preview; boost::scoped_ptr< ButtonSet > mpButtonSet; -// CheckBox* pPage6_Sound; +// CheckBox* pPage6_Sound; // standard controls - FixedLine aBottomLine; - HelpButton aHelpButton; - CancelButton aCancelButton; - PushButton aLastPageButton; - PushButton aNextPageButton; - OKButton aFinishButton; + FixedLine aBottomLine; + HelpButton aHelpButton; + CancelButton aCancelButton; + PushButton aLastPageButton; + PushButton aNextPageButton; + OKButton aFinishButton; - Assistent aAssistentFunc; + Assistent aAssistentFunc; - BOOL m_bImpress; - BOOL m_bButtonsDirty; + BOOL m_bImpress; + BOOL m_bButtonsDirty; void SetDefaults(); void CreatePages(); @@ -185,19 +185,19 @@ private: Color m_aBackColor, m_aTextColor, m_aLinkColor; Color m_aVLinkColor, m_aALinkColor; - void ChangePage(); - void UpdatePage(); + void ChangePage(); + void UpdatePage(); - List* m_pDesignList; - BOOL m_bDesignListDirty; + List* m_pDesignList; + BOOL m_bDesignListDirty; SdPublishingDesign* m_pDesign; - BOOL Load(); - BOOL Save(); + BOOL Load(); + BOOL Save(); - void GetDesign( SdPublishingDesign* pDesign ); - void SetDesign( SdPublishingDesign* pDesign ); + void GetDesign( SdPublishingDesign* pDesign ); + void SetDesign( SdPublishingDesign* pDesign ); - void LoadPreviewButtons(); + void LoadPreviewButtons(); DECL_LINK( FinishHdl, OKButton * ); DECL_LINK( NextPageHdl, PushButton * ); diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc index fb788cb83614..192ee97a4aeb 100755 --- a/sd/source/ui/inc/res_bmp.hrc +++ b/sd/source/ui/inc/res_bmp.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 @@ -40,305 +40,305 @@ #define RID_CONTROLS RID_APP_START+3 #define RID_IMPRESS_DOCWINDOWICON RID_APP_START+4 -#define RID_ALIGNMENT_TBX RID_APP_START+5 -#define RID_ZOOM_TBX RID_APP_START+6 -#define RID_CHOOSE_MODE RID_APP_START+7 -#define RID_CHOOSE_MODE_TBX RID_APP_START+8 - -#define RID_TEXT RID_APP_START+10 -#define RID_TEXT_TBX RID_APP_START+11 -#define RID_RECTANGLES RID_APP_START+12 -#define RID_RECTANGLES_TBX RID_APP_START+13 -#define RID_ELLIPSES RID_APP_START+14 -#define RID_ELLIPSES_TBX RID_APP_START+15 -#define RID_LINES RID_APP_START+16 -#define RID_LINES_TBX RID_APP_START+17 -#define RID_3D_OBJECTS RID_APP_START+18 -#define RID_3D_OBJECTS_TBX RID_APP_START+19 -#define RID_INSERT RID_APP_START+20 -#define RID_INSERT_TBX RID_APP_START+21 -#define RID_POSITION RID_APP_START+22 -#define RID_POSITION_TBX RID_APP_START+23 +#define RID_ALIGNMENT_TBX RID_APP_START+5 +#define RID_ZOOM_TBX RID_APP_START+6 +#define RID_CHOOSE_MODE RID_APP_START+7 +#define RID_CHOOSE_MODE_TBX RID_APP_START+8 + +#define RID_TEXT RID_APP_START+10 +#define RID_TEXT_TBX RID_APP_START+11 +#define RID_RECTANGLES RID_APP_START+12 +#define RID_RECTANGLES_TBX RID_APP_START+13 +#define RID_ELLIPSES RID_APP_START+14 +#define RID_ELLIPSES_TBX RID_APP_START+15 +#define RID_LINES RID_APP_START+16 +#define RID_LINES_TBX RID_APP_START+17 +#define RID_3D_OBJECTS RID_APP_START+18 +#define RID_3D_OBJECTS_TBX RID_APP_START+19 +#define RID_INSERT RID_APP_START+20 +#define RID_INSERT_TBX RID_APP_START+21 +#define RID_POSITION RID_APP_START+22 +#define RID_POSITION_TBX RID_APP_START+23 #define RID_CONNECTORS RID_APP_START+24 #define RID_CONNECTORS_TBX RID_APP_START+25 -#define RID_ARROWS RID_APP_START+26 -#define RID_ARROWS_TBX RID_APP_START+27 +#define RID_ARROWS RID_APP_START+26 +#define RID_ARROWS_TBX RID_APP_START+27 #define RID_DRAW_DOCWINDOWICON RID_APP_START+28 -#define RID_GRAFFILTERS RID_APP_START+29 -#define RID_GRAFFILTERS_TBX RID_APP_START+30 +#define RID_GRAFFILTERS RID_APP_START+29 +#define RID_GRAFFILTERS_TBX RID_APP_START+30 // Bitmaps fuer Tree-ListBox im Effekte-TabDialog -#define BMP_PAGE RID_APP_START+42 -#define BMP_PAGEOBJS RID_APP_START+43 -#define BMP_OBJECTS RID_APP_START+44 -#define BMP_DOC_OPEN RID_APP_START+45 -#define BMP_DOC_CLOSED RID_APP_START+46 -#define BMP_DOC_TEXT RID_APP_START+47 -#define BMP_OLE RID_APP_START+48 -#define BMP_PAGE_EXCLUDED RID_APP_START+49 +#define BMP_PAGE RID_APP_START+42 +#define BMP_PAGEOBJS RID_APP_START+43 +#define BMP_OBJECTS RID_APP_START+44 +#define BMP_DOC_OPEN RID_APP_START+45 +#define BMP_DOC_CLOSED RID_APP_START+46 +#define BMP_DOC_TEXT RID_APP_START+47 +#define BMP_OLE RID_APP_START+48 +#define BMP_PAGE_EXCLUDED RID_APP_START+49 #define BMP_PAGEOBJS_EXCLUDED RID_APP_START+50 -#define BMP_EXPAND RID_APP_START+51 -#define BMP_COLLAPSE RID_APP_START+52 -#define BMP_GRAPHIC RID_APP_START+53 +#define BMP_EXPAND RID_APP_START+51 +#define BMP_COLLAPSE RID_APP_START+52 +#define BMP_GRAPHIC RID_APP_START+53 // Bimaps fuer ValueSet im EffekteWindow -#define BMP_EFFECT_NONE RID_APP_START+105 -#define BMP_TEXTEFFECT_DISCARD_FROM_T RID_APP_START+106 -#define BMP_TEXTEFFECT_FADE_FROM_CENTER RID_APP_START+107 -#define BMP_EFFECT_HIDE RID_APP_START+108 -#define BMP_EFFECT_APPEAR RID_APP_START+109 +#define BMP_EFFECT_NONE RID_APP_START+105 +#define BMP_TEXTEFFECT_DISCARD_FROM_T RID_APP_START+106 +#define BMP_TEXTEFFECT_FADE_FROM_CENTER RID_APP_START+107 +#define BMP_EFFECT_HIDE RID_APP_START+108 +#define BMP_EFFECT_APPEAR RID_APP_START+109 // ----------------------------------------------------------------------------- -#define BMP_FOIL_NONE RID_APP_START+120 -#define BMP_GROUP RID_APP_START+121 -#define BMP_WAIT_ICON RID_APP_START+124 +#define BMP_FOIL_NONE RID_APP_START+120 +#define BMP_GROUP RID_APP_START+121 +#define BMP_WAIT_ICON RID_APP_START+124 // ----------------------------------------------------------------------------- // additional effects -#define BMP_EFFECT_DISCARD_FROM_UL RID_APP_START+130 -#define BMP_EFFECT_DISCARD_FROM_UR RID_APP_START+131 -#define BMP_EFFECT_DISCARD_FROM_LR RID_APP_START+132 -#define BMP_EFFECT_DISCARD_FROM_LL RID_APP_START+133 -#define BMP_EFFECT_DISCARD_S_FROM_L RID_APP_START+134 -#define BMP_EFFECT_DISCARD_S_FROM_UL RID_APP_START+135 -#define BMP_EFFECT_DISCARD_S_FROM_T RID_APP_START+136 -#define BMP_EFFECT_DISCARD_S_FROM_UR RID_APP_START+137 -#define BMP_EFFECT_DISCARD_S_FROM_R RID_APP_START+138 -#define BMP_EFFECT_DISCARD_S_FROM_LR RID_APP_START+139 -#define BMP_EFFECT_DISCARD_S_FROM_B RID_APP_START+140 -#define BMP_EFFECT_DISCARD_S_FROM_LL RID_APP_START+141 -#define BMP_EFFECT_VERTICAL_CHECKERBOARD RID_APP_START+142 -#define BMP_EFFECT_HORIZONTAL_CHECKERBOARD RID_APP_START+143 -#define BMP_EFFECT_STRTCH_FROM_L RID_APP_START+144 -#define BMP_EFFECT_STRTCH_FROM_UL RID_APP_START+145 -#define BMP_EFFECT_STRTCH_FROM_T RID_APP_START+146 -#define BMP_EFFECT_STRTCH_FROM_UR RID_APP_START+147 -#define BMP_EFFECT_STRTCH_FROM_R RID_APP_START+148 -#define BMP_EFFECT_STRTCH_FROM_LR RID_APP_START+149 -#define BMP_EFFECT_STRTCH_FROM_B RID_APP_START+150 -#define BMP_EFFECT_STRTCH_FROM_LL RID_APP_START+151 - -#define BMP_EFFECT_STRTCH_HORIZONTAL RID_APP_START+152 -#define BMP_EFFECT_STRTCH_VERTICAL RID_APP_START+153 -#define BMP_EFFECT_ROTATE_HORIZONTAL RID_APP_START+154 -#define BMP_EFFECT_ROTATE_VERTICAL RID_APP_START+155 - -#define BMP_FOIL_21 RID_APP_START+156 -#define BMP_FOIL_22 RID_APP_START+157 -#define BMP_FOIL_23 RID_APP_START+158 -#define BMP_FOIL_24 RID_APP_START+159 - -#define BMP_EFFECT_UNCOVER_TO_L RID_APP_START+165 -#define BMP_EFFECT_UNCOVER_TO_UL RID_APP_START+166 -#define BMP_EFFECT_UNCOVER_TO_T RID_APP_START+167 -#define BMP_EFFECT_UNCOVER_TO_UR RID_APP_START+168 -#define BMP_EFFECT_UNCOVER_TO_R RID_APP_START+169 -#define BMP_EFFECT_UNCOVER_TO_LR RID_APP_START+170 -#define BMP_EFFECT_UNCOVER_TO_B RID_APP_START+171 -#define BMP_EFFECT_UNCOVER_TO_LL RID_APP_START+172 - -#define BMP_PAGE_H RID_SD_START+213 -#define BMP_PAGEOBJS_H RID_SD_START+214 -#define BMP_OBJECTS_H RID_SD_START+215 -#define BMP_DOC_OPEN_H RID_SD_START+216 -#define BMP_DOC_CLOSED_H RID_SD_START+217 -#define BMP_DOC_TEXT_H RID_SD_START+218 -#define BMP_OLE_H RID_SD_START+219 -#define BMP_PAGE_EXCLUDED_H RID_SD_START+220 -#define BMP_PAGEOBJS_EXCLUDED_H RID_SD_START+221 -#define BMP_EXPAND_H RID_SD_START+222 -#define BMP_COLLAPSE_H RID_SD_START+223 -#define BMP_GRAPHIC_H RID_SD_START+224 - -#define BMP_FOIL_NONE_H RID_SD_START+225 -#define BMP_GROUP_H RID_SD_START+226 -#define BMP_WAIT_ICON_H RID_SD_START+229 +#define BMP_EFFECT_DISCARD_FROM_UL RID_APP_START+130 +#define BMP_EFFECT_DISCARD_FROM_UR RID_APP_START+131 +#define BMP_EFFECT_DISCARD_FROM_LR RID_APP_START+132 +#define BMP_EFFECT_DISCARD_FROM_LL RID_APP_START+133 +#define BMP_EFFECT_DISCARD_S_FROM_L RID_APP_START+134 +#define BMP_EFFECT_DISCARD_S_FROM_UL RID_APP_START+135 +#define BMP_EFFECT_DISCARD_S_FROM_T RID_APP_START+136 +#define BMP_EFFECT_DISCARD_S_FROM_UR RID_APP_START+137 +#define BMP_EFFECT_DISCARD_S_FROM_R RID_APP_START+138 +#define BMP_EFFECT_DISCARD_S_FROM_LR RID_APP_START+139 +#define BMP_EFFECT_DISCARD_S_FROM_B RID_APP_START+140 +#define BMP_EFFECT_DISCARD_S_FROM_LL RID_APP_START+141 +#define BMP_EFFECT_VERTICAL_CHECKERBOARD RID_APP_START+142 +#define BMP_EFFECT_HORIZONTAL_CHECKERBOARD RID_APP_START+143 +#define BMP_EFFECT_STRTCH_FROM_L RID_APP_START+144 +#define BMP_EFFECT_STRTCH_FROM_UL RID_APP_START+145 +#define BMP_EFFECT_STRTCH_FROM_T RID_APP_START+146 +#define BMP_EFFECT_STRTCH_FROM_UR RID_APP_START+147 +#define BMP_EFFECT_STRTCH_FROM_R RID_APP_START+148 +#define BMP_EFFECT_STRTCH_FROM_LR RID_APP_START+149 +#define BMP_EFFECT_STRTCH_FROM_B RID_APP_START+150 +#define BMP_EFFECT_STRTCH_FROM_LL RID_APP_START+151 + +#define BMP_EFFECT_STRTCH_HORIZONTAL RID_APP_START+152 +#define BMP_EFFECT_STRTCH_VERTICAL RID_APP_START+153 +#define BMP_EFFECT_ROTATE_HORIZONTAL RID_APP_START+154 +#define BMP_EFFECT_ROTATE_VERTICAL RID_APP_START+155 + +#define BMP_FOIL_21 RID_APP_START+156 +#define BMP_FOIL_22 RID_APP_START+157 +#define BMP_FOIL_23 RID_APP_START+158 +#define BMP_FOIL_24 RID_APP_START+159 + +#define BMP_EFFECT_UNCOVER_TO_L RID_APP_START+165 +#define BMP_EFFECT_UNCOVER_TO_UL RID_APP_START+166 +#define BMP_EFFECT_UNCOVER_TO_T RID_APP_START+167 +#define BMP_EFFECT_UNCOVER_TO_UR RID_APP_START+168 +#define BMP_EFFECT_UNCOVER_TO_R RID_APP_START+169 +#define BMP_EFFECT_UNCOVER_TO_LR RID_APP_START+170 +#define BMP_EFFECT_UNCOVER_TO_B RID_APP_START+171 +#define BMP_EFFECT_UNCOVER_TO_LL RID_APP_START+172 + +#define BMP_PAGE_H RID_SD_START+213 +#define BMP_PAGEOBJS_H RID_SD_START+214 +#define BMP_OBJECTS_H RID_SD_START+215 +#define BMP_DOC_OPEN_H RID_SD_START+216 +#define BMP_DOC_CLOSED_H RID_SD_START+217 +#define BMP_DOC_TEXT_H RID_SD_START+218 +#define BMP_OLE_H RID_SD_START+219 +#define BMP_PAGE_EXCLUDED_H RID_SD_START+220 +#define BMP_PAGEOBJS_EXCLUDED_H RID_SD_START+221 +#define BMP_EXPAND_H RID_SD_START+222 +#define BMP_COLLAPSE_H RID_SD_START+223 +#define BMP_GRAPHIC_H RID_SD_START+224 + +#define BMP_FOIL_NONE_H RID_SD_START+225 +#define BMP_GROUP_H RID_SD_START+226 +#define BMP_WAIT_ICON_H RID_SD_START+229 #define BMP_FADE_EFFECT_INDICATOR RID_SD_START+331 #define BMP_FADE_EFFECT_INDICATOR_H RID_SD_START+332 -#define BMP_COMMENTS_INDICATOR RID_SD_START+338 -#define BMP_COMMENTS_INDICATOR_H RID_SD_START+339 - -#define BMP_LAYOUT_EMPTY RID_SD_START+340 -#define BMP_LAYOUT_EMPTY_H RID_SD_START+341 -#define BMP_LAYOUT_HEAD01 RID_SD_START+342 -#define BMP_LAYOUT_HEAD01_H RID_SD_START+343 -#define BMP_LAYOUT_HEAD02 RID_SD_START+344 -#define BMP_LAYOUT_HEAD02_H RID_SD_START+345 -#define BMP_LAYOUT_HEAD02A RID_SD_START+346 -#define BMP_LAYOUT_HEAD02A_H RID_SD_START+347 -#define BMP_LAYOUT_HEAD02B RID_SD_START+348 -#define BMP_LAYOUT_HEAD02B_H RID_SD_START+349 -#define BMP_LAYOUT_HEAD03 RID_SD_START+350 -#define BMP_LAYOUT_HEAD03_H RID_SD_START+351 -#define BMP_LAYOUT_HEAD03A RID_SD_START+352 -#define BMP_LAYOUT_HEAD03A_H RID_SD_START+353 -#define BMP_LAYOUT_HEAD03B RID_SD_START+354 -#define BMP_LAYOUT_HEAD03B_H RID_SD_START+355 -#define BMP_LAYOUT_HEAD03C RID_SD_START+356 -#define BMP_LAYOUT_HEAD03C_H RID_SD_START+357 -#define BMP_LAYOUT_HEAD04 RID_SD_START+358 -#define BMP_LAYOUT_HEAD04_H RID_SD_START+359 -#define BMP_LAYOUT_HEAD06 RID_SD_START+360 -#define BMP_LAYOUT_HEAD06_H RID_SD_START+361 -#define BMP_LAYOUT_TEXTONLY RID_SD_START+362 -#define BMP_LAYOUT_TEXTONLY_H RID_SD_START+363 -#define BMP_LAYOUT_VERTICAL01 RID_SD_START+364 -#define BMP_LAYOUT_VERTICAL01_H RID_SD_START+365 -#define BMP_LAYOUT_VERTICAL02 RID_SD_START+366 -#define BMP_LAYOUT_VERTICAL02_H RID_SD_START+367 - -#define BMP_FOILH_01 RID_SD_START+388 -#define BMP_FOILH_01_H RID_SD_START+389 -#define BMP_FOILH_02 RID_SD_START+390 -#define BMP_FOILH_02_H RID_SD_START+391 -#define BMP_FOILH_03 RID_SD_START+392 -#define BMP_FOILH_03_H RID_SD_START+393 -#define BMP_FOILH_04 RID_SD_START+394 -#define BMP_FOILH_04_H RID_SD_START+395 -#define BMP_FOILH_06 RID_SD_START+396 -#define BMP_FOILH_06_H RID_SD_START+397 -#define BMP_FOILH_09 RID_SD_START+398 -#define BMP_FOILH_09_H RID_SD_START+399 - -#define BMP_FOILN_01 RID_SD_START+400 -#define BMP_FOILN_01_H RID_SD_START+401 - -#define BMP_PLACEHOLDER_SMALL_START (RID_SD_START+402) // these ids must stay in order! -#define BMP_PLACEHOLDER_TABLE_SMALL (RID_SD_START+402) -#define BMP_PLACEHOLDER_CHART_SMALL (RID_SD_START+403) -#define BMP_PLACEHOLDER_IMAGE_SMALL (RID_SD_START+404) -#define BMP_PLACEHOLDER_MOVIE_SMALL (RID_SD_START+405) -#define BMP_PLACEHOLDER_TABLE_SMALL_HOVER (RID_SD_START+406) -#define BMP_PLACEHOLDER_CHART_SMALL_HOVER (RID_SD_START+407) -#define BMP_PLACEHOLDER_IMAGE_SMALL_HOVER (RID_SD_START+408) -#define BMP_PLACEHOLDER_MOVIE_SMALL_HOVER (RID_SD_START+409) -#define BMP_PLACEHOLDER_SMALL_END (RID_SD_START+410) -#define BMP_PLACEHOLDER_LARGE_START (RID_SD_START+410) -#define BMP_PLACEHOLDER_TABLE_LARGE (RID_SD_START+410) -#define BMP_PLACEHOLDER_CHART_LARGE (RID_SD_START+411) -#define BMP_PLACEHOLDER_IMAGE_LARGE (RID_SD_START+412) -#define BMP_PLACEHOLDER_MOVIE_LARGE (RID_SD_START+413) -#define BMP_PLACEHOLDER_TABLE_LARGE_HOVER (RID_SD_START+414) -#define BMP_PLACEHOLDER_CHART_LARGE_HOVER (RID_SD_START+415) -#define BMP_PLACEHOLDER_IMAGE_LARGE_HOVER (RID_SD_START+416) -#define BMP_PLACEHOLDER_MOVIE_LARGE_HOVER (RID_SD_START+417) -#define BMP_PLACEHOLDER_LARGE_END (RID_SD_START+418) // until here! +#define BMP_COMMENTS_INDICATOR RID_SD_START+338 +#define BMP_COMMENTS_INDICATOR_H RID_SD_START+339 + +#define BMP_LAYOUT_EMPTY RID_SD_START+340 +#define BMP_LAYOUT_EMPTY_H RID_SD_START+341 +#define BMP_LAYOUT_HEAD01 RID_SD_START+342 +#define BMP_LAYOUT_HEAD01_H RID_SD_START+343 +#define BMP_LAYOUT_HEAD02 RID_SD_START+344 +#define BMP_LAYOUT_HEAD02_H RID_SD_START+345 +#define BMP_LAYOUT_HEAD02A RID_SD_START+346 +#define BMP_LAYOUT_HEAD02A_H RID_SD_START+347 +#define BMP_LAYOUT_HEAD02B RID_SD_START+348 +#define BMP_LAYOUT_HEAD02B_H RID_SD_START+349 +#define BMP_LAYOUT_HEAD03 RID_SD_START+350 +#define BMP_LAYOUT_HEAD03_H RID_SD_START+351 +#define BMP_LAYOUT_HEAD03A RID_SD_START+352 +#define BMP_LAYOUT_HEAD03A_H RID_SD_START+353 +#define BMP_LAYOUT_HEAD03B RID_SD_START+354 +#define BMP_LAYOUT_HEAD03B_H RID_SD_START+355 +#define BMP_LAYOUT_HEAD03C RID_SD_START+356 +#define BMP_LAYOUT_HEAD03C_H RID_SD_START+357 +#define BMP_LAYOUT_HEAD04 RID_SD_START+358 +#define BMP_LAYOUT_HEAD04_H RID_SD_START+359 +#define BMP_LAYOUT_HEAD06 RID_SD_START+360 +#define BMP_LAYOUT_HEAD06_H RID_SD_START+361 +#define BMP_LAYOUT_TEXTONLY RID_SD_START+362 +#define BMP_LAYOUT_TEXTONLY_H RID_SD_START+363 +#define BMP_LAYOUT_VERTICAL01 RID_SD_START+364 +#define BMP_LAYOUT_VERTICAL01_H RID_SD_START+365 +#define BMP_LAYOUT_VERTICAL02 RID_SD_START+366 +#define BMP_LAYOUT_VERTICAL02_H RID_SD_START+367 + +#define BMP_FOILH_01 RID_SD_START+388 +#define BMP_FOILH_01_H RID_SD_START+389 +#define BMP_FOILH_02 RID_SD_START+390 +#define BMP_FOILH_02_H RID_SD_START+391 +#define BMP_FOILH_03 RID_SD_START+392 +#define BMP_FOILH_03_H RID_SD_START+393 +#define BMP_FOILH_04 RID_SD_START+394 +#define BMP_FOILH_04_H RID_SD_START+395 +#define BMP_FOILH_06 RID_SD_START+396 +#define BMP_FOILH_06_H RID_SD_START+397 +#define BMP_FOILH_09 RID_SD_START+398 +#define BMP_FOILH_09_H RID_SD_START+399 + +#define BMP_FOILN_01 RID_SD_START+400 +#define BMP_FOILN_01_H RID_SD_START+401 + +#define BMP_PLACEHOLDER_SMALL_START (RID_SD_START+402) // these ids must stay in order! +#define BMP_PLACEHOLDER_TABLE_SMALL (RID_SD_START+402) +#define BMP_PLACEHOLDER_CHART_SMALL (RID_SD_START+403) +#define BMP_PLACEHOLDER_IMAGE_SMALL (RID_SD_START+404) +#define BMP_PLACEHOLDER_MOVIE_SMALL (RID_SD_START+405) +#define BMP_PLACEHOLDER_TABLE_SMALL_HOVER (RID_SD_START+406) +#define BMP_PLACEHOLDER_CHART_SMALL_HOVER (RID_SD_START+407) +#define BMP_PLACEHOLDER_IMAGE_SMALL_HOVER (RID_SD_START+408) +#define BMP_PLACEHOLDER_MOVIE_SMALL_HOVER (RID_SD_START+409) +#define BMP_PLACEHOLDER_SMALL_END (RID_SD_START+410) +#define BMP_PLACEHOLDER_LARGE_START (RID_SD_START+410) +#define BMP_PLACEHOLDER_TABLE_LARGE (RID_SD_START+410) +#define BMP_PLACEHOLDER_CHART_LARGE (RID_SD_START+411) +#define BMP_PLACEHOLDER_IMAGE_LARGE (RID_SD_START+412) +#define BMP_PLACEHOLDER_MOVIE_LARGE (RID_SD_START+413) +#define BMP_PLACEHOLDER_TABLE_LARGE_HOVER (RID_SD_START+414) +#define BMP_PLACEHOLDER_CHART_LARGE_HOVER (RID_SD_START+415) +#define BMP_PLACEHOLDER_IMAGE_LARGE_HOVER (RID_SD_START+416) +#define BMP_PLACEHOLDER_MOVIE_LARGE_HOVER (RID_SD_START+417) +#define BMP_PLACEHOLDER_LARGE_END (RID_SD_START+418) // until here! // ----------------------------------------------------------------------------- -#define IMG_PIPETTE_H RID_APP_START+21 -#define IMG_GET1OBJECT_H RID_APP_START+22 -#define IMG_GETALLOBJECT_H RID_APP_START+23 -#define IMG_REMOVEBMP_H RID_APP_START+24 -#define IMG_REMOVEALLBMP_H RID_APP_START+25 +#define IMG_PIPETTE_H RID_APP_START+21 +#define IMG_GET1OBJECT_H RID_APP_START+22 +#define IMG_GETALLOBJECT_H RID_APP_START+23 +#define IMG_REMOVEBMP_H RID_APP_START+24 +#define IMG_REMOVEALLBMP_H RID_APP_START+25 /* - * ResourceIDs fuer Popup-Menues brauchen keinen Dummy-String !!! + * ResourceIDs fuer Popup-Menues brauchen keinen Dummy-String !!! */ -#define RID_DRAW_TEXTOBJ_POPUP RID_APP_START+43 -#define RID_DRAW_GEOMOBJ_POPUP RID_APP_START+44 -#define RID_DRAW_NOSEL_POPUP RID_APP_START+45 -#define RID_SLIDE_SORTER_IMPRESS_SEL_POPUP RID_APP_START+46 -#define RID_BEZIER_POPUP RID_APP_START+47 -#define RID_DRAW_LINEOBJ_POPUP RID_APP_START+48 -#define RID_DRAW_MULTISELECTION_POPUP RID_APP_START+49 -#define RID_DRAW_PAGETAB_POPUP RID_APP_START+50 -#define RID_LAYERTAB_POPUP RID_APP_START+51 -#define RID_DRAW_GRAPHIC_POPUP RID_APP_START+52 -#define RID_DRAW_OLE2_POPUP RID_APP_START+53 -#define RID_DRAW_TEXTOBJ_INSIDE_POPUP RID_APP_START+54 +#define RID_DRAW_TEXTOBJ_POPUP RID_APP_START+43 +#define RID_DRAW_GEOMOBJ_POPUP RID_APP_START+44 +#define RID_DRAW_NOSEL_POPUP RID_APP_START+45 +#define RID_SLIDE_SORTER_IMPRESS_SEL_POPUP RID_APP_START+46 +#define RID_BEZIER_POPUP RID_APP_START+47 +#define RID_DRAW_LINEOBJ_POPUP RID_APP_START+48 +#define RID_DRAW_MULTISELECTION_POPUP RID_APP_START+49 +#define RID_DRAW_PAGETAB_POPUP RID_APP_START+50 +#define RID_LAYERTAB_POPUP RID_APP_START+51 +#define RID_DRAW_GRAPHIC_POPUP RID_APP_START+52 +#define RID_DRAW_OLE2_POPUP RID_APP_START+53 +#define RID_DRAW_TEXTOBJ_INSIDE_POPUP RID_APP_START+54 #define RID_SLIDE_SORTER_IMPRESS_NOSEL_POPUP RID_APP_START+55 -#define RID_OUTLINE_POPUP RID_APP_START+56 -#define RID_MASTERPAGE_POPUP RID_APP_START+57 -#define RID_DRAW_GROUPOBJ_POPUP RID_APP_START+58 -#define RID_DRAW_3DOBJ_POPUP RID_APP_START+59 -#define RID_DRAW_MEASUREOBJ_POPUP RID_APP_START+60 -#define RID_DRAW_EDGEOBJ_POPUP RID_APP_START+61 -#define RID_DRAW_BMP_CONVERT_POPUP RID_APP_START+62 -#define RID_DRAW_POLYLINEOBJ_POPUP RID_APP_START+63 -#define RID_DRAW_3DSCENE_POPUP RID_APP_START+64 -#define RID_DRAW_3DSCENE2_POPUP RID_APP_START+65 -#define RID_DRAW_CUSTOMSHAPE_POPUP RID_APP_START+66 -#define RID_TASKPANE_MASTERPAGESSELECTOR_POPUP RID_APP_START+67 -#define RID_TASKPANE_LAYOUTMENU_POPUP RID_APP_START+68 -#define RID_DRAW_MEDIA_POPUP RID_APP_START+69 +#define RID_OUTLINE_POPUP RID_APP_START+56 +#define RID_MASTERPAGE_POPUP RID_APP_START+57 +#define RID_DRAW_GROUPOBJ_POPUP RID_APP_START+58 +#define RID_DRAW_3DOBJ_POPUP RID_APP_START+59 +#define RID_DRAW_MEASUREOBJ_POPUP RID_APP_START+60 +#define RID_DRAW_EDGEOBJ_POPUP RID_APP_START+61 +#define RID_DRAW_BMP_CONVERT_POPUP RID_APP_START+62 +#define RID_DRAW_POLYLINEOBJ_POPUP RID_APP_START+63 +#define RID_DRAW_3DSCENE_POPUP RID_APP_START+64 +#define RID_DRAW_3DSCENE2_POPUP RID_APP_START+65 +#define RID_DRAW_CUSTOMSHAPE_POPUP RID_APP_START+66 +#define RID_TASKPANE_MASTERPAGESSELECTOR_POPUP RID_APP_START+67 +#define RID_TASKPANE_LAYOUTMENU_POPUP RID_APP_START+68 +#define RID_DRAW_MEDIA_POPUP RID_APP_START+69 // Draw (Graphic) -#define RID_GRAPHIC_TEXTOBJ_POPUP RID_APP_START+70 -#define RID_GRAPHIC_GEOMOBJ_POPUP RID_APP_START+71 -#define RID_GRAPHIC_NOSEL_POPUP RID_APP_START+72 -#define RID_GRAPHIC_LINEOBJ_POPUP RID_APP_START+73 -#define RID_GRAPHIC_MULTISELECTION_POPUP RID_APP_START+74 -#define RID_GRAPHIC_PAGETAB_POPUP RID_APP_START+75 -#define RID_GRAPHIC_GRAPHIC_POPUP RID_APP_START+76 -#define RID_GRAPHIC_OLE2_POPUP RID_APP_START+77 -#define RID_GRAPHIC_GROUPOBJ_POPUP RID_APP_START+78 -#define RID_GRAPHIC_3DOBJ_POPUP RID_APP_START+79 -#define RID_GRAPHIC_MEASUREOBJ_POPUP RID_APP_START+80 -#define RID_GRAPHIC_EDGEOBJ_POPUP RID_APP_START+81 -#define RID_GRAPHIC_POLYLINEOBJ_POPUP RID_APP_START+82 -#define RID_GRAPHIC_3DSCENE_POPUP RID_APP_START+83 -#define RID_GRAPHIC_3DSCENE2_POPUP RID_APP_START+84 -#define RID_GRAPHIC_CUSTOMSHAPE_POPUP RID_APP_START+85 -#define RID_GRAPHIC_MEDIA_POPUP RID_APP_START+86 +#define RID_GRAPHIC_TEXTOBJ_POPUP RID_APP_START+70 +#define RID_GRAPHIC_GEOMOBJ_POPUP RID_APP_START+71 +#define RID_GRAPHIC_NOSEL_POPUP RID_APP_START+72 +#define RID_GRAPHIC_LINEOBJ_POPUP RID_APP_START+73 +#define RID_GRAPHIC_MULTISELECTION_POPUP RID_APP_START+74 +#define RID_GRAPHIC_PAGETAB_POPUP RID_APP_START+75 +#define RID_GRAPHIC_GRAPHIC_POPUP RID_APP_START+76 +#define RID_GRAPHIC_OLE2_POPUP RID_APP_START+77 +#define RID_GRAPHIC_GROUPOBJ_POPUP RID_APP_START+78 +#define RID_GRAPHIC_3DOBJ_POPUP RID_APP_START+79 +#define RID_GRAPHIC_MEASUREOBJ_POPUP RID_APP_START+80 +#define RID_GRAPHIC_EDGEOBJ_POPUP RID_APP_START+81 +#define RID_GRAPHIC_POLYLINEOBJ_POPUP RID_APP_START+82 +#define RID_GRAPHIC_3DSCENE_POPUP RID_APP_START+83 +#define RID_GRAPHIC_3DSCENE2_POPUP RID_APP_START+84 +#define RID_GRAPHIC_CUSTOMSHAPE_POPUP RID_APP_START+85 +#define RID_GRAPHIC_MEDIA_POPUP RID_APP_START+86 #define RID_SLIDE_SORTER_DRAW_SEL_POPUP RID_APP_START+87 #define RID_SLIDE_SORTER_DRAW_NOSEL_POPUP RID_APP_START+88 #define RID_SLIDE_SORTER_MASTER_SEL_POPUP RID_APP_START+89 #define RID_SLIDE_SORTER_MASTER_NOSEL_POPUP RID_APP_START+90 -#define RID_DRAW_TABLE_POPUP RID_APP_START+91 -#define RID_GRAPHIC_TABLE_POPUP RID_APP_START+92 +#define RID_DRAW_TABLE_POPUP RID_APP_START+91 +#define RID_GRAPHIC_TABLE_POPUP RID_APP_START+92 -#define RID_TASKPANE_CURRENT_MASTERPAGESSELECTOR_POPUP RID_APP_START+93 +#define RID_TASKPANE_CURRENT_MASTERPAGESSELECTOR_POPUP RID_APP_START+93 -#define RID_DRAW_TABLEOBJ_INSIDE_POPUP RID_APP_START+94 +#define RID_DRAW_TABLEOBJ_INSIDE_POPUP RID_APP_START+94 -#define RID_DRAW_OUTLINETEXTOBJ_POPUP RID_APP_START+95 -#define RID_GRAPHIC_OUTLINETEXTOBJ_POPUP RID_APP_START+96 +#define RID_DRAW_OUTLINETEXTOBJ_POPUP RID_APP_START+95 +#define RID_GRAPHIC_OUTLINETEXTOBJ_POPUP RID_APP_START+96 /* * Pointer (Mauszeiger) */ -#define PTR_WATERCAN RID_APP_START+100 -#define PTR_PENCIL RID_APP_START+101 +#define PTR_WATERCAN RID_APP_START+100 +#define PTR_PENCIL RID_APP_START+101 /* * Globale Dialog-IDs */ -#define DLG_FONTWORK RID_APP_START+150 +#define DLG_FONTWORK RID_APP_START+150 /* - * ResourceIDs fuer Toolboxen nicht aendern, ohne die Strings in - * strings.hrc auf die selben IDs zu setzen (eine Toolbox und sein - * Konfigurationsstring muessen dieselbe ResourceID haben!). + * ResourceIDs fuer Toolboxen nicht aendern, ohne die Strings in + * strings.hrc auf die selben IDs zu setzen (eine Toolbox und sein + * Konfigurationsstring muessen dieselbe ResourceID haben!). */ // --> Jetzt in cfgids.hxx /* -#define _RID_DRAW_TOOLBOX RID_APP_START+200 -#define _RID_SLIDE_TOOLBOX RID_APP_START+201 -#define _RID_DRAW_OBJ_TOOLBOX RID_APP_START+202 -#define _RID_SLIDE_OBJ_TOOLBOX RID_APP_START+203 -#define _RID_BEZIER_TOOLBOX RID_APP_START+204 -#define _RID_TEXT_TOOLBOX RID_APP_START+205 -#define _RID_OUTLINE_TOOLBOX RID_APP_START+206 -#define _RID_DRAW_POLYLINEOBJ_POPUP RID_APP_START+207 -#define _RID_GLUEPOINTS_TOOLBOX RID_APP_START+208 +#define _RID_DRAW_TOOLBOX RID_APP_START+200 +#define _RID_SLIDE_TOOLBOX RID_APP_START+201 +#define _RID_DRAW_OBJ_TOOLBOX RID_APP_START+202 +#define _RID_SLIDE_OBJ_TOOLBOX RID_APP_START+203 +#define _RID_BEZIER_TOOLBOX RID_APP_START+204 +#define _RID_TEXT_TOOLBOX RID_APP_START+205 +#define _RID_OUTLINE_TOOLBOX RID_APP_START+206 +#define _RID_DRAW_POLYLINEOBJ_POPUP RID_APP_START+207 +#define _RID_GLUEPOINTS_TOOLBOX RID_APP_START+208 */ -#define RID_DRAW_SNAPOBJECT_POPUP RID_APP_START+390 -#define RID_DRAW_GLUEPOINT_POPUP RID_APP_START+392 -#define RID_DRAW_CONTROL_POPUP RID_APP_START+393 -#define RID_FORM_CONTROL_POPUP RID_APP_START+394 +#define RID_DRAW_SNAPOBJECT_POPUP RID_APP_START+390 +#define RID_DRAW_GLUEPOINT_POPUP RID_APP_START+392 +#define RID_DRAW_CONTROL_POPUP RID_APP_START+393 +#define RID_FORM_CONTROL_POPUP RID_APP_START+394 -#define RID_GRAPHICSTYLEFAMILY RID_APP_START+395 -#define RID_PRESENTATIONSTYLEFAMILY RID_APP_START+396 -#define RID_GRAPHICSCELLFAMILY RID_APP_START+397 +#define RID_GRAPHICSTYLEFAMILY RID_APP_START+395 +#define RID_PRESENTATIONSTYLEFAMILY RID_APP_START+396 +#define RID_GRAPHICSCELLFAMILY RID_APP_START+397 diff --git a/sd/source/ui/inc/sdpopup.hxx b/sd/source/ui/inc/sdpopup.hxx index 38bdbdbb05b4..8e41835e67ac 100644 --- a/sd/source/ui/inc/sdpopup.hxx +++ b/sd/source/ui/inc/sdpopup.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,21 +44,21 @@ class SvxFieldData; class SdFieldPopup : public PopupMenu { private: - const SvxFieldData* pField; + const SvxFieldData* pField; - void Fill( LanguageType eLanguage ); + void Fill( LanguageType eLanguage ); public: SdFieldPopup( const SvxFieldData* pInField, LanguageType eLanguage ); ~SdFieldPopup(); - //virtual void Select(); + //virtual void Select(); - SvxFieldData* GetField(); + SvxFieldData* GetField(); }; -#endif // _SD_SDPOPUP_HXX +#endif // _SD_SDPOPUP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/sdpreslt.hrc b/sd/source/ui/inc/sdpreslt.hrc index 19c3ded484fb..a93c5ac6cacf 100644 --- a/sd/source/ui/inc/sdpreslt.hrc +++ b/sd/source/ui/inc/sdpreslt.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/sd/source/ui/inc/sdpreslt.hxx b/sd/source/ui/inc/sdpreslt.hxx index 95b89bb6c9f4..a1df1b62596e 100644 --- a/sd/source/ui/inc/sdpreslt.hxx +++ b/sd/source/ui/inc/sdpreslt.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 ViewShell; -class SdPresLayoutDlg +class SdPresLayoutDlg : public ModalDialog { public: SdPresLayoutDlg( - ::sd::DrawDocShell* pDocShell, - ::sd::ViewShell* pViewShell, + ::sd::DrawDocShell* pDocShell, + ::sd::ViewShell* pViewShell, ::Window* pWindow, const SfxItemSet& rInAttrs); @@ -62,26 +62,26 @@ public: private: ::sd::DrawDocShell* mpDocSh; - ::sd::ViewShell* mpViewSh; - FixedText maFtLayout; + ::sd::ViewShell* mpViewSh; + FixedText maFtLayout; ValueSet maVS; - OKButton maBtnOK; - CancelButton maBtnCancel; - HelpButton maBtnHelp; - CheckBox maCbxMasterPage; - CheckBox maCbxCheckMasters; + OKButton maBtnOK; + CancelButton maBtnCancel; + HelpButton maBtnHelp; + CheckBox maCbxMasterPage; + CheckBox maCbxCheckMasters; PushButton maBtnLoad; - const SfxItemSet& mrOutAttrs; + const SfxItemSet& mrOutAttrs; List* mpLayoutNames; String maName; // Layoutname oder Dateiname - long mnLayoutCount; // Anzahl, der im Dokument vorhandenen MasterPages - const String maStrNone; + long mnLayoutCount; // Anzahl, der im Dokument vorhandenen MasterPages + const String maStrNone; void FillValueSet(); - void Reset(); + void Reset(); }; #endif diff --git a/sd/source/ui/inc/sdstring.hrc b/sd/source/ui/inc/sdstring.hrc index 0646da058faf..e9194a7be159 100644 --- a/sd/source/ui/inc/sdstring.hrc +++ b/sd/source/ui/inc/sdstring.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,11 +25,11 @@ * ************************************************************************/ #include <sfx2/sfx.hrc> -#define SID_SD_STRING_START RID_APP_START+300 +#define SID_SD_STRING_START RID_APP_START+300 // Texts for search and replace info and question boxes. #define STR_SAR_NOT_FOUND SID_SD_STRING_START+23 #define STR_SAR_WRAP_FORWARD SID_SD_STRING_START+24 #define STR_SAR_WRAP_BACKWARD SID_SD_STRING_START+25 -#define STR_SAR_WRAP_FORWARD_DRAW SID_SD_STRING_START+26 +#define STR_SAR_WRAP_FORWARD_DRAW SID_SD_STRING_START+26 #define STR_SAR_WRAP_BACKWARD_DRAW SID_SD_STRING_START+27 diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index 06cd1f57814d..9f5919fe5342 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ SV_DECL_REF(DrawDocShell) class SD_DLLPUBLIC SdPageObjsTLB : public SvTreeListBox { private: - + static BOOL SD_DLLPRIVATE bIsInDrag; // static, falls der Navigator im ExecuteDrag geloescht wird public: @@ -75,15 +75,15 @@ public: class SdPageObjsTransferable : public SdTransferable { public: - SdPageObjsTransferable( - SdPageObjsTLB& rParent, + SdPageObjsTransferable( + SdPageObjsTLB& rParent, const INetBookmark& rBookmark, ::sd::DrawDocShell& rDocShell, NavigatorDragType eDragType, const ::com::sun::star::uno::Any& rTreeListBoxData ); ::sd::DrawDocShell& GetDocShell() const; NavigatorDragType GetDragType() const; - + static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); static SdPageObjsTransferable* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxData ) throw(); /** Return a temporary transferable data flavor that is used @@ -91,24 +91,24 @@ public: lifetime ends with the office application. */ static sal_uInt32 GetListBoxDropFormatId (void); - + private: /** Temporary drop flavor id that is used internally in the navigator. */ static sal_uInt32 mnListBoxDropFormatId; - SdPageObjsTLB& mrParent; - INetBookmark maBookmark; + SdPageObjsTLB& mrParent; + INetBookmark maBookmark; ::sd::DrawDocShell& mrDocShell; NavigatorDragType meDragType; const ::com::sun::star::uno::Any maTreeListBoxData; - SD_DLLPRIVATE virtual ~SdPageObjsTransferable(); - - SD_DLLPRIVATE virtual void AddSupportedFormats(); - SD_DLLPRIVATE virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - SD_DLLPRIVATE virtual void DragFinished( sal_Int8 nDropAction ); + SD_DLLPRIVATE virtual ~SdPageObjsTransferable(); + + SD_DLLPRIVATE virtual void AddSupportedFormats(); + SD_DLLPRIVATE virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + SD_DLLPRIVATE virtual void DragFinished( sal_Int8 nDropAction ); SD_DLLPRIVATE virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException ); }; @@ -127,35 +127,35 @@ public: bool PageBelongsToCurrentShow (const SdPage* pPage) const; protected: - - Window* mpParent; - const SdDrawDocument* mpDoc; - SdDrawDocument* mpBookmarkDoc; - SfxMedium* mpMedium; - SfxMedium* mpOwnMedium; - Image maImgOle; - Image maImgGraphic; - Image maImgOleH; - Image maImgGraphicH; + + Window* mpParent; + const SdDrawDocument* mpDoc; + SdDrawDocument* mpBookmarkDoc; + SfxMedium* mpMedium; + SfxMedium* mpOwnMedium; + Image maImgOle; + Image maImgGraphic; + Image maImgOleH; + Image maImgGraphicH; BOOL mbLinkableSelected; - BOOL mbDragEnabled; - String maDocName; - ::sd::DrawDocShellRef mxBookmarkDocShRef; // Zum Laden von Bookmarks - ::sd::DrawDocShell* mpDropDocSh; - SdNavigatorWin* mpDropNavWin; + BOOL mbDragEnabled; + String maDocName; + ::sd::DrawDocShellRef mxBookmarkDocShRef; // Zum Laden von Bookmarks + ::sd::DrawDocShell* mpDropDocSh; + SdNavigatorWin* mpDropNavWin; SfxViewFrame* mpFrame; - // DragSourceHelper - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + // DragSourceHelper + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); // DropTargetHelper - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); - - virtual void RequestingChilds( SvLBoxEntry* pParent ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + virtual void RequestingChilds( SvLBoxEntry* pParent ); + void DoDrag(); - void OnDragFinished( sal_uInt8 nDropAction ); + void OnDragFinished( sal_uInt8 nDropAction ); /** Return the name of the object. When the object has no user supplied name and the bCreate flag is <TRUE/> then a name is created @@ -173,7 +173,7 @@ protected: String GetObjectName ( const SdrObject* pObject, const bool bCreate = true) const; - void CloseBookmarkDoc(); + void CloseBookmarkDoc(); DECL_STATIC_LINK(SdPageObjsTLB, ExecDragHdl, void*); /** Handle the reordering of entries in the navigator. This method @@ -184,37 +184,37 @@ protected: SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, SvLBoxEntry*& rpNewParent, - ULONG& rNewChildPos); - + ULONG& rNewChildPos); + using Window::GetDropTarget; virtual SvLBoxEntry* GetDropTarget (const Point& rLocation); public: - + SdPageObjsTLB( Window* pParent, const SdResId& rSdResId ); ~SdPageObjsTLB(); - virtual void SelectHdl(); - virtual void KeyInput( const KeyEvent& rKEvt ); - - void SetViewFrame( SfxViewFrame* pViewFrame ) { mpFrame = pViewFrame; } - SfxViewFrame* GetViewFrame() const { return mpFrame; } - - void Fill( const SdDrawDocument*, BOOL bAllPages, const String& rDocName ); - void Fill( const SdDrawDocument*, SfxMedium* pSfxMedium, const String& rDocName ); + virtual void SelectHdl(); + virtual void KeyInput( const KeyEvent& rKEvt ); + + void SetViewFrame( SfxViewFrame* pViewFrame ) { mpFrame = pViewFrame; } + SfxViewFrame* GetViewFrame() const { return mpFrame; } + + void Fill( const SdDrawDocument*, BOOL bAllPages, const String& rDocName ); + void Fill( const SdDrawDocument*, SfxMedium* pSfxMedium, const String& rDocName ); void SetShowAllShapes (const bool bShowAllShapes, const bool bFill); bool GetShowAllShapes (void) const; - BOOL IsEqualToDoc( const SdDrawDocument* pInDoc = NULL ); - BOOL HasSelectedChilds( const String& rName ); - BOOL SelectEntry( const String& rName ); - String GetSelectEntry(); - List* GetSelectEntryList( USHORT nDepth ); - SdDrawDocument* GetBookmarkDoc(SfxMedium* pMedium = NULL); - ::sd::DrawDocShell* GetDropDocSh() { return(mpDropDocSh); } - + BOOL IsEqualToDoc( const SdDrawDocument* pInDoc = NULL ); + BOOL HasSelectedChilds( const String& rName ); + BOOL SelectEntry( const String& rName ); + String GetSelectEntry(); + List* GetSelectEntryList( USHORT nDepth ); + SdDrawDocument* GetBookmarkDoc(SfxMedium* pMedium = NULL); + ::sd::DrawDocShell* GetDropDocSh() { return(mpDropDocSh); } + BOOL IsLinkableSelected() const { return mbLinkableSelected; } - - static BOOL IsInDrag(); + + static BOOL IsInDrag(); using SvLBox::ExecuteDrop; private: @@ -267,6 +267,6 @@ private: SdrObject& rObject) const; }; -#endif // _SDTREELB_HXX +#endif // _SDTREELB_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/sdundogr.hxx b/sd/source/ui/inc/sdundogr.hxx index fdc2c3c2abc7..38d9c0334e0b 100644 --- a/sd/source/ui/inc/sdundogr.hxx +++ b/sd/source/ui/inc/sdundogr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,24 +35,24 @@ class SD_DLLPUBLIC SdUndoGroup : public SdUndoAction { - Container aCtn; + Container aCtn; public: TYPEINFO(); SdUndoGroup(SdDrawDocument* pSdDrawDocument) : SdUndoAction(pSdDrawDocument), aCtn(16, 16, 16) {} - virtual ~SdUndoGroup(); + virtual ~SdUndoGroup(); virtual BOOL Merge( SfxUndoAction* pNextAction ); virtual void Undo(); virtual void Redo(); - void AddAction(SdUndoAction* pAction); - ULONG Count() const { return aCtn.Count(); } + void AddAction(SdUndoAction* pAction); + ULONG Count() const { return aCtn.Count(); } }; -#endif // _SD_SDUNDOGR_HXX +#endif // _SD_SDUNDOGR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx index 749c7b4fede4..94a8fc74688f 100644 --- a/sd/source/ui/inc/sdxfer.hxx +++ b/sd/source/ui/inc/sdxfer.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,79 +60,79 @@ public: void SetDocShell( const SfxObjectShellRef& rRef ) { maDocShellRef = rRef; } const SfxObjectShellRef& GetDocShell() const { return maDocShellRef; } - void SetWorkDocument( const SdDrawDocument* pWorkDoc ) { mpSdDrawDocument = mpSdDrawDocumentIntern = (SdDrawDocument*) pWorkDoc; } - const SdDrawDocument* GetWorkDocument() const { return mpSdDrawDocument; } + void SetWorkDocument( const SdDrawDocument* pWorkDoc ) { mpSdDrawDocument = mpSdDrawDocumentIntern = (SdDrawDocument*) pWorkDoc; } + const SdDrawDocument* GetWorkDocument() const { return mpSdDrawDocument; } - void SetView( const ::sd::View* pView ) { mpSdView = pView; } - const ::sd::View* GetView() const { return mpSdView; } + void SetView( const ::sd::View* pView ) { mpSdView = pView; } + const ::sd::View* GetView() const { return mpSdView; } - void SetObjectDescriptor( const TransferableObjectDescriptor& rObjDesc ); + void SetObjectDescriptor( const TransferableObjectDescriptor& rObjDesc ); - void SetStartPos( const Point& rStartPos ) { maStartPos = rStartPos; } - const Point& GetStartPos() const { return maStartPos; } + void SetStartPos( const Point& rStartPos ) { maStartPos = rStartPos; } + const Point& GetStartPos() const { return maStartPos; } - void SetInternalMove( BOOL bSet ) { mbInternalMove = bSet; } - BOOL IsInternalMove() const { return mbInternalMove; } + void SetInternalMove( BOOL bSet ) { mbInternalMove = bSet; } + BOOL IsInternalMove() const { return mbInternalMove; } - BOOL HasSourceDoc( const SdDrawDocument* pDoc ) const { return( mpSourceDoc == pDoc ); } + BOOL HasSourceDoc( const SdDrawDocument* pDoc ) const { return( mpSourceDoc == pDoc ); } - void SetPageBookmarks( const List& rPageBookmarks, BOOL bPersistent ); + void SetPageBookmarks( const List& rPageBookmarks, BOOL bPersistent ); BOOL IsPageTransferable() const { return mbPageTransferable; } BOOL HasPageBookmarks() const { return( mpPageDocShell && ( maPageBookmarks.Count() > 0 ) ); } const List& GetPageBookmarks() const { return maPageBookmarks; } - ::sd::DrawDocShell* GetPageDocShell() const { return mpPageDocShell; } + ::sd::DrawDocShell* GetPageDocShell() const { return mpPageDocShell; } - sal_Bool SetTableRTF( SdDrawDocument*, const ::com::sun::star::datatransfer::DataFlavor& ); + sal_Bool SetTableRTF( SdDrawDocument*, const ::com::sun::star::datatransfer::DataFlavor& ); static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); static SdTransferable* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxData ) throw(); // SfxListener - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); protected: - 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 DragFinished( sal_Int8 nDropAction ); - virtual void ObjectReleased(); + 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 DragFinished( sal_Int8 nDropAction ); + virtual void ObjectReleased(); virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException ); private: - SfxObjectShellRef maDocShellRef; - ::sd::DrawDocShell* mpPageDocShell; + SfxObjectShellRef maDocShellRef; + ::sd::DrawDocShell* mpPageDocShell; List maPageBookmarks; - TransferableDataHelper* mpOLEDataHelper; - TransferableObjectDescriptor* mpObjDesc; - const ::sd::View* mpSdView; - ::sd::View* mpSdViewIntern; - SdDrawDocument* mpSdDrawDocument; - SdDrawDocument* mpSdDrawDocumentIntern; - SdDrawDocument* mpSourceDoc; - VirtualDevice* mpVDev; - INetBookmark* mpBookmark; - Graphic* mpGraphic; - ImageMap* mpImageMap; - Rectangle maVisArea; - Point maStartPos; - BOOL mbInternalMove : 1; - BOOL mbOwnDocument : 1; - BOOL mbOwnView : 1; - BOOL mbLateInit : 1; + TransferableDataHelper* mpOLEDataHelper; + TransferableObjectDescriptor* mpObjDesc; + const ::sd::View* mpSdView; + ::sd::View* mpSdViewIntern; + SdDrawDocument* mpSdDrawDocument; + SdDrawDocument* mpSdDrawDocumentIntern; + SdDrawDocument* mpSourceDoc; + VirtualDevice* mpVDev; + INetBookmark* mpBookmark; + Graphic* mpGraphic; + ImageMap* mpImageMap; + Rectangle maVisArea; + Point maStartPos; + BOOL mbInternalMove : 1; + BOOL mbOwnDocument : 1; + BOOL mbOwnView : 1; + BOOL mbLateInit : 1; BOOL mbPageTransferable : 1; BOOL mbPageTransferablePersistent : 1; - bool mbIsUnoObj : 1; + bool mbIsUnoObj : 1; // not available SdTransferable(); SdTransferable( const SdTransferable& ); - SdTransferable& operator=( const SdTransferable& ); + SdTransferable& operator=( const SdTransferable& ); - void CreateObjectReplacement( SdrObject* pObj ); - void CreateData(); + void CreateObjectReplacement( SdrObject* pObj ); + void CreateData(); }; diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx index 4915bf6b9466..50f715755161 100644 --- a/sd/source/ui/inc/slideshow.hxx +++ b/sd/source/ui/inc/slideshow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ #include <boost/shared_ptr.hpp> namespace com { namespace sun { namespace star { - + namespace drawing { class XDrawPage; } @@ -65,10 +65,10 @@ class Window; class SfxRequest; // TODO: Remove -#define PAGE_NO_END 65535 -#define PAGE_NO_SOFTEND (PAGE_NO_END - 1) -#define PAGE_NO_PAUSE (PAGE_NO_SOFTEND - 1) -#define PAGE_NO_FIRSTDEF PAGE_NO_PAUSE // immer mit anpassen +#define PAGE_NO_END 65535 +#define PAGE_NO_SOFTEND (PAGE_NO_END - 1) +#define PAGE_NO_PAUSE (PAGE_NO_SOFTEND - 1) +#define PAGE_NO_FIRSTDEF PAGE_NO_PAUSE // immer mit anpassen /* Definition of SlideShow class */ @@ -123,7 +123,7 @@ public: // helper api - bool startPreview( + bool startPreview( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xAnimationNode, ::Window* pParent = 0 ); @@ -158,10 +158,10 @@ public: // legacy api - // actions - void jumpToPageNumber( sal_Int32 nPage ); // a.k.a. FuSlideShow::JumpToPage() + // actions + void jumpToPageNumber( sal_Int32 nPage ); // a.k.a. FuSlideShow::JumpToPage() void jumpToPageIndex( sal_Int32 nIndex ); - void jumpToBookmark( const ::rtl::OUString& sBookmark ); // a.k.a. FuSlideShow::JumpToBookmark() + void jumpToBookmark( const ::rtl::OUString& sBookmark ); // a.k.a. FuSlideShow::JumpToBookmark() /** sets or clears the pause state of the running slideshow. !!!! This should only be called by the SdShowWindow !!!!*/ @@ -169,11 +169,11 @@ public: // settings - bool isFullScreen(); // a.k.a. FuSlideShow::IsFullScreen() - bool isAlwaysOnTop(); // a.k.a. FuSlideShow::IsAlwaysOnTop(); - ShowWindow* getShowWindow(); // a.k.a. FuSlideShow::GetShowWindow() - int getAnimationMode(); // a.k.a. FuSlideShow::GetAnimationMode() - sal_Int32 getCurrentPageNumber(); // a.k.a. FuSlideShow::GetCurrentPage() + bool isFullScreen(); // a.k.a. FuSlideShow::IsFullScreen() + bool isAlwaysOnTop(); // a.k.a. FuSlideShow::IsAlwaysOnTop(); + ShowWindow* getShowWindow(); // a.k.a. FuSlideShow::GetShowWindow() + int getAnimationMode(); // a.k.a. FuSlideShow::GetAnimationMode() + sal_Int32 getCurrentPageNumber(); // a.k.a. FuSlideShow::GetCurrentPage() sal_Int32 getFirstPageNumber(); sal_Int32 getLastPageNumber(); bool isEndless(); @@ -186,7 +186,7 @@ public: void paint( const Rectangle& rRect ); bool keyInput(const KeyEvent& rKEvt); - + void receiveRequest(SfxRequest& rReq); bool dependsOn( ViewShellBase* pViewShellBase ); @@ -210,7 +210,7 @@ private: SlideShow(const SlideShow&); SlideShow& operator=( const SlideShow& ); - SvxItemPropertySet maPropSet; + SvxItemPropertySet maPropSet; rtl::Reference< SlideshowImpl > mxController; /** This flag is used together with mxController.is() to prevent @@ -225,7 +225,7 @@ private: ViewShellBase* mpCurrentViewShellBase; ViewShellBase* mpFullScreenViewShellBase; FrameView* mpFullScreenFrameView; - sal_Int32 mnInPlaceConfigEvent; + sal_Int32 mnInPlaceConfigEvent; }; } diff --git a/sd/source/ui/inc/smarttag.hxx b/sd/source/ui/inc/smarttag.hxx index a776197ea1ff..54763ddbf7b7 100644 --- a/sd/source/ui/inc/smarttag.hxx +++ b/sd/source/ui/inc/smarttag.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 bool MouseButtonDown( const MouseEvent&, SmartHdl& ); /** returns true if the SmartTag consumes this event. */ - virtual bool KeyInput( const KeyEvent& rKEvt ); + virtual bool KeyInput( const KeyEvent& rKEvt ); /** returns true if the SmartTag consumes this event. */ virtual bool RequestHelp( const HelpEvent& rHEvt ); @@ -94,8 +94,8 @@ protected: bool mbSelected; private: - SmartTag( const SmartTag& ); // not implemented - SmartTag& operator=( const SmartTag& ); // not implemented + SmartTag( const SmartTag& ); // not implemented + SmartTag& operator=( const SmartTag& ); // not implemented }; typedef rtl::Reference< SmartTag > SmartTagReference; @@ -121,7 +121,7 @@ public: bool MouseButtonDown( const MouseEvent& ); /** returns true if a SmartTag consumes this event. */ - bool KeyInput( const KeyEvent& rKEvt ); + bool KeyInput( const KeyEvent& rKEvt ); /** returns true if a SmartTag consumes this event. */ bool RequestHelp( const HelpEvent& rHEvt ); @@ -151,8 +151,8 @@ public: void CheckPossibilities(); private: - SmartTagSet( const SmartTagSet& ); // not implemented - SmartTagSet& operator=( const SmartTagSet& ); // not implemented + SmartTagSet( const SmartTagSet& ); // not implemented + SmartTagSet& operator=( const SmartTagSet& ); // not implemented /** adds a new smart tag to this set */ void add( const SmartTagReference& xTag ); @@ -185,6 +185,6 @@ protected: } // end of namespace sd -#endif // _SD_SMARTTAG_HXX_ +#endif // _SD_SMARTTAG_HXX_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/sprite.hxx b/sd/source/ui/inc/sprite.hxx index fed519b25d7f..57db1a3b4036 100644 --- a/sd/source/ui/inc/sprite.hxx +++ b/sd/source/ui/inc/sprite.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,36 +51,36 @@ public: Sprite( List* pListOfBmpEx ); ~Sprite(); - BOOL StartMoving( OutputDevice* pOut, + BOOL StartMoving( OutputDevice* pOut, OutputDevice* pBottomLayer = NULL, BitmapEx* pTopLayer = NULL, - MetaFile** ppTopMtf = NULL, + MetaFile** ppTopMtf = NULL, Marker* pObjStartMarker = NULL, Marker* pObjEndMarker = NULL ); - void MoveTo( OutputDevice* pOut, const Point& rPt, const Size* pSz = NULL ); - void MoveTo( OutputDevice* pOut, const Point& rPt, const double& rScaleX, const double& rScaleY ); - void EndMoving( OutputDevice* pOut ); + void MoveTo( OutputDevice* pOut, const Point& rPt, const Size* pSz = NULL ); + void MoveTo( OutputDevice* pOut, const Point& rPt, const double& rScaleX, const double& rScaleY ); + void EndMoving( OutputDevice* pOut ); protected: - MapMode aOldMap; - Region aOldClip; - Rectangle aPaintRect; - Point aPt; - Size aSz; - Point aLayerOffsetPix; - VirtualDevice* pPaintDev; - VirtualDevice* pBottomLayer; - BitmapEx* pActBmpEx; - BitmapEx* pTopLayer; - MetaFile** ppTopMtf; - Marker* pObjStartMarker; - Marker* pObjEndMarker; - List* pListOfBmpEx; - ULONG nLastTime; - BOOL bClipRegion; + MapMode aOldMap; + Region aOldClip; + Rectangle aPaintRect; + Point aPt; + Size aSz; + Point aLayerOffsetPix; + VirtualDevice* pPaintDev; + VirtualDevice* pBottomLayer; + BitmapEx* pActBmpEx; + BitmapEx* pTopLayer; + MetaFile** ppTopMtf; + Marker* pObjStartMarker; + Marker* pObjEndMarker; + List* pListOfBmpEx; + ULONG nLastTime; + BOOL bClipRegion; - BOOL ImplPrepareMoveTo(); - void ImplDrawSprite( OutputDevice* pOut, const Point& rPt, const Size& rSz ); + BOOL ImplPrepareMoveTo(); + void ImplDrawSprite( OutputDevice* pOut, const Point& rPt, const Size& rSz ); }; diff --git a/sd/source/ui/inc/strings.hrc b/sd/source/ui/inc/strings.hrc index 7f5086057e5c..f46f85fc99c5 100755 --- a/sd/source/ui/inc/strings.hrc +++ b/sd/source/ui/inc/strings.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,61 +28,61 @@ #ifndef _SD_CFGID_HXX #include "cfgids.hxx" #endif -#define STR_NULL (RID_APP_START+3) -#define STR_INSERTPAGE (RID_APP_START+35) -#define STR_INSERTLAYER (RID_APP_START+37) -#define STR_MODIFYLAYER (RID_APP_START+38) -#define STR_UNDO_SLIDE_MOVE (RID_APP_START+41) -#define STR_UNDO_REPLACE (RID_APP_START+42) +#define STR_NULL (RID_APP_START+3) +#define STR_INSERTPAGE (RID_APP_START+35) +#define STR_INSERTLAYER (RID_APP_START+37) +#define STR_MODIFYLAYER (RID_APP_START+38) +#define STR_UNDO_SLIDE_MOVE (RID_APP_START+41) +#define STR_UNDO_REPLACE (RID_APP_START+42) /* - * Dummy-Strings, diese ResourceIDs duerfen nicht an andere Strings vergeben - * werden, da sie fuer Popup-Menues benutzt werden (ein Popup-Menue und sein - * Konfigurationsstring muessen dieselbe ResourceID haben!). - * siehe auch: res_bmp.hrc, popup.src + * Dummy-Strings, diese ResourceIDs duerfen nicht an andere Strings vergeben + * werden, da sie fuer Popup-Menues benutzt werden (ein Popup-Menue und sein + * Konfigurationsstring muessen dieselbe ResourceID haben!). + * siehe auch: res_bmp.hrc, popup.src */ -#define STR_DRAW_TEXTOBJ_POPUP (RID_APP_START+43) -#define STR_DRAW_GEOMOBJ_POPUP (RID_APP_START+44) -#define STR_DRAW_NOSEL_POPUP (RID_APP_START+45) -#define STR_SLIDETABLE_POPUP (RID_APP_START+46) -#define STR_BEZIER_POPUP (RID_APP_START+47) -#define STR_DRAW_LINEOBJ_POPUP (RID_APP_START+48) -#define STR_DRAW_MULTISELECTION_POPUP (RID_APP_START+49) -#define STR_PAGETAB_POPUP (RID_APP_START+50) -#define STR_LAYERTAB_POPUP (RID_APP_START+51) -#define STR_DRAW_GRAPHIC_POPUP (RID_APP_START+52) -#define STR_DRAW_OLE2_POPUP (RID_APP_START+53) -#define STR_DRAW_TEXTOBJ_INSIDE_POPUP (RID_APP_START+54) -#define STR_SLIDE_NOSEL_POPUP (RID_APP_START+55) -#define STR_OUTLINE_POPUP (RID_APP_START+56) -#define STR_MASTERPAGE_POPUP (RID_APP_START+57) -#define STR_DRAW_GROUPOBJ_POPUP (RID_APP_START+58) - -#define STR_UNDO_CUT (RID_APP_START+59) -#define STR_UNDO_DRAGDROP (RID_APP_START+66) -#define STR_INSERTGRAPHIC (RID_APP_START+67) +#define STR_DRAW_TEXTOBJ_POPUP (RID_APP_START+43) +#define STR_DRAW_GEOMOBJ_POPUP (RID_APP_START+44) +#define STR_DRAW_NOSEL_POPUP (RID_APP_START+45) +#define STR_SLIDETABLE_POPUP (RID_APP_START+46) +#define STR_BEZIER_POPUP (RID_APP_START+47) +#define STR_DRAW_LINEOBJ_POPUP (RID_APP_START+48) +#define STR_DRAW_MULTISELECTION_POPUP (RID_APP_START+49) +#define STR_PAGETAB_POPUP (RID_APP_START+50) +#define STR_LAYERTAB_POPUP (RID_APP_START+51) +#define STR_DRAW_GRAPHIC_POPUP (RID_APP_START+52) +#define STR_DRAW_OLE2_POPUP (RID_APP_START+53) +#define STR_DRAW_TEXTOBJ_INSIDE_POPUP (RID_APP_START+54) +#define STR_SLIDE_NOSEL_POPUP (RID_APP_START+55) +#define STR_OUTLINE_POPUP (RID_APP_START+56) +#define STR_MASTERPAGE_POPUP (RID_APP_START+57) +#define STR_DRAW_GROUPOBJ_POPUP (RID_APP_START+58) + +#define STR_UNDO_CUT (RID_APP_START+59) +#define STR_UNDO_DRAGDROP (RID_APP_START+66) +#define STR_INSERTGRAPHIC (RID_APP_START+67) /* * Ueberblendeffekte: sollten nach hinten offen bleiben, * da FadeEffectLB mit variabler Anzahl arbeitet * (Jetzt ueber STR_EFFECT_...) */ -#define STR_DRAGTYPE_URL (RID_APP_START+70) -#define STR_DRAGTYPE_EMBEDDED (RID_APP_START+71) -#define STR_DRAGTYPE_LINK (RID_APP_START+72) -#define STR_GLUE_ESCDIR_SMART (RID_APP_START+73) -#define STR_GLUE_ESCDIR_LEFT (RID_APP_START+74) -#define STR_GLUE_ESCDIR_RIGHT (RID_APP_START+75) -#define STR_GLUE_ESCDIR_TOP (RID_APP_START+76) -#define STR_GLUE_ESCDIR_BOTTOM (RID_APP_START+77) -#define STR_GLUE_ESCDIR_LO (RID_APP_START+78) -#define STR_GLUE_ESCDIR_LU (RID_APP_START+79) -#define STR_GLUE_ESCDIR_RO (RID_APP_START+80) -#define STR_GLUE_ESCDIR_RU (RID_APP_START+81) -#define STR_GLUE_ESCDIR_HORZ (RID_APP_START+82) -#define STR_GLUE_ESCDIR_VERT (RID_APP_START+83) -#define STR_GLUE_ESCDIR_ALL (RID_APP_START+84) +#define STR_DRAGTYPE_URL (RID_APP_START+70) +#define STR_DRAGTYPE_EMBEDDED (RID_APP_START+71) +#define STR_DRAGTYPE_LINK (RID_APP_START+72) +#define STR_GLUE_ESCDIR_SMART (RID_APP_START+73) +#define STR_GLUE_ESCDIR_LEFT (RID_APP_START+74) +#define STR_GLUE_ESCDIR_RIGHT (RID_APP_START+75) +#define STR_GLUE_ESCDIR_TOP (RID_APP_START+76) +#define STR_GLUE_ESCDIR_BOTTOM (RID_APP_START+77) +#define STR_GLUE_ESCDIR_LO (RID_APP_START+78) +#define STR_GLUE_ESCDIR_LU (RID_APP_START+79) +#define STR_GLUE_ESCDIR_RO (RID_APP_START+80) +#define STR_GLUE_ESCDIR_RU (RID_APP_START+81) +#define STR_GLUE_ESCDIR_HORZ (RID_APP_START+82) +#define STR_GLUE_ESCDIR_VERT (RID_APP_START+83) +#define STR_GLUE_ESCDIR_ALL (RID_APP_START+84) #define STR_CANT_PERFORM_IN_LIVEMODE (RID_APP_START+85) #define STR_PUBLISH_BACK (RID_APP_START+86) @@ -91,218 +91,218 @@ #define STR_UNDO_COLORRESOLUTION (RID_APP_START+89) /* Von 90 - 100 fuer Popups freihalten */ -#define STR_DRAW_3DOBJ_POPUP (RID_APP_START+90) -#define STR_DRAW_MEASUREOBJ_POPUP (RID_APP_START+91) +#define STR_DRAW_3DOBJ_POPUP (RID_APP_START+90) +#define STR_DRAW_MEASUREOBJ_POPUP (RID_APP_START+91) #define STR_ASK_DELETE_ALL_PICTURES (RID_APP_START+92) #define STR_WARN_PAGE_EXISTS (RID_APP_START+93) -#define STR_SLOW (RID_APP_START+112) -#define STR_MEDIUM (RID_APP_START+113) -#define STR_FAST (RID_APP_START+114) +#define STR_SLOW (RID_APP_START+112) +#define STR_MEDIUM (RID_APP_START+113) +#define STR_FAST (RID_APP_START+114) -#define STR_SLIDE_MODE (RID_APP_START+121) -#define STR_DRAW_MODE (RID_APP_START+122) -#define STR_OUTLINE_MODE (RID_APP_START+123) +#define STR_SLIDE_MODE (RID_APP_START+121) +#define STR_DRAW_MODE (RID_APP_START+122) +#define STR_OUTLINE_MODE (RID_APP_START+123) -#define STR_UNDO_BEZCLOSE (RID_APP_START+127) +#define STR_UNDO_BEZCLOSE (RID_APP_START+127) #define STR_END_SPELLING_OBJ (RID_APP_START+129) -#define STR_NOTES_MODE (RID_APP_START+135) -#define STR_HANDOUT_MODE (RID_APP_START+136) +#define STR_NOTES_MODE (RID_APP_START+135) +#define STR_HANDOUT_MODE (RID_APP_START+136) -#define STR_LINEEND (RID_APP_START+137) -#define STR_DESC_LINEEND (RID_APP_START+138) -#define STR_WARN_NAME_DUPLICATE (RID_APP_START+139) -#define STR_UNDO_COPYOBJECTS (RID_APP_START+140) -#define STR_DESC_NAMEGROUP (RID_APP_START+141) -#define STR_TITLE_NAMEGROUP (RID_APP_START+143) +#define STR_LINEEND (RID_APP_START+137) +#define STR_DESC_LINEEND (RID_APP_START+138) +#define STR_WARN_NAME_DUPLICATE (RID_APP_START+139) +#define STR_UNDO_COPYOBJECTS (RID_APP_START+140) +#define STR_DESC_NAMEGROUP (RID_APP_START+141) +#define STR_TITLE_NAMEGROUP (RID_APP_START+143) -#define STR_SNAPDLG_SETLINE (RID_APP_START+144) -#define STR_SNAPDLG_SETPOINT (RID_APP_START+145) -#define STR_POPUP_EDIT_SNAPLINE (RID_APP_START+146) -#define STR_POPUP_EDIT_SNAPPOINT (RID_APP_START+147) +#define STR_SNAPDLG_SETLINE (RID_APP_START+144) +#define STR_SNAPDLG_SETPOINT (RID_APP_START+145) +#define STR_POPUP_EDIT_SNAPLINE (RID_APP_START+146) +#define STR_POPUP_EDIT_SNAPPOINT (RID_APP_START+147) #define STR_IMPRESS (RID_APP_START+149) #define STR_IMPRESS_DOCUMENT (RID_APP_START+154) -#define STR_LAYER (RID_APP_START+158) +#define STR_LAYER (RID_APP_START+158) // #define (RID_APP_START+159) -#define STR_POPUP_DELETE_SNAPLINE (RID_APP_START+160) -#define STR_POPUP_DELETE_SNAPPOINT (RID_APP_START+161) +#define STR_POPUP_DELETE_SNAPLINE (RID_APP_START+160) +#define STR_POPUP_DELETE_SNAPPOINT (RID_APP_START+161) -#define STR_SCALE_OBJS_TO_PAGE (RID_APP_START+162) +#define STR_SCALE_OBJS_TO_PAGE (RID_APP_START+162) -#define STR_EYEDROPPER (RID_APP_START+163) +#define STR_EYEDROPPER (RID_APP_START+163) -#define STR_UNDO_MORPHING (RID_APP_START+164) +#define STR_UNDO_MORPHING (RID_APP_START+164) #define STR_IMPRESS_DOCUMENT_FULLTYPE_60 (RID_APP_START+170) /* - * ResourceIDs fuer Toolboxen nicht aendern, ohne die Strings in - * strings.hrc auf die selben IDs zu setzen (eine Toolbox und sein - * Konfigurationsstring muessen dieselbe ResourceID haben!). + * ResourceIDs fuer Toolboxen nicht aendern, ohne die Strings in + * strings.hrc auf die selben IDs zu setzen (eine Toolbox und sein + * Konfigurationsstring muessen dieselbe ResourceID haben!). */ -#define STR_PLUGIN_TOOLBOX RID_PLUGINTOOLBOX -#define STR_DRAW_TOOLBOX RID_DRAW_TOOLBOX -#define STR_SLIDE_TOOLBOX RID_SLIDE_TOOLBOX -#define STR_DRAW_OBJ_TOOLBOX RID_DRAW_OBJ_TOOLBOX -#define STR_SLIDE_OBJ_TOOLBOX RID_SLIDE_OBJ_TOOLBOX -#define STR_BEZIER_TOOLBOX RID_BEZIER_TOOLBOX -#define STR_DRAW_TEXT_TOOLBOX RID_DRAW_TEXT_TOOLBOX -#define STR_DRAW_TABLE_TOOLBOX RID_DRAW_TABLE_TOOLBOX -#define STR_OUTLINE_TOOLBOX RID_OUTLINE_TOOLBOX -#define STR_DRAW_POLYLINEOBJ_POPUP RID_DRAW_POLYLINEOBJ_POPUP -#define STR_GLUEPOINTS_TOOLBOX RID_GLUEPOINTS_TOOLBOX -#define STR_DRAW_OPTIONS_TOOLBOX RID_DRAW_OPTIONS_TOOLBOX -#define STR_DRAW_COMMONTASK_TOOLBOX RID_DRAW_COMMONTASK_TOOLBOX - -#define STR_GRAPHIC_TOOLBOX RID_GRAPHIC_TOOLBOX -#define STR_GRAPHIC_OPTIONS_TOOLBOX RID_GRAPHIC_OPTIONS_TOOLBOX -#define STR_GRAPHIC_OBJ_TOOLBOX RID_GRAPHIC_OBJ_TOOLBOX +#define STR_PLUGIN_TOOLBOX RID_PLUGINTOOLBOX +#define STR_DRAW_TOOLBOX RID_DRAW_TOOLBOX +#define STR_SLIDE_TOOLBOX RID_SLIDE_TOOLBOX +#define STR_DRAW_OBJ_TOOLBOX RID_DRAW_OBJ_TOOLBOX +#define STR_SLIDE_OBJ_TOOLBOX RID_SLIDE_OBJ_TOOLBOX +#define STR_BEZIER_TOOLBOX RID_BEZIER_TOOLBOX +#define STR_DRAW_TEXT_TOOLBOX RID_DRAW_TEXT_TOOLBOX +#define STR_DRAW_TABLE_TOOLBOX RID_DRAW_TABLE_TOOLBOX +#define STR_OUTLINE_TOOLBOX RID_OUTLINE_TOOLBOX +#define STR_DRAW_POLYLINEOBJ_POPUP RID_DRAW_POLYLINEOBJ_POPUP +#define STR_GLUEPOINTS_TOOLBOX RID_GLUEPOINTS_TOOLBOX +#define STR_DRAW_OPTIONS_TOOLBOX RID_DRAW_OPTIONS_TOOLBOX +#define STR_DRAW_COMMONTASK_TOOLBOX RID_DRAW_COMMONTASK_TOOLBOX + +#define STR_GRAPHIC_TOOLBOX RID_GRAPHIC_TOOLBOX +#define STR_GRAPHIC_OPTIONS_TOOLBOX RID_GRAPHIC_OPTIONS_TOOLBOX +#define STR_GRAPHIC_OBJ_TOOLBOX RID_GRAPHIC_OBJ_TOOLBOX #define STR_GRAPHIC_TEXT_TOOLBOX RID_GRAPHIC_TEXT_TOOLBOX -#define STR_DRAW_GRAF_TOOLBOX RID_DRAW_GRAF_TOOLBOX -#define STR_DRAW_MEDIA_TOOLBOX RID_DRAW_MEDIA_TOOLBOX +#define STR_DRAW_GRAF_TOOLBOX RID_DRAW_GRAF_TOOLBOX +#define STR_DRAW_MEDIA_TOOLBOX RID_DRAW_MEDIA_TOOLBOX // IDs fuer Praesentationsfolien -#define STR_AUTOLAYOUT_NONE (RID_APP_START+210) -#define STR_AUTOLAYOUT_ONLY_TITLE (RID_APP_START+211) -#define STR_AUTOLAYOUT_ONLY_TEXT (RID_APP_START+212) -#define STR_AUTOLAYOUT_TITLE (RID_APP_START+213) -#define STR_AUTOLAYOUT_CONTENT (RID_APP_START+214) -#define STR_AUTOLAYOUT_2CONTENT (RID_APP_START+215) -#define STR_AUTOLAYOUT_CONTENT_2CONTENT (RID_APP_START+217) -#define STR_AUTOLAYOUT_2CONTENT_CONTENT (RID_APP_START+218) -#define STR_AUTOLAYOUT_CONTENT_OVER_2CONTENT (RID_APP_START+219) -#define STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT (RID_APP_START+220) -#define STR_AUTOLAYOUT_CONTENT_OVER_CONTENT (RID_APP_START+221) -#define STR_AUTOLAYOUT_4CONTENT (RID_APP_START+222) -#define STR_AUTOLAYOUT_6CONTENT (RID_APP_START+223) - -#define STR_AUTOLAYOUT_HANDOUT1 (RID_APP_START+231) -#define STR_AUTOLAYOUT_HANDOUT2 (RID_APP_START+232) -#define STR_AUTOLAYOUT_HANDOUT3 (RID_APP_START+233) -#define STR_AUTOLAYOUT_HANDOUT4 (RID_APP_START+234) -#define STR_AUTOLAYOUT_HANDOUT6 (RID_APP_START+235) -#define STR_AUTOLAYOUT_NOTES (RID_APP_START+236) -#define STR_AUTOLAYOUT_HANDOUT9 (RID_APP_START+237) - -#define STR_TRANSFORM (RID_APP_START+240) - -#define STR_EXPORT_HTML_NAME (RID_APP_START+244) -#define STR_EXPORT_HTML_FILTER (RID_APP_START+245) -#define STR_EXPORT_DIALOG_TITLE (RID_APP_START+261) -#define STR_TWAIN_NO_SOURCE_UNX (RID_APP_START+262) -#define STR_UNDO_DELETEPAGES (RID_APP_START+265) -#define STR_UNDO_INSERTPAGES (RID_APP_START+266) +#define STR_AUTOLAYOUT_NONE (RID_APP_START+210) +#define STR_AUTOLAYOUT_ONLY_TITLE (RID_APP_START+211) +#define STR_AUTOLAYOUT_ONLY_TEXT (RID_APP_START+212) +#define STR_AUTOLAYOUT_TITLE (RID_APP_START+213) +#define STR_AUTOLAYOUT_CONTENT (RID_APP_START+214) +#define STR_AUTOLAYOUT_2CONTENT (RID_APP_START+215) +#define STR_AUTOLAYOUT_CONTENT_2CONTENT (RID_APP_START+217) +#define STR_AUTOLAYOUT_2CONTENT_CONTENT (RID_APP_START+218) +#define STR_AUTOLAYOUT_CONTENT_OVER_2CONTENT (RID_APP_START+219) +#define STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT (RID_APP_START+220) +#define STR_AUTOLAYOUT_CONTENT_OVER_CONTENT (RID_APP_START+221) +#define STR_AUTOLAYOUT_4CONTENT (RID_APP_START+222) +#define STR_AUTOLAYOUT_6CONTENT (RID_APP_START+223) + +#define STR_AUTOLAYOUT_HANDOUT1 (RID_APP_START+231) +#define STR_AUTOLAYOUT_HANDOUT2 (RID_APP_START+232) +#define STR_AUTOLAYOUT_HANDOUT3 (RID_APP_START+233) +#define STR_AUTOLAYOUT_HANDOUT4 (RID_APP_START+234) +#define STR_AUTOLAYOUT_HANDOUT6 (RID_APP_START+235) +#define STR_AUTOLAYOUT_NOTES (RID_APP_START+236) +#define STR_AUTOLAYOUT_HANDOUT9 (RID_APP_START+237) + +#define STR_TRANSFORM (RID_APP_START+240) + +#define STR_EXPORT_HTML_NAME (RID_APP_START+244) +#define STR_EXPORT_HTML_FILTER (RID_APP_START+245) +#define STR_EXPORT_DIALOG_TITLE (RID_APP_START+261) +#define STR_TWAIN_NO_SOURCE_UNX (RID_APP_START+262) +#define STR_UNDO_DELETEPAGES (RID_APP_START+265) +#define STR_UNDO_INSERTPAGES (RID_APP_START+266) //free (RID_APP_START+267) -#define STR_ASK_DELETE_LAYER (RID_APP_START+268) -#define STR_UNDO_CHANGE_TITLE_AND_LAYOUT (RID_APP_START+269) -#define STR_WAV_FILE (RID_APP_START+270) -#define STR_MIDI_FILE (RID_APP_START+271) -#define STR_SD_PAGE (RID_APP_START+272) -#define STR_ALL_FILES (RID_APP_START+274) -#define STR_UNDO_INSERT_TEXTFRAME (RID_APP_START+275) -#define STR_ACTION_NOTPOSSIBLE (RID_APP_START+278) -#define STR_DLG_INSERT_PAGES_FROM_FILE (RID_APP_START+279) -#define STR_SCALE_OBJECTS (RID_APP_START+281) -#define STR_CREATE_PAGES (RID_APP_START+282) +#define STR_ASK_DELETE_LAYER (RID_APP_START+268) +#define STR_UNDO_CHANGE_TITLE_AND_LAYOUT (RID_APP_START+269) +#define STR_WAV_FILE (RID_APP_START+270) +#define STR_MIDI_FILE (RID_APP_START+271) +#define STR_SD_PAGE (RID_APP_START+272) +#define STR_ALL_FILES (RID_APP_START+274) +#define STR_UNDO_INSERT_TEXTFRAME (RID_APP_START+275) +#define STR_ACTION_NOTPOSSIBLE (RID_APP_START+278) +#define STR_DLG_INSERT_PAGES_FROM_FILE (RID_APP_START+279) +#define STR_SCALE_OBJECTS (RID_APP_START+281) +#define STR_CREATE_PAGES (RID_APP_START+282) -#define STR_UNDO_CHANGE_PAGEFORMAT (RID_APP_START+283) -#define STR_UNDO_CHANGE_PAGEBORDER (RID_APP_START+284) +#define STR_UNDO_CHANGE_PAGEFORMAT (RID_APP_START+283) +#define STR_UNDO_CHANGE_PAGEBORDER (RID_APP_START+284) -#define STR_EDIT_OBJ (RID_APP_START+288) +#define STR_EDIT_OBJ (RID_APP_START+288) -#define STR_READ_DATA_ERROR (RID_APP_START+290) +#define STR_READ_DATA_ERROR (RID_APP_START+290) /****************************************************************************** * Ab (RID_APP_START+300 beginnen die Ids in sdstring.hrc! ******************************************************************************/ -#define STR_DELETE_PAGES (RID_APP_START+332) -#define STR_WARN_PRINTFORMAT_FAILURE (RID_APP_START+333) -#define STR_REMOVE_LINK (RID_APP_START+334) - -#define STR_IMPORT_GRFILTER_OPENERROR (RID_APP_START+335) -#define STR_IMPORT_GRFILTER_IOERROR (RID_APP_START+336) -#define STR_IMPORT_GRFILTER_FORMATERROR (RID_APP_START+337) -#define STR_IMPORT_GRFILTER_VERSIONERROR (RID_APP_START+338) -#define STR_IMPORT_GRFILTER_FILTERERROR (RID_APP_START+339) -#define STR_IMPORT_GRFILTER_TOOBIG (RID_APP_START+340) - -#define STR_OBJECTS (RID_APP_START+341) -#define STR_END_SEARCHING (RID_APP_START+342) -#define STR_END_SPELLING (RID_APP_START+343) -#define STR_NOLANGUAGE (RID_APP_START+344) -#define STR_ASK_FOR_CONVERT_TO_BEZIER (RID_APP_START+347) -#define STR_UNDO_CHANGE_PRES_OBJECT (RID_APP_START+349) -#define STR_UNDO_MODIFY_PAGE (RID_APP_START+350) -#define STR_STATSTR_PRINT (RID_APP_START+351) -#define STR_UNDO_INSERT_FILE (RID_APP_START+352) -#define STR_UNDO_INSERT_SPECCHAR (RID_APP_START+353) -#define STR_UNDO_SET_PRESLAYOUT (RID_APP_START+354) -#define STR_STRING_NOTFOUND (RID_APP_START+355) -#define STR_PLAY (RID_APP_START+356) -#define STR_STOP (RID_APP_START+357) -#define STR_UNDO_ORIGINALSIZE (RID_APP_START+359) -#define STR_PRINT_DRAWING (RID_APP_START+361) -#define STR_PRINT_NOTES (RID_APP_START+362) -#define STR_PRINT_HANDOUT (RID_APP_START+363) -#define STR_PRINT_OUTLINE (RID_APP_START+364) -#define STR_WARN_SCALE_FAIL (RID_APP_START+365) +#define STR_DELETE_PAGES (RID_APP_START+332) +#define STR_WARN_PRINTFORMAT_FAILURE (RID_APP_START+333) +#define STR_REMOVE_LINK (RID_APP_START+334) + +#define STR_IMPORT_GRFILTER_OPENERROR (RID_APP_START+335) +#define STR_IMPORT_GRFILTER_IOERROR (RID_APP_START+336) +#define STR_IMPORT_GRFILTER_FORMATERROR (RID_APP_START+337) +#define STR_IMPORT_GRFILTER_VERSIONERROR (RID_APP_START+338) +#define STR_IMPORT_GRFILTER_FILTERERROR (RID_APP_START+339) +#define STR_IMPORT_GRFILTER_TOOBIG (RID_APP_START+340) + +#define STR_OBJECTS (RID_APP_START+341) +#define STR_END_SEARCHING (RID_APP_START+342) +#define STR_END_SPELLING (RID_APP_START+343) +#define STR_NOLANGUAGE (RID_APP_START+344) +#define STR_ASK_FOR_CONVERT_TO_BEZIER (RID_APP_START+347) +#define STR_UNDO_CHANGE_PRES_OBJECT (RID_APP_START+349) +#define STR_UNDO_MODIFY_PAGE (RID_APP_START+350) +#define STR_STATSTR_PRINT (RID_APP_START+351) +#define STR_UNDO_INSERT_FILE (RID_APP_START+352) +#define STR_UNDO_INSERT_SPECCHAR (RID_APP_START+353) +#define STR_UNDO_SET_PRESLAYOUT (RID_APP_START+354) +#define STR_STRING_NOTFOUND (RID_APP_START+355) +#define STR_PLAY (RID_APP_START+356) +#define STR_STOP (RID_APP_START+357) +#define STR_UNDO_ORIGINALSIZE (RID_APP_START+359) +#define STR_PRINT_DRAWING (RID_APP_START+361) +#define STR_PRINT_NOTES (RID_APP_START+362) +#define STR_PRINT_HANDOUT (RID_APP_START+363) +#define STR_PRINT_OUTLINE (RID_APP_START+364) +#define STR_WARN_SCALE_FAIL (RID_APP_START+365) // Strings fuer Klick-Effekte (Reihenfolge beibehalten) -#define STR_CLICK_ACTION_NONE (RID_APP_START+366) -#define STR_CLICK_ACTION_PREVPAGE (RID_APP_START+367) -#define STR_CLICK_ACTION_NEXTPAGE (RID_APP_START+368) -#define STR_CLICK_ACTION_FIRSTPAGE (RID_APP_START+369) -#define STR_CLICK_ACTION_LASTPAGE (RID_APP_START+370) -#define STR_CLICK_ACTION_BOOKMARK (RID_APP_START+371) -#define STR_CLICK_ACTION_DOCUMENT (RID_APP_START+372) -#define STR_CLICK_ACTION_VANISH (RID_APP_START+373) -#define STR_CLICK_ACTION_INVISIBLE (RID_APP_START+374) -#define STR_CLICK_ACTION_SOUND (RID_APP_START+375) -#define STR_CLICK_ACTION_VERB (RID_APP_START+376) -#define STR_CLICK_ACTION_PROGRAM (RID_APP_START+377) -#define STR_CLICK_ACTION_MACRO (RID_APP_START+378) +#define STR_CLICK_ACTION_NONE (RID_APP_START+366) +#define STR_CLICK_ACTION_PREVPAGE (RID_APP_START+367) +#define STR_CLICK_ACTION_NEXTPAGE (RID_APP_START+368) +#define STR_CLICK_ACTION_FIRSTPAGE (RID_APP_START+369) +#define STR_CLICK_ACTION_LASTPAGE (RID_APP_START+370) +#define STR_CLICK_ACTION_BOOKMARK (RID_APP_START+371) +#define STR_CLICK_ACTION_DOCUMENT (RID_APP_START+372) +#define STR_CLICK_ACTION_VANISH (RID_APP_START+373) +#define STR_CLICK_ACTION_INVISIBLE (RID_APP_START+374) +#define STR_CLICK_ACTION_SOUND (RID_APP_START+375) +#define STR_CLICK_ACTION_VERB (RID_APP_START+376) +#define STR_CLICK_ACTION_PROGRAM (RID_APP_START+377) +#define STR_CLICK_ACTION_MACRO (RID_APP_START+378) // Mind. bis 380 freihalten -#define STR_EFFECTDLG_SOUND (RID_APP_START+380) -#define STR_EFFECTDLG_PAGE_OBJECT (RID_APP_START+382) -#define STR_EFFECTDLG_DOCUMENT (RID_APP_START+383) -#define STR_EFFECTDLG_PROGRAM (RID_APP_START+384) -#define STR_EFFECTDLG_MACRO (RID_APP_START+385) -#define STR_EFFECTDLG_JUMP (RID_APP_START+386) -#define STR_EFFECTDLG_ACTION (RID_APP_START+387) - -/* Fortsetzung von RID_APP_START+43 bis RID_APP_START+58: - * Dummy-Strings, diese ResourceIDs duerfen nicht an andere Strings vergeben - * werden, da sie fuer Popup-Menues benutzt werden (ein Popup-Menue und sein - * Konfigurationsstring muessen dieselbe ResourceID haben!). - * siehe auch: res_bmp.hrc, popup.src +#define STR_EFFECTDLG_SOUND (RID_APP_START+380) +#define STR_EFFECTDLG_PAGE_OBJECT (RID_APP_START+382) +#define STR_EFFECTDLG_DOCUMENT (RID_APP_START+383) +#define STR_EFFECTDLG_PROGRAM (RID_APP_START+384) +#define STR_EFFECTDLG_MACRO (RID_APP_START+385) +#define STR_EFFECTDLG_JUMP (RID_APP_START+386) +#define STR_EFFECTDLG_ACTION (RID_APP_START+387) + +/* Fortsetzung von RID_APP_START+43 bis RID_APP_START+58: + * Dummy-Strings, diese ResourceIDs duerfen nicht an andere Strings vergeben + * werden, da sie fuer Popup-Menues benutzt werden (ein Popup-Menue und sein + * Konfigurationsstring muessen dieselbe ResourceID haben!). + * siehe auch: res_bmp.hrc, popup.src */ -#define STR_DRAW_SNAPOBJECT_POPUP (RID_APP_START+390) -#define STR_DRAW_GLUEPOINT_POPUP (RID_APP_START+392) -#define STR_DRAW_CONTROL_POPUP (RID_APP_START+393) +#define STR_DRAW_SNAPOBJECT_POPUP (RID_APP_START+390) +#define STR_DRAW_GLUEPOINT_POPUP (RID_APP_START+392) +#define STR_DRAW_CONTROL_POPUP (RID_APP_START+393) -#define STR_EFFECT_NONE (RID_APP_START+400) +#define STR_EFFECT_NONE (RID_APP_START+400) -#define STR_INSERT_TEXT (RID_APP_START+432) -#define STR_SLIDE_SINGULAR (RID_APP_START+433) -#define STR_SLIDE_PLURAL (RID_APP_START+434) -#define STR_AU_FILE (RID_APP_START+435) -#define STR_VOC_FILE (RID_APP_START+436) -#define STR_AIFF_FILE (RID_APP_START+437) -#define STR_SVX_FILE (RID_APP_START+438) +#define STR_INSERT_TEXT (RID_APP_START+432) +#define STR_SLIDE_SINGULAR (RID_APP_START+433) +#define STR_SLIDE_PLURAL (RID_APP_START+434) +#define STR_AU_FILE (RID_APP_START+435) +#define STR_VOC_FILE (RID_APP_START+436) +#define STR_AIFF_FILE (RID_APP_START+437) +#define STR_SVX_FILE (RID_APP_START+438) -/* Stringdefinitionen fuer die Chartbeschriftung +/* Stringdefinitionen fuer die Chartbeschriftung */ -#define STR_LOAD_PRESENTATION_LAYOUT (RID_APP_START+448) +#define STR_LOAD_PRESENTATION_LAYOUT (RID_APP_START+448) #define STR_CLICK_ACTION_STOPPRESENTATION (RID_APP_START+475) @@ -312,171 +312,171 @@ #define STR_GRAPHIC_DOCUMENT (RID_APP_START+499) #define STR_GRAPHIC_DOCUMENT_FULLTYPE_60 (RID_APP_START+501) -#define STR_FIX (RID_APP_START+502) -#define STR_VAR (RID_APP_START+503) -#define STR_STANDARD_NORMAL (RID_APP_START+504) -#define STR_STANDARD_SMALL (RID_APP_START+505) -#define STR_STANDARD_BIG (RID_APP_START+506) -#define STR_FILEFORMAT_NAME_EXT (RID_APP_START+507) -#define STR_FILEFORMAT_FULLPATH (RID_APP_START+508) -#define STR_FILEFORMAT_PATH (RID_APP_START+509) -#define STR_FILEFORMAT_NAME (RID_APP_START+510) +#define STR_FIX (RID_APP_START+502) +#define STR_VAR (RID_APP_START+503) +#define STR_STANDARD_NORMAL (RID_APP_START+504) +#define STR_STANDARD_SMALL (RID_APP_START+505) +#define STR_STANDARD_BIG (RID_APP_START+506) +#define STR_FILEFORMAT_NAME_EXT (RID_APP_START+507) +#define STR_FILEFORMAT_FULLPATH (RID_APP_START+508) +#define STR_FILEFORMAT_PATH (RID_APP_START+509) +#define STR_FILEFORMAT_NAME (RID_APP_START+510) -#define STR_RELEASE_GRAPHICLINK (RID_APP_START+511) +#define STR_RELEASE_GRAPHICLINK (RID_APP_START+511) -#define STR_NEW_CUSTOMSHOW (RID_APP_START+512) -#define STR_COPY_CUSTOMSHOW (RID_APP_START+513) +#define STR_NEW_CUSTOMSHOW (RID_APP_START+512) +#define STR_COPY_CUSTOMSHOW (RID_APP_START+513) -#define STR_VIEWTYPE_DUMMY (RID_APP_START+518) +#define STR_VIEWTYPE_DUMMY (RID_APP_START+518) -#define STR_BREAK_METAFILE (RID_APP_START+521) -#define STR_BREAK_FAIL (RID_APP_START+522) +#define STR_BREAK_METAFILE (RID_APP_START+521) +#define STR_BREAK_FAIL (RID_APP_START+522) -#define STR_PUBDLG_SAMENAME (RID_APP_START+523) +#define STR_PUBDLG_SAMENAME (RID_APP_START+523) -#define STR_HTMLATTR_TEXT (RID_APP_START+524) -#define STR_HTMLATTR_LINK (RID_APP_START+525) -#define STR_HTMLATTR_VLINK (RID_APP_START+526) -#define STR_HTMLATTR_ALINK (RID_APP_START+527) +#define STR_HTMLATTR_TEXT (RID_APP_START+524) +#define STR_HTMLATTR_LINK (RID_APP_START+525) +#define STR_HTMLATTR_VLINK (RID_APP_START+526) +#define STR_HTMLATTR_ALINK (RID_APP_START+527) -#define STR_HTMLEXP_NOTES (RID_APP_START+528) -#define STR_HTMLEXP_CONTENTS (RID_APP_START+529) -#define STR_HTMLEXP_CLICKSTART (RID_APP_START+530) -#define STR_HTMLEXP_AUTHOR (RID_APP_START+531) -#define STR_HTMLEXP_EMAIL (RID_APP_START+532) -#define STR_HTMLEXP_HOMEPAGE (RID_APP_START+533) -#define STR_HTMLEXP_INFO (RID_APP_START+534) -#define STR_HTMLEXP_DOWNLOAD (RID_APP_START+536) -#define STR_HTMLEXP_NOFRAMES (RID_APP_START+537) -#define STR_HTMLEXP_FIRSTPAGE (RID_APP_START+538) -#define STR_HTMLEXP_LASTPAGE (RID_APP_START+539) -#define STR_HTMLEXP_SETTEXT (RID_APP_START+540) -#define STR_HTMLEXP_SETGRAPHIC (RID_APP_START+541) -#define STR_HTMLEXP_OUTLINE (RID_APP_START+542) -#define STR_HTMLEXP_NOOUTLINE (RID_APP_START+543) +#define STR_HTMLEXP_NOTES (RID_APP_START+528) +#define STR_HTMLEXP_CONTENTS (RID_APP_START+529) +#define STR_HTMLEXP_CLICKSTART (RID_APP_START+530) +#define STR_HTMLEXP_AUTHOR (RID_APP_START+531) +#define STR_HTMLEXP_EMAIL (RID_APP_START+532) +#define STR_HTMLEXP_HOMEPAGE (RID_APP_START+533) +#define STR_HTMLEXP_INFO (RID_APP_START+534) +#define STR_HTMLEXP_DOWNLOAD (RID_APP_START+536) +#define STR_HTMLEXP_NOFRAMES (RID_APP_START+537) +#define STR_HTMLEXP_FIRSTPAGE (RID_APP_START+538) +#define STR_HTMLEXP_LASTPAGE (RID_APP_START+539) +#define STR_HTMLEXP_SETTEXT (RID_APP_START+540) +#define STR_HTMLEXP_SETGRAPHIC (RID_APP_START+541) +#define STR_HTMLEXP_OUTLINE (RID_APP_START+542) +#define STR_HTMLEXP_NOOUTLINE (RID_APP_START+543) -#define STR_PRES_SOFTEND (RID_APP_START+550) -#define STR_PRES_PAUSE (RID_APP_START+551) +#define STR_PRES_SOFTEND (RID_APP_START+550) +#define STR_PRES_PAUSE (RID_APP_START+551) -#define STR_WIZARD_ORIGINAL (RID_APP_START+552) +#define STR_WIZARD_ORIGINAL (RID_APP_START+552) -#define STR_ISLOADING (RID_APP_START+554) +#define STR_ISLOADING (RID_APP_START+554) -#define STR_WEBVIEW_SAVE (RID_APP_START+555) +#define STR_WEBVIEW_SAVE (RID_APP_START+555) -#define STR_UNDO_APPLY_3D_FAVOURITE (RID_APP_START+556) +#define STR_UNDO_APPLY_3D_FAVOURITE (RID_APP_START+556) //free (RID_APP_START+557) -#define RID_UNDO_DELETE_WARNING (RID_APP_START+558) -#define IMG_UNDO_DELETE_WARNING (RID_APP_START+559) -#define FT_UNDO_DELETE_WARNING (RID_APP_START+560) -#define CB_UNDO_DELETE_DISABLE (RID_APP_START+561) -#define BTN_UNDO_DELETE_YES (RID_APP_START+562) -#define BTN_UNDO_DELETE_NO (RID_APP_START+564) +#define RID_UNDO_DELETE_WARNING (RID_APP_START+558) +#define IMG_UNDO_DELETE_WARNING (RID_APP_START+559) +#define FT_UNDO_DELETE_WARNING (RID_APP_START+560) +#define CB_UNDO_DELETE_DISABLE (RID_APP_START+561) +#define BTN_UNDO_DELETE_YES (RID_APP_START+562) +#define BTN_UNDO_DELETE_NO (RID_APP_START+564) #define STR_WARNING_NOSOUNDFILE (RID_APP_START+565) -#define STR_UNDO_GRAFFILTER (RID_APP_START+570) +#define STR_UNDO_GRAFFILTER (RID_APP_START+570) -#define STR_UNDO_CONVERT_TO_METAFILE (RID_APP_START+571) -#define STR_UNDO_CONVERT_TO_BITMAP (RID_APP_START+572) +#define STR_UNDO_CONVERT_TO_METAFILE (RID_APP_START+571) +#define STR_UNDO_CONVERT_TO_BITMAP (RID_APP_START+572) -#define STR_HTMLEXP_ERROR_CREATE_FILE (RID_APP_START+578) -#define STR_HTMLEXP_ERROR_OPEN_FILE (RID_APP_START+579) -#define STR_HTMLEXP_ERROR_COPY_FILE (RID_APP_START+580) +#define STR_HTMLEXP_ERROR_CREATE_FILE (RID_APP_START+578) +#define STR_HTMLEXP_ERROR_OPEN_FILE (RID_APP_START+579) +#define STR_HTMLEXP_ERROR_COPY_FILE (RID_APP_START+580) -#define STR_PAGE_BACKGROUND_TXT (RID_APP_START+583) -#define STR_PAGE_BACKGROUND_TITLE (RID_APP_START+584) +#define STR_PAGE_BACKGROUND_TXT (RID_APP_START+583) +#define STR_PAGE_BACKGROUND_TITLE (RID_APP_START+584) // additional effects -#define STR_EFFECT_DISCARD_SHORT (RID_APP_START+598) - -#define STR_EFFECT_DISCARD_FROM_UL (RID_APP_START+600) -#define STR_EFFECT_DISCARD_FROM_UR (RID_APP_START+601) -#define STR_EFFECT_DISCARD_FROM_LR (RID_APP_START+602) -#define STR_EFFECT_DISCARD_FROM_LL (RID_APP_START+603) -#define STR_EFFECT_DISCARD_S_FROM_L (RID_APP_START+604) -#define STR_EFFECT_DISCARD_S_FROM_UL (RID_APP_START+605) -#define STR_EFFECT_DISCARD_S_FROM_T (RID_APP_START+606) -#define STR_EFFECT_DISCARD_S_FROM_UR (RID_APP_START+607) -#define STR_EFFECT_DISCARD_S_FROM_R (RID_APP_START+608) -#define STR_EFFECT_DISCARD_S_FROM_LR (RID_APP_START+609) -#define STR_EFFECT_DISCARD_S_FROM_B (RID_APP_START+610) -#define STR_EFFECT_DISCARD_S_FROM_LL (RID_APP_START+611) -#define STR_EFFECT_VERTICAL_CHECKERBOARD (RID_APP_START+612) -#define STR_EFFECT_HORIZONTAL_CHECKERBOARD (RID_APP_START+613) - -#define STR_EFFECT_MOVE_TO_UL (RID_APP_START+620) -#define STR_EFFECT_MOVE_TO_UR (RID_APP_START+621) -#define STR_EFFECT_MOVE_TO_LR (RID_APP_START+622) -#define STR_EFFECT_MOVE_TO_LL (RID_APP_START+623) -#define STR_EFFECT_MOVE_S_TO_L (RID_APP_START+625) -#define STR_EFFECT_MOVE_S_TO_UL (RID_APP_START+626) -#define STR_EFFECT_MOVE_S_TO_T (RID_APP_START+627) -#define STR_EFFECT_MOVE_S_TO_UR (RID_APP_START+628) -#define STR_EFFECT_MOVE_S_TO_R (RID_APP_START+629) -#define STR_EFFECT_MOVE_S_TO_LR (RID_APP_START+630) -#define STR_EFFECT_MOVE_S_TO_B (RID_APP_START+631) -#define STR_EFFECT_MOVE_S_TO_LL (RID_APP_START+632) - -#define STR_EFFECT_STRTCH (RID_APP_START+634) -#define STR_EFFECT_STRTCH_FROM_L (RID_APP_START+635) -#define STR_EFFECT_STRTCH_FROM_UL (RID_APP_START+636) -#define STR_EFFECT_STRTCH_FROM_T (RID_APP_START+637) -#define STR_EFFECT_STRTCH_FROM_UR (RID_APP_START+638) -#define STR_EFFECT_STRTCH_FROM_R (RID_APP_START+639) -#define STR_EFFECT_STRTCH_FROM_LR (RID_APP_START+640) -#define STR_EFFECT_STRTCH_FROM_B (RID_APP_START+641) -#define STR_EFFECT_STRTCH_FROM_LL (RID_APP_START+642) - -#define STR_EFFECT_STRTCH_ROTATE (RID_APP_START+643) -#define STR_EFFECT_STRTCH_HORIZONTAL (RID_APP_START+644) -#define STR_EFFECT_STRTCH_VERTICAL (RID_APP_START+645) -#define STR_EFFECT_ROTATE_HORIZONTAL (RID_APP_START+646) -#define STR_EFFECT_ROTATE_VERTICAL (RID_APP_START+647) - -#define STR_EFFECT_UNCOVER (RID_APP_START+650) -#define STR_EFFECT_UNCOVER_TO_L (RID_APP_START+651) -#define STR_EFFECT_UNCOVER_TO_UL (RID_APP_START+652) -#define STR_EFFECT_UNCOVER_TO_T (RID_APP_START+653) -#define STR_EFFECT_UNCOVER_TO_UR (RID_APP_START+654) -#define STR_EFFECT_UNCOVER_TO_R (RID_APP_START+655) -#define STR_EFFECT_UNCOVER_TO_LR (RID_APP_START+656) -#define STR_EFFECT_UNCOVER_TO_B (RID_APP_START+657) -#define STR_EFFECT_UNCOVER_TO_LL (RID_APP_START+658) - -#define STR_TWAIN_NO_SOURCE (RID_APP_START+670) -#define STR_UNDO_VECTORIZE (RID_APP_START+671) - -#define STR_AL_VERT_TITLE_TEXT_CHART (RID_APP_START+672) -#define STR_AL_VERT_TITLE_VERT_OUTLINE (RID_APP_START+673) +#define STR_EFFECT_DISCARD_SHORT (RID_APP_START+598) + +#define STR_EFFECT_DISCARD_FROM_UL (RID_APP_START+600) +#define STR_EFFECT_DISCARD_FROM_UR (RID_APP_START+601) +#define STR_EFFECT_DISCARD_FROM_LR (RID_APP_START+602) +#define STR_EFFECT_DISCARD_FROM_LL (RID_APP_START+603) +#define STR_EFFECT_DISCARD_S_FROM_L (RID_APP_START+604) +#define STR_EFFECT_DISCARD_S_FROM_UL (RID_APP_START+605) +#define STR_EFFECT_DISCARD_S_FROM_T (RID_APP_START+606) +#define STR_EFFECT_DISCARD_S_FROM_UR (RID_APP_START+607) +#define STR_EFFECT_DISCARD_S_FROM_R (RID_APP_START+608) +#define STR_EFFECT_DISCARD_S_FROM_LR (RID_APP_START+609) +#define STR_EFFECT_DISCARD_S_FROM_B (RID_APP_START+610) +#define STR_EFFECT_DISCARD_S_FROM_LL (RID_APP_START+611) +#define STR_EFFECT_VERTICAL_CHECKERBOARD (RID_APP_START+612) +#define STR_EFFECT_HORIZONTAL_CHECKERBOARD (RID_APP_START+613) + +#define STR_EFFECT_MOVE_TO_UL (RID_APP_START+620) +#define STR_EFFECT_MOVE_TO_UR (RID_APP_START+621) +#define STR_EFFECT_MOVE_TO_LR (RID_APP_START+622) +#define STR_EFFECT_MOVE_TO_LL (RID_APP_START+623) +#define STR_EFFECT_MOVE_S_TO_L (RID_APP_START+625) +#define STR_EFFECT_MOVE_S_TO_UL (RID_APP_START+626) +#define STR_EFFECT_MOVE_S_TO_T (RID_APP_START+627) +#define STR_EFFECT_MOVE_S_TO_UR (RID_APP_START+628) +#define STR_EFFECT_MOVE_S_TO_R (RID_APP_START+629) +#define STR_EFFECT_MOVE_S_TO_LR (RID_APP_START+630) +#define STR_EFFECT_MOVE_S_TO_B (RID_APP_START+631) +#define STR_EFFECT_MOVE_S_TO_LL (RID_APP_START+632) + +#define STR_EFFECT_STRTCH (RID_APP_START+634) +#define STR_EFFECT_STRTCH_FROM_L (RID_APP_START+635) +#define STR_EFFECT_STRTCH_FROM_UL (RID_APP_START+636) +#define STR_EFFECT_STRTCH_FROM_T (RID_APP_START+637) +#define STR_EFFECT_STRTCH_FROM_UR (RID_APP_START+638) +#define STR_EFFECT_STRTCH_FROM_R (RID_APP_START+639) +#define STR_EFFECT_STRTCH_FROM_LR (RID_APP_START+640) +#define STR_EFFECT_STRTCH_FROM_B (RID_APP_START+641) +#define STR_EFFECT_STRTCH_FROM_LL (RID_APP_START+642) + +#define STR_EFFECT_STRTCH_ROTATE (RID_APP_START+643) +#define STR_EFFECT_STRTCH_HORIZONTAL (RID_APP_START+644) +#define STR_EFFECT_STRTCH_VERTICAL (RID_APP_START+645) +#define STR_EFFECT_ROTATE_HORIZONTAL (RID_APP_START+646) +#define STR_EFFECT_ROTATE_VERTICAL (RID_APP_START+647) + +#define STR_EFFECT_UNCOVER (RID_APP_START+650) +#define STR_EFFECT_UNCOVER_TO_L (RID_APP_START+651) +#define STR_EFFECT_UNCOVER_TO_UL (RID_APP_START+652) +#define STR_EFFECT_UNCOVER_TO_T (RID_APP_START+653) +#define STR_EFFECT_UNCOVER_TO_UR (RID_APP_START+654) +#define STR_EFFECT_UNCOVER_TO_R (RID_APP_START+655) +#define STR_EFFECT_UNCOVER_TO_LR (RID_APP_START+656) +#define STR_EFFECT_UNCOVER_TO_B (RID_APP_START+657) +#define STR_EFFECT_UNCOVER_TO_LL (RID_APP_START+658) + +#define STR_TWAIN_NO_SOURCE (RID_APP_START+670) +#define STR_UNDO_VECTORIZE (RID_APP_START+671) + +#define STR_AL_VERT_TITLE_TEXT_CHART (RID_APP_START+672) +#define STR_AL_VERT_TITLE_VERT_OUTLINE (RID_APP_START+673) #define STR_AL_TITLE_VERT_OUTLINE (RID_APP_START+674) #define STR_AL_TITLE_VERT_OUTLINE_CLIPART (RID_APP_START+675) -#define STR_HTMLEXP_DEFAULT_EXTENSION (RID_APP_START+680) +#define STR_HTMLEXP_DEFAULT_EXTENSION (RID_APP_START+680) -#define STR_SET_BACKGROUND_PICTURE (RID_APP_START+681) +#define STR_SET_BACKGROUND_PICTURE (RID_APP_START+681) #define STR_DESC_RENAMESLIDE (RID_APP_START+682) #define STR_TITLE_RENAMESLIDE (RID_APP_START+683) -#define STR_PLACEHOLDER_DESCRIPTION_TITLE (RID_APP_START+684) -#define STR_PLACEHOLDER_DESCRIPTION_OUTLINE (RID_APP_START+685) -#define STR_PLACEHOLDER_DESCRIPTION_FOOTER (RID_APP_START+686) -#define STR_PLACEHOLDER_DESCRIPTION_HEADER (RID_APP_START+687) -#define STR_PLACEHOLDER_DESCRIPTION_DATETIME (RID_APP_START+688) -#define STR_PLACEHOLDER_DESCRIPTION_NUMBER (RID_APP_START+689) -#define STR_PLACEHOLDER_DESCRIPTION_SLIDE (RID_APP_START+690) -#define STR_PLACEHOLDER_DESCRIPTION_NOTES (RID_APP_START+691) +#define STR_PLACEHOLDER_DESCRIPTION_TITLE (RID_APP_START+684) +#define STR_PLACEHOLDER_DESCRIPTION_OUTLINE (RID_APP_START+685) +#define STR_PLACEHOLDER_DESCRIPTION_FOOTER (RID_APP_START+686) +#define STR_PLACEHOLDER_DESCRIPTION_HEADER (RID_APP_START+687) +#define STR_PLACEHOLDER_DESCRIPTION_DATETIME (RID_APP_START+688) +#define STR_PLACEHOLDER_DESCRIPTION_NUMBER (RID_APP_START+689) +#define STR_PLACEHOLDER_DESCRIPTION_SLIDE (RID_APP_START+690) +#define STR_PLACEHOLDER_DESCRIPTION_NOTES (RID_APP_START+691) -#define STR_FIELD_PLACEHOLDER_HEADER (RID_APP_START+692) -#define STR_FIELD_PLACEHOLDER_FOOTER (RID_APP_START+693) -#define STR_FIELD_PLACEHOLDER_DATETIME (RID_APP_START+694) -#define STR_FIELD_PLACEHOLDER_NUMBER (RID_APP_START+695) +#define STR_FIELD_PLACEHOLDER_HEADER (RID_APP_START+692) +#define STR_FIELD_PLACEHOLDER_FOOTER (RID_APP_START+693) +#define STR_FIELD_PLACEHOLDER_DATETIME (RID_APP_START+694) +#define STR_FIELD_PLACEHOLDER_NUMBER (RID_APP_START+695) #define STR_UNDO_HANGULHANJACONVERSION (RID_APP_START+696) -#define STR_FIELD_PLACEHOLDER_COUNT (RID_APP_START+697) +#define STR_FIELD_PLACEHOLDER_COUNT (RID_APP_START+697) #define STR_LEFT_PANE_DRAW_TITLE (RID_APP_START+700) #define STR_LEFT_PANE_IMPRESS_TITLE (RID_APP_START+701) @@ -491,21 +491,21 @@ #define STR_TASKPANEL_NOT_AVAILABLE_SUBSTITUTION (RID_APP_START+711) #define STR_TASKPANEL_PREPARING_PREVIEW_SUBSTITUTION (RID_APP_START+712) #define STR_TASKPANEL_LAYOUT_MENU_TITLE (RID_APP_START+713) -#define STR_RESTORE_DRAW_MODE (RID_APP_START+714) +#define STR_RESTORE_DRAW_MODE (RID_APP_START+714) #define STR_GRAPHICS_STYLE_FAMILY (RID_APP_START+715) -#define STR_TITLE_SAVE_AS_PICTURE (RID_APP_START+716) -#define STR_CELL_STYLE_FAMILY (RID_APP_START+717) +#define STR_TITLE_SAVE_AS_PICTURE (RID_APP_START+716) +#define STR_CELL_STYLE_FAMILY (RID_APP_START+717) #define STR_NAVIGATOR_SHOW_NAMED_SHAPES (RID_APP_START+718) #define STR_NAVIGATOR_SHOW_ALL_SHAPES (RID_APP_START+719) #define STR_NAVIGATOR_SHAPE_BASE_NAME (RID_APP_START+720) -#define STR_RESET_LAYOUT (RID_APP_START+721) -#define STR_INSERT_TABLE (RID_APP_START+722) -#define STR_INSERT_CHART (RID_APP_START+723) -#define STR_INSERT_PICTURE (RID_APP_START+724) -#define STR_INSERT_MOVIE (RID_APP_START+725) +#define STR_RESET_LAYOUT (RID_APP_START+721) +#define STR_INSERT_TABLE (RID_APP_START+722) +#define STR_INSERT_CHART (RID_APP_START+723) +#define STR_INSERT_PICTURE (RID_APP_START+724) +#define STR_INSERT_MOVIE (RID_APP_START+725) /****************************************************************************** * The ids in glob.hrc start at RID_APP_START+750! diff --git a/sd/source/ui/inc/tabtempl.hrc b/sd/source/ui/inc/tabtempl.hrc index 19fd9105b318..898140703093 100644 --- a/sd/source/ui/inc/tabtempl.hrc +++ b/sd/source/ui/inc/tabtempl.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,6 +25,6 @@ * ************************************************************************/ #include <sfx2/sfx.hrc> -/* #define TAB_TEMPLATE RID_APP_START+??? */ -#define TAB_TEMPLATE 637 +/* #define TAB_TEMPLATE RID_APP_START+??? */ +#define TAB_TEMPLATE 637 #define TAB_CONTROL 1 diff --git a/sd/source/ui/inc/tabtempl.hxx b/sd/source/ui/inc/tabtempl.hxx index 1b6b3f4aa373..5311d4232d95 100644 --- a/sd/source/ui/inc/tabtempl.hxx +++ b/sd/source/ui/inc/tabtempl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,26 +51,26 @@ class XLineEndList; class SdTabTemplateDlg : public SfxStyleDialog { private: - const SfxObjectShell& rDocShell; - SdrView* pSdrView; + const SfxObjectShell& rDocShell; + SdrView* pSdrView; - XColorTable* pColorTab; - XGradientList* pGradientList; - XHatchList* pHatchingList; - XBitmapList* pBitmapList; - XDashList* pDashList; - XLineEndList* pLineEndList; + XColorTable* pColorTab; + XGradientList* pGradientList; + XHatchList* pHatchingList; + XBitmapList* pBitmapList; + XDashList* pDashList; + XLineEndList* pLineEndList; - USHORT nPageType; - USHORT nDlgType; - USHORT nPos; - ChangeType nColorTableState; - ChangeType nBitmapListState; - ChangeType nGradientListState; - ChangeType nHatchingListState; + USHORT nPageType; + USHORT nDlgType; + USHORT nPos; + ChangeType nColorTableState; + ChangeType nBitmapListState; + ChangeType nGradientListState; + ChangeType nHatchingListState; - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); - virtual const SfxItemSet* GetRefreshedSet(); + virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual const SfxItemSet* GetRefreshedSet(); public: SdTabTemplateDlg( Window* pParent, diff --git a/sd/source/ui/inc/taskpane/ControlContainer.hxx b/sd/source/ui/inc/taskpane/ControlContainer.hxx index d14dd1418f44..65e13de8ebc5 100644 --- a/sd/source/ui/inc/taskpane/ControlContainer.hxx +++ b/sd/source/ui/inc/taskpane/ControlContainer.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx b/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx index 1788557196ce..7f0c9c5f65d7 100644 --- a/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx +++ b/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ public: /** This interface has to be implemented by windows that want to be - layouted by a SubToolPanel or ScrollablePanel object. + layouted by a SubToolPanel or ScrollablePanel object. */ class ILayoutableWindow { @@ -80,10 +80,10 @@ public: /** Return wether the window is generally resizable. When used by a VerticalLayouter then the width will always be resized and the return value of this method determines whether the height - may be modified as well. + may be modified as well. */ virtual bool IsResizable (void) = 0; - + /** Return the window so that its size and position can be set. @return Returns the window which is layouted or NULL to indicate @@ -93,7 +93,7 @@ public: /** Return the minimal width of the window. */ - virtual sal_Int32 GetMinimumWidth (void) = 0; + virtual sal_Int32 GetMinimumWidth (void) = 0; }; diff --git a/sd/source/ui/inc/taskpane/PanelId.hxx b/sd/source/ui/inc/taskpane/PanelId.hxx index 56576c36959c..204e0f5069cd 100644 --- a/sd/source/ui/inc/taskpane/PanelId.hxx +++ b/sd/source/ui/inc/taskpane/PanelId.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER 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/sd/source/ui/inc/taskpane/ScrollPanel.hxx b/sd/source/ui/inc/taskpane/ScrollPanel.hxx index 92186cbc2529..7ceb19131f4a 100644 --- a/sd/source/ui/inc/taskpane/ScrollPanel.hxx +++ b/sd/source/ui/inc/taskpane/ScrollPanel.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,7 +79,7 @@ public: title bar as children is returned. */ TitledControl* AddControl ( - ::std::auto_ptr<TreeNode> pControl, + ::std::auto_ptr<TreeNode> pControl, const String& rTitle, ULONG nHelpId); @@ -126,7 +126,7 @@ public: @param pWindow This window is used to translate the given coordinates into ones that are relative to the scroll panel. - + */ void MakeRectangleVisible ( Rectangle& aRectangle, diff --git a/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx b/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx index f79d5d4f4324..efc1c2fe7945 100644 --- a/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx +++ b/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,7 +72,7 @@ public: virtual void Resize (void); static SlideSorterCacheDisplay* Instance (const SdDrawDocument* pDocument); - + void SetPageCount (sal_Int32 nPageCount); enum PageStatus { NONE, @@ -192,10 +192,10 @@ void SscdSetUpToDate (const SdrPage* pPage, bool bUpToDate) #else -#define SSCD_SET_REQUEST_CLASS(Page,RequestClass) -#define SSCD_SET_STATUS(RequestData,Status) -#define SSCD_SET_VISIBILITY(Model,Index,Visible) -#define SSCD_SET_UPTODATE(Page,UpToDate) +#define SSCD_SET_REQUEST_CLASS(Page,RequestClass) +#define SSCD_SET_STATUS(RequestData,Status) +#define SSCD_SET_VISIBILITY(Model,Index,Visible) +#define SSCD_SET_UPTODATE(Page,UpToDate) #endif diff --git a/sd/source/ui/inc/taskpane/SubToolPanel.hxx b/sd/source/ui/inc/taskpane/SubToolPanel.hxx index 46063086bfa3..dd25f45adc24 100644 --- a/sd/source/ui/inc/taskpane/SubToolPanel.hxx +++ b/sd/source/ui/inc/taskpane/SubToolPanel.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx b/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx index cd4f2a8c5f59..12f1d163f14a 100644 --- a/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx +++ b/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx index 2c3ca8a96a91..75d2d66e3641 100644 --- a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx +++ b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -84,7 +84,7 @@ public: /** Return the joined minimum width of all children, i.e. the largest of the minimum widths. */ - virtual sal_Int32 GetMinimumWidth (void); + virtual sal_Int32 GetMinimumWidth (void); /** The default implementaion always returns <FALSE/> */ @@ -94,7 +94,7 @@ public: called node has to be changed, e.g. when the layout menu shows more or less items than before. As a typical result the node will layout and resize its children according to their size requirements. - + Please remember that the size of the children can be changed in the first place because scroll bars can give a node the space it needs. @@ -157,7 +157,7 @@ public: The accessible parent of the accessible object to create. It is not necessaryly the accessible object of the parent window of GetWindow(). - + */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> CreateAccessibleObject ( @@ -180,7 +180,7 @@ public: void FireStateChangeEvent ( TreeNodeStateChangeEventId eEventId, TreeNode* pChild = NULL) const; - + protected: ::std::auto_ptr<ControlContainer> mpControlContainer; diff --git a/sd/source/ui/inc/taskpane/TitleBar.hxx b/sd/source/ui/inc/taskpane/TitleBar.hxx index 052fd39f3b4c..afa332fa739c 100644 --- a/sd/source/ui/inc/taskpane/TitleBar.hxx +++ b/sd/source/ui/inc/taskpane/TitleBar.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/sd/source/ui/inc/taskpane/TitledControl.hxx b/sd/source/ui/inc/taskpane/TitledControl.hxx index 134ea745bf42..35902469f6d6 100644 --- a/sd/source/ui/inc/taskpane/TitledControl.hxx +++ b/sd/source/ui/inc/taskpane/TitledControl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 TitledControl { public: typedef ::boost::function1<void, TitledControl&> ClickHandler; - + /** Create a new descriptor for the given control. @param pParent The parent window of the new descriptor. @@ -69,11 +69,11 @@ public: @param eType Type of the title bar. This specifies how the title bar will be formated. For more information see TitleBar. - + */ TitledControl ( TreeNode* pParent, - ::std::auto_ptr<TreeNode> pControl, + ::std::auto_ptr<TreeNode> pControl, const String& rTitle, const ClickHandler& rClickHandler, TitleBar::TitleBarType eType); @@ -146,7 +146,7 @@ private: const TitledControl& aDescriptor); void UpdateStates (void); - + DECL_LINK(WindowEventListener, VclSimpleEvent*); }; diff --git a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx index fc0aaa2f2c17..2933f034a22f 100644 --- a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx +++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.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 @@ -76,7 +76,7 @@ public: SFX_DECL_INTERFACE(SD_IF_SDTOOLPANELSHELL) ToolPanelViewShell ( - SfxViewFrame* pFrame, + SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, ::Window* pParentWindow, FrameView* pFrameView); @@ -93,8 +93,8 @@ public: virtual void KeyInput (const KeyEvent& rEvent); using sd::ViewShell::KeyInput; - virtual SdPage* GetActualPage (void); - virtual SdPage* getCurrentPage (void) const; + virtual SdPage* GetActualPage (void); + virtual SdPage* getCurrentPage (void) const; void Execute (SfxRequest& rRequest); void GetState (SfxItemSet& rItemSet); diff --git a/sd/source/ui/inc/tbx_ww.hrc b/sd/source/ui/inc/tbx_ww.hrc index 0189eecf2739..efcb657b1357 100644 --- a/sd/source/ui/inc/tbx_ww.hrc +++ b/sd/source/ui/inc/tbx_ww.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/sd/source/ui/inc/tbx_ww.hxx b/sd/source/ui/inc/tbx_ww.hxx index 434551e08825..ba170322d55e 100644 --- a/sd/source/ui/inc/tbx_ww.hxx +++ b/sd/source/ui/inc/tbx_ww.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ class SdPopupWindowTbx : public SfxPopupWindow { private: - SfxToolBoxManager aTbx; + SfxToolBoxManager aTbx; SdResId aSdResIdWin; SdResId aSdResIdTbx; - WindowAlign eTbxAlign; - Link aSelectLink; + WindowAlign eTbxAlign; + Link aSelectLink; DECL_LINK( TbxSelectHdl, ToolBox * ); @@ -56,8 +56,8 @@ public: virtual void PopupModeEnd(); - void StartSelection() { aTbx.GetToolBox().StartSelection(); } - void Update(); + void StartSelection() { aTbx.GetToolBox().StartSelection(); } + void Update(); private: @@ -72,7 +72,7 @@ private: class SdTbxControl : public SfxToolBoxControl { private: - BOOL IsCheckable( USHORT nSId ); + BOOL IsCheckable( USHORT nSId ); public: SFX_DECL_TOOLBOX_CONTROL(); @@ -80,12 +80,12 @@ public: SdTbxControl(USHORT nSlotId, USHORT nId, ToolBox& rTbx ); ~SdTbxControl() {} - virtual SfxPopupWindowType GetPopupWindowType() const; - virtual SfxPopupWindow* CreatePopupWindow(); + virtual SfxPopupWindowType GetPopupWindowType() const; + virtual SfxPopupWindow* CreatePopupWindow(); virtual void StateChanged( USHORT nSId, SfxItemState eState, const SfxPoolItem* pState ); }; -#endif // _SD_TBX_WW_HXX +#endif // _SD_TBX_WW_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/tmplctrl.hxx b/sd/source/ui/inc/tmplctrl.hxx index 254247103310..109ab4eb98d7 100644 --- a/sd/source/ui/inc/tmplctrl.hxx +++ b/sd/source/ui/inc/tmplctrl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ public: SdTemplateControl( USHORT nSlotId, USHORT nId, StatusBar& rStb ); ~SdTemplateControl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void Paint( const UserDrawEvent& rEvt ); SFX_DECL_STATUSBAR_CONTROL(); diff --git a/sd/source/ui/inc/tools/AsynchronousCall.hxx b/sd/source/ui/inc/tools/AsynchronousCall.hxx index 3151d7c9540a..55f82a6924f8 100644 --- a/sd/source/ui/inc/tools/AsynchronousCall.hxx +++ b/sd/source/ui/inc/tools/AsynchronousCall.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace sd { namespace tools { objects can be used. b) When more than one function objects are posted to be executed later then the pending ones are erased and only the last one will actually be - executed. - + executed. + Use this class like this: aInstanceOfAsynchronousCall.Post( ::boost::bind( @@ -59,7 +59,7 @@ public: one (semantical) type of call. */ AsynchronousCall (void); - + ~AsynchronousCall (void); /** Post a function object that is to be executed asynchronously. When diff --git a/sd/source/ui/inc/tools/AsynchronousTask.hxx b/sd/source/ui/inc/tools/AsynchronousTask.hxx index f27508cd278a..a377d5e3f048 100644 --- a/sd/source/ui/inc/tools/AsynchronousTask.hxx +++ b/sd/source/ui/inc/tools/AsynchronousTask.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ #ifndef SD_ASYNCHRONOUS_TASK_HXX #define SD_ASYNCHRONOUS_TASK_HXX - + namespace sd { namespace tools { /** Interface for the asynchronous execution of a task. This interface diff --git a/sd/source/ui/inc/tools/ConfigurationAccess.hxx b/sd/source/ui/inc/tools/ConfigurationAccess.hxx index 877a037a80a2..7f595c52cab0 100644 --- a/sd/source/ui/inc/tools/ConfigurationAccess.hxx +++ b/sd/source/ui/inc/tools/ConfigurationAccess.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,7 +50,7 @@ class ConfigurationAccess { public: enum WriteMode { READ_WRITE, READ_ONLY }; - + /** Create a new object to access the configuration entries below the given root. @param rsRootName @@ -106,7 +106,7 @@ public: const ::rtl::OUString&, const std::vector<css::uno::Any>&) > Functor; - /** Execute a functor for all elements of the given container. + /** Execute a functor for all elements of the given container. @param rxContainer The container is a XNameAccess to a list of the configuration. This can be a node returned by GetConfigurationNode(). diff --git a/sd/source/ui/inc/tools/IconCache.hxx b/sd/source/ui/inc/tools/IconCache.hxx index 916ef47ff5d0..198ed208e25b 100644 --- a/sd/source/ui/inc/tools/IconCache.hxx +++ b/sd/source/ui/inc/tools/IconCache.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,7 +48,7 @@ class IconCache { public: /** The lifetime of the returned reference is limited to that of the sd - module. + module. */ static IconCache& Instance (void); diff --git a/sd/source/ui/inc/tools/IdleDetection.hxx b/sd/source/ui/inc/tools/IdleDetection.hxx index 357bb61a2000..9b6dc6d7c989 100644 --- a/sd/source/ui/inc/tools/IdleDetection.hxx +++ b/sd/source/ui/inc/tools/IdleDetection.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 <sal/types.h> class Window; - + namespace sd { namespace tools { /** Detect whether the system is idle and some time consuming operation may diff --git a/sd/source/ui/inc/tools/PropertySet.hxx b/sd/source/ui/inc/tools/PropertySet.hxx index fa85c4488ed3..282eeb6c0b83 100644 --- a/sd/source/ui/inc/tools/PropertySet.hxx +++ b/sd/source/ui/inc/tools/PropertySet.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,7 +50,7 @@ namespace { support constrained properties and thus does not support vetoable listeners. It does not support the optional property set info. - In order to use it you have to derive from this class and implement the + In order to use it you have to derive from this class and implement the GetPropertyValue() and SetPropertyValue() methods. */ class PropertySet @@ -68,7 +68,7 @@ public: virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo (void) throw(css::uno::RuntimeException); - + virtual void SAL_CALL setPropertyValue ( const rtl::OUString& rsPropertyName, const css::uno::Any& rsPropertyValue) @@ -77,12 +77,12 @@ public: css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException); - + virtual css::uno::Any SAL_CALL getPropertyValue (const rtl::OUString& rsPropertyName) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); - + virtual void SAL_CALL addPropertyChangeListener ( const rtl::OUString& rsPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener) diff --git a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx index a1715967e0a0..220a4e9c76b5 100644 --- a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx +++ b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,7 +74,7 @@ public: /** Add a resource to the container. The ownership of the resource is transferred to the container. The resource is destroyed when the container is destroyed, i.e. when the sd module is destroyed. - + When in doubt, use the shared_ptr variant of this method. */ void AddResource (::std::auto_ptr<SdGlobalResource> pResource); diff --git a/sd/source/ui/inc/tools/SlotStateListener.hxx b/sd/source/ui/inc/tools/SlotStateListener.hxx index 2bad729b6b8c..b2c90910b26f 100644 --- a/sd/source/ui/inc/tools/SlotStateListener.hxx +++ b/sd/source/ui/inc/tools/SlotStateListener.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ namespace sd { namespace tools { -typedef cppu::WeakComponentImplHelper1< +typedef cppu::WeakComponentImplHelper1< ::com::sun::star::frame::XStatusListener > SlotStateListenerInterfaceBase; @@ -96,7 +96,7 @@ public: @throws DisposedException */ void ObserveSlot (const ::rtl::OUString& rSlotName); - + //===== frame::XStatusListener ========================================== /** Called by slot state change broadcasters. In turn the callback is @@ -111,7 +111,7 @@ public: //===== lang::XEventListener ============================================ virtual void SAL_CALL - disposing(const com::sun::star::lang::EventObject& rEvent) + disposing(const com::sun::star::lang::EventObject& rEvent) throw(com::sun::star::uno::RuntimeException); protected: @@ -149,7 +149,7 @@ private: /** Return an XDispatch object for the given URL. */ - ::com::sun::star::uno::Reference<com::sun::star::frame::XDispatch> + ::com::sun::star::uno::Reference<com::sun::star::frame::XDispatch> GetDispatch ( const ::com::sun::star::util::URL& rURL) const; }; diff --git a/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx b/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx index d37aa44d4550..d2c3bf01eafa 100644 --- a/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx +++ b/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 AsynchronousTask; /** Execute an AsynchronousTask timer based, i.e. every nMillisecondsBetweenSteps milliseconds as much steps are executed as fit into a nMaxTimePerStep millisecond intervall. - + When a task is executed completely, i.e. HasNextStep() returns <FALSE/>, the TimerBasedTaskExecution destroys itself. This, of course, works only if the creating instance does not hold a shared_ptr to that object. @@ -72,7 +72,7 @@ public: exceptions. */ static void ReleaseTask (const ::boost::weak_ptr<TimerBasedTaskExecution>& rpTask); - + private: ::boost::shared_ptr<AsynchronousTask> mpTask; Timer maTimer; diff --git a/sd/source/ui/inc/tpaction.hrc b/sd/source/ui/inc/tpaction.hrc index e273b9cb573c..70bf2e1bf904 100644 --- a/sd/source/ui/inc/tpaction.hrc +++ b/sd/source/ui/inc/tpaction.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/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index 4d8ba7cf67a9..edf24a589f52 100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ class SdDrawDocument; class SdActionDlg : public SfxSingleTabDialog { private: - const SfxItemSet& rOutAttrs; + const SfxItemSet& rOutAttrs; public: @@ -74,31 +74,31 @@ public: class SdTPAction : public SfxTabPage { private: - FixedText aFtAction; // always visible - ListBox aLbAction; - - FixedText aFtTree; // jump destination controls - SdPageObjsTLB aLbTree; - SdPageObjsTLB aLbTreeDocument; - ListBox aLbOLEAction; + FixedText aFtAction; // always visible + ListBox aLbAction; + + FixedText aFtTree; // jump destination controls + SdPageObjsTLB aLbTree; + SdPageObjsTLB aLbTreeDocument; + ListBox aLbOLEAction; FixedLine aFlSeparator; - Edit aEdtSound; + Edit aEdtSound; Edit aEdtBookmark; Edit aEdtDocument; Edit aEdtProgram; Edit aEdtMacro; PushButton aBtnSearch; PushButton aBtnSeek; - - const SfxItemSet& rOutAttrs; - const ::sd::View* mpView; - SdDrawDocument* mpDoc; - XColorTable* pColTab; - - BOOL bTreeUpdated; - List* pCurrentActions; - String aLastFile; + + const SfxItemSet& rOutAttrs; + const ::sd::View* mpView; + SdDrawDocument* mpDoc; + XColorTable* pColTab; + + BOOL bTreeUpdated; + List* pCurrentActions; + String aLastFile; ::std::vector< long > aVerbVector; //------------------------------------ @@ -108,15 +108,15 @@ private: DECL_LINK( SelectTreeHdl, void * ); DECL_LINK( CheckFileHdl, void * ); - void UpdateTree(); - virtual void OpenFileDialog(); - ::com::sun::star::presentation::ClickAction GetActualClickAction(); - void SetActualClickAction( ::com::sun::star::presentation::ClickAction eCA ); - void SetActualAnimationEffect( ::com::sun::star::presentation::AnimationEffect eAE ); - void SetEditText( String const & rStr ); - String GetEditText( BOOL bURL = FALSE ); - USHORT GetClickActionSdResId( ::com::sun::star::presentation::ClickAction eCA ); - USHORT GetAnimationEffectSdResId( ::com::sun::star::presentation::AnimationEffect eAE ); + void UpdateTree(); + virtual void OpenFileDialog(); + ::com::sun::star::presentation::ClickAction GetActualClickAction(); + void SetActualClickAction( ::com::sun::star::presentation::ClickAction eCA ); + void SetActualAnimationEffect( ::com::sun::star::presentation::AnimationEffect eAE ); + void SetEditText( String const & rStr ); + String GetEditText( BOOL bURL = FALSE ); + USHORT GetClickActionSdResId( ::com::sun::star::presentation::ClickAction eCA ); + USHORT GetAnimationEffectSdResId( ::com::sun::star::presentation::AnimationEffect eAE ); public: SdTPAction( Window* pParent, const SfxItemSet& rInAttrs ); @@ -132,12 +132,12 @@ public: void Construct(); - void SetView( const ::sd::View* pSdView ); + void SetView( const ::sd::View* pSdView ); using TabPage::ActivatePage; using TabPage::DeactivatePage; }; -#endif // _SD_TPACTION_HXX +#endif // _SD_TPACTION_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/tpoption.hrc b/sd/source/ui/inc/tpoption.hrc index bcb5169d13f6..dc51afb6bf35 100644 --- a/sd/source/ui/inc/tpoption.hrc +++ b/sd/source/ui/inc/tpoption.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/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx index ca37ab084829..02955342cff8 100644 --- a/sd/source/ui/inc/tpoption.hxx +++ b/sd/source/ui/inc/tpoption.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,7 +50,7 @@ public: SdTpOptionsSnap( Window* pParent, const SfxItemSet& rInAttrs ); ~SdTpOptionsSnap(); - static SfxTabPage* Create( Window*, const SfxItemSet& ); + static SfxTabPage* Create( Window*, const SfxItemSet& ); virtual BOOL FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); @@ -67,16 +67,16 @@ class SdTpOptionsContents : public SfxTabPage private: FixedLine aGrpDisplay; CheckBox aCbxRuler; - CheckBox aCbxDragStripes; - CheckBox aCbxHandlesBezier; - CheckBox aCbxMoveOutline; + CheckBox aCbxDragStripes; + CheckBox aCbxHandlesBezier; + CheckBox aCbxMoveOutline; public: SdTpOptionsContents( Window* pParent, const SfxItemSet& rInAttrs ); ~SdTpOptionsContents(); - static SfxTabPage* Create( Window*, const SfxItemSet& ); + static SfxTabPage* Create( Window*, const SfxItemSet& ); virtual BOOL FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); }; @@ -109,7 +109,7 @@ private: FixedText aTxtMetric; ListBox aLbMetric; FixedText aTxtTabstop; - MetricField aMtrFldTabstop; + MetricField aMtrFldTabstop; CheckBox aCbxStartWithActualPage; FixedLine aGrpStartWithActualPage; @@ -126,25 +126,25 @@ private: FixedText aFtEquivalent; FixedText aFtPageWidth; - FixedInfo aFiInfo1; + FixedInfo aFiInfo1; MetricField aMtrFldOriginalWidth; FixedText aFtPageHeight; - FixedInfo aFiInfo2; + FixedInfo aFiInfo2; MetricField aMtrFldOriginalHeight; MetricField aMtrFldInfo1; - MetricField aMtrFldInfo2; + MetricField aMtrFldInfo2; UINT32 nWidth; - UINT32 nHeight; - String aInfo1; - String aInfo2; + UINT32 nHeight; + String aInfo1; + String aInfo2; - SfxMapUnit ePoolUnit; + SfxMapUnit ePoolUnit; - String GetScale( INT32 nX, INT32 nY ); - BOOL SetScale( const String& aScale, INT32& rX, INT32& rY ); + String GetScale( INT32 nX, INT32 nY ); + BOOL SetScale( const String& aScale, INT32& rX, INT32& rY ); DECL_LINK( ModifyScaleHdl, void * ); DECL_LINK( ModifyOriginalScaleHdl, void * ); @@ -158,13 +158,13 @@ private: protected: virtual void ActivatePage( const SfxItemSet& rSet ); - virtual int DeactivatePage( SfxItemSet* pSet ); + virtual int DeactivatePage( SfxItemSet* pSet ); public: SdTpOptionsMisc( Window* pParent, const SfxItemSet& rInAttrs ); ~SdTpOptionsMisc(); - static SfxTabPage* Create( Window*, const SfxItemSet& ); + static SfxTabPage* Create( Window*, const SfxItemSet& ); virtual BOOL FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); @@ -179,7 +179,7 @@ public: <member>SetDrawMode()</member> method more than once. */ void SetImpressMode (void); - virtual void PageCreated (SfxAllItemSet aSet); + virtual void PageCreated (SfxAllItemSet aSet); using TabPage::ActivatePage; using TabPage::DeactivatePage; diff --git a/sd/source/ui/inc/unchss.hxx b/sd/source/ui/inc/unchss.hxx index 481087783b65..6cd3a1331cb6 100644 --- a/sd/source/ui/inc/unchss.hxx +++ b/sd/source/ui/inc/unchss.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/sd/source/ui/inc/undoback.hxx b/sd/source/ui/inc/undoback.hxx index 11ca547c79c6..0021a35ecdc4 100644 --- a/sd/source/ui/inc/undoback.hxx +++ b/sd/source/ui/inc/undoback.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,15 +45,15 @@ private: SdPage& mrPage; SfxItemSet* mpItemSet; - + void ImplRestoreBackgroundObj(); public: - + TYPEINFO(); - - SdBackgroundObjUndoAction( - SdDrawDocument& rDoc, + + SdBackgroundObjUndoAction( + SdDrawDocument& rDoc, SdPage& rPage, const SfxItemSet& rItenSet); virtual ~SdBackgroundObjUndoAction(); diff --git a/sd/source/ui/inc/undoheaderfooter.hxx b/sd/source/ui/inc/undoheaderfooter.hxx index 90f5d7747f75..02756e2be934 100644 --- a/sd/source/ui/inc/undoheaderfooter.hxx +++ b/sd/source/ui/inc/undoheaderfooter.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,8 +42,8 @@ class SD_DLLPUBLIC SdHeaderFooterUndoAction : public SdUndoAction { SdPage* mpPage; - const sd::HeaderFooterSettings maOldSettings; - const sd::HeaderFooterSettings maNewSettings; + const sd::HeaderFooterSettings maOldSettings; + const sd::HeaderFooterSettings maNewSettings; public: TYPEINFO(); @@ -54,6 +54,6 @@ public: virtual void Redo(); }; -#endif // _SD_UNDOHEADERFOOTER_HXX +#endif // _SD_UNDOHEADERFOOTER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/undolayer.hxx b/sd/source/ui/inc/undolayer.hxx index f076d432ebe3..09f324b6ea72 100644 --- a/sd/source/ui/inc/undolayer.hxx +++ b/sd/source/ui/inc/undolayer.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ class SdrLayer; class SdLayerModifyUndoAction : public SdUndoAction { - + public: TYPEINFO(); SdLayerModifyUndoAction( SdDrawDocument* _pDoc, SdrLayer* pLayer, @@ -64,6 +64,6 @@ private: bool mbNewIsPrintable; }; -#endif // _SD_UNDOLAYER_HXX +#endif // _SD_UNDOLAYER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/undopage.hxx b/sd/source/ui/inc/undopage.hxx index 49d1505b1fa1..32bcb7241219 100644 --- a/sd/source/ui/inc/undopage.hxx +++ b/sd/source/ui/inc/undopage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,45 +65,45 @@ class SdPageFormatUndoAction : public SdUndoAction public: TYPEINFO(); - SdPageFormatUndoAction( SdDrawDocument* pDoc, - SdPage* pThePage, - const Size& rOldSz, - INT32 nOldLft, - INT32 nOldRgt, - INT32 nOldUpr, - INT32 nOldLwr, + SdPageFormatUndoAction( SdDrawDocument* pDoc, + SdPage* pThePage, + const Size& rOldSz, + INT32 nOldLft, + INT32 nOldRgt, + INT32 nOldUpr, + INT32 nOldLwr, BOOL bOldScl, Orientation eOldOrient, - USHORT nOPaperBin, - BOOL bOFullSize, + USHORT nOPaperBin, + BOOL bOFullSize, const Size& rNewSz, - INT32 nNewLft, - INT32 nNewRgt, - INT32 nNewUpr, + INT32 nNewLft, + INT32 nNewRgt, + INT32 nNewUpr, INT32 nNewLwr, BOOL bNewScl, Orientation eNewOrient, - USHORT nNPaperBin, - BOOL bNFullSize + USHORT nNPaperBin, + BOOL bNFullSize ) : SdUndoAction(pDoc), - mpPage (pThePage), - maOldSize (rOldSz), - mnOldLeft (nOldLft), - mnOldRight (nOldRgt), - mnOldUpper (nOldUpr), - mnOldLower (nOldLwr), + mpPage (pThePage), + maOldSize (rOldSz), + mnOldLeft (nOldLft), + mnOldRight (nOldRgt), + mnOldUpper (nOldUpr), + mnOldLower (nOldLwr), mbOldScale (bOldScl), meOldOrientation(eOldOrient), mnOldPaperBin (nOPaperBin), mbOldFullSize (bOFullSize), - maNewSize (rNewSz), - mnNewLeft (nNewLft), - mnNewRight (nNewRgt), - mnNewUpper (nNewUpr), + maNewSize (rNewSz), + mnNewLeft (nNewLft), + mnNewRight (nNewRgt), + mnNewUpper (nNewUpr), mnNewLower (nNewLwr), mbNewScale (bNewScl), meNewOrientation(eNewOrient), @@ -121,12 +121,12 @@ public: class SdPageLRUndoAction : public SdUndoAction { - SdPage* mpPage; + SdPage* mpPage; - INT32 mnOldLeft; - INT32 mnOldRight; - INT32 mnNewLeft; - INT32 mnNewRight; + INT32 mnOldLeft; + INT32 mnOldRight; + INT32 mnNewLeft; + INT32 mnNewRight; public: TYPEINFO(); @@ -134,11 +134,11 @@ public: INT32 nOldLft, INT32 nOldRgt, INT32 nNewLft, INT32 nNewRgt ) : SdUndoAction(pDoc), - mpPage (pThePage), - mnOldLeft (nOldLft), - mnOldRight (nOldRgt), - mnNewLeft (nNewLft), - mnNewRight (nNewRgt) + mpPage (pThePage), + mnOldLeft (nOldLft), + mnOldRight (nOldRgt), + mnNewLeft (nNewLft), + mnNewRight (nNewRgt) {} virtual ~SdPageLRUndoAction(); @@ -150,12 +150,12 @@ public: class SdPageULUndoAction : public SdUndoAction { - SdPage* mpPage; + SdPage* mpPage; - INT32 mnOldUpper; - INT32 mnOldLower; - INT32 mnNewUpper; - INT32 mnNewLower; + INT32 mnOldUpper; + INT32 mnOldLower; + INT32 mnNewUpper; + INT32 mnNewLower; public: TYPEINFO(); @@ -163,11 +163,11 @@ public: INT32 nOldUpr, INT32 nOldLwr, INT32 nNewUpr, INT32 nNewLwr ) : SdUndoAction(pDoc), - mpPage (pThePage), - mnOldUpper (nOldUpr), - mnOldLower (nOldLwr), - mnNewUpper (nNewUpr), - mnNewLower (nNewLwr) + mpPage (pThePage), + mnOldUpper (nOldUpr), + mnOldLower (nOldLwr), + mnNewUpper (nNewUpr), + mnNewLower (nNewLwr) {} virtual ~SdPageULUndoAction(); @@ -177,6 +177,6 @@ public: -#endif // _SD_UNDOPAGE_HXX +#endif // _SD_UNDOPAGE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/unmodpg.hxx b/sd/source/ui/inc/unmodpg.hxx index 9540bf1c00a9..05aa0ce84d08 100644 --- a/sd/source/ui/inc/unmodpg.hxx +++ b/sd/source/ui/inc/unmodpg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ class SdPage; class ModifyPageUndoAction : public SdUndoAction { // #67720# - SfxUndoManager* mpManager; + SfxUndoManager* mpManager; SdPage* mpPage; String maOldName; @@ -55,13 +55,13 @@ class ModifyPageUndoAction : public SdUndoAction public: TYPEINFO(); ModifyPageUndoAction( - SfxUndoManager* pManager, // #67720# - SdDrawDocument* pTheDoc, - SdPage* pThePage, - String aTheNewName, - AutoLayout eTheNewAutoLayout, - BOOL bTheNewBckgrndVisible, - BOOL bTheNewBckgrndObjsVisible); + SfxUndoManager* pManager, // #67720# + SdDrawDocument* pTheDoc, + SdPage* pThePage, + String aTheNewName, + AutoLayout eTheNewAutoLayout, + BOOL bTheNewBckgrndVisible, + BOOL bTheNewBckgrndObjsVisible); virtual ~ModifyPageUndoAction(); virtual void Undo(); diff --git a/sd/source/ui/inc/unmovss.hxx b/sd/source/ui/inc/unmovss.hxx index 4299a07026db..6b02bf512295 100644 --- a/sd/source/ui/inc/unmovss.hxx +++ b/sd/source/ui/inc/unmovss.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,9 +37,9 @@ class SdDrawDocument; class SdMoveStyleSheetsUndoAction : public SdUndoAction { - SdStyleSheetVector maStyles; - std::vector< SdStyleSheetVector > maListOfChildLists; - bool mbMySheets; + SdStyleSheetVector maStyles; + std::vector< SdStyleSheetVector > maListOfChildLists; + bool mbMySheets; public: SdMoveStyleSheetsUndoAction(SdDrawDocument* pTheDoc, SdStyleSheetVector& rTheStyles, bool bInserted); diff --git a/sd/source/ui/inc/unoaprms.hxx b/sd/source/ui/inc/unoaprms.hxx index 7640be9ed6ed..3dd8129a5a37 100644 --- a/sd/source/ui/inc/unoaprms.hxx +++ b/sd/source/ui/inc/unoaprms.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,11 +43,11 @@ class SdrObject; class SdAnimationPrmsUndoAction : public SdUndoAction { - SdrObject* pObject; - BOOL bOldActive; - BOOL bNewActive; + SdrObject* pObject; + BOOL bOldActive; + BOOL bNewActive; BOOL bOldDimPrevious; - BOOL bNewDimPrevious; + BOOL bNewDimPrevious; BOOL bOldDimHide; BOOL bNewDimHide; BOOL bOldSoundOn; @@ -63,13 +63,13 @@ class SdAnimationPrmsUndoAction : public SdUndoAction ::com::sun::star::presentation::AnimationEffect eOldTextEffect; ::com::sun::star::presentation::AnimationEffect eNewTextEffect; ::com::sun::star::presentation::AnimationSpeed eOldSpeed; - ::com::sun::star::presentation::AnimationSpeed eNewSpeed; + ::com::sun::star::presentation::AnimationSpeed eNewSpeed; ::com::sun::star::presentation::AnimationEffect eOldSecondEffect; ::com::sun::star::presentation::AnimationEffect eNewSecondEffect; ::com::sun::star::presentation::AnimationSpeed eOldSecondSpeed; ::com::sun::star::presentation::AnimationSpeed eNewSecondSpeed; Color aOldDimColor; - Color aNewDimColor; + Color aNewDimColor; Color aOldBlueScreen; Color aNewBlueScreen; String aOldSoundFile; @@ -84,8 +84,8 @@ class SdAnimationPrmsUndoAction : public SdUndoAction BOOL bNewInvisibleInPres; USHORT nOldVerb; USHORT nNewVerb; - ULONG nOldPresOrder; - ULONG nNewPresOrder; + ULONG nOldPresOrder; + ULONG nNewPresOrder; BOOL bInfoCreated; @@ -93,8 +93,8 @@ public: TYPEINFO(); SdAnimationPrmsUndoAction(SdDrawDocument* pTheDoc, SdrObject* pObj, BOOL bCreated): - SdUndoAction (pTheDoc), - pObject (pObj), + SdUndoAction (pTheDoc), + pObject (pObj), bInfoCreated (bCreated) {} @@ -146,6 +146,6 @@ public: virtual void Redo(); }; -#endif // _SD_UNOAPRMS_HXX +#endif // _SD_UNOAPRMS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/unokywds.hxx b/sd/source/ui/inc/unokywds.hxx index ba508f7f3cb9..36e5c87d608a 100644 --- a/sd/source/ui/inc/unokywds.hxx +++ b/sd/source/ui/inc/unokywds.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -97,11 +97,11 @@ SD_CONSTASCII_ACTION( sUNO_SdLayerManager, "SdUnoLayerManager" ); // SdLayer SD_CONSTASCII_ACTION( sUNO_SdLayer, "SdUnoLayer" ); -SD_CONSTASCII_ACTION( sUNO_LayerName_background, "background" ); +SD_CONSTASCII_ACTION( sUNO_LayerName_background, "background" ); SD_CONSTASCII_ACTION( sUNO_LayerName_background_objects, "backgroundobjects" ); -SD_CONSTASCII_ACTION( sUNO_LayerName_layout, "layout" ); -SD_CONSTASCII_ACTION( sUNO_LayerName_controls, "controls" ); -SD_CONSTASCII_ACTION( sUNO_LayerName_measurelines, "measurelines" ); +SD_CONSTASCII_ACTION( sUNO_LayerName_layout, "layout" ); +SD_CONSTASCII_ACTION( sUNO_LayerName_controls, "controls" ); +SD_CONSTASCII_ACTION( sUNO_LayerName_measurelines, "measurelines" ); // SdXShape SD_CONSTASCII_ACTION( sUNO_shape_style, "Style" ); @@ -130,88 +130,88 @@ SD_CONSTASCII_ACTION( sUNO_Service_ImageMapCircleObject, UNO_PREFIX "image.Image SD_CONSTASCII_ACTION( sUNO_Service_ImageMapPolygonObject, UNO_PREFIX "image.ImageMapPolygonObject" ); // properties -SD_CONSTASCII_ACTION( sUNO_Prop_Background, "Background" ); -SD_CONSTASCII_ACTION( sUNO_Prop_ForbiddenCharacters, "ForbiddenCharacters" ); -SD_CONSTASCII_ACTION( sUNO_Prop_MapUnit, "MapUnit" ); -SD_CONSTASCII_ACTION( sUNO_Prop_VisibleArea, "VisibleArea" ); -SD_CONSTASCII_ACTION( sUNO_Prop_Aspect, "Aspect" ); -SD_CONSTASCII_ACTION( sUNO_Prop_TabStop, "TabStop" ); -SD_CONSTASCII_ACTION( sUNO_Prop_CharLocale, "CharLocale" ); -SD_CONSTASCII_ACTION( sUNO_Prop_AutomContFocus, "AutomaticControlFocus" ); -SD_CONSTASCII_ACTION( sUNO_Prop_ApplyFrmDsgnMode, "ApplyFormDesignMode" ); -SD_CONSTASCII_ACTION( sUNO_Prop_IsBackgroundVisible, "IsBackgroundVisible" ); -SD_CONSTASCII_ACTION( sUNO_Prop_IsBackgroundObjectsVisible, "IsBackgroundObjectsVisible" ); +SD_CONSTASCII_ACTION( sUNO_Prop_Background, "Background" ); +SD_CONSTASCII_ACTION( sUNO_Prop_ForbiddenCharacters, "ForbiddenCharacters" ); +SD_CONSTASCII_ACTION( sUNO_Prop_MapUnit, "MapUnit" ); +SD_CONSTASCII_ACTION( sUNO_Prop_VisibleArea, "VisibleArea" ); +SD_CONSTASCII_ACTION( sUNO_Prop_Aspect, "Aspect" ); +SD_CONSTASCII_ACTION( sUNO_Prop_TabStop, "TabStop" ); +SD_CONSTASCII_ACTION( sUNO_Prop_CharLocale, "CharLocale" ); +SD_CONSTASCII_ACTION( sUNO_Prop_AutomContFocus, "AutomaticControlFocus" ); +SD_CONSTASCII_ACTION( sUNO_Prop_ApplyFrmDsgnMode, "ApplyFormDesignMode" ); +SD_CONSTASCII_ACTION( sUNO_Prop_IsBackgroundVisible, "IsBackgroundVisible" ); +SD_CONSTASCII_ACTION( sUNO_Prop_IsBackgroundObjectsVisible, "IsBackgroundObjectsVisible" ); SD_CONSTASCII_ACTION( sUNO_Prop_UserDefinedAttributes, "UserDefinedAttributes" ); -SD_CONSTASCII_ACTION( sUNO_Prop_BookmarkURL, "BookmarkURL" ); +SD_CONSTASCII_ACTION( sUNO_Prop_BookmarkURL, "BookmarkURL" ); SD_CONSTASCII_ACTION( sUNO_Prop_RuntimeUID, "RuntimeUID" ); SD_CONSTASCII_ACTION( sUNO_Prop_HasValidSignatures, "HasValidSignatures" ); // view settings -SD_CONSTASCII_ACTION( sUNO_View_ViewId, "ViewId" ); -SD_CONSTASCII_ACTION( sUNO_View_SnapLinesDrawing, "SnapLinesDrawing" ); -SD_CONSTASCII_ACTION( sUNO_View_SnapLinesNotes, "SnapLinesNotes" ); -SD_CONSTASCII_ACTION( sUNO_View_SnapLinesHandout, "SnapLinesHandout" ); -SD_CONSTASCII_ACTION( sUNO_View_RulerIsVisible, "RulerIsVisible" ); -SD_CONSTASCII_ACTION( sUNO_View_PageKind, "PageKind" ); -SD_CONSTASCII_ACTION( sUNO_View_SelectedPage, "SelectedPage" ); -SD_CONSTASCII_ACTION( sUNO_View_IsLayerMode, "IsLayerMode" ); -SD_CONSTASCII_ACTION( sUNO_View_IsQuickEdit, "IsQuickEdit" ); -SD_CONSTASCII_ACTION( sUNO_View_IsBigHandles, "IsBigHandles" ); -SD_CONSTASCII_ACTION( sUNO_View_IsDoubleClickTextEdit, "IsDoubleClickTextEdit" ); -SD_CONSTASCII_ACTION( sUNO_View_IsClickChangeRotation, "IsClickChangeRotation" ); -SD_CONSTASCII_ACTION( sUNO_View_IsDragWithCopy, "IsDragWithCopy" ); -SD_CONSTASCII_ACTION( sUNO_View_SlidesPerRow, "SlidesPerRow" ); -SD_CONSTASCII_ACTION( sUNO_View_DrawMode, "DrawMode" ); -SD_CONSTASCII_ACTION( sUNO_View_PreviewDrawMode, "PreviewDrawMode" ); -SD_CONSTASCII_ACTION( sUNO_View_IsShowPreviewInPageMode, "IsShowPreviewInPageMode" ); -SD_CONSTASCII_ACTION( sUNO_View_IsShowPreviewInMasterPageMode, "IsShowPreviewInMasterPageMode" ); -SD_CONSTASCII_ACTION( sUNO_View_SetShowPreviewInOutlineMode, "SetShowPreviewInOutlineMode" ); -SD_CONSTASCII_ACTION( sUNO_View_EditModeStandard, "EditModeStandard" ); -SD_CONSTASCII_ACTION( sUNO_View_EditModeNotes, "EditModeNotes" ); -SD_CONSTASCII_ACTION( sUNO_View_EditModeHandout, "EditModeHandout" ); -SD_CONSTASCII_ACTION( sUNO_View_VisArea, "VisArea" ); - -SD_CONSTASCII_ACTION( sUNO_View_GridIsVisible, "GridIsVisible" ); -SD_CONSTASCII_ACTION( sUNO_View_GridIsFront, "GridIsFront" ); -SD_CONSTASCII_ACTION( sUNO_View_IsSnapToGrid, "IsSnapToGrid" ); -SD_CONSTASCII_ACTION( sUNO_View_IsSnapToPageMargins, "IsSnapToPageMargins" ); -SD_CONSTASCII_ACTION( sUNO_View_IsSnapToSnapLines, "IsSnapToSnapLines" ); -SD_CONSTASCII_ACTION( sUNO_View_IsSnapToObjectFrame, "IsSnapToObjectFrame" ); -SD_CONSTASCII_ACTION( sUNO_View_IsSnapToObjectPoints, "IsSnapToObjectPoints" ); -SD_CONSTASCII_ACTION( sUNO_View_IsSnapLinesVisible, "IsSnapLinesVisible" ); -SD_CONSTASCII_ACTION( sUNO_View_IsDragStripes, "IsDragStripes" ); -SD_CONSTASCII_ACTION( sUNO_View_IsPlusHandlesAlwaysVisible, "IsPlusHandlesAlwaysVisible" ); -SD_CONSTASCII_ACTION( sUNO_View_IsFrameDragSingles, "IsFrameDragSingles" ); -SD_CONSTASCII_ACTION( sUNO_View_IsMarkedHitMovesAlways, "IsMarkedHitMovesAlways" ); -SD_CONSTASCII_ACTION( sUNO_View_EliminatePolyPointLimitAngle, "EliminatePolyPointLimitAngle" ); -SD_CONSTASCII_ACTION( sUNO_View_IsEliminatePolyPoints, "IsEliminatePolyPoints" ); -SD_CONSTASCII_ACTION( sUNO_View_IsLineDraft, "IsLineDraft" ); -SD_CONSTASCII_ACTION( sUNO_View_IsFillDraft, "IsFillDraft" ); -SD_CONSTASCII_ACTION( sUNO_View_IsTextDraft, "IsTextDraft" ); -SD_CONSTASCII_ACTION( sUNO_View_IsGrafDraft, "IsGrafDraft" ); -SD_CONSTASCII_ACTION( sUNO_View_ActiveLayer, "ActiveLayer" ); -SD_CONSTASCII_ACTION( sUNO_View_NoAttribs, "NoAttribs" ); -SD_CONSTASCII_ACTION( sUNO_View_NoColors, "NoColors" ); -SD_CONSTASCII_ACTION( sUNO_View_GridCoarseWidth, "GridCoarseWidth" ); -SD_CONSTASCII_ACTION( sUNO_View_GridCoarseHeight, "GridCoarseHeight" ); -SD_CONSTASCII_ACTION( sUNO_View_GridFineWidth, "GridFineWidth" ); -SD_CONSTASCII_ACTION( sUNO_View_GridFineHeight, "GridFineHeight" ); -SD_CONSTASCII_ACTION( sUNO_View_IsAngleSnapEnabled, "IsAngleSnapEnabled" ); -SD_CONSTASCII_ACTION( sUNO_View_SnapAngle, "SnapAngle" ); -SD_CONSTASCII_ACTION( sUNO_View_GridSnapWidthXNumerator, "GridSnapWidthXNumerator" ); -SD_CONSTASCII_ACTION( sUNO_View_GridSnapWidthXDenominator, "GridSnapWidthXDenominator" ); -SD_CONSTASCII_ACTION( sUNO_View_GridSnapWidthYNumerator, "GridSnapWidthYNumerator" ); -SD_CONSTASCII_ACTION( sUNO_View_GridSnapWidthYDenominator, "GridSnapWidthYDenominator" ); -SD_CONSTASCII_ACTION( sUNO_View_VisibleLayers, "VisibleLayers" ); -SD_CONSTASCII_ACTION( sUNO_View_PrintableLayers, "PrintableLayers" ); -SD_CONSTASCII_ACTION( sUNO_View_LockedLayers, "LockedLayers" ); - -SD_CONSTASCII_ACTION( sUNO_View_VisibleAreaTop, "VisibleAreaTop" ); -SD_CONSTASCII_ACTION( sUNO_View_VisibleAreaLeft, "VisibleAreaLeft" ); -SD_CONSTASCII_ACTION( sUNO_View_VisibleAreaWidth, "VisibleAreaWidth" ); -SD_CONSTASCII_ACTION( sUNO_View_VisibleAreaHeight, "VisibleAreaHeight" ); - -SD_CONSTASCII_ACTION( sUNO_View_ZoomOnPage, "ZoomOnPage" ); +SD_CONSTASCII_ACTION( sUNO_View_ViewId, "ViewId" ); +SD_CONSTASCII_ACTION( sUNO_View_SnapLinesDrawing, "SnapLinesDrawing" ); +SD_CONSTASCII_ACTION( sUNO_View_SnapLinesNotes, "SnapLinesNotes" ); +SD_CONSTASCII_ACTION( sUNO_View_SnapLinesHandout, "SnapLinesHandout" ); +SD_CONSTASCII_ACTION( sUNO_View_RulerIsVisible, "RulerIsVisible" ); +SD_CONSTASCII_ACTION( sUNO_View_PageKind, "PageKind" ); +SD_CONSTASCII_ACTION( sUNO_View_SelectedPage, "SelectedPage" ); +SD_CONSTASCII_ACTION( sUNO_View_IsLayerMode, "IsLayerMode" ); +SD_CONSTASCII_ACTION( sUNO_View_IsQuickEdit, "IsQuickEdit" ); +SD_CONSTASCII_ACTION( sUNO_View_IsBigHandles, "IsBigHandles" ); +SD_CONSTASCII_ACTION( sUNO_View_IsDoubleClickTextEdit, "IsDoubleClickTextEdit" ); +SD_CONSTASCII_ACTION( sUNO_View_IsClickChangeRotation, "IsClickChangeRotation" ); +SD_CONSTASCII_ACTION( sUNO_View_IsDragWithCopy, "IsDragWithCopy" ); +SD_CONSTASCII_ACTION( sUNO_View_SlidesPerRow, "SlidesPerRow" ); +SD_CONSTASCII_ACTION( sUNO_View_DrawMode, "DrawMode" ); +SD_CONSTASCII_ACTION( sUNO_View_PreviewDrawMode, "PreviewDrawMode" ); +SD_CONSTASCII_ACTION( sUNO_View_IsShowPreviewInPageMode, "IsShowPreviewInPageMode" ); +SD_CONSTASCII_ACTION( sUNO_View_IsShowPreviewInMasterPageMode, "IsShowPreviewInMasterPageMode" ); +SD_CONSTASCII_ACTION( sUNO_View_SetShowPreviewInOutlineMode, "SetShowPreviewInOutlineMode" ); +SD_CONSTASCII_ACTION( sUNO_View_EditModeStandard, "EditModeStandard" ); +SD_CONSTASCII_ACTION( sUNO_View_EditModeNotes, "EditModeNotes" ); +SD_CONSTASCII_ACTION( sUNO_View_EditModeHandout, "EditModeHandout" ); +SD_CONSTASCII_ACTION( sUNO_View_VisArea, "VisArea" ); + +SD_CONSTASCII_ACTION( sUNO_View_GridIsVisible, "GridIsVisible" ); +SD_CONSTASCII_ACTION( sUNO_View_GridIsFront, "GridIsFront" ); +SD_CONSTASCII_ACTION( sUNO_View_IsSnapToGrid, "IsSnapToGrid" ); +SD_CONSTASCII_ACTION( sUNO_View_IsSnapToPageMargins, "IsSnapToPageMargins" ); +SD_CONSTASCII_ACTION( sUNO_View_IsSnapToSnapLines, "IsSnapToSnapLines" ); +SD_CONSTASCII_ACTION( sUNO_View_IsSnapToObjectFrame, "IsSnapToObjectFrame" ); +SD_CONSTASCII_ACTION( sUNO_View_IsSnapToObjectPoints, "IsSnapToObjectPoints" ); +SD_CONSTASCII_ACTION( sUNO_View_IsSnapLinesVisible, "IsSnapLinesVisible" ); +SD_CONSTASCII_ACTION( sUNO_View_IsDragStripes, "IsDragStripes" ); +SD_CONSTASCII_ACTION( sUNO_View_IsPlusHandlesAlwaysVisible, "IsPlusHandlesAlwaysVisible" ); +SD_CONSTASCII_ACTION( sUNO_View_IsFrameDragSingles, "IsFrameDragSingles" ); +SD_CONSTASCII_ACTION( sUNO_View_IsMarkedHitMovesAlways, "IsMarkedHitMovesAlways" ); +SD_CONSTASCII_ACTION( sUNO_View_EliminatePolyPointLimitAngle, "EliminatePolyPointLimitAngle" ); +SD_CONSTASCII_ACTION( sUNO_View_IsEliminatePolyPoints, "IsEliminatePolyPoints" ); +SD_CONSTASCII_ACTION( sUNO_View_IsLineDraft, "IsLineDraft" ); +SD_CONSTASCII_ACTION( sUNO_View_IsFillDraft, "IsFillDraft" ); +SD_CONSTASCII_ACTION( sUNO_View_IsTextDraft, "IsTextDraft" ); +SD_CONSTASCII_ACTION( sUNO_View_IsGrafDraft, "IsGrafDraft" ); +SD_CONSTASCII_ACTION( sUNO_View_ActiveLayer, "ActiveLayer" ); +SD_CONSTASCII_ACTION( sUNO_View_NoAttribs, "NoAttribs" ); +SD_CONSTASCII_ACTION( sUNO_View_NoColors, "NoColors" ); +SD_CONSTASCII_ACTION( sUNO_View_GridCoarseWidth, "GridCoarseWidth" ); +SD_CONSTASCII_ACTION( sUNO_View_GridCoarseHeight, "GridCoarseHeight" ); +SD_CONSTASCII_ACTION( sUNO_View_GridFineWidth, "GridFineWidth" ); +SD_CONSTASCII_ACTION( sUNO_View_GridFineHeight, "GridFineHeight" ); +SD_CONSTASCII_ACTION( sUNO_View_IsAngleSnapEnabled, "IsAngleSnapEnabled" ); +SD_CONSTASCII_ACTION( sUNO_View_SnapAngle, "SnapAngle" ); +SD_CONSTASCII_ACTION( sUNO_View_GridSnapWidthXNumerator, "GridSnapWidthXNumerator" ); +SD_CONSTASCII_ACTION( sUNO_View_GridSnapWidthXDenominator, "GridSnapWidthXDenominator" ); +SD_CONSTASCII_ACTION( sUNO_View_GridSnapWidthYNumerator, "GridSnapWidthYNumerator" ); +SD_CONSTASCII_ACTION( sUNO_View_GridSnapWidthYDenominator, "GridSnapWidthYDenominator" ); +SD_CONSTASCII_ACTION( sUNO_View_VisibleLayers, "VisibleLayers" ); +SD_CONSTASCII_ACTION( sUNO_View_PrintableLayers, "PrintableLayers" ); +SD_CONSTASCII_ACTION( sUNO_View_LockedLayers, "LockedLayers" ); + +SD_CONSTASCII_ACTION( sUNO_View_VisibleAreaTop, "VisibleAreaTop" ); +SD_CONSTASCII_ACTION( sUNO_View_VisibleAreaLeft, "VisibleAreaLeft" ); +SD_CONSTASCII_ACTION( sUNO_View_VisibleAreaWidth, "VisibleAreaWidth" ); +SD_CONSTASCII_ACTION( sUNO_View_VisibleAreaHeight, "VisibleAreaHeight" ); + +SD_CONSTASCII_ACTION( sUNO_View_ZoomOnPage, "ZoomOnPage" ); #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx index b86235294fa3..9dd88f565f95 100644 --- a/sd/source/ui/inc/unomodel.hxx +++ b/sd/source/ui/inc/unomodel.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -120,11 +120,11 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxMarkerTable; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxDrawingPool; - const SvxItemPropertySet* mpPropSet; + const SvxItemPropertySet* mpPropSet; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > maTypeSequence; - rtl::OUString maBuildId; + rtl::OUString maBuildId; void initializeDocument(); public: @@ -135,8 +135,8 @@ public: static rtl::Reference< SdXImpressDocument > GetModel( SdDrawDocument* pDoc ); // intern - virtual int operator==( const SdXImpressDocument& rModel ) const { return mpDoc == rModel.mpDoc; } - virtual int operator!=( const SdXImpressDocument& rModel ) const { return mpDoc != rModel.mpDoc; } + virtual int operator==( const SdXImpressDocument& rModel ) const { return mpDoc == rModel.mpDoc; } + virtual int operator!=( const SdXImpressDocument& rModel ) const { return mpDoc != rModel.mpDoc; } ::sd::DrawDocShell* GetDocShell() const { return mpDocShell; } SdDrawDocument* GetDoc() const { return mpDoc; } @@ -147,7 +147,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XForbiddenCharacters > getForbiddenCharsTable(); // SfxListener - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); UNO3_GETIMPLEMENTATION_DECL(SdXImpressDocument) @@ -244,7 +244,7 @@ private: SdXImpressDocument* mpModel; public: - SdDrawPagesAccess( SdXImpressDocument& rMyModel ) throw(); + SdDrawPagesAccess( SdXImpressDocument& rMyModel ) throw(); virtual ~SdDrawPagesAccess() throw(); // XDrawPages @@ -284,7 +284,7 @@ public: class SdMasterPagesAccess : public ::cppu::WeakImplHelper3< ::com::sun::star::drawing::XDrawPages, ::com::sun::star::lang::XServiceInfo, ::com::sun::star::lang::XComponent > { private: - SdXImpressDocument* mpModel; + SdXImpressDocument* mpModel; public: SdMasterPagesAccess( SdXImpressDocument& rMyModel ) throw(); @@ -321,10 +321,10 @@ class SdDocLinkTargets : public ::cppu::WeakImplHelper3< ::com::sun::star::conta ::com::sun::star::lang::XServiceInfo , ::com::sun::star::lang::XComponent > { private: - SdXImpressDocument* mpModel; + SdXImpressDocument* mpModel; public: - SdDocLinkTargets( SdXImpressDocument& rMyModel ) throw(); + SdDocLinkTargets( SdXImpressDocument& rMyModel ) throw(); virtual ~SdDocLinkTargets() throw(); // XNameAccess diff --git a/sd/source/ui/inc/unoprnms.hxx b/sd/source/ui/inc/unoprnms.hxx index 79bad24858bc..c3d0ff4318d3 100644 --- a/sd/source/ui/inc/unoprnms.hxx +++ b/sd/source/ui/inc/unoprnms.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,74 +28,74 @@ #ifndef _SD_UNOPRNMS_HXX #define _SD_UNOPRNMS_HXX -#define UNO_NAME_MODEL_LANGUAGE "CharLocale" -#define UNO_NAME_MODEL_TABSTOP "TabStop" +#define UNO_NAME_MODEL_LANGUAGE "CharLocale" +#define UNO_NAME_MODEL_TABSTOP "TabStop" -#define UNO_NAME_PAGE_BACKGROUND "Background" -#define UNO_NAME_PAGE_LEFT "BorderLeft" -#define UNO_NAME_PAGE_RIGHT "BorderRight" -#define UNO_NAME_PAGE_TOP "BorderTop" -#define UNO_NAME_PAGE_BOTTOM "BorderBottom" -#define UNO_NAME_PAGE_CHANGE "Change" -#define UNO_NAME_PAGE_DURATION "Duration" -#define UNO_NAME_PAGE_EFFECT "Effect" -#define UNO_NAME_PAGE_HEIGHT "Height" -#define UNO_NAME_PAGE_LAYOUT "Layout" -#define UNO_NAME_PAGE_NUMBER "Number" -#define UNO_NAME_PAGE_OBJECTS "Objects" -#define UNO_NAME_PAGE_ORIENTATION "Orientation" -#define UNO_NAME_PAGE_SPEED "Speed" -#define UNO_NAME_PAGE_WIDTH "Width" -#define UNO_NAME_PAGE_PREVIEW "Preview" -#define UNO_NAME_PAGE_PREVIEWBITMAP "PreviewBitmap" -#define UNO_NAME_PAGE_VISIBLE "Visible" +#define UNO_NAME_PAGE_BACKGROUND "Background" +#define UNO_NAME_PAGE_LEFT "BorderLeft" +#define UNO_NAME_PAGE_RIGHT "BorderRight" +#define UNO_NAME_PAGE_TOP "BorderTop" +#define UNO_NAME_PAGE_BOTTOM "BorderBottom" +#define UNO_NAME_PAGE_CHANGE "Change" +#define UNO_NAME_PAGE_DURATION "Duration" +#define UNO_NAME_PAGE_EFFECT "Effect" +#define UNO_NAME_PAGE_HEIGHT "Height" +#define UNO_NAME_PAGE_LAYOUT "Layout" +#define UNO_NAME_PAGE_NUMBER "Number" +#define UNO_NAME_PAGE_OBJECTS "Objects" +#define UNO_NAME_PAGE_ORIENTATION "Orientation" +#define UNO_NAME_PAGE_SPEED "Speed" +#define UNO_NAME_PAGE_WIDTH "Width" +#define UNO_NAME_PAGE_PREVIEW "Preview" +#define UNO_NAME_PAGE_PREVIEWBITMAP "PreviewBitmap" +#define UNO_NAME_PAGE_VISIBLE "Visible" -#define UNO_NAME_OBJ_BOOKMARK "Bookmark" -#define UNO_NAME_OBJ_DIMCOLOR "DimColor" -#define UNO_NAME_OBJ_DIMHIDE "DimHide" -#define UNO_NAME_OBJ_DIMPREV "DimPrevious" -#define UNO_NAME_OBJ_EFFECT "Effect" -#define UNO_NAME_OBJ_ISEMPTYPRESOBJ "IsEmptyPresentationObject" -#define UNO_NAME_OBJ_ISPRESOBJ "IsPresentationObject" -#define UNO_NAME_OBJ_CLICKACTION "OnClick" -#define UNO_NAME_OBJ_PLAYFULL "PlayFull" -#define UNO_NAME_OBJ_PRESORDER "PresentationOrder" -#define UNO_NAME_OBJ_SOUNDFILE "Sound" -#define UNO_NAME_OBJ_SOUNDON "SoundOn" -#define UNO_NAME_OBJ_SPEED "Speed" -#define UNO_NAME_OBJ_TEXTEFFECT "TextEffect" -#define UNO_NAME_OBJ_BLUESCREEN "TransparentColor" -#define UNO_NAME_OBJ_VERB "Verb" -#define UNO_NAME_OBJ_STYLE "Style" -#define UNO_NAME_OBJ_MASTERDEPENDENT "IsPlaceholderDependent" -#define UNO_NAME_OBJ_ANIMATIONPATH "AnimationPath" +#define UNO_NAME_OBJ_BOOKMARK "Bookmark" +#define UNO_NAME_OBJ_DIMCOLOR "DimColor" +#define UNO_NAME_OBJ_DIMHIDE "DimHide" +#define UNO_NAME_OBJ_DIMPREV "DimPrevious" +#define UNO_NAME_OBJ_EFFECT "Effect" +#define UNO_NAME_OBJ_ISEMPTYPRESOBJ "IsEmptyPresentationObject" +#define UNO_NAME_OBJ_ISPRESOBJ "IsPresentationObject" +#define UNO_NAME_OBJ_CLICKACTION "OnClick" +#define UNO_NAME_OBJ_PLAYFULL "PlayFull" +#define UNO_NAME_OBJ_PRESORDER "PresentationOrder" +#define UNO_NAME_OBJ_SOUNDFILE "Sound" +#define UNO_NAME_OBJ_SOUNDON "SoundOn" +#define UNO_NAME_OBJ_SPEED "Speed" +#define UNO_NAME_OBJ_TEXTEFFECT "TextEffect" +#define UNO_NAME_OBJ_BLUESCREEN "TransparentColor" +#define UNO_NAME_OBJ_VERB "Verb" +#define UNO_NAME_OBJ_STYLE "Style" +#define UNO_NAME_OBJ_MASTERDEPENDENT "IsPlaceholderDependent" +#define UNO_NAME_OBJ_ANIMATIONPATH "AnimationPath" -#define UNO_NAME_LAYER_LOCKED "IsLocked" -#define UNO_NAME_LAYER_PRINTABLE "IsPrintable" -#define UNO_NAME_LAYER_VISIBLE "IsVisible" -#define UNO_NAME_LAYER_NAME "Name" +#define UNO_NAME_LAYER_LOCKED "IsLocked" +#define UNO_NAME_LAYER_PRINTABLE "IsPrintable" +#define UNO_NAME_LAYER_VISIBLE "IsVisible" +#define UNO_NAME_LAYER_NAME "Name" -#define UNO_NAME_SHOW_ALLOWANIM "AllowAnimations" -#define UNO_NAME_SHOW_CUSTOMSHOW "CustomShow" -#define UNO_NAME_SHOW_FIRSTPAGE "FirstPage" -#define UNO_NAME_SHOW_ONTOP "IsAlwaysOnTop" -#define UNO_NAME_SHOW_AUTOMATIC "IsAutomatic" -#define UNO_NAME_SHOW_ENDLESS "IsEndless" -#define UNO_NAME_SHOW_FULLSCREEN "IsFullScreen" -#define UNO_NAME_SHOW_MOUSEVISIBLE "IsMouseVisible" -#define UNO_NAME_SHOW_PAGERANGE "PageRange" -#define UNO_NAME_SHOW_PAUSE "Pause" -#define UNO_NAME_SHOW_STARTWITHNAV "StartWithNavigator" -#define UNO_NAME_SHOW_USEPEN "UsePen" +#define UNO_NAME_SHOW_ALLOWANIM "AllowAnimations" +#define UNO_NAME_SHOW_CUSTOMSHOW "CustomShow" +#define UNO_NAME_SHOW_FIRSTPAGE "FirstPage" +#define UNO_NAME_SHOW_ONTOP "IsAlwaysOnTop" +#define UNO_NAME_SHOW_AUTOMATIC "IsAutomatic" +#define UNO_NAME_SHOW_ENDLESS "IsEndless" +#define UNO_NAME_SHOW_FULLSCREEN "IsFullScreen" +#define UNO_NAME_SHOW_MOUSEVISIBLE "IsMouseVisible" +#define UNO_NAME_SHOW_PAGERANGE "PageRange" +#define UNO_NAME_SHOW_PAUSE "Pause" +#define UNO_NAME_SHOW_STARTWITHNAV "StartWithNavigator" +#define UNO_NAME_SHOW_USEPEN "UsePen" -#define UNO_NAME_SEARCH_BACKWARDS "SearchBackwards" -#define UNO_NAME_SEARCH_CASE "SearchCaseSensitive" -#define UNO_NAME_SEARCH_WORDS "SearchWords" +#define UNO_NAME_SEARCH_BACKWARDS "SearchBackwards" +#define UNO_NAME_SEARCH_CASE "SearchCaseSensitive" +#define UNO_NAME_SEARCH_WORDS "SearchWords" -#define UNO_NAME_LINKDISPLAYNAME "LinkDisplayName" -#define UNO_NAME_LINKDISPLAYBITMAP "LinkDisplayBitmap" +#define UNO_NAME_LINKDISPLAYNAME "LinkDisplayName" +#define UNO_NAME_LINKDISPLAYBITMAP "LinkDisplayBitmap" -#define UNO_NAME_STYLE_FAMILY "Family" +#define UNO_NAME_STYLE_FAMILY "Family" #endif diff --git a/sd/source/ui/inc/unosrch.hxx b/sd/source/ui/inc/unosrch.hxx index 842818526b89..4cac45c0c741 100644 --- a/sd/source/ui/inc/unosrch.hxx +++ b/sd/source/ui/inc/unosrch.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -93,7 +93,7 @@ protected: sal_Bool mbReplace; - ::rtl::OUString maSearchStr; + ::rtl::OUString maSearchStr; ::rtl::OUString maReplaceStr; public: @@ -117,9 +117,9 @@ public: // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); }; diff --git a/sd/source/ui/inc/unprlout.hxx b/sd/source/ui/inc/unprlout.hxx index 73b8a7d2bf8b..3849af88a67d 100644 --- a/sd/source/ui/inc/unprlout.hxx +++ b/sd/source/ui/inc/unprlout.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/sd/source/ui/inc/unslsel.hxx b/sd/source/ui/inc/unslsel.hxx index 084049f86c07..5085bf25ed27 100644 --- a/sd/source/ui/inc/unslsel.hxx +++ b/sd/source/ui/inc/unslsel.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,11 +43,11 @@ public: : SdUndoAction(pTheDoc), pOldOrder(pOld), pNewOrder(pNew) {} - virtual ~SlideSelectionUndoAction() {} + virtual ~SlideSelectionUndoAction() {} virtual void Undo(); virtual void Redo(); }; -#endif // _SD_UNSLSEL_HXX +#endif // _SD_UNSLSEL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/vectdlg.hrc b/sd/source/ui/inc/vectdlg.hrc index ca84ae2746db..e87eed2b705f 100644 --- a/sd/source/ui/inc/vectdlg.hrc +++ b/sd/source/ui/inc/vectdlg.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,29 +25,29 @@ * ************************************************************************/ -#define DLG_VECTORIZE 654 +#define DLG_VECTORIZE 654 -#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_PREVIEW 1 +#define BTN_PREVIEW 1 -#define GRP_SETTINGS 1 -#define GRP_PRGS 2 +#define GRP_SETTINGS 1 +#define GRP_PRGS 2 -#define CTL_BMP 1 -#define CTL_WMF 2 -#define WND_PRGS 3 +#define CTL_BMP 1 +#define CTL_WMF 2 +#define WND_PRGS 3 -#define FT_LAYERS 1 -#define FT_REDUCE 3 -#define FT_FILLHOLES 4 -#define FT_ORIGINAL 5 -#define FT_VECTORIZED 6 +#define FT_LAYERS 1 +#define FT_REDUCE 3 +#define FT_FILLHOLES 4 +#define FT_ORIGINAL 5 +#define FT_VECTORIZED 6 -#define NM_LAYERS 1 -#define MT_REDUCE 3 -#define MT_FILLHOLES 4 +#define NM_LAYERS 1 +#define MT_REDUCE 3 +#define MT_FILLHOLES 4 -#define CB_FILLHOLES 1 +#define CB_FILLHOLES 1 diff --git a/sd/source/ui/inc/vectdlg.hxx b/sd/source/ui/inc/vectdlg.hxx index b3f4b84a10b5..999dfb485981 100644 --- a/sd/source/ui/inc/vectdlg.hxx +++ b/sd/source/ui/inc/vectdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,43 +51,43 @@ class DrawDocShell; class SdVectorizeDlg : public ModalDialog { - ::sd::DrawDocShell * mpDocSh; - FixedLine aGrpSettings; - FixedText aFtLayers; - NumericField aNmLayers; - FixedText aFtReduce; - MetricField aMtReduce; - FixedText aFtFillHoles; - MetricField aMtFillHoles; - CheckBox aCbFillHoles; - - FixedText aFtOriginal; - GraphCtrl aBmpWin; - - FixedText aFtVectorized; - GraphCtrl aMtfWin; - - FixedText aGrpPrgs; - ProgressBar aPrgs; - - OKButton aBtnOK; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - PushButton aBtnPreview; - - Bitmap aBmp; - Bitmap aPreviewBmp; - GDIMetaFile aMtf; - - void LoadSettings(); - void SaveSettings() const; - void InitPreviewBmp(); - void UpdatePreviewMtf(); - - Rectangle GetRect( const Size& rDispSize, const Size& rBmpSize ) const; - Bitmap GetPreparedBitmap( Bitmap& rBmp, Fraction& rScale ); - void Calculate( Bitmap& rBmp, GDIMetaFile& rMtf ); - void AddTile( BitmapReadAccess* pRAcc, GDIMetaFile& rMtf, + ::sd::DrawDocShell * mpDocSh; + FixedLine aGrpSettings; + FixedText aFtLayers; + NumericField aNmLayers; + FixedText aFtReduce; + MetricField aMtReduce; + FixedText aFtFillHoles; + MetricField aMtFillHoles; + CheckBox aCbFillHoles; + + FixedText aFtOriginal; + GraphCtrl aBmpWin; + + FixedText aFtVectorized; + GraphCtrl aMtfWin; + + FixedText aGrpPrgs; + ProgressBar aPrgs; + + OKButton aBtnOK; + CancelButton aBtnCancel; + HelpButton aBtnHelp; + PushButton aBtnPreview; + + Bitmap aBmp; + Bitmap aPreviewBmp; + GDIMetaFile aMtf; + + void LoadSettings(); + void SaveSettings() const; + void InitPreviewBmp(); + void UpdatePreviewMtf(); + + Rectangle GetRect( const Size& rDispSize, const Size& rBmpSize ) const; + Bitmap GetPreparedBitmap( Bitmap& rBmp, Fraction& rScale ); + void Calculate( Bitmap& rBmp, GDIMetaFile& rMtf ); + void AddTile( BitmapReadAccess* pRAcc, GDIMetaFile& rMtf, long nPosX, long nPosY, long nWidth, long nHeight ); DECL_LINK( ProgressHdl, void* ); @@ -101,7 +101,7 @@ public: SdVectorizeDlg( Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ); ~SdVectorizeDlg(); - const GDIMetaFile& GetGDIMetaFile() const { return aMtf; } + const GDIMetaFile& GetGDIMetaFile() const { return aMtf; } }; #endif diff --git a/sd/source/ui/inc/view/viewoverlaymanager.hxx b/sd/source/ui/inc/view/viewoverlaymanager.hxx index 3a2f99134941..acb1581a3b56 100644 --- a/sd/source/ui/inc/view/viewoverlaymanager.hxx +++ b/sd/source/ui/inc/view/viewoverlaymanager.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 @@ -48,7 +48,7 @@ class ViewOverlayManager : public SfxListener public: ViewOverlayManager( ViewShellBase& rViewShellBase ); virtual ~ViewOverlayManager(); - + void onZoomChanged(); void UpdateTags(); @@ -64,7 +64,7 @@ private: ViewShellBase& mrBase; ULONG mnUpdateTagsEvent; - ViewTagVector maTagVector; + ViewTagVector maTagVector; }; } diff --git a/sd/source/ui/inc/zoomlist.hxx b/sd/source/ui/inc/zoomlist.hxx index 1d8c1f2237ad..69742ece6ac4 100644 --- a/sd/source/ui/inc/zoomlist.hxx +++ b/sd/source/ui/inc/zoomlist.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,15 +44,15 @@ public: ZoomList(ViewShell* pViewShell); virtual ~ZoomList(); - void InsertZoomRect(const Rectangle& rRect); - Rectangle GetNextZoomRect(); - Rectangle GetPreviousZoomRect(); - BOOL IsNextPossible() const; - BOOL IsPreviousPossible() const; + void InsertZoomRect(const Rectangle& rRect); + Rectangle GetNextZoomRect(); + Rectangle GetPreviousZoomRect(); + BOOL IsNextPossible() const; + BOOL IsPreviousPossible() const; private: - ViewShell* mpViewShell; - ULONG mnCurPos; + ViewShell* mpViewShell; + ULONG mnCurPos; }; } // end of namespace sd |