diff options
Diffstat (limited to 'accessibility')
28 files changed, 120 insertions, 120 deletions
diff --git a/accessibility/inc/accessibility/extended/accessibleiconchoicectrl.hxx b/accessibility/inc/accessibility/extended/accessibleiconchoicectrl.hxx index 38d583b2673d..9fc58e200b6b 100644 --- a/accessibility/inc/accessibility/extended/accessibleiconchoicectrl.hxx +++ b/accessibility/inc/accessibility/extended/accessibleiconchoicectrl.hxx @@ -76,8 +76,8 @@ namespace accessibility virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - static methods - static com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw(com::sun::star::uno::RuntimeException); - static OUString getImplementationName_Static(void) throw(com::sun::star::uno::RuntimeException); + static com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static() throw(com::sun::star::uno::RuntimeException); // XAccessible virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx b/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx index 363a54450e52..b56ca82df4a8 100644 --- a/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx +++ b/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx @@ -120,8 +120,8 @@ namespace accessibility virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - static methods - static com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw(com::sun::star::uno::RuntimeException); - static OUString getImplementationName_Static(void) throw(com::sun::star::uno::RuntimeException); + static com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static() throw(com::sun::star::uno::RuntimeException); // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/accessibility/inc/accessibility/extended/accessiblelistbox.hxx b/accessibility/inc/accessibility/extended/accessiblelistbox.hxx index b056f386c433..ac5bbe69c157 100644 --- a/accessibility/inc/accessibility/extended/accessiblelistbox.hxx +++ b/accessibility/inc/accessibility/extended/accessiblelistbox.hxx @@ -90,8 +90,8 @@ namespace accessibility virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - static methods - static com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw(com::sun::star::uno::RuntimeException); - static OUString getImplementationName_Static(void) throw(com::sun::star::uno::RuntimeException); + static com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static() throw(com::sun::star::uno::RuntimeException); // XAccessible virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx b/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx index dc3bd4653e82..a4fa0ab09421 100644 --- a/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx +++ b/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx @@ -155,8 +155,8 @@ namespace accessibility virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - static methods - static com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw(com::sun::star::uno::RuntimeException); - static OUString getImplementationName_Static(void) throw(com::sun::star::uno::RuntimeException); + static com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static() throw(com::sun::star::uno::RuntimeException); // XAccessible virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx b/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx index 89bfd7ef437c..8c47222f2ff2 100644 --- a/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx +++ b/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx @@ -92,7 +92,7 @@ public: DECLARE_XTYPEPROVIDER( ) // XServiceInfo - virtual OUString SAL_CALL getImplementationName (void) + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleSelection diff --git a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx index 2846113057a2..d64254608271 100644 --- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx +++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx @@ -589,7 +589,7 @@ private: // Must be called with both the external (Solar) and internal mutex // locked, and after init has been called: - ::rtl::Reference< Paragraph > + static ::rtl::Reference< Paragraph > getParagraph(Paragraphs::iterator const & rIt); // Must be called with both the external (Solar) and internal mutex @@ -633,7 +633,7 @@ private: static ::FontWeight mapFontWeight(css::uno::Any const & rWeight); - void retrieveDefaultAttributesImpl( + static void retrieveDefaultAttributesImpl( Paragraph const * pParagraph, const css::uno::Sequence< OUString >& RequestedAttributes, tPropValMap& rDefAttrSeq); diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx index 5654a12f77e5..8c46ebde607d 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx @@ -72,7 +72,7 @@ public: actual list. The text field is not provided for non drop down list boxes. */ - sal_Int32 SAL_CALL getAccessibleChildCount (void) + sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** For drop down list boxes the text field is a not editable <type>VCLXAccessibleTextField</type>, for combo boxes it is an @@ -84,17 +84,17 @@ public: /** The role is always <const scope="com::sun::star::accessibility">AccessibleRole::COMBO_BOX</const>. */ - sal_Int16 SAL_CALL getAccessibleRole (void) + sal_Int16 SAL_CALL getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - sal_Int32 SAL_CALL getAccessibleIndexInParent (void) + sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleAction /** There is one action for drop down boxes and none for others. */ - virtual sal_Int32 SAL_CALL getAccessibleActionCount (void) + virtual sal_Int32 SAL_CALL getAccessibleActionCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** The action for drop down boxes lets the user toggle the visibility of the popup menu. @@ -121,7 +121,7 @@ public: /** This method is called from the implementation helper during an XComponent::dispose() call. */ - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; //===== XAccessibleValue ================================================ @@ -170,11 +170,11 @@ protected: */ bool m_bHasListChild; - virtual ~VCLXAccessibleBox (void); + virtual ~VCLXAccessibleBox(); /** Returns </true> when the object is valid. */ - virtual bool IsValid (void) const = 0; + virtual bool IsValid() const = 0; virtual void ProcessWindowChildEvent (const VclWindowEvent& rVclWindowEvent) SAL_OVERRIDE; virtual void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent) SAL_OVERRIDE; diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx index 0ad8948ec6b1..cfc705e02223 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx @@ -39,17 +39,17 @@ public: VCLXAccessibleComboBox (VCLXWindow* pVCLXindow); // XServiceInfo - virtual OUString SAL_CALL getImplementationName (void) + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Return combo box specific services. virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames (void) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual ~VCLXAccessibleComboBox (void); + virtual ~VCLXAccessibleComboBox(); - virtual bool IsValid (void) const SAL_OVERRIDE; + virtual bool IsValid() const SAL_OVERRIDE; virtual void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent) SAL_OVERRIDE; }; diff --git a/accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx b/accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx index c52ea880a5b7..7499987b16eb 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx @@ -41,17 +41,17 @@ public: VCLXAccessibleDropDownComboBox (VCLXWindow* pVCLXindow); // XServiceInfo - virtual OUString SAL_CALL getImplementationName (void) + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Return drop down combo box specific services. virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames (void) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual ~VCLXAccessibleDropDownComboBox (void); + virtual ~VCLXAccessibleDropDownComboBox(); - virtual bool IsValid (void) const SAL_OVERRIDE; + virtual bool IsValid() const SAL_OVERRIDE; virtual void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent) SAL_OVERRIDE; }; diff --git a/accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx b/accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx index fcf41453a7e8..ac34023534d4 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx @@ -40,17 +40,17 @@ public: VCLXAccessibleDropDownListBox (VCLXWindow* pVCLXindow); // XServiceInfo - virtual OUString SAL_CALL getImplementationName (void) + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Return drop down list box specific services. virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames (void) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual ~VCLXAccessibleDropDownListBox (void); + virtual ~VCLXAccessibleDropDownListBox(); - virtual bool IsValid (void) const SAL_OVERRIDE; + virtual bool IsValid() const SAL_OVERRIDE; virtual void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent) SAL_OVERRIDE; }; diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx index d96ffc617f32..95f7869ed93f 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx @@ -89,11 +89,11 @@ public: // XAccessible virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL - getAccessibleContext (void) + getAccessibleContext() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) + virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 i) @@ -105,17 +105,17 @@ public: /** The index returned as index in parent is always the one set with the <member>SetIndexInParent()</member> method. */ - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent (void) + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int16 SAL_CALL getAccessibleRole (void) + virtual sal_Int16 SAL_CALL getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName (void) + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Return list specific services. virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames (void) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleSelection @@ -135,7 +135,7 @@ public: void UpdateSelection_Impl_Acc (bool b_IsDropDownList); void UpdateFocus_Impl_Acc ( sal_uInt16 nPos, bool b_IsDropDownList) ; - void NotifyListItem(::com::sun::star::uno::Any& val); + static void NotifyListItem(::com::sun::star::uno::Any& val); protected: BoxType m_aBoxType; ::accessibility::IComboListBoxHelper* m_pListBoxHelper; @@ -154,12 +154,12 @@ protected: ::com::sun::star::uno::WeakReference< ::com::sun::star::accessibility::XAccessible> m_xSelectedItem; - virtual ~VCLXAccessibleList (void); + virtual ~VCLXAccessibleList(); /** This function is called from the implementation helper during a XComponent::dispose call. Free the list of items and the items themselves. */ - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; /** This method adds the states <const>AccessibleStateType::FOCUSABLE</const> and possibly @@ -200,7 +200,7 @@ private: */ void clearItems(); - void UpdateEntryRange_Impl (void); + void UpdateEntryRange_Impl(); protected: void UpdateSelection_Impl (sal_uInt16 nPos = 0); bool checkEntrySelected(sal_uInt16 _nPos, diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelistbox.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblelistbox.hxx index 4e0a7cb192d3..d4da160ae805 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblelistbox.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblelistbox.hxx @@ -37,17 +37,17 @@ public: VCLXAccessibleListBox (VCLXWindow* pVCLXindow); // XServiceInfo - virtual OUString SAL_CALL getImplementationName (void) + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Return list box specific services. virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames (void) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual ~VCLXAccessibleListBox (void); + virtual ~VCLXAccessibleListBox(); - virtual bool IsValid (void) const SAL_OVERRIDE; + virtual bool IsValid() const SAL_OVERRIDE; virtual void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent) SAL_OVERRIDE; }; diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx index a77dcc2c8775..87db9bea130f 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx @@ -156,8 +156,8 @@ public: virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getForeground (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getBackground (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getForeground() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getBackground() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleText virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx index 64947ac49dbe..75aae851352e 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx @@ -52,36 +52,36 @@ public: // XAccessible ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL - getAccessibleContext (void) + getAccessibleContext() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleContext - sal_Int32 SAL_CALL getAccessibleChildCount (void) + sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 i) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - sal_Int16 SAL_CALL getAccessibleRole (void) + sal_Int16 SAL_CALL getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName (void) + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Return text field specific services. virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames (void) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual ~VCLXAccessibleTextField (void); + virtual ~VCLXAccessibleTextField(); /** With this method the text of the currently selected item is made available to the <type>VCLXAccessibleTextComponent</type> base class. */ - OUString implGetText (void) SAL_OVERRIDE; + OUString implGetText() SAL_OVERRIDE; private: /** We need to save the accessible parent to return it in <type>getAccessibleParent()</type>, diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx index 972522d93a1f..c446f1d6ca93 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx @@ -169,7 +169,7 @@ sal_Bool SAL_CALL AccessibleBrowseBoxHeaderBar::isAccessibleRowSelected( sal_Int ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); ensureIsValidRow( nRow ); - return isRowBar() ? implIsRowSelected( nRow ) : false; + return isRowBar() && implIsRowSelected( nRow ); } sal_Bool SAL_CALL AccessibleBrowseBoxHeaderBar::isAccessibleColumnSelected( sal_Int32 nColumn ) @@ -179,7 +179,7 @@ sal_Bool SAL_CALL AccessibleBrowseBoxHeaderBar::isAccessibleColumnSelected( sal_ ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); ensureIsValidColumn( nColumn ); - return isColumnBar() ? implIsColumnSelected( nColumn ) : false; + return isColumnBar() && implIsColumnSelected( nColumn ); } Reference< XAccessible > SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleCellAt( diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx b/accessibility/source/extended/accessibleiconchoicectrl.cxx index 1f658c24561e..1d512aa0631c 100644 --- a/accessibility/source/extended/accessibleiconchoicectrl.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx @@ -145,7 +145,7 @@ namespace accessibility // XServiceInfo - static methods - Sequence< OUString > AccessibleIconChoiceCtrl::getSupportedServiceNames_Static(void) throw (RuntimeException) + Sequence< OUString > AccessibleIconChoiceCtrl::getSupportedServiceNames_Static() throw (RuntimeException) { Sequence< OUString > aSupported(3); aSupported[0] = "com.sun.star.accessibility.AccessibleContext"; @@ -154,7 +154,7 @@ namespace accessibility return aSupported; } - OUString AccessibleIconChoiceCtrl::getImplementationName_Static(void) throw (RuntimeException) + OUString AccessibleIconChoiceCtrl::getImplementationName_Static() throw (RuntimeException) { return OUString( "com.sun.star.comp.svtools.AccessibleIconChoiceControl" ); } diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx index 794524017735..811fca30f4b5 100644 --- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx @@ -247,7 +247,7 @@ throw(RuntimeException, std::exception) // XServiceInfo - static methods - Sequence< OUString > AccessibleIconChoiceCtrlEntry::getSupportedServiceNames_Static(void) throw( RuntimeException ) + Sequence< OUString > AccessibleIconChoiceCtrlEntry::getSupportedServiceNames_Static() throw( RuntimeException ) { Sequence< OUString > aSupported(3); aSupported[0] = "com.sun.star.accessibility.AccessibleContext"; @@ -256,7 +256,7 @@ throw(RuntimeException, std::exception) return aSupported; } - OUString AccessibleIconChoiceCtrlEntry::getImplementationName_Static(void) throw( RuntimeException ) + OUString AccessibleIconChoiceCtrlEntry::getImplementationName_Static() throw( RuntimeException ) { return OUString( "com.sun.star.comp.svtools.AccessibleIconChoiceControlEntry" ); } diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx index 745394bcc77f..22cc0202e7bb 100644 --- a/accessibility/source/extended/accessiblelistbox.cxx +++ b/accessibility/source/extended/accessiblelistbox.cxx @@ -335,7 +335,7 @@ namespace accessibility // XServiceInfo - static methods - Sequence< OUString > AccessibleListBox::getSupportedServiceNames_Static(void) throw( RuntimeException ) + Sequence< OUString > AccessibleListBox::getSupportedServiceNames_Static() throw( RuntimeException ) { Sequence< OUString > aSupported(3); aSupported[0] = "com.sun.star.accessibility.AccessibleContext"; @@ -344,7 +344,7 @@ namespace accessibility return aSupported; } - OUString AccessibleListBox::getImplementationName_Static(void) throw( RuntimeException ) + OUString AccessibleListBox::getImplementationName_Static() throw( RuntimeException ) { return OUString( "com.sun.star.comp.svtools.AccessibleTreeListBox" ); } @@ -409,7 +409,7 @@ namespace accessibility } bool bHasButtons = (getListBox()->GetStyle() & WB_HASBUTTONS)!=0; - if( !(getListBox()->GetTreeFlags() & TREEFLAG_CHKBTN) ) + if( !(getListBox()->GetTreeFlags() & SvTreeFlags::CHKBTN) ) { if( bHasButtons ) nCase = 1; @@ -431,16 +431,16 @@ namespace accessibility if(getListBox()) { - short nType = getListBox()->GetAllEntriesAccessibleRoleType(); - if( nType == TREEBOX_ALLITEM_ACCROLE_TYPE_TREE) + SvTreeAccRoleType nType = getListBox()->GetAllEntriesAccessibleRoleType(); + if( nType == SvTreeAccRoleType::TREE) return AccessibleRole::TREE; - else if( nType == TREEBOX_ALLITEM_ACCROLE_TYPE_LIST) + else if( nType == SvTreeAccRoleType::LIST) return AccessibleRole::LIST; } //o is: return AccessibleRole::TREE; bool bHasButtons = (getListBox()->GetStyle() & WB_HASBUTTONS)!=0; - if(!bHasButtons && (getListBox()->GetTreeFlags() & TREEFLAG_CHKBTN)) + if(!bHasButtons && (getListBox()->GetTreeFlags() & SvTreeFlags::CHKBTN)) return AccessibleRole::LIST; else if (GetRoleType() == 0) diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx index a0aa0a760c21..7f68e1116ed9 100644 --- a/accessibility/source/extended/accessiblelistboxentry.cxx +++ b/accessibility/source/extended/accessiblelistboxentry.cxx @@ -273,7 +273,7 @@ namespace accessibility // XServiceInfo - static methods - Sequence< OUString > AccessibleListBoxEntry::getSupportedServiceNames_Static(void) throw( RuntimeException ) + Sequence< OUString > AccessibleListBoxEntry::getSupportedServiceNames_Static() throw( RuntimeException ) { Sequence< OUString > aSupported(3); aSupported[0] = "com.sun.star.accessibility.AccessibleContext"; @@ -282,7 +282,7 @@ namespace accessibility return aSupported; } - OUString AccessibleListBoxEntry::getImplementationName_Static(void) throw( RuntimeException ) + OUString AccessibleListBoxEntry::getImplementationName_Static() throw( RuntimeException ) { return OUString( "com.sun.star.comp.svtools.AccessibleTreeListBoxEntry" ); } @@ -393,7 +393,7 @@ namespace accessibility } bool bHasButtons = (getListBox()->GetStyle() & WB_HASBUTTONS)!=0; - if( !(getListBox()->GetTreeFlags() & TREEFLAG_CHKBTN) ) + if( !(getListBox()->GetTreeFlags() & SvTreeFlags::CHKBTN) ) { if( bHasButtons ) nCase = 1; @@ -416,14 +416,14 @@ namespace accessibility SvTreeListBox* pBox = getListBox(); if(pBox) { - short nType = pBox->GetAllEntriesAccessibleRoleType(); - if( nType == TREEBOX_ALLITEM_ACCROLE_TYPE_TREE) + SvTreeAccRoleType nType = pBox->GetAllEntriesAccessibleRoleType(); + if( nType == SvTreeAccRoleType::TREE) return AccessibleRole::TREE_ITEM; - else if( nType == TREEBOX_ALLITEM_ACCROLE_TYPE_LIST) + else if( nType == SvTreeAccRoleType::LIST) return AccessibleRole::LIST_ITEM; - sal_uInt16 treeFlag = pBox->GetTreeFlags(); - if(treeFlag & TREEFLAG_CHKBTN ) + SvTreeFlags treeFlag = pBox->GetTreeFlags(); + if(treeFlag & SvTreeFlags::CHKBTN ) { SvTreeListEntry* pEntry = pBox->GetEntryFromPath( m_aEntryPath ); SvButtonState eState = pBox->GetCheckButtonState( pEntry ); @@ -757,9 +757,9 @@ namespace accessibility // three actions supported SvTreeListBox* pBox = getListBox(); - sal_uInt16 treeFlag = pBox->GetTreeFlags(); + SvTreeFlags treeFlag = pBox->GetTreeFlags(); bool bHasButtons = (getListBox()->GetStyle() & WB_HASBUTTONS)!=0; - if( (treeFlag & TREEFLAG_CHKBTN) && !bHasButtons) + if( (treeFlag & SvTreeFlags::CHKBTN) && !bHasButtons) { sal_Int16 role = getAccessibleRole(); if ( role == AccessibleRole::CHECK_BOX ) @@ -781,8 +781,8 @@ namespace accessibility checkActionIndex_Impl( nIndex ); EnsureIsAlive(); - sal_uInt16 treeFlag = getListBox()->GetTreeFlags(); - if( nIndex == 0 && (treeFlag & TREEFLAG_CHKBTN) ) + SvTreeFlags treeFlag = getListBox()->GetTreeFlags(); + if( nIndex == 0 && (treeFlag & SvTreeFlags::CHKBTN) ) { if(getAccessibleRole() == AccessibleRole::CHECK_BOX) { @@ -794,7 +794,7 @@ namespace accessibility getListBox()->SetCheckButtonState(pEntry, SV_BUTTON_CHECKED); } } - else if( (nIndex == 1 && (treeFlag & TREEFLAG_CHKBTN) ) || (nIndex == 0) ) + else if( (nIndex == 1 && (treeFlag & SvTreeFlags::CHKBTN) ) || (nIndex == 0) ) { SvTreeListEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath ); if ( pEntry ) @@ -823,8 +823,8 @@ namespace accessibility // sal_Bool bHasButtons = (getListBox()->GetStyle() & WB_HASBUTTONS)!=0; SvTreeListEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath ); SvButtonState state = getListBox()->GetCheckButtonState( pEntry ); - sal_uInt16 treeFlag = getListBox()->GetTreeFlags(); - if(nIndex == 0 && (treeFlag & TREEFLAG_CHKBTN)) + SvTreeFlags treeFlag = getListBox()->GetTreeFlags(); + if(nIndex == 0 && (treeFlag & SvTreeFlags::CHKBTN)) { if(getAccessibleRole() == AccessibleRole::CHECK_BOX) { @@ -838,7 +838,7 @@ namespace accessibility //Sometimes, a List or Tree may have both checkbox and label at the same time return OUString(); } - }else if( (nIndex == 1 && (treeFlag & TREEFLAG_CHKBTN)) || nIndex == 0 ) + }else if( (nIndex == 1 && (treeFlag & SvTreeFlags::CHKBTN)) || nIndex == 0 ) { if( pEntry->HasChildren() || pEntry->HasChildrenOnDemand() ) return getListBox()->IsExpanded( pEntry ) ? \ diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx b/accessibility/source/extended/accessibletablistboxtable.cxx index 085bfb437bdc..d233aa62429a 100644 --- a/accessibility/source/extended/accessibletablistboxtable.cxx +++ b/accessibility/source/extended/accessibletablistboxtable.cxx @@ -271,7 +271,7 @@ namespace accessibility bool AccessibleTabListBoxTable::implIsRowSelected( sal_Int32 _nRow ) const { - return m_pTabListBox ? m_pTabListBox->IsSelected( m_pTabListBox->GetEntry( _nRow ) ) : false; + return m_pTabListBox && m_pTabListBox->IsSelected( m_pTabListBox->GetEntry( _nRow ) ); } void AccessibleTabListBoxTable::implSelectRow( sal_Int32 _nRow, bool _bSelect ) @@ -320,7 +320,7 @@ namespace accessibility // XServiceInfo - OUString AccessibleTabListBoxTable::getImplementationName (void) throw (RuntimeException, std::exception) + OUString AccessibleTabListBoxTable::getImplementationName() throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.svtools.AccessibleTabListBoxTable" ); } diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx index 6db5a54fc3f2..1e801a86e8fb 100644 --- a/accessibility/source/standard/vclxaccessiblebox.cxx +++ b/accessibility/source/standard/vclxaccessiblebox.cxx @@ -55,7 +55,7 @@ VCLXAccessibleBox::VCLXAccessibleBox (VCLXWindow* pVCLWindow, BoxType aType, boo m_bHasTextChild = true; } -VCLXAccessibleBox::~VCLXAccessibleBox (void) +VCLXAccessibleBox::~VCLXAccessibleBox() { } @@ -271,7 +271,7 @@ Reference< XAccessibleContext > SAL_CALL VCLXAccessibleBox::getAccessibleContext //===== XAccessibleContext ================================================== -sal_Int32 SAL_CALL VCLXAccessibleBox::getAccessibleChildCount (void) +sal_Int32 SAL_CALL VCLXAccessibleBox::getAccessibleChildCount() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -345,7 +345,7 @@ Reference<XAccessible> SAL_CALL VCLXAccessibleBox::getAccessibleChild (sal_Int32 return xChild; } -sal_Int16 SAL_CALL VCLXAccessibleBox::getAccessibleRole (void) throw (RuntimeException, std::exception) +sal_Int16 SAL_CALL VCLXAccessibleBox::getAccessibleRole() throw (RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -359,7 +359,7 @@ sal_Int16 SAL_CALL VCLXAccessibleBox::getAccessibleRole (void) throw (RuntimeExc return AccessibleRole::PANEL; } -sal_Int32 SAL_CALL VCLXAccessibleBox::getAccessibleIndexInParent (void) +sal_Int32 SAL_CALL VCLXAccessibleBox::getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception) { if (m_nIndexInParent != DEFAULT_INDEX_IN_PARENT) @@ -451,7 +451,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleBox::getAccessibleActionKeyBind //===== XComponent ========================================================== -void SAL_CALL VCLXAccessibleBox::disposing (void) +void SAL_CALL VCLXAccessibleBox::disposing() { VCLXAccessibleComponent::disposing(); } @@ -543,7 +543,7 @@ void VCLXAccessibleBox::FillAccessibleStateSet( utl::AccessibleStateSetHelper& r if ( sText.isEmpty() && nEntryCount > 0 ) rStateSet.AddState(AccessibleStateType::INDETERMINATE); } - else if (m_aBoxType == LISTBOX && m_bIsDropDownBox == true) + else if (m_aBoxType == LISTBOX && m_bIsDropDownBox) { sal_Int32 nSelectedEntryCount = 0; VclPtr< ListBox > pListBox = GetAs< ListBox >(); diff --git a/accessibility/source/standard/vclxaccessiblecombobox.cxx b/accessibility/source/standard/vclxaccessiblecombobox.cxx index f24ef8a24e8d..de97daac0cc1 100644 --- a/accessibility/source/standard/vclxaccessiblecombobox.cxx +++ b/accessibility/source/standard/vclxaccessiblecombobox.cxx @@ -39,11 +39,11 @@ VCLXAccessibleComboBox::VCLXAccessibleComboBox (VCLXWindow* pVCLWindow) -VCLXAccessibleComboBox::~VCLXAccessibleComboBox (void) +VCLXAccessibleComboBox::~VCLXAccessibleComboBox() { } -bool VCLXAccessibleComboBox::IsValid (void) const +bool VCLXAccessibleComboBox::IsValid() const { return GetWindow().get() != NULL; } @@ -58,7 +58,7 @@ void VCLXAccessibleComboBox::ProcessWindowEvent (const VclWindowEvent& rVclWindo //===== XServiceInfo ======================================================== -OUString VCLXAccessibleComboBox::getImplementationName (void) +OUString VCLXAccessibleComboBox::getImplementationName() throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.toolkit.AccessibleComboBox" ); @@ -67,7 +67,7 @@ OUString VCLXAccessibleComboBox::getImplementationName (void) -Sequence< OUString > VCLXAccessibleComboBox::getSupportedServiceNames (void) +Sequence< OUString > VCLXAccessibleComboBox::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames = VCLXAccessibleBox::getSupportedServiceNames(); diff --git a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx index 64a3625ad3e3..0e50ac8c8ea3 100644 --- a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx +++ b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx @@ -53,11 +53,11 @@ VCLXAccessibleDropDownComboBox::VCLXAccessibleDropDownComboBox (VCLXWindow* pVCL -VCLXAccessibleDropDownComboBox::~VCLXAccessibleDropDownComboBox (void) +VCLXAccessibleDropDownComboBox::~VCLXAccessibleDropDownComboBox() { } -bool VCLXAccessibleDropDownComboBox::IsValid (void) const +bool VCLXAccessibleDropDownComboBox::IsValid() const { return GetWindow().get() != NULL; } @@ -91,7 +91,7 @@ OUString VCLXAccessibleDropDownComboBox::getImplementationName() -Sequence< OUString > VCLXAccessibleDropDownComboBox::getSupportedServiceNames (void) +Sequence< OUString > VCLXAccessibleDropDownComboBox::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames = VCLXAccessibleBox::getSupportedServiceNames(); diff --git a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx index 41b578779ba4..2875852fd82d 100644 --- a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx +++ b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx @@ -56,7 +56,7 @@ VCLXAccessibleDropDownListBox::~VCLXAccessibleDropDownListBox() { } -bool VCLXAccessibleDropDownListBox::IsValid (void) const +bool VCLXAccessibleDropDownListBox::IsValid() const { return GetWindow().get() != NULL; } @@ -80,7 +80,7 @@ OUString VCLXAccessibleDropDownListBox::getImplementationName() -Sequence< OUString > VCLXAccessibleDropDownListBox::getSupportedServiceNames (void) +Sequence< OUString > VCLXAccessibleDropDownListBox::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames = VCLXAccessibleBox::getSupportedServiceNames(); diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx index 416075606510..f494d4b8629f 100644 --- a/accessibility/source/standard/vclxaccessiblelist.cxx +++ b/accessibility/source/standard/vclxaccessiblelist.cxx @@ -96,7 +96,7 @@ VCLXAccessibleList::VCLXAccessibleList (VCLXWindow* pVCLWindow, BoxType aBoxType } -VCLXAccessibleList::~VCLXAccessibleList (void) +VCLXAccessibleList::~VCLXAccessibleList() { delete m_pListBoxHelper; } @@ -108,7 +108,7 @@ void VCLXAccessibleList::SetIndexInParent (sal_Int32 nIndex) } -void SAL_CALL VCLXAccessibleList::disposing (void) +void SAL_CALL VCLXAccessibleList::disposing() { VCLXAccessibleComponent::disposing(); @@ -561,7 +561,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2(VCLXAccessibleList, VCLXAccessibleComponent, VC //===== XAccessible ========================================================= Reference<XAccessibleContext> SAL_CALL - VCLXAccessibleList::getAccessibleContext (void) + VCLXAccessibleList::getAccessibleContext() throw (RuntimeException, std::exception) { return this; @@ -570,7 +570,7 @@ Reference<XAccessibleContext> SAL_CALL //===== XAccessibleContext ================================================== -sal_Int32 SAL_CALL VCLXAccessibleList::getAccessibleChildCount (void) +sal_Int32 SAL_CALL VCLXAccessibleList::getAccessibleChildCount() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -614,7 +614,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleList::getAccessibleParent( ) return m_xParent; } -sal_Int32 SAL_CALL VCLXAccessibleList::getAccessibleIndexInParent (void) +sal_Int32 SAL_CALL VCLXAccessibleList::getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception) { if (m_nIndexInParent != DEFAULT_INDEX_IN_PARENT) @@ -623,20 +623,20 @@ sal_Int32 SAL_CALL VCLXAccessibleList::getAccessibleIndexInParent (void) return VCLXAccessibleComponent::getAccessibleIndexInParent(); } -sal_Int16 SAL_CALL VCLXAccessibleList::getAccessibleRole (void) +sal_Int16 SAL_CALL VCLXAccessibleList::getAccessibleRole() throw (RuntimeException, std::exception) { return AccessibleRole::LIST; } //===== XServiceInfo ========================================================== -OUString VCLXAccessibleList::getImplementationName (void) +OUString VCLXAccessibleList::getImplementationName() throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.toolkit.AccessibleList" ); } -Sequence< OUString > VCLXAccessibleList::getSupportedServiceNames (void) +Sequence< OUString > VCLXAccessibleList::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames = VCLXAccessibleComponent::getSupportedServiceNames(); diff --git a/accessibility/source/standard/vclxaccessiblelistbox.cxx b/accessibility/source/standard/vclxaccessiblelistbox.cxx index bd39b611fe68..bc48680703ae 100644 --- a/accessibility/source/standard/vclxaccessiblelistbox.cxx +++ b/accessibility/source/standard/vclxaccessiblelistbox.cxx @@ -50,11 +50,11 @@ VCLXAccessibleListBox::VCLXAccessibleListBox (VCLXWindow* pVCLWindow) -VCLXAccessibleListBox::~VCLXAccessibleListBox (void) +VCLXAccessibleListBox::~VCLXAccessibleListBox() { } -bool VCLXAccessibleListBox::IsValid (void) const +bool VCLXAccessibleListBox::IsValid() const { return GetWindow().get() != NULL; } @@ -66,7 +66,7 @@ void VCLXAccessibleListBox::ProcessWindowEvent (const VclWindowEvent& rVclWindow //===== XServiceInfo ======================================================== -OUString VCLXAccessibleListBox::getImplementationName (void) +OUString VCLXAccessibleListBox::getImplementationName() throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.toolkit.AccessibleListBox" ); @@ -75,7 +75,7 @@ OUString VCLXAccessibleListBox::getImplementationName (void) -Sequence< OUString > VCLXAccessibleListBox::getSupportedServiceNames (void) +Sequence< OUString > VCLXAccessibleListBox::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames = VCLXAccessibleBox::getSupportedServiceNames(); diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx index 7e934e205bd7..c9c1b16eb6d8 100644 --- a/accessibility/source/standard/vclxaccessiblelistitem.cxx +++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx @@ -629,7 +629,7 @@ void SAL_CALL VCLXAccessibleListItem::removeAccessibleEventListener( const Refer // AF (Oct. 29 2002): Return black as constant foreground color. This is an // initial implementation and has to be substituted by code that determines // the color that is actually used. -sal_Int32 SAL_CALL VCLXAccessibleListItem::getForeground (void) +sal_Int32 SAL_CALL VCLXAccessibleListItem::getForeground() throw (::com::sun::star::uno::RuntimeException, std::exception) { return COL_BLACK; @@ -638,7 +638,7 @@ sal_Int32 SAL_CALL VCLXAccessibleListItem::getForeground (void) // AF (Oct. 29 2002): Return white as constant background color. This is an // initial implementation and has to be substituted by code that determines // the color that is actually used. -sal_Int32 SAL_CALL VCLXAccessibleListItem::getBackground (void) +sal_Int32 SAL_CALL VCLXAccessibleListItem::getBackground() throw (::com::sun::star::uno::RuntimeException, std::exception) { return COL_WHITE; diff --git a/accessibility/source/standard/vclxaccessibletextfield.cxx b/accessibility/source/standard/vclxaccessibletextfield.cxx index 17a798198ca6..44461225ffdd 100644 --- a/accessibility/source/standard/vclxaccessibletextfield.cxx +++ b/accessibility/source/standard/vclxaccessibletextfield.cxx @@ -49,11 +49,11 @@ VCLXAccessibleTextField::VCLXAccessibleTextField (VCLXWindow* pVCLWindow, const -VCLXAccessibleTextField::~VCLXAccessibleTextField (void) +VCLXAccessibleTextField::~VCLXAccessibleTextField() { } -OUString VCLXAccessibleTextField::implGetText (void) +OUString VCLXAccessibleTextField::implGetText() { OUString aText; VclPtr< ListBox > pListBox = GetAs< ListBox >(); @@ -70,7 +70,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2(VCLXAccessibleTextField, VCLXAccessibleTextComp //===== XAccessible ========================================================= Reference<XAccessibleContext> SAL_CALL - VCLXAccessibleTextField::getAccessibleContext (void) + VCLXAccessibleTextField::getAccessibleContext() throw (RuntimeException, std::exception) { return this; @@ -79,7 +79,7 @@ Reference<XAccessibleContext> SAL_CALL //===== XAccessibleContext ================================================== -sal_Int32 SAL_CALL VCLXAccessibleTextField::getAccessibleChildCount (void) +sal_Int32 SAL_CALL VCLXAccessibleTextField::getAccessibleChildCount() throw (RuntimeException, std::exception) { return 0; @@ -97,7 +97,7 @@ Reference<XAccessible> SAL_CALL VCLXAccessibleTextField::getAccessibleChild (sal -sal_Int16 SAL_CALL VCLXAccessibleTextField::getAccessibleRole (void) +sal_Int16 SAL_CALL VCLXAccessibleTextField::getAccessibleRole() throw (RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -117,7 +117,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleTextField::getAccessibleParent( //===== XServiceInfo ========================================================== -OUString VCLXAccessibleTextField::getImplementationName (void) +OUString VCLXAccessibleTextField::getImplementationName() throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.toolkit.AccessibleTextField" ); @@ -126,7 +126,7 @@ OUString VCLXAccessibleTextField::getImplementationName (void) -Sequence< OUString > VCLXAccessibleTextField::getSupportedServiceNames (void) +Sequence< OUString > VCLXAccessibleTextField::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames = VCLXAccessibleTextComponent::getSupportedServiceNames(); |