diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:04:32 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:04:32 +0200 |
commit | c9ac7489ec5fd4652f0cff09722561ba5a27bcda (patch) | |
tree | e9fb41b01f699d5a4202e719d5dc7e087fa701c1 /sc/source/ui/inc/AccessibleDocument.hxx | |
parent | 69bb367315288b644439dc46d34743a2575a3527 (diff) |
recreated tag libreoffice-3.3.0.4 which had these commits:
commit 5e369f0d3b306be13606c1558ecf7d0aac0048f4 (tag: refs/tags/libreoffice-3.3.0.4)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 18 19:01:15 2011 +0100
Version 3.3.0.4, tag libreoffice-3.3.0.4 (3.3-rc4)
commit 2df81fdef39f29be15dc0a6e12031916de963f08
Author: Kohei Yoshida <kyoshida@novell.com>
Date: Thu Jan 13 11:18:07 2011 -0500
Reverting the merge commit 0fe55349b05fae496a86a3fa958d184f0453916c.
I created a patch between before and after the merge commit, and
reverse-applied it. This is because if you revert a merge commit
in git you are denying all future merges from that branch. I wasn't
sure if we really wanted that.
Signed-off-by: Petr Mladek <pmladek@suse.cz>
sc/inc/document.hxx | 22 +------
sc/inc/drwlayer.hxx | 2 +-
sc/inc/table.hxx | 16 +-----
sc/source/core/data/document.cxx | 7 +--
sc/source/core/data/drwlayer.cxx | 6 +-
sc/source/core/data/table1.cxx | 38 ++++--------
sc/source/core/data/table2.cxx | 91 ++++++------------------------
sc/source/core/data/table3.cxx | 71 +----------------------
sc/source/filter/xml/xmlrowi.cxx | 17 +----
sc/source/ui/docshell/externalrefmgr.cxx | 7 +-
sc/source/ui/view/dbfunc.cxx | 5 +-
sc/source/ui/view/tabvwshe.cxx | 4 +-
12 files changed, 52 insertions(+), 234 deletions(-)
commit 9ce94f52e8c404a5e19154d38c18a44281d961f0
Author: Kohei Yoshida <kyoshida@novell.com>
Date: Thu Jan 13 11:04:14 2011 -0500
Revert "This is also part of the merge."
This reverts commit 0fe55349b05fae496a86a3fa958d184f0453916c.
Signed-off-by: Petr Mladek <pmladek@suse.cz>
sc/source/core/data/table3.cxx | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
commit 1e03f54cc4f8939867869a3570f56d0645b515f5
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 22:59:36 2011 +0100
Branch libreoffice-3-3-0
This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
Notes
Notes:
split repo tag: calc_libreoffice-3.3.0.4
Diffstat (limited to 'sc/source/ui/inc/AccessibleDocument.hxx')
-rw-r--r-- | sc/source/ui/inc/AccessibleDocument.hxx | 82 |
1 files changed, 41 insertions, 41 deletions
diff --git a/sc/source/ui/inc/AccessibleDocument.hxx b/sc/source/ui/inc/AccessibleDocument.hxx index fbfa0667f68f..7facaf856d6f 100644 --- a/sc/source/ui/inc/AccessibleDocument.hxx +++ b/sc/source/ui/inc/AccessibleDocument.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ namespace utl class AccessibleRelationSetHelper; } -/** @descr +/** @descr This base class provides an implementation of the <code>AccessibleContext</code> service. */ @@ -61,7 +61,7 @@ typedef cppu::ImplHelper2< ::com::sun::star::accessibility::XAccessibleSelection ScAccessibleDocumentImpl; class ScAccessibleDocument - : public ScAccessibleDocumentBase, + : public ScAccessibleDocumentBase, public ScAccessibleDocumentImpl, public accessibility::IAccessibleViewForwarder { @@ -72,7 +72,7 @@ public: ::com::sun::star::accessibility::XAccessible>& rxParent, ScTabViewShell* pViewShell, ScSplitPos eSplitPos); - + virtual void Init(); @@ -92,12 +92,12 @@ public: ///===== XInterface ===================================================== - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - ::com::sun::star::uno::Type const & rType ) + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( + ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL acquire() throw (); - + virtual void SAL_CALL release() throw (); ///===== XAccessibleComponent ============================================ @@ -112,18 +112,18 @@ public: ///===== XAccessibleContext ============================================== - /// Return the number of currently visible children. + /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL getAccessibleChildCount(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the specified child or NULL if index is invalid. + /// Return the specified child or NULL if index is invalid. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException); - /// Return the set of current states. + /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet(void) @@ -131,42 +131,42 @@ public: ///===== XAccessibleSelection =========================================== - virtual void SAL_CALL - selectAccessibleChild( sal_Int32 nChildIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, + virtual void SAL_CALL + selectAccessibleChild( sal_Int32 nChildIndex ) + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL - isAccessibleChildSelected( sal_Int32 nChildIndex ) + virtual sal_Bool SAL_CALL + isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL - clearAccessibleSelection( ) + virtual void SAL_CALL + clearAccessibleSelection( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL - selectAllAccessibleChildren( ) + virtual void SAL_CALL + selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL - getSelectedAccessibleChildCount( ) + virtual sal_Int32 SAL_CALL + getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > SAL_CALL - getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) + ::com::sun::star::accessibility::XAccessible > SAL_CALL + getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL - deselectAccessibleChild( sal_Int32 nChildIndex ) + virtual void SAL_CALL + deselectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); ///===== XSelectionListener ============================================= - virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) + virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) @@ -174,7 +174,7 @@ public: ///===== XServiceInfo =================================================== - /** Returns an identifier for the implementation of this object. + /** Returns an identifier for the implementation of this object. */ virtual ::rtl::OUString SAL_CALL getImplementationName(void) @@ -189,11 +189,11 @@ public: ///===== XTypeProvider =================================================== /// returns the possible types - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL - getTypes() + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL + getTypes() throw (::com::sun::star::uno::RuntimeException); - /** Returns a implementation id. + /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(void) @@ -212,7 +212,7 @@ public: /** Returns the area of the underlying document that is visible in the * corresponding window. - @return + @return The rectangle of the visible part of the document. The values are, contrary to the base class, in internal coordinates. */ @@ -224,7 +224,7 @@ public: @param rPoint Point in internal coordinates. - @return + @return The same point but in screen coordinates relative to the upper left corner of the (current) screen. */ @@ -236,7 +236,7 @@ public: @param rSize Size in internal coordinates. - @return + @return The same size but in screen coordinates. */ virtual Size LogicToPixel (const Size& rSize) const; @@ -248,7 +248,7 @@ public: Point in screen coordinates relative to the upper left corner of the (current) screen. - @return + @return The same point but in internal coordinates. */ virtual Point PixelToLogic (const Point& rPoint) const; @@ -265,7 +265,7 @@ public: virtual Size PixelToLogic (const Size& rSize) const; ///======== internal ===================================================== - + utl::AccessibleRelationSetHelper* GetRelationSet(const ScAddress* pAddress) const; ::com::sun::star::uno::Reference @@ -273,27 +273,27 @@ public: GetAccessibleSpreadsheet(); protected: - /// Return this object's description. + /// Return this object's description. virtual ::rtl::OUString SAL_CALL createAccessibleDescription(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current name. + /// Return the object's current name. virtual ::rtl::OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current bounding box relative to the desktop. + /// Return the object's current bounding box relative to the desktop. virtual Rectangle GetBoundingBoxOnScreen(void) const throw (::com::sun::star::uno::RuntimeException); - /// Return the object's current bounding box relative to the parent object. + /// Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException); private: - ScTabViewShell* mpViewShell; - ScSplitPos meSplitPos; + ScTabViewShell* mpViewShell; + ScSplitPos meSplitPos; ScAccessibleSpreadsheet* mpAccessibleSpreadsheet; ScChildrenShapes* mpChildrenShapes; ScAccessibleEditObject* mpTempAccEdit; |