diff options
| author | Noel Grandin <noel@peralex.com> | 2015-04-14 12:44:47 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-04-15 11:47:12 +0200 |
| commit | 71b809959bb8f775d83dc52628448bb8b8322b28 (patch) | |
| tree | f9aa4308050eb7d55611068602c0cf0e3c1b3690 | |
| parent | 135907f2061550624ee1859745d94eee01849070 (diff) | |
remove unnecessary use of void in function declarations
ie.
void f(void);
becomes
void f();
I used the following command to make the changes:
git grep -lP '\(\s*void\s*\)' -- *.cxx \
| xargs perl -pi -w -e 's/(\w+)\s*\(\s*void\s*\)/$1\(\)/g;'
and ran it for both .cxx and .hxx files.
Change-Id: I314a1b56e9c14d10726e32841736b0ad5eef8ddd
1645 files changed, 7931 insertions, 7931 deletions
diff --git a/accessibility/inc/accessibility/extended/accessibleiconchoicectrl.hxx b/accessibility/inc/accessibility/extended/accessibleiconchoicectrl.hxx index 99757a9144ce..92c8cc3087b7 100644 --- a/accessibility/inc/accessibility/extended/accessibleiconchoicectrl.hxx +++ b/accessibility/inc/accessibility/extended/accessibleiconchoicectrl.hxx @@ -78,8 +78,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 098c8e5d0d43..da1a386b1643 100644 --- a/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx +++ b/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx @@ -119,8 +119,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 739153c2fa0c..3032a8b9b578 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 92e6fe996706..272f3fcc7e22 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/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 432e3212563f..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 @@ -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/accessibleiconchoicectrl.cxx b/accessibility/source/extended/accessibleiconchoicectrl.cxx index 2048021fe771..5ed05d9c27e1 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 a24d05bc9135..8a5e6efef8ba 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 ad24412be5a2..b7af42d8ba09 100644 --- a/accessibility/source/extended/accessiblelistbox.cxx +++ b/accessibility/source/extended/accessiblelistbox.cxx @@ -340,7 +340,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"; @@ -349,7 +349,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" ); } diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx index a0aa0a760c21..991b165af3d7 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" ); } diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx b/accessibility/source/extended/accessibletablistboxtable.cxx index 085bfb437bdc..701c3bbf948a 100644 --- a/accessibility/source/extended/accessibletablistboxtable.cxx +++ b/accessibility/source/extended/accessibletablistboxtable.cxx @@ -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 15e3829dc202..efc11869c612 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(); } diff --git a/accessibility/source/standard/vclxaccessiblecombobox.cxx b/accessibility/source/standard/vclxaccessiblecombobox.cxx index db8d0593723f..25ed8f65c279 100644 --- a/accessibility/source/standard/vclxaccessiblecombobox.cxx +++ b/accessibility/source/standard/vclxaccessiblecombobox.cxx @@ -39,14 +39,14 @@ VCLXAccessibleComboBox::VCLXAccessibleComboBox (VCLXWindow* pVCLWindow) -VCLXAccessibleComboBox::~VCLXAccessibleComboBox (void) +VCLXAccessibleComboBox::~VCLXAccessibleComboBox() { } -bool VCLXAccessibleComboBox::IsValid (void) const +bool VCLXAccessibleComboBox::IsValid() const { return static_cast<ComboBox*>(GetWindow()) != NULL; @@ -65,7 +65,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" ); @@ -74,7 +74,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 f9557ef04da2..9659e5e4afcd 100644 --- a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx +++ b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx @@ -53,13 +53,13 @@ VCLXAccessibleDropDownComboBox::VCLXAccessibleDropDownComboBox (VCLXWindow* pVCL -VCLXAccessibleDropDownComboBox::~VCLXAccessibleDropDownComboBox (void) +VCLXAccessibleDropDownComboBox::~VCLXAccessibleDropDownComboBox() { } -bool VCLXAccessibleDropDownComboBox::IsValid (void) const +bool VCLXAccessibleDropDownComboBox::IsValid() const { return static_cast<ComboBox*>(GetWindow()) != NULL; @@ -97,7 +97,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 bfff68edb824..23e44f0b2bbd 100644 --- a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx +++ b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx @@ -59,7 +59,7 @@ VCLXAccessibleDropDownListBox::~VCLXAccessibleDropDownListBox() -bool VCLXAccessibleDropDownListBox::IsValid (void) const +bool VCLXAccessibleDropDownListBox::IsValid() const { return static_cast<ListBox*>(GetWindow()) != NULL; @@ -87,7 +87,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 7fc060ba89e2..cb70d1a3711d 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 701e0ba3d895..3fb9b1be3081 100644 --- a/accessibility/source/standard/vclxaccessiblelistbox.cxx +++ b/accessibility/source/standard/vclxaccessiblelistbox.cxx @@ -50,14 +50,14 @@ VCLXAccessibleListBox::VCLXAccessibleListBox (VCLXWindow* pVCLWindow) -VCLXAccessibleListBox::~VCLXAccessibleListBox (void) +VCLXAccessibleListBox::~VCLXAccessibleListBox() { } -bool VCLXAccessibleListBox::IsValid (void) const +bool VCLXAccessibleListBox::IsValid() const { return static_cast<ListBox*>(GetWindow()) != NULL; @@ -76,7 +76,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" ); @@ -85,7 +85,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 3219be877f37..82e27f87eb60 100644 --- a/accessibility/source/standard/vclxaccessibletextfield.cxx +++ b/accessibility/source/standard/vclxaccessibletextfield.cxx @@ -49,14 +49,14 @@ VCLXAccessibleTextField::VCLXAccessibleTextField (VCLXWindow* pVCLWindow, const -VCLXAccessibleTextField::~VCLXAccessibleTextField (void) +VCLXAccessibleTextField::~VCLXAccessibleTextField() { } -OUString VCLXAccessibleTextField::implGetText (void) +OUString VCLXAccessibleTextField::implGetText() { OUString aText; ListBox* pListBox = static_cast<ListBox*>(GetWindow()); @@ -76,7 +76,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2(VCLXAccessibleTextField, VCLXAccessibleTextComp //===== XAccessible ========================================================= Reference<XAccessibleContext> SAL_CALL - VCLXAccessibleTextField::getAccessibleContext (void) + VCLXAccessibleTextField::getAccessibleContext() throw (RuntimeException, std::exception) { return this; @@ -85,7 +85,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; @@ -103,7 +103,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() ); @@ -123,7 +123,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" ); @@ -132,7 +132,7 @@ OUString VCLXAccessibleTextField::getImplementationName (void) -Sequence< OUString > VCLXAccessibleTextField::getSupportedServiceNames (void) +Sequence< OUString > VCLXAccessibleTextField::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames = VCLXAccessibleTextComponent::getSupportedServiceNames(); diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx index d3f0b870745a..3fbad43d9a1f 100644 --- a/animations/source/animcore/animcore.cxx +++ b/animations/source/animcore/animcore.cxx @@ -144,7 +144,7 @@ public: // XServiceInfo OUString SAL_CALL getImplementationName() throw(std::exception) SAL_OVERRIDE; - Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(std::exception) SAL_OVERRIDE; + Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception) SAL_OVERRIDE; // XChild @@ -568,7 +568,7 @@ OUString getImplementationName_SET() return OUString( "animcore::AnimateSet" ); } -Sequence<OUString> getSupportedServiceNames_ANIMATECOLOR(void) +Sequence<OUString> getSupportedServiceNames_ANIMATECOLOR() { Sequence<OUString> aRet(1); aRet.getArray()[0] = "com.sun.star.animations.AnimateColor"; @@ -580,7 +580,7 @@ OUString getImplementationName_ANIMATECOLOR() return OUString( "animcore::AnimateColor" ); } -Sequence<OUString> getSupportedServiceNames_ANIMATEMOTION(void) +Sequence<OUString> getSupportedServiceNames_ANIMATEMOTION() { Sequence<OUString> aRet(1); aRet.getArray()[0] = "com.sun.star.animations.AnimateMotion"; @@ -881,7 +881,7 @@ sal_Bool AnimationNode::supportsService(const OUString& ServiceName) throw(std:: } // XServiceInfo -Sequence< OUString > AnimationNode::getSupportedServiceNames(void) throw(std::exception) +Sequence< OUString > AnimationNode::getSupportedServiceNames() throw(std::exception) { switch( mnNodeType ) { diff --git a/avmedia/source/gstreamer/gstplayer.hxx b/avmedia/source/gstreamer/gstplayer.hxx index 671251d977f1..f1be5d245cef 100644 --- a/avmedia/source/gstreamer/gstplayer.hxx +++ b/avmedia/source/gstreamer/gstplayer.hxx @@ -74,7 +74,7 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; protected: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr; diff --git a/avmedia/source/macavf/macavfcommon.hxx b/avmedia/source/macavf/macavfcommon.hxx index ff4559e823d9..c63df0d2486a 100644 --- a/avmedia/source/macavf/macavfcommon.hxx +++ b/avmedia/source/macavf/macavfcommon.hxx @@ -85,7 +85,7 @@ private: static MacAVObserverObject* mpMacAVObserverObject; public: virtual ~MacAVObserverHandler() {} - MacAVObserverObject* getObserver( void ) const; + MacAVObserverObject* getObserver() const; virtual bool handleObservation( NSString* pKeyPath ) = 0; }; diff --git a/avmedia/source/win/player.hxx b/avmedia/source/win/player.hxx index de0d3938dc26..38ff12a659e7 100644 --- a/avmedia/source/win/player.hxx +++ b/avmedia/source/win/player.hxx @@ -87,7 +87,7 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void); + virtual void SAL_CALL disposing(); private: diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index a27aa8ebead9..f81a931f74f7 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -1733,11 +1733,11 @@ struct WatchItem maMemberList.clear(); } - WatchItem* GetRootItem( void ); - SbxDimArray* GetRootArray( void ); + WatchItem* GetRootItem(); + SbxDimArray* GetRootArray(); }; -WatchItem* WatchItem::GetRootItem( void ) +WatchItem* WatchItem::GetRootItem() { WatchItem* pItem = mpArrayParentItem; while( pItem ) @@ -1749,7 +1749,7 @@ WatchItem* WatchItem::GetRootItem( void ) return pItem; } -SbxDimArray* WatchItem::GetRootArray( void ) +SbxDimArray* WatchItem::GetRootArray() { WatchItem* pRootItem = GetRootItem(); SbxDimArray* pRet = NULL; diff --git a/basctl/source/basicide/localizationmgr.cxx b/basctl/source/basicide/localizationmgr.cxx index 4b41ee3eed3a..7fa7f8d5429d 100644 --- a/basctl/source/basicide/localizationmgr.cxx +++ b/basctl/source/basicide/localizationmgr.cxx @@ -778,13 +778,13 @@ void LocalizationMgr::handleSetCurrentLocale(const css::lang::Locale& rLocale) } } -void LocalizationMgr::handleBasicStarted( void ) +void LocalizationMgr::handleBasicStarted() { if( m_xStringResourceManager.is() ) m_aLocaleBeforeBasicStart = m_xStringResourceManager->getCurrentLocale(); } -void LocalizationMgr::handleBasicStopped( void ) +void LocalizationMgr::handleBasicStopped() { try { diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index ea06d718b3cb..8793ca43aa89 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -1041,7 +1041,7 @@ void LibPage::InsertLib() } } -void LibPage::Export( void ) +void LibPage::Export() { SvTreeListEntry* pCurEntry = m_pLibBox->GetCurEntry(); OUString aLibName( SvTabListBox::GetEntryText( pCurEntry, 0 ) ); diff --git a/basctl/source/basicide/unomodel.cxx b/basctl/source/basicide/unomodel.cxx index 5ae9d532d4e5..db1c9bc1c42d 100644 --- a/basctl/source/basicide/unomodel.cxx +++ b/basctl/source/basicide/unomodel.cxx @@ -78,7 +78,7 @@ uno::Sequence< uno::Type > SAL_CALL SIDEModel::getTypes( ) throw(uno::RuntimeEx return aTypes; } -OUString SIDEModel::getImplementationName(void) throw( uno::RuntimeException, std::exception ) +OUString SIDEModel::getImplementationName() throw( uno::RuntimeException, std::exception ) { return getImplementationName_Static(); } @@ -92,12 +92,12 @@ sal_Bool SIDEModel::supportsService(const OUString& rServiceName) throw( uno::Ru { return cppu::supportsService(this, rServiceName); } -uno::Sequence< OUString > SIDEModel::getSupportedServiceNames(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SIDEModel::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { return getSupportedServiceNames_Static(); } -uno::Sequence< OUString > SIDEModel::getSupportedServiceNames_Static(void) +uno::Sequence< OUString > SIDEModel::getSupportedServiceNames_Static() { uno::Sequence< OUString > aRet(1); OUString* pArray = aRet.getArray(); diff --git a/basctl/source/basicide/unomodel.hxx b/basctl/source/basicide/unomodel.hxx index e18383e7b278..e7225c91124b 100644 --- a/basctl/source/basicide/unomodel.hxx +++ b/basctl/source/basicide/unomodel.hxx @@ -42,11 +42,11 @@ public: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) 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; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XStorable2 virtual void SAL_CALL storeSelf( const ::com::sun::star::uno::Sequence< css::beans::PropertyValue >& ) diff --git a/basctl/source/inc/localizationmgr.hxx b/basctl/source/inc/localizationmgr.hxx index 54376cc44a10..f118dfe9a101 100644 --- a/basctl/source/inc/localizationmgr.hxx +++ b/basctl/source/inc/localizationmgr.hxx @@ -58,11 +58,11 @@ class LocalizationMgr xStringResourceManager, ::com::sun::star::uno::Reference< ::com::sun::star::resource:: XStringResourceResolver > xSourceStringResolver, HandleResourceMode eMode ); - void enableResourceForAllLibraryDialogs( void ) + void enableResourceForAllLibraryDialogs() { implEnableDisableResourceForAllLibraryDialogs( SET_IDS ); } - void disableResourceForAllLibraryDialogs( void ) + void disableResourceForAllLibraryDialogs() { implEnableDisableResourceForAllLibraryDialogs( RESET_IDS ); } @@ -73,14 +73,14 @@ public: const ::com::sun::star::uno::Reference < ::com::sun::star::resource::XStringResourceManager >& xStringResourceManager ); ::com::sun::star::uno::Reference - < ::com::sun::star::resource::XStringResourceManager >getStringResourceManager( void ) + < ::com::sun::star::resource::XStringResourceManager >getStringResourceManager() { return m_xStringResourceManager; } - bool isLibraryLocalized( void ); + bool isLibraryLocalized(); - void handleTranslationbar( void ); + void handleTranslationbar(); void handleAddLocales( const ::com::sun::star::uno::Sequence < ::com::sun::star::lang::Locale >& aLocaleSeq ); @@ -92,9 +92,9 @@ public: void handleSetCurrentLocale(const css::lang::Locale& rLocale); - void handleBasicStarted( void ); + void handleBasicStarted(); - void handleBasicStopped( void ); + void handleBasicStopped(); static void setControlResourceIDsForNewEditorObject(DlgEditor* pEditor, const css::uno::Any& rControlAny, const OUString& aCtrlName); diff --git a/basic/inc/sbobjmod.hxx b/basic/inc/sbobjmod.hxx index 0f586a9e3a66..cd673bfd71bd 100644 --- a/basic/inc/sbobjmod.hxx +++ b/basic/inc/sbobjmod.hxx @@ -78,7 +78,7 @@ public: void triggerLayoutEvent(); void triggerResizeEvent(); - bool getInitState( void ) + bool getInitState() { return mbInit; } void setInitState( bool bInit ) { mbInit = bInit; } diff --git a/basic/inc/sbprop.hxx b/basic/inc/sbprop.hxx index 20126eaaa25b..83347e5622aa 100644 --- a/basic/inc/sbprop.hxx +++ b/basic/inc/sbprop.hxx @@ -56,7 +56,7 @@ public: {} TYPEINFO_OVERRIDE(); - bool isSet( void ) + bool isSet() { return mbSet; } void setSet( bool bSet ) { mbSet = bSet; } diff --git a/basic/qa/cppunit/basic_coverage.cxx b/basic/qa/cppunit/basic_coverage.cxx index 7e8fd225239d..1c4cb3a8ef52 100644 --- a/basic/qa/cppunit/basic_coverage.cxx +++ b/basic/qa/cppunit/basic_coverage.cxx @@ -26,8 +26,8 @@ private: OUString m_sCurrentTest; void process_directory(const OUString& sDirName); void run_test(const OUString& sFileName); - void test_failed(void); - void test_success(void); + void test_failed(); + void test_success(); StringVec get_subdirnames( const OUString& sDirName ); public: @@ -136,7 +136,7 @@ void Coverage::process_directory(const OUString& sDirName) fprintf(stderr,"end process directory\n"); } -void Coverage::Coverage_Iterator(void) +void Coverage::Coverage_Iterator() { OUString sDirName = getURLFromSrc("/basic/qa/basic_coverage/"); diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index 795b97207ef4..070ece1b4ede 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -116,7 +116,7 @@ struct BasicManagerImpl boost::ptr_vector<BasicLibInfo> aLibs; OUString aBasicLibPath; - BasicManagerImpl( void ) + BasicManagerImpl() : mpManagerStream( NULL ) , mppLibStreams( NULL ) , mnLibStreamCount( 0 ) @@ -429,7 +429,7 @@ public: static BasicLibInfo* Create( SotStorageStream& rSStream ); - uno::Reference< script::XLibraryContainer > GetLibraryContainer( void ) + uno::Reference< script::XLibraryContainer > GetLibraryContainer() { return mxScriptCont; } void SetLibraryContainer( const uno::Reference< script::XLibraryContainer >& xScriptCont ) { mxScriptCont = xScriptCont; } diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx index 281ee8d3b906..20b1fda7ac6c 100644 --- a/basic/source/classes/propacc.cxx +++ b/basic/source/classes/propacc.cxx @@ -62,7 +62,7 @@ SbPropertyValues::~SbPropertyValues() -Reference< XPropertySetInfo > SbPropertyValues::getPropertySetInfo(void) throw( RuntimeException, std::exception ) +Reference< XPropertySetInfo > SbPropertyValues::getPropertySetInfo() throw( RuntimeException, std::exception ) { // create on demand? if (!m_xInfo.is()) @@ -159,7 +159,7 @@ void SbPropertyValues::removeVetoableChangeListener( -Sequence< PropertyValue > SbPropertyValues::getPropertyValues(void) throw (::com::sun::star::uno::RuntimeException, std::exception) +Sequence< PropertyValue > SbPropertyValues::getPropertyValues() throw (::com::sun::star::uno::RuntimeException, std::exception) { Sequence<PropertyValue> aRet( m_aPropVals.size() ); for (size_t n = 0; n < m_aPropVals.size(); ++n) @@ -244,7 +244,7 @@ SbPropertySetInfo::~SbPropertySetInfo() -Sequence< Property > SbPropertySetInfo::getProperties(void) throw( RuntimeException, std::exception ) +Sequence< Property > SbPropertySetInfo::getProperties() throw( RuntimeException, std::exception ) { return aImpl.getProperties(); } diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index 08fc825797ce..c78880ef32ea 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -802,7 +802,7 @@ SbxVariable* SbClassModuleObject::Find( const OUString& rName, SbxClassType t ) return pRes; } -void SbClassModuleObject::triggerInitializeEvent( void ) +void SbClassModuleObject::triggerInitializeEvent() { if( mbInitializeEventDone ) { @@ -820,7 +820,7 @@ void SbClassModuleObject::triggerInitializeEvent( void ) } } -void SbClassModuleObject::triggerTerminateEvent( void ) +void SbClassModuleObject::triggerTerminateEvent() { if( !mbInitializeEventDone || GetSbData()->bRunInit ) { @@ -836,18 +836,18 @@ void SbClassModuleObject::triggerTerminateEvent( void ) } -SbClassData::SbClassData( void ) +SbClassData::SbClassData() { mxIfaces = new SbxArray(); } -void SbClassData::clear( void ) +void SbClassData::clear() { mxIfaces->Clear(); maRequiredTypes.clear(); } -SbClassFactory::SbClassFactory( void ) +SbClassFactory::SbClassFactory() { OUString aDummyName; xClassModules = new SbxObject( aDummyName ); @@ -1164,7 +1164,7 @@ struct ClassModuleRunInitItem bool m_bProcessing; bool m_bRunInitDone; - ClassModuleRunInitItem( void ) + ClassModuleRunInitItem() : m_pModule( NULL ) , m_bProcessing( false ) , m_bRunInitDone( false ) @@ -1286,7 +1286,7 @@ void StarBASIC::InitAllModules( StarBASIC* pBasicNotToInit ) // #88329 Put modules back to not initialised state to // force reinitialisation at next start -void StarBASIC::DeInitAllModules( void ) +void StarBASIC::DeInitAllModules() { // Deinit own modules for ( sal_uInt16 nMod = 0; nMod < pModules->Count(); nMod++ ) @@ -1637,7 +1637,7 @@ struct BasicStringList_Impl : private Resource ~BasicStringList_Impl() { FreeResource(); } OUString GetString(){ return aResId.toString(); } - bool IsErrorTextAvailable( void ) + bool IsErrorTextAvailable() { return IsAvailableRes(aResId.SetRT(RSC_STRING)); } }; @@ -1853,7 +1853,7 @@ void StarBASIC::SetGlobalBreakHdl( const Link& rLink ) GetSbData()->aBreakHdl = rLink; } -SbxArrayRef StarBASIC::getUnoListeners( void ) +SbxArrayRef StarBASIC::getUnoListeners() { if( !xUnoListeners.Is() ) { diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 9c39792d25d1..e49e63822719 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -169,14 +169,14 @@ void SetSbUnoObjectDfltPropName( SbxObject* pObj ) } // save CoreReflection statically -Reference< XIdlReflection > getCoreReflection_Impl( void ) +Reference< XIdlReflection > getCoreReflection_Impl() { return css::reflection::theCoreReflection::get( comphelper::getProcessComponentContext()); } // save CoreReflection statically -Reference< XHierarchicalNameAccess > getCoreReflection_HierarchicalNameAccess_Impl( void ) +Reference< XHierarchicalNameAccess > getCoreReflection_HierarchicalNameAccess_Impl() { static Reference< XHierarchicalNameAccess > xCoreReflection_HierarchicalNameAccess; @@ -193,7 +193,7 @@ Reference< XHierarchicalNameAccess > getCoreReflection_HierarchicalNameAccess_Im } // Hold TypeProvider statically -Reference< XHierarchicalNameAccess > getTypeProvider_Impl( void ) +Reference< XHierarchicalNameAccess > getTypeProvider_Impl() { static Reference< XHierarchicalNameAccess > xAccess; @@ -219,7 +219,7 @@ Reference< XHierarchicalNameAccess > getTypeProvider_Impl( void ) } // Hold TypeConverter statically -Reference< XTypeConverter > getTypeConverter_Impl( void ) +Reference< XTypeConverter > getTypeConverter_Impl() { static Reference< XTypeConverter > xTypeConverter; @@ -465,7 +465,7 @@ struct ObjectItem typedef std::vector< ObjectItem > NativeObjectWrapperVector; class GaNativeObjectWrapperVector : public rtl::Static<NativeObjectWrapperVector, GaNativeObjectWrapperVector> {}; -void clearNativeObjectWrapperVector( void ) +void clearNativeObjectWrapperVector() { GaNativeObjectWrapperVector::get().clear(); } @@ -2426,7 +2426,7 @@ SbUnoObject::~SbUnoObject() // pass the introspection on Demand -void SbUnoObject::doIntrospection( void ) +void SbUnoObject::doIntrospection() { if( !bNeedIntrospection ) return; @@ -2523,7 +2523,7 @@ void clearUnoMethodsForBasic( StarBASIC* pBasic ) } } -void clearUnoMethods( void ) +void clearUnoMethods() { SbUnoMethod* pMeth = pFirst; while( pMeth ) @@ -2596,7 +2596,7 @@ SbxInfo* SbUnoMethod::GetInfo() return pInfo; } -const Sequence<ParamInfo>& SbUnoMethod::getParamInfos( void ) +const Sequence<ParamInfo>& SbUnoMethod::getParamInfos() { if (!pParamInfoSeq) { @@ -2800,7 +2800,7 @@ SbxVariable* SbUnoObject::Find( const OUString& rName, SbxClassType t ) // help method to create the dbg_-Properties -void SbUnoObject::implCreateDbgProperties( void ) +void SbUnoObject::implCreateDbgProperties() { Property aProp; @@ -2817,7 +2817,7 @@ void SbUnoObject::implCreateDbgProperties( void ) QuickInsert( (SbxVariable*)xVarRef ); } -void SbUnoObject::implCreateAll( void ) +void SbUnoObject::implCreateAll() { // throw away all existing methods and properties pMethods = new SbxArray; @@ -2882,7 +2882,7 @@ void SbUnoObject::implCreateAll( void ) // output the value -Any SbUnoObject::getUnoAny( void ) +Any SbUnoObject::getUnoAny() { Any aRetAny; if( bNeedIntrospection ) doIntrospection(); @@ -3770,7 +3770,7 @@ void SbUnoService::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, static SbUnoServiceCtor* pFirstCtor = NULL; -void clearUnoServiceCtors( void ) +void clearUnoServiceCtors() { SbUnoServiceCtor* pCtor = pFirstCtor; while( pCtor ) @@ -4006,7 +4006,7 @@ public: const Reference< XAllListener >& AllListener, const Any& Helper ); // XInvocation - virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection(void) throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection() throw( RuntimeException, std::exception ) SAL_OVERRIDE; virtual Any SAL_CALL invoke(const OUString& FunctionName, const Sequence< Any >& Params, Sequence< sal_Int16 >& OutParamIndex, Sequence< Any >& OutParam) throw( IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setValue(const OUString& PropertyName, const Any& Value) @@ -4057,7 +4057,7 @@ InvocationToAllListenerMapper::InvocationToAllListenerMapper } -Reference< XIntrospectionAccess > SAL_CALL InvocationToAllListenerMapper::getIntrospection(void) +Reference< XIntrospectionAccess > SAL_CALL InvocationToAllListenerMapper::getIntrospection() throw( RuntimeException, std::exception ) { return Reference< XIntrospectionAccess >(); @@ -4899,7 +4899,7 @@ SbxVariable* SbUnoStructRefObject::Find( const OUString& rName, SbxClassType t ) } // help method to create the dbg_-Properties -void SbUnoStructRefObject::implCreateDbgProperties( void ) +void SbUnoStructRefObject::implCreateDbgProperties() { Property aProp; @@ -4944,7 +4944,7 @@ void SbUnoStructRefObject::implCreateAll() } // output the value -Any SbUnoStructRefObject::getUnoAny( void ) +Any SbUnoStructRefObject::getUnoAny() { return maMemberInfo.getValue(); } diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 36c852042847..4aeb38e700cb 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -1416,7 +1416,7 @@ void SbModule::ClearVarsDependingOnDeletedBasic( StarBASIC* pDeletedBasic ) } } -void StarBASIC::ClearAllModuleVars( void ) +void StarBASIC::ClearAllModuleVars() { // Initialise the own module for ( sal_uInt16 nMod = 0; nMod < pModules->Count(); nMod++ ) @@ -1470,7 +1470,7 @@ void SbModule::GlobalRunInit( bool bBasicStart ) } } -void SbModule::GlobalRunDeInit( void ) +void SbModule::GlobalRunDeInit() { StarBASIC *pBasic = PTR_CAST(StarBASIC,GetParent()); if( pBasic ) @@ -2519,20 +2519,20 @@ void SbUserFormModule::triggerMethod( const OUString& aMethodToRun, Sequence< An } } -void SbUserFormModule::triggerActivateEvent( void ) +void SbUserFormModule::triggerActivateEvent() { SAL_INFO("basic", "**** entering SbUserFormModule::triggerActivate"); triggerMethod( "UserForm_Activate" ); SAL_INFO("basic", "**** leaving SbUserFormModule::triggerActivate"); } -void SbUserFormModule::triggerDeactivateEvent( void ) +void SbUserFormModule::triggerDeactivateEvent() { SAL_INFO("basic", "**** SbUserFormModule::triggerDeactivate"); triggerMethod( "Userform_Deactivate" ); } -void SbUserFormModule::triggerInitializeEvent( void ) +void SbUserFormModule::triggerInitializeEvent() { if ( mbInit ) return; @@ -2541,19 +2541,19 @@ void SbUserFormModule::triggerInitializeEvent( void ) mbInit = true; } -void SbUserFormModule::triggerTerminateEvent( void ) +void SbUserFormModule::triggerTerminateEvent() { SAL_INFO("basic", "**** SbUserFormModule::triggerTerminateEvent"); triggerMethod(OUString( "Userform_Terminate" )); mbInit=false; } -void SbUserFormModule::triggerLayoutEvent( void ) +void SbUserFormModule::triggerLayoutEvent() { triggerMethod(OUString( "Userform_Layout" )); } -void SbUserFormModule::triggerResizeEvent( void ) +void SbUserFormModule::triggerResizeEvent() { triggerMethod(OUString("Userform_Resize")); } diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx index b38154b1b534..faafb0d5eb22 100644 --- a/basic/source/comp/parser.cxx +++ b/basic/source/comp/parser.cxx @@ -849,7 +849,7 @@ inline void addStringConst( SbiSymPool& rPool, const char* pSym, const char* pSt addStringConst( rPool, pSym, OUString::createFromAscii( pStr ) ); } -void SbiParser::AddConstants( void ) +void SbiParser::AddConstants() { // #113063 Create constant RTL symbols addStringConst( aPublics, "vbCr", "\x0D" ); diff --git a/basic/source/comp/sbcomp.cxx b/basic/source/comp/sbcomp.cxx index b02ca86eb8b3..99dc47890626 100644 --- a/basic/source/comp/sbcomp.cxx +++ b/basic/source/comp/sbcomp.cxx @@ -348,7 +348,7 @@ struct FunctionItem bool m_bBlockAll; bool m_bBlockSteps; - FunctionItem( void ) + FunctionItem() : m_dTotalTime( 0.0 ) , m_dNetTime( 0.0 ) , m_nCallCount( 0 ) @@ -367,7 +367,7 @@ bool compareFunctionNetTime( FunctionItem* p1, FunctionItem* p2 ) return (p1->m_dNetTime > p2->m_dNetTime); } -void lcl_printTimeOutput( void ) +void lcl_printTimeOutput() { // Overall time output lcl_lineOut( "" ); @@ -428,7 +428,7 @@ void lcl_printTimeOutput( void ) static bool GbInitTraceAlreadyCalled = false; -void dbg_InitTrace( void ) +void dbg_InitTrace() { if( GbInitOnlyAtOfficeStart && GbInitTraceAlreadyCalled ) { @@ -466,7 +466,7 @@ void dbg_InitTrace( void ) #endif } -void dbg_DeInitTrace( void ) +void dbg_DeInitTrace() { GbTraceOn = GbSavTraceOn; diff --git a/basic/source/comp/token.cxx b/basic/source/comp/token.cxx index 3d5e048ddcee..553de30f7d28 100644 --- a/basic/source/comp/token.cxx +++ b/basic/source/comp/token.cxx @@ -183,7 +183,7 @@ static const TokenTable aTokTable_Basic [] = { // #i109076 -TokenLabelInfo::TokenLabelInfo( void ) +TokenLabelInfo::TokenLabelInfo() { m_pTokenCanBeLabelTab = new bool[VBASUPPORT+1]; for( int i = 0 ; i <= VBASUPPORT ; ++i ) diff --git a/basic/source/inc/codegen.hxx b/basic/source/inc/codegen.hxx index 4304713e55b5..1b928cca5114 100644 --- a/basic/source/inc/codegen.hxx +++ b/basic/source/inc/codegen.hxx @@ -50,8 +50,8 @@ public: void Save(); // #29955 service for-loop-level - void IncForLevel( void ) { nForLevel++; } - void DecForLevel( void ) { nForLevel--; } + void IncForLevel() { nForLevel++; } + void DecForLevel() { nForLevel--; } static sal_uInt32 calcNewOffSet( sal_uInt8* pCode, sal_uInt16 nOffset ); static sal_uInt16 calcLegacyOffSet( sal_uInt8* pCode, sal_uInt32 nOffset ); diff --git a/basic/source/inc/dlgcont.hxx b/basic/source/inc/dlgcont.hxx index 13a10dc92693..c3084be98896 100644 --- a/basic/source/inc/dlgcont.hxx +++ b/basic/source/inc/dlgcont.hxx @@ -59,7 +59,7 @@ class SfxDialogLibraryContainer : public SfxLibraryContainer virtual void SAL_CALL importFromOldStorage( const OUString& aFile ) SAL_OVERRIDE; - virtual SfxLibraryContainer* createInstanceImpl( void ) SAL_OVERRIDE; + virtual SfxLibraryContainer* createInstanceImpl() SAL_OVERRIDE; virtual void onNewRootStorage() SAL_OVERRIDE; @@ -69,7 +69,7 @@ class SfxDialogLibraryContainer : public SfxLibraryContainer virtual const sal_Char* SAL_CALL getLibrariesDir() const SAL_OVERRIDE; public: - SfxDialogLibraryContainer( void ); + SfxDialogLibraryContainer(); SfxDialogLibraryContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); // Methods XStorageBasedLibraryContainer @@ -107,8 +107,8 @@ class SfxDialogLibrary :public SfxLibrary OUString m_aName; // Provide modify state including resources - virtual bool isModified( void ) SAL_OVERRIDE; - virtual void storeResources( void ) SAL_OVERRIDE; + virtual bool isModified() SAL_OVERRIDE; + virtual void storeResources() SAL_OVERRIDE; virtual void storeResourcesAsURL( const OUString& URL, const OUString& NewName ) SAL_OVERRIDE; virtual void storeResourcesToURL( const OUString& URL, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler ) SAL_OVERRIDE; @@ -142,11 +142,11 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceResolver > SAL_CALL getStringResource( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - OUString getName( void ) + OUString getName() { return m_aName; } ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourcePersistence > - getStringResourcePersistence( void ) + getStringResourcePersistence() { return m_xStringResourcePersistence; } diff --git a/basic/source/inc/errobject.hxx b/basic/source/inc/errobject.hxx index f76b8d2de421..588a69ef3de8 100644 --- a/basic/source/inc/errobject.hxx +++ b/basic/source/inc/errobject.hxx @@ -31,7 +31,7 @@ class SbxErrObject : public SbUnoObject SbxErrObject( const OUString& aName_, const com::sun::star::uno::Any& aUnoObj_ ); virtual ~SbxErrObject(); - class ErrObject* getImplErrObject( void ) + class ErrObject* getImplErrObject() { return m_pErrObject; } public: diff --git a/basic/source/inc/expr.hxx b/basic/source/inc/expr.hxx index 9f4b5adc1fff..4994df661875 100644 --- a/basic/source/inc/expr.hxx +++ b/basic/source/inc/expr.hxx @@ -116,7 +116,7 @@ class SbiExprNode { // operators (and operands) void GenElement( SbiOpcode ); void BaseInit( SbiParser* p ); // help function for Ctor, from 17.12.95 public: - SbiExprNode( void ); + SbiExprNode(); SbiExprNode( SbiParser*, double, SbxDataType ); SbiExprNode( SbiParser*, const OUString& ); SbiExprNode( SbiParser*, const SbiSymDef&, SbxDataType, SbiExprList* = NULL ); diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx index 9e20a0865363..82b9ddf9b80c 100644 --- a/basic/source/inc/namecont.hxx +++ b/basic/source/inc/namecont.hxx @@ -293,7 +293,7 @@ protected: virtual SfxLibrary* SAL_CALL implCreateLibraryLink ( const OUString& aName, const OUString& aLibInfoFileURL, const OUString& StorageURL, bool ReadOnly ) = 0; - virtual ::com::sun::star::uno::Any SAL_CALL createEmptyLibraryElement( void ) = 0; + virtual ::com::sun::star::uno::Any SAL_CALL createEmptyLibraryElement() = 0; virtual bool SAL_CALL isLibraryElementValid(const css::uno::Any& rElement) const = 0; virtual void SAL_CALL writeLibraryElement ( @@ -331,11 +331,11 @@ protected: // #56666, Creates another library container // instance of the same derived class - virtual SfxLibraryContainer* createInstanceImpl( void ) = 0; + virtual SfxLibraryContainer* createInstanceImpl() = 0; // Interface to get the BasicManager (Hack for password implementation) - BasicManager* getBasicManager( void ); + BasicManager* getBasicManager(); OUString createAppLibraryFolder( SfxLibrary* pLib, const OUString& aName ); void init( const OUString& rInitialDocumentURL, @@ -375,10 +375,10 @@ protected: private: void init_Impl( const OUString& rInitialDocumentURL, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _rxInitialStorage ); - void implScanExtensions( void ); + void implScanExtensions(); public: - SfxLibraryContainer( void ); + SfxLibraryContainer(); virtual ~SfxLibraryContainer(); @@ -600,8 +600,8 @@ private: // Additional functionality for localisation // Provide modify state including resources - virtual bool isModified( void ) = 0; - virtual void storeResources( void ) = 0; + virtual bool isModified() = 0; + virtual void storeResources() = 0; virtual void storeResourcesAsURL( const OUString& URL, const OUString& NewName ) = 0; virtual void storeResourcesToURL( const OUString& URL, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler ) = 0; @@ -744,7 +744,7 @@ public: class ScriptExtensionIterator { public: - ScriptExtensionIterator( void ); + ScriptExtensionIterator(); OUString nextBasicOrDialogLibrary( bool& rbPureDialogLib ); protected: diff --git a/basic/source/inc/parser.hxx b/basic/source/inc/parser.hxx index 018b8955a2e2..1d277b4b22fd 100644 --- a/basic/source/inc/parser.hxx +++ b/basic/source/inc/parser.hxx @@ -88,7 +88,7 @@ public: // from 31.3.1996, search symbol in the runtime-library SbiSymDef* CheckRTLForSym( const OUString& rSym, SbxDataType eType ); - void AddConstants( void ); + void AddConstants(); bool HasGlobalCode(); diff --git a/basic/source/inc/propacc.hxx b/basic/source/inc/propacc.hxx index db0bc7454af3..61f246d1c64a 100644 --- a/basic/source/inc/propacc.hxx +++ b/basic/source/inc/propacc.hxx @@ -51,7 +51,7 @@ public: // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue) @@ -82,7 +82,7 @@ public: throw (std::exception) SAL_OVERRIDE; // XPropertyAccess - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues(void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValues(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& PropertyValues_) 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, std::exception) SAL_OVERRIDE; }; @@ -104,7 +104,7 @@ public: PropertySetInfoImpl( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& rProps ); // XPropertySetInfo - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties(void) throw () { return _aProps;} + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties() throw () { return _aProps;} ::com::sun::star::beans::Property SAL_CALL getPropertyByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException ); bool SAL_CALL hasPropertyByName(const OUString& Name) @@ -120,7 +120,7 @@ public: virtual ~SbPropertySetInfo(); // XPropertySetInfo - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties(void) + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx index 33758e30d252..fc7d093d26c6 100644 --- a/basic/source/inc/runtime.hxx +++ b/basic/source/inc/runtime.hxx @@ -69,7 +69,7 @@ struct SbiForStack { // for/next stack: sal_Int32* pArrayUpperBounds; css::uno::Reference< css::container::XEnumeration > xEnumeration; - SbiForStack( void ) + SbiForStack() : pNext(NULL) , eForType(FOR_TO) , nCurCollectionIndex(0) @@ -176,18 +176,18 @@ public: OUString GetErrorMsg() { return aErrorMsg; } sal_Int32 GetErl() { return nErl; } void EnableReschedule( bool bEnable ) { bReschedule = bEnable; } - bool IsReschedule( void ) { return bReschedule; } + bool IsReschedule() { return bReschedule; } void EnableCompatibility( bool bEnable ) { bCompatibility = bEnable; } - bool IsCompatibility( void ) { return bCompatibility; } + bool IsCompatibility() { return bCompatibility; } - ComponentVector_t& getComponentVector( void ) { return ComponentVector; } + ComponentVector_t& getComponentVector() { return ComponentVector; } SbMethod* GetCaller( sal_uInt16 ); SbModule* GetActiveModule(); SbiIoSystem* GetIoSystem() { return pIosys; } SbiDdeControl* GetDdeControl() { return pDdeCtrl; } - StarBASIC* GetBasic( void ) { return pBasic; } + StarBASIC* GetBasic() { return pBasic; } SbiDllMgr* GetDllMgr(); SbiRTLData* GetRTLData() const { return const_cast<SbiRTLData*>(&aRTLData); } @@ -282,7 +282,7 @@ class SbiRuntime pItem->xRef = pVar; pRefSaveList = pItem; } - void ClearRefs( void ) + void ClearRefs() { while( pRefSaveList ) { @@ -398,8 +398,8 @@ public: void DumpPCode(); bool Step(); // single step (one opcode) void Stop() { bRun = false; } - void block( void ) { bBlocked = true; } - void unblock( void ) { bBlocked = false; } + void block() { bBlocked = true; } + void unblock() { bBlocked = false; } SbMethod* GetMethod() { return pMeth; } SbModule* GetModule() { return pMod; } sal_uInt16 GetDebugFlags() { return nFlags; } @@ -437,12 +437,12 @@ StarBASIC* GetCurrentBasic( StarBASIC* pRTBasic ); // no DDE functionality, no DLLCALL) in basic because // of portal "virtual" users (portal user != UNIX user) // (Implemented in iosys.cxx) -bool needSecurityRestrictions( void ); +bool needSecurityRestrictions(); // Returns true if UNO is available, otherwise the old // file system implementation has to be used // (Implemented in iosys.cxx) -bool hasUno( void ); +bool hasUno(); // Converts possibly relative paths to absolute paths // according to the setting done by ChDir/ChDrive diff --git a/basic/source/inc/sbintern.hxx b/basic/source/inc/sbintern.hxx index e03517c4b75f..e36873d1c20b 100644 --- a/basic/source/inc/sbintern.hxx +++ b/basic/source/inc/sbintern.hxx @@ -53,10 +53,10 @@ struct SbClassData // needed for initialization order of class modules StringVector maRequiredTypes; - SbClassData( void ); - ~SbClassData( void ) + SbClassData(); + ~SbClassData() { clear(); } - void clear( void ); + void clear(); }; // #115824: Factory class to create class objects (type command) @@ -66,7 +66,7 @@ class BASIC_DLLPUBLIC SbClassFactory : public SbxFactory SbxObjectRef xClassModules; public: - SbClassFactory( void ); + SbClassFactory(); virtual ~SbClassFactory(); void AddClassModule( SbModule* pClassModule ); diff --git a/basic/source/inc/sbtrace.hxx b/basic/source/inc/sbtrace.hxx index e52a27ceaa60..a12b302aa9f6 100644 --- a/basic/source/inc/sbtrace.hxx +++ b/basic/source/inc/sbtrace.hxx @@ -36,8 +36,8 @@ //#define DBG_TRACE_PROFILING #ifdef DBG_TRACE_BASIC -void dbg_InitTrace( void ); -void dbg_DeInitTrace( void ); +void dbg_InitTrace(); +void dbg_DeInitTrace(); void dbg_traceStep( SbModule* pModule, UINT32 nPC, INT32 nCallLvl ); void dbg_traceNotifyCall( SbModule* pModule, SbMethod* pMethod, INT32 nCallLvl, bool bLeave = false ); void dbg_traceNotifyError( SbError nTraceErr, const String& aTraceErrMsg, bool bTraceErrHandled, INT32 nCallLvl ); diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx index cac1d4b1c336..12b9cd73ef96 100644 --- a/basic/source/inc/sbunoobj.hxx +++ b/basic/source/inc/sbunoobj.hxx @@ -92,7 +92,7 @@ public: virtual SbxVariable* Find( const OUString&, SbxClassType ) SAL_OVERRIDE; // Force creation of all properties for debugging - void createAllProperties( void ) + void createAllProperties() { implCreateAll(); } // give out value @@ -112,11 +112,11 @@ class SbUnoObject: public SbxObject ::com::sun::star::uno::Any maTmpUnoObj; // Only to save obj for doIntrospection! ::boost::shared_ptr< SbUnoStructRefObject > maStructInfo; // help method to establish the dbg_-properties - void implCreateDbgProperties( void ); + void implCreateDbgProperties(); // help method to establish all properties and methods // (on the on-demand-mechanism required for the dbg_-properties) - void implCreateAll( void ); + void implCreateAll(); public: static bool getDefaultPropName( SbUnoObject* pUnoObj, OUString& sDfltProp ); @@ -125,35 +125,35 @@ public: virtual ~SbUnoObject(); // #76470 do introspection on demand - void doIntrospection( void ); + void doIntrospection(); // override Find to support e. g. NameAccess virtual SbxVariable* Find( const OUString&, SbxClassType ) SAL_OVERRIDE; // Force creation of all properties for debugging - void createAllProperties( void ) + void createAllProperties() { implCreateAll(); } // give out value - ::com::sun::star::uno::Any getUnoAny( void ); - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XIntrospectionAccess > getIntrospectionAccess( void ) { return mxUnoAccess; } - ::com::sun::star::uno::Reference< ::com::sun::star::script::XInvocation > getInvocation( void ) { return mxInvocation; } + ::com::sun::star::uno::Any getUnoAny(); + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XIntrospectionAccess > getIntrospectionAccess() { return mxUnoAccess; } + ::com::sun::star::uno::Reference< ::com::sun::star::script::XInvocation > getInvocation() { return mxInvocation; } void SFX_NOTIFY( SfxBroadcaster&, const TypeId&, const SfxHint& rHint, const TypeId& ) SAL_OVERRIDE; - bool isNativeCOMObject( void ) + bool isNativeCOMObject() { return bNativeCOMObject; } }; typedef tools::SvRef<SbUnoObject> SbUnoObjectRef; // #67781 delete return values of the uno-methods -void clearUnoMethods( void ); +void clearUnoMethods(); void clearUnoMethodsForBasic( StarBASIC* pBasic ); class SbUnoMethod : public SbxMethod { friend class SbUnoObject; - friend void clearUnoMethods( void ); + friend void clearUnoMethods(); friend void clearUnoMethodsForBasic( StarBASIC* pBasic ); ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlMethod > m_xUnoMethod; @@ -175,11 +175,11 @@ public: virtual ~SbUnoMethod(); virtual SbxInfo* GetInfo() SAL_OVERRIDE; - const ::com::sun::star::uno::Sequence< ::com::sun::star::reflection::ParamInfo >& getParamInfos( void ); + const ::com::sun::star::uno::Sequence< ::com::sun::star::reflection::ParamInfo >& getParamInfos(); - bool isInvocationBased( void ) + bool isInvocationBased() { return mbInvocation; } - bool needsDirectInvocation( void ) + bool needsDirectInvocation() { return mbDirectInvocation; } }; @@ -206,7 +206,7 @@ public: const ::com::sun::star::beans::Property& aUnoProp_, sal_Int32 nId_, bool bInvocation, bool bUnoStruct ); bool isUnoStruct() { return mbUnoStruct; } - bool isInvocationBased( void ) + bool isInvocationBased() { return mbInvocation; } SbxDataType getRealType() { return mRealType; } }; @@ -238,7 +238,7 @@ public: virtual SbxVariable* Find( const OUString&, SbxClassType ) SAL_OVERRIDE; - const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass >& getUnoClass( void ) { return m_xClass; } + const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass >& getUnoClass() { return m_xClass; } }; @@ -271,12 +271,12 @@ public: SbUnoService* findUnoService( const OUString& rName ); -void clearUnoServiceCtors( void ); +void clearUnoServiceCtors(); class SbUnoServiceCtor : public SbxMethod { friend class SbUnoService; - friend void clearUnoServiceCtors( void ); + friend void clearUnoServiceCtors(); ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XServiceConstructorDescription > m_xServiceCtorDesc; @@ -289,7 +289,7 @@ public: virtual ~SbUnoServiceCtor(); virtual SbxInfo* GetInfo() SAL_OVERRIDE; - ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XServiceConstructorDescription > getServiceCtorDesc( void ) + ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XServiceConstructorDescription > getServiceCtorDesc() { return m_xServiceCtorDesc; } }; @@ -321,7 +321,7 @@ public: , mVal( rVal ) {} - const ::com::sun::star::uno::Any& getValue( void ) + const ::com::sun::star::uno::Any& getValue() { return mVal; } TYPEINFO_OVERRIDE(); @@ -340,7 +340,7 @@ public: : maNameSeq( nSeqSize ) {} - ::com::sun::star::uno::Sequence< OUString >& getNames( void ) + ::com::sun::star::uno::Sequence< OUString >& getNames() { return maNameSeq; } }; @@ -359,7 +359,7 @@ void RTL_Impl_EqualUnoObjects( StarBASIC* pBasic, SbxArray& rPar, bool bWrite ); void RTL_Impl_GetDefaultContext( StarBASIC* pBasic, SbxArray& rPar, bool bWrite ); void disposeComVariablesForBasic( StarBASIC* pBasic ); -void clearNativeObjectWrapperVector( void ); +void clearNativeObjectWrapperVector(); diff --git a/basic/source/inc/scanner.hxx b/basic/source/inc/scanner.hxx index 82ea17cc0331..43bab7bcbbbc 100644 --- a/basic/source/inc/scanner.hxx +++ b/basic/source/inc/scanner.hxx @@ -82,8 +82,8 @@ public: sal_Int32 GetCol2() { return nCol2; } void SetCol1( sal_Int32 n ) { nCol1 = n; } StarBASIC* GetBasic() { return pBasic; } - void SaveLine(void) { pSaveLine = pLine; } - void RestoreLine(void) { pLine = pSaveLine; } + void SaveLine() { pSaveLine = pLine; } + void RestoreLine() { pLine = pSaveLine; } void LockColumn(); void UnlockColumn(); bool DoesColonFollow(); diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx index 5b5f496fc165..c3662775cea8 100644 --- a/basic/source/inc/scriptcont.hxx +++ b/basic/source/inc/scriptcont.hxx @@ -59,7 +59,7 @@ class SfxScriptLibraryContainer : public SfxLibraryContainer, public OldBasicPas virtual void SAL_CALL importFromOldStorage( const OUString& aFile ) SAL_OVERRIDE; - virtual SfxLibraryContainer* createInstanceImpl( void ) SAL_OVERRIDE; + virtual SfxLibraryContainer* createInstanceImpl() SAL_OVERRIDE; // Password encryption @@ -92,7 +92,7 @@ class SfxScriptLibraryContainer : public SfxLibraryContainer, public OldBasicPas virtual const sal_Char* SAL_CALL getLibrariesDir() const SAL_OVERRIDE; public: - SfxScriptLibraryContainer( void ); + SfxScriptLibraryContainer(); SfxScriptLibraryContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); @@ -139,8 +139,8 @@ class SfxScriptLibrary : public SfxLibrary, public SfxScriptLibrary_BASE ModuleInfoMap mModuleInfos; // Provide modify state including resources - virtual bool isModified( void ) SAL_OVERRIDE; - virtual void storeResources( void ) SAL_OVERRIDE; + virtual bool isModified() SAL_OVERRIDE; + virtual void storeResources() SAL_OVERRIDE; virtual void storeResourcesAsURL( const OUString& URL, const OUString& NewName ) SAL_OVERRIDE; virtual void storeResourcesToURL( const OUString& URL, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler ) SAL_OVERRIDE; diff --git a/basic/source/inc/symtbl.hxx b/basic/source/inc/symtbl.hxx index 0f759f947591..3c67c8d7af83 100644 --- a/basic/source/inc/symtbl.hxx +++ b/basic/source/inc/symtbl.hxx @@ -145,7 +145,7 @@ public: void SetDefinedAs() { bAs = true; } void SetGlobal(bool b){ bGlobal = b; } void SetDefaultId( sal_uInt16 n ) { nDefaultId = n; } - sal_uInt16 GetDefaultId( void ) { return nDefaultId; } + sal_uInt16 GetDefaultId() { return nDefaultId; } bool IsOptional() const{ return bOpt; } bool IsParamArray() const{ return bParamArray; } bool IsWithEvents() const{ return bWithEvents; } @@ -155,7 +155,7 @@ public: bool IsNew() const { return bNew; } bool IsDefinedAs() const { return bAs; } bool IsGlobal() const { return bGlobal; } - short GetFixedStringLength( void ) const { return nFixedStringLength; } + short GetFixedStringLength() const { return nFixedStringLength; } void SetFixedStringLength( short n ) { nFixedStringLength = n; } SbiSymPool& GetPool(); diff --git a/basic/source/inc/token.hxx b/basic/source/inc/token.hxx index 0b6482ac98ff..a136f39293f1 100644 --- a/basic/source/inc/token.hxx +++ b/basic/source/inc/token.hxx @@ -120,7 +120,7 @@ class TokenLabelInfo bool* m_pTokenCanBeLabelTab; public: - TokenLabelInfo( void ); + TokenLabelInfo(); TokenLabelInfo( const TokenLabelInfo& rInfo ) : m_pTokenCanBeLabelTab( NULL ) { (void)rInfo; } diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index 76020c585b4f..ae6d03e256fc 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -209,7 +209,7 @@ OUString findUserInDescription( const OUString& aDescription ) return user; } -bool needSecurityRestrictions( void ) +bool needSecurityRestrictions() { static bool bNeedInit = true; static bool bRetVal = true; @@ -276,7 +276,7 @@ bool needSecurityRestrictions( void ) // Returns sal_True if UNO is available, otherwise the old file // system implementation has to be used // #89378 New semantic: Don't just ask for UNO but for UCB -bool hasUno( void ) +bool hasUno() { static bool bNeedInit = true; static bool bRetVal = true; @@ -929,7 +929,7 @@ SbiStream* SbiIoSystem::GetStream( short nChannel ) const return pRet; } -void SbiIoSystem::CloseAll(void) +void SbiIoSystem::CloseAll() { for( short i = 1; i < CHANNELS; i++ ) { diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 623b092c6651..17e2c5f0c712 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -121,7 +121,7 @@ static void FilterWhiteSpace( OUString& rStr ) static long GetDayDiff( const Date& rDate ); -static const CharClass& GetCharClass( void ) +static const CharClass& GetCharClass() { static bool bNeedsInit = true; static LanguageTag aLanguageTag( LANGUAGE_SYSTEM); @@ -161,7 +161,7 @@ OUString getFullPath( const OUString& aRelPath ) } // TODO: -> SbiGlobals -static uno::Reference< ucb::XSimpleFileAccess3 > getFileAccess( void ) +static uno::Reference< ucb::XSimpleFileAccess3 > getFileAccess() { static uno::Reference< ucb::XSimpleFileAccess3 > xSFI; if( !xSFI.is() ) @@ -2379,7 +2379,7 @@ double Now_Impl() return aSerial; } -// Date Now(void) +// Date Now() RTLFUNC(Now) { @@ -2388,7 +2388,7 @@ RTLFUNC(Now) rPar.Get(0)->PutDate( Now_Impl() ); } -// Date Time(void) +// Date Time() RTLFUNC(Time) { diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx index 86aed45c93c2..be21232d68f0 100644 --- a/basic/source/runtime/methods1.cxx +++ b/basic/source/runtime/methods1.cxx @@ -67,7 +67,7 @@ using namespace com::sun::star::lang; using namespace com::sun::star::sheet; using namespace com::sun::star::uno; -static Reference< XCalendar4 > getLocaleCalendar( void ) +static Reference< XCalendar4 > getLocaleCalendar() { static Reference< XCalendar4 > xCalendar; if( !xCalendar.is() ) diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index 122b8fccaad8..fc3b7f844a5c 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -1771,7 +1771,7 @@ struct DimAsNewRecoverItem SbxObject* m_pObjParent; SbModule* m_pClassModule; - DimAsNewRecoverItem( void ) + DimAsNewRecoverItem() : m_pObjParent( NULL ) , m_pClassModule( NULL ) {} diff --git a/basic/source/sbx/sbxdec.cxx b/basic/source/sbx/sbxdec.cxx index ba2fc8a40a2e..267bee9a3c0a 100644 --- a/basic/source/sbx/sbxdec.cxx +++ b/basic/source/sbx/sbxdec.cxx @@ -26,7 +26,7 @@ #include <boost/scoped_array.hpp> // Implementation SbxDecimal -SbxDecimal::SbxDecimal( void ) +SbxDecimal::SbxDecimal() { setInt( 0 ); mnRefCount = 0; @@ -118,14 +118,14 @@ bool SbxDecimal::operator *= ( const SbxDecimal &r ) return bRet; } -bool SbxDecimal::neg( void ) +bool SbxDecimal::neg() { HRESULT hResult = VarDecNeg( &maDec, &maDec ); bool bRet = ( hResult == S_OK ); return bRet; } -bool SbxDecimal::isZero( void ) +bool SbxDecimal::isZero() { SbxDecimal aZeroDec; aZeroDec.setLong( 0 ); @@ -306,12 +306,12 @@ bool SbxDecimal::operator *= ( const SbxDecimal &r ) return false; } -bool SbxDecimal::neg( void ) +bool SbxDecimal::neg() { return false; } -bool SbxDecimal::isZero( void ) +bool SbxDecimal::isZero() { return false; } diff --git a/basic/source/sbx/sbxdec.hxx b/basic/source/sbx/sbxdec.hxx index 1e6c91bfddfc..a821c96f9011 100644 --- a/basic/source/sbx/sbxdec.hxx +++ b/basic/source/sbx/sbxdec.hxx @@ -51,13 +51,13 @@ class SbxDecimal sal_Int32 mnRefCount; public: - SbxDecimal( void ); + SbxDecimal(); SbxDecimal( const SbxDecimal& rDec ); SbxDecimal( const com::sun::star::bridge::oleautomation::Decimal& rAutomationDec ); ~SbxDecimal(); - void addRef( void ) + void addRef() { mnRefCount++; } void fillAutomationDecimal( com::sun::star::bridge::oleautomation::Decimal& rAutomationDec ); @@ -98,9 +98,9 @@ public: bool operator += ( const SbxDecimal &r ); bool operator /= ( const SbxDecimal &r ); bool operator *= ( const SbxDecimal &r ); - bool neg( void ); + bool neg(); - bool isZero( void ); + bool isZero(); enum CmpResult { LT, EQ, GT }; friend CmpResult compare( const SbxDecimal &rLeft, const SbxDecimal &rRight ); diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx index f22df239205f..6ba986d97bab 100644 --- a/basic/source/sbx/sbxscan.cxx +++ b/basic/source/sbx/sbxscan.cxx @@ -563,7 +563,7 @@ bool SbxValue::Scan( const OUString& rSrc, sal_uInt16* pLen ) } -ResMgr* implGetResMgr( void ) +ResMgr* implGetResMgr() { static ResMgr* pResMgr = NULL; if( !pResMgr ) diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx index 56f88c29e7cb..0771c71bc203 100644 --- a/basic/source/sbx/sbxvar.cxx +++ b/basic/source/sbx/sbxvar.cxx @@ -47,7 +47,7 @@ class SbxVariableImpl Reference< XInterface > m_xComListener; StarBASIC* m_pComListenerParentBasic; - SbxVariableImpl( void ) + SbxVariableImpl() : m_pComListenerParentBasic( NULL ) {} SbxVariableImpl( const SbxVariableImpl& r ) @@ -430,7 +430,7 @@ void SbxVariable::SetParent( SbxObject* p ) pParent = p; } -SbxVariableImpl* SbxVariable::getImpl( void ) +SbxVariableImpl* SbxVariable::getImpl() { if( mpSbxVariableImpl == NULL ) { @@ -439,7 +439,7 @@ SbxVariableImpl* SbxVariable::getImpl( void ) return mpSbxVariableImpl; } -const OUString& SbxVariable::GetDeclareClassName( void ) +const OUString& SbxVariable::GetDeclareClassName() { SbxVariableImpl* pImpl = getImpl(); return pImpl->m_aDeclareClassName; @@ -462,7 +462,7 @@ void SbxVariable::SetComListener( ::com::sun::star::uno::Reference< ::com::sun:: #endif } -void SbxVariable::ClearComListener( void ) +void SbxVariable::ClearComListener() { SbxVariableImpl* pImpl = getImpl(); pImpl->m_xComListener.clear(); diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx index 5876bed79035..66becfa53f3c 100644 --- a/basic/source/uno/dlgcont.cxx +++ b/basic/source/uno/dlgcont.cxx @@ -71,7 +71,7 @@ const sal_Char* SAL_CALL SfxDialogLibraryContainer::getLibElementFileExtension() const sal_Char* SAL_CALL SfxDialogLibraryContainer::getLibrariesDir() const { return "Dialogs"; } // Ctor for service -SfxDialogLibraryContainer::SfxDialogLibraryContainer( void ) +SfxDialogLibraryContainer::SfxDialogLibraryContainer() { // all initialisation has to be done // by calling XInitialization::initialize @@ -340,7 +340,7 @@ void SAL_CALL SfxDialogLibraryContainer::importFromOldStorage( const OUString& ) // Nothing to do here, old dialogs cannot be imported } -SfxLibraryContainer* SfxDialogLibraryContainer::createInstanceImpl( void ) +SfxLibraryContainer* SfxDialogLibraryContainer::createInstanceImpl() { return new SfxDialogLibraryContainer(); } @@ -495,7 +495,7 @@ IMPLEMENT_FORWARD_XINTERFACE2( SfxDialogLibrary, SfxLibrary, SfxDialogLibrary_BA IMPLEMENT_FORWARD_XTYPEPROVIDER2( SfxDialogLibrary, SfxLibrary, SfxDialogLibrary_BASE ); // Provide modify state including resources -bool SfxDialogLibrary::isModified( void ) +bool SfxDialogLibrary::isModified() { bool bRet = implIsModified(); @@ -506,7 +506,7 @@ bool SfxDialogLibrary::isModified( void ) return bRet; } -void SfxDialogLibrary::storeResources( void ) +void SfxDialogLibrary::storeResources() { if( m_xStringResourcePersistence.is() ) m_xStringResourcePersistence->store(); diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index adc6905a43bb..8b6510e49d30 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -376,7 +376,7 @@ bool VBAScriptListenerContainer::implTypedNotify( const Reference< vba::XVBAScri } // Ctor -SfxLibraryContainer::SfxLibraryContainer( void ) +SfxLibraryContainer::SfxLibraryContainer() : SfxLibraryContainer_BASE( maMutex ) , maVBAScriptListeners( maMutex ) @@ -1265,7 +1265,7 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL, } } -void SfxLibraryContainer::implScanExtensions( void ) +void SfxLibraryContainer::implScanExtensions() { #if HAVE_FEATURE_EXTENSIONS ScriptExtensionIterator aScriptIt; @@ -3284,7 +3284,7 @@ void SAL_CALL SfxLibrary::removeChangesListener( const Reference< XChangesListen #define sBasicLibMediaType "application/vnd.sun.star.basic-library" #define sDialogLibMediaType "application/vnd.sun.star.dialog-library" -ScriptExtensionIterator::ScriptExtensionIterator( void ) +ScriptExtensionIterator::ScriptExtensionIterator() : m_xContext( comphelper::getProcessComponentContext() ) , m_eState( USER_EXTENSIONS ) , m_bUserPackagesLoaded( false ) diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx index a422f2a6a840..cedd2e553eeb 100644 --- a/basic/source/uno/scriptcont.cxx +++ b/basic/source/uno/scriptcont.cxx @@ -128,7 +128,7 @@ bool SfxScriptLibraryContainer::hasLibraryPassword( const OUString& rLibraryName } // Ctor for service -SfxScriptLibraryContainer::SfxScriptLibraryContainer( void ) +SfxScriptLibraryContainer::SfxScriptLibraryContainer() :maScriptLanguage( "StarBasic" ) { // all initialisation has to be done @@ -160,7 +160,7 @@ SfxLibrary* SfxScriptLibraryContainer::implCreateLibraryLink( const OUString& aN return pRet; } -Any SAL_CALL SfxScriptLibraryContainer::createEmptyLibraryElement( void ) +Any SAL_CALL SfxScriptLibraryContainer::createEmptyLibraryElement() { OUString aMod; Any aRetAny; @@ -354,7 +354,7 @@ Any SAL_CALL SfxScriptLibraryContainer::importLibraryElement return aRetAny; } -SfxLibraryContainer* SfxScriptLibraryContainer::createInstanceImpl( void ) +SfxLibraryContainer* SfxScriptLibraryContainer::createInstanceImpl() { return new SfxScriptLibraryContainer(); } @@ -1237,12 +1237,12 @@ bool SfxScriptLibrary::isLoadedStorable() } // Provide modify state including resources -bool SfxScriptLibrary::isModified( void ) +bool SfxScriptLibrary::isModified() { return implIsModified(); // No resources } -void SfxScriptLibrary::storeResources( void ) +void SfxScriptLibrary::storeResources() { // No resources } diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx b/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx index 1bde6e3b9952..9c254914d400 100644 --- a/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx @@ -79,7 +79,7 @@ namespace CPPU_CURRENT_NAMESPACE __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); } -extern "C" void privateSnippetExecutor(void); +extern "C" void privateSnippetExecutor(); namespace arm { diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx index 8670f0d40801..f9960819bde7 100644 --- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx @@ -59,7 +59,7 @@ #define HWCAP_ARM_VFP 64 -int hasVFP(void) +int hasVFP() { int fd = open ("/proc/self/auxv", O_RDONLY); if (fd == -1) diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx index 68799e419d73..bba1ce6a771f 100644 --- a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx @@ -553,7 +553,7 @@ namespace */ // static void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** gpregptr, void** fpregptr, void** ovrflw) // static void cpp_vtable_call( int nFunctionIndex, int nVtableOffset, void** gpregptr, void** ovrflw) - static void cpp_vtable_call(void) + static void cpp_vtable_call() { int nFunctionIndex; int vTableOffset; diff --git a/bridges/source/cpp_uno/mingw_intel/dllinit.cxx b/bridges/source/cpp_uno/mingw_intel/dllinit.cxx index 0b004d7de92e..5b9bb38eaa26 100644 --- a/bridges/source/cpp_uno/mingw_intel/dllinit.cxx +++ b/bridges/source/cpp_uno/mingw_intel/dllinit.cxx @@ -20,8 +20,8 @@ #include <windows.h> -void dso_init(void); -void dso_exit(void); +void dso_init(); +void dso_exit(); extern "C" BOOL WINAPI DllMain(HMODULE hModule, DWORD dwReason, LPVOID lpvReserved) diff --git a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx index 229159f6f3ae..78d4bcc7b72b 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx @@ -354,7 +354,7 @@ static typelib_TypeClass __cdecl cpp_mediate( * is called on incoming vtable calls * (called by asm snippets) */ -static __declspec(naked) void __cdecl cpp_vtable_call(void) +static __declspec(naked) void __cdecl cpp_vtable_call() { __asm { diff --git a/bridges/source/cpp_uno/msvc_win32_intel/dllinit.cxx b/bridges/source/cpp_uno/msvc_win32_intel/dllinit.cxx index d523b63aa975..2e96e8478380 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/dllinit.cxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/dllinit.cxx @@ -25,8 +25,8 @@ #pragma warning(pop) -void dso_init(void); -void dso_exit(void); +void dso_init(); +void dso_exit(); extern "C" BOOL WINAPI DllMain(HMODULE hModule, DWORD dwReason, LPVOID lpvReserved) diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/dllinit.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/dllinit.cxx index d523b63aa975..2e96e8478380 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/dllinit.cxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/dllinit.cxx @@ -25,8 +25,8 @@ #pragma warning(pop) -void dso_init(void); -void dso_exit(void); +void dso_init(); +void dso_exit(); extern "C" BOOL WINAPI DllMain(HMODULE hModule, DWORD dwReason, LPVOID lpvReserved) diff --git a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx index 8ca98a841f15..3d583235b0c9 100644 --- a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx +++ b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx @@ -38,16 +38,16 @@ static bridges::cpp_uno::shared::VtableFactory * pInstance; #if defined(__GNUG__) && !defined(__MINGW32__) -extern "C" void dso_init(void) __attribute__((constructor)); -extern "C" void dso_exit(void) __attribute__((destructor)); +extern "C" void dso_init() __attribute__((constructor)); +extern "C" void dso_exit() __attribute__((destructor)); #endif -void dso_init(void) { +void dso_init() { if (!pInstance) pInstance = new bridges::cpp_uno::shared::VtableFactory(); } -void dso_exit(void) { +void dso_exit() { if (pInstance) { delete pInstance; diff --git a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx index fba970761567..86f2b59faa6e 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx @@ -62,7 +62,7 @@ uno::Sequence< OUString > ChartTypeUnoDlg::getSupportedServiceNames_Static() aSNS.getArray()[ 0 ] = CHART_TYPE_DIALOG_SERVICE_NAME; return aSNS; } -uno::Sequence< sal_Int8 > SAL_CALL ChartTypeUnoDlg::getImplementationId( void ) throw( uno::RuntimeException, std::exception ) +uno::Sequence< sal_Int8 > SAL_CALL ChartTypeUnoDlg::getImplementationId() throw( uno::RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx index 5a777db94004..1672e8d0b6b4 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx @@ -157,7 +157,7 @@ uno::Sequence< uno::Type > CreationWizardUnoDlg::getTypes() throw(uno::RuntimeEx return aTypeList; } -uno::Sequence< sal_Int8 > SAL_CALL CreationWizardUnoDlg::getImplementationId( void ) throw( uno::RuntimeException, std::exception ) +uno::Sequence< sal_Int8 > SAL_CALL CreationWizardUnoDlg::getImplementationId() throw( uno::RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } diff --git a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx index 95dc944b7aae..6bf4e0f2851a 100644 --- a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx +++ b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx @@ -37,8 +37,8 @@ public: ChartTypeUnoDlg( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); // XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void); - static OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); + static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); private: virtual ~ChartTypeUnoDlg(); diff --git a/chart2/source/controller/main/ShapeToolbarController.hxx b/chart2/source/controller/main/ShapeToolbarController.hxx index 73b98c748ee2..8bdb1ed096d2 100644 --- a/chart2/source/controller/main/ShapeToolbarController.hxx +++ b/chart2/source/controller/main/ShapeToolbarController.hxx @@ -67,7 +67,7 @@ public: // needed by registration static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XInitialization diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx index ebf404f0db30..279f18d0ce6e 100644 --- a/comphelper/source/eventattachermgr/eventattachermgr.cxx +++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx @@ -120,7 +120,7 @@ public: throw( IllegalArgumentException, RuntimeException, std::exception ) SAL_OVERRIDE; // Methods of XPersistObject - virtual OUString SAL_CALL getServiceName(void) throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getServiceName() throw( RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL write(const Reference< XObjectOutputStream >& OutStream) throw( IOException, RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL read(const Reference< XObjectInputStream >& InStream) throw( IOException, RuntimeException, std::exception ) SAL_OVERRIDE; @@ -744,7 +744,7 @@ void SAL_CALL ImplEventAttacherManager::removeScriptListener(const Reference< XS // Methods of XPersistObject -OUString SAL_CALL ImplEventAttacherManager::getServiceName(void) +OUString SAL_CALL ImplEventAttacherManager::getServiceName() throw( RuntimeException, std::exception ) { return OUString( "com.sun.star.uno.script.EventAttacherManager" ); diff --git a/comphelper/source/misc/serviceinfohelper.cxx b/comphelper/source/misc/serviceinfohelper.cxx index 656490f595ec..5b040045e28e 100644 --- a/comphelper/source/misc/serviceinfohelper.cxx +++ b/comphelper/source/misc/serviceinfohelper.cxx @@ -33,7 +33,7 @@ OUString SAL_CALL ServiceInfoHelper::getImplementationName() throw( ::com::sun:: } /** the base implementation has no supported services */ -::com::sun::star::uno::Sequence< OUString > ServiceInfoHelper::getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +::com::sun::star::uno::Sequence< OUString > ServiceInfoHelper::getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) { ::com::sun::star::uno::Sequence< OUString> aSeq(0); return aSeq; diff --git a/comphelper/source/misc/syntaxhighlight.cxx b/comphelper/source/misc/syntaxhighlight.cxx index 11ec7231fa52..41dd9f2a070c 100644 --- a/comphelper/source/misc/syntaxhighlight.cxx +++ b/comphelper/source/misc/syntaxhighlight.cxx @@ -274,7 +274,7 @@ public: HighlighterLanguage const aLanguage; Tokenizer( HighlighterLanguage aLang ); - ~Tokenizer( void ); + ~Tokenizer(); void getHighlightPortions(const OUString& rLine, /*out*/std::vector<HighlightPortion>& portions) const; @@ -661,7 +661,7 @@ SyntaxHighlighter::Tokenizer::Tokenizer( HighlighterLanguage aLang ): aLanguage( nKeyWordCount = 0; } -SyntaxHighlighter::Tokenizer::~Tokenizer( void ) +SyntaxHighlighter::Tokenizer::~Tokenizer() { } diff --git a/comphelper/source/property/opropertybag.hxx b/comphelper/source/property/opropertybag.hxx index 2e6349747a7a..02145997dc35 100644 --- a/comphelper/source/property/opropertybag.hxx +++ b/comphelper/source/property/opropertybag.hxx @@ -93,8 +93,8 @@ namespace comphelper public: // XServiceInfo - static versions - 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 ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); diff --git a/comphelper/source/xml/attributelist.cxx b/comphelper/source/xml/attributelist.cxx index de5e58b3fadf..49b8864522fa 100644 --- a/comphelper/source/xml/attributelist.cxx +++ b/comphelper/source/xml/attributelist.cxx @@ -53,7 +53,7 @@ struct AttributeList_Impl ::std::vector<struct TagAttribute_Impl> vecAttribute; }; -sal_Int16 SAL_CALL AttributeList::getLength(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +sal_Int16 SAL_CALL AttributeList::getLength() throw( ::com::sun::star::uno::RuntimeException, std::exception ) { return (sal_Int16)(m_pImpl->vecAttribute.size()); } diff --git a/compilerplugins/clang/store/referencecasting.cxx b/compilerplugins/clang/store/referencecasting.cxx index e6a1391c9040..4466fb66e122 100644 --- a/compilerplugins/clang/store/referencecasting.cxx +++ b/compilerplugins/clang/store/referencecasting.cxx @@ -52,7 +52,7 @@ void ReferenceCasting::run() // (CompoundStmt 0x205d430 </noel-extra1/libo-clang/compilerplugins/clang/noel1.cxx:17:1, line:20:1> // (DeclStmt 0x20580a8 <line:18:5, col:32> // (0x20530e0 "css::uno::Reference<B> refB = -// (CXXConstructExpr 0x2058078 <col:28> 'css::uno::Reference<B>':'class com::sun::star::uno::Reference<class B>''void (void)')")) +// (CXXConstructExpr 0x2058078 <col:28> 'css::uno::Reference<B>':'class com::sun::star::uno::Reference<class B>''void(void)')")) // (DeclStmt 0x205d418 <line:19:5, col:59> // (0x2058310 "css::uno::Reference<A> refA = // (CXXConstructExpr 0x205d3d8 <col:28, col:58> 'css::uno::Reference<A>':'class com::sun::star::uno::Reference<class A>''void (const class com::sun::star::uno::BaseReference &, enum com::sun::star::uno::UnoReference_Query)' @@ -76,7 +76,7 @@ void ReferenceCasting::run() // static void example_method2() (CompoundStmt 0x2a7a650 </noel-extra1/libo-clang/compilerplugins/clang/noel1.cxx:21:1, line:24:1> // (DeclStmt 0x2a7a1a8 <line:22:5, col:32> // (0x2a751e0 "css::uno::Reference<B> refB = -// (CXXConstructExpr 0x2a7a178 <col:28> 'css::uno::Reference<B>':'class com::sun::star::uno::Reference<class B>''void (void)')")) +// (CXXConstructExpr 0x2a7a178 <col:28> 'css::uno::Reference<B>':'class com::sun::star::uno::Reference<class B>''void(void)')")) // (ExprWithCleanups 0x2a7a638 <line:23:5, col:70> 'void' // (CallExpr 0x2a7a570 <col:5, col:70> 'void' // (ImplicitCastExpr 0x2a7a558 <col:5> 'void (*)(css::uno::Reference<A>)' <FunctionToPointerDecay> diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx index 3f9dfc9c9629..21554757602a 100644 --- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx +++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx @@ -119,7 +119,7 @@ void ODatabaseMetaDataResultSet::setType(MetaDataResultSetType _eType) } } -void ODatabaseMetaDataResultSet::disposing(void) +void ODatabaseMetaDataResultSet::disposing() { OPropertySetHelper::disposing(); diff --git a/connectivity/source/commontools/TPrivilegesResultSet.cxx b/connectivity/source/commontools/TPrivilegesResultSet.cxx index d52a1a0b7541..d6eb7e4c4bf9 100644 --- a/connectivity/source/commontools/TPrivilegesResultSet.cxx +++ b/connectivity/source/commontools/TPrivilegesResultSet.cxx @@ -107,7 +107,7 @@ const ORowSetValue& OResultSetPrivileges::getValue(sal_Int32 columnIndex) return ODatabaseMetaDataResultSet::getValue(columnIndex); } -void SAL_CALL OResultSetPrivileges::disposing(void) +void SAL_CALL OResultSetPrivileges::disposing() { ODatabaseMetaDataResultSet::disposing(); m_xTables.clear(); diff --git a/connectivity/source/cpool/ZConnectionWrapper.hxx b/connectivity/source/cpool/ZConnectionWrapper.hxx index ab827185fb2f..29b7a04cb106 100644 --- a/connectivity/source/cpool/ZConnectionWrapper.hxx +++ b/connectivity/source/cpool/ZConnectionWrapper.hxx @@ -42,7 +42,7 @@ namespace connectivity { protected: // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; virtual ~OConnectionWeakWrapper(); public: OConnectionWeakWrapper(::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation >& _xConnection); diff --git a/connectivity/source/cpool/ZPooledConnection.cxx b/connectivity/source/cpool/ZPooledConnection.cxx index 56576adde5ad..e98e2888482b 100644 --- a/connectivity/source/cpool/ZPooledConnection.cxx +++ b/connectivity/source/cpool/ZPooledConnection.cxx @@ -44,7 +44,7 @@ OPooledConnection::OPooledConnection(const Reference< XConnection >& _xConnectio } // OComponentHelper -void SAL_CALL OPooledConnection::disposing(void) +void SAL_CALL OPooledConnection::disposing() { MutexGuard aGuard(m_aMutex); if (m_xComponent.is()) diff --git a/connectivity/source/cpool/ZPooledConnection.hxx b/connectivity/source/cpool/ZPooledConnection.hxx index ee2d9f150b97..26dba7b32faf 100644 --- a/connectivity/source/cpool/ZPooledConnection.hxx +++ b/connectivity/source/cpool/ZPooledConnection.hxx @@ -43,7 +43,7 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XProxyFactory > m_xProxyFactory; public: // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; OPooledConnection(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XProxyFactory >& _rxProxyFactory); diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx index 35a6b4359da5..98450024280d 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx @@ -82,7 +82,7 @@ ODatabaseMetaDataResultSet::~ODatabaseMetaDataResultSet() m_pRecordSet->Release(); } -void ODatabaseMetaDataResultSet::disposing(void) +void ODatabaseMetaDataResultSet::disposing() { OPropertySetHelper::disposing(); diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx index ff0b20092e14..7e7f553c9c05 100644 --- a/connectivity/source/drivers/ado/AResultSet.cxx +++ b/connectivity/source/drivers/ado/AResultSet.cxx @@ -120,7 +120,7 @@ OResultSet::~OResultSet() m_pRecordSet->Release(); } -void OResultSet::disposing(void) +void OResultSet::disposing() { OPropertySetHelper::disposing(); diff --git a/connectivity/source/drivers/ado/ATable.cxx b/connectivity/source/drivers/ado/ATable.cxx index d41d462ec7ab..c3c14a1d05e4 100644 --- a/connectivity/source/drivers/ado/ATable.cxx +++ b/connectivity/source/drivers/ado/ATable.cxx @@ -67,7 +67,7 @@ OAdoTable::OAdoTable(sdbcx::OCollection* _pTables,sal_Bool _bCase,OCatalog* _pCa } -void SAL_CALL OAdoTable::disposing(void) +void SAL_CALL OAdoTable::disposing() { OTable_TYPEDEF::disposing(); m_aTable.clear(); diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx index b7a4b29ef7fe..f353db13b07c 100644 --- a/connectivity/source/drivers/calc/CTable.cxx +++ b/connectivity/source/drivers/calc/CTable.cxx @@ -636,7 +636,7 @@ void OCalcTable::refreshIndexes() } -void SAL_CALL OCalcTable::disposing(void) +void SAL_CALL OCalcTable::disposing() { OFileTable::disposing(); ::osl::MutexGuard aGuard(m_aMutex); diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index d0c8d0205392..cb0be0944339 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -716,7 +716,7 @@ void ODbaseTable::refreshIndexes() } -void SAL_CALL ODbaseTable::disposing(void) +void SAL_CALL ODbaseTable::disposing() { OFileTable::disposing(); ::osl::MutexGuard aGuard(m_aMutex); diff --git a/connectivity/source/drivers/evoab2/NConnection.hxx b/connectivity/source/drivers/evoab2/NConnection.hxx index 6f5287305609..32b808df1b2a 100644 --- a/connectivity/source/drivers/evoab2/NConnection.hxx +++ b/connectivity/source/drivers/evoab2/NConnection.hxx @@ -76,7 +76,7 @@ namespace connectivity void setSDBCAddressType(SDBCAddress::sdbc_address_type _eSDBCAddressType) {m_eSDBCAddressType = _eSDBCAddressType;} // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual void SAL_CALL release() throw() SAL_OVERRIDE; diff --git a/connectivity/source/drivers/evoab2/NDriver.hxx b/connectivity/source/drivers/evoab2/NDriver.hxx index 5c3026b261f1..f7827132a2f6 100644 --- a/connectivity/source/drivers/evoab2/NDriver.hxx +++ b/connectivity/source/drivers/evoab2/NDriver.hxx @@ -54,7 +54,7 @@ namespace connectivity virtual ~OEvoabDriver(); // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); @@ -75,7 +75,7 @@ namespace connectivity public: const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > - & getMSFactory(void) const { return m_xFactory; } + & getMSFactory() const { return m_xFactory; } ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getComponentContext( ) const { return comphelper::getComponentContext( m_xFactory ); } diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx index a6ce0a481b4c..7fc072f6c6d1 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.cxx +++ b/connectivity/source/drivers/evoab2/NResultSet.cxx @@ -706,7 +706,7 @@ void OEvoabResultSet::construct( const QueryData& _rData ) } -void OEvoabResultSet::disposing(void) +void OEvoabResultSet::disposing() { ::comphelper::OPropertyContainer::disposing(); diff --git a/connectivity/source/drivers/evoab2/NResultSet.hxx b/connectivity/source/drivers/evoab2/NResultSet.hxx index 760f9d7db576..6c761eedb360 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.hxx +++ b/connectivity/source/drivers/evoab2/NResultSet.hxx @@ -127,7 +127,7 @@ namespace connectivity } // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx b/connectivity/source/drivers/evoab2/NStatement.hxx index 42df8b1c588a..7d92717d5a48 100644 --- a/connectivity/source/drivers/evoab2/NStatement.hxx +++ b/connectivity/source/drivers/evoab2/NStatement.hxx @@ -196,7 +196,7 @@ namespace connectivity OCommonStatement( OEvoabConnection* _pConnection ); // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual void SAL_CALL release() throw() SAL_OVERRIDE; virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; diff --git a/connectivity/source/drivers/evoab2/NTables.cxx b/connectivity/source/drivers/evoab2/NTables.cxx index 817b9e557f5b..5c4cfbe520ec 100644 --- a/connectivity/source/drivers/evoab2/NTables.cxx +++ b/connectivity/source/drivers/evoab2/NTables.cxx @@ -82,7 +82,7 @@ void OEvoabTables::impl_refresh( ) throw(RuntimeException) static_cast<OEvoabCatalog&>(m_rParent).refreshTables(); } -void OEvoabTables::disposing(void) +void OEvoabTables::disposing() { m_xMetaData.clear(); OCollection::disposing(); diff --git a/connectivity/source/drivers/evoab2/NTables.hxx b/connectivity/source/drivers/evoab2/NTables.hxx index 252d81657be3..279f9686c0e1 100644 --- a/connectivity/source/drivers/evoab2/NTables.hxx +++ b/connectivity/source/drivers/evoab2/NTables.hxx @@ -38,7 +38,7 @@ namespace connectivity sdbcx::OCollection(_rParent,true,_rMutex,_rVector), m_xMetaData(_rMetaData) {} - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; }; } } diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx index fd11265acc19..68893053df95 100644 --- a/connectivity/source/drivers/file/FResultSet.cxx +++ b/connectivity/source/drivers/file/FResultSet.cxx @@ -137,7 +137,7 @@ void OResultSet::construct() registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY,PropertyAttribute::READONLY,&m_nResultSetConcurrency, ::cppu::UnoType<sal_Int32>::get()); } -void OResultSet::disposing(void) +void OResultSet::disposing() { OPropertySetHelper::disposing(); diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx index 86d882b704b7..cf7e93475569 100644 --- a/connectivity/source/drivers/file/FStatement.cxx +++ b/connectivity/source/drivers/file/FStatement.cxx @@ -300,7 +300,7 @@ sal_Int32 SAL_CALL OStatement::executeUpdate( const OUString& sql ) throw(SQLExc } -void SAL_CALL OStatement_Base::disposing(void) +void SAL_CALL OStatement_Base::disposing() { if(m_aEvaluateRow.is()) { diff --git a/connectivity/source/drivers/file/FTable.cxx b/connectivity/source/drivers/file/FTable.cxx index 540a5f05ffa0..69ab89cdf9c5 100644 --- a/connectivity/source/drivers/file/FTable.cxx +++ b/connectivity/source/drivers/file/FTable.cxx @@ -116,7 +116,7 @@ Any SAL_CALL OFileTable::queryInterface( const Type & rType ) throw(RuntimeExcep return OTable_TYPEDEF::queryInterface(rType); } -void SAL_CALL OFileTable::disposing(void) +void SAL_CALL OFileTable::disposing() { OTable::disposing(); diff --git a/connectivity/source/drivers/file/FTables.cxx b/connectivity/source/drivers/file/FTables.cxx index ae5f2cb7cf87..d1402b2c3cd9 100644 --- a/connectivity/source/drivers/file/FTables.cxx +++ b/connectivity/source/drivers/file/FTables.cxx @@ -45,7 +45,7 @@ void OTables::impl_refresh( ) throw(RuntimeException) static_cast<OFileCatalog&>(m_rParent).refreshTables(); } -void OTables::disposing(void) +void OTables::disposing() { m_xMetaData.clear(); OCollection::disposing(); diff --git a/connectivity/source/drivers/firebird/Blob.cxx b/connectivity/source/drivers/firebird/Blob.cxx index 0c87b3fdfdd4..6e5a8e3ebdff 100644 --- a/connectivity/source/drivers/firebird/Blob.cxx +++ b/connectivity/source/drivers/firebird/Blob.cxx @@ -107,7 +107,7 @@ void Blob::closeBlob() } } -void SAL_CALL Blob::disposing(void) +void SAL_CALL Blob::disposing() { try { diff --git a/connectivity/source/drivers/firebird/Connection.hxx b/connectivity/source/drivers/firebird/Connection.hxx index 31f17e6e4a21..5ce33878a791 100644 --- a/connectivity/source/drivers/firebird/Connection.hxx +++ b/connectivity/source/drivers/firebird/Connection.hxx @@ -215,7 +215,7 @@ namespace connectivity createCatalog(); // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual void SAL_CALL release() throw() SAL_OVERRIDE; diff --git a/connectivity/source/drivers/firebird/Driver.hxx b/connectivity/source/drivers/firebird/Driver.hxx index 7725c69980f6..d8785e874fd9 100644 --- a/connectivity/source/drivers/firebird/Driver.hxx +++ b/connectivity/source/drivers/firebird/Driver.hxx @@ -68,7 +68,7 @@ namespace connectivity const css::uno::Reference<css::uno::XComponentContext>& getContext() const { return m_aContext; } // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.hxx b/connectivity/source/drivers/firebird/StatementCommonBase.hxx index 60ac91533450..8ebbad6251d9 100644 --- a/connectivity/source/drivers/firebird/StatementCommonBase.hxx +++ b/connectivity/source/drivers/firebird/StatementCommonBase.hxx @@ -108,7 +108,7 @@ namespace connectivity using OStatementCommonBase_Base::operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >; // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE { + virtual void SAL_CALL disposing() SAL_OVERRIDE { disposeResultSet(); OStatementCommonBase_Base::disposing(); } diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx index 1c124d87ec1e..1a48c684d4cd 100644 --- a/connectivity/source/drivers/flat/ETable.cxx +++ b/connectivity/source/drivers/flat/ETable.cxx @@ -514,7 +514,7 @@ void OFlatTable::refreshColumns() } -void SAL_CALL OFlatTable::disposing(void) +void SAL_CALL OFlatTable::disposing() { OFileTable::disposing(); ::osl::MutexGuard aGuard(m_aMutex); diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx index e2b618ab1feb..562fc493b579 100644 --- a/connectivity/source/drivers/hsqldb/HConnection.cxx +++ b/connectivity/source/drivers/hsqldb/HConnection.cxx @@ -83,7 +83,7 @@ namespace GraphicColorMode = ::com::sun::star::graphic::GraphicColorMode; namespace connectivity { namespace hsqldb { - void SAL_CALL OHsqlConnection::disposing(void) + void SAL_CALL OHsqlConnection::disposing() { m_aFlushListeners.disposeAndClear( EventObject( *this ) ); OHsqlConnection_BASE::disposing(); diff --git a/connectivity/source/drivers/hsqldb/HTables.cxx b/connectivity/source/drivers/hsqldb/HTables.cxx index e1850b51859f..227b18edb91e 100644 --- a/connectivity/source/drivers/hsqldb/HTables.cxx +++ b/connectivity/source/drivers/hsqldb/HTables.cxx @@ -97,7 +97,7 @@ void OTables::impl_refresh( ) throw(RuntimeException) static_cast<OHCatalog&>(m_rParent).refreshTables(); } -void OTables::disposing(void) +void OTables::disposing() { m_xMetaData.clear(); OCollection::disposing(); diff --git a/connectivity/source/drivers/hsqldb/HViews.cxx b/connectivity/source/drivers/hsqldb/HViews.cxx index 13a538371467..157cd8481e9d 100644 --- a/connectivity/source/drivers/hsqldb/HViews.cxx +++ b/connectivity/source/drivers/hsqldb/HViews.cxx @@ -78,7 +78,7 @@ void HViews::impl_refresh( ) throw(RuntimeException) static_cast<OHCatalog&>(m_rParent).refreshTables(); } -void HViews::disposing(void) +void HViews::disposing() { m_xMetaData.clear(); OCollection::disposing(); diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx index 838eaa88768d..223a47663745 100644 --- a/connectivity/source/drivers/jdbc/JStatement.cxx +++ b/connectivity/source/drivers/jdbc/JStatement.cxx @@ -106,7 +106,7 @@ jclass java_sql_Statement_Base::getMyClass() const return theClass; } -void SAL_CALL java_sql_Statement_Base::disposing(void) +void SAL_CALL java_sql_Statement_Base::disposing() { m_aLogger.log( LogLevel::FINE, STR_LOG_CLOSING_STATEMENT ); java_sql_Statement_BASE::disposing(); diff --git a/connectivity/source/drivers/kab/KConnection.hxx b/connectivity/source/drivers/kab/KConnection.hxx index aeb6b3f02795..5fb23e515a9c 100644 --- a/connectivity/source/drivers/kab/KConnection.hxx +++ b/connectivity/source/drivers/kab/KConnection.hxx @@ -86,7 +86,7 @@ namespace connectivity void closeAllStatements () throw( ::com::sun::star::sdbc::SQLException); // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual void SAL_CALL release() throw() SAL_OVERRIDE; diff --git a/connectivity/source/drivers/kab/KDriver.hxx b/connectivity/source/drivers/kab/KDriver.hxx index d33b1ccd302c..bd53ad6a014b 100644 --- a/connectivity/source/drivers/kab/KDriver.hxx +++ b/connectivity/source/drivers/kab/KDriver.hxx @@ -174,7 +174,7 @@ namespace connectivity KabDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/connectivity/source/drivers/kab/KResultSet.hxx b/connectivity/source/drivers/kab/KResultSet.hxx index 4e453ec0c332..75910d8bdd06 100644 --- a/connectivity/source/drivers/kab/KResultSet.hxx +++ b/connectivity/source/drivers/kab/KResultSet.hxx @@ -106,7 +106,7 @@ namespace connectivity { return m_xMetaData; } // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/connectivity/source/drivers/kab/KTables.cxx b/connectivity/source/drivers/kab/KTables.cxx index 6f910d4e25ce..7aa95c01f0ff 100644 --- a/connectivity/source/drivers/kab/KTables.cxx +++ b/connectivity/source/drivers/kab/KTables.cxx @@ -73,7 +73,7 @@ void KabTables::impl_refresh( ) throw(RuntimeException) static_cast<KabCatalog&>(m_rParent).refreshTables(); } -void KabTables::disposing(void) +void KabTables::disposing() { m_xMetaData.clear(); OCollection::disposing(); diff --git a/connectivity/source/drivers/kab/KTables.hxx b/connectivity/source/drivers/kab/KTables.hxx index 7ea30ce52716..7e66ce514f13 100644 --- a/connectivity/source/drivers/kab/KTables.hxx +++ b/connectivity/source/drivers/kab/KTables.hxx @@ -45,7 +45,7 @@ namespace connectivity m_xMetaData(_rMetaData) { } - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; }; } } diff --git a/connectivity/source/drivers/macab/MacabConnection.hxx b/connectivity/source/drivers/macab/MacabConnection.hxx index 8e5c165e2735..f0e6d514a942 100644 --- a/connectivity/source/drivers/macab/MacabConnection.hxx +++ b/connectivity/source/drivers/macab/MacabConnection.hxx @@ -73,7 +73,7 @@ namespace connectivity void closeAllStatements () throw( ::com::sun::star::sdbc::SQLException); // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual void SAL_CALL release() throw() SAL_OVERRIDE; diff --git a/connectivity/source/drivers/macab/MacabDriver.hxx b/connectivity/source/drivers/macab/MacabDriver.hxx index b783d3082b44..e9dbdb5fc955 100644 --- a/connectivity/source/drivers/macab/MacabDriver.hxx +++ b/connectivity/source/drivers/macab/MacabDriver.hxx @@ -144,7 +144,7 @@ namespace connectivity MacabDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; diff --git a/connectivity/source/drivers/macab/MacabResultSet.hxx b/connectivity/source/drivers/macab/MacabResultSet.hxx index 428e8a7e8441..5970d43a8a69 100644 --- a/connectivity/source/drivers/macab/MacabResultSet.hxx +++ b/connectivity/source/drivers/macab/MacabResultSet.hxx @@ -104,7 +104,7 @@ namespace connectivity void setTableName(const OUString& _sTableName); // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; diff --git a/connectivity/source/drivers/macab/MacabTables.cxx b/connectivity/source/drivers/macab/MacabTables.cxx index 6fa6dc45c6a6..7a685f86201f 100644 --- a/connectivity/source/drivers/macab/MacabTables.cxx +++ b/connectivity/source/drivers/macab/MacabTables.cxx @@ -73,7 +73,7 @@ void MacabTables::impl_refresh( ) throw(RuntimeException) static_cast<MacabCatalog&>(m_rParent).refreshTables(); } -void MacabTables::disposing(void) +void MacabTables::disposing() { m_xMetaData.clear(); OCollection::disposing(); diff --git a/connectivity/source/drivers/macab/MacabTables.hxx b/connectivity/source/drivers/macab/MacabTables.hxx index 293141059ba9..00e723ac3c0b 100644 --- a/connectivity/source/drivers/macab/MacabTables.hxx +++ b/connectivity/source/drivers/macab/MacabTables.hxx @@ -45,7 +45,7 @@ namespace connectivity m_xMetaData(_rMetaData) { } - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; }; } } diff --git a/connectivity/source/drivers/mork/MConnection.hxx b/connectivity/source/drivers/mork/MConnection.hxx index 11e796759f23..f843f8eabb48 100644 --- a/connectivity/source/drivers/mork/MConnection.hxx +++ b/connectivity/source/drivers/mork/MConnection.hxx @@ -67,7 +67,7 @@ namespace connectivity void closeAllStatements () throw( ::com::sun::star::sdbc::SQLException); // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual void SAL_CALL release() throw() SAL_OVERRIDE; diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx index d0c74f604c52..4bd102d7ad7b 100644 --- a/connectivity/source/drivers/mork/MResultSet.cxx +++ b/connectivity/source/drivers/mork/MResultSet.cxx @@ -118,7 +118,7 @@ OResultSet::~OResultSet() } -void OResultSet::disposing(void) +void OResultSet::disposing() { OPropertySetHelper::disposing(); diff --git a/connectivity/source/drivers/mork/MResultSet.hxx b/connectivity/source/drivers/mork/MResultSet.hxx index 8e90471d9239..b130610badd2 100644 --- a/connectivity/source/drivers/mork/MResultSet.hxx +++ b/connectivity/source/drivers/mork/MResultSet.hxx @@ -124,7 +124,7 @@ namespace connectivity } // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; diff --git a/connectivity/source/drivers/mork/MStatement.hxx b/connectivity/source/drivers/mork/MStatement.hxx index 2b7a3d04abd8..b5eaffc6fdea 100644 --- a/connectivity/source/drivers/mork/MStatement.hxx +++ b/connectivity/source/drivers/mork/MStatement.hxx @@ -153,7 +153,7 @@ namespace connectivity using OCommonStatement_IBASE::operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >; // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual void SAL_CALL release() throw() SAL_OVERRIDE; diff --git a/connectivity/source/drivers/mork/MTables.cxx b/connectivity/source/drivers/mork/MTables.cxx index 2024e5af52ae..4885d1406e04 100644 --- a/connectivity/source/drivers/mork/MTables.cxx +++ b/connectivity/source/drivers/mork/MTables.cxx @@ -76,7 +76,7 @@ void OTables::impl_refresh( ) throw(RuntimeException) static_cast<OCatalog&>(m_rParent).refreshTables(); } -void OTables::disposing(void) +void OTables::disposing() { m_xMetaData.clear(); OCollection::disposing(); diff --git a/connectivity/source/drivers/mork/MTables.hxx b/connectivity/source/drivers/mork/MTables.hxx index dfdb02e6b763..b09b6073dab6 100644 --- a/connectivity/source/drivers/mork/MTables.hxx +++ b/connectivity/source/drivers/mork/MTables.hxx @@ -39,7 +39,7 @@ namespace connectivity {} // only the name is identical to ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; }; } } diff --git a/connectivity/source/drivers/mozab/MConfigAccess.cxx b/connectivity/source/drivers/mozab/MConfigAccess.cxx index c28ddc5e1d0e..8c5f8ba7c09b 100644 --- a/connectivity/source/drivers/mozab/MConfigAccess.cxx +++ b/connectivity/source/drivers/mozab/MConfigAccess.cxx @@ -175,7 +175,7 @@ namespace connectivity -extern "C" const sal_Unicode* SAL_CALL getUserProfile( void ) +extern "C" const sal_Unicode* SAL_CALL getUserProfile() { static sal_Bool bReadConfig = sal_False; static OUString sUserProfile; @@ -188,7 +188,7 @@ extern "C" const sal_Unicode* SAL_CALL getUserProfile( void ) return sUserProfile.getStr(); } -extern "C" const sal_Char* SAL_CALL getPabDescription( void ) +extern "C" const sal_Char* SAL_CALL getPabDescription() { static sal_Bool bReadConfig = sal_False; static OUString usPabDescription; @@ -208,7 +208,7 @@ extern "C" const sal_Char* SAL_CALL getPabDescription( void ) } -extern "C" const sal_Char* SAL_CALL getHisDescription( void ) +extern "C" const sal_Char* SAL_CALL getHisDescription() { static sal_Bool bReadConfig = sal_False; static OUString usHisDescription; diff --git a/connectivity/source/drivers/mozab/MConfigAccess.hxx b/connectivity/source/drivers/mozab/MConfigAccess.hxx index 9e7048ef0df9..25c1fc3e0f13 100644 --- a/connectivity/source/drivers/mozab/MConfigAccess.hxx +++ b/connectivity/source/drivers/mozab/MConfigAccess.hxx @@ -22,11 +22,11 @@ #include <sal/types.h> -extern "C" const sal_Unicode* SAL_CALL getUserProfile( void ); +extern "C" const sal_Unicode* SAL_CALL getUserProfile(); -extern "C" const sal_Char* SAL_CALL getPabDescription( void ); +extern "C" const sal_Char* SAL_CALL getPabDescription(); -extern "C" const sal_Char* SAL_CALL getHisDescription( void ); +extern "C" const sal_Char* SAL_CALL getHisDescription(); #endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_MCONFIGACCESS_HXX diff --git a/connectivity/source/drivers/mozab/MConnection.hxx b/connectivity/source/drivers/mozab/MConnection.hxx index 112f97e85308..ec7d017b6a44 100644 --- a/connectivity/source/drivers/mozab/MConnection.hxx +++ b/connectivity/source/drivers/mozab/MConnection.hxx @@ -134,7 +134,7 @@ namespace connectivity void closeAllStatements () throw( ::com::sun::star::sdbc::SQLException); // OComponentHelper - virtual void SAL_CALL disposing(void); + virtual void SAL_CALL disposing(); // XInterface virtual void SAL_CALL release() throw(); @@ -193,9 +193,9 @@ namespace connectivity // Get whether use ssl to connect to ldap sal_Bool getUseSSL() const {return m_bUseSSL;} - sal_Bool usesFactory(void) const { return (m_eSDBCAddressType == SDBCAddress::Outlook) || (m_eSDBCAddressType == SDBCAddress::OutlookExp); } - sal_Bool isLDAP(void) const { return m_eSDBCAddressType == SDBCAddress::LDAP; } - sal_Bool isThunderbird(void) const { return m_eSDBCAddressType == SDBCAddress::ThunderBird; } + sal_Bool usesFactory() const { return (m_eSDBCAddressType == SDBCAddress::Outlook) || (m_eSDBCAddressType == SDBCAddress::OutlookExp); } + sal_Bool isLDAP() const { return m_eSDBCAddressType == SDBCAddress::LDAP; } + sal_Bool isThunderbird() const { return m_eSDBCAddressType == SDBCAddress::ThunderBird; } sal_Bool isOutlookExpress() const { return m_eSDBCAddressType == SDBCAddress::OutlookExp;} sal_Int32 getMaxResultRecords() const { return m_nMaxResultRecords; } diff --git a/connectivity/source/drivers/mozab/MDriver.hxx b/connectivity/source/drivers/mozab/MDriver.hxx index 842342324828..37545c83aa0c 100644 --- a/connectivity/source/drivers/mozab/MDriver.hxx +++ b/connectivity/source/drivers/mozab/MDriver.hxx @@ -74,7 +74,7 @@ namespace connectivity MozabDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory); // OComponentHelper - virtual void SAL_CALL disposing(void); + virtual void SAL_CALL disposing(); // XInterface static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); @@ -92,7 +92,7 @@ namespace connectivity virtual sal_Int32 SAL_CALL getMinorVersion( ) throw(::com::sun::star::uno::RuntimeException); const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > - & getMSFactory(void) const { return m_xMSFactory; } + & getMSFactory() const { return m_xMSFactory; } private: EDriverType impl_classifyURL( const OUString& url ); diff --git a/connectivity/source/drivers/mozab/MResultSet.cxx b/connectivity/source/drivers/mozab/MResultSet.cxx index 118e4116b8fa..af47aa9e6f3e 100644 --- a/connectivity/source/drivers/mozab/MResultSet.cxx +++ b/connectivity/source/drivers/mozab/MResultSet.cxx @@ -117,7 +117,7 @@ OResultSet::~OResultSet() } -void OResultSet::disposing(void) +void OResultSet::disposing() { OPropertySetHelper::disposing(); diff --git a/connectivity/source/drivers/mozab/MResultSet.hxx b/connectivity/source/drivers/mozab/MResultSet.hxx index dfebeff19882..22e30ec1d783 100644 --- a/connectivity/source/drivers/mozab/MResultSet.hxx +++ b/connectivity/source/drivers/mozab/MResultSet.hxx @@ -125,7 +125,7 @@ namespace connectivity } // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void); + virtual void SAL_CALL disposing(); // 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() throw(); diff --git a/connectivity/source/drivers/mozab/MStatement.hxx b/connectivity/source/drivers/mozab/MStatement.hxx index 070e74747467..59b30fb3ad7e 100644 --- a/connectivity/source/drivers/mozab/MStatement.hxx +++ b/connectivity/source/drivers/mozab/MStatement.hxx @@ -155,7 +155,7 @@ namespace connectivity using OCommonStatement_IBASE::operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >; // OComponentHelper - virtual void SAL_CALL disposing(void); + virtual void SAL_CALL disposing(); // XInterface virtual void SAL_CALL release() throw(); diff --git a/connectivity/source/drivers/mozab/MTables.cxx b/connectivity/source/drivers/mozab/MTables.cxx index 3cc06c694692..129c84dd493f 100644 --- a/connectivity/source/drivers/mozab/MTables.cxx +++ b/connectivity/source/drivers/mozab/MTables.cxx @@ -76,7 +76,7 @@ void OTables::impl_refresh( ) throw(RuntimeException) static_cast<OCatalog&>(m_rParent).refreshTables(); } -void OTables::disposing(void) +void OTables::disposing() { m_xMetaData.clear(); OCollection::disposing(); diff --git a/connectivity/source/drivers/mozab/MTables.hxx b/connectivity/source/drivers/mozab/MTables.hxx index 5193b98fed08..dbd694b3ef73 100644 --- a/connectivity/source/drivers/mozab/MTables.hxx +++ b/connectivity/source/drivers/mozab/MTables.hxx @@ -39,7 +39,7 @@ namespace connectivity {} // only the name is identical to ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void); + virtual void SAL_CALL disposing(); }; } } diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx index 3fe8d5515276..58ff8fd3cffb 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx @@ -51,7 +51,7 @@ namespace connectivity MozillaBootstrap(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory); // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); @@ -83,7 +83,7 @@ namespace connectivity virtual ::sal_Int32 SAL_CALL Run( const ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XCodeProxy >& aCode ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > - & getMSFactory(void) const { return m_xMSFactory; } + & getMSFactory() const { return m_xMSFactory; } }; } diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx index a3429b70bc1f..82fbccd366b8 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx @@ -246,7 +246,7 @@ namespace connectivity { namespace mozab { } - NS_IMETHODIMP MLdapAttributeMap::CheckState(void) + NS_IMETHODIMP MLdapAttributeMap::CheckState() { // we do not allow modifying the map, so we're always in a valid state return NS_OK; diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx index 8b24a4266d55..fe2f8f7c4a01 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx @@ -592,13 +592,13 @@ MQuery::getRealRowCount() // false sal_Bool -MQuery::queryComplete( void ) +MQuery::queryComplete() { return hadError() || m_aQueryHelper->queryComplete(); } sal_Bool -MQuery::waitForQueryComplete( void ) +MQuery::waitForQueryComplete() { if( m_aQueryHelper->waitForQueryComplete( ) ) return sal_True; diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx index 08facee24cd5..524fe5e0014b 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx @@ -234,10 +234,10 @@ namespace connectivity void setMaxNrOfReturns( const sal_Int32); - sal_Int32 getRowCount( void ); - sal_uInt32 getRealRowCount( void ); - sal_Bool queryComplete( void ); - sal_Bool waitForQueryComplete( void ); + sal_Int32 getRowCount(); + sal_uInt32 getRealRowCount(); + sal_Bool queryComplete(); + sal_Bool waitForQueryComplete(); sal_Bool checkRowAvailable( sal_Int32 nDBRow ); sal_Bool getRowValue( connectivity::ORowSetValue& rValue, sal_Int32 nDBRow, diff --git a/connectivity/source/drivers/mysql/YTables.cxx b/connectivity/source/drivers/mysql/YTables.cxx index e1c2fb6e7589..25949eb04177 100644 --- a/connectivity/source/drivers/mysql/YTables.cxx +++ b/connectivity/source/drivers/mysql/YTables.cxx @@ -102,7 +102,7 @@ void OTables::impl_refresh( ) throw(RuntimeException) static_cast<OMySQLCatalog&>(m_rParent).refreshTables(); } -void OTables::disposing(void) +void OTables::disposing() { m_xMetaData.clear(); OCollection::disposing(); diff --git a/connectivity/source/drivers/mysql/YViews.cxx b/connectivity/source/drivers/mysql/YViews.cxx index a7ec2cac6310..cfe2998bf25d 100644 --- a/connectivity/source/drivers/mysql/YViews.cxx +++ b/connectivity/source/drivers/mysql/YViews.cxx @@ -72,7 +72,7 @@ void OViews::impl_refresh( ) throw(RuntimeException) static_cast<OMySQLCatalog&>(m_rParent).refreshTables(); } -void OViews::disposing(void) +void OViews::disposing() { m_xMetaData.clear(); OCollection::disposing(); diff --git a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx index a4d019dfaf72..e9e9a3e4462a 100644 --- a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx @@ -86,7 +86,7 @@ ODatabaseMetaDataResultSet::~ODatabaseMetaDataResultSet() delete [] m_pRowStatusArray; } -void ODatabaseMetaDataResultSet::disposing(void) +void ODatabaseMetaDataResultSet::disposing() { OPropertySetHelper::disposing(); diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx index 426b869c0224..3d2a9f42eda3 100644 --- a/connectivity/source/drivers/odbc/OResultSet.cxx +++ b/connectivity/source/drivers/odbc/OResultSet.cxx @@ -181,7 +181,7 @@ void OResultSet::construct() osl_atomic_decrement( &m_refCount ); } -void OResultSet::disposing(void) +void OResultSet::disposing() { SQLRETURN nRet = N3SQLCloseCursor(m_aStatementHandle); OSL_UNUSED( nRet ); diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx index 6ecadf402e87..5df41972f75b 100644 --- a/connectivity/source/drivers/odbc/OStatement.cxx +++ b/connectivity/source/drivers/odbc/OStatement.cxx @@ -98,7 +98,7 @@ void OStatement_Base::disposeResultSet() m_xResultSet.clear(); } -void SAL_CALL OStatement_Base::disposing(void) +void SAL_CALL OStatement_Base::disposing() { ::osl::MutexGuard aGuard(m_aMutex); diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx index 7ef8ced84202..ed7470a6100a 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.cxx +++ b/connectivity/source/drivers/postgresql/pq_connection.cxx @@ -136,7 +136,7 @@ OUString ConnectionGetImplementationName() { return OUString( "org.openoffice.comp.connectivity.pq.Connection.noext" ); } -com::sun::star::uno::Sequence<OUString> ConnectionGetSupportedServiceNames(void) +com::sun::star::uno::Sequence<OUString> ConnectionGetSupportedServiceNames() { OUString serv( "com.sun.star.sdbc.Connection" ); return Sequence< OUString> (&serv,1); diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx index c020893df624..0e2b839a7757 100644 --- a/connectivity/source/drivers/postgresql/pq_driver.cxx +++ b/connectivity/source/drivers/postgresql/pq_driver.cxx @@ -147,7 +147,7 @@ sal_Bool Driver::supportsService(const OUString& ServiceName) return cppu::supportsService(this, ServiceName); } -Sequence< OUString > Driver::getSupportedServiceNames(void) +Sequence< OUString > Driver::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) { return DriverGetSupportedServiceNames(); @@ -225,7 +225,7 @@ public: return sal_True; return sal_False; } - Sequence< OUString > SAL_CALL getSupportedServiceNames(void) + Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return m_serviceNames; diff --git a/connectivity/source/drivers/postgresql/pq_driver.hxx b/connectivity/source/drivers/postgresql/pq_driver.hxx index f1afe29be07b..0751184d6336 100644 --- a/connectivity/source/drivers/postgresql/pq_driver.hxx +++ b/connectivity/source/drivers/postgresql/pq_driver.hxx @@ -104,7 +104,7 @@ public: // XServiceInfo virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: // XDataDefinitionSupplier diff --git a/connectivity/source/drivers/postgresql/pq_xbase.cxx b/connectivity/source/drivers/postgresql/pq_xbase.cxx index 5ae9d45ae5e2..5e1d9918d99b 100644 --- a/connectivity/source/drivers/postgresql/pq_xbase.cxx +++ b/connectivity/source/drivers/postgresql/pq_xbase.cxx @@ -153,7 +153,7 @@ sal_Bool ReflectionBase::supportsService(const OUString& ServiceName) return cppu::supportsService(this, ServiceName); } -Sequence< OUString > ReflectionBase::getSupportedServiceNames(void) +Sequence< OUString > ReflectionBase::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) { return m_supportedServices; diff --git a/connectivity/source/drivers/postgresql/pq_xbase.hxx b/connectivity/source/drivers/postgresql/pq_xbase.hxx index 3603fcda9b37..fff7f55025a3 100644 --- a/connectivity/source/drivers/postgresql/pq_xbase.hxx +++ b/connectivity/source/drivers/postgresql/pq_xbase.hxx @@ -115,7 +115,7 @@ public: // XServiceInfo throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: // XTypeProvider, first implemented by OPropertySetHelper diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx index 1aafe39de5ee..0e5d5084d10c 100644 --- a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx @@ -161,7 +161,7 @@ namespace connectivity virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XTypeProvider diff --git a/connectivity/source/inc/TConnection.hxx b/connectivity/source/inc/TConnection.hxx index 58c1f17a84ab..fcc589f5efb4 100644 --- a/connectivity/source/inc/TConnection.hxx +++ b/connectivity/source/inc/TConnection.hxx @@ -72,7 +72,7 @@ namespace connectivity getConnectionInfo() const { return m_aConnectionInfo; } // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; //XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/connectivity/source/inc/TPrivilegesResultSet.hxx b/connectivity/source/inc/TPrivilegesResultSet.hxx index 2737d0d50139..198f95205814 100644 --- a/connectivity/source/inc/TPrivilegesResultSet.hxx +++ b/connectivity/source/inc/TPrivilegesResultSet.hxx @@ -38,7 +38,7 @@ namespace connectivity ,const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern); // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XResultSet virtual sal_Bool SAL_CALL next( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/connectivity/source/inc/ado/AConnection.hxx b/connectivity/source/inc/ado/AConnection.hxx index 1b1adff81227..7b45d1bf594b 100644 --- a/connectivity/source/inc/ado/AConnection.hxx +++ b/connectivity/source/inc/ado/AConnection.hxx @@ -86,7 +86,7 @@ namespace connectivity // XServiceInfo DECLARE_SERVICE_INFO(); // OComponentHelper - virtual void SAL_CALL disposing(void); + virtual void SAL_CALL disposing(); // XInterface virtual void SAL_CALL release() throw(); diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx index 59adc3365df3..b9d740eec8f6 100644 --- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx @@ -117,7 +117,7 @@ namespace connectivity ~ODatabaseMetaDataResultSet(); // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void); + virtual void SAL_CALL disposing(); // 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() throw(); diff --git a/connectivity/source/inc/ado/ADriver.hxx b/connectivity/source/inc/ado/ADriver.hxx index 3dbf7c98bf88..3195666e58d2 100644 --- a/connectivity/source/inc/ado/ADriver.hxx +++ b/connectivity/source/inc/ado/ADriver.hxx @@ -56,7 +56,7 @@ namespace connectivity ~ODriver(); // OComponentHelper - virtual void SAL_CALL disposing(void); + virtual void SAL_CALL disposing(); // XInterface static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/ado/APreparedStatement.hxx b/connectivity/source/inc/ado/APreparedStatement.hxx index 3a46f1faf509..7d0b22d87831 100644 --- a/connectivity/source/inc/ado/APreparedStatement.hxx +++ b/connectivity/source/inc/ado/APreparedStatement.hxx @@ -103,7 +103,7 @@ namespace connectivity // XResultSetMetaDataSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // OComponentHelper - virtual void SAL_CALL disposing(void); + virtual void SAL_CALL disposing(); }; } } diff --git a/connectivity/source/inc/ado/AResultSet.hxx b/connectivity/source/inc/ado/AResultSet.hxx index 3319a9ff9208..f9d1312f0205 100644 --- a/connectivity/source/inc/ado/AResultSet.hxx +++ b/connectivity/source/inc/ado/AResultSet.hxx @@ -121,7 +121,7 @@ namespace connectivity virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void); + virtual void SAL_CALL disposing(); // 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() throw(); diff --git a/connectivity/source/inc/ado/AStatement.hxx b/connectivity/source/inc/ado/AStatement.hxx index 356a37a80e7b..45798fb5f337 100644 --- a/connectivity/source/inc/ado/AStatement.hxx +++ b/connectivity/source/inc/ado/AStatement.hxx @@ -138,7 +138,7 @@ namespace connectivity using OStatement_BASE::operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >; // OComponentHelper - virtual void SAL_CALL disposing(void); + virtual void SAL_CALL disposing(); // XInterface virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); diff --git a/connectivity/source/inc/ado/ATable.hxx b/connectivity/source/inc/ado/ATable.hxx index 02327a0f10c7..9b1231a27918 100644 --- a/connectivity/source/inc/ado/ATable.hxx +++ b/connectivity/source/inc/ado/ATable.hxx @@ -46,7 +46,7 @@ namespace connectivity virtual void refreshIndexes(); // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void); + virtual void SAL_CALL disposing(); public: OAdoTable(sdbcx::OCollection* _pTables,sal_Bool _bCase,OCatalog* _pCatalog,_ADOTable* _pTable); diff --git a/connectivity/source/inc/calc/CConnection.hxx b/connectivity/source/inc/calc/CConnection.hxx index b66d892570ac..cda44ef9ccee 100644 --- a/connectivity/source/inc/calc/CConnection.hxx +++ b/connectivity/source/inc/calc/CConnection.hxx @@ -55,7 +55,7 @@ namespace connectivity DECLARE_SERVICE_INFO(); // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XConnection virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/connectivity/source/inc/calc/CTable.hxx b/connectivity/source/inc/calc/CTable.hxx index 491c17e20da4..4e8ea641dded 100644 --- a/connectivity/source/inc/calc/CTable.hxx +++ b/connectivity/source/inc/calc/CTable.hxx @@ -79,7 +79,7 @@ namespace connectivity virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // com::sun::star::lang::XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/connectivity/source/inc/dbase/DTable.hxx b/connectivity/source/inc/dbase/DTable.hxx index 915503d0cca0..e30d3035614d 100644 --- a/connectivity/source/inc/dbase/DTable.hxx +++ b/connectivity/source/inc/dbase/DTable.hxx @@ -145,7 +145,7 @@ namespace connectivity virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // com::sun::star::lang::XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/connectivity/source/inc/file/FCatalog.hxx b/connectivity/source/inc/file/FCatalog.hxx index 5cf87e78fe5f..dc2dbdc41feb 100644 --- a/connectivity/source/inc/file/FCatalog.hxx +++ b/connectivity/source/inc/file/FCatalog.hxx @@ -55,7 +55,7 @@ namespace connectivity virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::cppu::OComponentHelper virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; }; } } diff --git a/connectivity/source/inc/file/FConnection.hxx b/connectivity/source/inc/file/FConnection.hxx index 43d430d012af..2b6bc47069f6 100644 --- a/connectivity/source/inc/file/FConnection.hxx +++ b/connectivity/source/inc/file/FConnection.hxx @@ -87,7 +87,7 @@ namespace connectivity void closeAllStatements () throw( ::com::sun::star::sdbc::SQLException); // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual void SAL_CALL release() throw() SAL_OVERRIDE; diff --git a/connectivity/source/inc/file/FDriver.hxx b/connectivity/source/inc/file/FDriver.hxx index 1f0e466ec741..42374972b569 100644 --- a/connectivity/source/inc/file/FDriver.hxx +++ b/connectivity/source/inc/file/FDriver.hxx @@ -48,7 +48,7 @@ namespace connectivity OFileDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/file/FPreparedStatement.hxx b/connectivity/source/inc/file/FPreparedStatement.hxx index 07d1302bda31..da00bebe5552 100644 --- a/connectivity/source/inc/file/FPreparedStatement.hxx +++ b/connectivity/source/inc/file/FPreparedStatement.hxx @@ -77,7 +77,7 @@ namespace connectivity virtual void construct(const OUString& sql) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; //XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx index cb7de4bda3e7..f443a545626c 100644 --- a/connectivity/source/inc/file/FResultSet.hxx +++ b/connectivity/source/inc/file/FResultSet.hxx @@ -178,7 +178,7 @@ namespace connectivity } // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx index 0706b83c682e..b7747c8b6c63 100644 --- a/connectivity/source/inc/file/FStatement.hxx +++ b/connectivity/source/inc/file/FStatement.hxx @@ -145,7 +145,7 @@ namespace connectivity virtual void construct(const OUString& sql) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface // virtual void SAL_CALL release() throw(::com::sun::star::uno::RuntimeException) = 0; virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; @@ -175,7 +175,7 @@ namespace connectivity OStatement_BASE2(OConnection* _pConnection ) : OStatement_Base(_pConnection ), connectivity::OSubComponent<OStatement_BASE2, OStatement_BASE>((::cppu::OWeakObject*)_pConnection, this){} // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual void SAL_CALL release() throw() SAL_OVERRIDE; }; diff --git a/connectivity/source/inc/file/FTable.hxx b/connectivity/source/inc/file/FTable.hxx index 27fcaa46b431..93f5a1af7f8d 100644 --- a/connectivity/source/inc/file/FTable.hxx +++ b/connectivity/source/inc/file/FTable.hxx @@ -68,7 +68,7 @@ namespace connectivity virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; virtual void SAL_CALL release() throw() SAL_OVERRIDE; // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; OConnection* getConnection() const { return m_pConnection;} virtual sal_Int32 getCurrentLastPos() const {return -1;} diff --git a/connectivity/source/inc/file/FTables.hxx b/connectivity/source/inc/file/FTables.hxx index 74ac0dce6f86..2c91b2221c3f 100644 --- a/connectivity/source/inc/file/FTables.hxx +++ b/connectivity/source/inc/file/FTables.hxx @@ -45,7 +45,7 @@ namespace connectivity virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // only the name is identical to ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; }; } } diff --git a/connectivity/source/inc/flat/ETable.hxx b/connectivity/source/inc/flat/ETable.hxx index d03d4f7af93e..f45fe0fd5ba3 100644 --- a/connectivity/source/inc/flat/ETable.hxx +++ b/connectivity/source/inc/flat/ETable.hxx @@ -95,7 +95,7 @@ namespace connectivity virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // com::sun::star::lang::XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/connectivity/source/inc/hsqldb/HConnection.hxx b/connectivity/source/inc/hsqldb/HConnection.hxx index 45ae3edfb96a..5c380e0a7640 100644 --- a/connectivity/source/inc/hsqldb/HConnection.hxx +++ b/connectivity/source/inc/hsqldb/HConnection.hxx @@ -64,7 +64,7 @@ namespace connectivity bool m_bReadOnly; protected: - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; virtual ~OHsqlConnection(); public: diff --git a/connectivity/source/inc/hsqldb/HDriver.hxx b/connectivity/source/inc/hsqldb/HDriver.hxx index 099182b940b7..e7921a484b7f 100644 --- a/connectivity/source/inc/hsqldb/HDriver.hxx +++ b/connectivity/source/inc/hsqldb/HDriver.hxx @@ -119,7 +119,7 @@ namespace connectivity /// dtor virtual ~ODriverDelegator(); // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; /** called when we connected to a newly created embedded database */ diff --git a/connectivity/source/inc/hsqldb/HTables.hxx b/connectivity/source/inc/hsqldb/HTables.hxx index bd553d1ec56a..75c95e013a37 100644 --- a/connectivity/source/inc/hsqldb/HTables.hxx +++ b/connectivity/source/inc/hsqldb/HTables.hxx @@ -45,7 +45,7 @@ namespace connectivity {} // only the name is identical to ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XDrop void appendNew(const OUString& _rsNewTable); diff --git a/connectivity/source/inc/hsqldb/HViews.hxx b/connectivity/source/inc/hsqldb/HViews.hxx index fd72e431f710..1650b4030a63 100644 --- a/connectivity/source/inc/hsqldb/HViews.hxx +++ b/connectivity/source/inc/hsqldb/HViews.hxx @@ -45,7 +45,7 @@ namespace connectivity ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector ); // only the name is identical to ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; void dropByNameImpl(const OUString& elementName); }; diff --git a/connectivity/source/inc/java/sql/Connection.hxx b/connectivity/source/inc/java/sql/Connection.hxx index a61f89addcb6..47281e4a58ca 100644 --- a/connectivity/source/inc/java/sql/Connection.hxx +++ b/connectivity/source/inc/java/sql/Connection.hxx @@ -110,7 +110,7 @@ namespace connectivity const jdbc::GlobalRef< jobject >& getDriverClassLoader() const { return m_pDriverClassLoader; } // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual void SAL_CALL release() throw() SAL_OVERRIDE; diff --git a/connectivity/source/inc/java/sql/JStatement.hxx b/connectivity/source/inc/java/sql/JStatement.hxx index b2b321ad78f4..716e14d8a15f 100644 --- a/connectivity/source/inc/java/sql/JStatement.hxx +++ b/connectivity/source/inc/java/sql/JStatement.hxx @@ -130,7 +130,7 @@ namespace connectivity sal_Int32 getStatementObjectID() const { return m_aLogger.getObjectID(); } // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; virtual void SAL_CALL release() throw() SAL_OVERRIDE; @@ -173,7 +173,7 @@ namespace connectivity OSubComponent<OStatement_BASE2, java_sql_Statement_BASE>(static_cast<cppu::OWeakObject*>(&_rCon), this){} // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual void SAL_CALL release() throw() SAL_OVERRIDE; }; diff --git a/connectivity/source/inc/java/sql/ResultSet.hxx b/connectivity/source/inc/java/sql/ResultSet.hxx index 07a0653c9a6a..56fe7f364951 100644 --- a/connectivity/source/inc/java/sql/ResultSet.hxx +++ b/connectivity/source/inc/java/sql/ResultSet.hxx @@ -106,7 +106,7 @@ namespace connectivity java_sql_Statement_Base* pStmt = NULL ); // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; diff --git a/connectivity/source/inc/mysql/YDriver.hxx b/connectivity/source/inc/mysql/YDriver.hxx index ac0600330153..1634092d68fd 100644 --- a/connectivity/source/inc/mysql/YDriver.hxx +++ b/connectivity/source/inc/mysql/YDriver.hxx @@ -103,7 +103,7 @@ namespace connectivity /// dtor virtual ~ODriverDelegator(); // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; }; } diff --git a/connectivity/source/inc/mysql/YTables.hxx b/connectivity/source/inc/mysql/YTables.hxx index 84715849a680..e3bb892c8ed5 100644 --- a/connectivity/source/inc/mysql/YTables.hxx +++ b/connectivity/source/inc/mysql/YTables.hxx @@ -47,7 +47,7 @@ namespace connectivity {} // only the name is identical to ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XDrop void appendNew(const OUString& _rsNewTable); diff --git a/connectivity/source/inc/mysql/YViews.hxx b/connectivity/source/inc/mysql/YViews.hxx index 22485967ba88..8e554c6e6828 100644 --- a/connectivity/source/inc/mysql/YViews.hxx +++ b/connectivity/source/inc/mysql/YViews.hxx @@ -46,7 +46,7 @@ namespace connectivity {} // only the name is identical to ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; void dropByNameImpl(const OUString& elementName); }; diff --git a/connectivity/source/inc/odbc/OConnection.hxx b/connectivity/source/inc/odbc/OConnection.hxx index 59e645ef903c..dbf8f3772d85 100644 --- a/connectivity/source/inc/odbc/OConnection.hxx +++ b/connectivity/source/inc/odbc/OConnection.hxx @@ -93,7 +93,7 @@ namespace connectivity void closeAllStatements () throw( ::com::sun::star::sdbc::SQLException); // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual void SAL_CALL release() throw() SAL_OVERRIDE; diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx index eaee603d6571..15fac9a39440 100644 --- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx @@ -127,7 +127,7 @@ namespace connectivity return m_pConnection->getOdbcFunction(_nIndex); } // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; diff --git a/connectivity/source/inc/odbc/ODriver.hxx b/connectivity/source/inc/odbc/ODriver.hxx index e50e951fed6d..1612e7fab913 100644 --- a/connectivity/source/inc/odbc/ODriver.hxx +++ b/connectivity/source/inc/odbc/ODriver.hxx @@ -56,7 +56,7 @@ namespace connectivity // only possibility to get the odbc functions virtual oslGenericFunction getOdbcFunction(sal_Int32 _nIndex) const = 0; // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx index 104f617086eb..f7dda14b73fa 100644 --- a/connectivity/source/inc/odbc/OResultSet.hxx +++ b/connectivity/source/inc/odbc/OResultSet.hxx @@ -234,7 +234,7 @@ namespace connectivity inline void setMetaData(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData>& _xMetaData) { m_xMetaData = _xMetaData;} // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx index aa71fb544ac7..9a8297a35f7d 100644 --- a/connectivity/source/inc/odbc/OStatement.hxx +++ b/connectivity/source/inc/odbc/OStatement.hxx @@ -157,7 +157,7 @@ namespace connectivity return m_pConnection->getOdbcFunction(_nIndex); } // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual void SAL_CALL release() throw() SAL_OVERRIDE; virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; @@ -212,7 +212,7 @@ namespace connectivity OStatement_BASE2(OConnection* _pConnection ) : OStatement_Base(_pConnection ), ::connectivity::OSubComponent<OStatement_BASE2, OStatement_BASE>((::cppu::OWeakObject*)_pConnection, this){} // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual void SAL_CALL release() throw() SAL_OVERRIDE; }; diff --git a/connectivity/source/sdbcx/VCollection.cxx b/connectivity/source/sdbcx/VCollection.cxx index c43cc185d92d..3dd1d9a5455e 100644 --- a/connectivity/source/sdbcx/VCollection.cxx +++ b/connectivity/source/sdbcx/VCollection.cxx @@ -293,7 +293,7 @@ void OCollection::clear_NoDispose() } -void OCollection::disposing(void) +void OCollection::disposing() { m_aContainerListeners.disposeAndClear(EventObject(static_cast<XTypeProvider*>(this))); m_aRefreshListeners.disposeAndClear(EventObject(static_cast<XTypeProvider*>(this))); diff --git a/connectivity/source/sdbcx/VColumn.cxx b/connectivity/source/sdbcx/VColumn.cxx index 6653c014192e..bc2d2185d359 100644 --- a/connectivity/source/sdbcx/VColumn.cxx +++ b/connectivity/source/sdbcx/VColumn.cxx @@ -172,7 +172,7 @@ void OColumn::construct() registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TABLENAME), PROPERTY_ID_TABLENAME, nAttrib, &m_TableName, cppu::UnoType<decltype(m_TableName)>::get()); } -void OColumn::disposing(void) +void OColumn::disposing() { OPropertySetHelper::disposing(); diff --git a/connectivity/source/sdbcx/VGroup.cxx b/connectivity/source/sdbcx/VGroup.cxx index 1bf65b9e9804..6ebb5c1639cc 100644 --- a/connectivity/source/sdbcx/VGroup.cxx +++ b/connectivity/source/sdbcx/VGroup.cxx @@ -67,7 +67,7 @@ Sequence< Type > SAL_CALL OGroup::getTypes( ) throw(RuntimeException, std::exce return ::comphelper::concatSequences(ODescriptor::getTypes(),OGroup_BASE::getTypes()); } -void OGroup::disposing(void) +void OGroup::disposing() { OPropertySetHelper::disposing(); diff --git a/connectivity/source/sdbcx/VIndex.cxx b/connectivity/source/sdbcx/VIndex.cxx index bcbf6e5e804f..e7dee0361cec 100644 --- a/connectivity/source/sdbcx/VIndex.cxx +++ b/connectivity/source/sdbcx/VIndex.cxx @@ -133,7 +133,7 @@ void OIndex::construct() registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCLUSTERED), PROPERTY_ID_ISCLUSTERED, nAttrib,&m_IsClustered, cppu::UnoType<bool>::get()); } -void OIndex::disposing(void) +void OIndex::disposing() { OPropertySetHelper::disposing(); diff --git a/connectivity/source/sdbcx/VTable.cxx b/connectivity/source/sdbcx/VTable.cxx index 7828c7e1fe12..7a4d453febb3 100644 --- a/connectivity/source/sdbcx/VTable.cxx +++ b/connectivity/source/sdbcx/VTable.cxx @@ -145,7 +145,7 @@ Sequence< Type > SAL_CALL OTable::getTypes( ) throw(RuntimeException, std::exce return ::comphelper::concatSequences(ODescriptor::getTypes(),OTableDescriptor_BASE::getTypes(),OTable_BASE::getTypes()); } -void SAL_CALL OTable::disposing(void) +void SAL_CALL OTable::disposing() { ODescriptor::disposing(); diff --git a/connectivity/source/sdbcx/VUser.cxx b/connectivity/source/sdbcx/VUser.cxx index b74842c724eb..7d5067248ba3 100644 --- a/connectivity/source/sdbcx/VUser.cxx +++ b/connectivity/source/sdbcx/VUser.cxx @@ -57,7 +57,7 @@ OUser::~OUser( ) delete m_pGroups; } -void OUser::disposing(void) +void OUser::disposing() { OPropertySetHelper::disposing(); ::osl::MutexGuard aGuard(m_aMutex); diff --git a/connectivity/workben/skeleton/SResultSet.hxx b/connectivity/workben/skeleton/SResultSet.hxx index d00ffceea144..a27e420286b5 100644 --- a/connectivity/workben/skeleton/SResultSet.hxx +++ b/connectivity/workben/skeleton/SResultSet.hxx @@ -138,7 +138,7 @@ namespace connectivity } // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void); + virtual void SAL_CALL disposing(); // 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() throw(::com::sun::star::uno::RuntimeException); diff --git a/cppu/source/AffineBridge/AffineBridge.cxx b/cppu/source/AffineBridge/AffineBridge.cxx index c340282d1ae7..2184a59461a1 100644 --- a/cppu/source/AffineBridge/AffineBridge.cxx +++ b/cppu/source/AffineBridge/AffineBridge.cxx @@ -68,24 +68,24 @@ public: osl::Condition m_outerCondition; OuterThread * m_pOuterThread; - explicit AffineBridge(void); - virtual ~AffineBridge(void); + explicit AffineBridge(); + virtual ~AffineBridge(); virtual void v_callInto_v(uno_EnvCallee * pCallee, va_list * pParam) SAL_OVERRIDE; virtual void v_callOut_v (uno_EnvCallee * pCallee, va_list * pParam) SAL_OVERRIDE; - virtual void v_enter(void) SAL_OVERRIDE; - virtual void v_leave(void) SAL_OVERRIDE; + virtual void v_enter() SAL_OVERRIDE; + virtual void v_leave() SAL_OVERRIDE; virtual bool v_isValid(rtl::OUString * pReason) SAL_OVERRIDE; - void innerDispatch(void); + void innerDispatch(); void outerDispatch(int loop); }; class InnerThread : public osl::Thread { - virtual void SAL_CALL run(void) SAL_OVERRIDE; + virtual void SAL_CALL run() SAL_OVERRIDE; AffineBridge * m_pAffineBridge; @@ -97,7 +97,7 @@ public: } }; -void InnerThread::run(void) +void InnerThread::run() { osl_setThreadName("UNO AffineBridge InnerThread"); @@ -108,7 +108,7 @@ void InnerThread::run(void) class OuterThread : public osl::Thread { - virtual void SAL_CALL run(void) SAL_OVERRIDE; + virtual void SAL_CALL run() SAL_OVERRIDE; AffineBridge * m_pAffineBridge; @@ -122,7 +122,7 @@ OuterThread::OuterThread(AffineBridge * threadEnvironment) create(); } -void OuterThread::run(void) +void OuterThread::run() { osl_setThreadName("UNO AffineBridge OuterThread"); @@ -137,7 +137,7 @@ void OuterThread::run(void) } -AffineBridge::AffineBridge(void) +AffineBridge::AffineBridge() : m_message (CB_DONE), m_pCallee (0), m_pParam (0), @@ -150,9 +150,9 @@ AffineBridge::AffineBridge(void) LOG_LIFECYCLE_AffineBridge_emit(fprintf(stderr, "LIFE: %s -> %p\n", "AffineBridge::AffineBridge(uno_Environment * pEnv)", this)); } -AffineBridge::~AffineBridge(void) +AffineBridge::~AffineBridge() { - LOG_LIFECYCLE_AffineBridge_emit(fprintf(stderr, "LIFE: %s -> %p\n", "AffineBridge::~AffineBridge(void)", this)); + LOG_LIFECYCLE_AffineBridge_emit(fprintf(stderr, "LIFE: %s -> %p\n", "AffineBridge::~AffineBridge()", this)); if (m_pInnerThread && osl::Thread::getCurrentIdentifier() != m_innerThreadId) { @@ -211,7 +211,7 @@ void AffineBridge::outerDispatch(int loop) while(mm != CB_DONE && loop); } -void AffineBridge::innerDispatch(void) +void AffineBridge::innerDispatch() { OSL_ASSERT(m_innerThreadId == osl::Thread::getCurrentIdentifier()); OSL_ASSERT(m_innerThreadId != m_outerThreadId); @@ -303,7 +303,7 @@ void AffineBridge::v_callOut_v(uno_EnvCallee * pCallee, va_list * pParam) innerDispatch(); } -void AffineBridge::v_enter(void) +void AffineBridge::v_enter() { m_innerMutex.acquire(); @@ -315,7 +315,7 @@ void AffineBridge::v_enter(void) ++ m_enterCount; } -void AffineBridge::v_leave(void) +void AffineBridge::v_leave() { OSL_ASSERT(m_innerThreadId == osl::Thread::getCurrentIdentifier()); diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx index 30cde7fee365..2948d9bf32d8 100644 --- a/cppu/source/LogBridge/LogBridge.cxx +++ b/cppu/source/LogBridge/LogBridge.cxx @@ -39,27 +39,27 @@ class LogBridge : public cppu::Enterable sal_Int32 m_count; oslThreadIdentifier m_threadId; - virtual ~LogBridge(void); + virtual ~LogBridge(); public: - explicit LogBridge(void); + explicit LogBridge(); virtual void v_callInto_v(uno_EnvCallee * pCallee, va_list * pParam) SAL_OVERRIDE; virtual void v_callOut_v (uno_EnvCallee * pCallee, va_list * pParam) SAL_OVERRIDE; - virtual void v_enter(void) SAL_OVERRIDE; - virtual void v_leave(void) SAL_OVERRIDE; + virtual void v_enter() SAL_OVERRIDE; + virtual void v_leave() SAL_OVERRIDE; virtual bool v_isValid(rtl::OUString * pReason) SAL_OVERRIDE; }; -LogBridge::LogBridge(void) +LogBridge::LogBridge() : m_count (0) ,m_threadId(0) { } -LogBridge::~LogBridge(void) +LogBridge::~LogBridge() { OSL_ASSERT(m_count >= 0); } @@ -83,7 +83,7 @@ void LogBridge::v_callOut_v(uno_EnvCallee * pCallee, va_list * pParam) m_threadId = osl::Thread::getCurrentIdentifier(); } -void LogBridge::v_enter(void) +void LogBridge::v_enter() { m_mutex.acquire(); @@ -95,7 +95,7 @@ void LogBridge::v_enter(void) ++ m_count; } -void LogBridge::v_leave(void) +void LogBridge::v_leave() { OSL_ASSERT(m_count > 0); diff --git a/cppu/source/UnsafeBridge/UnsafeBridge.cxx b/cppu/source/UnsafeBridge/UnsafeBridge.cxx index b51f17836ff0..533ff93b372c 100644 --- a/cppu/source/UnsafeBridge/UnsafeBridge.cxx +++ b/cppu/source/UnsafeBridge/UnsafeBridge.cxx @@ -47,30 +47,30 @@ class UnsafeBridge : public cppu::Enterable sal_Int32 m_count; oslThreadIdentifier m_threadId; - virtual ~UnsafeBridge(void); + virtual ~UnsafeBridge(); public: - explicit UnsafeBridge(void); + explicit UnsafeBridge(); virtual void v_callInto_v(uno_EnvCallee * pCallee, va_list * pParam) SAL_OVERRIDE; virtual void v_callOut_v (uno_EnvCallee * pCallee, va_list * pParam) SAL_OVERRIDE; - virtual void v_enter(void) SAL_OVERRIDE; - virtual void v_leave(void) SAL_OVERRIDE; + virtual void v_enter() SAL_OVERRIDE; + virtual void v_leave() SAL_OVERRIDE; virtual bool v_isValid(rtl::OUString * pReason) SAL_OVERRIDE; }; -UnsafeBridge::UnsafeBridge(void) +UnsafeBridge::UnsafeBridge() : m_count (0), m_threadId(0) { LOG_LIFECYCLE_UnsafeBridge_emit(fprintf(stderr, "LIFE: %s -> %p\n", "UnsafeBridge::UnsafeBridge(uno_Environment * pEnv)", this)); } -UnsafeBridge::~UnsafeBridge(void) +UnsafeBridge::~UnsafeBridge() { - LOG_LIFECYCLE_UnsafeBridge_emit(fprintf(stderr, "LIFE: %s -> %p\n", "UnsafeBridge::~UnsafeBridge(void)", this)); + LOG_LIFECYCLE_UnsafeBridge_emit(fprintf(stderr, "LIFE: %s -> %p\n", "UnsafeBridge::~UnsafeBridge()", this)); SAL_WARN_IF(m_count < 0, "cppu.unsafebridge", "m_count is less than 0"); } @@ -94,7 +94,7 @@ void UnsafeBridge::v_callOut_v(uno_EnvCallee * pCallee, va_list * pParam) m_threadId = osl::Thread::getCurrentIdentifier(); } -void UnsafeBridge::v_enter(void) +void UnsafeBridge::v_enter() { m_mutex.acquire(); @@ -106,7 +106,7 @@ void UnsafeBridge::v_enter(void) ++ m_count; } -void UnsafeBridge::v_leave(void) +void UnsafeBridge::v_leave() { SAL_WARN_IF(m_count <= 0, "cppu.unsafebridge", "m_count is less than or equal to 0"); diff --git a/cppu/source/helper/purpenv/Proxy.hxx b/cppu/source/helper/purpenv/Proxy.hxx index 2b69faaeb9c6..037c68e8dc05 100644 --- a/cppu/source/helper/purpenv/Proxy.hxx +++ b/cppu/source/helper/purpenv/Proxy.hxx @@ -56,10 +56,10 @@ public: rtl::OUString const & rOId, cppu::helper::purpenv::ProbeFun * probeFun, void * pProbeContext); - ~Proxy(void); + ~Proxy(); - void acquire(void); - void release(void); + void acquire(); + void release(); void dispatch( typelib_TypeDescriptionReference * pReturnTypeRef, diff --git a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx index d3b47bfee7f0..f6dc421b4db6 100644 --- a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx +++ b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx @@ -76,11 +76,11 @@ class Base : public cppu::Enterable public: explicit Base(uno_Environment * pEnv, cppu::Enterable * pEnterable); - void acquireWeak(void); - void releaseWeak(void); + void acquireWeak(); + void releaseWeak(); void harden (uno_Environment ** ppHardEnv); - void acquire (void); - void release (void); + void acquire(); + void release(); void registerProxyInterface (void ** ppProxy, uno_freeProxyFunc freeProxy, @@ -100,8 +100,8 @@ public: void acquireInterface (void * pInterface); void releaseInterface (void * pInterface); - virtual void v_enter (void) SAL_OVERRIDE; - virtual void v_leave (void) SAL_OVERRIDE; + virtual void v_enter() SAL_OVERRIDE; + virtual void v_leave() SAL_OVERRIDE; virtual void v_callInto_v(uno_EnvCallee * pCallee, va_list * pParam) SAL_OVERRIDE; virtual void v_callOut_v (uno_EnvCallee * pCallee, va_list * pParam) SAL_OVERRIDE; virtual bool v_isValid (rtl::OUString * pReason) SAL_OVERRIDE; @@ -281,14 +281,14 @@ Base::~Base() m_pEnv->release(m_pEnv); } -void Base::acquire(void) +void Base::acquire() { m_env_acquire(m_pEnv); osl_atomic_increment(&m_nRef); } -void Base::release(void) +void Base::release() { if (osl_atomic_decrement(&m_nRef) == 0) delete this; @@ -303,12 +303,12 @@ void Base::harden(uno_Environment ** ppHardEnv) osl_atomic_increment(&m_nRef); } -void Base::acquireWeak(void) +void Base::acquireWeak() { m_env_acquireWeak(m_pEnv); } -void Base::releaseWeak(void) +void Base::releaseWeak() { m_env_releaseWeak(m_pEnv); } @@ -493,12 +493,12 @@ void Base::releaseInterface(void * pInterface) m_env_releaseInterface); } -void Base::v_enter(void) +void Base::v_enter() { m_pEnterable->enter(); } -void Base::v_leave(void) +void Base::v_leave() { m_pEnterable->leave(); } diff --git a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx index 5e03243df2ae..250ad9dede94 100644 --- a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx +++ b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx @@ -60,15 +60,15 @@ public: uno_Environment * pTo, cppu::helper::purpenv::ProbeFun * probeFun, void * pProbeContext); - virtual ~Mapping(void); + virtual ~Mapping(); void mapInterface( uno_Interface ** ppOut, uno_Interface * pUnoI, typelib_InterfaceTypeDescription * pTypeDescr); - void acquire(void); - void release(void); + void acquire(); + void release(); }; static void SAL_CALL s_mapInterface( @@ -135,9 +135,9 @@ Mapping::Mapping(uno_Environment * pFrom, uno_Mapping::mapInterface = (uno_MapInterfaceFunc)s_mapInterface; } -Mapping::~Mapping(void) +Mapping::~Mapping() { - LOG_LIFECYCLE_cppu_helper_purpenv_Mapping_emit(fprintf(stderr, "LIFE: %s -> %p\n", "Mapping::~Mapping(void)", this)); + LOG_LIFECYCLE_cppu_helper_purpenv_Mapping_emit(fprintf(stderr, "LIFE: %s -> %p\n", "Mapping::~Mapping()", this)); } diff --git a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx index f73a3228ed5b..e366b9478d58 100644 --- a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx +++ b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx @@ -255,7 +255,7 @@ Proxy::~Proxy() typelib_typedescription_release(&m_pTypeDescr->aBase); } -static uno::TypeDescription getAcquireMethod(void) +static uno::TypeDescription getAcquireMethod() { typelib_TypeDescriptionReference * type_XInterface = * typelib_static_type_getByTypeClass(typelib_TypeClass_INTERFACE); @@ -270,7 +270,7 @@ static uno::TypeDescription getAcquireMethod(void) return acquire; } -static uno::TypeDescription getReleaseMethod(void) +static uno::TypeDescription getReleaseMethod() { typelib_TypeDescriptionReference * type_XInterface = * typelib_static_type_getByTypeClass(typelib_TypeClass_INTERFACE); @@ -288,7 +288,7 @@ static uno::TypeDescription getReleaseMethod(void) static uno::TypeDescription s_acquireMethod(getAcquireMethod()); static uno::TypeDescription s_releaseMethod(getReleaseMethod()); -void Proxy::acquire(void) +void Proxy::acquire() { if (m_probeFun) m_probeFun(true, @@ -328,7 +328,7 @@ void Proxy::acquire(void) } -void Proxy::release(void) +void Proxy::release() { cppu::helper::purpenv::ProbeFun * probeFun = m_probeFun; void * pProbeContext = m_pProbeContext; diff --git a/cppu/source/typelib/static_types.cxx b/cppu/source/typelib/static_types.cxx index e5227553e97a..446671afd09a 100644 --- a/cppu/source/typelib/static_types.cxx +++ b/cppu/source/typelib/static_types.cxx @@ -398,7 +398,7 @@ void init( typelib_TypeDescription * pReg = &pComp->aBase; pReg->pWeakRef = reinterpret_cast<typelib_TypeDescriptionReference *>(pReg); - // sizeof( void ) not allowed + // sizeof(void) not allowed pReg->nSize = ::typelib_typedescription_getAlignedUnoSize( pReg, 0, pReg->nAlignment ); pReg->nAlignment = adjustAlignment( pReg->nAlignment ); pReg->bComplete = sal_False; @@ -495,7 +495,7 @@ void SAL_CALL typelib_static_mi_interface_type_init( typelib_TypeDescription * pReg = &pIface->aBase; pReg->pWeakRef = reinterpret_cast<typelib_TypeDescriptionReference *>(pReg); - // sizeof( void ) not allowed + // sizeof(void) not allowed pReg->nSize = ::typelib_typedescription_getAlignedUnoSize( pReg, 0, pReg->nAlignment ); pReg->nAlignment = adjustAlignment( pReg->nAlignment ); @@ -536,7 +536,7 @@ void SAL_CALL typelib_static_enum_type_init( pEnum->nDefaultEnumValue = nDefaultValue; pReg->pWeakRef = reinterpret_cast<typelib_TypeDescriptionReference *>(pReg); - // sizeof( void ) not allowed + // sizeof(void) not allowed pReg->nSize = ::typelib_typedescription_getAlignedUnoSize( pReg, 0, pReg->nAlignment ); pReg->nAlignment = ::adjustAlignment( pReg->nAlignment ); pReg->bComplete = sal_False; diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx index 4ae195745b41..c69fd8f0e790 100644 --- a/cppu/source/typelib/typelib.cxx +++ b/cppu/source/typelib/typelib.cxx @@ -826,7 +826,7 @@ void newTypeDescription( (*ppRet)->pWeakRef = reinterpret_cast<typelib_TypeDescriptionReference *>(*ppRet); if( eTypeClass != typelib_TypeClass_VOID ) { - // sizeof( void ) not allowed + // sizeof(void) not allowed (*ppRet)->nSize = typelib_typedescription_getAlignedUnoSize( (*ppRet), 0, (*ppRet)->nAlignment ); (*ppRet)->nAlignment = adjustAlignment( (*ppRet)->nAlignment ); } @@ -884,7 +884,7 @@ extern "C" void SAL_CALL typelib_typedescription_newEnum( ::memcpy( pEnum->pEnumValues, pEnumValues, nEnumValues * sizeof(sal_Int32) ); (*ppRet)->pWeakRef = reinterpret_cast<typelib_TypeDescriptionReference *>(*ppRet); - // sizeof( void ) not allowed + // sizeof(void) not allowed (*ppRet)->nSize = typelib_typedescription_getAlignedUnoSize( (*ppRet), 0, (*ppRet)->nAlignment ); (*ppRet)->nAlignment = adjustAlignment( (*ppRet)->nAlignment ); } diff --git a/cppu/source/uno/EnvStack.cxx b/cppu/source/uno/EnvStack.cxx index 1bb726685348..5fefaa85640a 100644 --- a/cppu/source/uno/EnvStack.cxx +++ b/cppu/source/uno/EnvStack.cxx @@ -86,7 +86,7 @@ static void s_setCurrent(uno_Environment * pEnv) } } -static uno_Environment * s_getCurrent(void) +static uno_Environment * s_getCurrent() { uno_Environment * pEnv = NULL; diff --git a/cppu/source/uno/cascade_mapping.cxx b/cppu/source/uno/cascade_mapping.cxx index 1402be535454..596205a6be4e 100644 --- a/cppu/source/uno/cascade_mapping.cxx +++ b/cppu/source/uno/cascade_mapping.cxx @@ -52,8 +52,8 @@ class MediatorMapping : public uno_Mapping uno::Environment m_to; public: - void acquire(void); - void release(void); + void acquire(); + void release(); void mapInterface(void ** ppOut, void * pInterface, @@ -113,14 +113,14 @@ MediatorMapping::~MediatorMapping() LOG_LIFECYLE_MediatorMapping_emit(std::cerr << __FUNCTION__ << std::endl); } -void MediatorMapping::acquire(void) +void MediatorMapping::acquire() { LOG_LIFECYLE_MediatorMapping_emit(std::cerr << __FUNCTION__ << std::endl); osl_atomic_increment(&m_refCount); } -void MediatorMapping::release(void) +void MediatorMapping::release() { LOG_LIFECYLE_MediatorMapping_emit(std::cerr << __FUNCTION__ << std::endl); diff --git a/cppuhelper/qa/unourl/cppu_unourl.cxx b/cppuhelper/qa/unourl/cppu_unourl.cxx index 1bccf2fc3639..a54cf7cf40c9 100644 --- a/cppuhelper/qa/unourl/cppu_unourl.cxx +++ b/cppuhelper/qa/unourl/cppu_unourl.cxx @@ -186,7 +186,7 @@ namespace cppu_unourl } } - void testDescriptorKey(void) + void testDescriptorKey() { struct Test { diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx index 8cbec655be6b..a634086fd33b 100644 --- a/cppuhelper/source/factory.cxx +++ b/cppuhelper/source/factory.cxx @@ -104,7 +104,7 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - Sequence< OUString > SAL_CALL getSupportedServiceNames(void) + Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: @@ -240,7 +240,7 @@ sal_Bool OSingleFactoryHelper::supportsService( } // XServiceInfo -Sequence< OUString > OSingleFactoryHelper::getSupportedServiceNames(void) +Sequence< OUString > OSingleFactoryHelper::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) { return aServiceNames; @@ -522,7 +522,7 @@ public: throw (Exception, RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - Sequence< OUString > SAL_CALL getSupportedServiceNames(void) + Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XUnloadingPreference sal_Bool SAL_CALL releaseOnNotification() @@ -811,7 +811,7 @@ Reference< XInterface > ORegistryFactoryHelper::createModuleFactory() } // XServiceInfo -Sequence< OUString > ORegistryFactoryHelper::getSupportedServiceNames(void) +Sequence< OUString > ORegistryFactoryHelper::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) { MutexGuard aGuard( aMutex ); @@ -892,7 +892,7 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - Sequence< OUString > SAL_CALL getSupportedServiceNames(void) + Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XUnloadingPreference sal_Bool SAL_CALL releaseOnNotification() @@ -935,7 +935,7 @@ sal_Bool OFactoryProxyHelper::supportsService(const OUString& ServiceName) } // XServiceInfo -Sequence< OUString > OFactoryProxyHelper::getSupportedServiceNames(void) +Sequence< OUString > OFactoryProxyHelper::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) { Reference<XServiceInfo > xInfo( xFactory, UNO_QUERY ); diff --git a/cppuhelper/source/implbase_ex.cxx b/cppuhelper/source/implbase_ex.cxx index b32d373dc4cf..4d9e04f01788 100644 --- a/cppuhelper/source/implbase_ex.cxx +++ b/cppuhelper/source/implbase_ex.cxx @@ -48,7 +48,7 @@ namespace cppu /** Shared mutex for implementation helper initialization. Not for public use. */ -::osl::Mutex & SAL_CALL getImplHelperInitMutex(void) +::osl::Mutex & SAL_CALL getImplHelperInitMutex() { return theImplHelperInitMutex::get(); } diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx index f2835f454112..42fdfcae17a5 100644 --- a/cppuhelper/source/propshlp.cxx +++ b/cppuhelper/source/propshlp.cxx @@ -78,7 +78,7 @@ public: OPropertySetHelperInfo_Impl( IPropertyArrayHelper & rHelper_ ); // XPropertySetInfo-methods - virtual Sequence< Property > SAL_CALL getProperties(void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual Sequence< Property > SAL_CALL getProperties() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual Property SAL_CALL getPropertyByName(const OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& PropertyName) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -96,7 +96,7 @@ OPropertySetHelperInfo_Impl::OPropertySetHelperInfo_Impl( /** * Return the sequence of properties, which are provided through the constructor. */ -Sequence< Property > OPropertySetHelperInfo_Impl::getProperties(void) throw(::com::sun::star::uno::RuntimeException, std::exception) +Sequence< Property > OPropertySetHelperInfo_Impl::getProperties() throw(::com::sun::star::uno::RuntimeException, std::exception) { return aInfos; } @@ -1108,7 +1108,7 @@ sal_Bool OPropertyArrayHelper::fillPropertyMembersByHandle } -Sequence< Property > OPropertyArrayHelper::getProperties(void) +Sequence< Property > OPropertyArrayHelper::getProperties() { return aInfos; } diff --git a/cppuhelper/test/bootstrap/TestEnv.cxx b/cppuhelper/test/bootstrap/TestEnv.cxx index 8c3dc010b71a..0a08b54bd559 100644 --- a/cppuhelper/test/bootstrap/TestEnv.cxx +++ b/cppuhelper/test/bootstrap/TestEnv.cxx @@ -46,8 +46,8 @@ public: explicit TestEnv(); protected: - virtual void v_enter(void); - virtual void v_leave(void); + virtual void v_enter(); + virtual void v_leave(); virtual void v_callInto_v(uno_EnvCallee * pCallee, va_list * pParam); virtual void v_callOut_v (uno_EnvCallee * pCallee, va_list * pParam); @@ -61,9 +61,9 @@ TestEnv::TestEnv() LOG_LIFECYCLE_TestEnv_emit(fprintf(stderr, "LIFE: %s -> %p\n", "TestEnv::TestEnv(...)", this)); } -TestEnv::~TestEnv(void) +TestEnv::~TestEnv() { - LOG_LIFECYCLE_TestEnv_emit(fprintf(stderr, "LIFE: %s -> %p\n", "TestEnv::~TestEnv(void)", this)); + LOG_LIFECYCLE_TestEnv_emit(fprintf(stderr, "LIFE: %s -> %p\n", "TestEnv::~TestEnv()", this)); } @@ -81,12 +81,12 @@ void TestEnv::v_callOut_v(uno_EnvCallee * pCallee, va_list * pParam) ++ m_inCount; } -void TestEnv::v_enter(void) +void TestEnv::v_enter() { ++ m_inCount; } -void TestEnv::v_leave(void) +void TestEnv::v_leave() { -- m_inCount; } diff --git a/cppuhelper/test/bootstrap/bootstrap.test.cxx b/cppuhelper/test/bootstrap/bootstrap.test.cxx index bfb3e7520015..d4d766e54acb 100644 --- a/cppuhelper/test/bootstrap/bootstrap.test.cxx +++ b/cppuhelper/test/bootstrap/bootstrap.test.cxx @@ -144,7 +144,7 @@ static void s_test__loadSharedLibComponentFactory__purpose_purpose() s_test__loadSharedLibComponentFactory(":testenv", ":testenv"); } -static rtl::OUString s_getSDrive(void) +static rtl::OUString s_getSDrive() { rtl::OUString path;//("file://"); @@ -180,14 +180,14 @@ static void s_test__createSimpleRegistry(rtl::OUString const & clientPurpose) } } -static void s_test__createSimpleRegistry__free(void) +static void s_test__createSimpleRegistry__free() { s_comment += "\ts_test__createSimpleRegistry__free\n"; s_test__createSimpleRegistry(rtl::OUString()); } -static void s_test__createSimpleRegistry__purpose(void) +static void s_test__createSimpleRegistry__purpose() { s_comment += "\ts_test__createSimpleRegistry__purpose\n"; @@ -226,14 +226,14 @@ static void s_test__bootstrap_InitialComponentContext(rtl::OUString const & clie xComponent->dispose(); } -static void s_test__bootstrap_InitialComponentContext__free(void) +static void s_test__bootstrap_InitialComponentContext__free() { s_comment += "\ts_test__bootstrap_InitialComponentContext__free\n"; s_test__bootstrap_InitialComponentContext(rtl::OUString()); } -static void s_test__bootstrap_InitialComponentContext__purpose(void) +static void s_test__bootstrap_InitialComponentContext__purpose() { s_comment += "\ts_test__bootstrap_InitialComponentContext__purpose\n"; diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 5f83f286784f..dec5a9fb3e6b 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -172,7 +172,7 @@ void MacroEventListBox::Resize() maListBox.SetPosSizePixel( aPnt, aSize ); } -void MacroEventListBox::ConnectElements( void ) +void MacroEventListBox::ConnectElements() { Resize(); diff --git a/cui/source/customize/macropg_impl.hxx b/cui/source/customize/macropg_impl.hxx index 7babc45611a5..dd7909275085 100644 --- a/cui/source/customize/macropg_impl.hxx +++ b/cui/source/customize/macropg_impl.hxx @@ -51,7 +51,7 @@ public: AssignComponentDialog( vcl::Window * pParent, const OUString& rURL ); virtual ~AssignComponentDialog(); - OUString getURL( void ) const + OUString getURL() const { return maURL; } }; diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index e80f41854b6a..ade585801826 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -901,7 +901,7 @@ namespace svx - void HangulHanjaOptionsDialog::Init( void ) + void HangulHanjaOptionsDialog::Init() { if( !m_xConversionDictionaryList.is() ) { @@ -1204,7 +1204,7 @@ namespace svx // index of the internal iterator, used for First() and Next() methods sal_uInt16 m_nAct; - const OUString* _Next( void ); + const OUString* _Next(); public: SuggestionList(); ~SuggestionList(); @@ -1212,12 +1212,12 @@ namespace svx bool Set( const OUString& _rElement, sal_uInt16 _nNumOfElement ); bool Reset( sal_uInt16 _nNumOfElement ); const OUString* Get( sal_uInt16 _nNumOfElement ) const; - void Clear( void ); + void Clear(); - const OUString* First( void ); - const OUString* Next( void ); + const OUString* First(); + const OUString* Next(); - inline sal_uInt16 GetCount( void ) const { return m_nNumOfEntries; } + inline sal_uInt16 GetCount() const { return m_nNumOfEntries; } }; SuggestionList::SuggestionList() : @@ -1271,7 +1271,7 @@ namespace svx return NULL; } - void SuggestionList::Clear( void ) + void SuggestionList::Clear() { if( m_nNumOfEntries ) { @@ -1286,7 +1286,7 @@ namespace svx } } - const OUString* SuggestionList::_Next( void ) + const OUString* SuggestionList::_Next() { const OUString* pRet = NULL; while( m_nAct < m_vElements.size() && !pRet ) @@ -1299,13 +1299,13 @@ namespace svx return pRet; } - const OUString* SuggestionList::First( void ) + const OUString* SuggestionList::First() { m_nAct = 0; return _Next(); } - const OUString* SuggestionList::Next( void ) + const OUString* SuggestionList::Next() { const OUString* pRet; @@ -1599,7 +1599,7 @@ namespace svx UpdateButtonStates(); } - void HangulHanjaEditDictDialog::UpdateOriginalLB( void ) + void HangulHanjaEditDictDialog::UpdateOriginalLB() { m_aOriginalLB->Clear(); Reference< XConversionDictionary > xDict = m_rDictList[ m_nCurrentDict ]; @@ -1632,7 +1632,7 @@ namespace svx m_aDeletePB->Enable(!m_bModifiedOriginal && bHaveValidOriginalString); } - void HangulHanjaEditDictDialog::UpdateSuggestions( void ) + void HangulHanjaEditDictDialog::UpdateSuggestions() { Sequence< OUString > aEntries; bool bFound = GetConversions( m_rDictList[ m_nCurrentDict ], m_aOriginal, aEntries ); @@ -1773,7 +1773,7 @@ namespace svx delete m_pSuggestions; } - void HangulHanjaEditDictDialog::UpdateScrollbar( void ) + void HangulHanjaEditDictDialog::UpdateScrollbar() { sal_uInt16 nPos = sal_uInt16( m_aScrollSB->GetThumbPos() ); m_nTopPos = nPos; diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx index c3c167cca62d..ef1eecff6a99 100644 --- a/cui/source/dialogs/insrc.cxx +++ b/cui/source/dialogs/insrc.cxx @@ -45,7 +45,7 @@ SvxInsRowColDlg::SvxInsRowColDlg(vcl::Window* pParent, bool bCol, const OString& SetHelpId( sHelpId ); } -short SvxInsRowColDlg::Execute(void) +short SvxInsRowColDlg::Execute() { return ModalDialog::Execute(); } diff --git a/cui/source/dialogs/newtabledlg.cxx b/cui/source/dialogs/newtabledlg.cxx index ab9058c0c975..ae6a0e757fa2 100644 --- a/cui/source/dialogs/newtabledlg.cxx +++ b/cui/source/dialogs/newtabledlg.cxx @@ -28,7 +28,7 @@ SvxNewTableDialog::SvxNewTableDialog( vcl::Window* pParent ) get(mpNumColumns, "columns"); } -short SvxNewTableDialog::Execute(void) +short SvxNewTableDialog::Execute() { return ModalDialog::Execute(); } diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index 4cea2af82cd2..cb228daebc1e 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -218,7 +218,7 @@ namespace svx DECL_LINK( EditDictHdl, void* ); DECL_LINK( DeleteDictHdl, void* ); - void Init( void ); ///< reads settings from core and init controls + void Init(); ///< reads settings from core and init controls public: HangulHanjaOptionsDialog( vcl::Window* _pParent ); virtual ~HangulHanjaOptionsDialog(); @@ -299,8 +299,8 @@ namespace svx DECL_LINK( DeletePBPushHdl, void* ); void InitEditDictDialog( sal_uInt32 _nSelDict ); - void UpdateOriginalLB( void ); - void UpdateSuggestions( void ); + void UpdateOriginalLB(); + void UpdateSuggestions(); void UpdateButtonStates(); void SetEditText( Edit& _rEdit, sal_uInt16 _nEntryNum ); @@ -313,7 +313,7 @@ namespace svx HangulHanjaEditDictDialog( vcl::Window* _pParent, HHDictList& _rDictList, sal_uInt32 _nSelDict ); virtual ~HangulHanjaEditDictDialog(); - void UpdateScrollbar( void ); + void UpdateScrollbar(); }; diff --git a/cui/source/inc/headertablistbox.hxx b/cui/source/inc/headertablistbox.hxx index f536a1d77b57..d368d4dc27c9 100644 --- a/cui/source/inc/headertablistbox.hxx +++ b/cui/source/inc/headertablistbox.hxx @@ -48,7 +48,7 @@ public: return maHeaderBar; } - void ConnectElements( void );/**< should be called after all manipulations on elements are done + void ConnectElements();/**< should be called after all manipulations on elements are done calcs real sizes depending on sizes of this */ void Show( bool bVisible = true, sal_uInt16 nFlags = 0 ); ///< same meaning as Windows::Show() void Enable( bool bEnable = true, bool bChild = true ); ///< same meaning as Windows::Enable() diff --git a/cui/source/inc/insrc.hxx b/cui/source/inc/insrc.hxx index 012916b89423..a6e215e2ee49 100644 --- a/cui/source/inc/insrc.hxx +++ b/cui/source/inc/insrc.hxx @@ -44,7 +44,7 @@ class SvxInsRowColDlg : public SvxAbstractInsRowColDlg, public ModalDialog public: SvxInsRowColDlg( vcl::Window* pParent, bool bCol, const OString& sHelpId ); - virtual short Execute(void) SAL_OVERRIDE; + virtual short Execute() SAL_OVERRIDE; virtual bool isInsertBefore() const SAL_OVERRIDE; virtual sal_uInt16 getInsertCount() const SAL_OVERRIDE; diff --git a/cui/source/inc/newtabledlg.hxx b/cui/source/inc/newtabledlg.hxx index 778457aec69e..109d62f1509e 100644 --- a/cui/source/inc/newtabledlg.hxx +++ b/cui/source/inc/newtabledlg.hxx @@ -35,7 +35,7 @@ private: public: SvxNewTableDialog( vcl::Window* pWindow ); - virtual short Execute(void) SAL_OVERRIDE; + virtual short Execute() SAL_OVERRIDE; virtual sal_Int32 getRows() const SAL_OVERRIDE; virtual sal_Int32 getColumns() const SAL_OVERRIDE; diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx index 234d14094f9c..6c309a329b92 100644 --- a/cui/source/inc/textattr.hxx +++ b/cui/source/inc/textattr.hxx @@ -71,7 +71,7 @@ private: /** Return whether the text direction is from left to right (</sal_True>) or top to bottom (</sal_False>). */ - bool IsTextDirectionLeftToRight (void) const; + bool IsTextDirectionLeftToRight() const; public: diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index b6d70f487531..2fa0d064ef9c 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -29,7 +29,7 @@ class SfxShell; // static ---------------------------------------------------------------- bool EnableSSO(); -CreateTabPage GetSSOCreator( void ); +CreateTabPage GetSSOCreator(); // struct OrderedEntry --------------------------------------------------- diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx index ea3cdd8af441..07011b6827ef 100644 --- a/cui/source/options/optmemory.cxx +++ b/cui/source/options/optmemory.cxx @@ -82,7 +82,7 @@ inline void OfaMemoryOptionsPage::SetNfGraphicCacheVal( long nSizeInBytes ) m_pNfGraphicCache->SetValue( nSizeInBytes >> 20 ); } -long OfaMemoryOptionsPage::GetNfGraphicObjectCacheVal( void ) const +long OfaMemoryOptionsPage::GetNfGraphicObjectCacheVal() const { return long( ::rtl::math::round( double( m_pNfGraphicObjectCache->GetValue() ) * NF2BYTES ) ); } diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx index b3aaff18715d..666010fd3f10 100644 --- a/cui/source/options/optmemory.hxx +++ b/cui/source/options/optmemory.hxx @@ -48,7 +48,7 @@ private: sal_Int32 GetNfGraphicCacheVal() const; // returns # of Bytes inline void SetNfGraphicCacheVal( long nSizeInBytes ); - long GetNfGraphicObjectCacheVal( void ) const; // returns # of Bytes + long GetNfGraphicObjectCacheVal() const; // returns # of Bytes void SetNfGraphicObjectCacheVal( long nSizeInBytes ); inline void SetNfGraphicObjectCacheMax( long nSizeInBytes ); inline void SetNfGraphicObjectCacheLast( long nSizeInBytes ); diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index ce9c8928a78c..655638577e35 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -677,7 +677,7 @@ IMPL_LINK_NOARG(SvxTextAttrPage, ClickHdl_Impl) } -bool SvxTextAttrPage::IsTextDirectionLeftToRight (void) const +bool SvxTextAttrPage::IsTextDirectionLeftToRight() const { // Determine the text writing direction with left to right as default. bool bLeftToRightDirection = true; diff --git a/dbaccess/source/core/api/CIndexes.cxx b/dbaccess/source/core/api/CIndexes.cxx index 66f62f144163..f51a1d845ac6 100644 --- a/dbaccess/source/core/api/CIndexes.cxx +++ b/dbaccess/source/core/api/CIndexes.cxx @@ -82,7 +82,7 @@ void OIndexes::dropObject(sal_Int32 _nPos, const OUString& _sElementName) OIndexesHelper::dropObject(_nPos,_sElementName); } -void SAL_CALL OIndexes::disposing(void) +void SAL_CALL OIndexes::disposing() { if ( m_xIndexes.is() ) clear_NoDispose(); diff --git a/dbaccess/source/core/api/CIndexes.hxx b/dbaccess/source/core/api/CIndexes.hxx index da6c68bc265e..837a15425ce0 100644 --- a/dbaccess/source/core/api/CIndexes.hxx +++ b/dbaccess/source/core/api/CIndexes.hxx @@ -41,7 +41,7 @@ namespace dbaccess ,m_xIndexes(_rxIndexes) {} - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; }; } diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx b/dbaccess/source/core/api/CRowSetDataColumn.cxx index df23c4c0403c..876fc2a6d7b8 100644 --- a/dbaccess/source/core/api/CRowSetDataColumn.cxx +++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx @@ -219,7 +219,7 @@ sdbcx::ObjectType ORowSetDataColumns::createObject(const OUString& _rName) return xNamed; } -void SAL_CALL ORowSetDataColumns::disposing(void) +void SAL_CALL ORowSetDataColumns::disposing() { ORowSetDataColumns_BASE::disposing(); m_aColumns = NULL; diff --git a/dbaccess/source/core/api/CRowSetDataColumn.hxx b/dbaccess/source/core/api/CRowSetDataColumn.hxx index 5483f167f97d..0dc3db9866f8 100644 --- a/dbaccess/source/core/api/CRowSetDataColumn.hxx +++ b/dbaccess/source/core/api/CRowSetDataColumn.hxx @@ -93,7 +93,7 @@ namespace dbaccess ); virtual ~ORowSetDataColumns(); // only the name is identical to ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; void assign(const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns,const ::std::vector< OUString> &_rVector); }; } diff --git a/dbaccess/source/core/api/HelperCollections.cxx b/dbaccess/source/core/api/HelperCollections.cxx index 301596443723..78c99cfff0b7 100644 --- a/dbaccess/source/core/api/HelperCollections.cxx +++ b/dbaccess/source/core/api/HelperCollections.cxx @@ -66,7 +66,7 @@ namespace dbaccess return new OPrivateColumns( _rColumns, _bCase, _rParent, _rMutex, aNames, false ); } - void SAL_CALL OPrivateColumns::disposing(void) + void SAL_CALL OPrivateColumns::disposing() { m_aColumns = NULL; clear_NoDispose(); diff --git a/dbaccess/source/core/api/HelperCollections.hxx b/dbaccess/source/core/api/HelperCollections.hxx index 5a74ad6ca8c4..13bed62eadc1 100644 --- a/dbaccess/source/core/api/HelperCollections.hxx +++ b/dbaccess/source/core/api/HelperCollections.hxx @@ -70,7 +70,7 @@ namespace dbaccess ::osl::Mutex& _rMutex ); - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; }; typedef connectivity::sdbcx::OCollection OPrivateTables_BASE; @@ -95,7 +95,7 @@ namespace dbaccess ,m_aTables(_rTables) { } - virtual void SAL_CALL disposing(void) SAL_OVERRIDE + virtual void SAL_CALL disposing() SAL_OVERRIDE { clear_NoDispose(); // we're not owner of the objects we're holding, instead the object we got in our ctor is diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index ef658a9fb243..69b357182380 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -2907,7 +2907,7 @@ void ORowSetClone::disposing() } // XCloseable -void ORowSetClone::close(void) throw( SQLException, RuntimeException, std::exception ) +void ORowSetClone::close() throw( SQLException, RuntimeException, std::exception ) { { MutexGuard aGuard( m_aMutex ); diff --git a/dbaccess/source/core/api/RowSet.hxx b/dbaccess/source/core/api/RowSet.hxx index 581d42b8674f..aae5b7f0a634 100644 --- a/dbaccess/source/core/api/RowSet.hxx +++ b/dbaccess/source/core/api/RowSet.hxx @@ -268,11 +268,11 @@ namespace dbaccess virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::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 ); // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // ::com::sun::star::lang::XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -500,7 +500,7 @@ namespace dbaccess static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // ::com::sun::star::sdbc::XCloseable virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx index cad73d99295e..a90f33cc8fcd 100644 --- a/dbaccess/source/core/api/RowSetBase.cxx +++ b/dbaccess/source/core/api/RowSetBase.cxx @@ -154,7 +154,7 @@ void SAL_CALL ORowSetBase::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) c } // OComponentHelper -void SAL_CALL ORowSetBase::disposing(void) +void SAL_CALL ORowSetBase::disposing() { MutexGuard aGuard(*m_pMutex); @@ -1087,7 +1087,7 @@ void ORowSetBase::checkPositioningAllowed() throw( SQLException, RuntimeExceptio throwFunctionSequenceException(*m_pMySelf); } -Reference< XInterface > ORowSetBase::getStatement(void) throw( SQLException, RuntimeException, std::exception ) +Reference< XInterface > ORowSetBase::getStatement() throw( SQLException, RuntimeException, std::exception ) { return NULL; } diff --git a/dbaccess/source/core/api/RowSetBase.hxx b/dbaccess/source/core/api/RowSetBase.hxx index 9f23bd06199e..3e111c1182e7 100644 --- a/dbaccess/source/core/api/RowSetBase.hxx +++ b/dbaccess/source/core/api/RowSetBase.hxx @@ -235,7 +235,7 @@ namespace dbaccess virtual ~ORowSetBase(); // OComponentHelper - virtual void SAL_CALL disposing(void); + virtual void SAL_CALL disposing(); // com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx index ac7705df9fc6..69c88a049e0c 100644 --- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx +++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx @@ -276,7 +276,7 @@ OSingleSelectQueryComposer::~OSingleSelectQueryComposer() } // OComponentHelper -void SAL_CALL OSingleSelectQueryComposer::disposing(void) +void SAL_CALL OSingleSelectQueryComposer::disposing() { OSubComponent::disposing(); diff --git a/dbaccess/source/core/api/column.cxx b/dbaccess/source/core/api/column.cxx index ae4d769b8612..ca0ee700413c 100644 --- a/dbaccess/source/core/api/column.cxx +++ b/dbaccess/source/core/api/column.cxx @@ -228,7 +228,7 @@ void OColumns::clearColumns() disposing(); } -void SAL_CALL OColumns::disposing(void) +void SAL_CALL OColumns::disposing() { MutexGuard aGuard(m_rMutex); m_xDrvColumns = NULL; diff --git a/dbaccess/source/core/api/datacolumn.cxx b/dbaccess/source/core/api/datacolumn.cxx index f8c36db9ebe0..0ab2bce9e28e 100644 --- a/dbaccess/source/core/api/datacolumn.cxx +++ b/dbaccess/source/core/api/datacolumn.cxx @@ -106,7 +106,7 @@ void ODataColumn::disposing() } // ::com::sun::star::sdb::XColumn -sal_Bool ODataColumn::wasNull(void) throw( SQLException, RuntimeException, std::exception ) +sal_Bool ODataColumn::wasNull() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(!m_xRow.is()); @@ -114,7 +114,7 @@ sal_Bool ODataColumn::wasNull(void) throw( SQLException, RuntimeException, std:: return m_xRow->wasNull(); } -OUString ODataColumn::getString(void) throw( SQLException, RuntimeException, std::exception ) +OUString ODataColumn::getString() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(!m_xRow.is()); @@ -122,7 +122,7 @@ OUString ODataColumn::getString(void) throw( SQLException, RuntimeException, std return m_xRow->getString(m_nPos); } -sal_Bool ODataColumn::getBoolean(void) throw( SQLException, RuntimeException, std::exception ) +sal_Bool ODataColumn::getBoolean() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(!m_xRow.is()); @@ -130,7 +130,7 @@ sal_Bool ODataColumn::getBoolean(void) throw( SQLException, RuntimeException, st return m_xRow->getBoolean(m_nPos); } -sal_Int8 ODataColumn::getByte(void) throw( SQLException, RuntimeException, std::exception ) +sal_Int8 ODataColumn::getByte() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(!m_xRow.is()); @@ -138,7 +138,7 @@ sal_Int8 ODataColumn::getByte(void) throw( SQLException, RuntimeException, std:: return m_xRow->getByte(m_nPos); } -sal_Int16 ODataColumn::getShort(void) throw( SQLException, RuntimeException, std::exception ) +sal_Int16 ODataColumn::getShort() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(!m_xRow.is()); @@ -146,7 +146,7 @@ sal_Int16 ODataColumn::getShort(void) throw( SQLException, RuntimeException, std return m_xRow->getShort(m_nPos); } -sal_Int32 ODataColumn::getInt(void) throw( SQLException, RuntimeException, std::exception ) +sal_Int32 ODataColumn::getInt() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(!m_xRow.is()); @@ -154,7 +154,7 @@ sal_Int32 ODataColumn::getInt(void) throw( SQLException, RuntimeException, std:: return m_xRow->getInt(m_nPos); } -sal_Int64 ODataColumn::getLong(void) throw( SQLException, RuntimeException, std::exception ) +sal_Int64 ODataColumn::getLong() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(!m_xRow.is()); @@ -162,7 +162,7 @@ sal_Int64 ODataColumn::getLong(void) throw( SQLException, RuntimeException, std: return m_xRow->getLong(m_nPos); } -float ODataColumn::getFloat(void) throw( SQLException, RuntimeException, std::exception ) +float ODataColumn::getFloat() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(!m_xRow.is()); @@ -170,7 +170,7 @@ float ODataColumn::getFloat(void) throw( SQLException, RuntimeException, std::ex return m_xRow->getFloat(m_nPos); } -double ODataColumn::getDouble(void) throw( SQLException, RuntimeException, std::exception ) +double ODataColumn::getDouble() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(!m_xRow.is()); @@ -178,7 +178,7 @@ double ODataColumn::getDouble(void) throw( SQLException, RuntimeException, std:: return m_xRow->getDouble(m_nPos); } -Sequence< sal_Int8 > ODataColumn::getBytes(void) throw( SQLException, RuntimeException, std::exception ) +Sequence< sal_Int8 > ODataColumn::getBytes() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(!m_xRow.is()); @@ -186,7 +186,7 @@ Sequence< sal_Int8 > ODataColumn::getBytes(void) throw( SQLException, RuntimeExc return m_xRow->getBytes(m_nPos); } -com::sun::star::util::Date ODataColumn::getDate(void) throw( SQLException, RuntimeException, std::exception ) +com::sun::star::util::Date ODataColumn::getDate() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(!m_xRow.is()); @@ -194,7 +194,7 @@ com::sun::star::util::Date ODataColumn::getDate(void) throw( SQLException, Runti return m_xRow->getDate(m_nPos); } -com::sun::star::util::Time ODataColumn::getTime(void) throw( SQLException, RuntimeException, std::exception ) +com::sun::star::util::Time ODataColumn::getTime() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(!m_xRow.is()); @@ -202,7 +202,7 @@ com::sun::star::util::Time ODataColumn::getTime(void) throw( SQLException, Runti return m_xRow->getTime(m_nPos); } -com::sun::star::util::DateTime ODataColumn::getTimestamp(void) throw( SQLException, RuntimeException, std::exception ) +com::sun::star::util::DateTime ODataColumn::getTimestamp() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(!m_xRow.is()); @@ -210,7 +210,7 @@ com::sun::star::util::DateTime ODataColumn::getTimestamp(void) throw( SQLExcepti return m_xRow->getTimestamp(m_nPos); } -Reference< ::com::sun::star::io::XInputStream > ODataColumn::getBinaryStream(void) throw( SQLException, RuntimeException, std::exception ) +Reference< ::com::sun::star::io::XInputStream > ODataColumn::getBinaryStream() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(!m_xRow.is()); @@ -218,7 +218,7 @@ Reference< ::com::sun::star::io::XInputStream > ODataColumn::getBinaryStream(vo return m_xRow->getBinaryStream(m_nPos); } -Reference< ::com::sun::star::io::XInputStream > ODataColumn::getCharacterStream(void) throw( SQLException, RuntimeException, std::exception ) +Reference< ::com::sun::star::io::XInputStream > ODataColumn::getCharacterStream() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(!m_xRow.is()); @@ -234,7 +234,7 @@ Any ODataColumn::getObject(const Reference< ::com::sun::star::container::XNameAc return m_xRow->getObject(m_nPos, typeMap); } -Reference< XRef > ODataColumn::getRef(void) throw( SQLException, RuntimeException, std::exception ) +Reference< XRef > ODataColumn::getRef() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(!m_xRow.is()); @@ -242,7 +242,7 @@ Reference< XRef > ODataColumn::getRef(void) throw( SQLException, RuntimeExcepti return m_xRow->getRef(m_nPos); } -Reference< XBlob > ODataColumn::getBlob(void) throw( SQLException, RuntimeException, std::exception ) +Reference< XBlob > ODataColumn::getBlob() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(!m_xRow.is()); @@ -250,7 +250,7 @@ Reference< XBlob > ODataColumn::getBlob(void) throw( SQLException, RuntimeExcep return m_xRow->getBlob(m_nPos); } -Reference< XClob > ODataColumn::getClob(void) throw( SQLException, RuntimeException, std::exception ) +Reference< XClob > ODataColumn::getClob() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(!m_xRow.is()); @@ -258,7 +258,7 @@ Reference< XClob > ODataColumn::getClob(void) throw( SQLException, RuntimeExcep return m_xRow->getClob(m_nPos); } -Reference< XArray > ODataColumn::getArray(void) throw( SQLException, RuntimeException, std::exception ) +Reference< XArray > ODataColumn::getArray() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(!m_xRow.is()); @@ -267,7 +267,7 @@ Reference< XArray > ODataColumn::getArray(void) throw( SQLException, RuntimeExc } // ::com::sun::star::sdb::XColumnUpdate -void ODataColumn::updateNull(void) throw( SQLException, RuntimeException, std::exception ) +void ODataColumn::updateNull() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard( m_aMutex ); ::connectivity::checkDisposed(!m_xRowUpdate.is()); diff --git a/dbaccess/source/core/api/datacolumn.hxx b/dbaccess/source/core/api/datacolumn.hxx index 51d210d17d58..eecbcfa238ca 100644 --- a/dbaccess/source/core/api/datacolumn.hxx +++ b/dbaccess/source/core/api/datacolumn.hxx @@ -61,7 +61,7 @@ namespace dbaccess virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // ::com::sun::star::sdb::XColumn virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/dbaccess/source/core/api/preparedstatement.cxx b/dbaccess/source/core/api/preparedstatement.cxx index 353de68d72a4..4197c78a4f5d 100644 --- a/dbaccess/source/core/api/preparedstatement.cxx +++ b/dbaccess/source/core/api/preparedstatement.cxx @@ -139,7 +139,7 @@ void OPreparedStatement::disposing() } // ::com::sun::star::sdbcx::XColumnsSupplier -Reference< ::com::sun::star::container::XNameAccess > OPreparedStatement::getColumns(void) throw( RuntimeException, std::exception ) +Reference< ::com::sun::star::container::XNameAccess > OPreparedStatement::getColumns() throw( RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -173,7 +173,7 @@ Reference< ::com::sun::star::container::XNameAccess > OPreparedStatement::getCol } // XResultSetMetaDataSupplier -Reference< XResultSetMetaData > OPreparedStatement::getMetaData(void) throw( SQLException, RuntimeException, std::exception ) +Reference< XResultSetMetaData > OPreparedStatement::getMetaData() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -220,7 +220,7 @@ sal_Bool OPreparedStatement::execute() throw( SQLException, RuntimeException, st return Reference< XPreparedStatement >( m_xAggregateAsSet, UNO_QUERY_THROW )->execute(); } -Reference< XConnection > OPreparedStatement::getConnection(void) throw( SQLException, RuntimeException, std::exception ) +Reference< XConnection > OPreparedStatement::getConnection() throw( SQLException, RuntimeException, std::exception ) { return Reference< XConnection > (m_xParent, UNO_QUERY); } diff --git a/dbaccess/source/core/api/resultcolumn.hxx b/dbaccess/source/core/api/resultcolumn.hxx index d58f6fb99e1c..7f019c6a462c 100644 --- a/dbaccess/source/core/api/resultcolumn.hxx +++ b/dbaccess/source/core/api/resultcolumn.hxx @@ -66,7 +66,7 @@ namespace dbaccess virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // comphelper::OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; diff --git a/dbaccess/source/core/api/resultset.cxx b/dbaccess/source/core/api/resultset.cxx index b1a40e4ced4c..46f5a5c2fefe 100644 --- a/dbaccess/source/core/api/resultset.cxx +++ b/dbaccess/source/core/api/resultset.cxx @@ -158,7 +158,7 @@ void OResultSet::disposing() } // XCloseable -void OResultSet::close(void) throw( SQLException, RuntimeException, std::exception ) +void OResultSet::close() throw( SQLException, RuntimeException, std::exception ) { { MutexGuard aGuard( m_aMutex ); @@ -261,14 +261,14 @@ void OResultSet::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const } // XWarningsSupplier -Any OResultSet::getWarnings(void) throw( SQLException, RuntimeException, std::exception ) +Any OResultSet::getWarnings() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); return m_aWarnings.getWarnings(); } -void OResultSet::clearWarnings(void) throw( SQLException, RuntimeException, std::exception ) +void OResultSet::clearWarnings() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -276,7 +276,7 @@ void OResultSet::clearWarnings(void) throw( SQLException, RuntimeException, std: } // ::com::sun::star::sdbc::XResultSetMetaDataSupplier -Reference< XResultSetMetaData > OResultSet::getMetaData(void) throw( SQLException, RuntimeException, std::exception ) +Reference< XResultSetMetaData > OResultSet::getMetaData() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -319,7 +319,7 @@ namespace } // ::com::sun::star::sdbcx::XColumnsSupplier -Reference< ::com::sun::star::container::XNameAccess > OResultSet::getColumns(void) throw( RuntimeException, std::exception ) +Reference< ::com::sun::star::container::XNameAccess > OResultSet::getColumns() throw( RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -389,7 +389,7 @@ Reference< ::com::sun::star::container::XNameAccess > OResultSet::getColumns(voi } // ::com::sun::star::sdbc::XRow -sal_Bool OResultSet::wasNull(void) throw( SQLException, RuntimeException, std::exception ) +sal_Bool OResultSet::wasNull() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -721,7 +721,7 @@ void OResultSet::updateObject(sal_Int32 columnIndex, const Any& x) throw( SQLExc } // ::com::sun::star::sdbc::XResultSet -sal_Bool OResultSet::next(void) throw( SQLException, RuntimeException, std::exception ) +sal_Bool OResultSet::next() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -729,7 +729,7 @@ sal_Bool OResultSet::next(void) throw( SQLException, RuntimeException, std::exce return m_xDelegatorResultSet->next(); } -sal_Bool OResultSet::isBeforeFirst(void) throw( SQLException, RuntimeException, std::exception ) +sal_Bool OResultSet::isBeforeFirst() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -737,7 +737,7 @@ sal_Bool OResultSet::isBeforeFirst(void) throw( SQLException, RuntimeException, return m_xDelegatorResultSet->isBeforeFirst(); } -sal_Bool OResultSet::isAfterLast(void) throw( SQLException, RuntimeException, std::exception ) +sal_Bool OResultSet::isAfterLast() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -745,7 +745,7 @@ sal_Bool OResultSet::isAfterLast(void) throw( SQLException, RuntimeException, st return m_xDelegatorResultSet->isAfterLast(); } -sal_Bool OResultSet::isFirst(void) throw( SQLException, RuntimeException, std::exception ) +sal_Bool OResultSet::isFirst() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -753,7 +753,7 @@ sal_Bool OResultSet::isFirst(void) throw( SQLException, RuntimeException, std::e return m_xDelegatorResultSet->isFirst(); } -sal_Bool OResultSet::isLast(void) throw( SQLException, RuntimeException, std::exception ) +sal_Bool OResultSet::isLast() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -761,7 +761,7 @@ sal_Bool OResultSet::isLast(void) throw( SQLException, RuntimeException, std::ex return m_xDelegatorResultSet->isLast(); } -void OResultSet::beforeFirst(void) throw( SQLException, RuntimeException, std::exception ) +void OResultSet::beforeFirst() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -769,7 +769,7 @@ void OResultSet::beforeFirst(void) throw( SQLException, RuntimeException, std::e m_xDelegatorResultSet->beforeFirst(); } -void OResultSet::afterLast(void) throw( SQLException, RuntimeException, std::exception ) +void OResultSet::afterLast() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -777,7 +777,7 @@ void OResultSet::afterLast(void) throw( SQLException, RuntimeException, std::exc m_xDelegatorResultSet->afterLast(); } -sal_Bool OResultSet::first(void) throw( SQLException, RuntimeException, std::exception ) +sal_Bool OResultSet::first() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -785,7 +785,7 @@ sal_Bool OResultSet::first(void) throw( SQLException, RuntimeException, std::exc return m_xDelegatorResultSet->first(); } -sal_Bool OResultSet::last(void) throw( SQLException, RuntimeException, std::exception ) +sal_Bool OResultSet::last() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -793,7 +793,7 @@ sal_Bool OResultSet::last(void) throw( SQLException, RuntimeException, std::exce return m_xDelegatorResultSet->last(); } -sal_Int32 OResultSet::getRow(void) throw( SQLException, RuntimeException, std::exception ) +sal_Int32 OResultSet::getRow() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -817,7 +817,7 @@ sal_Bool OResultSet::relative(sal_Int32 rows) throw( SQLException, RuntimeExcept return m_xDelegatorResultSet->relative(rows); } -sal_Bool OResultSet::previous(void) throw( SQLException, RuntimeException, std::exception ) +sal_Bool OResultSet::previous() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -825,7 +825,7 @@ sal_Bool OResultSet::previous(void) throw( SQLException, RuntimeException, std:: return m_xDelegatorResultSet->previous(); } -void OResultSet::refreshRow(void) throw( SQLException, RuntimeException, std::exception ) +void OResultSet::refreshRow() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -833,7 +833,7 @@ void OResultSet::refreshRow(void) throw( SQLException, RuntimeException, std::ex m_xDelegatorResultSet->refreshRow(); } -sal_Bool OResultSet::rowUpdated(void) throw( SQLException, RuntimeException, std::exception ) +sal_Bool OResultSet::rowUpdated() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -841,7 +841,7 @@ sal_Bool OResultSet::rowUpdated(void) throw( SQLException, RuntimeException, std return m_xDelegatorResultSet->rowUpdated(); } -sal_Bool OResultSet::rowInserted(void) throw( SQLException, RuntimeException, std::exception ) +sal_Bool OResultSet::rowInserted() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -849,7 +849,7 @@ sal_Bool OResultSet::rowInserted(void) throw( SQLException, RuntimeException, st return m_xDelegatorResultSet->rowInserted(); } -sal_Bool OResultSet::rowDeleted(void) throw( SQLException, RuntimeException, std::exception ) +sal_Bool OResultSet::rowDeleted() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -857,7 +857,7 @@ sal_Bool OResultSet::rowDeleted(void) throw( SQLException, RuntimeException, std return m_xDelegatorResultSet->rowDeleted(); } -Reference< XInterface > OResultSet::getStatement(void) throw( SQLException, RuntimeException, std::exception ) +Reference< XInterface > OResultSet::getStatement() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -866,7 +866,7 @@ Reference< XInterface > OResultSet::getStatement(void) throw( SQLException, Runt } // ::com::sun::star::sdbcx::XRowLocate -Any OResultSet::getBookmark(void) throw( SQLException, RuntimeException, std::exception ) +Any OResultSet::getBookmark() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -906,7 +906,7 @@ sal_Int32 OResultSet::compareBookmarks(const Any& _first, const Any& _second) th return Reference< XRowLocate >(m_xDelegatorResultSet, UNO_QUERY)->compareBookmarks(_first, _second); } -sal_Bool OResultSet::hasOrderedBookmarks(void) throw( SQLException, RuntimeException, std::exception ) +sal_Bool OResultSet::hasOrderedBookmarks() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -927,7 +927,7 @@ sal_Int32 OResultSet::hashBookmark(const Any& bookmark) throw( SQLException, Run } // ::com::sun::star::sdbc::XResultSetUpdate -void OResultSet::insertRow(void) throw( SQLException, RuntimeException, std::exception ) +void OResultSet::insertRow() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -937,7 +937,7 @@ void OResultSet::insertRow(void) throw( SQLException, RuntimeException, std::exc m_xDelegatorResultSetUpdate->insertRow(); } -void OResultSet::updateRow(void) throw( SQLException, RuntimeException, std::exception ) +void OResultSet::updateRow() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -947,7 +947,7 @@ void OResultSet::updateRow(void) throw( SQLException, RuntimeException, std::exc m_xDelegatorResultSetUpdate->updateRow(); } -void OResultSet::deleteRow(void) throw( SQLException, RuntimeException, std::exception ) +void OResultSet::deleteRow() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -957,7 +957,7 @@ void OResultSet::deleteRow(void) throw( SQLException, RuntimeException, std::exc m_xDelegatorResultSetUpdate->deleteRow(); } -void OResultSet::cancelRowUpdates(void) throw( SQLException, RuntimeException, std::exception ) +void OResultSet::cancelRowUpdates() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -967,7 +967,7 @@ void OResultSet::cancelRowUpdates(void) throw( SQLException, RuntimeException, s m_xDelegatorResultSetUpdate->cancelRowUpdates(); } -void OResultSet::moveToInsertRow(void) throw( SQLException, RuntimeException, std::exception ) +void OResultSet::moveToInsertRow() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); @@ -977,7 +977,7 @@ void OResultSet::moveToInsertRow(void) throw( SQLException, RuntimeException, st m_xDelegatorResultSetUpdate->moveToInsertRow(); } -void OResultSet::moveToCurrentRow(void) throw( SQLException, RuntimeException, std::exception ) +void OResultSet::moveToCurrentRow() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed); diff --git a/dbaccess/source/core/api/resultset.hxx b/dbaccess/source/core/api/resultset.hxx index 55030b32ec13..e6793809a684 100644 --- a/dbaccess/source/core/api/resultset.hxx +++ b/dbaccess/source/core/api/resultset.hxx @@ -101,7 +101,7 @@ namespace dbaccess virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // ::com::sun::star::sdbc::XCloseable virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/dbaccess/source/core/api/statement.cxx b/dbaccess/source/core/api/statement.cxx index 20a45c710f09..17906099d07f 100644 --- a/dbaccess/source/core/api/statement.cxx +++ b/dbaccess/source/core/api/statement.cxx @@ -160,7 +160,7 @@ void OStatementBase::disposing() } // XCloseable -void OStatementBase::close(void) throw( SQLException, RuntimeException, std::exception ) +void OStatementBase::close() throw( SQLException, RuntimeException, std::exception ) { { MutexGuard aGuard( m_aMutex ); @@ -287,7 +287,7 @@ void OStatementBase::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) cons } // XWarningsSupplier -Any OStatementBase::getWarnings(void) throw( SQLException, RuntimeException, std::exception ) +Any OStatementBase::getWarnings() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -295,7 +295,7 @@ Any OStatementBase::getWarnings(void) throw( SQLException, RuntimeException, std return Reference< XWarningsSupplier >(m_xAggregateAsSet, UNO_QUERY)->getWarnings(); } -void OStatementBase::clearWarnings(void) throw( SQLException, RuntimeException, std::exception ) +void OStatementBase::clearWarnings() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -304,7 +304,7 @@ void OStatementBase::clearWarnings(void) throw( SQLException, RuntimeException, } // ::com::sun::star::util::XCancellable -void OStatementBase::cancel(void) throw( RuntimeException, std::exception ) +void OStatementBase::cancel() throw( RuntimeException, std::exception ) { // no blocking as cancel is typically called from a different thread ClearableMutexGuard aCancelGuard(m_aCancelMutex); @@ -528,7 +528,7 @@ Sequence< sal_Int32 > OStatement::executeBatch( ) throw( SQLException, RuntimeEx } -Reference< XConnection > OStatement::getConnection(void) throw( SQLException, RuntimeException, std::exception ) +Reference< XConnection > OStatement::getConnection() throw( SQLException, RuntimeException, std::exception ) { return Reference< XConnection >( m_xParent, UNO_QUERY ); } diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx index 15d2bea37d19..ad177f52a067 100644 --- a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx +++ b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx @@ -125,8 +125,8 @@ public: virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - 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 ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); diff --git a/dbaccess/source/core/dataaccess/SharedConnection.cxx b/dbaccess/source/core/dataaccess/SharedConnection.cxx index 1d275706361f..de84d39279ff 100644 --- a/dbaccess/source/core/dataaccess/SharedConnection.cxx +++ b/dbaccess/source/core/dataaccess/SharedConnection.cxx @@ -39,7 +39,7 @@ OSharedConnection::~OSharedConnection() { } -void SAL_CALL OSharedConnection::disposing(void) +void SAL_CALL OSharedConnection::disposing() { OSharedConnection_BASE::disposing(); OConnectionWrapper::disposing(); diff --git a/dbaccess/source/core/dataaccess/SharedConnection.hxx b/dbaccess/source/core/dataaccess/SharedConnection.hxx index e4bf7d51d399..28c419c95185 100644 --- a/dbaccess/source/core/dataaccess/SharedConnection.hxx +++ b/dbaccess/source/core/dataaccess/SharedConnection.hxx @@ -49,7 +49,7 @@ namespace dbaccess , public OSharedConnection_BASE2 { protected: - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; virtual ~OSharedConnection(); public: OSharedConnection(::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation >& _rxProxyConnection); diff --git a/dbaccess/source/core/dataaccess/commanddefinition.hxx b/dbaccess/source/core/dataaccess/commanddefinition.hxx index 476fd0b20521..58640a08e3a0 100644 --- a/dbaccess/source/core/dataaccess/commanddefinition.hxx +++ b/dbaccess/source/core/dataaccess/commanddefinition.hxx @@ -88,8 +88,8 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::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 ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx index 13c2ef116015..070af92f3082 100644 --- a/dbaccess/source/core/dataaccess/connection.cxx +++ b/dbaccess/source/core/dataaccess/connection.cxx @@ -101,20 +101,20 @@ Sequence< OUString > OConnection::getSupportedServiceNames( ) throw (RuntimeExc } // XCloseable -void OConnection::close(void) throw( SQLException, RuntimeException, std::exception ) +void OConnection::close() throw( SQLException, RuntimeException, std::exception ) { // being closed is the same as being disposed dispose(); } -sal_Bool OConnection::isClosed(void) throw( SQLException, RuntimeException, std::exception ) +sal_Bool OConnection::isClosed() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); return !m_xMasterConnection.is(); } // XConnection -Reference< XStatement > OConnection::createStatement(void) throw( SQLException, RuntimeException, std::exception ) +Reference< XStatement > OConnection::createStatement() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); checkDisposed(); @@ -174,28 +174,28 @@ void OConnection::setAutoCommit(sal_Bool autoCommit) throw( SQLException, Runtim m_xMasterConnection->setAutoCommit(autoCommit); } -sal_Bool OConnection::getAutoCommit(void) throw( SQLException, RuntimeException, std::exception ) +sal_Bool OConnection::getAutoCommit() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); checkDisposed(); return m_xMasterConnection->getAutoCommit(); } -void OConnection::commit(void) throw( SQLException, RuntimeException, std::exception ) +void OConnection::commit() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); checkDisposed(); m_xMasterConnection->commit(); } -void OConnection::rollback(void) throw( SQLException, RuntimeException, std::exception ) +void OConnection::rollback() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); checkDisposed(); m_xMasterConnection->rollback(); } -Reference< XDatabaseMetaData > OConnection::getMetaData(void) throw( SQLException, RuntimeException, std::exception ) +Reference< XDatabaseMetaData > OConnection::getMetaData() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); checkDisposed(); @@ -209,7 +209,7 @@ void OConnection::setReadOnly(sal_Bool readOnly) throw( SQLException, RuntimeExc m_xMasterConnection->setReadOnly(readOnly); } -sal_Bool OConnection::isReadOnly(void) throw( SQLException, RuntimeException, std::exception ) +sal_Bool OConnection::isReadOnly() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); checkDisposed(); @@ -223,7 +223,7 @@ void OConnection::setCatalog(const OUString& catalog) throw( SQLException, Runti m_xMasterConnection->setCatalog(catalog); } -OUString OConnection::getCatalog(void) throw( SQLException, RuntimeException, std::exception ) +OUString OConnection::getCatalog() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); checkDisposed(); @@ -237,14 +237,14 @@ void OConnection::setTransactionIsolation(sal_Int32 level) throw( SQLException, m_xMasterConnection->setTransactionIsolation(level); } -sal_Int32 OConnection::getTransactionIsolation(void) throw( SQLException, RuntimeException, std::exception ) +sal_Int32 OConnection::getTransactionIsolation() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); checkDisposed(); return m_xMasterConnection->getTransactionIsolation(); } -Reference< XNameAccess > OConnection::getTypeMap(void) throw( SQLException, RuntimeException, std::exception ) +Reference< XNameAccess > OConnection::getTypeMap() throw( SQLException, RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); checkDisposed(); @@ -498,7 +498,7 @@ void OConnection::disposing() } // XChild -Reference< XInterface > OConnection::getParent(void) throw( RuntimeException, std::exception ) +Reference< XInterface > OConnection::getParent() throw( RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); checkDisposed(); @@ -511,7 +511,7 @@ void OConnection::setParent(const Reference< XInterface > & /*Parent*/) throw( N } // XSQLQueryComposerFactory -Reference< XSQLQueryComposer > OConnection::createQueryComposer(void) throw( RuntimeException, std::exception ) +Reference< XSQLQueryComposer > OConnection::createQueryComposer() throw( RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); checkDisposed(); @@ -590,7 +590,7 @@ Reference< XNameAccess > SAL_CALL OConnection::getViews( ) throw(RuntimeExcepti } // XQueriesSupplier -Reference< XNameAccess > OConnection::getQueries(void) throw( RuntimeException, std::exception ) +Reference< XNameAccess > OConnection::getQueries() throw( RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); checkDisposed(); diff --git a/dbaccess/source/core/dataaccess/connection.hxx b/dbaccess/source/core/dataaccess/connection.hxx index 574f5b5dcc6a..0bb9de2322ee 100644 --- a/dbaccess/source/core/dataaccess/connection.hxx +++ b/dbaccess/source/core/dataaccess/connection.hxx @@ -120,7 +120,7 @@ public: virtual void SAL_CALL release() throw( ) SAL_OVERRIDE; // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // ::com::sun::star::container::XChild virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx index 263a7e394c96..c3072d65351b 100644 --- a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx +++ b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx @@ -225,8 +225,8 @@ namespace dbaccess virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - static versions - static Sequence< OUString > getSupportedServiceNames_static(void) throw( RuntimeException ); - static OUString getImplementationName_static(void) throw( RuntimeException ); + static Sequence< OUString > getSupportedServiceNames_static() throw( RuntimeException ); + static OUString getImplementationName_static() throw( RuntimeException ); static Reference< XInterface > Create(const Reference< XComponentContext >& _rxContext); static OUString getSingletonName_static(); diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx index dc91e952a711..e4fb8e62727c 100644 --- a/dbaccess/source/core/dataaccess/databasecontext.cxx +++ b/dbaccess/source/core/dataaccess/databasecontext.cxx @@ -213,7 +213,7 @@ Reference< XInterface > ODatabaseContext::Create(const Reference< XComponentCont return *( new ODatabaseContext( _rxContext ) ); } -Sequence< OUString > ODatabaseContext::getSupportedServiceNames_static(void) throw( RuntimeException ) +Sequence< OUString > ODatabaseContext::getSupportedServiceNames_static() throw( RuntimeException ) { Sequence< OUString > aSNS( 1 ); aSNS[0] = "com.sun.star.sdb.DatabaseContext"; @@ -585,7 +585,7 @@ Type ODatabaseContext::getElementType( ) throw(RuntimeException, std::exception return cppu::UnoType<XDataSource>::get(); } -sal_Bool ODatabaseContext::hasElements(void) throw( RuntimeException, std::exception ) +sal_Bool ODatabaseContext::hasElements() throw( RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(DatabaseAccessContext_Base::rBHelper.bDisposed); @@ -594,7 +594,7 @@ sal_Bool ODatabaseContext::hasElements(void) throw( RuntimeException, std::excep } // ::com::sun::star::container::XEnumerationAccess -Reference< ::com::sun::star::container::XEnumeration > ODatabaseContext::createEnumeration(void) throw( RuntimeException, std::exception ) +Reference< ::com::sun::star::container::XEnumeration > ODatabaseContext::createEnumeration() throw( RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); return new ::comphelper::OEnumerationByName(static_cast<XNameAccess*>(this)); @@ -651,7 +651,7 @@ Any ODatabaseContext::getByName(const OUString& _rName) throw( NoSuchElementExce } } -Sequence< OUString > ODatabaseContext::getElementNames(void) throw( RuntimeException, std::exception ) +Sequence< OUString > ODatabaseContext::getElementNames() throw( RuntimeException, std::exception ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(DatabaseAccessContext_Base::rBHelper.bDisposed); diff --git a/dbaccess/source/core/dataaccess/databasecontext.hxx b/dbaccess/source/core/dataaccess/databasecontext.hxx index abadff780a76..6665bf6007b1 100644 --- a/dbaccess/source/core/dataaccess/databasecontext.hxx +++ b/dbaccess/source/core/dataaccess/databasecontext.hxx @@ -119,7 +119,7 @@ public: virtual ~ODatabaseContext(); // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XSingleServiceFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -131,8 +131,8 @@ public: 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 ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx b/dbaccess/source/core/dataaccess/databasedocument.hxx index cc29925bcf83..5b2b3e839e39 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.hxx +++ b/dbaccess/source/core/dataaccess/databasedocument.hxx @@ -300,8 +300,8 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::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 ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index c83049d5e991..b638765b1c5c 100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -1039,7 +1039,7 @@ void ODatabaseSource::setLoginTimeout(sal_Int32 seconds) throw( SQLException, Ru m_pImpl->m_nLoginTimeout = seconds; } -sal_Int32 ODatabaseSource::getLoginTimeout(void) throw( SQLException, RuntimeException, std::exception ) +sal_Int32 ODatabaseSource::getLoginTimeout() throw( SQLException, RuntimeException, std::exception ) { ModelMethodGuard aGuard( *this ); return m_pImpl->m_nLoginTimeout; diff --git a/dbaccess/source/core/dataaccess/datasource.hxx b/dbaccess/source/core/dataaccess/datasource.hxx index 72d1e776bf34..bfc9e27b36c9 100644 --- a/dbaccess/source/core/dataaccess/datasource.hxx +++ b/dbaccess/source/core/dataaccess/datasource.hxx @@ -130,13 +130,13 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::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 ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/dbaccess/source/core/inc/DatabaseDataProvider.hxx b/dbaccess/source/core/inc/DatabaseDataProvider.hxx index 441455d57c76..baa92025e425 100644 --- a/dbaccess/source/core/inc/DatabaseDataProvider.hxx +++ b/dbaccess/source/core/inc/DatabaseDataProvider.hxx @@ -57,8 +57,8 @@ public: explicit DatabaseDataProvider(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & context); // ::com::sun::star::lang::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 ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & context); diff --git a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx index f9d1d68afdd8..3c52ad3a200a 100644 --- a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx +++ b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx @@ -207,7 +207,7 @@ namespace dbaccess const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rContext); - void SAL_CALL disposing(void) SAL_OVERRIDE; + void SAL_CALL disposing() SAL_OVERRIDE; virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/dbaccess/source/core/inc/TableDeco.hxx b/dbaccess/source/core/inc/TableDeco.hxx index b1076e235d65..764610351ae0 100644 --- a/dbaccess/source/core/inc/TableDeco.hxx +++ b/dbaccess/source/core/inc/TableDeco.hxx @@ -130,7 +130,7 @@ namespace dbaccess virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo DECLARE_SERVICE_INFO(); diff --git a/dbaccess/source/core/inc/column.hxx b/dbaccess/source/core/inc/column.hxx index 84a9c2a2a4a8..00f48ba4c541 100644 --- a/dbaccess/source/core/inc/column.hxx +++ b/dbaccess/source/core/inc/column.hxx @@ -93,7 +93,7 @@ namespace dbaccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -229,7 +229,7 @@ namespace dbaccess void append(const OUString& rName, OColumn*); void clearColumns(); // only the name is identical to ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; private: using OColumns_BASE::setParent; diff --git a/dbaccess/source/core/inc/preparedstatement.hxx b/dbaccess/source/core/inc/preparedstatement.hxx index 8199dd854245..b14bca6f4da0 100644 --- a/dbaccess/source/core/inc/preparedstatement.hxx +++ b/dbaccess/source/core/inc/preparedstatement.hxx @@ -63,7 +63,7 @@ namespace dbaccess virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // ::com::sun::star::sdbc::XPreparedStatement virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/dbaccess/source/core/inc/statement.hxx b/dbaccess/source/core/inc/statement.hxx index d7bc85a5b1c4..c1d08623f484 100644 --- a/dbaccess/source/core/inc/statement.hxx +++ b/dbaccess/source/core/inc/statement.hxx @@ -76,7 +76,7 @@ public: virtual void SAL_CALL release() throw() SAL_OVERRIDE; // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/dbaccess/source/core/inc/table.hxx b/dbaccess/source/core/inc/table.hxx index a70c0a8f9d2d..f30cb5203268 100644 --- a/dbaccess/source/core/inc/table.hxx +++ b/dbaccess/source/core/inc/table.hxx @@ -92,7 +92,7 @@ namespace dbaccess virtual ::connectivity::sdbcx::OCollection* createIndexes(const ::connectivity::TStringVector& _rNames) SAL_OVERRIDE; // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; public: /** constructs a wrapper supporting the com.sun.star.sdb.Table service.<BR> @param _rxConn the connection the table belongs to diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx index 5714649c1bfa..3c5d7507cd72 100644 --- a/dbaccess/source/filter/xml/dbloader2.cxx +++ b/dbaccess/source/filter/xml/dbloader2.cxx @@ -102,14 +102,14 @@ public: // XServiceInfo OUString SAL_CALL getImplementationName() throw(std::exception ) SAL_OVERRIDE; sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception ) SAL_OVERRIDE; - Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(std::exception ) SAL_OVERRIDE; + Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception ) SAL_OVERRIDE; // static methods static OUString getImplementationName_Static() throw( ) { return OUString("org.openoffice.comp.dbflt.DBTypeDetection"); } - static Sequence< OUString> getSupportedServiceNames_Static(void) throw( ); + static Sequence< OUString> getSupportedServiceNames_Static() throw( ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); @@ -200,13 +200,13 @@ sal_Bool SAL_CALL DBTypeDetection::supportsService(const OUString& ServiceName) } // XServiceInfo -Sequence< OUString > SAL_CALL DBTypeDetection::getSupportedServiceNames(void) throw(std::exception ) +Sequence< OUString > SAL_CALL DBTypeDetection::getSupportedServiceNames() throw(std::exception ) { return getSupportedServiceNames_Static(); } // ORegistryServiceManager_Static -Sequence< OUString > DBTypeDetection::getSupportedServiceNames_Static(void) throw( ) +Sequence< OUString > DBTypeDetection::getSupportedServiceNames_Static() throw( ) { Sequence< OUString > aSNS( 1 ); aSNS[0] = "com.sun.star.document.ExtendedTypeDetection"; @@ -239,14 +239,14 @@ public: // XServiceInfo OUString SAL_CALL getImplementationName() throw(std::exception ) SAL_OVERRIDE; sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception ) SAL_OVERRIDE; - Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(std::exception ) SAL_OVERRIDE; + Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception ) SAL_OVERRIDE; // static methods static OUString getImplementationName_Static() throw( ) { return OUString("org.openoffice.comp.dbflt.DBContentLoader2"); } - static Sequence< OUString > getSupportedServiceNames_Static(void) throw( ); + static Sequence< OUString > getSupportedServiceNames_Static() throw( ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); @@ -254,7 +254,7 @@ public: virtual void SAL_CALL load( const Reference< XFrame > & _rFrame, const OUString& _rURL, const Sequence< PropertyValue >& _rArgs, const Reference< XLoadEventListener > & _rListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL cancel(void) throw(std::exception) SAL_OVERRIDE; + virtual void SAL_CALL cancel() throw(std::exception) SAL_OVERRIDE; private: bool impl_executeNewDatabaseWizard( Reference< XModel >& _rxModel, bool& _bShouldStartTableWizard ); @@ -291,13 +291,13 @@ sal_Bool SAL_CALL DBContentLoader::supportsService(const OUString& ServiceName) } // XServiceInfo -Sequence< OUString > SAL_CALL DBContentLoader::getSupportedServiceNames(void) throw(std::exception ) +Sequence< OUString > SAL_CALL DBContentLoader::getSupportedServiceNames() throw(std::exception ) { return getSupportedServiceNames_Static(); } // ORegistryServiceManager_Static -Sequence< OUString > DBContentLoader::getSupportedServiceNames_Static(void) throw( ) +Sequence< OUString > DBContentLoader::getSupportedServiceNames_Static() throw( ) { Sequence< OUString > aSNS( 1 ); aSNS[0] = "com.sun.star.frame.FrameLoader"; @@ -558,7 +558,7 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const OU ::comphelper::disposeComponent(xModel); } -void DBContentLoader::cancel(void) throw(std::exception) +void DBContentLoader::cancel() throw(std::exception) { } diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 84d51f92f08f..7188a9562b53 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -168,7 +168,7 @@ OUString OApplicationController::getImplementationName_Static() throw( RuntimeEx return OUString(SERVICE_SDB_APPLICATIONCONTROLLER); } -Sequence< OUString> OApplicationController::getSupportedServiceNames_Static(void) throw( RuntimeException ) +Sequence< OUString> OApplicationController::getSupportedServiceNames_Static() throw( RuntimeException ) { Sequence< OUString> aSupported(1); aSupported[0] = "com.sun.star.sdb.application.DefaultViewController"; @@ -2547,7 +2547,7 @@ sal_Int8 OApplicationController::executeDrop( const ExecuteDropEvent& _rEvt ) return DND_ACTION_NONE; } -Reference< XModel > SAL_CALL OApplicationController::getModel(void) throw( RuntimeException, std::exception ) +Reference< XModel > SAL_CALL OApplicationController::getModel() throw( RuntimeException, std::exception ) { return m_xModel; } diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx index 17ac7e840dbb..959f8c0b38f1 100644 --- a/dbaccess/source/ui/app/AppController.hxx +++ b/dbaccess/source/ui/app/AppController.hxx @@ -426,7 +426,7 @@ namespace dbaui virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // need by registration static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); @@ -434,7 +434,7 @@ namespace dbaui virtual void SAL_CALL attachFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > & xFrame) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL attachModel(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xModel) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > SAL_CALL getModel(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > SAL_CALL getModel() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::container::XContainerListener virtual void SAL_CALL elementInserted(const ::com::sun::star::container::ContainerEvent& Event) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -514,7 +514,7 @@ namespace dbaui virtual void notifyHiContrastChanged() SAL_OVERRIDE; virtual bool isDataSourceReadOnly() const SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > - getXController(void) throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; + getXController() throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; virtual bool interceptUserInput( const NotifyEvent& _rEvent ) SAL_OVERRIDE; // IControlActionListener overridables diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index e8cd789f223c..dc5d6659a3c6 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -162,7 +162,7 @@ public: // XFormController virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormOperations > SAL_CALL getFormOperations() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > SAL_CALL getCurrentControl(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > SAL_CALL getCurrentControl() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL addActivateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormControllerListener > & l) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeActivateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormControllerListener > & l) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL addChildController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController >& _ChildController ) throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, std::exception ) SAL_OVERRIDE; @@ -223,14 +223,14 @@ public: // XTabController, base of XFormController virtual void SAL_CALL setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel > & Model) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel > SAL_CALL getModel(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel > SAL_CALL getModel() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setContainer(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > & _Container) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > SAL_CALL getContainer(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > > SAL_CALL getControls(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL autoTabOrder(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL activateTabOrder(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL activateFirst(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL activateLast(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > SAL_CALL getContainer() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > > SAL_CALL getControls() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL autoTabOrder() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL activateTabOrder() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL activateFirst() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL activateLast() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XFrameActionListener virtual void SAL_CALL frameAction(const ::com::sun::star::frame::FrameActionEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -260,7 +260,7 @@ Reference< runtime::XFormOperations > SAL_CALL SbaXDataBrowserController::FormCo return FormOperations::createWithFormController( m_pOwner->m_xContext, this ); } -Reference< ::com::sun::star::awt::XControl > SbaXDataBrowserController::FormControllerImpl::getCurrentControl(void) throw( RuntimeException, std::exception ) +Reference< ::com::sun::star::awt::XControl > SbaXDataBrowserController::FormControllerImpl::getCurrentControl() throw( RuntimeException, std::exception ) { return m_pOwner->getBrowserView() ? m_pOwner->getBrowserView()->getGridControl() : Reference< ::com::sun::star::awt::XControl > (); } @@ -445,7 +445,7 @@ void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setModel(const Refe SAL_WARN("dbaccess.ui","SbaXDataBrowserController::FormControllerImpl::setModel : invalid call, can't change my model !"); } -Reference< ::com::sun::star::awt::XTabControllerModel > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getModel(void) throw( RuntimeException, std::exception ) +Reference< ::com::sun::star::awt::XTabControllerModel > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getModel() throw( RuntimeException, std::exception ) { return Reference< XTabControllerModel >(m_pOwner->getRowSet(), UNO_QUERY); } @@ -455,14 +455,14 @@ void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setContainer(const SAL_WARN("dbaccess.ui","SbaXDataBrowserController::FormControllerImpl::setContainer : invalid call, can't change my container !"); } -Reference< ::com::sun::star::awt::XControlContainer > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getContainer(void) throw( RuntimeException, std::exception ) +Reference< ::com::sun::star::awt::XControlContainer > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getContainer() throw( RuntimeException, std::exception ) { if (m_pOwner->getBrowserView()) return m_pOwner->getBrowserView()->getContainer(); return Reference< ::com::sun::star::awt::XControlContainer > (); } -Sequence< Reference< ::com::sun::star::awt::XControl > > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getControls(void) throw( RuntimeException, std::exception ) +Sequence< Reference< ::com::sun::star::awt::XControl > > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getControls() throw( RuntimeException, std::exception ) { if (m_pOwner->getBrowserView()) { @@ -472,23 +472,23 @@ Sequence< Reference< ::com::sun::star::awt::XControl > > SAL_CALL SbaXDataBrowse return Sequence< Reference< ::com::sun::star::awt::XControl > >(); } -void SAL_CALL SbaXDataBrowserController::FormControllerImpl::autoTabOrder(void) throw( RuntimeException, std::exception ) +void SAL_CALL SbaXDataBrowserController::FormControllerImpl::autoTabOrder() throw( RuntimeException, std::exception ) { SAL_WARN("dbaccess.ui","SbaXDataBrowserController::FormControllerImpl::autoTabOrder : nothing to do (always have only one control) !"); } -void SAL_CALL SbaXDataBrowserController::FormControllerImpl::activateTabOrder(void) throw( RuntimeException, std::exception ) +void SAL_CALL SbaXDataBrowserController::FormControllerImpl::activateTabOrder() throw( RuntimeException, std::exception ) { SAL_WARN("dbaccess.ui","SbaXDataBrowserController::FormControllerImpl::activateTabOrder : nothing to do (always have only one control) !"); } -void SAL_CALL SbaXDataBrowserController::FormControllerImpl::activateFirst(void) throw( RuntimeException, std::exception ) +void SAL_CALL SbaXDataBrowserController::FormControllerImpl::activateFirst() throw( RuntimeException, std::exception ) { if (m_pOwner->getBrowserView()) m_pOwner->getBrowserView()->getVclControl()->ActivateCell(); } -void SAL_CALL SbaXDataBrowserController::FormControllerImpl::activateLast(void) throw( RuntimeException, std::exception ) +void SAL_CALL SbaXDataBrowserController::FormControllerImpl::activateLast() throw( RuntimeException, std::exception ) { if (m_pOwner->getBrowserView()) m_pOwner->getBrowserView()->getVclControl()->ActivateCell(); diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx index 74fc745b597e..b6299e7691da 100644 --- a/dbaccess/source/ui/browser/dbloader.cxx +++ b/dbaccess/source/ui/browser/dbloader.cxx @@ -76,14 +76,14 @@ public: // XServiceInfo OUString SAL_CALL getImplementationName() throw(std::exception ) SAL_OVERRIDE; sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception ) SAL_OVERRIDE; - Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(std::exception ) SAL_OVERRIDE; + Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception ) SAL_OVERRIDE; // static methods static OUString getImplementationName_Static() throw( ) { return OUString("org.openoffice.comp.dbu.DBContentLoader"); } - static Sequence< OUString> getSupportedServiceNames_Static(void) throw( ); + static Sequence< OUString> getSupportedServiceNames_Static() throw( ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); @@ -91,7 +91,7 @@ public: virtual void SAL_CALL load( const Reference< XFrame > & _rFrame, const OUString& _rURL, const Sequence< PropertyValue >& _rArgs, const Reference< XLoadEventListener > & _rListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL cancel(void) throw(std::exception) SAL_OVERRIDE; + virtual void SAL_CALL cancel() throw(std::exception) SAL_OVERRIDE; }; @@ -129,13 +129,13 @@ sal_Bool SAL_CALL DBContentLoader::supportsService(const OUString& ServiceName) } // XServiceInfo -Sequence< OUString > SAL_CALL DBContentLoader::getSupportedServiceNames(void) throw(std::exception ) +Sequence< OUString > SAL_CALL DBContentLoader::getSupportedServiceNames() throw(std::exception ) { return getSupportedServiceNames_Static(); } // ORegistryServiceManager_Static -Sequence< OUString > DBContentLoader::getSupportedServiceNames_Static(void) throw( ) +Sequence< OUString > DBContentLoader::getSupportedServiceNames_Static() throw( ) { Sequence< OUString > aSNS( 2 ); aSNS[0] = "com.sun.star.frame.FrameLoader"; @@ -306,7 +306,7 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const OU rListener->loadCancelled( this ); } -void DBContentLoader::cancel(void) throw(std::exception) +void DBContentLoader::cancel() throw(std::exception) { } diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index 0613b7d54c50..c0e6c4686d56 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -686,7 +686,7 @@ Sequence< Reference< XDispatch > > OGenericUnoController::queryDispatches(const return aReturn; } -Reference< XDispatchProvider > OGenericUnoController::getSlaveDispatchProvider(void) throw( RuntimeException, std::exception ) +Reference< XDispatchProvider > OGenericUnoController::getSlaveDispatchProvider() throw( RuntimeException, std::exception ) { return m_xSlaveDispatcher; } @@ -696,7 +696,7 @@ void OGenericUnoController::setSlaveDispatchProvider(const Reference< XDispatchP m_xSlaveDispatcher = _xNewProvider; } -Reference< XDispatchProvider > OGenericUnoController::getMasterDispatchProvider(void) throw( RuntimeException, std::exception ) +Reference< XDispatchProvider > OGenericUnoController::getMasterDispatchProvider() throw( RuntimeException, std::exception ) { return m_xMasterDispatcher; } @@ -1047,7 +1047,7 @@ IMPL_LINK_NOARG(OGenericUnoController, OnAsyncCloseTask) return 0L; } -Any SAL_CALL OGenericUnoController::getViewData(void) throw( RuntimeException, std::exception ) +Any SAL_CALL OGenericUnoController::getViewData() throw( RuntimeException, std::exception ) { return Any(); } @@ -1056,12 +1056,12 @@ void SAL_CALL OGenericUnoController::restoreViewData(const Any& /*Data*/) throw( { } -Reference< XModel > SAL_CALL OGenericUnoController::getModel(void) throw( RuntimeException, std::exception ) +Reference< XModel > SAL_CALL OGenericUnoController::getModel() throw( RuntimeException, std::exception ) { return Reference< XModel >(); } -Reference< XFrame > SAL_CALL OGenericUnoController::getFrame(void) throw( RuntimeException, std::exception ) +Reference< XFrame > SAL_CALL OGenericUnoController::getFrame() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( getMutex() ); return m_aCurrentFrame.getFrame(); diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index a35e163c6de9..92bf55a2457e 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -127,7 +127,7 @@ OUString SbaXGridControl::getImplementationName_Static() throw( RuntimeException return OUString("com.sun.star.comp.dbu.SbaXGridControl"); } -Sequence< OUString> SbaXGridControl::getSupportedServiceNames_Static(void) throw( RuntimeException ) +Sequence< OUString> SbaXGridControl::getSupportedServiceNames_Static() throw( RuntimeException ) { Sequence< OUString> aSupported(3); aSupported[0] = "com.sun.star.form.control.InteractionGridControl"; @@ -264,7 +264,7 @@ void SAL_CALL SbaXGridControl::removeStatusListener(const Reference< ::com::sun: pMultiplexer->removeInterface( _rxListener ); } -void SAL_CALL SbaXGridControl::dispose(void) throw( RuntimeException, std::exception ) +void SAL_CALL SbaXGridControl::dispose() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -298,7 +298,7 @@ SbaXGridPeer::~SbaXGridPeer() { } -void SAL_CALL SbaXGridPeer::dispose(void) throw( RuntimeException, std::exception ) +void SAL_CALL SbaXGridPeer::dispose() throw( RuntimeException, std::exception ) { EventObject aEvt(*this); diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index 69a70c4c74d3..e0cb02c94b2a 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -563,7 +563,7 @@ namespace } } -PopupMenu* DBTreeListBox::CreateContextMenu( void ) +PopupMenu* DBTreeListBox::CreateContextMenu() { ::std::unique_ptr< PopupMenu > pContextMenu; diff --git a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx index fa3e860217f0..fb63317073f6 100644 --- a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx +++ b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx @@ -59,7 +59,7 @@ namespace dbaui virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - static methods - static OUString getImplementationName_Static(void) throw( com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static() throw( com::sun::star::uno::RuntimeException ); // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/JAccess.hxx b/dbaccess/source/ui/inc/JAccess.hxx index 44e8dfb339d4..2306dfef8d4b 100644 --- a/dbaccess/source/ui/inc/JAccess.hxx +++ b/dbaccess/source/ui/inc/JAccess.hxx @@ -44,7 +44,7 @@ namespace dbaui DECLARE_XTYPEPROVIDER( ) // XServiceInfo - static methods - static OUString getImplementationName_Static(void) throw( com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static() throw( com::sun::star::uno::RuntimeException ); virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/RelationController.hxx b/dbaccess/source/ui/inc/RelationController.hxx index 458599c21d50..4edbecf07164 100644 --- a/dbaccess/source/ui/inc/RelationController.hxx +++ b/dbaccess/source/ui/inc/RelationController.hxx @@ -63,7 +63,7 @@ namespace dbaui virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // need by registration static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx index 578eb991efa6..6bb0b2c0f95b 100644 --- a/dbaccess/source/ui/inc/TableController.hxx +++ b/dbaccess/source/ui/inc/TableController.hxx @@ -129,7 +129,7 @@ namespace dbaui virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // need by registration static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); diff --git a/dbaccess/source/ui/inc/TableWindowAccess.hxx b/dbaccess/source/ui/inc/TableWindowAccess.hxx index 710c755f85e5..305f89838f20 100644 --- a/dbaccess/source/ui/inc/TableWindowAccess.hxx +++ b/dbaccess/source/ui/inc/TableWindowAccess.hxx @@ -66,8 +66,8 @@ namespace dbaui 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/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx index ab15137087bb..0a5b71da3809 100644 --- a/dbaccess/source/ui/inc/dbtreelistbox.hxx +++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx @@ -117,7 +117,7 @@ namespace dbaui virtual bool DoubleClickHdl() SAL_OVERRIDE; - virtual PopupMenu* CreateContextMenu( void ) SAL_OVERRIDE; + virtual PopupMenu* CreateContextMenu() SAL_OVERRIDE; virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) SAL_OVERRIDE; void SetEnterKeyHdl(const Link& rNewHdl) {m_aEnterKeyHdl = rNewHdl;} diff --git a/dbaccess/source/ui/inc/exsrcbrw.hxx b/dbaccess/source/ui/inc/exsrcbrw.hxx index cdf31a99560a..a3d71cb63286 100644 --- a/dbaccess/source/ui/inc/exsrcbrw.hxx +++ b/dbaccess/source/ui/inc/exsrcbrw.hxx @@ -45,14 +45,14 @@ namespace dbaui SbaExternalSourceBrowser(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rM); static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); // UNO DECLARE_UNO3_DEFAULTS(SbaExternalSourceBrowser, OGenericUnoController) virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > > getIdlClasses(void); + // virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > > getIdlClasses(); // static ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > getStaticIdlClass(); diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx index 72f9b90a87ba..c3e55ed9cd83 100644 --- a/dbaccess/source/ui/inc/querycontroller.hxx +++ b/dbaccess/source/ui/inc/querycontroller.hxx @@ -183,12 +183,12 @@ namespace dbaui virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // need by registration static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); // XController - virtual ::com::sun::star::uno::Any SAL_CALL getViewData(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getViewData() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL restoreViewData(const ::com::sun::star::uno::Any& Data) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; private: diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index f016da2720bc..443ed2791a48 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -73,7 +73,7 @@ namespace dbaui virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; // need by registration static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); @@ -83,7 +83,7 @@ namespace dbaui virtual void SAL_CALL removeStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xControl, const ::com::sun::star::util::URL& aURL) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::lang::XComponent - virtual void SAL_CALL dispose(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL createPeer(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > & rToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > & rParentPeer) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -124,7 +124,7 @@ namespace dbaui virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch(const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::lang::XComponent - virtual void SAL_CALL dispose(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: virtual FmGridControl* imp_CreateControl(vcl::Window* pParent, WinBits nStyle) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx index cd15a2f5a200..a544a2a98fee 100644 --- a/dbaccess/source/ui/inc/unodatbr.hxx +++ b/dbaccess/source/ui/inc/unodatbr.hxx @@ -141,7 +141,7 @@ namespace dbaui // need by registration static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); diff --git a/dbaccess/source/ui/inc/unosqlmessage.hxx b/dbaccess/source/ui/inc/unosqlmessage.hxx index 438f455f324b..7028db2c22e6 100644 --- a/dbaccess/source/ui/inc/unosqlmessage.hxx +++ b/dbaccess/source/ui/inc/unosqlmessage.hxx @@ -51,8 +51,8 @@ public: virtual ::comphelper::StringSequence 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 ); static com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL Create(const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&); diff --git a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx index d089f291c1ec..e58d60f183f3 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx @@ -61,7 +61,7 @@ namespace dbaui return getImplementationName_Static(); } // XServiceInfo - static methods - OUString OConnectionLineAccess::getImplementationName_Static(void) throw( RuntimeException ) + OUString OConnectionLineAccess::getImplementationName_Static() throw( RuntimeException ) { return OUString("org.openoffice.comp.dbu.ConnectionLineAccessibility"); } diff --git a/dbaccess/source/ui/querydesign/JAccess.cxx b/dbaccess/source/ui/querydesign/JAccess.cxx index 9e942be56793..c76d2f8c933f 100644 --- a/dbaccess/source/ui/querydesign/JAccess.cxx +++ b/dbaccess/source/ui/querydesign/JAccess.cxx @@ -41,7 +41,7 @@ namespace dbaui { return getImplementationName_Static(); } - OUString OJoinDesignViewAccess::getImplementationName_Static(void) throw( RuntimeException ) + OUString OJoinDesignViewAccess::getImplementationName_Static() throw( RuntimeException ) { return OUString("org.openoffice.comp.dbu.JoinViewAccessibility"); } diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx index b91e32e50bed..c122c96dc79d 100644 --- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx @@ -77,14 +77,14 @@ namespace dbaui return getSupportedServiceNames_Static(); } // XServiceInfo - static methods - Sequence< OUString > OTableWindowAccess::getSupportedServiceNames_Static(void) throw( RuntimeException ) + Sequence< OUString > OTableWindowAccess::getSupportedServiceNames_Static() throw( RuntimeException ) { Sequence< OUString > aSupported(2); aSupported[0] = "com.sun.star.accessibility.Accessible"; aSupported[1] = "com.sun.star.accessibility.AccessibleContext"; return aSupported; } - OUString OTableWindowAccess::getImplementationName_Static(void) throw( RuntimeException ) + OUString OTableWindowAccess::getImplementationName_Static() throw( RuntimeException ) { return OUString("org.openoffice.comp.dbu.TableWindowAccessibility"); } diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index c1f5fe73011e..92dde0c697a5 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -117,7 +117,7 @@ namespace dbaui { return OUString("org.openoffice.comp.dbu.OViewDesign"); } - static Sequence< OUString > getSupportedServiceNames_Static(void) throw( RuntimeException ) + static Sequence< OUString > getSupportedServiceNames_Static() throw( RuntimeException ) { Sequence< OUString> aSupported(1); aSupported.getArray()[0] = "com.sun.star.sdb.ViewDesign"; @@ -308,7 +308,7 @@ OUString OQueryController::getImplementationName_Static() throw( RuntimeExceptio return OUString("org.openoffice.comp.dbu.OQueryDesign"); } -Sequence< OUString> OQueryController::getSupportedServiceNames_Static(void) throw( RuntimeException ) +Sequence< OUString> OQueryController::getSupportedServiceNames_Static() throw( RuntimeException ) { Sequence< OUString> aSupported(1); aSupported.getArray()[0] = "com.sun.star.sdb.QueryDesign"; diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index 184a20e27f0e..2bc001a585bf 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -101,7 +101,7 @@ OUString ORelationController::getImplementationName_Static() throw( RuntimeExcep return OUString("org.openoffice.comp.dbu.ORelationDesign"); } -Sequence< OUString> ORelationController::getSupportedServiceNames_Static(void) throw( RuntimeException ) +Sequence< OUString> ORelationController::getSupportedServiceNames_Static() throw( RuntimeException ) { Sequence< OUString> aSupported(1); aSupported[0] = "com.sun.star.sdb.RelationDesign"; diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index b21d9c88fe07..e01e0654689f 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -121,7 +121,7 @@ OUString OTableController::getImplementationName_Static() throw( RuntimeExceptio return OUString("org.openoffice.comp.dbu.OTableDesign"); } -Sequence< OUString> OTableController::getSupportedServiceNames_Static(void) throw( RuntimeException ) +Sequence< OUString> OTableController::getSupportedServiceNames_Static() throw( RuntimeException ) { Sequence< OUString> aSupported(1); aSupported[0] = "com.sun.star.sdb.TableDesign"; diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx index ec9594082bcf..222903c1af58 100644 --- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx @@ -50,8 +50,8 @@ namespace dbaui virtual ::comphelper::StringSequence 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 ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&); diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx index 4a3a265a6a68..10df28c4e6dd 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx @@ -42,8 +42,8 @@ public: virtual ::comphelper::StringSequence 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 ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&); diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx index 45f0c7b50e8c..c0f6faeb86a1 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx @@ -44,8 +44,8 @@ public: virtual ::comphelper::StringSequence 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 ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&); diff --git a/dbaccess/source/ui/uno/TableFilterDlg.hxx b/dbaccess/source/ui/uno/TableFilterDlg.hxx index 408457ea8cc1..9acfe840ac87 100644 --- a/dbaccess/source/ui/uno/TableFilterDlg.hxx +++ b/dbaccess/source/ui/uno/TableFilterDlg.hxx @@ -42,8 +42,8 @@ public: virtual ::comphelper::StringSequence 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 ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&); diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.hxx b/dbaccess/source/ui/uno/UserSettingsDlg.hxx index 043fa1a52410..efc682601b62 100644 --- a/dbaccess/source/ui/uno/UserSettingsDlg.hxx +++ b/dbaccess/source/ui/uno/UserSettingsDlg.hxx @@ -42,8 +42,8 @@ public: virtual ::comphelper::StringSequence 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 ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&); diff --git a/dbaccess/source/ui/uno/admindlg.hxx b/dbaccess/source/ui/uno/admindlg.hxx index c791129851f3..d326ce1f3693 100644 --- a/dbaccess/source/ui/uno/admindlg.hxx +++ b/dbaccess/source/ui/uno/admindlg.hxx @@ -42,8 +42,8 @@ public: virtual ::comphelper::StringSequence 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 ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&); diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx index 5a676d190922..cbcadf4f7376 100644 --- a/dbaccess/source/ui/uno/copytablewizard.cxx +++ b/dbaccess/source/ui/uno/copytablewizard.cxx @@ -154,8 +154,8 @@ namespace dbaui virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - static methods - static Sequence< OUString > getSupportedServiceNames_Static(void) throw( RuntimeException ); - static OUString getImplementationName_Static(void) throw( RuntimeException ); + static Sequence< OUString > getSupportedServiceNames_Static() throw( RuntimeException ); + static OUString getImplementationName_Static() throw( RuntimeException ); static Reference< XInterface > Create( const Reference< XMultiServiceFactory >& ); // XCopyTableWizard diff --git a/desktop/source/app/cmdlinehelp.cxx b/desktop/source/app/cmdlinehelp.cxx index 61694b8f2791..bd583e0b3867 100644 --- a/desktop/source/app/cmdlinehelp.cxx +++ b/desktop/source/app/cmdlinehelp.cxx @@ -198,7 +198,7 @@ namespace desktop } #ifndef UNX - CmdlineHelpDialog::CmdlineHelpDialog (void) + CmdlineHelpDialog::CmdlineHelpDialog() : ModalDialog( NULL, "CmdLineHelp", "desktop/ui/cmdlinehelp.ui" ) { get(m_pftHead, "header"); diff --git a/desktop/source/app/cmdlinehelp.hxx b/desktop/source/app/cmdlinehelp.hxx index 2a3bda797896..07b4f520979d 100644 --- a/desktop/source/app/cmdlinehelp.hxx +++ b/desktop/source/app/cmdlinehelp.hxx @@ -32,7 +32,7 @@ namespace desktop class CmdlineHelpDialog : public ModalDialog { public: - CmdlineHelpDialog ( void ); + CmdlineHelpDialog(); FixedText* m_pftHead; FixedText* m_pftLeft; diff --git a/desktop/source/deployment/inc/lockfile.hxx b/desktop/source/deployment/inc/lockfile.hxx index 890c98eee0ac..f3f1da28d07a 100644 --- a/desktop/source/deployment/inc/lockfile.hxx +++ b/desktop/source/deployment/inc/lockfile.hxx @@ -68,7 +68,7 @@ namespace desktop { bool check( fpExecWarning execWarning ); // removes the lockfile - ~Lockfile(void); + ~Lockfile(); private: bool m_bIPCserver; @@ -81,8 +81,8 @@ namespace desktop { OUString m_aId; OUString m_aDate; // access to data in file - void syncToFile(void) const; - bool isStale(void) const; + void syncToFile() const; + bool isStale() const; friend bool Lockfile_execWarning( Lockfile * that ); }; diff --git a/desktop/source/deployment/misc/lockfile.cxx b/desktop/source/deployment/misc/lockfile.cxx index 3e191a5ef417..65ca50828f91 100644 --- a/desktop/source/deployment/misc/lockfile.cxx +++ b/desktop/source/deployment/misc/lockfile.cxx @@ -140,7 +140,7 @@ namespace desktop { } } - bool Lockfile::isStale( void ) const + bool Lockfile::isStale() const { // this checks whether the lockfile was created on the same // host by the same user. Should this be the case it is safe @@ -169,7 +169,7 @@ namespace desktop { return false; } - void Lockfile::syncToFile( void ) const + void Lockfile::syncToFile() const { OUString aLockname = m_aLockname; Config aConfig(aLockname); @@ -195,7 +195,7 @@ namespace desktop { aConfig.Flush( ); } - Lockfile::~Lockfile( void ) + Lockfile::~Lockfile() { // unlock userdata by removing file if ( m_bRemove ) diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx index 51feccca2ebf..ea00434b2189 100644 --- a/desktop/source/deployment/registry/help/dp_help.cxx +++ b/desktop/source/deployment/registry/help/dp_help.cxx @@ -106,7 +106,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend void revokeEntryFromDb(OUString const & url); bool activateEntry(OUString const & url); - Reference< ucb::XSimpleFileAccess3 > getFileAccess( void ); + Reference< ucb::XSimpleFileAccess3 > getFileAccess(); Reference< ucb::XSimpleFileAccess3 > m_xSFA; const Reference<deployment::XPackageTypeInfo> m_xHelpTypeInfo; @@ -601,7 +601,7 @@ void BackendImpl::implCollectXhpFiles( const OUString& aDir, } } -Reference< ucb::XSimpleFileAccess3 > BackendImpl::getFileAccess( void ) +Reference< ucb::XSimpleFileAccess3 > BackendImpl::getFileAccess() { if( !m_xSFA.is() ) { diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 186f60bf29f3..0651480dfa79 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -767,7 +767,7 @@ static char* lo_getError (LibreOfficeKit *pThis) return pMemory; } -static void force_c_locale(void) +static void force_c_locale() { // force locale (and resource files loaded) to en-US OUString aLangISO("en-US"); diff --git a/dtrans/source/cnttype/mcnttype.cxx b/dtrans/source/cnttype/mcnttype.cxx index 74022478ec9c..e9c2915dbe20 100644 --- a/dtrans/source/cnttype/mcnttype.cxx +++ b/dtrans/source/cnttype/mcnttype.cxx @@ -101,7 +101,7 @@ void SAL_CALL CMimeContentType::init( const OUString& aCntType ) throw( IllegalA type(); } -void SAL_CALL CMimeContentType::getSym( void ) +void SAL_CALL CMimeContentType::getSym() { if ( m_nPos < m_ContentType.getLength( ) ) { @@ -121,13 +121,13 @@ void SAL_CALL CMimeContentType::acceptSym( const OUString& pSymTlb ) getSym(); } -void SAL_CALL CMimeContentType::skipSpaces( void ) +void SAL_CALL CMimeContentType::skipSpaces() { while (m_nxtSym == SPACE) getSym( ); } -void SAL_CALL CMimeContentType::type( void ) +void SAL_CALL CMimeContentType::type() { skipSpaces( ); @@ -156,7 +156,7 @@ void SAL_CALL CMimeContentType::type( void ) subtype( ); } -void SAL_CALL CMimeContentType::subtype( void ) +void SAL_CALL CMimeContentType::subtype() { skipSpaces( ); @@ -182,7 +182,7 @@ void SAL_CALL CMimeContentType::subtype( void ) trailer(); } -void SAL_CALL CMimeContentType::trailer( void ) +void SAL_CALL CMimeContentType::trailer() { OUString sToken(TOKEN); while( !m_nxtSym.isEmpty( ) ) @@ -325,7 +325,7 @@ OUString SAL_CALL CMimeContentType::nonquotedPValue( ) return pvalue; } -void SAL_CALL CMimeContentType::comment( void ) +void SAL_CALL CMimeContentType::comment() { while ( !m_nxtSym.isEmpty( ) ) { diff --git a/dtrans/source/cnttype/mcnttype.hxx b/dtrans/source/cnttype/mcnttype.hxx index b7663021a4fe..e44e12261b21 100644 --- a/dtrans/source/cnttype/mcnttype.hxx +++ b/dtrans/source/cnttype/mcnttype.hxx @@ -51,17 +51,17 @@ public: private: void SAL_CALL init( const OUString& aCntType ) throw( com::sun::star::lang::IllegalArgumentException ); - void SAL_CALL getSym( void ); + void SAL_CALL getSym(); void SAL_CALL acceptSym( const OUString& pSymTlb ); - void SAL_CALL skipSpaces( void ); - void SAL_CALL type( void ); - void SAL_CALL subtype( void ); - void SAL_CALL trailer( void ); + void SAL_CALL skipSpaces(); + void SAL_CALL type(); + void SAL_CALL subtype(); + void SAL_CALL trailer(); OUString SAL_CALL pName( ); OUString SAL_CALL pValue( ); OUString SAL_CALL quotedPValue( ); OUString SAL_CALL nonquotedPValue( ); - void SAL_CALL comment( void ); + void SAL_CALL comment(); static bool SAL_CALL isInRange( const OUString& aChr, const OUString& aRange ); private: diff --git a/dtrans/source/win32/clipb/WinClipbImpl.cxx b/dtrans/source/win32/clipb/WinClipbImpl.cxx index a529b812ed76..817d7f2f7a20 100644 --- a/dtrans/source/win32/clipb/WinClipbImpl.cxx +++ b/dtrans/source/win32/clipb/WinClipbImpl.cxx @@ -181,7 +181,7 @@ void SAL_CALL CWinClipbImpl::dispose() throw( RuntimeException ) OSL_ENSURE( !m_pCurrentClipContent, "Clipboard was not flushed before shutdown!" ); } -void WINAPI CWinClipbImpl::onClipboardContentChanged( void ) +void WINAPI CWinClipbImpl::onClipboardContentChanged() { MutexGuard aGuard( s_aMutex ); diff --git a/dtrans/source/win32/clipb/WinClipbImpl.hxx b/dtrans/source/win32/clipb/WinClipbImpl.hxx index e248dad499b4..a5da94cca792 100644 --- a/dtrans/source/win32/clipb/WinClipbImpl.hxx +++ b/dtrans/source/win32/clipb/WinClipbImpl.hxx @@ -76,7 +76,7 @@ protected: void SAL_CALL registerClipboardViewer( ); void SAL_CALL unregisterClipboardViewer( ); - static void WINAPI onClipboardContentChanged( void ); + static void WINAPI onClipboardContentChanged(); private: void SAL_CALL onReleaseDataObject( CXNotifyingDataObject* theCaller ); diff --git a/dtrans/source/win32/dnd/idroptarget.cxx b/dtrans/source/win32/dnd/idroptarget.cxx index 1510a5420965..0edc50ab4b04 100644 --- a/dtrans/source/win32/dnd/idroptarget.cxx +++ b/dtrans/source/win32/dnd/idroptarget.cxx @@ -57,12 +57,12 @@ HRESULT STDMETHODCALLTYPE IDropTargetImpl::QueryInterface( REFIID riid, void ** } -ULONG STDMETHODCALLTYPE IDropTargetImpl::AddRef( void) +ULONG STDMETHODCALLTYPE IDropTargetImpl::AddRef() { return InterlockedIncrement( &m_nRefCount); } -ULONG STDMETHODCALLTYPE IDropTargetImpl::Release( void) +ULONG STDMETHODCALLTYPE IDropTargetImpl::Release() { LONG count= InterlockedDecrement( &m_nRefCount); if( m_nRefCount == 0 ) @@ -86,7 +86,7 @@ STDMETHODIMP IDropTargetImpl::DragOver( DWORD grfKeyState, return m_rDropTarget.DragOver( grfKeyState, pt, pdwEffect); } -STDMETHODIMP IDropTargetImpl::DragLeave( void) +STDMETHODIMP IDropTargetImpl::DragLeave() { return m_rDropTarget.DragLeave(); } diff --git a/dtrans/source/win32/dnd/source.cxx b/dtrans/source/win32/dnd/source.cxx index 2728aed7cc11..b7a1aa0551ed 100644 --- a/dtrans/source/win32/dnd/source.cxx +++ b/dtrans/source/win32/dnd/source.cxx @@ -218,13 +218,13 @@ HRESULT STDMETHODCALLTYPE DragSource::QueryInterface( REFIID riid, void **ppvOb } -ULONG STDMETHODCALLTYPE DragSource::AddRef( void) +ULONG STDMETHODCALLTYPE DragSource::AddRef() { acquire(); return (ULONG) m_refCount; } -ULONG STDMETHODCALLTYPE DragSource::Release( void) +ULONG STDMETHODCALLTYPE DragSource::Release() { ULONG ref= m_refCount; release(); diff --git a/dtrans/source/win32/dnd/target.cxx b/dtrans/source/win32/dnd/target.cxx index 8c8e963b321a..849b284f50c4 100644 --- a/dtrans/source/win32/dnd/target.cxx +++ b/dtrans/source/win32/dnd/target.cxx @@ -410,7 +410,7 @@ HRESULT DropTarget::DragOver( DWORD grfKeyState, return S_OK; } -HRESULT DropTarget::DragLeave( void) +HRESULT DropTarget::DragLeave() { #if defined DBG_CONSOLE_OUT printf("\nDropTarget::DragLeave"); diff --git a/editeng/source/accessibility/AccessibleComponentBase.cxx b/editeng/source/accessibility/AccessibleComponentBase.cxx index 38ad66f09117..c2b2ddfd50c5 100644 --- a/editeng/source/accessibility/AccessibleComponentBase.cxx +++ b/editeng/source/accessibility/AccessibleComponentBase.cxx @@ -36,14 +36,14 @@ namespace accessibility { //===== internal ============================================================ -AccessibleComponentBase::AccessibleComponentBase (void) +AccessibleComponentBase::AccessibleComponentBase() { } -AccessibleComponentBase::~AccessibleComponentBase (void) +AccessibleComponentBase::~AccessibleComponentBase() { } @@ -77,7 +77,7 @@ uno::Reference<XAccessible > SAL_CALL -awt::Rectangle SAL_CALL AccessibleComponentBase::getBounds (void) +awt::Rectangle SAL_CALL AccessibleComponentBase::getBounds() throw (uno::RuntimeException, std::exception) { return awt::Rectangle(); @@ -86,7 +86,7 @@ awt::Rectangle SAL_CALL AccessibleComponentBase::getBounds (void) -awt::Point SAL_CALL AccessibleComponentBase::getLocation (void) +awt::Point SAL_CALL AccessibleComponentBase::getLocation() throw (::com::sun::star::uno::RuntimeException, std::exception) { awt::Rectangle aBBox (getBounds()); @@ -96,7 +96,7 @@ awt::Point SAL_CALL AccessibleComponentBase::getLocation (void) -awt::Point SAL_CALL AccessibleComponentBase::getLocationOnScreen (void) +awt::Point SAL_CALL AccessibleComponentBase::getLocationOnScreen() throw (::com::sun::star::uno::RuntimeException, std::exception) { return awt::Point(); @@ -105,7 +105,7 @@ awt::Point SAL_CALL AccessibleComponentBase::getLocationOnScreen (void) -::com::sun::star::awt::Size SAL_CALL AccessibleComponentBase::getSize (void) +::com::sun::star::awt::Size SAL_CALL AccessibleComponentBase::getSize() throw (::com::sun::star::uno::RuntimeException, std::exception) { awt::Rectangle aBBox (getBounds()); @@ -136,7 +136,7 @@ void SAL_CALL AccessibleComponentBase::removeFocusListener (const ::com::sun::st -void SAL_CALL AccessibleComponentBase::grabFocus (void) +void SAL_CALL AccessibleComponentBase::grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) { uno::Reference<XAccessibleContext> xContext (this, uno::UNO_QUERY); @@ -153,7 +153,7 @@ void SAL_CALL AccessibleComponentBase::grabFocus (void) -sal_Int32 SAL_CALL AccessibleComponentBase::getForeground (void) +sal_Int32 SAL_CALL AccessibleComponentBase::getForeground() throw (::com::sun::star::uno::RuntimeException, std::exception) { return Color(COL_BLACK).GetColor(); @@ -162,7 +162,7 @@ sal_Int32 SAL_CALL AccessibleComponentBase::getForeground (void) -sal_Int32 SAL_CALL AccessibleComponentBase::getBackground (void) +sal_Int32 SAL_CALL AccessibleComponentBase::getBackground() throw (::com::sun::star::uno::RuntimeException, std::exception) { return Color(COL_WHITE).GetColor(); @@ -174,7 +174,7 @@ sal_Int32 SAL_CALL AccessibleComponentBase::getBackground (void) //===== XAccessibleExtendedComponent ======================================== ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL - AccessibleComponentBase::getFont (void) + AccessibleComponentBase::getFont() throw (::com::sun::star::uno::RuntimeException, std::exception) { return uno::Reference<awt::XFont>(); @@ -183,14 +183,14 @@ sal_Int32 SAL_CALL AccessibleComponentBase::getBackground (void) -OUString SAL_CALL AccessibleComponentBase::getTitledBorderText (void) +OUString SAL_CALL AccessibleComponentBase::getTitledBorderText() throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString(); } -OUString SAL_CALL AccessibleComponentBase::getToolTipText (void) +OUString SAL_CALL AccessibleComponentBase::getToolTipText() throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString(); @@ -202,7 +202,7 @@ OUString SAL_CALL AccessibleComponentBase::getToolTipText (void) //===== XTypeProvider =================================================== uno::Sequence<uno::Type> SAL_CALL - AccessibleComponentBase::getTypes (void) + AccessibleComponentBase::getTypes() throw (uno::RuntimeException, std::exception) { // Get list of types from the context base implementation... diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx b/editeng/source/accessibility/AccessibleContextBase.cxx index bd364892b890..377a8428a417 100644 --- a/editeng/source/accessibility/AccessibleContextBase.cxx +++ b/editeng/source/accessibility/AccessibleContextBase.cxx @@ -81,7 +81,7 @@ AccessibleContextBase::AccessibleContextBase ( mxRelationSet = pRelationSet; } -AccessibleContextBase::~AccessibleContextBase(void) +AccessibleContextBase::~AccessibleContextBase() { } @@ -188,7 +188,7 @@ void AccessibleContextBase::SetRelationSet ( //===== XAccessible ========================================================= uno::Reference< XAccessibleContext> SAL_CALL - AccessibleContextBase::getAccessibleContext (void) + AccessibleContextBase::getAccessibleContext() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -203,7 +203,7 @@ uno::Reference< XAccessibleContext> SAL_CALL /** No children. */ sal_Int32 SAL_CALL - AccessibleContextBase::getAccessibleChildCount (void) + AccessibleContextBase::getAccessibleChildCount() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -230,7 +230,7 @@ uno::Reference<XAccessible> SAL_CALL uno::Reference<XAccessible> SAL_CALL - AccessibleContextBase::getAccessibleParent (void) + AccessibleContextBase::getAccessibleParent() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -241,7 +241,7 @@ uno::Reference<XAccessible> SAL_CALL sal_Int32 SAL_CALL - AccessibleContextBase::getAccessibleIndexInParent (void) + AccessibleContextBase::getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -277,7 +277,7 @@ sal_Int32 SAL_CALL sal_Int16 SAL_CALL - AccessibleContextBase::getAccessibleRole (void) + AccessibleContextBase::getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -288,7 +288,7 @@ sal_Int16 SAL_CALL OUString SAL_CALL - AccessibleContextBase::getAccessibleDescription (void) + AccessibleContextBase::getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -300,7 +300,7 @@ OUString SAL_CALL OUString SAL_CALL - AccessibleContextBase::getAccessibleName (void) + AccessibleContextBase::getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -322,7 +322,7 @@ OUString SAL_CALL /** Return a copy of the relation set. */ uno::Reference<XAccessibleRelationSet> SAL_CALL - AccessibleContextBase::getAccessibleRelationSet (void) + AccessibleContextBase::getAccessibleRelationSet() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -349,7 +349,7 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL VISIBLE */ uno::Reference<XAccessibleStateSet> SAL_CALL - AccessibleContextBase::getAccessibleStateSet (void) + AccessibleContextBase::getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) { ::utl::AccessibleStateSetHelper* pStateSet = NULL; @@ -389,7 +389,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL lang::Locale SAL_CALL - AccessibleContextBase::getLocale (void) + AccessibleContextBase::getLocale() throw (IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) { @@ -457,7 +457,7 @@ void SAL_CALL AccessibleContextBase::removeAccessibleEventListener ( } //===== XServiceInfo ======================================================== -OUString SAL_CALL AccessibleContextBase::getImplementationName (void) +OUString SAL_CALL AccessibleContextBase::getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -471,7 +471,7 @@ sal_Bool SAL_CALL AccessibleContextBase::supportsService (const OUString& sServi } uno::Sequence< OUString > SAL_CALL - AccessibleContextBase::getSupportedServiceNames (void) + AccessibleContextBase::getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -488,7 +488,7 @@ uno::Sequence< OUString > SAL_CALL //===== XTypeProvider ======================================================= uno::Sequence< ::com::sun::star::uno::Type> - AccessibleContextBase::getTypes (void) + AccessibleContextBase::getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -499,7 +499,7 @@ uno::Sequence< ::com::sun::star::uno::Type> } uno::Sequence<sal_Int8> SAL_CALL - AccessibleContextBase::getImplementationId (void) + AccessibleContextBase::getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); @@ -507,7 +507,7 @@ uno::Sequence<sal_Int8> SAL_CALL //===== internal ============================================================ -void SAL_CALL AccessibleContextBase::disposing (void) +void SAL_CALL AccessibleContextBase::disposing() { SetState (AccessibleStateType::DEFUNC); @@ -574,7 +574,7 @@ void AccessibleContextBase::SetAccessibleName ( -OUString AccessibleContextBase::CreateAccessibleDescription (void) +OUString AccessibleContextBase::CreateAccessibleDescription() throw (::com::sun::star::uno::RuntimeException) { return OUString("Empty Description"); @@ -583,7 +583,7 @@ OUString AccessibleContextBase::CreateAccessibleDescription (void) -OUString AccessibleContextBase::CreateAccessibleName (void) +OUString AccessibleContextBase::CreateAccessibleName() throw (::com::sun::star::uno::RuntimeException) { return OUString("Empty Name"); @@ -624,7 +624,7 @@ void AccessibleContextBase::FireEvent (const AccessibleEventObject& aEvent) -void AccessibleContextBase::ThrowIfDisposed (void) +void AccessibleContextBase::ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) @@ -637,7 +637,7 @@ void AccessibleContextBase::ThrowIfDisposed (void) -bool AccessibleContextBase::IsDisposed (void) +bool AccessibleContextBase::IsDisposed() { return (rBHelper.bDisposed || rBHelper.bInDispose); } diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx index 7ed255a83dde..53ca25fdb06b 100644 --- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx +++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx @@ -2813,7 +2813,7 @@ namespace accessibility // XServiceInfo - OUString SAL_CALL AccessibleEditableTextPara::getImplementationName (void) throw (uno::RuntimeException, std::exception) + OUString SAL_CALL AccessibleEditableTextPara::getImplementationName() throw (uno::RuntimeException, std::exception) { return OUString("AccessibleEditableTextPara"); @@ -2825,7 +2825,7 @@ namespace accessibility return cppu::supportsService(this, sServiceName); } - uno::Sequence< OUString> SAL_CALL AccessibleEditableTextPara::getSupportedServiceNames (void) throw (uno::RuntimeException, std::exception) + uno::Sequence< OUString> SAL_CALL AccessibleEditableTextPara::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) { const OUString sServiceName( getServiceName() ); @@ -2833,7 +2833,7 @@ namespace accessibility } // XServiceName - OUString SAL_CALL AccessibleEditableTextPara::getServiceName (void) throw (uno::RuntimeException) + OUString SAL_CALL AccessibleEditableTextPara::getServiceName() throw (uno::RuntimeException) { // #105185# Using correct service now diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx index cac43b3b8b86..09b07a764f4d 100644 --- a/editeng/source/accessibility/AccessibleImageBullet.cxx +++ b/editeng/source/accessibility/AccessibleImageBullet.cxx @@ -357,7 +357,7 @@ namespace accessibility return static_cast<sal_Int32>( aColor.GetColor() ); } - OUString SAL_CALL AccessibleImageBullet::getImplementationName (void) throw (uno::RuntimeException, std::exception) + OUString SAL_CALL AccessibleImageBullet::getImplementationName() throw (uno::RuntimeException, std::exception) { return OUString("AccessibleImageBullet"); @@ -369,7 +369,7 @@ namespace accessibility return cppu::supportsService(this, sServiceName); } - uno::Sequence< OUString > SAL_CALL AccessibleImageBullet::getSupportedServiceNames (void) throw (uno::RuntimeException, std::exception) + uno::Sequence< OUString > SAL_CALL AccessibleImageBullet::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) { const OUString sServiceName ("com.sun.star.accessibility.AccessibleContext"); diff --git a/editeng/source/misc/SvXMLAutoCorrectExport.hxx b/editeng/source/misc/SvXMLAutoCorrectExport.hxx index 62ce537b1e6d..c1dadc45a4f0 100644 --- a/editeng/source/misc/SvXMLAutoCorrectExport.hxx +++ b/editeng/source/misc/SvXMLAutoCorrectExport.hxx @@ -36,7 +36,7 @@ public: const OUString &rFileName, com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler); - virtual ~SvXMLAutoCorrectExport ( void ) {} + virtual ~SvXMLAutoCorrectExport() {} sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum eClass) SAL_OVERRIDE; void _ExportAutoStyles() SAL_OVERRIDE {} void _ExportMasterStyles () SAL_OVERRIDE {} @@ -56,7 +56,7 @@ public: const OUString &rFileName, com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler); - virtual ~SvXMLExceptionListExport ( void ) {} + virtual ~SvXMLExceptionListExport() {} sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum eClass) SAL_OVERRIDE; void _ExportAutoStyles() SAL_OVERRIDE {} void _ExportMasterStyles () SAL_OVERRIDE {} diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.cxx b/editeng/source/misc/SvXMLAutoCorrectImport.cxx index e68362e472de..c389d5e5f169 100644 --- a/editeng/source/misc/SvXMLAutoCorrectImport.cxx +++ b/editeng/source/misc/SvXMLAutoCorrectImport.cxx @@ -35,7 +35,7 @@ SvXMLAutoCorrectImport::SvXMLAutoCorrectImport( { } -SvXMLAutoCorrectImport::~SvXMLAutoCorrectImport ( void ) throw () +SvXMLAutoCorrectImport::~SvXMLAutoCorrectImport() throw () { } @@ -69,7 +69,7 @@ throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) return new SvXMLImportContext( rLocalRef ); } -SvXMLWordListContext::~SvXMLWordListContext ( void ) +SvXMLWordListContext::~SvXMLWordListContext() { } @@ -105,7 +105,7 @@ SvXMLWordContext::SvXMLWordContext( rLocalRef.pAutocorr_List->LoadEntry( sWrong, sRight, bOnlyTxt ); } -SvXMLWordContext::~SvXMLWordContext ( void ) +SvXMLWordContext::~SvXMLWordContext() { } @@ -117,7 +117,7 @@ SvXMLExceptionListImport::SvXMLExceptionListImport( { } -SvXMLExceptionListImport::~SvXMLExceptionListImport ( void ) throw () +SvXMLExceptionListImport::~SvXMLExceptionListImport() throw () { } @@ -150,7 +150,7 @@ com::sun::star::uno::Reference<xml::sax::XFastContextHandler> SAL_CALL SvXMLExce return new SvXMLImportContext( rLocalRef ); } -SvXMLExceptionListContext::~SvXMLExceptionListContext ( void ) +SvXMLExceptionListContext::~SvXMLExceptionListContext() { } @@ -172,7 +172,7 @@ SvXMLExceptionContext::SvXMLExceptionContext( rLocalRef.rList.insert( sWord ); } -SvXMLExceptionContext::~SvXMLExceptionContext ( void ) +SvXMLExceptionContext::~SvXMLExceptionContext() { } diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.hxx b/editeng/source/misc/SvXMLAutoCorrectImport.hxx index 96df12d64119..533a84b1700b 100644 --- a/editeng/source/misc/SvXMLAutoCorrectImport.hxx +++ b/editeng/source/misc/SvXMLAutoCorrectImport.hxx @@ -44,7 +44,7 @@ public: SvxAutoCorrect &rNewAutoCorrect, const ::css::uno::Reference < com::sun::star::embed::XStorage >& rNewStorage); - virtual ~SvXMLAutoCorrectImport ( void ) throw (); + virtual ~SvXMLAutoCorrectImport() throw (); }; class SvXMLWordListContext : public SvXMLImportContext @@ -59,7 +59,7 @@ public: const ::css::uno::Reference< ::css::xml::sax::XFastAttributeList > & xAttrList ) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; - virtual ~SvXMLWordListContext ( void ); + virtual ~SvXMLWordListContext(); }; class SvXMLWordContext : public SvXMLImportContext @@ -70,7 +70,7 @@ public: SvXMLWordContext ( SvXMLAutoCorrectImport& rImport, sal_Int32 Element, const ::css::uno::Reference< ::css::xml::sax::XFastAttributeList > & xAttrList ); - virtual ~SvXMLWordContext ( void ); + virtual ~SvXMLWordContext(); }; @@ -89,7 +89,7 @@ public: const ::css::uno::Reference< ::css::uno::XComponentContext > xContext, SvStringsISortDtor & rNewList ); - virtual ~SvXMLExceptionListImport ( void ) throw (); + virtual ~SvXMLExceptionListImport() throw (); }; class SvXMLExceptionListContext : public SvXMLImportContext @@ -104,7 +104,7 @@ public: const ::css::uno::Reference< ::css::xml::sax::XFastAttributeList > & xAttrList ) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; - virtual ~SvXMLExceptionListContext ( void ); + virtual ~SvXMLExceptionListContext(); }; class SvXMLExceptionContext : public SvXMLImportContext @@ -115,7 +115,7 @@ public: SvXMLExceptionContext ( SvXMLExceptionListImport& rImport, sal_Int32 Element, const ::css::uno::Reference< ::css::xml::sax::XFastAttributeList > & xAttrList ); - virtual ~SvXMLExceptionContext ( void ); + virtual ~SvXMLExceptionContext(); }; diff --git a/editeng/source/uno/unopracc.cxx b/editeng/source/uno/unopracc.cxx index 59baa24002ab..f7957a30cddb 100644 --- a/editeng/source/uno/unopracc.cxx +++ b/editeng/source/uno/unopracc.cxx @@ -101,7 +101,7 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxAccessibleTextPropertySet::getImplementati } // XServiceInfo -OUString SAL_CALL SAL_CALL SvxAccessibleTextPropertySet::getImplementationName (void) throw (uno::RuntimeException, std::exception) +OUString SAL_CALL SAL_CALL SvxAccessibleTextPropertySet::getImplementationName() throw (uno::RuntimeException, std::exception) { return OUString("SvxAccessibleTextPropertySet"); } @@ -111,7 +111,7 @@ sal_Bool SAL_CALL SvxAccessibleTextPropertySet::supportsService (const OUString& return cppu::supportsService(this, sServiceName); } -uno::Sequence< OUString> SAL_CALL SvxAccessibleTextPropertySet::getSupportedServiceNames (void) throw (uno::RuntimeException, std::exception) +uno::Sequence< OUString> SAL_CALL SvxAccessibleTextPropertySet::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) { // TODO return SvxUnoTextRangeBase::getSupportedServiceNames(); diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index 390b19f8d178..b3cf7127b0a8 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -306,7 +306,7 @@ void SvxUnoTextRangeBase::SetSelection( const ESelection& rSelection ) throw() // Interface XTextRange ( XText ) -uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextRangeBase::getStart(void) +uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextRangeBase::getStart() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -335,7 +335,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextRangeBase::getStart(void) return xRange; } -uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextRangeBase::getEnd(void) +uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextRangeBase::getEnd() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -363,7 +363,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextRangeBase::getEnd(void) return xRet; } -OUString SAL_CALL SvxUnoTextRangeBase::getString(void) +OUString SAL_CALL SvxUnoTextRangeBase::getString() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -409,7 +409,7 @@ void SAL_CALL SvxUnoTextRangeBase::setString(const OUString& aString) } // Interface beans::XPropertySet -uno::Reference< beans::XPropertySetInfo > SAL_CALL SvxUnoTextRangeBase::getPropertySetInfo(void) +uno::Reference< beans::XPropertySetInfo > SAL_CALL SvxUnoTextRangeBase::getPropertySetInfo() throw( uno::RuntimeException, std::exception ) { return mpPropSet->getPropertySetInfo(); @@ -1352,7 +1352,7 @@ uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::getPropertyDefaults( con } // internal -void SvxUnoTextRangeBase::CollapseToStart(void) throw() +void SvxUnoTextRangeBase::CollapseToStart() throw() { CheckSelection( maSelection, mpEditSource ); @@ -1360,7 +1360,7 @@ void SvxUnoTextRangeBase::CollapseToStart(void) throw() maSelection.nEndPos = maSelection.nStartPos; } -void SvxUnoTextRangeBase::CollapseToEnd(void) throw() +void SvxUnoTextRangeBase::CollapseToEnd() throw() { CheckSelection( maSelection, mpEditSource ); @@ -1368,7 +1368,7 @@ void SvxUnoTextRangeBase::CollapseToEnd(void) throw() maSelection.nStartPos = maSelection.nEndPos; } -bool SvxUnoTextRangeBase::IsCollapsed(void) throw() +bool SvxUnoTextRangeBase::IsCollapsed() throw() { CheckSelection( maSelection, mpEditSource ); diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx index e57cf87f399e..3c9cf39c3467 100644 --- a/editeng/source/uno/unotext2.cxx +++ b/editeng/source/uno/unotext2.cxx @@ -57,7 +57,7 @@ SvxUnoTextContentEnumeration::~SvxUnoTextContentEnumeration() throw() } // container::XEnumeration -sal_Bool SAL_CALL SvxUnoTextContentEnumeration::hasMoreElements(void) +sal_Bool SAL_CALL SvxUnoTextContentEnumeration::hasMoreElements() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -67,7 +67,7 @@ sal_Bool SAL_CALL SvxUnoTextContentEnumeration::hasMoreElements(void) return sal_False; } -uno::Any SvxUnoTextContentEnumeration::nextElement(void) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) +uno::Any SvxUnoTextContentEnumeration::nextElement() throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -626,7 +626,7 @@ void SAL_CALL SvxUnoTextCursor::gotoRange( const uno::Reference< text::XTextRang } // text::XTextRange (rest in SvxTextRange) -uno::Reference< text::XText > SAL_CALL SvxUnoTextCursor::getText(void) throw( uno::RuntimeException, std::exception ) +uno::Reference< text::XText > SAL_CALL SvxUnoTextCursor::getText() throw( uno::RuntimeException, std::exception ) { return mxParentText; } diff --git a/embeddedobj/source/msole/advisesink.cxx b/embeddedobj/source/msole/advisesink.cxx index c8272846b84b..10a5fee37d34 100644 --- a/embeddedobj/source/msole/advisesink.cxx +++ b/embeddedobj/source/msole/advisesink.cxx @@ -98,14 +98,14 @@ STDMETHODIMP_(void) OleWrapperAdviseSink::OnRename(LPMONIKER) // handled by default inprocess handler } -STDMETHODIMP_(void) OleWrapperAdviseSink::OnSave(void) +STDMETHODIMP_(void) OleWrapperAdviseSink::OnSave() { // TODO: ??? // The object knows about document saving already since it contolls it as ClienSite // other interested listeners must be registered for the object } -STDMETHODIMP_(void) OleWrapperAdviseSink::OnClose(void) +STDMETHODIMP_(void) OleWrapperAdviseSink::OnClose() { ::rtl::Reference< OleComponent > xLockComponent; diff --git a/embeddedobj/source/msole/advisesink.hxx b/embeddedobj/source/msole/advisesink.hxx index d8d0da7b372f..bfd5f19b7921 100644 --- a/embeddedobj/source/msole/advisesink.hxx +++ b/embeddedobj/source/msole/advisesink.hxx @@ -34,19 +34,19 @@ protected: public: OleWrapperAdviseSink( OleComponent* pOleComp ); - OleWrapperAdviseSink(void); + OleWrapperAdviseSink(); virtual ~OleWrapperAdviseSink(); void disconnectOleComponent(); STDMETHODIMP QueryInterface(REFIID, void**); - STDMETHODIMP_(ULONG) AddRef(void); - STDMETHODIMP_(ULONG) Release(void); + STDMETHODIMP_(ULONG) AddRef(); + STDMETHODIMP_(ULONG) Release(); STDMETHODIMP_(void) OnDataChange(LPFORMATETC, LPSTGMEDIUM); STDMETHODIMP_(void) OnViewChange(DWORD, LONG); STDMETHODIMP_(void) OnRename(LPMONIKER); - STDMETHODIMP_(void) OnSave(void); - STDMETHODIMP_(void) OnClose(void); + STDMETHODIMP_(void) OnSave(); + STDMETHODIMP_(void) OnClose(); }; #endif diff --git a/embeddedobj/source/msole/olewrapclient.cxx b/embeddedobj/source/msole/olewrapclient.cxx index 7f14a2629eaa..7c8755cdc05a 100644 --- a/embeddedobj/source/msole/olewrapclient.cxx +++ b/embeddedobj/source/msole/olewrapclient.cxx @@ -112,7 +112,7 @@ STDMETHODIMP OleWrapperClientSite::GetContainer( LPOLECONTAINER* ppContainer ) return E_NOTIMPL; } -STDMETHODIMP OleWrapperClientSite::ShowObject(void) +STDMETHODIMP OleWrapperClientSite::ShowObject() { return S_OK; } @@ -140,7 +140,7 @@ STDMETHODIMP OleWrapperClientSite::OnShowWindow( BOOL bShow ) return S_OK; } -STDMETHODIMP OleWrapperClientSite::RequestNewObjectLayout(void) +STDMETHODIMP OleWrapperClientSite::RequestNewObjectLayout() { return E_NOTIMPL; } diff --git a/embeddedobj/source/msole/olewrapclient.hxx b/embeddedobj/source/msole/olewrapclient.hxx index 52ebca2d9e1a..f5cc8dcc34c5 100644 --- a/embeddedobj/source/msole/olewrapclient.hxx +++ b/embeddedobj/source/msole/olewrapclient.hxx @@ -33,20 +33,20 @@ class OleWrapperClientSite : public IOleClientSite public: OleWrapperClientSite( OleComponent* pOleComp ); - virtual ~OleWrapperClientSite(void); + virtual ~OleWrapperClientSite(); void disconnectOleComponent(); STDMETHODIMP QueryInterface(REFIID, void**); - STDMETHODIMP_(ULONG) AddRef(void); - STDMETHODIMP_(ULONG) Release(void); + STDMETHODIMP_(ULONG) AddRef(); + STDMETHODIMP_(ULONG) Release(); - STDMETHODIMP SaveObject(void); + STDMETHODIMP SaveObject(); STDMETHODIMP GetMoniker(DWORD, DWORD, LPMONIKER *); STDMETHODIMP GetContainer(LPOLECONTAINER *); - STDMETHODIMP ShowObject(void); + STDMETHODIMP ShowObject(); STDMETHODIMP OnShowWindow(BOOL); - STDMETHODIMP RequestNewObjectLayout(void); + STDMETHODIMP RequestNewObjectLayout(); }; #endif diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx index 3263c9b4b547..496d08935767 100644 --- a/embedserv/source/embed/docholder.cxx +++ b/embedserv/source/embed/docholder.cxx @@ -419,7 +419,7 @@ HRESULT DocumentHolder::InPlaceActivate( } -void DocumentHolder::InPlaceDeactivate(void) +void DocumentHolder::InPlaceDeactivate() { m_bOnDeactivate = true; @@ -531,7 +531,7 @@ void CopyToOLEMenu(HMENU hOrig,WORD origPos,HMENU hDest,WORD destPos) SetMenuItemInfoW(hDest,(WORD)destPos,TRUE,&mi); } -BOOL DocumentHolder::InPlaceMenuCreate(void) +BOOL DocumentHolder::InPlaceMenuCreate() { HMENU hMenu; UINT i; @@ -586,7 +586,7 @@ BOOL DocumentHolder::InPlaceMenuCreate(void) return TRUE; } -BOOL DocumentHolder::InPlaceMenuDestroy(void) +BOOL DocumentHolder::InPlaceMenuDestroy() { if( NULL == m_nMenuShared ) return TRUE; @@ -597,12 +597,12 @@ BOOL DocumentHolder::InPlaceMenuDestroy(void) return TRUE; } -void DocumentHolder::OpenIntoWindow(void) +void DocumentHolder::OpenIntoWindow() { // not implemented } -BOOL DocumentHolder::Undo(void) +BOOL DocumentHolder::Undo() { // not implemented return false; diff --git a/embedserv/source/embed/ed_iinplace.cxx b/embedserv/source/embed/ed_iinplace.cxx index 5ca62c67f49c..1ea81f2d73bb 100644 --- a/embedserv/source/embed/ed_iinplace.cxx +++ b/embedserv/source/embed/ed_iinplace.cxx @@ -37,7 +37,7 @@ STDMETHODIMP EmbedDocument_Impl::ContextSensitiveHelp(BOOL) return NOERROR; } -STDMETHODIMP EmbedDocument_Impl::InPlaceDeactivate(void) +STDMETHODIMP EmbedDocument_Impl::InPlaceDeactivate() { // no locking is used since the OLE must use the same thread always if ( m_bIsInVerbHandling ) @@ -54,7 +54,7 @@ STDMETHODIMP EmbedDocument_Impl::InPlaceDeactivate(void) return NOERROR; } -STDMETHODIMP EmbedDocument_Impl::UIDeactivate(void) +STDMETHODIMP EmbedDocument_Impl::UIDeactivate() { // no locking is used since the OLE must use the same thread always if ( m_bIsInVerbHandling ) @@ -79,7 +79,7 @@ STDMETHODIMP EmbedDocument_Impl::SetObjectRects(LPCRECT aRect, LPCRECT aClip) return m_pDocHolder->SetObjectRects(aRect,aClip); } -STDMETHODIMP EmbedDocument_Impl::ReactivateAndUndo(void) +STDMETHODIMP EmbedDocument_Impl::ReactivateAndUndo() { return E_NOTIMPL; } diff --git a/embedserv/source/embed/iipaobj.cxx b/embedserv/source/embed/iipaobj.cxx index cec2d5b11017..43ecad4c0204 100644 --- a/embedserv/source/embed/iipaobj.cxx +++ b/embedserv/source/embed/iipaobj.cxx @@ -56,12 +56,12 @@ STDMETHODIMP CIIAObj::QueryInterface(REFIID riid, LPVOID FAR *ppv) } -STDMETHODIMP_(ULONG) CIIAObj::AddRef(void) +STDMETHODIMP_(ULONG) CIIAObj::AddRef() { return osl_atomic_increment( &m_refCount); } -STDMETHODIMP_(ULONG) CIIAObj::Release(void) +STDMETHODIMP_(ULONG) CIIAObj::Release() { sal_Int32 nCount = osl_atomic_decrement( &m_refCount); if ( nCount == 0 ) diff --git a/embedserv/source/embed/syswinwrapper.cxx b/embedserv/source/embed/syswinwrapper.cxx index dd124b1278a0..d493dd93218b 100644 --- a/embedserv/source/embed/syswinwrapper.cxx +++ b/embedserv/source/embed/syswinwrapper.cxx @@ -60,7 +60,7 @@ winwrap::CWindow::CWindow(HINSTANCE hInst) return; } -winwrap::CWindow::~CWindow(void) +winwrap::CWindow::~CWindow() { if (IsWindow(m_hWnd)) DestroyWindow(m_hWnd); @@ -80,7 +80,7 @@ winwrap::CWindow::~CWindow(void) * HWND Window handle for this object */ -HWND winwrap::CWindow::Window(void) +HWND winwrap::CWindow::Window() { return m_hWnd; } @@ -97,7 +97,7 @@ HWND winwrap::CWindow::Window(void) * HINSTANCE Instance handle of the module stored here. */ -HINSTANCE winwrap::CWindow::Instance(void) +HINSTANCE winwrap::CWindow::Instance() { return m_hInst; } @@ -177,7 +177,7 @@ CHatchWin::CHatchWin(HINSTANCE hInst,const DocumentHolder* pDocHolder) } -CHatchWin::~CHatchWin(void) +CHatchWin::~CHatchWin() { /* * Chances are this was already destroyed when a document @@ -255,7 +255,7 @@ HWND CHatchWin::HwndAssociateSet(HWND hWndAssoc) } -HWND CHatchWin::HwndAssociateGet(void) +HWND CHatchWin::HwndAssociateGet() { return m_hWndAssociate; } diff --git a/embedserv/source/inc/docholder.hxx b/embedserv/source/inc/docholder.hxx index 3e3928b8da81..4ab0468a2556 100644 --- a/embedserv/source/inc/docholder.hxx +++ b/embedserv/source/inc/docholder.hxx @@ -138,14 +138,14 @@ public: BOOL isActive() const; void DisableInplaceActivation(BOOL); HRESULT InPlaceActivate(LPOLECLIENTSITE,BOOL); - void InPlaceDeactivate(void); + void InPlaceDeactivate(); HRESULT UIActivate(); void UIDeactivate(); - BOOL InPlaceMenuCreate(void); - BOOL InPlaceMenuDestroy(void); + BOOL InPlaceMenuCreate(); + BOOL InPlaceMenuDestroy(); - void OpenIntoWindow(void); - BOOL Undo(void); + void OpenIntoWindow(); + BOOL Undo(); // further methods diff --git a/embedserv/source/inc/iipaobj.hxx b/embedserv/source/inc/iipaobj.hxx index 17e97acf8341..ba0e476c574d 100644 --- a/embedserv/source/inc/iipaobj.hxx +++ b/embedserv/source/inc/iipaobj.hxx @@ -42,8 +42,8 @@ public: /* IUnknown methods */ STDMETHODIMP QueryInterface(REFIID, LPVOID FAR * ppvObj); - STDMETHODIMP_(ULONG) AddRef(void); - STDMETHODIMP_(ULONG) Release(void); + STDMETHODIMP_(ULONG) AddRef(); + STDMETHODIMP_(ULONG) Release(); /* IOleInPlaceActiveObject methods */ STDMETHODIMP GetWindow(HWND *); diff --git a/embedserv/source/inc/syswinwrapper.hxx b/embedserv/source/inc/syswinwrapper.hxx index bde2efce0bf0..422dff9c3a4a 100644 --- a/embedserv/source/inc/syswinwrapper.hxx +++ b/embedserv/source/inc/syswinwrapper.hxx @@ -52,11 +52,11 @@ namespace winwrap { public: //Standard Class Functions CWindow(HINSTANCE); - ~CWindow(void); + ~CWindow(); //Just returns members. No need to modify - HWND Window(void); - HINSTANCE Instance(void); + HWND Window(); + HINSTANCE Instance(); }; @@ -155,12 +155,12 @@ protected: public: CHatchWin(HINSTANCE,const DocumentHolder*); - ~CHatchWin(void); + ~CHatchWin(); BOOL Init(HWND, UINT, HWND); HWND HwndAssociateSet(HWND); - HWND HwndAssociateGet(void); + HWND HwndAssociateGet(); void RectsSet(LPRECT, LPRECT); void ChildSet(HWND); diff --git a/embedserv/source/inprocserv/advisesink.cxx b/embedserv/source/inprocserv/advisesink.cxx index bbd7e5860c72..6d44b9f3caf2 100644 --- a/embedserv/source/inprocserv/advisesink.cxx +++ b/embedserv/source/inprocserv/advisesink.cxx @@ -153,7 +153,7 @@ STDMETHODIMP_(void) OleWrapperAdviseSink::OnRename( LPMONIKER pMoniker ) } } -STDMETHODIMP_(void) OleWrapperAdviseSink::OnSave(void) +STDMETHODIMP_(void) OleWrapperAdviseSink::OnSave() { if ( m_pListener ) { @@ -161,7 +161,7 @@ STDMETHODIMP_(void) OleWrapperAdviseSink::OnSave(void) } } -STDMETHODIMP_(void) OleWrapperAdviseSink::OnClose(void) +STDMETHODIMP_(void) OleWrapperAdviseSink::OnClose() { if ( m_pListener ) { diff --git a/embedserv/source/inprocserv/advisesink.hxx b/embedserv/source/inprocserv/advisesink.hxx index 2dc6d7739868..a30653aa0a84 100644 --- a/embedserv/source/inprocserv/advisesink.hxx +++ b/embedserv/source/inprocserv/advisesink.hxx @@ -76,14 +76,14 @@ public: BOOL IsClosed() { return m_bClosed; } STDMETHODIMP QueryInterface(REFIID, void**); - STDMETHODIMP_(ULONG) AddRef(void); - STDMETHODIMP_(ULONG) Release(void); + STDMETHODIMP_(ULONG) AddRef(); + STDMETHODIMP_(ULONG) Release(); STDMETHODIMP_(void) OnDataChange(LPFORMATETC, LPSTGMEDIUM); STDMETHODIMP_(void) OnViewChange(DWORD, LONG); STDMETHODIMP_(void) OnRename(LPMONIKER); - STDMETHODIMP_(void) OnSave(void); - STDMETHODIMP_(void) OnClose(void); + STDMETHODIMP_(void) OnSave(); + STDMETHODIMP_(void) OnClose(); }; }; // namespace advisesink diff --git a/embedserv/source/inprocserv/dllentry.cxx b/embedserv/source/inprocserv/dllentry.cxx index 545002aefe3b..e8b955d61aa7 100644 --- a/embedserv/source/inprocserv/dllentry.cxx +++ b/embedserv/source/inprocserv/dllentry.cxx @@ -205,7 +205,7 @@ extern "C" STDAPI INPROC_DLLPUBLIC DllCanUnloadNow() } -STDAPI INPROC_DLLPUBLIC DllRegisterServer( void ) +STDAPI INPROC_DLLPUBLIC DllRegisterServer() { HMODULE aCurModule = GetModuleHandleA( "inprocserv.dll" ); if( aCurModule ) @@ -223,7 +223,7 @@ STDAPI INPROC_DLLPUBLIC DllRegisterServer( void ) } -STDAPI INPROC_DLLPUBLIC DllUnregisterServer( void ) +STDAPI INPROC_DLLPUBLIC DllUnregisterServer() { return WriteLibraryToRegistry( "ole32.dll", 10 ); } diff --git a/embedserv/source/inprocserv/inprocembobj.cxx b/embedserv/source/inprocserv/inprocembobj.cxx index 04442f795cd6..912efc4dc160 100644 --- a/embedserv/source/inprocserv/inprocembobj.cxx +++ b/embedserv/source/inprocserv/inprocembobj.cxx @@ -1542,7 +1542,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::ContextSensitiveHelp( BOOL fEnterMode ) // IOleInPlaceObject methods -STDMETHODIMP InprocEmbedDocument_Impl::InPlaceDeactivate( void ) +STDMETHODIMP InprocEmbedDocument_Impl::InPlaceDeactivate() { if ( CheckDefHandler() ) { @@ -1558,7 +1558,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::InPlaceDeactivate( void ) } -STDMETHODIMP InprocEmbedDocument_Impl::UIDeactivate( void ) +STDMETHODIMP InprocEmbedDocument_Impl::UIDeactivate() { if ( CheckDefHandler() ) { @@ -1590,7 +1590,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::SetObjectRects( LPCRECT lprcPosRect, LPCR } -STDMETHODIMP InprocEmbedDocument_Impl::ReactivateAndUndo( void ) +STDMETHODIMP InprocEmbedDocument_Impl::ReactivateAndUndo() { if ( CheckDefHandler() ) { diff --git a/eventattacher/source/eventattacher.cxx b/eventattacher/source/eventattacher.cxx index 70a8c287dfcb..6e7cd7cbbdc3 100644 --- a/eventattacher/source/eventattacher.cxx +++ b/eventattacher/source/eventattacher.cxx @@ -67,7 +67,7 @@ public: const Reference< XAllListener >& AllListener, const Any& Helper ); // XInvocation - virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection(void) throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection() throw( RuntimeException, std::exception ) SAL_OVERRIDE; virtual Any SAL_CALL invoke(const OUString& FunctionName, const Sequence< Any >& Params, Sequence< sal_Int16 >& OutParamIndex, Sequence< Any >& OutParam) throw( IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setValue(const OUString& PropertyName, const Any& Value) @@ -118,7 +118,7 @@ InvocationToAllListenerMapper::InvocationToAllListenerMapper } -Reference< XIntrospectionAccess > SAL_CALL InvocationToAllListenerMapper::getIntrospection(void) +Reference< XIntrospectionAccess > SAL_CALL InvocationToAllListenerMapper::getIntrospection() throw( RuntimeException, std::exception ) { return Reference< XIntrospectionAccess >(); diff --git a/extensions/source/abpilot/unodialogabp.hxx b/extensions/source/abpilot/unodialogabp.hxx index ff58b6e9a456..b444095823a5 100644 --- a/extensions/source/abpilot/unodialogabp.hxx +++ b/extensions/source/abpilot/unodialogabp.hxx @@ -63,8 +63,8 @@ namespace abp virtual ::comphelper::StringSequence 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 ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&); diff --git a/extensions/source/activex/so_activex.cxx b/extensions/source/activex/so_activex.cxx index d460bc6aa984..45c9174610c4 100644 --- a/extensions/source/activex/so_activex.cxx +++ b/extensions/source/activex/so_activex.cxx @@ -90,7 +90,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/) // Used to determine whether the DLL can be unloaded by OLE -STDAPI DllCanUnloadNow(void) +STDAPI DllCanUnloadNow() { return (_Module.GetLockCount()==0) ? S_OK : S_FALSE; } @@ -658,7 +658,7 @@ STDAPI DllUnregisterServerDoc( int nMode, BOOL bForAllUsers, BOOL bFor64Bit ) // DllRegisterServer - regsvr32 entry point -STDAPI DllRegisterServer( void ) +STDAPI DllRegisterServer() { char pProgramPath[1024]; HRESULT aResult = E_FAIL; @@ -691,7 +691,7 @@ STDAPI DllRegisterServer( void ) // DllUnregisterServer - regsvr32 entry point -STDAPI DllUnregisterServer( void ) +STDAPI DllUnregisterServer() { DllUnregisterServerDoc( 63, FALSE, bX64 ); DllUnregisterServerNative( 63, FALSE, bX64 ); diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index 98016ca29009..9cb50420584d 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.cxx @@ -99,7 +99,7 @@ public: // XServiceInfo OUString SAL_CALL getImplementationName() throw(std::exception ) SAL_OVERRIDE; sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception ) SAL_OVERRIDE; - Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(std::exception ) SAL_OVERRIDE; + Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception ) SAL_OVERRIDE; static OUString getImplementationName_Static() throw( ) { @@ -110,15 +110,15 @@ public: //XNameAccess virtual Any SAL_CALL getByName(const OUString& aName) throw ( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) SAL_OVERRIDE; - virtual Sequence< OUString > SAL_CALL getElementNames(void) throw ( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual Sequence< OUString > SAL_CALL getElementNames() throw ( RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasByName(const OUString& aName) throw ( RuntimeException, std::exception ) SAL_OVERRIDE; //XElementAccess - virtual Type SAL_CALL getElementType(void) throw ( RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements(void) throw ( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual Type SAL_CALL getElementType() throw ( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements() throw ( RuntimeException, std::exception ) SAL_OVERRIDE; //XPropertySet - virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo(void) throw ( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo() throw ( RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue(const OUString& PropertyName, const Any& aValue) throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception ) SAL_OVERRIDE; virtual Any SAL_CALL getPropertyValue(const OUString& PropertyName) throw ( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL addPropertyChangeListener(const OUString& PropertyName, const Reference< XPropertyChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) SAL_OVERRIDE; @@ -126,7 +126,7 @@ public: virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const Reference< XVetoableChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName, const Reference< XVetoableChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) SAL_OVERRIDE; - static Sequence<OUString> SAL_CALL getSupportedServiceNames_Static(void) throw( ); + static Sequence<OUString> SAL_CALL getSupportedServiceNames_Static() throw( ); friend Reference< XInterface > SAL_CALL BibliographyLoader_CreateInstance( const Reference< XMultiServiceFactory > & rSMgr ) throw( Exception ); @@ -134,7 +134,7 @@ public: virtual void SAL_CALL load(const Reference< XFrame > & aFrame, const OUString& aURL, const Sequence< PropertyValue >& aArgs, const Reference< XLoadEventListener > & aListener) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL cancel(void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL cancel() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; BibliographyLoader::BibliographyLoader() : @@ -173,13 +173,13 @@ sal_Bool BibliographyLoader::supportsService(const OUString& ServiceName) throw( } // XServiceInfo -Sequence< OUString > BibliographyLoader::getSupportedServiceNames(void) throw(std::exception ) +Sequence< OUString > BibliographyLoader::getSupportedServiceNames() throw(std::exception ) { return getSupportedServiceNames_Static(); } // ORegistryServiceManager_Static -Sequence< OUString > BibliographyLoader::getSupportedServiceNames_Static(void) throw( ) +Sequence< OUString > BibliographyLoader::getSupportedServiceNames_Static() throw( ) { Sequence< OUString > aSNS( 2 ); aSNS.getArray()[0] = "com.sun.star.frame.FrameLoader"; @@ -213,7 +213,7 @@ extern "C" } -void BibliographyLoader::cancel(void) throw (::com::sun::star::uno::RuntimeException, std::exception) +void BibliographyLoader::cancel() throw (::com::sun::star::uno::RuntimeException, std::exception) { //! //! @@ -498,7 +498,7 @@ Any BibliographyLoader::getByName(const OUString& rName) throw return aRet; } -Sequence< OUString > BibliographyLoader::getElementNames(void) throw ( RuntimeException, std::exception ) +Sequence< OUString > BibliographyLoader::getElementNames() throw ( RuntimeException, std::exception ) { Sequence< OUString > aRet(10); int nRealNameCount = 0; @@ -562,19 +562,19 @@ sal_Bool BibliographyLoader::hasByName(const OUString& rName) throw ( RuntimeExc return bRet; } -Type BibliographyLoader::getElementType(void) throw ( RuntimeException, std::exception ) +Type BibliographyLoader::getElementType() throw ( RuntimeException, std::exception ) { return cppu::UnoType<Sequence<PropertyValue>>::get(); } -sal_Bool BibliographyLoader::hasElements(void) throw ( RuntimeException, std::exception ) +sal_Bool BibliographyLoader::hasElements() throw ( RuntimeException, std::exception ) { Reference< XResultSet > xCursor = GetDataCursor(); Reference< XNameAccess > xColumns = GetDataColumns(); return xColumns.is() && (xColumns->getElementNames().getLength() != 0); } -Reference< XPropertySetInfo > BibliographyLoader::getPropertySetInfo(void) throw +Reference< XPropertySetInfo > BibliographyLoader::getPropertySetInfo() throw ( RuntimeException, std::exception ) { static const SfxItemPropertyMapEntry aBibProps_Impl[] = diff --git a/extensions/source/bibliography/bibshortcuthandler.hxx b/extensions/source/bibliography/bibshortcuthandler.hxx index f8c87f395fb5..45bf279df404 100644 --- a/extensions/source/bibliography/bibshortcuthandler.hxx +++ b/extensions/source/bibliography/bibshortcuthandler.hxx @@ -40,14 +40,14 @@ public: virtual ~BibShortCutHandler(); virtual bool HandleShortCutKey( const KeyEvent& rKeyEvent ); // returns true, if key was handled - inline vcl::Window* GetWindow( void ); + inline vcl::Window* GetWindow(); }; inline BibShortCutHandler::BibShortCutHandler( vcl::Window* _pBaseClass ) : pBaseClass( _pBaseClass ) { } -inline vcl::Window* BibShortCutHandler::GetWindow( void ) +inline vcl::Window* BibShortCutHandler::GetWindow() { return pBaseClass; } diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx index 02764e4e5816..238b1606d1e6 100644 --- a/extensions/source/bibliography/general.cxx +++ b/extensions/source/bibliography/general.cxx @@ -482,7 +482,7 @@ uno::Reference< awt::XControlModel > BibGeneralPage::AddXControl( return xCtrModel; } -void BibGeneralPage::InitFixedTexts( void ) +void BibGeneralPage::InitFixedTexts() { aFixedTexts[0] = pIdentifierFT; aFixedTexts[1] = pAuthTypeFT; diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx index 0b89c0ea322e..2c0c17aaf5fe 100644 --- a/extensions/source/bibliography/general.hxx +++ b/extensions/source/bibliography/general.hxx @@ -125,7 +125,7 @@ class BibGeneralPage: public BibGeneralPageBaseClass, public BibTabPage const OString& sHelpId, sal_uInt16 nIndexInFTArray, std::vector<vcl::Window*>& rChildren ); protected: - void InitFixedTexts( void ); // create mnemonics and set text an all fixed texts + void InitFixedTexts(); // create mnemonics and set text an all fixed texts public: BibGeneralPage(vcl::Window* pParent, BibDataManager* pDatMan); diff --git a/extensions/source/config/ldap/ldapaccess.hxx b/extensions/source/config/ldap/ldapaccess.hxx index 16d512863e0d..b0c308c0e78f 100644 --- a/extensions/source/config/ldap/ldapaccess.hxx +++ b/extensions/source/config/ldap/ldapaccess.hxx @@ -79,9 +79,9 @@ class LdapConnection public: /** Default constructor */ - LdapConnection(void) : mConnection(NULL),mLdapDefinition() {} + LdapConnection() : mConnection(NULL),mLdapDefinition() {} /** Destructor, releases the connection */ - ~LdapConnection(void) ; + ~LdapConnection() ; /** Make connection to LDAP server */ void connectSimple(const LdapDefinition& aDefinition) throw (ldap::LdapConnectionException, @@ -118,7 +118,7 @@ private: Indicates whether the connection is in a valid state. @return sal_True if connection is valid, sal_False otherwise */ - bool isValid(void) const { return mConnection != NULL ; } + bool isValid() const { return mConnection != NULL ; } void connectSimple() throw (ldap::LdapConnectionException, diff --git a/extensions/source/config/ldap/ldapuserprofilebe.cxx b/extensions/source/config/ldap/ldapuserprofilebe.cxx index 4d53c39c8572..dfb8a60f7c13 100644 --- a/extensions/source/config/ldap/ldapuserprofilebe.cxx +++ b/extensions/source/config/ldap/ldapuserprofilebe.cxx @@ -212,19 +212,19 @@ css::uno::Any LdapUserProfileBe::getPropertyValue( } -OUString SAL_CALL LdapUserProfileBe::getLdapUserProfileBeName(void) { +OUString SAL_CALL LdapUserProfileBe::getLdapUserProfileBeName() { return OUString("com.sun.star.comp.configuration.backend.LdapUserProfileBe"); } -OUString SAL_CALL LdapUserProfileBe::getImplementationName(void) +OUString SAL_CALL LdapUserProfileBe::getImplementationName() throw (uno::RuntimeException, std::exception) { return getLdapUserProfileBeName() ; } -uno::Sequence<OUString> SAL_CALL LdapUserProfileBe::getLdapUserProfileBeServiceNames(void) +uno::Sequence<OUString> SAL_CALL LdapUserProfileBe::getLdapUserProfileBeServiceNames() { uno::Sequence<OUString> aServices(1) ; aServices[0] = "com.sun.star.configuration.backend.LdapUserProfileBe"; @@ -238,7 +238,7 @@ sal_Bool SAL_CALL LdapUserProfileBe::supportsService(const OUString& aServiceNam } uno::Sequence<OUString> -SAL_CALL LdapUserProfileBe::getSupportedServiceNames(void) +SAL_CALL LdapUserProfileBe::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) { return getLdapUserProfileBeServiceNames() ; diff --git a/extensions/source/config/ldap/ldapuserprofilebe.hxx b/extensions/source/config/ldap/ldapuserprofilebe.hxx index 56f6155db466..983f833466b0 100644 --- a/extensions/source/config/ldap/ldapuserprofilebe.hxx +++ b/extensions/source/config/ldap/ldapuserprofilebe.hxx @@ -55,7 +55,7 @@ class LdapUserProfileBe : private LdapProfileMutexHolder, public BackendBase public : LdapUserProfileBe(const uno::Reference<uno::XComponentContext>& xContext); - virtual ~LdapUserProfileBe(void) ; + virtual ~LdapUserProfileBe() ; // XServiceInfo virtual OUString SAL_CALL @@ -125,13 +125,13 @@ class LdapUserProfileBe : private LdapProfileMutexHolder, public BackendBase Provides the implementation name. @return implementation name */ - static OUString SAL_CALL getLdapUserProfileBeName(void) ; + static OUString SAL_CALL getLdapUserProfileBeName() ; /** Provides the supported services names @return service names */ static uno::Sequence<OUString> SAL_CALL - getLdapUserProfileBeServiceNames(void) ; + getLdapUserProfileBeServiceNames() ; private: /** Check if LDAP is configured */ diff --git a/extensions/source/dbpilots/unoautopilot.hxx b/extensions/source/dbpilots/unoautopilot.hxx index d176321acacf..c70597fca7d5 100644 --- a/extensions/source/dbpilots/unoautopilot.hxx +++ b/extensions/source/dbpilots/unoautopilot.hxx @@ -71,8 +71,8 @@ namespace dbp virtual ::comphelper::StringSequence 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 ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&); diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx index b5560fcfc16a..01f8aa368596 100644 --- a/extensions/source/ole/oleobjw.cxx +++ b/extensions/source/ole/oleobjw.cxx @@ -154,7 +154,7 @@ Any IUnknownWrapper_Impl::queryInterface(const Type& t) XInitialization, XAutomationObject, XDefaultProperty, XDefaultMethod, XDirectInvocation, XAutomationInvocation >::queryInterface(t); } -Reference<XIntrospectionAccess> SAL_CALL IUnknownWrapper_Impl::getIntrospection(void) +Reference<XIntrospectionAccess> SAL_CALL IUnknownWrapper_Impl::getIntrospection() throw (RuntimeException ) { Reference<XIntrospectionAccess> ret; diff --git a/extensions/source/plugin/base/manager.cxx b/extensions/source/plugin/base/manager.cxx index 0b91202befde..84d45719d4c6 100644 --- a/extensions/source/plugin/base/manager.cxx +++ b/extensions/source/plugin/base/manager.cxx @@ -120,13 +120,13 @@ sal_Bool XPluginManager_Impl::supportsService(const OUString& ServiceName) throw } // ::com::sun::star::lang::XServiceInfo -Sequence< OUString > XPluginManager_Impl::getSupportedServiceNames(void) throw( ) +Sequence< OUString > XPluginManager_Impl::getSupportedServiceNames() throw( ) { return getSupportedServiceNames_Static(); } // XPluginManager_Impl -Sequence< OUString > XPluginManager_Impl::getSupportedServiceNames_Static(void) throw( ) +Sequence< OUString > XPluginManager_Impl::getSupportedServiceNames_Static() throw( ) { Sequence< OUString > aSNS( 1 ); aSNS[0] = "com.sun.star.plugin.PluginManager"; diff --git a/extensions/source/plugin/base/plctrl.cxx b/extensions/source/plugin/base/plctrl.cxx index b8973e0ec8f0..6ad9fdd5aa5b 100644 --- a/extensions/source/plugin/base/plctrl.cxx +++ b/extensions/source/plugin/base/plctrl.cxx @@ -77,7 +77,7 @@ void PluginControl_Impl::removeEventListener( const Reference< ::com::sun::star: } //---- ::com::sun::star::lang::XComponent ---------------------------------------------------------------------------------- -void PluginControl_Impl::dispose(void) +void PluginControl_Impl::dispose() throw( RuntimeException, std::exception ) { // send disposing events @@ -106,7 +106,7 @@ void PluginControl_Impl::setPosSize( sal_Int32 nX_, sal_Int32 nY_, sal_Int32 nWi } //---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- -::com::sun::star::awt::Rectangle PluginControl_Impl::getPosSize(void) +::com::sun::star::awt::Rectangle PluginControl_Impl::getPosSize() throw( RuntimeException, std::exception ) { return _xPeerWindow->getPosSize(); @@ -131,7 +131,7 @@ void PluginControl_Impl::setEnable( sal_Bool bEnable ) } //---- ::com::sun::star::awt::XWindow ------------------------------------------------------------------------------------- -void PluginControl_Impl::setFocus(void) throw( RuntimeException, std::exception ) +void PluginControl_Impl::setFocus() throw( RuntimeException, std::exception ) { if (_xPeerWindow.is()) _xPeerWindow->setFocus(); diff --git a/extensions/source/plugin/base/plmodel.cxx b/extensions/source/plugin/base/plmodel.cxx index f2c5cc3f650f..8ef83b590cd6 100644 --- a/extensions/source/plugin/base/plmodel.cxx +++ b/extensions/source/plugin/base/plmodel.cxx @@ -54,7 +54,7 @@ Any PluginModel::queryAggregation( const Type& type ) throw( RuntimeException, s // XPluginManager_Impl -Sequence< OUString > PluginModel::getSupportedServiceNames_Static(void) throw() +Sequence< OUString > PluginModel::getSupportedServiceNames_Static() throw() { Sequence< OUString > aSNS( 1 ); aSNS[0] = "com.sun.star.plugin.PluginModel"; @@ -170,7 +170,7 @@ void PluginModel::removeEventListener( const Reference< ::com::sun::star::lang:: } //---- ::com::sun::star::lang::XComponent ---------------------------------------------------------------------------------- -void PluginModel::dispose(void) throw(std::exception) +void PluginModel::dispose() throw(std::exception) { // send disposing events ::com::sun::star::lang::EventObject aEvt; diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx index cd0ccd56bb98..834b52ec766b 100644 --- a/extensions/source/plugin/base/xplugin.cxx +++ b/extensions/source/plugin/base/xplugin.cxx @@ -1170,7 +1170,7 @@ sal_uInt32 PluginInputStream::read( sal_uInt32 offset, sal_Int8* buffer, sal_uIn return m_aFileStream.Read( buffer, size ); } -void PluginInputStream::flush(void) throw(std::exception) +void PluginInputStream::flush() throw(std::exception) { } diff --git a/extensions/source/plugin/inc/plugin/impl.hxx b/extensions/source/plugin/inc/plugin/impl.hxx index 7ec12f716dec..1df38ee2a574 100644 --- a/extensions/source/plugin/inc/plugin/impl.hxx +++ b/extensions/source/plugin/inc/plugin/impl.hxx @@ -316,8 +316,8 @@ public: virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw() SAL_OVERRIDE; virtual OUString SAL_CALL getImplementationName() throw() SAL_OVERRIDE; - Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ) SAL_OVERRIDE; - static Sequence< OUString > getSupportedServiceNames_Static(void) throw( ); + Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ) SAL_OVERRIDE; + static Sequence< OUString > getSupportedServiceNames_Static() throw( ); static OUString getImplementationName_Static() throw( ) { /** the soplayer uses this name in its source! maybe not after 5.2 */ diff --git a/extensions/source/plugin/inc/plugin/model.hxx b/extensions/source/plugin/inc/plugin/model.hxx index 4cf7bdd2e1e0..b5ac5477b9fc 100644 --- a/extensions/source/plugin/inc/plugin/model.hxx +++ b/extensions/source/plugin/inc/plugin/model.hxx @@ -101,7 +101,7 @@ class PluginModel : public BroadcasterHelperHolder, // com::sun::star::lang::XTypeProvider - static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(void) throw( ); + static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static() throw( ); static OUString SAL_CALL getImplementationName_Static() throw( ) { /** the soplayer uses this name in its source! maybe not after 5.2 */ diff --git a/extensions/source/plugin/inc/plugin/plctrl.hxx b/extensions/source/plugin/inc/plugin/plctrl.hxx index bab35813b453..0684a9a6fe20 100644 --- a/extensions/source/plugin/inc/plugin/plctrl.hxx +++ b/extensions/source/plugin/inc/plugin/plctrl.hxx @@ -99,10 +99,10 @@ public: // ::com::sun::star::awt::XWindow virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setEnable( sal_Bool bEnable ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL setFocus(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setFocus() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setPosSize( sal_Int32 nX_, sal_Int32 nY_, sal_Int32 nWidth_, sal_Int32 nHeight_, sal_Int16 nFlags ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::awt::Rectangle SAL_CALL getPosSize(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Rectangle SAL_CALL getPosSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -132,10 +132,10 @@ public: // ::com::sun::star::awt::XView virtual sal_Bool SAL_CALL setGraphics( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > & /*aDevice*/ ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE { return sal_False; } - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > SAL_CALL getGraphics(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > SAL_CALL getGraphics() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE { return ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > (); } - virtual ::com::sun::star::awt::Size SAL_CALL getSize(void) 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 { return ::com::sun::star::awt::Size(_nWidth, _nHeight); } virtual void SAL_CALL draw( sal_Int32 x, sal_Int32 y ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.hxx b/extensions/source/propctrlr/MasterDetailLinkDialog.hxx index 3ff5f64ec0cf..28a6ddfa7875 100644 --- a/extensions/source/propctrlr/MasterDetailLinkDialog.hxx +++ b/extensions/source/propctrlr/MasterDetailLinkDialog.hxx @@ -40,8 +40,8 @@ namespace pcr MasterDetailLinkDialog(const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& _rxContext); // 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 ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >&); private: diff --git a/extensions/source/propctrlr/controlfontdialog.hxx b/extensions/source/propctrlr/controlfontdialog.hxx index a5bd97d45b81..3df0b46fcdc5 100644 --- a/extensions/source/propctrlr/controlfontdialog.hxx +++ b/extensions/source/propctrlr/controlfontdialog.hxx @@ -65,8 +65,8 @@ namespace pcr virtual ::comphelper::StringSequence 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 ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >&); diff --git a/extensions/source/propctrlr/pcrunodialogs.hxx b/extensions/source/propctrlr/pcrunodialogs.hxx index 61a76bf24f4c..e0e6e4325e22 100644 --- a/extensions/source/propctrlr/pcrunodialogs.hxx +++ b/extensions/source/propctrlr/pcrunodialogs.hxx @@ -61,8 +61,8 @@ namespace pcr virtual ::comphelper::StringSequence 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 ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >&); diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx index 24fb70112512..2036f0834a07 100644 --- a/extensions/source/propctrlr/taborder.cxx +++ b/extensions/source/propctrlr/taborder.cxx @@ -58,12 +58,12 @@ namespace pcr // XTabControllerModel virtual void SAL_CALL setControlModels(const Sequence< Reference< XControlModel > >& rModels) throw( RuntimeException, std::exception ) SAL_OVERRIDE {m_aModels = rModels;} - virtual Sequence< Reference< XControlModel > > SAL_CALL getControlModels(void) throw( RuntimeException, std::exception ) SAL_OVERRIDE {return m_aModels;} + virtual Sequence< Reference< XControlModel > > SAL_CALL getControlModels() throw( RuntimeException, std::exception ) SAL_OVERRIDE {return m_aModels;} virtual void SAL_CALL setGroup(const Sequence< Reference< XControlModel > >& /*Group*/, const OUString& /*GroupName*/) throw( RuntimeException, std::exception ) SAL_OVERRIDE {} - virtual sal_Int32 SAL_CALL getGroupCount(void) throw( RuntimeException, std::exception ) SAL_OVERRIDE {return 0;} + virtual sal_Int32 SAL_CALL getGroupCount() throw( RuntimeException, std::exception ) SAL_OVERRIDE {return 0;} virtual void SAL_CALL getGroup(sal_Int32 /*nGroup*/, Sequence< Reference< XControlModel > >& /*Group*/, OUString& /*Name*/) throw( RuntimeException, std::exception ) SAL_OVERRIDE {} virtual void SAL_CALL getGroupByName(const OUString& /*Name*/, Sequence< Reference< XControlModel > >& /*Group*/) throw( RuntimeException, std::exception ) SAL_OVERRIDE {} - virtual sal_Bool SAL_CALL getGroupControl(void) throw( RuntimeException, std::exception ) SAL_OVERRIDE {return sal_False;} ; + virtual sal_Bool SAL_CALL getGroupControl() throw( RuntimeException, std::exception ) SAL_OVERRIDE {return sal_False;} ; virtual void SAL_CALL setGroupControl(sal_Bool /*GroupControl*/) throw( RuntimeException, std::exception ) SAL_OVERRIDE {}; }; diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index cad79ac149d3..cd04ef5d3810 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -176,7 +176,7 @@ public: throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; //XPropertySet - virtual uno::Reference< beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(void) + virtual uno::Reference< beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue(const OUString& PropertyName, const uno::Any& aValue) throw( beans::UnknownPropertyException, beans::PropertyVetoException, @@ -384,7 +384,7 @@ void SAL_CALL UpdateCheckUI::disposing(const lang::EventObject&) } -uno::Reference< beans::XPropertySetInfo > UpdateCheckUI::getPropertySetInfo(void) +uno::Reference< beans::XPropertySetInfo > UpdateCheckUI::getPropertySetInfo() throw ( uno::RuntimeException, std::exception ) { return NULL; diff --git a/extensions/test/ole/cpnt/cpnt.cxx b/extensions/test/ole/cpnt/cpnt.cxx index 36483086ee89..179448430909 100644 --- a/extensions/test/ole/cpnt/cpnt.cxx +++ b/extensions/test/ole/cpnt/cpnt.cxx @@ -149,33 +149,33 @@ public: // XTestSequence virtual Sequence< Reference<XEventListener> > SAL_CALL methodXEventListeners( const Sequence<Reference<XEventListener> >& aSeq) throw( RuntimeException); virtual Sequence< Sequence<Reference<XEventListener > > > SAL_CALL methodXEventListenersMul( const Sequence<Sequence<Reference<XEventListener > > >& aSeq ) throw (RuntimeException); - virtual Sequence< sal_Int8 > SAL_CALL getAttrByte(void) throw( RuntimeException ); + virtual Sequence< sal_Int8 > SAL_CALL getAttrByte() throw( RuntimeException ); virtual void SAL_CALL setAttrByte(const Sequence< sal_Int8 >& AttrByte_) throw( RuntimeException ); - virtual Sequence< float > SAL_CALL getAttrFloat(void) throw( RuntimeException) ; + virtual Sequence< float > SAL_CALL getAttrFloat() throw( RuntimeException) ; virtual void SAL_CALL setAttrFloat(const Sequence< float >& AttrFloat_) throw( RuntimeException ); - virtual Sequence< double > SAL_CALL getAttrDouble(void) throw( RuntimeException) ; + virtual Sequence< double > SAL_CALL getAttrDouble() throw( RuntimeException) ; virtual void SAL_CALL setAttrDouble(const Sequence< double >& AttrDouble_) throw( RuntimeException ); - virtual Sequence< sal_Bool > SAL_CALL getAttrBool(void) throw( RuntimeException ); + virtual Sequence< sal_Bool > SAL_CALL getAttrBool() throw( RuntimeException ); virtual void SAL_CALL setAttrBool(const Sequence< sal_Bool >& AttrBool_) throw( RuntimeException ); - virtual Sequence< sal_Int16 > SAL_CALL getAttrShort(void) throw( RuntimeException ); + virtual Sequence< sal_Int16 > SAL_CALL getAttrShort() throw( RuntimeException ); virtual void SAL_CALL setAttrShort(const Sequence< sal_Int16 >& AttrShort_) throw( RuntimeException ); - virtual Sequence< sal_uInt16 > SAL_CALL getAttrUShort(void) throw( RuntimeException ); + virtual Sequence< sal_uInt16 > SAL_CALL getAttrUShort() throw( RuntimeException ); virtual void SAL_CALL setAttrUShort(const Sequence< sal_uInt16 >& AttrUShort_) throw( RuntimeException ); - virtual Sequence< sal_Int32 > SAL_CALL getAttrLong(void) throw( RuntimeException ); + virtual Sequence< sal_Int32 > SAL_CALL getAttrLong() throw( RuntimeException ); virtual void SAL_CALL setAttrLong(const Sequence< sal_Int32 >& AttrLong_) throw( RuntimeException ); - virtual Sequence< sal_uInt32 > SAL_CALL getAttrULong(void) throw( RuntimeException ); + virtual Sequence< sal_uInt32 > SAL_CALL getAttrULong() throw( RuntimeException ); virtual void SAL_CALL setAttrULong(const Sequence< sal_uInt32 >& AttrULong_) throw( RuntimeException ); - virtual Sequence< OUString > SAL_CALL getAttrString(void) throw(RuntimeException ); + virtual Sequence< OUString > SAL_CALL getAttrString() throw(RuntimeException ); virtual void SAL_CALL setAttrString(const Sequence< OUString >& AttrString_) throw( RuntimeException ); - virtual Sequence< sal_Unicode > SAL_CALL getAttrChar(void) throw( RuntimeException ); + virtual Sequence< sal_Unicode > SAL_CALL getAttrChar() throw( RuntimeException ); virtual void SAL_CALL setAttrChar(const Sequence< sal_Unicode >& AttrChar_) throw( RuntimeException ); - virtual Sequence< Any > SAL_CALL getAttrAny(void) throw( RuntimeException ); + virtual Sequence< Any > SAL_CALL getAttrAny() throw( RuntimeException ); virtual void SAL_CALL setAttrAny(const Sequence< Any >& AttrAny_) throw( RuntimeException ); - virtual Sequence< Type > SAL_CALL getAttrType(void) throw( RuntimeException ); + virtual Sequence< Type > SAL_CALL getAttrType() throw( RuntimeException ); virtual void SAL_CALL setAttrType( const Sequence< Type >& _attrtype ) throw (RuntimeException); - virtual Sequence< Sequence< sal_Int32 > > SAL_CALL getAttrSequence(void) throw( RuntimeException ); + virtual Sequence< Sequence< sal_Int32 > > SAL_CALL getAttrSequence() throw( RuntimeException ); virtual void SAL_CALL setAttrSequence(const Sequence< Sequence< sal_Int32 > >& AttrSequence_) throw( RuntimeException ); - virtual Sequence< Sequence< Sequence< sal_Int32 > > > SAL_CALL getAttrSequence2(void) throw( RuntimeException ); + virtual Sequence< Sequence< Sequence< sal_Int32 > > > SAL_CALL getAttrSequence2() throw( RuntimeException ); virtual void SAL_CALL setAttrSequence2(const Sequence< Sequence< Sequence< sal_Int32 > > >& AttrSequence2_) throw ( RuntimeException ); virtual Sequence< Reference< XInterface > > SAL_CALL getAttrXInterface() throw(RuntimeException); virtual void SAL_CALL setAttrXInterface( const Sequence< Reference< XInterface > >& _attrxinterface ) throw(RuntimeException); @@ -250,23 +250,23 @@ public: // XTestSequence virtual void SAL_CALL testinout_methodXInterface( Reference< XInvocation >& rOut ) throw(RuntimeException); virtual void SAL_CALL testinout_methodXInterface2( Reference< XInterface > & rOut) throw( RuntimeException); virtual Any SAL_CALL methodAnyTest1(const Any& rIn) throw( RuntimeException ) ; - virtual Any SAL_CALL getAttrAny2(void) throw( RuntimeException ) ; + virtual Any SAL_CALL getAttrAny2() throw( RuntimeException ) ; virtual void SAL_CALL setAttrAny2(const Any& AttrAny2_) throw( RuntimeException ) ; // XTestStruct virtual void SAL_CALL methodStruct(const Property& aProp) throw( RuntimeException ); - virtual Property SAL_CALL retMethodStruct(void) throw( RuntimeException ); + virtual Property SAL_CALL retMethodStruct() throw( RuntimeException ); - virtual Property SAL_CALL getAttrStruct(void) throw( RuntimeException ); + virtual Property SAL_CALL getAttrStruct() throw( RuntimeException ); virtual void SAL_CALL setAttrStruct(const Property& AttrStruct_) throw( RuntimeException ); virtual Property SAL_CALL methodStruct2( const Property& aProp ) throw (RuntimeException); // XTestOther virtual void SAL_CALL other_methodAnyIn(const Any& rAny) throw( RuntimeException ); virtual void SAL_CALL other_methodAnyOut(Any& rAny) throw( RuntimeException ); - virtual Any SAL_CALL other_methodAnyRet(void) throw( RuntimeException ); + virtual Any SAL_CALL other_methodAnyRet() throw( RuntimeException ); virtual void SAL_CALL in_float( float val) throw ( RuntimeException); virtual Any SAL_CALL other_methodAny( const Any& rAny, const OUString& typeInAny ) throw (RuntimeException); @@ -330,7 +330,7 @@ Reference<XInterface> SAL_CALL OComponent_CreateInstance( const Reference<XMulti return xService; } -Sequence<OUString> OComponent_getSupportedServiceNames(void) +Sequence<OUString> OComponent_getSupportedServiceNames() { Sequence<OUString> aRet(1); aRet.getArray()[0] = SERVICE_NAME;//ODataInputStream_getImplementationName(); @@ -562,7 +562,7 @@ Sequence< Sequence<Reference<XEventListener > > > SAL_CALL OComponent::methodXEv -Sequence< sal_Int8 > SAL_CALL OComponent::getAttrByte(void) throw( RuntimeException) +Sequence< sal_Int8 > SAL_CALL OComponent::getAttrByte() throw( RuntimeException) { return m_seqByte; } @@ -570,7 +570,7 @@ void SAL_CALL OComponent::setAttrByte(const Sequence< sal_Int8 >& AttrByte_) thr { m_seqByte= AttrByte_; } -Sequence< float > SAL_CALL OComponent::getAttrFloat(void) throw( RuntimeException ) +Sequence< float > SAL_CALL OComponent::getAttrFloat() throw( RuntimeException ) { return m_seqFloat; } @@ -579,7 +579,7 @@ void SAL_CALL OComponent::setAttrFloat(const Sequence< float >& AttrFloat_) thro m_seqFloat= AttrFloat_; } -Sequence< double > SAL_CALL OComponent::getAttrDouble(void) throw( RuntimeException ) +Sequence< double > SAL_CALL OComponent::getAttrDouble() throw( RuntimeException ) { return m_seqDouble; } @@ -588,7 +588,7 @@ void SAL_CALL OComponent::setAttrDouble(const Sequence< double >& AttrDouble_) t m_seqDouble= AttrDouble_; } -Sequence< sal_Bool > SAL_CALL OComponent::getAttrBool(void) throw( RuntimeException) +Sequence< sal_Bool > SAL_CALL OComponent::getAttrBool() throw( RuntimeException) { return m_seqBool; } @@ -598,7 +598,7 @@ void SAL_CALL OComponent::setAttrBool(const Sequence< sal_Bool >& AttrBool_) thr m_seqBool= AttrBool_; } -Sequence< sal_Int16 > SAL_CALL OComponent::getAttrShort(void) throw( RuntimeException) +Sequence< sal_Int16 > SAL_CALL OComponent::getAttrShort() throw( RuntimeException) { return m_seqShort; } @@ -607,7 +607,7 @@ void SAL_CALL OComponent::setAttrShort(const Sequence< sal_Int16 >& AttrShort_) m_seqShort= AttrShort_; } -Sequence< sal_uInt16 > SAL_CALL OComponent::getAttrUShort(void) throw( RuntimeException ) +Sequence< sal_uInt16 > SAL_CALL OComponent::getAttrUShort() throw( RuntimeException ) { return m_seqUShort; } @@ -616,7 +616,7 @@ void SAL_CALL OComponent::setAttrUShort(const Sequence< sal_uInt16 >& AttrUShort m_seqUShort= AttrUShort_; } -Sequence< sal_Int32 > SAL_CALL OComponent::getAttrLong(void) throw( RuntimeException) +Sequence< sal_Int32 > SAL_CALL OComponent::getAttrLong() throw( RuntimeException) { return m_seqLong; } @@ -625,7 +625,7 @@ void SAL_CALL OComponent::setAttrLong(const Sequence< sal_Int32 >& AttrLong_) th m_seqLong= AttrLong_; } -Sequence< sal_uInt32 > SAL_CALL OComponent::getAttrULong(void) throw( RuntimeException ) +Sequence< sal_uInt32 > SAL_CALL OComponent::getAttrULong() throw( RuntimeException ) { return m_seqULong; } @@ -634,7 +634,7 @@ void SAL_CALL OComponent::setAttrULong(const Sequence< sal_uInt32 >& AttrULong_) m_seqULong= AttrULong_; } -Sequence< OUString > SAL_CALL OComponent::getAttrString(void) throw( RuntimeException ) +Sequence< OUString > SAL_CALL OComponent::getAttrString() throw( RuntimeException ) { return m_seqString; } @@ -643,7 +643,7 @@ void SAL_CALL OComponent::setAttrString(const Sequence< OUString >& AttrString_) m_seqString= AttrString_; } -Sequence< sal_Unicode > SAL_CALL OComponent::getAttrChar(void) throw( RuntimeException ) +Sequence< sal_Unicode > SAL_CALL OComponent::getAttrChar() throw( RuntimeException ) { return m_seqChar; } @@ -652,7 +652,7 @@ void SAL_CALL OComponent::setAttrChar(const Sequence< sal_Unicode >& AttrChar_) m_seqChar= AttrChar_; } -Sequence< Any > SAL_CALL OComponent::getAttrAny(void) throw( RuntimeException) +Sequence< Any > SAL_CALL OComponent::getAttrAny() throw( RuntimeException) { return m_seqAny; } @@ -661,7 +661,7 @@ void SAL_CALL OComponent::setAttrAny(const Sequence< Any >& AttrAny_) throw( Run m_seqAny= AttrAny_; } -Sequence< Type > SAL_CALL OComponent::getAttrType(void) throw( RuntimeException ) +Sequence< Type > SAL_CALL OComponent::getAttrType() throw( RuntimeException ) { return m_seqType; } @@ -672,7 +672,7 @@ void SAL_CALL OComponent::setAttrType( const Sequence< Type >& AttrType_) throw( } -Sequence< Sequence< sal_Int32 > > SAL_CALL OComponent::getAttrSequence(void) throw( RuntimeException) +Sequence< Sequence< sal_Int32 > > SAL_CALL OComponent::getAttrSequence() throw( RuntimeException) { return m_seq1; } @@ -692,7 +692,7 @@ void SAL_CALL OComponent::setAttrSequence(const Sequence< Sequence< sal_Int32 > m_seq1= AttrSequence; } -Sequence< Sequence< Sequence< sal_Int32 > > > SAL_CALL OComponent::getAttrSequence2(void) throw( RuntimeException ) +Sequence< Sequence< Sequence< sal_Int32 > > > SAL_CALL OComponent::getAttrSequence2() throw( RuntimeException ) { return m_seq2; } @@ -1213,7 +1213,7 @@ Any SAL_CALL OComponent::methodAnyTest1(const Any& rIn) throw( RuntimeException { return rIn; } -Any SAL_CALL OComponent::getAttrAny2(void) throw( RuntimeException ) +Any SAL_CALL OComponent::getAttrAny2() throw( RuntimeException ) { return m_any; } @@ -1235,7 +1235,7 @@ void SAL_CALL OComponent::methodStruct(const Property& aProp) throw( RuntimeExce MessageBox( NULL, A2T(buff), _T("OleTest: methodStruct"), MB_OK); } -Property SAL_CALL OComponent::retMethodStruct(void) throw( RuntimeException ) +Property SAL_CALL OComponent::retMethodStruct() throw( RuntimeException ) { Property a(L"OleTest_Property", 255, cppu::UnoType<XInterface>::get(), PropertyAttribute::MAYBEVOID | PropertyAttribute::BOUND | PropertyAttribute::CONSTRAINED | @@ -1244,7 +1244,7 @@ Property SAL_CALL OComponent::retMethodStruct(void) throw( RuntimeException ) return a; } -Property SAL_CALL OComponent::getAttrStruct(void) throw( RuntimeException) +Property SAL_CALL OComponent::getAttrStruct() throw( RuntimeException) { Property a(L"OleTest_Property", 255, cppu::UnoType<XInterface>::get(), PropertyAttribute::MAYBEVOID | PropertyAttribute::BOUND | PropertyAttribute::CONSTRAINED | @@ -1277,7 +1277,7 @@ void SAL_CALL OComponent::other_methodAnyOut(Any& rAny) throw( RuntimeException rAny <<= OUString(L"Ein Any"); } -Any SAL_CALL OComponent::other_methodAnyRet(void) throw(RuntimeException ) +Any SAL_CALL OComponent::other_methodAnyRet() throw(RuntimeException ) { Any a; a <<= OUString(L"Ein Any"); diff --git a/extensions/workben/pythonautotest.cxx b/extensions/workben/pythonautotest.cxx index fb6b66ba3fda..a7ee631e8a75 100644 --- a/extensions/workben/pythonautotest.cxx +++ b/extensions/workben/pythonautotest.cxx @@ -58,7 +58,7 @@ public: void* getImplementation(Reflection *p) { return OWeakObject::getImplementation(p); } public: - XIntrospectionAccessRef getIntrospection(void) const THROWS( (UsrSystemException) ) + XIntrospectionAccessRef getIntrospection() const THROWS( (UsrSystemException) ) { return XIntrospectionAccessRef(); } UsrAny invoke( const UString& FunctionName, @@ -348,7 +348,7 @@ class PythonCodeLibrary : return FALSE; } - virtual Sequence< UString > getModuleNames(void) THROWS( (UsrSystemException) ) + virtual Sequence< UString > getModuleNames() THROWS( (UsrSystemException) ) { return Sequence<UString> (); } diff --git a/extensions/workben/testpgp.cxx b/extensions/workben/testpgp.cxx index b9fe1f877566..1d8ea709190d 100644 --- a/extensions/workben/testpgp.cxx +++ b/extensions/workben/testpgp.cxx @@ -65,7 +65,7 @@ class DataSource_Impl : public: DataSource_Impl (int fd = 0); - virtual ~DataSource_Impl (void); + virtual ~DataSource_Impl(); void setBuffer (const Sequence<sal_Int8> &rBuffer); @@ -74,9 +74,9 @@ public: virtual sal_Bool SAL_CALL queryInterface ( const Uik &rUik, Any &rIfc) throw(RuntimeException); - virtual void SAL_CALL acquire (void) throw(RuntimeException); + virtual void SAL_CALL acquire() throw(RuntimeException); - virtual void SAL_CALL release (void) throw(RuntimeException); + virtual void SAL_CALL release() throw(RuntimeException); /** XInputStream. */ @@ -97,10 +97,10 @@ public: BufferSizeExceededException, IOException); - virtual sal_Int32 SAL_CALL available (void) + virtual sal_Int32 SAL_CALL available() throw (NotConnectedException, IOException); - virtual void SAL_CALL closeInput (void) + virtual void SAL_CALL closeInput() throw (NotConnectedException, IOException); }; @@ -116,18 +116,18 @@ class DataSink_Impl : Sequence<sal_Int8> m_buffer; public: - DataSink_Impl (void); - virtual ~DataSink_Impl (void); + DataSink_Impl(); + virtual ~DataSink_Impl(); - const Sequence<sal_Int8>& getBuffer (void) const { return m_buffer; } + const Sequence<sal_Int8>& getBuffer() const { return m_buffer; } /** XInterface. */ virtual sal_Bool SAL_CALL queryInterface ( const Uik &rUik, Any &rIfc) throw(RuntimeException); - virtual void SAL_CALL acquire (void) throw(RuntimeException); - virtual void SAL_CALL release (void) throw(RuntimeException); + virtual void SAL_CALL acquire() throw(RuntimeException); + virtual void SAL_CALL release() throw(RuntimeException); /** XOutputStream. */ @@ -137,12 +137,12 @@ public: BufferSizeExceededException, IOException); - virtual void SAL_CALL flush (void) + virtual void SAL_CALL flush() throw (NotConnectedException, BufferSizeExceededException, IOException); - virtual void SAL_CALL closeOutput (void) + virtual void SAL_CALL closeOutput() throw (NotConnectedException, BufferSizeExceededException, IOException); @@ -158,17 +158,17 @@ class DecoderListener_Impl : public XPGPDecoderListener { public: - DecoderListener_Impl (void); - virtual ~DecoderListener_Impl (void); + DecoderListener_Impl(); + virtual ~DecoderListener_Impl(); /** XInterface. */ virtual sal_Bool SAL_CALL queryInterface ( const Uik &rUik, Any &rIfc) throw(RuntimeException); - virtual void SAL_CALL acquire (void) throw(RuntimeException); + virtual void SAL_CALL acquire() throw(RuntimeException); - virtual void SAL_CALL release (void) throw(RuntimeException); + virtual void SAL_CALL release() throw(RuntimeException); /** XEventListener. */ @@ -196,7 +196,7 @@ DataSource_Impl::DataSource_Impl (int fd) /* * ~DataSource_Impl. */ -DataSource_Impl::~DataSource_Impl (void) +DataSource_Impl::~DataSource_Impl() { } @@ -245,7 +245,7 @@ sal_Bool SAL_CALL DataSource_Impl::queryInterface ( /* * XInterface: acquire. */ -void SAL_CALL DataSource_Impl::acquire (void) throw(RuntimeException) +void SAL_CALL DataSource_Impl::acquire() throw(RuntimeException) { OWeakObject::acquire(); } @@ -253,7 +253,7 @@ void SAL_CALL DataSource_Impl::acquire (void) throw(RuntimeException) /* * XInterface: release. */ -void SAL_CALL DataSource_Impl::release (void) throw(RuntimeException) +void SAL_CALL DataSource_Impl::release() throw(RuntimeException) { OWeakObject::release(); } @@ -305,7 +305,7 @@ void SAL_CALL DataSource_Impl::skipBytes (sal_Int32 nBytesToSkip) /* * XInputStream: available. */ -sal_Int32 SAL_CALL DataSource_Impl::available (void) +sal_Int32 SAL_CALL DataSource_Impl::available() throw (NotConnectedException, IOException) { sal_Int32 k = m_buffer.getLength() - m_position; @@ -315,7 +315,7 @@ sal_Int32 SAL_CALL DataSource_Impl::available (void) /* * XInputStream: closeInput. */ -void SAL_CALL DataSource_Impl::closeInput (void) +void SAL_CALL DataSource_Impl::closeInput() throw (NotConnectedException, IOException) { } @@ -328,14 +328,14 @@ void SAL_CALL DataSource_Impl::closeInput (void) /* * DataSink_Impl. */ -DataSink_Impl::DataSink_Impl (void) +DataSink_Impl::DataSink_Impl() { } /* * ~DataSink_Impl. */ -DataSink_Impl::~DataSink_Impl (void) +DataSink_Impl::~DataSink_Impl() { } @@ -356,7 +356,7 @@ sal_Bool SAL_CALL DataSink_Impl::queryInterface ( /* * XInterface: acquire. */ -void SAL_CALL DataSink_Impl::acquire (void) throw(RuntimeException) +void SAL_CALL DataSink_Impl::acquire() throw(RuntimeException) { OWeakObject::acquire(); } @@ -364,7 +364,7 @@ void SAL_CALL DataSink_Impl::acquire (void) throw(RuntimeException) /* * XInterface: release. */ -void SAL_CALL DataSink_Impl::release (void) throw(RuntimeException) +void SAL_CALL DataSink_Impl::release() throw(RuntimeException) { OWeakObject::release(); } @@ -390,7 +390,7 @@ void SAL_CALL DataSink_Impl::writeBytes (const Sequence<sal_Int8> &rBuffer) /* * XOutputStream: flush. */ -void SAL_CALL DataSink_Impl::flush (void) +void SAL_CALL DataSink_Impl::flush() throw (NotConnectedException, BufferSizeExceededException, IOException) { if (m_buffer.getLength()) @@ -413,7 +413,7 @@ void SAL_CALL DataSink_Impl::flush (void) /* * XOutputStream: closeOutput. */ -void SAL_CALL DataSink_Impl::closeOutput (void) +void SAL_CALL DataSink_Impl::closeOutput() throw (NotConnectedException, BufferSizeExceededException, IOException) { flush(); @@ -427,14 +427,14 @@ void SAL_CALL DataSink_Impl::closeOutput (void) /* * DecoderListener_Impl. */ -DecoderListener_Impl::DecoderListener_Impl (void) +DecoderListener_Impl::DecoderListener_Impl() { } /* * ~DecoderListener_Impl. */ -DecoderListener_Impl::~DecoderListener_Impl (void) +DecoderListener_Impl::~DecoderListener_Impl() { } @@ -456,7 +456,7 @@ sal_Bool SAL_CALL DecoderListener_Impl::queryInterface ( /* * XInterface: acquire. */ -void SAL_CALL DecoderListener_Impl::acquire (void) throw(RuntimeException) +void SAL_CALL DecoderListener_Impl::acquire() throw(RuntimeException) { OWeakObject::acquire(); } @@ -464,7 +464,7 @@ void SAL_CALL DecoderListener_Impl::acquire (void) throw(RuntimeException) /* * XInterface: release. */ -void SAL_CALL DecoderListener_Impl::release (void) throw(RuntimeException) +void SAL_CALL DecoderListener_Impl::release() throw(RuntimeException) { OWeakObject::release(); } diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx index c34bc0b8aec7..718fad56d67c 100644 --- a/filter/source/graphicfilter/itiff/itiff.cxx +++ b/filter/source/graphicfilter/itiff/itiff.cxx @@ -112,7 +112,7 @@ private: sal_uLong GetBits( const sal_uInt8 * pSrc, sal_uLong nBitsPos, sal_uLong nBitsCount ); // fetches BitsCount bits from pSrc[..] at the position nBitsPos - void MakePalCol( void ); + void MakePalCol(); // Create the bitmap from the temporary bitmap pMap // and partly deletes pMap while doing this. @@ -1069,7 +1069,7 @@ bool TIFFReader::ConvertScanline( sal_uLong nY ) -void TIFFReader::MakePalCol( void ) +void TIFFReader::MakePalCol() { if ( nDstBitsPerPixel <= 8 ) { diff --git a/filter/source/xsltdialog/typedetectionimport.cxx b/filter/source/xsltdialog/typedetectionimport.cxx index 386ab1b2b59f..1efd61d9c9e6 100644 --- a/filter/source/xsltdialog/typedetectionimport.cxx +++ b/filter/source/xsltdialog/typedetectionimport.cxx @@ -50,7 +50,7 @@ TypeDetectionImporter::TypeDetectionImporter() { } -TypeDetectionImporter::~TypeDetectionImporter (void ) +TypeDetectionImporter::~TypeDetectionImporter() { } diff --git a/filter/source/xsltdialog/typedetectionimport.hxx b/filter/source/xsltdialog/typedetectionimport.hxx index a755dbc26f6a..2a0a269dde20 100644 --- a/filter/source/xsltdialog/typedetectionimport.hxx +++ b/filter/source/xsltdialog/typedetectionimport.hxx @@ -62,7 +62,7 @@ class TypeDetectionImporter : public cppu::WeakImplHelper1 < com::sun::star::xml { public: TypeDetectionImporter(); - virtual ~TypeDetectionImporter( void ); + virtual ~TypeDetectionImporter(); static void doImport( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, com::sun::star::uno::Reference < com::sun::star::io::XInputStream > xOS, XMLFilterVector& rFilters ); diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx index fd570b7ef2c5..4ca2d999d1b6 100644 --- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx +++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx @@ -213,7 +213,7 @@ OUString SAL_CALL XMLFilterDialogComponent::getImplementationName() throw(com::s namespace { struct lcl_ImplId : public rtl::Static< ::cppu::OImplementationId, lcl_ImplId > {}; } -Sequence< sal_Int8 > SAL_CALL XMLFilterDialogComponent::getImplementationId( void ) throw( RuntimeException, std::exception ) +Sequence< sal_Int8 > SAL_CALL XMLFilterDialogComponent::getImplementationId() throw( RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx index 2cfd52d406e5..d3246b9062db 100644 --- a/forms/source/component/Filter.cxx +++ b/forms/source/component/Filter.cxx @@ -679,7 +679,7 @@ namespace frm } - OUString SAL_CALL OFilterControl::getSelectedText( void ) throw(RuntimeException, std::exception) + OUString SAL_CALL OFilterControl::getSelectedText() throw(RuntimeException, std::exception) { OUString aSelected; Reference< XTextComponent > xText( getPeer(), UNO_QUERY ); @@ -698,7 +698,7 @@ namespace frm } - ::com::sun::star::awt::Selection SAL_CALL OFilterControl::getSelection( void ) throw(::com::sun::star::uno::RuntimeException, std::exception) + ::com::sun::star::awt::Selection SAL_CALL OFilterControl::getSelection() throw(::com::sun::star::uno::RuntimeException, std::exception) { ::com::sun::star::awt::Selection aSel; Reference< XTextComponent > xText( getPeer(), UNO_QUERY ); @@ -708,7 +708,7 @@ namespace frm } - sal_Bool SAL_CALL OFilterControl::isEditable( void ) throw(RuntimeException, std::exception) + sal_Bool SAL_CALL OFilterControl::isEditable() throw(RuntimeException, std::exception) { Reference< XTextComponent > xText( getPeer(), UNO_QUERY ); return xText.is() && xText->isEditable(); diff --git a/forms/source/component/Filter.hxx b/forms/source/component/Filter.hxx index 1513f86c6565..337d726cebe1 100644 --- a/forms/source/component/Filter.hxx +++ b/forms/source/component/Filter.hxx @@ -94,7 +94,7 @@ namespace frm virtual void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > & rxToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > & rParentPeer ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::lang::XComponent - virtual void SAL_CALL dispose(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::awt::XTextComponent virtual void SAL_CALL addTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx index cbb83f07d297..fcdaa6a1874b 100644 --- a/framework/inc/xml/imagesdocumenthandler.hxx +++ b/framework/inc/xml/imagesdocumenthandler.hxx @@ -67,11 +67,11 @@ class OReadImagesDocumentHandler : public ::cppu::WeakImplHelper1< ::com::sun::s virtual ~OReadImagesDocumentHandler(); // XDocumentHandler - virtual void SAL_CALL startDocument(void) + virtual void SAL_CALL startDocument() throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL endDocument(void) + virtual void SAL_CALL endDocument() throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx index 10de22c60af6..0c049063fcef 100644 --- a/framework/inc/xml/menudocumenthandler.hxx +++ b/framework/inc/xml/menudocumenthandler.hxx @@ -42,11 +42,11 @@ class FWE_DLLPUBLIC ReadMenuDocumentHandlerBase : virtual ~ReadMenuDocumentHandlerBase(); // XDocumentHandler - virtual void SAL_CALL startDocument(void) + virtual void SAL_CALL startDocument() throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0; - virtual void SAL_CALL endDocument(void) + virtual void SAL_CALL endDocument() throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0; @@ -103,11 +103,11 @@ class FWE_DLLPUBLIC OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBas virtual ~OReadMenuDocumentHandler(); // XDocumentHandler - virtual void SAL_CALL startDocument(void) + virtual void SAL_CALL startDocument() throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL endDocument(void) + virtual void SAL_CALL endDocument() throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -141,11 +141,11 @@ class FWE_DLLPUBLIC OReadMenuBarHandler : public ReadMenuDocumentHandlerBase virtual ~OReadMenuBarHandler(); // XDocumentHandler - virtual void SAL_CALL startDocument(void) + virtual void SAL_CALL startDocument() throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL endDocument(void) + virtual void SAL_CALL endDocument() throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -178,11 +178,11 @@ class FWE_DLLPUBLIC OReadMenuHandler : public ReadMenuDocumentHandlerBase virtual ~OReadMenuHandler(); // XDocumentHandler - virtual void SAL_CALL startDocument(void) + virtual void SAL_CALL startDocument() throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL endDocument(void) + virtual void SAL_CALL endDocument() throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -215,11 +215,11 @@ class FWE_DLLPUBLIC OReadMenuPopupHandler : public ReadMenuDocumentHandlerBase virtual ~OReadMenuPopupHandler(); // XDocumentHandler - virtual void SAL_CALL startDocument(void) + virtual void SAL_CALL startDocument() throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL endDocument(void) + virtual void SAL_CALL endDocument() throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/framework/inc/xml/saxnamespacefilter.hxx b/framework/inc/xml/saxnamespacefilter.hxx index 82b632e8d198..b6764f2fdd9c 100644 --- a/framework/inc/xml/saxnamespacefilter.hxx +++ b/framework/inc/xml/saxnamespacefilter.hxx @@ -40,11 +40,11 @@ class FWE_DLLPUBLIC SaxNamespaceFilter : virtual ~SaxNamespaceFilter(); // XDocumentHandler - virtual void SAL_CALL startDocument(void) + virtual void SAL_CALL startDocument() throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL endDocument(void) + virtual void SAL_CALL endDocument() throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx index 96c70fdb72b3..a917fe15c284 100644 --- a/framework/inc/xml/statusbardocumenthandler.hxx +++ b/framework/inc/xml/statusbardocumenthandler.hxx @@ -65,11 +65,11 @@ class FWE_DLLPUBLIC OReadStatusBarDocumentHandler : virtual ~OReadStatusBarDocumentHandler(); // XDocumentHandler - virtual void SAL_CALL startDocument(void) + virtual void SAL_CALL startDocument() throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL endDocument(void) + virtual void SAL_CALL endDocument() throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx index 8fb52012d832..82eefaebbacc 100644 --- a/framework/inc/xml/toolboxdocumenthandler.hxx +++ b/framework/inc/xml/toolboxdocumenthandler.hxx @@ -70,11 +70,11 @@ class FWE_DLLPUBLIC OReadToolBoxDocumentHandler : virtual ~OReadToolBoxDocumentHandler(); // XDocumentHandler - virtual void SAL_CALL startDocument(void) + virtual void SAL_CALL startDocument() throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL endDocument(void) + virtual void SAL_CALL endDocument() throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx index 8d6e3d3cbd7a..9f48ff4ad901 100644 --- a/framework/source/fwe/xml/menudocumenthandler.cxx +++ b/framework/source/fwe/xml/menudocumenthandler.cxx @@ -227,12 +227,12 @@ OReadMenuDocumentHandler::~OReadMenuDocumentHandler() { } -void SAL_CALL OReadMenuDocumentHandler::startDocument(void) +void SAL_CALL OReadMenuDocumentHandler::startDocument() throw ( SAXException, RuntimeException, std::exception ) { } -void SAL_CALL OReadMenuDocumentHandler::endDocument(void) +void SAL_CALL OReadMenuDocumentHandler::endDocument() throw( SAXException, RuntimeException, std::exception ) { if ( m_nElementDepth > 0 ) @@ -303,12 +303,12 @@ OReadMenuBarHandler::~OReadMenuBarHandler() { } -void SAL_CALL OReadMenuBarHandler::startDocument(void) +void SAL_CALL OReadMenuBarHandler::startDocument() throw ( SAXException, RuntimeException, std::exception ) { } -void SAL_CALL OReadMenuBarHandler::endDocument(void) +void SAL_CALL OReadMenuBarHandler::endDocument() throw( SAXException, RuntimeException, std::exception ) { } @@ -444,12 +444,12 @@ OReadMenuHandler::~OReadMenuHandler() { } -void SAL_CALL OReadMenuHandler::startDocument(void) +void SAL_CALL OReadMenuHandler::startDocument() throw ( SAXException, RuntimeException, std::exception ) { } -void SAL_CALL OReadMenuHandler::endDocument(void) +void SAL_CALL OReadMenuHandler::endDocument() throw( SAXException, RuntimeException, std::exception) { } @@ -522,12 +522,12 @@ OReadMenuPopupHandler::~OReadMenuPopupHandler() { } -void SAL_CALL OReadMenuPopupHandler::startDocument(void) +void SAL_CALL OReadMenuPopupHandler::startDocument() throw ( SAXException, RuntimeException, std::exception ) { } -void SAL_CALL OReadMenuPopupHandler::endDocument(void) +void SAL_CALL OReadMenuPopupHandler::endDocument() throw( SAXException, RuntimeException, std::exception) { } diff --git a/framework/source/fwe/xml/saxnamespacefilter.cxx b/framework/source/fwe/xml/saxnamespacefilter.cxx index aa0d10cc7914..759807707b2c 100644 --- a/framework/source/fwe/xml/saxnamespacefilter.cxx +++ b/framework/source/fwe/xml/saxnamespacefilter.cxx @@ -49,12 +49,12 @@ SaxNamespaceFilter::~SaxNamespaceFilter() } // XDocumentHandler -void SAL_CALL SaxNamespaceFilter::startDocument(void) +void SAL_CALL SaxNamespaceFilter::startDocument() throw ( SAXException, RuntimeException, std::exception ) { } -void SAL_CALL SaxNamespaceFilter::endDocument(void) +void SAL_CALL SaxNamespaceFilter::endDocument() throw( SAXException, RuntimeException, std::exception ) { } diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx index 00d1461c5369..55b6fe89629f 100644 --- a/framework/source/fwe/xml/statusbardocumenthandler.cxx +++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx @@ -179,12 +179,12 @@ OReadStatusBarDocumentHandler::~OReadStatusBarDocumentHandler() } // XDocumentHandler -void SAL_CALL OReadStatusBarDocumentHandler::startDocument(void) +void SAL_CALL OReadStatusBarDocumentHandler::startDocument() throw ( SAXException, RuntimeException, std::exception ) { } -void SAL_CALL OReadStatusBarDocumentHandler::endDocument(void) +void SAL_CALL OReadStatusBarDocumentHandler::endDocument() throw( SAXException, RuntimeException, std::exception ) { SolarMutexGuard g; diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx index e96f436b705e..a294ca9d788c 100644 --- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx +++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx @@ -191,12 +191,12 @@ OReadToolBoxDocumentHandler::~OReadToolBoxDocumentHandler() } // XDocumentHandler -void SAL_CALL OReadToolBoxDocumentHandler::startDocument(void) +void SAL_CALL OReadToolBoxDocumentHandler::startDocument() throw ( SAXException, RuntimeException, std::exception ) { } -void SAL_CALL OReadToolBoxDocumentHandler::endDocument(void) +void SAL_CALL OReadToolBoxDocumentHandler::endDocument() throw( SAXException, RuntimeException, std::exception ) { SolarMutexGuard g; diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx index 4254ead4e8f8..f1e88e434dcb 100644 --- a/framework/source/fwi/uielement/constitemcontainer.cxx +++ b/framework/source/fwi/uielement/constitemcontainer.cxx @@ -61,7 +61,7 @@ public: OPropertySetHelperInfo_Impl( IPropertyArrayHelper & rHelper_ ); // XPropertySetInfo-Methoden - virtual Sequence< Property > SAL_CALL getProperties(void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual Sequence< Property > SAL_CALL getProperties() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual Property SAL_CALL getPropertyByName(const OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& PropertyName) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -78,7 +78,7 @@ OPropertySetHelperInfo_Impl::OPropertySetHelperInfo_Impl( /** * Return the sequence of properties, which are provided through the constructor. */ -Sequence< Property > OPropertySetHelperInfo_Impl::getProperties(void) throw(::com::sun::star::uno::RuntimeException, std::exception) +Sequence< Property > OPropertySetHelperInfo_Impl::getProperties() throw(::com::sun::star::uno::RuntimeException, std::exception) { return aInfos; } diff --git a/framework/source/services/ContextChangeEventMultiplexer.cxx b/framework/source/services/ContextChangeEventMultiplexer.cxx index e1950dd45ef1..c47a0fe1d62f 100644 --- a/framework/source/services/ContextChangeEventMultiplexer.cxx +++ b/framework/source/services/ContextChangeEventMultiplexer.cxx @@ -53,9 +53,9 @@ class ContextChangeEventMultiplexer { public: ContextChangeEventMultiplexer(); - virtual ~ContextChangeEventMultiplexer (void); + virtual ~ContextChangeEventMultiplexer(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XContextChangeEventMultiplexer virtual void SAL_CALL addContextChangeEventListener ( @@ -75,12 +75,12 @@ public: throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName (void) + virtual ::rtl::OUString SAL_CALL getImplementationName() throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService ( const ::rtl::OUString& rsServiceName) throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; - virtual cssu::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames (void) + virtual cssu::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames() throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener @@ -120,11 +120,11 @@ ContextChangeEventMultiplexer::ContextChangeEventMultiplexer() { } -ContextChangeEventMultiplexer::~ContextChangeEventMultiplexer (void) +ContextChangeEventMultiplexer::~ContextChangeEventMultiplexer() { } -void SAL_CALL ContextChangeEventMultiplexer::disposing (void) +void SAL_CALL ContextChangeEventMultiplexer::disposing() { ListenerMap aListeners; aListeners.swap(maListeners); diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx index 0db4d4ebd17c..d78cd8f5abd8 100644 --- a/framework/source/xml/imagesdocumenthandler.cxx +++ b/framework/source/xml/imagesdocumenthandler.cxx @@ -140,12 +140,12 @@ OReadImagesDocumentHandler::~OReadImagesDocumentHandler() } // XDocumentHandler -void SAL_CALL OReadImagesDocumentHandler::startDocument(void) +void SAL_CALL OReadImagesDocumentHandler::startDocument() throw ( SAXException, RuntimeException, std::exception ) { } -void SAL_CALL OReadImagesDocumentHandler::endDocument(void) +void SAL_CALL OReadImagesDocumentHandler::endDocument() throw( SAXException, RuntimeException, std::exception ) { SolarMutexGuard g; diff --git a/helpcompiler/inc/HelpCompiler.hxx b/helpcompiler/inc/HelpCompiler.hxx index 6caf2da01d27..4c599534183f 100644 --- a/helpcompiler/inc/HelpCompiler.hxx +++ b/helpcompiler/inc/HelpCompiler.hxx @@ -57,7 +57,7 @@ namespace fs { - rtl_TextEncoding getThreadTextEncoding( void ); + rtl_TextEncoding getThreadTextEncoding(); enum convert { native }; class path diff --git a/helpcompiler/source/HelpCompiler.cxx b/helpcompiler/source/HelpCompiler.cxx index f85aae124b77..a45b3567b448 100644 --- a/helpcompiler/source/HelpCompiler.cxx +++ b/helpcompiler/source/HelpCompiler.cxx @@ -507,7 +507,7 @@ bool HelpCompiler::compile() namespace fs { - rtl_TextEncoding getThreadTextEncoding( void ) + rtl_TextEncoding getThreadTextEncoding() { static bool bNeedsInit = true; static rtl_TextEncoding nThreadTextEncoding; diff --git a/hwpfilter/source/attributes.cxx b/hwpfilter/source/attributes.cxx index ea1dc43b4c2d..a5749e8e0dd7 100644 --- a/hwpfilter/source/attributes.cxx +++ b/hwpfilter/source/attributes.cxx @@ -46,7 +46,7 @@ struct AttributeListImpl_impl std::vector<struct TagAttribute> vecAttribute; }; -sal_Int16 SAL_CALL AttributeListImpl::getLength(void) throw (RuntimeException, std::exception) +sal_Int16 SAL_CALL AttributeListImpl::getLength() throw (RuntimeException, std::exception) { return (sal_Int16)m_pImpl->vecAttribute.size(); } diff --git a/hwpfilter/source/attributes.hxx b/hwpfilter/source/attributes.hxx index 4972dbd614cf..de1bde89548f 100644 --- a/hwpfilter/source/attributes.hxx +++ b/hwpfilter/source/attributes.hxx @@ -45,7 +45,7 @@ public: AttributeListImpl( const AttributeListImpl & ); public: - virtual sal_Int16 SAL_CALL getLength(void) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL getLength() throw (RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw (RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw (RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getTypeByName(const OUString& aName) throw (RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/hwpfilter/source/grammar.cxx b/hwpfilter/source/grammar.cxx index 979d15e14550..77984b97c9fa 100644 --- a/hwpfilter/source/grammar.cxx +++ b/hwpfilter/source/grammar.cxx @@ -483,7 +483,7 @@ int yydebug; /* nonzero means print parse trace */ #ifdef YYPARSE_PARAM int yyparse (void *); #else -int yyparse (void); +int yyparse(); #endif #endif diff --git a/hwpfilter/source/hbox.cxx b/hwpfilter/source/hbox.cxx index 7fe3c64f9fb6..ddcd815d5e78 100644 --- a/hwpfilter/source/hbox.cxx +++ b/hwpfilter/source/hbox.cxx @@ -46,7 +46,7 @@ HBox::~HBox() } -int HBox::WSize(void) +int HBox::WSize() { static const int wsize[32] = { @@ -85,7 +85,7 @@ SkipData::SkipData(hchar hch) { } -SkipData::~SkipData(void) +SkipData::~SkipData() { delete[]data_block; } @@ -105,7 +105,7 @@ FieldCode::FieldCode() reserved2 = new char[22]; } -FieldCode::~FieldCode(void) +FieldCode::~FieldCode() { delete[] str1; delete[] str2; @@ -124,7 +124,7 @@ Bookmark::Bookmark() { } -Bookmark::~Bookmark(void) +Bookmark::~Bookmark() { } @@ -353,7 +353,7 @@ TxtBox::TxtBox() reserved[0] = reserved[1] = 0; } -TxtBox::~TxtBox(void) +TxtBox::~TxtBox() { delete[]cell; @@ -401,7 +401,7 @@ Picture::Picture() { } -Picture::~Picture(void) +Picture::~Picture() { delete[]follow; if( pictype == PICTYPE_DRAW && picinfo.picdraw.hdo ) @@ -430,7 +430,7 @@ hunit Picture::Height(CharShape * sty) // line(14) // hidden(15) -Hidden::~Hidden(void) +Hidden::~Hidden() { std::list < HWPPara* >::iterator it = plist.begin(); for (; it != plist.end(); ++it) @@ -442,7 +442,7 @@ Hidden::~Hidden(void) // header/footer(16) -HeaderFooter::~HeaderFooter(void) +HeaderFooter::~HeaderFooter() { std::list < HWPPara* >::iterator it = plist.begin(); for (; it != plist.end(); ++it) @@ -454,7 +454,7 @@ HeaderFooter::~HeaderFooter(void) // footnote(17) -Footnote::~Footnote(void) +Footnote::~Footnote() { std::list < HWPPara* >::iterator it = plist.begin(); for (; it != plist.end(); ++it) diff --git a/hwpfilter/source/hfont.cxx b/hwpfilter/source/hfont.cxx index 6be9ef0dcb31..6607261d3cdb 100644 --- a/hwpfilter/source/hfont.cxx +++ b/hwpfilter/source/hfont.cxx @@ -23,7 +23,7 @@ #include "hfont.h" /* 이 함수는 HWP 파일을 해석하는 부분이다. */ -HWPFont::HWPFont(void) +HWPFont::HWPFont() { for (int ii = 0; ii < NLanguage; ii++) { @@ -33,7 +33,7 @@ HWPFont::HWPFont(void) } -HWPFont::~HWPFont(void) +HWPFont::~HWPFont() { for (int ii = 0; ii < NLanguage; ii++) { diff --git a/hwpfilter/source/hinfo.cxx b/hwpfilter/source/hinfo.cxx index 0c2afb67a718..4a8f35f6acd6 100644 --- a/hwpfilter/source/hinfo.cxx +++ b/hwpfilter/source/hinfo.cxx @@ -64,7 +64,7 @@ HWPInfo::HWPInfo() memset(bordermargin, 0, sizeof(bordermargin)); } -HWPInfo::~HWPInfo(void) +HWPInfo::~HWPInfo() { delete[] info_block; info_block = 0; diff --git a/hwpfilter/source/hiodev.cxx b/hwpfilter/source/hiodev.cxx index b5c564cc38a9..dd072b8c495b 100644 --- a/hwpfilter/source/hiodev.cxx +++ b/hwpfilter/source/hiodev.cxx @@ -135,14 +135,14 @@ bool HStreamIODev::open() } -void HStreamIODev::flush(void) +void HStreamIODev::flush() { if (_gzfp) gz_flush(_gzfp, Z_FINISH); } -void HStreamIODev::close(void) +void HStreamIODev::close() { /* 플러시한 후 닫는다. */ this->flush(); @@ -152,7 +152,7 @@ void HStreamIODev::close(void) } -int HStreamIODev::state(void) const +int HStreamIODev::state() const { return 0; } @@ -290,17 +290,17 @@ bool HMemIODev::open() } -void HMemIODev::flush(void) +void HMemIODev::flush() { } -void HMemIODev::close(void) +void HMemIODev::close() { } -int HMemIODev::state(void) const +int HMemIODev::state() const { if (pos <= length) return 0; diff --git a/hwpfilter/source/hstyle.cxx b/hwpfilter/source/hstyle.cxx index 0d2c8674cefa..ccd75e704641 100644 --- a/hwpfilter/source/hstyle.cxx +++ b/hwpfilter/source/hstyle.cxx @@ -39,14 +39,14 @@ struct StyleData static char buffer[MAXSTYLENAME + 1]; -HWPStyle::HWPStyle(void) +HWPStyle::HWPStyle() { nstyles = 0; style = 0; } -HWPStyle::~HWPStyle(void) +HWPStyle::~HWPStyle() { delete[]DATA; nstyles = 0; diff --git a/hwpfilter/source/htags.cxx b/hwpfilter/source/htags.cxx index 2629479f702b..428048812eaf 100644 --- a/hwpfilter/source/htags.cxx +++ b/hwpfilter/source/htags.cxx @@ -56,7 +56,7 @@ EmPicture::EmPicture(size_t tsize) #ifdef WIN32 #define unlink _unlink #endif -EmPicture::~EmPicture(void) +EmPicture::~EmPicture() { if (data) delete[]data; diff --git a/hwpfilter/source/hwpfile.cxx b/hwpfilter/source/hwpfile.cxx index 862f85f6f364..6e1d488ddef8 100644 --- a/hwpfilter/source/hwpfile.cxx +++ b/hwpfilter/source/hwpfile.cxx @@ -218,25 +218,25 @@ HIODev *HWPFile::SetIODevice(HIODev * new_hiodev) // end of HIODev wrapper -bool HWPFile::InfoRead(void) +bool HWPFile::InfoRead() { return _hwpInfo.Read(*this); } -bool HWPFile::FontRead(void) +bool HWPFile::FontRead() { return _hwpFont.Read(*this); } -bool HWPFile::StyleRead(void) +bool HWPFile::StyleRead() { return _hwpStyle.Read(*this); } -bool HWPFile::ParaListRead(void) +bool HWPFile::ParaListRead() { return ReadParaList(plist); } @@ -277,7 +277,7 @@ bool HWPFile::ReadParaList(std::list < HWPPara* > &aplist, unsigned char flag) return true; } -void HWPFile::TagsRead(void) +void HWPFile::TagsRead() { while (true) { @@ -696,7 +696,7 @@ int HWPFile::compareParaShape(ParaShape *shape) } -HWPFile *GetCurrentDoc(void) +HWPFile *GetCurrentDoc() { return HWPFile::cur_doc; } diff --git a/hwpfilter/source/hwpreader.hxx b/hwpfilter/source/hwpreader.hxx index c3ef10af05b7..93bcc9e1b006 100644 --- a/hwpfilter/source/hwpreader.hxx +++ b/hwpfilter/source/hwpreader.hxx @@ -173,7 +173,7 @@ public: // XServiceInfo OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception) SAL_OVERRIDE; - Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XExtendedFilterDetection diff --git a/hwpfilter/source/lexer.cxx b/hwpfilter/source/lexer.cxx index 1424d3bd8b04..85632209c09c 100644 --- a/hwpfilter/source/lexer.cxx +++ b/hwpfilter/source/lexer.cxx @@ -1757,7 +1757,7 @@ YY_BUFFER_STATE new_buffer; #ifdef YY_USE_PROTOS -void yy_load_buffer_state( void ) +void yy_load_buffer_state() #else void yy_load_buffer_state() #endif diff --git a/i18nlangtag/source/languagetag/simple-langtag.cxx b/i18nlangtag/source/languagetag/simple-langtag.cxx index 8afa42d3f6a6..a7aa1aeb2e68 100644 --- a/i18nlangtag/source/languagetag/simple-langtag.cxx +++ b/i18nlangtag/source/languagetag/simple-langtag.cxx @@ -303,7 +303,7 @@ static void lt_db_initialize() { } static void lt_db_finalize() { } static void lt_db_set_datadir( const char* /* dir */ ) { } -static lt_tag_t* lt_tag_new(void) +static lt_tag_t* lt_tag_new() { return new lt_tag_t; } diff --git a/i18npool/inc/characterclassificationImpl.hxx b/i18npool/inc/characterclassificationImpl.hxx index c7c93dd2d6d7..59f84b769d11 100644 --- a/i18npool/inc/characterclassificationImpl.hxx +++ b/i18npool/inc/characterclassificationImpl.hxx @@ -72,11 +72,11 @@ public: 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; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; private: diff --git a/i18npool/inc/defaultnumberingprovider.hxx b/i18npool/inc/defaultnumberingprovider.hxx index 965296eb38f9..2ec0c0a2e049 100644 --- a/i18npool/inc/defaultnumberingprovider.hxx +++ b/i18npool/inc/defaultnumberingprovider.hxx @@ -78,11 +78,11 @@ public: 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; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; private: com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > m_xContext; diff --git a/i18npool/inc/numberformatcode.hxx b/i18npool/inc/numberformatcode.hxx index e6c6e547acea..466acb24240a 100644 --- a/i18npool/inc/numberformatcode.hxx +++ b/i18npool/inc/numberformatcode.hxx @@ -46,11 +46,11 @@ public: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode > SAL_CALL getAllFormatCodes( const ::com::sun::star::lang::Locale& rLocale ) 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; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; private: diff --git a/i18npool/inc/transliterationImpl.hxx b/i18npool/inc/transliterationImpl.hxx index a1d34a0ce6e6..d31fa9fbd90c 100644 --- a/i18npool/inc/transliterationImpl.hxx +++ b/i18npool/inc/transliterationImpl.hxx @@ -93,10 +93,10 @@ public: throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; private: diff --git a/i18npool/inc/unoscripttypedetector.hxx b/i18npool/inc/unoscripttypedetector.hxx index d10a17de87c8..eae7a0513ce4 100644 --- a/i18npool/inc/unoscripttypedetector.hxx +++ b/i18npool/inc/unoscripttypedetector.hxx @@ -44,11 +44,11 @@ public: //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx b/i18npool/source/breakiterator/breakiteratorImpl.cxx index 6df41fec581e..088e6b526d65 100644 --- a/i18npool/source/breakiterator/breakiteratorImpl.cxx +++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx @@ -600,7 +600,7 @@ BreakIteratorImpl::getLocaleSpecificBreakIterator(const Locale& rLocale) throw ( } OUString SAL_CALL -BreakIteratorImpl::getImplementationName(void) throw( RuntimeException, std::exception ) +BreakIteratorImpl::getImplementationName() throw( RuntimeException, std::exception ) { return OUString("com.sun.star.i18n.BreakIterator"); } @@ -612,7 +612,7 @@ BreakIteratorImpl::supportsService(const OUString& rServiceName) throw( RuntimeE } Sequence< OUString > SAL_CALL -BreakIteratorImpl::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) +BreakIteratorImpl::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); aRet[0] = "com.sun.star.i18n.BreakIterator"; diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx index 933e775f12ff..126114c2c195 100644 --- a/i18npool/source/breakiterator/breakiterator_unicode.cxx +++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx @@ -443,7 +443,7 @@ LineBreakResults SAL_CALL BreakIterator_Unicode::getLineBreak( } OUString SAL_CALL -BreakIterator_Unicode::getImplementationName(void) throw( uno::RuntimeException, std::exception ) +BreakIterator_Unicode::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString::createFromAscii(cBreakIterator); } @@ -455,7 +455,7 @@ BreakIterator_Unicode::supportsService(const OUString& rServiceName) throw( uno: } uno::Sequence< OUString > SAL_CALL -BreakIterator_Unicode::getSupportedServiceNames(void) throw( uno::RuntimeException, std::exception ) +BreakIterator_Unicode::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aRet(1); aRet[0] = OUString::createFromAscii(cBreakIterator); diff --git a/i18npool/source/calendar/calendarImpl.cxx b/i18npool/source/calendar/calendarImpl.cxx index 68cf9c2116b3..67a82dbb7795 100644 --- a/i18npool/source/calendar/calendarImpl.cxx +++ b/i18npool/source/calendar/calendarImpl.cxx @@ -356,7 +356,7 @@ CalendarImpl::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativ } OUString SAL_CALL -CalendarImpl::getImplementationName(void) throw( RuntimeException, std::exception ) +CalendarImpl::getImplementationName() throw( RuntimeException, std::exception ) { return OUString("com.sun.star.i18n.CalendarImpl"); } @@ -368,7 +368,7 @@ CalendarImpl::supportsService(const OUString& rServiceName) throw( RuntimeExcept } Sequence< OUString > SAL_CALL -CalendarImpl::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) +CalendarImpl::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(2); aRet[0] = "com.sun.star.i18n.LocaleCalendar"; diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx index d2f513c2afff..eb6331d27082 100644 --- a/i18npool/source/calendar/calendar_gregorian.cxx +++ b/i18npool/source/calendar/calendar_gregorian.cxx @@ -1204,7 +1204,7 @@ Calendar_buddhist::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 n } OUString SAL_CALL -Calendar_gregorian::getImplementationName(void) throw( RuntimeException, std::exception ) +Calendar_gregorian::getImplementationName() throw( RuntimeException, std::exception ) { return OUString::createFromAscii(cCalendar); } @@ -1216,7 +1216,7 @@ Calendar_gregorian::supportsService(const OUString& rServiceName) throw( Runtime } Sequence< OUString > SAL_CALL -Calendar_gregorian::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) +Calendar_gregorian::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); aRet[0] = OUString::createFromAscii(cCalendar); diff --git a/i18npool/source/characterclassification/characterclassificationImpl.cxx b/i18npool/source/characterclassification/characterclassificationImpl.cxx index 2cf2dd00d9d7..78648cd6ee98 100644 --- a/i18npool/source/characterclassification/characterclassificationImpl.cxx +++ b/i18npool/source/characterclassification/characterclassificationImpl.cxx @@ -192,7 +192,7 @@ CharacterClassificationImpl::getLocaleSpecificCharacterClassification(const Loca } OUString SAL_CALL -CharacterClassificationImpl::getImplementationName(void) +CharacterClassificationImpl::getImplementationName() throw( RuntimeException, std::exception ) { return OUString("com.sun.star.i18n.CharacterClassification"); @@ -206,7 +206,7 @@ CharacterClassificationImpl::supportsService(const OUString& rServiceName) } Sequence< OUString > SAL_CALL -CharacterClassificationImpl::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) +CharacterClassificationImpl::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); aRet[0] = "com.sun.star.i18n.CharacterClassification"; diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx index 10b3f3277d3f..a38cb75c05c1 100644 --- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx +++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx @@ -1045,7 +1045,7 @@ OUString DefaultNumberingProvider::getNumberingIdentifier( sal_Int16 nNumberingT return OUString(); } -OUString DefaultNumberingProvider::getImplementationName(void) +OUString DefaultNumberingProvider::getImplementationName() throw( RuntimeException, std::exception ) { return OUString("com.sun.star.text.DefaultNumberingProvider"); @@ -1057,7 +1057,7 @@ sal_Bool DefaultNumberingProvider::supportsService(const OUString& rServiceName) return cppu::supportsService(this, rServiceName); } -Sequence< OUString > DefaultNumberingProvider::getSupportedServiceNames(void) +Sequence< OUString > DefaultNumberingProvider::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); diff --git a/i18npool/source/inputchecker/inputsequencechecker.cxx b/i18npool/source/inputchecker/inputsequencechecker.cxx index 93da474aee14..e1cd90877f80 100644 --- a/i18npool/source/inputchecker/inputsequencechecker.cxx +++ b/i18npool/source/inputchecker/inputsequencechecker.cxx @@ -134,7 +134,7 @@ InputSequenceCheckerImpl::getInputSequenceChecker(sal_Char* rLanguage) throw (Ru } OUString SAL_CALL -InputSequenceCheckerImpl::getImplementationName(void) throw( RuntimeException, std::exception ) +InputSequenceCheckerImpl::getImplementationName() throw( RuntimeException, std::exception ) { return OUString::createFromAscii(serviceName); } @@ -146,7 +146,7 @@ InputSequenceCheckerImpl::supportsService(const OUString& rServiceName) throw( R } Sequence< OUString > SAL_CALL -InputSequenceCheckerImpl::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) +InputSequenceCheckerImpl::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); aRet[0] = OUString::createFromAscii(serviceName); diff --git a/i18npool/source/localedata/LocaleNode.hxx b/i18npool/source/localedata/LocaleNode.hxx index b4b7127f584b..cbecd44b0204 100644 --- a/i18npool/source/localedata/LocaleNode.hxx +++ b/i18npool/source/localedata/LocaleNode.hxx @@ -61,7 +61,7 @@ public: void writeParameter(const sal_Char* pAsciiStr, const OUString& aChars, sal_Int16 count0, sal_Int16 count1) const; void writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const OUString& aChars, const sal_Int16 count) const; void writeParameter(const sal_Char* pTagStr, const sal_Char* pAsciiStr, const OUString& aChars, sal_Int16 count0, sal_Int16 count1) const; - void closeOutput(void) const; + void closeOutput() const; /// Return the locale string, something like en_US or de_DE const char * getLocale() const { return theLocale; } private: diff --git a/i18npool/source/localedata/filewriter.cxx b/i18npool/source/localedata/filewriter.cxx index 7264b12e9d80..02b0c327fbca 100644 --- a/i18npool/source/localedata/filewriter.cxx +++ b/i18npool/source/localedata/filewriter.cxx @@ -171,7 +171,7 @@ void OFileWriter::writeParameter(const sal_Char* pTagStr, const sal_Char* pAscii fprintf(m_f, "0x0};\n"); } -void OFileWriter::closeOutput(void) const +void OFileWriter::closeOutput() const { if(m_f) { diff --git a/i18npool/source/localedata/saxparser.cxx b/i18npool/source/localedata/saxparser.cxx index a6a5e8023cbc..1674478a9c6a 100644 --- a/i18npool/source/localedata/saxparser.cxx +++ b/i18npool/source/localedata/saxparser.cxx @@ -200,7 +200,7 @@ public: // ExtendedDocumentHandler stack<LocaleNode *> currentNode ; LocaleNode * rootNode; - virtual void SAL_CALL startDocument(void) throw (SAXException, RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL startDocument() throw (SAXException, RuntimeException, std::exception) SAL_OVERRIDE { printf( "parsing document %s started\n", theLocale); of.writeAsciiString("#include <sal/types.h>\n\n\n"); @@ -208,7 +208,7 @@ public: // ExtendedDocumentHandler of.writeAsciiString("extern \"C\" {\n\n"); } - virtual void SAL_CALL endDocument(void) throw (SAXException, RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL endDocument() throw (SAXException, RuntimeException, std::exception) SAL_OVERRIDE { if (rootNode) { @@ -289,10 +289,10 @@ public: // ExtendedDocumentHandler return source; } - virtual void SAL_CALL startCDATA(void) throw (SAXException,RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL startCDATA() throw (SAXException,RuntimeException, std::exception) SAL_OVERRIDE { } - virtual void SAL_CALL endCDATA(void) throw (RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL endCDATA() throw (RuntimeException, std::exception) SAL_OVERRIDE { } virtual void SAL_CALL comment(const OUString& /*sComment*/) throw (SAXException,RuntimeException, std::exception) SAL_OVERRIDE @@ -302,7 +302,7 @@ public: // ExtendedDocumentHandler { } - virtual void SAL_CALL allowLineBreak( void) throw (SAXException, RuntimeException, std::exception ) SAL_OVERRIDE + virtual void SAL_CALL allowLineBreak() throw (SAXException, RuntimeException, std::exception ) SAL_OVERRIDE { } diff --git a/i18npool/source/numberformatcode/numberformatcode.cxx b/i18npool/source/numberformatcode/numberformatcode.cxx index 3b39bfc8ccb9..42f9a08d46af 100644 --- a/i18npool/source/numberformatcode/numberformatcode.cxx +++ b/i18npool/source/numberformatcode/numberformatcode.cxx @@ -261,7 +261,7 @@ NumberFormatCodeMapper::createLocaleDataObject() { } OUString SAL_CALL -NumberFormatCodeMapper::getImplementationName(void) +NumberFormatCodeMapper::getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.i18n.NumberFormatCodeMapper"); @@ -274,7 +274,7 @@ sal_Bool SAL_CALL NumberFormatCodeMapper::supportsService(const OUString& rServi } ::com::sun::star::uno::Sequence< OUString > SAL_CALL -NumberFormatCodeMapper::getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +NumberFormatCodeMapper::getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) { ::com::sun::star::uno::Sequence< OUString > aRet(1); aRet[0] = "com.sun.star.i18n.NumberFormatMapper"; diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx index 9649de30880f..3f874c24de76 100644 --- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx +++ b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx @@ -135,7 +135,7 @@ uno::Sequence< OUString > SAL_CALL OrdinalSuffixService::getOrdinalSuffix( sal_I const sal_Char cOrdinalSuffix[] = "com.sun.star.i18n.OrdinalSuffix"; -OUString SAL_CALL OrdinalSuffixService::getImplementationName(void) throw( RuntimeException, std::exception ) +OUString SAL_CALL OrdinalSuffixService::getImplementationName() throw( RuntimeException, std::exception ) { return OUString(cOrdinalSuffix); } @@ -145,7 +145,7 @@ sal_Bool SAL_CALL OrdinalSuffixService::supportsService( const OUString& rServic return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SAL_CALL OrdinalSuffixService::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) +Sequence< OUString > SAL_CALL OrdinalSuffixService::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); aRet[0] = cOrdinalSuffix; diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx index 0ff2639f6267..9c2173581e45 100644 --- a/i18npool/source/search/textsearch.cxx +++ b/i18npool/source/search/textsearch.cxx @@ -1089,7 +1089,7 @@ sal_Bool SAL_CALL TextSearch::supportsService(const OUString& rServiceName) } Sequence< OUString > SAL_CALL -TextSearch::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) +TextSearch::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); aRet[0] = getServiceName_Static(); diff --git a/i18npool/source/search/textsearch.hxx b/i18npool/source/search/textsearch.hxx index 760052a54e13..4b3a93d25791 100644 --- a/i18npool/source/search/textsearch.hxx +++ b/i18npool/source/search/textsearch.hxx @@ -135,11 +135,11 @@ public: 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; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; diff --git a/i18npool/source/transliteration/transliterationImpl.cxx b/i18npool/source/transliteration/transliterationImpl.cxx index f780b6e65070..4ff2f3e6dc1e 100644 --- a/i18npool/source/transliteration/transliterationImpl.cxx +++ b/i18npool/source/transliteration/transliterationImpl.cxx @@ -657,7 +657,7 @@ TransliterationImpl::supportsService(const OUString& rServiceName) throw( Runtim } Sequence< OUString > SAL_CALL -TransliterationImpl::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) +TransliterationImpl::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); aRet[0] = "com.sun.star.i18n.Transliteration"; diff --git a/i18nutil/source/utility/widthfolding.cxx b/i18nutil/source/utility/widthfolding.cxx index a47152333eda..e9b46c71c8de 100644 --- a/i18nutil/source/utility/widthfolding.cxx +++ b/i18nutil/source/utility/widthfolding.cxx @@ -93,7 +93,7 @@ OUString widthfolding::decompose_ja_voiced_sound_marks (const OUString& inStr, s return OUString(newStr, SAL_NO_ACQUIRE); // take ownership } -oneToOneMapping& widthfolding::getfull2halfTable(void) +oneToOneMapping& widthfolding::getfull2halfTable() { static oneToOneMappingWithFlag table(full2half, sizeof(full2half), FULL2HALF_NORMAL); table.makeIndex(); @@ -198,7 +198,7 @@ OUString widthfolding::compose_ja_voiced_sound_marks (const OUString& inStr, sal return OUString(newStr, SAL_NO_ACQUIRE); // take ownership } -oneToOneMapping& widthfolding::gethalf2fullTable(void) +oneToOneMapping& widthfolding::gethalf2fullTable() { static oneToOneMappingWithFlag table(half2full, sizeof(half2full), HALF2FULL_NORMAL); table.makeIndex(); diff --git a/include/basegfx/vector/b3dvector.hxx b/include/basegfx/vector/b3dvector.hxx index d7e5229b130b..cef199fc8913 100644 --- a/include/basegfx/vector/b3dvector.hxx +++ b/include/basegfx/vector/b3dvector.hxx @@ -121,7 +121,7 @@ namespace basegfx @return The Length of the 3D Vector */ - double getLength(void) const + double getLength() const { double fLen(scalar(*this)); if((0.0 == fLen) || (1.0 == fLen)) @@ -133,7 +133,7 @@ namespace basegfx @return The XY-Plane Length of the 3D Vector */ - double getXYLength(void) const + double getXYLength() const { double fLen((mfX * mfX) + (mfY * mfY)); if((0.0 == fLen) || (1.0 == fLen)) @@ -145,7 +145,7 @@ namespace basegfx @return The XZ-Plane Length of the 3D Vector */ - double getXZLength(void) const + double getXZLength() const { double fLen((mfX * mfX) + (mfZ * mfZ)); // #i73040# if((0.0 == fLen) || (1.0 == fLen)) @@ -157,7 +157,7 @@ namespace basegfx @return The YZ-Plane Length of the 3D Vector */ - double getYZLength(void) const + double getYZLength() const { double fLen((mfY * mfY) + (mfZ * mfZ)); if((0.0 == fLen) || (1.0 == fLen)) diff --git a/include/basegfx/vector/b3ivector.hxx b/include/basegfx/vector/b3ivector.hxx index 0e4700c21451..cbc1db790189 100644 --- a/include/basegfx/vector/b3ivector.hxx +++ b/include/basegfx/vector/b3ivector.hxx @@ -119,7 +119,7 @@ namespace basegfx @return The Length of the 3D Vector */ - double getLength(void) const + double getLength() const { double fLen(scalar(*this)); if((0 == fLen) || (1.0 == fLen)) @@ -131,7 +131,7 @@ namespace basegfx @return The XY-Plane Length of the 3D Vector */ - double getXYLength(void) const + double getXYLength() const { double fLen((mnX * mnX) + (mnY * mnY)); if((0 == fLen) || (1.0 == fLen)) @@ -143,7 +143,7 @@ namespace basegfx @return The XZ-Plane Length of the 3D Vector */ - double getXZLength(void) const + double getXZLength() const { double fLen((mnX * mnZ) + (mnY * mnZ)); if((0 == fLen) || (1.0 == fLen)) @@ -155,7 +155,7 @@ namespace basegfx @return The YZ-Plane Length of the 3D Vector */ - double getYZLength(void) const + double getYZLength() const { double fLen((mnY * mnY) + (mnZ * mnZ)); if((0 == fLen) || (1.0 == fLen)) diff --git a/include/basic/sbmeth.hxx b/include/basic/sbmeth.hxx index 002589c006ab..70e61c68754d 100644 --- a/include/basic/sbmeth.hxx +++ b/include/basic/sbmeth.hxx @@ -82,7 +82,7 @@ public: , mxImplMeth( pImplMeth ) {} virtual ~SbIfaceMapperMethod(); - SbMethod* getImplMethod( void ) + SbMethod* getImplMethod() { return mxImplMeth; } }; diff --git a/include/basic/sbmod.hxx b/include/basic/sbmod.hxx index 9f2a5d82af03..dedae3a3aaaf 100644 --- a/include/basic/sbmod.hxx +++ b/include/basic/sbmod.hxx @@ -83,7 +83,7 @@ protected: void ClearPrivateVars(); void ClearVarsDependingOnDeletedBasic( StarBASIC* pDeletedBasic ); void GlobalRunInit( bool bBasicStart ); // for all modules - void GlobalRunDeInit( void ); + void GlobalRunDeInit(); const sal_uInt8* FindNextStmnt( const sal_uInt8*, sal_uInt16&, sal_uInt16& ) const; const sal_uInt8* FindNextStmnt( const sal_uInt8*, sal_uInt16&, sal_uInt16&, bool bFollowJumps, const SbiImage* pImg=NULL ) const; @@ -158,11 +158,11 @@ public: virtual void SFX_NOTIFY( SfxBroadcaster&, const TypeId&, const SfxHint& rHint, const TypeId& ) SAL_OVERRIDE; - SbModule* getClassModule( void ) + SbModule* getClassModule() { return mpClassModule; } - void triggerInitializeEvent( void ); - void triggerTerminateEvent( void ); + void triggerInitializeEvent(); + void triggerTerminateEvent(); }; #endif diff --git a/include/basic/sbstar.hxx b/include/basic/sbstar.hxx index 327027bee041..c0b84019e1f7 100644 --- a/include/basic/sbstar.hxx +++ b/include/basic/sbstar.hxx @@ -129,8 +129,8 @@ public: SbModule* FindModule( const OUString& ); // Run init code of all modules (including the inserted Doc-Basics) void InitAllModules( StarBASIC* pBasicNotToInit = NULL ); - void DeInitAllModules( void ); - void ClearAllModuleVars( void ); + void DeInitAllModules(); + void ClearAllModuleVars(); // Calls for error and break handler static sal_uInt16 GetLine(); @@ -157,7 +157,7 @@ public: Link GetBreakHdl() const { return aBreakHdl; } void SetBreakHdl( const Link& r ) { aBreakHdl = r; } - SbxArrayRef getUnoListeners( void ); + SbxArrayRef getUnoListeners(); static SbxBase* FindSBXInCurrentScope( const OUString& rName ); static SbMethod* GetActiveMethod( sal_uInt16 nLevel = 0 ); @@ -165,7 +165,7 @@ public: void SetVBAEnabled( bool bEnabled ); bool isVBAEnabled(); - SbxObjectRef getRTL( void ) { return pRtl; } + SbxObjectRef getRTL() { return pRtl; } bool IsDocBasic() { return bDocBasic; } SbxVariable* VBAFind( const OUString& rName, SbxClassType t ); bool GetUNOConstant( const sal_Char* _pAsciiName, ::com::sun::star::uno::Any& aOut ); diff --git a/include/basic/sbxfac.hxx b/include/basic/sbxfac.hxx index 698e582e692e..95139d538c64 100644 --- a/include/basic/sbxfac.hxx +++ b/include/basic/sbxfac.hxx @@ -33,7 +33,7 @@ class BASIC_DLLPUBLIC SbxFactory public: virtual ~SbxFactory(); SbxFactory( bool bLast=false ) { bHandleLast = bLast; } - bool IsHandleLast( void ) { return bHandleLast; } + bool IsHandleLast() { return bHandleLast; } virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX ); virtual SbxObject* CreateObject( const OUString& ); }; diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx index 56c1dfd3c5da..5ac8d733244b 100644 --- a/include/basic/sbxvar.hxx +++ b/include/basic/sbxvar.hxx @@ -293,7 +293,7 @@ class BASIC_DLLPUBLIC SbxVariable : public SbxValue SbxArrayRef mpPar; // Parameter-Array, if set sal_uInt16 nHash; // Hash-ID for search - BASIC_DLLPRIVATE SbxVariableImpl* getImpl( void ); + BASIC_DLLPRIVATE SbxVariableImpl* getImpl(); protected: SbxInfoRef pInfo; // Probably called information @@ -340,11 +340,11 @@ public: SbxObject* GetParent() { return pParent;} virtual void SetParent( SbxObject* ); - const OUString& GetDeclareClassName( void ); + const OUString& GetDeclareClassName(); void SetDeclareClassName( const OUString& ); void SetComListener( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xComListener, StarBASIC* pParentBasic ); - void ClearComListener( void ); + void ClearComListener(); static sal_uInt16 MakeHashCode( const OUString& rName ); }; diff --git a/include/comphelper/attributelist.hxx b/include/comphelper/attributelist.hxx index 483a7d8a6535..e359b0b5dbb8 100644 --- a/include/comphelper/attributelist.hxx +++ b/include/comphelper/attributelist.hxx @@ -44,7 +44,7 @@ public: void AddAttribute( const OUString &sName , const OUString &sType , const OUString &sValue ); // ::com::sun::star::xml::sax::XAttributeList - virtual sal_Int16 SAL_CALL getLength(void) + virtual sal_Int16 SAL_CALL getLength() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/include/connectivity/sdbcx/VCatalog.hxx b/include/connectivity/sdbcx/VCatalog.hxx index ef2d3b8be7e0..264cc33e1568 100644 --- a/include/connectivity/sdbcx/VCatalog.hxx +++ b/include/connectivity/sdbcx/VCatalog.hxx @@ -103,7 +103,7 @@ namespace connectivity // the other refresh methods come from base classes IRefreshableGroups and IRefreshableUsers // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface void SAL_CALL acquire() throw() SAL_OVERRIDE; void SAL_CALL release() throw() SAL_OVERRIDE; diff --git a/include/connectivity/sdbcx/VCollection.hxx b/include/connectivity/sdbcx/VCollection.hxx index 3cde90b277a4..e7838979bf32 100644 --- a/include/connectivity/sdbcx/VCollection.hxx +++ b/include/connectivity/sdbcx/VCollection.hxx @@ -185,7 +185,7 @@ namespace connectivity void renameObject(const OUString& _sOldName, const OUString& _sNewName); // only the name is identical to ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void); + virtual void SAL_CALL disposing(); // dispatch the refcounting to the parent virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; virtual void SAL_CALL release() throw() SAL_OVERRIDE; diff --git a/include/connectivity/sdbcx/VColumn.hxx b/include/connectivity/sdbcx/VColumn.hxx index 20c2bd6ce684..317436242e7b 100644 --- a/include/connectivity/sdbcx/VColumn.hxx +++ b/include/connectivity/sdbcx/VColumn.hxx @@ -101,7 +101,7 @@ namespace connectivity // ODescriptor virtual void construct() SAL_OVERRIDE; // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNamed diff --git a/include/connectivity/sdbcx/VGroup.hxx b/include/connectivity/sdbcx/VGroup.hxx index fabb75ade8f4..b4223b01d42f 100644 --- a/include/connectivity/sdbcx/VGroup.hxx +++ b/include/connectivity/sdbcx/VGroup.hxx @@ -79,7 +79,7 @@ namespace connectivity virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XUsersSupplier diff --git a/include/connectivity/sdbcx/VIndex.hxx b/include/connectivity/sdbcx/VIndex.hxx index f5e85edc5304..d07a498b025b 100644 --- a/include/connectivity/sdbcx/VIndex.hxx +++ b/include/connectivity/sdbcx/VIndex.hxx @@ -86,7 +86,7 @@ namespace connectivity // ODescriptor virtual void construct() SAL_OVERRIDE; // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XColumnsSupplier diff --git a/include/connectivity/sdbcx/VTable.hxx b/include/connectivity/sdbcx/VTable.hxx index 2e0f86af887e..4f1882cfb539 100644 --- a/include/connectivity/sdbcx/VTable.hxx +++ b/include/connectivity/sdbcx/VTable.hxx @@ -110,7 +110,7 @@ namespace connectivity virtual void refreshKeys(); virtual void refreshIndexes(); // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XColumnsSupplier @@ -121,7 +121,7 @@ namespace connectivity virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDataDescriptorFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( void ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XIndexesSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getIndexes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XRename diff --git a/include/connectivity/sdbcx/VUser.hxx b/include/connectivity/sdbcx/VUser.hxx index 125ff4a84509..3b8287323a55 100644 --- a/include/connectivity/sdbcx/VUser.hxx +++ b/include/connectivity/sdbcx/VUser.hxx @@ -69,7 +69,7 @@ namespace connectivity DECLARE_SERVICE_INFO(); // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; //XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; diff --git a/include/connectivity/sqlbison_exports.hxx b/include/connectivity/sqlbison_exports.hxx index 0ec8c936963c..662c5045a1ee 100644 --- a/include/connectivity/sqlbison_exports.hxx +++ b/include/connectivity/sqlbison_exports.hxx @@ -15,7 +15,7 @@ #include <connectivity/sqlnode.hxx> OUString ConvertLikeToken(const ::connectivity::OSQLParseNode* pTokenNode, const ::connectivity::OSQLParseNode* pEscapeNode, bool bInternational); -int SQLyyparse (void); +int SQLyyparse(); void setParser( ::connectivity::OSQLParser* ); #endif // INCLUDED_CONNECTIVITY_SQLBISON_EXPORTS_HXX diff --git a/include/connectivity/sqlscan.hxx b/include/connectivity/sqlscan.hxx index d89949acae17..3e79e2141874 100644 --- a/include/connectivity/sqlscan.hxx +++ b/include/connectivity/sqlscan.hxx @@ -53,10 +53,10 @@ namespace connectivity inline static void SAL_CALL operator delete( void *,void* ) { } - sal_Int32 SQLyygetc(void); + sal_Int32 SQLyygetc(); void SQLyyerror(char const *fmt); void output(sal_Int32) { OSL_FAIL("Internal error in sdblex.l: output not possible"); } - void ECHO(void) { OSL_FAIL("Internal error in sdblex.l: ECHO not possible"); } + void ECHO() { OSL_FAIL("Internal error in sdblex.l: ECHO not possible"); } IParseContext::InternationalKeyCode getInternationalTokenID(const char* sToken) const; // setting the new information before scanning diff --git a/include/cppu/Enterable.hxx b/include/cppu/Enterable.hxx index 2c20986da680..4670ab52d49e 100644 --- a/include/cppu/Enterable.hxx +++ b/include/cppu/Enterable.hxx @@ -36,8 +36,8 @@ class Enterable : public uno_Enterable public: /* These methods need to be implemented in a derived class. */ - virtual void v_enter (void) = 0; - virtual void v_leave (void) = 0; + virtual void v_enter() = 0; + virtual void v_leave() = 0; virtual void v_callInto_v(uno_EnvCallee * pCallee, va_list * pParam) = 0; virtual void v_callOut_v (uno_EnvCallee * pCallee, va_list * pParam) = 0; virtual bool v_isValid (rtl::OUString * pReason) = 0; @@ -45,10 +45,10 @@ public: virtual ~Enterable() {} public: - inline explicit Enterable(void); + inline explicit Enterable(); - inline void enter(void) {m_enter(this);} - inline void leave(void) {m_leave(this);} + inline void enter() {m_enter(this);} + inline void leave() {m_leave(this);} inline void callInto_v(uno_EnvCallee * pCallee, va_list * pParam) {m_callInto_v(this, pCallee, pParam);} inline void callOut_v (uno_EnvCallee * pCallee, va_list * pParam) {m_callOut_v (this, pCallee, pParam);} @@ -73,7 +73,7 @@ extern "C" inline int Enterable_call_isValid (void * context, rtl_uString ** {return static_cast<Enterable *>(context)->v_isValid(reinterpret_cast<rtl::OUString *>(pReason));} -Enterable::Enterable(void) +Enterable::Enterable() { m_enter = Enterable_call_enter; m_leave = Enterable_call_leave; diff --git a/include/cppuhelper/propshlp.hxx b/include/cppuhelper/propshlp.hxx index 933e002c0a33..d7a641561c14 100644 --- a/include/cppuhelper/propshlp.hxx +++ b/include/cppuhelper/propshlp.hxx @@ -77,7 +77,7 @@ public: /** Return the sequence of properties. The sequence is sorted by name. */ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties(void) = 0; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties() = 0; /** Return the property with the name rPropertyName. @param rPropertyName the name of the property. @@ -157,7 +157,7 @@ public: /** Return the sequence of properties. The sequence is sorted by name. */ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties(void) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties() SAL_OVERRIDE; /** Return the property with the name rPropertyName. @param rPropertyName the name of the property. diff --git a/include/dbaccess/IController.hxx b/include/dbaccess/IController.hxx index 6bc22d9d75e5..87679fcd54eb 100644 --- a/include/dbaccess/IController.hxx +++ b/include/dbaccess/IController.hxx @@ -115,7 +115,7 @@ namespace dbaui the controller does not have an own model. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > - getXController(void) throw( ::com::sun::star::uno::RuntimeException ) = 0; + getXController() throw( ::com::sun::star::uno::RuntimeException ) = 0; /** allows interception of user input, aka mouse clicks and key events */ diff --git a/include/dbaccess/genericcontroller.hxx b/include/dbaccess/genericcontroller.hxx index 2b6ae5c37452..4dffac9b87f7 100644 --- a/include/dbaccess/genericcontroller.hxx +++ b/include/dbaccess/genericcontroller.hxx @@ -468,10 +468,10 @@ namespace dbaui virtual void SAL_CALL attachFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > & xFrame) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL attachModel(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xModel) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0; - virtual ::com::sun::star::uno::Any SAL_CALL getViewData(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getViewData() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL restoreViewData(const ::com::sun::star::uno::Any& Data) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > SAL_CALL getModel(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > SAL_CALL getModel() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::frame::XDispatch virtual void SAL_CALL dispatch(const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -479,9 +479,9 @@ namespace dbaui virtual void SAL_CALL removeStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & aListener, const ::com::sun::star::util::URL& aURL) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::frame::XDispatchProviderInterceptor - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getSlaveDispatchProvider(void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getSlaveDispatchProvider() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setSlaveDispatchProvider(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > & _xNewProvider) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getMasterDispatchProvider(void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getMasterDispatchProvider() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setMasterDispatchProvider(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > & _xNewProvider) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::frame::XDispatchProvider diff --git a/include/editeng/AccessibleComponentBase.hxx b/include/editeng/AccessibleComponentBase.hxx index 9e866fc5bb5a..9ea6d004069d 100644 --- a/include/editeng/AccessibleComponentBase.hxx +++ b/include/editeng/AccessibleComponentBase.hxx @@ -43,8 +43,8 @@ class EDITENG_DLLPUBLIC AccessibleComponentBase { public: //===== internal ======================================================== - AccessibleComponentBase (void); - virtual ~AccessibleComponentBase (void); + AccessibleComponentBase(); + virtual ~AccessibleComponentBase(); //===== XAccessibleComponent ================================================ @@ -67,25 +67,25 @@ public: /** The default implementation returns an empty rectangle. */ - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds (void) + virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** 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() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** The default implementation returns an empty position, i.e. the * result of the default constructor of com::sun::star::awt::Point. */ - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen (void) + virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** 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() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** The default implementation ignores this call. @@ -103,33 +103,33 @@ public: /** The default implementation does nothing. */ - virtual void SAL_CALL grabFocus (void) + virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns black as the default foreground color. */ - virtual sal_Int32 SAL_CALL getForeground (void) + virtual sal_Int32 SAL_CALL getForeground() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns white as the default background color. */ - virtual sal_Int32 SAL_CALL getBackground (void) + virtual sal_Int32 SAL_CALL getBackground() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleExtendedComponent ==================================== virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL - getFont (void) + getFont() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getTitledBorderText (void) + virtual OUString SAL_CALL getTitledBorderText() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getToolTipText (void) + virtual OUString SAL_CALL getToolTipText() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XTypeProvider =================================================== virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL - getTypes (void) + getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/include/editeng/AccessibleContextBase.hxx b/include/editeng/AccessibleContextBase.hxx index f50aa485413c..99ebeb8b7f01 100644 --- a/include/editeng/AccessibleContextBase.hxx +++ b/include/editeng/AccessibleContextBase.hxx @@ -76,7 +76,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, const sal_Int16 aRole); - virtual ~AccessibleContextBase (void); + virtual ~AccessibleContextBase(); /** Call all accessiblity event listeners to inform them about the @@ -175,14 +175,14 @@ public: /// Return the XAccessibleContext. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL - getAccessibleContext (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getAccessibleContext() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleContext ============================================== /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL - getAccessibleChildCount (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the specified child or throw exception. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL @@ -191,46 +191,46 @@ public: /// Return a reference to the parent. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL - getAccessibleParent (void) + getAccessibleParent() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return this objects index among the parents children. virtual sal_Int32 SAL_CALL - getAccessibleIndexInParent (void) + getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return this object's role. virtual sal_Int16 SAL_CALL - getAccessibleRole (void) + getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return this object's description. virtual OUString SAL_CALL - getAccessibleDescription (void) + getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the object's current name. virtual OUString SAL_CALL - getAccessibleName (void) + getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return NULL to indicate that an empty relation set. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL - getAccessibleRelationSet (void) + getAccessibleRelationSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL - getAccessibleStateSet (void) + getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Return the parents locale or throw exception if this object has no parent yet/anymore. */ virtual ::com::sun::star::lang::Locale SAL_CALL - getLocale (void) + getLocale() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception) SAL_OVERRIDE; @@ -254,7 +254,7 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName (void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Return whether the specified service is supported by this class. @@ -267,7 +267,7 @@ public: the AccessibleContext service. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames (void) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -276,13 +276,13 @@ public: /** Returns a sequence of all supported interfaces. */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL - getTypes (void) + getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId (void) + getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: @@ -298,7 +298,7 @@ protected: ::com::sun::star::accessibility::XAccessibleRelationSet> mxRelationSet; // This method is called from the component helper base class while disposing. - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; /** Create the accessible object's name. This method may be called more than once for a single object. @@ -306,7 +306,7 @@ protected: The returned string is a unique (among the accessible object's siblings) name. */ - virtual OUString CreateAccessibleName (void) + virtual OUString CreateAccessibleName() throw (::com::sun::star::uno::RuntimeException); /** Create the accessible object's descriptive string. May be called @@ -315,7 +315,7 @@ protected: Descriptive string. Not necessarily unique. */ virtual OUString - CreateAccessibleDescription (void) + CreateAccessibleDescription() throw (::com::sun::star::uno::RuntimeException); void FireEvent (const ::com::sun::star::accessibility::AccessibleEventObject& aEvent); @@ -325,7 +325,7 @@ protected: DisposedException is thrown to inform the (indirect) caller of the foul deed. */ - void ThrowIfDisposed (void) + void ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException); /** Check whether or not the object has been disposed (or is in the @@ -334,7 +334,7 @@ protected: @return TRUE, if the object is disposed or in the course of being disposed. Otherwise, FALSE is returned. */ - bool IsDisposed (void); + bool IsDisposed(); /** sets the role as returned by XaccessibleContext::getAccessibleRole diff --git a/include/editeng/AccessibleEditableTextPara.hxx b/include/editeng/AccessibleEditableTextPara.hxx index 79c32f8078da..6412986d6365 100644 --- a/include/editeng/AccessibleEditableTextPara.hxx +++ b/include/editeng/AccessibleEditableTextPara.hxx @@ -162,12 +162,12 @@ namespace accessibility virtual ::sal_Int32 SAL_CALL getNumberOfLineWithCaret( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceName - static OUString SAL_CALL getServiceName (void) throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getServiceName() throw (::com::sun::star::uno::RuntimeException); /** Set the current index in the accessibility parent diff --git a/include/editeng/AccessibleImageBullet.hxx b/include/editeng/AccessibleImageBullet.hxx index 9e55e69bd9a7..79f2dbf56dd4 100644 --- a/include/editeng/AccessibleImageBullet.hxx +++ b/include/editeng/AccessibleImageBullet.hxx @@ -89,9 +89,9 @@ namespace accessibility virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Set the current index in the accessibility parent diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx index 736d1268e748..f3d239604568 100644 --- a/include/editeng/unotext.hxx +++ b/include/editeng/unotext.hxx @@ -284,9 +284,9 @@ public: const ESelection& GetSelection() const throw() { CheckSelection( const_cast<SvxUnoTextRangeBase*>(this)->maSelection, mpEditSource->GetTextForwarder() ); return maSelection; }; void SetSelection( const ESelection& rSelection ) throw(); - void CollapseToStart(void) throw(); - void CollapseToEnd(void) throw(); - bool IsCollapsed(void) throw(); + void CollapseToStart() throw(); + void CollapseToEnd() throw(); + bool IsCollapsed() throw(); bool GoLeft(sal_Int16 nCount, bool Expand) throw(); bool GoRight(sal_Int16 nCount, bool Expand) throw(); void GotoStart(bool Expand) throw(); diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx index a9a9f3505eb5..94db141ac20d 100644 --- a/include/filter/msfilter/msdffimp.hxx +++ b/include/filter/msfilter/msdffimp.hxx @@ -683,10 +683,10 @@ public: const Rectangle& rClientRect, const Rectangle& rGlobalChildRect ); - inline const SvxMSDffShapeInfos_ById* GetShapeInfos( void ) const + inline const SvxMSDffShapeInfos_ById* GetShapeInfos() const { return m_xShapeInfosById.get(); } - inline SvxMSDffShapeOrders* GetShapeOrders( void ) const + inline SvxMSDffShapeOrders* GetShapeOrders() const { return pShapeOrders; } void StoreShapeOrder(sal_uLong nId, diff --git a/include/helpcompiler/compilehelp.hxx b/include/helpcompiler/compilehelp.hxx index 6d7e191d7865..c9643ac0c28a 100644 --- a/include/helpcompiler/compilehelp.hxx +++ b/include/helpcompiler/compilehelp.hxx @@ -46,7 +46,7 @@ struct HelpProcessingErrorInfo OUString m_aXMLParsingFile; sal_Int32 m_nXMLParsingLine; - HelpProcessingErrorInfo( void ) + HelpProcessingErrorInfo() : m_eErrorClass( HELPPROCESSING_NO_ERROR ) , m_nXMLParsingLine( -1 ) {} diff --git a/include/registry/reflread.hxx b/include/registry/reflread.hxx index cf541396b752..1f4938e840e9 100644 --- a/include/registry/reflread.hxx +++ b/include/registry/reflread.hxx @@ -83,7 +83,7 @@ struct RegistryTypeReader_Api /** the API initialization function. */ -REG_DLLPUBLIC RegistryTypeReader_Api* TYPEREG_CALLTYPE initRegistryTypeReader_Api(void); +REG_DLLPUBLIC RegistryTypeReader_Api* TYPEREG_CALLTYPE initRegistryTypeReader_Api(); #ifdef __cplusplus } diff --git a/include/registry/reflwrit.hxx b/include/registry/reflwrit.hxx index 57551dfbf703..795628a336e9 100644 --- a/include/registry/reflwrit.hxx +++ b/include/registry/reflwrit.hxx @@ -62,7 +62,7 @@ struct RegistryTypeWriter_Api /** the API initialization function. */ -REG_DLLPUBLIC RegistryTypeWriter_Api* TYPEREG_CALLTYPE initRegistryTypeWriter_Api(void); +REG_DLLPUBLIC RegistryTypeWriter_Api* TYPEREG_CALLTYPE initRegistryTypeWriter_Api(); #ifdef __cplusplus } diff --git a/include/registry/registry.hxx b/include/registry/registry.hxx index 948509bce87f..128adca9d0d3 100644 --- a/include/registry/registry.hxx +++ b/include/registry/registry.hxx @@ -74,7 +74,7 @@ struct Registry_Api /** the API initialization function. */ -REG_DLLPUBLIC Registry_Api* REGISTRY_CALLTYPE initRegistry_Api(void); +REG_DLLPUBLIC Registry_Api* REGISTRY_CALLTYPE initRegistry_Api(); #ifdef __cplusplus } diff --git a/include/sax/tools/documenthandleradapter.hxx b/include/sax/tools/documenthandleradapter.hxx index aedb236349bf..74c3df92640a 100644 --- a/include/sax/tools/documenthandleradapter.hxx +++ b/include/sax/tools/documenthandleradapter.hxx @@ -29,13 +29,13 @@ namespace sax public: // XDocumentHandler virtual void SAL_CALL - startDocument(void) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + startDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { m_handler->startDocument(); } virtual void SAL_CALL - endDocument(void) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { m_handler->endDocument(); } @@ -121,13 +121,13 @@ namespace sax public: // XDocumentHandler virtual void SAL_CALL - startDocument(void) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + startDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { m_handler->startDocument(); } virtual void SAL_CALL - endDocument(void) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { m_handler->endDocument(); } @@ -174,12 +174,12 @@ namespace sax } // XExtendedDocumentHandler virtual void SAL_CALL - startCDATA(void) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + startCDATA() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { m_handler->startCDATA(); } virtual void SAL_CALL - endCDATA(void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + endCDATA() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { m_handler->endCDATA(); } @@ -195,7 +195,7 @@ namespace sax m_handler->unknown(sString); } virtual void SAL_CALL - allowLineBreak(void) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + allowLineBreak() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { m_handler->allowLineBreak(); } diff --git a/include/sfx2/sidebar/CommandInfoProvider.hxx b/include/sfx2/sidebar/CommandInfoProvider.hxx index 6eb1ba6c3638..55ce82b8a394 100644 --- a/include/sfx2/sidebar/CommandInfoProvider.hxx +++ b/include/sfx2/sidebar/CommandInfoProvider.hxx @@ -43,7 +43,7 @@ public: Lifetime control should work but could be more elegant. */ - static CommandInfoProvider& Instance (void); + static CommandInfoProvider& Instance(); /** Return a label for the given command. @param rsCommandName @@ -71,13 +71,13 @@ public: ::rtl::OUString msCachedModuleIdentifier; css::uno::Reference<css::lang::XComponent> mxFrameListener; - CommandInfoProvider (void); - ~CommandInfoProvider (void); + CommandInfoProvider(); + ~CommandInfoProvider(); - css::uno::Reference<css::ui::XAcceleratorConfiguration> GetDocumentAcceleratorConfiguration (void); - css::uno::Reference<css::ui::XAcceleratorConfiguration> GetModuleAcceleratorConfiguration (void); - css::uno::Reference<css::ui::XAcceleratorConfiguration> GetGlobalAcceleratorConfiguration(void); - ::rtl::OUString GetModuleIdentifier (void); + css::uno::Reference<css::ui::XAcceleratorConfiguration> GetDocumentAcceleratorConfiguration(); + css::uno::Reference<css::ui::XAcceleratorConfiguration> GetModuleAcceleratorConfiguration(); + css::uno::Reference<css::ui::XAcceleratorConfiguration> GetGlobalAcceleratorConfiguration(); + ::rtl::OUString GetModuleIdentifier(); ::rtl::OUString GetCommandShortcut (const ::rtl::OUString& rCommandName); css::uno::Sequence<css::beans::PropertyValue> GetCommandProperties ( const ::rtl::OUString& rsCommandName); diff --git a/include/sfx2/sidebar/ControllerItem.hxx b/include/sfx2/sidebar/ControllerItem.hxx index f06ae5e9e0a4..7210dea31c3d 100644 --- a/include/sfx2/sidebar/ControllerItem.hxx +++ b/include/sfx2/sidebar/ControllerItem.hxx @@ -91,21 +91,21 @@ public: /** Force the controller item to call its NotifyItemUpdate callback with up-to-date data. */ - void RequestUpdate (void); + void RequestUpdate(); /** Return the label for the command. It contains the keyboard accelerator when one exists. */ - ::rtl::OUString GetLabel (void) const; + ::rtl::OUString GetLabel() const; /** Return the extended help text for the command. Returns an empty string when the UNO command name is not available. */ - ::rtl::OUString GetHelpText (void) const; + ::rtl::OUString GetHelpText() const; /** Return the icon for the command. */ - Image GetIcon (void) const; + Image GetIcon() const; /** Convenience method for setting all relevant properties for the slot/command represented by the called object at the given tool @@ -116,11 +116,11 @@ public: /** Do not call. Used by local class only. Should be a member of a local and hidden interface. */ - void NotifyFrameContextChange (void); + void NotifyFrameContextChange(); /** Do not call. Used by local class only. Should be a member of a local and hidden interface. */ - void ResetFrame (void); + void ResetFrame(); protected: diff --git a/include/sfx2/sidebar/EnumContext.hxx b/include/sfx2/sidebar/EnumContext.hxx index 80e8228484ed..3fc5fda50f22 100644 --- a/include/sfx2/sidebar/EnumContext.hxx +++ b/include/sfx2/sidebar/EnumContext.hxx @@ -102,7 +102,7 @@ public: __LastContextEnum = Context_Unknown }; - EnumContext (void); + EnumContext(); EnumContext ( const Application eApplication, const Context eContext); @@ -142,8 +142,8 @@ private: Application meApplication; Context meContext; - static void ProvideApplicationContainers (void); - static void ProvideContextContainers (void); + static void ProvideApplicationContainers(); + static void ProvideContextContainers(); static void AddEntry (const ::rtl::OUString& rsName, const Application eApplication); static void AddEntry (const ::rtl::OUString& rsName, const Context eContext); }; diff --git a/include/sfx2/sidebar/SidebarPanelBase.hxx b/include/sfx2/sidebar/SidebarPanelBase.hxx index 6215f6d03e64..2f34065a8480 100644 --- a/include/sfx2/sidebar/SidebarPanelBase.hxx +++ b/include/sfx2/sidebar/SidebarPanelBase.hxx @@ -75,20 +75,20 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XUIElement - virtual css::uno::Reference<css::frame::XFrame> SAL_CALL getFrame (void) + virtual css::uno::Reference<css::frame::XFrame> SAL_CALL getFrame() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::rtl::OUString SAL_CALL getResourceURL (void) + virtual ::rtl::OUString SAL_CALL getResourceURL() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int16 SAL_CALL getType (void) + virtual sal_Int16 SAL_CALL getType() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getRealInterface (void) + virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getRealInterface() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XToolPanel virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL createAccessible ( const css::uno::Reference<css::accessibility::XAccessible>& rxParentAccessible) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference<css::awt::XWindow> SAL_CALL getWindow (void) + virtual css::uno::Reference<css::awt::XWindow> SAL_CALL getWindow() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XSidebarPanel @@ -105,9 +105,9 @@ protected: const css::uno::Reference<css::frame::XFrame>& rxFrame, vcl::Window* pWindow, const css::ui::LayoutSize& rLayoutSize); - virtual ~SidebarPanelBase (void); + virtual ~SidebarPanelBase(); - virtual void SAL_CALL disposing (void) + virtual void SAL_CALL disposing() throw (css::uno::RuntimeException) SAL_OVERRIDE; private: diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx index 381745da7648..a19e182f648a 100644 --- a/include/sfx2/sidebar/SidebarToolBox.hxx +++ b/include/sfx2/sidebar/SidebarToolBox.hxx @@ -40,7 +40,7 @@ class SFX2_DLLPUBLIC SidebarToolBox { public: SidebarToolBox(vcl::Window* pParentWindow); - virtual ~SidebarToolBox (void); + virtual ~SidebarToolBox(); using ToolBox::InsertItem; virtual void InsertItem(const OUString& rCommand, @@ -87,7 +87,7 @@ private: const sal_uInt16 nItemId, const css::uno::Reference<css::frame::XFrame>& rxFrame, const sal_Int32 nItemWidth = 0); - void RegisterHandlers (void); + void RegisterHandlers(); }; diff --git a/include/sfx2/sidebar/Theme.hxx b/include/sfx2/sidebar/Theme.hxx index ba3d49107118..faaa62360793 100644 --- a/include/sfx2/sidebar/Theme.hxx +++ b/include/sfx2/sidebar/Theme.hxx @@ -146,21 +146,21 @@ public: static sal_Int32 GetInteger (const ThemeItem eItem); static bool GetBoolean (const ThemeItem eItem); - static bool IsHighContrastMode (void); + static bool IsHighContrastMode(); - static void HandleDataChange (void); + static void HandleDataChange(); void InitializeTheme(); - Theme (void); - virtual ~Theme (void); + Theme(); + virtual ~Theme(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; - static css::uno::Reference<css::beans::XPropertySet> GetPropertySet (void); + static css::uno::Reference<css::beans::XPropertySet> GetPropertySet(); // beans::XPropertySet - virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo (void) + virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue ( const ::rtl::OUString& rsPropertyName, @@ -199,7 +199,7 @@ public: css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // beans::XPropertySetInfo - virtual css::uno::Sequence<css::beans::Property> SAL_CALL getProperties (void) + virtual css::uno::Sequence<css::beans::Property> SAL_CALL getProperties() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::beans::Property SAL_CALL getPropertyByName (const ::rtl::OUString& rsName) throw(css::beans::UnknownPropertyException, @@ -244,8 +244,8 @@ private: PT_Invalid }; - void SetupPropertyMaps (void); - void UpdateTheme (void); + void SetupPropertyMaps(); + void UpdateTheme(); static PropertyType GetPropertyType (const ThemeItem eItem); static css::uno::Type GetCppuType (const PropertyType eType); static sal_Int32 GetIndex ( diff --git a/include/sfx2/templdlg.hxx b/include/sfx2/templdlg.hxx index a3237d345bd9..280610ff3e14 100644 --- a/include/sfx2/templdlg.hxx +++ b/include/sfx2/templdlg.hxx @@ -47,7 +47,7 @@ public: virtual void DataChanged( const DataChangedEvent& _rDCEvt ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; - void FreeResource (void); + void FreeResource(); private: const std::unique_ptr<SfxTemplateDialog_Impl> pImpl; diff --git a/include/sfx2/titledockwin.hxx b/include/sfx2/titledockwin.hxx index 97fdebc11fd2..61db702d236c 100644 --- a/include/sfx2/titledockwin.hxx +++ b/include/sfx2/titledockwin.hxx @@ -86,7 +86,7 @@ namespace sfx2 /** Return the border that is painted around the inner window as decoration. */ - SvBorder GetDecorationBorder (void) const { return m_aBorder; } + SvBorder GetDecorationBorder() const { return m_aBorder; } protected: // Window overridables diff --git a/include/sot/filelist.hxx b/include/sot/filelist.hxx index e3b063e8860f..1734c12bb79f 100644 --- a/include/sot/filelist.hxx +++ b/include/sot/filelist.hxx @@ -39,7 +39,7 @@ protected: virtual void Assign( const SvDataCopyStream& ) SAL_OVERRIDE; // Liste loeschen; - void ClearAll( void ); + void ClearAll(); public: @@ -57,7 +57,7 @@ public: // Liste fuellen/abfragen void AppendFile( const OUString& rStr ); OUString GetFile( size_t i ) const; - size_t Count( void ) const; + size_t Count() const; }; diff --git a/include/store/store.hxx b/include/store/store.hxx index 85c546564e47..943b73ccd570 100644 --- a/include/store/store.hxx +++ b/include/store/store.hxx @@ -37,13 +37,13 @@ class OStoreStream public: /** Construction. */ - inline OStoreStream (void) + inline OStoreStream() : m_hImpl (0) {} /** Destruction. */ - inline ~OStoreStream (void) + inline ~OStoreStream() { if (m_hImpl) (void) store_releaseHandle (m_hImpl); @@ -81,7 +81,7 @@ public: /** Conversion into Stream Handle. */ - inline operator storeStreamHandle (void) const + inline operator storeStreamHandle() const { return m_hImpl; } @@ -89,7 +89,7 @@ public: /** Check for a valid Stream Handle. @return sal_True if valid, sal_False otherwise. */ - inline bool isValid (void) const + inline bool isValid() const { return (m_hImpl != 0); } @@ -114,7 +114,7 @@ public: /** Close the stream. @see store_closeStream() */ - inline void close (void) + inline void close() { if (m_hImpl) { @@ -156,7 +156,7 @@ public: /** Flush the stream. @see store_flushStream() */ - inline storeError flush (void) const + inline storeError flush() const { if (!m_hImpl) return store_E_InvalidHandle; @@ -202,13 +202,13 @@ class OStoreDirectory public: /** Construction. */ - inline OStoreDirectory (void) + inline OStoreDirectory() : m_hImpl (0) {} /** Destruction. */ - inline ~OStoreDirectory (void) + inline ~OStoreDirectory() { if (m_hImpl) (void) store_releaseHandle (m_hImpl); @@ -246,7 +246,7 @@ public: /** Conversion into Directory Handle. */ - inline operator storeDirectoryHandle(void) const + inline operator storeDirectoryHandle() const { return m_hImpl; } @@ -254,7 +254,7 @@ public: /** Check for a valid Directory Handle. @return sal_True if valid, sal_False otherwise. */ - inline bool isValid (void) const + inline bool isValid() const { return (m_hImpl != 0); } @@ -279,7 +279,7 @@ public: /** Close the directory. @see store_closeDirectory() */ - inline void close (void) + inline void close() { if (m_hImpl) { @@ -332,13 +332,13 @@ class OStoreFile public: /** Construction. */ - inline OStoreFile (void) + inline OStoreFile() : m_hImpl (0) {} /** Destruction. */ - inline ~OStoreFile (void) + inline ~OStoreFile() { if (m_hImpl) (void) store_releaseHandle (m_hImpl); @@ -376,7 +376,7 @@ public: /** Conversion into File Handle. */ - inline operator storeFileHandle (void) const + inline operator storeFileHandle() const { return m_hImpl; } @@ -384,7 +384,7 @@ public: /** Check for a valid File Handle. @return sal_True if valid, sal_False otherwise. */ - inline bool isValid (void) const + inline bool isValid() const { return (m_hImpl != 0); } @@ -422,7 +422,7 @@ public: /** Close the file. @see store_closeFile() */ - inline void close (void) + inline void close() { if (m_hImpl) { @@ -434,7 +434,7 @@ public: /** Flush the file. @see store_flushFile() */ - inline storeError flush (void) const + inline storeError flush() const { if (!m_hImpl) return store_E_InvalidHandle; diff --git a/include/svl/ctloptions.hxx b/include/svl/ctloptions.hxx index d20a4f6cf4c5..0cc0e5b8141a 100644 --- a/include/svl/ctloptions.hxx +++ b/include/svl/ctloptions.hxx @@ -45,7 +45,7 @@ public: bool IsCTLSequenceChecking() const; void SetCTLSequenceCheckingRestricted( bool _bEnable ); - bool IsCTLSequenceCheckingRestricted( void ) const; + bool IsCTLSequenceCheckingRestricted() const; void SetCTLSequenceCheckingTypeAndReplace( bool _bEnable ); bool IsCTLSequenceCheckingTypeAndReplace() const; diff --git a/include/svl/inethist.hxx b/include/svl/inethist.hxx index 0cd3801c5985..b54f8dc426ff 100644 --- a/include/svl/inethist.hxx +++ b/include/svl/inethist.hxx @@ -39,8 +39,8 @@ class SVL_DLLPUBLIC INetURLHistory : public SfxBroadcaster /** Construction/Destruction. */ - SAL_DLLPRIVATE INetURLHistory (void); - SAL_DLLPRIVATE virtual ~INetURLHistory (void); + SAL_DLLPRIVATE INetURLHistory(); + SAL_DLLPRIVATE virtual ~INetURLHistory(); /** Implementation. */ @@ -57,7 +57,7 @@ class SVL_DLLPUBLIC INetURLHistory : public SfxBroadcaster public: /** GetOrCreate. */ - static INetURLHistory* GetOrCreate (void); + static INetURLHistory* GetOrCreate(); /** QueryProtocol. */ diff --git a/include/svtools/accessibleruler.hxx b/include/svtools/accessibleruler.hxx index a3fe1c5a0580..0c286ee73cd2 100644 --- a/include/svtools/accessibleruler.hxx +++ b/include/svtools/accessibleruler.hxx @@ -75,7 +75,7 @@ public: //===== XAccessible ===================================================== virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL - getAccessibleContext( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleContext() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //===== XAccessibleComponent ============================================ @@ -108,35 +108,35 @@ public: //===== XAccessibleContext ============================================== virtual sal_Int32 SAL_CALL - getAccessibleChildCount( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleChildCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; 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, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL - getAccessibleParent( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleParent() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL - getAccessibleIndexInParent( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleIndexInParent() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL - getAccessibleRole( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleRole() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::rtl::OUString SAL_CALL - getAccessibleDescription( void ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::rtl::OUString SAL_CALL - getAccessibleName( void ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL - getAccessibleRelationSet( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleRelationSet() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL - getAccessibleStateSet( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleStateSet() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::lang::Locale SAL_CALL - getLocale( void ) + getLocale() throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception ) SAL_OVERRIDE; //===== XAccessibleEventBroadcaster ===================================== @@ -150,38 +150,38 @@ public: //===== XServiceInfo ==================================================== virtual ::rtl::OUString SAL_CALL - getImplementationName( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL - getSupportedServiceNames( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //===== XTypeProvider =================================================== virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getImplementationId() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: /// @Return the object's current bounding box relative to the desktop. - Rectangle GetBoundingBoxOnScreen( void ) throw( ::com::sun::star::uno::RuntimeException ); + Rectangle GetBoundingBoxOnScreen() throw( ::com::sun::star::uno::RuntimeException ); /// @Return the object's current bounding box relative to the parent object. - Rectangle GetBoundingBox( void ) throw( ::com::sun::star::uno::RuntimeException ); + Rectangle GetBoundingBox() throw( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL disposing() SAL_OVERRIDE; /// @returns true if it's disposed or in disposing - inline bool IsAlive( void ) const; + inline bool IsAlive() const; /// @returns true if it's not disposed and no in disposing - inline bool IsNotAlive( void ) const; + inline bool IsNotAlive() const; /// throws the exception DisposedException if it's not alive - void ThrowExceptionIfNotAlive( void ) throw( ::com::sun::star::lang::DisposedException ); + void ThrowExceptionIfNotAlive() throw( ::com::sun::star::lang::DisposedException ); private: /** Description of this object. This is not a constant because it can @@ -206,12 +206,12 @@ private: }; -inline bool SvtRulerAccessible::IsAlive( void ) const +inline bool SvtRulerAccessible::IsAlive() const { return !rBHelper.bDisposed && !rBHelper.bInDispose; } -inline bool SvtRulerAccessible::IsNotAlive( void ) const +inline bool SvtRulerAccessible::IsNotAlive() const { return rBHelper.bDisposed || rBHelper.bInDispose; } diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index d382a9d6e34b..55af3e0e948e 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -291,7 +291,7 @@ class SVT_DLLPUBLIC LineListBox : public ListBox sal_uInt16 nStyle, Bitmap& rBmp ); using Window::ImplInit; SVT_DLLPRIVATE void ImplInit(); - bool UpdatePaintLineColor( void ); // returns sal_True if maPaintCol has changed + bool UpdatePaintLineColor(); // returns sal_True if maPaintCol has changed virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; void UpdateEntries( long nOldWidth ); @@ -347,7 +347,7 @@ public: protected: - inline const Color& GetPaintColor( void ) const; + inline const Color& GetPaintColor() const; Color GetColorLine1( sal_Int32 nPos = 0 ); Color GetColorLine2( sal_Int32 nPos = 0 ); Color GetColorDist( sal_Int32 nPos = 0 ); @@ -366,7 +366,7 @@ inline void LineListBox::SetColor( const Color& rColor ) UpdateEntries( m_nWidth ); } -const Color& LineListBox::GetPaintColor( void ) const +const Color& LineListBox::GetPaintColor() const { return maPaintCol; } diff --git a/include/svtools/svlbitm.hxx b/include/svtools/svlbitm.hxx index 263e7a04cd3c..8e9f6321a78b 100644 --- a/include/svtools/svlbitm.hxx +++ b/include/svtools/svlbitm.hxx @@ -99,7 +99,7 @@ public: void SetDefaultImages( const Control* pControlForSettings = NULL ); // set images according to the color scheeme of the Control // pControlForSettings == NULL: settings are taken from Application - bool HasDefaultImages( void ) const; + bool HasDefaultImages() const; }; // ********************************************************************** diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx index 521622058303..43c7e0a6b330 100644 --- a/include/svtools/svparser.hxx +++ b/include/svtools/svparser.hxx @@ -210,7 +210,7 @@ class SvKeyValue public: /** Construction. */ - SvKeyValue (void) + SvKeyValue() {} SvKeyValue (const OUString &rKey, const OUString &rValue) @@ -232,8 +232,8 @@ public: /** Operation. */ - const OUString& GetKey (void) const { return m_aKey; } - const OUString& GetValue (void) const { return m_aValue; } + const OUString& GetKey() const { return m_aKey; } + const OUString& GetValue() const { return m_aValue; } void SetKey (const OUString &rKey ) { m_aKey = rKey; } void SetValue (const OUString &rValue) { m_aValue = rValue; } diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index f7c1af30cc4b..0af36c9584a8 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -764,10 +764,10 @@ public: void ShowFocusRect( const SvTreeListEntry* pEntry ); void InitStartEntry(); - virtual PopupMenu* CreateContextMenu( void ); + virtual PopupMenu* CreateContextMenu(); virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ); - void EnableContextMenuHandling( void ); + void EnableContextMenuHandling(); void EnableList( bool _bEnable ); diff --git a/include/svtools/unoevent.hxx b/include/svtools/unoevent.hxx index cdcfb2e9702e..046ae558d137 100644 --- a/include/svtools/unoevent.hxx +++ b/include/svtools/unoevent.hxx @@ -126,7 +126,7 @@ public: // XServiceInfo /// must be implemented in subclass - virtual OUString SAL_CALL getImplementationName(void) + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0; // XServiceInfo @@ -135,7 +135,7 @@ public: // XServiceInfo virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames(void) + getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: @@ -263,7 +263,7 @@ public: virtual ~SvDetachedEventDescriptor(); //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: diff --git a/include/svx/AccessibleGraphicShape.hxx b/include/svx/AccessibleGraphicShape.hxx index 3e8d46fee679..6245f5297ba4 100644 --- a/include/svx/AccessibleGraphicShape.hxx +++ b/include/svx/AccessibleGraphicShape.hxx @@ -41,17 +41,17 @@ public: const AccessibleShapeInfo& rShapeInfo, const AccessibleShapeTreeInfo& rShapeTreeInfo); - virtual ~AccessibleGraphicShape (void); + virtual ~AccessibleGraphicShape(); //===== XAccessibleImage ================================================ - OUString SAL_CALL getAccessibleImageDescription (void) + OUString SAL_CALL getAccessibleImageDescription() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - sal_Int32 SAL_CALL getAccessibleImageHeight (void) + sal_Int32 SAL_CALL getAccessibleImageHeight() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - sal_Int32 SAL_CALL getAccessibleImageWidth (void) + sal_Int32 SAL_CALL getAccessibleImageWidth() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XInterface ====================================================== @@ -61,11 +61,11 @@ public: throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL - acquire (void) + acquire() throw () SAL_OVERRIDE; virtual void SAL_CALL - release (void) + release() throw () SAL_OVERRIDE; //===== XServiceInfo ==================================================== @@ -73,20 +73,20 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName (void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames (void) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XTypeProvider =================================================== virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL - getTypes (void) + getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return this object's role. - virtual sal_Int16 SAL_CALL getAccessibleRole (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: /// Create a name string that contains the accessible name. virtual OUString diff --git a/include/svx/AccessibleOLEShape.hxx b/include/svx/AccessibleOLEShape.hxx index 943639851b8f..4591edd939f2 100644 --- a/include/svx/AccessibleOLEShape.hxx +++ b/include/svx/AccessibleOLEShape.hxx @@ -41,11 +41,11 @@ public: AccessibleOLEShape ( const AccessibleShapeInfo& rShapeInfo, const AccessibleShapeTreeInfo& rShapeTreeInfo); - virtual ~AccessibleOLEShape (void); + virtual ~AccessibleOLEShape(); //===== XAccessibleAction =============================================== - sal_Int32 SAL_CALL getAccessibleActionCount (void) + sal_Int32 SAL_CALL getAccessibleActionCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL doAccessibleAction (sal_Int32 nIndex) @@ -69,27 +69,27 @@ public: throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL - acquire (void) + acquire() throw () SAL_OVERRIDE; virtual void SAL_CALL - release (void) + release() throw () SAL_OVERRIDE; //===== XServiceInfo ==================================================== virtual OUString SAL_CALL - getImplementationName (void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames (void) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XTypeProvider =================================================== virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL - getTypes (void) + getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ====== XAccessibleExtendedAttributes ===================================== virtual ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes() throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx index b51e62b4cee6..d32baf2a8c6b 100644 --- a/include/svx/AccessibleShape.hxx +++ b/include/svx/AccessibleShape.hxx @@ -106,9 +106,9 @@ public: const AccessibleShapeInfo& rShapeInfo, const AccessibleShapeTreeInfo& rShapeTreeInfo); //Solution: Overwrite the object's current name. - virtual OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleSelection ============================================ virtual void SAL_CALL selectAccessibleChild( @@ -144,7 +144,7 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes() throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; /// Return this object's role. - virtual sal_Int16 SAL_CALL getAccessibleRole (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleGroupPosition ========================================= virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getGroupPosition( const ::com::sun::star::uno::Any& rAny ) @@ -154,12 +154,12 @@ public: /** The destructor releases its children manager and text engine if still existent. These are responsible to send appropriate events. */ - virtual ~AccessibleShape (void); + virtual ~AccessibleShape(); /** Initialize a new shape. See the documentation of the constructor for the reason of this method's existence. */ - virtual void Init (void); + virtual void Init(); /** Compare two accessible shapes using object identity @param rShape @@ -215,7 +215,7 @@ public: /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL - getAccessibleChildCount (void) + getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Return the specified child. @@ -236,12 +236,12 @@ public: /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL - getAccessibleStateSet (void) + getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return this objects index among the parents children. virtual sal_Int32 SAL_CALL - getAccessibleIndexInParent (void) + getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleComponent ============================================ @@ -251,22 +251,22 @@ public: getAccessibleAtPoint (const ::com::sun::star::awt::Point& aPoint) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds (void) + virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::awt::Point SAL_CALL getLocation (void) + virtual ::com::sun::star::awt::Point SAL_CALL getLocation() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen (void) + 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 (void) + virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getForeground (void) + virtual sal_Int32 SAL_CALL getForeground() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getBackground (void) + virtual sal_Int32 SAL_CALL getBackground() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleEventBroadcaster ===================================== @@ -304,11 +304,11 @@ public: throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL - acquire (void) + acquire() throw () SAL_OVERRIDE; virtual void SAL_CALL - release (void) + release() throw () SAL_OVERRIDE; @@ -317,17 +317,17 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName (void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames (void) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XTypeProvider =================================================== virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL - getTypes (void) + getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== IAccessibleViewForwarderListener ================================ @@ -429,24 +429,24 @@ protected: /** This method is called from the component helper base class while disposing. */ - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; /** Create a base name string that contains the accessible name. */ virtual OUString - CreateAccessibleBaseName (void) + CreateAccessibleBaseName() throw (::com::sun::star::uno::RuntimeException); /** Create a unique name string that contains the accessible name. The name consists of the base name and the index. */ virtual OUString - CreateAccessibleName (void) + CreateAccessibleName() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /// Create a description string that contains the accessible description. virtual OUString - CreateAccessibleDescription (void) + CreateAccessibleDescription() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; OUString GetFullAccessibleName(AccessibleShape *shape) @@ -456,7 +456,7 @@ protected: ::com::sun::star::accessibility::XAccessibleStateSet > &xStateSet); /** Update the <const>OPAQUE</const> and <const>SELECTED</const> state. */ - void UpdateStates (void); + void UpdateStates(); private: AccessibleShape (const AccessibleShape&) SAL_DELETED_FUNCTION; @@ -469,7 +469,7 @@ private: This method adapts the name and description members of the AccessibleContextBase base class. */ - void UpdateNameAndDescription (void); + void UpdateNameAndDescription(); }; } // end of namespace accessibility diff --git a/include/svx/AccessibleShapeInfo.hxx b/include/svx/AccessibleShapeInfo.hxx index d8591fcb1470..0c75bc914b9b 100644 --- a/include/svx/AccessibleShapeInfo.hxx +++ b/include/svx/AccessibleShapeInfo.hxx @@ -87,7 +87,7 @@ public: ::com::sun::star::accessibility::XAccessible>& rxParent, sal_Int32 nIndex = -1); - ~AccessibleShapeInfo (void); + ~AccessibleShapeInfo(); AccessibleShapeInfo (const AccessibleShapeInfo&); private: diff --git a/include/svx/AccessibleShapeTreeInfo.hxx b/include/svx/AccessibleShapeTreeInfo.hxx index ec316f2498bb..d7dc02c5b862 100644 --- a/include/svx/AccessibleShapeTreeInfo.hxx +++ b/include/svx/AccessibleShapeTreeInfo.hxx @@ -53,7 +53,7 @@ public: /** Use this constructor to create an empty object that is filled later with more meaningfull data. */ - AccessibleShapeTreeInfo (void); + AccessibleShapeTreeInfo(); /** Create a copy of the given shape info. @param rInfo @@ -61,7 +61,7 @@ public: */ AccessibleShapeTreeInfo (const AccessibleShapeTreeInfo& rInfo); - ~AccessibleShapeTreeInfo (void); + ~AccessibleShapeTreeInfo(); AccessibleShapeTreeInfo& operator= (const AccessibleShapeTreeInfo& rInfo); @@ -74,7 +74,7 @@ public: */ ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleComponent> - GetDocumentWindow (void) const { return mxDocumentWindow;} + GetDocumentWindow() const { return mxDocumentWindow;} /** Deprecated. Use the correctly named SetModelBroadcaster method instead. @@ -86,7 +86,7 @@ public: */ ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventBroadcaster> - GetControllerBroadcaster (void) const { return mxModelBroadcaster;} + GetControllerBroadcaster() const { return mxModelBroadcaster;} /** Set a new broadcaster that sends events indicating shape changes. The broadcaster usually is or belongs to a document model. @@ -104,7 +104,7 @@ public: */ ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventBroadcaster> - GetModelBroadcaster (void) const { return mxModelBroadcaster;} + GetModelBroadcaster() const { return mxModelBroadcaster;} /** Set the view that will be used to construct SvxTextEditSources which in turn are used to create accessible edit engines. @@ -118,7 +118,7 @@ public: @return The returned value may be NULL. */ - SdrView* GetSdrView (void) const { return mpView;} + SdrView* GetSdrView() const { return mpView;} /** Set a new controller. This will usually but not necessarily correspond to the SdrView. @@ -135,7 +135,7 @@ public: */ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController> - GetController (void) const { return mxController;} + GetController() const { return mxController;} /** Set the window that is used to construct SvxTextEditSources which in turn is used to create accessible edit engines. @@ -146,7 +146,7 @@ public: @return The returned value may be NULL. */ - vcl::Window* GetWindow (void) const { return mpWindow;} + vcl::Window* GetWindow() const { return mpWindow;} /** The view forwarder allows the transformation between internal and pixel coordinates and can be asked for the visible area. @@ -159,7 +159,7 @@ public: @return The returned pointer may be NULL. */ - const IAccessibleViewForwarder* GetViewForwarder (void) const { return mpViewForwarder;} + const IAccessibleViewForwarder* GetViewForwarder() const { return mpViewForwarder;} private: /** Deprecated. diff --git a/include/svx/ChildrenManager.hxx b/include/svx/ChildrenManager.hxx index 17bc1a36ab61..668574f5f61e 100644 --- a/include/svx/ChildrenManager.hxx +++ b/include/svx/ChildrenManager.hxx @@ -98,13 +98,13 @@ public: /** If there still are managed children these are marked as DEFUNC and released. */ - virtual ~ChildrenManager (void); + virtual ~ChildrenManager(); /** Return the number of currently visible accessible children. @return If there are no children a 0 is returned. */ - long GetChildCount (void) const throw (); + long GetChildCount() const throw (); /** Return the requested accessible child or throw and IndexOutOfBoundsException if the given index is invalid. @@ -161,7 +161,7 @@ public: /** Clear the list of accessible shapes which have been added by previous calls to <member>AddAccessibleShape</member>. */ - void ClearAccessibleShapeList (void); + void ClearAccessibleShapeList(); /** Take a new event shape tree info. Call this method to inform the children manager of a change of the info bundle. @@ -174,7 +174,7 @@ public: according to the given selection. This includes setting <em>and</em> resetting the states. */ - void UpdateSelection (void); + void UpdateSelection(); /** Return whether one of the shapes managed by this object has currently the focus. @@ -182,13 +182,13 @@ public: Returns <true/> when there is a shape that has the focus and <false/> when there is no such shape. */ - bool HasFocus (void); + bool HasFocus(); /** When there is a shape that currently has the focus, i.e. <member>HasFocus()</member> returns <true/> then remove the focus from that shape. Otherwise nothing changes. */ - void RemoveFocus (void); + void RemoveFocus(); virtual void ViewForwarderChanged (ChangeType aChangeType, const IAccessibleViewForwarder* pViewForwarder) SAL_OVERRIDE; diff --git a/include/svx/DescriptionGenerator.hxx b/include/svx/DescriptionGenerator.hxx index f8fc1cb74a42..3603d21aacde 100644 --- a/include/svx/DescriptionGenerator.hxx +++ b/include/svx/DescriptionGenerator.hxx @@ -56,7 +56,7 @@ public: DescriptionGenerator (const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>& xShape); - ~DescriptionGenerator (void); + ~DescriptionGenerator(); /** Initialize the description with the given prefix followed by the shape's style in parantheses and a colon. @@ -134,19 +134,19 @@ public: /** Add properties that describe line and border attributes. */ - void AddLineProperties (void); + void AddLineProperties(); /** Add properties that describe how areas are filled. */ - void AddFillProperties (void); + void AddFillProperties(); /** Add properties that describesattributes of 3D objects. */ - void Add3DProperties (void); + void Add3DProperties(); /** Add properties that describe text attributes. */ - void AddTextProperties (void); + void AddTextProperties(); private: /// Reference to the shape from which the properties are extracted. diff --git a/include/svx/IAccessibleParent.hxx b/include/svx/IAccessibleParent.hxx index 843914d24f84..d92edc97336f 100644 --- a/include/svx/IAccessibleParent.hxx +++ b/include/svx/IAccessibleParent.hxx @@ -38,7 +38,7 @@ class IAccessibleParent public: /** Allow for a virtual destructor. */ - virtual ~IAccessibleParent (void){}; + virtual ~IAccessibleParent(){}; /** A call to this method requests the implementor to replace one child with another and send the appropriate notifications. That are two diff --git a/include/svx/IAccessibleViewForwarder.hxx b/include/svx/IAccessibleViewForwarder.hxx index e280c41fb3ad..14be8b0499ac 100644 --- a/include/svx/IAccessibleViewForwarder.hxx +++ b/include/svx/IAccessibleViewForwarder.hxx @@ -52,7 +52,7 @@ namespace accessibility { class IAccessibleViewForwarder { public: - virtual ~IAccessibleViewForwarder (void){}; + virtual ~IAccessibleViewForwarder(){}; /** This method informs you about the state of the forwarder. Do not use it when the returned value is <false/>. @@ -60,7 +60,7 @@ public: @return Return <true/> if the view forwarder is valid and <false/> else. */ - virtual bool IsValid (void) const = 0; + virtual bool IsValid() const = 0; /** Returns the area of the underlying document that is visible in the * corresponding window. diff --git a/include/svx/ShapeTypeHandler.hxx b/include/svx/ShapeTypeHandler.hxx index ee84c34109f5..ec387257e742 100644 --- a/include/svx/ShapeTypeHandler.hxx +++ b/include/svx/ShapeTypeHandler.hxx @@ -63,7 +63,7 @@ struct ShapeTypeDescriptor msServiceName (sName), maCreateFunction (aFunction) {} - ShapeTypeDescriptor (void) + ShapeTypeDescriptor() : mnShapeTypeId (-1), msServiceName (), maCreateFunction (NULL) @@ -85,7 +85,7 @@ public: @return Returns a reference to a ShapeTypeHandler object. */ - static ShapeTypeHandler& Instance (void); + static ShapeTypeHandler& Instance(); /** Determines the type id of a shape with the given service name. @param aServiceName @@ -161,14 +161,14 @@ protected: // Declare default constructor, copy constructor, destructor, and // assignment operation protected so that no one accidentally creates a // second instance of this singleton class or deletes it. - ShapeTypeHandler (void); + ShapeTypeHandler(); ShapeTypeHandler (const ShapeTypeHandler& aHandler); // never implemented, this is a singleton class ShapeTypeHandler& operator= (const ShapeTypeHandler& aHandler); // never implemented, this is a singleton class /** This destructor is never called at the moment. But because this class is a singleton this is not a problem. */ - virtual ~ShapeTypeHandler (void); + virtual ~ShapeTypeHandler(); private: /// Pointer to the only instance of this class. diff --git a/include/svx/SpellDialogChildWindow.hxx b/include/svx/SpellDialogChildWindow.hxx index 2f6bc5cae067..a50ddbbfb013 100644 --- a/include/svx/SpellDialogChildWindow.hxx +++ b/include/svx/SpellDialogChildWindow.hxx @@ -95,7 +95,7 @@ protected: */ virtual void SetGrammarChecking(bool bOn); - SfxBindings& GetBindings (void) const; + SfxBindings& GetBindings() const; /** Set the spell dialog into the 'resume' state. This method should be called to notify the SpellDialog about changes in the document that invalidate the current state which results in disabling most of the dialog controls and presenting diff --git a/include/svx/SvxShapeTypes.hxx b/include/svx/SvxShapeTypes.hxx index 474d8cdf86d8..6af2a822dcdc 100644 --- a/include/svx/SvxShapeTypes.hxx +++ b/include/svx/SvxShapeTypes.hxx @@ -28,7 +28,7 @@ namespace accessibility { /** Register the SVX draw shape types with the ShapeTypeHandler singleton. This method is usually called from the shape type handler constructor. */ -void RegisterDrawShapeTypes (void); +void RegisterDrawShapeTypes(); /** Enum describing all shape types known in the SVX project. */ diff --git a/include/svx/bmpmask.hxx b/include/svx/bmpmask.hxx index 1747e16402c7..cfd31a395f5d 100644 --- a/include/svx/bmpmask.hxx +++ b/include/svx/bmpmask.hxx @@ -160,7 +160,7 @@ private: like the source color checkboxes which initially have no name and for which the description would be read by AT. */ - SVX_DLLPRIVATE void SetAccessibleNames (void); + SVX_DLLPRIVATE void SetAccessibleNames(); }; #endif // INCLUDED_SVX_BMPMASK_HXX diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx index 7df5d9a3e7e9..825deea3cedc 100644 --- a/include/svx/charmap.hxx +++ b/include/svx/charmap.hxx @@ -61,8 +61,8 @@ public: static sal_uInt32& getSelectedChar(); ::svx::SvxShowCharSetItem* ImplGetItem( int _nPos ); - int FirstInView( void) const; - int LastInView( void) const; + int FirstInView() const; + int LastInView() const; int PixelToMapIndex( const Point&) const; void SelectIndex( int index, bool bFocus = false ); void DeSelect(); diff --git a/include/svx/colrctrl.hxx b/include/svx/colrctrl.hxx index 3896ffeca6cb..0987da9dea53 100644 --- a/include/svx/colrctrl.hxx +++ b/include/svx/colrctrl.hxx @@ -91,7 +91,7 @@ private: the focus to the color value set so that it can be controlled with the keyboard. */ - virtual void GetFocus (void) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; protected: virtual bool Close() SAL_OVERRIDE; diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index 456c4f8afb25..01a2de76c2ea 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -65,8 +65,8 @@ class SVX_DLLPUBLIC SvxRectCtl : public Control { private: SVX_DLLPRIVATE void InitSettings( bool bForeground, bool bBackground ); - SVX_DLLPRIVATE void InitRectBitmap( void ); - SVX_DLLPRIVATE Bitmap& GetRectBitmap( void ); + SVX_DLLPRIVATE void InitRectBitmap(); + SVX_DLLPRIVATE Bitmap& GetRectBitmap(); SVX_DLLPRIVATE void Resize_Impl(); protected: @@ -115,9 +115,9 @@ public: void SetState( CTL_STATE nState ); - sal_uInt8 GetNumOfChildren( void ) const; // returns number of usable radio buttons + sal_uInt8 GetNumOfChildren() const; // returns number of usable radio buttons - Rectangle CalculateFocusRectangle( void ) const; + Rectangle CalculateFocusRectangle() const; Rectangle CalculateFocusRectangle( RECT_POINT eRectPoint ) const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; @@ -341,7 +341,7 @@ class SVX_DLLPUBLIC LineEndLB : public ListBox public: LineEndLB( vcl::Window* pParent, WinBits aWB ); - virtual ~LineEndLB (void); + virtual ~LineEndLB(); void Fill( const XLineEndListRef &pList, bool bStart = true ); diff --git a/include/svx/fmdmod.hxx b/include/svx/fmdmod.hxx index 31f3856c4942..8a5a1676a646 100644 --- a/include/svx/fmdmod.hxx +++ b/include/svx/fmdmod.hxx @@ -32,7 +32,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance(const OUString& ServiceSpecifier) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments(const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; #endif // INCLUDED_SVX_FMDMOD_HXX diff --git a/include/svx/fmdpage.hxx b/include/svx/fmdpage.hxx index 8717f2ff2fa1..ba7e8ef5a759 100644 --- a/include/svx/fmdpage.hxx +++ b/include/svx/fmdpage.hxx @@ -55,13 +55,13 @@ public: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XFormsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > SAL_CALL getForms(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > SAL_CALL getForms() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XFormsSupplier2 - virtual sal_Bool SAL_CALL hasForms(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasForms() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; #endif // INCLUDED_SVX_FMDPAGE_HXX diff --git a/include/svx/fmtools.hxx b/include/svx/fmtools.hxx index 61edca34e54b..225c77324979 100644 --- a/include/svx/fmtools.hxx +++ b/include/svx/fmtools.hxx @@ -136,13 +136,13 @@ public: { return m_xMoveOperations->queryInterface(type); } // css::uno::Reference< css::sdbcx::XRowLocate> - css::uno::Any getBookmark(void) + css::uno::Any getBookmark() throw( css::sdbc::SQLException, css::uno::RuntimeException ) { return m_xBookmarkOperations->getBookmark(); } bool moveToBookmark(const css::uno::Any& bookmark) throw( css::sdbc::SQLException, css::uno::RuntimeException ) { return m_xBookmarkOperations->moveToBookmark(bookmark); } bool moveRelativeToBookmark(const css::uno::Any& bookmark, sal_Int32 rows) throw( css::sdbc::SQLException, css::uno::RuntimeException ) { return m_xBookmarkOperations->moveRelativeToBookmark(bookmark, rows); } sal_Int32 compareBookmarks(const css::uno::Any& lhs, const css::uno::Any& rhs) const throw( css::sdbc::SQLException, css::uno::RuntimeException ) { return m_xBookmarkOperations->compareBookmarks(lhs, rhs); } - sal_Int32 hasOrderedBookmarks(void) const throw( css::sdbc::SQLException, css::uno::RuntimeException ) { return m_xBookmarkOperations->hasOrderedBookmarks(); } + sal_Int32 hasOrderedBookmarks() const throw( css::sdbc::SQLException, css::uno::RuntimeException ) { return m_xBookmarkOperations->hasOrderedBookmarks(); } sal_Int32 hashBookmark(const css::uno::Any& bookmark) const throw( css::sdbc::SQLException, css::uno::RuntimeException ) { return m_xBookmarkOperations->hashBookmark(bookmark); } // css::sdbc::XResultSet diff --git a/include/svx/fntctrl.hxx b/include/svx/fntctrl.hxx index 0c9461f73891..f6c276a7c10c 100644 --- a/include/svx/fntctrl.hxx +++ b/include/svx/fntctrl.hxx @@ -74,7 +74,7 @@ public: void SetFontWidthScale( sal_uInt16 nScaleInPercent ); - void AutoCorrectFontColor( void ); + void AutoCorrectFontColor(); void SetPreviewText( const OUString& rString ); void SetFontNameAsPreviewText(); diff --git a/include/svx/linectrl.hxx b/include/svx/linectrl.hxx index c7c80a48b15a..1c3a90ee50ca 100644 --- a/include/svx/linectrl.hxx +++ b/include/svx/linectrl.hxx @@ -107,7 +107,7 @@ protected: the focus to the line ends value set so that it can be controlled with the keyboard. */ - virtual void GetFocus (void) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; public: SvxLineEndWindow( sal_uInt16 nId, diff --git a/include/svx/numfmtsh.hxx b/include/svx/numfmtsh.hxx index 0c1626591f64..5d972675d8de 100644 --- a/include/svx/numfmtsh.hxx +++ b/include/svx/numfmtsh.hxx @@ -176,7 +176,7 @@ public: OUString const& rFmtString); void SetUseStarFormat( bool bUse ) { bUseStarFormat = bUse; } - bool IsUseStarFormat( void ) { return bUseStarFormat; } + bool IsUseStarFormat() { return bUseStarFormat; } private: static const double DEFAULT_NUMVALUE; diff --git a/include/svx/rubydialog.hxx b/include/svx/rubydialog.hxx index bd605a17778e..d0e9429501a2 100644 --- a/include/svx/rubydialog.hxx +++ b/include/svx/rubydialog.hxx @@ -155,7 +155,7 @@ class SvxRubyDialog : public SfxModelessDialog void GetCurrentText(OUString& rBase, OUString& rRuby); - void UpdateColors( void ); + void UpdateColors(); protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; public: diff --git a/include/svx/sidebar/Popup.hxx b/include/svx/sidebar/Popup.hxx index e11e8c1ee6b0..7f0d804f78c2 100644 --- a/include/svx/sidebar/Popup.hxx +++ b/include/svx/sidebar/Popup.hxx @@ -53,7 +53,7 @@ public : vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator, const ::rtl::OUString& rsAccessibleName); - virtual ~Popup (void); + virtual ~Popup(); /** Show the popup. @rToolBox @@ -68,12 +68,12 @@ public : application can call Hide() when the popup should be closed for other, non-standard reasons. */ - void Hide (void); + void Hide(); /** If you want to be informed when the popup closes then add a callback that is called after that. */ - void SetPopupModeEndHandler (const ::boost::function<void(void)>& rCallback); + void SetPopupModeEndHandler (const ::boost::function<void()>& rCallback); protected: std::unique_ptr<PopupControl> mxControl; @@ -81,17 +81,17 @@ protected: /** Make sure that both PopupContainer and PopupControl objects exist. Calls the maControlCreator functor if necessary. */ - void ProvideContainerAndControl (void); + void ProvideContainerAndControl(); /** A derived specialisation class can override this method to do additional work. */ - void CreateContainerAndControl (void); + void CreateContainerAndControl(); private: vcl::Window* mpParent; ::boost::function<PopupControl*(PopupContainer*)> maControlCreator; - ::boost::function<void(void)> maPopupModeEndCallback; + ::boost::function<void()> maPopupModeEndCallback; const ::rtl::OUString msAccessibleName; std::unique_ptr<PopupContainer> mxContainer; diff --git a/include/svx/sidebar/PopupContainer.hxx b/include/svx/sidebar/PopupContainer.hxx index f8f6f524573f..f15c283ff313 100644 --- a/include/svx/sidebar/PopupContainer.hxx +++ b/include/svx/sidebar/PopupContainer.hxx @@ -34,7 +34,7 @@ class SVX_DLLPUBLIC PopupContainer { public: PopupContainer (vcl::Window* pParent); - virtual ~PopupContainer (void); + virtual ~PopupContainer(); virtual bool Notify (NotifyEvent& rNEvt) SAL_OVERRIDE; }; diff --git a/include/svx/sidebar/PopupControl.hxx b/include/svx/sidebar/PopupControl.hxx index 84bed5af5870..32658b3ae4d7 100644 --- a/include/svx/sidebar/PopupControl.hxx +++ b/include/svx/sidebar/PopupControl.hxx @@ -38,7 +38,7 @@ public : PopupControl ( vcl::Window* pParent, const ResId& rResId); - virtual ~PopupControl (void); + virtual ~PopupControl(); virtual void Paint (const Rectangle& rect) SAL_OVERRIDE; }; diff --git a/include/svx/sidebar/SelectionChangeHandler.hxx b/include/svx/sidebar/SelectionChangeHandler.hxx index ed5e9a80ad1e..715265840c57 100644 --- a/include/svx/sidebar/SelectionChangeHandler.hxx +++ b/include/svx/sidebar/SelectionChangeHandler.hxx @@ -48,10 +48,10 @@ class SVX_DLLPUBLIC SelectionChangeHandler { public: SelectionChangeHandler ( - const boost::function<rtl::OUString(void)>& rSelectionChangeCallback, + const boost::function<rtl::OUString()>& rSelectionChangeCallback, const css::uno::Reference<css::frame::XController>& rxController, const sfx2::sidebar::EnumContext::Context eDefaultContext); - virtual ~SelectionChangeHandler (void); + virtual ~SelectionChangeHandler(); virtual void SAL_CALL selectionChanged (const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -59,17 +59,17 @@ public: virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL disposing (void) + virtual void SAL_CALL disposing() throw (css::uno::RuntimeException) SAL_OVERRIDE; - void Connect (void); - void Disconnect (void); + void Connect(); + void Disconnect(); private: SelectionChangeHandler(const SelectionChangeHandler&) SAL_DELETED_FUNCTION; SelectionChangeHandler& operator=(const SelectionChangeHandler&) SAL_DELETED_FUNCTION; - const boost::function<rtl::OUString(void)> maSelectionChangeCallback; + const boost::function<rtl::OUString()> maSelectionChangeCallback; css::uno::Reference<css::frame::XController> mxController; const sfx2::sidebar::EnumContext::Context meDefaultContext; bool mbIsConnected; diff --git a/include/svx/sidebar/SidebarDialControl.hxx b/include/svx/sidebar/SidebarDialControl.hxx index a77d0f412419..1d829d27fe76 100644 --- a/include/svx/sidebar/SidebarDialControl.hxx +++ b/include/svx/sidebar/SidebarDialControl.hxx @@ -29,7 +29,7 @@ class SVX_DLLPUBLIC SidebarDialControl : public svx::DialControl { public: SidebarDialControl (vcl::Window* pParent, WinBits nBits = 0); - virtual ~SidebarDialControl (void); + virtual ~SidebarDialControl(); virtual Size GetOptimalSize() const SAL_OVERRIDE; virtual void MouseButtonDown (const MouseEvent& rMEvt) SAL_OVERRIDE; diff --git a/include/svx/sidebar/ValueSetWithTextControl.hxx b/include/svx/sidebar/ValueSetWithTextControl.hxx index 33054ead6feb..e6724b278c9c 100644 --- a/include/svx/sidebar/ValueSetWithTextControl.hxx +++ b/include/svx/sidebar/ValueSetWithTextControl.hxx @@ -52,7 +52,7 @@ public: vcl::Window* pParent, const ResId& rResId); - virtual ~ValueSetWithTextControl(void); + virtual ~ValueSetWithTextControl(); // add item for control type IMAGE_TEXT // if control type does not match IMAGE_TEXT no item is added. diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index 971c5b250f0f..6d0e2017771f 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -500,7 +500,7 @@ public: // @return // If no navigation position has been explicitly defined then the // result of GetOrdNum() is returned. - sal_uInt32 GetNavigationPosition (void); + sal_uInt32 GetNavigationPosition(); // Set the position in the navigation position to the given value. // This method is typically used only by the model after a change to diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx index 868dc49ee801..bdd0c981ab2a 100644 --- a/include/svx/svdpage.hxx +++ b/include/svx/svdpage.hxx @@ -201,7 +201,7 @@ public: different from those returne by SdrObject::GetOrdNum() and GetObj(). */ - bool HasObjectNavigationOrder (void) const; + bool HasObjectNavigationOrder() const; /** Set the navigation position of the given object to the specified value. Note that this changes the navigation position for all @@ -225,7 +225,7 @@ public: /** Restore the navigation order to that defined by the z-order. */ - void ClearObjectNavigationOrder (void); + void ClearObjectNavigationOrder(); /** Set the navigation position of all SdrObjects to their position in the mxNavigationOrder list. This method returns immediately when no @@ -237,7 +237,7 @@ public: for example because no explicit navigation order has been defined, i.e. HasObjectNavigationOrder() would return <FALSE/>. */ - bool RecalcNavigationPositions (void); + bool RecalcNavigationPositions(); /** Set the navigation order to the one defined by the given list of XShape objects. diff --git a/include/svx/swframeexample.hxx b/include/svx/swframeexample.hxx index b6f698c0773f..45bb9098c83a 100644 --- a/include/svx/swframeexample.hxx +++ b/include/svx/swframeexample.hxx @@ -61,7 +61,7 @@ class SVX_DLLPUBLIC SvxSwFrameExample : public vcl::Window Point aRelPos; - void InitColors_Impl( void ); + void InitColors_Impl(); void InitAllRects_Impl(); void CalcBoundRect_Impl(Rectangle &rRect); Rectangle DrawInnerFrame_Impl(const Rectangle &rRect, const Color &rFillColor, const Color &rBorderColor); diff --git a/include/svx/viewpt3d.hxx b/include/svx/viewpt3d.hxx index 1778bffb8da4..e546f20643a0 100644 --- a/include/svx/viewpt3d.hxx +++ b/include/svx/viewpt3d.hxx @@ -75,7 +75,7 @@ class SVX_DLLPUBLIC Viewport3D double fWRatio; // device/view aspect ratio double fHRatio; - void MakeTransform(void); + void MakeTransform(); public: Viewport3D(); diff --git a/include/svx/xmlexchg.hxx b/include/svx/xmlexchg.hxx index 7de6e3ab923c..18b09be08f8b 100644 --- a/include/svx/xmlexchg.hxx +++ b/include/svx/xmlexchg.hxx @@ -50,7 +50,7 @@ namespace svx OUString szServiceName; css::uno::Reference< css::beans::XPropertySet > xPropSet; - inline OXFormsDescriptor( void ) {} + inline OXFormsDescriptor() {} inline OXFormsDescriptor( const OXFormsDescriptor &rhs ) { *this=rhs; } inline OXFormsDescriptor &operator = ( const OXFormsDescriptor &rhs ) { szName = rhs.szName; diff --git a/include/toolkit/controls/eventcontainer.hxx b/include/toolkit/controls/eventcontainer.hxx index be41bdd6fc69..9ae4ef517d59 100644 --- a/include/toolkit/controls/eventcontainer.hxx +++ b/include/toolkit/controls/eventcontainer.hxx @@ -108,7 +108,7 @@ public: class ScriptEventContainer : public NameContainer_Impl { public: - ScriptEventContainer( void ); + ScriptEventContainer(); }; diff --git a/include/tools/inetstrm.hxx b/include/tools/inetstrm.hxx index d566799d1313..ea6be1f9c0fe 100644 --- a/include/tools/inetstrm.hxx +++ b/include/tools/inetstrm.hxx @@ -70,15 +70,15 @@ protected: public: INetMessageIStream (sal_uIntPtr nBufferSize = 2048); - virtual ~INetMessageIStream (void); + virtual ~INetMessageIStream(); TOOLS_DLLPUBLIC int Read (sal_Char *pData, sal_uIntPtr nSize); - INetMIMEMessage *GetSourceMessage (void) const { return pSourceMsg; } + INetMIMEMessage *GetSourceMessage() const { return pSourceMsg; } void SetSourceMessage (INetMIMEMessage *pMsg) { pSourceMsg = pMsg; } void SetHeaderGenerated() { bHeaderGenerated = true; } - bool IsHeaderGenerated (void) const { return bHeaderGenerated; } + bool IsHeaderGenerated() const { return bHeaderGenerated; } }; /// Message Parser Interface. @@ -98,16 +98,16 @@ protected: virtual int PutMsgLine (const sal_Char *pData, sal_uIntPtr nSize); public: - INetMessageOStream (void); - virtual ~INetMessageOStream (void); + INetMessageOStream(); + virtual ~INetMessageOStream(); int Write (const sal_Char *pData, sal_uIntPtr nSize); - INetMIMEMessage *GetTargetMessage (void) const { return pTargetMsg; } + INetMIMEMessage *GetTargetMessage() const { return pTargetMsg; } void SetTargetMessage (INetMIMEMessage *pMsg) { pTargetMsg = pMsg; } void ParseHeader (bool bParse = true) { bHeaderParsed = !bParse; } - bool IsHeaderParsed (void) const { return bHeaderParsed; } + bool IsHeaderParsed() const { return bHeaderParsed; } }; enum INetMessageEncoding @@ -145,7 +145,7 @@ protected: public: INetMIMEMessageStream (sal_uIntPtr nBufferSize = 2048); - virtual ~INetMIMEMessageStream (void); + virtual ~INetMIMEMessageStream(); }; #endif diff --git a/include/ucbhelper/fd_inputstream.hxx b/include/ucbhelper/fd_inputstream.hxx index c1b4125c4f93..3c206618d601 100644 --- a/include/ucbhelper/fd_inputstream.hxx +++ b/include/ucbhelper/fd_inputstream.hxx @@ -77,13 +77,13 @@ namespace ucbhelper css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL - available(void) + available() throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL - closeInput(void) + closeInput() throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -100,13 +100,13 @@ namespace ucbhelper virtual sal_Int64 SAL_CALL - getPosition(void) + getPosition() throw(css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int64 SAL_CALL - getLength(void) + getLength() throw(css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/include/unotools/accessiblerelationsethelper.hxx b/include/unotools/accessiblerelationsethelper.hxx index 42664db8c426..38a4cf430cfb 100644 --- a/include/unotools/accessiblerelationsethelper.hxx +++ b/include/unotools/accessiblerelationsethelper.hxx @@ -54,7 +54,7 @@ public: AccessibleRelationSetHelper (); AccessibleRelationSetHelper (const AccessibleRelationSetHelper& rHelper); protected: - virtual ~AccessibleRelationSetHelper (void); + virtual ~AccessibleRelationSetHelper(); public: //===== XAccessibleRelationSet ========================================== @@ -124,13 +124,13 @@ public: /** Returns a sequence of all supported interfaces. */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL - getTypes (void) + getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId (void) + getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: diff --git a/include/unotools/accessiblestatesethelper.hxx b/include/unotools/accessiblestatesethelper.hxx index 330a3e248e54..cdd6d948ba62 100644 --- a/include/unotools/accessiblestatesethelper.hxx +++ b/include/unotools/accessiblestatesethelper.hxx @@ -65,7 +65,7 @@ public: AccessibleStateSetHelper ( const AccessibleStateSetHelper& rHelper ); protected: - virtual ~AccessibleStateSetHelper (void); + virtual ~AccessibleStateSetHelper(); public: //===== XAccessibleStateSet ============================================== @@ -132,13 +132,13 @@ public: /** Returns a sequence of all supported interfaces. */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL - getTypes (void) + getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId (void) + getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: diff --git a/include/unotools/xmlaccelcfg.hxx b/include/unotools/xmlaccelcfg.hxx index 54fec55bcd90..fe1d95de866b 100644 --- a/include/unotools/xmlaccelcfg.hxx +++ b/include/unotools/xmlaccelcfg.hxx @@ -54,9 +54,9 @@ class OReadAccelatorDocumentHandler : public ::com::sun::star::xml::sax::XDocume const ::com::sun::star::uno::Type & rType ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XDocumentHandler - virtual void SAL_CALL startDocument(void) + virtual void SAL_CALL startDocument() throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL endDocument(void) + virtual void SAL_CALL endDocument() throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL startElement( const OUString& aName, diff --git a/include/vcl/lazydelete.hxx b/include/vcl/lazydelete.hxx index 531d64051e8b..ad4e9cfaeb8e 100644 --- a/include/vcl/lazydelete.hxx +++ b/include/vcl/lazydelete.hxx @@ -277,7 +277,7 @@ namespace vcl addDeinitContainer( this ); } virtual ~DeleteUnoReferenceOnDeinit() {} - ::com::sun::star::uno::Reference<I> get (void) { return m_xI; } + ::com::sun::star::uno::Reference<I> get() { return m_xI; } void set (const ::com::sun::star::uno::Reference<I>& r_xNew ) { diff --git a/include/vcl/salnativewidgets.hxx b/include/vcl/salnativewidgets.hxx index 359494075c0b..d473aea1b584 100644 --- a/include/vcl/salnativewidgets.hxx +++ b/include/vcl/salnativewidgets.hxx @@ -294,10 +294,10 @@ class VCL_DLLPUBLIC ImplControlValue ControlType getType() const { return mType; } - inline ButtonValue getTristateVal( void ) const { return mTristate; } + inline ButtonValue getTristateVal() const { return mTristate; } inline void setTristateVal( ButtonValue nTristate ) { mTristate = nTristate; } - inline long getNumericVal( void ) const { return mNumber; } + inline long getNumericVal() const { return mNumber; } inline void setNumericVal( long nNumeric ) { mNumber = nNumeric; } }; diff --git a/include/xmloff/XMLEmbeddedObjectExportFilter.hxx b/include/xmloff/XMLEmbeddedObjectExportFilter.hxx index a4a1b25155cc..8100c0f1aaad 100644 --- a/include/xmloff/XMLEmbeddedObjectExportFilter.hxx +++ b/include/xmloff/XMLEmbeddedObjectExportFilter.hxx @@ -41,9 +41,9 @@ public: virtual ~XMLEmbeddedObjectExportFilter () throw(); // ::com::sun::star::xml::sax::XDocumentHandler - virtual void SAL_CALL startDocument(void) + virtual void SAL_CALL startDocument() throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL endDocument(void) + virtual void SAL_CALL endDocument() throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL startElement(const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttribs) @@ -61,11 +61,11 @@ public: throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::xml::sax::XExtendedDocumentHandler - virtual void SAL_CALL startCDATA(void) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL endCDATA(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL startCDATA() throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL endCDATA() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL comment(const OUString& sComment) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL allowLineBreak(void) + virtual void SAL_CALL allowLineBreak() throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL unknown(const OUString& sString) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/include/xmloff/attrlist.hxx b/include/xmloff/attrlist.hxx index 240d53dd47d7..dda7903fab39 100644 --- a/include/xmloff/attrlist.hxx +++ b/include/xmloff/attrlist.hxx @@ -56,7 +56,7 @@ public: virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::xml::sax::XAttributeList - virtual sal_Int16 SAL_CALL getLength(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL getLength() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual OUString SAL_CALL getTypeByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/include/xmloff/unoatrcn.hxx b/include/xmloff/unoatrcn.hxx index 7f265e478d0a..d13a69fdf85e 100644 --- a/include/xmloff/unoatrcn.hxx +++ b/include/xmloff/unoatrcn.hxx @@ -56,12 +56,12 @@ public: virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::container::XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::container::XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& aName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::container::XNameReplace @@ -72,8 +72,8 @@ public: virtual void SAL_CALL removeByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; friend ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SvUnoAttributeContainer_CreateInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr ) throw( ::com::sun::star::uno::Exception ); diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx index 7b94d38e05cd..2939f6e10bea 100644 --- a/include/xmloff/xmlimp.hxx +++ b/include/xmloff/xmlimp.hxx @@ -259,11 +259,11 @@ public: throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; // ::com::sun::star::xml::sax::XExtendedDocumentHandler - virtual void SAL_CALL startCDATA(void) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL endCDATA(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL startCDATA() throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL endCDATA() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL comment(const OUString& sComment) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL allowLineBreak(void) + virtual void SAL_CALL allowLineBreak() throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL unknown(const OUString& sString) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/include/xmlscript/xmllib_imexp.hxx b/include/xmlscript/xmllib_imexp.hxx index 4f4f4780aa30..2820fa017ebc 100644 --- a/include/xmlscript/xmllib_imexp.hxx +++ b/include/xmlscript/xmllib_imexp.hxx @@ -49,7 +49,7 @@ struct XMLSCRIPT_DLLPUBLIC LibDescriptorArray LibDescriptor* mpLibs; sal_Int32 mnLibCount; - LibDescriptorArray( void ) { mpLibs = NULL; mnLibCount = 0; } + LibDescriptorArray() { mpLibs = NULL; mnLibCount = 0; } LibDescriptorArray( sal_Int32 nLibCount ); ~LibDescriptorArray(); diff --git a/io/source/TextInputStream/TextInputStream.cxx b/io/source/TextInputStream/TextInputStream.cxx index 09d2eec3da69..607f04104674 100644 --- a/io/source/TextInputStream/TextInputStream.cxx +++ b/io/source/TextInputStream/TextInputStream.cxx @@ -72,7 +72,7 @@ class OTextInputStream : public TextInputStreamHelper sal_Int32 mnCharsInBuffer; bool mbReachedEOF; - void implResizeBuffer( void ); + void implResizeBuffer(); OUString implReadString( const Sequence< sal_Unicode >& Delimiters, bool bRemoveDelimiter, bool bFindLineEnd ) throw(IOException, RuntimeException); @@ -111,7 +111,7 @@ public: // Methods XServiceInfo virtual OUString SAL_CALL getImplementationName() throw(std::exception) SAL_OVERRIDE; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(std::exception) SAL_OVERRIDE; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception) SAL_OVERRIDE; }; @@ -138,7 +138,7 @@ OTextInputStream::~OTextInputStream() delete[] mpBuffer; } -void OTextInputStream::implResizeBuffer( void ) +void OTextInputStream::implResizeBuffer() { sal_Int32 mnNewBufferSize = mnBufferSize * 2; sal_Unicode* pNewBuffer = new sal_Unicode[ mnNewBufferSize ]; @@ -461,7 +461,7 @@ sal_Bool OTextInputStream::supportsService(const OUString& ServiceName) throw(st return cppu::supportsService(this, ServiceName); } -Sequence< OUString > OTextInputStream::getSupportedServiceNames(void) throw(std::exception) +Sequence< OUString > OTextInputStream::getSupportedServiceNames() throw(std::exception) { return TextInputStream_getSupportedServiceNames(); } diff --git a/io/source/TextOutputStream/TextOutputStream.cxx b/io/source/TextOutputStream/TextOutputStream.cxx index e9f643329594..5d678a0a73c1 100644 --- a/io/source/TextOutputStream/TextOutputStream.cxx +++ b/io/source/TextOutputStream/TextOutputStream.cxx @@ -91,7 +91,7 @@ public: // Methods XServiceInfo virtual OUString SAL_CALL getImplementationName() throw(std::exception) SAL_OVERRIDE; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(std::exception) SAL_OVERRIDE; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception) SAL_OVERRIDE; }; @@ -270,7 +270,7 @@ sal_Bool OTextOutputStream::supportsService(const OUString& ServiceName) throw(s return cppu::supportsService(this, ServiceName); } -Sequence< OUString > OTextOutputStream::getSupportedServiceNames(void) throw(std::exception) +Sequence< OUString > OTextOutputStream::getSupportedServiceNames() throw(std::exception) { return TextOutputStream_getSupportedServiceNames(); } diff --git a/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx index d58aa9d6d546..4791dc21b8c8 100644 --- a/io/source/acceptor/acceptor.cxx +++ b/io/source/acceptor/acceptor.cxx @@ -62,7 +62,7 @@ namespace io_acceptor public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw(std::exception) SAL_OVERRIDE; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(std::exception) SAL_OVERRIDE; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception) SAL_OVERRIDE; private: @@ -294,7 +294,7 @@ namespace io_acceptor return cppu::supportsService(this, ServiceName); } - Sequence< OUString > OAcceptor::getSupportedServiceNames(void) throw(std::exception) + Sequence< OUString > OAcceptor::getSupportedServiceNames() throw(std::exception) { return acceptor_getSupportedServiceNames(); } diff --git a/io/source/connector/connector.cxx b/io/source/connector/connector.cxx index 81bfdb64ddb2..9b9477ff869f 100644 --- a/io/source/connector/connector.cxx +++ b/io/source/connector/connector.cxx @@ -61,7 +61,7 @@ namespace stoc_connector public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw(std::exception) SAL_OVERRIDE; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(std::exception) SAL_OVERRIDE; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception) SAL_OVERRIDE; }; @@ -197,7 +197,7 @@ namespace stoc_connector return cppu::supportsService(this, ServiceName); } - Sequence< OUString > OConnector::getSupportedServiceNames(void) throw(std::exception) + Sequence< OUString > OConnector::getSupportedServiceNames() throw(std::exception) { return connector_getSupportedServiceNames(); } diff --git a/io/source/services.hxx b/io/source/services.hxx index 89dc339195b2..e6a55da677a3 100644 --- a/io/source/services.hxx +++ b/io/source/services.hxx @@ -58,35 +58,35 @@ namespace io_TextOutputStream { namespace io_stm { Reference< XInterface > SAL_CALL OPipeImpl_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw (Exception); OUString OPipeImpl_getImplementationName(); - Sequence<OUString> OPipeImpl_getSupportedServiceNames(void); + Sequence<OUString> OPipeImpl_getSupportedServiceNames(); Reference< XInterface > SAL_CALL ODataInputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw (Exception); OUString ODataInputStream_getImplementationName(); - Sequence<OUString> ODataInputStream_getSupportedServiceNames(void); + Sequence<OUString> ODataInputStream_getSupportedServiceNames(); Reference< XInterface > SAL_CALL ODataOutputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw (Exception); OUString ODataOutputStream_getImplementationName(); - Sequence<OUString> ODataOutputStream_getSupportedServiceNames(void); + Sequence<OUString> ODataOutputStream_getSupportedServiceNames(); Reference< XInterface > SAL_CALL OMarkableOutputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw (Exception); OUString OMarkableOutputStream_getImplementationName(); - Sequence<OUString> OMarkableOutputStream_getSupportedServiceNames(void); + Sequence<OUString> OMarkableOutputStream_getSupportedServiceNames(); Reference< XInterface > SAL_CALL OMarkableInputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw (Exception); OUString OMarkableInputStream_getImplementationName() ; - Sequence<OUString> OMarkableInputStream_getSupportedServiceNames(void); + Sequence<OUString> OMarkableInputStream_getSupportedServiceNames(); Reference< XInterface > SAL_CALL OObjectOutputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw(Exception); OUString OObjectOutputStream_getImplementationName(); - Sequence<OUString> OObjectOutputStream_getSupportedServiceNames(void); + Sequence<OUString> OObjectOutputStream_getSupportedServiceNames(); Reference< XInterface > SAL_CALL OObjectInputStream_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw(Exception); OUString OObjectInputStream_getImplementationName() ; - Sequence<OUString> OObjectInputStream_getSupportedServiceNames(void); + Sequence<OUString> OObjectInputStream_getSupportedServiceNames(); Reference< XInterface > SAL_CALL OPumpImpl_CreateInstance( const Reference< XComponentContext > & rSMgr ) throw (Exception); OUString OPumpImpl_getImplementationName(); - Sequence<OUString> OPumpImpl_getSupportedServiceNames(void); + Sequence<OUString> OPumpImpl_getSupportedServiceNames(); } #endif diff --git a/io/source/stm/odata.cxx b/io/source/stm/odata.cxx index e03ae4471787..fa289f15c398 100644 --- a/io/source/stm/odata.cxx +++ b/io/source/stm/odata.cxx @@ -76,39 +76,39 @@ public: // XInputStream virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) throw ( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL available(void) throw ( NotConnectedException, + virtual sal_Int32 SAL_CALL available() throw ( NotConnectedException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL closeInput(void) throw ( NotConnectedException, + virtual void SAL_CALL closeInput() throw ( NotConnectedException, RuntimeException, std::exception) SAL_OVERRIDE; public: // XDataInputStream - virtual sal_Int8 SAL_CALL readBoolean(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int8 SAL_CALL readByte(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Unicode SAL_CALL readChar(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int16 SAL_CALL readShort(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL readLong(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int64 SAL_CALL readHyper(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual float SAL_CALL readFloat(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual double SAL_CALL readDouble(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL readUTF(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int8 SAL_CALL readBoolean() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int8 SAL_CALL readByte() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Unicode SAL_CALL readChar() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL readShort() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL readLong() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL readHyper() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual float SAL_CALL readFloat() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL readDouble() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL readUTF() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; public: // XActiveDataSink virtual void SAL_CALL setInputStream(const Reference< XInputStream > & aStream) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual Reference< XInputStream > SAL_CALL getInputStream(void) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual Reference< XInputStream > SAL_CALL getInputStream() throw (RuntimeException, std::exception) SAL_OVERRIDE; public: // XConnectable virtual void SAL_CALL setPredecessor(const Reference < XConnectable >& aPredecessor) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual Reference < XConnectable > SAL_CALL getPredecessor(void) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual Reference < XConnectable > SAL_CALL getPredecessor() throw (RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setSuccessor(const Reference < XConnectable >& aSuccessor) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual Reference < XConnectable > SAL_CALL getSuccessor(void) throw (RuntimeException, std::exception) SAL_OVERRIDE ; + virtual Reference < XConnectable > SAL_CALL getSuccessor() throw (RuntimeException, std::exception) SAL_OVERRIDE ; public: // XServiceInfo OUString SAL_CALL getImplementationName() throw (std::exception) SAL_OVERRIDE; - Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw (std::exception) SAL_OVERRIDE; + Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (std::exception) SAL_OVERRIDE; protected: @@ -173,7 +173,7 @@ void ODataInputStream::skipBytes(sal_Int32 nBytesToSkip) } -sal_Int32 ODataInputStream::available(void) +sal_Int32 ODataInputStream::available() throw ( NotConnectedException, RuntimeException, std::exception) { @@ -190,7 +190,7 @@ sal_Int32 ODataInputStream::available(void) return nAvail; } -void ODataInputStream::closeInput(void ) +void ODataInputStream::closeInput() throw ( NotConnectedException, RuntimeException, std::exception) { @@ -213,12 +213,12 @@ void ODataInputStream::closeInput(void ) //== XDataInputStream =========================================== // XDataInputStream -sal_Int8 ODataInputStream::readBoolean(void) throw (IOException, RuntimeException, std::exception) +sal_Int8 ODataInputStream::readBoolean() throw (IOException, RuntimeException, std::exception) { return readByte(); } -sal_Int8 ODataInputStream::readByte(void) throw (IOException, RuntimeException, std::exception) +sal_Int8 ODataInputStream::readByte() throw (IOException, RuntimeException, std::exception) { Sequence<sal_Int8> aTmp(1); if( 1 != readBytes( aTmp, 1 ) ) @@ -228,7 +228,7 @@ sal_Int8 ODataInputStream::readByte(void) throw (IOException, RuntimeExceptio return aTmp.getArray()[0]; } -sal_Unicode ODataInputStream::readChar(void) throw (IOException, RuntimeException, std::exception) +sal_Unicode ODataInputStream::readChar() throw (IOException, RuntimeException, std::exception) { Sequence<sal_Int8> aTmp(2); if( 2 != readBytes( aTmp, 2 ) ) @@ -240,7 +240,7 @@ sal_Unicode ODataInputStream::readChar(void) throw (IOException, RuntimeExceptio return ((sal_Unicode)pBytes[0] << 8) + pBytes[1]; } -sal_Int16 ODataInputStream::readShort(void) throw (IOException, RuntimeException, std::exception) +sal_Int16 ODataInputStream::readShort() throw (IOException, RuntimeException, std::exception) { Sequence<sal_Int8> aTmp(2); if( 2 != readBytes( aTmp, 2 ) ) @@ -253,7 +253,7 @@ sal_Int16 ODataInputStream::readShort(void) throw (IOException, RuntimeException } -sal_Int32 ODataInputStream::readLong(void) throw (IOException, RuntimeException, std::exception) +sal_Int32 ODataInputStream::readLong() throw (IOException, RuntimeException, std::exception) { Sequence<sal_Int8> aTmp(4); if( 4 != readBytes( aTmp, 4 ) ) @@ -266,7 +266,7 @@ sal_Int32 ODataInputStream::readLong(void) throw (IOException, RuntimeException, } -sal_Int64 ODataInputStream::readHyper(void) throw (IOException, RuntimeException, std::exception) +sal_Int64 ODataInputStream::readHyper() throw (IOException, RuntimeException, std::exception) { Sequence<sal_Int8> aTmp(8); if( 8 != readBytes( aTmp, 8 ) ) @@ -286,14 +286,14 @@ sal_Int64 ODataInputStream::readHyper(void) throw (IOException, RuntimeException pBytes[7]; } -float ODataInputStream::readFloat(void) throw (IOException, RuntimeException, std::exception) +float ODataInputStream::readFloat() throw (IOException, RuntimeException, std::exception) { union { float f; sal_uInt32 n; } a; a.n = readLong(); return a.f; } -double ODataInputStream::readDouble(void) throw (IOException, RuntimeException, std::exception) +double ODataInputStream::readDouble() throw (IOException, RuntimeException, std::exception) { union { double d; struct { sal_uInt32 n1; sal_uInt32 n2; } ad; } a; #if defined OSL_LITENDIAN @@ -306,7 +306,7 @@ double ODataInputStream::readDouble(void) throw (IOException, RuntimeException, return a.d; } -OUString ODataInputStream::readUTF(void) throw (IOException, RuntimeException, std::exception) +OUString ODataInputStream::readUTF() throw (IOException, RuntimeException, std::exception) { sal_uInt16 nShortLen = (sal_uInt16)readShort(); sal_Int32 nUTFLen; @@ -401,7 +401,7 @@ void ODataInputStream::setInputStream(const Reference< XInputStream > & aStream) m_bValidStream = m_input.is(); } -Reference< XInputStream > ODataInputStream::getInputStream(void) throw (RuntimeException, std::exception) +Reference< XInputStream > ODataInputStream::getInputStream() throw (RuntimeException, std::exception) { return m_input; } @@ -460,7 +460,7 @@ sal_Bool ODataInputStream::supportsService(const OUString& ServiceName) throw (s } // XServiceInfo -Sequence< OUString > ODataInputStream::getSupportedServiceNames(void) throw (std::exception) +Sequence< OUString > ODataInputStream::getSupportedServiceNames() throw (std::exception) { return ODataInputStream_getSupportedServiceNames(); } @@ -485,7 +485,7 @@ OUString ODataInputStream_getImplementationName() return OUString("com.sun.star.comp.io.stm.DataInputStream"); } -Sequence<OUString> ODataInputStream_getSupportedServiceNames(void) +Sequence<OUString> ODataInputStream_getSupportedServiceNames() { Sequence<OUString> aRet(1); aRet.getArray()[0] = "com.sun.star.io.DataInputStream"; @@ -514,11 +514,11 @@ public: // XOutputStream throw ( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL flush(void) + virtual void SAL_CALL flush() throw ( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL closeOutput(void) + virtual void SAL_CALL closeOutput() throw ( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) SAL_OVERRIDE; @@ -537,21 +537,21 @@ public: // XDataOutputStream public: // XActiveDataSource virtual void SAL_CALL setOutputStream(const Reference< XOutputStream > & aStream) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual Reference < XOutputStream > SAL_CALL getOutputStream(void) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual Reference < XOutputStream > SAL_CALL getOutputStream() throw (RuntimeException, std::exception) SAL_OVERRIDE; public: // XConnectable virtual void SAL_CALL setPredecessor(const Reference < XConnectable >& aPredecessor) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual Reference < XConnectable > SAL_CALL getPredecessor(void) + virtual Reference < XConnectable > SAL_CALL getPredecessor() throw (RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setSuccessor(const Reference < XConnectable >& aSuccessor) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual Reference < XConnectable > SAL_CALL getSuccessor(void) + virtual Reference < XConnectable > SAL_CALL getSuccessor() throw (RuntimeException, std::exception) SAL_OVERRIDE; public: // XServiceInfo OUString SAL_CALL getImplementationName() throw (std::exception) SAL_OVERRIDE; - Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw (std::exception) SAL_OVERRIDE; + Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (std::exception) SAL_OVERRIDE; protected: @@ -581,7 +581,7 @@ void ODataOutputStream::writeBytes(const Sequence< sal_Int8 >& aData) } } -void ODataOutputStream::flush(void) +void ODataOutputStream::flush() throw ( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) @@ -598,7 +598,7 @@ void ODataOutputStream::flush(void) } -void ODataOutputStream::closeOutput(void) +void ODataOutputStream::closeOutput() throw ( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) @@ -791,7 +791,7 @@ void ODataOutputStream::setOutputStream(const Reference< XOutputStream > & aStre } } -Reference< XOutputStream > ODataOutputStream::getOutputStream(void) +Reference< XOutputStream > ODataOutputStream::getOutputStream() throw (RuntimeException, std::exception) { return m_output; @@ -855,7 +855,7 @@ sal_Bool ODataOutputStream::supportsService(const OUString& ServiceName) throw ( } // XServiceInfo -Sequence< OUString > ODataOutputStream::getSupportedServiceNames(void) throw (std::exception) +Sequence< OUString > ODataOutputStream::getSupportedServiceNames() throw (std::exception) { return ODataOutputStream_getSupportedServiceNames(); } @@ -875,7 +875,7 @@ OUString ODataOutputStream_getImplementationName() return OUString("com.sun.star.comp.io.stm.DataOutputStream"); } -Sequence<OUString> ODataOutputStream_getSupportedServiceNames(void) +Sequence<OUString> ODataOutputStream_getSupportedServiceNames() { Sequence<OUString> aRet(1); aRet.getArray()[0] = "com.sun.star.io.DataOutputStream"; @@ -931,13 +931,13 @@ public: RuntimeException, std::exception) SAL_OVERRIDE { ODataOutputStream::writeBytes( aData ); } - virtual void SAL_CALL flush(void) + virtual void SAL_CALL flush() throw ( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) SAL_OVERRIDE { ODataOutputStream::flush(); } - virtual void SAL_CALL closeOutput(void) + virtual void SAL_CALL closeOutput() throw ( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) SAL_OVERRIDE @@ -968,16 +968,16 @@ public: virtual void SAL_CALL writeObject( const Reference< XPersistObject > & r ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: // XMarkableStream - virtual sal_Int32 SAL_CALL createMark(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL createMark() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL deleteMark(sal_Int32 Mark) throw (IOException, IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL jumpToMark(sal_Int32 nMark) throw (IOException, IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL jumpToFurthest(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL jumpToFurthest() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL offsetToMark(sal_Int32 nMark) throw (IOException, IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; public: // XServiceInfo OUString SAL_CALL getImplementationName() throw (std::exception) SAL_OVERRIDE; - Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw (std::exception) SAL_OVERRIDE; + Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (std::exception) SAL_OVERRIDE; private: @@ -1060,7 +1060,7 @@ void OObjectOutputStream::writeObject( const Reference< XPersistObject > & xPObj -void OObjectOutputStream::connectToMarkable(void) +void OObjectOutputStream::connectToMarkable() { if( ! m_bValidMarkable ) { if( ! m_bValidStream ) @@ -1089,7 +1089,7 @@ void OObjectOutputStream::connectToMarkable(void) } -sal_Int32 OObjectOutputStream::createMark(void) +sal_Int32 OObjectOutputStream::createMark() throw (IOException, RuntimeException, std::exception) { connectToMarkable(); // throws an exception, if a markable is not connected ! @@ -1118,7 +1118,7 @@ void OObjectOutputStream::jumpToMark(sal_Int32 nMark) } -void OObjectOutputStream::jumpToFurthest(void) +void OObjectOutputStream::jumpToFurthest() throw (IOException, RuntimeException, std::exception) { connectToMarkable(); @@ -1151,7 +1151,7 @@ OUString OObjectOutputStream_getImplementationName() return OUString("com.sun.star.comp.io.stm.ObjectOutputStream"); } -Sequence<OUString> OObjectOutputStream_getSupportedServiceNames(void) +Sequence<OUString> OObjectOutputStream_getSupportedServiceNames() { Sequence<OUString> aRet(1); aRet.getArray()[0] = "com.sun.star.io.ObjectOutputStream"; @@ -1171,7 +1171,7 @@ sal_Bool OObjectOutputStream::supportsService(const OUString& ServiceName) throw } // XServiceInfo -Sequence< OUString > OObjectOutputStream::getSupportedServiceNames(void) throw (std::exception) +Sequence< OUString > OObjectOutputStream::getSupportedServiceNames() throw (std::exception) { return OObjectOutputStream_getSupportedServiceNames(); } @@ -1209,51 +1209,51 @@ public: // XInputStream RuntimeException, std::exception) SAL_OVERRIDE { ODataInputStream::skipBytes( nBytesToSkip ); } - virtual sal_Int32 SAL_CALL available(void) + virtual sal_Int32 SAL_CALL available() throw ( NotConnectedException, RuntimeException, std::exception) SAL_OVERRIDE { return ODataInputStream::available(); } - virtual void SAL_CALL closeInput(void) + virtual void SAL_CALL closeInput() throw ( NotConnectedException, RuntimeException, std::exception) SAL_OVERRIDE { ODataInputStream::closeInput(); } public: // XDataInputStream - virtual sal_Int8 SAL_CALL readBoolean(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Int8 SAL_CALL readBoolean() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE { return ODataInputStream::readBoolean(); } - virtual sal_Int8 SAL_CALL readByte(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Int8 SAL_CALL readByte() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE { return ODataInputStream::readByte(); } - virtual sal_Unicode SAL_CALL readChar(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Unicode SAL_CALL readChar() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE { return ODataInputStream::readChar(); } - virtual sal_Int16 SAL_CALL readShort(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Int16 SAL_CALL readShort() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE { return ODataInputStream::readShort(); } - virtual sal_Int32 SAL_CALL readLong(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Int32 SAL_CALL readLong() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE { return ODataInputStream::readLong(); } - virtual sal_Int64 SAL_CALL readHyper(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Int64 SAL_CALL readHyper() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE { return ODataInputStream::readHyper(); } - virtual float SAL_CALL readFloat(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE + virtual float SAL_CALL readFloat() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE { return ODataInputStream::readFloat(); } - virtual double SAL_CALL readDouble(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE + virtual double SAL_CALL readDouble() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE { return ODataInputStream::readDouble(); } - virtual OUString SAL_CALL readUTF(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE + virtual OUString SAL_CALL readUTF() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE { return ODataInputStream::readUTF(); } public: // XObjectInputStream virtual Reference< XPersistObject > SAL_CALL readObject( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: // XMarkableStream - virtual sal_Int32 SAL_CALL createMark(void) + virtual sal_Int32 SAL_CALL createMark() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL deleteMark(sal_Int32 Mark) throw (IOException, IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL jumpToMark(sal_Int32 nMark) throw (IOException, IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL jumpToFurthest(void) throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL jumpToFurthest() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL offsetToMark(sal_Int32 nMark) throw (IOException, IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; public: // XServiceInfo OUString SAL_CALL getImplementationName() throw (std::exception) SAL_OVERRIDE; - Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw (std::exception) SAL_OVERRIDE; + Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (std::exception) SAL_OVERRIDE; private: @@ -1386,7 +1386,7 @@ void OObjectInputStream::connectToMarkable() } } -sal_Int32 OObjectInputStream::createMark(void) throw (IOException, RuntimeException, std::exception) +sal_Int32 OObjectInputStream::createMark() throw (IOException, RuntimeException, std::exception) { connectToMarkable(); // throws an exception, if a markable is not connected ! @@ -1410,7 +1410,7 @@ void OObjectInputStream::jumpToMark(sal_Int32 nMark) throw (IOException, } m_rMarkable->jumpToMark( nMark ); } -void OObjectInputStream::jumpToFurthest(void) throw (IOException, RuntimeException, std::exception) +void OObjectInputStream::jumpToFurthest() throw (IOException, RuntimeException, std::exception) { connectToMarkable(); m_rMarkable->jumpToFurthest(); @@ -1439,7 +1439,7 @@ sal_Bool OObjectInputStream::supportsService(const OUString& ServiceName) throw } // XServiceInfo -Sequence< OUString > OObjectInputStream::getSupportedServiceNames(void) throw (std::exception) +Sequence< OUString > OObjectInputStream::getSupportedServiceNames() throw (std::exception) { return OObjectInputStream_getSupportedServiceNames(); } @@ -1455,7 +1455,7 @@ OUString OObjectInputStream_getImplementationName() return OUString("com.sun.star.comp.io.stm.ObjectInputStream"); } -Sequence<OUString> OObjectInputStream_getSupportedServiceNames(void) +Sequence<OUString> OObjectInputStream_getSupportedServiceNames() { Sequence<OUString> aRet(1); aRet.getArray()[0] = "com.sun.star.io.ObjectInputStream"; diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx index 004842c7c9df..c3d6f1e55e0c 100644 --- a/io/source/stm/omark.cxx +++ b/io/source/stm/omark.cxx @@ -82,17 +82,17 @@ public: // XOutputStream throw ( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL flush(void) + virtual void SAL_CALL flush() throw ( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL closeOutput(void) + virtual void SAL_CALL closeOutput() throw ( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) SAL_OVERRIDE; public: // XMarkable - virtual sal_Int32 SAL_CALL createMark(void) + virtual sal_Int32 SAL_CALL createMark() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL deleteMark(sal_Int32 Mark) throw (IOException, @@ -102,7 +102,7 @@ public: // XMarkable throw (IOException, IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL jumpToFurthest(void) + virtual void SAL_CALL jumpToFurthest() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL offsetToMark(sal_Int32 nMark) throw (IOException, @@ -112,20 +112,20 @@ public: // XMarkable public: // XActiveDataSource virtual void SAL_CALL setOutputStream(const Reference < XOutputStream > & aStream) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual Reference < XOutputStream > SAL_CALL getOutputStream(void) + virtual Reference < XOutputStream > SAL_CALL getOutputStream() throw (RuntimeException, std::exception) SAL_OVERRIDE; public: // XConnectable virtual void SAL_CALL setPredecessor(const Reference < XConnectable > & aPredecessor) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual Reference < XConnectable > SAL_CALL getPredecessor(void) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual Reference < XConnectable > SAL_CALL getPredecessor() throw (RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setSuccessor(const Reference < XConnectable >& aSuccessor) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual Reference< XConnectable > SAL_CALL getSuccessor(void) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual Reference< XConnectable > SAL_CALL getSuccessor() throw (RuntimeException, std::exception) SAL_OVERRIDE; public: // XServiceInfo OUString SAL_CALL getImplementationName() throw (std::exception) SAL_OVERRIDE; - Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw (std::exception) SAL_OVERRIDE; + Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (std::exception) SAL_OVERRIDE; private: @@ -195,7 +195,7 @@ void OMarkableOutputStream::writeBytes(const Sequence< sal_Int8 >& aData) } } -void OMarkableOutputStream::flush(void) +void OMarkableOutputStream::flush() throw ( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) @@ -215,7 +215,7 @@ void OMarkableOutputStream::flush(void) } } -void OMarkableOutputStream::closeOutput(void) +void OMarkableOutputStream::closeOutput() throw ( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) @@ -243,7 +243,7 @@ void OMarkableOutputStream::closeOutput(void) } -sal_Int32 OMarkableOutputStream::createMark(void) +sal_Int32 OMarkableOutputStream::createMark() throw ( IOException, RuntimeException, std::exception) { @@ -297,7 +297,7 @@ void OMarkableOutputStream::jumpToMark(sal_Int32 nMark) } } -void OMarkableOutputStream::jumpToFurthest(void) +void OMarkableOutputStream::jumpToFurthest() throw (IOException, RuntimeException, std::exception) { @@ -341,7 +341,7 @@ void OMarkableOutputStream::setOutputStream(const Reference < XOutputStream >& a m_bValidStream = m_output.is(); } -Reference< XOutputStream > OMarkableOutputStream::getOutputStream(void) throw (RuntimeException, std::exception) +Reference< XOutputStream > OMarkableOutputStream::getOutputStream() throw (RuntimeException, std::exception) { return m_output; } @@ -435,7 +435,7 @@ sal_Bool OMarkableOutputStream::supportsService(const OUString& ServiceName) thr } // XServiceInfo -Sequence< OUString > OMarkableOutputStream::getSupportedServiceNames(void) throw (std::exception) +Sequence< OUString > OMarkableOutputStream::getSupportedServiceNames() throw (std::exception) { return OMarkableOutputStream_getSupportedServiceNames(); } @@ -459,7 +459,7 @@ OUString OMarkableOutputStream_getImplementationName() return OUString("com.sun.star.comp.io.stm.MarkableOutputStream"); } -Sequence<OUString> OMarkableOutputStream_getSupportedServiceNames(void) +Sequence<OUString> OMarkableOutputStream_getSupportedServiceNames() { Sequence<OUString> aRet(1); aRet.getArray()[0] = "com.sun.star.io.MarkableOutputStream"; @@ -507,19 +507,19 @@ public: // XInputStream BufferSizeExceededException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL available(void) + virtual sal_Int32 SAL_CALL available() throw ( NotConnectedException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL closeInput(void) throw (NotConnectedException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL closeInput() throw (NotConnectedException, RuntimeException, std::exception) SAL_OVERRIDE; public: // XMarkable - virtual sal_Int32 SAL_CALL createMark(void) + virtual sal_Int32 SAL_CALL createMark() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL deleteMark(sal_Int32 Mark) throw (IOException, IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL jumpToMark(sal_Int32 nMark) throw (IOException, IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL jumpToFurthest(void) + virtual void SAL_CALL jumpToFurthest() throw (IOException, RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL offsetToMark(sal_Int32 nMark) throw (IOException, IllegalArgumentException,RuntimeException, std::exception) SAL_OVERRIDE; @@ -527,21 +527,21 @@ public: // XMarkable public: // XActiveDataSink virtual void SAL_CALL setInputStream(const Reference < XInputStream > & aStream) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual Reference < XInputStream > SAL_CALL getInputStream(void) + virtual Reference < XInputStream > SAL_CALL getInputStream() throw (RuntimeException, std::exception) SAL_OVERRIDE; public: // XConnectable virtual void SAL_CALL setPredecessor(const Reference < XConnectable > & aPredecessor) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual Reference < XConnectable > SAL_CALL getPredecessor(void) + virtual Reference < XConnectable > SAL_CALL getPredecessor() throw (RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setSuccessor(const Reference < XConnectable > & aSuccessor) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual Reference < XConnectable > SAL_CALL getSuccessor(void) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual Reference < XConnectable > SAL_CALL getSuccessor() throw (RuntimeException, std::exception) SAL_OVERRIDE; public: // XServiceInfo OUString SAL_CALL getImplementationName() throw (std::exception) SAL_OVERRIDE; - Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw (std::exception) SAL_OVERRIDE; + Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (std::exception) SAL_OVERRIDE; private: @@ -718,7 +718,7 @@ void OMarkableInputStream::skipBytes(sal_Int32 nBytesToSkip) readBytes( seqDummy , nBytesToSkip ); } -sal_Int32 OMarkableInputStream::available(void) throw (NotConnectedException, RuntimeException, std::exception) +sal_Int32 OMarkableInputStream::available() throw (NotConnectedException, RuntimeException, std::exception) { sal_Int32 nAvail; if( m_bValidStream ) { @@ -736,7 +736,7 @@ sal_Int32 OMarkableInputStream::available(void) throw (NotConnectedException, Ru } -void OMarkableInputStream::closeInput(void) throw (NotConnectedException, RuntimeException, std::exception) +void OMarkableInputStream::closeInput() throw (NotConnectedException, RuntimeException, std::exception) { if( m_bValidStream ) { MutexGuard guard( m_mutex ); @@ -761,7 +761,7 @@ void OMarkableInputStream::closeInput(void) throw (NotConnectedException, Runtim // XMarkable -sal_Int32 OMarkableInputStream::createMark(void) throw (IOException, RuntimeException, std::exception) +sal_Int32 OMarkableInputStream::createMark() throw (IOException, RuntimeException, std::exception) { MutexGuard guard( m_mutex ); sal_Int32 nMark = m_nCurrentMark; @@ -812,7 +812,7 @@ void OMarkableInputStream::jumpToMark(sal_Int32 nMark) } } -void OMarkableInputStream::jumpToFurthest(void) throw (IOException, RuntimeException, std::exception) +void OMarkableInputStream::jumpToFurthest() throw (IOException, RuntimeException, std::exception) { MutexGuard guard( m_mutex ); m_nCurrentPos = m_pBuffer->getSize(); @@ -860,7 +860,7 @@ void OMarkableInputStream::setInputStream(const Reference< XInputStream > & aStr } -Reference< XInputStream > OMarkableInputStream::getInputStream(void) throw (RuntimeException, std::exception) +Reference< XInputStream > OMarkableInputStream::getInputStream() throw (RuntimeException, std::exception) { return m_input; } @@ -951,7 +951,7 @@ sal_Bool OMarkableInputStream::supportsService(const OUString& ServiceName) thro } // XServiceInfo -Sequence< OUString > OMarkableInputStream::getSupportedServiceNames(void) throw (std::exception) +Sequence< OUString > OMarkableInputStream::getSupportedServiceNames() throw (std::exception) { return OMarkableInputStream_getSupportedServiceNames(); } @@ -974,7 +974,7 @@ OUString OMarkableInputStream_getImplementationName() return OUString("com.sun.star.comp.io.stm.MarkableInputStream"); } -Sequence<OUString> OMarkableInputStream_getSupportedServiceNames(void) +Sequence<OUString> OMarkableInputStream_getSupportedServiceNames() { Sequence<OUString> aRet(1); aRet.getArray()[0] = "com.sun.star.io.MarkableInputStream"; diff --git a/io/source/stm/opipe.cxx b/io/source/stm/opipe.cxx index 8f4f952b8281..4315a999c7a2 100644 --- a/io/source/stm/opipe.cxx +++ b/io/source/stm/opipe.cxx @@ -70,10 +70,10 @@ public: // XInputStream throw( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL available(void) + virtual sal_Int32 SAL_CALL available() throw( NotConnectedException, RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL closeInput(void) + virtual void SAL_CALL closeInput() throw( NotConnectedException, RuntimeException, std::exception ) SAL_OVERRIDE; @@ -83,11 +83,11 @@ public: // XOutputStream throw( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL flush(void) + virtual void SAL_CALL flush() throw( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL closeOutput(void) + virtual void SAL_CALL closeOutput() throw( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception ) SAL_OVERRIDE; @@ -95,15 +95,15 @@ public: // XOutputStream public: // XConnectable virtual void SAL_CALL setPredecessor(const Reference< XConnectable >& aPredecessor) throw( RuntimeException, std::exception ) SAL_OVERRIDE; - virtual Reference< XConnectable > SAL_CALL getPredecessor(void) throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual Reference< XConnectable > SAL_CALL getPredecessor() throw( RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setSuccessor(const Reference < XConnectable > & aSuccessor) throw( RuntimeException, std::exception ) SAL_OVERRIDE; - virtual Reference < XConnectable > SAL_CALL getSuccessor(void) throw( RuntimeException, std::exception ) SAL_OVERRIDE ; + virtual Reference < XConnectable > SAL_CALL getSuccessor() throw( RuntimeException, std::exception ) SAL_OVERRIDE ; public: // XServiceInfo OUString SAL_CALL getImplementationName() throw(std::exception ) SAL_OVERRIDE; - Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(std::exception ) SAL_OVERRIDE; + Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception ) SAL_OVERRIDE; sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception ) SAL_OVERRIDE; private: @@ -242,7 +242,7 @@ void OPipeImpl::skipBytes(sal_Int32 nBytesToSkip) } -sal_Int32 OPipeImpl::available(void) +sal_Int32 OPipeImpl::available() throw( NotConnectedException, RuntimeException, std::exception ) { @@ -256,7 +256,7 @@ sal_Int32 OPipeImpl::available(void) return m_pFIFO->getSize(); } -void OPipeImpl::closeInput(void) +void OPipeImpl::closeInput() throw( NotConnectedException, RuntimeException, std::exception) { @@ -338,7 +338,7 @@ void OPipeImpl::writeBytes(const Sequence< sal_Int8 >& aData) } -void OPipeImpl::flush(void) +void OPipeImpl::flush() throw( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) @@ -347,7 +347,7 @@ void OPipeImpl::flush(void) return; } -void OPipeImpl::closeOutput(void) +void OPipeImpl::closeOutput() throw( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) @@ -417,7 +417,7 @@ sal_Bool OPipeImpl::supportsService(const OUString& ServiceName) throw(std::exce } // XServiceInfo -Sequence< OUString > OPipeImpl::getSupportedServiceNames(void) throw(std::exception ) +Sequence< OUString > OPipeImpl::getSupportedServiceNames() throw(std::exception ) { return OPipeImpl_getSupportedServiceNames(); } @@ -443,7 +443,7 @@ OUString OPipeImpl_getImplementationName() return OUString( IMPLEMENTATION_NAME ); } -Sequence<OUString> OPipeImpl_getSupportedServiceNames(void) +Sequence<OUString> OPipeImpl_getSupportedServiceNames() { Sequence<OUString> aRet(1); aRet.getArray()[0] = "com.sun.star.io.Pipe"; diff --git a/io/source/stm/opump.cxx b/io/source/stm/opump.cxx index 22e01d9f26cb..a45680048666 100644 --- a/io/source/stm/opump.cxx +++ b/io/source/stm/opump.cxx @@ -101,7 +101,7 @@ namespace io_stm { public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw(std::exception ) SAL_OVERRIDE; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(std::exception ) SAL_OVERRIDE; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception ) SAL_OVERRIDE; }; @@ -447,7 +447,7 @@ sal_Bool Pump::supportsService(const OUString& ServiceName) throw(std::exception } // XServiceInfo -Sequence< OUString > Pump::getSupportedServiceNames(void) throw(std::exception ) +Sequence< OUString > Pump::getSupportedServiceNames() throw(std::exception ) { return OPumpImpl_getSupportedServiceNames(); } @@ -465,7 +465,7 @@ OUString OPumpImpl_getImplementationName() return OUString("com.sun.star.comp.io.Pump"); } -Sequence<OUString> OPumpImpl_getSupportedServiceNames(void) +Sequence<OUString> OPumpImpl_getSupportedServiceNames() { OUString s("com.sun.star.io.Pump"); Sequence< OUString > seq( &s , 1 ); diff --git a/io/test/stm/datatest.cxx b/io/test/stm/datatest.cxx index ee378cf7066c..559f3e2a3c4a 100644 --- a/io/test/stm/datatest.cxx +++ b/io/test/stm/datatest.cxx @@ -79,10 +79,10 @@ public: throw ( IllegalArgumentException, RuntimeException); - virtual sal_Bool SAL_CALL testPassed(void) throw ( RuntimeException); - virtual Sequence< OUString > SAL_CALL getErrors(void) throw (RuntimeException); - virtual Sequence< Any > SAL_CALL getErrorExceptions(void) throw (RuntimeException); - virtual Sequence< OUString > SAL_CALL getWarnings(void) throw (RuntimeException); + virtual sal_Bool SAL_CALL testPassed() throw ( RuntimeException); + virtual Sequence< OUString > SAL_CALL getErrors() throw (RuntimeException); + virtual Sequence< Any > SAL_CALL getErrorExceptions() throw (RuntimeException); + virtual Sequence< OUString > SAL_CALL getWarnings() throw (RuntimeException); private: void testSimple( const Reference < XDataInputStream > & , const Reference < XDataOutputStream > &); @@ -222,25 +222,25 @@ sal_Int32 ODataStreamTest::test( -sal_Bool ODataStreamTest::testPassed(void) throw (RuntimeException) +sal_Bool ODataStreamTest::testPassed() throw (RuntimeException) { return m_seqErrors.getLength() == 0; } -Sequence< OUString > ODataStreamTest::getErrors(void) throw (RuntimeException) +Sequence< OUString > ODataStreamTest::getErrors() throw (RuntimeException) { return m_seqErrors; } -Sequence< Any > ODataStreamTest::getErrorExceptions(void) throw (RuntimeException) +Sequence< Any > ODataStreamTest::getErrorExceptions() throw (RuntimeException) { return m_seqExceptions; } -Sequence< OUString > ODataStreamTest::getWarnings(void) throw (RuntimeException) +Sequence< OUString > ODataStreamTest::getWarnings() throw (RuntimeException) { return m_seqWarnings; } @@ -384,7 +384,7 @@ public: public: - virtual OUString SAL_CALL getServiceName(void) throw (RuntimeException); + virtual OUString SAL_CALL getServiceName() throw (RuntimeException); virtual void SAL_CALL write( const Reference< XObjectOutputStream >& OutStream ) throw (IOException, RuntimeException); virtual void SAL_CALL read(const Reference< XObjectInputStream >& InStream) @@ -392,7 +392,7 @@ public: public: - virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo(void) + virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (RuntimeException); virtual void SAL_CALL setPropertyValue(const OUString& aPropertyName, const Any& aValue) @@ -446,7 +446,7 @@ public: -Reference <XPropertySetInfo > MyPersistObject::getPropertySetInfo(void) +Reference <XPropertySetInfo > MyPersistObject::getPropertySetInfo() throw (RuntimeException) { return Reference< XPropertySetInfo >(); diff --git a/io/test/stm/marktest.cxx b/io/test/stm/marktest.cxx index a9866af396dc..d743e32bf3a4 100644 --- a/io/test/stm/marktest.cxx +++ b/io/test/stm/marktest.cxx @@ -51,7 +51,7 @@ public: ~OMarkableOutputStreamTest(); public: // implementation names - static Sequence< OUString > getSupportedServiceNames_Static(void) throw (); + static Sequence< OUString > getSupportedServiceNames_Static() throw (); static OUString getImplementationName_Static() throw (); public: @@ -65,13 +65,13 @@ public: const Reference < XInterface >& TestObject, sal_Int32 hTestHandle) throw ( IllegalArgumentException, RuntimeException); - virtual sal_Bool SAL_CALL testPassed(void) + virtual sal_Bool SAL_CALL testPassed() throw ( RuntimeException); - virtual Sequence< OUString > SAL_CALL getErrors(void) + virtual Sequence< OUString > SAL_CALL getErrors() throw (RuntimeException); - virtual Sequence< Any > SAL_CALL getErrorExceptions(void) + virtual Sequence< Any > SAL_CALL getErrorExceptions() throw (RuntimeException); - virtual Sequence< OUString > SAL_CALL getWarnings(void) + virtual Sequence< OUString > SAL_CALL getWarnings() throw (RuntimeException); private: @@ -174,25 +174,25 @@ sal_Int32 OMarkableOutputStreamTest::test( -sal_Bool OMarkableOutputStreamTest::testPassed(void) throw (RuntimeException) +sal_Bool OMarkableOutputStreamTest::testPassed() throw (RuntimeException) { return m_seqErrors.getLength() == 0; } -Sequence< OUString > OMarkableOutputStreamTest::getErrors(void) throw (RuntimeException) +Sequence< OUString > OMarkableOutputStreamTest::getErrors() throw (RuntimeException) { return m_seqErrors; } -Sequence< Any > OMarkableOutputStreamTest::getErrorExceptions(void) throw (RuntimeException) +Sequence< Any > OMarkableOutputStreamTest::getErrorExceptions() throw (RuntimeException) { return m_seqExceptions; } -Sequence< OUString > OMarkableOutputStreamTest::getWarnings(void) throw (RuntimeException) +Sequence< OUString > OMarkableOutputStreamTest::getWarnings() throw (RuntimeException) { return m_seqWarnings; } @@ -375,7 +375,7 @@ Reference < XInterface > SAL_CALL OMarkableOutputStreamTest_CreateInstance( cons -Sequence<OUString> OMarkableOutputStreamTest_getSupportedServiceNames(void) throw () +Sequence<OUString> OMarkableOutputStreamTest_getSupportedServiceNames() throw () { Sequence<OUString> aRet(1); aRet.getArray()[0] = OMarkableOutputStreamTest_getImplementationName(); @@ -410,7 +410,7 @@ public: ~OMarkableInputStreamTest(); public: // implementation names - static Sequence< OUString > getSupportedServiceNames_Static(void) throw () ; + static Sequence< OUString > getSupportedServiceNames_Static() throw () ; static OUString getImplementationName_Static() throw () ; public: @@ -426,13 +426,13 @@ public: throw ( IllegalArgumentException, RuntimeException) ; - virtual sal_Bool SAL_CALL testPassed(void) + virtual sal_Bool SAL_CALL testPassed() throw ( RuntimeException); - virtual Sequence< OUString > SAL_CALL getErrors(void) + virtual Sequence< OUString > SAL_CALL getErrors() throw (RuntimeException); - virtual Sequence< Any > SAL_CALL getErrorExceptions(void) + virtual Sequence< Any > SAL_CALL getErrorExceptions() throw (RuntimeException); - virtual Sequence< OUString > SAL_CALL getWarnings(void) + virtual Sequence< OUString > SAL_CALL getWarnings() throw (RuntimeException); private: @@ -541,25 +541,25 @@ sal_Int32 OMarkableInputStreamTest::test( -sal_Bool OMarkableInputStreamTest::testPassed(void) throw (RuntimeException) +sal_Bool OMarkableInputStreamTest::testPassed() throw (RuntimeException) { return m_seqErrors.getLength() == 0; } -Sequence< OUString > OMarkableInputStreamTest::getErrors(void) throw (RuntimeException) +Sequence< OUString > OMarkableInputStreamTest::getErrors() throw (RuntimeException) { return m_seqErrors; } -Sequence< Any > OMarkableInputStreamTest::getErrorExceptions(void) throw (RuntimeException) +Sequence< Any > OMarkableInputStreamTest::getErrorExceptions() throw (RuntimeException) { return m_seqExceptions; } -Sequence< OUString > OMarkableInputStreamTest::getWarnings(void) throw (RuntimeException) +Sequence< OUString > OMarkableInputStreamTest::getWarnings() throw (RuntimeException) { return m_seqWarnings; } @@ -647,7 +647,7 @@ Reference < XInterface > SAL_CALL OMarkableInputStreamTest_CreateInstance( const -Sequence<OUString> OMarkableInputStreamTest_getSupportedServiceNames(void) throw () +Sequence<OUString> OMarkableInputStreamTest_getSupportedServiceNames() throw () { Sequence<OUString> aRet(1); aRet.getArray()[0] = OMarkableInputStreamTest_getImplementationName(); diff --git a/io/test/stm/pipetest.cxx b/io/test/stm/pipetest.cxx index 2aadab0db005..f2ad64308ae5 100644 --- a/io/test/stm/pipetest.cxx +++ b/io/test/stm/pipetest.cxx @@ -98,7 +98,7 @@ public: ~OPipeTest(); public: // implementation names - static Sequence< OUString > getSupportedServiceNames_Static(void) throw(); + static Sequence< OUString > getSupportedServiceNames_Static() throw(); static OUString getImplementationName_Static() throw(); public: @@ -111,10 +111,10 @@ public: throw ( IllegalArgumentException, RuntimeException); - virtual sal_Bool SAL_CALL testPassed(void) throw ( RuntimeException) ; - virtual Sequence< OUString > SAL_CALL getErrors(void) throw (RuntimeException) ; - virtual Sequence< Any > SAL_CALL getErrorExceptions(void) throw (RuntimeException); - virtual Sequence< OUString > SAL_CALL getWarnings(void) throw (RuntimeException); + virtual sal_Bool SAL_CALL testPassed() throw ( RuntimeException) ; + virtual Sequence< OUString > SAL_CALL getErrors() throw (RuntimeException) ; + virtual Sequence< Any > SAL_CALL getErrorExceptions() throw (RuntimeException); + virtual Sequence< OUString > SAL_CALL getWarnings() throw (RuntimeException); private: void testSimple( const Reference < XInterface > & ); @@ -206,25 +206,25 @@ sal_Int32 OPipeTest::test( -sal_Bool OPipeTest::testPassed(void) throw (RuntimeException) +sal_Bool OPipeTest::testPassed() throw (RuntimeException) { return m_seqErrors.getLength() == 0; } -Sequence< OUString > OPipeTest::getErrors(void) throw (RuntimeException) +Sequence< OUString > OPipeTest::getErrors() throw (RuntimeException) { return m_seqErrors; } -Sequence< Any > OPipeTest::getErrorExceptions(void) throw (RuntimeException) +Sequence< Any > OPipeTest::getErrorExceptions() throw (RuntimeException) { return m_seqExceptions; } -Sequence< OUString > OPipeTest::getWarnings(void) throw (RuntimeException) +Sequence< OUString > OPipeTest::getWarnings() throw (RuntimeException) { return m_seqWarnings; } @@ -409,7 +409,7 @@ Reference < XInterface > SAL_CALL OPipeTest_CreateInstance( const Reference< XMu -Sequence<OUString> OPipeTest_getSupportedServiceNames(void) throw() +Sequence<OUString> OPipeTest_getSupportedServiceNames() throw() { Sequence<OUString> aRet(1); aRet.getArray()[0] = OPipeTest_getServiceName(); diff --git a/io/test/stm/pumptest.cxx b/io/test/stm/pumptest.cxx index d911cd1b42ca..34a9a783ef8b 100644 --- a/io/test/stm/pumptest.cxx +++ b/io/test/stm/pumptest.cxx @@ -67,7 +67,7 @@ public: ~OPumpTest(); public: // implementation names - static Sequence< OUString > getSupportedServiceNames_Static(void) throw(); + static Sequence< OUString > getSupportedServiceNames_Static() throw(); static OUString getImplementationName_Static() throw(); public: @@ -80,10 +80,10 @@ public: throw ( IllegalArgumentException, RuntimeException); - virtual sal_Bool SAL_CALL testPassed(void) throw ( RuntimeException) ; - virtual Sequence< OUString > SAL_CALL getErrors(void) throw (RuntimeException) ; - virtual Sequence< Any > SAL_CALL getErrorExceptions(void) throw (RuntimeException); - virtual Sequence< OUString > SAL_CALL getWarnings(void) throw (RuntimeException); + virtual sal_Bool SAL_CALL testPassed() throw ( RuntimeException) ; + virtual Sequence< OUString > SAL_CALL getErrors() throw (RuntimeException) ; + virtual Sequence< Any > SAL_CALL getErrorExceptions() throw (RuntimeException); + virtual Sequence< OUString > SAL_CALL getWarnings() throw (RuntimeException); private: void testSimple( const Reference < XInterface > & ); @@ -190,25 +190,25 @@ sal_Int32 OPumpTest::test( -sal_Bool OPumpTest::testPassed(void) throw (RuntimeException) +sal_Bool OPumpTest::testPassed() throw (RuntimeException) { return m_seqErrors.getLength() == 0; } -Sequence< OUString > OPumpTest::getErrors(void) throw (RuntimeException) +Sequence< OUString > OPumpTest::getErrors() throw (RuntimeException) { return m_seqErrors; } -Sequence< Any > OPumpTest::getErrorExceptions(void) throw (RuntimeException) +Sequence< Any > OPumpTest::getErrorExceptions() throw (RuntimeException) { return m_seqExceptions; } -Sequence< OUString > OPumpTest::getWarnings(void) throw (RuntimeException) +Sequence< OUString > OPumpTest::getWarnings() throw (RuntimeException) { return m_seqWarnings; } @@ -420,7 +420,7 @@ Reference< XInterface > SAL_CALL OPumpTest_CreateInstance( const Reference< XMul return *new OPumpTest( rSMgr ); } -Sequence<OUString> OPumpTest_getSupportedServiceNames(void) throw() +Sequence<OUString> OPumpTest_getSupportedServiceNames() throw() { OUString s = OPumpTest_getServiceName(); Sequence< OUString > seq( &s , 1 ); diff --git a/io/test/stm/testfactreg.hxx b/io/test/stm/testfactreg.hxx index 6578bc5d320e..787a6faef428 100644 --- a/io/test/stm/testfactreg.hxx +++ b/io/test/stm/testfactreg.hxx @@ -23,12 +23,12 @@ #include <rtl/strbuf.hxx> Reference< XInterface > SAL_CALL OPipeTest_CreateInstance( const Reference< XMultiServiceFactory > & rSMgr ) throw( Exception ); -Sequence<OUString> OPipeTest_getSupportedServiceNames(void) throw(); +Sequence<OUString> OPipeTest_getSupportedServiceNames() throw(); OUString OPipeTest_getServiceName() throw(); OUString OPipeTest_getImplementationName() throw(); Reference< XInterface > SAL_CALL OPumpTest_CreateInstance( const Reference< XMultiServiceFactory > & rSMgr ) throw( Exception ); -Sequence<OUString> OPumpTest_getSupportedServiceNames(void) throw(); +Sequence<OUString> OPumpTest_getSupportedServiceNames() throw(); OUString OPumpTest_getServiceName() throw(); OUString OPumpTest_getImplementationName() throw(); @@ -38,12 +38,12 @@ OUString ODataStreamTest_getServiceName( int i) throw(); OUString ODataStreamTest_getImplementationName( int i) throw(); Reference< XInterface > SAL_CALL OMarkableOutputStreamTest_CreateInstance( const Reference< XMultiServiceFactory > & rSMgr ) throw(Exception); -Sequence<OUString> OMarkableOutputStreamTest_getSupportedServiceNames(void) throw(); +Sequence<OUString> OMarkableOutputStreamTest_getSupportedServiceNames() throw(); OUString OMarkableOutputStreamTest_getServiceName() throw(); OUString OMarkableOutputStreamTest_getImplementationName() throw(); Reference< XInterface > SAL_CALL OMarkableInputStreamTest_CreateInstance( const Reference< XMultiServiceFactory > & rSMgr ) throw(Exception); -Sequence<OUString> OMarkableInputStreamTest_getSupportedServiceNames(void) throw(); +Sequence<OUString> OMarkableInputStreamTest_getSupportedServiceNames() throw(); OUString OMarkableInputStreamTest_getServiceName() throw(); OUString OMarkableInputStreamTest_getImplementationName() throw(); diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx index dadcf4ebc214..bf31bfdc57cc 100644 --- a/linguistic/source/convdicxml.cxx +++ b/linguistic/source/convdicxml.cxx @@ -373,7 +373,7 @@ void ConvDicXMLExport::_ExportContent() } } -void SAL_CALL ConvDicXMLImport::startDocument(void) +void SAL_CALL ConvDicXMLImport::startDocument() throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) { // register namespace at first possible opportunity @@ -382,7 +382,7 @@ void SAL_CALL ConvDicXMLImport::startDocument(void) SvXMLImport::startDocument(); } -void SAL_CALL ConvDicXMLImport::endDocument(void) +void SAL_CALL ConvDicXMLImport::endDocument() throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) { SvXMLImport::endDocument(); diff --git a/linguistic/source/convdicxml.hxx b/linguistic/source/convdicxml.hxx index 92824ca7989b..8e04adfa4b1b 100644 --- a/linguistic/source/convdicxml.hxx +++ b/linguistic/source/convdicxml.hxx @@ -96,8 +96,8 @@ public: { } - virtual void SAL_CALL startDocument(void) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL endDocument(void) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL startDocument() throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL endDocument() throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual SvXMLImportContext * CreateContext( sal_uInt16 nPrefix, const OUString &rLocalName, diff --git a/lotuswordpro/source/filter/bento.hxx b/lotuswordpro/source/filter/bento.hxx index 4d9e8f67e4ad..dcd5acf1754f 100644 --- a/lotuswordpro/source/filter/bento.hxx +++ b/lotuswordpro/source/filter/bento.hxx @@ -406,8 +406,8 @@ public: // Internal methods const char * GetNameCStr() { return csName.c_str(); } void SetPosition(BenContainerPos Pos) { cPos = Pos; } - BenContainerPos GetPosition(void) { return cPos; } - size_t GetLength(void) { return csName.length()+ 1; } + BenContainerPos GetPosition() { return cPos; } + size_t GetLength() { return csName.length()+ 1; } CBenNamedObjectListElmt& GetNameListElmt() { return cNameListElmt; } private: // Data diff --git a/lotuswordpro/source/filter/lwpcelllayout.hxx b/lotuswordpro/source/filter/lwpcelllayout.hxx index d162c209c524..ac0630e6e62f 100644 --- a/lotuswordpro/source/filter/lwpcelllayout.hxx +++ b/lotuswordpro/source/filter/lwpcelllayout.hxx @@ -100,7 +100,7 @@ public: LwpObjectID * GetPreviousCellStory(); virtual LwpPara* GetLastParaOfPreviousStory() SAL_OVERRIDE; LwpTableLayout * GetTableLayout(); - virtual void SetCellMap(void); + virtual void SetCellMap(); double GetActualWidth(); OUString GetNumfmtName(){return m_NumfmtName;} protected: @@ -154,7 +154,7 @@ public: virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE; virtual XFCell* ConvertCell(LwpObjectID aTableID, sal_uInt16 nRow, sal_uInt16 nCol) SAL_OVERRIDE; void RegisterStyle() SAL_OVERRIDE {} - virtual void SetCellMap(void) SAL_OVERRIDE; + virtual void SetCellMap() SAL_OVERRIDE; protected: void Read() SAL_OVERRIDE; LwpObjectID cconnectedlayout; @@ -174,7 +174,7 @@ public: virtual XFCell* ConvertCell(LwpObjectID aTableID, sal_uInt16 nRow, sal_uInt16 nCol) SAL_OVERRIDE; sal_uInt16 GetNumrows(){return m_nRealrowspan;} sal_uInt8 GetNumcols(){return m_nRealcolspan;} - virtual void SetCellMap(void) SAL_OVERRIDE; + virtual void SetCellMap() SAL_OVERRIDE; void SetNumrows(sal_uInt16 nVal){m_nRealrowspan = nVal;} void SetNumcols(sal_uInt8 nVal){m_nRealcolspan = nVal;} protected: diff --git a/lotuswordpro/source/filter/lwpdllist.cxx b/lotuswordpro/source/filter/lwpdllist.cxx index abf4d66cb617..04310d204dd9 100644 --- a/lotuswordpro/source/filter/lwpdllist.cxx +++ b/lotuswordpro/source/filter/lwpdllist.cxx @@ -64,7 +64,7 @@ #include "lwpdllist.hxx" -LwpDLList::LwpDLList(void) +LwpDLList::LwpDLList() { m_pNext = m_pPrevious = NULL; } @@ -80,7 +80,7 @@ LwpDLList::insert(LwpDLList* Next,LwpDLList* Previous) m_pPrevious = Previous; } -LwpDLList::~LwpDLList(void) +LwpDLList::~LwpDLList() { remove(); } diff --git a/lotuswordpro/source/filter/lwpdllist.hxx b/lotuswordpro/source/filter/lwpdllist.hxx index bbb67d200561..744d399e9f35 100644 --- a/lotuswordpro/source/filter/lwpdllist.hxx +++ b/lotuswordpro/source/filter/lwpdllist.hxx @@ -68,12 +68,12 @@ class LwpDLList { public: - LwpDLList(void); + LwpDLList(); virtual ~LwpDLList(); void insert(LwpDLList*, LwpDLList*); - void remove(void); - LwpDLList* GetNext(void); - LwpDLList* GetPrevious(void); + void remove(); + LwpDLList* GetNext(); + LwpDLList* GetPrevious(); void SetNext(LwpDLList*); void SetPrevious(LwpDLList*); private: @@ -81,7 +81,7 @@ private: LwpDLList* m_pPrevious; }; -inline LwpDLList* LwpDLList::GetNext(void) +inline LwpDLList* LwpDLList::GetNext() { return m_pNext; } @@ -91,7 +91,7 @@ inline void LwpDLList::SetNext(LwpDLList* Next) m_pNext = Next; } -inline LwpDLList* LwpDLList::GetPrevious(void) +inline LwpDLList* LwpDLList::GetPrevious() { return m_pPrevious; } diff --git a/lotuswordpro/source/filter/lwplayout.cxx b/lotuswordpro/source/filter/lwplayout.cxx index 69ad38e423d9..14036a2717c3 100644 --- a/lotuswordpro/source/filter/lwplayout.cxx +++ b/lotuswordpro/source/filter/lwplayout.cxx @@ -939,7 +939,7 @@ LwpTabOverride* LwpMiddleLayout::GetTabOverride() * @param: * @return: */ -sal_uInt16 LwpMiddleLayout::GetScaleMode(void) +sal_uInt16 LwpMiddleLayout::GetScaleMode() { if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is()) return GetLayoutScale()->GetScaleMode(); @@ -949,7 +949,7 @@ sal_uInt16 LwpMiddleLayout::GetScaleMode(void) return (LwpLayoutScale::FIT_IN_FRAME | LwpLayoutScale::MAINTAIN_ASPECT_RATIO); } -sal_uInt16 LwpMiddleLayout::GetScaleTile(void) +sal_uInt16 LwpMiddleLayout::GetScaleTile() { if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is()) return (GetLayoutScale()->GetPlacement() & LwpLayoutScale::TILED) @@ -960,7 +960,7 @@ sal_uInt16 LwpMiddleLayout::GetScaleTile(void) return 0; } -sal_uInt16 LwpMiddleLayout::GetScaleCenter(void) +sal_uInt16 LwpMiddleLayout::GetScaleCenter() { if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is()) return (GetLayoutScale()->GetPlacement() & LwpLayoutScale::CENTERED) @@ -971,7 +971,7 @@ sal_uInt16 LwpMiddleLayout::GetScaleCenter(void) return 0; } -sal_uInt32 LwpMiddleLayout::GetScalePercentage(void) +sal_uInt32 LwpMiddleLayout::GetScalePercentage() { if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is()) return GetLayoutScale()->GetScalePercentage()/10;//m_nScalePercentage 1000 = 100% @@ -981,7 +981,7 @@ sal_uInt32 LwpMiddleLayout::GetScalePercentage(void) return 100; } -double LwpMiddleLayout::GetScaleWidth(void) +double LwpMiddleLayout::GetScaleWidth() { if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is()) return LwpTools::ConvertFromUnits(GetLayoutScale()->GetScaleWidth()); @@ -991,7 +991,7 @@ double LwpMiddleLayout::GetScaleWidth(void) return 0; } -double LwpMiddleLayout::GetScaleHeight(void) +double LwpMiddleLayout::GetScaleHeight() { if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is()) return LwpTools::ConvertFromUnits(GetLayoutScale()->GetScaleHeight()); @@ -1000,7 +1000,7 @@ double LwpMiddleLayout::GetScaleHeight(void) else return 0; } -bool LwpMiddleLayout::CanSizeRight(void) +bool LwpMiddleLayout::CanSizeRight() { sal_uInt8 RelType = GetRelativeType(); @@ -1040,7 +1040,7 @@ sal_Int32 LwpMiddleLayout::DetermineWidth() } return 0; } -bool LwpMiddleLayout::IsSizeRightToContainer(void) +bool LwpMiddleLayout::IsSizeRightToContainer() { if (!CanSizeRight()) return false; @@ -1059,7 +1059,7 @@ bool LwpMiddleLayout::IsSizeRightToContainer(void) else return false; } -bool LwpMiddleLayout::IsSizeRightToContent(void) +bool LwpMiddleLayout::IsSizeRightToContent() { if (!CanSizeRight()) return false; diff --git a/lotuswordpro/source/filter/lwplayout.hxx b/lotuswordpro/source/filter/lwplayout.hxx index 9d6488d09da3..b213bfc53b09 100644 --- a/lotuswordpro/source/filter/lwplayout.hxx +++ b/lotuswordpro/source/filter/lwplayout.hxx @@ -303,18 +303,18 @@ public: bool GetUsePrinterSettings(); LwpLayoutScale* GetLayoutScale(){return dynamic_cast<LwpLayoutScale*>(m_LayScale.obj().get());} - sal_uInt16 GetScaleMode(void); - sal_uInt16 GetScaleTile(void); - sal_uInt16 GetScaleCenter(void); - sal_uInt32 GetScalePercentage(void); - double GetScaleWidth(void); - double GetScaleHeight(void); + sal_uInt16 GetScaleMode(); + sal_uInt16 GetScaleTile(); + sal_uInt16 GetScaleCenter(); + sal_uInt32 GetScalePercentage(); + double GetScaleWidth(); + double GetScaleHeight(); - bool CanSizeRight(void); + bool CanSizeRight(); virtual double GetWidth() SAL_OVERRIDE; sal_Int32 GetMinimumWidth(); - bool IsSizeRightToContent(void); - bool IsSizeRightToContainer(void); + bool IsSizeRightToContent(); + bool IsSizeRightToContainer(); sal_Int32 DetermineWidth(); virtual double GetHeight(); LwpPoint GetOrigin(); diff --git a/lotuswordpro/source/filter/lwpnumericfmt.cxx b/lotuswordpro/source/filter/lwpnumericfmt.cxx index 9d54213d8724..d512ad82d365 100644 --- a/lotuswordpro/source/filter/lwpnumericfmt.cxx +++ b/lotuswordpro/source/filter/lwpnumericfmt.cxx @@ -275,7 +275,7 @@ bool LwpNumericFormat::IsCurrencyFormat(sal_uInt16 Format) * @return. */ sal_uInt16 -LwpNumericFormat::GetDecimalPlaces(void) +LwpNumericFormat::GetDecimalPlaces() { if (IsDecimalPlacesOverridden()) return cDecimalPlaces; diff --git a/lotuswordpro/source/filter/lwpnumericfmt.hxx b/lotuswordpro/source/filter/lwpnumericfmt.hxx index 9b3a4d40d046..74b9587ed3b9 100644 --- a/lotuswordpro/source/filter/lwpnumericfmt.hxx +++ b/lotuswordpro/source/filter/lwpnumericfmt.hxx @@ -252,10 +252,10 @@ public: ~LwpNumericFormat(){} void Read(); static bool IsCurrencyFormat(sal_uInt16 Format); - sal_uInt16 GetDecimalPlaces(void); - bool IsDecimalPlacesOverridden(void); - bool IsNegativeOverridden(void); - bool IsZeroOverridden(void); + sal_uInt16 GetDecimalPlaces(); + bool IsDecimalPlacesOverridden(); + bool IsNegativeOverridden(); + bool IsZeroOverridden(); XFStyle* Convert(); private: @@ -286,19 +286,19 @@ private: }; inline bool -LwpNumericFormat::IsDecimalPlacesOverridden(void) +LwpNumericFormat::IsDecimalPlacesOverridden() { return (cFlags & NF_OVER_DECIMAL_PLACES) != 0; } inline bool -LwpNumericFormat::IsNegativeOverridden(void) +LwpNumericFormat::IsNegativeOverridden() { return (cFlags & NF_OVER_NEGATIVE) != 0; } inline bool -LwpNumericFormat::IsZeroOverridden(void) +LwpNumericFormat::IsZeroOverridden() { return (cFlags & NF_OVER_ZERO) != 0; } diff --git a/lotuswordpro/source/filter/lwpobjstrm.cxx b/lotuswordpro/source/filter/lwpobjstrm.cxx index 55fcae7206be..7f61cdfb509d 100644 --- a/lotuswordpro/source/filter/lwpobjstrm.cxx +++ b/lotuswordpro/source/filter/lwpobjstrm.cxx @@ -393,7 +393,7 @@ sal_uInt16 LwpObjectStream::DecompressBuffer(sal_uInt8* pDst, sal_uInt8* pSrc, s /** * @descr quick read string with 1252 */ -OUString LwpObjectStream::QuickReadStringPtr(void) +OUString LwpObjectStream::QuickReadStringPtr() { sal_uInt16 diskSize; diff --git a/lotuswordpro/source/filter/lwpparaproperty.cxx b/lotuswordpro/source/filter/lwpparaproperty.cxx index 9c8be79955ae..3dc427f01940 100644 --- a/lotuswordpro/source/filter/lwpparaproperty.cxx +++ b/lotuswordpro/source/filter/lwpparaproperty.cxx @@ -151,11 +151,11 @@ LwpParaAlignProperty::LwpParaAlignProperty(LwpObjectStream* pFile) } -LwpParaAlignProperty::~LwpParaAlignProperty(void) +LwpParaAlignProperty::~LwpParaAlignProperty() { } -sal_uInt32 LwpParaAlignProperty::GetType(void) +sal_uInt32 LwpParaAlignProperty::GetType() { return PP_LOCAL_ALIGN; } @@ -168,11 +168,11 @@ LwpParaIndentProperty::LwpParaIndentProperty(LwpObjectStream* pFile) m_pIndent = pIndentPiece ? dynamic_cast<LwpIndentOverride*>(pIndentPiece->GetOverride()) : NULL; } -LwpParaIndentProperty::~LwpParaIndentProperty(void) +LwpParaIndentProperty::~LwpParaIndentProperty() { } -sal_uInt32 LwpParaIndentProperty::GetType(void) +sal_uInt32 LwpParaIndentProperty::GetType() { return PP_LOCAL_INDENT; } @@ -186,11 +186,11 @@ LwpParaSpacingProperty::LwpParaSpacingProperty(LwpObjectStream* pFile) m_pSpacing = pSpacingPiece ? dynamic_cast<LwpSpacingOverride*>(pSpacingPiece->GetOverride()) : NULL; } -LwpParaSpacingProperty::~LwpParaSpacingProperty(void) +LwpParaSpacingProperty::~LwpParaSpacingProperty() { } -sal_uInt32 LwpParaSpacingProperty::GetType(void) +sal_uInt32 LwpParaSpacingProperty::GetType() { return PP_LOCAL_SPACING; } diff --git a/lotuswordpro/source/filter/lwpparaproperty.hxx b/lotuswordpro/source/filter/lwpparaproperty.hxx index fd3bf7ff3a10..ab7df94ff7c5 100644 --- a/lotuswordpro/source/filter/lwpparaproperty.hxx +++ b/lotuswordpro/source/filter/lwpparaproperty.hxx @@ -90,21 +90,21 @@ class LwpParaProperty : public LwpDLList { public: LwpParaProperty(){} - virtual ~LwpParaProperty(void){} - virtual sal_uInt32 GetType(void) = 0; - inline LwpParaProperty* GetNext(void); - inline LwpParaProperty* GetPrevious(void); + virtual ~LwpParaProperty(){} + virtual sal_uInt32 GetType() = 0; + inline LwpParaProperty* GetNext(); + inline LwpParaProperty* GetPrevious(); static LwpParaProperty* ReadPropertyList(LwpObjectStream* pFile,rtl::Reference<LwpObject> const & Whole); }; -inline LwpParaProperty* LwpParaProperty::GetNext(void) +inline LwpParaProperty* LwpParaProperty::GetNext() { return static_cast<LwpParaProperty*>(LwpDLList::GetNext()); } -inline LwpParaProperty* LwpParaProperty::GetPrevious(void) +inline LwpParaProperty* LwpParaProperty::GetPrevious() { return static_cast<LwpParaProperty*>(LwpDLList::GetPrevious()); } @@ -117,15 +117,15 @@ class LwpParaAlignProperty : public LwpParaProperty public: // LwpParaAlignProperty(LwpParaAlignProperty* pOther); LwpParaAlignProperty(LwpObjectStream* pFile); - virtual ~LwpParaAlignProperty(void); - LwpAlignmentOverride* GetAlignment(void); - sal_uInt32 GetType(void) SAL_OVERRIDE; + virtual ~LwpParaAlignProperty(); + LwpAlignmentOverride* GetAlignment(); + sal_uInt32 GetType() SAL_OVERRIDE; private: LwpAlignmentOverride* m_pAlignment; }; -inline LwpAlignmentOverride* LwpParaAlignProperty::GetAlignment(void) +inline LwpAlignmentOverride* LwpParaAlignProperty::GetAlignment() { return m_pAlignment; } @@ -134,9 +134,9 @@ class LwpParaIndentProperty : public LwpParaProperty { public: LwpParaIndentProperty(LwpObjectStream* pFile); - virtual ~LwpParaIndentProperty(void); - LwpIndentOverride* GetIndent(void); - sal_uInt32 GetType(void) SAL_OVERRIDE; + virtual ~LwpParaIndentProperty(); + LwpIndentOverride* GetIndent(); + sal_uInt32 GetType() SAL_OVERRIDE; inline LwpObjectID GetIndentID(); private: @@ -147,7 +147,7 @@ inline LwpObjectID LwpParaIndentProperty::GetIndentID() { return m_aIndentID; } -inline LwpIndentOverride* LwpParaIndentProperty::GetIndent(void) +inline LwpIndentOverride* LwpParaIndentProperty::GetIndent() { return m_pIndent; } @@ -156,15 +156,15 @@ class LwpParaSpacingProperty : public LwpParaProperty { public: LwpParaSpacingProperty(LwpObjectStream* pFile); - virtual ~LwpParaSpacingProperty(void); - LwpSpacingOverride* GetSpacing(void); - sal_uInt32 GetType(void) SAL_OVERRIDE; + virtual ~LwpParaSpacingProperty(); + LwpSpacingOverride* GetSpacing(); + sal_uInt32 GetType() SAL_OVERRIDE; private: LwpSpacingOverride* m_pSpacing; }; -inline LwpSpacingOverride* LwpParaSpacingProperty::GetSpacing(void) +inline LwpSpacingOverride* LwpParaSpacingProperty::GetSpacing() { return m_pSpacing; } @@ -248,7 +248,7 @@ class LwpParaTabRackProperty : public LwpParaProperty { public: LwpParaTabRackProperty(LwpObjectStream* pStrm); - virtual ~LwpParaTabRackProperty(void); + virtual ~LwpParaTabRackProperty(); sal_uInt32 GetType() SAL_OVERRIDE { return PP_LOCAL_TABRACK; } inline LwpTabOverride* GetTab(); @@ -266,14 +266,14 @@ class LwpParaBackGroundProperty : public LwpParaProperty { public: LwpParaBackGroundProperty(LwpObjectStream* pFile); - virtual ~LwpParaBackGroundProperty(void); - LwpBackgroundOverride* GetBackground(void); - sal_uInt32 GetType(void) SAL_OVERRIDE; + virtual ~LwpParaBackGroundProperty(); + LwpBackgroundOverride* GetBackground(); + sal_uInt32 GetType() SAL_OVERRIDE; private: LwpBackgroundOverride* m_pBackground; }; -inline LwpBackgroundOverride* LwpParaBackGroundProperty::GetBackground(void) +inline LwpBackgroundOverride* LwpParaBackGroundProperty::GetBackground() { return m_pBackground; } diff --git a/lotuswordpro/source/filter/lwprowlayout.cxx b/lotuswordpro/source/filter/lwprowlayout.cxx index 32f052e72da8..e7bae0f15dfc 100644 --- a/lotuswordpro/source/filter/lwprowlayout.cxx +++ b/lotuswordpro/source/filter/lwprowlayout.cxx @@ -93,7 +93,7 @@ LwpRowLayout::~LwpRowLayout() * @param * @return */ -void LwpRowLayout::SetRowMap(void) +void LwpRowLayout::SetRowMap() { LwpObjectID& rCellID= GetChildHead(); LwpCellLayout * pCellLayout = dynamic_cast<LwpCellLayout *>(rCellID.obj().get()); diff --git a/lotuswordpro/source/filter/lwprowlayout.hxx b/lotuswordpro/source/filter/lwprowlayout.hxx index 070683ed47b2..3173f93bee24 100644 --- a/lotuswordpro/source/filter/lwprowlayout.hxx +++ b/lotuswordpro/source/filter/lwprowlayout.hxx @@ -84,7 +84,7 @@ public: sal_uInt16 GetRowID() { return crowid;} virtual void RegisterStyle() SAL_OVERRIDE; inline LwpTableLayout * GetParentTableLayout(){return dynamic_cast<LwpTableLayout *>(GetParent().obj().get());} - void SetRowMap(void); + void SetRowMap(); protected: void Read() SAL_OVERRIDE; sal_uInt16 crowid; diff --git a/lotuswordpro/source/filter/lwpsdwfileloader.cxx b/lotuswordpro/source/filter/lwpsdwfileloader.cxx index 3c3ed764fec4..150fad3dc129 100644 --- a/lotuswordpro/source/filter/lwpsdwfileloader.cxx +++ b/lotuswordpro/source/filter/lwpsdwfileloader.cxx @@ -70,7 +70,7 @@ LwpSdwFileLoader::LwpSdwFileLoader(SvStream* pStream, LwpGraphicObject* pGraphic pStream->Seek(0); } -LwpSdwFileLoader::~LwpSdwFileLoader(void) +LwpSdwFileLoader::~LwpSdwFileLoader() { } // add by ,03/25/2005 diff --git a/lotuswordpro/source/filter/lwpsdwfileloader.hxx b/lotuswordpro/source/filter/lwpsdwfileloader.hxx index a634eda1a34e..c903cf649b99 100644 --- a/lotuswordpro/source/filter/lwpsdwfileloader.hxx +++ b/lotuswordpro/source/filter/lwpsdwfileloader.hxx @@ -81,10 +81,10 @@ private: LwpGraphicObject* m_pGraphicObj; public: LwpSdwFileLoader(SvStream* pStream, LwpGraphicObject* pGraphicObj); - ~LwpSdwFileLoader(void); + ~LwpSdwFileLoader(); public: -// void LoadObjectList(void); -// void RegisterStyle(void); +// void LoadObjectList(); +// void RegisterStyle(); // add by ,03/25/2005 void CreateDrawObjects(std::vector< rtl::Reference<XFFrame> >* pDrawObjVector); diff --git a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx index aabda032cc72..872d0117cdad 100644 --- a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx +++ b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx @@ -243,7 +243,7 @@ void LwpSdwGroupLoaderV0102::BeginDrawObjects(std::vector< rtl::Reference<XFFram * the corresponding drawing objects. * @param pDrawObjVector a container which will contains the created drawing object of XF-Model. */ -XFDrawGroup* LwpSdwGroupLoaderV0102::CreateDrawGroupObject(void) +XFDrawGroup* LwpSdwGroupLoaderV0102::CreateDrawGroupObject() { //flag unsigned char BinSignature[2]; @@ -304,7 +304,7 @@ XFDrawGroup* LwpSdwGroupLoaderV0102::CreateDrawGroupObject(void) * @descr Create the XF-drawing objects according to the object type read from bento stream. * @return the created XF-drawing objects. */ -XFFrame* LwpSdwGroupLoaderV0102::CreateDrawObject(void) +XFFrame* LwpSdwGroupLoaderV0102::CreateDrawObject() { //record type unsigned char recType; diff --git a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.hxx b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.hxx index f8d8d7b017ab..c9d7476f310b 100644 --- a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.hxx +++ b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.hxx @@ -88,8 +88,8 @@ public: public: void BeginDrawObjects(std::vector< rtl::Reference<XFFrame> >* pDrawObjVector); - XFDrawGroup* CreateDrawGroupObject(void); - XFFrame* CreateDrawObject(void); + XFDrawGroup* CreateDrawGroupObject(); + XFFrame* CreateDrawObject(); // end add }; diff --git a/lotuswordpro/source/filter/lwptable.cxx b/lotuswordpro/source/filter/lwptable.cxx index 300fb38d3945..420b7e85a170 100644 --- a/lotuswordpro/source/filter/lwptable.cxx +++ b/lotuswordpro/source/filter/lwptable.cxx @@ -190,7 +190,7 @@ LwpGlossary::LwpGlossary(LwpObjectHeader &objHdr, LwpSvStream* pStrm):LwpParalle LwpGlossary::~LwpGlossary() { } -sal_uInt16 LwpGlossary::GetNumIndexRows(void) +sal_uInt16 LwpGlossary::GetNumIndexRows() { if (GetRow() > 0 && GetRow() <= MAX_NUM_ROWS) return GetRow() - 1; // Minus one row for repeated heading. diff --git a/lotuswordpro/source/filter/lwptable.hxx b/lotuswordpro/source/filter/lwptable.hxx index 833716c4a34e..6c4f1cbc973a 100644 --- a/lotuswordpro/source/filter/lwptable.hxx +++ b/lotuswordpro/source/filter/lwptable.hxx @@ -184,7 +184,7 @@ public: virtual ~LwpGlossary(); protected: void Read() SAL_OVERRIDE; - sal_uInt16 GetNumIndexRows(void); + sal_uInt16 GetNumIndexRows(); }; #endif diff --git a/lotuswordpro/source/filter/lwptabrack.hxx b/lotuswordpro/source/filter/lwptabrack.hxx index 6f3efc10905f..d8c6e617fee7 100644 --- a/lotuswordpro/source/filter/lwptabrack.hxx +++ b/lotuswordpro/source/filter/lwptabrack.hxx @@ -69,7 +69,7 @@ class LwpTabRack; class LwpTab { public: - LwpTab(void); + LwpTab(); enum TabType { diff --git a/lotuswordpro/source/filter/lwptblcell.hxx b/lotuswordpro/source/filter/lwptblcell.hxx index 1bbe0614e346..8c72b4e4c6fa 100644 --- a/lotuswordpro/source/filter/lwptblcell.hxx +++ b/lotuswordpro/source/filter/lwptblcell.hxx @@ -231,19 +231,19 @@ private: class LwpRowColumnQualifier { public: - LwpRowColumnQualifier(void); + LwpRowColumnQualifier(); ~LwpRowColumnQualifier(){} - inline void SetAbsolute(void); - inline void ClearAbsolute(void); - bool IsAbsolute(void); + inline void SetAbsolute(); + inline void ClearAbsolute(); + bool IsAbsolute(); - inline void SetAfter(void); - inline void ClearAfter(void); - bool IsAfter(void); + inline void SetAfter(); + inline void ClearAfter(); + bool IsAfter(); void SetBad(bool Bad); - bool IsBad(void); + bool IsBad(); void QuickRead(LwpObjectStream *pStrm); @@ -258,25 +258,25 @@ private: }; inline void -LwpRowColumnQualifier::SetAbsolute(void) +LwpRowColumnQualifier::SetAbsolute() { cFlags |= REF_ABSOLUTE; } inline void -LwpRowColumnQualifier::ClearAbsolute(void) +LwpRowColumnQualifier::ClearAbsolute() { cFlags &= ~REF_ABSOLUTE; } inline void -LwpRowColumnQualifier::SetAfter(void) +LwpRowColumnQualifier::SetAfter() { cFlags |= REF_AFTER; } inline void -LwpRowColumnQualifier::ClearAfter(void) +LwpRowColumnQualifier::ClearAfter() { cFlags &= ~REF_AFTER; } @@ -311,7 +311,7 @@ LwpRowColumnQualifier::IsAbsolute() class LwpRowSpecifier { public: - LwpRowSpecifier(void) + LwpRowSpecifier() : cRow(0) {} ~LwpRowSpecifier(){} @@ -320,18 +320,18 @@ public: OUString ToString(sal_uInt16 nFormulaRow); sal_uInt16 RowID(sal_uInt16 FormulaRow); - sal_uInt16 &Row(void); + sal_uInt16 &Row(); - void SetAbsolute(void); - void ClearAbsolute(void); - bool IsAbsolute(void); + void SetAbsolute(); + void ClearAbsolute(); + bool IsAbsolute(); - void SetAfter(void); - void ClearAfter(void); - bool IsAfter(void); + void SetAfter(); + void ClearAfter(); + bool IsAfter(); void SetBad(bool Bad); - bool IsBad(void); + bool IsBad(); void SetRowDelta(sal_uInt16 ReferenceRowID, sal_uInt16 FormulaRowID); private: @@ -361,13 +361,13 @@ LwpRowSpecifier::Row() } inline void -LwpRowSpecifier::SetAbsolute(void) +LwpRowSpecifier::SetAbsolute() { cQualifier.SetAbsolute(); } inline void -LwpRowSpecifier::ClearAbsolute(void) +LwpRowSpecifier::ClearAbsolute() { cQualifier.ClearAbsolute(); } @@ -379,13 +379,13 @@ LwpRowSpecifier::IsAbsolute() } inline void -LwpRowSpecifier::SetAfter(void) +LwpRowSpecifier::SetAfter() { cQualifier.SetAfter(); } inline void -LwpRowSpecifier::ClearAfter(void) +LwpRowSpecifier::ClearAfter() { cQualifier.ClearAfter(); } @@ -414,7 +414,7 @@ LwpRowSpecifier::IsBad() class LwpColumnSpecifier { public: - LwpColumnSpecifier(void) + LwpColumnSpecifier() : cColumn(0) {} ~LwpColumnSpecifier() @@ -425,14 +425,14 @@ public: OUString ToString(sal_uInt8 nFormulaCol); sal_uInt8 ColumnID(sal_uInt8 FormulaColumn); - void SetAbsolute(void); - void ClearAbsolute(void); - bool IsAbsolute(void); - void SetAfter(void); - void ClearAfter(void); - bool IsAfter(void); + void SetAbsolute(); + void ClearAbsolute(); + bool IsAbsolute(); + void SetAfter(); + void ClearAfter(); + bool IsAfter(); void SetBad(bool Bad); - bool IsBad(void); + bool IsBad(); void SetColumnDelta(sal_uInt8 ReferenceColumnID, sal_uInt8 FormulaColumnID); private: @@ -455,13 +455,13 @@ LwpColumnSpecifier::ColumnID(sal_uInt8 FormulaColumn) } inline void -LwpColumnSpecifier::SetAbsolute(void) +LwpColumnSpecifier::SetAbsolute() { cQualifier.SetAbsolute(); } inline void -LwpColumnSpecifier::ClearAbsolute(void) +LwpColumnSpecifier::ClearAbsolute() { cQualifier.ClearAbsolute(); } @@ -473,13 +473,13 @@ LwpColumnSpecifier::IsAbsolute() } inline void -LwpColumnSpecifier::SetAfter(void) +LwpColumnSpecifier::SetAfter() { cQualifier.SetAfter(); } inline void -LwpColumnSpecifier::ClearAfter(void) +LwpColumnSpecifier::ClearAfter() { cQualifier.ClearAfter(); } diff --git a/lotuswordpro/source/filter/lwptoc.hxx b/lotuswordpro/source/filter/lwptoc.hxx index 2635a50e3ff1..83031433a79c 100644 --- a/lotuswordpro/source/filter/lwptoc.hxx +++ b/lotuswordpro/source/filter/lwptoc.hxx @@ -152,10 +152,10 @@ public: LwpTocLevelData(LwpObjectHeader &objHdr, LwpSvStream* pStrm); void RegisterStyle() SAL_OVERRIDE; virtual void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE; - inline sal_uInt16 GetLevel(void){return m_nLevel;} - inline bool GetUseText(void){ return (m_nFlags & USETEXT) ? sal_True : sal_False;} - inline OUString GetSearchStyle(void){return m_SearchName.str();} - inline bool GetUseLeadingText(void){ return (m_nFlags & USENUMBER) ? sal_True : sal_False;} + inline sal_uInt16 GetLevel(){return m_nLevel;} + inline bool GetUseText(){ return (m_nFlags & USETEXT) ? sal_True : sal_False;} + inline OUString GetSearchStyle(){return m_SearchName.str();} + inline bool GetUseLeadingText(){ return (m_nFlags & USENUMBER) ? sal_True : sal_False;} private: virtual ~LwpTocLevelData(); diff --git a/lotuswordpro/source/filter/utlist.hxx b/lotuswordpro/source/filter/utlist.hxx index deb9f72d1e4b..6b05e4a1eb9e 100644 --- a/lotuswordpro/source/filter/utlist.hxx +++ b/lotuswordpro/source/filter/utlist.hxx @@ -125,7 +125,7 @@ public: // Methods bool IsEmpty() { return GetFirst() == &GetTerminating(); }; bool ContainsAtLeastTwoItems() { return GetFirst() != GetLast(); }; - void Destroy(void); + void Destroy(); private: // Data CUtListElmt cDummyElmt; diff --git a/mysqlc/source/mysqlc_connection.hxx b/mysqlc/source/mysqlc_connection.hxx index 7377a0ba2d06..801ba70c5831 100644 --- a/mysqlc/source/mysqlc_connection.hxx +++ b/mysqlc/source/mysqlc_connection.hxx @@ -140,7 +140,7 @@ namespace connectivity // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual void SAL_CALL release() throw() SAL_OVERRIDE; diff --git a/mysqlc/source/mysqlc_driver.hxx b/mysqlc/source/mysqlc_driver.hxx index 21b299812dcb..f95e914729dc 100644 --- a/mysqlc/source/mysqlc_driver.hxx +++ b/mysqlc/source/mysqlc_driver.hxx @@ -79,7 +79,7 @@ namespace connectivity MysqlCDriver(const Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory); // OComponentHelper - void SAL_CALL disposing(void) SAL_OVERRIDE; + void SAL_CALL disposing() SAL_OVERRIDE; // XInterface static rtl::OUString getImplementationName_Static() throw(RuntimeException); static Sequence< rtl::OUString > getSupportedServiceNames_Static() throw(RuntimeException); diff --git a/mysqlc/source/mysqlc_statement.hxx b/mysqlc/source/mysqlc_statement.hxx index 1bf3093587cb..f9eb191d0f98 100644 --- a/mysqlc/source/mysqlc_statement.hxx +++ b/mysqlc/source/mysqlc_statement.hxx @@ -103,7 +103,7 @@ namespace connectivity using OCommonStatement_IBase::operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >; // OComponentHelper - void SAL_CALL disposing(void) SAL_OVERRIDE; + void SAL_CALL disposing() SAL_OVERRIDE; // XInterface void SAL_CALL release() throw() SAL_OVERRIDE; diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.hxx index a1e72aaa85df..dee2dc390181 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.hxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.hxx @@ -112,7 +112,7 @@ namespace connectivity void closeAllStatements () throw( ::com::sun::star::sdbc::SQLException); // OComponentHelper - virtual void SAL_CALL disposing(void); + virtual void SAL_CALL disposing(); // XInterface virtual void SAL_CALL release() throw(); diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.hxx index b482d5088aa5..59abf9dd5ca2 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.hxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.hxx @@ -66,7 +66,7 @@ namespace connectivity SkeletonDriver(); // OComponentHelper - virtual void SAL_CALL disposing(void); + virtual void SAL_CALL disposing(); // XInterface static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx index c4847fe50db7..40582fc07dd3 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx @@ -88,7 +88,7 @@ OResultSet::~OResultSet() { } -void OResultSet::disposing(void) +void OResultSet::disposing() { OPropertySetHelper::disposing(); diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.hxx index edc20b67c639..4f887ebe7f00 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.hxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.hxx @@ -119,7 +119,7 @@ namespace connectivity } // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void); + virtual void SAL_CALL disposing(); // 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() throw(); diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.hxx index ac63064fbc84..66393c2d6ce1 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.hxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.hxx @@ -103,7 +103,7 @@ namespace connectivity using OStatement_BASE::operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >; // OComponentHelper - virtual void SAL_CALL disposing(void){OStatement_BASE::disposing();} + virtual void SAL_CALL disposing(){OStatement_BASE::disposing();} // XInterface virtual void SAL_CALL release() throw(); virtual void SAL_CALL acquire() throw(); @@ -144,7 +144,7 @@ namespace connectivity OStatement_BASE2(OConnection* _pConnection ) : OStatement_Base(_pConnection ), OSubComponent<OStatement_BASE2, OStatement_BASE>((::cppu::OWeakObject*)_pConnection, this){} // OComponentHelper - virtual void SAL_CALL disposing(void); + virtual void SAL_CALL disposing(); // XInterface virtual void SAL_CALL release() throw(); }; diff --git a/package/inc/ZipPackage.hxx b/package/inc/ZipPackage.hxx index 3e03b1396b39..86d6e10c8290 100644 --- a/package/inc/ZipPackage.hxx +++ b/package/inc/ZipPackage.hxx @@ -124,7 +124,7 @@ protected: public: ZipPackage( const ::com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > &xContext ); - virtual ~ZipPackage( void ); + virtual ~ZipPackage(); ZipFile& getZipFile() { return *m_pZipFile;} sal_Int32 getFormat() const { return m_nFormat; } diff --git a/package/inc/ZipPackageBuffer.hxx b/package/inc/ZipPackageBuffer.hxx index bdffcb729156..8f1b9ff7b97d 100644 --- a/package/inc/ZipPackageBuffer.hxx +++ b/package/inc/ZipPackageBuffer.hxx @@ -37,7 +37,7 @@ protected: bool m_bMustInitBuffer; public: ZipPackageBuffer(sal_Int64 nNewBufferSize); - virtual ~ZipPackageBuffer(void); + virtual ~ZipPackageBuffer(); inline void realloc ( sal_Int32 nSize ) { m_aBuffer.realloc ( nSize ); } inline const sal_Int8 * getConstArray () const { return m_aBuffer.getConstArray(); } diff --git a/package/inc/ZipPackageEntry.hxx b/package/inc/ZipPackageEntry.hxx index d1ff8de8b5cf..fe19772f5d05 100644 --- a/package/inc/ZipPackageEntry.hxx +++ b/package/inc/ZipPackageEntry.hxx @@ -58,7 +58,7 @@ protected: public: ZipEntry aEntry; ZipPackageEntry(); - virtual ~ZipPackageEntry( void ); + virtual ~ZipPackageEntry(); const OUString& GetMediaType () const { return msMediaType; } void SetMediaType ( const OUString & sNewType) { msMediaType = sNewType; } @@ -73,7 +73,7 @@ public: const css::uno::Sequence < sal_Int8 >& rEncryptionKey, const rtlRandomPool &rRandomPool ) = 0; - void clearParent ( void ) + void clearParent() { // xParent.clear(); mpParent = NULL; diff --git a/package/inc/ZipPackageStream.hxx b/package/inc/ZipPackageStream.hxx index af2c7217d86d..d94d662bfbc5 100644 --- a/package/inc/ZipPackageStream.hxx +++ b/package/inc/ZipPackageStream.hxx @@ -124,7 +124,7 @@ public: const css::uno::Reference < css::uno::XComponentContext >& xContext, sal_Int32 nFormat, bool bAllowRemoveOnInsert ); - virtual ~ZipPackageStream( void ); + virtual ~ZipPackageStream(); ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetRawEncrStreamNoHeaderCopy(); ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > TryToGetRawFromDataStream( diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/manifest/ManifestImport.cxx index e242eac90603..9376ab060721 100644 --- a/package/source/manifest/ManifestImport.cxx +++ b/package/source/manifest/ManifestImport.cxx @@ -94,7 +94,7 @@ ManifestImport::ManifestImport( vector < Sequence < PropertyValue > > & rNewManV aStack.reserve( 10 ); } -ManifestImport::~ManifestImport ( void ) +ManifestImport::~ManifestImport() { } diff --git a/package/source/manifest/ManifestImport.hxx b/package/source/manifest/ManifestImport.hxx index 23151358bc56..7bebfb1f13f1 100644 --- a/package/source/manifest/ManifestImport.hxx +++ b/package/source/manifest/ManifestImport.hxx @@ -122,7 +122,7 @@ protected: public: ManifestImport( std::vector < ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue > > & rNewVector ); - virtual ~ManifestImport( void ); + virtual ~ManifestImport(); virtual void SAL_CALL startDocument( ) throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL endDocument( ) diff --git a/package/source/zipapi/Deflater.cxx b/package/source/zipapi/Deflater.cxx index 9ff3e7d5d1b8..939814a345b8 100644 --- a/package/source/zipapi/Deflater.cxx +++ b/package/source/zipapi/Deflater.cxx @@ -31,7 +31,7 @@ using namespace ZipUtils; * library. */ -Deflater::~Deflater(void) +Deflater::~Deflater() { end(); } diff --git a/package/source/zipapi/ZipEnumeration.cxx b/package/source/zipapi/ZipEnumeration.cxx index c5686d6c3b62..aab7325afdb0 100644 --- a/package/source/zipapi/ZipEnumeration.cxx +++ b/package/source/zipapi/ZipEnumeration.cxx @@ -26,7 +26,7 @@ ZipEnumeration::ZipEnumeration( EntryHash & rNewEntryHash) , aIterator(rEntryHash.begin()) { } -ZipEnumeration::~ZipEnumeration( void ) +ZipEnumeration::~ZipEnumeration() { } bool SAL_CALL ZipEnumeration::hasMoreElements() diff --git a/package/source/zipapi/ZipOutputEntry.cxx b/package/source/zipapi/ZipOutputEntry.cxx index ae7b64530b0f..de44ae46f6b4 100644 --- a/package/source/zipapi/ZipOutputEntry.cxx +++ b/package/source/zipapi/ZipOutputEntry.cxx @@ -71,7 +71,7 @@ ZipOutputEntry::ZipOutputEntry( } } -ZipOutputEntry::~ZipOutputEntry( void ) +ZipOutputEntry::~ZipOutputEntry() { } diff --git a/package/source/zipapi/ZipOutputStream.cxx b/package/source/zipapi/ZipOutputStream.cxx index 7cf7074548f5..7c7924d63ea7 100644 --- a/package/source/zipapi/ZipOutputStream.cxx +++ b/package/source/zipapi/ZipOutputStream.cxx @@ -47,7 +47,7 @@ ZipOutputStream::ZipOutputStream( const uno::Reference < io::XOutputStream > &xO { } -ZipOutputStream::~ZipOutputStream( void ) +ZipOutputStream::~ZipOutputStream() { } diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx index ca47523d560d..5013e93a2e5f 100644 --- a/package/source/zippackage/ZipPackage.cxx +++ b/package/source/zippackage/ZipPackage.cxx @@ -162,7 +162,7 @@ ZipPackage::ZipPackage ( const uno::Reference < XComponentContext > &xContext ) m_xRootFolder = m_pRootFolder = new ZipPackageFolder( m_xContext, m_nFormat, m_bAllowRemoveOnInsert ); } -ZipPackage::~ZipPackage( void ) +ZipPackage::~ZipPackage() { delete m_pZipFile; @@ -1656,7 +1656,7 @@ uno::Reference < XSingleServiceFactory > ZipPackage::createServiceFactory( uno:: namespace { struct lcl_ImplId : public rtl::Static< ::cppu::OImplementationId, lcl_ImplId > {}; } -Sequence< sal_Int8 > ZipPackage::getUnoTunnelImplementationId( void ) +Sequence< sal_Int8 > ZipPackage::getUnoTunnelImplementationId() throw ( RuntimeException ) { ::cppu::OImplementationId &rId = lcl_ImplId::get(); diff --git a/package/source/zippackage/ZipPackageBuffer.cxx b/package/source/zippackage/ZipPackageBuffer.cxx index 931c045de655..00f2640114b9 100644 --- a/package/source/zippackage/ZipPackageBuffer.cxx +++ b/package/source/zippackage/ZipPackageBuffer.cxx @@ -38,7 +38,7 @@ ZipPackageBuffer::ZipPackageBuffer(sal_Int64 nNewBufferSize ) , m_bMustInitBuffer ( true ) { } -ZipPackageBuffer::~ZipPackageBuffer(void) +ZipPackageBuffer::~ZipPackageBuffer() { } diff --git a/package/source/zippackage/ZipPackageFolderEnumeration.cxx b/package/source/zippackage/ZipPackageFolderEnumeration.cxx index 1699ce6d67ff..8189e553cb67 100644 --- a/package/source/zippackage/ZipPackageFolderEnumeration.cxx +++ b/package/source/zippackage/ZipPackageFolderEnumeration.cxx @@ -35,7 +35,7 @@ ZipPackageFolderEnumeration::ZipPackageFolderEnumeration ( ContentHash &rInput) { } -ZipPackageFolderEnumeration::~ZipPackageFolderEnumeration( void ) +ZipPackageFolderEnumeration::~ZipPackageFolderEnumeration() { } diff --git a/package/source/zippackage/ZipPackageFolderEnumeration.hxx b/package/source/zippackage/ZipPackageFolderEnumeration.hxx index 569714665509..7c8e79ebefba 100644 --- a/package/source/zippackage/ZipPackageFolderEnumeration.hxx +++ b/package/source/zippackage/ZipPackageFolderEnumeration.hxx @@ -36,7 +36,7 @@ protected: public: //ZipPackageFolderEnumeration (unordered_map < OUString, com::sun::star::uno::Reference < com::sun::star::container::XNamed >, hashFunc, eqFunc > &rInput); ZipPackageFolderEnumeration (ContentHash &rInput); - virtual ~ZipPackageFolderEnumeration( void ); + virtual ~ZipPackageFolderEnumeration(); // XEnumeration virtual sal_Bool SAL_CALL hasMoreElements( ) diff --git a/package/source/zippackage/ZipPackageSink.cxx b/package/source/zippackage/ZipPackageSink.cxx index c33911e2c6c6..738ccb4f9d14 100644 --- a/package/source/zippackage/ZipPackageSink.cxx +++ b/package/source/zippackage/ZipPackageSink.cxx @@ -19,11 +19,11 @@ #include <ZipPackageSink.hxx> -ZipPackageSink::ZipPackageSink(void) +ZipPackageSink::ZipPackageSink() : xStream ( com::sun::star::uno::Reference < com::sun::star::io::XInputStream > (NULL)) { } -ZipPackageSink::~ZipPackageSink(void) +ZipPackageSink::~ZipPackageSink() { } void SAL_CALL ZipPackageSink::setInputStream( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& aStream ) diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx index 8e2bbb07dadf..0676ce5802ea 100644 --- a/package/source/zippackage/ZipPackageStream.cxx +++ b/package/source/zippackage/ZipPackageStream.cxx @@ -113,7 +113,7 @@ ZipPackageStream::ZipPackageStream ( ZipPackage & rNewPackage, aEntry.nExtraLen = -1; } -ZipPackageStream::~ZipPackageStream( void ) +ZipPackageStream::~ZipPackageStream() { } diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx index 3999c4e9cb64..fe09ddac72f3 100644 --- a/registry/source/reflread.cxx +++ b/registry/source/reflread.cxx @@ -1824,7 +1824,7 @@ void TYPEREG_CALLTYPE typereg_reader_getSuperTypeName( rtl_uString_new(pSuperTypeName); } -RegistryTypeReader_Api* TYPEREG_CALLTYPE initRegistryTypeReader_Api(void) +RegistryTypeReader_Api* TYPEREG_CALLTYPE initRegistryTypeReader_Api() { static RegistryTypeReader_Api aApi= {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; if (!aApi.acquire) diff --git a/registry/source/reflwrit.cxx b/registry/source/reflwrit.cxx index b98c469fd980..7c1f440d5f77 100644 --- a/registry/source/reflwrit.cxx +++ b/registry/source/reflwrit.cxx @@ -1430,7 +1430,7 @@ static TypeWriterImpl TYPEREG_CALLTYPE createEntry( return t; } -RegistryTypeWriter_Api* TYPEREG_CALLTYPE initRegistryTypeWriter_Api(void) +RegistryTypeWriter_Api* TYPEREG_CALLTYPE initRegistryTypeWriter_Api() { static RegistryTypeWriter_Api aApi= {0,0,0,0,0,0,0,0,0,0,0,0,0}; if (!aApi.acquire) diff --git a/registry/source/registry.cxx b/registry/source/registry.cxx index 15fd9ae5fa3e..345e0bf6f8be 100644 --- a/registry/source/registry.cxx +++ b/registry/source/registry.cxx @@ -401,7 +401,7 @@ static RegError REGISTRY_CALLTYPE dumpRegistry(RegHandle hReg, // initRegistry_Api -Registry_Api* REGISTRY_CALLTYPE initRegistry_Api(void) +Registry_Api* REGISTRY_CALLTYPE initRegistry_Api() { static Registry_Api aApi= {&acquire, &release, diff --git a/reportdesign/inc/ReportDefinition.hxx b/reportdesign/inc/ReportDefinition.hxx index 763d2e8332ef..18ac1b88ce6f 100644 --- a/reportdesign/inc/ReportDefinition.hxx +++ b/reportdesign/inc/ReportDefinition.hxx @@ -187,8 +187,8 @@ namespace reportdesign ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & _xFactory ,::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _xShape); - 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 ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); @@ -364,7 +364,7 @@ namespace reportdesign // SvxUnoDrawMSFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XStyleFamiliesSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getStyleFamilies( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/reportdesign/source/core/api/Group.cxx b/reportdesign/source/core/api/Group.cxx index b6fa289cefa1..92df9713f62b 100644 --- a/reportdesign/source/core/api/Group.cxx +++ b/reportdesign/source/core/api/Group.cxx @@ -64,7 +64,7 @@ OUString SAL_CALL OGroup::getImplementationName( ) throw(uno::RuntimeException, return OUString("com.sun.star.comp.report.Group"); } -uno::Sequence< OUString> OGroup::getSupportedServiceNames_Static(void) throw( uno::RuntimeException ) +uno::Sequence< OUString> OGroup::getSupportedServiceNames_Static() throw( uno::RuntimeException ) { uno::Sequence< OUString> aSupported(1); aSupported.getArray()[0] = SERVICE_GROUP; diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 2b08c5d7ff16..f657d233547e 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -2198,7 +2198,7 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstance( co return m_pImpl->m_pReportModel->createShape(aServiceSpecifier,xShape); } -uno::Sequence< OUString > SAL_CALL OReportDefinition::getAvailableServiceNames(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SAL_CALL OReportDefinition::getAvailableServiceNames() throw( uno::RuntimeException, std::exception ) { static const OUString aSvxComponentServiceNameList[] = { diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx index 465087310658..7ce500da3e25 100644 --- a/reportdesign/source/core/api/Section.cxx +++ b/reportdesign/source/core/api/Section.cxx @@ -177,7 +177,7 @@ OUString SAL_CALL OSection::getImplementationName( ) throw(uno::RuntimeExceptio return OUString("com.sun.star.comp.report.Section"); } -uno::Sequence< OUString> OSection::getSupportedServiceNames_Static(void) throw( uno::RuntimeException ) +uno::Sequence< OUString> OSection::getSupportedServiceNames_Static() throw( uno::RuntimeException ) { uno::Sequence< OUString> aSupported(1); aSupported.getArray()[0] = SERVICE_SECTION; diff --git a/reportdesign/source/core/inc/FixedLine.hxx b/reportdesign/source/core/inc/FixedLine.hxx index f74204f56442..1d759faecd11 100644 --- a/reportdesign/source/core/inc/FixedLine.hxx +++ b/reportdesign/source/core/inc/FixedLine.hxx @@ -83,8 +83,8 @@ namespace reportdesign virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - 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 ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); // com::sun::star::beans::XPropertySet diff --git a/reportdesign/source/core/inc/FixedText.hxx b/reportdesign/source/core/inc/FixedText.hxx index 9c243bba6b2e..2b19fab22956 100644 --- a/reportdesign/source/core/inc/FixedText.hxx +++ b/reportdesign/source/core/inc/FixedText.hxx @@ -95,8 +95,8 @@ namespace reportdesign virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - 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 ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); // com::sun::star::beans::XPropertySet diff --git a/reportdesign/source/core/inc/FormatCondition.hxx b/reportdesign/source/core/inc/FormatCondition.hxx index a1ba1c9aa4c8..d7739f76385b 100644 --- a/reportdesign/source/core/inc/FormatCondition.hxx +++ b/reportdesign/source/core/inc/FormatCondition.hxx @@ -84,8 +84,8 @@ namespace reportdesign virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - 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 ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); // com::sun::star::beans::XPropertySet diff --git a/reportdesign/source/core/inc/FormattedField.hxx b/reportdesign/source/core/inc/FormattedField.hxx index 9a0c5bc283d8..26f7d8bcff86 100644 --- a/reportdesign/source/core/inc/FormattedField.hxx +++ b/reportdesign/source/core/inc/FormattedField.hxx @@ -98,8 +98,8 @@ namespace reportdesign virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - static OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException, std::exception ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); // com::sun::star::beans::XPropertySet diff --git a/reportdesign/source/core/inc/Function.hxx b/reportdesign/source/core/inc/Function.hxx index 6c2ea414d2af..967f0350b68e 100644 --- a/reportdesign/source/core/inc/Function.hxx +++ b/reportdesign/source/core/inc/Function.hxx @@ -86,8 +86,8 @@ namespace reportdesign virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - 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 ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); // com::sun::star::beans::XPropertySet diff --git a/reportdesign/source/core/inc/Group.hxx b/reportdesign/source/core/inc/Group.hxx index 58f4ba22b661..443666836d2a 100644 --- a/reportdesign/source/core/inc/Group.hxx +++ b/reportdesign/source/core/inc/Group.hxx @@ -108,7 +108,7 @@ namespace reportdesign virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException ); // com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/reportdesign/source/core/inc/ImageControl.hxx b/reportdesign/source/core/inc/ImageControl.hxx index b2b7ffc0b09a..df687ccf6c06 100644 --- a/reportdesign/source/core/inc/ImageControl.hxx +++ b/reportdesign/source/core/inc/ImageControl.hxx @@ -89,8 +89,8 @@ namespace reportdesign virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - 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 ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); // com::sun::star::beans::XPropertySet diff --git a/reportdesign/source/core/inc/ReportEngineJFree.hxx b/reportdesign/source/core/inc/ReportEngineJFree.hxx index 6952685f0571..7542c779236b 100644 --- a/reportdesign/source/core/inc/ReportEngineJFree.hxx +++ b/reportdesign/source/core/inc/ReportEngineJFree.hxx @@ -88,8 +88,8 @@ namespace reportdesign virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - 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 ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); private: diff --git a/reportdesign/source/core/inc/Section.hxx b/reportdesign/source/core/inc/Section.hxx index 03d06fcd2bf9..70b6159fd7cb 100644 --- a/reportdesign/source/core/inc/Section.hxx +++ b/reportdesign/source/core/inc/Section.hxx @@ -147,7 +147,7 @@ namespace reportdesign virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException ); // com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue( const 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, std::exception) SAL_OVERRIDE; diff --git a/reportdesign/source/core/inc/Shape.hxx b/reportdesign/source/core/inc/Shape.hxx index 854d26a4c8c4..39c14dcbf5cc 100644 --- a/reportdesign/source/core/inc/Shape.hxx +++ b/reportdesign/source/core/inc/Shape.hxx @@ -101,8 +101,8 @@ namespace reportdesign virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - 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 ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); // com::sun::star::beans::XPropertySet diff --git a/reportdesign/source/filter/xml/dbloader2.cxx b/reportdesign/source/filter/xml/dbloader2.cxx index ff88876d9b9f..ddcbc6ce31f8 100644 --- a/reportdesign/source/filter/xml/dbloader2.cxx +++ b/reportdesign/source/filter/xml/dbloader2.cxx @@ -98,13 +98,13 @@ sal_Bool SAL_CALL ORptTypeDetection::supportsService(const OUString& ServiceName } // XServiceInfo -Sequence< OUString > SAL_CALL ORptTypeDetection::getSupportedServiceNames(void) throw(std::exception ) +Sequence< OUString > SAL_CALL ORptTypeDetection::getSupportedServiceNames() throw(std::exception ) { return getSupportedServiceNames_Static(); } // ORegistryServiceManager_Static -Sequence< OUString > ORptTypeDetection::getSupportedServiceNames_Static(void) throw( RuntimeException ) +Sequence< OUString > ORptTypeDetection::getSupportedServiceNames_Static() throw( RuntimeException ) { Sequence< OUString > aSNS( 1 ); aSNS[0] = "com.sun.star.document.ExtendedTypeDetection"; diff --git a/reportdesign/source/filter/xml/dbloader2.hxx b/reportdesign/source/filter/xml/dbloader2.hxx index 856ec7efcd6c..687e27d58d9a 100644 --- a/reportdesign/source/filter/xml/dbloader2.hxx +++ b/reportdesign/source/filter/xml/dbloader2.hxx @@ -73,14 +73,14 @@ public: // XServiceInfo OUString SAL_CALL getImplementationName() throw(std::exception ) SAL_OVERRIDE; sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception ) SAL_OVERRIDE; - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(std::exception ) SAL_OVERRIDE; + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception ) SAL_OVERRIDE; // static methods - static OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ) + static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ) { return OUString("com.sun.star.comp.report.ORptTypeDetection"); } - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); diff --git a/reportdesign/source/filter/xml/xmlExport.hxx b/reportdesign/source/filter/xml/xmlExport.hxx index 2e0023d8e073..c0d5272f053f 100644 --- a/reportdesign/source/filter/xml/xmlExport.hxx +++ b/reportdesign/source/filter/xml/xmlExport.hxx @@ -186,8 +186,8 @@ public: ORptExport(const Reference< XComponentContext >& _rxContext, OUString const & implementationName, SvXMLExportFlags nExportFlag); - 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 ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index 77a2358b4a48..dca562b6a8f3 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -973,7 +973,7 @@ OUString ORptFilter::convertFormula(const OUString& _sFormula) return _sFormula; } -void SAL_CALL ORptFilter::startDocument( void ) +void SAL_CALL ORptFilter::startDocument() throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) { m_xReportDefinition.set(GetModel(),UNO_QUERY_THROW); @@ -987,7 +987,7 @@ void SAL_CALL ORptFilter::startDocument( void ) } } -void ORptFilter::endDocument( void ) +void ORptFilter::endDocument() throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) { OSL_ENSURE( GetModel().is(), "model missing; maybe startDocument wasn't called?" ); diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx index 4fa25c67c856..9c430569791a 100644 --- a/reportdesign/source/filter/xml/xmlfilter.hxx +++ b/reportdesign/source/filter/xml/xmlfilter.hxx @@ -122,8 +122,8 @@ public: // XFilter virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& rDescriptor ) throw(RuntimeException, std::exception) SAL_OVERRIDE; - 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 ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); @@ -136,9 +136,9 @@ public: ::boost::shared_ptr<rptui::OReportModel> getSdrModel() const { return m_pReportModel; } void FinishStyles(); - virtual void SAL_CALL startDocument(void) + virtual void SAL_CALL startDocument() throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL endDocument(void) + virtual void SAL_CALL endDocument() throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; const SvXMLTokenMap& GetDocElemTokenMap() const; diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx index 7a7d5c699f68..aa749e833fd8 100644 --- a/reportdesign/source/ui/inc/ReportController.hxx +++ b/reportdesign/source/ui/inc/ReportController.hxx @@ -365,7 +365,7 @@ namespace rptui virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // need by registration static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); @@ -385,7 +385,7 @@ namespace rptui // ::com::sun::star::frame::XController virtual sal_Bool SAL_CALL attachModel(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xModel) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getViewData(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getViewData() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL restoreViewData(const ::com::sun::star::uno::Any& Data) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** gives access to the report definition @@ -394,7 +394,7 @@ namespace rptui inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition> getReportDefinition() const { return m_xReportDefinition; } // ::com::sun::star::frame::XController - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > SAL_CALL getModel(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > SAL_CALL getModel() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XTitle virtual OUString SAL_CALL getTitle( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/reportdesign/source/ui/inc/statusbarcontroller.hxx b/reportdesign/source/ui/inc/statusbarcontroller.hxx index 5be27b9e9ac8..07e6de106b57 100644 --- a/reportdesign/source/ui/inc/statusbarcontroller.hxx +++ b/reportdesign/source/ui/inc/statusbarcontroller.hxx @@ -40,7 +40,7 @@ namespace rptui OStatusbarController(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB); static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); diff --git a/reportdesign/source/ui/inc/toolboxcontroller.hxx b/reportdesign/source/ui/inc/toolboxcontroller.hxx index 9b294b1302fd..810de524f4bd 100644 --- a/reportdesign/source/ui/inc/toolboxcontroller.hxx +++ b/reportdesign/source/ui/inc/toolboxcontroller.hxx @@ -60,7 +60,7 @@ namespace rptui virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // need by registration static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx b/reportdesign/source/ui/misc/statusbarcontroller.cxx index cbc9afad1501..c59c587f0211 100644 --- a/reportdesign/source/ui/misc/statusbarcontroller.cxx +++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx @@ -50,7 +50,7 @@ OUString OStatusbarController::getImplementationName_Static() throw( RuntimeExce return OUString("com.sun.star.report.comp.StatusbarController"); } -Sequence< OUString> OStatusbarController::getSupportedServiceNames_Static(void) throw( RuntimeException ) +Sequence< OUString> OStatusbarController::getSupportedServiceNames_Static() throw( RuntimeException ) { Sequence< OUString> aSupported(1); aSupported[0] = "com.sun.star.frame.StatusbarController"; diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx index cb83281f3b29..788cc1fddfc6 100644 --- a/reportdesign/source/ui/misc/toolboxcontroller.cxx +++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx @@ -65,7 +65,7 @@ OUString OToolboxController::getImplementationName_Static() throw( RuntimeExcept return OUString("com.sun.star.report.comp.ReportToolboxController"); } -Sequence< OUString> OToolboxController::getSupportedServiceNames_Static(void) throw( RuntimeException ) +Sequence< OUString> OToolboxController::getSupportedServiceNames_Static() throw( RuntimeException ) { Sequence< OUString> aSupported(1); aSupported[0] = "com.sun.star.report.ReportToolboxController"; diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 549fa2f33c36..b02d01f85c3c 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -266,7 +266,7 @@ OUString OReportController::getImplementationName_Static() throw( RuntimeExcepti return OUString("com.sun.star.report.comp.ReportDesign"); } -Sequence< OUString> OReportController::getSupportedServiceNames_Static(void) throw( RuntimeException ) +Sequence< OUString> OReportController::getSupportedServiceNames_Static() throw( RuntimeException ) { Sequence< OUString> aSupported(1); aSupported[0] = "com.sun.star.sdb.ReportDesign"; @@ -2736,7 +2736,7 @@ void OReportController::shrinkSection(sal_uInt16 _nUndoStrId, uno::Reference<rep } -uno::Any SAL_CALL OReportController::getViewData(void) throw( uno::RuntimeException, std::exception ) +uno::Any SAL_CALL OReportController::getViewData() throw( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( getMutex() ); @@ -3002,7 +3002,7 @@ uno::Reference<frame::XModel> OReportController::executeReport() return xModel; } -uno::Reference< frame::XModel > SAL_CALL OReportController::getModel(void) throw( uno::RuntimeException, std::exception ) +uno::Reference< frame::XModel > SAL_CALL OReportController::getModel() throw( uno::RuntimeException, std::exception ) { return m_xReportDefinition.get(); } diff --git a/rsc/inc/rsclex.hxx b/rsc/inc/rsclex.hxx index 70fda227f10f..f98a7506e552 100644 --- a/rsc/inc/rsclex.hxx +++ b/rsc/inc/rsclex.hxx @@ -99,11 +99,11 @@ class ObjectStack #if defined ( SOLARIS ) extern "C" int yyparse(); // forward Deklaration fuer erzeugte Funktion extern "C" void yyerror( const char * ); -extern "C" int yylex( void ); +extern "C" int yylex(); #else int yyparse(); // forward Deklaration fuer erzeugte Funktion void yyerror( char * ); -int yylex( void ); +int yylex(); #endif class RscTypCont; diff --git a/sal/cpprt/operators_new_delete.cxx b/sal/cpprt/operators_new_delete.cxx index c03d8bda9830..064caa5946f5 100644 --- a/sal/cpprt/operators_new_delete.cxx +++ b/sal/cpprt/operators_new_delete.cxx @@ -93,7 +93,7 @@ const AllocatorTraits::signature_type ScalarTraits::g_signature = "new() "; // Allocator -static void default_handler (void) +static void default_handler() { // Multithreading race in 'std::set_new_handler()' call sequence below. throw std::bad_alloc(); diff --git a/sal/osl/all/compat.cxx b/sal/osl/all/compat.cxx index ca5f340038c3..b43bae85d88b 100644 --- a/sal/osl/all/compat.cxx +++ b/sal/osl/all/compat.cxx @@ -158,7 +158,7 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL rtl_logfile_longTrace(char const *, ...) { std::abort(); } -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL rtl_logfile_hasLogFile( void ) { +SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL rtl_logfile_hasLogFile() { for (;;) { std::abort(); } // avoid "must return a value" warnings } diff --git a/sal/osl/unx/mutex.cxx b/sal/osl/unx/mutex.cxx index 7c8b365a2a2b..0f5f751d79c4 100644 --- a/sal/osl/unx/mutex.cxx +++ b/sal/osl/unx/mutex.cxx @@ -159,7 +159,7 @@ sal_Bool SAL_CALL osl_releaseMutex(oslMutexImpl *pMutex) static oslMutexImpl globalMutexImpl; -static void globalMutexInitImpl(void) { +static void globalMutexInitImpl() { pthread_mutexattr_t attr; if (pthread_mutexattr_init(&attr) != 0 || pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE) || diff --git a/sal/osl/unx/pipe.cxx b/sal/osl/unx/pipe.cxx index 9a559c2b8d1e..2bfe5f0a0170 100644 --- a/sal/osl/unx/pipe.cxx +++ b/sal/osl/unx/pipe.cxx @@ -73,7 +73,7 @@ static oslPipeError osl_PipeErrorFromNative(int nativeType) return PipeError[i].error; } -oslPipe __osl_createPipeImpl(void) +oslPipe __osl_createPipeImpl() { oslPipe pPipeImpl; diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx index a7c42b11b001..9a1ebd03f570 100644 --- a/sal/osl/unx/process_impl.cxx +++ b/sal/osl/unx/process_impl.cxx @@ -156,7 +156,7 @@ oslProcessError SAL_CALL osl_getExecutableFile (rtl_uString ** ppustrFile) /*************************************** osl_getCommandArgCount(). **************************************/ -sal_uInt32 SAL_CALL osl_getCommandArgCount (void) +sal_uInt32 SAL_CALL osl_getCommandArgCount() { sal_uInt32 result = 0; diff --git a/sal/osl/unx/saltime.hxx b/sal/osl/unx/saltime.hxx index e72e09b43f89..03e8047e0a87 100644 --- a/sal/osl/unx/saltime.hxx +++ b/sal/osl/unx/saltime.hxx @@ -22,7 +22,7 @@ #include <sal/config.h> -void sal_initGlobalTimer(void); +void sal_initGlobalTimer(); #endif diff --git a/sal/osl/unx/signal.cxx b/sal/osl/unx/signal.cxx index 85773bd273cc..050aa81d0ade 100644 --- a/sal/osl/unx/signal.cxx +++ b/sal/osl/unx/signal.cxx @@ -169,7 +169,7 @@ static void getExecutableName_Impl (rtl_String ** ppstrProgName) } } -static bool is_soffice_Impl (void) +static bool is_soffice_Impl() { sal_Int32 idx = -1; rtl_String * strProgName = 0; @@ -183,7 +183,7 @@ static bool is_soffice_Impl (void) return (idx != -1); } -static bool InitSignal(void) +static bool InitSignal() { int i; struct sigaction act; @@ -272,7 +272,7 @@ static bool InitSignal(void) return true; } -static bool DeInitSignal(void) +static bool DeInitSignal() { int i; struct sigaction act; @@ -380,7 +380,7 @@ void CallSystemHandler(int Signal) } #if defined HAVE_VALGRIND_HEADERS -static void DUMPCURRENTALLOCS(void) +static void DUMPCURRENTALLOCS() { VALGRIND_PRINTF( "=== start memcheck dump of active allocations ===\n" ); diff --git a/sal/osl/unx/socket.cxx b/sal/osl/unx/socket.cxx index a25a9f8b5dd6..0e5a1f0da0b0 100644 --- a/sal/osl/unx/socket.cxx +++ b/sal/osl/unx/socket.cxx @@ -466,7 +466,7 @@ void __osl_destroySocketImpl(oslSocket Socket) #endif } -static oslSocketAddr __osl_createSocketAddr(void) +static oslSocketAddr __osl_createSocketAddr() { oslSocketAddr pAddr = static_cast<oslSocketAddr>(rtl_allocateZeroMemory( sizeof( struct oslSocketAddrImpl ))); #if OSL_DEBUG_LEVEL > 1 diff --git a/sal/osl/unx/thread.cxx b/sal/osl/unx/thread.cxx index e6bcc451a4c3..237db690cf8b 100644 --- a/sal/osl/unx/thread.cxx +++ b/sal/osl/unx/thread.cxx @@ -98,7 +98,7 @@ struct osl_thread_priority_st }; #define OSL_THREAD_PRIORITY_INITIALIZER { 127, 96, 64, 32, 0 } -static void osl_thread_priority_init_Impl (void); +static void osl_thread_priority_init_Impl(); struct osl_thread_textencoding_st { @@ -107,7 +107,7 @@ struct osl_thread_textencoding_st }; #define OSL_THREAD_TEXTENCODING_INITIALIZER { 0, RTL_TEXTENCODING_DONTKNOW } -static void osl_thread_textencoding_init_Impl (void); +static void osl_thread_textencoding_init_Impl(); struct osl_thread_global_st { @@ -123,9 +123,9 @@ static struct osl_thread_global_st g_thread = OSL_THREAD_TEXTENCODING_INITIALIZER }; -static void osl_thread_init_Impl (void); +static void osl_thread_init_Impl(); -static Thread_Impl* osl_thread_construct_Impl (void); +static Thread_Impl* osl_thread_construct_Impl(); static void osl_thread_destruct_Impl (Thread_Impl ** ppImpl); static void* osl_thread_start_Impl (void * pData); @@ -139,13 +139,13 @@ static sal_uInt16 insertThreadId (pthread_t hThread); static sal_uInt16 lookupThreadId (pthread_t hThread); static void removeThreadId (pthread_t hThread); -static void osl_thread_init_Impl (void) +static void osl_thread_init_Impl() { osl_thread_priority_init_Impl(); osl_thread_textencoding_init_Impl(); } -Thread_Impl* osl_thread_construct_Impl (void) +Thread_Impl* osl_thread_construct_Impl() { Thread_Impl* pImpl = new Thread_Impl; if (pImpl) @@ -692,7 +692,7 @@ oslThreadIdentifier SAL_CALL osl_getThreadIdentifier(oslThread Thread) to have the "normal" priority. *****************************************************************************/ -static void osl_thread_priority_init_Impl (void) +static void osl_thread_priority_init_Impl() { #ifndef NO_PTHREAD_PRIORITY struct sched_param param; @@ -994,7 +994,7 @@ sal_Bool SAL_CALL osl_setThreadKeyData(oslThreadKey Key, void *pData) /*****************************************************************************/ /* Thread Local Text Encoding */ /*****************************************************************************/ -static void osl_thread_textencoding_init_Impl (void) +static void osl_thread_textencoding_init_Impl() { rtl_TextEncoding defaultEncoding; diff --git a/sal/osl/unx/time.cxx b/sal/osl/unx/time.cxx index 4abd99d4ed48..74ab972db414 100644 --- a/sal/osl/unx/time.cxx +++ b/sal/osl/unx/time.cxx @@ -259,7 +259,7 @@ sal_Bool SAL_CALL osl_getSystemTimeFromLocalTime( const TimeValue* pLocalTimeVal return sal_False; } -void sal_initGlobalTimer(void) +void sal_initGlobalTimer() { #ifdef __MACH__ clock_serv_t cclock; diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx index 51bef22c0917..a5d060509463 100644 --- a/sal/osl/w32/file_dirvol.cxx +++ b/sal/osl/w32/file_dirvol.cxx @@ -272,7 +272,7 @@ typedef struct tagDRIVEENUM LPCTSTR lpCurrent; } DRIVEENUM, * PDRIVEENUM, FAR * LPDRIVEENUM; -static HANDLE WINAPI OpenLogicalDrivesEnum(void) +static HANDLE WINAPI OpenLogicalDrivesEnum() { LPDRIVEENUM pEnum = (LPDRIVEENUM)HeapAlloc( GetProcessHeap(), 0, sizeof(DRIVEENUM) ); if ( pEnum ) diff --git a/sal/osl/w32/process.cxx b/sal/osl/w32/process.cxx index 722342867d0e..0a85135a5d40 100644 --- a/sal/osl/w32/process.cxx +++ b/sal/osl/w32/process.cxx @@ -322,7 +322,7 @@ oslProcessError SAL_CALL osl_getExecutableFile( rtl_uString **ppustrFile ) /***************************************************************************/ -sal_uInt32 SAL_CALL osl_getCommandArgCount(void) +sal_uInt32 SAL_CALL osl_getCommandArgCount() { sal_uInt32 result = 0; diff --git a/sal/osl/w32/signal.cxx b/sal/osl/w32/signal.cxx index 28979f35a41e..51fe5ac93b77 100644 --- a/sal/osl/w32/signal.cxx +++ b/sal/osl/w32/signal.cxx @@ -50,7 +50,7 @@ static oslSignalHandlerImpl* SignalList; static long WINAPI SignalHandlerFunction(LPEXCEPTION_POINTERS lpEP); -static sal_Bool InitSignal(void) +static sal_Bool InitSignal() { HMODULE hFaultRep; @@ -70,7 +70,7 @@ static sal_Bool InitSignal(void) return sal_True; } -static sal_Bool DeInitSignal(void) +static sal_Bool DeInitSignal() { SetUnhandledExceptionFilter(NULL); diff --git a/sal/osl/w32/socket.cxx b/sal/osl/w32/socket.cxx index 5ec52cf98be5..0b98b3facc4d 100644 --- a/sal/osl/w32/socket.cxx +++ b/sal/osl/w32/socket.cxx @@ -269,7 +269,7 @@ static oslSocketDialupImpl *pDialupImpl = NULL; /* * __osl_createSocketDialupImpl. */ -static oslSocketDialupImpl* __osl_createSocketDialupImpl (void) +static oslSocketDialupImpl* __osl_createSocketDialupImpl() { oslSocketDialupImpl *pImpl; pImpl = (oslSocketDialupImpl*)rtl_allocateZeroMemory( sizeof (oslSocketDialupImpl)); @@ -343,7 +343,7 @@ static void __osl_destroySocketDialupImpl (oslSocketDialupImpl *pImpl) /* * __osl_querySocketDialupImpl. */ -static sal_Bool __osl_querySocketDialupImpl (void) +static sal_Bool __osl_querySocketDialupImpl() { sal_Bool result; @@ -371,7 +371,7 @@ static sal_Bool __osl_querySocketDialupImpl (void) /* * __osl_attemptSocketDialupImpl. */ -static sal_Bool __osl_attemptSocketDialupImpl (void) +static sal_Bool __osl_attemptSocketDialupImpl() { sal_Bool result; diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index cec250d6f4a1..2b5766225ac1 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -426,7 +426,7 @@ inline void changeFileMode( ::rtl::OUString & filepath, sal_Int32 mode ) } #endif -inline ::rtl::OUString getCurrentPID( void ); +inline ::rtl::OUString getCurrentPID(); // Beginning of the test cases for FileBase class diff --git a/sal/qa/osl/module/osl_Module.cxx b/sal/qa/osl/module/osl_Module.cxx index be812e04b161..56f781069f28 100644 --- a/sal/qa/osl/module/osl_Module.cxx +++ b/sal/qa/osl/module/osl_Module.cxx @@ -29,7 +29,7 @@ using ::rtl::OString; /** get dll file URL. */ -inline ::rtl::OUString getDllURL( void ) +inline ::rtl::OUString getDllURL() { #if ( defined WNT ) // lib in Unix and lib in Windows are not same in file name. ::rtl::OUString libPath( "test_Module_DLL.dll" ); diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx index b053f9fdb135..4a9cd425658c 100644 --- a/sal/qa/osl/process/osl_process.cxx +++ b/sal/qa/osl/process/osl_process.cxx @@ -80,7 +80,7 @@ using ::rtl::OString; /** get binary Path. */ -inline ::rtl::OUString getExecutablePath( void ) +inline ::rtl::OUString getExecutablePath() { ::rtl::OUString dirPath; osl::Module::getUrlFromAddress( diff --git a/sal/qa/osl/profile/osl_old_testprofile.cxx b/sal/qa/osl/profile/osl_old_testprofile.cxx index 97ef52143655..3cfba1247d65 100644 --- a/sal/qa/osl/profile/osl_old_testprofile.cxx +++ b/sal/qa/osl/profile/osl_old_testprofile.cxx @@ -38,7 +38,7 @@ namespace osl_Profile CPPUNIT_TEST_SUITE_END( ); }; -void oldtests::test_profile(void) +void oldtests::test_profile() { rtl::OUString baseUrl; CPPUNIT_ASSERT(rtl::Bootstrap::get("UserInstallation", baseUrl)); diff --git a/sal/qa/osl/socket/osl_Socket.cxx b/sal/qa/osl/socket/osl_Socket.cxx index 94eed88daa98..2c9e1ff58f98 100644 --- a/sal/qa/osl/socket/osl_Socket.cxx +++ b/sal/qa/osl/socket/osl_Socket.cxx @@ -128,7 +128,7 @@ inline void printUString( const ::rtl::OUString & str, const sal_Char * msg = "" mindy: gethostbyname( "localhost" ), on Linux, it returns the hostname in /etc/hosts + domain name, if no entry in /etc/hosts, it returns "localhost" + domain name */ -inline ::rtl::OUString getHost( void ) +inline ::rtl::OUString getHost() { struct hostent *hptr; @@ -141,7 +141,7 @@ inline ::rtl::OUString getHost( void ) /** get the full host name of the current processor, such as "aegean.prc.sun.com" --mindyliu */ -inline ::rtl::OUString getThisHostname( void ) +inline ::rtl::OUString getThisHostname() { ::rtl::OUString aUString; #ifdef WNT diff --git a/sal/qa/osl/socket/sockethelper.cxx b/sal/qa/osl/socket/sockethelper.cxx index 3057c350f3a0..df4f5e7c11ca 100644 --- a/sal/qa/osl/socket/sockethelper.cxx +++ b/sal/qa/osl/socket/sockethelper.cxx @@ -86,7 +86,7 @@ void printUString( const ::rtl::OUString & str, const char* msg) mindy: gethostbyname( "localhost" ), on Linux, it returns the hostname in /etc/hosts + domain name, if no entry in /etc/hosts, it returns "localhost" + domain name */ -::rtl::OUString getHost( void ) +::rtl::OUString getHost() { struct hostent *hptr; @@ -99,7 +99,7 @@ void printUString( const ::rtl::OUString & str, const char* msg) /** get the full host name of the current processor, such as "aegean.prc.sun.com" --mindyliu */ -::rtl::OUString getThisHostname( void ) +::rtl::OUString getThisHostname() { ::rtl::OUString aUString; #ifdef WNT diff --git a/sal/qa/osl/socket/sockethelper.hxx b/sal/qa/osl/socket/sockethelper.hxx index 4debc78d87f4..9e400d8f3c05 100644 --- a/sal/qa/osl/socket/sockethelper.hxx +++ b/sal/qa/osl/socket/sockethelper.hxx @@ -109,10 +109,10 @@ void printUString( const ::rtl::OUString & str, const char * msg = "" ); mindy: gethostbyname( "localhost" ), on Linux, it returns the hostname in /etc/hosts + domain name, if no entry in /etc/hosts, it returns "localhost" + domain name */ -::rtl::OUString getHost( void ); +::rtl::OUString getHost(); /** get the full host name of the current processor, such as "aegean.prc.sun.com" --mindyliu */ -::rtl::OUString getThisHostname( void ); +::rtl::OUString getThisHostname(); /** get IP by name, search /etc/hosts first, then search from dns, fail return OUString("") */ ::rtl::OUString getIPbyName( rtl::OString const& str_name ); diff --git a/sal/qa/rtl/process/rtl_Process.cxx b/sal/qa/rtl/process/rtl_Process.cxx index 535b4f1f903b..1cbfb58e073c 100644 --- a/sal/qa/rtl/process/rtl_Process.cxx +++ b/sal/qa/rtl/process/rtl_Process.cxx @@ -53,7 +53,7 @@ inline void printUString( const ::rtl::OUString & str, const sal_Char * msg = NU printf("%s\n", aString.getStr( ) ); } -inline ::rtl::OUString getModulePath( void ) +inline ::rtl::OUString getModulePath() { ::rtl::OUString suDirPath; ::osl::Module::getUrlFromAddress( diff --git a/sal/textenc/convertiso2022cn.cxx b/sal/textenc/convertiso2022cn.cxx index afe946d62383..7adece94fff0 100644 --- a/sal/textenc/convertiso2022cn.cxx +++ b/sal/textenc/convertiso2022cn.cxx @@ -416,7 +416,7 @@ sal_Size ImplConvertIso2022CnToUnicode(void const * pData, return pDestBufPtr - pDestBuf; } -void * ImplCreateUnicodeToIso2022CnContext(void) +void * ImplCreateUnicodeToIso2022CnContext() { ImplUnicodeToIso2022CnContext * pContext = new ImplUnicodeToIso2022CnContext; diff --git a/sal/workben/clipboardwben/testviewer/cbvtest.cxx b/sal/workben/clipboardwben/testviewer/cbvtest.cxx index f6057c86909a..b68375bb5e8d 100644 --- a/sal/workben/clipboardwben/testviewer/cbvtest.cxx +++ b/sal/workben/clipboardwben/testviewer/cbvtest.cxx @@ -59,7 +59,7 @@ void RegisterClipboardViewer( BOOL bRegister ); void ShowAvailableClipboardFormats( HWND hWnd, HDC hdc, PAINTSTRUCT ps, RECT rcWnd ); void ClearClipboardContent( HWND hWnd ); -void CALLBACK OnClipboardContentChange( void ); +void CALLBACK OnClipboardContentChange(); LRESULT CALLBACK WndProc( HWND, UINT, WPARAM, LPARAM ); LRESULT CALLBACK About( HWND, UINT, WPARAM, LPARAM ); @@ -322,7 +322,7 @@ void ClearClipboardContent( HWND hWnd ) } // clipboard viewer callback function -void CALLBACK OnClipboardContentChange( void ) +void CALLBACK OnClipboardContentChange() { ++g_nCBChanges; InvalidateRect( g_hwndMain, NULL, TRUE ); diff --git a/sal/workben/test.cxx b/sal/workben/test.cxx index 0d04bece1686..faed0d8822ee 100644 --- a/sal/workben/test.cxx +++ b/sal/workben/test.cxx @@ -28,7 +28,7 @@ int _cdecl main( int argc, char * argv[] ) void test_int64(); test_int64(); - void test_profile(void); + void test_profile(); test_profile(); void test_OString(); diff --git a/sal/workben/testfile.cxx b/sal/workben/testfile.cxx index cbe504317197..addb1b6b8603 100644 --- a/sal/workben/testfile.cxx +++ b/sal/workben/testfile.cxx @@ -105,7 +105,7 @@ sal_Bool testLineBreak( sal_Char *pCount , sal_uInt64 nLen , sal_uInt32 *cLineBr // Initialization -sal_Bool Initialize( void ) +sal_Bool Initialize() { DirectoryItem aItem; FileStatus aStatus( osl_FileStatus_Mask_All ); @@ -258,7 +258,7 @@ sal_Bool Initialize( void ) // Shutdown -sal_Bool Shutdown( void ) +sal_Bool Shutdown() { sal_Bool fSuccess=sal_True; FileBase::RC rc; @@ -425,7 +425,7 @@ TimeValue getSystemTime() // DirectoryOpenAndCloseTest -void DirectoryOpenAndCloseTest( void ) +void DirectoryOpenAndCloseTest() { FileBase::RC rc; Directory *pDir; @@ -536,7 +536,7 @@ void DirectoryOpenAndCloseTest( void ) // DirectoryCreateAndRemoveTest -void DirectoryCreateAndRemoveTest( void ) +void DirectoryCreateAndRemoveTest() { FileBase::RC rc,rc1; Directory *pDir; @@ -614,7 +614,7 @@ void DirectoryCreateAndRemoveTest( void ) // FileOpenAndCloseTest -static void FileOpenAndCloseTest( void ) +static void FileOpenAndCloseTest() { FileBase::RC rc; @@ -720,7 +720,7 @@ void FileCreateAndRemoveTest() // FileWriteAndReadTest -void FileWriteAndReadTest( void ) +void FileWriteAndReadTest() { FileBase::RC rc; @@ -804,7 +804,7 @@ void FileWriteAndReadTest( void ) // FileCopyMoveTest -void FileCopyAndMoveTest( void ) +void FileCopyAndMoveTest() { FileBase::RC rc; @@ -962,7 +962,7 @@ void FileCopyAndMoveTest( void ) // FileSizeTest -void FileSizeTest( void ) +void FileSizeTest() { FileBase::RC rc; sal_uInt64 filesize; @@ -1042,7 +1042,7 @@ void FileSizeTest( void ) // FilePointerTest -void FilePointerTest( void ) +void FilePointerTest() { FileBase::RC rc; sal_uInt64 filepointer; @@ -1114,7 +1114,7 @@ void FilePointerTest( void ) // FileAttributesTest -void verifyFileAttributes( void ) +void verifyFileAttributes() { FileBase::RC rc; DirectoryItem aItem; @@ -1144,7 +1144,7 @@ void verifyFileAttributes( void ) } #ifdef UNX -void FileAttributesTest( void ) +void FileAttributesTest() { FileBase::RC rc; @@ -1249,7 +1249,7 @@ void FileAttributesTest( void ) #endif #ifdef WNT -void FileAttributesTest( void ) +void FileAttributesTest() { FileBase::RC rc; @@ -1299,7 +1299,7 @@ void FileAttributesTest( void ) // FileTimeTest -void FileTimeTest( void ) +void FileTimeTest() { FileBase::RC rc; @@ -1427,7 +1427,7 @@ void FileTimeTest( void ) // DirectoryItemTest -void DirectoryItemTest( void ) +void DirectoryItemTest() { FileBase::RC rc; Directory *pDir; @@ -1743,7 +1743,7 @@ void FileStatusTest( FileStatus *pStatus ) // DirectoryFileStatusTest -void DirectoryFileStatusTest( void ) +void DirectoryFileStatusTest() { FileBase::RC rc; DirectoryItem aItem; @@ -1779,7 +1779,7 @@ void DirectoryFileStatusTest( void ) // FileFileStatusTest -void FileFileStatusTest( void ) +void FileFileStatusTest() { FileBase::RC rc; DirectoryItem aItem; @@ -1815,7 +1815,7 @@ void FileFileStatusTest( void ) // VolumeFileStatusTest -void VolumeFileStatusTest( void ) +void VolumeFileStatusTest() { FileBase::RC rc; DirectoryItem aItem; @@ -1851,7 +1851,7 @@ void VolumeFileStatusTest( void ) // VolumeInfoTest -void VolumeInfoTest( void ) +void VolumeInfoTest() { FileBase::RC rc; @@ -2070,7 +2070,7 @@ void DoAbsolutePathTest(rtl::OUString strDirBase, rtl::OUString strRelative) return; } -void AbsolutePathTest(void) +void AbsolutePathTest() { printf( "--------------------------------------------\n" ); printf( "AbsolutePath-Test\n" ); @@ -2092,7 +2092,7 @@ void AbsolutePathTest(void) // searchPathTest -void SearchPathTest(void) +void SearchPathTest() { FileBase::RC rc; @@ -2283,7 +2283,7 @@ void getCanonicalNameTest(rtl::OUString strPath) return; } -void CanonicalNameTest(void) +void CanonicalNameTest() { printf( "--------------------------------------------\n" ); printf( "CanonicalName-Test\n" ); diff --git a/sal/workben/testpip2.cxx b/sal/workben/testpip2.cxx index ef567867219a..87fcd705ae71 100644 --- a/sal/workben/testpip2.cxx +++ b/sal/workben/testpip2.cxx @@ -38,7 +38,7 @@ void fail( const char * pszText, int retval ) * Teste die Pipe-Implementation in osl */ -int main (void) +int main() { char szBuffer[ 256 ]; rtl_uString* ustrPipeName=0; diff --git a/sal/workben/testproc.cxx b/sal/workben/testproc.cxx index 928ccce60f59..3d2bd79322bf 100644 --- a/sal/workben/testproc.cxx +++ b/sal/workben/testproc.cxx @@ -26,7 +26,7 @@ #define MAIN main #endif -int MAIN (void) +int MAIN() { //oslProcess Process; sal_uInt32 nArgCount; diff --git a/salhelper/test/Symbols/samplelib.cxx b/salhelper/test/Symbols/samplelib.cxx index 23c0e0bcba5a..f904d43eb033 100644 --- a/salhelper/test/Symbols/samplelib.cxx +++ b/salhelper/test/Symbols/samplelib.cxx @@ -21,7 +21,7 @@ #include <sal/types.h> extern "C" -SampleLib_Api* SAL_CALL initSampleLibApi(void) +SampleLib_Api* SAL_CALL initSampleLibApi() { static SampleLib_Api aApi= {0,0}; if (!aApi.funcA) diff --git a/salhelper/test/dynamicloader/samplelib.cxx b/salhelper/test/dynamicloader/samplelib.cxx index 23c0e0bcba5a..f904d43eb033 100644 --- a/salhelper/test/dynamicloader/samplelib.cxx +++ b/salhelper/test/dynamicloader/samplelib.cxx @@ -21,7 +21,7 @@ #include <sal/types.h> extern "C" -SampleLib_Api* SAL_CALL initSampleLibApi(void) +SampleLib_Api* SAL_CALL initSampleLibApi() { static SampleLib_Api aApi= {0,0}; if (!aApi.funcA) diff --git a/salhelper/test/rtti/rttitest.cxx b/salhelper/test/rtti/rttitest.cxx index 37fadade3a25..d50ce849698c 100644 --- a/salhelper/test/rtti/rttitest.cxx +++ b/salhelper/test/rtti/rttitest.cxx @@ -21,7 +21,7 @@ #include <typeinfo> #include "samplelibrtti.hxx" -int main( void ) +int main() { MyClassB b; MyClassA* pA= &b; diff --git a/sax/source/expatwrap/attrlistimpl.cxx b/sax/source/expatwrap/attrlistimpl.cxx index fad903fd4ff2..0eba8f06217d 100644 --- a/sax/source/expatwrap/attrlistimpl.cxx +++ b/sax/source/expatwrap/attrlistimpl.cxx @@ -57,7 +57,7 @@ struct AttributeList_impl -sal_Int16 AttributeList::getLength(void) throw (RuntimeException, std::exception) +sal_Int16 AttributeList::getLength() throw (RuntimeException, std::exception) { return static_cast<sal_Int16>(m_pImpl->vecAttribute.size()); } diff --git a/sax/source/expatwrap/attrlistimpl.hxx b/sax/source/expatwrap/attrlistimpl.hxx index 160e5fb3952f..a03985e0c669 100644 --- a/sax/source/expatwrap/attrlistimpl.hxx +++ b/sax/source/expatwrap/attrlistimpl.hxx @@ -47,7 +47,7 @@ public: void clear(); public: // XAttributeList - virtual sal_Int16 SAL_CALL getLength(void) + virtual sal_Int16 SAL_CALL getLength() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx index 1996cf714cbb..aca68c02b7bc 100644 --- a/sax/source/expatwrap/sax_expat.cxx +++ b/sax/source/expatwrap/sax_expat.cxx @@ -169,7 +169,7 @@ public: public: // XServiceInfo OUString SAL_CALL getImplementationName() throw (std::exception) SAL_OVERRIDE; - css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw (std::exception) SAL_OVERRIDE; + css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (std::exception) SAL_OVERRIDE; private: @@ -366,19 +366,19 @@ public: } public: //XLocator - virtual sal_Int32 SAL_CALL getColumnNumber(void) throw (std::exception) SAL_OVERRIDE + virtual sal_Int32 SAL_CALL getColumnNumber() throw (std::exception) SAL_OVERRIDE { return XML_GetCurrentColumnNumber( m_pParser->getEntity().pParser ); } - virtual sal_Int32 SAL_CALL getLineNumber(void) throw (std::exception) SAL_OVERRIDE + virtual sal_Int32 SAL_CALL getLineNumber() throw (std::exception) SAL_OVERRIDE { return XML_GetCurrentLineNumber( m_pParser->getEntity().pParser ); } - virtual OUString SAL_CALL getPublicId(void) throw (std::exception) SAL_OVERRIDE + virtual OUString SAL_CALL getPublicId() throw (std::exception) SAL_OVERRIDE { return m_pParser->getEntity().structSource.sPublicId; } - virtual OUString SAL_CALL getSystemId(void) throw (std::exception) SAL_OVERRIDE + virtual OUString SAL_CALL getSystemId() throw (std::exception) SAL_OVERRIDE { return m_pParser->getEntity().structSource.sSystemId; } @@ -603,7 +603,7 @@ sal_Bool SaxExpatParser::supportsService(const OUString& ServiceName) throw (std } // XServiceInfo -css::uno::Sequence< OUString > SaxExpatParser::getSupportedServiceNames(void) throw (std::exception) +css::uno::Sequence< OUString > SaxExpatParser::getSupportedServiceNames() throw (std::exception) { css::uno::Sequence<OUString> seq(1); seq[0] = "com.sun.star.xml.sax.Parser"; diff --git a/sax/source/expatwrap/saxwriter.cxx b/sax/source/expatwrap/saxwriter.cxx index 2c59889cc479..a7460dd25592 100644 --- a/sax/source/expatwrap/saxwriter.cxx +++ b/sax/source/expatwrap/saxwriter.cxx @@ -915,17 +915,17 @@ public: // XActiveDataSource e.WrappedException); } } - virtual Reference< XOutputStream > SAL_CALL getOutputStream(void) + virtual Reference< XOutputStream > SAL_CALL getOutputStream() throw(RuntimeException, std::exception) SAL_OVERRIDE { return m_out; } public: // XDocumentHandler - virtual void SAL_CALL startDocument(void) + virtual void SAL_CALL startDocument() throw(SAXException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL endDocument(void) + virtual void SAL_CALL endDocument() throw(SAXException, RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL startElement(const OUString& aName, @@ -947,18 +947,18 @@ public: // XDocumentHandler throw(SAXException, RuntimeException, std::exception) SAL_OVERRIDE; public: // XExtendedDocumentHandler - virtual void SAL_CALL startCDATA(void) throw(SAXException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL endCDATA(void) throw(SAXException,RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL startCDATA() throw(SAXException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL endCDATA() throw(SAXException,RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL comment(const OUString& sComment) throw(SAXException, RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL unknown(const OUString& sString) throw(SAXException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL allowLineBreak(void) + virtual void SAL_CALL allowLineBreak() throw(SAXException,RuntimeException, std::exception) SAL_OVERRIDE; public: // XServiceInfo OUString SAL_CALL getImplementationName() throw(std::exception) SAL_OVERRIDE; - Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(std::exception) SAL_OVERRIDE; + Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception) SAL_OVERRIDE; private: @@ -1008,7 +1008,7 @@ sal_Bool SAXWriter::supportsService(const OUString& ServiceName) throw(std::exce } // XServiceInfo -Sequence< OUString > SAXWriter::getSupportedServiceNames(void) throw (std::exception) +Sequence< OUString > SAXWriter::getSupportedServiceNames() throw (std::exception) { Sequence<OUString> seq(1); seq[0] = "com.sun.star.xml.sax.Writer"; @@ -1025,7 +1025,7 @@ void SAXWriter::startDocument() throw(SAXException, RuntimeE } -void SAXWriter::endDocument(void) throw(SAXException, RuntimeException, std::exception) +void SAXWriter::endDocument() throw(SAXException, RuntimeException, std::exception) { if( ! m_bDocStarted ) { @@ -1272,7 +1272,7 @@ void SAXWriter::setDocumentLocator(const Reference< XLocator >&) } -void SAXWriter::startCDATA(void) throw(SAXException, RuntimeException, std::exception) +void SAXWriter::startCDATA() throw(SAXException, RuntimeException, std::exception) { if( ! m_bDocStarted || m_bIsCDATA) { @@ -1289,7 +1289,7 @@ void SAXWriter::startCDATA(void) throw(SAXException, RuntimeException, std::exce m_bIsCDATA = true; } -void SAXWriter::endCDATA(void) throw (SAXException,RuntimeException, std::exception) +void SAXWriter::endCDATA() throw (SAXException,RuntimeException, std::exception) { if( ! m_bDocStarted || ! m_bIsCDATA) { diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx index ba0c158eb18e..8768281ea2fe 100644 --- a/sax/source/fastparser/fastparser.cxx +++ b/sax/source/fastparser/fastparser.cxx @@ -337,34 +337,34 @@ public: void checkDispose() throw (RuntimeException) { if( !mpParser ) throw DisposedException(); } //XLocator - virtual sal_Int32 SAL_CALL getColumnNumber(void) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getLineNumber(void) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getPublicId(void) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getSystemId(void) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getColumnNumber() throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getLineNumber() throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getPublicId() throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getSystemId() throw (RuntimeException, std::exception) SAL_OVERRIDE; private: FastSaxParserImpl *mpParser; }; -sal_Int32 SAL_CALL FastLocatorImpl::getColumnNumber(void) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL FastLocatorImpl::getColumnNumber() throw (RuntimeException, std::exception) { checkDispose(); return xmlSAX2GetColumnNumber( mpParser->getEntity().mpParser ); } -sal_Int32 SAL_CALL FastLocatorImpl::getLineNumber(void) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL FastLocatorImpl::getLineNumber() throw (RuntimeException, std::exception) { checkDispose(); return xmlSAX2GetLineNumber( mpParser->getEntity().mpParser ); } -OUString SAL_CALL FastLocatorImpl::getPublicId(void) throw (RuntimeException, std::exception) +OUString SAL_CALL FastLocatorImpl::getPublicId() throw (RuntimeException, std::exception) { checkDispose(); return mpParser->getEntity().maStructSource.sPublicId; } -OUString SAL_CALL FastLocatorImpl::getSystemId(void) throw (RuntimeException, std::exception) +OUString SAL_CALL FastLocatorImpl::getSystemId() throw (RuntimeException, std::exception) { checkDispose(); return mpParser->getEntity().maStructSource.sSystemId; diff --git a/sax/test/sax/testsax.cxx b/sax/test/sax/testsax.cxx index caeac6d771d8..b520059975a3 100644 --- a/sax/test/sax/testsax.cxx +++ b/sax/test/sax/testsax.cxx @@ -63,10 +63,10 @@ public: sal_Int32 hTestHandle) throw ( IllegalArgumentException,RuntimeException); - virtual sal_Bool SAL_CALL testPassed(void) throw (RuntimeException); - virtual Sequence< OUString > SAL_CALL getErrors(void) throw (RuntimeException); - virtual Sequence< Any > SAL_CALL getErrorExceptions(void) throw (RuntimeException); - virtual Sequence< OUString > SAL_CALL getWarnings(void) throw (RuntimeException); + virtual sal_Bool SAL_CALL testPassed() throw (RuntimeException); + virtual Sequence< OUString > SAL_CALL getErrors() throw (RuntimeException); + virtual Sequence< Any > SAL_CALL getErrorExceptions() throw (RuntimeException); + virtual Sequence< OUString > SAL_CALL getWarnings() throw (RuntimeException); private: void testSimple( const Reference < XParser > &r ); @@ -174,22 +174,22 @@ sal_Int32 OSaxParserTest::test( return hTestHandle; } -sal_Bool OSaxParserTest::testPassed(void) throw (RuntimeException) +sal_Bool OSaxParserTest::testPassed() throw (RuntimeException) { return m_seqErrors.getLength() == 0; } -Sequence< OUString > OSaxParserTest::getErrors(void) throw (RuntimeException) +Sequence< OUString > OSaxParserTest::getErrors() throw (RuntimeException) { return m_seqErrors; } -Sequence< Any > OSaxParserTest::getErrorExceptions(void) throw (RuntimeException) +Sequence< Any > OSaxParserTest::getErrorExceptions() throw (RuntimeException) { return m_seqExceptions; } -Sequence< OUString > OSaxParserTest::getWarnings(void) throw (RuntimeException) +Sequence< OUString > OSaxParserTest::getWarnings() throw (RuntimeException) { return m_seqWarnings; } @@ -264,7 +264,7 @@ public: } // ExtendedDocumentHandler - virtual void SAL_CALL startDocument(void) throw (SAXException, RuntimeException) + virtual void SAL_CALL startDocument() throw (SAXException, RuntimeException) { m_iLevel = 0; m_iElementCount = 0; @@ -275,7 +275,7 @@ public: printf( "document started\n" ); } } - virtual void SAL_CALL endDocument(void) throw (SAXException, RuntimeException) + virtual void SAL_CALL endDocument() throw (SAXException, RuntimeException) { if( m_bPrint ) { printf( "document finished\n" ); @@ -379,13 +379,13 @@ public: return source; } - virtual void SAL_CALL startCDATA(void) throw (SAXException,RuntimeException) + virtual void SAL_CALL startCDATA() throw (SAXException,RuntimeException) { if( m_bPrint ) { printf( "CDataStart :\n" ); } } - virtual void SAL_CALL endCDATA(void) throw (SAXException,RuntimeException) + virtual void SAL_CALL endCDATA() throw (SAXException,RuntimeException) { if( m_bPrint ) { printf( "CEndStart :\n" ); @@ -407,7 +407,7 @@ public: } } - virtual void SAL_CALL allowLineBreak( void) throw (SAXException, RuntimeException ) + virtual void SAL_CALL allowLineBreak() throw (SAXException, RuntimeException ) { } diff --git a/sax/test/sax/testwriter.cxx b/sax/test/sax/testwriter.cxx index 3dc52fa83ca2..f078ea88d741 100644 --- a/sax/test/sax/testwriter.cxx +++ b/sax/test/sax/testwriter.cxx @@ -56,9 +56,9 @@ public: public: virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData) throw (NotConnectedException, BufferSizeExceededException, RuntimeException); - virtual void SAL_CALL flush(void) + virtual void SAL_CALL flush() throw (NotConnectedException, BufferSizeExceededException, RuntimeException); - virtual void SAL_CALL closeOutput(void) + virtual void SAL_CALL closeOutput() throw (NotConnectedException, BufferSizeExceededException, RuntimeException); private: char m_pcFile[256]; @@ -77,13 +77,13 @@ void OFileWriter::writeBytes(const Sequence< sal_Int8 >& aData) } -void OFileWriter::flush(void) +void OFileWriter::flush() throw (NotConnectedException, BufferSizeExceededException, RuntimeException) { fflush( m_f ); } -void OFileWriter::closeOutput(void) +void OFileWriter::closeOutput() throw (NotConnectedException, BufferSizeExceededException, RuntimeException) { fclose( m_f ); @@ -115,11 +115,11 @@ public: sal_Int32 hTestHandle) throw ( IllegalArgumentException,RuntimeException); - virtual sal_Bool SAL_CALL testPassed(void) + virtual sal_Bool SAL_CALL testPassed() throw ( RuntimeException); - virtual Sequence< OUString > SAL_CALL getErrors(void) throw (RuntimeException); - virtual Sequence< Any > SAL_CALL getErrorExceptions(void) throw (RuntimeException); - virtual Sequence< OUString > SAL_CALL getWarnings(void) throw (RuntimeException); + virtual Sequence< OUString > SAL_CALL getErrors() throw (RuntimeException); + virtual Sequence< Any > SAL_CALL getErrorExceptions() throw (RuntimeException); + virtual Sequence< OUString > SAL_CALL getWarnings() throw (RuntimeException); private: void testSimple( const Reference< XExtendedDocumentHandler > &r ); @@ -152,7 +152,7 @@ public: ~AttributeListImpl(); public: - virtual sal_Int16 SAL_CALL getLength(void) throw (RuntimeException); + virtual sal_Int16 SAL_CALL getLength() throw (RuntimeException); virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw (RuntimeException); virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw (RuntimeException); virtual OUString SAL_CALL getTypeByName(const OUString& aName) throw (RuntimeException); @@ -199,7 +199,7 @@ struct AttributeListImpl_impl -sal_Int16 AttributeListImpl::getLength(void) throw (RuntimeException) +sal_Int16 AttributeListImpl::getLength() throw (RuntimeException) { return m_pImpl->vecAttribute.size(); } @@ -411,25 +411,25 @@ sal_Int32 OSaxWriterTest::test( -sal_Bool OSaxWriterTest::testPassed(void) throw (RuntimeException) +sal_Bool OSaxWriterTest::testPassed() throw (RuntimeException) { return m_seqErrors.getLength() == 0; } -Sequence< OUString > OSaxWriterTest::getErrors(void) throw (RuntimeException) +Sequence< OUString > OSaxWriterTest::getErrors() throw (RuntimeException) { return m_seqErrors; } -Sequence< Any > OSaxWriterTest::getErrorExceptions(void) throw (RuntimeException) +Sequence< Any > OSaxWriterTest::getErrorExceptions() throw (RuntimeException) { return m_seqExceptions; } -Sequence< OUString > OSaxWriterTest::getWarnings(void) throw (RuntimeException) +Sequence< OUString > OSaxWriterTest::getWarnings() throw (RuntimeException) { return m_seqWarnings; } diff --git a/sax/test/saxdemo.cxx b/sax/test/saxdemo.cxx index 7b014060182e..5af47eb763ff 100644 --- a/sax/test/saxdemo.cxx +++ b/sax/test/saxdemo.cxx @@ -158,7 +158,7 @@ public: // Error handler public: // ExtendedDocumentHandler - virtual void SAL_CALL startDocument(void) throw (SAXException, RuntimeException) + virtual void SAL_CALL startDocument() throw (SAXException, RuntimeException) { m_iElementCount = 0; m_iAttributeCount = 0; @@ -166,7 +166,7 @@ public: // ExtendedDocumentHandler m_iCharCount=0; printf( "document started\n" ); } - virtual void SAL_CALL endDocument(void) throw (SAXException, RuntimeException) + virtual void SAL_CALL endDocument() throw (SAXException, RuntimeException) { printf( "document finished\n" ); printf( "(ElementCount %d),(AttributeCount %d),(WhitespaceCount %d),(CharCount %d)\n", @@ -221,10 +221,10 @@ public: // ExtendedDocumentHandler return source; } - virtual void SAL_CALL startCDATA(void) throw (SAXException,RuntimeException) + virtual void SAL_CALL startCDATA() throw (SAXException,RuntimeException) { } - virtual void SAL_CALL endCDATA(void) throw (SAXException,RuntimeException) + virtual void SAL_CALL endCDATA() throw (SAXException,RuntimeException) { } virtual void SAL_CALL comment(const OUString& /* sComment */) throw (SAXException,RuntimeException) @@ -234,7 +234,7 @@ public: // ExtendedDocumentHandler { } - virtual void SAL_CALL allowLineBreak( void) throw (SAXException, RuntimeException ) + virtual void SAL_CALL allowLineBreak() throw (SAXException, RuntimeException ) { } @@ -259,7 +259,7 @@ public: ~AttributeListImpl(); public: - virtual sal_Int16 SAL_CALL getLength(void) throw (RuntimeException); + virtual sal_Int16 SAL_CALL getLength() throw (RuntimeException); virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw (RuntimeException); virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw (RuntimeException); virtual OUString SAL_CALL getTypeByName(const OUString& aName) throw (RuntimeException); @@ -306,7 +306,7 @@ struct AttributeListImpl_impl -sal_Int16 AttributeListImpl::getLength(void) throw (RuntimeException) +sal_Int16 AttributeListImpl::getLength() throw (RuntimeException) { return (sal_Int16) m_pImpl->vecAttribute.size(); } @@ -440,9 +440,9 @@ public: public: virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData) throw (NotConnectedException, BufferSizeExceededException, RuntimeException); - virtual void SAL_CALL flush(void) + virtual void SAL_CALL flush() throw (NotConnectedException, BufferSizeExceededException, RuntimeException); - virtual void SAL_CALL closeOutput(void) + virtual void SAL_CALL closeOutput() throw (NotConnectedException, BufferSizeExceededException, RuntimeException); private: char m_pcFile[256]; @@ -461,13 +461,13 @@ void OFileWriter::writeBytes(const Sequence< sal_Int8 >& aData) } -void OFileWriter::flush(void) +void OFileWriter::flush() throw (NotConnectedException, BufferSizeExceededException, RuntimeException) { fflush( m_f ); } -void OFileWriter::closeOutput(void) +void OFileWriter::closeOutput() throw (NotConnectedException, BufferSizeExceededException, RuntimeException) { fclose( m_f ); diff --git a/sc/inc/ScPanelFactory.hxx b/sc/inc/ScPanelFactory.hxx index 69af4f086e26..8f81d3833f32 100644 --- a/sc/inc/ScPanelFactory.hxx +++ b/sc/inc/ScPanelFactory.hxx @@ -47,8 +47,8 @@ public: const css::uno::Reference<css::lang::XMultiServiceFactory>& rxFactory); static css::uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames_static(); - ScPanelFactory(void); - virtual ~ScPanelFactory(void); + ScPanelFactory(); + virtual ~ScPanelFactory(); // XUIElementFactory css::uno::Reference<css::ui::XUIElement> SAL_CALL createUIElement( diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx index 1d30cc5833f9..3052b3760a65 100644 --- a/sc/inc/dapiuno.hxx +++ b/sc/inc/dapiuno.hxx @@ -566,9 +566,9 @@ public: getItems() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // only called from property-functions: - com::sun::star::sheet::DataPilotFieldOrientation getOrientation(void) const; + com::sun::star::sheet::DataPilotFieldOrientation getOrientation() const; void setOrientation(com::sun::star::sheet::DataPilotFieldOrientation Orientation); - com::sun::star::sheet::GeneralFunction getFunction(void) const; + com::sun::star::sheet::GeneralFunction getFunction() const; void setFunction(com::sun::star::sheet::GeneralFunction Function); com::sun::star::uno::Sequence< com::sun::star::sheet::GeneralFunction > getSubtotals() const; void setSubtotals(const com::sun::star::uno::Sequence< com::sun::star::sheet::GeneralFunction >& rFunctions); diff --git a/sc/inc/filter.hxx b/sc/inc/filter.hxx index 40d93fd945ce..987daf39e425 100644 --- a/sc/inc/filter.hxx +++ b/sc/inc/filter.hxx @@ -119,7 +119,7 @@ protected: // scfilt plugin symbol extern "C" { - SAL_DLLPUBLIC_EXPORT ScFormatFilterPlugin * SAL_CALL ScFilterCreate(void); + SAL_DLLPUBLIC_EXPORT ScFormatFilterPlugin * SAL_CALL ScFilterCreate(); } class ScFormatFilter { diff --git a/sc/inc/linkuno.hxx b/sc/inc/linkuno.hxx index 2addfba54403..c4b804f9a0f2 100644 --- a/sc/inc/linkuno.hxx +++ b/sc/inc/linkuno.hxx @@ -135,13 +135,13 @@ public: ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // aus get/setPropertyValue gerufen: - OUString getFileName(void) const; + OUString getFileName() const; void setFileName(const OUString& FileName); - OUString getFilter(void) const; + OUString getFilter() const; void setFilter(const OUString& Filter); - OUString getFilterOptions(void) const; + OUString getFilterOptions() const; void setFilterOptions(const OUString& FilterOptions); - sal_Int32 getRefreshDelay(void) const; + sal_Int32 getRefreshDelay() const; void setRefreshDelay(sal_Int32 nRefreshDelay); // XServiceInfo @@ -286,13 +286,13 @@ public: ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // called from get/setPropertyValue: - OUString getFileName(void) const; + OUString getFileName() const; void setFileName(const OUString& FileName); - OUString getFilter(void) const; + OUString getFilter() const; void setFilter(const OUString& Filter); - OUString getFilterOptions(void) const; + OUString getFilterOptions() const; void setFilterOptions(const OUString& FilterOptions); - sal_Int32 getRefreshDelay(void) const; + sal_Int32 getRefreshDelay() const; void setRefreshDelay(sal_Int32 nRefreshDelay); // XAreaLink diff --git a/sc/inc/miscuno.hxx b/sc/inc/miscuno.hxx index 654273ef9583..8ff623364787 100644 --- a/sc/inc/miscuno.hxx +++ b/sc/inc/miscuno.hxx @@ -42,7 +42,7 @@ sal_Bool SAL_CALL ClassName::supportsService( const OUString& ServiceName ) \ return cppu::supportsService(this, ServiceName); \ } \ ::com::sun::star::uno::Sequence< OUString > \ - SAL_CALL ClassName::getSupportedServiceNames(void) \ + SAL_CALL ClassName::getSupportedServiceNames() \ throw(::com::sun::star::uno::RuntimeException, std::exception) \ { \ ::com::sun::star::uno::Sequence< OUString > aRet(1); \ diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx index 5d782e99e525..1190895f2277 100644 --- a/sc/inc/rangenam.hxx +++ b/sc/inc/rangenam.hxx @@ -102,8 +102,8 @@ public: bool operator== (const ScRangeData& rData) const; void GetName( OUString& rName ) const { rName = aName; } - const OUString& GetName( void ) const { return aName; } - const OUString& GetUpperName( void ) const { return aUpperName; } + const OUString& GetName() const { return aName; } + const OUString& GetUpperName() const { return aUpperName; } ScAddress GetPos() const { return aPos; } // The index has to be unique. If index=0 a new index value is assigned. void SetIndex( sal_uInt16 nInd ) { nIndex = nInd; } diff --git a/sc/inc/shapeuno.hxx b/sc/inc/shapeuno.hxx index 6fdf66a0dd9b..4182893ddf63 100644 --- a/sc/inc/shapeuno.hxx +++ b/sc/inc/shapeuno.hxx @@ -170,7 +170,7 @@ public: std::exception) SAL_OVERRIDE; // XComponent - virtual void SAL_CALL dispose(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/sc/inc/targuno.hxx b/sc/inc/targuno.hxx index 978cf286557d..433ef8416153 100644 --- a/sc/inc/targuno.hxx +++ b/sc/inc/targuno.hxx @@ -83,17 +83,17 @@ public: throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::container::XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; class ScLinkTargetTypeObj : public ::cppu::WeakImplHelper3< @@ -116,7 +116,7 @@ public: static void SetLinkTargetBitmap( ::com::sun::star::uno::Any& rRet, sal_uInt16 nType ); // ::com::sun::star::beans::XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue(const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue) throw( ::com::sun::star::beans::UnknownPropertyException, @@ -150,12 +150,12 @@ public: ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::document::XLinkTargetSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getLinks(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getLinks() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; class ScLinkTargetsObj : public ::cppu::WeakImplHelper2< @@ -174,17 +174,17 @@ public: throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::container::XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; #endif diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx index 2b39aacf9544..f4d3afede272 100644 --- a/sc/inc/viewuno.hxx +++ b/sc/inc/viewuno.hxx @@ -196,9 +196,9 @@ private: bool bFilteredRangeSelection; ScViewPaneObj* GetObjectByIndex_Impl(sal_uInt16 nIndex) const; - sal_Int16 GetZoom(void) const; + sal_Int16 GetZoom() const; void SetZoom(sal_Int16 Zoom); - sal_Int16 GetZoomType(void) const; + sal_Int16 GetZoomType() const; void SetZoomType(sal_Int16 ZoomType); com::sun::star::uno::Reference< com::sun::star::uno::XInterface > GetClickedObject(const Point& rPoint) const; diff --git a/sc/source/core/opencl/op_addin.hxx b/sc/source/core/opencl/op_addin.hxx index ecdec028392b..c092eebd9daf 100644 --- a/sc/source/core/opencl/op_addin.hxx +++ b/sc/source/core/opencl/op_addin.hxx @@ -19,14 +19,14 @@ class OpBesselj: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Besselj"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Besselj"; } }; class OpGestep: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Gestep"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Gestep"; } }; }} diff --git a/sc/source/core/opencl/op_array.hxx b/sc/source/core/opencl/op_array.hxx index 410e013a5212..e8d76bef9696 100644 --- a/sc/source/core/opencl/op_array.hxx +++ b/sc/source/core/opencl/op_array.hxx @@ -19,7 +19,7 @@ class OpSumX2MY2: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SumX2MY2"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "SumX2MY2"; } }; class OpSumX2PY2: public CheckVariables @@ -27,7 +27,7 @@ class OpSumX2PY2: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SumX2PY2"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "SumX2PY2"; } }; class OpSumXMY2: public CheckVariables @@ -35,7 +35,7 @@ class OpSumXMY2: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SumXMY2"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "SumXMY2"; } }; }} diff --git a/sc/source/core/opencl/op_database.hxx b/sc/source/core/opencl/op_database.hxx index d64f3bcd37de..30a41618d395 100644 --- a/sc/source/core/opencl/op_database.hxx +++ b/sc/source/core/opencl/op_database.hxx @@ -19,7 +19,7 @@ class OpDmax: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dmax"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dmax"; } }; class OpDmin: public CheckVariables @@ -27,7 +27,7 @@ class OpDmin: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dmin"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dmin"; } }; class OpDproduct: public CheckVariables @@ -35,7 +35,7 @@ class OpDproduct: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dproduct"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dproduct"; } }; class OpDaverage: public CheckVariables @@ -43,7 +43,7 @@ class OpDaverage: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Daverage"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Daverage"; } }; class OpDstdev: public CheckVariables @@ -51,7 +51,7 @@ class OpDstdev: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dstdev"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dstdev"; } }; class OpDstdevp: public CheckVariables @@ -59,7 +59,7 @@ class OpDstdevp: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dstdevp"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dstdevp"; } }; class OpDsum: public CheckVariables @@ -67,7 +67,7 @@ class OpDsum: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dsum"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dsum"; } }; class OpDvar: public CheckVariables @@ -75,7 +75,7 @@ class OpDvar: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dvar"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dvar"; } }; class OpDvarp: public CheckVariables @@ -83,7 +83,7 @@ class OpDvarp: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dvarp"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dvarp"; } }; class OpDcount: public CheckVariables @@ -91,7 +91,7 @@ class OpDcount: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dcount"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dcount"; } }; class OpDcount2: public CheckVariables @@ -99,7 +99,7 @@ class OpDcount2: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dcount2"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dcount2"; } }; }} diff --git a/sc/source/core/opencl/op_financial.hxx b/sc/source/core/opencl/op_financial.hxx index 0136be7fc4f4..b64d2ee86eee 100644 --- a/sc/source/core/opencl/op_financial.hxx +++ b/sc/source/core/opencl/op_financial.hxx @@ -26,8 +26,8 @@ public: class OpRRI:public RRI { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "RRI"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "RRI"; } }; class OpNominal: public Normal @@ -35,131 +35,131 @@ class OpNominal: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "NOMINAL_ADD"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "NOMINAL_ADD"; } }; class OpDollarde:public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dollarde"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dollarde"; } }; class OpDollarfr:public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dollarfr"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dollarfr"; } }; class OpDISC: public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "DISC"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "DISC"; } }; class OpINTRATE: public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "INTRATE"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "INTRATE"; } }; class OpFV: public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream& ss, const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& , std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { + virtual std::string BinFuncName() const SAL_OVERRIDE { return "FV"; } }; class OpIPMT: public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream& ss, const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& , std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { + virtual std::string BinFuncName() const SAL_OVERRIDE { return "IPMT"; } }; class OpISPMT: public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ISPMT"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ISPMT"; } }; class OpDuration: public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream& ss, const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Duration"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Duration"; } }; class OpDuration_ADD: public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream& ss, const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& , std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Duration_ADD"; } }; class OpMDuration: public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream& ss, const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& , std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE {return "MDuration"; } + virtual std::string BinFuncName() const SAL_OVERRIDE {return "MDuration"; } }; class Fvschedule: public Normal @@ -187,8 +187,8 @@ public: class OpIRR: public IRR { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "IRR"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "IRR"; } }; class XNPV: public Normal @@ -211,7 +211,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SYD"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "SYD"; } }; class MIRR: public Normal @@ -224,26 +224,26 @@ public: class OpEffective:public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Effect_Add"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Effect_Add"; } }; class OpCumipmt: public Cumipmt { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Cumipmt"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Cumipmt"; } }; class OpXNPV: public XNPV { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "XNPV"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "XNPV"; } }; @@ -253,28 +253,28 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "fTbilleq"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "fTbilleq"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; class OpCumprinc: public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "cumprinc"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "cumprinc"; } }; class OpAccrintm: public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Accrintm"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Accrintm"; } }; class OpAccrint: public Normal { @@ -282,7 +282,7 @@ class OpAccrint: public Normal virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Accrint"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Accrint"; } }; class OpYield: public Normal @@ -290,7 +290,7 @@ class OpYield: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Yield"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Yield"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; @@ -299,14 +299,14 @@ class OpSLN: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SLN"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "SLN"; } }; class OpFvschedule: public Fvschedule { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Fvschedule"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Fvschedule"; } }; class OpYieldmat: public Normal @@ -314,7 +314,7 @@ class OpYieldmat: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Yieldmat"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Yieldmat"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; @@ -323,14 +323,14 @@ class OpPMT: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "PMT"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "PMT"; } }; class OpNPV: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "NPV"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "NPV"; } }; class OpPrice: public Normal @@ -339,7 +339,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Price"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Price"; } }; class OpNper: public Normal @@ -347,7 +347,7 @@ class OpNper: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "NPER"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "NPER"; } }; class OpOddlprice: public Normal { @@ -356,7 +356,7 @@ public: const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>&, std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Oddlprice"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Oddlprice"; } }; class OpOddlyield: public Normal { @@ -365,7 +365,7 @@ public: const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& , std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Oddlyield"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Oddlyield"; } }; class OpPriceDisc: public Normal { @@ -374,7 +374,7 @@ public: const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>&, std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "PriceDisc"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "PriceDisc"; } }; class OpPPMT: public Normal { @@ -382,39 +382,39 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "PPMT"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "PPMT"; } }; class OpCoupdaybs:public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0";} + virtual std::string GetBottom() SAL_OVERRIDE { return "0";} virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Coupdaybs"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Coupdaybs"; } }; class OpCoupdays:public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0";} + virtual std::string GetBottom() SAL_OVERRIDE { return "0";} virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Coupdays";} + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Coupdays";} }; class OpCoupdaysnc:public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0";} + virtual std::string GetBottom() SAL_OVERRIDE { return "0";} virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Coupdaysnc"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Coupdaysnc"; } }; @@ -424,7 +424,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Couppcd"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Couppcd"; } }; @@ -434,18 +434,18 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Coupncd"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Coupncd"; } }; class OpCoupnum:public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0";} + virtual std::string GetBottom() SAL_OVERRIDE { return "0";} virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Coupnum"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Coupnum"; } }; class OpDDB:public Normal @@ -454,7 +454,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "DDB"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "DDB"; } }; class OpDB:public Normal { @@ -462,34 +462,34 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "DB"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "DB"; } }; class OpAmordegrc:public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0";} + virtual std::string GetBottom() SAL_OVERRIDE { return "0";} virtual void GenSlidingWindowFunction(std::stringstream& ss, const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Amordegrc"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Amordegrc"; } }; class OpAmorlinc:public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0";} + virtual std::string GetBottom() SAL_OVERRIDE { return "0";} virtual void GenSlidingWindowFunction(std::stringstream& ss, const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Amorlinc"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Amorlinc"; } }; class OpReceived:public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Received"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Received"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; @@ -498,7 +498,7 @@ class OpYielddisc: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Yielddisc"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Yielddisc"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; @@ -507,15 +507,15 @@ class OpTbillprice: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "fTbillprice"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "fTbillprice"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; class OpPriceMat:public PriceMat { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "PriceMat"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "PriceMat"; } }; class RATE: public Normal @@ -527,8 +527,8 @@ public: }; class OpIntrate: public RATE { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "rate"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "rate"; } }; class OpTbillyield: public Normal @@ -537,15 +537,15 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "fTbillyield"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "fTbillyield"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; class OpMIRR: public MIRR { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "MIRR"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "MIRR"; } }; class OpPV: public Normal @@ -553,7 +553,7 @@ class OpPV: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "PV"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "PV"; } }; class OpVDB: public CheckVariables @@ -562,7 +562,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "VDB"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "VDB"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; @@ -572,7 +572,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Xirr"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Xirr"; } }; }} diff --git a/sc/source/core/opencl/op_logical.hxx b/sc/source/core/opencl/op_logical.hxx index be0ba3755fb2..db29889cc815 100644 --- a/sc/source/core/opencl/op_logical.hxx +++ b/sc/source/core/opencl/op_logical.hxx @@ -19,7 +19,7 @@ class OpAnd: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "And"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "And"; } }; class OpOr: public Normal @@ -27,28 +27,28 @@ class OpOr: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Or"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Or"; } }; class OpNot: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Not"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Not"; } }; class OpXor: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Xor"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Xor"; } }; class OpIf:public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "IF"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "IF"; } }; }} diff --git a/sc/source/core/opencl/op_math.hxx b/sc/source/core/opencl/op_math.hxx index 3929154c698b..6cb1eab34a79 100644 --- a/sc/source/core/opencl/op_math.hxx +++ b/sc/source/core/opencl/op_math.hxx @@ -20,7 +20,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Cos"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Cos"; } }; class OpSec: public Normal { @@ -28,7 +28,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Sec"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Sec"; } }; class OpSecH: public Normal { @@ -36,7 +36,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SecH"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "SecH"; } }; class OpMROUND: public Normal { @@ -44,7 +44,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "MROUND"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "MROUND"; } }; class OpCsc: public Normal @@ -52,16 +52,16 @@ class OpCsc: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Csc"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Csc"; } }; class OpSumIfs: public CheckVariables { public: - OpSumIfs(void): CheckVariables(), mNeedReductionKernel(false) {} + OpSumIfs(): CheckVariables(), mNeedReductionKernel(false) {} virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SumIfs"; } - bool NeedReductionKernel(void) const { return mNeedReductionKernel; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "SumIfs"; } + bool NeedReductionKernel() const { return mNeedReductionKernel; } protected: bool mNeedReductionKernel; }; @@ -71,43 +71,43 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Cosh"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Cosh"; } }; class OpSinh: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Sinh"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Sinh"; } }; class OpSin: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Sin"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Sin"; } }; class OpAbs:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScAbs"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScAbs"; } }; class OpArcCos:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScACos"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScACos"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; }; class OpArcCosHyp:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom(void) SAL_OVERRIDE { return "1.0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScACosH"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "1.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScACosH"; } }; class OpTan: public Normal { @@ -115,7 +115,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Tan"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Tan"; } }; class OpTanH: public Normal { @@ -123,7 +123,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "TanH"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "TanH"; } }; class OpSqrt: public Normal { @@ -131,36 +131,36 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Sqrt"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Sqrt"; } }; class OpArcCot:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScACot"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScACot"; } }; class OpArcCotHyp:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom(void) SAL_OVERRIDE { return "2.0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScACotH"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "2.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScACotH"; } }; class OpArcSin:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScASin"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScASin"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; }; class OpArcSinHyp:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScASinH"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScASinH"; } }; class OpTrunc: public Normal { @@ -168,120 +168,120 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Trunc"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Trunc"; } }; class OpArcTan2:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScATan2"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScATan2"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; }; class OpArcTan:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScATan"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScATan"; } }; class OpArcTanH:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScATanH"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScATanH"; } }; class OpBitAnd:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScBitAnd"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScBitAnd"; } }; class OpBitOr:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScBitOr"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScBitOr"; } }; class OpBitXor:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScBitXor"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScBitXor"; } }; class OpBitLshift:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScBitLshift"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScBitLshift"; } }; class OpBitRshift:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScBitRshift"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScBitRshift"; } }; class OpLn: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Ln"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Ln"; } }; class OpRound: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Round"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Round"; } }; class OpRoundUp: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "RoundUp"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "RoundUp"; } }; class OpRoundDown: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "RoundDown"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "RoundDown"; } }; class OpInt: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Int"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Int"; } }; class OpRadians: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Radians"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Radians"; } }; class OpIsEven: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "IsEven"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "IsEven"; } }; class OpIsOdd: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "IsOdd"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "IsOdd"; } }; class OpCot: public Normal { @@ -289,7 +289,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Cot"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Cot"; } }; class OpSumSQ: public Normal { @@ -297,7 +297,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SumSQ"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "SumSQ"; } }; class OpCoth: public Normal { @@ -306,63 +306,63 @@ public: const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& , std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Coth"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Coth"; } }; class OpPower: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Power"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Power"; } }; class OpOdd: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Odd"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Odd"; } }; class OpFloor: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Floor"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Floor"; } }; class OpCscH: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "CscH"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "CscH"; } }; class OpCeil:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScCeil"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScCeil"; } }; class OpExp: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Exp"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Exp"; } }; class OpLog10: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Log10"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Log10"; } }; class OpConvert: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Convert"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Convert"; } virtual bool takeString() const SAL_OVERRIDE { return true; } }; @@ -372,21 +372,21 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Even"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Even"; } }; class OpAverageIfs: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "AverageIfs"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "AverageIfs"; } }; class OpCountIfs: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "CountIfs"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "CountIfs"; } }; class OpMod: public Normal { @@ -394,14 +394,14 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Mod"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Mod"; } }; class OpProduct: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Product"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Product"; } }; class OpSqrtPi: public Normal { @@ -409,7 +409,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SqrtPi"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "SqrtPi"; } }; class OpCombinA: public Normal @@ -418,7 +418,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Combina"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Combina"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; class OpLog: public Normal @@ -427,14 +427,14 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Log"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Log"; } }; class OpCombin: public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScCombin"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScCombin"; } }; class OpAverageIf: public CheckVariables { @@ -442,56 +442,56 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "AverageIf"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "AverageIf"; } }; class OpDeg: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Degrees"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Degrees"; } }; class OpCountIf: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Countif"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Countif"; } }; class OpFact: public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream& ss, const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Fact"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Fact"; } }; class OpSeriesSum: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SeriesSum"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "SeriesSum"; } }; class OpSumIf: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SumIf"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "SumIf"; } }; class OpQuotient: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Quotient"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Quotient"; } }; class OpNegSub: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "NegSub"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "NegSub"; } }; }} diff --git a/sc/source/core/opencl/op_spreadsheet.hxx b/sc/source/core/opencl/op_spreadsheet.hxx index 01795062b616..e787bda0a4cd 100644 --- a/sc/source/core/opencl/op_spreadsheet.hxx +++ b/sc/source/core/opencl/op_spreadsheet.hxx @@ -19,7 +19,7 @@ class OpVLookup: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "VLookup"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "VLookup"; } virtual bool takeString() const SAL_OVERRIDE { return true; } }; diff --git a/sc/source/core/opencl/op_statistical.hxx b/sc/source/core/opencl/op_statistical.hxx index 792c486ea6be..0f9eb6478392 100644 --- a/sc/source/core/opencl/op_statistical.hxx +++ b/sc/source/core/opencl/op_statistical.hxx @@ -19,35 +19,35 @@ class OpStandard: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Standard"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Standard"; } }; class OpExponDist: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ExponDist"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ExponDist"; } }; class OpVar: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Var"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Var"; } }; class OpSTEYX: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "STEYX"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "STEYX"; } }; class OpVarP: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "VarP"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "VarP"; } }; class OpZTest: public Normal { @@ -55,14 +55,14 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ZTest"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ZTest"; } }; class OpStDevP: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "StDevP"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "StDevP"; } }; class OpStDev: public Normal @@ -70,28 +70,28 @@ class OpStDev: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "StDev"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "StDev"; } }; class OpSkewp: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Skewp"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Skewp"; } }; class OpSlope: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Slope"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Slope"; } }; class OpWeibull: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Weibull"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Weibull"; } }; class OpFdist: public Normal { @@ -99,14 +99,14 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Fdist"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Fdist"; } }; class OpTDist: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "TDist"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "TDist"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; }; class OpTInv: public Normal @@ -114,7 +114,7 @@ class OpTInv: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "TInv"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "TInv"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; }; class OpTTest: public Normal @@ -122,7 +122,7 @@ class OpTTest: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "TTest"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "TTest"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; }; class OpSkew: public Normal @@ -130,14 +130,14 @@ class OpSkew: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Skew"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Skew"; } }; class OpFisher: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Fisher"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Fisher"; } }; class OpFisherInv: public Normal @@ -145,7 +145,7 @@ class OpFisherInv: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "FisherInv"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "FisherInv"; } }; class OpGamma: public Normal @@ -153,7 +153,7 @@ class OpGamma: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Gamma"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Gamma"; } }; class OpCorrel: public Normal @@ -161,7 +161,7 @@ class OpCorrel: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Correl"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Correl"; } }; class OpNegbinomdist: public Normal @@ -169,7 +169,7 @@ class OpNegbinomdist: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpNegbinomdist"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpNegbinomdist"; } }; class OpPearson: public Normal @@ -177,7 +177,7 @@ class OpPearson: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpPearson"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpPearson"; } }; class OpGammaLn: public Normal @@ -185,7 +185,7 @@ class OpGammaLn: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "GammaLn"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "GammaLn"; } }; class OpGauss: public Normal @@ -195,17 +195,17 @@ public: const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& , std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Gauss"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Gauss"; } }; class OpGeoMean: public CheckVariables { public: - OpGeoMean(void): CheckVariables(), mNeedReductionKernel(true) {} + OpGeoMean(): CheckVariables(), mNeedReductionKernel(true) {} virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "GeoMean"; } - bool NeedReductionKernel(void) const { return mNeedReductionKernel; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "GeoMean"; } + bool NeedReductionKernel() const { return mNeedReductionKernel; } protected: bool mNeedReductionKernel; }; @@ -215,7 +215,7 @@ class OpHarMean: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "HarMean"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "HarMean"; } }; class OpRsq: public Normal @@ -223,124 +223,124 @@ class OpRsq: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpRsq"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpRsq"; } }; class OpNormdist:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpNormdist"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpNormdist"; } }; class OpMedian:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpMedian"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpMedian"; } }; class OpNormsdist:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpNormsdist"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpNormsdist"; } }; class OpNorminv:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpNorminv"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpNorminv"; } }; class OpNormsinv:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpNormsinv"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpNormsinv"; } }; class OpPhi:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpPhi"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpPhi"; } }; class OpKurt: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Kurt"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Kurt"; } }; class OpCovar: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream& ss, const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Covar"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Covar"; } }; class OpPermut:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpPermut"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpPermut"; } }; class OpPermutationA:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpPermutationA";} + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpPermutationA";} }; class OpConfidence: public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream& ss, const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& , std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Confidence"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Confidence"; } }; class OpIntercept: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Intercept"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Intercept"; } }; class OpLogInv: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "LogInv"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "LogInv"; } }; class OpCritBinom: public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream& ss, const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& , std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "CritBinom"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "CritBinom"; } }; class OpForecast: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Forecast"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Forecast"; } }; class OpLogNormDist: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "LogNormdist"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "LogNormdist"; } }; class OpGammaDist: public Normal { @@ -348,34 +348,34 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; void BinInlineFun(std::set<std::string>& decls,std::set<std::string>& funs) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "GammaDist"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "GammaDist"; } }; class OpHypGeomDist:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpHypGeomDist"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpHypGeomDist"; } }; class OpChiDist:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpChiDist"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpChiDist"; } }; class OpBinomdist:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpBinomdist"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpBinomdist"; } }; class OpChiSqDist: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ChiSqDist"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ChiSqDist"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; @@ -384,7 +384,7 @@ class OpChiSqInv: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ChiSqInv"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ChiSqInv"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; class OpChiInv:public Normal{ @@ -392,14 +392,14 @@ class OpChiInv:public Normal{ virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpChiInv"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpChiInv"; } }; class OpPoisson:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpPoisson"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpPoisson"; } }; class OpGammaInv: public Normal @@ -409,7 +409,7 @@ public: const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; void BinInlineFun(std::set<std::string>& decls,std::set<std::string>& funs ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "GammaInv"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "GammaInv"; } }; class OpFInv: public Normal { @@ -418,7 +418,7 @@ public: const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; void BinInlineFun(std::set<std::string>& decls,std::set<std::string>& funs ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "FInv"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "FInv"; } }; class OpFTest: public Normal { @@ -427,14 +427,14 @@ public: const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; void BinInlineFun(std::set<std::string>& decls,std::set<std::string>& funs ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "FTest"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "FTest"; } }; class OpDevSq: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "DevSq"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "DevSq"; } }; class OpB: public Normal { @@ -443,7 +443,7 @@ public: const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; void BinInlineFun(std::set<std::string>& decls,std::set<std::string>& funs ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "B"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "B"; } }; class OpBetaDist: public Normal { @@ -452,21 +452,21 @@ public: const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; void BinInlineFun(std::set<std::string>& decls,std::set<std::string>& funs ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "BetaDist"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "BetaDist"; } }; class OpBetainv:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpBetainv"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpBetainv"; } }; class OpMinA: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpMinA"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpMinA"; } virtual bool takeString() const SAL_OVERRIDE { return true; } virtual bool takeNumeric() const SAL_OVERRIDE { return true; } }; @@ -475,7 +475,7 @@ class OpCountA: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpCountA"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpCountA"; } virtual bool takeString() const SAL_OVERRIDE { return true; } virtual bool takeNumeric() const SAL_OVERRIDE { return true; } }; @@ -484,7 +484,7 @@ class OpMaxA: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpMaxA"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpMaxA"; } virtual bool takeString() const SAL_OVERRIDE { return true; } virtual bool takeNumeric() const SAL_OVERRIDE { return true; } }; @@ -493,7 +493,7 @@ class OpVarA: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpVarA"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpVarA"; } virtual bool takeString() const SAL_OVERRIDE { return true; } virtual bool takeNumeric() const SAL_OVERRIDE { return true; } }; @@ -502,7 +502,7 @@ class OpVarPA: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpVarPA"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpVarPA"; } virtual bool takeString() const SAL_OVERRIDE { return true; } virtual bool takeNumeric() const SAL_OVERRIDE { return true; } }; @@ -511,7 +511,7 @@ class OpStDevPA: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpStDevPA"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpStDevPA"; } virtual bool takeString() const SAL_OVERRIDE { return true; } virtual bool takeNumeric() const SAL_OVERRIDE { return true; } }; @@ -520,7 +520,7 @@ class OpAverageA: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpAverageA"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpAverageA"; } virtual bool takeString() const SAL_OVERRIDE { return true; } virtual bool takeNumeric() const SAL_OVERRIDE { return true; } }; @@ -529,7 +529,7 @@ class OpStDevA: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpStDevA"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpStDevA"; } virtual bool takeString() const SAL_OVERRIDE { return true; } virtual bool takeNumeric() const SAL_OVERRIDE { return true; } }; @@ -538,7 +538,7 @@ class OpAveDev: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "AveDev"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "AveDev"; } }; }} diff --git a/sc/source/core/opencl/opinlinefun_finacial.cxx b/sc/source/core/opencl/opinlinefun_finacial.cxx index c18212fdeb58..f062954d4115 100644 --- a/sc/source/core/opencl/opinlinefun_finacial.cxx +++ b/sc/source/core/opencl/opinlinefun_finacial.cxx @@ -272,18 +272,18 @@ std::string DateToDays_new= "}\n"; std::string GetNullDateDecl= -"int GetNullDate(void);\n"; +"int GetNullDate();\n"; std::string GetNullDate= -"int GetNullDate(void)\n" +"int GetNullDate()\n" "{\n" " return DateToDays(30,12,1899 );\n" "}\n"; std::string GetNullDate_newDecl= -"int GetNullDate_new(void);\n"; +"int GetNullDate_new();\n"; std::string GetNullDate_new= -"int GetNullDate_new(void)\n" +"int GetNullDate_new()\n" "{\n" " return DateToDays_new(30,12,1899 );\n" "}\n"; diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx index 6efb11abba75..f46d25c8d324 100644 --- a/sc/source/filter/dif/difimp.cxx +++ b/sc/source/filter/dif/difimp.cxx @@ -253,7 +253,7 @@ DifParser::DifParser( SvStream& rNewIn, const sal_uInt32 nOption, ScDocument& rD pNumFormatter = rDoc.GetFormatTable(); } -TOPIC DifParser::GetNextTopic( void ) +TOPIC DifParser::GetNextTopic() { enum STATE { S_VectorVal, S_Data, S_END, S_START, S_UNKNOWN, S_ERROR_L2 }; @@ -489,7 +489,7 @@ bool DifParser::LookAhead() return bValidStructure; } -DATASET DifParser::GetNextDataset( void ) +DATASET DifParser::GetNextDataset() { DATASET eRet = D_UNKNOWN; OUString aLine; diff --git a/sc/source/filter/excel/excdoc.cxx b/sc/source/filter/excel/excdoc.cxx index c32262546ddd..b9788d7f8154 100644 --- a/sc/source/filter/excel/excdoc.cxx +++ b/sc/source/filter/excel/excdoc.cxx @@ -760,7 +760,7 @@ ExcDocument::~ExcDocument() delete pExpChangeTrack; } -void ExcDocument::ReadDoc( void ) +void ExcDocument::ReadDoc() { InitializeConvert(); diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index 72ba7717d759..7b27ddce9323 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -209,35 +209,35 @@ ImportExcel8::~ImportExcel8() { } -void ImportExcel8::Calccount( void ) +void ImportExcel8::Calccount() { ScDocOptions aOpt = pD->GetDocOptions(); aOpt.SetIterCount( aIn.ReaduInt16() ); pD->SetDocOptions( aOpt ); } -void ImportExcel8::Precision( void ) +void ImportExcel8::Precision() { ScDocOptions aOpt = pD->GetDocOptions(); aOpt.SetCalcAsShown( aIn.ReaduInt16() == 0 ); pD->SetDocOptions( aOpt ); } -void ImportExcel8::Delta( void ) +void ImportExcel8::Delta() { ScDocOptions aOpt = pD->GetDocOptions(); aOpt.SetIterEps( aIn.ReadDouble() ); pD->SetDocOptions( aOpt ); } -void ImportExcel8::Iteration( void ) +void ImportExcel8::Iteration() { ScDocOptions aOpt = pD->GetDocOptions(); aOpt.SetIter( aIn.ReaduInt16() == 1 ); pD->SetDocOptions( aOpt ); } -void ImportExcel8::Boundsheet( void ) +void ImportExcel8::Boundsheet() { sal_uInt8 nLen; sal_uInt16 nGrbit; @@ -270,7 +270,7 @@ void ImportExcel8::Boundsheet( void ) nBdshtTab++; } -void ImportExcel8::Scenman( void ) +void ImportExcel8::Scenman() { sal_uInt16 nLastDispl; @@ -280,12 +280,12 @@ void ImportExcel8::Scenman( void ) maScenList.nLastScenario = nLastDispl; } -void ImportExcel8::Scenario( void ) +void ImportExcel8::Scenario() { maScenList.aEntries.push_back( new ExcScenario( aIn, *pExcRoot ) ); } -void ImportExcel8::Labelsst( void ) +void ImportExcel8::Labelsst() { XclAddress aXclPos; sal_uInt16 nXF; @@ -305,7 +305,7 @@ void ImportExcel8::Labelsst( void ) } } -void ImportExcel8::FeatHdr( void ) +void ImportExcel8::FeatHdr() { if (!readFrtHeader( aIn, 0x0867)) return; @@ -322,7 +322,7 @@ void ImportExcel8::FeatHdr( void ) GetSheetProtectBuffer().ReadOptions( aIn, GetCurrScTab() ); } -void ImportExcel8::Feat( void ) +void ImportExcel8::Feat() { if (!readFrtHeader( aIn, 0x0868)) return; @@ -370,7 +370,7 @@ void ImportExcel8::Feat( void ) GetSheetProtectBuffer().AppendEnhancedProtection( aProt, GetCurrScTab() ); } -void ImportExcel8::ReadBasic( void ) +void ImportExcel8::ReadBasic() { SfxObjectShell* pShell = GetDocShell(); SotStorageRef xRootStrg = GetRootStorage(); @@ -423,14 +423,14 @@ void ImportExcel8::ReadBasic( void ) } } -void ImportExcel8::EndSheet( void ) +void ImportExcel8::EndSheet() { ImportExcel::EndSheet(); GetCondFormatManager().Apply(); GetValidationManager().Apply(); } -void ImportExcel8::PostDocLoad( void ) +void ImportExcel8::PostDocLoad() { #if HAVE_FEATURE_SCRIPTING // reading basic has been delayed until sheet objects (codenames etc.) are read @@ -483,7 +483,7 @@ void ImportExcel8::LoadDocumentProperties() // autofilter -void ImportExcel8::FilterMode( void ) +void ImportExcel8::FilterMode() { // The FilterMode record exists: if either the AutoFilter // record exists or an Advanced Filter is saved and stored @@ -496,7 +496,7 @@ void ImportExcel8::FilterMode( void ) pData->SetAutoOrAdvanced(); } -void ImportExcel8::AutoFilterInfo( void ) +void ImportExcel8::AutoFilterInfo() { if( !pExcRoot->pAutoFilterBuffer ) return; @@ -508,7 +508,7 @@ void ImportExcel8::AutoFilterInfo( void ) } } -void ImportExcel8::AutoFilter( void ) +void ImportExcel8::AutoFilter() { if( !pExcRoot->pAutoFilterBuffer ) return; diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx index 7bbe5559f446..2af837e14e0a 100644 --- a/sc/source/filter/excel/excrecds.cxx +++ b/sc/source/filter/excel/excrecds.cxx @@ -162,7 +162,7 @@ void ExcDummyRec::Save( XclExpStream& rStrm ) rStrm.Write( GetData(), GetLen() ); // raw write mode } -sal_uInt16 ExcDummyRec::GetNum( void ) const +sal_uInt16 ExcDummyRec::GetNum() const { return 0x0000; } @@ -174,7 +174,7 @@ void ExcBoolRecord::SaveCont( XclExpStream& rStrm ) rStrm << (sal_uInt16)(bVal ? 0x0001 : 0x0000); } -sal_Size ExcBoolRecord::GetLen( void ) const +sal_Size ExcBoolRecord::GetLen() const { return 2; } @@ -191,7 +191,7 @@ ExcBof_Base::ExcBof_Base() //-------------------------------------------------------------- class ExcBof - -ExcBof::ExcBof( void ) +ExcBof::ExcBof() { nDocType = 0x0010; nVers = 0x0500; @@ -202,19 +202,19 @@ void ExcBof::SaveCont( XclExpStream& rStrm ) rStrm << nVers << nDocType << nRupBuild << nRupYear; } -sal_uInt16 ExcBof::GetNum( void ) const +sal_uInt16 ExcBof::GetNum() const { return 0x0809; } -sal_Size ExcBof::GetLen( void ) const +sal_Size ExcBof::GetLen() const { return 8; } //------------------------------------------------------------- class ExcBofW - -ExcBofW::ExcBofW( void ) +ExcBofW::ExcBofW() { nDocType = 0x0005; nVers = 0x0500; @@ -225,58 +225,58 @@ void ExcBofW::SaveCont( XclExpStream& rStrm ) rStrm << nVers << nDocType << nRupBuild << nRupYear; } -sal_uInt16 ExcBofW::GetNum( void ) const +sal_uInt16 ExcBofW::GetNum() const { return 0x0809; } -sal_Size ExcBofW::GetLen( void ) const +sal_Size ExcBofW::GetLen() const { return 8; } //-------------------------------------------------------------- class ExcEof - -sal_uInt16 ExcEof::GetNum( void ) const +sal_uInt16 ExcEof::GetNum() const { return 0x000A; } -sal_Size ExcEof::GetLen( void ) const +sal_Size ExcEof::GetLen() const { return 0; } //--------------------------------------------------------- class ExcDummy_00 - -sal_Size ExcDummy_00::GetLen( void ) const +sal_Size ExcDummy_00::GetLen() const { return nMyLen; } -const sal_uInt8* ExcDummy_00::GetData( void ) const +const sal_uInt8* ExcDummy_00::GetData() const { return pMyData; } //-------------------------------------------------------- class ExcDummy_04x - -sal_Size ExcDummy_040::GetLen( void ) const +sal_Size ExcDummy_040::GetLen() const { return nMyLen; } -const sal_uInt8* ExcDummy_040::GetData( void ) const +const sal_uInt8* ExcDummy_040::GetData() const { return pMyData; } -sal_Size ExcDummy_041::GetLen( void ) const +sal_Size ExcDummy_041::GetLen() const { return nMyLen; } -const sal_uInt8* ExcDummy_041::GetData( void ) const +const sal_uInt8* ExcDummy_041::GetData() const { return pMyData; } @@ -290,7 +290,7 @@ Exc1904::Exc1904( ScDocument& rDoc ) bDateCompatibility = pDate && !( *pDate == Date( 30, 12, 1899 )); } -sal_uInt16 Exc1904::GetNum( void ) const +sal_uInt16 Exc1904::GetNum() const { return 0x0022; } @@ -340,7 +340,7 @@ void ExcBundlesheetBase::UpdateStreamPos( XclExpStream& rStrm ) rStrm.EnableEncryption(); } -sal_uInt16 ExcBundlesheetBase::GetNum( void ) const +sal_uInt16 ExcBundlesheetBase::GetNum() const { return 0x0085; } @@ -368,12 +368,12 @@ sal_Size ExcBundlesheet::GetLen() const //--------------------------------------------------------- class ExcDummy_02 - -sal_Size ExcDummy_02a::GetLen( void ) const +sal_Size ExcDummy_02a::GetLen() const { return nMyLen; } -const sal_uInt8* ExcDummy_02a::GetData( void ) const +const sal_uInt8* ExcDummy_02a::GetData() const { return pMyData; } diff --git a/sc/source/filter/excel/exctools.cxx b/sc/source/filter/excel/exctools.cxx index 53df97379afe..c23c70dab191 100644 --- a/sc/source/filter/excel/exctools.cxx +++ b/sc/source/filter/excel/exctools.cxx @@ -46,7 +46,7 @@ #include <vector> -RootData::RootData( void ) +RootData::RootData() { eDateiTyp = BiffX; pExtSheetBuff = NULL; diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx index 5b6bcd8426c0..a08bd1468b3f 100644 --- a/sc/source/filter/excel/impop.cxx +++ b/sc/source/filter/excel/impop.cxx @@ -152,7 +152,7 @@ ImportExcel::ImportExcel( XclImpRootData& rImpData, SvStream& rStrm ): pD->SetDocOptions( aDocOpt ); } -ImportExcel::~ImportExcel( void ) +ImportExcel::~ImportExcel() { GetDoc().SetSrcCharSet( GetTextEncoding() ); @@ -415,7 +415,7 @@ void ImportExcel::Window1() GetDocViewSettings().ReadWindow1( maStrm ); } -void ImportExcel::Row25( void ) +void ImportExcel::Row25() { sal_uInt16 nRow, nRowHeight; @@ -445,7 +445,7 @@ void ImportExcel::Row25( void ) } } -void ImportExcel::Bof2( void ) +void ImportExcel::Bof2() { sal_uInt16 nSubType; maStrm.DisableDecryption(); @@ -460,14 +460,14 @@ void ImportExcel::Bof2( void ) pExcRoot->eDateiTyp = Biff2; } -void ImportExcel::Eof( void ) +void ImportExcel::Eof() { // POST: cannot be called after an invalid table! EndSheet(); IncCurrScTab(); } -void ImportExcel::SheetPassword( void ) +void ImportExcel::SheetPassword() { if (GetRoot().GetBiff() != EXC_BIFF8) return; @@ -475,7 +475,7 @@ void ImportExcel::SheetPassword( void ) GetRoot().GetSheetProtectBuffer().ReadPasswordHash( aIn, GetCurrScTab() ); } -void ImportExcel::Externsheet( void ) +void ImportExcel::Externsheet() { OUString aUrl, aTabName; bool bSameWorkBook; @@ -484,7 +484,7 @@ void ImportExcel::Externsheet( void ) mnLastRefIdx = pExcRoot->pExtSheetBuff->Add( aUrl, aTabName, bSameWorkBook ); } -void ImportExcel:: WinProtection( void ) +void ImportExcel:: WinProtection() { if (GetRoot().GetBiff() != EXC_BIFF8) return; @@ -492,7 +492,7 @@ void ImportExcel:: WinProtection( void ) GetRoot().GetDocProtectBuffer().ReadWinProtect( aIn ); } -void ImportExcel::Columndefault( void ) +void ImportExcel::Columndefault() {// Default Cell Attributes sal_uInt16 nColMic, nColMac; sal_uInt8 nOpt0; @@ -518,7 +518,7 @@ void ImportExcel::Columndefault( void ) } } -void ImportExcel::Array25( void ) +void ImportExcel::Array25() { sal_uInt16 nFirstRow, nLastRow, nFormLen; sal_uInt8 nFirstCol, nLastCol; @@ -556,7 +556,7 @@ void ImportExcel::Array25( void ) } } -void ImportExcel::Rec1904( void ) +void ImportExcel::Rec1904() { sal_uInt16 n1904; @@ -571,7 +571,7 @@ void ImportExcel::Rec1904( void ) } } -void ImportExcel::Externname25( void ) +void ImportExcel::Externname25() { sal_uInt32 nRes; sal_uInt16 nOpt; @@ -596,7 +596,7 @@ void ImportExcel::Externname25( void ) } } -void ImportExcel::Colwidth( void ) +void ImportExcel::Colwidth() {// Column Width sal_uInt8 nColFirst, nColLast; sal_uInt16 nColWidth; @@ -613,7 +613,7 @@ void ImportExcel::Colwidth( void ) pColRowBuff->SetWidthRange( nColFirst, nColLast, nScWidth ); } -void ImportExcel::Defrowheight2( void ) +void ImportExcel::Defrowheight2() { sal_uInt16 nDefHeight; nDefHeight = maStrm.ReaduInt16(); @@ -621,7 +621,7 @@ void ImportExcel::Defrowheight2( void ) pColRowBuff->SetDefHeight( nDefHeight, EXC_DEFROW_UNSYNCED ); } -void ImportExcel::SheetProtect( void ) +void ImportExcel::SheetProtect() { if (GetRoot().GetBiff() != EXC_BIFF8) return; @@ -629,7 +629,7 @@ void ImportExcel::SheetProtect( void ) GetRoot().GetSheetProtectBuffer().ReadProtect( aIn, GetCurrScTab() ); } -void ImportExcel::DocProtect( void ) +void ImportExcel::DocProtect() { if (GetRoot().GetBiff() != EXC_BIFF8) return; @@ -637,7 +637,7 @@ void ImportExcel::DocProtect( void ) GetRoot().GetDocProtectBuffer().ReadDocProtect( aIn ); } -void ImportExcel::DocPasssword( void ) +void ImportExcel::DocPasssword() { if (GetRoot().GetBiff() != EXC_BIFF8) return; @@ -645,17 +645,17 @@ void ImportExcel::DocPasssword( void ) GetRoot().GetDocProtectBuffer().ReadPasswordHash( aIn ); } -void ImportExcel::Codepage( void ) +void ImportExcel::Codepage() { SetCodePage( maStrm.ReaduInt16() ); } -void ImportExcel::Ixfe( void ) +void ImportExcel::Ixfe() { mnIxfeIndex = maStrm.ReaduInt16(); } -void ImportExcel::DefColWidth( void ) +void ImportExcel::DefColWidth() { // stored as entire characters -> convert to 1/256 of characters (as in COLINFO) double fDefWidth = 256.0 * maStrm.ReaduInt16(); @@ -668,7 +668,7 @@ void ImportExcel::DefColWidth( void ) pColRowBuff->SetDefWidth( nScWidth ); } -void ImportExcel::Colinfo( void ) +void ImportExcel::Colinfo() {// Column Formatting Information sal_uInt16 nColFirst, nColLast, nColWidth, nXF; sal_uInt16 nOpt; @@ -698,7 +698,7 @@ void ImportExcel::Colinfo( void ) pColRowBuff->SetDefaultXF( nColFirst, nColLast, nXF ); } -void ImportExcel::Wsbool( void ) +void ImportExcel::Wsbool() { sal_uInt16 nFlags; nFlags = aIn.ReaduInt16(); @@ -709,7 +709,7 @@ void ImportExcel::Wsbool( void ) GetPageSettings().SetFitToPages( ::get_flag( nFlags, EXC_WSBOOL_FITTOPAGE ) ); } -void ImportExcel::Boundsheet( void ) +void ImportExcel::Boundsheet() { sal_uInt16 nGrbit = 0; @@ -742,7 +742,7 @@ void ImportExcel::Boundsheet( void ) nBdshtTab++; } -void ImportExcel::Country( void ) +void ImportExcel::Country() { sal_uInt16 nUICountry, nDocCountry; nUICountry = maStrm.ReaduInt16(); @@ -769,7 +769,7 @@ void ImportExcel::ReadUsesElfs() } } -void ImportExcel::Hideobj( void ) +void ImportExcel::Hideobj() { sal_uInt16 nHide; ScVObjMode eOle, eChart, eDraw; @@ -804,13 +804,13 @@ void ImportExcel::Hideobj( void ) pD->SetViewOptions( aOpts ); } -void ImportExcel::Standardwidth( void ) +void ImportExcel::Standardwidth() { sal_uInt16 nScWidth = XclTools::GetScColumnWidth( maStrm.ReaduInt16(), GetCharWidth() ); pColRowBuff->SetDefWidth( nScWidth, true ); } -void ImportExcel::Shrfmla( void ) +void ImportExcel::Shrfmla() { switch (mnLastRecId) { @@ -863,7 +863,7 @@ void ImportExcel::Shrfmla( void ) mpLastFormula->mpCell = pCell; } -void ImportExcel::Mulrk( void ) +void ImportExcel::Mulrk() { XclAddress aXclPos; sal_uInt16 nXF; @@ -885,7 +885,7 @@ void ImportExcel::Mulrk( void ) } } -void ImportExcel::Mulblank( void ) +void ImportExcel::Mulblank() { XclAddress aXclPos; sal_uInt16 nXF; @@ -902,7 +902,7 @@ void ImportExcel::Mulblank( void ) } } -void ImportExcel::Rstring( void ) +void ImportExcel::Rstring() { XclAddress aXclPos; sal_uInt16 nXFIdx; @@ -948,7 +948,7 @@ void ImportExcel::Cellmerging() } } -void ImportExcel::Olesize( void ) +void ImportExcel::Olesize() { XclRange aXclOleSize( ScAddress::UNINITIALIZED ); maStrm.Ignore( 2 ); @@ -958,7 +958,7 @@ void ImportExcel::Olesize( void ) GetAddressConverter().ConvertRange( maScOleSize, aXclOleSize, nScTab, nScTab, false ); } -void ImportExcel::Row34( void ) +void ImportExcel::Row34() { sal_uInt16 nRow, nRowHeight, nGrbit, nXF; @@ -988,7 +988,7 @@ void ImportExcel::Row34( void ) } } -void ImportExcel::Bof3( void ) +void ImportExcel::Bof3() { sal_uInt16 nSubType; maStrm.DisableDecryption(); @@ -1006,7 +1006,7 @@ void ImportExcel::Bof3( void ) pExcRoot->eDateiTyp = Biff3; } -void ImportExcel::Array34( void ) +void ImportExcel::Array34() { sal_uInt16 nFirstRow, nLastRow, nFormLen; sal_uInt8 nFirstCol, nLastCol; @@ -1035,7 +1035,7 @@ void ImportExcel::Array34( void ) } } -void ImportExcel::Defrowheight345( void ) +void ImportExcel::Defrowheight345() { sal_uInt16 nFlags, nDefHeight; nFlags = maStrm.ReaduInt16(); @@ -1043,7 +1043,7 @@ void ImportExcel::Defrowheight345( void ) pColRowBuff->SetDefHeight( nDefHeight, nFlags ); } -void ImportExcel::TableOp( void ) +void ImportExcel::TableOp() { sal_uInt16 nFirstRow, nLastRow; sal_uInt8 nFirstCol, nLastCol; @@ -1125,7 +1125,7 @@ void ImportExcel::TableOp( void ) } } -void ImportExcel::Bof4( void ) +void ImportExcel::Bof4() { sal_uInt16 nSubType; maStrm.DisableDecryption(); @@ -1142,7 +1142,7 @@ void ImportExcel::Bof4( void ) pExcRoot->eDateiTyp = Biff4; } -void ImportExcel::Bof5( void ) +void ImportExcel::Bof5() { //POST: eDateiTyp = Type of the file to be read sal_uInt16 nSubType, nVers; @@ -1170,7 +1170,7 @@ void ImportExcel::Bof5( void ) pExcRoot->eDateiTyp = eDatei; } -void ImportExcel::EndSheet( void ) +void ImportExcel::EndSheet() { pExcRoot->pExtSheetBuff->Reset(); @@ -1183,7 +1183,7 @@ void ImportExcel::EndSheet( void ) FinalizeTable(); } -void ImportExcel::NewTable( void ) +void ImportExcel::NewTable() { SCTAB nTab = GetCurrScTab(); if( nTab > 0 && !pD->HasTable( nTab ) ) @@ -1225,7 +1225,7 @@ void ImportExcel::AdjustRowHeight() pDocObj->UpdateAllRowHeights(); } -void ImportExcel::PostDocLoad( void ) +void ImportExcel::PostDocLoad() { /* Set automatic page numbering in Default page style (default is "page number = 1"). Otherwise hidden tables (i.e. for scenarios) which have Default page style will diff --git a/sc/source/filter/excel/namebuff.cxx b/sc/source/filter/excel/namebuff.cxx index dde5392339eb..098c32eef658 100644 --- a/sc/source/filter/excel/namebuff.cxx +++ b/sc/source/filter/excel/namebuff.cxx @@ -182,17 +182,17 @@ bool ExtSheetBuffer::GetLink( const sal_uInt16 nExcIndex, OUString& rAppl, OUStr return true; } -void ExtSheetBuffer::Reset( void ) +void ExtSheetBuffer::Reset() { maEntries.clear(); } -bool ExtName::IsDDE( void ) const +bool ExtName::IsDDE() const { return ( nFlags & 0x0001 ) != 0; } -bool ExtName::IsOLE( void ) const +bool ExtName::IsOLE() const { return ( nFlags & 0x0002 ) != 0; } @@ -228,7 +228,7 @@ const ExtName* ExtNameBuff::GetNameByIndex( sal_Int16 nRefIdx, sal_uInt16 nNameI return ((aIt != maExtNames.end()) && (0 < nNameIdx) && (nNameIdx <= aIt->second.size())) ? &aIt->second[ nNameIdx - 1 ] : 0; } -void ExtNameBuff::Reset( void ) +void ExtNameBuff::Reset() { maExtNames.clear(); } diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx index dc7c74e9072a..fe0afcf05c53 100644 --- a/sc/source/filter/excel/read.cxx +++ b/sc/source/filter/excel/read.cxx @@ -42,7 +42,7 @@ #include <boost/scoped_ptr.hpp> -FltError ImportExcel::Read( void ) +FltError ImportExcel::Read() { XclImpPageSettings& rPageSett = GetPageSettings(); XclImpTabViewSettings& rTabViewSett = GetTabViewSettings(); @@ -766,7 +766,7 @@ FltError ImportExcel::Read( void ) return eLastErr; } -FltError ImportExcel8::Read( void ) +FltError ImportExcel8::Read() { #ifdef EXC_INCL_DUMPER { diff --git a/sc/source/filter/excel/tokstack.cxx b/sc/source/filter/excel/tokstack.cxx index cea4a4c4a7ef..7837b6d6046d 100644 --- a/sc/source/filter/excel/tokstack.cxx +++ b/sc/source/filter/excel/tokstack.cxx @@ -152,7 +152,7 @@ static sal_uInt16 lcl_canGrow( sal_uInt16 nOld, sal_uInt16 nByMin = 1 ) return static_cast<sal_uInt16>(nNew); } -bool TokenPool::GrowString( void ) +bool TokenPool::GrowString() { sal_uInt16 nP_StrNew = lcl_canGrow( nP_Str); if (!nP_StrNew) @@ -176,7 +176,7 @@ bool TokenPool::GrowString( void ) return true; } -bool TokenPool::GrowDouble( void ) +bool TokenPool::GrowDouble() { sal_uInt16 nP_DblNew = lcl_canGrow( nP_Dbl); if (!nP_DblNew) @@ -198,7 +198,7 @@ bool TokenPool::GrowDouble( void ) /* TODO: in case we had FormulaTokenArray::AddError() */ #if 0 -void TokenPool::GrowError( void ) +void TokenPool::GrowError() { sal_uInt16 nP_ErrNew = lcl_canGrow( nP_Err); if (!nP_ErrNew) @@ -243,7 +243,7 @@ bool TokenPool::GrowTripel( sal_uInt16 nByMin ) return true; } -bool TokenPool::GrowId( void ) +bool TokenPool::GrowId() { sal_uInt16 nP_IdNew = lcl_canGrow( nP_Id); if (!nP_IdNew) @@ -263,7 +263,7 @@ bool TokenPool::GrowId( void ) return true; } -bool TokenPool::GrowElement( void ) +bool TokenPool::GrowElement() { sal_uInt16 nElementNew = lcl_canGrow( nElement); if (!nElementNew) @@ -298,7 +298,7 @@ bool TokenPool::GrowElement( void ) return true; } -bool TokenPool::GrowExt( void ) +bool TokenPool::GrowExt() { sal_uInt16 nNewSize = lcl_canGrow( nP_Ext); if (!nNewSize) @@ -317,7 +317,7 @@ bool TokenPool::GrowExt( void ) return true; } -bool TokenPool::GrowNlf( void ) +bool TokenPool::GrowNlf() { sal_uInt16 nNewSize = lcl_canGrow( nP_Nlf); if (!nNewSize) @@ -336,7 +336,7 @@ bool TokenPool::GrowNlf( void ) return true; } -bool TokenPool::GrowMatrix( void ) +bool TokenPool::GrowMatrix() { sal_uInt16 nNewSize = lcl_canGrow( nP_Matrix); if (!nNewSize) @@ -874,7 +874,7 @@ const TokenId TokenPool::StoreExtRef( sal_uInt16 nFileId, const OUString& rTabNa return static_cast<const TokenId>(nElementAkt); } -void TokenPool::Reset( void ) +void TokenPool::Reset() { nP_IdAkt = nP_IdLast = nElementAkt = nP_StrAkt = nP_DblAkt = nP_ErrAkt = nP_RefTrAkt = nP_ExtAkt = nP_NlfAkt = nP_MatrixAkt = 0; maRangeNames.clear(); diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx index f23fdd576c15..cb81d715cb31 100644 --- a/sc/source/filter/ftools/ftools.cxx +++ b/sc/source/filter/ftools/ftools.cxx @@ -363,7 +363,7 @@ ScOrcusFilters* ScFormatFilterPluginImpl::GetOrcusFilters() #endif } -ScFormatFilterPlugin * SAL_CALL ScFilterCreate(void) +ScFormatFilterPlugin * SAL_CALL ScFilterCreate() { return new ScFormatFilterPluginImpl(); } diff --git a/sc/source/filter/inc/dif.hxx b/sc/source/filter/inc/dif.hxx index 8ed3448ad60e..357ecdb8c72d 100644 --- a/sc/source/filter/inc/dif.hxx +++ b/sc/source/filter/inc/dif.hxx @@ -82,9 +82,9 @@ private: public: DifParser( SvStream&, const sal_uInt32 nOption, ScDocument&, rtl_TextEncoding ); - TOPIC GetNextTopic( void ); + TOPIC GetNextTopic(); - DATASET GetNextDataset( void ); + DATASET GetNextDataset(); const sal_Unicode* ScanIntVal( const sal_Unicode* pStart, sal_uInt32& rRet ); bool ScanFloatVal( const sal_Unicode* pStart ); @@ -94,7 +94,7 @@ public: static inline bool IsV( const sal_Unicode* pRef ); - inline bool IsPlain( void ) const; + inline bool IsPlain() const; }; inline bool DifParser::IsBOT( const sal_Unicode* pRef ) @@ -137,7 +137,7 @@ inline bool DifParser::IsNumberEnding( const sal_Unicode cChar ) return ( cChar == 0x00 ); } -inline bool DifParser::IsPlain( void ) const +inline bool DifParser::IsPlain() const { return bPlain; } diff --git a/sc/source/filter/inc/excdoc.hxx b/sc/source/filter/inc/excdoc.hxx index c1158e8c9f0e..776c9f741a9a 100644 --- a/sc/source/filter/inc/excdoc.hxx +++ b/sc/source/filter/inc/excdoc.hxx @@ -97,7 +97,7 @@ public: explicit ExcDocument( const XclExpRoot& rRoot ); virtual ~ExcDocument(); - void ReadDoc( void ); + void ReadDoc(); void Write( SvStream& rSvStrm ); void WriteXml( XclExpXmlStream& ); }; diff --git a/sc/source/filter/inc/excimp8.hxx b/sc/source/filter/inc/excimp8.hxx index ef59b5fa89af..b8e32b722289 100644 --- a/sc/source/filter/inc/excimp8.hxx +++ b/sc/source/filter/inc/excimp8.hxx @@ -38,29 +38,29 @@ class ImportExcel8 : public ImportExcel { public: ImportExcel8( XclImpRootData& rImpData, SvStream& rStrm ); - virtual ~ImportExcel8( void ); - - virtual FltError Read( void ) SAL_OVERRIDE; - - void Calccount( void ); // 0x0C - void Precision( void ); // 0x0E - void Delta( void ); // 0x10 - void Iteration( void ); // 0x11 - void Boundsheet( void ); // 0x85 - void FilterMode( void ); // 0x9B - void AutoFilterInfo( void ); // 0x9D - void AutoFilter( void ); // 0x9E - void Scenman( void ); // 0xAE - void Scenario( void ); // 0xAF - void ReadBasic( void ); // 0xD3 - void Labelsst( void ); // 0xFD - - void Hlink( void ); // 0x01B8 - void FeatHdr( void ); // 0x0867 - void Feat( void ); // 0x0868 - - virtual void EndSheet( void ) SAL_OVERRIDE; - virtual void PostDocLoad( void ) SAL_OVERRIDE; + virtual ~ImportExcel8(); + + virtual FltError Read() SAL_OVERRIDE; + + void Calccount(); // 0x0C + void Precision(); // 0x0E + void Delta(); // 0x10 + void Iteration(); // 0x11 + void Boundsheet(); // 0x85 + void FilterMode(); // 0x9B + void AutoFilterInfo(); // 0x9D + void AutoFilter(); // 0x9E + void Scenman(); // 0xAE + void Scenario(); // 0xAF + void ReadBasic(); // 0xD3 + void Labelsst(); // 0xFD + + void Hlink(); // 0x01B8 + void FeatHdr(); // 0x0867 + void Feat(); // 0x0868 + + virtual void EndSheet() SAL_OVERRIDE; + virtual void PostDocLoad() SAL_OVERRIDE; private: void LoadDocumentProperties(); diff --git a/sc/source/filter/inc/excrecds.hxx b/sc/source/filter/inc/excrecds.hxx index ba74e5a63461..edfb231890e7 100644 --- a/sc/source/filter/inc/excrecds.hxx +++ b/sc/source/filter/inc/excrecds.hxx @@ -101,7 +101,7 @@ protected: public: inline ExcBoolRecord( const bool bDefault ) : bVal( bDefault ) {} - virtual sal_Size GetLen( void ) const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; }; //--------------------------------------------------------- class ExcBof_Base - @@ -115,7 +115,7 @@ protected: sal_uInt16 nRupBuild; sal_uInt16 nRupYear; public: - ExcBof_Base( void ); + ExcBof_Base(); }; //-------------------------------------------------------------- class ExcBof - @@ -126,10 +126,10 @@ class ExcBof : public ExcBof_Base private: virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: - ExcBof( void ); + ExcBof(); - virtual sal_uInt16 GetNum( void ) const SAL_OVERRIDE; - virtual sal_Size GetLen( void ) const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; }; //------------------------------------------------------------- class ExcBofW - @@ -140,10 +140,10 @@ class ExcBofW : public ExcBof_Base private: virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: - ExcBofW( void ); + ExcBofW(); - virtual sal_uInt16 GetNum( void ) const SAL_OVERRIDE; - virtual sal_Size GetLen( void ) const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; }; //-------------------------------------------------------------- class ExcEof - @@ -152,8 +152,8 @@ class ExcEof : public ExcRecord { private: public: - virtual sal_uInt16 GetNum( void ) const SAL_OVERRIDE; - virtual sal_Size GetLen( void ) const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; }; //--------------------------------------------------------- class ExcDummy_00 - @@ -165,8 +165,8 @@ private: static const sal_uInt8 pMyData[]; static const sal_Size nMyLen; public: - virtual sal_Size GetLen( void ) const SAL_OVERRIDE; - virtual const sal_uInt8* GetData( void ) const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual const sal_uInt8* GetData() const SAL_OVERRIDE; }; // EXC_ID_WINDOWPROTECTION @@ -215,8 +215,8 @@ private: static const sal_uInt8 pMyData[]; static const sal_Size nMyLen; public: - virtual sal_Size GetLen( void ) const SAL_OVERRIDE; - virtual const sal_uInt8* GetData( void ) const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual const sal_uInt8* GetData() const SAL_OVERRIDE; }; class ExcDummy_041 : public ExcDummyRec @@ -225,8 +225,8 @@ private: static const sal_uInt8 pMyData[]; static const sal_Size nMyLen; public: - virtual sal_Size GetLen( void ) const SAL_OVERRIDE; - virtual const sal_uInt8* GetData( void ) const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual const sal_uInt8* GetData() const SAL_OVERRIDE; }; //------------------------------------------------------------- class Exc1904 - @@ -235,7 +235,7 @@ class Exc1904 : public ExcBoolRecord { public: Exc1904( ScDocument& rDoc ); - virtual sal_uInt16 GetNum( void ) const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: @@ -284,8 +284,8 @@ private: static const sal_uInt8 pMyData[]; static const sal_Size nMyLen; public: - virtual sal_Size GetLen( void ) const SAL_OVERRIDE; - virtual const sal_uInt8* GetData( void ) const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual const sal_uInt8* GetData() const SAL_OVERRIDE; }; /** This record contains the Windows country IDs for the UI and document language. */ diff --git a/sc/source/filter/inc/excscen.hxx b/sc/source/filter/inc/excscen.hxx index 32ab82b1cb23..667108b3b13e 100644 --- a/sc/source/filter/inc/excscen.hxx +++ b/sc/source/filter/inc/excscen.hxx @@ -39,7 +39,7 @@ public: inline void SetValue( const OUString& rVal ) { aValue = rVal; } - inline const OUString& GetValue( void ) const { return aValue; } + inline const OUString& GetValue() const { return aValue; } }; class ExcScenario diff --git a/sc/source/filter/inc/imp_op.hxx b/sc/source/filter/inc/imp_op.hxx index 2d4b2161610a..87fd1446ecf6 100644 --- a/sc/source/filter/inc/imp_op.hxx +++ b/sc/source/filter/inc/imp_op.hxx @@ -53,7 +53,7 @@ public: ImportTyp( ScDocument*, rtl_TextEncoding eSrc ); virtual ~ImportTyp(); - virtual FltError Read( void ); + virtual FltError Read(); }; class XclImpOutlineDataBuffer : protected XclImpRoot @@ -141,69 +141,69 @@ protected: void ReadRk(); void Window1(); - void Formula25( void ); // 0x06 -> excform.cxx - void Row25( void ); // 0x08 - void Bof2( void ); // 0x09 - void Eof( void ); // 0x0A - void DocProtect( void ); // 0x12 - void SheetProtect( void ); // 0x12 Sheet Protection - void DocPasssword( void ); // 0x13 document password - void SheetPassword( void ); // 0x13 sheet password - void Externsheet( void ); // 0x17 - void WinProtection( void ); // 0x19 - void Columndefault( void ); // 0x20 - void Array25( void ); // 0x21 - void Rec1904( void ); // 0x22 - void Externname25( void ); // 0x23 - void Colwidth( void ); // 0x24 - void Defrowheight2( void ); // 0x25 -// void Window1( void ); // 0x3D - void Codepage( void ); // 0x42 - void Ixfe( void ); // 0x44 - void DefColWidth( void ); // 0x55 - void Colinfo( void ); // 0x7D - void Wsbool( void ); // 0x81 - void Boundsheet( void ); // 0x85 - void Country( void ); // 0x8C - void Hideobj( void ); // 0x8D - void Standardwidth( void ); // 0x99 - void Shrfmla( void ); // 0xBC - void Mulrk( void ); // 0xBD - void Mulblank( void ); // 0xBE - void Rstring( void ); // 0xD6 - void Cellmerging( void ); // 0xE5 - void Olesize( void ); // 0xDE + void Formula25(); // 0x06 -> excform.cxx + void Row25(); // 0x08 + void Bof2(); // 0x09 + void Eof(); // 0x0A + void DocProtect(); // 0x12 + void SheetProtect(); // 0x12 Sheet Protection + void DocPasssword(); // 0x13 document password + void SheetPassword(); // 0x13 sheet password + void Externsheet(); // 0x17 + void WinProtection(); // 0x19 + void Columndefault(); // 0x20 + void Array25(); // 0x21 + void Rec1904(); // 0x22 + void Externname25(); // 0x23 + void Colwidth(); // 0x24 + void Defrowheight2(); // 0x25 +// void Window1(); // 0x3D + void Codepage(); // 0x42 + void Ixfe(); // 0x44 + void DefColWidth(); // 0x55 + void Colinfo(); // 0x7D + void Wsbool(); // 0x81 + void Boundsheet(); // 0x85 + void Country(); // 0x8C + void Hideobj(); // 0x8D + void Standardwidth(); // 0x99 + void Shrfmla(); // 0xBC + void Mulrk(); // 0xBD + void Mulblank(); // 0xBE + void Rstring(); // 0xD6 + void Cellmerging(); // 0xE5 + void Olesize(); // 0xDE void ReadUsesElfs(); // 0x0160 - void Formula3( void ); // 0x0206 -> excform.cxx + void Formula3(); // 0x0206 -> excform.cxx // 0x0207 -> 0x07 - void Row34( void ); // 0x0208 - void Bof3( void ); // 0x0209 - void Array34( void ); // 0x0221 - void Defrowheight345( void ); // 0x0225 - void TableOp( void ); // 0x0236 - //void Rk( void ); // 0x027E -> 0x7E - void Formula4( void ); // 0x0406 -> excform.cxx - void Bof4( void ); // 0x0409 - void Bof5( void ); // 0x0809 + void Row34(); // 0x0208 + void Bof3(); // 0x0209 + void Array34(); // 0x0221 + void Defrowheight345(); // 0x0225 + void TableOp(); // 0x0236 + //void Rk(); // 0x027E -> 0x7E + void Formula4(); // 0x0406 -> excform.cxx + void Bof4(); // 0x0409 + void Bof5(); // 0x0809 void Formula( const XclAddress& rXclPos, sal_uInt16 nXF, sal_uInt16 nFormLen, double fCurVal, bool bShrFmla); // -> excform.cxx - virtual void EndSheet( void ); - void NewTable( void ); + virtual void EndSheet(); + void NewTable(); const ScTokenArray* ErrorToFormula( bool bErrOrVal, sal_uInt8 nError, double& rVal ); void AdjustRowHeight(); - virtual void PostDocLoad( void ); + virtual void PostDocLoad(); public: ImportExcel( XclImpRootData& rImpData, SvStream& rStrm ); - virtual ~ImportExcel( void ); + virtual ~ImportExcel(); - virtual FltError Read( void ) SAL_OVERRIDE; + virtual FltError Read() SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/inc/lotfntbf.hxx b/sc/source/filter/inc/lotfntbf.hxx index aba56e290d82..81f477ee0589 100644 --- a/sc/source/filter/inc/lotfntbf.hxx +++ b/sc/source/filter/inc/lotfntbf.hxx @@ -37,7 +37,7 @@ private: SvxFontHeightItem* pHeight; SvxColorItem* pColor; sal_Int32 nType; // < 0 -> undefiniert - inline ENTRY( void ) + inline ENTRY() { pTmpName = NULL; pFont = NULL; diff --git a/sc/source/filter/inc/lotform.hxx b/sc/source/filter/inc/lotform.hxx index 37aa95ada8a6..cc819cfdf993 100644 --- a/sc/source/filter/inc/lotform.hxx +++ b/sc/source/filter/inc/lotform.hxx @@ -93,7 +93,7 @@ public: const FORMULA_TYPE eFT = FT_CellFormula ) SAL_OVERRIDE; void Reset( const ScAddress& rEingPos ); - inline void SetWK3( void ); + inline void SetWK3(); LotusContext& getContext() { return m_rContext; } private: @@ -109,7 +109,7 @@ inline void LotusToSc::ReadCRD( ScComplexRefData& rCRD, sal_uInt8 nRelBit ) ReadSRD( rCRD.Ref2, nRelBit >> 3 ); } -inline void LotusToSc::SetWK3( void ) +inline void LotusToSc::SetWK3() { bWK3 = true; } diff --git a/sc/source/filter/inc/lotimpop.hxx b/sc/source/filter/inc/lotimpop.hxx index f177eeb5b75d..4cdd130c8e3f 100644 --- a/sc/source/filter/inc/lotimpop.hxx +++ b/sc/source/filter/inc/lotimpop.hxx @@ -41,26 +41,26 @@ private: sal_Int32 nExtTab; // in WK?-Datei - void Bof( void ); // 0x0000 00 - bool BofFm3( void ); // 0x0000 00 + void Bof(); // 0x0000 00 + bool BofFm3(); // 0x0000 00 void Columnwidth( sal_uInt16 nRecLen ); // 0x0007 07 void Hiddencolumn( sal_uInt16 nRecLen ); // 0x0008 08 - void Userrange( void ); // 0x0009 09 - void Errcell( void ); // 0x0014 20 - void Nacell( void ); // 0x0015 21 - void Labelcell( void ); // 0x0016 22 - void Numbercell( void ); // 0x0017 23 - void Smallnumcell( void ); // 0x0018 24 + void Userrange(); // 0x0009 09 + void Errcell(); // 0x0014 20 + void Nacell(); // 0x0015 21 + void Labelcell(); // 0x0016 22 + void Numbercell(); // 0x0017 23 + void Smallnumcell(); // 0x0018 24 ScFormulaCell* Formulacell( sal_uInt16 nRecLen ); // 0x0019 25 void Formulastring( ScFormulaCell& ); // 0x001a 26 // 0x001b 27 special - void NamedSheet( void ); // 14000 + void NamedSheet(); // 14000 void RowPresentation( sal_uInt16 nRecLen ); // 2007 // in FM?-Datei - void Font_Face( void ); // 174 - void Font_Type( void ); // 176 - void Font_Ysize( void ); // 177 + void Font_Face(); // 174 + void Font_Type(); // 176 + void Font_Ysize(); // 177 void _Row( const sal_uInt16 nRecLen ); // 197 ? inline void Read( ScAddress& ); diff --git a/sc/source/filter/inc/lotrange.hxx b/sc/source/filter/inc/lotrange.hxx index 2950e50638a6..62356e25b745 100644 --- a/sc/source/filter/inc/lotrange.hxx +++ b/sc/source/filter/inc/lotrange.hxx @@ -38,7 +38,7 @@ private: SCCOL nColEnd; SCROW nRowEnd; LR_ID nId; - void MakeHash( void ); + void MakeHash(); inline void Copy( const LotusRange& ); inline void SetId( LR_ID nId ); public: @@ -48,7 +48,7 @@ public: inline LotusRange &operator =( const LotusRange& ); inline bool operator ==( const LotusRange& ) const; inline bool operator !=( const LotusRange& ) const; - inline bool IsSingle( void ) const; + inline bool IsSingle() const; }; inline void LotusRange::Copy( const LotusRange& rCpy ) @@ -86,7 +86,7 @@ inline bool LotusRange::operator !=( const LotusRange& rRef ) const nRowEnd != rRef.nRowEnd ); } -inline bool LotusRange::IsSingle( void ) const +inline bool LotusRange::IsSingle() const { return ( nColStart == nColEnd && nRowStart == nRowEnd ); } @@ -103,7 +103,7 @@ private: public: LotusRangeList(LOTUS_ROOT* pLotRoot); - ~LotusRangeList( void ); + ~LotusRangeList(); inline sal_uInt16 GetIndex( SCCOL nCol, SCROW nRow ); inline sal_uInt16 GetIndex( SCCOL nColS, SCROW nRowS, SCCOL nColE, SCROW nRowE ); sal_uInt16 GetIndex( const LotusRange& ); diff --git a/sc/source/filter/inc/namebuff.hxx b/sc/source/filter/inc/namebuff.hxx index 520d5fd5b2fd..ae296aeff136 100644 --- a/sc/source/filter/inc/namebuff.hxx +++ b/sc/source/filter/inc/namebuff.hxx @@ -45,14 +45,14 @@ private: static sal_uInt32 MakeHashCode( const OUString& ); public: inline StringHashEntry( const OUString& ); - inline StringHashEntry( void ); + inline StringHashEntry(); inline void operator =( const sal_Char* ); inline void operator =( const OUString& ); inline void operator =( const StringHashEntry& ); inline bool operator ==( const StringHashEntry& ) const; }; -inline StringHashEntry::StringHashEntry( void ) +inline StringHashEntry::StringHashEntry() { } @@ -245,7 +245,7 @@ public: bool IsLink( const sal_uInt16 nExcSheetIndex ) const; bool GetLink( const sal_uInt16 nExcSheetIndex, OUString &rAppl, OUString &rDoc ) const; - void Reset( void ); + void Reset(); }; inline ExtSheetBuffer::ExtSheetBuffer( RootData* p ) : ExcRoot( p ) @@ -260,8 +260,8 @@ struct ExtName inline ExtName( const OUString& r, sal_uInt16 n ) : aName( r ), nStorageId( 0 ), nFlags( n ) {} - bool IsDDE( void ) const; - bool IsOLE( void ) const; + bool IsDDE() const; + bool IsOLE() const; }; class ExtNameBuff : protected XclImpRoot diff --git a/sc/source/filter/inc/root.hxx b/sc/source/filter/inc/root.hxx index 0dd0e57e0c77..f92b2fd3e132 100644 --- a/sc/source/filter/inc/root.hxx +++ b/sc/source/filter/inc/root.hxx @@ -67,7 +67,7 @@ struct RootData // -> Inkarnation jeweils im ImportExcel-Objekt! XclImpRoot* pIR; XclExpRoot* pER; - RootData( void ); // -> exctools.cxx + RootData(); // -> exctools.cxx ~RootData(); // -> exctools.cxx }; diff --git a/sc/source/filter/inc/tokstack.hxx b/sc/source/filter/inc/tokstack.hxx index 9e458d7b0730..bb81bdf93388 100644 --- a/sc/source/filter/inc/tokstack.hxx +++ b/sc/source/filter/inc/tokstack.hxx @@ -175,18 +175,18 @@ private: #endif ScTokenArray* pScToken; // Token array - bool GrowString( void ); - bool GrowDouble( void ); + bool GrowString(); + bool GrowDouble(); /* TODO: in case we had FormulaTokenArray::AddError() */ #if 0 - bool GrowError( void ); + bool GrowError(); #endif bool GrowTripel( sal_uInt16 nByMin = 1 ); - bool GrowId( void ); - bool GrowElement( void ); - bool GrowExt( void ); - bool GrowNlf( void ); - bool GrowMatrix( void ); + bool GrowId(); + bool GrowElement(); + bool GrowExt(); + bool GrowNlf(); + bool GrowMatrix(); bool GetElement( const sal_uInt16 nId ); bool GetElementRek( const sal_uInt16 nId ); public: @@ -197,7 +197,7 @@ public: inline TokenPool& operator <<( TokenStack& rStack ); void operator >>( TokenId& rId ); inline void operator >>( TokenStack& rStack ); - inline const TokenId Store( void ); + inline const TokenId Store(); const TokenId Store( const double& rDouble ); // only for Range-Names @@ -216,9 +216,9 @@ public: const TokenId StoreExtRef( sal_uInt16 nFileId, const OUString& rTabName, const ScSingleRefData& rRef ); const TokenId StoreExtRef( sal_uInt16 nFileId, const OUString& rTabName, const ScComplexRefData& rRef ); - inline const TokenId LastId( void ) const; + inline const TokenId LastId() const; inline const ScTokenArray* operator []( const TokenId& rId ); - void Reset( void ); + void Reset(); inline E_TYPE GetType( const TokenId& rId ) const; bool IsSingleOp( const TokenId& rId, const DefTokenId eId ) const; const OUString* GetExternal( const TokenId& rId ) const; @@ -239,13 +239,13 @@ class TokenStack inline TokenStack& operator <<( const TokenId& rNewId ); inline void operator >>( TokenId &rId ); - inline void Reset( void ); + inline void Reset(); inline bool HasMoreTokens() const { return nPos > 0; } - inline const TokenId Get( void ); + inline const TokenId Get(); }; -inline const TokenId TokenStack::Get( void ) +inline const TokenId TokenStack::Get() { OSL_ENSURE( nPos > 0, "*TokenStack::Get(): is empty, is empty, ..." ); @@ -286,7 +286,7 @@ inline void TokenStack::operator >>( TokenId& rId ) } } -inline void TokenStack::Reset( void ) +inline void TokenStack::Reset() { nPos = 0; } @@ -343,7 +343,7 @@ inline void TokenPool::operator >>( TokenStack& rStack ) rStack << nId; } -inline const TokenId TokenPool::Store( void ) +inline const TokenId TokenPool::Store() { TokenId nId; *this >> nId; @@ -355,7 +355,7 @@ inline const TokenId TokenPool::Store( const sal_Int16 nWert ) return Store( ( double ) nWert ); } -inline const TokenId TokenPool::LastId( void ) const +inline const TokenId TokenPool::LastId() const { return static_cast<TokenId>(nElementAkt); // correct, as Ausgabe with Offset 1! } diff --git a/sc/source/filter/lotus/lotimpop.cxx b/sc/source/filter/lotus/lotimpop.cxx index a8a3026165a4..0b49b0f3ca0d 100644 --- a/sc/source/filter/lotus/lotimpop.cxx +++ b/sc/source/filter/lotus/lotimpop.cxx @@ -86,7 +86,7 @@ ImportLotus::~ImportLotus() aLotImpSemaphore.release(); } -void ImportLotus::Bof( void ) +void ImportLotus::Bof() { sal_uInt16 nFileCode, nFileSub, nSaveCnt; sal_uInt8 nMajorId, nMinorId, nFlags; @@ -114,7 +114,7 @@ void ImportLotus::Bof( void ) } } -bool ImportLotus::BofFm3( void ) +bool ImportLotus::BofFm3() { sal_uInt16 nFileCode, nFileSub; @@ -181,7 +181,7 @@ void ImportLotus::Hiddencolumn( sal_uInt16 nRecLen ) } } -void ImportLotus::Userrange( void ) +void ImportLotus::Userrange() { sal_uInt16 nRangeType; ScRange aScRange; @@ -199,7 +199,7 @@ void ImportLotus::Userrange( void ) rContext.pLotusRoot->pRngNmBffWK3->Add( aName, aScRange ); } -void ImportLotus::Errcell( void ) +void ImportLotus::Errcell() { ScAddress aA; @@ -211,7 +211,7 @@ void ImportLotus::Errcell( void ) pD->SetString(aA, "#ERR!", &aParam); } -void ImportLotus::Nacell( void ) +void ImportLotus::Nacell() { ScAddress aA; @@ -223,7 +223,7 @@ void ImportLotus::Nacell( void ) pD->SetString(aA, "#NA!", &aParam); } -void ImportLotus::Labelcell( void ) +void ImportLotus::Labelcell() { ScAddress aA; OUString aLabel; @@ -239,7 +239,7 @@ void ImportLotus::Labelcell( void ) pD->SetString(aA, aLabel, &aParam); } -void ImportLotus::Numbercell( void ) +void ImportLotus::Numbercell() { ScAddress aAddr; double fVal; @@ -251,7 +251,7 @@ void ImportLotus::Numbercell( void ) pD->SetValue(aAddr, fVal); } -void ImportLotus::Smallnumcell( void ) +void ImportLotus::Smallnumcell() { ScAddress aAddr; sal_Int16 nVal; @@ -328,7 +328,7 @@ void ImportLotus::RowPresentation( sal_uInt16 nRecLen ) } } -void ImportLotus::NamedSheet( void ) +void ImportLotus::NamedSheet() { sal_uInt16 nTmpTab(0); Read(nTmpTab); @@ -343,7 +343,7 @@ void ImportLotus::NamedSheet( void ) pD->InsertTab(nLTab, aName); } -void ImportLotus::Font_Face( void ) +void ImportLotus::Font_Face() { sal_uInt8 nNum; OUString aName; @@ -359,7 +359,7 @@ void ImportLotus::Font_Face( void ) rContext.pLotusRoot->pFontBuff->SetName( nNum, aName ); } -void ImportLotus::Font_Type( void ) +void ImportLotus::Font_Type() { LotusContext &rContext = aConv.getContext(); for( sal_uInt16 nCnt = 0 ; nCnt < LotusFontBuffer::nSize ; nCnt++ ) @@ -370,7 +370,7 @@ void ImportLotus::Font_Type( void ) } } -void ImportLotus::Font_Ysize( void ) +void ImportLotus::Font_Ysize() { LotusContext &rContext = aConv.getContext(); for( sal_uInt16 nCnt = 0 ; nCnt < LotusFontBuffer::nSize ; nCnt++ ) diff --git a/sc/source/filter/lotus/tool.cxx b/sc/source/filter/lotus/tool.cxx index 3d4081961e04..6bc124c37484 100644 --- a/sc/source/filter/lotus/tool.cxx +++ b/sc/source/filter/lotus/tool.cxx @@ -337,7 +337,7 @@ SfxUInt32Item* FormCache::NewAttr( sal_uInt8 nFormat, sal_uInt8 nSt ) return new SfxUInt32Item( ATTR_VALUE_FORMAT, ( sal_uInt32 ) nHandle ); } -void LotusRange::MakeHash( void ) +void LotusRange::MakeHash() { // 33222222222211111111110000000000 // 10987654321098765432109876543210 diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index c630040cc0c5..b8e58b6257fd 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -2973,7 +2973,7 @@ throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::R } // ::com::sun::star::xml::sax::XDocumentHandler -void SAL_CALL ScXMLImport::startDocument(void) +void SAL_CALL ScXMLImport::startDocument() throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) { ScXMLImport::MutexGuard aGuard(*this); diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index 479bedf183a9..53435a898aff 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -1185,7 +1185,7 @@ public: // XImporter virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL startDocument(void) + virtual void SAL_CALL startDocument() throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL endDocument() throw(::com::sun::star::xml::sax::SAXException, diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx index 6ad4cc2faebc..337d91b531f1 100644 --- a/sc/source/ui/Accessibility/AccessibleCell.cxx +++ b/sc/source/ui/Accessibility/AccessibleCell.cxx @@ -152,7 +152,7 @@ void SAL_CALL ScAccessibleCell::grabFocus( ) } } -Rectangle ScAccessibleCell::GetBoundingBoxOnScreen(void) const +Rectangle ScAccessibleCell::GetBoundingBoxOnScreen() const throw (uno::RuntimeException, std::exception) { Rectangle aCellRect(GetBoundingBox()); @@ -214,7 +214,7 @@ Rectangle ScAccessibleCell::GetBoundingBox() const //===== XAccessibleContext ============================================== sal_Int32 SAL_CALL - ScAccessibleCell::getAccessibleChildCount(void) + ScAccessibleCell::getAccessibleChildCount() throw (uno::RuntimeException, std::exception) { return AccessibleStaticTextBase::getAccessibleChildCount(); @@ -229,7 +229,7 @@ uno::Reference< XAccessible > SAL_CALL } uno::Reference<XAccessibleStateSet> SAL_CALL - ScAccessibleCell::getAccessibleStateSet(void) + ScAccessibleCell::getAccessibleStateSet() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -302,14 +302,14 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL //===== XServiceInfo ==================================================== -OUString SAL_CALL ScAccessibleCell::getImplementationName(void) +OUString SAL_CALL ScAccessibleCell::getImplementationName() throw (uno::RuntimeException, std::exception) { return OUString("ScAccessibleCell"); } uno::Sequence< OUString> SAL_CALL - ScAccessibleCell::getSupportedServiceNames(void) + ScAccessibleCell::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx index 7024fe57f311..c50a46ed889d 100644 --- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx @@ -196,7 +196,7 @@ void SAL_CALL ScAccessibleCellBase::release() //===== XAccessibleContext ============================================== sal_Int32 - ScAccessibleCellBase::getAccessibleIndexInParent(void) + ScAccessibleCellBase::getAccessibleIndexInParent() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -205,7 +205,7 @@ sal_Int32 } OUString SAL_CALL - ScAccessibleCellBase::createAccessibleDescription(void) + ScAccessibleCellBase::createAccessibleDescription() throw (uno::RuntimeException) { OUString sDescription = OUString(ScResId(STR_ACC_CELL_DESCR)); @@ -214,7 +214,7 @@ OUString SAL_CALL } OUString SAL_CALL - ScAccessibleCellBase::createAccessibleName(void) + ScAccessibleCellBase::createAccessibleName() throw (uno::RuntimeException, std::exception) { // Document not needed, because only the cell address, but not the tablename is needed @@ -285,7 +285,7 @@ uno::Any SAL_CALL //===== XServiceInfo ==================================================== -OUString SAL_CALL ScAccessibleCellBase::getImplementationName(void) +OUString SAL_CALL ScAccessibleCellBase::getImplementationName() throw (uno::RuntimeException, std::exception) { return OUString("ScAccessibleCellBase"); @@ -300,7 +300,7 @@ uno::Sequence< uno::Type > SAL_CALL ScAccessibleCellBase::getTypes() } uno::Sequence<sal_Int8> SAL_CALL - ScAccessibleCellBase::getImplementationId(void) + ScAccessibleCellBase::getImplementationId() throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); @@ -315,7 +315,7 @@ bool ScAccessibleCellBase::IsEditable( return bEditable; } -OUString SAL_CALL ScAccessibleCellBase::GetNote(void) +OUString SAL_CALL ScAccessibleCellBase::GetNote() throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -364,7 +364,7 @@ OUString SAL_CALL ScAccessibleCellBase::GetNote(void) #include <com/sun/star/table/ShadowFormat.hpp> -OUString SAL_CALL ScAccessibleCellBase::getShadowAttrs(void) +OUString SAL_CALL ScAccessibleCellBase::getShadowAttrs() throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -447,7 +447,7 @@ OUString SAL_CALL ScAccessibleCellBase::getShadowAttrs(void) #include <com/sun/star/table/BorderLine.hpp> -OUString SAL_CALL ScAccessibleCellBase::getBorderAttrs(void) +OUString SAL_CALL ScAccessibleCellBase::getBorderAttrs() throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -597,7 +597,7 @@ OUString SAL_CALL ScAccessibleCellBase::getBorderAttrs(void) } //end of cell attributes -OUString SAL_CALL ScAccessibleCellBase::GetAllDisplayNote(void) +OUString SAL_CALL ScAccessibleCellBase::GetAllDisplayNote() throw (::com::sun::star::uno::RuntimeException) { OUString strNote; diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx index 1f5bd3502dcc..9eb6355162d1 100644 --- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx @@ -49,7 +49,7 @@ ScAccessibleContextBase::ScAccessibleContextBase( { } -ScAccessibleContextBase::~ScAccessibleContextBase(void) +ScAccessibleContextBase::~ScAccessibleContextBase() { if (!IsDefunc() && !rBHelper.bInDispose) { @@ -140,7 +140,7 @@ void ScAccessibleContextBase::Notify( SfxBroadcaster&, const SfxHint& rHint ) //===== XAccessible ========================================================= uno::Reference< XAccessibleContext> SAL_CALL - ScAccessibleContextBase::getAccessibleContext(void) + ScAccessibleContextBase::getAccessibleContext() throw (uno::RuntimeException, std::exception) { return this; @@ -258,14 +258,14 @@ uno::Reference<XAccessible> SAL_CALL } uno::Reference<XAccessible> SAL_CALL - ScAccessibleContextBase::getAccessibleParent(void) + ScAccessibleContextBase::getAccessibleParent() throw (uno::RuntimeException, std::exception) { return mxParent; } sal_Int32 SAL_CALL - ScAccessibleContextBase::getAccessibleIndexInParent(void) + ScAccessibleContextBase::getAccessibleIndexInParent() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -299,14 +299,14 @@ sal_Int32 SAL_CALL } sal_Int16 SAL_CALL - ScAccessibleContextBase::getAccessibleRole(void) + ScAccessibleContextBase::getAccessibleRole() throw (uno::RuntimeException, std::exception) { return maRole; } OUString SAL_CALL - ScAccessibleContextBase::getAccessibleDescription(void) + ScAccessibleContextBase::getAccessibleDescription() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -332,7 +332,7 @@ OUString SAL_CALL } OUString SAL_CALL - ScAccessibleContextBase::getAccessibleName(void) + ScAccessibleContextBase::getAccessibleName() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -366,14 +366,14 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL } uno::Reference<XAccessibleStateSet> SAL_CALL - ScAccessibleContextBase::getAccessibleStateSet(void) + ScAccessibleContextBase::getAccessibleStateSet() throw (uno::RuntimeException, std::exception) { return uno::Reference<XAccessibleStateSet>(); } lang::Locale SAL_CALL - ScAccessibleContextBase::getLocale(void) + ScAccessibleContextBase::getLocale() throw (IllegalAccessibleComponentStateException, uno::RuntimeException, std::exception) { @@ -454,7 +454,7 @@ void SAL_CALL ScAccessibleContextBase::notifyEvent( } //===== XServiceInfo ======================================================== -OUString SAL_CALL ScAccessibleContextBase::getImplementationName(void) +OUString SAL_CALL ScAccessibleContextBase::getImplementationName() throw (uno::RuntimeException, std::exception) { return OUString("ScAccessibleContextBase"); @@ -467,7 +467,7 @@ sal_Bool SAL_CALL ScAccessibleContextBase::supportsService(const OUString& sServ } uno::Sequence< OUString> SAL_CALL - ScAccessibleContextBase::getSupportedServiceNames(void) + ScAccessibleContextBase::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) { uno::Sequence<OUString> aServiceNames(2); @@ -490,7 +490,7 @@ uno::Sequence< uno::Type > SAL_CALL ScAccessibleContextBase::getTypes() } uno::Sequence<sal_Int8> SAL_CALL - ScAccessibleContextBase::getImplementationId(void) + ScAccessibleContextBase::getImplementationId() throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); @@ -499,7 +499,7 @@ uno::Sequence<sal_Int8> SAL_CALL //===== internal ============================================================ OUString SAL_CALL - ScAccessibleContextBase::createAccessibleDescription(void) + ScAccessibleContextBase::createAccessibleDescription() throw (uno::RuntimeException) { OSL_FAIL("should be implemented in the abrevated class"); diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index f58d2244e421..4b1c96b071c9 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -1445,7 +1445,7 @@ void ScAccessibleDocument::Init() mpChildrenShapes = new ScChildrenShapes(this, mpViewShell, meSplitPos); } -ScAccessibleDocument::~ScAccessibleDocument(void) +ScAccessibleDocument::~ScAccessibleDocument() { if (!ScAccessibleContextBase::IsDefunc() && !rBHelper.bInDispose) { @@ -1780,7 +1780,7 @@ void SAL_CALL ScAccessibleDocument::grabFocus( ) /// Return the number of currently visible children. sal_Int32 SAL_CALL - ScAccessibleDocument::getAccessibleChildCount(void) + ScAccessibleDocument::getAccessibleChildCount() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1829,7 +1829,7 @@ uno::Reference<XAccessible> SAL_CALL /// Return the set of current states. uno::Reference<XAccessibleStateSet> SAL_CALL - ScAccessibleDocument::getAccessibleStateSet(void) + ScAccessibleDocument::getAccessibleStateSet() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1856,7 +1856,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL } OUString SAL_CALL - ScAccessibleDocument::getAccessibleName(void) + ScAccessibleDocument::getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -2068,14 +2068,14 @@ void SAL_CALL //===== XServiceInfo ==================================================== OUString SAL_CALL - ScAccessibleDocument::getImplementationName(void) + ScAccessibleDocument::getImplementationName() throw (uno::RuntimeException, std::exception) { return OUString("ScAccessibleDocument"); } uno::Sequence< OUString> SAL_CALL - ScAccessibleDocument::getSupportedServiceNames(void) + ScAccessibleDocument::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); @@ -2096,7 +2096,7 @@ uno::Sequence< uno::Type > SAL_CALL ScAccessibleDocument::getTypes() } uno::Sequence<sal_Int8> SAL_CALL - ScAccessibleDocument::getImplementationId(void) + ScAccessibleDocument::getImplementationId() throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); @@ -2104,7 +2104,7 @@ uno::Sequence<sal_Int8> SAL_CALL ///===== IAccessibleViewForwarder ======================================== -bool ScAccessibleDocument::IsValid (void) const +bool ScAccessibleDocument::IsValid() const { SolarMutexGuard aGuard; IsObjectValid(); @@ -2198,7 +2198,7 @@ utl::AccessibleRelationSetHelper* ScAccessibleDocument::GetRelationSet(const ScA } OUString SAL_CALL - ScAccessibleDocument::createAccessibleDescription(void) + ScAccessibleDocument::createAccessibleDescription() throw (uno::RuntimeException) { OUString sDescription = OUString(ScResId(STR_ACC_DOC_DESCR)); @@ -2206,7 +2206,7 @@ OUString SAL_CALL } OUString SAL_CALL - ScAccessibleDocument::createAccessibleName(void) + ScAccessibleDocument::createAccessibleName() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/Accessibility/AccessibleDocumentBase.cxx b/sc/source/ui/Accessibility/AccessibleDocumentBase.cxx index 3b32481933a1..599c2b65e1d0 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentBase.cxx @@ -32,7 +32,7 @@ ScAccessibleDocumentBase::ScAccessibleDocumentBase( { } -ScAccessibleDocumentBase::~ScAccessibleDocumentBase(void) +ScAccessibleDocumentBase::~ScAccessibleDocumentBase() { } diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index c366349add68..08db9aa7fc63 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -491,7 +491,7 @@ public: ///===== IAccessibleViewForwarder ======================================== - virtual bool IsValid (void) const SAL_OVERRIDE; + virtual bool IsValid() const SAL_OVERRIDE; virtual Rectangle GetVisibleArea() const SAL_OVERRIDE; virtual Point LogicToPixel (const Point& rPoint) const SAL_OVERRIDE; virtual Size LogicToPixel (const Size& rSize) const SAL_OVERRIDE; @@ -526,7 +526,7 @@ ScIAccessibleViewForwarder::~ScIAccessibleViewForwarder() ///===== IAccessibleViewForwarder ======================================== -bool ScIAccessibleViewForwarder::IsValid (void) const +bool ScIAccessibleViewForwarder::IsValid() const { SolarMutexGuard aGuard; return mbValid; @@ -1241,7 +1241,7 @@ ScAccessibleDocumentPagePreview::ScAccessibleDocumentPagePreview( } -ScAccessibleDocumentPagePreview::~ScAccessibleDocumentPagePreview(void) +ScAccessibleDocumentPagePreview::~ScAccessibleDocumentPagePreview() { if (!ScAccessibleDocumentBase::IsDefunc() && !rBHelper.bInDispose) { @@ -1545,7 +1545,7 @@ uno::Reference<XAccessible> SAL_CALL ScAccessibleDocumentPagePreview::getAccessi } /// Return the set of current states. -uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleDocumentPagePreview::getAccessibleStateSet(void) +uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleDocumentPagePreview::getAccessibleStateSet() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1573,13 +1573,13 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleDocumentPagePreview::ge //===== XServiceInfo ==================================================== -OUString SAL_CALL ScAccessibleDocumentPagePreview::getImplementationName(void) +OUString SAL_CALL ScAccessibleDocumentPagePreview::getImplementationName() throw (uno::RuntimeException, std::exception) { return OUString("ScAccessibleDocumentPagePreview"); } -uno::Sequence< OUString> SAL_CALL ScAccessibleDocumentPagePreview::getSupportedServiceNames(void) +uno::Sequence< OUString> SAL_CALL ScAccessibleDocumentPagePreview::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); @@ -1594,7 +1594,7 @@ uno::Sequence< OUString> SAL_CALL ScAccessibleDocumentPagePreview::getSupportedS //===== XTypeProvider ======================================================= uno::Sequence<sal_Int8> SAL_CALL - ScAccessibleDocumentPagePreview::getImplementationId(void) + ScAccessibleDocumentPagePreview::getImplementationId() throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); @@ -1602,14 +1602,14 @@ uno::Sequence<sal_Int8> SAL_CALL //===== internal ======================================================== -OUString SAL_CALL ScAccessibleDocumentPagePreview::createAccessibleDescription(void) +OUString SAL_CALL ScAccessibleDocumentPagePreview::createAccessibleDescription() throw (uno::RuntimeException) { OUString sDescription = OUString(ScResId(STR_ACC_PREVIEWDOC_DESCR)); return sDescription; } -OUString SAL_CALL ScAccessibleDocumentPagePreview::createAccessibleName(void) +OUString SAL_CALL ScAccessibleDocumentPagePreview::createAccessibleName() throw (uno::RuntimeException, std::exception) { OUString sName = OUString(ScResId(STR_ACC_PREVIEWDOC_NAME)); @@ -1673,7 +1673,7 @@ ScShapeChildren* ScAccessibleDocumentPagePreview::GetShapeChildren() return mpShapeChildren; } -OUString ScAccessibleDocumentPagePreview::getAccessibleName(void) +OUString ScAccessibleDocumentPagePreview::getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard g; diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx index a16028147575..e975bd527912 100644 --- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx +++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx @@ -139,13 +139,13 @@ com::sun::star::uno::Any SAL_CALL return aReturn; } void SAL_CALL - ScAccessibleEditObject::acquire (void) + ScAccessibleEditObject::acquire() throw () { ScAccessibleContextBase::acquire (); } void SAL_CALL - ScAccessibleEditObject::release (void) + ScAccessibleEditObject::release() throw () { ScAccessibleContextBase::release (); @@ -171,7 +171,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleEditObject::getAccessibleAtPo return xRet; } -Rectangle ScAccessibleEditObject::GetBoundingBoxOnScreen(void) const +Rectangle ScAccessibleEditObject::GetBoundingBoxOnScreen() const throw (uno::RuntimeException, std::exception) { Rectangle aScreenBounds; @@ -200,7 +200,7 @@ Rectangle ScAccessibleEditObject::GetBoundingBoxOnScreen(void) const return aScreenBounds; } -Rectangle ScAccessibleEditObject::GetBoundingBox(void) const +Rectangle ScAccessibleEditObject::GetBoundingBox() const throw (uno::RuntimeException, std::exception) { Rectangle aBounds( GetBoundingBoxOnScreen() ); @@ -235,7 +235,7 @@ Rectangle ScAccessibleEditObject::GetBoundingBox(void) const //===== XAccessibleContext ============================================== sal_Int32 SAL_CALL - ScAccessibleEditObject::getAccessibleChildCount(void) + ScAccessibleEditObject::getAccessibleChildCount() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -258,7 +258,7 @@ uno::Reference< XAccessible > SAL_CALL } uno::Reference<XAccessibleStateSet> SAL_CALL - ScAccessibleEditObject::getAccessibleStateSet(void) + ScAccessibleEditObject::getAccessibleStateSet() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -286,7 +286,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL } OUString SAL_CALL - ScAccessibleEditObject::createAccessibleDescription(void) + ScAccessibleEditObject::createAccessibleDescription() throw (uno::RuntimeException) { // OSL_FAIL("Should never be called, because is set in the constructor.") @@ -294,7 +294,7 @@ OUString SAL_CALL } OUString SAL_CALL - ScAccessibleEditObject::createAccessibleName(void) + ScAccessibleEditObject::createAccessibleName() throw (uno::RuntimeException, std::exception) { OSL_FAIL("Should never be called, because is set in the constructor."); @@ -329,7 +329,7 @@ void SAL_CALL //===== XServiceInfo ==================================================== -OUString SAL_CALL ScAccessibleEditObject::getImplementationName(void) +OUString SAL_CALL ScAccessibleEditObject::getImplementationName() throw (uno::RuntimeException, std::exception) { return OUString("ScAccessibleEditObject"); @@ -338,7 +338,7 @@ OUString SAL_CALL ScAccessibleEditObject::getImplementationName(void) //===== XTypeProvider ======================================================= uno::Sequence<sal_Int8> SAL_CALL - ScAccessibleEditObject::getImplementationId(void) + ScAccessibleEditObject::getImplementationId() throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx index 5749093d83e3..936a8fce7561 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx @@ -331,14 +331,14 @@ uno::Sequence<OUString> SAL_CALL ScAccessiblePageHeader::getSupportedServiceName //==== internal ========================================================= -OUString SAL_CALL ScAccessiblePageHeader::createAccessibleDescription(void) +OUString SAL_CALL ScAccessiblePageHeader::createAccessibleDescription() throw (uno::RuntimeException) { OUString sDesc(SC_RESSTR(mbHeader ? STR_ACC_HEADER_DESCR : STR_ACC_FOOTER_DESCR)); return sDesc.replaceFirst("%1", SC_RESSTR(SCSTR_UNKNOWN)); } -OUString SAL_CALL ScAccessiblePageHeader::createAccessibleName(void) +OUString SAL_CALL ScAccessiblePageHeader::createAccessibleName() throw (uno::RuntimeException, std::exception) { OUString sName(SC_RESSTR(mbHeader ? STR_ACC_HEADER_NAME : STR_ACC_FOOTER_NAME)); diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx index 88403d803f26..a4370fe3a56c 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx @@ -65,7 +65,7 @@ ScAccessiblePageHeaderArea::ScAccessiblePageHeaderArea( mpViewShell->AddAccessibilityObject(*this); } -ScAccessiblePageHeaderArea::~ScAccessiblePageHeaderArea(void) +ScAccessiblePageHeaderArea::~ScAccessiblePageHeaderArea() { if (!ScAccessibleContextBase::IsDefunc() && !rBHelper.bInDispose) { @@ -136,7 +136,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePageHeaderArea::getAccessible //===== XAccessibleContext ============================================== sal_Int32 SAL_CALL - ScAccessiblePageHeaderArea::getAccessibleChildCount(void) + ScAccessiblePageHeaderArea::getAccessibleChildCount() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -159,7 +159,7 @@ uno::Reference< XAccessible > SAL_CALL } uno::Reference<XAccessibleStateSet> SAL_CALL - ScAccessiblePageHeaderArea::getAccessibleStateSet(void) + ScAccessiblePageHeaderArea::getAccessibleStateSet() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -187,14 +187,14 @@ uno::Reference<XAccessibleStateSet> SAL_CALL //===== XServiceInfo ======================================================== OUString SAL_CALL - ScAccessiblePageHeaderArea::getImplementationName(void) + ScAccessiblePageHeaderArea::getImplementationName() throw (uno::RuntimeException, std::exception) { return OUString("ScAccessiblePageHeaderArea"); } uno::Sequence< OUString> SAL_CALL - ScAccessiblePageHeaderArea::getSupportedServiceNames(void) + ScAccessiblePageHeaderArea::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); @@ -209,14 +209,14 @@ uno::Sequence< OUString> SAL_CALL //===== XTypeProvider ======================================================= uno::Sequence<sal_Int8> SAL_CALL - ScAccessiblePageHeaderArea::getImplementationId(void) + ScAccessiblePageHeaderArea::getImplementationId() throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } //===== internal ============================================================== -OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleDescription(void) +OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleDescription() throw(uno::RuntimeException) { OUString sDesc; @@ -238,7 +238,7 @@ OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleDescription(void) return sDesc; } -OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleName(void) +OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleName() throw (uno::RuntimeException, std::exception) { OUString sName; @@ -260,7 +260,7 @@ OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleName(void) return sName; } -Rectangle ScAccessiblePageHeaderArea::GetBoundingBoxOnScreen(void) const +Rectangle ScAccessiblePageHeaderArea::GetBoundingBoxOnScreen() const throw(::com::sun::star::uno::RuntimeException, std::exception) { Rectangle aRect; @@ -277,7 +277,7 @@ Rectangle ScAccessiblePageHeaderArea::GetBoundingBoxOnScreen(void) const return aRect; } -Rectangle ScAccessiblePageHeaderArea::GetBoundingBox(void) const +Rectangle ScAccessiblePageHeaderArea::GetBoundingBox() const throw (::com::sun::star::uno::RuntimeException, std::exception) { Rectangle aRect; diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx index df7fb5749e5e..810befd1f879 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx @@ -202,7 +202,7 @@ uno::Sequence<OUString> SAL_CALL ScAccessiblePreviewCell::getSupportedServiceNam //===== XTypeProvider ======================================================= uno::Sequence<sal_Int8> SAL_CALL - ScAccessiblePreviewCell::getImplementationId(void) + ScAccessiblePreviewCell::getImplementationId() throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx index cea59f9facf5..90e5e91bbd31 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx @@ -322,7 +322,7 @@ uno::Sequence< uno::Type > SAL_CALL ScAccessiblePreviewHeaderCell::getTypes() } uno::Sequence<sal_Int8> SAL_CALL - ScAccessiblePreviewHeaderCell::getImplementationId(void) + ScAccessiblePreviewHeaderCell::getImplementationId() throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx index db7790cf3bb6..fcac4494089c 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx @@ -603,7 +603,7 @@ uno::Sequence<sal_Int8> SAL_CALL ScAccessiblePreviewTable::getImplementationId() //==== internal ========================================================= -OUString SAL_CALL ScAccessiblePreviewTable::createAccessibleDescription(void) +OUString SAL_CALL ScAccessiblePreviewTable::createAccessibleDescription() throw (uno::RuntimeException) { OUString sDesc(ScResId(STR_ACC_TABLE_DESCR)); diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx index f1c5b4402317..e46e6df7444e 100644 --- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx +++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx @@ -1039,7 +1039,7 @@ sal_Int32 SAL_CALL ScAccessibleSpreadsheet::getBackground( ) //===== XAccessibleContext ============================================== -uno::Reference<XAccessibleRelationSet> SAL_CALL ScAccessibleSpreadsheet::getAccessibleRelationSet(void) +uno::Reference<XAccessibleRelationSet> SAL_CALL ScAccessibleSpreadsheet::getAccessibleRelationSet() throw (::com::sun::star::uno::RuntimeException, std::exception) { utl::AccessibleRelationSetHelper* pRelationSet = NULL; @@ -1051,7 +1051,7 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL ScAccessibleSpreadsheet::getAcce } uno::Reference<XAccessibleStateSet> SAL_CALL - ScAccessibleSpreadsheet::getAccessibleStateSet(void) + ScAccessibleSpreadsheet::getAccessibleStateSet() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1308,14 +1308,14 @@ void ScAccessibleSpreadsheet::AddMarkedRange(const ScRange& rRange) //===== XServiceInfo ==================================================== -OUString SAL_CALL ScAccessibleSpreadsheet::getImplementationName(void) +OUString SAL_CALL ScAccessibleSpreadsheet::getImplementationName() throw (uno::RuntimeException, std::exception) { return OUString("ScAccessibleSpreadsheet"); } uno::Sequence< OUString> SAL_CALL - ScAccessibleSpreadsheet::getSupportedServiceNames (void) + ScAccessibleSpreadsheet::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aSequence = ScAccessibleTableBase::getSupportedServiceNames(); @@ -1330,7 +1330,7 @@ uno::Sequence< OUString> SAL_CALL //===== XTypeProvider ======================================================= uno::Sequence<sal_Int8> SAL_CALL - ScAccessibleSpreadsheet::getImplementationId(void) + ScAccessibleSpreadsheet::getImplementationId() throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxx index be6ab391cb72..5b483c3b9c90 100644 --- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx @@ -364,7 +364,7 @@ uno::Reference< XAccessible > SAL_CALL } OUString SAL_CALL - ScAccessibleTableBase::createAccessibleDescription(void) + ScAccessibleTableBase::createAccessibleDescription() throw (uno::RuntimeException) { OUString sDesc(ScResId(STR_ACC_TABLE_DESCR)); @@ -382,7 +382,7 @@ OUString SAL_CALL ScAccessibleTableBase::createAccessibleName() } uno::Reference<XAccessibleRelationSet> SAL_CALL - ScAccessibleTableBase::getAccessibleRelationSet(void) + ScAccessibleTableBase::getAccessibleRelationSet() throw (uno::RuntimeException, std::exception) { OSL_FAIL("should be implemented in the abrevated class"); @@ -390,7 +390,7 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL } uno::Reference<XAccessibleStateSet> SAL_CALL - ScAccessibleTableBase::getAccessibleStateSet(void) + ScAccessibleTableBase::getAccessibleStateSet() throw (uno::RuntimeException, std::exception) { OSL_FAIL("should be implemented in the abrevated class"); @@ -449,7 +449,7 @@ void SAL_CALL ScAccessibleTableBase::deselectAccessibleChild( sal_Int32 /* nSele //===== XServiceInfo ==================================================== -OUString SAL_CALL ScAccessibleTableBase::getImplementationName(void) +OUString SAL_CALL ScAccessibleTableBase::getImplementationName() throw (uno::RuntimeException, std::exception) { return OUString("ScAccessibleTableBase"); @@ -464,7 +464,7 @@ uno::Sequence< uno::Type > SAL_CALL ScAccessibleTableBase::getTypes() } uno::Sequence<sal_Int8> SAL_CALL - ScAccessibleTableBase::getImplementationId(void) + ScAccessibleTableBase::getImplementationId() throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx index edada20f2da6..d880f372433c 100644 --- a/sc/source/ui/drawfunc/drawsh2.cxx +++ b/sc/source/ui/drawfunc/drawsh2.cxx @@ -400,7 +400,7 @@ void ScDrawShell::Activate (const bool bMDI) GetSidebarContextName())); } -::rtl::OUString ScDrawShell::GetSidebarContextName (void) +::rtl::OUString ScDrawShell::GetSidebarContextName() { return sfx2::sidebar::EnumContext::GetContextName( ::svx::sidebar::SelectionAnalyzer::GetContextForSelection_SC( diff --git a/sc/source/ui/inc/AccessibleCell.hxx b/sc/source/ui/inc/AccessibleCell.hxx index 5dbce7033f37..75bd457b4ad0 100644 --- a/sc/source/ui/inc/AccessibleCell.hxx +++ b/sc/source/ui/inc/AccessibleCell.hxx @@ -96,7 +96,7 @@ public: protected: /// Return the object's current bounding box relative to the desktop. - virtual Rectangle GetBoundingBoxOnScreen(void) const + virtual Rectangle GetBoundingBoxOnScreen() const throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the object's current bounding box relative to the parent object. @@ -109,7 +109,7 @@ public: /// Return the number of currently visible children. /// override to calculate this on demand virtual sal_Int32 SAL_CALL - getAccessibleChildCount(void) + getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the specified child or NULL if index is invalid. @@ -122,7 +122,7 @@ public: /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL - getAccessibleStateSet(void) + getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< @@ -135,13 +135,13 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName(void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns a list of all supported services. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames(void) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes() diff --git a/sc/source/ui/inc/AccessibleCellBase.hxx b/sc/source/ui/inc/AccessibleCellBase.hxx index 779d166525d2..3094541c0af4 100644 --- a/sc/source/ui/inc/AccessibleCellBase.hxx +++ b/sc/source/ui/inc/AccessibleCellBase.hxx @@ -70,18 +70,18 @@ public: /// Return this objects index among the parents children. virtual sal_Int32 SAL_CALL - getAccessibleIndexInParent(void) + getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: /// Return this object's description. virtual OUString SAL_CALL - createAccessibleDescription(void) + createAccessibleDescription() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /// Return the object's current name. virtual OUString SAL_CALL - createAccessibleName(void) + createAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: @@ -109,7 +109,7 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName(void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XTypeProvider =================================================== @@ -122,7 +122,7 @@ public: /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId(void) + getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: @@ -137,14 +137,14 @@ private: const com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); protected: - OUString SAL_CALL GetNote(void) + OUString SAL_CALL GetNote() throw (::com::sun::star::uno::RuntimeException); - OUString SAL_CALL GetAllDisplayNote(void) + OUString SAL_CALL GetAllDisplayNote() throw (::com::sun::star::uno::RuntimeException); - OUString SAL_CALL getShadowAttrs(void) + OUString SAL_CALL getShadowAttrs() throw (::com::sun::star::uno::RuntimeException); - OUString SAL_CALL getBorderAttrs(void) + OUString SAL_CALL getBorderAttrs() throw (::com::sun::star::uno::RuntimeException); public: const ScAddress& GetCellAddress() const { return maCellAddress; } diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx index 0eecb33385b7..61f1cbcca487 100644 --- a/sc/source/ui/inc/AccessibleContextBase.hxx +++ b/sc/source/ui/inc/AccessibleContextBase.hxx @@ -76,7 +76,7 @@ public: virtual void Init(); virtual void SAL_CALL disposing() SAL_OVERRIDE; protected: - virtual ~ScAccessibleContextBase(void); + virtual ~ScAccessibleContextBase(); public: bool SAL_CALL isShowing( ) @@ -103,7 +103,7 @@ public: /// Return the XAccessibleContext. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL - getAccessibleContext(void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getAccessibleContext() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XAccessibleComponent ============================================ @@ -152,27 +152,27 @@ public: /// Return a reference to the parent. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL - getAccessibleParent(void) + getAccessibleParent() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return this objects index among the parents children. virtual sal_Int32 SAL_CALL - getAccessibleIndexInParent(void) + getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return this object's role. virtual sal_Int16 SAL_CALL - getAccessibleRole(void) + getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return this object's description. virtual OUString SAL_CALL - getAccessibleDescription(void) + getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the object's current name. virtual OUString SAL_CALL - getAccessibleName(void) + getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return NULL to indicate that an empty relation set. @@ -184,14 +184,14 @@ public: /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL - getAccessibleStateSet(void) + getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Return the parents locale or throw exception if this object has no parent yet/anymore. */ virtual ::com::sun::star::lang::Locale SAL_CALL - getLocale(void) + getLocale() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception) SAL_OVERRIDE; @@ -229,7 +229,7 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName(void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Return whether the specified service is supported by this class. @@ -242,7 +242,7 @@ public: the AccessibleContext and Accessible service. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames(void) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XTypeProvider =================================================== @@ -255,18 +255,18 @@ public: /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId(void) + getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: /// Return this object's description. virtual OUString SAL_CALL - createAccessibleDescription(void) + createAccessibleDescription() throw (::com::sun::star::uno::RuntimeException); /// Return the object's current name. virtual OUString SAL_CALL - createAccessibleName(void) + createAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception); diff --git a/sc/source/ui/inc/AccessibleDocument.hxx b/sc/source/ui/inc/AccessibleDocument.hxx index a450fa38e836..0d47e004205c 100644 --- a/sc/source/ui/inc/AccessibleDocument.hxx +++ b/sc/source/ui/inc/AccessibleDocument.hxx @@ -67,7 +67,7 @@ public: DECL_LINK( WindowChildEventListener, VclSimpleEvent* ); protected: - virtual ~ScAccessibleDocument(void); + virtual ~ScAccessibleDocument(); using ScAccessibleDocumentBase::IsDefunc; @@ -103,7 +103,7 @@ public: /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL - getAccessibleChildCount(void) + getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the specified child or NULL if index is invalid. @@ -115,11 +115,11 @@ public: /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL - getAccessibleStateSet(void) + getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL - getAccessibleName(void) + getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes() @@ -172,13 +172,13 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName(void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns a list of all supported services. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames(void) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XTypeProvider =================================================== @@ -191,7 +191,7 @@ public: /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId(void) + getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== IAccessibleViewForwarder ======================================== @@ -202,7 +202,7 @@ public: @return Return <true/> if the view forwarder is valid and <false/> else. */ - virtual bool IsValid (void) const SAL_OVERRIDE; + virtual bool IsValid() const SAL_OVERRIDE; /** Returns the area of the underlying document that is visible in the * corresponding window. @@ -270,20 +270,20 @@ public: protected: /// Return this object's description. virtual OUString SAL_CALL - createAccessibleDescription(void) + createAccessibleDescription() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /// Return the object's current name. virtual OUString SAL_CALL - createAccessibleName(void) + createAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the object's current bounding box relative to the desktop. - virtual Rectangle GetBoundingBoxOnScreen(void) const + virtual Rectangle GetBoundingBoxOnScreen() const throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the object's current bounding box relative to the parent object. - virtual Rectangle GetBoundingBox(void) const + virtual Rectangle GetBoundingBox() const throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: diff --git a/sc/source/ui/inc/AccessibleDocumentBase.hxx b/sc/source/ui/inc/AccessibleDocumentBase.hxx index 7ab210daf913..de147514f252 100644 --- a/sc/source/ui/inc/AccessibleDocumentBase.hxx +++ b/sc/source/ui/inc/AccessibleDocumentBase.hxx @@ -32,7 +32,7 @@ public: ::com::sun::star::accessibility::XAccessible>& rxParent); virtual void SwitchViewFireFocus(); protected: - virtual ~ScAccessibleDocumentBase (void); + virtual ~ScAccessibleDocumentBase(); }; #endif diff --git a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx index 6aa038504325..0a05bb781089 100644 --- a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx +++ b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx @@ -38,7 +38,7 @@ public: ::com::sun::star::accessibility::XAccessible>& rxParent, ScPreviewShell* pViewShell ); protected: - virtual ~ScAccessibleDocumentPagePreview(void); + virtual ~ScAccessibleDocumentPagePreview(); using ScAccessibleDocumentBase::IsDefunc; @@ -77,23 +77,23 @@ public: /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL - getAccessibleStateSet(void) + getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getAccessibleName(void) + virtual OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XServiceInfo ==================================================== /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName(void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns a list of all supported services. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames(void) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XTypeProvider =================================================== @@ -101,7 +101,7 @@ public: /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId(void) + getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== internal ======================================================== @@ -109,22 +109,22 @@ public: protected: /// Return this object's description. virtual OUString SAL_CALL - createAccessibleDescription(void) + createAccessibleDescription() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /// Return the object's current name. virtual OUString SAL_CALL - createAccessibleName(void) + createAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: // needed in ScShapeChildren /// Return the object's current bounding box relative to the desktop. - virtual Rectangle GetBoundingBoxOnScreen(void) const + virtual Rectangle GetBoundingBoxOnScreen() const throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: /// Return the object's current bounding box relative to the parent object. - virtual Rectangle GetBoundingBox(void) const + virtual Rectangle GetBoundingBox() const throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: diff --git a/sc/source/ui/inc/AccessibleEditObject.hxx b/sc/source/ui/inc/AccessibleEditObject.hxx index b9c2fdf85a4d..919a896a561f 100644 --- a/sc/source/ui/inc/AccessibleEditObject.hxx +++ b/sc/source/ui/inc/AccessibleEditObject.hxx @@ -85,11 +85,11 @@ public: protected: /// Return the object's current bounding box relative to the desktop. - virtual Rectangle GetBoundingBoxOnScreen(void) const + virtual Rectangle GetBoundingBoxOnScreen() const throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the object's current bounding box relative to the parent object. - virtual Rectangle GetBoundingBox(void) const + virtual Rectangle GetBoundingBox() const throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: @@ -98,7 +98,7 @@ public: /// Return the number of currently visible children. /// override to calculate this on demand virtual sal_Int32 SAL_CALL - getAccessibleChildCount(void) + getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the specified child or NULL if index is invalid. @@ -111,7 +111,7 @@ public: /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL - getAccessibleStateSet(void) + getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleSelection ============================================ @@ -142,12 +142,12 @@ public: protected: /// Return this object's description. virtual OUString SAL_CALL - createAccessibleDescription(void) + createAccessibleDescription() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /// Return the object's current name. virtual OUString SAL_CALL - createAccessibleName(void) + createAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: @@ -174,7 +174,7 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName(void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XTypeProvider =================================================== @@ -182,7 +182,7 @@ public: /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId(void) + getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: diff --git a/sc/source/ui/inc/AccessiblePageHeader.hxx b/sc/source/ui/inc/AccessiblePageHeader.hxx index 2e1739db3757..5e00d62fc8c1 100644 --- a/sc/source/ui/inc/AccessiblePageHeader.hxx +++ b/sc/source/ui/inc/AccessiblePageHeader.hxx @@ -77,11 +77,11 @@ public: void SetCurrentIndexInParent(sal_Int32 nNew) { mnIndex = nNew; } protected: - virtual OUString SAL_CALL createAccessibleDescription(void) throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; - virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL createAccessibleDescription() throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + virtual OUString SAL_CALL createAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Rectangle GetBoundingBoxOnScreen(void) const throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual Rectangle GetBoundingBoxOnScreen() const throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual Rectangle GetBoundingBox() const throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: ScPreviewShell* mpViewShell; diff --git a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx index 2a9bbd1b3c23..123e9b8bd643 100644 --- a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx +++ b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx @@ -43,7 +43,7 @@ public: bool bHeader, SvxAdjust eAdjust); protected: - virtual ~ScAccessiblePageHeaderArea (void); + virtual ~ScAccessiblePageHeaderArea(); public: const EditTextObject* GetEditTextObject() const { return mpEditObj; } @@ -66,7 +66,7 @@ public: /// Return the number of currently visible children. /// override to calculate this on demand virtual sal_Int32 SAL_CALL - getAccessibleChildCount(void) + getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the specified child or NULL if index is invalid. @@ -79,7 +79,7 @@ public: /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL - getAccessibleStateSet(void) + getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XServiceInfo ==================================================== @@ -87,14 +87,14 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName(void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns a list of all supported services. In this case that is just the AccessibleContext and Accessible service. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames(void) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XTypeProvider =================================================== @@ -102,15 +102,15 @@ public: /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId(void) + getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual OUString SAL_CALL createAccessibleDescription(void) throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; - virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL createAccessibleDescription() throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + virtual OUString SAL_CALL createAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Rectangle GetBoundingBoxOnScreen(void) const throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual Rectangle GetBoundingBoxOnScreen() const throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual Rectangle GetBoundingBox() const throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: EditTextObject* mpEditObj; diff --git a/sc/source/ui/inc/AccessiblePreviewCell.hxx b/sc/source/ui/inc/AccessiblePreviewCell.hxx index 68dd70e5f40e..8615b6386e76 100644 --- a/sc/source/ui/inc/AccessiblePreviewCell.hxx +++ b/sc/source/ui/inc/AccessiblePreviewCell.hxx @@ -82,7 +82,7 @@ public: /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId(void) + getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: diff --git a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx index c399e4ebb098..4b8d2c9c980e 100644 --- a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx +++ b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx @@ -112,12 +112,12 @@ public: /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId(void) + getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual OUString SAL_CALL createAccessibleDescription(void) throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; - virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL createAccessibleDescription() throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + virtual OUString SAL_CALL createAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual Rectangle GetBoundingBoxOnScreen() const throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual Rectangle GetBoundingBox() const throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/AccessiblePreviewTable.hxx b/sc/source/ui/inc/AccessiblePreviewTable.hxx index ba281afb8867..29b524b8e0d7 100644 --- a/sc/source/ui/inc/AccessiblePreviewTable.hxx +++ b/sc/source/ui/inc/AccessiblePreviewTable.hxx @@ -175,7 +175,7 @@ protected: throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Rectangle GetBoundingBoxOnScreen(void) const throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual Rectangle GetBoundingBoxOnScreen() const throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual Rectangle GetBoundingBox() const throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx b/sc/source/ui/inc/AccessibleSpreadsheet.hxx index 9ec6ecb60195..b74360f5c743 100644 --- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx +++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx @@ -168,13 +168,13 @@ private: /// Return NULL to indicate that an empty relation set. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL - getAccessibleRelationSet(void) + getAccessibleRelationSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL - getAccessibleStateSet(void) + getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XAccessibleSelection =========================================== @@ -214,13 +214,13 @@ private: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName(void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns a list of all supported services. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames(void) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XTypeProvider =================================================== @@ -228,7 +228,7 @@ private: /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId(void) + getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XAccessibleEventBroadcaster ===================================== @@ -257,11 +257,11 @@ private: protected: /// Return the object's current bounding box relative to the desktop. - virtual Rectangle GetBoundingBoxOnScreen(void) const + virtual Rectangle GetBoundingBoxOnScreen() const throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the object's current bounding box relative to the parent object. - virtual Rectangle GetBoundingBox(void) const + virtual Rectangle GetBoundingBox() const throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: ScTabViewShell* mpViewShell; diff --git a/sc/source/ui/inc/AccessibleTableBase.hxx b/sc/source/ui/inc/AccessibleTableBase.hxx index ff3659e083df..7e923c1ec92a 100644 --- a/sc/source/ui/inc/AccessibleTableBase.hxx +++ b/sc/source/ui/inc/AccessibleTableBase.hxx @@ -198,7 +198,7 @@ public: /// Return the number of currently visible children. /// override to calculate this on demand virtual sal_Int32 SAL_CALL - getAccessibleChildCount(void) + getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -225,7 +225,7 @@ public: protected: /// Return this object's description. virtual OUString SAL_CALL - createAccessibleDescription(void) + createAccessibleDescription() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /// Return the object's current name. @@ -238,14 +238,14 @@ public: /// Return NULL to indicate that an empty relation set. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL - getAccessibleRelationSet(void) + getAccessibleRelationSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the set of current states. // perhaps sometimes to be implemented virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL - getAccessibleStateSet(void) + getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XAccessibleSelection =========================================== @@ -291,7 +291,7 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName(void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XTypeProvider =================================================== @@ -304,7 +304,7 @@ public: /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId(void) + getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: diff --git a/sc/source/ui/inc/drawsh.hxx b/sc/source/ui/inc/drawsh.hxx index 50b90bcf4b6d..3f12fe64bb86 100644 --- a/sc/source/ui/inc/drawsh.hxx +++ b/sc/source/ui/inc/drawsh.hxx @@ -88,7 +88,7 @@ public: bool AreAllObjectsOnLayer(sal_uInt16 nLayerNo,const SdrMarkList& rMark); void GetDrawAttrStateForIFBX( SfxItemSet& rSet ); - ::rtl::OUString GetSidebarContextName (void); + ::rtl::OUString GetSidebarContextName(); }; #endif diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx index af0bfe8fbe90..38c0154d3785 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx @@ -56,7 +56,7 @@ svx::sidebar::PopupControl* CellAppearancePropertyPanel::CreateCellLineStylePopu return new CellLineStyleControl(pParent, *this); } -void CellAppearancePropertyPanel::EndCellLineStylePopupMode(void) +void CellAppearancePropertyPanel::EndCellLineStylePopupMode() { if(mpCellLineStylePopup.get()) { @@ -69,7 +69,7 @@ svx::sidebar::PopupControl* CellAppearancePropertyPanel::CreateCellBorderStylePo return new CellBorderStyleControl(pParent, *this); } -void CellAppearancePropertyPanel::EndCellBorderStylePopupMode(void) +void CellAppearancePropertyPanel::EndCellBorderStylePopupMode() { if(mpCellBorderStylePopup.get()) { diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx index f8da7a59bfb9..eb9e7dc45eb7 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx @@ -139,11 +139,11 @@ private: // for CellLineStyle popup svx::sidebar::PopupControl* CreateCellLineStylePopupControl(svx::sidebar::PopupContainer* pParent); - void EndCellLineStylePopupMode(void); + void EndCellLineStylePopupMode(); // for CellBorderStyle popup svx::sidebar::PopupControl* CreateCellBorderStylePopupControl(svx::sidebar::PopupContainer* pParent); - void EndCellBorderStylePopupMode(void); + void EndCellBorderStylePopupMode(); // constructor/destuctor CellAppearancePropertyPanel( diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.cxx b/sc/source/ui/sidebar/CellBorderStyleControl.cxx index 08f7417bea08..ad6507dcda71 100644 --- a/sc/source/ui/sidebar/CellBorderStyleControl.cxx +++ b/sc/source/ui/sidebar/CellBorderStyleControl.cxx @@ -56,7 +56,7 @@ CellBorderStyleControl::CellBorderStyleControl(vcl::Window* pParent, CellAppeara FreeResource(); } -CellBorderStyleControl::~CellBorderStyleControl(void) +CellBorderStyleControl::~CellBorderStyleControl() { delete[] mpImageList; } diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.hxx b/sc/source/ui/sidebar/CellBorderStyleControl.hxx index 7cf04e2d68fd..cf0db80ae3ef 100644 --- a/sc/source/ui/sidebar/CellBorderStyleControl.hxx +++ b/sc/source/ui/sidebar/CellBorderStyleControl.hxx @@ -47,7 +47,7 @@ private: public: CellBorderStyleControl(vcl::Window* pParent, CellAppearancePropertyPanel& rPanel); - virtual ~CellBorderStyleControl(void); + virtual ~CellBorderStyleControl(); }; } } // end of namespace svx::sidebar diff --git a/sc/source/ui/sidebar/CellBorderStylePopup.cxx b/sc/source/ui/sidebar/CellBorderStylePopup.cxx index ae491f611005..1a27c25e6a55 100644 --- a/sc/source/ui/sidebar/CellBorderStylePopup.cxx +++ b/sc/source/ui/sidebar/CellBorderStylePopup.cxx @@ -29,7 +29,7 @@ CellBorderStylePopup::CellBorderStylePopup ( { } -CellBorderStylePopup::~CellBorderStylePopup (void) +CellBorderStylePopup::~CellBorderStylePopup() { } diff --git a/sc/source/ui/sidebar/CellBorderStylePopup.hxx b/sc/source/ui/sidebar/CellBorderStylePopup.hxx index de5b3727cafd..62899d555ae8 100644 --- a/sc/source/ui/sidebar/CellBorderStylePopup.hxx +++ b/sc/source/ui/sidebar/CellBorderStylePopup.hxx @@ -30,7 +30,7 @@ public : CellBorderStylePopup( vcl::Window* pParent, const ::boost::function<svx::sidebar::PopupControl*(svx::sidebar::PopupContainer*)>& rControlCreator); - virtual ~CellBorderStylePopup(void); + virtual ~CellBorderStylePopup(); }; } } // end of namespace sc::sidebar diff --git a/sc/source/ui/sidebar/CellLineStylePopup.cxx b/sc/source/ui/sidebar/CellLineStylePopup.cxx index 1409037bb5b2..a65cc219a3f5 100644 --- a/sc/source/ui/sidebar/CellLineStylePopup.cxx +++ b/sc/source/ui/sidebar/CellLineStylePopup.cxx @@ -29,7 +29,7 @@ CellLineStylePopup::CellLineStylePopup ( { } -CellLineStylePopup::~CellLineStylePopup (void) +CellLineStylePopup::~CellLineStylePopup() { } diff --git a/sc/source/ui/sidebar/CellLineStylePopup.hxx b/sc/source/ui/sidebar/CellLineStylePopup.hxx index cfca1afe76b7..757a86a8af2c 100644 --- a/sc/source/ui/sidebar/CellLineStylePopup.hxx +++ b/sc/source/ui/sidebar/CellLineStylePopup.hxx @@ -30,7 +30,7 @@ public : CellLineStylePopup( vcl::Window* pParent, const ::boost::function<svx::sidebar::PopupControl*(svx::sidebar::PopupContainer*)>& rControlCreator); - virtual ~CellLineStylePopup(void); + virtual ~CellLineStylePopup(); void SetLineStyleSelect(sal_uInt16 out, sal_uInt16 in, sal_uInt16 dis); }; diff --git a/sc/source/ui/sidebar/ScPanelFactory.cxx b/sc/source/ui/sidebar/ScPanelFactory.cxx index b0d4c8fdd4ed..cb1c23852bdc 100644 --- a/sc/source/ui/sidebar/ScPanelFactory.cxx +++ b/sc/source/ui/sidebar/ScPanelFactory.cxx @@ -67,12 +67,12 @@ css::uno::Sequence<OUString> SAL_CALL ScPanelFactory::getSupportedServiceNames_s } -ScPanelFactory::ScPanelFactory (void) +ScPanelFactory::ScPanelFactory() : PanelFactoryInterfaceBase(m_aMutex) { } -ScPanelFactory::~ScPanelFactory (void) +ScPanelFactory::~ScPanelFactory() { } diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx index bec0c4d25302..13772e37070e 100644 --- a/sc/source/ui/unoobj/linkuno.cxx +++ b/sc/source/ui/unoobj/linkuno.cxx @@ -273,7 +273,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScSheetLinkObj ) // internal: -OUString ScSheetLinkObj::getFileName(void) const +OUString ScSheetLinkObj::getFileName() const { SolarMutexGuard aGuard; return aFileName; @@ -316,7 +316,7 @@ void ScSheetLinkObj::setFileName(const OUString& rNewName) } } -OUString ScSheetLinkObj::getFilter(void) const +OUString ScSheetLinkObj::getFilter() const { SolarMutexGuard aGuard; OUString aRet; @@ -337,7 +337,7 @@ void ScSheetLinkObj::setFilter(const OUString& Filter) } } -OUString ScSheetLinkObj::getFilterOptions(void) const +OUString ScSheetLinkObj::getFilterOptions() const { SolarMutexGuard aGuard; OUString aRet; @@ -358,7 +358,7 @@ void ScSheetLinkObj::setFilterOptions(const OUString& FilterOptions) } } -sal_Int32 ScSheetLinkObj::getRefreshDelay(void) const +sal_Int32 ScSheetLinkObj::getRefreshDelay() const { SolarMutexGuard aGuard; sal_Int32 nRet = 0; @@ -819,7 +819,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScAreaLinkObj ) // internal: -OUString ScAreaLinkObj::getFileName(void) const +OUString ScAreaLinkObj::getFileName() const { SolarMutexGuard aGuard; OUString aRet; @@ -835,7 +835,7 @@ void ScAreaLinkObj::setFileName(const OUString& rNewName) Modify_Impl( &rNewName, NULL, NULL, NULL, NULL ); } -OUString ScAreaLinkObj::getFilter(void) const +OUString ScAreaLinkObj::getFilter() const { SolarMutexGuard aGuard; OUString aRet; @@ -851,7 +851,7 @@ void ScAreaLinkObj::setFilter(const OUString& Filter) Modify_Impl( NULL, &Filter, NULL, NULL, NULL ); } -OUString ScAreaLinkObj::getFilterOptions(void) const +OUString ScAreaLinkObj::getFilterOptions() const { SolarMutexGuard aGuard; OUString aRet; @@ -867,7 +867,7 @@ void ScAreaLinkObj::setFilterOptions(const OUString& FilterOptions) Modify_Impl( NULL, NULL, &FilterOptions, NULL, NULL ); } -sal_Int32 ScAreaLinkObj::getRefreshDelay(void) const +sal_Int32 ScAreaLinkObj::getRefreshDelay() const { SolarMutexGuard aGuard; sal_Int32 nRet = 0; diff --git a/sc/source/ui/unoobj/miscuno.cxx b/sc/source/ui/unoobj/miscuno.cxx index a3d18ebe8bc0..9f187786be2a 100644 --- a/sc/source/ui/unoobj/miscuno.cxx +++ b/sc/source/ui/unoobj/miscuno.cxx @@ -230,7 +230,7 @@ sal_Bool SAL_CALL ScIndexEnumeration::supportsService( const OUString& ServiceNa } ::com::sun::star::uno::Sequence< OUString > - SAL_CALL ScIndexEnumeration::getSupportedServiceNames(void) + SAL_CALL ScIndexEnumeration::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) { ::com::sun::star::uno::Sequence< OUString > aRet(1); diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx index 6b8c897fdde7..09dce6220125 100644 --- a/sc/source/ui/unoobj/targuno.cxx +++ b/sc/source/ui/unoobj/targuno.cxx @@ -104,7 +104,7 @@ uno::Any SAL_CALL ScLinkTargetTypesObj::getByName(const OUString& aName) throw container::NoSuchElementException(); } -uno::Sequence<OUString> SAL_CALL ScLinkTargetTypesObj::getElementNames(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence<OUString> SAL_CALL ScLinkTargetTypesObj::getElementNames() throw( uno::RuntimeException, std::exception ) { uno::Sequence<OUString> aRet(SC_LINKTARGETTYPE_COUNT); OUString* pArray = aRet.getArray(); @@ -124,12 +124,12 @@ sal_Bool SAL_CALL ScLinkTargetTypesObj::hasByName(const OUString& aName) throw( // container::XElementAccess -uno::Type SAL_CALL ScLinkTargetTypesObj::getElementType(void) throw( uno::RuntimeException, std::exception ) +uno::Type SAL_CALL ScLinkTargetTypesObj::getElementType() throw( uno::RuntimeException, std::exception ) { return cppu::UnoType<beans::XPropertySet>::get(); } -sal_Bool SAL_CALL ScLinkTargetTypesObj::hasElements(void) throw( uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL ScLinkTargetTypesObj::hasElements() throw( uno::RuntimeException, std::exception ) { return sal_True; } @@ -159,7 +159,7 @@ void ScLinkTargetTypeObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) // document::XLinkTargetSupplier -uno::Reference< container::XNameAccess > SAL_CALL ScLinkTargetTypeObj::getLinks(void) throw( uno::RuntimeException, std::exception ) +uno::Reference< container::XNameAccess > SAL_CALL ScLinkTargetTypeObj::getLinks() throw( uno::RuntimeException, std::exception ) { uno::Reference< container::XNameAccess > xCollection; @@ -190,7 +190,7 @@ uno::Reference< container::XNameAccess > SAL_CALL ScLinkTargetTypeObj::getLinks // beans::XPropertySet -uno::Reference< beans::XPropertySetInfo > SAL_CALL ScLinkTargetTypeObj::getPropertySetInfo(void) throw( uno::RuntimeException, std::exception ) +uno::Reference< beans::XPropertySetInfo > SAL_CALL ScLinkTargetTypeObj::getPropertySetInfo() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; static uno::Reference< beans::XPropertySetInfo > aRef(new SfxItemPropertySetInfo( lcl_GetLinkTargetMap() )); @@ -270,7 +270,7 @@ uno::Any SAL_CALL ScLinkTargetsObj::getByName(const OUString& aName) // return uno::Any(); } -uno::Sequence<OUString> SAL_CALL ScLinkTargetsObj::getElementNames(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence<OUString> SAL_CALL ScLinkTargetsObj::getElementNames() throw( uno::RuntimeException, std::exception ) { return xCollection->getElementNames(); } @@ -282,12 +282,12 @@ sal_Bool SAL_CALL ScLinkTargetsObj::hasByName(const OUString& aName) throw( uno: // container::XElementAccess -uno::Type SAL_CALL ScLinkTargetsObj::getElementType(void) throw( uno::RuntimeException, std::exception ) +uno::Type SAL_CALL ScLinkTargetsObj::getElementType() throw( uno::RuntimeException, std::exception ) { return cppu::UnoType<beans::XPropertySet>::get(); } -sal_Bool SAL_CALL ScLinkTargetsObj::hasElements(void) throw( uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL ScLinkTargetsObj::hasElements() throw( uno::RuntimeException, std::exception ) { return xCollection->hasElements(); } diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index 494b2c58c231..1d5647143def 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -1426,7 +1426,7 @@ void SAL_CALL ScTabViewObj::removeActivationEventListener( const uno::Reference< EndActivationListening(); } -sal_Int16 ScTabViewObj::GetZoom(void) const +sal_Int16 ScTabViewObj::GetZoom() const { ScTabViewShell* pViewSh = GetViewShell(); if (pViewSh) @@ -1463,7 +1463,7 @@ void ScTabViewObj::SetZoom(sal_Int16 nZoom) } } -sal_Int16 ScTabViewObj::GetZoomType(void) const +sal_Int16 ScTabViewObj::GetZoomType() const { sal_Int16 aZoomType = view::DocumentZoomType::OPTIMAL; ScTabViewShell* pViewSh = GetViewShell(); diff --git a/sc/source/ui/vba/vbaapplication.hxx b/sc/source/ui/vba/vbaapplication.hxx index 76aa0297bf4d..c70c9eef8640 100644 --- a/sc/source/ui/vba/vbaapplication.hxx +++ b/sc/source/ui/vba/vbaapplication.hxx @@ -53,7 +53,7 @@ public: virtual OUString SAL_CALL getExactName( const OUString& aApproximateName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInvocation - virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection(void) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Any SAL_CALL invoke(const OUString& FunctionName, const css::uno::Sequence< css::uno::Any >& Params, css::uno::Sequence< sal_Int16 >& OutParamIndex, css::uno::Sequence< css::uno::Any >& OutParam) throw(css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setValue(const OUString& PropertyName, const css::uno::Any& Value) throw(css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Any SAL_CALL getValue(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sc/source/ui/vba/vbawsfunction.cxx b/sc/source/ui/vba/vbawsfunction.cxx index 0a70bb60bb73..3635a198809f 100644 --- a/sc/source/ui/vba/vbawsfunction.cxx +++ b/sc/source/ui/vba/vbawsfunction.cxx @@ -72,7 +72,7 @@ ScVbaWSFunction::ScVbaWSFunction( const uno::Reference< XHelperInterface >& xPar } uno::Reference< beans::XIntrospectionAccess > -ScVbaWSFunction::getIntrospection(void) throw(uno::RuntimeException, std::exception) +ScVbaWSFunction::getIntrospection() throw(uno::RuntimeException, std::exception) { return uno::Reference<beans::XIntrospectionAccess>(); } diff --git a/sc/source/ui/vba/vbawsfunction.hxx b/sc/source/ui/vba/vbawsfunction.hxx index 1f8094bcd91e..69f9e961b66f 100644 --- a/sc/source/ui/vba/vbawsfunction.hxx +++ b/sc/source/ui/vba/vbawsfunction.hxx @@ -34,7 +34,7 @@ public: ScVbaWSFunction( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext); virtual ~ScVbaWSFunction(){} - virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection(void) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Any SAL_CALL invoke(const OUString& FunctionName, const css::uno::Sequence< css::uno::Any >& Params, css::uno::Sequence< sal_Int16 >& OutParamIndex, css::uno::Sequence< css::uno::Any >& OutParam) throw(css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setValue(const OUString& PropertyName, const css::uno::Any& Value) throw(css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Any SAL_CALL getValue(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sc/workben/addin.hxx b/sc/workben/addin.hxx index 822528d8a561..6e5033bc5a8d 100644 --- a/sc/workben/addin.hxx +++ b/sc/workben/addin.hxx @@ -48,7 +48,7 @@ public: // SMART_UNO_DECLARATION( ScTestAddIn, UsrObject ); // friend Reflection * ScTestAddIn_getReflection(); // virtual BOOL queryInterface( Uik, XInterfaceRef& ); -// virtual XIdlClassRef getIdlClass(void); +// virtual XIdlClassRef getIdlClass(); static UString getImplementationName_Static(); static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); diff --git a/sc/workben/test.cxx b/sc/workben/test.cxx index 3d36f50db40a..7e6688c01b22 100644 --- a/sc/workben/test.cxx +++ b/sc/workben/test.cxx @@ -95,7 +95,7 @@ public: SMART_UNO_DECLARATION( ScTestListener, UsrObject ); virtual XInterface * queryInterface( UsrUik ); - virtual XIdlClassRef getIdlClass(void); + virtual XIdlClassRef getIdlClass(); virtual void disposing(const EventObject& Source); @@ -124,7 +124,7 @@ XInterface* ScTestListener::queryInterface( UsrUik aUIK ) return UsrObject::queryInterface( aUIK ); } -XIdlClassRef ScTestListener::getIdlClass(void) +XIdlClassRef ScTestListener::getIdlClass() { static XIdlClassRef xClass = createStandardClass( L"ScTestListener", UsrObject::getUsrObjectIdlClass(), diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx index a5b84f6d6a85..6a2b61ae2a26 100644 --- a/scaddins/source/analysis/analysis.cxx +++ b/scaddins/source/analysis/analysis.cxx @@ -64,7 +64,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL analysis_component_getFactory( return pRet; } -ResMgr& AnalysisAddIn::GetResMgr( void ) throw( uno::RuntimeException ) +ResMgr& AnalysisAddIn::GetResMgr() throw( uno::RuntimeException ) { if( !pResMgr ) { @@ -119,7 +119,7 @@ OUString AnalysisAddIn::GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex return aRet; } -void AnalysisAddIn::InitData( void ) +void AnalysisAddIn::InitData() { delete pResMgr; pResMgr = ResMgr::CreateResMgr("analysis", LanguageTag(aFuncLoc)); @@ -394,7 +394,7 @@ static const sal_Char* pLang[] = { "de", "en" }; static const sal_Char* pCoun[] = { "DE", "US" }; static const sal_uInt32 nNumOfLoc = SAL_N_ELEMENTS(pLang); -void AnalysisAddIn::InitDefLocales( void ) +void AnalysisAddIn::InitDefLocales() { pDefLocales = new lang::Locale[ nNumOfLoc ]; diff --git a/scaddins/source/analysis/analysis.hxx b/scaddins/source/analysis/analysis.hxx index a1ef342e5566..8c682ecc3cf3 100644 --- a/scaddins/source/analysis/analysis.hxx +++ b/scaddins/source/analysis/analysis.hxx @@ -62,12 +62,12 @@ private: sca::analysis::ScaAnyConverter aAnyConv; - ResMgr& GetResMgr( void ) throw( css::uno::RuntimeException ); + ResMgr& GetResMgr() throw( css::uno::RuntimeException ); OUString GetDisplFuncStr( sal_uInt16 nFuncNum ) throw( css::uno::RuntimeException ); OUString GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex ) throw( css::uno::RuntimeException ); - void InitDefLocales( void ); + void InitDefLocales(); inline const css::lang::Locale& GetLocale( sal_uInt32 nInd ); - void InitData( void ); + void InitData(); /// Converts an Any to sal_Int32 in the range from 0 to 4 (date calculation mode). sal_Int32 getDateMode( diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx index f47409dd8942..9c26c7ee8403 100644 --- a/scaddins/source/analysis/analysishelper.cxx +++ b/scaddins/source/analysis/analysishelper.cxx @@ -1800,7 +1800,7 @@ OUString Complex::GetString() const throw( uno::RuntimeException, lang::IllegalA } -double Complex::Arg( void ) const throw( uno::RuntimeException, lang::IllegalArgumentException ) +double Complex::Arg() const throw( uno::RuntimeException, lang::IllegalArgumentException ) { if( r == 0.0 && i == 0.0 ) throw lang::IllegalArgumentException(); @@ -1843,7 +1843,7 @@ void Complex::Power( double fPower ) throw( uno::RuntimeException, lang::Illegal } -void Complex::Sqrt( void ) +void Complex::Sqrt() { static const double fMultConst = 0.7071067811865475; // ...2440084436210485 = 1/sqrt(2) double p = Abs(); @@ -1854,7 +1854,7 @@ void Complex::Sqrt( void ) } -void Complex::Sin( void ) throw( uno::RuntimeException, lang::IllegalArgumentException ) +void Complex::Sin() throw( uno::RuntimeException, lang::IllegalArgumentException ) { if( !::rtl::math::isValidArcArg( r ) ) throw lang::IllegalArgumentException(); @@ -1872,7 +1872,7 @@ void Complex::Sin( void ) throw( uno::RuntimeException, lang::IllegalArgumentExc } -void Complex::Cos( void ) throw( uno::RuntimeException, lang::IllegalArgumentException ) +void Complex::Cos() throw( uno::RuntimeException, lang::IllegalArgumentException ) { if( !::rtl::math::isValidArcArg( r ) ) throw lang::IllegalArgumentException(); @@ -1909,7 +1909,7 @@ void Complex::Div( const Complex& z ) throw( uno::RuntimeException, lang::Illega } -void Complex::Exp( void ) +void Complex::Exp() { double fE = exp( r ); r = fE * cos( i ); @@ -1917,7 +1917,7 @@ void Complex::Exp( void ) } -void Complex::Ln( void ) throw( uno::RuntimeException, lang::IllegalArgumentException ) +void Complex::Ln() throw( uno::RuntimeException, lang::IllegalArgumentException ) { if( r == 0.0 && i == 0.0 ) throw lang::IllegalArgumentException(); @@ -1934,21 +1934,21 @@ void Complex::Ln( void ) throw( uno::RuntimeException, lang::IllegalArgumentExce } -void Complex::Log10( void ) throw( uno::RuntimeException, lang::IllegalArgumentException ) +void Complex::Log10() throw( uno::RuntimeException, lang::IllegalArgumentException ) { Ln(); Mult( 0.434294481903251828 ); // * log10( e ) } -void Complex::Log2( void ) throw( uno::RuntimeException, lang::IllegalArgumentException ) +void Complex::Log2() throw( uno::RuntimeException, lang::IllegalArgumentException ) { Ln(); Mult( 1.442695040888963407 ); // * log2( e ) } -void Complex::Tan(void) throw( uno::RuntimeException, lang::IllegalArgumentException ) +void Complex::Tan() throw( uno::RuntimeException, lang::IllegalArgumentException ) { if ( i ) { @@ -1967,7 +1967,7 @@ void Complex::Tan(void) throw( uno::RuntimeException, lang::IllegalArgumentExcep } -void Complex::Sec( void ) throw( uno::RuntimeException, lang::IllegalArgumentException ) +void Complex::Sec() throw( uno::RuntimeException, lang::IllegalArgumentException ) { if( i ) { @@ -1988,7 +1988,7 @@ void Complex::Sec( void ) throw( uno::RuntimeException, lang::IllegalArgumentExc } -void Complex::Csc( void ) throw( uno::RuntimeException, lang::IllegalArgumentException ) +void Complex::Csc() throw( uno::RuntimeException, lang::IllegalArgumentException ) { if( i ) { @@ -2009,7 +2009,7 @@ void Complex::Csc( void ) throw( uno::RuntimeException, lang::IllegalArgumentExc } -void Complex::Cot(void) throw( uno::RuntimeException, lang::IllegalArgumentException ) +void Complex::Cot() throw( uno::RuntimeException, lang::IllegalArgumentException ) { if ( i ) { @@ -2028,7 +2028,7 @@ void Complex::Cot(void) throw( uno::RuntimeException, lang::IllegalArgumentExcep } -void Complex::Sinh( void ) throw( uno::RuntimeException, lang::IllegalArgumentException ) +void Complex::Sinh() throw( uno::RuntimeException, lang::IllegalArgumentException ) { if( !::rtl::math::isValidArcArg( r ) ) throw lang::IllegalArgumentException(); @@ -2045,7 +2045,7 @@ void Complex::Sinh( void ) throw( uno::RuntimeException, lang::IllegalArgumentEx } -void Complex::Cosh( void ) throw( uno::RuntimeException, lang::IllegalArgumentException ) +void Complex::Cosh() throw( uno::RuntimeException, lang::IllegalArgumentException ) { if( !::rtl::math::isValidArcArg( r ) ) throw lang::IllegalArgumentException(); @@ -2062,7 +2062,7 @@ void Complex::Cosh( void ) throw( uno::RuntimeException, lang::IllegalArgumentEx } -void Complex::Sech(void) throw( uno::RuntimeException, lang::IllegalArgumentException ) +void Complex::Sech() throw( uno::RuntimeException, lang::IllegalArgumentException ) { if ( i ) { @@ -2083,7 +2083,7 @@ void Complex::Sech(void) throw( uno::RuntimeException, lang::IllegalArgumentExce } -void Complex::Csch(void) throw( uno::RuntimeException, lang::IllegalArgumentException ) +void Complex::Csch() throw( uno::RuntimeException, lang::IllegalArgumentException ) { if ( i ) { @@ -2386,7 +2386,7 @@ double ConvertDataLinear::ConvertFromBase( double f, sal_Int16 n ) const } -ConvertDataList::ConvertDataList( void ) +ConvertDataList::ConvertDataList() { #define NEWD(str,unit,cl) maVector.push_back(new ConvertData(str,unit,cl)) #define NEWDP(str,unit,cl) maVector.push_back(new ConvertData(str,unit,cl,true)) diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx index c0fadc5cf3fc..1f94bb41f142 100644 --- a/scaddins/source/analysis/analysishelper.hxx +++ b/scaddins/source/analysis/analysishelper.hxx @@ -188,18 +188,18 @@ public: FuncData( const FuncDataBase& rBaseData, ResMgr& ); virtual ~FuncData(); - inline sal_uInt16 GetUINameID( void ) const; - inline sal_uInt16 GetDescrID( void ) const; - inline bool IsDouble( void ) const; - inline bool HasIntParam( void ) const; + inline sal_uInt16 GetUINameID() const; + inline sal_uInt16 GetDescrID() const; + inline bool IsDouble() const; + inline bool HasIntParam() const; sal_uInt16 GetStrIndex( sal_uInt16 nParamNum ) const; inline bool Is( const OUString& rCompareTo ) const; inline const std::vector<OUString> & - GetCompNameList( void ) const; + GetCompNameList() const; - inline FDCategory GetCategory( void ) const; + inline FDCategory GetCategory() const; }; @@ -378,35 +378,35 @@ public: static bool ParseString( const OUString& rComplexAsString, Complex& rReturn ); OUString GetString() const throw( css::uno::RuntimeException, css::lang::IllegalArgumentException ); - inline double Real( void ) const; - inline double Imag( void ) const; + inline double Real() const; + inline double Imag() const; - double Arg( void ) const throw( css::uno::RuntimeException, css::lang::IllegalArgumentException ); - inline double Abs( void ) const; + double Arg() const throw( css::uno::RuntimeException, css::lang::IllegalArgumentException ); + inline double Abs() const; // following functions change the complex number itself to avoid unnecessary copy actions! void Power( double fPower ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException ); - void Sqrt( void ); - void Sin( void ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException ); - void Cos( void ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException ); + void Sqrt(); + void Sin() throw( css::uno::RuntimeException, css::lang::IllegalArgumentException ); + void Cos() throw( css::uno::RuntimeException, css::lang::IllegalArgumentException ); void Div( const Complex& rDivisor ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException ); - void Exp( void ); - inline void Conjugate( void ); - void Ln( void ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException ); - void Log10( void ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException ); - void Log2( void ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException ); + void Exp(); + inline void Conjugate(); + void Ln() throw( css::uno::RuntimeException, css::lang::IllegalArgumentException ); + void Log10() throw( css::uno::RuntimeException, css::lang::IllegalArgumentException ); + void Log2() throw( css::uno::RuntimeException, css::lang::IllegalArgumentException ); inline void Mult( double fFact ); inline void Mult( const Complex& rMult ); inline void Sub( const Complex& rMult ); inline void Add( const Complex& rAdd ); - void Tan( void ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException ); - void Sec( void ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException ); - void Csc( void ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException ); - void Cot( void ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException ); - void Sinh( void ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException ); - void Cosh( void ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException ); - void Sech( void ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException ); - void Csch( void ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException ); + void Tan() throw( css::uno::RuntimeException, css::lang::IllegalArgumentException ); + void Sec() throw( css::uno::RuntimeException, css::lang::IllegalArgumentException ); + void Csc() throw( css::uno::RuntimeException, css::lang::IllegalArgumentException ); + void Cot() throw( css::uno::RuntimeException, css::lang::IllegalArgumentException ); + void Sinh() throw( css::uno::RuntimeException, css::lang::IllegalArgumentException ); + void Cosh() throw( css::uno::RuntimeException, css::lang::IllegalArgumentException ); + void Sech() throw( css::uno::RuntimeException, css::lang::IllegalArgumentException ); + void Csch() throw( css::uno::RuntimeException, css::lang::IllegalArgumentException ); }; @@ -428,9 +428,9 @@ public: inline const Complex* Get( sal_uInt32 nIndex ) const; - inline bool empty( void ) const + inline bool empty() const { return maVector.empty(); } - inline sal_uInt32 Count( void ) const + inline sal_uInt32 Count() const { return maVector.size(); } inline void Append( Complex* pNew ); @@ -482,8 +482,8 @@ public: virtual double ConvertToBase( double fVal, sal_Int16 nMatchLevel ) const; virtual double ConvertFromBase( double fVal, sal_Int16 nMatchLevel ) const; - inline ConvertDataClass Class( void ) const; - inline bool IsPrefixSupport( void ) const; + inline ConvertDataClass Class() const; + inline bool IsPrefixSupport() const; }; class ConvertDataLinear : public ConvertData @@ -514,7 +514,7 @@ class ConvertDataList private: std::vector<ConvertData*> maVector; public: - ConvertDataList( void ); + ConvertDataList(); virtual ~ConvertDataList(); double Convert( double fVal, const OUString& rFrom, const OUString& rTo ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException ); @@ -554,25 +554,25 @@ inline void AlignDate( sal_uInt16& rD, sal_uInt16 nM, sal_uInt16 nY ) } -inline sal_uInt16 FuncData::GetUINameID( void ) const +inline sal_uInt16 FuncData::GetUINameID() const { return nUINameID; } -inline sal_uInt16 FuncData::GetDescrID( void ) const +inline sal_uInt16 FuncData::GetDescrID() const { return nDescrID; } -inline bool FuncData::IsDouble( void ) const +inline bool FuncData::IsDouble() const { return bDouble; } -inline bool FuncData::HasIntParam( void ) const +inline bool FuncData::HasIntParam() const { return bWithOpt; } @@ -584,13 +584,13 @@ inline bool FuncData::Is( const OUString& r ) const } -inline const std::vector<OUString> & FuncData::GetCompNameList( void ) const +inline const std::vector<OUString> & FuncData::GetCompNameList() const { return aCompList; } -inline FDCategory FuncData::GetCategory( void ) const +inline FDCategory FuncData::GetCategory() const { return eCat; } @@ -614,25 +614,25 @@ inline Complex::Complex( double fReal, double fImag, sal_Unicode cC ) : } -inline double Complex::Real( void ) const +inline double Complex::Real() const { return r; } -inline double Complex::Imag( void ) const +inline double Complex::Imag() const { return i; } -inline double Complex::Abs( void ) const +inline double Complex::Abs() const { return sqrt( r * r + i * i ); } -void Complex::Conjugate( void ) +void Complex::Conjugate() { i = -i; } @@ -685,12 +685,12 @@ inline void ComplexList::Append( Complex* p ) } -inline ConvertDataClass ConvertData::Class( void ) const +inline ConvertDataClass ConvertData::Class() const { return eClass; } -inline bool ConvertData::IsPrefixSupport( void ) const +inline bool ConvertData::IsPrefixSupport() const { return bPrefixSupport; } diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx index 381552c29369..0c64fa2b6880 100644 --- a/scripting/source/stringresource/stringresource.cxx +++ b/scripting/source/stringresource/stringresource.cxx @@ -691,13 +691,13 @@ LocaleItem* StringResourceImpl::getClosestMatchItemForLocale( const Locale& loca return pRetItem; } -void StringResourceImpl::implModified( void ) +void StringResourceImpl::implModified() { m_bModified = true; implNotifyListeners(); } -void StringResourceImpl::implNotifyListeners( void ) +void StringResourceImpl::implNotifyListeners() { EventObject aEvent; aEvent.Source = static_cast< XInterface* >( (OWeakObject*)this ); @@ -729,13 +729,13 @@ bool StringResourceImpl::loadLocale( LocaleItem* pLocaleItem ) return true; } -void StringResourceImpl::implLoadAllLocales( void ) +void StringResourceImpl::implLoadAllLocales() { // Base implementation has nothing to load } -Reference< XMultiComponentFactory > StringResourceImpl::getMultiComponentFactory( void ) +Reference< XMultiComponentFactory > StringResourceImpl::getMultiComponentFactory() { ::osl::MutexGuard aGuard( getMutex() ); @@ -1477,13 +1477,13 @@ public: Reference< io::XInputStream > getInputStreamForSection( sal_Int32 nSize ); void seek( sal_Int32 nPos ); - sal_Int32 getPosition( void ) const + sal_Int32 getPosition() const { return m_nCurPos; } - sal_Int16 readInt16( void ); - sal_Int32 readInt32( void ); - sal_Unicode readUnicodeChar( void ); - OUString readString( void ); + sal_Int16 readInt16(); + sal_Int32 readInt32(); + sal_Unicode readUnicodeChar(); + OUString readString(); }; BinaryInput::BinaryInput( const Sequence< ::sal_Int8 >& aData, Reference< XMultiComponentFactory > xMCF, @@ -1527,7 +1527,7 @@ void BinaryInput::seek( sal_Int32 nPos ) } -sal_Int16 BinaryInput::readInt16( void ) +sal_Int16 BinaryInput::readInt16() { sal_Int16 nRet = 0; if( m_nCurPos + 2 <= m_nSize ) @@ -1541,7 +1541,7 @@ sal_Int16 BinaryInput::readInt16( void ) return nRet; } -sal_Int32 BinaryInput::readInt32( void ) +sal_Int32 BinaryInput::readInt32() { sal_Int32 nRet = 0; if( m_nCurPos + 4 <= m_nSize ) @@ -1559,7 +1559,7 @@ sal_Int32 BinaryInput::readInt32( void ) return nRet; } -sal_Unicode BinaryInput::readUnicodeChar( void ) +sal_Unicode BinaryInput::readUnicodeChar() { sal_uInt16 nRet = 0; if( m_nCurPos + 2 <= m_nSize ) @@ -1574,7 +1574,7 @@ sal_Unicode BinaryInput::readUnicodeChar( void ) return cRet; } -OUString BinaryInput::readString( void ) +OUString BinaryInput::readString() { OUStringBuffer aBuf; sal_Unicode c; @@ -1697,7 +1697,7 @@ bool checkNamingSceme( const OUString& aName, const OUString& aNameBase, return bSuccess; } -void StringResourcePersistenceImpl::implLoadAllLocales( void ) +void StringResourcePersistenceImpl::implLoadAllLocales() { for( LocaleItemVectorIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); ++it ) { @@ -1770,7 +1770,7 @@ void StringResourcePersistenceImpl::implScanLocaleNames( const Sequence< OUStrin } // Scan locale properties files -void StringResourcePersistenceImpl::implScanLocales( void ) +void StringResourcePersistenceImpl::implScanLocales() { // Dummy implementation, method not called for this // base class, but pure virtual not possible- @@ -2542,7 +2542,7 @@ void StringResourceWithStorageImpl::setStorage( const Reference< XStorage >& Sto // Scan locale properties files -void StringResourceWithStorageImpl::implScanLocales( void ) +void StringResourceWithStorageImpl::implScanLocales() { Reference< container::XNameAccess > xNameAccess( m_xStorage, UNO_QUERY ); if( xNameAccess.is() ) @@ -2897,7 +2897,7 @@ void StringResourceWithLocationImpl::setURL( const OUString& URL ) // Scan locale properties files -void StringResourceWithLocationImpl::implScanLocales( void ) +void StringResourceWithLocationImpl::implScanLocales() { const Reference< ucb::XSimpleFileAccess3 > xFileAccess = getFileAccess(); if( xFileAccess.is() && xFileAccess->isFolder( m_aLocation ) ) @@ -2935,7 +2935,7 @@ bool StringResourceWithLocationImpl::implLoadLocale( LocaleItem* pLocaleItem ) return bSuccess; } -const Reference< ucb::XSimpleFileAccess3 > StringResourceWithLocationImpl::getFileAccess( void ) +const Reference< ucb::XSimpleFileAccess3 > StringResourceWithLocationImpl::getFileAccess() { ::osl::MutexGuard aGuard( getMutex() ); diff --git a/scripting/source/stringresource/stringresource.hxx b/scripting/source/stringresource/stringresource.hxx index 3054da7840cd..a9c51178dda2 100644 --- a/scripting/source/stringresource/stringresource.hxx +++ b/scripting/source/stringresource/stringresource.hxx @@ -126,7 +126,7 @@ protected: // Return the context's MultiComponentFactory ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiComponentFactory > - getMultiComponentFactory( void ); + getMultiComponentFactory(); // Returns the LocalItem for a given locale, if it exists, otherwise NULL // This method compares the locales exactly, no closest match search is performed @@ -140,8 +140,8 @@ protected: bool FindClosestMatch, bool bUseDefaultIfNoMatch ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - void implModified( void ); - void implNotifyListeners( void ); + void implModified(); + void implNotifyListeners(); //=== Impl methods for ...ForLocale methods === OUString SAL_CALL implResolveString( const OUString& ResourceID, LocaleItem* pLocaleItem ) @@ -157,7 +157,7 @@ protected: // successful. Default implementation in base class just returns true. virtual bool loadLocale( LocaleItem* pLocaleItem ); - virtual void implLoadAllLocales( void ); + virtual void implLoadAllLocales(); public: StringResourceImpl( @@ -250,7 +250,7 @@ protected: throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // Scan locale properties files - virtual void implScanLocales( void ); + virtual void implScanLocales(); // Method to load a locale if necessary, returns true if loading was successful virtual bool loadLocale( LocaleItem* pLocaleItem ) SAL_OVERRIDE; @@ -258,7 +258,7 @@ protected: // does the actual loading virtual bool implLoadLocale( LocaleItem* pLocaleItem ); - virtual void implLoadAllLocales( void ) SAL_OVERRIDE; + virtual void implLoadAllLocales() SAL_OVERRIDE; void implScanLocaleNames( const ::com::sun::star::uno::Sequence< OUString >& aContentSeq ); static OUString implGetFileNameForLocaleItem( LocaleItem* pLocaleItem, const OUString& aNameBase ); @@ -418,7 +418,7 @@ class StringResourceWithStorageImpl : public StringResourceWithStorageImpl_BASE ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xStorage; bool m_bStorageChanged; - virtual void implScanLocales( void ) SAL_OVERRIDE; + virtual void implScanLocales() SAL_OVERRIDE; virtual bool implLoadLocale( LocaleItem* pLocaleItem ) SAL_OVERRIDE; public: @@ -542,9 +542,9 @@ class StringResourceWithLocationImpl : public StringResourceWithLocationImpl_BAS com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess3 > m_xSFI; com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > m_xInteractionHandler; - const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 > getFileAccess( void ); + const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 > getFileAccess(); - virtual void implScanLocales( void ) SAL_OVERRIDE; + virtual void implScanLocales() SAL_OVERRIDE; virtual bool implLoadLocale( LocaleItem* pLocaleItem ) SAL_OVERRIDE; public: diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx index 4999b48d1dac..f4b1a6f64deb 100644 --- a/sd/inc/Outliner.hxx +++ b/sd/inc/Outliner.hxx @@ -120,12 +120,12 @@ public: search mode, may be restored after finishing searching/spell checking. */ - void PrepareSpelling (void); + void PrepareSpelling(); /** Initialize a spell check but do not start it yet. This method is a better candidate for the name PrepareSpelling. */ - void StartSpelling (void); + void StartSpelling(); /** Proxy for method from base class to avoid compiler warning */ void StartSpelling(EditView&, unsigned char); @@ -142,15 +142,15 @@ public: next sentence with spelling errors. While doing so the view mode may be changed and text shapes are set into edit mode. */ - ::svx::SpellPortions GetNextSpellSentence (void); + ::svx::SpellPortions GetNextSpellSentence(); /** Release all resources that have been created during the find&replace or spell check. */ - void EndSpelling (void); + void EndSpelling(); /** callback for textconversion */ - bool ConvertNextDocument (void) SAL_OVERRIDE; + bool ConvertNextDocument() SAL_OVERRIDE; /** Starts the text conversion (hangul/hanja or Chinese simplified/traditional) for the current viewshell */ @@ -161,10 +161,10 @@ public: The position of current view mode/page/object/caret position is remembered and will be restored after conversion. */ - void BeginConversion (void); + void BeginConversion(); /** Release all resources that have been created during the conversion */ - void EndConversion (void); + void EndConversion(); DECL_LINK( SpellError, void * ); @@ -354,14 +354,14 @@ private: /** Do search and replace for whole document. */ - bool SearchAndReplaceAll (void); + bool SearchAndReplaceAll(); /** Do search and replace for next match. @return The return value specifies whether the search ended (</sal_True>) or another call to this method is required (</sal_False>). */ - bool SearchAndReplaceOnce (void); + bool SearchAndReplaceOnce(); /** Detect changes of the document or view and react accordingly. Such changes may occur because different calls to @@ -370,50 +370,50 @@ private: button but may include any other action some of which affect the search. */ - void DetectChange (void); + void DetectChange(); /** Detect whether the selection has changed. @return Return <TRUE/> when the selection has been changed since the last call to this method. */ - bool DetectSelectionChange (void); + bool DetectSelectionChange(); /** Remember the current edited object/caret position/page/view mode when starting to search/spell check so that it can be restored on termination. */ - void RememberStartPosition (void); + void RememberStartPosition(); /** Restore the position stored in the last call of <member>RememberStartPositiony</member>. */ - void RestoreStartPosition (void); + void RestoreStartPosition(); /** Provide next object to search or spell check as text object in edit mode on the current page. This skips all objects that do not match or are no text object. */ - void ProvideNextTextObject (void); + void ProvideNextTextObject(); /** Handle the situation that the iterator has reached the last object. This may result in setting the <member>mbEndOfSearch</member> flag back to </sal_False>. This method may show either the end-of-search dialog or the wrap-around dialog. */ - void EndOfSearch (void); + void EndOfSearch(); /** Show a dialog that tells the user that the search has ended either because there are no more matches after finding at least one or that no match has been found at all. */ - void ShowEndOfSearchDialog (void); + void ShowEndOfSearchDialog(); /** Show a dialog that asks the user whether to wrap around to the beginning/end of the document and continue with the search/spell check. */ - bool ShowWrapArroundDialog (void); + bool ShowWrapArroundDialog(); /** Check whether the object pointed to by the iterator is a valid text object. @@ -425,23 +425,23 @@ private: /** Put text of current text object into outliner so that the text can be searched/spell checked. */ - void PutTextIntoOutliner (void); + void PutTextIntoOutliner(); /** Prepare to do spell checking on the current text object. This includes putting it into edit mode. Under certain conditions this method sets <member>mbEndOfSearch</member> to <TRUE/>. */ - void PrepareSpellCheck (void); + void PrepareSpellCheck(); /** Prepare to search and replace on the current text object. This includes putting it into edit mode. */ - void PrepareSearchAndReplace (void); + void PrepareSearchAndReplace(); /** Prepare to do a text conversion on the current text object. This includes putting it into edit mode. */ - void PrepareConversion (void); + void PrepareConversion(); /** Switch to a new view mode. Try to restore the original edit mode before doing so. @@ -470,7 +470,7 @@ private: The position mentioned above in form of a selection with start equals end. */ - ESelection GetSearchStartPosition (void); + ESelection GetSearchStartPosition(); /** Detect whether there exists a previous match. Note that only the absence of such a match can be detected reliably. An existing match @@ -481,7 +481,7 @@ private: Returns </True> when there is no previous match and </False> when there may be one. */ - bool HasNoPreviousMatch (void); + bool HasNoPreviousMatch(); /** Handle a failed search (with or without replace) for the outline mode. Show message boxes when the search failed completely, @@ -492,7 +492,7 @@ private: search shall take place. If that is so, then it is the caller's responsibility to set the cursor position accordingly. */ - bool HandleFailedSearch (void); + bool HandleFailedSearch(); /** Take a position as returned by an object iterator and switch to the view and page on which the object specified by this position is @@ -516,7 +516,7 @@ private: a copy of the current selection and reassigns the object iterator to the current() iterator. */ - void HandleChangedSelection (void); + void HandleChangedSelection(); /** Initiate the spell check of the next relevant text object. When the outline view is active then this method is called @@ -526,7 +526,7 @@ private: required. When all text objects have been processed then <FALSE/> is returned. */ - virtual bool SpellNextDocument (void) SAL_OVERRIDE; + virtual bool SpellNextDocument() SAL_OVERRIDE; /** Show the given message box and make it modal. It is assumed that the parent of the given dialog is NULL, i.e. the application diff --git a/sd/inc/OutlinerIterator.hxx b/sd/inc/OutlinerIterator.hxx index d056ed412267..81f48c16e510 100644 --- a/sd/inc/OutlinerIterator.hxx +++ b/sd/inc/OutlinerIterator.hxx @@ -85,7 +85,7 @@ enum IteratorType {SELECTION,SINGLE_VIEW,DOCUMENT}; class Iterator { public: - Iterator (void); + Iterator(); /** The copy constructor creates a new iterator by copying the implementation object. @@ -99,7 +99,7 @@ public: */ explicit Iterator (IteratorImplBase* pObject); - ~Iterator (void); + ~Iterator(); /** Assign the iterator from the given one. The implementation object of this iterator will be a copy of the given iterator. @@ -152,7 +152,7 @@ public: /** Reverse the direction of iteration. The position of the iterator is not changed. Thus calling this method twice returns to the old state. */ - void Reverse (void); + void Reverse(); private: /// The implementation object to which most of the methods are forwarded. @@ -186,7 +186,7 @@ public: The returned iterator points either to the first (forward search) or to the last object (backward search) of the set. */ - Iterator begin (void); + Iterator begin(); /** Return an iterator that marks the end of the iteration. This takes also into account the direction of iteration. The object pointed to @@ -196,7 +196,7 @@ public: one (forward search) or to the one in front of the first (backward search). */ - Iterator end (void); + Iterator end(); /** Return an iterator that points to the current object of one of the sets described above. This takes also into account the direction of @@ -207,7 +207,7 @@ public: selected objects or of the current page if the search set spans more than one page. */ - Iterator current (void); + Iterator current(); private: /// The wrapped outliner that is represented as object container. @@ -292,7 +292,7 @@ private: // Do not allow default constructor and copying of outliner containers. OutlinerContainer (const OutlinerContainer&) {}; - OutlinerContainer (void) {}; + OutlinerContainer() {}; OutlinerContainer& operator= (const OutlinerContainer&) {return *this;}; }; @@ -306,7 +306,7 @@ public: These values should not be accessed. The only use of the object as it is as a marker in comparisons. */ - IteratorPosition (void); + IteratorPosition(); /** Create a new object with all data members set from the given position. @param aPosition @@ -316,7 +316,7 @@ public: IteratorPosition (const IteratorPosition& aPosition); /// The destructor is a no-op at the moment. - ~IteratorPosition (void); + ~IteratorPosition(); /** Assign the content of the given position to this one. @param aPosition This is the position object from which to take the values of all diff --git a/sd/inc/SdShapeTypes.hxx b/sd/inc/SdShapeTypes.hxx index ff2223479152..307a8cf1251b 100644 --- a/sd/inc/SdShapeTypes.hxx +++ b/sd/inc/SdShapeTypes.hxx @@ -29,7 +29,7 @@ namespace accessibility { /** Register the SD presentation shape types with the ShapeTypeHandler singleton. This method is usually called while loading the sd library. */ -void RegisterImpressShapeTypes (void); +void RegisterImpressShapeTypes(); /** Enum describing all shape types known in the SD project. */ diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index 47c4fe719020..394f62f82286 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -405,7 +405,7 @@ public: scope="com::sun::star::document::PrinterIndependentLayout">DISABLED</const> when formatting depends on the current printer metrics. */ - SAL_DLLPRIVATE sal_Int32 GetPrinterIndependentLayout (void) { return mnPrinterIndependentLayout;} + SAL_DLLPRIVATE sal_Int32 GetPrinterIndependentLayout() { return mnPrinterIndependentLayout;} SAL_DLLPRIVATE void SetOnlineSpell( bool bIn ); SAL_DLLPRIVATE bool GetOnlineSpell() const { return mbOnlineSpell; } diff --git a/sd/inc/sdcgmfilter.hxx b/sd/inc/sdcgmfilter.hxx index 144f0a03a3cb..4ac21541a1b4 100644 --- a/sd/inc/sdcgmfilter.hxx +++ b/sd/inc/sdcgmfilter.hxx @@ -30,7 +30,7 @@ public: SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, bool bShowProgress ); - virtual ~SdCGMFilter (void); + virtual ~SdCGMFilter(); bool Import(); bool Export() SAL_OVERRIDE; diff --git a/sd/inc/sdgrffilter.hxx b/sd/inc/sdgrffilter.hxx index d4d87c4b8fb4..c14662441cec 100644 --- a/sd/inc/sdgrffilter.hxx +++ b/sd/inc/sdgrffilter.hxx @@ -31,7 +31,7 @@ class SdGRFFilter : public SdFilter public: SdGRFFilter ( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell ); - virtual ~SdGRFFilter (void); + virtual ~SdGRFFilter(); bool Import(); bool Export() SAL_OVERRIDE; diff --git a/sd/inc/sdhtmlfilter.hxx b/sd/inc/sdhtmlfilter.hxx index 130f84a7b07e..356d3a2dce09 100644 --- a/sd/inc/sdhtmlfilter.hxx +++ b/sd/inc/sdhtmlfilter.hxx @@ -31,7 +31,7 @@ public: SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, bool bShowProgress); - virtual ~SdHTMLFilter (void); + virtual ~SdHTMLFilter(); virtual bool Export() SAL_OVERRIDE; diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx index 624b0a8b492e..5ad63fd081ee 100644 --- a/sd/inc/sdmod.hxx +++ b/sd/inc/sdmod.hxx @@ -112,7 +112,7 @@ public: The returned pointer is NULL when the device could not be created when this modules was instantiated. */ - OutputDevice* GetVirtualRefDevice (void) { return mpVirtualRefDevice;} + OutputDevice* GetVirtualRefDevice() { return mpVirtualRefDevice;} /** Deprecated alias to <member>GetVirtualRefDevice</member>. @param rDocShell diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx index 87d2e7ee7ba2..6e6a354408b1 100644 --- a/sd/inc/sdpage.hxx +++ b/sd/inc/sdpage.hxx @@ -376,7 +376,7 @@ public: When this method returns <TRUE/> for a master page then this master page should not be deleted automatically. */ - bool IsPrecious (void) const { return mbIsPrecious; } + bool IsPrecious() const { return mbIsPrecious; } void createAnnotation( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation ); void addAnnotation( const ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation, int nIndex = -1 ); diff --git a/sd/inc/sdpptwrp.hxx b/sd/inc/sdpptwrp.hxx index 01432bd0df70..823a3b3d4c50 100644 --- a/sd/inc/sdpptwrp.hxx +++ b/sd/inc/sdpptwrp.hxx @@ -30,7 +30,7 @@ public: SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, bool bShowProgress); - virtual ~SdPPTFilter (void); + virtual ~SdPPTFilter(); /// these methods are necessary for the export to PowerPoint bool Import(); diff --git a/sd/inc/sdxmlwrp.hxx b/sd/inc/sdxmlwrp.hxx index 8945ab1fac78..f144461ae4f1 100644 --- a/sd/inc/sdxmlwrp.hxx +++ b/sd/inc/sdxmlwrp.hxx @@ -39,7 +39,7 @@ public: bool bShowProgress, SdXMLFilterMode eFilterMode = SDXMLMODE_Normal, sal_uLong nStoreVer = SOFFICE_FILEFORMAT_8 ); - virtual ~SdXMLFilter (void); + virtual ~SdXMLFilter(); bool Import( ErrCode& nError ); bool Export() SAL_OVERRIDE; diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx index 33255377e06e..5a22993fd36f 100644 --- a/sd/inc/stlpool.hxx +++ b/sd/inc/stlpool.hxx @@ -121,8 +121,8 @@ public: virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire (void) throw () SAL_OVERRIDE; - virtual void SAL_CALL release (void) throw () SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; + virtual void SAL_CALL release() throw () SAL_OVERRIDE; protected: void RenameAndCopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily, SdStyleSheetVector& rCreatedSheets, OUString &rRenameSuffix); void CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily ); diff --git a/sd/inc/undo/undomanager.hxx b/sd/inc/undo/undomanager.hxx index a3f68f929b03..470609ffea88 100644 --- a/sd/inc/undo/undomanager.hxx +++ b/sd/inc/undo/undomanager.hxx @@ -55,7 +55,7 @@ private: outline view seems to have a bug. Therefore this method is called whenever a new undo action is added. */ - void ClearLinkedRedoActions (void); + void ClearLinkedRedoActions(); }; } diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index d427b831f446..3c2a1265265d 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -1451,12 +1451,12 @@ SdStyleSheetVector SdStyleSheetPool::CreateChildList( SdStyleSheet* pSheet ) return aResult; } -void SAL_CALL SdStyleSheetPool::acquire (void) throw () +void SAL_CALL SdStyleSheetPool::acquire() throw () { SdStyleSheetPoolBase::acquire(); } -void SAL_CALL SdStyleSheetPool::release (void) throw () +void SAL_CALL SdStyleSheetPool::release() throw () { SdStyleSheetPoolBase::release(); } diff --git a/sd/source/core/undo/undomanager.cxx b/sd/source/core/undo/undomanager.cxx index 801c63ab3226..d7006175ea8a 100644 --- a/sd/source/core/undo/undomanager.cxx +++ b/sd/source/core/undo/undomanager.cxx @@ -54,7 +54,7 @@ void UndoManager::SetLinkedUndoManager (::svl::IUndoManager* pLinkedUndoManager) mpLinkedUndoManager = pLinkedUndoManager; } -void UndoManager::ClearLinkedRedoActions (void) +void UndoManager::ClearLinkedRedoActions() { if (mpLinkedUndoManager != NULL) mpLinkedUndoManager->ClearRedo(); diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index bb7dd9671561..e746db3dfa5d 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -172,7 +172,7 @@ SdXMLFilter::SdXMLFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, boo { } -SdXMLFilter::~SdXMLFilter(void) +SdXMLFilter::~SdXMLFilter() { } diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx index b3866bc14e20..00dd5f964877 100644 --- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx +++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx @@ -89,13 +89,13 @@ AccessibleDocumentViewBase::AccessibleDocumentViewBase ( mpViewShell = pViewShell; } -AccessibleDocumentViewBase::~AccessibleDocumentViewBase (void) +AccessibleDocumentViewBase::~AccessibleDocumentViewBase() { // At this place we should be disposed. You may want to add a // corresponding assertion into the destructor of a derived class. } -void AccessibleDocumentViewBase::Init (void) +void AccessibleDocumentViewBase::Init() { // Finish the initialization of the shape tree info container. maShapeTreeInfo.SetDocumentWindow (this); @@ -226,7 +226,7 @@ void AccessibleDocumentViewBase::ViewForwarderChanged(ChangeType, const IAccessi //===== XAccessibleContext ================================================== Reference<XAccessible> SAL_CALL - AccessibleDocumentViewBase::getAccessibleParent (void) + AccessibleDocumentViewBase::getAccessibleParent() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -235,7 +235,7 @@ Reference<XAccessible> SAL_CALL } sal_Int32 SAL_CALL - AccessibleDocumentViewBase::getAccessibleChildCount (void) + AccessibleDocumentViewBase::getAccessibleChildCount() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -305,7 +305,7 @@ uno::Reference<XAccessible > SAL_CALL } awt::Rectangle SAL_CALL - AccessibleDocumentViewBase::getBounds (void) + AccessibleDocumentViewBase::getBounds() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -341,7 +341,7 @@ awt::Rectangle SAL_CALL } awt::Point SAL_CALL - AccessibleDocumentViewBase::getLocation (void) + AccessibleDocumentViewBase::getLocation() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -350,7 +350,7 @@ awt::Point SAL_CALL } awt::Point SAL_CALL - AccessibleDocumentViewBase::getLocationOnScreen (void) + AccessibleDocumentViewBase::getLocationOnScreen() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -360,7 +360,7 @@ awt::Point SAL_CALL } awt::Size SAL_CALL - AccessibleDocumentViewBase::getSize (void) + AccessibleDocumentViewBase::getSize() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -402,14 +402,14 @@ uno::Any SAL_CALL } void SAL_CALL - AccessibleDocumentViewBase::acquire (void) + AccessibleDocumentViewBase::acquire() throw () { AccessibleContextBase::acquire (); } void SAL_CALL - AccessibleDocumentViewBase::release (void) + AccessibleDocumentViewBase::release() throw () { AccessibleContextBase::release (); @@ -418,14 +418,14 @@ void SAL_CALL //===== XServiceInfo ======================================================== OUString SAL_CALL - AccessibleDocumentViewBase::getImplementationName (void) + AccessibleDocumentViewBase::getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString("AccessibleDocumentViewBase"); } ::com::sun::star::uno::Sequence< OUString> SAL_CALL - AccessibleDocumentViewBase::getSupportedServiceNames (void) + AccessibleDocumentViewBase::getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -435,7 +435,7 @@ OUString SAL_CALL //===== XTypeProvider ======================================================= ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL - AccessibleDocumentViewBase::getTypes (void) + AccessibleDocumentViewBase::getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -626,7 +626,7 @@ void AccessibleDocumentViewBase::focusLost (const ::com::sun::star::awt::FocusEv //===== protected internal ================================================== // This method is called from the component helper base class while disposing. -void SAL_CALL AccessibleDocumentViewBase::disposing (void) +void SAL_CALL AccessibleDocumentViewBase::disposing() { impl_dispose(); @@ -635,7 +635,7 @@ void SAL_CALL AccessibleDocumentViewBase::disposing (void) /// Create a name for this view. OUString - AccessibleDocumentViewBase::CreateAccessibleName (void) + AccessibleDocumentViewBase::CreateAccessibleName() throw (::com::sun::star::uno::RuntimeException) { return OUString ("AccessibleDocumentViewBase"); @@ -645,7 +645,7 @@ OUString if a description is not available. */ OUString - AccessibleDocumentViewBase::CreateAccessibleDescription (void) + AccessibleDocumentViewBase::CreateAccessibleDescription() throw (::com::sun::star::uno::RuntimeException) { OUString sDescription; @@ -666,12 +666,12 @@ OUString return sDescription; } -void AccessibleDocumentViewBase::Activated (void) +void AccessibleDocumentViewBase::Activated() { // Empty. Overwrite to do something useful. } -void AccessibleDocumentViewBase::Deactivated (void) +void AccessibleDocumentViewBase::Deactivated() { // Empty. Overwrite to do something useful. } diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx index 16208b1eb870..f6df1c395f1c 100644 --- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx +++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx @@ -92,14 +92,14 @@ AccessibleDrawDocumentView::AccessibleDrawDocumentView ( UpdateAccessibleName(); } -AccessibleDrawDocumentView::~AccessibleDrawDocumentView (void) +AccessibleDrawDocumentView::~AccessibleDrawDocumentView() { OSL_TRACE ("~AccessibleDrawDocumentView"); DBG_ASSERT (rBHelper.bDisposed || rBHelper.bInDispose, "~AccessibleDrawDocumentView: object has not been disposed"); } -void AccessibleDrawDocumentView::Init (void) +void AccessibleDrawDocumentView::Init() { AccessibleDocumentViewBase::Init (); @@ -135,7 +135,7 @@ void AccessibleDrawDocumentView::ViewForwarderChanged (ChangeType aChangeType, /** The page shape is created on every call at the moment (provided that every thing goes well). */ -rtl::Reference<AccessiblePageShape> AccessibleDrawDocumentView::CreateDrawPageShape (void) +rtl::Reference<AccessiblePageShape> AccessibleDrawDocumentView::CreateDrawPageShape() { rtl::Reference<AccessiblePageShape> xShape; @@ -188,7 +188,7 @@ rtl::Reference<AccessiblePageShape> AccessibleDrawDocumentView::CreateDrawPageSh //===== XAccessibleContext ================================================== sal_Int32 SAL_CALL - AccessibleDrawDocumentView::getAccessibleChildCount (void) + AccessibleDrawDocumentView::getAccessibleChildCount() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -237,7 +237,7 @@ uno::Reference<XAccessible> SAL_CALL } OUString SAL_CALL - AccessibleDrawDocumentView::getAccessibleName(void) + AccessibleDrawDocumentView::getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -394,14 +394,14 @@ void SAL_CALL //===== XServiceInfo ======================================================== OUString SAL_CALL - AccessibleDrawDocumentView::getImplementationName (void) + AccessibleDrawDocumentView::getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString("AccessibleDrawDocumentView"); } ::com::sun::star::uno::Sequence< OUString> SAL_CALL - AccessibleDrawDocumentView::getSupportedServiceNames (void) + AccessibleDrawDocumentView::getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -432,13 +432,13 @@ uno::Any SAL_CALL } void SAL_CALL - AccessibleDrawDocumentView::acquire (void) + AccessibleDrawDocumentView::acquire() throw () { AccessibleDocumentViewBase::acquire (); } void SAL_CALL - AccessibleDrawDocumentView::release (void) + AccessibleDrawDocumentView::release() throw () { AccessibleDocumentViewBase::release (); @@ -553,7 +553,7 @@ OUString AccessibleDrawDocumentView::getObjectLink( const uno::Any& rAny ) } /// Create a name for this view. -OUString AccessibleDrawDocumentView::CreateAccessibleName (void) +OUString AccessibleDrawDocumentView::CreateAccessibleName() throw (::com::sun::star::uno::RuntimeException) { OUString sName; @@ -606,7 +606,7 @@ OUString AccessibleDrawDocumentView::CreateAccessibleName (void) if a description is not available. */ OUString - AccessibleDrawDocumentView::CreateAccessibleDescription (void) + AccessibleDrawDocumentView::CreateAccessibleDescription() throw (::com::sun::star::uno::RuntimeException) { OUString sDescription; @@ -785,7 +785,7 @@ void } } -void AccessibleDrawDocumentView::Activated (void) +void AccessibleDrawDocumentView::Activated() { if (mpChildrenManager != NULL) { @@ -806,14 +806,14 @@ void AccessibleDrawDocumentView::Activated (void) } } -void AccessibleDrawDocumentView::Deactivated (void) +void AccessibleDrawDocumentView::Deactivated() { if (mpChildrenManager != NULL) mpChildrenManager->RemoveFocus(); ResetState (AccessibleStateType::FOCUSED); } -void AccessibleDrawDocumentView::impl_dispose (void) +void AccessibleDrawDocumentView::impl_dispose() { if (mpChildrenManager != NULL) { @@ -827,7 +827,7 @@ void AccessibleDrawDocumentView::impl_dispose (void) /** This method is called from the component helper base class while disposing. */ -void SAL_CALL AccessibleDrawDocumentView::disposing (void) +void SAL_CALL AccessibleDrawDocumentView::disposing() { // Release resources. @@ -994,7 +994,7 @@ uno::Reference<XAccessible> AccessibleDrawDocumentView::GetSelAccContextInTable( return xRet; } -void AccessibleDrawDocumentView::UpdateAccessibleName (void) +void AccessibleDrawDocumentView::UpdateAccessibleName() { OUString sNewName (CreateAccessibleName()); sNewName += ": "; diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx index 398abdd7d816..7d17fe6c69d9 100644 --- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx +++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx @@ -90,12 +90,12 @@ AccessibleOutlineView::AccessibleOutlineView ( } } -AccessibleOutlineView::~AccessibleOutlineView (void) +AccessibleOutlineView::~AccessibleOutlineView() { OSL_TRACE ("~AccessibleOutlineView"); } -void AccessibleOutlineView::Init (void) +void AccessibleOutlineView::Init() { // Set event source _before_ starting to listen maTextHelper.SetEventSource(this); @@ -114,7 +114,7 @@ void AccessibleOutlineView::ViewForwarderChanged (ChangeType aChangeType, //===== XAccessibleContext ================================================== sal_Int32 SAL_CALL - AccessibleOutlineView::getAccessibleChildCount (void) + AccessibleOutlineView::getAccessibleChildCount() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -135,7 +135,7 @@ uno::Reference<XAccessible> SAL_CALL #include <drawdoc.hxx> OUString SAL_CALL - AccessibleOutlineView::getAccessibleName(void) + AccessibleOutlineView::getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -183,7 +183,7 @@ void SAL_CALL AccessibleOutlineView::removeAccessibleEventListener( const uno::R //===== XServiceInfo ======================================================== OUString SAL_CALL - AccessibleOutlineView::getImplementationName (void) + AccessibleOutlineView::getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString("AccessibleOutlineView"); @@ -200,7 +200,7 @@ void SAL_CALL //===== protected internal ================================================== -void AccessibleOutlineView::Activated (void) +void AccessibleOutlineView::Activated() { SolarMutexGuard aGuard; @@ -208,7 +208,7 @@ void AccessibleOutlineView::Activated (void) maTextHelper.SetFocus(true); } -void AccessibleOutlineView::Deactivated (void) +void AccessibleOutlineView::Deactivated() { SolarMutexGuard aGuard; @@ -216,7 +216,7 @@ void AccessibleOutlineView::Deactivated (void) maTextHelper.SetFocus(false); } -void SAL_CALL AccessibleOutlineView::disposing (void) +void SAL_CALL AccessibleOutlineView::disposing() { // dispose children maTextHelper.Dispose(); @@ -261,7 +261,7 @@ void SAL_CALL /// Create a name for this view. OUString - AccessibleOutlineView::CreateAccessibleName (void) + AccessibleOutlineView::CreateAccessibleName() throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -273,7 +273,7 @@ OUString if a description is not available. */ OUString - AccessibleOutlineView::CreateAccessibleDescription (void) + AccessibleOutlineView::CreateAccessibleDescription() throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; diff --git a/sd/source/ui/accessibility/AccessiblePageShape.cxx b/sd/source/ui/accessibility/AccessiblePageShape.cxx index 29ec73d5c085..4ebed11874ac 100644 --- a/sd/source/ui/accessibility/AccessiblePageShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePageShape.cxx @@ -50,12 +50,12 @@ AccessiblePageShape::AccessiblePageShape ( // has to be called from this constructor's caller. } -AccessiblePageShape::~AccessiblePageShape (void) +AccessiblePageShape::~AccessiblePageShape() { OSL_TRACE ("~AccessiblePageShape"); } -void AccessiblePageShape::Init (void) +void AccessiblePageShape::Init() { AccessibleShape::Init (); } @@ -63,7 +63,7 @@ void AccessiblePageShape::Init (void) //===== XAccessibleContext ================================================== sal_Int32 SAL_CALL - AccessiblePageShape::getAccessibleChildCount (void) + AccessiblePageShape::getAccessibleChildCount() throw (std::exception) { return 0; @@ -82,7 +82,7 @@ uno::Reference<XAccessible> SAL_CALL //===== XAccessibleComponent ================================================ -awt::Rectangle SAL_CALL AccessiblePageShape::getBounds (void) +awt::Rectangle SAL_CALL AccessiblePageShape::getBounds() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -146,7 +146,7 @@ awt::Rectangle SAL_CALL AccessiblePageShape::getBounds (void) return aBoundingBox; } -sal_Int32 SAL_CALL AccessiblePageShape::getForeground (void) +sal_Int32 SAL_CALL AccessiblePageShape::getForeground() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -172,7 +172,7 @@ sal_Int32 SAL_CALL AccessiblePageShape::getForeground (void) /** Extract the background color from the Background property of eithe the draw page or its master page. */ -sal_Int32 SAL_CALL AccessiblePageShape::getBackground (void) +sal_Int32 SAL_CALL AccessiblePageShape::getBackground() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -222,7 +222,7 @@ sal_Int32 SAL_CALL AccessiblePageShape::getBackground (void) //===== XServiceInfo ======================================================== OUString SAL_CALL - AccessiblePageShape::getImplementationName (void) + AccessiblePageShape::getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -230,7 +230,7 @@ OUString SAL_CALL } ::com::sun::star::uno::Sequence< OUString> SAL_CALL - AccessiblePageShape::getSupportedServiceNames (void) + AccessiblePageShape::getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -249,7 +249,7 @@ void SAL_CALL //===== XComponent ========================================================== -void AccessiblePageShape::dispose (void) +void AccessiblePageShape::dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) { OSL_TRACE ("AccessiblePageShape::dispose"); @@ -269,14 +269,14 @@ void AccessiblePageShape::dispose (void) //===== protected internal ================================================== OUString - AccessiblePageShape::CreateAccessibleBaseName (void) + AccessiblePageShape::CreateAccessibleBaseName() throw (::com::sun::star::uno::RuntimeException) { return OUString ("PageShape"); } OUString - AccessiblePageShape::CreateAccessibleName (void) + AccessiblePageShape::CreateAccessibleName() throw (::com::sun::star::uno::RuntimeException) { Reference<beans::XPropertySet> xPageProperties (mxPage, UNO_QUERY); @@ -298,7 +298,7 @@ OUString } OUString - AccessiblePageShape::CreateAccessibleDescription (void) + AccessiblePageShape::CreateAccessibleDescription() throw (::com::sun::star::uno::RuntimeException) { return OUString ("Page Shape"); diff --git a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx index 0b45b4cbee71..150fe48e6882 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx @@ -38,14 +38,14 @@ AccessiblePresentationGraphicShape::AccessiblePresentationGraphicShape ( { } -AccessiblePresentationGraphicShape::~AccessiblePresentationGraphicShape (void) +AccessiblePresentationGraphicShape::~AccessiblePresentationGraphicShape() { } //===== XServiceInfo ======================================================== OUString SAL_CALL - AccessiblePresentationGraphicShape::getImplementationName (void) + AccessiblePresentationGraphicShape::getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString("AccessiblePresentationGraphicShape"); @@ -53,7 +53,7 @@ OUString SAL_CALL /// Set this object's name if is different to the current name. OUString - AccessiblePresentationGraphicShape::CreateAccessibleBaseName (void) + AccessiblePresentationGraphicShape::CreateAccessibleBaseName() throw (::com::sun::star::uno::RuntimeException) { OUString sName; @@ -75,7 +75,7 @@ OUString } OUString - AccessiblePresentationGraphicShape::CreateAccessibleDescription (void) + AccessiblePresentationGraphicShape::CreateAccessibleDescription() throw (::com::sun::star::uno::RuntimeException) { // return createAccessibleName (); diff --git a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx index 76f2d6060183..3eb1a82773cc 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx @@ -38,14 +38,14 @@ AccessiblePresentationOLEShape::AccessiblePresentationOLEShape ( { } -AccessiblePresentationOLEShape::~AccessiblePresentationOLEShape (void) +AccessiblePresentationOLEShape::~AccessiblePresentationOLEShape() { } //===== XServiceInfo ======================================================== OUString SAL_CALL - AccessiblePresentationOLEShape::getImplementationName (void) + AccessiblePresentationOLEShape::getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString("AccessiblePresentationOLEShape"); @@ -53,7 +53,7 @@ OUString SAL_CALL /// Set this object's name if it is different to the current name. OUString - AccessiblePresentationOLEShape::CreateAccessibleBaseName (void) + AccessiblePresentationOLEShape::CreateAccessibleBaseName() throw (::com::sun::star::uno::RuntimeException) { OUString sName; @@ -81,7 +81,7 @@ OUString } OUString - AccessiblePresentationOLEShape::CreateAccessibleDescription (void) + AccessiblePresentationOLEShape::CreateAccessibleDescription() throw (::com::sun::star::uno::RuntimeException) { // return createAccessibleName(); diff --git a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx index 1651f1b224a3..c0a5520fbb35 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx @@ -40,21 +40,21 @@ AccessiblePresentationShape::AccessiblePresentationShape ( { } -AccessiblePresentationShape::~AccessiblePresentationShape (void) +AccessiblePresentationShape::~AccessiblePresentationShape() { } //===== XServiceInfo ======================================================== OUString SAL_CALL - AccessiblePresentationShape::getImplementationName (void) + AccessiblePresentationShape::getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString("AccessiblePresentationShape"); } /// Set this object's name if is different to the current name. -OUString AccessiblePresentationShape::CreateAccessibleBaseName (void) +OUString AccessiblePresentationShape::CreateAccessibleBaseName() throw (::com::sun::star::uno::RuntimeException) { OUString sName; @@ -103,7 +103,7 @@ OUString AccessiblePresentationShape::CreateAccessibleBaseName (void) } OUString - AccessiblePresentationShape::CreateAccessibleDescription (void) + AccessiblePresentationShape::CreateAccessibleDescription() throw (::com::sun::star::uno::RuntimeException) { // return createAccessibleName (); diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx index b8e75ff2cc2a..a9c6a05c9abd 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx @@ -59,7 +59,7 @@ AccessibleSlideSorterObject::AccessibleSlideSorterObject( { } -AccessibleSlideSorterObject::~AccessibleSlideSorterObject (void) +AccessibleSlideSorterObject::~AccessibleSlideSorterObject() { if ( ! IsDisposed()) dispose(); @@ -83,7 +83,7 @@ void AccessibleSlideSorterObject::FireAccessibleEvent ( } } -void SAL_CALL AccessibleSlideSorterObject::disposing (void) +void SAL_CALL AccessibleSlideSorterObject::disposing() { const SolarMutexGuard aSolarGuard; @@ -98,7 +98,7 @@ void SAL_CALL AccessibleSlideSorterObject::disposing (void) //===== XAccessible =========================================================== Reference<XAccessibleContext> SAL_CALL - AccessibleSlideSorterObject::getAccessibleContext (void) + AccessibleSlideSorterObject::getAccessibleContext() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -107,7 +107,7 @@ Reference<XAccessibleContext> SAL_CALL //===== XAccessibleContext ==================================================== -sal_Int32 SAL_CALL AccessibleSlideSorterObject::getAccessibleChildCount (void) +sal_Int32 SAL_CALL AccessibleSlideSorterObject::getAccessibleChildCount() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -121,7 +121,7 @@ Reference<XAccessible> SAL_CALL AccessibleSlideSorterObject::getAccessibleChild throw lang::IndexOutOfBoundsException(); } -Reference<XAccessible> SAL_CALL AccessibleSlideSorterObject::getAccessibleParent (void) +Reference<XAccessible> SAL_CALL AccessibleSlideSorterObject::getAccessibleParent() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -154,7 +154,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterObject::getAccessibleIndexInParent() return nIndexInParent; } -sal_Int16 SAL_CALL AccessibleSlideSorterObject::getAccessibleRole (void) +sal_Int16 SAL_CALL AccessibleSlideSorterObject::getAccessibleRole() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -164,14 +164,14 @@ sal_Int16 SAL_CALL AccessibleSlideSorterObject::getAccessibleRole (void) return nRole; } -OUString SAL_CALL AccessibleSlideSorterObject::getAccessibleDescription (void) +OUString SAL_CALL AccessibleSlideSorterObject::getAccessibleDescription() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); return SD_RESSTR(STR_PAGE); } -OUString SAL_CALL AccessibleSlideSorterObject::getAccessibleName (void) +OUString SAL_CALL AccessibleSlideSorterObject::getAccessibleName() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -185,7 +185,7 @@ OUString SAL_CALL AccessibleSlideSorterObject::getAccessibleName (void) } Reference<XAccessibleRelationSet> SAL_CALL - AccessibleSlideSorterObject::getAccessibleRelationSet (void) + AccessibleSlideSorterObject::getAccessibleRelationSet() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -193,7 +193,7 @@ Reference<XAccessibleRelationSet> SAL_CALL } Reference<XAccessibleStateSet> SAL_CALL - AccessibleSlideSorterObject::getAccessibleStateSet (void) + AccessibleSlideSorterObject::getAccessibleStateSet() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -222,7 +222,7 @@ Reference<XAccessibleStateSet> SAL_CALL return pStateSet; } -lang::Locale SAL_CALL AccessibleSlideSorterObject::getLocale (void) +lang::Locale SAL_CALL AccessibleSlideSorterObject::getLocale() throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) { @@ -306,7 +306,7 @@ Reference<XAccessible> SAL_CALL return NULL; } -awt::Rectangle SAL_CALL AccessibleSlideSorterObject::getBounds (void) +awt::Rectangle SAL_CALL AccessibleSlideSorterObject::getBounds() throw (RuntimeException, std::exception) { ThrowIfDisposed (); @@ -348,7 +348,7 @@ awt::Point SAL_CALL AccessibleSlideSorterObject::getLocation () return awt::Point(aBBox.X, aBBox.Y); } -awt::Point SAL_CALL AccessibleSlideSorterObject::getLocationOnScreen (void) +awt::Point SAL_CALL AccessibleSlideSorterObject::getLocationOnScreen() throw (RuntimeException, std::exception) { ThrowIfDisposed (); @@ -371,7 +371,7 @@ awt::Point SAL_CALL AccessibleSlideSorterObject::getLocationOnScreen (void) return aLocation; } -awt::Size SAL_CALL AccessibleSlideSorterObject::getSize (void) +awt::Size SAL_CALL AccessibleSlideSorterObject::getSize() throw (RuntimeException, std::exception) { ThrowIfDisposed (); @@ -379,13 +379,13 @@ awt::Size SAL_CALL AccessibleSlideSorterObject::getSize (void) return awt::Size(aBBox.Width,aBBox.Height); } -void SAL_CALL AccessibleSlideSorterObject::grabFocus (void) +void SAL_CALL AccessibleSlideSorterObject::grabFocus() throw (RuntimeException, std::exception) { // nothing to do } -sal_Int32 SAL_CALL AccessibleSlideSorterObject::getForeground (void) +sal_Int32 SAL_CALL AccessibleSlideSorterObject::getForeground() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -394,7 +394,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterObject::getForeground (void) return static_cast<sal_Int32>(nColor); } -sal_Int32 SAL_CALL AccessibleSlideSorterObject::getBackground (void) +sal_Int32 SAL_CALL AccessibleSlideSorterObject::getBackground() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -404,7 +404,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterObject::getBackground (void) //===== XServiceInfo ======================================================== OUString SAL_CALL - AccessibleSlideSorterObject::getImplementationName (void) + AccessibleSlideSorterObject::getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString("AccessibleSlideSorterObject"); @@ -417,7 +417,7 @@ sal_Bool SAL_CALL AccessibleSlideSorterObject::supportsService (const OUString& } uno::Sequence< OUString> SAL_CALL - AccessibleSlideSorterObject::getSupportedServiceNames (void) + AccessibleSlideSorterObject::getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -429,7 +429,7 @@ uno::Sequence< OUString> SAL_CALL return uno::Sequence<OUString> (sServiceNames, 2); } -void AccessibleSlideSorterObject::ThrowIfDisposed (void) +void AccessibleSlideSorterObject::ThrowIfDisposed() throw (lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) @@ -440,12 +440,12 @@ void AccessibleSlideSorterObject::ThrowIfDisposed (void) } } -bool AccessibleSlideSorterObject::IsDisposed (void) +bool AccessibleSlideSorterObject::IsDisposed() { return (rBHelper.bDisposed || rBHelper.bInDispose); } -SdPage* AccessibleSlideSorterObject::GetPage (void) const +SdPage* AccessibleSlideSorterObject::GetPage() const { ::sd::slidesorter::model::SharedPageDescriptor pDescriptor( mrSlideSorter.GetModel().GetPageDescriptor(mnPageNumber)); diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx index 8d04f48fe315..6cde28c4d4f1 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx @@ -69,16 +69,16 @@ public: AccessibleSlideSorterView& rAccessibleSlideSorter, ::sd::slidesorter::SlideSorter& rSlideSorter, vcl::Window* pWindow); - virtual ~Implementation (void); + virtual ~Implementation(); - void RequestUpdateChildren (void); - void Clear (void); - sal_Int32 GetVisibleChildCount (void) const; + void RequestUpdateChildren(); + void Clear(); + sal_Int32 GetVisibleChildCount() const; AccessibleSlideSorterObject* GetAccessibleChild (sal_Int32 nIndex); AccessibleSlideSorterObject* GetVisibleChild (sal_Int32 nIndex); - void ConnectListeners (void); - void ReleaseListeners (void); + void ConnectListeners(); + void ReleaseListeners(); void Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint) SAL_OVERRIDE; DECL_LINK(WindowEventListener, VclWindowEvent*); DECL_LINK(SelectionChangeListener, void*); @@ -87,7 +87,7 @@ public: DECL_LINK(VisibilityChangeListener, void*); DECL_LINK(UpdateChildrenCallback, void*); - void Activated(void); + void Activated(); private: AccessibleSlideSorterView& mrAccessibleSlideSorter; ::sd::slidesorter::SlideSorter& mrSlideSorter; @@ -102,7 +102,7 @@ private: ImplSVEvent * mnUpdateChildrenUserEventId; ImplSVEvent * mnSelectionChangeUserEventId; - void UpdateChildren (void); + void UpdateChildren(); }; //===== AccessibleSlideSorterView ============================================= @@ -124,7 +124,7 @@ void AccessibleSlideSorterView::Init() mpImpl.reset(new Implementation(*this,mrSlideSorter,mpContentWindow)); } -AccessibleSlideSorterView::~AccessibleSlideSorterView (void) +AccessibleSlideSorterView::~AccessibleSlideSorterView() { Destroyed (); } @@ -147,7 +147,7 @@ void AccessibleSlideSorterView::FireAccessibleEvent ( } } -void SAL_CALL AccessibleSlideSorterView::disposing (void) +void SAL_CALL AccessibleSlideSorterView::disposing() { if (mnClientId != 0) { @@ -169,7 +169,7 @@ AccessibleSlideSorterObject* AccessibleSlideSorterView::GetAccessibleChildImplem return pResult; } -void AccessibleSlideSorterView::Destroyed (void) +void AccessibleSlideSorterView::Destroyed() { ::osl::MutexGuard aGuard (maMutex); @@ -184,7 +184,7 @@ void AccessibleSlideSorterView::Destroyed (void) //===== XAccessible ========================================================= Reference<XAccessibleContext > SAL_CALL - AccessibleSlideSorterView::getAccessibleContext (void) + AccessibleSlideSorterView::getAccessibleContext() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -193,7 +193,7 @@ Reference<XAccessibleContext > SAL_CALL //===== XAccessibleContext ================================================== -sal_Int32 SAL_CALL AccessibleSlideSorterView::getAccessibleChildCount (void) +sal_Int32 SAL_CALL AccessibleSlideSorterView::getAccessibleChildCount() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -214,7 +214,7 @@ Reference<XAccessible > SAL_CALL return mpImpl->GetVisibleChild(nIndex); } -Reference<XAccessible > SAL_CALL AccessibleSlideSorterView::getAccessibleParent (void) +Reference<XAccessible > SAL_CALL AccessibleSlideSorterView::getAccessibleParent() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -231,7 +231,7 @@ Reference<XAccessible > SAL_CALL AccessibleSlideSorterView::getAccessibleParent return xParent; } -sal_Int32 SAL_CALL AccessibleSlideSorterView::getAccessibleIndexInParent (void) +sal_Int32 SAL_CALL AccessibleSlideSorterView::getAccessibleIndexInParent() throw (uno::RuntimeException, std::exception) { OSL_ASSERT(getAccessibleParent().is()); @@ -255,7 +255,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterView::getAccessibleIndexInParent (void) return nIndexInParent; } -sal_Int16 SAL_CALL AccessibleSlideSorterView::getAccessibleRole (void) +sal_Int16 SAL_CALL AccessibleSlideSorterView::getAccessibleRole() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -263,7 +263,7 @@ sal_Int16 SAL_CALL AccessibleSlideSorterView::getAccessibleRole (void) return nRole; } -OUString SAL_CALL AccessibleSlideSorterView::getAccessibleDescription (void) +OUString SAL_CALL AccessibleSlideSorterView::getAccessibleDescription() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -272,7 +272,7 @@ OUString SAL_CALL AccessibleSlideSorterView::getAccessibleDescription (void) return SD_RESSTR(SID_SD_A11Y_I_SLIDEVIEW_D); } -OUString SAL_CALL AccessibleSlideSorterView::getAccessibleName (void) +OUString SAL_CALL AccessibleSlideSorterView::getAccessibleName() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -282,14 +282,14 @@ OUString SAL_CALL AccessibleSlideSorterView::getAccessibleName (void) } Reference<XAccessibleRelationSet> SAL_CALL - AccessibleSlideSorterView::getAccessibleRelationSet (void) + AccessibleSlideSorterView::getAccessibleRelationSet() throw (uno::RuntimeException, std::exception) { return Reference<XAccessibleRelationSet>(); } Reference<XAccessibleStateSet > SAL_CALL - AccessibleSlideSorterView::getAccessibleStateSet (void) + AccessibleSlideSorterView::getAccessibleStateSet() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -313,7 +313,7 @@ Reference<XAccessibleStateSet > SAL_CALL return pStateSet; } -lang::Locale SAL_CALL AccessibleSlideSorterView::getLocale (void) +lang::Locale SAL_CALL AccessibleSlideSorterView::getLocale() throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) { @@ -409,7 +409,7 @@ Reference<XAccessible> SAL_CALL return xAccessible; } -awt::Rectangle SAL_CALL AccessibleSlideSorterView::getBounds (void) +awt::Rectangle SAL_CALL AccessibleSlideSorterView::getBounds() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -430,7 +430,7 @@ awt::Rectangle SAL_CALL AccessibleSlideSorterView::getBounds (void) return aBBox; } -awt::Point SAL_CALL AccessibleSlideSorterView::getLocation (void) +awt::Point SAL_CALL AccessibleSlideSorterView::getLocation() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -472,7 +472,7 @@ awt::Point SAL_CALL AccessibleSlideSorterView::getLocationOnScreen() return aLocationOnScreen; } -awt::Size SAL_CALL AccessibleSlideSorterView::getSize (void) +awt::Size SAL_CALL AccessibleSlideSorterView::getSize() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -488,7 +488,7 @@ awt::Size SAL_CALL AccessibleSlideSorterView::getSize (void) return aSize; } -void SAL_CALL AccessibleSlideSorterView::grabFocus (void) +void SAL_CALL AccessibleSlideSorterView::grabFocus() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -498,7 +498,7 @@ void SAL_CALL AccessibleSlideSorterView::grabFocus (void) mpContentWindow->GrabFocus(); } -sal_Int32 SAL_CALL AccessibleSlideSorterView::getForeground (void) +sal_Int32 SAL_CALL AccessibleSlideSorterView::getForeground() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -507,7 +507,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterView::getForeground (void) return static_cast<sal_Int32>(nColor); } -sal_Int32 SAL_CALL AccessibleSlideSorterView::getBackground (void) +sal_Int32 SAL_CALL AccessibleSlideSorterView::getBackground() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -549,7 +549,7 @@ sal_Bool SAL_CALL AccessibleSlideSorterView::isAccessibleChildSelected (sal_Int3 return bIsSelected; } -void SAL_CALL AccessibleSlideSorterView::clearAccessibleSelection (void) +void SAL_CALL AccessibleSlideSorterView::clearAccessibleSelection() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -558,7 +558,7 @@ void SAL_CALL AccessibleSlideSorterView::clearAccessibleSelection (void) mrSlideSorter.GetController().GetPageSelector().DeselectAllPages(); } -void SAL_CALL AccessibleSlideSorterView::selectAllAccessibleChildren (void) +void SAL_CALL AccessibleSlideSorterView::selectAllAccessibleChildren() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -567,7 +567,7 @@ void SAL_CALL AccessibleSlideSorterView::selectAllAccessibleChildren (void) mrSlideSorter.GetController().GetPageSelector().SelectAllPages(); } -sal_Int32 SAL_CALL AccessibleSlideSorterView::getSelectedAccessibleChildCount (void) +sal_Int32 SAL_CALL AccessibleSlideSorterView::getSelectedAccessibleChildCount() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -620,7 +620,7 @@ void SAL_CALL AccessibleSlideSorterView::deselectAccessibleChild (sal_Int32 nChi //===== XServiceInfo ======================================================== OUString SAL_CALL - AccessibleSlideSorterView::getImplementationName (void) + AccessibleSlideSorterView::getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString("AccessibleSlideSorterView"); @@ -633,7 +633,7 @@ sal_Bool SAL_CALL AccessibleSlideSorterView::supportsService (const OUString& sS } uno::Sequence< OUString> SAL_CALL - AccessibleSlideSorterView::getSupportedServiceNames (void) + AccessibleSlideSorterView::getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -646,7 +646,7 @@ uno::Sequence< OUString> SAL_CALL return uno::Sequence<OUString> (sServiceNames, 3); } -void AccessibleSlideSorterView::ThrowIfDisposed (void) +void AccessibleSlideSorterView::ThrowIfDisposed() throw (lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) @@ -657,7 +657,7 @@ void AccessibleSlideSorterView::ThrowIfDisposed (void) } } -bool AccessibleSlideSorterView::IsDisposed (void) +bool AccessibleSlideSorterView::IsDisposed() { return (rBHelper.bDisposed || rBHelper.bInDispose); } @@ -684,7 +684,7 @@ AccessibleSlideSorterView::Implementation::Implementation ( UpdateChildren(); } -AccessibleSlideSorterView::Implementation::~Implementation (void) +AccessibleSlideSorterView::Implementation::~Implementation() { if (mnUpdateChildrenUserEventId != 0) Application::RemoveUserEvent(mnUpdateChildrenUserEventId); @@ -694,7 +694,7 @@ AccessibleSlideSorterView::Implementation::~Implementation (void) Clear(); } -void AccessibleSlideSorterView::Implementation::RequestUpdateChildren (void) +void AccessibleSlideSorterView::Implementation::RequestUpdateChildren() { if (mnUpdateChildrenUserEventId == 0) mnUpdateChildrenUserEventId = Application::PostUserEvent( @@ -702,7 +702,7 @@ void AccessibleSlideSorterView::Implementation::RequestUpdateChildren (void) UpdateChildrenCallback)); } -void AccessibleSlideSorterView::Implementation::UpdateChildren (void) +void AccessibleSlideSorterView::Implementation::UpdateChildren() { //By default, all children should be accessible. So here workaround is to make all children visible. // MT: THis was in UpdateVisibility, which has some similarity, and hg merge automatically has put it here. Correct?! @@ -734,7 +734,7 @@ void AccessibleSlideSorterView::Implementation::UpdateChildren (void) GetAccessibleChild(nIndex); } -void AccessibleSlideSorterView::Implementation::Clear (void) +void AccessibleSlideSorterView::Implementation::Clear() { PageObjectList::iterator iPageObject; PageObjectList::iterator iEnd = maPageObjects.end(); @@ -754,7 +754,7 @@ void AccessibleSlideSorterView::Implementation::Clear (void) maPageObjects.clear(); } -sal_Int32 AccessibleSlideSorterView::Implementation::GetVisibleChildCount (void) const +sal_Int32 AccessibleSlideSorterView::Implementation::GetVisibleChildCount() const { if (mnFirstVisibleChild<=mnLastVisibleChild && mnFirstVisibleChild>=0) return mnLastVisibleChild - mnFirstVisibleChild + 1; @@ -806,7 +806,7 @@ AccessibleSlideSorterObject* AccessibleSlideSorterView::Implementation::GetAcces return pChild; } -void AccessibleSlideSorterView::Implementation::ConnectListeners (void) +void AccessibleSlideSorterView::Implementation::ConnectListeners() { StartListening (*mrSlideSorter.GetModel().GetDocument()); if (mrSlideSorter.GetViewShell() != NULL) @@ -825,7 +825,7 @@ void AccessibleSlideSorterView::Implementation::ConnectListeners (void) LINK(this,AccessibleSlideSorterView::Implementation,VisibilityChangeListener)); } -void AccessibleSlideSorterView::Implementation::ReleaseListeners (void) +void AccessibleSlideSorterView::Implementation::ReleaseListeners() { mrSlideSorter.GetController().GetFocusManager().RemoveFocusChangeListener( LINK(this,AccessibleSlideSorterView::Implementation,FocusChangeListener)); @@ -882,7 +882,7 @@ void AccessibleSlideSorterView::Implementation::Notify ( } } -void AccessibleSlideSorterView::SwitchViewActivated (void) +void AccessibleSlideSorterView::SwitchViewActivated() { // Firstly, set focus to view this->FireAccessibleEvent(AccessibleEventId::STATE_CHANGED, diff --git a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx index ea1fb773a277..f110a6b676af 100644 --- a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx +++ b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx @@ -50,17 +50,17 @@ AccessibleViewForwarder::AccessibleViewForwarder (SdrPaintView* pView, OutputDev } } -AccessibleViewForwarder::~AccessibleViewForwarder (void) +AccessibleViewForwarder::~AccessibleViewForwarder() { // empty } -bool AccessibleViewForwarder::IsValid (void) const +bool AccessibleViewForwarder::IsValid() const { return true; } -Rectangle AccessibleViewForwarder::GetVisibleArea (void) const +Rectangle AccessibleViewForwarder::GetVisibleArea() const { Rectangle aVisibleArea; diff --git a/sd/source/ui/accessibility/SdShapeTypes.cxx b/sd/source/ui/accessibility/SdShapeTypes.cxx index 3dfbab2f0c75..75ef2c14897f 100644 --- a/sd/source/ui/accessibility/SdShapeTypes.cxx +++ b/sd/source/ui/accessibility/SdShapeTypes.cxx @@ -58,7 +58,7 @@ AccessibleShape* } } -void RegisterImpressShapeTypes (void) +void RegisterImpressShapeTypes() { /** List of shape type descriptors corresponding to the <type>SdShapeTypes</type> enum. diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx index b28f4cf138c5..66301bb6f830 100644 --- a/sd/source/ui/animations/CustomAnimationList.hxx +++ b/sd/source/ui/animations/CustomAnimationList.hxx @@ -71,7 +71,7 @@ public: virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; - virtual PopupMenu* CreateContextMenu( void ) SAL_OVERRIDE; + virtual PopupMenu* CreateContextMenu() SAL_OVERRIDE; virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) SAL_OVERRIDE; virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index f327dc95bfc5..1e4cb028cb4e 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -803,7 +803,7 @@ void CustomAnimationPane::DataChanged (const DataChangedEvent& rEvent) UpdateLook(); } -void CustomAnimationPane::UpdateLook (void) +void CustomAnimationPane::UpdateLook() { const Wallpaper aBackground ( ::sfx2::sidebar::Theme::GetWallpaper( @@ -2199,7 +2199,7 @@ void CustomAnimationPane::onSelect() markShapesFromSelectedEffects(); } -const CustomAnimationPresets& CustomAnimationPane::getPresets (void) +const CustomAnimationPresets& CustomAnimationPane::getPresets() { if (mpCustomAnimationPresets == NULL) mpCustomAnimationPresets = &CustomAnimationPresets::getCustomAnimationPresets(); diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx index 0cbd137a1441..57d10c613611 100644 --- a/sd/source/ui/animations/CustomAnimationPane.hxx +++ b/sd/source/ui/animations/CustomAnimationPane.hxx @@ -113,7 +113,7 @@ private: ::com::sun::star::uno::Any getProperty1Value( sal_Int32 nType, CustomAnimationEffectPtr pEffect ); bool setProperty1Value( sal_Int32 nType, CustomAnimationEffectPtr pEffect, const ::com::sun::star::uno::Any& rValue ); - void UpdateLook (void); + void UpdateLook(); DECL_LINK( implControlHdl, Control* ); DECL_LINK(implPropertyHdl, void *); @@ -168,7 +168,7 @@ private: /** This method initializes the mpCustomAnimationPresets on demand and returns a reference to the list. */ - const CustomAnimationPresets& getPresets (void); + const CustomAnimationPresets& getPresets(); MotionPathTagVector maMotionPathTags; diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index 7548ad9e0b88..47b98b6dc326 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -493,7 +493,7 @@ void SlideTransitionPane::DataChanged (const DataChangedEvent& rEvent) UpdateLook(); } -void SlideTransitionPane::UpdateLook (void) +void SlideTransitionPane::UpdateLook() { SetBackground(::sfx2::sidebar::Theme::GetWallpaper(::sfx2::sidebar::Theme::Paint_PanelBackground)); mpFT_SPEED->SetBackground(Wallpaper()); @@ -510,7 +510,7 @@ void SlideTransitionPane::onChangeCurrentPage() updateControls(); } -::sd::slidesorter::SharedPageSelection SlideTransitionPane::getSelectedPages (void) const +::sd::slidesorter::SharedPageSelection SlideTransitionPane::getSelectedPages() const { ::sd::slidesorter::SlideSorterViewShell * pSlideSorterViewShell = ::sd::slidesorter::SlideSorterViewShell::GetSlideSorter(mrBase); diff --git a/sd/source/ui/animations/SlideTransitionPane.hxx b/sd/source/ui/animations/SlideTransitionPane.hxx index a75ca210a19c..3bb556d74112 100644 --- a/sd/source/ui/animations/SlideTransitionPane.hxx +++ b/sd/source/ui/animations/SlideTransitionPane.hxx @@ -82,9 +82,9 @@ private: void addListener(); void removeListener(); - ::sd::slidesorter::SharedPageSelection getSelectedPages (void) const; + ::sd::slidesorter::SharedPageSelection getSelectedPages() const; - void UpdateLook (void); + void UpdateLook(); DECL_LINK( ApplyToAllButtonClicked, void * ); DECL_LINK( PlayButtonClicked, void * ); diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index 24ce6a43e0e5..9129ca8f952b 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -505,7 +505,7 @@ IMPL_LINK_NOARG(AnnotationWindow, ModifyHdl) return 0; } -SvxLanguageItem AnnotationWindow::GetLanguage(void) +SvxLanguageItem AnnotationWindow::GetLanguage() { return SvxLanguageItem( Doc()->GetLanguage( EE_CHAR_LANGUAGE ), SID_ATTR_LANGUAGE ); } diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx index ed2c13ee39d6..f8adcdf99a81 100644 --- a/sd/source/ui/annotations/annotationwindow.hxx +++ b/sd/source/ui/annotations/annotationwindow.hxx @@ -105,7 +105,7 @@ class AnnotationWindow : public FloatingWindow void StartEdit(); - SvxLanguageItem GetLanguage(void); + SvxLanguageItem GetLanguage(); void setAnnotation( const ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation, bool bGrabFocus = false ); const ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& getAnnotation() const { return mxAnnotation; } diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index 65108f1bffee..c7bebb074c29 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -80,7 +80,7 @@ public: ::sd::ViewShellBase& rBase, SdDrawDocument& rDocument, SvLockBytes& rBytes); - virtual ~OutlineToImpressFinalizer (void) {}; + virtual ~OutlineToImpressFinalizer() {}; void operator() (bool bEventSeen); private: ::sd::ViewShellBase& mrBase; diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index 0bd42e937b44..283544f8aa99 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -744,7 +744,7 @@ void SdTransferable::AddUserData (const ::boost::shared_ptr<UserData>& rpData) maUserData.push_back(rpData); } -sal_Int32 SdTransferable::GetUserDataCount (void) const +sal_Int32 SdTransferable::GetUserDataCount() const { return maUserData.size(); } diff --git a/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx index 98df417636ce..8b6875284bb8 100644 --- a/sd/source/ui/dlg/LayerTabBar.cxx +++ b/sd/source/ui/dlg/LayerTabBar.cxx @@ -287,13 +287,13 @@ void LayerTabBar::ActivatePage() } } -void LayerTabBar::SendActivatePageEvent (void) +void LayerTabBar::SendActivatePageEvent() { CallEventListeners (VCLEVENT_TABBAR_PAGEACTIVATED, reinterpret_cast<void*>(GetCurPageId())); } -void LayerTabBar::SendDeactivatePageEvent (void) +void LayerTabBar::SendDeactivatePageEvent() { CallEventListeners (VCLEVENT_TABBAR_PAGEDEACTIVATED, reinterpret_cast<void*>(GetCurPageId())); diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx b/sd/source/ui/dlg/PaneChildWindows.cxx index 15908461a011..364a4dc47b4b 100644 --- a/sd/source/ui/dlg/PaneChildWindows.cxx +++ b/sd/source/ui/dlg/PaneChildWindows.cxx @@ -72,7 +72,7 @@ PaneChildWindow::PaneChildWindow ( } } -PaneChildWindow::~PaneChildWindow (void) +PaneChildWindow::~PaneChildWindow() { ViewShellBase* pBase = NULL; PaneDockingWindow* pDockingWindow = dynamic_cast<PaneDockingWindow*>(pWindow); diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx b/sd/source/ui/dlg/PaneDockingWindow.cxx index 4a38a10341a4..4947dd78f088 100644 --- a/sd/source/ui/dlg/PaneDockingWindow.cxx +++ b/sd/source/ui/dlg/PaneDockingWindow.cxx @@ -46,7 +46,7 @@ PaneDockingWindow::PaneDockingWindow( SetSizePixel(LogicToPixel(Size(80,200), MAP_APPFONT)); } -PaneDockingWindow::~PaneDockingWindow (void) +PaneDockingWindow::~PaneDockingWindow() { } @@ -116,7 +116,7 @@ void PaneDockingWindow::SetValidSizeRange (const Range& rValidSizeRange) } } -PaneDockingWindow::Orientation PaneDockingWindow::GetOrientation (void) const +PaneDockingWindow::Orientation PaneDockingWindow::GetOrientation() const { SplitWindow* pSplitWindow = dynamic_cast<SplitWindow*>(GetParent()); if (pSplitWindow == NULL) diff --git a/sd/source/ui/dlg/PaneShells.cxx b/sd/source/ui/dlg/PaneShells.cxx index ce6c512484cb..cd2b3c48ffc4 100644 --- a/sd/source/ui/dlg/PaneShells.cxx +++ b/sd/source/ui/dlg/PaneShells.cxx @@ -45,13 +45,13 @@ void LeftImpressPaneShell::InitInterface_Impl() TYPEINIT1(LeftImpressPaneShell, SfxShell); -LeftImpressPaneShell::LeftImpressPaneShell (void) +LeftImpressPaneShell::LeftImpressPaneShell() : SfxShell() { SetName(OUString("LeftImpressPane")); } -LeftImpressPaneShell::~LeftImpressPaneShell (void) +LeftImpressPaneShell::~LeftImpressPaneShell() { } @@ -71,13 +71,13 @@ void LeftDrawPaneShell::InitInterface_Impl() TYPEINIT1(LeftDrawPaneShell, SfxShell); -LeftDrawPaneShell::LeftDrawPaneShell (void) +LeftDrawPaneShell::LeftDrawPaneShell() : SfxShell() { SetName(OUString("LeftDrawPane")); } -LeftDrawPaneShell::~LeftDrawPaneShell (void) +LeftDrawPaneShell::~LeftDrawPaneShell() { } diff --git a/sd/source/ui/dlg/SpellDialogChildWindow.cxx b/sd/source/ui/dlg/SpellDialogChildWindow.cxx index daf0aaaa4541..e3b6c961f99d 100644 --- a/sd/source/ui/dlg/SpellDialogChildWindow.cxx +++ b/sd/source/ui/dlg/SpellDialogChildWindow.cxx @@ -49,7 +49,7 @@ SpellDialogChildWindow::SpellDialogChildWindow ( ProvideOutliner(); } -SpellDialogChildWindow::~SpellDialogChildWindow (void) +SpellDialogChildWindow::~SpellDialogChildWindow() { if (mpSdOutliner != NULL) mpSdOutliner->EndSpelling(); @@ -58,12 +58,12 @@ SpellDialogChildWindow::~SpellDialogChildWindow (void) delete mpSdOutliner; } -SfxChildWinInfo SpellDialogChildWindow::GetInfo (void) const +SfxChildWinInfo SpellDialogChildWindow::GetInfo() const { return ::svx::SpellDialogChildWindow::GetInfo(); } -void SpellDialogChildWindow::InvalidateSpellDialog (void) +void SpellDialogChildWindow::InvalidateSpellDialog() { ::svx::SpellDialogChildWindow::InvalidateSpellDialog(); } @@ -106,7 +106,7 @@ void SpellDialogChildWindow::ApplyChangedSentence ( } } -void SpellDialogChildWindow::GetFocus (void) +void SpellDialogChildWindow::GetFocus() { // In order to detect a cursor movement we could compare the // currently selected text shape with the one that was selected @@ -119,7 +119,7 @@ void SpellDialogChildWindow::LoseFocus() { } -void SpellDialogChildWindow::ProvideOutliner (void) +void SpellDialogChildWindow::ProvideOutliner() { ViewShellBase* pViewShellBase = PTR_CAST (ViewShellBase, SfxViewShell::Current()); diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx index 3e43b1923ccd..0416c639c476 100644 --- a/sd/source/ui/dlg/TemplateScanner.cxx +++ b/sd/source/ui/dlg/TemplateScanner.cxx @@ -165,7 +165,7 @@ class TemplateScanner::FolderDescriptorList { }; -TemplateScanner::TemplateScanner (void) +TemplateScanner::TemplateScanner() : meState(INITIALIZE_SCANNING), maFolderContent(), mpTemplateDirectory(NULL), @@ -182,7 +182,7 @@ TemplateScanner::TemplateScanner (void) // empty; } -TemplateScanner::~TemplateScanner (void) +TemplateScanner::~TemplateScanner() { mpFolderDescriptors.reset(); @@ -194,7 +194,7 @@ TemplateScanner::~TemplateScanner (void) delete *I; } -TemplateScanner::State TemplateScanner::GetTemplateRoot (void) +TemplateScanner::State TemplateScanner::GetTemplateRoot() { State eNextState (INITIALIZE_FOLDER_SCANNING); @@ -205,7 +205,7 @@ TemplateScanner::State TemplateScanner::GetTemplateRoot (void) return eNextState; } -TemplateScanner::State TemplateScanner::InitializeEntryScanning (void) +TemplateScanner::State TemplateScanner::InitializeEntryScanning() { State eNextState (SCAN_ENTRY); @@ -231,7 +231,7 @@ TemplateScanner::State TemplateScanner::InitializeEntryScanning (void) return eNextState; } -TemplateScanner::State TemplateScanner::ScanEntry (void) +TemplateScanner::State TemplateScanner::ScanEntry() { State eNextState (ERROR); @@ -290,7 +290,7 @@ TemplateScanner::State TemplateScanner::ScanEntry (void) return eNextState; } -TemplateScanner::State TemplateScanner::InitializeFolderScanning (void) +TemplateScanner::State TemplateScanner::InitializeFolderScanning() { State eNextState (ERROR); @@ -322,7 +322,7 @@ TemplateScanner::State TemplateScanner::InitializeFolderScanning (void) return eNextState; } -TemplateScanner::State TemplateScanner::GatherFolderList (void) +TemplateScanner::State TemplateScanner::GatherFolderList() { State eNextState (ERROR); @@ -354,7 +354,7 @@ TemplateScanner::State TemplateScanner::GatherFolderList (void) return eNextState; } -TemplateScanner::State TemplateScanner::ScanFolder (void) +TemplateScanner::State TemplateScanner::ScanFolder() { State eNextState (ERROR); @@ -386,13 +386,13 @@ TemplateScanner::State TemplateScanner::ScanFolder (void) return eNextState; } -void TemplateScanner::Scan (void) +void TemplateScanner::Scan() { while (HasNextStep()) RunNextStep(); } -void TemplateScanner::RunNextStep (void) +void TemplateScanner::RunNextStep() { switch (meState) { @@ -440,7 +440,7 @@ void TemplateScanner::RunNextStep (void) } } -bool TemplateScanner::HasNextStep (void) +bool TemplateScanner::HasNextStep() { switch (meState) { diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index 9a41a1235d2c..98df35d60900 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -95,9 +95,9 @@ class NextButton public: NextButton (vcl::Window* pParent); - void ForceFocusEventBroadcast (void); + void ForceFocusEventBroadcast(); void SetClickHdl (const Link& rLink); - bool IsEnabled (void); + bool IsEnabled(); void Enable (bool bEnable); private: @@ -123,7 +123,7 @@ public: /** Extract form the history list of recently used files the impress files and insert them into a listbox. */ - void ScanDocmenu (void); + void ScanDocmenu(); /** Flag that is set to sal_True after the recently used files have been scanned. */ @@ -136,7 +136,7 @@ public: <member>maPresentList</member>. Note that the first call to this method after installing a new Office may take some time. */ - void ProvideTemplates (void); + void ProvideTemplates(); /** This method transfers the template folders from the template scanner to the internal structures of this class. On termination it sets @@ -683,7 +683,7 @@ void AssistentDlgImpl::EndDialog( long ) mpWindow = NULL; } -void AssistentDlgImpl::ScanDocmenu (void) +void AssistentDlgImpl::ScanDocmenu() { if( mbRecentDocumentsReady ) return; @@ -761,7 +761,7 @@ void AssistentDlgImpl::ScanDocmenu (void) } } -void AssistentDlgImpl::ProvideTemplates (void) +void AssistentDlgImpl::ProvideTemplates() { if ( ! mbTemplatesReady) { @@ -1836,7 +1836,7 @@ NextButton::NextButton (vcl::Window* pParent) : mpNextButton2->Hide(); } -void NextButton::ForceFocusEventBroadcast (void) +void NextButton::ForceFocusEventBroadcast() { // Hide the currently visible button and show and focus the other one. if (mbIsFirstButtonActive) @@ -1863,7 +1863,7 @@ void NextButton::SetClickHdl (const Link& rLink) mpNextButton2->SetClickHdl(rLink); } -bool NextButton::IsEnabled (void) +bool NextButton::IsEnabled() { // Because the buttons are both either enabled or disabled, it is // sufficient to ask one to determine the state. diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index a0358f4c379f..2599f3be7c65 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -60,7 +60,7 @@ using namespace com::sun::star; class SdPageObjsTLB::IconProvider { public: - IconProvider (void); + IconProvider(); // Regular icons. Image maImgPage; @@ -1600,7 +1600,7 @@ void SdPageObjsTLB::AddShapeToTransferable ( //===== IconProvider ========================================================== -SdPageObjsTLB::IconProvider::IconProvider (void) +SdPageObjsTLB::IconProvider::IconProvider() : maImgPage( BitmapEx( SdResId( BMP_PAGE ) ) ), maImgPageExcl( BitmapEx( SdResId( BMP_PAGE_EXCLUDED ) ) ), maImgPageObjsExcl( BitmapEx( SdResId( BMP_PAGEOBJS_EXCLUDED ) ) ), diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index 9065e1ebe922..66eaeeb73030 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -509,7 +509,7 @@ IMPL_LINK_NOARG(SdTpOptionsMisc, SelectMetricHdl_Impl) return 0; } -void SdTpOptionsMisc::SetImpressMode (void) +void SdTpOptionsMisc::SetImpressMode() { #ifndef ENABLE_SDREMOTE_BLUETOOTH m_pCbxEnableSdremote->Hide(); @@ -570,7 +570,7 @@ bool SdTpOptionsMisc::SetScale( const OUString& aScale, sal_Int32& rX, sal_Int32 return true; } -void SdTpOptionsMisc::UpdateCompatibilityControls (void) +void SdTpOptionsMisc::UpdateCompatibilityControls() { // Disable the compatibility controls by default. Enable them only when // there is at least one open document. diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index 4232b3f70f5b..2705eaed58b6 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -1112,7 +1112,7 @@ void DrawDocShell::FillClass(SvGlobalName* pClassName, STR_GRAPHIC_DOCUMENT : STR_IMPRESS_DOCUMENT )); } -OutputDevice* DrawDocShell::GetDocumentRefDev (void) +OutputDevice* DrawDocShell::GetDocumentRefDev() { OutputDevice* pReferenceDevice = SfxObjectShell::GetDocumentRefDev (); // Only when our parent does not have a reference device then we return diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueue.cxx b/sd/source/ui/framework/configuration/ChangeRequestQueue.cxx index 4758f5ab828f..f41f4e7417ff 100644 --- a/sd/source/ui/framework/configuration/ChangeRequestQueue.cxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueue.cxx @@ -21,7 +21,7 @@ namespace sd { namespace framework { -ChangeRequestQueue::ChangeRequestQueue (void) +ChangeRequestQueue::ChangeRequestQueue() { } diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx b/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx index a9fbae6a5d8f..2792539b389e 100644 --- a/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx @@ -37,7 +37,7 @@ class ChangeRequestQueue public: /** Create an empty queue. */ - ChangeRequestQueue (void); + ChangeRequestQueue(); }; } } // end of namespace sd::framework diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx index 15a472007b5a..a8cf31ee5cd1 100644 --- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx @@ -62,7 +62,7 @@ ChangeRequestQueueProcessor::ChangeRequestQueueProcessor ( { } -ChangeRequestQueueProcessor::~ChangeRequestQueueProcessor (void) +ChangeRequestQueueProcessor::~ChangeRequestQueueProcessor() { if (mnUserEventId != 0) Application::RemoveUserEvent(mnUserEventId); @@ -97,7 +97,7 @@ void ChangeRequestQueueProcessor::AddRequest ( StartProcessing(); } -void ChangeRequestQueueProcessor::StartProcessing (void) +void ChangeRequestQueueProcessor::StartProcessing() { ::osl::MutexGuard aGuard (maMutex); @@ -130,7 +130,7 @@ IMPL_LINK(ChangeRequestQueueProcessor, ProcessEvent, void*, pUnused) return 0; } -void ChangeRequestQueueProcessor::ProcessOneEvent (void) +void ChangeRequestQueueProcessor::ProcessOneEvent() { ::osl::MutexGuard aGuard (maMutex); @@ -169,18 +169,18 @@ void ChangeRequestQueueProcessor::ProcessOneEvent (void) } } -bool ChangeRequestQueueProcessor::IsEmpty (void) const +bool ChangeRequestQueueProcessor::IsEmpty() const { return maQueue.empty(); } -void ChangeRequestQueueProcessor::ProcessUntilEmpty (void) +void ChangeRequestQueueProcessor::ProcessUntilEmpty() { while ( ! IsEmpty()) ProcessOneEvent(); } -void ChangeRequestQueueProcessor::Clear (void) +void ChangeRequestQueueProcessor::Clear() { ::osl::MutexGuard aGuard (maMutex); maQueue.clear(); diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx index d58b1a676422..fa3b4d456b9c 100644 --- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx @@ -57,7 +57,7 @@ public: ChangeRequestQueueProcessor ( const ::rtl::Reference<ConfigurationController>& rxController, const ::boost::shared_ptr<ConfigurationUpdater>& rpUpdater); - ~ChangeRequestQueueProcessor (void); + ~ChangeRequestQueueProcessor(); /** Sets the configuration who will be changed by subsequent change requests. This method should be called only by the configuration @@ -76,25 +76,25 @@ public: /** Returns </sal_True> when the queue is empty. */ - bool IsEmpty (void) const; + bool IsEmpty() const; /** Process all events in the queue synchronously. <p>This method is typically called when the framework is shut down to establish an empty configuration.</p> */ - void ProcessUntilEmpty (void); + void ProcessUntilEmpty(); /** Process the first event in queue. */ - void ProcessOneEvent (void); + void ProcessOneEvent(); /** Remove all events from the queue. <p>This method is typically called when the framework is shut down to avoid the processing of still pending activation requests.</p> */ - void Clear (void); + void Clear(); private: mutable ::osl::Mutex maMutex; @@ -117,7 +117,7 @@ private: /** Initiate the processing of the entries in the queue. The actual processing starts asynchronously. */ - void StartProcessing (void); + void StartProcessing(); /** Callback function for the PostUserEvent() call. */ diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx index b25a33d0bb21..f64bcd5f9346 100644 --- a/sd/source/ui/framework/configuration/Configuration.cxx +++ b/sd/source/ui/framework/configuration/Configuration.cxx @@ -50,7 +50,7 @@ class Configuration::ResourceContainer : public ::std::set<Reference<XResourceId>, XResourceIdLess> { public: - ResourceContainer (void) {} + ResourceContainer() {} }; //===== Configuration ========================================================= @@ -76,11 +76,11 @@ Configuration::Configuration ( { } -Configuration::~Configuration (void) +Configuration::~Configuration() { } -void SAL_CALL Configuration::disposing (void) +void SAL_CALL Configuration::disposing() { ::osl::MutexGuard aGuard (maMutex); mpResourceContainer->clear(); @@ -188,7 +188,7 @@ sal_Bool SAL_CALL Configuration::hasResource (const Reference<XResourceId>& rxRe //----- XCloneable ------------------------------------------------------------ -Reference<util::XCloneable> SAL_CALL Configuration::createClone (void) +Reference<util::XCloneable> SAL_CALL Configuration::createClone() throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); @@ -204,7 +204,7 @@ Reference<util::XCloneable> SAL_CALL Configuration::createClone (void) //----- XNamed ---------------------------------------------------------------- -OUString SAL_CALL Configuration::getName (void) +OUString SAL_CALL Configuration::getName() throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); @@ -280,7 +280,7 @@ void Configuration::PostEvent ( } } -void Configuration::ThrowIfDisposed (void) const +void Configuration::ThrowIfDisposed() const throw (::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx index d970b447efd6..50d99322068e 100644 --- a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx @@ -38,7 +38,7 @@ ConfigurationClassifier::ConfigurationClassifier ( { } -bool ConfigurationClassifier::Partition (void) +bool ConfigurationClassifier::Partition() { maC1minusC2.clear(); maC2minusC1.clear(); diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx index b74a4487a946..da7038241e0b 100644 --- a/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx @@ -51,7 +51,7 @@ public: When the two configurations differ then return <TRUE/>. When they are equivalent then return <FALSE/>. */ - bool Partition (void); + bool Partition(); typedef ::std::vector<com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId> > ResourceIdVector; @@ -64,7 +64,7 @@ public: returned. This reference remains valid as long as the called ConfigurationClassifier object stays alive. */ - const ResourceIdVector& GetC1minusC2 (void) const { return maC1minusC2;} + const ResourceIdVector& GetC1minusC2() const { return maC1minusC2;} /** Return the resources that belong to the configuration given as rxConfiguration2 to the constructor but that do not belong to @@ -74,7 +74,7 @@ public: returned. This reference remains valid as long as the called ConfigurationClassifier object stays alive. */ - const ResourceIdVector& GetC2minusC1 (void) const { return maC2minusC1;} + const ResourceIdVector& GetC2minusC1() const { return maC2minusC1;} /** Return the resources that belong to both the configurations that where given to the constructor. @@ -83,7 +83,7 @@ public: returned. This reference remains valid as long as the called ConfigurationClassifier object stays alive. */ - const ResourceIdVector& GetC1andC2 (void) const { return maC1andC2;} + const ResourceIdVector& GetC1andC2() const { return maC1andC2;} void TraceResourceIdVector ( const sal_Char* pMessage, diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx index e0744a417f32..e2ecae03f79d 100644 --- a/sd/source/ui/framework/configuration/ConfigurationController.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx @@ -52,7 +52,7 @@ public: Implementation ( ConfigurationController& rController, const Reference<frame::XController>& rxController); - ~Implementation (void); + ~Implementation(); Reference<XControllerManager> mxControllerManager; @@ -97,7 +97,7 @@ ConfigurationController::Lock::Lock (const Reference<XConfigurationController>& mxController->lock(); } -ConfigurationController::Lock::~Lock (void) +ConfigurationController::Lock::~Lock() { if (mxController.is()) mxController->unlock(); @@ -105,18 +105,18 @@ ConfigurationController::Lock::~Lock (void) //===== ConfigurationController =============================================== -ConfigurationController::ConfigurationController (void) throw() +ConfigurationController::ConfigurationController() throw() : ConfigurationControllerInterfaceBase(MutexOwner::maMutex) , mpImplementation() , mbIsDisposed(false) { } -ConfigurationController::~ConfigurationController (void) throw() +ConfigurationController::~ConfigurationController() throw() { } -void SAL_CALL ConfigurationController::disposing (void) +void SAL_CALL ConfigurationController::disposing() { if (mpImplementation.get() == NULL) return; @@ -148,7 +148,7 @@ void SAL_CALL ConfigurationController::disposing (void) mpImplementation.reset(); } -void ConfigurationController::ProcessEvent (void) +void ConfigurationController::ProcessEvent() { if (mpImplementation.get() != NULL) { @@ -158,7 +158,7 @@ void ConfigurationController::ProcessEvent (void) } } -void ConfigurationController::RequestSynchronousUpdate (void) +void ConfigurationController::RequestSynchronousUpdate() { if (mpImplementation.get() == NULL) return; @@ -217,7 +217,7 @@ void SAL_CALL ConfigurationController::lock() = mpImplementation->mpConfigurationUpdater->GetLock(); } -void SAL_CALL ConfigurationController::unlock (void) +void SAL_CALL ConfigurationController::unlock() throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); @@ -342,7 +342,7 @@ Reference<XResource> SAL_CALL ConfigurationController::getResource ( return aDescriptor.mxResource; } -void SAL_CALL ConfigurationController::update (void) +void SAL_CALL ConfigurationController::update() throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); @@ -361,7 +361,7 @@ void SAL_CALL ConfigurationController::update (void) } } -sal_Bool SAL_CALL ConfigurationController::hasPendingRequests (void) +sal_Bool SAL_CALL ConfigurationController::hasPendingRequests() throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); @@ -380,7 +380,7 @@ void SAL_CALL ConfigurationController::postChangeRequest ( mpImplementation->mpQueueProcessor->AddRequest(rxRequest); } -Reference<XConfiguration> SAL_CALL ConfigurationController::getRequestedConfiguration (void) +Reference<XConfiguration> SAL_CALL ConfigurationController::getRequestedConfiguration() throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); @@ -393,7 +393,7 @@ Reference<XConfiguration> SAL_CALL ConfigurationController::getRequestedConfigur return Reference<XConfiguration>(); } -Reference<XConfiguration> SAL_CALL ConfigurationController::getCurrentConfiguration (void) +Reference<XConfiguration> SAL_CALL ConfigurationController::getCurrentConfiguration() throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); @@ -563,7 +563,7 @@ ConfigurationController::Implementation::Implementation ( mpQueueProcessor->SetConfiguration(mxRequestedConfiguration); } -ConfigurationController::Implementation::~Implementation (void) +ConfigurationController::Implementation::~Implementation() { } diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx index fbe1ed0c13c3..5ee7f9d15780 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx @@ -147,7 +147,7 @@ void ConfigurationControllerBroadcaster::NotifyListeners ( } } -void ConfigurationControllerBroadcaster::DisposeAndClear (void) +void ConfigurationControllerBroadcaster::DisposeAndClear() { lang::EventObject aEvent; aEvent.Source = mxConfigurationController; diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx index 6b801500e070..049a8703ac0b 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx @@ -104,7 +104,7 @@ public: the list of registered listeners is empty. Further calls to RemoveListener() are not necessary but do not result in an error. */ - void DisposeAndClear (void); + void DisposeAndClear(); private: css::uno::Reference< diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx index d7a04442539c..5e0e92864b15 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx @@ -43,7 +43,7 @@ ConfigurationControllerResourceManager::ConfigurationControllerResourceManager ( { } -ConfigurationControllerResourceManager::~ConfigurationControllerResourceManager (void) +ConfigurationControllerResourceManager::~ConfigurationControllerResourceManager() { } diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx index ccfcf3f0bfe8..727365574207 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx @@ -61,7 +61,7 @@ public: const ::boost::shared_ptr<ResourceFactoryManager>& rpResourceFactoryContainer, const ::boost::shared_ptr<ConfigurationControllerBroadcaster>& rpBroadcaster); - ~ConfigurationControllerResourceManager (void); + ~ConfigurationControllerResourceManager(); /** Activate all the resources that are specified by resource ids in rResources. The resource ids of activated resources are added to diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx index 10ea9201038f..5cc3a3a2fad8 100644 --- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx @@ -52,7 +52,7 @@ class ConfigurationUpdaterLock public: ConfigurationUpdaterLock (ConfigurationUpdater& rUpdater) : mrUpdater(rUpdater) { mrUpdater.LockUpdates(); } - ~ConfigurationUpdaterLock(void) { mrUpdater.UnlockUpdates(); } + ~ConfigurationUpdaterLock() { mrUpdater.UnlockUpdates(); } private: ConfigurationUpdater& mrUpdater; }; @@ -82,7 +82,7 @@ ConfigurationUpdater::ConfigurationUpdater ( SetControllerManager(rxControllerManager); } -ConfigurationUpdater::~ConfigurationUpdater (void) +ConfigurationUpdater::~ConfigurationUpdater() { maUpdateTimer.Stop(); } @@ -118,7 +118,7 @@ void ConfigurationUpdater::RequestUpdate ( } } -bool ConfigurationUpdater::IsUpdatePossible (void) +bool ConfigurationUpdater::IsUpdatePossible() { return ! mbUpdateBeingProcessed && mxControllerManager.is() @@ -127,7 +127,7 @@ bool ConfigurationUpdater::IsUpdatePossible (void) && mxCurrentConfiguration.is(); } -void ConfigurationUpdater::UpdateConfiguration (void) +void ConfigurationUpdater::UpdateConfiguration() { SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": UpdateConfiguration update"); SetUpdateBeingProcessed(true); @@ -192,7 +192,7 @@ void ConfigurationUpdater::UpdateConfiguration (void) SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": UpdateConfiguration end"); } -void ConfigurationUpdater::CleanRequestedConfiguration (void) +void ConfigurationUpdater::CleanRequestedConfiguration() { if (mxControllerManager.is()) { @@ -211,7 +211,7 @@ void ConfigurationUpdater::CleanRequestedConfiguration (void) } } -void ConfigurationUpdater::CheckUpdateSuccess (void) +void ConfigurationUpdater::CheckUpdateSuccess() { // When the two configurations differ then start the timer to call // another update later. @@ -341,12 +341,12 @@ void ConfigurationUpdater::CheckPureAnchors ( } } -void ConfigurationUpdater::LockUpdates (void) +void ConfigurationUpdater::LockUpdates() { ++mnLockCount; } -void ConfigurationUpdater::UnlockUpdates (void) +void ConfigurationUpdater::UnlockUpdates() { --mnLockCount; if (mnLockCount == 0 && mbUpdatePending) @@ -355,7 +355,7 @@ void ConfigurationUpdater::UnlockUpdates (void) } } -::boost::shared_ptr<ConfigurationUpdaterLock> ConfigurationUpdater::GetLock (void) +::boost::shared_ptr<ConfigurationUpdaterLock> ConfigurationUpdater::GetLock() { return ::boost::shared_ptr<ConfigurationUpdaterLock>(new ConfigurationUpdaterLock(*this)); } diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx index bde705ff32af..8c25b7575387 100644 --- a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx @@ -53,7 +53,7 @@ public: const ::boost::shared_ptr<ConfigurationControllerResourceManager>& rpResourceManager, const css::uno::Reference< css::drawing::framework::XControllerManager>& rxControllerManager); - ~ConfigurationUpdater (void); + ~ConfigurationUpdater(); /** This method is typically called once, when the controller manager is accessible to the caller. @@ -72,14 +72,14 @@ public: css::drawing::framework::XConfiguration>& rxRequestedConfiguration); css::uno::Reference< - css::drawing::framework::XConfiguration> GetCurrentConfiguration (void) const { return mxCurrentConfiguration;} + css::drawing::framework::XConfiguration> GetCurrentConfiguration() const { return mxCurrentConfiguration;} friend class ConfigurationUpdaterLock; /** Return a lock of the called ConfigurationUpdater. While the returned object exists no update of the current configuration is made. */ - ::boost::shared_ptr<ConfigurationUpdaterLock> GetLock (void); + ::boost::shared_ptr<ConfigurationUpdaterLock> GetLock(); private: /** A reference to the XControllerManager is kept so that @@ -146,7 +146,7 @@ private: and tells them to update their active resources. It notifies listeners about the start and end of the configuration update. */ - void UpdateConfiguration (void); + void UpdateConfiguration(); /** Basically calls UpdaterStart() andUpdateEnd() and makes some debug output. @@ -167,12 +167,12 @@ private: because without the actual resource the 'pureness' of an anchor can not be determined. */ - void CleanRequestedConfiguration (void); + void CleanRequestedConfiguration(); /** Check the success of a recently executed configuration update. When the update failed then start the timer. */ - void CheckUpdateSuccess (void); + void CheckUpdateSuccess(); /** This method sets the mbUpdateBeingProcessed member that is used to prevent reentrance problems. This method allows function objects @@ -185,17 +185,17 @@ private: executed, the lock count, and whether the configuration controller is still valid. */ - bool IsUpdatePossible (void); + bool IsUpdatePossible(); /** Lock updates of the current configuration. For intermediate requests for updates mbUpdatePending is set to <TRUE/>. */ - void LockUpdates (void); + void LockUpdates(); /** When an update was requested since the last LockUpdates() call then RequestUpdate() is called. */ - void UnlockUpdates (void); + void UnlockUpdates(); DECL_LINK(TimeoutHandler, void *); }; diff --git a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx index 6653a3409550..c4f569109684 100644 --- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx +++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx @@ -38,7 +38,7 @@ GenericConfigurationChangeRequest::GenericConfigurationChangeRequest ( throw ::com::sun::star::lang::IllegalArgumentException(); } -GenericConfigurationChangeRequest::~GenericConfigurationChangeRequest (void) throw() +GenericConfigurationChangeRequest::~GenericConfigurationChangeRequest() throw() { } @@ -61,7 +61,7 @@ void SAL_CALL GenericConfigurationChangeRequest::execute ( } } -OUString SAL_CALL GenericConfigurationChangeRequest::getName (void) +OUString SAL_CALL GenericConfigurationChangeRequest::getName() throw (RuntimeException, std::exception) { return "GenericConfigurationChangeRequest " diff --git a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx index 1eb507da9f30..36bdacdb34a9 100644 --- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx +++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx @@ -70,7 +70,7 @@ public: const Mode eMode) throw (::com::sun::star::lang::IllegalArgumentException); - virtual ~GenericConfigurationChangeRequest (void) throw(); + virtual ~GenericConfigurationChangeRequest() throw(); // XConfigurationChangeOperation @@ -91,7 +91,7 @@ public: /** Return a human readable string representation. This is used for debugging purposes. */ - virtual OUString SAL_CALL getName (void) + virtual OUString SAL_CALL getName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** This call is ignored because the XNamed interface is (mis)used to diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx index 7602b0847cdb..e3a7cd911783 100644 --- a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx +++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx @@ -48,7 +48,7 @@ ResourceFactoryManager::ResourceFactoryManager (const Reference<XControllerManag mxURLTransformer = util::URLTransformer::create(xContext); } -ResourceFactoryManager::~ResourceFactoryManager (void) +ResourceFactoryManager::~ResourceFactoryManager() { Reference<lang::XComponent> xComponent (mxURLTransformer, UNO_QUERY); if (xComponent.is()) diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx index 3087051118f1..dcb24835f1fc 100644 --- a/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx +++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx @@ -42,7 +42,7 @@ public: ResourceFactoryManager ( const css::uno::Reference<css::drawing::framework::XControllerManager>& rxManager); - ~ResourceFactoryManager (void); + ~ResourceFactoryManager(); /** Register a resource factory for one type of resource. @param rsURL diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx index 1aef100bf4c7..3f343c989069 100644 --- a/sd/source/ui/framework/configuration/ResourceId.cxx +++ b/sd/source/ui/framework/configuration/ResourceId.cxx @@ -47,7 +47,7 @@ namespace sd { namespace framework { WeakReference<util::XURLTransformer> ResourceId::mxURLTransformerWeak; -ResourceId::ResourceId (void) +ResourceId::ResourceId() : ResourceIdInterfaceBase(), maResourceURLs(0), mpURL() @@ -102,13 +102,13 @@ ResourceId::ResourceId ( ParseResourceURL(); } -ResourceId::~ResourceId (void) +ResourceId::~ResourceId() { mpURL.reset(); } OUString SAL_CALL - ResourceId::getResourceURL (void) + ResourceId::getResourceURL() throw(com::sun::star::uno::RuntimeException, std::exception) { if (!maResourceURLs.empty()) @@ -118,7 +118,7 @@ OUString SAL_CALL } util::URL SAL_CALL - ResourceId::getFullResourceURL (void) + ResourceId::getFullResourceURL() throw(com::sun::star::uno::RuntimeException, std::exception) { if (mpURL.get() != NULL) @@ -140,14 +140,14 @@ util::URL SAL_CALL } sal_Bool SAL_CALL - ResourceId::hasAnchor (void) + ResourceId::hasAnchor() throw (RuntimeException, std::exception) { return maResourceURLs.size()>1; } Reference<XResourceId> SAL_CALL - ResourceId::getAnchor (void) + ResourceId::getAnchor() throw (RuntimeException, std::exception) { ::rtl::Reference<ResourceId> rResourceId (new ResourceId()); @@ -162,7 +162,7 @@ Reference<XResourceId> SAL_CALL } Sequence<OUString> SAL_CALL - ResourceId::getAnchorURLs (void) + ResourceId::getAnchorURLs() throw (RuntimeException, std::exception) { const sal_Int32 nAnchorCount (maResourceURLs.size() - 1); @@ -178,7 +178,7 @@ Sequence<OUString> SAL_CALL } OUString SAL_CALL - ResourceId::getResourceTypePrefix (void) + ResourceId::getResourceTypePrefix() throw (RuntimeException, std::exception) { if (!maResourceURLs.empty() ) @@ -361,7 +361,7 @@ sal_Bool SAL_CALL } Reference<XResourceId> SAL_CALL - ResourceId::clone (void) + ResourceId::clone() throw(RuntimeException, std::exception) { return new ResourceId(maResourceURLs); @@ -492,7 +492,7 @@ bool ResourceId::IsBoundToAnchor ( return true; } -void ResourceId::ParseResourceURL (void) +void ResourceId::ParseResourceURL() { ::osl::Guard< ::osl::Mutex > aGuard (::osl::Mutex::getGlobalMutex()); Reference<util::XURLTransformer> xURLTransformer (mxURLTransformerWeak); diff --git a/sd/source/ui/framework/configuration/UpdateRequest.cxx b/sd/source/ui/framework/configuration/UpdateRequest.cxx index 332c8a25b5f6..10142f9b1501 100644 --- a/sd/source/ui/framework/configuration/UpdateRequest.cxx +++ b/sd/source/ui/framework/configuration/UpdateRequest.cxx @@ -27,13 +27,13 @@ using namespace ::com::sun::star::drawing::framework; namespace sd { namespace framework { -UpdateRequest::UpdateRequest (void) +UpdateRequest::UpdateRequest() throw() : UpdateRequestInterfaceBase(MutexOwner::maMutex) { } -UpdateRequest::~UpdateRequest (void) throw() +UpdateRequest::~UpdateRequest() throw() { } @@ -45,7 +45,7 @@ void SAL_CALL UpdateRequest::execute (const Reference<XConfiguration>& rxConfigu // becomes empty. } -OUString SAL_CALL UpdateRequest::getName (void) +OUString SAL_CALL UpdateRequest::getName() throw (RuntimeException, std::exception) { return OUString("UpdateRequest"); diff --git a/sd/source/ui/framework/configuration/UpdateRequest.hxx b/sd/source/ui/framework/configuration/UpdateRequest.hxx index b6461ae31205..cd597028ba91 100644 --- a/sd/source/ui/framework/configuration/UpdateRequest.hxx +++ b/sd/source/ui/framework/configuration/UpdateRequest.hxx @@ -50,8 +50,8 @@ class UpdateRequest public UpdateRequestInterfaceBase { public: - UpdateRequest (void) throw(); - virtual ~UpdateRequest (void) throw(); + UpdateRequest() throw(); + virtual ~UpdateRequest() throw(); // XConfigurationChangeOperation @@ -65,7 +65,7 @@ public: /** Return a human readable string representation. This is used for debugging purposes. */ - virtual OUString SAL_CALL getName (void) + virtual OUString SAL_CALL getName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** This call is ignored because the XNamed interface is (mis)used to diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx index e0e30c7971ae..9d9c7959e0b2 100644 --- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx @@ -81,7 +81,7 @@ class BasicPaneFactory::PaneContainer : public ::std::vector<PaneDescriptor> { public: - PaneContainer (void) {} + PaneContainer() {} }; //===== PaneFactory =========================================================== @@ -96,11 +96,11 @@ BasicPaneFactory::BasicPaneFactory ( { } -BasicPaneFactory::~BasicPaneFactory (void) +BasicPaneFactory::~BasicPaneFactory() { } -void SAL_CALL BasicPaneFactory::disposing (void) +void SAL_CALL BasicPaneFactory::disposing() { Reference<XConfigurationController> xCC (mxConfigurationControllerWeak); if (xCC.is()) @@ -427,7 +427,7 @@ Reference<XResource> BasicPaneFactory::CreateChildWindowPane ( return xPane; } -void BasicPaneFactory::ThrowIfDisposed (void) const +void BasicPaneFactory::ThrowIfDisposed() const throw (lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.hxx b/sd/source/ui/framework/factories/BasicPaneFactory.hxx index b7752de26b68..f5700d706f24 100644 --- a/sd/source/ui/framework/factories/BasicPaneFactory.hxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.hxx @@ -67,9 +67,9 @@ class BasicPaneFactory public: BasicPaneFactory ( const css::uno::Reference<css::uno::XComponentContext>& rxContext); - virtual ~BasicPaneFactory (void); + virtual ~BasicPaneFactory(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInitialization @@ -138,7 +138,7 @@ private: css::drawing::framework::XResourceId>& rxPaneId, const PaneDescriptor& rDescriptor); - void ThrowIfDisposed (void) const + void ThrowIfDisposed() const throw (css::lang::DisposedException); }; diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx index 2ac67314ff7a..7ae9508d906a 100644 --- a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx +++ b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx @@ -46,16 +46,16 @@ BasicToolBarFactory::BasicToolBarFactory ( (void)rxContext; } -BasicToolBarFactory::~BasicToolBarFactory (void) +BasicToolBarFactory::~BasicToolBarFactory() { } -void SAL_CALL BasicToolBarFactory::disposing (void) +void SAL_CALL BasicToolBarFactory::disposing() { Shutdown(); } -void BasicToolBarFactory::Shutdown (void) +void BasicToolBarFactory::Shutdown() { mpViewShellBase = NULL; Reference<lang::XComponent> xComponent (mxConfigurationController, UNO_QUERY); @@ -161,7 +161,7 @@ void SAL_CALL BasicToolBarFactory::releaseResource ( xComponent->dispose(); } -void BasicToolBarFactory::ThrowIfDisposed (void) const +void BasicToolBarFactory::ThrowIfDisposed() const throw (lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx index 5442f4e19051..024af69fc134 100644 --- a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx +++ b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx @@ -58,9 +58,9 @@ class BasicToolBarFactory public: BasicToolBarFactory ( const css::uno::Reference<com::sun::star::uno::XComponentContext>& rxContext); - virtual ~BasicToolBarFactory (void); + virtual ~BasicToolBarFactory(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // ToolBarFactory @@ -93,9 +93,9 @@ private: css::uno::Reference<css::frame::XController> mxController; ViewShellBase* mpViewShellBase; - void Shutdown (void); + void Shutdown(); - void ThrowIfDisposed (void) const + void ThrowIfDisposed() const throw (css::lang::DisposedException); }; diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx index 10fe98d14b2d..21be69f667a8 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.cxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx @@ -72,14 +72,14 @@ class BasicViewFactory::ViewShellContainer : public ::std::vector<boost::shared_ptr<ViewDescriptor> > { public: - ViewShellContainer (void) {}; + ViewShellContainer() {}; }; class BasicViewFactory::ViewCache : public ::std::vector<boost::shared_ptr<ViewDescriptor> > { public: - ViewCache (void) {}; + ViewCache() {}; }; //===== ViewFactory =========================================================== @@ -98,11 +98,11 @@ BasicViewFactory::BasicViewFactory ( (void)rxContext; } -BasicViewFactory::~BasicViewFactory (void) +BasicViewFactory::~BasicViewFactory() { } -void SAL_CALL BasicViewFactory::disposing (void) +void SAL_CALL BasicViewFactory::disposing() { // Disconnect from the frame view. if (mpFrameView != NULL) diff --git a/sd/source/ui/framework/factories/BasicViewFactory.hxx b/sd/source/ui/framework/factories/BasicViewFactory.hxx index fa62d325b17d..6d6d89591fa3 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.hxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.hxx @@ -73,9 +73,9 @@ class BasicViewFactory public: BasicViewFactory ( const css::uno::Reference<css::uno::XComponentContext>& rxContext); - virtual ~BasicViewFactory (void); + virtual ~BasicViewFactory(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XViewFactory diff --git a/sd/source/ui/framework/factories/ChildWindowPane.cxx b/sd/source/ui/framework/factories/ChildWindowPane.cxx index 7e6da77b9cbf..69e79836ba6f 100644 --- a/sd/source/ui/framework/factories/ChildWindowPane.cxx +++ b/sd/source/ui/framework/factories/ChildWindowPane.cxx @@ -88,11 +88,11 @@ ChildWindowPane::ChildWindowPane ( } } -ChildWindowPane::~ChildWindowPane (void) +ChildWindowPane::~ChildWindowPane() { } -void ChildWindowPane::Hide (void) +void ChildWindowPane::Hide() { SfxViewFrame* pViewFrame = mrViewShellBase.GetViewFrame(); if (pViewFrame != NULL) @@ -105,7 +105,7 @@ void ChildWindowPane::Hide (void) mxWindow = NULL; } -void SAL_CALL ChildWindowPane::disposing (void) +void SAL_CALL ChildWindowPane::disposing() { ::osl::MutexGuard aGuard (maMutex); @@ -120,7 +120,7 @@ void SAL_CALL ChildWindowPane::disposing (void) Pane::disposing(); } -::vcl::Window* ChildWindowPane::GetWindow (void) +::vcl::Window* ChildWindowPane::GetWindow() { do { @@ -185,7 +185,7 @@ void SAL_CALL ChildWindowPane::disposing (void) return mpWindow; } -Reference<awt::XWindow> SAL_CALL ChildWindowPane::getWindow (void) +Reference<awt::XWindow> SAL_CALL ChildWindowPane::getWindow() throw (RuntimeException, std::exception) { if (mpWindow == NULL || ! mxWindow.is()) diff --git a/sd/source/ui/framework/factories/ChildWindowPane.hxx b/sd/source/ui/framework/factories/ChildWindowPane.hxx index a4725002bbdc..ba83dfb53edb 100644 --- a/sd/source/ui/framework/factories/ChildWindowPane.hxx +++ b/sd/source/ui/framework/factories/ChildWindowPane.hxx @@ -57,13 +57,13 @@ public: sal_uInt16 nChildWindowId, ViewShellBase& rViewShellBase, ::std::unique_ptr<SfxShell> && pShell); - virtual ~ChildWindowPane (void); + virtual ~ChildWindowPane(); /** Hide the pane. To make the pane visible again, call GetWindow(). */ - void Hide (void); + void Hide(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; /** This returns the content window when the child window is already visible. Otherwise <NULL/> is returned. In that case a later call @@ -72,13 +72,13 @@ public: Note that GetWindow() may return different Window pointers when Hide() is called in between. */ - virtual vcl::Window* GetWindow (void) SAL_OVERRIDE; + virtual vcl::Window* GetWindow() SAL_OVERRIDE; /** The local getWindow() first calls GetWindow() to provide a valid window pointer before forwarding the call to the base class. */ virtual ::com::sun::star::uno::Reference<com::sun::star::awt::XWindow> - SAL_CALL getWindow (void) + SAL_CALL getWindow() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; DECLARE_XINTERFACE() diff --git a/sd/source/ui/framework/factories/FrameWindowPane.cxx b/sd/source/ui/framework/factories/FrameWindowPane.cxx index 82af2666733b..c30d5860ed7b 100644 --- a/sd/source/ui/framework/factories/FrameWindowPane.cxx +++ b/sd/source/ui/framework/factories/FrameWindowPane.cxx @@ -32,11 +32,11 @@ FrameWindowPane::FrameWindowPane ( { } -FrameWindowPane::~FrameWindowPane (void) throw() +FrameWindowPane::~FrameWindowPane() throw() { } -sal_Bool SAL_CALL FrameWindowPane::isAnchorOnly (void) +sal_Bool SAL_CALL FrameWindowPane::isAnchorOnly() throw (RuntimeException, std::exception) { return false; diff --git a/sd/source/ui/framework/factories/FrameWindowPane.hxx b/sd/source/ui/framework/factories/FrameWindowPane.hxx index 836c2f77929f..cc77ac7f5d28 100644 --- a/sd/source/ui/framework/factories/FrameWindowPane.hxx +++ b/sd/source/ui/framework/factories/FrameWindowPane.hxx @@ -37,13 +37,13 @@ public: const ::com::sun::star::uno::Reference< com::sun::star::drawing::framework::XResourceId>& rxPaneId, vcl::Window* pWindow); - virtual ~FrameWindowPane (void) throw(); + virtual ~FrameWindowPane() throw(); /** A frame window typically can (and should) exists on its own without children, if only to visualize that something (a view) is missing. Therefore this method always returns <FALSE/>. */ - virtual sal_Bool SAL_CALL isAnchorOnly (void) + virtual sal_Bool SAL_CALL isAnchorOnly() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx index ae8698c4f503..009975465541 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.cxx +++ b/sd/source/ui/framework/factories/FullScreenPane.cxx @@ -97,11 +97,11 @@ FullScreenPane::FullScreenPane ( mpWindow->GrabFocus(); } -FullScreenPane::~FullScreenPane (void) throw() +FullScreenPane::~FullScreenPane() throw() { } -void SAL_CALL FullScreenPane::disposing (void) +void SAL_CALL FullScreenPane::disposing() { // We have created the window pointed to by mpWindow, we delete it. if (mpWindow != NULL) @@ -121,7 +121,7 @@ void SAL_CALL FullScreenPane::disposing (void) //----- XPane ----------------------------------------------------------------- -sal_Bool SAL_CALL FullScreenPane::isVisible (void) +sal_Bool SAL_CALL FullScreenPane::isVisible() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -143,7 +143,7 @@ void SAL_CALL FullScreenPane::setVisible (const sal_Bool bIsVisible) mpWorkWindow->Show(bIsVisible); } -Reference<css::accessibility::XAccessible> SAL_CALL FullScreenPane::getAccessible (void) +Reference<css::accessibility::XAccessible> SAL_CALL FullScreenPane::getAccessible() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -195,7 +195,7 @@ IMPL_LINK(FullScreenPane, WindowEventHandler, VclWindowEvent*, pEvent) return 1; } -Reference<rendering::XCanvas> FullScreenPane::CreateCanvas (void) +Reference<rendering::XCanvas> FullScreenPane::CreateCanvas() throw (RuntimeException) { vcl::Window* pWindow = VCLUnoHelper::GetWindow(mxWindow); diff --git a/sd/source/ui/framework/factories/FullScreenPane.hxx b/sd/source/ui/framework/factories/FullScreenPane.hxx index 1d7c3481ea98..0c2e1afac517 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.hxx +++ b/sd/source/ui/framework/factories/FullScreenPane.hxx @@ -52,19 +52,19 @@ public: const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext, const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId, const vcl::Window* pViewShellWindow); - virtual ~FullScreenPane (void) throw(); + virtual ~FullScreenPane() throw(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; //----- XPane ------------------------------------------------------------- - virtual sal_Bool SAL_CALL isVisible (void) + virtual sal_Bool SAL_CALL isVisible() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setVisible (sal_Bool bIsVisible) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL getAccessible (void) + virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL getAccessible() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setAccessible ( @@ -75,7 +75,7 @@ public: protected: virtual ::com::sun::star::uno::Reference<com::sun::star::rendering::XCanvas> - CreateCanvas (void) + CreateCanvas() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; private: diff --git a/sd/source/ui/framework/factories/Pane.cxx b/sd/source/ui/framework/factories/Pane.cxx index 321692e2e87a..0fd14c668bb2 100644 --- a/sd/source/ui/framework/factories/Pane.cxx +++ b/sd/source/ui/framework/factories/Pane.cxx @@ -43,17 +43,17 @@ Pane::Pane ( { } -Pane::~Pane (void) +Pane::~Pane() { } -void Pane::disposing (void) +void Pane::disposing() { mxWindow = NULL; mpWindow = NULL; } -::vcl::Window* Pane::GetWindow (void) +::vcl::Window* Pane::GetWindow() { if (mxWindow.is()) return mpWindow; @@ -63,7 +63,7 @@ void Pane::disposing (void) //----- XPane ----------------------------------------------------------------- -Reference<awt::XWindow> SAL_CALL Pane::getWindow (void) +Reference<awt::XWindow> SAL_CALL Pane::getWindow() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -71,7 +71,7 @@ Reference<awt::XWindow> SAL_CALL Pane::getWindow (void) return mxWindow; } -Reference<rendering::XCanvas> SAL_CALL Pane::getCanvas (void) +Reference<rendering::XCanvas> SAL_CALL Pane::getCanvas() throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); @@ -85,7 +85,7 @@ Reference<rendering::XCanvas> SAL_CALL Pane::getCanvas (void) //----- XPane2 ---------------------------------------------------------------- -sal_Bool SAL_CALL Pane::isVisible (void) +sal_Bool SAL_CALL Pane::isVisible() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -107,7 +107,7 @@ void SAL_CALL Pane::setVisible (sal_Bool bIsVisible) pWindow->Show(bIsVisible); } -Reference<css::accessibility::XAccessible> SAL_CALL Pane::getAccessible (void) +Reference<css::accessibility::XAccessible> SAL_CALL Pane::getAccessible() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -130,7 +130,7 @@ void SAL_CALL Pane::setAccessible ( //----- XResource ------------------------------------------------------------- -Reference<XResourceId> SAL_CALL Pane::getResourceId (void) +Reference<XResourceId> SAL_CALL Pane::getResourceId() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -138,7 +138,7 @@ Reference<XResourceId> SAL_CALL Pane::getResourceId (void) return mxPaneId; } -sal_Bool SAL_CALL Pane::isAnchorOnly (void) +sal_Bool SAL_CALL Pane::isAnchorOnly() throw (RuntimeException, std::exception) { return true; @@ -151,7 +151,7 @@ namespace class thePaneUnoTunnelId : public rtl::Static< UnoTunnelIdInit, thePaneUnoTunnelId > {}; } -const Sequence<sal_Int8>& Pane::getUnoTunnelId (void) +const Sequence<sal_Int8>& Pane::getUnoTunnelId() { return thePaneUnoTunnelId::get().getSeq(); } @@ -170,7 +170,7 @@ sal_Int64 SAL_CALL Pane::getSomething (const Sequence<sal_Int8>& rId) return nResult; } -Reference<rendering::XCanvas> Pane::CreateCanvas (void) +Reference<rendering::XCanvas> Pane::CreateCanvas() throw (RuntimeException) { Reference<rendering::XCanvas> xCanvas; @@ -186,7 +186,7 @@ Reference<rendering::XCanvas> Pane::CreateCanvas (void) return xCanvas; } -void Pane::ThrowIfDisposed (void) const +void Pane::ThrowIfDisposed() const throw (lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx b/sd/source/ui/framework/factories/PresentationFactory.cxx index dfe9bf2a0cc0..f8e0322ee7d0 100644 --- a/sd/source/ui/framework/factories/PresentationFactory.cxx +++ b/sd/source/ui/framework/factories/PresentationFactory.cxx @@ -47,9 +47,9 @@ class PresentationFactoryProvider { public: PresentationFactoryProvider (const Reference<XComponentContext>& rxContext); - virtual ~PresentationFactoryProvider (void); + virtual ~PresentationFactoryProvider(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInitialization @@ -71,14 +71,14 @@ class PresentationView public: PresentationView (const Reference<XResourceId>& rxViewId) : PresentationViewInterfaceBase(maMutex),mxResourceId(rxViewId) {}; - virtual ~PresentationView (void) {}; + virtual ~PresentationView() {}; // XView - virtual Reference<XResourceId> SAL_CALL getResourceId (void) throw (RuntimeException, std::exception) SAL_OVERRIDE + virtual Reference<XResourceId> SAL_CALL getResourceId() throw (RuntimeException, std::exception) SAL_OVERRIDE { return mxResourceId; }; - virtual sal_Bool SAL_CALL isAnchorOnly (void) throw (RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL isAnchorOnly() throw (RuntimeException, std::exception) SAL_OVERRIDE { return false; } private: @@ -109,11 +109,11 @@ PresentationFactory::PresentationFactory ( } } -PresentationFactory::~PresentationFactory (void) +PresentationFactory::~PresentationFactory() { } -void SAL_CALL PresentationFactory::disposing (void) +void SAL_CALL PresentationFactory::disposing() { } @@ -171,7 +171,7 @@ void SAL_CALL PresentationFactory::disposing ( (void)rEventObject; } -void PresentationFactory::ThrowIfDisposed (void) const +void PresentationFactory::ThrowIfDisposed() const throw (lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) @@ -192,11 +192,11 @@ PresentationFactoryProvider::PresentationFactoryProvider ( (void)rxContext; } -PresentationFactoryProvider::~PresentationFactoryProvider (void) +PresentationFactoryProvider::~PresentationFactoryProvider() { } -void PresentationFactoryProvider::disposing (void) +void PresentationFactoryProvider::disposing() { } diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx index 8d1181d61f1b..ba3361233568 100644 --- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx +++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx @@ -67,11 +67,11 @@ ViewShellWrapper::ViewShellWrapper ( { } -ViewShellWrapper::~ViewShellWrapper (void) +ViewShellWrapper::~ViewShellWrapper() { } -void SAL_CALL ViewShellWrapper::disposing (void) +void SAL_CALL ViewShellWrapper::disposing() { ::osl::MutexGuard aGuard( maMutex ); @@ -107,13 +107,13 @@ uno::Any SAL_CALL ViewShellWrapper::queryInterface( const uno::Type & rType ) th //----- XResource ------------------------------------------------------------- -Reference<XResourceId> SAL_CALL ViewShellWrapper::getResourceId (void) +Reference<XResourceId> SAL_CALL ViewShellWrapper::getResourceId() throw (RuntimeException, std::exception) { return mxViewId; } -sal_Bool SAL_CALL ViewShellWrapper::isAnchorOnly (void) +sal_Bool SAL_CALL ViewShellWrapper::isAnchorOnly() throw (RuntimeException, std::exception) { return false; @@ -236,7 +236,7 @@ namespace class theViewShellWrapperUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theViewShellWrapperUnoTunnelId> {}; } -const Sequence<sal_Int8>& ViewShellWrapper::getUnoTunnelId (void) +const Sequence<sal_Int8>& ViewShellWrapper::getUnoTunnelId() { return theViewShellWrapperUnoTunnelId::get().getSeq(); } diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.cxx b/sd/source/ui/framework/module/CenterViewFocusModule.cxx index a84ded03f401..a0f2c54f1e9f 100644 --- a/sd/source/ui/framework/module/CenterViewFocusModule.cxx +++ b/sd/source/ui/framework/module/CenterViewFocusModule.cxx @@ -86,11 +86,11 @@ CenterViewFocusModule::CenterViewFocusModule (Reference<frame::XController>& rxC } } -CenterViewFocusModule::~CenterViewFocusModule (void) +CenterViewFocusModule::~CenterViewFocusModule() { } -void SAL_CALL CenterViewFocusModule::disposing (void) +void SAL_CALL CenterViewFocusModule::disposing() { if (mxConfigurationController.is()) mxConfigurationController->removeConfigurationChangeListener(this); diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.hxx b/sd/source/ui/framework/module/CenterViewFocusModule.hxx index d1ff8eba52e2..af911dbef097 100644 --- a/sd/source/ui/framework/module/CenterViewFocusModule.hxx +++ b/sd/source/ui/framework/module/CenterViewFocusModule.hxx @@ -56,9 +56,9 @@ class CenterViewFocusModule public: CenterViewFocusModule ( ::com::sun::star::uno::Reference<com::sun::star::frame::XController>& rxController); - virtual ~CenterViewFocusModule (void); + virtual ~CenterViewFocusModule(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XConfigurationChangeListener diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx index 4cce9529c557..8b86fca69008 100644 --- a/sd/source/ui/framework/module/ModuleController.cxx +++ b/sd/source/ui/framework/module/ModuleController.cxx @@ -45,7 +45,7 @@ class ModuleController::ResourceToFactoryMap OUStringHash> { public: - ResourceToFactoryMap (void) {} + ResourceToFactoryMap() {} }; class ModuleController::LoadedFactoryContainer @@ -55,7 +55,7 @@ class ModuleController::LoadedFactoryContainer OUStringHash> { public: - LoadedFactoryContainer (void) {} + LoadedFactoryContainer() {} }; //===== ModuleController ====================================================== @@ -76,11 +76,11 @@ ModuleController::ModuleController (const Reference<XComponentContext>& rxContex LoadFactories(rxContext); } -ModuleController::~ModuleController (void) throw() +ModuleController::~ModuleController() throw() { } -void SAL_CALL ModuleController::disposing (void) +void SAL_CALL ModuleController::disposing() { // Break the cyclic reference back to DrawController object mpLoadedFactories.reset(); @@ -142,7 +142,7 @@ void ModuleController::ProcessFactory (const ::std::vector<Any>& rValues) } } -void ModuleController::InstantiateStartupServices (void) +void ModuleController::InstantiateStartupServices() { try { diff --git a/sd/source/ui/framework/module/ResourceManager.cxx b/sd/source/ui/framework/module/ResourceManager.cxx index 14901db3044e..a3255c9fd763 100644 --- a/sd/source/ui/framework/module/ResourceManager.cxx +++ b/sd/source/ui/framework/module/ResourceManager.cxx @@ -42,7 +42,7 @@ class ResourceManager::MainViewContainer : public ::std::set<OUString> { public: - MainViewContainer (void) {} + MainViewContainer() {} }; //===== ResourceManager ======================================================= @@ -80,7 +80,7 @@ ResourceManager::ResourceManager ( } } -ResourceManager::~ResourceManager (void) +ResourceManager::~ResourceManager() { } @@ -96,11 +96,11 @@ bool ResourceManager::IsResourceActive ( return (mpActiveMainViewContainer->find(rsMainViewURL) != mpActiveMainViewContainer->end()); } -void ResourceManager::SaveResourceState (void) +void ResourceManager::SaveResourceState() { } -void SAL_CALL ResourceManager::disposing (void) +void SAL_CALL ResourceManager::disposing() { if (mxConfigurationController.is()) { @@ -165,7 +165,7 @@ void SAL_CALL ResourceManager::notifyConfigurationChange ( } } -void ResourceManager::UpdateForMainViewShell (void) +void ResourceManager::UpdateForMainViewShell() { if (mxConfigurationController.is()) { diff --git a/sd/source/ui/framework/module/ResourceManager.hxx b/sd/source/ui/framework/module/ResourceManager.hxx index 1ce16db74410..e2d31dd49c1a 100644 --- a/sd/source/ui/framework/module/ResourceManager.hxx +++ b/sd/source/ui/framework/module/ResourceManager.hxx @@ -53,16 +53,16 @@ public: ::com::sun::star::frame::XController>& rxController, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId>& rxResourceId); - virtual ~ResourceManager (void); + virtual ~ResourceManager(); /** Remember the given URL as one of a center pane view for which to activate the resource managed by the called object. */ void AddActiveMainView (const OUString& rsMainViewURL); bool IsResourceActive (const OUString& rsMainViewURL); - virtual void SaveResourceState (void); + virtual void SaveResourceState(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XConfigurationChangeListener @@ -101,7 +101,7 @@ private: bool bActivation, const ::com::sun::star::uno::Reference< com::sun::star::drawing::framework::XConfiguration>& rxConfiguration); - void UpdateForMainViewShell (void); + void UpdateForMainViewShell(); }; } } // end of namespace sd::framework diff --git a/sd/source/ui/framework/module/ShellStackGuard.cxx b/sd/source/ui/framework/module/ShellStackGuard.cxx index 7f2f172d9cef..3e9ef23a51b1 100644 --- a/sd/source/ui/framework/module/ShellStackGuard.cxx +++ b/sd/source/ui/framework/module/ShellStackGuard.cxx @@ -76,11 +76,11 @@ ShellStackGuard::ShellStackGuard (Reference<frame::XController>& rxController) } } -ShellStackGuard::~ShellStackGuard (void) +ShellStackGuard::~ShellStackGuard() { } -void SAL_CALL ShellStackGuard::disposing (void) +void SAL_CALL ShellStackGuard::disposing() { if (mxConfigurationController.is()) mxConfigurationController->removeConfigurationChangeListener(this); @@ -142,7 +142,7 @@ IMPL_LINK(ShellStackGuard, TimeoutHandler, Idle*, pIdle) return 0; } -bool ShellStackGuard::IsPrinting (void) const +bool ShellStackGuard::IsPrinting() const { if (mpBase != NULL) { diff --git a/sd/source/ui/framework/module/ShellStackGuard.hxx b/sd/source/ui/framework/module/ShellStackGuard.hxx index 56796f423d09..851687490d1b 100644 --- a/sd/source/ui/framework/module/ShellStackGuard.hxx +++ b/sd/source/ui/framework/module/ShellStackGuard.hxx @@ -65,9 +65,9 @@ class ShellStackGuard { public: ShellStackGuard (css::uno::Reference<css::frame::XController>& rxController); - virtual ~ShellStackGuard (void); + virtual ~ShellStackGuard(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XConfigurationChangeListener @@ -93,7 +93,7 @@ private: the printer is not printing, or there is no printer, or something else went wrong. */ - bool IsPrinting (void) const; + bool IsPrinting() const; }; } } // end of namespace sd::framework diff --git a/sd/source/ui/framework/module/SlideSorterModule.cxx b/sd/source/ui/framework/module/SlideSorterModule.cxx index b4a3c430b995..32dc1e79dba5 100644 --- a/sd/source/ui/framework/module/SlideSorterModule.cxx +++ b/sd/source/ui/framework/module/SlideSorterModule.cxx @@ -71,11 +71,11 @@ SlideSorterModule::SlideSorterModule ( } } -SlideSorterModule::~SlideSorterModule (void) +SlideSorterModule::~SlideSorterModule() { } -void SlideSorterModule::SaveResourceState (void) +void SlideSorterModule::SaveResourceState() { SvtSlideSorterBarOptions().SetVisibleImpressView(IsResourceActive(FrameworkHelper::msImpressViewURL)); SvtSlideSorterBarOptions().SetVisibleOutlineView(IsResourceActive(FrameworkHelper::msOutlineViewURL)); diff --git a/sd/source/ui/framework/module/SlideSorterModule.hxx b/sd/source/ui/framework/module/SlideSorterModule.hxx index 906a8ec1b556..349d2f18cadc 100644 --- a/sd/source/ui/framework/module/SlideSorterModule.hxx +++ b/sd/source/ui/framework/module/SlideSorterModule.hxx @@ -37,9 +37,9 @@ public: SlideSorterModule ( const css::uno::Reference<css::frame::XController>& rxController, const OUString& rsLeftPaneURL); - virtual ~SlideSorterModule (void); + virtual ~SlideSorterModule(); - virtual void SaveResourceState (void) SAL_OVERRIDE; + virtual void SaveResourceState() SAL_OVERRIDE; // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( diff --git a/sd/source/ui/framework/module/ToolBarModule.cxx b/sd/source/ui/framework/module/ToolBarModule.cxx index a7b88bd06a13..51e4b6ba6254 100644 --- a/sd/source/ui/framework/module/ToolBarModule.cxx +++ b/sd/source/ui/framework/module/ToolBarModule.cxx @@ -84,11 +84,11 @@ ToolBarModule::ToolBarModule ( } } -ToolBarModule::~ToolBarModule (void) +ToolBarModule::~ToolBarModule() { } -void SAL_CALL ToolBarModule::disposing (void) +void SAL_CALL ToolBarModule::disposing() { if (mxConfigurationController.is()) mxConfigurationController->removeConfigurationChangeListener(this); @@ -133,7 +133,7 @@ void SAL_CALL ToolBarModule::notifyConfigurationChange ( } } -void ToolBarModule::HandleUpdateStart (void) +void ToolBarModule::HandleUpdateStart() { // Lock the ToolBarManager and tell it to lock the ViewShellManager as // well. This way the ToolBarManager can optimize the releasing of @@ -147,7 +147,7 @@ void ToolBarModule::HandleUpdateStart (void) } } -void ToolBarModule::HandleUpdateEnd (void) +void ToolBarModule::HandleUpdateEnd() { if (mbMainViewSwitchUpdatePending) { diff --git a/sd/source/ui/framework/module/ToolBarModule.hxx b/sd/source/ui/framework/module/ToolBarModule.hxx index 1a309ac66630..36ba62be7144 100644 --- a/sd/source/ui/framework/module/ToolBarModule.hxx +++ b/sd/source/ui/framework/module/ToolBarModule.hxx @@ -56,9 +56,9 @@ public: */ ToolBarModule ( const css::uno::Reference<css::frame::XController>& rxController); - virtual ~ToolBarModule (void); + virtual ~ToolBarModule(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XConfigurationChangeListener @@ -79,8 +79,8 @@ private: ::boost::scoped_ptr<ToolBarManager::UpdateLock> mpToolBarManagerLock; bool mbMainViewSwitchUpdatePending; - void HandleUpdateStart (void); - void HandleUpdateEnd (void); + void HandleUpdateStart(); + void HandleUpdateEnd(); }; } } // end of namespace sd::framework diff --git a/sd/source/ui/framework/module/ToolPanelModule.cxx b/sd/source/ui/framework/module/ToolPanelModule.cxx index 942e83c5a5aa..617a293862e6 100644 --- a/sd/source/ui/framework/module/ToolPanelModule.cxx +++ b/sd/source/ui/framework/module/ToolPanelModule.cxx @@ -64,11 +64,11 @@ ToolPanelModule::ToolPanelModule ( } } -ToolPanelModule::~ToolPanelModule (void) +ToolPanelModule::~ToolPanelModule() { } -void ToolPanelModule::SaveResourceState (void) +void ToolPanelModule::SaveResourceState() { SvtToolPanelOptions().SetVisibleImpressView(IsResourceActive(FrameworkHelper::msImpressViewURL)); SvtToolPanelOptions().SetVisibleOutlineView(IsResourceActive(FrameworkHelper::msOutlineViewURL)); diff --git a/sd/source/ui/framework/module/ToolPanelModule.hxx b/sd/source/ui/framework/module/ToolPanelModule.hxx index 3f22e6efe39a..bbf4ee7c638a 100644 --- a/sd/source/ui/framework/module/ToolPanelModule.hxx +++ b/sd/source/ui/framework/module/ToolPanelModule.hxx @@ -36,9 +36,9 @@ public: ToolPanelModule ( const css::uno::Reference<css::frame::XController>& rxController, const OUString& rsRightPaneURL); - virtual ~ToolPanelModule (void); + virtual ~ToolPanelModule(); - virtual void SaveResourceState (void) SAL_OVERRIDE; + virtual void SaveResourceState() SAL_OVERRIDE; // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( diff --git a/sd/source/ui/framework/module/ViewTabBarModule.cxx b/sd/source/ui/framework/module/ViewTabBarModule.cxx index bc02e08151f0..ccf08fbabe47 100644 --- a/sd/source/ui/framework/module/ViewTabBarModule.cxx +++ b/sd/source/ui/framework/module/ViewTabBarModule.cxx @@ -77,11 +77,11 @@ ViewTabBarModule::ViewTabBarModule ( } } -ViewTabBarModule::~ViewTabBarModule (void) +ViewTabBarModule::~ViewTabBarModule() { } -void SAL_CALL ViewTabBarModule::disposing (void) +void SAL_CALL ViewTabBarModule::disposing() { if (mxConfigurationController.is()) mxConfigurationController->removeConfigurationChangeListener(this); diff --git a/sd/source/ui/framework/module/ViewTabBarModule.hxx b/sd/source/ui/framework/module/ViewTabBarModule.hxx index b07eef9b0d5e..b8bd19bc4a2d 100644 --- a/sd/source/ui/framework/module/ViewTabBarModule.hxx +++ b/sd/source/ui/framework/module/ViewTabBarModule.hxx @@ -59,9 +59,9 @@ public: const css::uno::Reference<css::frame::XController>& rxController, const css::uno::Reference< css::drawing::framework::XResourceId>& rxViewTabBarId); - virtual ~ViewTabBarModule (void); + virtual ~ViewTabBarModule(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XConfigurationChangeListener diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index f775eb2cd972..c666e7017b19 100644 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -91,9 +91,9 @@ public: const OUString& rsEventType, const ::sd::framework::FrameworkHelper::ConfigurationChangeEventFilter& rFilter, const ::sd::framework::FrameworkHelper::Callback& rCallback); - virtual ~CallbackCaller (void); + virtual ~CallbackCaller(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XEventListener virtual void SAL_CALL disposing (const lang::EventObject& rEvent) throw (RuntimeException, std::exception) SAL_OVERRIDE; @@ -126,9 +126,9 @@ class LifetimeController { public: explicit LifetimeController (::sd::ViewShellBase& rBase); - virtual ~LifetimeController (void); + virtual ~LifetimeController(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; /** XEventListener. This method is called when the frame::XController is being destroyed. @@ -149,7 +149,7 @@ private: mbListeningToController members were modified then call this method to either dispose or release the associated FrameworkHelper. */ - void Update (void); + void Update(); }; } // end of anonymous namespace @@ -279,7 +279,7 @@ class FrameworkHelper::ViewURLMap OUStringHash> { public: - ViewURLMap (void) {} + ViewURLMap() {} }; //----- Framework::DiposeListener --------------------------------------------- @@ -296,9 +296,9 @@ class FrameworkHelper::DisposeListener { public: DisposeListener (const ::boost::shared_ptr<FrameworkHelper>& rpHelper); - virtual ~DisposeListener (void); + virtual ~DisposeListener(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; virtual void SAL_CALL disposing (const lang::EventObject& rEventObject) throw(RuntimeException, std::exception) SAL_OVERRIDE; @@ -384,23 +384,23 @@ FrameworkHelper::FrameworkHelper (ViewShellBase& rBase) new LifetimeController(mrBase); } -void FrameworkHelper::Initialize (void) +void FrameworkHelper::Initialize() { mxDisposeListener = new DisposeListener(shared_from_this()); } -FrameworkHelper::~FrameworkHelper (void) +FrameworkHelper::~FrameworkHelper() { } -void FrameworkHelper::Dispose (void) +void FrameworkHelper::Dispose() { if (mxDisposeListener.is()) mxDisposeListener->dispose(); mxConfigurationController = NULL; } -bool FrameworkHelper::IsValid (void) +bool FrameworkHelper::IsValid() { return mxConfigurationController.is(); } @@ -659,7 +659,7 @@ private: bool& mrFlag; }; -void FrameworkHelper::RequestSynchronousUpdate (void) +void FrameworkHelper::RequestSynchronousUpdate() { rtl::Reference<ConfigurationController> pCC ( dynamic_cast<ConfigurationController*>(mxConfigurationController.get())); @@ -689,7 +689,7 @@ void FrameworkHelper::WaitForEvent (const OUString& rsEventType) const } } -void FrameworkHelper::WaitForUpdate (void) const +void FrameworkHelper::WaitForUpdate() const { WaitForEvent(msConfigurationUpdateEndEvent); } @@ -708,7 +708,7 @@ void FrameworkHelper::disposing (const lang::EventObject& rEventObject) mxConfigurationController = NULL; } -void FrameworkHelper::UpdateConfiguration (void) +void FrameworkHelper::UpdateConfiguration() { if (mxConfigurationController.is()) { @@ -784,11 +784,11 @@ FrameworkHelper::DisposeListener::DisposeListener ( xComponent->addEventListener(this); } -FrameworkHelper::DisposeListener::~DisposeListener (void) +FrameworkHelper::DisposeListener::~DisposeListener() { } -void SAL_CALL FrameworkHelper::DisposeListener::disposing (void) +void SAL_CALL FrameworkHelper::DisposeListener::disposing() { Reference<XComponent> xComponent (mpHelper->mxConfigurationController, UNO_QUERY); if (xComponent.is()) @@ -856,11 +856,11 @@ CallbackCaller::CallbackCaller ( } } -CallbackCaller::~CallbackCaller (void) +CallbackCaller::~CallbackCaller() { } -void CallbackCaller::disposing (void) +void CallbackCaller::disposing() { try { @@ -933,12 +933,12 @@ LifetimeController::LifetimeController (::sd::ViewShellBase& rBase) } } -LifetimeController::~LifetimeController (void) +LifetimeController::~LifetimeController() { OSL_ASSERT(!mbListeningToController && !mbListeningToViewShellBase); } -void LifetimeController::disposing (void) +void LifetimeController::disposing() { } @@ -962,7 +962,7 @@ void LifetimeController::Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rH } } -void LifetimeController::Update (void) +void LifetimeController::Update() { if (mbListeningToViewShellBase && mbListeningToController) { diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx index 16241381f83f..8c4977b243c5 100644 --- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx +++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx @@ -116,13 +116,13 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent); - virtual ~AccessibleDocumentViewBase (void); + virtual ~AccessibleDocumentViewBase(); /** Initialize a new object. Call this method directly after creating a new object. It finished the initialization begun in the constructor but which needs a fully created object. */ - virtual void Init (void); + virtual void Init(); /** Define callback for listening to window child events of VCL. Listen for creation or destruction of OLE objects. @@ -143,14 +143,14 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL - getAccessibleParent (void) + getAccessibleParent() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** This implementation returns either 1 or 0 depending on whether there is an active accessible OLE object or not. */ virtual sal_Int32 SAL_CALL - getAccessibleChildCount (void) + getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** This implementation either returns the active accessible OLE object @@ -169,16 +169,16 @@ public: getAccessibleAtPoint (const ::com::sun::star::awt::Point& aPoint) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds (void) + virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::awt::Point SAL_CALL getLocation (void) + virtual ::com::sun::star::awt::Point SAL_CALL getLocation() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen (void) + 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 (void) + virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XInterface ====================================================== @@ -188,11 +188,11 @@ public: throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL - acquire (void) + acquire() throw () SAL_OVERRIDE; virtual void SAL_CALL - release (void) + release() throw () SAL_OVERRIDE; //===== XServiceInfo ==================================================== @@ -200,17 +200,17 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName (void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames (void) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XTypeProvider =================================================== virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL - getTypes (void) + getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== lang::XEventListener ============================================ @@ -309,7 +309,7 @@ protected: // This method is called from the component helper base class while // disposing. - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; /** Create a name string. The current name is not modified and, therefore, no events are send. This method is usually called once @@ -339,7 +339,7 @@ protected: Note: Currently used as a substitute for FocusGained. Should be renamed in the future. */ - virtual void Activated (void); + virtual void Activated(); /** This method is called when (before or after?) the frame containing this document has been deactivated. Can be used to send FOCUSED @@ -348,7 +348,7 @@ protected: Note: Currently used as a substitute for FocusLost. Should be renamed in the future. */ - virtual void Deactivated (void); + virtual void Deactivated(); /** Set or remove the currently active accessible OLE object. @param xOLEObject @@ -369,13 +369,13 @@ protected: throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; public: - void SwitchViewActivated (void) { Activated(); } + void SwitchViewActivated() { Activated(); } 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; - virtual void impl_dispose (void); + virtual void impl_dispose(); }; } // end of namespace accessibility diff --git a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx index 2512145cd95d..5552c723c3f0 100644 --- a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx +++ b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx @@ -48,11 +48,11 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent); - virtual ~AccessibleDrawDocumentView (void); + virtual ~AccessibleDrawDocumentView(); /** Complete the initialization begun in the constructor. */ - virtual void Init (void) SAL_OVERRIDE; + virtual void Init() SAL_OVERRIDE; //===== IAccessibleViewForwarderListener ================================ @@ -62,7 +62,7 @@ public: //===== XAccessibleContext ============================================== virtual sal_Int32 SAL_CALL - getAccessibleChildCount (void) + getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL @@ -71,7 +71,7 @@ public: ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL - getAccessibleName(void) + getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== lang::XEventListener ============================================ @@ -92,11 +92,11 @@ public: throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL - acquire (void) + acquire() throw () SAL_OVERRIDE; virtual void SAL_CALL - release (void) + release() throw () SAL_OVERRIDE; //===== XAccessibleGroupPosition ========================================= @@ -113,11 +113,11 @@ protected: //===== XServiceInfo ==================================================== virtual OUString SAL_CALL - getImplementationName (void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames (void) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual bool @@ -152,11 +152,11 @@ protected: // This method is called from the component helper base class while // disposing. - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; /** Create a shape the represents the page as seen on the screen. */ - rtl::Reference<AccessiblePageShape> CreateDrawPageShape (void); + rtl::Reference<AccessiblePageShape> CreateDrawPageShape(); /// Create an accessible name that contains the current view mode. virtual OUString @@ -173,14 +173,14 @@ protected: /** Make sure that the currently focused shape sends a FOCUSED state change event indicating that it has (regained) the focus. */ - virtual void Activated (void) SAL_OVERRIDE; + virtual void Activated() SAL_OVERRIDE; /** Make sure that the currently focused shape sends a FOCUSED state change event indicating that it has lost the focus. */ - virtual void Deactivated (void) SAL_OVERRIDE; + virtual void Deactivated() SAL_OVERRIDE; - virtual void impl_dispose (void) SAL_OVERRIDE; + virtual void impl_dispose() SAL_OVERRIDE; //===== XAccessibleGetAccFromXShape ============================================ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > @@ -190,7 +190,7 @@ protected: GetSelAccContextInTable(); private: - void UpdateAccessibleName (void); + void UpdateAccessibleName(); }; } // end of namespace accessibility diff --git a/sd/source/ui/inc/AccessibleOutlineView.hxx b/sd/source/ui/inc/AccessibleOutlineView.hxx index a11734f42fb0..e3d519a9ccc8 100644 --- a/sd/source/ui/inc/AccessibleOutlineView.hxx +++ b/sd/source/ui/inc/AccessibleOutlineView.hxx @@ -49,11 +49,11 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent); - virtual ~AccessibleOutlineView (void); + virtual ~AccessibleOutlineView(); /** Complete the initialization begun in the constructor. */ - virtual void Init (void) SAL_OVERRIDE; + virtual void Init() SAL_OVERRIDE; //===== IAccessibleViewForwarderListener ================================ @@ -63,14 +63,14 @@ public: //===== XAccessibleContext ============================================== virtual sal_Int32 SAL_CALL - getAccessibleChildCount (void) + getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL - getAccessibleName(void) + getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleEventBroadcaster ======================================== @@ -91,7 +91,7 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName (void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== lang::XEventListener ============================================ @@ -109,17 +109,17 @@ public: protected: // overridden to detect focus changes - virtual void Activated (void) SAL_OVERRIDE; + virtual void Activated() SAL_OVERRIDE; // overridden to detect focus changes - virtual void Deactivated (void) SAL_OVERRIDE; + virtual void Deactivated() SAL_OVERRIDE; // declared, but not defined AccessibleOutlineView( const AccessibleOutlineView& ); AccessibleOutlineView& operator= ( const AccessibleOutlineView& ); // This method is called from the component helper base class while disposing. - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; /// Create an accessible name that contains the current view mode. virtual OUString diff --git a/sd/source/ui/inc/AccessiblePageShape.hxx b/sd/source/ui/inc/AccessiblePageShape.hxx index cddb7a414ca1..8781db72eb34 100644 --- a/sd/source/ui/inc/AccessiblePageShape.hxx +++ b/sd/source/ui/inc/AccessiblePageShape.hxx @@ -67,18 +67,18 @@ public: const AccessibleShapeTreeInfo& rShapeTreeInfo, long nIndex = -1); - virtual ~AccessiblePageShape (void); + virtual ~AccessiblePageShape(); /** Initialize a new shape. See the documentation of the constructor for the reason of this method's existence. */ - virtual void Init (void) SAL_OVERRIDE; + virtual void Init() SAL_OVERRIDE; //===== XAccessibleContext ============================================== /// Returns always 0 because there can be no children. virtual sal_Int32 SAL_CALL - getAccessibleChildCount (void) + getAccessibleChildCount() throw (std::exception) SAL_OVERRIDE; /** Return the specified child. @@ -97,29 +97,29 @@ public: //===== XAccessibleComponent ============================================ - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds (void) + virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getForeground (void) + virtual sal_Int32 SAL_CALL getForeground() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getBackground (void) + virtual sal_Int32 SAL_CALL getBackground() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XComponent ====================================================== virtual void SAL_CALL - dispose (void) + dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XServiceInfo ==================================================== virtual OUString SAL_CALL - getImplementationName (void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames (void) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== lang::XEventListener ============================================ @@ -134,16 +134,16 @@ protected: /** Create a base name string that contains the accessible name. */ virtual OUString - CreateAccessibleBaseName (void) + CreateAccessibleBaseName() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual OUString - CreateAccessibleName (void) + CreateAccessibleName() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /// Create a description string that contains the accessible description. virtual OUString - CreateAccessibleDescription (void) + CreateAccessibleDescription() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; private: diff --git a/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx b/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx index 4a02162c971a..cee2b8d66365 100644 --- a/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx +++ b/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx @@ -35,14 +35,14 @@ public: AccessiblePresentationGraphicShape ( const AccessibleShapeInfo& rShapeInfo, const AccessibleShapeTreeInfo& rShapeTreeInfo); - virtual ~AccessiblePresentationGraphicShape (void); + virtual ~AccessiblePresentationGraphicShape(); //===== XServiceInfo ==================================================== /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName (void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== internal ======================================================== diff --git a/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx b/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx index 46f72c1cb3b9..4704774cb5ae 100644 --- a/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx +++ b/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx @@ -35,14 +35,14 @@ public: AccessiblePresentationOLEShape ( const AccessibleShapeInfo& rShapeInfo, const AccessibleShapeTreeInfo& rShapeTreeInfo); - virtual ~AccessiblePresentationOLEShape (void); + virtual ~AccessiblePresentationOLEShape(); //===== XServiceInfo ==================================================== /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName (void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== internal ======================================================== diff --git a/sd/source/ui/inc/AccessiblePresentationShape.hxx b/sd/source/ui/inc/AccessiblePresentationShape.hxx index 200ee7b14964..46580a760168 100644 --- a/sd/source/ui/inc/AccessiblePresentationShape.hxx +++ b/sd/source/ui/inc/AccessiblePresentationShape.hxx @@ -34,14 +34,14 @@ public: AccessiblePresentationShape ( const AccessibleShapeInfo& rShapeInfo, const AccessibleShapeTreeInfo& rShapeTreeInfo); - virtual ~AccessiblePresentationShape (void); + virtual ~AccessiblePresentationShape(); //===== XServiceInfo ==================================================== /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName (void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== internal ======================================================== diff --git a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx index 373f7023b719..b651707a890c 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx @@ -67,22 +67,22 @@ public: ::com::sun::star::accessibility::XAccessible >& rxParent, ::sd::slidesorter::SlideSorter& rSlideSorter, sal_uInt16 nPageNumber); - virtual ~AccessibleSlideSorterObject (void); + virtual ~AccessibleSlideSorterObject(); /** Return the page that is made accessible by the called object. */ - SdPage* GetPage (void) const; + SdPage* GetPage() const; /** The page number as given to the constructor. */ - sal_uInt16 GetPageNumber (void) const { return mnPageNumber;} + sal_uInt16 GetPageNumber() const { return mnPageNumber;} void FireAccessibleEvent ( short nEventId, const ::com::sun::star::uno::Any& rOldValue, const ::com::sun::star::uno::Any& rNewValue); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; //===== XComponent ============================================== @@ -97,7 +97,7 @@ public: 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; //===== XAccessibleEventBroadcaster ======================================= @@ -116,42 +116,42 @@ public: //===== XAccessibleContext ============================================== virtual sal_Int32 SAL_CALL - getAccessibleChildCount (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; 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, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL - getAccessibleParent (void) + getAccessibleParent() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL - getAccessibleIndexInParent (void) + getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL - getAccessibleRole (void) + getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL - getAccessibleDescription (void) + getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL - getAccessibleName (void) + getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL - getAccessibleRelationSet (void) + getAccessibleRelationSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL - getAccessibleStateSet (void) + getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::lang::Locale SAL_CALL - getLocale (void) + getLocale() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception) SAL_OVERRIDE; @@ -166,25 +166,25 @@ public: const ::com::sun::star::awt::Point& aPoint) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds (void) + virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::awt::Point SAL_CALL getLocation (void) + virtual ::com::sun::star::awt::Point SAL_CALL getLocation() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen (void) + 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 (void) + virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL grabFocus (void) + virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getForeground (void) + virtual sal_Int32 SAL_CALL getForeground() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getBackground (void) + virtual sal_Int32 SAL_CALL getBackground() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XServiceInfo ==================================================== @@ -192,7 +192,7 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName (void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Return whether the specified service is supported by this class. @@ -204,7 +204,7 @@ public: /** Returns a list of all supported services. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames (void) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: @@ -219,7 +219,7 @@ private: DisposedException is thrown to inform the (indirect) caller of the foul deed. */ - void ThrowIfDisposed (void) + void ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException); /** Check whether or not the object has been disposed (or is in the @@ -228,7 +228,7 @@ private: @return sal_True, if the object is disposed or in the course of being disposed. Otherwise, sal_False is returned. */ - bool IsDisposed (void); + bool IsDisposed(); }; } // end of namespace ::accessibility diff --git a/sd/source/ui/inc/AccessibleSlideSorterView.hxx b/sd/source/ui/inc/AccessibleSlideSorterView.hxx index 99affbe53d99..bc31ee58bb32 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterView.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterView.hxx @@ -69,19 +69,19 @@ public: void Init(); - virtual ~AccessibleSlideSorterView (void); + virtual ~AccessibleSlideSorterView(); /** This method acts like a dispose call. It sends a disposing to all of its listeners. It may be called twice. */ - void Destroyed (void); + void Destroyed(); void FireAccessibleEvent ( short nEventId, const ::com::sun::star::uno::Any& rOldValue, const ::com::sun::star::uno::Any& rNewValue); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; /** Return the implementation object of the specified child. @param nIndex @@ -102,7 +102,7 @@ public: 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; //===== XAccessibleEventBroadcaster ======================================= @@ -122,7 +122,7 @@ public: /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL - getAccessibleChildCount (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the specified child or throw exception. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL @@ -131,46 +131,46 @@ public: /// Return a reference to the parent. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL - getAccessibleParent (void) + getAccessibleParent() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return this objects index among the parents children. virtual sal_Int32 SAL_CALL - getAccessibleIndexInParent (void) + getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return this object's role. virtual sal_Int16 SAL_CALL - getAccessibleRole (void) + getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return this object's description. virtual OUString SAL_CALL - getAccessibleDescription (void) + getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the object's current name. virtual OUString SAL_CALL - getAccessibleName (void) + getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return NULL to indicate that an empty relation set. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL - getAccessibleRelationSet (void) + getAccessibleRelationSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL - getAccessibleStateSet (void) + getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Return the parents locale or throw exception if this object has no parent yet/anymore. */ virtual ::com::sun::star::lang::Locale SAL_CALL - getLocale (void) + getLocale() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception) SAL_OVERRIDE; @@ -194,40 +194,40 @@ public: /** The default implementation returns an empty rectangle. */ - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds (void) + virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** 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() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** 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() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** 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() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** The default implementation does nothing. */ - virtual void SAL_CALL grabFocus (void) + virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns black as the default foreground color. */ - virtual sal_Int32 SAL_CALL getForeground (void) + virtual sal_Int32 SAL_CALL getForeground() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns white as the default background color. */ - virtual sal_Int32 SAL_CALL getBackground (void) + virtual sal_Int32 SAL_CALL getBackground() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleSelection ============================================== @@ -270,7 +270,7 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName (void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Return whether the specified service is supported by this class. @@ -282,10 +282,10 @@ public: /** Returns a list of all supported services. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames (void) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - void SwitchViewActivated (void); + void SwitchViewActivated(); private: class Implementation; ::std::unique_ptr<Implementation> mpImpl; @@ -304,7 +304,7 @@ private: DisposedException is thrown to inform the (indirect) caller of the foul deed. */ - void ThrowIfDisposed (void) + void ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException); /** Check whether or not the object has been disposed (or is in the @@ -313,7 +313,7 @@ private: @return sal_True, if the object is disposed or in the course of being disposed. Otherwise, sal_False is returned. */ - bool IsDisposed (void); + bool IsDisposed(); }; } // end of namespace ::accessibility diff --git a/sd/source/ui/inc/AccessibleViewForwarder.hxx b/sd/source/ui/inc/AccessibleViewForwarder.hxx index b50b91b7651b..d500eb992b4e 100644 --- a/sd/source/ui/inc/AccessibleViewForwarder.hxx +++ b/sd/source/ui/inc/AccessibleViewForwarder.hxx @@ -46,7 +46,7 @@ public: AccessibleViewForwarder (SdrPaintView* pView, OutputDevice& rDevice); - virtual ~AccessibleViewForwarder (void); + virtual ~AccessibleViewForwarder(); //===== IAccessibleViewforwarder ======================================== @@ -56,7 +56,7 @@ public: @return Return <true/> if the view forwarder is valid and <false/> else. */ - virtual bool IsValid (void) const SAL_OVERRIDE; + virtual bool IsValid() const SAL_OVERRIDE; /** Returns the area of the underlying document that is visible in the * corresponding window. diff --git a/sd/source/ui/inc/Client.hxx b/sd/source/ui/inc/Client.hxx index 5f2fd28422bc..279add7ec642 100644 --- a/sd/source/ui/inc/Client.hxx +++ b/sd/source/ui/inc/Client.hxx @@ -43,7 +43,7 @@ class Client : public SfxInPlaceClient public: Client (SdrOle2Obj* pObj, ViewShell* pSdViewShell, vcl::Window* pWindow); - virtual ~Client (void); + virtual ~Client(); SdrOle2Obj* GetSdrOle2Obj() const { return pSdrOle2Obj; } void SetSdrGrafObj(SdrGrafObj* pObj) { pSdrGrafObj = pObj; } diff --git a/sd/source/ui/inc/ClientView.hxx b/sd/source/ui/inc/ClientView.hxx index c2713af809f3..055fd8eb6802 100644 --- a/sd/source/ui/inc/ClientView.hxx +++ b/sd/source/ui/inc/ClientView.hxx @@ -37,7 +37,7 @@ public: DrawDocShell* pDocSh, OutputDevice* pOutDev, DrawViewShell* pShell); - virtual ~ClientView (void); + virtual ~ClientView(); virtual void CompleteRedraw(OutputDevice* pOutDev, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/DocumentRenderer.hxx b/sd/source/ui/inc/DocumentRenderer.hxx index 403825e45935..77a5d1d8f525 100644 --- a/sd/source/ui/inc/DocumentRenderer.hxx +++ b/sd/source/ui/inc/DocumentRenderer.hxx @@ -41,7 +41,7 @@ class DocumentRenderer { public: DocumentRenderer (ViewShellBase& rBase); - virtual ~DocumentRenderer (void); + virtual ~DocumentRenderer(); // XRenderable virtual sal_Int32 SAL_CALL getRendererCount ( diff --git a/sd/source/ui/inc/DrawController.hxx b/sd/source/ui/inc/DrawController.hxx index 68a20852d081..8db4323178c3 100644 --- a/sd/source/ui/inc/DrawController.hxx +++ b/sd/source/ui/inc/DrawController.hxx @@ -99,7 +99,7 @@ public: */ DrawController (ViewShellBase& rBase) throw(); - virtual ~DrawController (void) throw(); + virtual ~DrawController() throw(); /** Replace the currently used sub controller with the given one. This new sub controller is used from now on for the view (that is the @@ -120,7 +120,7 @@ public: /** Call this method when the selection has changed. */ - void FireSelectionChangeListener (void) throw(); + void FireSelectionChangeListener() throw(); /** Call this method when the edit mode has changed. */ @@ -137,7 +137,7 @@ public: /** Broadcast a sidebar context change that is caused by a view switch. */ - void BroadcastContextChange (void) const; + void BroadcastContextChange() const; void NotifyAccUpdate(); void fireChangeLayer( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer>* pCurrentLayer ) throw(); // change the parameter to int @@ -152,16 +152,16 @@ public: The returned pointer is <NULL/> after a call to ReleaseViewShellBase(). */ - ViewShellBase* GetViewShellBase (void) { return mpBase;} + ViewShellBase* GetViewShellBase() { return mpBase;} /** This method is typically called from the destructor of ViewShellBase to tell the DrawController that it and its members must not access the ViewShellBase anymore. After this call the DrawController is semi-disposed. */ - void ReleaseViewShellBase (void); + void ReleaseViewShellBase(); - static const ::com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId (void); + static const ::com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); DECLARE_XINTERFACE() DECLARE_XTYPEPROVIDER() @@ -205,7 +205,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL - getCurrentPage (void) + getCurrentPage() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // lang::XEventListener @@ -221,11 +221,11 @@ public: // XControllerManager virtual css::uno::Reference<css::drawing::framework::XConfigurationController> SAL_CALL - getConfigurationController (void) + getConfigurationController() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference<css::drawing::framework::XModuleController> SAL_CALL - getModuleController (void) + getModuleController() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XUnoTunnel @@ -282,7 +282,7 @@ protected: /** When the called object has been disposed already this method throws a Disposed exception and does not return. */ - void ThrowIfDisposed (void) const + void ThrowIfDisposed() const throw (::com::sun::star::lang::DisposedException); using cppu::OPropertySetHelper::disposing; @@ -327,8 +327,8 @@ private: const ::com::sun::star::uno::Any& rNewValue, const ::com::sun::star::uno::Any& rOldValue); - void ProvideFrameworkControllers (void); - void DisposeFrameworkControllers (void); + void ProvideFrameworkControllers(); + void DisposeFrameworkControllers(); }; } // end of namespace sd diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index 5b25bb8d7339..df23e0a35a56 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -195,7 +195,7 @@ public: @return Returns NULL when the current document has no reference device. */ - virtual OutputDevice* GetDocumentRefDev (void) SAL_OVERRIDE; + virtual OutputDevice* GetDocumentRefDev() SAL_OVERRIDE; DECL_LINK( RenameSlideHdl, AbstractSvxNameDialog* ); diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index 1eb4498b423b..0012c2a9d7fd 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -92,11 +92,11 @@ public: PageKind ePageKind = PK_STANDARD, FrameView* pFrameView = NULL); - virtual ~DrawViewShell (void); + virtual ~DrawViewShell(); virtual void Init (bool bIsMainViewShell) SAL_OVERRIDE; - virtual void Shutdown (void) SAL_OVERRIDE; + virtual void Shutdown() SAL_OVERRIDE; void PrePaint() SAL_OVERRIDE; virtual void Paint(const Rectangle& rRect, ::sd::Window* pWin) SAL_OVERRIDE; @@ -126,7 +126,7 @@ public: the enclosing window and current sizes of buttons, rulers, and sliders. */ - virtual void ArrangeGUIElements (void) SAL_OVERRIDE; + virtual void ArrangeGUIElements() SAL_OVERRIDE; void HidePage(); @@ -136,7 +136,7 @@ public: virtual void MouseButtonDown(const MouseEvent& rMEvt, ::sd::Window* pWin) SAL_OVERRIDE; virtual void Command(const CommandEvent& rCEvt, ::sd::Window* pWin) SAL_OVERRIDE; - virtual void Resize (void) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; void ShowMousePosInfo(const Rectangle& rRect, ::sd::Window* pWin); @@ -289,7 +289,7 @@ public: void ScannerEvent( const ::com::sun::star::lang::EventObject& rEventObject ); - bool IsLayerModeActive (void) const { return mbIsLayerModeActive;} + bool IsLayerModeActive() const { return mbIsLayerModeActive;} sal_uInt16* GetSlotArray() const { return mpSlotArray; } @@ -322,7 +322,7 @@ public: returned value is independent of whether the layer modus is currently active and the tab control is visible. */ - int GetTabLayerCount (void) const; + int GetTabLayerCount() const; /** Return the numerical id of the currently active layer as seen by the layer tab control. @@ -331,7 +331,7 @@ public: number of layers as returned by the <member>GetTabLayerCount</member> method (exclusive). */ - int GetActiveTabLayerIndex (void) const; + int GetActiveTabLayerIndex() const; /** Set the active layer at the layer tab control and update the control accordingly to reflect the change on screen. @@ -345,11 +345,11 @@ public: /** Return a pointer to the tab control for pages. */ - TabControl& GetPageTabControl (void) { return maTabControl;} + TabControl& GetPageTabControl() { return maTabControl;} /** Return a pointer to the tab control for layers. */ - LayerTabBar* GetLayerTabControl (void); + LayerTabBar* GetLayerTabControl(); /** Renames the given slide using an SvxNameDialog @@ -365,7 +365,7 @@ public: /** modifies the given layer with the given values */ void ModifyLayer( SdrLayer* pLayer, const OUString& rLayerName, const OUString& rLayerTitle, const OUString& rLayerDesc, bool bIsVisible, bool bIsLocked, bool bIsPrintable ); - virtual css::uno::Reference<css::drawing::XDrawSubController> CreateSubController (void) SAL_OVERRIDE; + virtual css::uno::Reference<css::drawing::XDrawSubController> CreateSubController() SAL_OVERRIDE; DrawView* GetDrawView() const { return mpDrawView; } @@ -374,7 +374,7 @@ public: */ virtual bool RelocateToParentWindow (::vcl::Window* pParentWindow) SAL_OVERRIDE; - OUString GetSidebarContextName (void) const; + OUString GetSidebarContextName() const; //move this method to ViewShell. //void NotifyAccUpdate(); diff --git a/sd/source/ui/inc/EventMultiplexer.hxx b/sd/source/ui/inc/EventMultiplexer.hxx index f7cb8088a5af..68ee23083ca4 100644 --- a/sd/source/ui/inc/EventMultiplexer.hxx +++ b/sd/source/ui/inc/EventMultiplexer.hxx @@ -159,7 +159,7 @@ public: /** Create new EventMultiplexer for the given ViewShellBase object. */ EventMultiplexer (ViewShellBase& rBase); - ~EventMultiplexer (void); + ~EventMultiplexer(); /** Some constants that make it easier to remove a listener for all event types at once. diff --git a/sd/source/ui/inc/FormShellManager.hxx b/sd/source/ui/inc/FormShellManager.hxx index 0168800353ca..ef8a4212dcea 100644 --- a/sd/source/ui/inc/FormShellManager.hxx +++ b/sd/source/ui/inc/FormShellManager.hxx @@ -51,7 +51,7 @@ class FormShellManager { public: FormShellManager (ViewShellBase& rBase); - virtual ~FormShellManager (void); + virtual ~FormShellManager(); /** Typically called by a ShellFactory. It tells the FormShellManager which form shell to manage. @@ -66,7 +66,7 @@ public: The result may be <NULL/> when the SetFormShell() method has not yet been called or was last called with <NULL/>. */ - FmFormShell* GetFormShell (void) { return mpFormShell;} + FmFormShell* GetFormShell() { return mpFormShell;} private: ViewShellBase& mrBase; @@ -96,12 +96,12 @@ private: the deselection of the form shell. The later informs about its selection. */ - void RegisterAtCenterPane (void); + void RegisterAtCenterPane(); /** Unregister the listeners that were registered in RegisterAtCenterPane(). */ - void UnregisterAtCenterPane (void); + void UnregisterAtCenterPane(); /** This call back is called by the application window (among others) when the window gets the focus. In this case the form shell is diff --git a/sd/source/ui/inc/FrameView.hxx b/sd/source/ui/inc/FrameView.hxx index d24b0d80581e..2aa665224ae4 100644 --- a/sd/source/ui/inc/FrameView.hxx +++ b/sd/source/ui/inc/FrameView.hxx @@ -114,7 +114,7 @@ public: /** Return the value of the edit mode as it was when the document was loaded. */ - EditMode GetViewShEditModeOnLoad (void) const { return meEditModeOnLoad;} + EditMode GetViewShEditModeOnLoad() const { return meEditModeOnLoad;} void SetLayerMode(bool bMode) { mbLayerMode = bMode; } @@ -141,14 +141,14 @@ public: /** Return the type of the view shell previously associated with this frame view. */ - ViewShell::ShellType GetPreviousViewShellType (void) const { return mePreviousViewShellType;} + ViewShell::ShellType GetPreviousViewShellType() const { return mePreviousViewShellType;} /** Remember the type of the view shell at the time when the document is loaded or, rather, when the ViewShellBase is constructed. */ void SetViewShellTypeOnLoad (ViewShell::ShellType eType); - ViewShell::ShellType GetViewShellTypeOnLoad (void) const { return meViewShellTypeOnLoad;} + ViewShell::ShellType GetViewShellTypeOnLoad() const { return meViewShellTypeOnLoad;} void SetPresentationViewShellId(sal_uInt16 nId) { mnPresViewShellId = nId; } @@ -164,7 +164,7 @@ public: sal_uLong GetDrawMode() const { return mnDrawMode; }; void SetIsNavigatorShowingAllShapes (const bool bIsNavigatorShowingAllShapes); - bool IsNavigatorShowingAllShapes (void) const { return mbIsNavigatorShowingAllShapes;} + bool IsNavigatorShowingAllShapes() const { return mbIsNavigatorShowingAllShapes;} void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ); void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ); diff --git a/sd/source/ui/inc/GraphicDocShell.hxx b/sd/source/ui/inc/GraphicDocShell.hxx index 7734f9089b83..b11f3c427547 100644 --- a/sd/source/ui/inc/GraphicDocShell.hxx +++ b/sd/source/ui/inc/GraphicDocShell.hxx @@ -56,7 +56,7 @@ public: bool bSdDataObj=false, DocumentType=DOCUMENT_TYPE_DRAW); - virtual ~GraphicDocShell (void); + virtual ~GraphicDocShell(); }; } // end of namespace sd diff --git a/sd/source/ui/inc/GraphicObjectBar.hxx b/sd/source/ui/inc/GraphicObjectBar.hxx index bd0f5804bac5..e0847c8bc6ae 100644 --- a/sd/source/ui/inc/GraphicObjectBar.hxx +++ b/sd/source/ui/inc/GraphicObjectBar.hxx @@ -42,7 +42,7 @@ private: public: GraphicObjectBar (ViewShell* pSdViewShell, ::sd::View* pSdView); - virtual ~GraphicObjectBar (void); + virtual ~GraphicObjectBar(); void GetAttrState( SfxItemSet& rSet ); void Execute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/GraphicViewShell.hxx b/sd/source/ui/inc/GraphicViewShell.hxx index 7077e3714568..c8a0b34c4bea 100644 --- a/sd/source/ui/inc/GraphicViewShell.hxx +++ b/sd/source/ui/inc/GraphicViewShell.hxx @@ -62,15 +62,15 @@ public: vcl::Window* pParentWindow, FrameView* pFrameView = NULL); - virtual ~GraphicViewShell (void); + virtual ~GraphicViewShell(); /** Override this method in order to have the layer mode always active. */ virtual void ChangeEditMode (EditMode eMode, bool bIsLayerModeActive) SAL_OVERRIDE; protected: - void ConstructGraphicViewShell (void); - virtual void ArrangeGUIElements (void) SAL_OVERRIDE; + void ConstructGraphicViewShell(); + virtual void ArrangeGUIElements() SAL_OVERRIDE; }; } // end of namespace sd diff --git a/sd/source/ui/inc/GraphicViewShellBase.hxx b/sd/source/ui/inc/GraphicViewShellBase.hxx index d0a58861cd78..3acf53699f96 100644 --- a/sd/source/ui/inc/GraphicViewShellBase.hxx +++ b/sd/source/ui/inc/GraphicViewShellBase.hxx @@ -38,14 +38,14 @@ public: macros. */ GraphicViewShellBase (SfxViewFrame *pFrame, SfxViewShell* pOldShell); - virtual ~GraphicViewShellBase (void); + virtual ~GraphicViewShellBase(); /** Callback function for general slot calls. */ virtual void Execute (SfxRequest& rRequest) SAL_OVERRIDE; protected: - virtual void InitializeFramework (void) SAL_OVERRIDE; + virtual void InitializeFramework() SAL_OVERRIDE; }; } // end of namespace sd diff --git a/sd/source/ui/inc/ImpressViewShellBase.hxx b/sd/source/ui/inc/ImpressViewShellBase.hxx index 3538473b386e..c4522288b8fa 100644 --- a/sd/source/ui/inc/ImpressViewShellBase.hxx +++ b/sd/source/ui/inc/ImpressViewShellBase.hxx @@ -38,14 +38,14 @@ public: macros. */ ImpressViewShellBase (SfxViewFrame *pFrame, SfxViewShell* pOldShell); - virtual ~ImpressViewShellBase (void); + virtual ~ImpressViewShellBase(); /** Callback function for general slot calls. */ virtual void Execute (SfxRequest& rRequest) SAL_OVERRIDE; protected: - virtual void InitializeFramework (void) SAL_OVERRIDE; + virtual void InitializeFramework() SAL_OVERRIDE; }; } // end of namespace sd diff --git a/sd/source/ui/inc/LayerTabBar.hxx b/sd/source/ui/inc/LayerTabBar.hxx index 061c2a78258c..bb79203ea923 100644 --- a/sd/source/ui/inc/LayerTabBar.hxx +++ b/sd/source/ui/inc/LayerTabBar.hxx @@ -38,19 +38,19 @@ public: LayerTabBar ( DrawViewShell* pDrViewSh, vcl::Window* pParent); - virtual ~LayerTabBar (void); + virtual ~LayerTabBar(); /** Inform all listeners of this control that the current layer has been activated. Call this method after switching the current layer and is not done elsewhere (like when using ctrl + page up/down keys). */ - void SendActivatePageEvent (void); + void SendActivatePageEvent(); /** Inform all listeners of this control that the current layer has been deactivated. Call this method before switching the current layer and is not done elsewhere (like when using ctrl page up/down keys). */ - void SendDeactivatePageEvent (void); + void SendDeactivatePageEvent(); protected: DrawViewShell* pDrViewSh; diff --git a/sd/source/ui/inc/MasterPageObserver.hxx b/sd/source/ui/inc/MasterPageObserver.hxx index 0e2f8f77632c..41d454665103 100644 --- a/sd/source/ui/inc/MasterPageObserver.hxx +++ b/sd/source/ui/inc/MasterPageObserver.hxx @@ -43,7 +43,7 @@ public: /** Return the single instance of this class. */ - static MasterPageObserver& Instance (void); + static MasterPageObserver& Instance(); /** The master page observer will listen to events of this document and detect changes of the use of master pages. @@ -77,8 +77,8 @@ private: class Implementation; ::std::unique_ptr<Implementation> mpImpl; - MasterPageObserver (void); - virtual ~MasterPageObserver (void); + MasterPageObserver(); + virtual ~MasterPageObserver(); MasterPageObserver (const MasterPageObserver&) SAL_DELETED_FUNCTION; diff --git a/sd/source/ui/inc/MediaObjectBar.hxx b/sd/source/ui/inc/MediaObjectBar.hxx index 00be1fbfc83b..47aea20a7366 100644 --- a/sd/source/ui/inc/MediaObjectBar.hxx +++ b/sd/source/ui/inc/MediaObjectBar.hxx @@ -43,7 +43,7 @@ private: public: MediaObjectBar (ViewShell* pSdViewShell, ::sd::View* pSdView); - virtual ~MediaObjectBar (void); + virtual ~MediaObjectBar(); void GetState( SfxItemSet& rSet ); void Execute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx index d97042f521a5..8d0cfbd1ba2f 100644 --- a/sd/source/ui/inc/OutlineView.hxx +++ b/sd/source/ui/inc/OutlineView.hxx @@ -59,15 +59,15 @@ public: OutlineView (DrawDocShell& rDocSh, ::vcl::Window* pWindow, OutlineViewShell& rOutlineViewSh); - virtual ~OutlineView (void); + virtual ~OutlineView(); /** This method is called by the view shell that owns the view to tell the view that it can safely connect to the application. This method must not be called before the view shell is on the shell stack. */ - void ConnectToApplication (void); - void DisconnectFromApplication (void); + void ConnectToApplication(); + void DisconnectFromApplication(); TYPEINFO_OVERRIDE(); diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx index cf8835d4d036..9bf1d45c1b2a 100644 --- a/sd/source/ui/inc/OutlineViewShell.hxx +++ b/sd/source/ui/inc/OutlineViewShell.hxx @@ -59,9 +59,9 @@ public: ::vcl::Window* pParentWindow, FrameView* pFrameView = NULL); - virtual ~OutlineViewShell (void); + virtual ~OutlineViewShell(); - virtual void Shutdown (void) SAL_OVERRIDE; + virtual void Shutdown() SAL_OVERRIDE; virtual void Paint(const Rectangle& rRect, ::sd::Window* pWin) SAL_OVERRIDE; @@ -70,7 +70,7 @@ public: the enclosing window and current sizes of buttons, rulers, and sliders. */ - virtual void ArrangeGUIElements (void) SAL_OVERRIDE; + virtual void ArrangeGUIElements() SAL_OVERRIDE; virtual bool PrepareClose( bool bUI = true ) SAL_OVERRIDE; @@ -137,7 +137,7 @@ public: */ virtual void UpdatePreview (SdPage* pPage, bool bInit = false) SAL_OVERRIDE; - virtual css::uno::Reference<css::drawing::XDrawSubController> CreateSubController (void) SAL_OVERRIDE; + virtual css::uno::Reference<css::drawing::XDrawSubController> CreateSubController() SAL_OVERRIDE; /** Make the given page the new current page. This method notifies the controller and adapts the selection of the diff --git a/sd/source/ui/inc/OutlineViewShellBase.hxx b/sd/source/ui/inc/OutlineViewShellBase.hxx index 2cbabd04c0da..68bfb33963bf 100644 --- a/sd/source/ui/inc/OutlineViewShellBase.hxx +++ b/sd/source/ui/inc/OutlineViewShellBase.hxx @@ -38,7 +38,7 @@ public: macros. */ OutlineViewShellBase (SfxViewFrame *pFrame, SfxViewShell* pOldShell); - virtual ~OutlineViewShellBase (void); + virtual ~OutlineViewShellBase(); }; } // end of namespace sd diff --git a/sd/source/ui/inc/OutlinerIteratorImpl.hxx b/sd/source/ui/inc/OutlinerIteratorImpl.hxx index eb506187ecec..df8ef82fdcae 100644 --- a/sd/source/ui/inc/OutlinerIteratorImpl.hxx +++ b/sd/source/ui/inc/OutlinerIteratorImpl.hxx @@ -60,14 +60,14 @@ public: IteratorImplBase (SdDrawDocument* pDocument, const ::boost::weak_ptr<ViewShell>& rpViewShellWeak, bool bDirectionIsForward, PageKind ePageKind, EditMode eEditMode); - virtual ~IteratorImplBase (void); + virtual ~IteratorImplBase(); /** Advance to the next text of the current object or to the next object. This takes the iteration direction into account. The new object pointed to can be retrieved (among other information) by calling the <member>GetPosition</member> method. */ - virtual void GotoNextText (void) = 0; + virtual void GotoNextText() = 0; /** Return an object that describes the current object. @return The returned object describes the current object pointed to by @@ -75,7 +75,7 @@ public: <type>IteratorPosition</type> for details on the available information. */ - virtual const IteratorPosition& GetPosition (void); + virtual const IteratorPosition& GetPosition(); /** Create an exact copy of this object. No argument should be specified when called from the outside. It then creates an object first and passes that to the inherited <member>Clone()</member> @@ -107,7 +107,7 @@ public: virtual bool IsEqual (const IteratorImplBase& rIterator, IteratorType aType) const; /** Reverse the direction of iteration. The current object stays the same. */ - virtual void Reverse (void); + virtual void Reverse(); protected: /// The current position as returned by <member>GetPosition()</member>. @@ -140,10 +140,10 @@ public: const ::boost::weak_ptr<ViewShell>& rpViewShellWeak, bool bDirectionIsForward); SelectionIteratorImpl (const SelectionIteratorImpl& rObject); - virtual ~SelectionIteratorImpl (void); + virtual ~SelectionIteratorImpl(); - virtual void GotoNextText (void) SAL_OVERRIDE; - virtual const IteratorPosition& GetPosition (void) SAL_OVERRIDE; + virtual void GotoNextText() SAL_OVERRIDE; + virtual const IteratorPosition& GetPosition() SAL_OVERRIDE; virtual IteratorImplBase* Clone (IteratorImplBase* pObject) const SAL_OVERRIDE; virtual bool operator== (const IteratorImplBase& rIterator) const SAL_OVERRIDE; @@ -188,11 +188,11 @@ public: bool bDirectionIsForward, PageKind ePageKind, EditMode eEditMode); - virtual ~ViewIteratorImpl (void); + virtual ~ViewIteratorImpl(); - virtual void GotoNextText (void) SAL_OVERRIDE; + virtual void GotoNextText() SAL_OVERRIDE; virtual IteratorImplBase* Clone (IteratorImplBase* pObject) const SAL_OVERRIDE; - virtual void Reverse (void) SAL_OVERRIDE; + virtual void Reverse() SAL_OVERRIDE; protected: /** Initialize this iterator with respect to the given location. After @@ -236,9 +236,9 @@ public: SdDrawDocument* pDocument, const ::boost::weak_ptr<ViewShell>& rpViewShellWeak, bool bDirectionIsForward); - virtual ~DocumentIteratorImpl (void); + virtual ~DocumentIteratorImpl(); - virtual void GotoNextText (void) SAL_OVERRIDE; + virtual void GotoNextText() SAL_OVERRIDE; virtual IteratorImplBase* Clone (IteratorImplBase* pObject) const SAL_OVERRIDE; private: diff --git a/sd/source/ui/inc/PaneDockingWindow.hxx b/sd/source/ui/inc/PaneDockingWindow.hxx index fd908f7f033a..a8d3b2167b34 100644 --- a/sd/source/ui/inc/PaneDockingWindow.hxx +++ b/sd/source/ui/inc/PaneDockingWindow.hxx @@ -65,7 +65,7 @@ public: VerticalOrientation. Otherwise UnknownOrientation is returned. */ - Orientation GetOrientation (void) const; + Orientation GetOrientation() const; }; } // end of namespace ::sd diff --git a/sd/source/ui/inc/PaneShells.hxx b/sd/source/ui/inc/PaneShells.hxx index 51dc0f7e9599..b362d3e35c95 100644 --- a/sd/source/ui/inc/PaneShells.hxx +++ b/sd/source/ui/inc/PaneShells.hxx @@ -41,8 +41,8 @@ private: static void InitInterface_Impl(); public: - LeftImpressPaneShell (void); - virtual ~LeftImpressPaneShell (void); + LeftImpressPaneShell(); + virtual ~LeftImpressPaneShell(); }; /** Shell that displays the left pane for Draw. The shell does not do @@ -60,8 +60,8 @@ private: static void InitInterface_Impl(); public: - LeftDrawPaneShell (void); - virtual ~LeftDrawPaneShell (void); + LeftDrawPaneShell(); + virtual ~LeftDrawPaneShell(); }; /** Shell that displays the right pane for both Impress and Draw. The shell diff --git a/sd/source/ui/inc/PresentationViewShell.hxx b/sd/source/ui/inc/PresentationViewShell.hxx index 53bbde6cba4b..e91ae3de7ad6 100644 --- a/sd/source/ui/inc/PresentationViewShell.hxx +++ b/sd/source/ui/inc/PresentationViewShell.hxx @@ -41,7 +41,7 @@ private: public: PresentationViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, vcl::Window* pParentWindow, FrameView* pFrameView = NULL); - virtual ~PresentationViewShell (void); + virtual ~PresentationViewShell(); /** This method is used by a simple class that passes some arguments from the creator of the new view shell to the new view @@ -52,7 +52,7 @@ public: */ void FinishInitialization( FrameView* pFrameView ); - virtual void Resize (void) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; protected: virtual SvxRuler* CreateHRuler(::sd::Window* pWin, bool bIsFirst) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/PresentationViewShellBase.hxx b/sd/source/ui/inc/PresentationViewShellBase.hxx index 3eddaaceb19d..f52c6a243cee 100644 --- a/sd/source/ui/inc/PresentationViewShellBase.hxx +++ b/sd/source/ui/inc/PresentationViewShellBase.hxx @@ -38,10 +38,10 @@ public: macros. */ PresentationViewShellBase (SfxViewFrame *pFrame, SfxViewShell* pOldShell); - virtual ~PresentationViewShellBase (void); + virtual ~PresentationViewShellBase(); protected: - virtual void InitializeFramework (void) SAL_OVERRIDE; + virtual void InitializeFramework() SAL_OVERRIDE; }; } // end of namespace sd diff --git a/sd/source/ui/inc/PreviewRenderer.hxx b/sd/source/ui/inc/PreviewRenderer.hxx index 515918491b3c..ec7c5fadcadc 100644 --- a/sd/source/ui/inc/PreviewRenderer.hxx +++ b/sd/source/ui/inc/PreviewRenderer.hxx @@ -51,7 +51,7 @@ public: OutputDevice* pTemplate = NULL, const bool bPaintFrame = true); - virtual ~PreviewRenderer (void); + virtual ~PreviewRenderer(); /** Render a page with the given pixel size. Use this version when only the width of the preview is known to the @@ -139,12 +139,12 @@ private: const SdPage* pPage, const Size& rPixelSize, const bool bObeyHighContrastMode); - void Cleanup (void); + void Cleanup(); void PaintPage ( const SdPage* pPage, const bool bDisplayPresentationObjects); void PaintSubstitutionText (const OUString& rSubstitutionText); - void PaintFrame (void); + void PaintFrame(); /** Set up the map mode so that the given page is renderer into a bitmap with the specified width. diff --git a/sd/source/ui/inc/Ruler.hxx b/sd/source/ui/inc/Ruler.hxx index 956585e3a35e..64d214f77420 100644 --- a/sd/source/ui/inc/Ruler.hxx +++ b/sd/source/ui/inc/Ruler.hxx @@ -40,7 +40,7 @@ public: sal_uInt16 nRulerFlags, SfxBindings& rBindings, WinBits nWinStyle); - virtual ~Ruler (void); + virtual ~Ruler(); void SetNullOffset(const Point& rOffset); diff --git a/sd/source/ui/inc/SdUnoDrawView.hxx b/sd/source/ui/inc/SdUnoDrawView.hxx index 3a39b8733eaf..6a9ae21c83a8 100644 --- a/sd/source/ui/inc/SdUnoDrawView.hxx +++ b/sd/source/ui/inc/SdUnoDrawView.hxx @@ -44,7 +44,7 @@ public: SdUnoDrawView ( DrawViewShell& rViewShell, View& rView) throw(); - virtual ~SdUnoDrawView (void) throw(); + virtual ~SdUnoDrawView() throw(); // XSelectionSupplier @@ -54,7 +54,7 @@ public: css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getSelection (void) + virtual css::uno::Any SAL_CALL getSelection() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -73,7 +73,7 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage (void) + virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XFastPropertySet @@ -99,9 +99,9 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - bool getMasterPageMode(void) const throw(); + bool getMasterPageMode() const throw(); void setMasterPageMode(bool MasterPageMode_) throw(); - bool getLayerMode(void) const throw(); + bool getLayerMode() const throw(); void setLayerMode(bool LayerMode_) throw(); public: /** Return a reference to the active layer object. @@ -109,7 +109,7 @@ public: The returned value may be empty when the internal state of this view is not valid (like during destruction.) */ - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer> getActiveLayer (void) throw (); + ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer> getActiveLayer() throw (); protected: /** Make the specified object the active layer. @param rxLayer @@ -118,7 +118,7 @@ protected: void setActiveLayer (const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer>& rxLayer) throw (css::uno::RuntimeException); void SetZoom( sal_Int16 nZoom ); - sal_Int16 GetZoom(void) const; + sal_Int16 GetZoom() const; void SetViewOffset(const com::sun::star::awt::Point& rWinPos ); com::sun::star::awt::Point GetViewOffset() const; @@ -131,7 +131,7 @@ private: DrawViewShell& mrDrawViewShell; sd::View& mrView; - SdXImpressDocument* GetModel (void) const throw(); + SdXImpressDocument* GetModel() const throw(); }; } // end of namespace sd diff --git a/sd/source/ui/inc/SdUnoOutlineView.hxx b/sd/source/ui/inc/SdUnoOutlineView.hxx index 38691b671761..ad3295718240 100644 --- a/sd/source/ui/inc/SdUnoOutlineView.hxx +++ b/sd/source/ui/inc/SdUnoOutlineView.hxx @@ -37,9 +37,9 @@ class SdUnoOutlineView public: SdUnoOutlineView ( OutlineViewShell& rViewShell) throw(); - virtual ~SdUnoOutlineView (void) throw(); + virtual ~SdUnoOutlineView() throw(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XSelectionSupplier @@ -48,7 +48,7 @@ public: throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getSelection (void) + virtual css::uno::Any SAL_CALL getSelection() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addSelectionChangeListener ( @@ -65,7 +65,7 @@ public: const css::uno::Reference<css::drawing::XDrawPage >& xPage) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage (void) + virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XFastPropertySet diff --git a/sd/source/ui/inc/SdUnoSlideView.hxx b/sd/source/ui/inc/SdUnoSlideView.hxx index 38f755ee5e21..7a6d741b555b 100644 --- a/sd/source/ui/inc/SdUnoSlideView.hxx +++ b/sd/source/ui/inc/SdUnoSlideView.hxx @@ -40,7 +40,7 @@ class SdUnoSlideView public: SdUnoSlideView ( slidesorter::SlideSorter& rSlideSorter) throw(); - virtual ~SdUnoSlideView (void) throw(); + virtual ~SdUnoSlideView() throw(); // XSelectionSupplier @@ -48,7 +48,7 @@ public: throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getSelection (void) + virtual ::com::sun::star::uno::Any SAL_CALL getSelection() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addSelectionChangeListener ( @@ -66,7 +66,7 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL - getCurrentPage (void) + getCurrentPage() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XFastPropertySet diff --git a/sd/source/ui/inc/ShellFactory.hxx b/sd/source/ui/inc/ShellFactory.hxx index 5cfde74b3c8e..9c8eb4e6aab9 100644 --- a/sd/source/ui/inc/ShellFactory.hxx +++ b/sd/source/ui/inc/ShellFactory.hxx @@ -39,7 +39,7 @@ public: /** This abstract virtual class needs a destructor so that the destructors of derived classes are called. */ - virtual ~ShellFactory (void) {}; + virtual ~ShellFactory() {}; /** Create a new instance of a view shell for the given id that will be stacked onto the given view shell base. diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx index ff2d6624f7b7..8854e242eee1 100644 --- a/sd/source/ui/inc/SlideSorter.hxx +++ b/sd/source/ui/inc/SlideSorter.hxx @@ -72,7 +72,7 @@ class SlideSorter { friend class controller::SlotManager; public: - virtual ~SlideSorter (void); + virtual ~SlideSorter(); /** Return whether the called SlideSorter object is valid and calling its Get(Model,View,Controller) methods is safe. When <FALSE/> is @@ -80,7 +80,7 @@ public: Calling this method should be necessary only during startup and shutdown (when that can be detected). */ - bool IsValid (void) const { return mbIsValid;} + bool IsValid() const { return mbIsValid;} /** 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. @@ -120,44 +120,44 @@ public: /** Return the control of the vertical scroll bar. */ - ::boost::shared_ptr<ScrollBar> GetVerticalScrollBar (void) const { return mpVerticalScrollBar;} + ::boost::shared_ptr<ScrollBar> GetVerticalScrollBar() const { return mpVerticalScrollBar;} /** Return the control of the horizontal scroll bar. */ - ::boost::shared_ptr<ScrollBar> GetHorizontalScrollBar (void) const { return mpHorizontalScrollBar;} + ::boost::shared_ptr<ScrollBar> GetHorizontalScrollBar() const { return mpHorizontalScrollBar;} /** Return the scroll bar filler that paints the little square that is enclosed by the two scroll bars. */ - ::boost::shared_ptr<ScrollBarBox> GetScrollBarFiller (void) const { return mpScrollBarBox;} + ::boost::shared_ptr<ScrollBarBox> GetScrollBarFiller() const { return mpScrollBarBox;} /** Return the content window. This is a sibling and is geometrically enclosed by the scroll bars. */ - SharedSdWindow GetContentWindow (void) const { return mpContentWindow;} + SharedSdWindow GetContentWindow() const { return mpContentWindow;} - model::SlideSorterModel& GetModel (void) const; + model::SlideSorterModel& GetModel() const; - view::SlideSorterView& GetView (void) const; + view::SlideSorterView& GetView() const; - controller::SlideSorterController& GetController (void) const; + controller::SlideSorterController& GetController() const; /** Return the view shell that was given at construction. @return May be empty. */ - ViewShell* GetViewShell (void) const { return mpViewShell;} + ViewShell* GetViewShell() const { return mpViewShell;} /** Return the XController object of the main view. */ ::com::sun::star::uno::Reference<com::sun::star::frame::XController> - GetXController (void) const; + GetXController() const; /** Return the ViewShellBase object. @return May be empty. */ - ViewShellBase* GetViewShellBase (void) const { return mpViewShellBase;} + ViewShellBase* GetViewShellBase() const { return mpViewShellBase;} void Paint (const Rectangle& rRepaintArea); @@ -180,11 +180,11 @@ public: /** Return a collection of properties that are used throughout the slide sorter. */ - ::boost::shared_ptr<controller::Properties> GetProperties (void) const; + ::boost::shared_ptr<controller::Properties> GetProperties() const; /** Return the active theme which gives access to colors and fonts. */ - ::boost::shared_ptr<view::Theme> GetTheme (void) const; + ::boost::shared_ptr<view::Theme> GetTheme() const; protected: /** This virtual method makes it possible to create a specialization of @@ -193,25 +193,25 @@ protected: calls the CreateModel(), CreateView(), and CreateController() methods in this order. */ - void CreateModelViewController (void); + void CreateModelViewController(); /** Create the model for the view shell. When called from the default implementation of CreateModelViewController() then neither view nor controller do exist. Test their pointers when in doubt. */ - model::SlideSorterModel* CreateModel (void); + model::SlideSorterModel* CreateModel(); /** Create the view for the view shell. When called from the default implementation of CreateModelViewController() then the model but not the controller does exist. Test their pointers when in doubt. */ - view::SlideSorterView* CreateView (void); + view::SlideSorterView* CreateView(); /** Create the controller for the view shell. When called from the default implementation of CreateModelViewController() then both the view and the controller do exist. Test their pointers when in doubt. */ - controller::SlideSorterController* CreateController (void); + controller::SlideSorterController* CreateController(); private: bool mbIsValid; @@ -249,7 +249,7 @@ private: ViewShell* pViewShell, ::vcl::Window& rParentWindow); - void Init (void); + void Init(); /** Create the controls for the slide sorter. This are the tab bar for switching the edit mode, the scroll bar, and the actual slide sorter view window. @@ -261,11 +261,11 @@ private: /** This method is usually called exactly one time from the constructor. */ - void SetupListeners (void); + void SetupListeners(); /** Release the listeners that have been installed in SetupListeners(). */ - void ReleaseListeners (void); + void ReleaseListeners(); }; } } // end of namespace ::sd::slidesorter diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx index 659727588b1e..292993522034 100644 --- a/sd/source/ui/inc/SlideSorterViewShell.hxx +++ b/sd/source/ui/inc/SlideSorterViewShell.hxx @@ -56,7 +56,7 @@ public: FrameView* pFrameView, const bool bIsCenterPane); - virtual ~SlideSorterViewShell (void); + virtual ~SlideSorterViewShell(); /** Late initialization that has to be called after a new instance has completed its construction. @@ -72,7 +72,7 @@ public: */ static SlideSorterViewShell* GetSlideSorter (ViewShellBase& rBase); - virtual SdPage* GetActualPage (void) SAL_OVERRIDE; + virtual SdPage* GetActualPage() SAL_OVERRIDE; /// inherited from sd::ViewShell virtual SdPage* getCurrentPage() const SAL_OVERRIDE; @@ -90,7 +90,7 @@ public: void GetClipboardState (SfxItemSet &rSet); virtual void ReadFrameViewData (FrameView* pView) SAL_OVERRIDE; - virtual void WriteFrameViewData (void) SAL_OVERRIDE; + virtual void WriteFrameViewData() SAL_OVERRIDE; /** Set the zoom factor. The given value is clipped against an upper bound. @@ -110,7 +110,7 @@ public: method when something has changed that for instance affects the visibility state of the scroll bars. */ - virtual void ArrangeGUIElements (void) SAL_OVERRIDE; + virtual void ArrangeGUIElements() SAL_OVERRIDE; virtual void Activate (bool IsMDIActivate) SAL_OVERRIDE; virtual void Deactivate (bool IsMDIActivate) SAL_OVERRIDE; @@ -137,7 +137,7 @@ public: /** Return the set of selected pages. */ - ::boost::shared_ptr<PageSelection> GetPageSelection (void) const; + ::boost::shared_ptr<PageSelection> GetPageSelection() const; void SetPageSelection (const ::boost::shared_ptr<PageSelection>& rSelection); @@ -158,7 +158,7 @@ public: */ void RemoveSelectionChangeListener (const Link& rListener); - virtual css::uno::Reference<css::drawing::XDrawSubController> CreateSubController (void) SAL_OVERRIDE; + virtual css::uno::Reference<css::drawing::XDrawSubController> CreateSubController() SAL_OVERRIDE; /** Create an accessible object representing the specified window. @param pWindow @@ -173,7 +173,7 @@ public: // handle SlideSorterView specially because AccessibleSlideSorterView doesn't inherit from AccessibleDocumentViewBase virtual void SwitchViewFireFocus( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc ) SAL_OVERRIDE; - SlideSorter& GetSlideSorter (void) const; + SlideSorter& GetSlideSorter() const; /** Try to relocate all toplevel window elements to the given parent window. @@ -185,7 +185,7 @@ protected: /** Override this method to handle a missing tool bar correctly. This is the case when the slide sorter is not the main view shell. */ - virtual ::svl::IUndoManager* ImpGetUndoManager (void) const SAL_OVERRIDE; + virtual ::svl::IUndoManager* ImpGetUndoManager() const SAL_OVERRIDE; private: ::boost::shared_ptr<SlideSorter> mpSlideSorter; @@ -196,13 +196,13 @@ private: ViewShellBase& rViewShellBase, vcl::Window* pParentWindow, FrameView* pFrameView); - void Initialize (void); + void Initialize(); /** This method overwrites the one from our base class: We do our own scroll bar and the base class call is thus unnecessary. It simply calls UpdateScrollBars(false). */ - virtual void UpdateScrollBars (void) SAL_OVERRIDE; + virtual void UpdateScrollBars() SAL_OVERRIDE; }; typedef ::boost::shared_ptr<SlideSorterViewShell::PageSelection> SharedPageSelection; diff --git a/sd/source/ui/inc/SlideSorterViewShellBase.hxx b/sd/source/ui/inc/SlideSorterViewShellBase.hxx index b76dc738c7cc..4c78ca9abfa7 100644 --- a/sd/source/ui/inc/SlideSorterViewShellBase.hxx +++ b/sd/source/ui/inc/SlideSorterViewShellBase.hxx @@ -38,7 +38,7 @@ public: macros. */ SlideSorterViewShellBase (SfxViewFrame *pFrame, SfxViewShell* pOldShell); - virtual ~SlideSorterViewShellBase (void); + virtual ~SlideSorterViewShellBase(); }; } // end of namespace sd diff --git a/sd/source/ui/inc/SpellDialogChildWindow.hxx b/sd/source/ui/inc/SpellDialogChildWindow.hxx index 73e3ba0c07a2..db658e8ffb61 100644 --- a/sd/source/ui/inc/SpellDialogChildWindow.hxx +++ b/sd/source/ui/inc/SpellDialogChildWindow.hxx @@ -39,12 +39,12 @@ public: sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo); - virtual ~SpellDialogChildWindow (void); + virtual ~SpellDialogChildWindow(); /** This method makes the one from the base class public so that it can be called from the view shell when one is created. */ - void InvalidateSpellDialog (void); + void InvalidateSpellDialog(); SFX_DECL_CHILDWINDOW_WITHID(SpellDialogChildWindow); @@ -59,8 +59,8 @@ protected: spelling dialog back into the document. */ virtual void ApplyChangedSentence(const ::svx::SpellPortions& rChanged, bool bRecheck) SAL_OVERRIDE; - virtual void GetFocus (void) SAL_OVERRIDE; - virtual void LoseFocus (void) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; private: /** This outliner is used to do the main work of iterating over a @@ -78,7 +78,7 @@ private: deletion/release of formerly created/obtained one prior to construction/obtaining of a new one. */ - void ProvideOutliner (void); + void ProvideOutliner(); }; } // end of namespace ::sd diff --git a/sd/source/ui/inc/TabControl.hxx b/sd/source/ui/inc/TabControl.hxx index ece600143a64..b767cc8b2ba7 100644 --- a/sd/source/ui/inc/TabControl.hxx +++ b/sd/source/ui/inc/TabControl.hxx @@ -40,19 +40,19 @@ class TabControl sal_uInt16 RrePageID; public: TabControl (DrawViewShell* pDrViewSh, vcl::Window* pParent); - virtual ~TabControl (void); + virtual ~TabControl(); /** Inform all listeners of this control that the current page has been activated. Call this method after switching the current page and is not done elsewhere (like when using page up/down keys). */ - void SendActivatePageEvent (void); + void SendActivatePageEvent(); /** Inform all listeners of this control that the current page has been deactivated. Call this method before switching the current page and is not done elsewhere (like when using page up/down keys). */ - void SendDeactivatePageEvent (void); + void SendDeactivatePageEvent(); protected: DrawViewShell* pDrViewSh; diff --git a/sd/source/ui/inc/TemplateScanner.hxx b/sd/source/ui/inc/TemplateScanner.hxx index e74f33e1f8c7..1a066eebd0c0 100644 --- a/sd/source/ui/inc/TemplateScanner.hxx +++ b/sd/source/ui/inc/TemplateScanner.hxx @@ -106,33 +106,33 @@ class SD_DLLPUBLIC TemplateScanner public: /** Create a new template scanner and prepare but do not execute the scanning. */ - TemplateScanner (void); + TemplateScanner(); /** The destructor deletes any remaining entries of the local list of templates. */ - virtual ~TemplateScanner (void); + virtual ~TemplateScanner(); /** Execute the actual scanning of templates. When this method terminates the result can be obtained by calling the <member>GetTemplateList</member> method. */ - void Scan (void); + void Scan(); /** Return the list of template folders. It lies in the responsibility of the caller to take ownership of some or all entries and remove them from the returned list. All entries that remain until the destructor is called will be destroyed. */ - std::vector<TemplateDir*>& GetFolderList (void) { return maFolderList;} + std::vector<TemplateDir*>& GetFolderList() { return maFolderList;} /** Implementation of the AsynchronousTask interface method. */ - virtual void RunNextStep (void) SAL_OVERRIDE; + virtual void RunNextStep() SAL_OVERRIDE; /** Implementation of the AsynchronousTask interface method. */ - virtual bool HasNextStep (void) SAL_OVERRIDE; + virtual bool HasNextStep() SAL_OVERRIDE; /** Return the TemplateDir object that was last added to mpTemplateDirectory. @@ -140,7 +140,7 @@ public: <NULL/> is returned either before the template scanning is started or after it has ended. */ - const TemplateEntry* GetLastAddedEntry (void) const { return mpLastAddedEntry;} + const TemplateEntry* GetLastAddedEntry() const { return mpLastAddedEntry;} /** Set whether to sort the template entries inside the regions. */ @@ -198,40 +198,40 @@ private: /** Obtain the root folder of the template folder hierarchy. The result is stored in mxTemplateRoot for later use. */ - State GetTemplateRoot (void); + State GetTemplateRoot(); /** Initialize the scanning of folders. This is called exactly once. @return Returns one of the two states ERROR or GATHER_FOLDER_LIST. */ - State InitializeFolderScanning (void); + State InitializeFolderScanning(); /** Collect all available top-level folders in an ordered list which can then be processed by ScanFolder(). @return Returns one of the two states ERROR or SCAN_FOLDER. */ - State GatherFolderList (void); + State GatherFolderList(); /** From the list of top-level folders collected by GatherFolderList() the one with highest priority is processed. @return Returns one of the states ERROR, DONE, or INITILIZE_ENTRY_SCAN. */ - State ScanFolder (void); + State ScanFolder(); /** Initialize the scanning of entries of a top-level folder. @return Returns one of the states ERROR or SCAN_ENTRY. */ - State InitializeEntryScanning (void); + State InitializeEntryScanning(); /** Scan one entry. When this entry matches the recognized template types it is appended to the result set. @return Returns one of the states ERROR, SCAN_ENTRY, or SCAN_FOLDER. */ - State ScanEntry (void); + State ScanEntry(); }; } // end of namespace sd diff --git a/sd/source/ui/inc/TextObjectBar.hxx b/sd/source/ui/inc/TextObjectBar.hxx index 1b12cfe1c6df..026f664995e2 100644 --- a/sd/source/ui/inc/TextObjectBar.hxx +++ b/sd/source/ui/inc/TextObjectBar.hxx @@ -47,7 +47,7 @@ public: ViewShell* pSdViewShell, SfxItemPool& rItemPool, ::sd::View* pSdView); - virtual ~TextObjectBar (void); + virtual ~TextObjectBar(); void GetAttrState( SfxItemSet& rSet ); void GetCharState( SfxItemSet& rSet ); diff --git a/sd/source/ui/inc/ToolBarManager.hxx b/sd/source/ui/inc/ToolBarManager.hxx index 5d3e392ba9e1..b5b9f80df612 100644 --- a/sd/source/ui/inc/ToolBarManager.hxx +++ b/sd/source/ui/inc/ToolBarManager.hxx @@ -74,14 +74,14 @@ public: const ::boost::shared_ptr<tools::EventMultiplexer>& rpMultiplexer, const ::boost::shared_ptr<ViewShellManager>& rpViewShellManager); - ~ToolBarManager (void); + ~ToolBarManager(); /** Call this method prior to the destructor to prevent the ToolBarManager from accessing the ViewShellManager or the XLayoutManager when those are possibly not well and alive anymore (like during the destruction of the ViewShellBase.) */ - void Shutdown (void); + void Shutdown(); /** When the view in the center pane changes then this method sets up the initial set of tool bars for the new view. @@ -146,7 +146,7 @@ public: When this shell is not the main view then the method returns immediately. */ - void ResetAllToolBars (void); + void ResetAllToolBars(); /** Add the tool bar with the given name to the specified group of tool bars. @@ -223,19 +223,19 @@ public: ToolBarGroup eGroup, ShellId nToolBarId); - void PreUpdate (void); + void PreUpdate(); /** Request an update of the active tool bars. The update is made asynchronously. */ - void RequestUpdate (void); + void RequestUpdate(); /** This is a hint for the ToolBarManager to improve the performance when it updates its tool bars when its own lock is released. Taking control of the release of the update lock of the ViewShellManager avoids some shell stack modifications and tool bar updates. */ - void LockViewShellManager (void); + void LockViewShellManager(); /** Use this class to prevent the visible tool bars from being updated (and thus causing repaints and GUI rearrangements) when several tool @@ -244,13 +244,13 @@ public: class UpdateLock { public: UpdateLock(const ::boost::shared_ptr<ToolBarManager>& rpManager) : mpManager(rpManager) { mpManager->LockUpdate(); } - ~UpdateLock(void) { mpManager->UnlockUpdate(); } + ~UpdateLock() { mpManager->UnlockUpdate(); } private: ::boost::shared_ptr<ToolBarManager> mpManager; }; friend class UpdateLock; - void ToolBarsDestroyed(void); + void ToolBarsDestroyed(); private: class Implementation; @@ -259,10 +259,10 @@ private: /** The ViewShellBase is used to get the XLayoutManager and to determine the plug in mode. */ - ToolBarManager (void); + ToolBarManager(); - void LockUpdate (void); - void UnlockUpdate (void); + void LockUpdate(); + void UnlockUpdate(); }; } // end of namespace sd diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index 9e60436b5e77..1b22016d93e2 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -91,7 +91,7 @@ public: SdDrawDocument& rDrawDoc, OutputDevice* pOutDev, ViewShell* pViewSh=NULL); - virtual ~View (void); + virtual ~View(); void CompleteRedraw( OutputDevice* pOutDev, const ::vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) SAL_OVERRIDE; @@ -133,9 +133,9 @@ public: void UpdateSelectionClipboard( bool bForceDeselect ); - inline DrawDocShell* GetDocSh(void) const { return mpDocSh; } - inline SdDrawDocument& GetDoc(void) const; - inline ViewShell* GetViewShell(void) const { return mpViewSh; } + inline DrawDocShell* GetDocSh() const { return mpDocSh; } + inline SdDrawDocument& GetDoc() const; + inline ViewShell* GetViewShell() const { return mpViewSh; } virtual bool SdrBeginTextEdit(SdrObject* pObj, SdrPageView* pPV = 0L, ::vcl::Window* pWin = 0L, bool bIsNewObj = false, SdrOutliner* pGivenOutliner = 0L, OutlinerView* pGivenOutlinerView = 0L, @@ -297,7 +297,7 @@ private: OutlinerMasterViewFilter maMasterViewFilter; }; -SdDrawDocument& View::GetDoc (void) const +SdDrawDocument& View::GetDoc() const { return mrDoc; } diff --git a/sd/source/ui/inc/ViewClipboard.hxx b/sd/source/ui/inc/ViewClipboard.hxx index 86f3bbaaf7f6..6778d7dcf09d 100644 --- a/sd/source/ui/inc/ViewClipboard.hxx +++ b/sd/source/ui/inc/ViewClipboard.hxx @@ -35,7 +35,7 @@ class ViewClipboard { public: ViewClipboard (::sd::View& rView); - virtual ~ViewClipboard (void); + virtual ~ViewClipboard(); /** Handle the drop of a drag-and-drop action where the transferable contains a set of pages. diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index 6d8ba4080a0e..1b46129e1087 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -118,7 +118,7 @@ public: ::vcl::Window* pParentWindow, ViewShellBase& rViewShellBase, bool bAllowCenter = true); - virtual ~ViewShell (void); + virtual ~ViewShell(); /** The Init method has to be called from the outside directly after a new object of this class has been created. It can be @@ -138,27 +138,27 @@ public: view shell is still a valid object and can safely call methods that rely on that. */ - void Exit (void); + void Exit(); void Cancel(); /** Return the window that is the parent of all controls of this view shell. This may or may not be the window of the frame. */ - inline ::vcl::Window* GetParentWindow (void) const { return mpParentWindow; } + inline ::vcl::Window* GetParentWindow() const { return mpParentWindow; } - inline ::sd::View* GetView (void) const { return mpView; } - inline SdrView* GetDrawView (void) const; - SD_DLLPUBLIC DrawDocShell* GetDocSh (void) const; + inline ::sd::View* GetView() const { return mpView; } + inline SdrView* GetDrawView() const; + SD_DLLPUBLIC DrawDocShell* GetDocSh() const; - SdDrawDocument* GetDoc (void) const; + SdDrawDocument* GetDoc() const; - SD_DLLPUBLIC SfxViewFrame* GetViewFrame (void) const; + SD_DLLPUBLIC SfxViewFrame* GetViewFrame() const; /** The active window is usually the mpContentWindow. When there is a show running then the active window is a ShowWindow. */ - ::sd::Window* GetActiveWindow (void) const { return mpActiveWindow;} + ::sd::Window* GetActiveWindow() const { return mpActiveWindow;} /** Set the active window. When the shell is displayed in the center pane then the window of the ViewShellBase is also set to the given @@ -173,7 +173,7 @@ public: The rectangle is returned in screen coordinates, i.e. pixel values relative to the upper left corner of the screen?. */ - const Rectangle& GetAllWindowRect (void); + const Rectangle& GetAllWindowRect(); // Mouse- & Key-Events virtual void PrePaint(); @@ -193,14 +193,14 @@ public: const SfxPoolItem* GetNumBulletItem(SfxItemSet& aNewAttr, sal_uInt16& nNumItemId); - bool HasRuler (void) { return mbHasRulers;} + bool HasRuler() { return mbHasRulers;} void SetRuler(bool bRuler); /** Set internal values of all scroll bars that determine thumb size and position. The external values like size and position of the scroll bar controls are not modified. */ - virtual void UpdateScrollBars (void); + virtual void UpdateScrollBars(); void Scroll(long nX, long nY); void ScrollLines(long nX, long nY); virtual void SetZoom(long nZoom); @@ -218,9 +218,9 @@ public: void ExecReq( SfxRequest &rReq ); - ZoomList* GetZoomList (void) { return mpZoomList;} + ZoomList* GetZoomList() { return mpZoomList;} - FrameView* GetFrameView (void) { return mpFrameView; } + FrameView* GetFrameView() { return mpFrameView; } /** Setting a frame view triggers ReadFrameViewData() for the new frame. @param pFrameView @@ -265,10 +265,10 @@ public: void SetStartShowWithDialog( bool bIn = true ) { mbStartShowWithDialog = bIn; } bool IsStartShowWithDialog() const { return mbStartShowWithDialog; } - sal_uInt16 GetPrintedHandoutPageNum (void) const { return mnPrintedHandoutPageNum; } + sal_uInt16 GetPrintedHandoutPageNum() const { return mnPrintedHandoutPageNum; } void SetPrintedHandoutPageNum (sal_uInt16 nPageNumber) {mnPrintedHandoutPageNum=nPageNumber; } - sal_uInt16 GetPrintedHandoutPageCount(void) const { return mnPrintedHandoutPageCount; } + sal_uInt16 GetPrintedHandoutPageCount() const { return mnPrintedHandoutPageCount; } void SetPrintedHandoutPageCount (sal_uInt16 nPageCount) {mnPrintedHandoutPageCount=nPageCount; } virtual bool PrepareClose( bool bUI = true ); @@ -312,7 +312,7 @@ public: In rare circumstances the returned pointer may be <null/>, i.e. when no memory is available anymore. */ - ::sd::WindowUpdater* GetWindowUpdater (void) const; + ::sd::WindowUpdater* GetWindowUpdater() const; /** Return the border that is drawn around the actual document view. The border contains typically rulers and scroll bars. @@ -332,7 +332,7 @@ public: The ViewShell places and resizes its UI elements accordingly. The new size can be obtained from the parent window. */ - virtual void Resize (void); + virtual void Resize(); /** Set the position and size of the area which contains the GUI elements like rulers, sliders, and buttons as well as the document @@ -360,19 +360,19 @@ public: document view according to the position and size that were given with the last Resize() call. */ - virtual void ArrangeGUIElements (void); + virtual void ArrangeGUIElements(); // virtual void OuterResizePixel(const Point &rPos, const Size &rSize); // virtual void InnerResizePixel(const Point &rPos, const Size &rSize); - ViewShellBase& GetViewShellBase (void) const; + ViewShellBase& GetViewShellBase() const; /** Return <TRUE/> when the called view shell is the main sub shell of its ViewShellBase object, i.e. is display in the center pane. This convenience function is equivalent to comparing the this pointer to the result of ViewShellBase::GetViewShell(PT_CENTER). */ - bool IsMainViewShell (void) const; + bool IsMainViewShell() const; /** Set or reset the flag that indicates whether the called shell is the one displayed in the center pane. By default this flag is set to @@ -383,11 +383,11 @@ public: /** Return a sub controller that implements the view shell specific part of the DrawController. */ - virtual css::uno::Reference<css::drawing::XDrawSubController> CreateSubController (void) = 0; + virtual css::uno::Reference<css::drawing::XDrawSubController> CreateSubController() = 0; /** Return the type of the shell. */ - ShellType GetShellType (void) const; + ShellType GetShellType() const; /** 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 @@ -398,7 +398,7 @@ public: RemoveSubShell() comes to late when the view shell is not on the stack anymore.</p> */ - virtual void Shutdown (void); + virtual void Shutdown(); /** This function is called from the underlying ViewShellBase object to handle a verb execution request. @@ -412,7 +412,7 @@ public: As a result the border is adapted. */ virtual void ShowUIControls (bool bVisible = true); - bool IsPageFlipMode(void) const; + bool IsPageFlipMode() const; /** Set the given window as new parent window. This is not possible for all views, so the return value tells the caller if the relocation @@ -521,7 +521,7 @@ protected: ::std::unique_ptr<Implementation> mpImpl; // Support methods for centralized UNDO/REDO - virtual ::svl::IUndoManager* ImpGetUndoManager (void) const; + virtual ::svl::IUndoManager* ImpGetUndoManager() const; void ImpGetUndoStrings(SfxItemSet &rSet) const; void ImpGetRedoStrings(SfxItemSet &rSet) const; void ImpSidUndo(bool bDrawViewShell, SfxRequest& rReq); @@ -578,16 +578,16 @@ private: /** Code common to all constructors. It generally is a bad idea to call this function from outside a constructor. */ - void construct (void); + void construct(); DECL_LINK(FrameWindowEventListener, VclSimpleEvent*); /** Create the rulers. */ - void SetupRulers (void); + void SetupRulers(); }; -SdrView* ViewShell::GetDrawView (void) const +SdrView* ViewShell::GetDrawView() const { return static_cast<SdrView*>(mpView); } diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index e1a180757c2c..b4e86bb90459 100644 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx @@ -79,20 +79,20 @@ public: SfxViewFrame *pFrame, SfxViewShell* pOldShell); - virtual ~ViewShellBase (void); + virtual ~ViewShellBase(); /** This method is part of the object construction. It HAS to be called after the constructor has created a new object. */ void LateInit (const OUString& rsDefaultView); - ::boost::shared_ptr<ViewShellManager> GetViewShellManager (void) const; + ::boost::shared_ptr<ViewShellManager> GetViewShellManager() const; /** Return the main view shell stacked on the called ViewShellBase object. This is usually the view shell displayed in the center pane. */ - ::boost::shared_ptr<ViewShell> GetMainViewShell (void) const; + ::boost::shared_ptr<ViewShell> GetMainViewShell() const; /** When given a view frame this static method returns the corresponding sd::ViewShellBase object. @@ -102,8 +102,8 @@ public: */ static ViewShellBase* GetViewShellBase (SfxViewFrame* pFrame); - DrawDocShell* GetDocShell (void) const { return mpDocShell;} - SdDrawDocument* GetDocument (void) const { return mpDocument;} + DrawDocShell* GetDocShell() const { return mpDocShell;} + SdDrawDocument* GetDocument() const { return mpDocument;} /** Callback function for general slot calls. At the moment these are slots for switching the pane docking windows on and off. @@ -131,7 +131,7 @@ public: /** Return a new renderer that can be used for example for printing the document. */ - virtual com::sun::star::uno::Reference<com::sun::star::view::XRenderable> GetRenderable (void) SAL_OVERRIDE; + virtual com::sun::star::uno::Reference<com::sun::star::view::XRenderable> GetRenderable() SAL_OVERRIDE; /// Forwarded to the print manager. virtual SfxPrinter* GetPrinter (bool bCreate = false) SAL_OVERRIDE; @@ -166,7 +166,7 @@ public: virtual bool PrepareClose (bool bUI = true) SAL_OVERRIDE; virtual void WriteUserData (OUString&, bool bBrowse = false) SAL_OVERRIDE; virtual void ReadUserData (const OUString&, bool bBrowse = false) SAL_OVERRIDE; - virtual SdrView* GetDrawView (void) const SAL_OVERRIDE; + virtual SdrView* GetDrawView() const SAL_OVERRIDE; virtual void AdjustPosSizePixel (const Point &rOfs, const Size &rSize) SAL_OVERRIDE; /** When <TRUE/> is given, then the mouse shape is set to hour glass (or @@ -181,7 +181,7 @@ public: This method is like ResizePixel() with no arguments. */ - void Rearrange (void); + void Rearrange(); /** Update the border that is set with SfxViewShell::SetBorderPixel(). This is done by adding the border used by the ViewShellBase itself @@ -206,17 +206,17 @@ public: events from various sources. This method must not be called before LateInit() has terminated. */ - ::boost::shared_ptr<tools::EventMultiplexer> GetEventMultiplexer (void); + ::boost::shared_ptr<tools::EventMultiplexer> GetEventMultiplexer(); /** returns the complete area of the current view relative to the frame window */ const Rectangle& getClientRectangle() const; - ::boost::shared_ptr<ToolBarManager> GetToolBarManager (void) const; - ::boost::shared_ptr<FormShellManager> GetFormShellManager (void) const; + ::boost::shared_ptr<ToolBarManager> GetToolBarManager() const; + ::boost::shared_ptr<FormShellManager> GetFormShellManager() const; - DrawController& GetDrawController (void) const; + DrawController& GetDrawController() const; void SetViewTabBar (const ::rtl::Reference<ViewTabBar>& rViewTabBar); @@ -224,7 +224,7 @@ public: view and other UI elements, like scroll bars and rulers. Ownership of that window remains with the called ViewShellBase object. */ - vcl::Window* GetViewWindow (void); + vcl::Window* GetViewWindow(); /** 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) */ @@ -235,7 +235,7 @@ protected: virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; - virtual void InitializeFramework (void); + virtual void InitializeFramework(); private: class Implementation; @@ -249,7 +249,7 @@ private: we check that the right type is active and change again if that is not the case because something went wrong. */ - OUString GetInitialViewShellType (void); + OUString GetInitialViewShellType(); }; OUString ImplRetrieveLabelFromCommand( const css::uno::Reference< css::frame::XFrame >& xFrame, const OUString& aCmdURL ); diff --git a/sd/source/ui/inc/ViewShellHint.hxx b/sd/source/ui/inc/ViewShellHint.hxx index 03ab7aaaf75b..dbbd3d3d0d03 100644 --- a/sd/source/ui/inc/ViewShellHint.hxx +++ b/sd/source/ui/inc/ViewShellHint.hxx @@ -47,7 +47,7 @@ public: ViewShellHint (HintId nHintId); - HintId GetHintId (void) const { return meHintId;} + HintId GetHintId() const { return meHintId;} private: HintId meHintId; diff --git a/sd/source/ui/inc/ViewShellImplementation.hxx b/sd/source/ui/inc/ViewShellImplementation.hxx index a98a89f1dcbd..ad604e01bf88 100644 --- a/sd/source/ui/inc/ViewShellImplementation.hxx +++ b/sd/source/ui/inc/ViewShellImplementation.hxx @@ -89,7 +89,7 @@ public: */ ::boost::shared_ptr<ToolBarManagerLock> mpSelf; ToolBarManagerLock (const ::boost::shared_ptr<sd::ToolBarManager>& rpManager); - ~ToolBarManagerLock (void); + ~ToolBarManagerLock(); class Deleter; friend class Deleter; @@ -99,7 +99,7 @@ public: ::boost::weak_ptr<ToolBarManagerLock> mpUpdateLockForMouse; Implementation (ViewShell& rViewShell); - ~Implementation (void); + ~Implementation(); /** Process the SID_MODIFY slot. */ @@ -136,14 +136,14 @@ public: configuration that has in the center pane a view shell of the same type as mrViewShell. */ - sal_uInt16 GetViewId (void); + sal_uInt16 GetViewId(); /** Return a pointer to the image map dialog that is displayed in some child window. @return Returns <NULL/> when the image map dialog is not available. */ - static SvxIMapDlg* GetImageMapDialog (void); + static SvxIMapDlg* GetImageMapDialog(); private: ViewShell& mrViewShell; diff --git a/sd/source/ui/inc/ViewShellManager.hxx b/sd/source/ui/inc/ViewShellManager.hxx index 683eb2387de4..66eb593f8c18 100644 --- a/sd/source/ui/inc/ViewShellManager.hxx +++ b/sd/source/ui/inc/ViewShellManager.hxx @@ -61,14 +61,14 @@ public: /** Before the destructor is called the method Shutdown() has to have been called. */ - ~ViewShellManager (void); + ~ViewShellManager(); /** Tell a ViewShellManager object to prepare to be deleted, i.e. to destroy all of its resources and to ignore all following calls. Use this when the owner of the view shell manager is about being destroyed but the view shell manager itself can not yet be deleted. */ - void Shutdown (void); + void Shutdown(); /** Set the factory for sub shells of the specified view shell. */ @@ -162,11 +162,11 @@ public: /** Return the top-most shell on the SFX shell stack regardless of whether that is a view shell or a sub shell. */ - SfxShell* GetTopShell (void) const; + SfxShell* GetTopShell() const; /** Return the top-most active view shell on the internal shell stack. */ - SfxShell* GetTopViewShell (void) const; + SfxShell* GetTopViewShell() const; /** Use this class to safely lock updates of the view shell stack. */ @@ -175,7 +175,7 @@ public: public: UpdateLock (const ::boost::shared_ptr<ViewShellManager>& rpManager) : mpManager(rpManager) {mpManager->LockUpdate();} - ~UpdateLock (void) {mpManager->UnlockUpdate();}; + ~UpdateLock() {mpManager->UnlockUpdate();}; private: ::boost::shared_ptr<ViewShellManager> mpManager; }; @@ -186,8 +186,8 @@ private: ::std::unique_ptr<ViewShellManager::Implementation> mpImpl; bool mbValid; - void LockUpdate (void); - void UnlockUpdate (void); + void LockUpdate(); + void UnlockUpdate(); }; } // end of namespace sd diff --git a/sd/source/ui/inc/ViewTabBar.hxx b/sd/source/ui/inc/ViewTabBar.hxx index b259f3ffcdff..f3b40694cc33 100644 --- a/sd/source/ui/inc/ViewTabBar.hxx +++ b/sd/source/ui/inc/ViewTabBar.hxx @@ -63,13 +63,13 @@ public: com::sun::star::drawing::framework::XResourceId>& rxViewTabBarId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController>& rxController); - virtual ~ViewTabBar (void); + virtual ~ViewTabBar(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; - ::boost::shared_ptr< ::TabControl> GetTabControl (void) const { return mpTabControl;} + ::boost::shared_ptr< ::TabControl> GetTabControl() const { return mpTabControl;} - bool ActivatePage (void); + bool ActivatePage(); //----- drawing::framework::XConfigurationChangeListener ------------------ @@ -108,16 +108,16 @@ public: throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence<com::sun::star::drawing::framework::TabBarButton> - SAL_CALL getTabBarButtons (void) + SAL_CALL getTabBarButtons() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //----- XResource --------------------------------------------------------- virtual ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::framework::XResourceId> SAL_CALL getResourceId (void) + ::com::sun::star::drawing::framework::XResourceId> SAL_CALL getResourceId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isAnchorOnly (void) + virtual sal_Bool SAL_CALL isAnchorOnly() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //----- XUnoTunnel -------------------------------------------------------- @@ -134,7 +134,7 @@ public: To be on the safe side wait for this control to become visible and the call this method again. */ - int GetHeight (void); + int GetHeight(); void AddTabBarButton ( const ::com::sun::star::drawing::framework::TabBarButton& rButton, @@ -146,7 +146,7 @@ public: bool HasTabBarButton ( const ::com::sun::star::drawing::framework::TabBarButton& rButton); ::com::sun::star::uno::Sequence<com::sun::star::drawing::framework::TabBarButton> - GetTabBarButtons (void); + GetTabBarButtons(); private: ::boost::shared_ptr< ::TabControl> mpTabControl; @@ -161,11 +161,11 @@ private: ::com::sun::star::drawing::framework::XResourceId> mxViewTabBarId; ViewShellBase* mpViewShellBase; - void UpdateActiveButton (void); + void UpdateActiveButton(); void AddTabBarButton ( const ::com::sun::star::drawing::framework::TabBarButton& rButton, sal_Int32 nPosition); - void UpdateTabBarButtons (void); + void UpdateTabBarButtons(); /** This method is called from the constructor to get the window for an anchor ResourceId and pass it to our base class. It has to be @@ -177,7 +177,7 @@ private: ::com::sun::star::drawing::framework::XResourceId>& rxViewTabBarId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController>& rxController); - const ::com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId (void); + const ::com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); }; } // end of namespace sd diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx index dca72fbdc519..718c17842a5b 100644 --- a/sd/source/ui/inc/Window.hxx +++ b/sd/source/ui/inc/Window.hxx @@ -45,7 +45,7 @@ class Window { public: Window (vcl::Window* pParent); - virtual ~Window (void); + virtual ~Window(); void SetViewShell (ViewShell* pViewSh); @@ -98,17 +98,17 @@ public: <p>This calculation is performed only when the <member>bMinZoomAutoCalc</member> is set (to <TRUE/>).</p> */ - void CalcMinZoom (void); + void CalcMinZoom(); void SetMinZoom (long int nMin); - long GetMinZoom (void) const { return mnMinZoom;} + long GetMinZoom() const { return mnMinZoom;} void SetMaxZoom (long int nMax); - long GetMaxZoom (void) const { return mnMaxZoom;} + long GetMaxZoom() const { return mnMaxZoom;} - long GetZoom (void) const; + long GetZoom() const; - Point GetWinViewPos (void) const { return maWinPos;} - Point GetViewOrigin (void) const { return maViewOrigin;} - Size GetViewSize (void) const { return maViewSize;} + Point GetWinViewPos() const { return maWinPos;} + Point GetViewOrigin() const { return maViewOrigin;} + Size GetViewSize() const { return maViewSize;} void SetWinViewPos(const Point& rPnt); void SetViewOrigin(const Point& rPnt); void SetViewSize(const Size& rSize); @@ -123,7 +123,7 @@ public: */ void UpdateMapOrigin (bool bInvalidate = true); - void UpdateMapMode (void); + void UpdateMapMode(); double GetVisibleX(); // Interface fuer ScrollBars double GetVisibleY(); @@ -188,7 +188,7 @@ protected: */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> - CreateAccessible (void) SAL_OVERRIDE; + CreateAccessible() SAL_OVERRIDE; OUString GetSurroundingText() const SAL_OVERRIDE; Selection GetSurroundingTextSelection() const SAL_OVERRIDE; diff --git a/sd/source/ui/inc/WindowUpdater.hxx b/sd/source/ui/inc/WindowUpdater.hxx index b35c73c82a0c..f7f2a1830a64 100644 --- a/sd/source/ui/inc/WindowUpdater.hxx +++ b/sd/source/ui/inc/WindowUpdater.hxx @@ -53,8 +53,8 @@ class SD_DLLPUBLIC WindowUpdater : public utl::ConfigurationListener { public: - explicit WindowUpdater (void); - virtual ~WindowUpdater (void) throw(); + explicit WindowUpdater(); + virtual ~WindowUpdater() throw(); /** Add the given device to the list of devices which will be updated when one of the monitored values changes. diff --git a/sd/source/ui/inc/drawview.hxx b/sd/source/ui/inc/drawview.hxx index 7d20d8bd4863..7d4ad1c6780a 100644 --- a/sd/source/ui/inc/drawview.hxx +++ b/sd/source/ui/inc/drawview.hxx @@ -39,7 +39,7 @@ public: DrawDocShell* pDocSh, OutputDevice* pOutDev, DrawViewShell* pShell); - virtual ~DrawView (void); + virtual ~DrawView(); virtual void MarkListHasChanged() SAL_OVERRIDE; void CompleteRedraw(OutputDevice* pOutDev, const ::vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/framework/Configuration.hxx b/sd/source/ui/inc/framework/Configuration.hxx index 7d17b200a533..c5b60e2c2c4a 100644 --- a/sd/source/ui/inc/framework/Configuration.hxx +++ b/sd/source/ui/inc/framework/Configuration.hxx @@ -81,9 +81,9 @@ public: Configuration (const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XConfigurationControllerBroadcaster>& rxBroadcaster, bool bBroadcastRequestEvents); - virtual ~Configuration (void); + virtual ~Configuration(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XConfiguration @@ -113,7 +113,7 @@ public: // XCloneable virtual ::com::sun::star::uno::Reference<com::sun::star::util::XCloneable> - SAL_CALL createClone (void) + SAL_CALL createClone() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNamed @@ -121,7 +121,7 @@ public: /** Return a human readable string representation. This is used for debugging purposes. */ - virtual OUString SAL_CALL getName (void) + virtual OUString SAL_CALL getName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** This call is ignored because the XNamed interface is (mis)used to @@ -184,7 +184,7 @@ private: /** When the called object has already been disposed this method throws an exception and does not return. */ - void ThrowIfDisposed (void) const + void ThrowIfDisposed() const throw (::com::sun::star::lang::DisposedException); }; diff --git a/sd/source/ui/inc/framework/ConfigurationController.hxx b/sd/source/ui/inc/framework/ConfigurationController.hxx index fd09381e6a81..45f82cfe4127 100644 --- a/sd/source/ui/inc/framework/ConfigurationController.hxx +++ b/sd/source/ui/inc/framework/ConfigurationController.hxx @@ -64,12 +64,12 @@ class ConfigurationController public ConfigurationControllerInterfaceBase { public: - ConfigurationController (void) throw(); - virtual ~ConfigurationController (void) throw(); + ConfigurationController() throw(); + virtual ~ConfigurationController() throw(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; - void ProcessEvent (void); + void ProcessEvent(); /** Normally the requested changes of the configuration are executed asynchronously. However, there is at least one situation (searching @@ -80,7 +80,7 @@ public: Do not use this method until there is absolutely no other way. */ - void RequestSynchronousUpdate (void); + void RequestSynchronousUpdate(); // XConfigurationController @@ -88,7 +88,7 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL unlock (void) + virtual void SAL_CALL unlock() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL requestResourceActivation ( @@ -106,17 +106,17 @@ public: const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL update (void) + virtual void SAL_CALL update() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::drawing::framework::XConfiguration> - SAL_CALL getRequestedConfiguration (void) + SAL_CALL getRequestedConfiguration() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::drawing::framework::XConfiguration> - SAL_CALL getCurrentConfiguration (void) + SAL_CALL getCurrentConfiguration() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL restoreConfiguration ( @@ -145,7 +145,7 @@ public: // XConfigurationRequestQueue - virtual sal_Bool SAL_CALL hasPendingRequests (void) + virtual sal_Bool SAL_CALL hasPendingRequests() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL postChangeRequest ( @@ -187,7 +187,7 @@ public: public: Lock (const css::uno::Reference< css::drawing::framework::XConfigurationController>& rxController); - ~Lock (void); + ~Lock(); private: css::uno::Reference< css::drawing::framework::XConfigurationController> mxController; diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx index 749c57d6fc65..2dd9aa0cbf00 100644 --- a/sd/source/ui/inc/framework/FrameworkHelper.hxx +++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx @@ -159,7 +159,7 @@ public: @return When the object has already been disposed then <FALSE/> is returned. */ - bool IsValid (void); + bool IsValid(); /** Return a pointer to the view shell that is displayed in the specified pane. See GetView() for a variant that returns a @@ -244,7 +244,7 @@ public: Do not use this method until there is absolutely no other way. */ - void RequestSynchronousUpdate (void); + void RequestSynchronousUpdate(); /** Block until the specified event is notified by the configuration controller. When the configuration controller is not processing any @@ -255,7 +255,7 @@ public: /** This is a short cut for WaitForEvent(msConfigurationUpdateEndEvent). Call this method to execute the pending requests. */ - void WaitForUpdate (void) const; + void WaitForUpdate() const; /** Explicit request for an update of the current configuration. Call this method when one of the resources managed by the sd framework @@ -263,7 +263,7 @@ public: framework itself. An example for this is a click on the closer button of one of the side panes. */ - void UpdateConfiguration (void); + void UpdateConfiguration(); /** Return a string representation of the given XResourceId object. */ @@ -297,7 +297,7 @@ public: css::drawing::framework::XResourceId>& rxAnchor); css::uno::Reference<css::drawing::framework::XConfigurationController> - GetConfigurationController (void) const { return mxConfigurationController;} + GetConfigurationController() const { return mxConfigurationController;} private: typedef ::std::map< @@ -321,13 +321,13 @@ private: FrameworkHelper (ViewShellBase& rBase); FrameworkHelper (const FrameworkHelper& rHelper) SAL_DELETED_FUNCTION; - virtual ~FrameworkHelper (void); + virtual ~FrameworkHelper(); class Deleter; friend class Deleter; FrameworkHelper& operator= (const FrameworkHelper& rHelper) SAL_DELETED_FUNCTION; - void Initialize (void); + void Initialize(); - void Dispose (void); + void Dispose(); /** Run the given callback when an event of the specified type is received from the ConfigurationController or when the diff --git a/sd/source/ui/inc/framework/ModuleController.hxx b/sd/source/ui/inc/framework/ModuleController.hxx index b1d279c79451..525fabc9a639 100644 --- a/sd/source/ui/inc/framework/ModuleController.hxx +++ b/sd/source/ui/inc/framework/ModuleController.hxx @@ -72,7 +72,7 @@ public: const css::uno::Reference<css::uno::XComponentContext>& rxContext); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XModuleController @@ -98,7 +98,7 @@ private: const css::uno::Reference<css::uno::XComponentContext>& rxContext) throw (std::exception); ModuleController (const ModuleController&) SAL_DELETED_FUNCTION; - virtual ~ModuleController (void) throw(); + virtual ~ModuleController() throw(); /** Load a list of URL to service mappings from the /org.openoffice.Office.Impress/MultiPaneGUI/Framework/ResourceFactories @@ -116,7 +116,7 @@ private: configuration entry. This method is called once when a new ModuleController object is created. */ - void InstantiateStartupServices (void); + void InstantiateStartupServices(); /** Called for one entry in the StartupServices configuration list this method instantiates the service described by the entry. It does not diff --git a/sd/source/ui/inc/framework/Pane.hxx b/sd/source/ui/inc/framework/Pane.hxx index b4ee242f32bf..e9c94df151db 100644 --- a/sd/source/ui/inc/framework/Pane.hxx +++ b/sd/source/ui/inc/framework/Pane.hxx @@ -76,16 +76,16 @@ public: com::sun::star::drawing::framework::XResourceId>& rxPaneId, vcl::Window* pWindow) throw (); - virtual ~Pane (void); + virtual ~Pane(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; - static const ::com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId (void); + static const ::com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); /** This method is typically used together with the XUnoTunnel to obtain a Window pointer from an XPane object. */ - virtual vcl::Window* GetWindow (void); + virtual vcl::Window* GetWindow(); //----- XPane ------------------------------------------------------------- @@ -94,22 +94,22 @@ public: in the window of the pane. */ virtual css::uno::Reference<css::awt::XWindow> - SAL_CALL getWindow (void) + SAL_CALL getWindow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference<css::rendering::XCanvas> - SAL_CALL getCanvas (void) + SAL_CALL getCanvas() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //----- XPane2 ------------------------------------------------------------- - virtual sal_Bool SAL_CALL isVisible (void) + virtual sal_Bool SAL_CALL isVisible() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setVisible (sal_Bool bIsVisible) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL getAccessible (void) + virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL getAccessible() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setAccessible ( @@ -119,13 +119,13 @@ public: //----- XResource --------------------------------------------------------- virtual ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> - SAL_CALL getResourceId (void) + SAL_CALL getResourceId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** For the typical pane it makes no sense to be dislayed without a view. Therefore this default implementation returns always <TRUE/>. */ - virtual sal_Bool SAL_CALL isAnchorOnly (void) + virtual sal_Bool SAL_CALL isAnchorOnly() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //----- XUnoTunnel -------------------------------------------------------- @@ -143,14 +143,14 @@ protected: different canvas. */ virtual ::com::sun::star::uno::Reference<com::sun::star::rendering::XCanvas> - CreateCanvas (void) + CreateCanvas() throw (::com::sun::star::uno::RuntimeException); /** Throw DisposedException when the object has already been disposed or is currently being disposed. Otherwise this method returns normally. */ - void ThrowIfDisposed (void) const + void ThrowIfDisposed() const throw (::com::sun::star::lang::DisposedException); }; diff --git a/sd/source/ui/inc/framework/PresentationFactory.hxx b/sd/source/ui/inc/framework/PresentationFactory.hxx index 1c00b5f73995..f07edf30899e 100644 --- a/sd/source/ui/inc/framework/PresentationFactory.hxx +++ b/sd/source/ui/inc/framework/PresentationFactory.hxx @@ -58,9 +58,9 @@ public: PresentationFactory ( const css::uno::Reference<css::frame::XController>& rxController); - virtual ~PresentationFactory (void); + virtual ~PresentationFactory(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XResourceFactory @@ -91,7 +91,7 @@ private: mxConfigurationController; css::uno::Reference<css::frame::XController> mxController; - void ThrowIfDisposed (void) const + void ThrowIfDisposed() const throw (css::lang::DisposedException); }; diff --git a/sd/source/ui/inc/framework/ResourceId.hxx b/sd/source/ui/inc/framework/ResourceId.hxx index c407db582777..d048f517a527 100644 --- a/sd/source/ui/inc/framework/ResourceId.hxx +++ b/sd/source/ui/inc/framework/ResourceId.hxx @@ -53,7 +53,7 @@ class ResourceId public: /** Create a new, empty resource id. */ - ResourceId (void); + ResourceId(); /** Create a new resource id that is described by the given URLs. @param rsResourceURLs @@ -99,38 +99,38 @@ public: const OUString& rsFirstAnchorURL, const css::uno::Sequence<OUString>& rAnchorURLs); - virtual ~ResourceId (void); + virtual ~ResourceId(); /** Return the list of URLs of both the resource URL and the anchor URLs. */ - const ::std::vector<OUString>& GetResourceURLs (void) const; + const ::std::vector<OUString>& GetResourceURLs() const; //===== XResourceId ======================================================= virtual OUString SAL_CALL - getResourceURL (void) + getResourceURL() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::util::URL SAL_CALL - getFullResourceURL (void) + getFullResourceURL() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL - hasAnchor (void) + hasAnchor() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::drawing::framework::XResourceId> SAL_CALL - getAnchor (void) + getAnchor() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence<OUString> SAL_CALL - getAnchorURLs (void) + getAnchorURLs() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL - getResourceTypePrefix (void) + getResourceTypePrefix() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL @@ -153,7 +153,7 @@ public: virtual css::uno::Reference< css::drawing::framework::XResourceId> SAL_CALL - clone (void) + clone() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XInitialization =================================================== @@ -226,7 +226,7 @@ private: const ::std::vector<OUString>& rResourceURLs, css::drawing::framework::AnchorBindingMode eMode) const; - void ParseResourceURL (void); + void ParseResourceURL(); }; } } // end of namespace sd::framework diff --git a/sd/source/ui/inc/framework/ViewShellWrapper.hxx b/sd/source/ui/inc/framework/ViewShellWrapper.hxx index e785952ebb92..5b384485c13f 100644 --- a/sd/source/ui/inc/framework/ViewShellWrapper.hxx +++ b/sd/source/ui/inc/framework/ViewShellWrapper.hxx @@ -72,18 +72,18 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId>& rxViewId, const ::com::sun::star::uno::Reference<com::sun::star::awt::XWindow>& rxWindow); - virtual ~ViewShellWrapper (void); + virtual ~ViewShellWrapper(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - static const ::com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId (void); + static const ::com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); /** This method is typically used together with the XUnoTunnel interface to obtain a pointer to the wrapped ViewShell object for a given XView object. */ - ::boost::shared_ptr<ViewShell> GetViewShell (void) { return mpViewShell;} + ::boost::shared_ptr<ViewShell> GetViewShell() { return mpViewShell;} // XUnoTunnel @@ -93,10 +93,10 @@ public: // XResource virtual ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> - SAL_CALL getResourceId (void) + SAL_CALL getResourceId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isAnchorOnly (void) + virtual sal_Bool SAL_CALL isAnchorOnly() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XSelectionSupplier diff --git a/sd/source/ui/inc/fudspord.hxx b/sd/source/ui/inc/fudspord.hxx index e67218d62c55..dbbd8fc6b826 100644 --- a/sd/source/ui/inc/fudspord.hxx +++ b/sd/source/ui/inc/fudspord.hxx @@ -45,7 +45,7 @@ public: virtual void Deactivate() SAL_OVERRIDE; protected: - virtual ~FuDisplayOrder (void); + virtual ~FuDisplayOrder(); void implClearOverlay(); Pointer maPtr; diff --git a/sd/source/ui/inc/fuediglu.hxx b/sd/source/ui/inc/fuediglu.hxx index 5eb054b01771..99fbf7bcb800 100644 --- a/sd/source/ui/inc/fuediglu.hxx +++ b/sd/source/ui/inc/fuediglu.hxx @@ -57,7 +57,7 @@ protected: ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq); - virtual ~FuEditGluePoints (void); + virtual ~FuEditGluePoints(); }; } // end of namespace sd diff --git a/sd/source/ui/inc/fupage.hxx b/sd/source/ui/inc/fupage.hxx index 81b12eba87e4..d1ff3ba0141e 100644 --- a/sd/source/ui/inc/fupage.hxx +++ b/sd/source/ui/inc/fupage.hxx @@ -44,7 +44,7 @@ class FuPage const SfxItemSet* ExecuteDialog( vcl::Window* pParent ); protected: - virtual ~FuPage (void); + virtual ~FuPage(); private: FuPage ( diff --git a/sd/source/ui/inc/fupoor.hxx b/sd/source/ui/inc/fupoor.hxx index 00817a769d5a..9f50c75ed925 100644 --- a/sd/source/ui/inc/fupoor.hxx +++ b/sd/source/ui/inc/fupoor.hxx @@ -124,7 +124,7 @@ protected: ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq); - virtual ~FuPoor (void); + virtual ~FuPoor(); DECL_LINK( DelayHdl, void * ); diff --git a/sd/source/ui/inc/fusearch.hxx b/sd/source/ui/inc/fusearch.hxx index be7ad1bfceee..3e9a73b26269 100644 --- a/sd/source/ui/inc/fusearch.hxx +++ b/sd/source/ui/inc/fusearch.hxx @@ -42,7 +42,7 @@ public: ::sd::Outliner* GetOutliner() const { return pSdOutliner; } protected: - virtual ~FuSearch (void); + virtual ~FuSearch(); ::sd::Outliner* pSdOutliner; bool bOwnOutliner; diff --git a/sd/source/ui/inc/fuzoom.hxx b/sd/source/ui/inc/fuzoom.hxx index 8f42cb0d04b1..3e80b33e474e 100644 --- a/sd/source/ui/inc/fuzoom.hxx +++ b/sd/source/ui/inc/fuzoom.hxx @@ -44,7 +44,7 @@ public: virtual void Deactivate() SAL_OVERRIDE; ///< deactivates the function protected: - virtual ~FuZoom (void); + virtual ~FuZoom(); Point aBeginPosPix; Point aBeginPos; diff --git a/sd/source/ui/inc/morphdlg.hxx b/sd/source/ui/inc/morphdlg.hxx index f23d69207d98..06b5b3624495 100644 --- a/sd/source/ui/inc/morphdlg.hxx +++ b/sd/source/ui/inc/morphdlg.hxx @@ -38,7 +38,7 @@ public: vcl::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2); - virtual ~MorphDlg (void); + virtual ~MorphDlg(); void SaveSettings() const; sal_uInt16 GetFadeSteps() const { return (sal_uInt16) m_pMtfSteps->GetValue(); } diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx index fa388da27ea7..b5771f38b92e 100644 --- a/sd/source/ui/inc/navigatr.hxx +++ b/sd/source/ui/inc/navigatr.hxx @@ -82,7 +82,7 @@ class SdNavigatorWin : public vcl::Window { public: - typedef ::boost::function<void(void)> UpdateRequestFunctor; + typedef ::boost::function<void()> UpdateRequestFunctor; /** Create a new instance of the navigator. @param bUseActiveUpdate diff --git a/sd/source/ui/inc/sdpreslt.hxx b/sd/source/ui/inc/sdpreslt.hxx index ea68e8de3214..bef6400329ff 100644 --- a/sd/source/ui/inc/sdpreslt.hxx +++ b/sd/source/ui/inc/sdpreslt.hxx @@ -42,7 +42,7 @@ public: vcl::Window* pWindow, const SfxItemSet& rInAttrs); - virtual ~SdPresLayoutDlg (void); + virtual ~SdPresLayoutDlg(); void GetAttr(SfxItemSet& rOutAttrs); diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index 1d2a5bbdbe73..bbbfeed10c68 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -84,7 +84,7 @@ public: internally in the navigator for reordering entries. Its lifetime ends with the office application. */ - static SotClipboardFormatId GetListBoxDropFormatId (void); + static SotClipboardFormatId GetListBoxDropFormatId(); private: /** Temporary drop flavor id that is used internally in the @@ -201,7 +201,7 @@ public: void Fill( const SdDrawDocument*, bool bAllPages, const OUString& rDocName ); void Fill( const SdDrawDocument*, SfxMedium* pSfxMedium, const OUString& rDocName ); void SetShowAllShapes (const bool bShowAllShapes, const bool bFill); - bool GetShowAllShapes (void) const { return mbShowAllShapes;} + bool GetShowAllShapes() const { return mbShowAllShapes;} bool IsEqualToDoc( const SdDrawDocument* pInDoc = NULL ); bool HasSelectedChildren( const OUString& rName ); bool SelectEntry( const OUString& rName ); diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx index 136c3838de29..d249a1579e6a 100644 --- a/sd/source/ui/inc/sdxfer.hxx +++ b/sd/source/ui/inc/sdxfer.hxx @@ -78,7 +78,7 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; virtual void DragFinished( sal_Int8 nDropAction ) SAL_OVERRIDE; - SdDrawDocument* GetSourceDoc (void) const { return mpSourceDoc;} + SdDrawDocument* GetSourceDoc() const { return mpSourceDoc;} /** User data objects can be used to store information temporarily at the transferable. The slide sorter uses this to store @@ -94,7 +94,7 @@ public: /** Return the number of user data objects. */ - sal_Int32 GetUserDataCount (void) const; + sal_Int32 GetUserDataCount() const; /** Return the specified user data object. When the index is not valid, ie not in the range [0,count) then an empty pointer is diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx index 2f19ca0e3ff1..af0b1ef22f9c 100644 --- a/sd/source/ui/inc/slideshow.hxx +++ b/sd/source/ui/inc/slideshow.hxx @@ -116,7 +116,7 @@ public: // uno api - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/taskpane/ControlContainer.hxx b/sd/source/ui/inc/taskpane/ControlContainer.hxx index f06f06be51b4..fbec419860d8 100644 --- a/sd/source/ui/inc/taskpane/ControlContainer.hxx +++ b/sd/source/ui/inc/taskpane/ControlContainer.hxx @@ -57,7 +57,7 @@ public: */ ControlContainer (TreeNode* pNode); - virtual ~ControlContainer (void); + virtual ~ControlContainer(); /** This is function makes sure that all children are deleted. Call this function from the destructor of a sub class to have all child @@ -65,7 +65,7 @@ public: sub class is called. When that other base class is some kind of a window it would otherwise complain that there are living children. */ - void DeleteChildren (void); + void DeleteChildren(); /** Add the given control to the set of controls managed by the container. This control is then expanded. @@ -97,11 +97,11 @@ public: /** Return the number of controls in the container. */ - sal_uInt32 GetControlCount (void) const; + sal_uInt32 GetControlCount() const; /** Return the number of visible controls in the container. */ - sal_uInt32 GetVisibleControlCount (void) const; + sal_uInt32 GetVisibleControlCount() const; /** Return the control with the specified index regardless of whether that control is hidden or visible. @@ -159,7 +159,7 @@ public: empty. Overwrite this method in derived classes in order to react to such changes. */ - virtual void ListHasChanged (void); + virtual void ListHasChanged(); private: osl::Mutex maMutex; diff --git a/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx b/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx index 31d40c573bd2..9a5344266eeb 100644 --- a/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx +++ b/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx @@ -33,7 +33,7 @@ public: /** This method is called by layoutable controls when they have to be resized. */ - virtual void RequestResize (void) = 0; + virtual void RequestResize() = 0; protected: ~ILayouter() {} @@ -45,14 +45,14 @@ protected: class ILayoutableWindow { public: - virtual ~ILayoutableWindow (void) {}; + virtual ~ILayoutableWindow() {}; /** Return the preferred size without constraints on either the height or the width. The size the window will later be set to may but does not have to be equal to this size. */ - virtual Size GetPreferredSize (void) = 0; + virtual Size GetPreferredSize() = 0; /** Return the preferred width with the constraint, that the window will be set to the given height. @@ -73,18 +73,18 @@ public: the return value of this method determines whether the height may be modified as well. */ - virtual bool IsResizable (void) = 0; + virtual bool IsResizable() = 0; /** Return the window so that its size and position can be set. @return Returns the window which is layouted or NULL to indicate that the object is in an invalid state. */ - virtual vcl::Window* GetWindow (void) = 0; + virtual vcl::Window* GetWindow() = 0; /** Return the minimal width of the window. */ - virtual sal_Int32 GetMinimumWidth (void) = 0; + virtual sal_Int32 GetMinimumWidth() = 0; }; } } // end of namespace ::sd::toolpanel diff --git a/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx b/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx index e6ae9d24572b..a5d1abef8580 100644 --- a/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx +++ b/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx @@ -52,12 +52,12 @@ class SlideSorterCacheDisplay { public: SlideSorterCacheDisplay (const SdDrawDocument* pDocument); - virtual ~SlideSorterCacheDisplay (void); + virtual ~SlideSorterCacheDisplay(); void SetParentWindow (vcl::Window* pParentWindow); virtual void Paint (const Rectangle& rBoundingBox); - virtual void Resize (void); + virtual void Resize(); static SlideSorterCacheDisplay* Instance (const SdDrawDocument* pDocument); @@ -73,13 +73,13 @@ public: void SetPageVisibility (sal_Int32 nPageIndex, bool bVisible); void SetUpToDate (sal_Int32 nPageIndex, bool bUpToDate); - virtual Size GetPreferredSize (void); + virtual Size GetPreferredSize(); virtual sal_Int32 GetPreferredWidth (sal_Int32 nHeigh); virtual sal_Int32 GetPreferredHeight (sal_Int32 nWidth); - virtual vcl::Window* GetWindow (void); - virtual bool IsResizable (void); - virtual bool IsExpandable (void) const; - virtual bool IsExpanded (void) const; + virtual vcl::Window* GetWindow(); + virtual bool IsResizable(); + virtual bool IsExpandable() const; + virtual bool IsExpanded() const; private: static ::std::map<const SdDrawDocument*, SlideSorterCacheDisplay*> maDisplays; diff --git a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx index 34b921477edd..8b4056c7eb22 100644 --- a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx +++ b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx @@ -54,27 +54,27 @@ class TreeNode { public: TreeNode (TreeNode* pParent); - virtual ~TreeNode (void); + virtual ~TreeNode(); void SetParentNode (TreeNode* pNewParent); - TreeNode* GetParentNode (void); + TreeNode* GetParentNode(); /** Return the Window pointer of a tree node. */ - virtual vcl::Window* GetWindow (void); + virtual vcl::Window* GetWindow(); /** Return a const pointer to the window of a tree node. */ - virtual const vcl::Window* GetConstWindow (void) const; + virtual const vcl::Window* GetConstWindow() const; /** 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(); /** The default implementaion always returns <FALSE/> */ - virtual bool IsResizable (void); + virtual bool IsResizable(); /** Call this method whenever the size of one of the children of the called node has to be changed, e.g. when the layout menu shows more @@ -86,7 +86,7 @@ public: The default implementation passes this call to its parent. */ - virtual void RequestResize (void); + virtual void RequestResize(); /** The default implementation shows the window (when it exists) when bExpansionState is <TRUE/>. It hides the window otherwise. @@ -100,7 +100,7 @@ public: /** The default implementation returns whether the window is showing. When there is no window then it returns <FALSE/>. */ - virtual bool IsExpanded (void) const; + virtual bool IsExpanded() const; /** Return whether the node can be expanded or collapsed. The default implementation always returns <TRUE/> when there is window and @@ -108,7 +108,7 @@ public: then Expand() may be called but it will not change the expansion state. */ - virtual bool IsExpandable (void) const; + virtual bool IsExpandable() const; /** The default implementation calls GetWindow()->Show(). */ @@ -116,9 +116,9 @@ public: /** The default implementation returns GetWindow()->IsVisible(). */ - virtual bool IsShowing (void) const; + virtual bool IsShowing() const; - ControlContainer& GetControlContainer (void); + ControlContainer& GetControlContainer(); /** Give each node access to a shell manage. This usually is the shell manager of the ToolPanelViewShell. @@ -127,13 +127,13 @@ public: default implementation simply returns the shell manager of its parent. */ - virtual TaskPaneShellManager* GetShellManager (void); + virtual TaskPaneShellManager* GetShellManager(); /** You will rarely need to override this method. To supply your own accessible object you should override CreateAccessible() instead. */ virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> GetAccessibleObject (void); + ::com::sun::star::accessibility::XAccessible> GetAccessibleObject(); /** Override this method in order to supply a class specific accessible object. diff --git a/sd/source/ui/inc/taskpane/TitleBar.hxx b/sd/source/ui/inc/taskpane/TitleBar.hxx index 05f34c540cf7..a51cf2003345 100644 --- a/sd/source/ui/inc/taskpane/TitleBar.hxx +++ b/sd/source/ui/inc/taskpane/TitleBar.hxx @@ -55,21 +55,21 @@ public: const OUString& rsTitle, TitleBarType eType, bool bIsExpandable); - virtual ~TitleBar (void); + virtual ~TitleBar(); - virtual Size GetPreferredSize (void); + virtual Size GetPreferredSize(); virtual sal_Int32 GetPreferredWidth (sal_Int32 nHeight); virtual sal_Int32 GetPreferredHeight (sal_Int32 nWidth); - virtual bool IsResizable (void); - virtual vcl::Window* GetWindow (void); - virtual sal_Int32 GetMinimumWidth (void); + virtual bool IsResizable(); + virtual vcl::Window* GetWindow(); + virtual sal_Int32 GetMinimumWidth(); virtual void Paint (const Rectangle& rBoundingBox); virtual bool Expand (bool bFlag = true); - virtual bool IsExpanded (void) const; + virtual bool IsExpanded() const; virtual void SetEnabledState(bool bFlag); - virtual void GetFocus (void); - virtual void LoseFocus (void); + virtual void GetFocus(); + virtual void LoseFocus(); virtual void MouseMove(const MouseEvent& rEvent); /** Empty implementation prevents forwarding to docking window. @@ -101,7 +101,7 @@ private: bitmap. It is safe to call GetExpansionIndicator() when this method returns <FALSE/> but unnecessary. */ - bool HasExpansionIndicator (void) const; + bool HasExpansionIndicator() const; /** Return the image of the expansion indicator. @return @@ -109,7 +109,7 @@ private: then an empty Image is returned. You better call HasExpansionIndicator() to prevent this. */ - Image GetExpansionIndicator (void) const; + Image GetExpansionIndicator() const; /** Calculate the bounding box of the title text. This takes into account indentation due to an expansion indicator and the given @@ -130,7 +130,7 @@ private: const Rectangle& rTextBox, int nTitleBarWidth); - void PaintSubPanelHeadLineBar (void); + void PaintSubPanelHeadLineBar(); void PaintBackground (const Rectangle& rTextBox); @@ -141,12 +141,12 @@ private: void PaintText (const Rectangle& rTextBox); - sal_uInt16 GetTextStyle (void); + sal_uInt16 GetTextStyle(); const static int snIndentationWidth; // Default constructor, copy constructor, and assignment are not supported. - TitleBar (void); + TitleBar(); TitleBar (const TitleBar&); TitleBar& operator= (const TitleBar&); diff --git a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx index 93f5de4563f6..bd69db1766f3 100644 --- a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx +++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx @@ -68,19 +68,19 @@ public: ViewShellBase& rViewShellBase, vcl::Window* pParentWindow, FrameView* pFrameView); - virtual ~ToolPanelViewShell (void); + virtual ~ToolPanelViewShell(); - void GetFocus (void); - void LoseFocus (void); + void GetFocus(); + void LoseFocus(); void KeyInput (const KeyEvent& rEvent); using sd::ViewShell::KeyInput; - virtual SdPage* GetActualPage (void) SAL_OVERRIDE; - virtual SdPage* getCurrentPage (void) const SAL_OVERRIDE; + virtual SdPage* GetActualPage() SAL_OVERRIDE; + virtual SdPage* getCurrentPage() const SAL_OVERRIDE; - virtual void ArrangeGUIElements (void) SAL_OVERRIDE; + virtual void ArrangeGUIElements() SAL_OVERRIDE; - TaskPaneShellManager& GetSubShellManager (void) const; + TaskPaneShellManager& GetSubShellManager() const; /** deactivates the given panel, bypassing the configuration controller. Only valid for tool panels which are not under the drawing framework's control. @@ -97,13 +97,13 @@ public: When the view shell is not placed in a docking window, e.g. when shown in the center pane, then <NULL?> is returned. */ - DockingWindow* GetDockingWindow (void); + DockingWindow* GetDockingWindow(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> CreateAccessibleDocumentView (::sd::Window* pWindow) SAL_OVERRIDE; - virtual css::uno::Reference<css::drawing::XDrawSubController> CreateSubController (void) SAL_OVERRIDE; + virtual css::uno::Reference<css::drawing::XDrawSubController> CreateSubController() SAL_OVERRIDE; /** Relocate all toplevel controls to the given parent window. */ @@ -143,7 +143,7 @@ private: before. If mbIsInitialized is already set to <TRUE/> then this method returns immediately. */ - void Initialize (void); + void Initialize(); }; } } // end of namespace ::sd::toolpanel diff --git a/sd/source/ui/inc/tools/AsynchronousCall.hxx b/sd/source/ui/inc/tools/AsynchronousCall.hxx index c6d101d01257..52bbb3ad8093 100644 --- a/sd/source/ui/inc/tools/AsynchronousCall.hxx +++ b/sd/source/ui/inc/tools/AsynchronousCall.hxx @@ -48,9 +48,9 @@ public: /** Create a new asynchronous call. Each object of this class processes one (semantical) type of call. */ - AsynchronousCall (void); + AsynchronousCall(); - ~AsynchronousCall (void); + ~AsynchronousCall(); /** Post a function object that is to be executed asynchronously. When this method is called while the current function object has not bee diff --git a/sd/source/ui/inc/tools/AsynchronousTask.hxx b/sd/source/ui/inc/tools/AsynchronousTask.hxx index 3a2211f5c588..dae3210e57bd 100644 --- a/sd/source/ui/inc/tools/AsynchronousTask.hxx +++ b/sd/source/ui/inc/tools/AsynchronousTask.hxx @@ -33,13 +33,13 @@ public: /** Run the next step of the task. After HasNextStep() returns false this method should ignore further calls. */ - virtual void RunNextStep (void) = 0; + virtual void RunNextStep() = 0; /** Return <TRUE/> when there is at least one more step to execute. When the task has been executed completely then <FALSE/> is returned. */ - virtual bool HasNextStep (void) = 0; + virtual bool HasNextStep() = 0; protected: ~AsynchronousTask() {} diff --git a/sd/source/ui/inc/tools/ConfigurationAccess.hxx b/sd/source/ui/inc/tools/ConfigurationAccess.hxx index b19e313c8b3a..fa17a6a6caf6 100644 --- a/sd/source/ui/inc/tools/ConfigurationAccess.hxx +++ b/sd/source/ui/inc/tools/ConfigurationAccess.hxx @@ -85,7 +85,7 @@ public: This call is ignored when the called ConfigurationAccess object was not create with read-write mode. */ - void CommitChanges (void); + void CommitChanges(); /** This functor is typically called for every item in a set. Its two parameters are the name of key item (often of no further interest) diff --git a/sd/source/ui/inc/tools/IconCache.hxx b/sd/source/ui/inc/tools/IconCache.hxx index 3ef8bc7dc2bb..8caf5a67009f 100644 --- a/sd/source/ui/inc/tools/IconCache.hxx +++ b/sd/source/ui/inc/tools/IconCache.hxx @@ -41,7 +41,7 @@ public: /** The lifetime of the returned reference is limited to that of the sd module. */ - static IconCache& Instance (void); + static IconCache& Instance(); /** Return the icon with the given resource id. @return @@ -59,11 +59,11 @@ private: it at the SdGlobalResourceContainer to limit is lifetime to that of the sd module. */ - IconCache (void); + IconCache(); /** This destructor is called by SdGlobalResourceContainer. */ - virtual ~IconCache (void); + virtual ~IconCache(); }; } // end of namespace sd diff --git a/sd/source/ui/inc/tools/IdleDetection.hxx b/sd/source/ui/inc/tools/IdleDetection.hxx index 7bdb8401e924..63690dc84662 100644 --- a/sd/source/ui/inc/tools/IdleDetection.hxx +++ b/sd/source/ui/inc/tools/IdleDetection.hxx @@ -69,11 +69,11 @@ public: private: /** Check whether there are input events pending. */ - static sal_Int32 CheckInputPending (void); + static sal_Int32 CheckInputPending(); /** Check whether a slide show is running full screen or in a window. */ - static sal_Int32 CheckSlideShowRunning (void); + static sal_Int32 CheckSlideShowRunning(); static sal_Int32 CheckWindowPainting (const vcl::Window& rWindow); }; diff --git a/sd/source/ui/inc/tools/PropertySet.hxx b/sd/source/ui/inc/tools/PropertySet.hxx index e4a97978073d..e44224377df8 100644 --- a/sd/source/ui/inc/tools/PropertySet.hxx +++ b/sd/source/ui/inc/tools/PropertySet.hxx @@ -46,15 +46,15 @@ class PropertySet public PropertySetInterfaceBase { public: - explicit PropertySet (void); - virtual ~PropertySet (void); + explicit PropertySet(); + virtual ~PropertySet(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XPropertySet virtual css::uno::Reference<css::beans::XPropertySetInfo> - SAL_CALL getPropertySetInfo (void) + SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue ( @@ -130,7 +130,7 @@ private: /** This method throws a DisposedException when the object has already been disposed. */ - void ThrowIfDisposed (void) + void ThrowIfDisposed() throw (css::lang::DisposedException); }; diff --git a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx index 65e1065a1a35..b9281ab6be4a 100644 --- a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx +++ b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx @@ -30,7 +30,7 @@ namespace sd { class SdGlobalResource { public: - virtual ~SdGlobalResource (void) {}; + virtual ~SdGlobalResource() {}; }; /** The purpose of this container is to hold references to resources that @@ -58,7 +58,7 @@ public: class SdGlobalResourceContainer { public: - static SdGlobalResourceContainer& Instance (void); + static SdGlobalResourceContainer& Instance(); /** Add a resource to the container. The ownership of the resource is transferred to the container. The resource is destroyed when the @@ -89,8 +89,8 @@ protected: class Implementation; ::std::unique_ptr<Implementation> mpImpl; - SdGlobalResourceContainer (void); - ~SdGlobalResourceContainer (void); + SdGlobalResourceContainer(); + ~SdGlobalResourceContainer(); }; } // end of namespace sd diff --git a/sd/source/ui/inc/tools/SlotStateListener.hxx b/sd/source/ui/inc/tools/SlotStateListener.hxx index 2e148b485dbe..64045d50509e 100644 --- a/sd/source/ui/inc/tools/SlotStateListener.hxx +++ b/sd/source/ui/inc/tools/SlotStateListener.hxx @@ -59,7 +59,7 @@ public: /** The constructor de-registers all remaining listeners. Usually a prior dispose() call should have done that already. */ - virtual ~SlotStateListener (void); + virtual ~SlotStateListener(); /** Set the callback to the given value. Whenever one of the observed slots changes its state this callback is informed about it. @@ -108,7 +108,7 @@ protected: reaction to a XComponent::dispose() call. It releases all currently active listeners. */ - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; private: Link maCallback; @@ -124,12 +124,12 @@ private: /** Deregister all currently active state change listeners. */ - void ReleaseListeners (void); + void ReleaseListeners(); /** This method throws a DisposedException when the object has already been disposed. */ - void ThrowIfDisposed (void) + void ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException); /** Transform the given string into a URL object. diff --git a/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx b/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx index 7a79d06da1df..1bf5ec72cf14 100644 --- a/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx +++ b/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx @@ -56,7 +56,7 @@ public: /** Stop the execution of the task and release the shared pointer to itself so that it will eventually be destroyed. */ - void Release (void); + void Release(); /** Convenience method that calls Release() on the given task. It checks the given weak_ptr for being expired and catches bad_weak_ptr @@ -77,7 +77,7 @@ private: const ::boost::shared_ptr<AsynchronousTask>& rpTask, sal_uInt32 nMillisecondsBetweenSteps, sal_uInt32 nMaxTimePerStep); - ~TimerBasedTaskExecution (void); + ~TimerBasedTaskExecution(); void SetSelf (const ::boost::shared_ptr<TimerBasedTaskExecution>& rpSelf); class Deleter; diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx index 353b06eee46f..58bd4e965c80 100644 --- a/sd/source/ui/inc/tpoption.hxx +++ b/sd/source/ui/inc/tpoption.hxx @@ -122,7 +122,7 @@ private: 'general' tab page depending on whether there is at least one document. */ - void UpdateCompatibilityControls (void); + void UpdateCompatibilityControls(); protected: virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; @@ -140,13 +140,13 @@ public: and arrange the visible controls. Do not call this method or the <member>SetImpressMode()</member> method more than once. */ - void SetDrawMode (void); + void SetDrawMode(); /** Hide Draw specific controls, make Impress specific controls visible and arrange the visible controls. Do not call this method or the <member>SetDrawMode()</member> method more than once. */ - void SetImpressMode (void); + void SetImpressMode(); virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; using TabPage::ActivatePage; diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.cxx b/sd/source/ui/presenter/CanvasUpdateRequester.cxx index f460f2bdc493..0f73676fff4b 100644 --- a/sd/source/ui/presenter/CanvasUpdateRequester.cxx +++ b/sd/source/ui/presenter/CanvasUpdateRequester.cxx @@ -68,7 +68,7 @@ CanvasUpdateRequester::CanvasUpdateRequester ( } } -CanvasUpdateRequester::~CanvasUpdateRequester (void) +CanvasUpdateRequester::~CanvasUpdateRequester() { if (mnUserEventId != 0) Application::RemoveUserEvent(mnUserEventId); diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.hxx b/sd/source/ui/presenter/CanvasUpdateRequester.hxx index 4143f4e4e9c2..35085a1e2fc8 100644 --- a/sd/source/ui/presenter/CanvasUpdateRequester.hxx +++ b/sd/source/ui/presenter/CanvasUpdateRequester.hxx @@ -50,7 +50,7 @@ public: private: CanvasUpdateRequester (const css::uno::Reference<css::rendering::XSpriteCanvas>& rxCanvas); - ~CanvasUpdateRequester (void); + ~CanvasUpdateRequester(); class Deleter; friend class Deleter; typedef ::std::vector< diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx index 908908c7277c..dd38320f3c7c 100644 --- a/sd/source/ui/presenter/PresenterCanvas.cxx +++ b/sd/source/ui/presenter/PresenterCanvas.cxx @@ -61,8 +61,8 @@ public: const Reference<rendering::XCustomSprite>& rxSprite, const Reference<awt::XWindow>& rxBaseWindow, const css::geometry::RealSize2D& rSpriteSize); - virtual ~PresenterCustomSprite (void); - virtual void SAL_CALL disposing (void) + virtual ~PresenterCustomSprite(); + virtual void SAL_CALL disposing() throw (RuntimeException) SAL_OVERRIDE; // XSprite @@ -84,15 +84,15 @@ public: virtual void SAL_CALL setPriority (double nPriority) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL show (void) + virtual void SAL_CALL show() throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL hide (void) + virtual void SAL_CALL hide() throw (RuntimeException, std::exception) SAL_OVERRIDE; // XCustomSprite - virtual Reference<rendering::XCanvas> SAL_CALL getContentCanvas (void) + virtual Reference<rendering::XCanvas> SAL_CALL getContentCanvas() throw (RuntimeException, std::exception) SAL_OVERRIDE; private: @@ -102,13 +102,13 @@ private: geometry::RealPoint2D maPosition; geometry::RealSize2D maSpriteSize; - void ThrowIfDisposed (void) + void ThrowIfDisposed() throw (css::lang::DisposedException); }; //===== PresenterCanvas ======================================================= -PresenterCanvas::PresenterCanvas (void) +PresenterCanvas::PresenterCanvas() : PresenterCanvasInterfaceBase(m_aMutex), mxUpdateCanvas(), mxSharedCanvas(), @@ -145,11 +145,11 @@ PresenterCanvas::PresenterCanvas ( mpUpdateRequester = CanvasUpdateRequester::Instance(mxUpdateCanvas); } -PresenterCanvas::~PresenterCanvas (void) +PresenterCanvas::~PresenterCanvas() { } -void SAL_CALL PresenterCanvas::disposing (void) +void SAL_CALL PresenterCanvas::disposing() throw (css::uno::RuntimeException) { if (mxWindow.is()) @@ -234,7 +234,7 @@ css::uno::Sequence<OUString> PresenterCanvas::getSupportedServiceNames() //----- XCanvas --------------------------------------------------------------- -void SAL_CALL PresenterCanvas::clear (void) +void SAL_CALL PresenterCanvas::clear() throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -470,7 +470,7 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL } css::uno::Reference<css::rendering::XGraphicDevice> SAL_CALL - PresenterCanvas::getDevice (void) + PresenterCanvas::getDevice() throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -612,7 +612,7 @@ void SAL_CALL PresenterCanvas::windowHidden (const css::lang::EventObject& rEven //----- XBitmap --------------------------------------------------------------- -geometry::IntegerSize2D SAL_CALL PresenterCanvas::getSize (void) +geometry::IntegerSize2D SAL_CALL PresenterCanvas::getSize() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -626,7 +626,7 @@ geometry::IntegerSize2D SAL_CALL PresenterCanvas::getSize (void) return geometry::IntegerSize2D(0,0); } -sal_Bool SAL_CALL PresenterCanvas::hasAlpha (void) +sal_Bool SAL_CALL PresenterCanvas::hasAlpha() throw (RuntimeException, std::exception) { Reference<rendering::XBitmap> xBitmap (mxSharedCanvas, UNO_QUERY); @@ -856,7 +856,7 @@ Reference<rendering::XPolyPolygon2D> PresenterCanvas::UpdateSpriteClip ( return xPolygon; } -void PresenterCanvas::ThrowIfDisposed (void) +void PresenterCanvas::ThrowIfDisposed() throw (css::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose || ! mxSharedCanvas.is()) @@ -882,11 +882,11 @@ PresenterCustomSprite::PresenterCustomSprite ( { } -PresenterCustomSprite::~PresenterCustomSprite (void) +PresenterCustomSprite::~PresenterCustomSprite() { } -void SAL_CALL PresenterCustomSprite::disposing (void) +void SAL_CALL PresenterCustomSprite::disposing() throw (RuntimeException) { Reference<XComponent> xComponent (mxSprite, UNO_QUERY); @@ -948,14 +948,14 @@ void SAL_CALL PresenterCustomSprite::setPriority (const double nPriority) mxSprite->setPriority(nPriority); } -void SAL_CALL PresenterCustomSprite::show (void) +void SAL_CALL PresenterCustomSprite::show() throw (RuntimeException, std::exception) { ThrowIfDisposed(); mxSprite->show(); } -void SAL_CALL PresenterCustomSprite::hide (void) +void SAL_CALL PresenterCustomSprite::hide() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -964,14 +964,14 @@ void SAL_CALL PresenterCustomSprite::hide (void) //----- XCustomSprite --------------------------------------------------------- -Reference<rendering::XCanvas> PresenterCustomSprite::getContentCanvas (void) +Reference<rendering::XCanvas> PresenterCustomSprite::getContentCanvas() throw (RuntimeException, std::exception) { ThrowIfDisposed(); return mxSprite->getContentCanvas(); } -void PresenterCustomSprite::ThrowIfDisposed (void) +void PresenterCustomSprite::ThrowIfDisposed() throw (css::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose || ! mxSprite.is()) diff --git a/sd/source/ui/presenter/PresenterCanvas.hxx b/sd/source/ui/presenter/PresenterCanvas.hxx index d60d41f95c9b..606117caca4e 100644 --- a/sd/source/ui/presenter/PresenterCanvas.hxx +++ b/sd/source/ui/presenter/PresenterCanvas.hxx @@ -70,7 +70,7 @@ public: /** This constructor is used when a PresenterCanvas object is created as a service. */ - PresenterCanvas (void); + PresenterCanvas(); /** This constructor is used when a PresenterCanvas object is created directly, typically by the PresenterCanvasFactory. @@ -105,9 +105,9 @@ public: const css::uno::Reference<css::rendering::XCanvas>& rxSharedCanvas, const css::uno::Reference<css::awt::XWindow>& rxSharedWindow, const css::uno::Reference<css::awt::XWindow>& rxWindow); - virtual ~PresenterCanvas (void); + virtual ~PresenterCanvas(); - virtual void SAL_CALL disposing (void) + virtual void SAL_CALL disposing() throw (css::uno::RuntimeException) SAL_OVERRIDE; css::awt::Point GetOffset (const css::uno::Reference<css::awt::XWindow>& rxBaseWindow); @@ -119,7 +119,7 @@ public: const css::rendering::ViewState& rViewState, const css::awt::Point& raOffset); - css::uno::Reference<css::rendering::XCanvas> GetSharedCanvas (void) const; + css::uno::Reference<css::rendering::XCanvas> GetSharedCanvas() const; /** This method is typically called by CanvasPane objects to set the repaint rectangle of a windowPaint() call as clip rectangle. When @@ -160,7 +160,7 @@ public: // XCanvas - virtual void SAL_CALL clear (void) + virtual void SAL_CALL clear() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL drawPoint ( @@ -305,7 +305,7 @@ public: css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference<css::rendering::XGraphicDevice> SAL_CALL - getDevice (void) + getDevice() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XSpriteCanvas @@ -358,10 +358,10 @@ public: // XBitmap - virtual css::geometry::IntegerSize2D SAL_CALL getSize (void) + virtual css::geometry::IntegerSize2D SAL_CALL getSize() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasAlpha (void) + virtual sal_Bool SAL_CALL hasAlpha() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference<css::rendering::XBitmap> SAL_CALL getScaledBitmap( @@ -411,7 +411,7 @@ private: /** This method throws a DisposedException when the object has already been disposed. */ - void ThrowIfDisposed (void) + void ThrowIfDisposed() throw (css::lang::DisposedException); }; diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx index 8e62792adb37..79d9ef48cad2 100644 --- a/sd/source/ui/presenter/PresenterHelper.cxx +++ b/sd/source/ui/presenter/PresenterHelper.cxx @@ -51,7 +51,7 @@ PresenterHelper::PresenterHelper ( { } -PresenterHelper::~PresenterHelper (void) +PresenterHelper::~PresenterHelper() { } diff --git a/sd/source/ui/presenter/PresenterHelper.hxx b/sd/source/ui/presenter/PresenterHelper.hxx index 44bc3fc7b555..4f1625bc919b 100644 --- a/sd/source/ui/presenter/PresenterHelper.hxx +++ b/sd/source/ui/presenter/PresenterHelper.hxx @@ -46,7 +46,7 @@ class PresenterHelper { public: PresenterHelper (const css::uno::Reference<css::uno::XComponentContext>& rxContext); - virtual ~PresenterHelper (void); + virtual ~PresenterHelper(); // XInitialize diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx index c4fd99bb1b7e..00406b0759b0 100644 --- a/sd/source/ui/presenter/PresenterPreviewCache.cxx +++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx @@ -35,8 +35,8 @@ namespace sd { namespace presenter { class PresenterPreviewCache::PresenterCacheContext : public CacheContext { public: - PresenterCacheContext (void); - virtual ~PresenterCacheContext (void); + PresenterCacheContext(); + virtual ~PresenterCacheContext(); void SetDocumentSlides ( const Reference<container::XIndexAccess>& rxSlides, @@ -52,12 +52,12 @@ public: virtual void NotifyPreviewCreation ( CacheKey aKey, const Bitmap& rPreview) SAL_OVERRIDE; - virtual bool IsIdle (void) SAL_OVERRIDE; + virtual bool IsIdle() SAL_OVERRIDE; virtual bool IsVisible (CacheKey aKey) SAL_OVERRIDE; virtual const SdrPage* GetPage (CacheKey aKey) SAL_OVERRIDE; virtual ::boost::shared_ptr<std::vector<CacheKey> > GetEntryList (bool bVisible) SAL_OVERRIDE; virtual sal_Int32 GetPriority (CacheKey aKey) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference<com::sun::star::uno::XInterface> GetModel (void) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference<com::sun::star::uno::XInterface> GetModel() SAL_OVERRIDE; private: Reference<container::XIndexAccess> mxSlides; @@ -81,7 +81,7 @@ PresenterPreviewCache::PresenterPreviewCache (const Reference<XComponentContext> (void)rxContext; } -PresenterPreviewCache::~PresenterPreviewCache (void) +PresenterPreviewCache::~PresenterPreviewCache() { } @@ -171,7 +171,7 @@ void SAL_CALL PresenterPreviewCache::removePreviewCreationNotifyListener ( mpCacheContext->RemovePreviewCreationNotifyListener(rxListener); } -void SAL_CALL PresenterPreviewCache::pause (void) +void SAL_CALL PresenterPreviewCache::pause() throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -179,7 +179,7 @@ void SAL_CALL PresenterPreviewCache::pause (void) mpCache->Pause(); } -void SAL_CALL PresenterPreviewCache::resume (void) +void SAL_CALL PresenterPreviewCache::resume() throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -187,7 +187,7 @@ void SAL_CALL PresenterPreviewCache::resume (void) mpCache->Resume(); } -void PresenterPreviewCache::ThrowIfDisposed (void) +void PresenterPreviewCache::ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) @@ -199,7 +199,7 @@ void PresenterPreviewCache::ThrowIfDisposed (void) //===== PresenterPreviewCache::PresenterCacheContext ========================== -PresenterPreviewCache::PresenterCacheContext::PresenterCacheContext (void) +PresenterPreviewCache::PresenterCacheContext::PresenterCacheContext() : mxSlides(), mxDocument(), mnFirstVisibleSlideIndex(-1), @@ -208,7 +208,7 @@ PresenterPreviewCache::PresenterCacheContext::PresenterCacheContext (void) { } -PresenterPreviewCache::PresenterCacheContext::~PresenterCacheContext (void) +PresenterPreviewCache::PresenterCacheContext::~PresenterCacheContext() { } @@ -274,7 +274,7 @@ void PresenterPreviewCache::PresenterCacheContext::NotifyPreviewCreation ( CallListeners(nIndex); } -bool PresenterPreviewCache::PresenterCacheContext::IsIdle (void) +bool PresenterPreviewCache::PresenterCacheContext::IsIdle() { return true; } @@ -337,7 +337,7 @@ sal_Int32 PresenterPreviewCache::PresenterCacheContext::GetPriority (CacheKey aK return 0; } -Reference<XInterface> PresenterPreviewCache::PresenterCacheContext::GetModel (void) +Reference<XInterface> PresenterPreviewCache::PresenterCacheContext::GetModel() { return mxDocument; } diff --git a/sd/source/ui/presenter/PresenterPreviewCache.hxx b/sd/source/ui/presenter/PresenterPreviewCache.hxx index 28e7be95957a..fa680c72e0ca 100644 --- a/sd/source/ui/presenter/PresenterPreviewCache.hxx +++ b/sd/source/ui/presenter/PresenterPreviewCache.hxx @@ -47,7 +47,7 @@ class PresenterPreviewCache { public: PresenterPreviewCache (const css::uno::Reference<css::uno::XComponentContext>& rxContext); - virtual ~PresenterPreviewCache (void); + virtual ~PresenterPreviewCache(); // XInitialize @@ -87,10 +87,10 @@ public: const css::uno::Reference<css::drawing::XSlidePreviewCacheListener>& rxListener) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL pause (void) + virtual void SAL_CALL pause() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL resume (void) + virtual void SAL_CALL resume() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: @@ -103,7 +103,7 @@ private: /** This method throws a DisposedException when the object has already been disposed. */ - void ThrowIfDisposed (void) throw (css::lang::DisposedException); + void ThrowIfDisposed() throw (css::lang::DisposedException); }; } } // end of namespace ::sd::presenter diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index b9fe2662921e..7fde4a4c5e08 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -64,20 +64,20 @@ public: const OUString msTopRelativePropertyName; const OUString msTotalHeightPropertyName; - Implementation (void); - ~Implementation (void); + Implementation(); + ~Implementation(); void SetCanvas (const cppcanvas::CanvasSharedPtr& rCanvas); void SetSize (const Size aSize); void SetBackgroundColor (const Color aColor); void SetTextColor (const Color aColor); void SetFontDescriptor (const awt::FontDescriptor& rFontDescriptor); - sal_Int32 GetTop (void) const { return mnTop;} + sal_Int32 GetTop() const { return mnTop;} void SetTop (const sal_Int32 nTop); void SetText (const OUString& Text); sal_Int32 ParseDistance (const OUString& rsDistance) const; - Reference<rendering::XBitmap> GetBitmap (void); - sal_Int32 GetTotalHeight (void); + Reference<rendering::XBitmap> GetBitmap(); + sal_Int32 GetTotalHeight(); private: Reference<rendering::XBitmap> mxBitmap; @@ -92,9 +92,9 @@ private: sal_Int32 mnTop; sal_Int32 mnTotalHeight; - EditEngine * GetEditEngine (void); - EditEngine* CreateEditEngine (void); - void CheckTop (void); + EditEngine * GetEditEngine(); + EditEngine* CreateEditEngine(); + void CheckTop(); }; // PresenterTextView @@ -105,11 +105,11 @@ PresenterTextView::PresenterTextView (const Reference<XComponentContext>& rxCont (void)rxContext; } -PresenterTextView::~PresenterTextView (void) +PresenterTextView::~PresenterTextView() { } -void SAL_CALL PresenterTextView::disposing (void) +void SAL_CALL PresenterTextView::disposing() { mpImplementation.reset(); } @@ -217,7 +217,7 @@ Any PresenterTextView::SetPropertyValue ( return aOldValue; } -void PresenterTextView::ThrowIfDisposed (void) +void PresenterTextView::ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException) { if (PresenterTextViewInterfaceBase::rBHelper.bDisposed @@ -230,7 +230,7 @@ void PresenterTextView::ThrowIfDisposed (void) } // PresenterTextView::Implementation -PresenterTextView::Implementation::Implementation (void) +PresenterTextView::Implementation::Implementation() : msTextPropertyName("Text"), msBitmapPropertyName("Bitmap"), msSizePropertyName("Size"), @@ -257,21 +257,21 @@ PresenterTextView::Implementation::Implementation (void) GetEditEngine(); } -PresenterTextView::Implementation::~Implementation (void) +PresenterTextView::Implementation::~Implementation() { delete mpEditEngine; SfxItemPool::Free(mpEditEngineItemPool); delete mpOutputDevice; } -EditEngine * PresenterTextView::Implementation::GetEditEngine (void) +EditEngine * PresenterTextView::Implementation::GetEditEngine() { if (mpEditEngine == NULL) mpEditEngine = CreateEditEngine (); return mpEditEngine; } -EditEngine* PresenterTextView::Implementation::CreateEditEngine (void) +EditEngine* PresenterTextView::Implementation::CreateEditEngine() { EditEngine* pEditEngine = mpEditEngine; if (pEditEngine == NULL) @@ -447,7 +447,7 @@ sal_Int32 PresenterTextView::Implementation::ParseDistance (const OUString& rsDi return nDistance; } -Reference<rendering::XBitmap> PresenterTextView::Implementation::GetBitmap (void) +Reference<rendering::XBitmap> PresenterTextView::Implementation::GetBitmap() { DBG_ASSERT(mpEditEngine!=NULL, "EditEngine missing"); @@ -484,7 +484,7 @@ Reference<rendering::XBitmap> PresenterTextView::Implementation::GetBitmap (void return mxBitmap; } -sal_Int32 PresenterTextView::Implementation::GetTotalHeight (void) +sal_Int32 PresenterTextView::Implementation::GetTotalHeight() { DBG_ASSERT(mpEditEngine!=NULL, "EditEngine missing"); @@ -497,7 +497,7 @@ sal_Int32 PresenterTextView::Implementation::GetTotalHeight (void) return mnTotalHeight; } -void PresenterTextView::Implementation::CheckTop (void) +void PresenterTextView::Implementation::CheckTop() { DBG_ASSERT(mpEditEngine!=NULL, "EditEngine missing"); diff --git a/sd/source/ui/presenter/PresenterTextView.hxx b/sd/source/ui/presenter/PresenterTextView.hxx index 21a878dcc698..2927e3831499 100644 --- a/sd/source/ui/presenter/PresenterTextView.hxx +++ b/sd/source/ui/presenter/PresenterTextView.hxx @@ -50,7 +50,7 @@ class PresenterTextView { public: explicit PresenterTextView (const css::uno::Reference<css::uno::XComponentContext>& rxContext); - virtual ~PresenterTextView (void); + virtual ~PresenterTextView(); // XInitialization @@ -58,7 +58,7 @@ public: throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; virtual css::uno::Any GetPropertyValue ( const OUString& rsPropertyName) SAL_OVERRIDE; @@ -73,7 +73,7 @@ private: /** This method throws a DisposedException when the object has already been disposed. */ - void ThrowIfDisposed (void) throw (css::lang::DisposedException); + void ThrowIfDisposed() throw (css::lang::DisposedException); }; } } // end of namespace ::sd::presenter diff --git a/sd/source/ui/presenter/SlideRenderer.cxx b/sd/source/ui/presenter/SlideRenderer.cxx index bec55173cf9a..f64f6c515cc0 100644 --- a/sd/source/ui/presenter/SlideRenderer.cxx +++ b/sd/source/ui/presenter/SlideRenderer.cxx @@ -41,11 +41,11 @@ SlideRenderer::SlideRenderer (const Reference<XComponentContext>& rxContext) (void)rxContext; } -SlideRenderer::~SlideRenderer (void) +SlideRenderer::~SlideRenderer() { } -void SAL_CALL SlideRenderer::disposing (void) +void SAL_CALL SlideRenderer::disposing() { } @@ -197,7 +197,7 @@ BitmapEx SlideRenderer::CreatePreview ( } } -void SlideRenderer::ThrowIfDisposed (void) +void SlideRenderer::ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException) { if (SlideRendererInterfaceBase::rBHelper.bDisposed || SlideRendererInterfaceBase::rBHelper.bInDispose) diff --git a/sd/source/ui/presenter/SlideRenderer.hxx b/sd/source/ui/presenter/SlideRenderer.hxx index 19846faca260..d99459019ab9 100644 --- a/sd/source/ui/presenter/SlideRenderer.hxx +++ b/sd/source/ui/presenter/SlideRenderer.hxx @@ -51,8 +51,8 @@ class SlideRenderer { public: explicit SlideRenderer (const css::uno::Reference<css::uno::XComponentContext>& rxContext); - virtual ~SlideRenderer (void); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual ~SlideRenderer(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInitialization @@ -100,7 +100,7 @@ private: /** This method throws a DisposedException when the object has already been disposed. */ - void ThrowIfDisposed (void) throw (css::lang::DisposedException); + void ThrowIfDisposed() throw (css::lang::DisposedException); }; } } // end of namespace ::sd::presenter diff --git a/sd/source/ui/remotecontrol/Listener.cxx b/sd/source/ui/remotecontrol/Listener.cxx index 2bc86be2f671..f166609f1a90 100644 --- a/sd/source/ui/remotecontrol/Listener.cxx +++ b/sd/source/ui/remotecontrol/Listener.cxx @@ -85,12 +85,12 @@ void SAL_CALL Listener::repeat( const css::uno::Reference< //----- XSlideShowListener ---------------------------------------------------- -void SAL_CALL Listener::paused (void) +void SAL_CALL Listener::paused() throw (com::sun::star::uno::RuntimeException, std::exception) { } -void SAL_CALL Listener::resumed (void) +void SAL_CALL Listener::resumed() throw (css::uno::RuntimeException, std::exception) { } @@ -106,7 +106,7 @@ void SAL_CALL Listener::hyperLinkClicked (const OUString &) { } -void SAL_CALL Listener::slideTransitionStarted (void) +void SAL_CALL Listener::slideTransitionStarted() throw (css::uno::RuntimeException, std::exception) { sal_Int32 aSlide = mController->getCurrentSlideIndex(); @@ -122,17 +122,17 @@ void SAL_CALL Listener::slideTransitionStarted (void) } } -void SAL_CALL Listener::slideTransitionEnded (void) +void SAL_CALL Listener::slideTransitionEnded() throw (css::uno::RuntimeException, std::exception) { } -void SAL_CALL Listener::slideAnimationsEnded (void) +void SAL_CALL Listener::slideAnimationsEnded() throw (css::uno::RuntimeException, std::exception) { } -void SAL_CALL Listener::disposing (void) +void SAL_CALL Listener::disposing() { pTransmitter = NULL; if ( mController.is() ) diff --git a/sd/source/ui/remotecontrol/Listener.hxx b/sd/source/ui/remotecontrol/Listener.hxx index 5bcc02d11422..bb89477615d1 100644 --- a/sd/source/ui/remotecontrol/Listener.hxx +++ b/sd/source/ui/remotecontrol/Listener.hxx @@ -55,7 +55,7 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; virtual void SAL_CALL disposing ( const com::sun::star::lang::EventObject& rEvent) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sd/source/ui/sidebar/AllMasterPagesSelector.cxx b/sd/source/ui/sidebar/AllMasterPagesSelector.cxx index d633cfecf978..8e40ef1d0471 100644 --- a/sd/source/ui/sidebar/AllMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/AllMasterPagesSelector.cxx @@ -74,7 +74,7 @@ class AllMasterPagesSelector::SortedMasterPageDescriptorList : public ::std::set<SharedMasterPageDescriptor,MasterPageDescriptorOrder> { public: - SortedMasterPageDescriptorList (void) {} + SortedMasterPageDescriptorList() {} }; MasterPagesSelector* AllMasterPagesSelector::Create ( @@ -113,7 +113,7 @@ AllMasterPagesSelector::AllMasterPagesSelector ( MasterPagesSelector::Fill(); } -AllMasterPagesSelector::~AllMasterPagesSelector (void) +AllMasterPagesSelector::~AllMasterPagesSelector() { } @@ -146,7 +146,7 @@ void AllMasterPagesSelector::NotifyContainerChangeEvent ( } } -void AllMasterPagesSelector::UpdateMasterPageList (void) +void AllMasterPagesSelector::UpdateMasterPageList() { mpSortedMasterPages->clear(); int nTokenCount = mpContainer->GetTokenCount(); diff --git a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx index e3135871d5ca..11bcb2640f65 100644 --- a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx @@ -62,7 +62,7 @@ private: ViewShellBase& rBase, const ::boost::shared_ptr<MasterPageContainer>& rpContainer, const css::uno::Reference<css::ui::XSidebar>& rxSidebar); - virtual ~AllMasterPagesSelector (void); + virtual ~AllMasterPagesSelector(); void AddTemplate (const TemplateEntry& rEntry); @@ -75,7 +75,7 @@ private: /** Update the internal list of master pages that are to show in the control. */ - void UpdateMasterPageList (void); + void UpdateMasterPageList(); using MasterPagesSelector::Fill; }; diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx index 5e01b5fa66e4..5e8bdad96b52 100644 --- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx @@ -89,7 +89,7 @@ CurrentMasterPagesSelector::CurrentMasterPagesSelector ( | sd::tools::EventMultiplexerEvent::EID_SHAPE_REMOVED); } -CurrentMasterPagesSelector::~CurrentMasterPagesSelector (void) +CurrentMasterPagesSelector::~CurrentMasterPagesSelector() { if (mrDocument.GetDocSh() != NULL) { @@ -104,7 +104,7 @@ CurrentMasterPagesSelector::~CurrentMasterPagesSelector (void) mrBase.GetEventMultiplexer()->RemoveEventListener(aLink); } -void CurrentMasterPagesSelector::LateInit (void) +void CurrentMasterPagesSelector::LateInit() { MasterPagesSelector::LateInit(); MasterPagesSelector::Fill(); @@ -157,12 +157,12 @@ void CurrentMasterPagesSelector::Fill (ItemList& rItemList) } } -ResId CurrentMasterPagesSelector::GetContextMenuResId (void) const +ResId CurrentMasterPagesSelector::GetContextMenuResId() const { return SdResId(RID_TASKPANE_CURRENT_MASTERPAGESSELECTOR_POPUP); } -void CurrentMasterPagesSelector::UpdateSelection (void) +void CurrentMasterPagesSelector::UpdateSelection() { // Iterate over all pages and for the selected ones put the name of // their master page into a set. diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx index e5c2932b90be..e9a3cbe5d7d8 100644 --- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx @@ -44,7 +44,7 @@ public: used by the currently selected page of the document in the center pane. */ - virtual void UpdateSelection (void) SAL_OVERRIDE; + virtual void UpdateSelection() SAL_OVERRIDE; /** Copy all master pages that are to be shown into the given list. */ @@ -53,7 +53,7 @@ public: using MasterPagesSelector::Fill; protected: - virtual ResId GetContextMenuResId (void) const SAL_OVERRIDE; + virtual ResId GetContextMenuResId() const SAL_OVERRIDE; virtual void ProcessPopupMenu (Menu& rMenu) SAL_OVERRIDE; virtual void ExecuteCommand (const sal_Int32 nCommandId) SAL_OVERRIDE; @@ -67,9 +67,9 @@ private: ViewShellBase& rBase, const ::boost::shared_ptr<MasterPageContainer>& rpContainer, const css::uno::Reference<css::ui::XSidebar>& rxSidebar); - virtual ~CurrentMasterPagesSelector (void); + virtual ~CurrentMasterPagesSelector(); - virtual void LateInit (void) SAL_OVERRIDE; + virtual void LateInit() SAL_OVERRIDE; DECL_LINK(EventMultiplexerListener,sd::tools::EventMultiplexerEvent*); }; diff --git a/sd/source/ui/sidebar/CustomAnimationPanel.cxx b/sd/source/ui/sidebar/CustomAnimationPanel.cxx index 804b6c143aa7..7f0f2d5c4d69 100644 --- a/sd/source/ui/sidebar/CustomAnimationPanel.cxx +++ b/sd/source/ui/sidebar/CustomAnimationPanel.cxx @@ -39,7 +39,7 @@ CustomAnimationPanel::CustomAnimationPanel ( #endif } -CustomAnimationPanel::~CustomAnimationPanel (void) +CustomAnimationPanel::~CustomAnimationPanel() { } diff --git a/sd/source/ui/sidebar/CustomAnimationPanel.hxx b/sd/source/ui/sidebar/CustomAnimationPanel.hxx index f9a9d708c8e3..5b42840cb3e3 100644 --- a/sd/source/ui/sidebar/CustomAnimationPanel.hxx +++ b/sd/source/ui/sidebar/CustomAnimationPanel.hxx @@ -32,7 +32,7 @@ public: vcl::Window* pParentWindow, ViewShellBase& rViewShellBase, const css::uno::Reference<css::frame::XFrame>& rxFrame); - virtual ~CustomAnimationPanel (void); + virtual ~CustomAnimationPanel(); // ILayoutableWindow virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE; diff --git a/sd/source/ui/sidebar/IDisposable.hxx b/sd/source/ui/sidebar/IDisposable.hxx index 41dc811e0f57..3bad77980735 100644 --- a/sd/source/ui/sidebar/IDisposable.hxx +++ b/sd/source/ui/sidebar/IDisposable.hxx @@ -29,7 +29,7 @@ namespace sd { namespace sidebar { class IDisposable { public: - virtual void Dispose (void) = 0; + virtual void Dispose() = 0; virtual ~IDisposable(); }; diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index b421ac01bf29..1306ffbb8f13 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -192,13 +192,13 @@ void LayoutMenu::implConstruct( DrawDocShell& rDocumentShell ) GetParent()->AddEventListener(aWindowEventHandlerLink); } -LayoutMenu::~LayoutMenu (void) +LayoutMenu::~LayoutMenu() { SAL_INFO("sd.ui", "destroying LayoutMenu at " << this); Dispose(); } -void LayoutMenu::Dispose (void) +void LayoutMenu::Dispose() { if (mbIsDisposed) return; @@ -219,7 +219,7 @@ void LayoutMenu::Dispose (void) GetParent()->RemoveEventListener(aWindowEventHandlerLink); } -AutoLayout LayoutMenu::GetSelectedAutoLayout (void) +AutoLayout LayoutMenu::GetSelectedAutoLayout() { AutoLayout aResult = AUTOLAYOUT_NONE; @@ -266,7 +266,7 @@ void LayoutMenu::Paint (const Rectangle& rRect) ValueSet::Paint (rRect); } -void LayoutMenu::Resize (void) +void LayoutMenu::Resize() { Size aWindowSize = GetOutputSizePixel(); if (IsVisible() && aWindowSize.Width() > 0) @@ -337,7 +337,7 @@ void LayoutMenu::InsertPageWithLayout (AutoLayout aLayout) UpdateSelection(); } -void LayoutMenu::InvalidateContent (void) +void LayoutMenu::InvalidateContent() { // Throw away the current set and fill the menu anew according to the // current settings (this includes the support for vertical writing.) @@ -493,7 +493,7 @@ SfxRequest LayoutMenu::CreateRequest ( return aRequest; } -void LayoutMenu::Fill (void) +void LayoutMenu::Fill() { SvtLanguageOptions aLanguageOptions; bool bVertical = aLanguageOptions.IsVerticalTextEnabled(); @@ -559,7 +559,7 @@ void LayoutMenu::Fill (void) mbSelectionUpdatePending = true; } -void LayoutMenu::Clear (void) +void LayoutMenu::Clear() { for (sal_uInt16 nId=1; nId<=GetItemCount(); nId++) delete static_cast<AutoLayout*>(GetItemData(nId)); @@ -661,7 +661,7 @@ IMPL_LINK(LayoutMenu, OnMenuItemSelected, Menu*, pMenu) return 0; } -void LayoutMenu::UpdateSelection (void) +void LayoutMenu::UpdateSelection() { bool bItemSelected = false; diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx b/sd/source/ui/sidebar/LayoutMenu.hxx index 7eb77fc38f46..32c5819f9649 100644 --- a/sd/source/ui/sidebar/LayoutMenu.hxx +++ b/sd/source/ui/sidebar/LayoutMenu.hxx @@ -72,21 +72,21 @@ public: vcl::Window* pParent, ViewShellBase& rViewShellBase, const css::uno::Reference<css::ui::XSidebar>& rxSidebar); - virtual ~LayoutMenu (void); + virtual ~LayoutMenu(); - void Dispose (void); + void Dispose(); /** Return a numerical value representing the currently selected layout. */ - AutoLayout GetSelectedAutoLayout (void); + AutoLayout GetSelectedAutoLayout(); // From ILayoutableWindow virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE; // From vcl::Window virtual void Paint (const Rectangle& rRect) SAL_OVERRIDE; - virtual void Resize (void) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; /** Show a context menu when the right mouse button is pressed. */ @@ -96,7 +96,7 @@ public: anymore. It will re-assemble this set according to the current settings. */ - void InvalidateContent (void); + void InvalidateContent(); // DragSourceHelper virtual void StartDrag (sal_Int8 nAction, const Point& rPosPixel) SAL_OVERRIDE; @@ -146,11 +146,11 @@ private: /** Fill the value set with the layouts that are applicable to the current main view shell. */ - void Fill (void); + void Fill(); /** Remove all items from the value set. */ - void Clear (void); + void Clear(); /** Assign the given layout to all selected slides of a slide sorter. If no slide sorter is active then this call is ignored. The slide @@ -180,7 +180,7 @@ private: /** Select the layout that is used by the current page. */ - void UpdateSelection (void); + void UpdateSelection(); // internal ctor void implConstruct( DrawDocShell& rDocumentShell ); diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx index 6ce87fb0019a..0a6c697fa6d1 100644 --- a/sd/source/ui/sidebar/MasterPageContainer.cxx +++ b/sd/source/ui/sidebar/MasterPageContainer.cxx @@ -81,12 +81,12 @@ public: static ::boost::weak_ptr<Implementation> mpInstance; MasterPageContainerType maContainer; - static ::boost::shared_ptr<Implementation> Instance (void); + static ::boost::shared_ptr<Implementation> Instance(); - void LateInit (void); + void LateInit(); void AddChangeListener (const Link& rLink); void RemoveChangeListener (const Link& rLink); - void UpdatePreviewSizePixel (void); + void UpdatePreviewSizePixel(); Size GetPreviewSizePixel (PreviewSize eSize) const; bool HasToken (Token aToken) const; @@ -100,8 +100,8 @@ public: PreviewState GetPreviewState (Token aToken) const; bool RequestPreview (Token aToken); - Reference<frame::XModel> GetModel (void); - SdDrawDocument* GetDocument (void); + Reference<frame::XModel> GetModel(); + SdDrawDocument* GetDocument(); void FireContainerChange ( MasterPageContainerChangeEvent::EventType eType, @@ -119,11 +119,11 @@ public: /** Called by the MasterPageContainerFiller to notify that all master pages from template documents have been added. */ - virtual void FillingDone (void) SAL_OVERRIDE; + virtual void FillingDone() SAL_OVERRIDE; private: - Implementation (void); - virtual ~Implementation (void); + Implementation(); + virtual ~Implementation(); class Deleter { public: void operator() (Implementation* pObject) { delete pObject; } @@ -175,7 +175,7 @@ private: Image GetPreviewSubstitution (sal_uInt16 nId, PreviewSize ePreviewSize); - void CleanContainer (void); + void CleanContainer(); }; //===== MasterPageContainer =================================================== @@ -184,7 +184,7 @@ private: MasterPageContainer::Implementation::mpInstance; ::boost::shared_ptr<MasterPageContainer::Implementation> - MasterPageContainer::Implementation::Instance (void) + MasterPageContainer::Implementation::Instance() { ::boost::shared_ptr<MasterPageContainer::Implementation> pInstance; @@ -217,14 +217,14 @@ private: return pInstance; } -MasterPageContainer::MasterPageContainer (void) +MasterPageContainer::MasterPageContainer() : mpImpl(Implementation::Instance()), mePreviewSize(SMALL) { mpImpl->LateInit(); } -MasterPageContainer::~MasterPageContainer (void) +MasterPageContainer::~MasterPageContainer() { } @@ -246,7 +246,7 @@ void MasterPageContainer::SetPreviewSize (PreviewSize eSize) NIL_TOKEN); } -Size MasterPageContainer::GetPreviewSizePixel (void) const +Size MasterPageContainer::GetPreviewSizePixel() const { return mpImpl->GetPreviewSizePixel(mePreviewSize); } @@ -290,7 +290,7 @@ void MasterPageContainer::ReleaseToken (Token aToken) } } -int MasterPageContainer::GetTokenCount (void) const +int MasterPageContainer::GetTokenCount() const { const ::osl::MutexGuard aGuard (mpImpl->maMutex); @@ -483,7 +483,7 @@ bool MasterPageContainer::RequestPreview (Token aToken) //==== Implementation ================================================ -MasterPageContainer::Implementation::Implementation (void) +MasterPageContainer::Implementation::Implementation() : maMutex(), maContainer(), meInitializationState(NOT_INITIALIZED), @@ -505,7 +505,7 @@ MasterPageContainer::Implementation::Implementation (void) UpdatePreviewSizePixel(); } -MasterPageContainer::Implementation::~Implementation (void) +MasterPageContainer::Implementation::~Implementation() { // When the initializer or filler tasks are still running then we have // to stop them now in order to prevent them from calling us back. @@ -527,7 +527,7 @@ MasterPageContainer::Implementation::~Implementation (void) mxModel = NULL; } -void MasterPageContainer::Implementation::LateInit (void) +void MasterPageContainer::Implementation::LateInit() { const ::osl::MutexGuard aGuard (maMutex); @@ -569,7 +569,7 @@ void MasterPageContainer::Implementation::RemoveChangeListener (const Link& rLin maChangeListeners.erase(iListener); } -void MasterPageContainer::Implementation::UpdatePreviewSizePixel (void) +void MasterPageContainer::Implementation::UpdatePreviewSizePixel() { const ::osl::MutexGuard aGuard (maMutex); @@ -835,7 +835,7 @@ bool MasterPageContainer::Implementation::RequestPreview (Token aToken) return false; } -Reference<frame::XModel> MasterPageContainer::Implementation::GetModel (void) +Reference<frame::XModel> MasterPageContainer::Implementation::GetModel() { const ::osl::MutexGuard aGuard (maMutex); @@ -887,7 +887,7 @@ Reference<frame::XModel> MasterPageContainer::Implementation::GetModel (void) return mxModel; } -SdDrawDocument* MasterPageContainer::Implementation::GetDocument (void) +SdDrawDocument* MasterPageContainer::Implementation::GetDocument() { GetModel(); return mpDocument; @@ -937,7 +937,7 @@ Image MasterPageContainer::Implementation::GetPreviewSubstitution ( return aPreview; } -void MasterPageContainer::Implementation::CleanContainer (void) +void MasterPageContainer::Implementation::CleanContainer() { // Remove the empty elements at the end of the container. The empty // elements in the middle can not be removed because that would @@ -1031,7 +1031,7 @@ void MasterPageContainer::Implementation::ReleaseDescriptor (Token aToken) } } -void MasterPageContainer::Implementation::FillingDone (void) +void MasterPageContainer::Implementation::FillingDone() { mpRequestQueue->ProcessAllRequests(); } diff --git a/sd/source/ui/sidebar/MasterPageContainer.hxx b/sd/source/ui/sidebar/MasterPageContainer.hxx index 4ed2d90bb6d9..020b6bd2d7fb 100644 --- a/sd/source/ui/sidebar/MasterPageContainer.hxx +++ b/sd/source/ui/sidebar/MasterPageContainer.hxx @@ -58,8 +58,8 @@ public: typedef int Token; static const Token NIL_TOKEN = -1; - MasterPageContainer (void); - virtual ~MasterPageContainer (void); + MasterPageContainer(); + virtual ~MasterPageContainer(); void AddChangeListener (const Link& rLink); void RemoveChangeListener (const Link& rLink); @@ -75,11 +75,11 @@ public: /** Returns the preview size. */ - PreviewSize GetPreviewSize (void) const { return mePreviewSize;} + PreviewSize GetPreviewSize() const { return mePreviewSize;} /** Return the preview size in pixels. */ - Size GetPreviewSizePixel (void) const; + Size GetPreviewSizePixel() const; enum PreviewState { PS_AVAILABLE, PS_CREATABLE, PS_PREPARING, PS_NOT_AVAILABLE }; PreviewState GetPreviewState (Token aToken); @@ -115,7 +115,7 @@ public: /** This and the GetTokenForIndex() methods can be used to iterate over all members of the container. */ - int GetTokenCount (void) const; + int GetTokenCount() const; /** Determine whether the container has a member for the given token. */ diff --git a/sd/source/ui/sidebar/MasterPageContainerFiller.cxx b/sd/source/ui/sidebar/MasterPageContainerFiller.cxx index 49fba6dbfc06..f85c72f360e4 100644 --- a/sd/source/ui/sidebar/MasterPageContainerFiller.cxx +++ b/sd/source/ui/sidebar/MasterPageContainerFiller.cxx @@ -51,11 +51,11 @@ MasterPageContainerFiller::MasterPageContainerFiller (ContainerAdapter& rpAdapte mrContainerAdapter.PutMasterPage(pDescriptor); } -MasterPageContainerFiller::~MasterPageContainerFiller (void) +MasterPageContainerFiller::~MasterPageContainerFiller() { } -void MasterPageContainerFiller::RunNextStep (void) +void MasterPageContainerFiller::RunNextStep() { switch (meState) { @@ -95,7 +95,7 @@ void MasterPageContainerFiller::RunNextStep (void) } } -bool MasterPageContainerFiller::HasNextStep (void) +bool MasterPageContainerFiller::HasNextStep() { switch (meState) { @@ -108,7 +108,7 @@ bool MasterPageContainerFiller::HasNextStep (void) } } -MasterPageContainerFiller::State MasterPageContainerFiller::ScanTemplate (void) +MasterPageContainerFiller::State MasterPageContainerFiller::ScanTemplate() { State eState (ERROR); @@ -135,7 +135,7 @@ MasterPageContainerFiller::State MasterPageContainerFiller::ScanTemplate (void) return eState; } -MasterPageContainerFiller::State MasterPageContainerFiller::AddTemplate (void) +MasterPageContainerFiller::State MasterPageContainerFiller::AddTemplate() { if (mpLastAddedEntry != NULL) { diff --git a/sd/source/ui/sidebar/MasterPageContainerFiller.hxx b/sd/source/ui/sidebar/MasterPageContainerFiller.hxx index d6229edd36bc..2ea39a194ba7 100644 --- a/sd/source/ui/sidebar/MasterPageContainerFiller.hxx +++ b/sd/source/ui/sidebar/MasterPageContainerFiller.hxx @@ -47,25 +47,25 @@ public: /** This method is called when all Impress templates have been added to the container via the PutMasterPage() method. */ - virtual void FillingDone (void) = 0; + virtual void FillingDone() = 0; protected: ~ContainerAdapter() {} }; MasterPageContainerFiller (ContainerAdapter& rContainerAdapter); - virtual ~MasterPageContainerFiller (void); + virtual ~MasterPageContainerFiller(); /** Run the next step of the task. After HasNextStep() returns false this method should ignore further calls. */ - virtual void RunNextStep (void) SAL_OVERRIDE; + virtual void RunNextStep() SAL_OVERRIDE; /** Return <TRUE/> when there is at least one more step to execute. When the task has been executed completely then <FALSE/> is returned. */ - virtual bool HasNextStep (void) SAL_OVERRIDE; + virtual bool HasNextStep() SAL_OVERRIDE; private: ContainerAdapter& mrContainerAdapter; @@ -81,8 +81,8 @@ private: const TemplateEntry* mpLastAddedEntry; int mnIndex; - State ScanTemplate (void); - State AddTemplate (void); + State ScanTemplate(); + State AddTemplate(); }; } } // end of namespace sd::sidebar diff --git a/sd/source/ui/sidebar/MasterPageContainerProviders.cxx b/sd/source/ui/sidebar/MasterPageContainerProviders.cxx index c197615666e3..6474735da5e8 100644 --- a/sd/source/ui/sidebar/MasterPageContainerProviders.cxx +++ b/sd/source/ui/sidebar/MasterPageContainerProviders.cxx @@ -40,7 +40,7 @@ namespace sd { namespace sidebar { //===== PagePreviewProvider =================================================== -PagePreviewProvider::PagePreviewProvider (void) +PagePreviewProvider::PagePreviewProvider() { } @@ -65,12 +65,12 @@ Image PagePreviewProvider::operator () ( return aPreview; } -int PagePreviewProvider::GetCostIndex (void) +int PagePreviewProvider::GetCostIndex() { return 5; } -bool PagePreviewProvider::NeedsPageObject (void) +bool PagePreviewProvider::NeedsPageObject() { return true; } @@ -95,12 +95,12 @@ Image TemplatePreviewProvider::operator() ( return Image(ThumbnailView::readThumbnail(msURL)); } -int TemplatePreviewProvider::GetCostIndex (void) +int TemplatePreviewProvider::GetCostIndex() { return 10; } -bool TemplatePreviewProvider::NeedsPageObject (void) +bool TemplatePreviewProvider::NeedsPageObject() { return false; } @@ -163,7 +163,7 @@ SdPage* TemplatePageObjectProvider::operator() (SdDrawDocument* pContainerDocume return PTR_CAST(::sd::DrawDocShell,pShell); } -int TemplatePageObjectProvider::GetCostIndex (void) +int TemplatePageObjectProvider::GetCostIndex() { return 20; } @@ -180,7 +180,7 @@ bool TemplatePageObjectProvider::operator== (const PageObjectProvider& rProvider //===== DefaultPageObjectProvider ============================================== -DefaultPageObjectProvider::DefaultPageObjectProvider (void) +DefaultPageObjectProvider::DefaultPageObjectProvider() { } @@ -203,7 +203,7 @@ SdPage* DefaultPageObjectProvider::operator () (SdDrawDocument* pContainerDocume return pLocalMasterPage; } -int DefaultPageObjectProvider::GetCostIndex (void) +int DefaultPageObjectProvider::GetCostIndex() { return 15; } @@ -227,7 +227,7 @@ SdPage* ExistingPageProvider::operator() (SdDrawDocument* pDocument) return mpPage; } -int ExistingPageProvider::GetCostIndex (void) +int ExistingPageProvider::GetCostIndex() { return 0; } diff --git a/sd/source/ui/sidebar/MasterPageContainerProviders.hxx b/sd/source/ui/sidebar/MasterPageContainerProviders.hxx index 7fc367ebe30b..bffab9c3270c 100644 --- a/sd/source/ui/sidebar/MasterPageContainerProviders.hxx +++ b/sd/source/ui/sidebar/MasterPageContainerProviders.hxx @@ -52,7 +52,7 @@ public: immediate return. Positive values stand for higher costs. Negative values are not supported. */ - virtual int GetCostIndex (void) = 0; + virtual int GetCostIndex() = 0; virtual bool operator== (const PageObjectProvider& rProvider) = 0; @@ -83,12 +83,12 @@ public: is the preview creation. Return 0 when the preview is already present and can be returned immediately. */ - virtual int GetCostIndex (void) = 0; + virtual int GetCostIndex() = 0; /** Return whether the page object passed is necessary to create a preview. */ - virtual bool NeedsPageObject (void) = 0; + virtual bool NeedsPageObject() = 0; protected: ~PreviewProvider() {} @@ -99,11 +99,11 @@ protected: class PagePreviewProvider : public PreviewProvider { public: - PagePreviewProvider (void); + PagePreviewProvider(); virtual ~PagePreviewProvider() {} virtual Image operator () (int nWidth, SdPage* pPage, ::sd::PreviewRenderer& rRenderer) SAL_OVERRIDE; - virtual int GetCostIndex (void) SAL_OVERRIDE; - virtual bool NeedsPageObject (void) SAL_OVERRIDE; + virtual int GetCostIndex() SAL_OVERRIDE; + virtual bool NeedsPageObject() SAL_OVERRIDE; private: }; @@ -114,9 +114,9 @@ class TemplatePageObjectProvider : public PageObjectProvider { public: TemplatePageObjectProvider (const OUString& rsURL); - virtual ~TemplatePageObjectProvider (void) {}; + virtual ~TemplatePageObjectProvider() {}; virtual SdPage* operator () (SdDrawDocument* pDocument) SAL_OVERRIDE; - virtual int GetCostIndex (void) SAL_OVERRIDE; + virtual int GetCostIndex() SAL_OVERRIDE; virtual bool operator== (const PageObjectProvider& rProvider) SAL_OVERRIDE; private: OUString msURL; @@ -131,10 +131,10 @@ class TemplatePreviewProvider : public PreviewProvider { public: TemplatePreviewProvider (const OUString& rsURL); - virtual ~TemplatePreviewProvider (void) {}; + virtual ~TemplatePreviewProvider() {}; virtual Image operator() (int nWidth, SdPage* pPage, ::sd::PreviewRenderer& rRenderer) SAL_OVERRIDE; - virtual int GetCostIndex (void) SAL_OVERRIDE; - virtual bool NeedsPageObject (void) SAL_OVERRIDE; + virtual int GetCostIndex() SAL_OVERRIDE; + virtual bool NeedsPageObject() SAL_OVERRIDE; private: OUString msURL; }; @@ -144,10 +144,10 @@ private: class DefaultPageObjectProvider : public PageObjectProvider { public: - DefaultPageObjectProvider (void); + DefaultPageObjectProvider(); virtual ~DefaultPageObjectProvider() {} virtual SdPage* operator () (SdDrawDocument* pDocument) SAL_OVERRIDE; - virtual int GetCostIndex (void) SAL_OVERRIDE; + virtual int GetCostIndex() SAL_OVERRIDE; virtual bool operator== (const PageObjectProvider& rProvider) SAL_OVERRIDE; }; @@ -160,7 +160,7 @@ public: ExistingPageProvider (SdPage* pPage); virtual ~ExistingPageProvider() {} virtual SdPage* operator() (SdDrawDocument* pDocument) SAL_OVERRIDE; - virtual int GetCostIndex (void) SAL_OVERRIDE; + virtual int GetCostIndex() SAL_OVERRIDE; virtual bool operator== (const PageObjectProvider& rProvider) SAL_OVERRIDE; private: SdPage* mpPage; diff --git a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx index 6841211049b2..0d5b6e46caa4 100644 --- a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx +++ b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx @@ -76,7 +76,7 @@ class MasterPageContainerQueue::RequestQueue : public ::std::set<PreviewCreationRequest,PreviewCreationRequest::Compare> { public: - RequestQueue (void) {} + RequestQueue() {} }; //===== MasterPageContainerQueue ============================================== @@ -98,14 +98,14 @@ MasterPageContainerQueue::MasterPageContainerQueue ( { } -MasterPageContainerQueue::~MasterPageContainerQueue (void) +MasterPageContainerQueue::~MasterPageContainerQueue() { maDelayedPreviewCreationTimer.Stop(); while ( ! mpRequestQueue->empty()) mpRequestQueue->erase(mpRequestQueue->begin()); } -void MasterPageContainerQueue::LateInit (void) +void MasterPageContainerQueue::LateInit() { // Set up the timer for the delayed creation of preview bitmaps. maDelayedPreviewCreationTimer.SetTimeout (snDelayedCreationTimeout); @@ -248,12 +248,12 @@ bool MasterPageContainerQueue::HasRequest (MasterPageContainer::Token aToken) co return (iRequest != mpRequestQueue->end()); } -bool MasterPageContainerQueue::IsEmpty (void) const +bool MasterPageContainerQueue::IsEmpty() const { return mpRequestQueue->empty(); } -void MasterPageContainerQueue::ProcessAllRequests (void) +void MasterPageContainerQueue::ProcessAllRequests() { snWaitForMoreRequestsCount = 0; if (mpRequestQueue->size() > 0) diff --git a/sd/source/ui/sidebar/MasterPageContainerQueue.hxx b/sd/source/ui/sidebar/MasterPageContainerQueue.hxx index f013acc7da9a..1aa6589c4547 100644 --- a/sd/source/ui/sidebar/MasterPageContainerQueue.hxx +++ b/sd/source/ui/sidebar/MasterPageContainerQueue.hxx @@ -51,7 +51,7 @@ public: static MasterPageContainerQueue* Create ( const ::boost::weak_ptr<ContainerAdapter>& rpContainer); - virtual ~MasterPageContainerQueue (void); + virtual ~MasterPageContainerQueue(); /** This method is typically called for entries in the container for which GetPreviewState() returns OS_CREATABLE. The creation of the @@ -68,14 +68,14 @@ public: /** Return <TRUE/> when there is at least one request in the queue. */ - bool IsEmpty (void) const; + bool IsEmpty() const; /** After this call the queue does not wait anymore for requests with higher priority when only a small number of requests with lower priority are present. This method should be called when all templates are inserted into the MasterPageContainer. */ - void ProcessAllRequests (void); + void ProcessAllRequests(); private: ::boost::weak_ptr<ContainerAdapter> mpWeakContainer; @@ -116,7 +116,7 @@ private: static sal_uInt32 snWaitForMoreRequestsCount; MasterPageContainerQueue (const ::boost::weak_ptr<ContainerAdapter>& rpContainer); - void LateInit (void); + void LateInit(); /** Calculate the priority that defines the order in which requests are processed. diff --git a/sd/source/ui/sidebar/MasterPageDescriptor.cxx b/sd/source/ui/sidebar/MasterPageDescriptor.cxx index 5ec98d9ff3bb..5c4889d94765 100644 --- a/sd/source/ui/sidebar/MasterPageDescriptor.cxx +++ b/sd/source/ui/sidebar/MasterPageDescriptor.cxx @@ -73,7 +73,7 @@ MasterPageDescriptor::MasterPageDescriptor (const MasterPageDescriptor& rDescrip { } -MasterPageDescriptor::~MasterPageDescriptor (void) +MasterPageDescriptor::~MasterPageDescriptor() { } @@ -251,7 +251,7 @@ bool MasterPageDescriptor::UpdatePreview ( return bModified; } -MasterPageDescriptor::URLClassification MasterPageDescriptor::GetURLClassification (void) +MasterPageDescriptor::URLClassification MasterPageDescriptor::GetURLClassification() { if (meURLClassification == URLCLASS_UNDETERMINED) { diff --git a/sd/source/ui/sidebar/MasterPageDescriptor.hxx b/sd/source/ui/sidebar/MasterPageDescriptor.hxx index c77b2197cda8..7636cf6b4a8d 100644 --- a/sd/source/ui/sidebar/MasterPageDescriptor.hxx +++ b/sd/source/ui/sidebar/MasterPageDescriptor.hxx @@ -47,7 +47,7 @@ public: const ::boost::shared_ptr<PageObjectProvider>& rpPageObjectProvider, const ::boost::shared_ptr<PreviewProvider>& rpPreviewProvider); MasterPageDescriptor (const MasterPageDescriptor& rDescriptor); - ~MasterPageDescriptor (void); + ~MasterPageDescriptor(); void SetToken (MasterPageContainer::Token aToken); @@ -137,7 +137,7 @@ public: URLCLASS_UNDETERMINED }; - URLClassification GetURLClassification (void); + URLClassification GetURLClassification(); /** The Token under which the MasterPageContainer gives access to the object. diff --git a/sd/source/ui/sidebar/MasterPageObserver.cxx b/sd/source/ui/sidebar/MasterPageObserver.cxx index 606902ac7ba4..b5b5f4bd4ac5 100644 --- a/sd/source/ui/sidebar/MasterPageObserver.cxx +++ b/sd/source/ui/sidebar/MasterPageObserver.cxx @@ -92,7 +92,7 @@ MasterPageObserver* MasterPageObserver::Implementation::mpInstance = NULL; //===== MasterPageObserver ==================================================== -MasterPageObserver& MasterPageObserver::Instance (void) +MasterPageObserver& MasterPageObserver::Instance() { if (Implementation::mpInstance == NULL) { @@ -138,11 +138,11 @@ void MasterPageObserver::RemoveEventListener (const Link& rEventListener) mpImpl->RemoveEventListener (rEventListener); } -MasterPageObserver::MasterPageObserver (void) +MasterPageObserver::MasterPageObserver() : mpImpl (new Implementation()) {} -MasterPageObserver::~MasterPageObserver (void) +MasterPageObserver::~MasterPageObserver() {} //===== MasterPageObserver::Implementation ==================================== diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx index 6a0e7b35082b..28d3abde2d9a 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx @@ -102,7 +102,7 @@ MasterPagesSelector::MasterPagesSelector ( mpContainer->AddChangeListener(aChangeListener); } -MasterPagesSelector::~MasterPagesSelector (void) +MasterPagesSelector::~MasterPagesSelector() { Clear(); UpdateLocks(ItemList()); @@ -111,7 +111,7 @@ MasterPagesSelector::~MasterPagesSelector (void) mpContainer->RemoveChangeListener(aChangeListener); } -void MasterPagesSelector::LateInit (void) +void MasterPagesSelector::LateInit() { } @@ -149,7 +149,7 @@ void MasterPagesSelector::UpdateLocks (const ItemList& rItemList) maLockedMasterPages.swap(aNewLockList); } -void MasterPagesSelector::Fill (void) +void MasterPagesSelector::Fill() { ::std::unique_ptr<ItemList> pItemList (new ItemList()); @@ -159,7 +159,7 @@ void MasterPagesSelector::Fill (void) UpdateItemList(std::move(pItemList)); } -ResId MasterPagesSelector::GetContextMenuResId (void) const +ResId MasterPagesSelector::GetContextMenuResId() const { return SdResId(RID_TASKPANE_MASTERPAGESSELECTOR_POPUP); } @@ -332,7 +332,7 @@ IMPL_LINK(MasterPagesSelector, ContainerChangeListener, MasterPageContainerChang return 0; } -SdPage* MasterPagesSelector::GetSelectedMasterPage (void) +SdPage* MasterPagesSelector::GetSelectedMasterPage() { const ::osl::MutexGuard aGuard (maMutex); @@ -483,7 +483,7 @@ void MasterPagesSelector::SetUserData (int nIndex, UserData* pData) } } -void MasterPagesSelector::UpdateSelection (void) +void MasterPagesSelector::UpdateSelection() { } @@ -582,7 +582,7 @@ void MasterPagesSelector::InvalidatePreview (const SdPage* pPage) } } -void MasterPagesSelector::UpdateAllPreviews (void) +void MasterPagesSelector::UpdateAllPreviews() { const ::osl::MutexGuard aGuard (maMutex); @@ -602,7 +602,7 @@ void MasterPagesSelector::UpdateAllPreviews (void) PreviewValueSet::Rearrange(true); } -void MasterPagesSelector::ClearPageSet (void) +void MasterPagesSelector::ClearPageSet() { const ::osl::MutexGuard aGuard (maMutex); @@ -633,7 +633,7 @@ sal_Int32 MasterPagesSelector::GetIndexForToken (MasterPageContainer::Token aTok return -1; } -void MasterPagesSelector::Clear (void) +void MasterPagesSelector::Clear() { const ::osl::MutexGuard aGuard (maMutex); diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx index 46e6f72c95d1..eab38546d57b 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx @@ -62,9 +62,9 @@ public: ViewShellBase& rBase, const ::boost::shared_ptr<MasterPageContainer>& rpContainer, const css::uno::Reference<css::ui::XSidebar>& rxSidebar); - virtual ~MasterPagesSelector (void); + virtual ~MasterPagesSelector(); - virtual void LateInit (void); + virtual void LateInit(); /** Return the height that this control needs to show all of its lines. */ @@ -93,15 +93,15 @@ public: the currently used master pages by default and thus is not influenced by its changes. */ - virtual void UpdateSelection (void); + virtual void UpdateSelection(); - void FillPageSet (void); + void FillPageSet(); /** Make the selector empty. This method clear the value set from any entries. Override this method to add functionality, especially to destroy objects set as data items at the value set. */ - void ClearPageSet (void); + void ClearPageSet(); void SetHelpId( const OString& aId ); @@ -115,7 +115,7 @@ public: */ void InvalidatePreview (const SdPage* pPage); - void UpdateAllPreviews (void); + void UpdateAllPreviews(); // ILayoutableWindow virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE; @@ -137,7 +137,7 @@ protected: */ ::std::queue<sal_uInt16> maPreviewUpdateQueue; - SdPage* GetSelectedMasterPage (void); + SdPage* GetSelectedMasterPage(); /** Assign the given master page to all slides of the document. @param pMasterPage @@ -166,7 +166,7 @@ protected: sal_Int32 GetIndexForToken (MasterPageContainer::Token aToken) const; typedef ::std::vector<MasterPageContainer::Token> ItemList; void UpdateItemList (::std::unique_ptr<ItemList> && pList); - void Clear (void); + void Clear(); /** Invalidate the specified item so that on the next Fill() this item is updated. */ @@ -184,14 +184,14 @@ protected: */ void UpdateLocks (const ItemList& rItemList); - void Fill (void); + void Fill(); virtual void Fill (ItemList& rItemList) = 0; /** Give derived classes the opportunity to provide their own context menu. If they do then they probably have to provide their own Execute() and GetState() methods as well. */ - virtual ResId GetContextMenuResId (void) const; + virtual ResId GetContextMenuResId() const; virtual void Command (const CommandEvent& rEvent) SAL_OVERRIDE; diff --git a/sd/source/ui/sidebar/NavigatorWrapper.cxx b/sd/source/ui/sidebar/NavigatorWrapper.cxx index 3197ffcb7daa..6df0a2e01aa6 100644 --- a/sd/source/ui/sidebar/NavigatorWrapper.cxx +++ b/sd/source/ui/sidebar/NavigatorWrapper.cxx @@ -47,11 +47,11 @@ NavigatorWrapper::NavigatorWrapper ( maNavigator.Show(); } -NavigatorWrapper::~NavigatorWrapper (void) +NavigatorWrapper::~NavigatorWrapper() { } -void NavigatorWrapper::Resize (void) +void NavigatorWrapper::Resize() { maNavigator.SetSizePixel(GetSizePixel()); } @@ -63,12 +63,12 @@ css::ui::LayoutSize NavigatorWrapper::GetHeightForWidth (const sal_Int32 nWidth) return css::ui::LayoutSize(-1,-1,-1); } -void NavigatorWrapper::UpdateNavigator (void) +void NavigatorWrapper::UpdateNavigator() { maNavigator.InitTreeLB(mrViewShellBase.GetDocument()); } -void NavigatorWrapper::GetFocus (void) +void NavigatorWrapper::GetFocus() { maNavigator.GrabFocus(); } diff --git a/sd/source/ui/sidebar/NavigatorWrapper.hxx b/sd/source/ui/sidebar/NavigatorWrapper.hxx index edc258ffae64..98c95aa72426 100644 --- a/sd/source/ui/sidebar/NavigatorWrapper.hxx +++ b/sd/source/ui/sidebar/NavigatorWrapper.hxx @@ -45,11 +45,11 @@ public: sd::ViewShellBase& rViewShellBase, SfxBindings* pBindings); - virtual ~NavigatorWrapper (void); + virtual ~NavigatorWrapper(); // Control - virtual void Resize (void) SAL_OVERRIDE; - virtual void GetFocus (void) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; // From ILayoutableWindow virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE; @@ -58,7 +58,7 @@ private: ViewShellBase& mrViewShellBase; SdNavigatorWin maNavigator; - void UpdateNavigator (void); + void UpdateNavigator(); }; } } // end of namespace sd::sidebar diff --git a/sd/source/ui/sidebar/PanelBase.cxx b/sd/source/ui/sidebar/PanelBase.cxx index 90c4a49a2907..f0366b7c329d 100644 --- a/sd/source/ui/sidebar/PanelBase.cxx +++ b/sd/source/ui/sidebar/PanelBase.cxx @@ -36,14 +36,14 @@ PanelBase::PanelBase ( #endif } -PanelBase::~PanelBase (void) +PanelBase::~PanelBase() { OSL_TRACE("deleting wrapped control at %p", mpWrappedControl.get()); mpWrappedControl.reset(); OSL_TRACE("deleting PanelBase at %p from parent %p", this, GetParent()); } -void PanelBase::Dispose (void) +void PanelBase::Dispose() { OSL_TRACE("PanelBase::DisposeL: deleting wrapped control at %p", mpWrappedControl.get()); mpWrappedControl.reset(); @@ -57,7 +57,7 @@ css::ui::LayoutSize PanelBase::GetHeightForWidth (const sal_Int32 /*nWidth*/) return css::ui::LayoutSize(nHeight,nHeight,nHeight); } -void PanelBase::Resize (void) +void PanelBase::Resize() { if (ProvideWrappedControl()) { @@ -73,7 +73,7 @@ void PanelBase::SetSidebar (const css::uno::Reference<css::ui::XSidebar>& rxSide mxSidebar->requestLayout(); } -bool PanelBase::ProvideWrappedControl (void) +bool PanelBase::ProvideWrappedControl() { if ( ! mpWrappedControl) { diff --git a/sd/source/ui/sidebar/PanelBase.hxx b/sd/source/ui/sidebar/PanelBase.hxx index 672112fa57d7..dcef4732e521 100644 --- a/sd/source/ui/sidebar/PanelBase.hxx +++ b/sd/source/ui/sidebar/PanelBase.hxx @@ -44,12 +44,12 @@ public: PanelBase ( vcl::Window* pParentWindow, ViewShellBase& rViewShellBase); - virtual ~PanelBase (void); + virtual ~PanelBase(); - virtual void Resize (void) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; // IDisposable - virtual void Dispose (void) SAL_OVERRIDE; + virtual void Dispose() SAL_OVERRIDE; // ILayoutableWindow virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE; @@ -67,7 +67,7 @@ private: css::uno::Reference<css::ui::XSidebar> mxSidebar; ViewShellBase& mrViewShellBase; - bool ProvideWrappedControl (void); + bool ProvideWrappedControl(); }; } } // end of namespace sd::sidebar diff --git a/sd/source/ui/sidebar/PanelFactory.cxx b/sd/source/ui/sidebar/PanelFactory.cxx index 03dbddaa1c49..f10290af8572 100644 --- a/sd/source/ui/sidebar/PanelFactory.cxx +++ b/sd/source/ui/sidebar/PanelFactory.cxx @@ -69,11 +69,11 @@ PanelFactory::PanelFactory( { } -PanelFactory::~PanelFactory (void) +PanelFactory::~PanelFactory() { } -void SAL_CALL PanelFactory::disposing (void) +void SAL_CALL PanelFactory::disposing() { } diff --git a/sd/source/ui/sidebar/PanelFactory.hxx b/sd/source/ui/sidebar/PanelFactory.hxx index 8365a49764f9..6188e3033de1 100644 --- a/sd/source/ui/sidebar/PanelFactory.hxx +++ b/sd/source/ui/sidebar/PanelFactory.hxx @@ -52,15 +52,15 @@ class PanelFactory public PanelFactoryInterfaceBase { public: - static ::rtl::OUString SAL_CALL getImplementationName (void); + static ::rtl::OUString SAL_CALL getImplementationName(); static css::uno::Reference<css::uno::XInterface> SAL_CALL createInstance ( const css::uno::Reference<css::lang::XMultiServiceFactory>& rxFactory); - static css::uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames (void); + static css::uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames(); PanelFactory (const css::uno::Reference<css::uno::XComponentContext>& rxContext); - virtual ~PanelFactory (void); + virtual ~PanelFactory(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XUIElementFactory diff --git a/sd/source/ui/sidebar/PreviewValueSet.cxx b/sd/source/ui/sidebar/PreviewValueSet.cxx index c738b0be64d5..4c199cbb1611 100644 --- a/sd/source/ui/sidebar/PreviewValueSet.cxx +++ b/sd/source/ui/sidebar/PreviewValueSet.cxx @@ -38,7 +38,7 @@ PreviewValueSet::PreviewValueSet (vcl::Window* pParent) SetExtraSpacing (2); } -PreviewValueSet::~PreviewValueSet (void) +PreviewValueSet::~PreviewValueSet() { } @@ -62,7 +62,7 @@ void PreviewValueSet::MouseButtonDown (const MouseEvent& rEvent) } -void PreviewValueSet::Resize (void) +void PreviewValueSet::Resize() { ValueSet::Resize (); diff --git a/sd/source/ui/sidebar/PreviewValueSet.hxx b/sd/source/ui/sidebar/PreviewValueSet.hxx index f41f33b2462d..2ce5fc564db0 100644 --- a/sd/source/ui/sidebar/PreviewValueSet.hxx +++ b/sd/source/ui/sidebar/PreviewValueSet.hxx @@ -31,10 +31,10 @@ class PreviewValueSet { public: PreviewValueSet (vcl::Window* pParent); - virtual ~PreviewValueSet (void); + virtual ~PreviewValueSet(); void SetRightMouseClickHandler (const Link& rLink); - virtual void Resize (void) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; void SetPreviewSize (const Size& rSize); diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx index 002f088746bf..6266e2e25f61 100644 --- a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx @@ -66,13 +66,13 @@ RecentMasterPagesSelector::RecentMasterPagesSelector ( { } -RecentMasterPagesSelector::~RecentMasterPagesSelector (void) +RecentMasterPagesSelector::~RecentMasterPagesSelector() { RecentlyUsedMasterPages::Instance().RemoveEventListener ( LINK(this,RecentMasterPagesSelector,MasterPageListListener)); } -void RecentMasterPagesSelector::LateInit (void) +void RecentMasterPagesSelector::LateInit() { MasterPagesSelector::LateInit(); diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx b/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx index 0c1c53f67ccd..f690c7875674 100644 --- a/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx @@ -64,9 +64,9 @@ private: ViewShellBase& rBase, const ::boost::shared_ptr<MasterPageContainer>& rpContainer, const css::uno::Reference<css::ui::XSidebar>& rxSidebar); - virtual ~RecentMasterPagesSelector (void); + virtual ~RecentMasterPagesSelector(); - virtual void LateInit (void) SAL_OVERRIDE; + virtual void LateInit() SAL_OVERRIDE; }; } } // end of namespace sd::sidebar diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx index 4f7b7577e952..f237da8fd10e 100644 --- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx +++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx @@ -63,7 +63,7 @@ namespace sd { namespace sidebar { RecentlyUsedMasterPages* RecentlyUsedMasterPages::mpInstance = NULL; -RecentlyUsedMasterPages& RecentlyUsedMasterPages::Instance (void) +RecentlyUsedMasterPages& RecentlyUsedMasterPages::Instance() { if (mpInstance == NULL) { @@ -86,7 +86,7 @@ RecentlyUsedMasterPages& RecentlyUsedMasterPages::Instance (void) return *mpInstance; } -RecentlyUsedMasterPages::RecentlyUsedMasterPages (void) +RecentlyUsedMasterPages::RecentlyUsedMasterPages() : maListeners(), mvMasterPages(), mnMaxListSize(8), @@ -94,7 +94,7 @@ RecentlyUsedMasterPages::RecentlyUsedMasterPages (void) { } -RecentlyUsedMasterPages::~RecentlyUsedMasterPages (void) +RecentlyUsedMasterPages::~RecentlyUsedMasterPages() { Link aLink (LINK(this,RecentlyUsedMasterPages,MasterPageContainerChangeListener)); mpContainer->RemoveChangeListener(aLink); @@ -103,7 +103,7 @@ RecentlyUsedMasterPages::~RecentlyUsedMasterPages (void) LINK(this,RecentlyUsedMasterPages,MasterPageChangeListener)); } -void RecentlyUsedMasterPages::LateInit (void) +void RecentlyUsedMasterPages::LateInit() { Link aLink (LINK(this,RecentlyUsedMasterPages,MasterPageContainerChangeListener)); mpContainer->AddChangeListener(aLink); @@ -113,7 +113,7 @@ void RecentlyUsedMasterPages::LateInit (void) LINK(this,RecentlyUsedMasterPages,MasterPageChangeListener)); } -void RecentlyUsedMasterPages::LoadPersistentValues (void) +void RecentlyUsedMasterPages::LoadPersistentValues() { try { @@ -178,7 +178,7 @@ void RecentlyUsedMasterPages::LoadPersistentValues (void) } } -void RecentlyUsedMasterPages::SavePersistentValues (void) +void RecentlyUsedMasterPages::SavePersistentValues() { try { @@ -257,7 +257,7 @@ void RecentlyUsedMasterPages::RemoveEventListener (const Link& rEventListener) rEventListener)); } -int RecentlyUsedMasterPages::GetMasterPageCount (void) const +int RecentlyUsedMasterPages::GetMasterPageCount() const { return mvMasterPages.size(); } @@ -270,7 +270,7 @@ MasterPageContainer::Token RecentlyUsedMasterPages::GetTokenForIndex (sal_uInt32 return MasterPageContainer::NIL_TOKEN; } -void RecentlyUsedMasterPages::SendEvent (void) +void RecentlyUsedMasterPages::SendEvent() { ::std::vector<Link>::iterator aLink (maListeners.begin()); ::std::vector<Link>::iterator aEnd (maListeners.end()); @@ -361,7 +361,7 @@ void RecentlyUsedMasterPages::AddMasterPage ( } } -void RecentlyUsedMasterPages::ResolveList (void) +void RecentlyUsedMasterPages::ResolveList() { bool bNotify (false); diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx index c4725f678d1b..04fbd5b9c44c 100644 --- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx +++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx @@ -44,12 +44,12 @@ class RecentlyUsedMasterPages public: /** Return the single instance of this class. */ - static RecentlyUsedMasterPages& Instance (void); + static RecentlyUsedMasterPages& Instance(); void AddEventListener (const Link& rEventListener); void RemoveEventListener (const Link& rEventListener); - int GetMasterPageCount (void) const; + int GetMasterPageCount() const; MasterPageContainer::Token GetTokenForIndex (sal_uInt32 nIndex) const; private: @@ -91,18 +91,18 @@ private: unsigned long int mnMaxListSize; ::boost::shared_ptr<MasterPageContainer> mpContainer; - RecentlyUsedMasterPages (void); - virtual ~RecentlyUsedMasterPages (void); + RecentlyUsedMasterPages(); + virtual ~RecentlyUsedMasterPages(); /** Call this method after a new object has been created. */ - void LateInit (void); + void LateInit(); RecentlyUsedMasterPages (const RecentlyUsedMasterPages&) SAL_DELETED_FUNCTION; RecentlyUsedMasterPages& operator= (const RecentlyUsedMasterPages&) SAL_DELETED_FUNCTION; - void SendEvent (void); + void SendEvent(); DECL_LINK(MasterPageChangeListener, MasterPageObserverEvent*); DECL_LINK(MasterPageContainerChangeListener, MasterPageContainerChangeEvent*); @@ -123,14 +123,14 @@ private: /** Load the list of recently used master pages from the registry where it was saved to make it persistent. */ - void LoadPersistentValues (void); + void LoadPersistentValues(); /** Save the list of recently used master pages to the registry to make it presistent. */ - void SavePersistentValues (void); + void SavePersistentValues(); - void ResolveList (void); + void ResolveList(); }; } } // end of namespace sd::sidebar diff --git a/sd/source/ui/sidebar/SlideTransitionPanel.cxx b/sd/source/ui/sidebar/SlideTransitionPanel.cxx index 7051d3a957db..2d58b94ac6dc 100644 --- a/sd/source/ui/sidebar/SlideTransitionPanel.cxx +++ b/sd/source/ui/sidebar/SlideTransitionPanel.cxx @@ -37,7 +37,7 @@ SlideTransitionPanel::SlideTransitionPanel ( #endif } -SlideTransitionPanel::~SlideTransitionPanel (void) +SlideTransitionPanel::~SlideTransitionPanel() { } diff --git a/sd/source/ui/sidebar/SlideTransitionPanel.hxx b/sd/source/ui/sidebar/SlideTransitionPanel.hxx index ab36313cbea6..bd975baf83f9 100644 --- a/sd/source/ui/sidebar/SlideTransitionPanel.hxx +++ b/sd/source/ui/sidebar/SlideTransitionPanel.hxx @@ -32,7 +32,7 @@ public: vcl::Window* pParentWindow, ViewShellBase& rViewShellBase, const css::uno::Reference<css::frame::XFrame>& rxFrame ); - virtual ~SlideTransitionPanel (void); + virtual ~SlideTransitionPanel(); // ILayoutableWindow virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE; diff --git a/sd/source/ui/sidebar/TableDesignPanel.cxx b/sd/source/ui/sidebar/TableDesignPanel.cxx index f0008cd28a88..30d31ebcac5b 100644 --- a/sd/source/ui/sidebar/TableDesignPanel.cxx +++ b/sd/source/ui/sidebar/TableDesignPanel.cxx @@ -34,7 +34,7 @@ TableDesignPanel::TableDesignPanel ( #endif } -TableDesignPanel::~TableDesignPanel (void) +TableDesignPanel::~TableDesignPanel() { } diff --git a/sd/source/ui/sidebar/TableDesignPanel.hxx b/sd/source/ui/sidebar/TableDesignPanel.hxx index 9d9c5d188c4b..7d52b612460e 100644 --- a/sd/source/ui/sidebar/TableDesignPanel.hxx +++ b/sd/source/ui/sidebar/TableDesignPanel.hxx @@ -30,7 +30,7 @@ public: TableDesignPanel ( vcl::Window* pParentWindow, ViewShellBase& rViewShellBase); - virtual ~TableDesignPanel (void); + virtual ~TableDesignPanel(); // ILayoutableWindow virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE; diff --git a/sd/source/ui/slideshow/PaneHider.cxx b/sd/source/ui/slideshow/PaneHider.cxx index 7fb399ef13a0..bcef62055eb3 100644 --- a/sd/source/ui/slideshow/PaneHider.cxx +++ b/sd/source/ui/slideshow/PaneHider.cxx @@ -80,7 +80,7 @@ PaneHider::PaneHider (const ViewShell& rViewShell, SlideshowImpl* pSlideShow) } } -PaneHider::~PaneHider (void) +PaneHider::~PaneHider() { if (mxConfiguration.is() && mxConfigurationController.is()) { diff --git a/sd/source/ui/slideshow/PaneHider.hxx b/sd/source/ui/slideshow/PaneHider.hxx index bfdda992f7a1..6718f819d6bc 100644 --- a/sd/source/ui/slideshow/PaneHider.hxx +++ b/sd/source/ui/slideshow/PaneHider.hxx @@ -42,7 +42,7 @@ public: /** Restore the original visibility of the side panes. */ - ~PaneHider (void); + ~PaneHider(); private: const ViewShell& mrViewShell; diff --git a/sd/source/ui/slideshow/SlideShowRestarter.cxx b/sd/source/ui/slideshow/SlideShowRestarter.cxx index a4757d70d76e..cdf9b8401f9d 100644 --- a/sd/source/ui/slideshow/SlideShowRestarter.cxx +++ b/sd/source/ui/slideshow/SlideShowRestarter.cxx @@ -47,7 +47,7 @@ SlideShowRestarter::SlideShowRestarter ( { } -SlideShowRestarter::~SlideShowRestarter (void) +SlideShowRestarter::~SlideShowRestarter() { } @@ -123,7 +123,7 @@ IMPL_LINK_NOARG(SlideShowRestarter, EndPresentation) return 0; } -void SlideShowRestarter::StartPresentation (void) +void SlideShowRestarter::StartPresentation() { //rhbz#1091117 crash because we're exiting the application, and this is //being called during the configuration update event on exit. At this point diff --git a/sd/source/ui/slideshow/SlideShowRestarter.hxx b/sd/source/ui/slideshow/SlideShowRestarter.hxx index 6a216143bd8e..56a23b80030f 100644 --- a/sd/source/ui/slideshow/SlideShowRestarter.hxx +++ b/sd/source/ui/slideshow/SlideShowRestarter.hxx @@ -51,7 +51,7 @@ public: SlideShowRestarter ( const ::rtl::Reference<SlideShow>& rpSlideShow, ViewShellBase* pViewShellBase); - virtual ~SlideShowRestarter (void); + virtual ~SlideShowRestarter(); /** Restarting the slide show is an asynchronous multi step process which is started by calling this method. @@ -73,14 +73,14 @@ private: displays has changed and thus whether restarting the slide show is really necessary. */ - sal_Int32 GetDisplayCount (void); + sal_Int32 GetDisplayCount(); DECL_LINK(EndPresentation, void*); /** Restart the presentation on the slide last shown before the restart was initiated. */ - void StartPresentation (void); + void StartPresentation(); }; } // end of namespace sd diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index 712a73c5d3f7..29c4031dc20d 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -77,7 +77,7 @@ ShowWindow::ShowWindow( const ::rtl::Reference< SlideshowImpl >& xController, vc AddEventListener( LINK( this, ShowWindow, EventHdl ) ); } -ShowWindow::~ShowWindow(void) +ShowWindow::~ShowWindow() { maPauseTimer.Stop(); maMouseTimer.Stop(); @@ -621,7 +621,7 @@ void ShowWindow::AddWindowToPaintView() // Override the sd::Window's CreateAccessible to create a different accessible object ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> - ShowWindow::CreateAccessible (void) + ShowWindow::CreateAccessible() { ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc = GetAccessible(false); if (xAcc.get()) diff --git a/sd/source/ui/slideshow/showwindow.hxx b/sd/source/ui/slideshow/showwindow.hxx index 894938f86043..81bfe0a437c3 100644 --- a/sd/source/ui/slideshow/showwindow.hxx +++ b/sd/source/ui/slideshow/showwindow.hxx @@ -50,7 +50,7 @@ class ShowWindow public: ShowWindow ( const ::rtl::Reference< ::sd::SlideshowImpl >& xController, vcl::Window* pParent ); - virtual ~ShowWindow (void); + virtual ~ShowWindow(); bool SetEndMode(); bool SetPauseMode( sal_Int32 nPageIndexToRestart, sal_Int32 nTimeoutSec = SLIDE_NO_TIMEOUT, Graphic* pLogo = NULL ); @@ -80,7 +80,7 @@ public: /// Override the sd::Window's CreateAccessible to create a different accessible object virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> - CreateAccessible (void) SAL_OVERRIDE; + CreateAccessible() SAL_OVERRIDE; void TerminateShow(); void RestartShow(); diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 32f8db4ed6b0..d077853dfc65 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -879,7 +879,7 @@ Reference< XSlideShowController > SAL_CALL SlideShow::getController( ) throw (R // XComponent -void SAL_CALL SlideShow::disposing (void) +void SAL_CALL SlideShow::disposing() { SolarMutexGuard aGuard; diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index eac84daaf878..694f43579c3f 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -1823,7 +1823,7 @@ IMPL_LINK_NOARG(SlideshowImpl, PostYieldListener) return updateSlideShow(); } -sal_Int32 SlideshowImpl::updateSlideShow (void) +sal_Int32 SlideshowImpl::updateSlideShow() { // prevent me from deletion when recursing (App::EnableYieldMode does) const rtl::Reference<SlideshowImpl> this_(this); diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index b39c4ede6c9a..d9ddffb8a07a 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -316,7 +316,7 @@ private: its return value, wait for a certain amount of time before another call to update() is scheduled. */ - sal_Int32 updateSlideShow (void); + sal_Int32 updateSlideShow(); css::uno::Reference< css::presentation::XSlideShow > mxShow; rtl::Reference<sd::SlideShowView> mxView; diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx index 7cc55952c95c..eabd8aeb0176 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx @@ -40,28 +40,28 @@ class BitmapCache::CacheEntry public: CacheEntry(const Bitmap& rBitmap, sal_Int32 nLastAccessTime, bool bIsPrecious); CacheEntry(sal_Int32 nLastAccessTime, bool bIsPrecious); - ~CacheEntry (void) {}; + ~CacheEntry() {}; inline void Recycle (const CacheEntry& rEntry); - inline sal_Int32 GetMemorySize (void) const; + inline sal_Int32 GetMemorySize() const; void Compress (const ::boost::shared_ptr<BitmapCompressor>& rpCompressor); - inline void Decompress (void); + inline void Decompress(); - bool IsUpToDate (void) const { return mbIsUpToDate; } + bool IsUpToDate() const { return mbIsUpToDate; } void SetUpToDate (bool bIsUpToDate) { mbIsUpToDate = bIsUpToDate; } - sal_Int32 GetAccessTime (void) const { return mnLastAccessTime; } + sal_Int32 GetAccessTime() const { return mnLastAccessTime; } void SetAccessTime (sal_Int32 nAccessTime) { mnLastAccessTime = nAccessTime; } - Bitmap GetPreview (void) const { return maPreview; } + Bitmap GetPreview() const { return maPreview; } inline void SetPreview (const Bitmap& rPreview); - bool HasPreview (void) const; + bool HasPreview() const; - Bitmap GetMarkedPreview (void) const { return maMarkedPreview; } + Bitmap GetMarkedPreview() const { return maMarkedPreview; } inline void SetMarkedPreview (const Bitmap& rMarkePreview); - bool HasReplacement (void) const { return (mpReplacement.get() != NULL); } - inline bool HasLosslessReplacement (void) const; - void Invalidate (void) { mpReplacement.reset(); mpCompressor.reset(); mbIsUpToDate = false; } - bool IsPrecious (void) const { return mbIsPrecious; } + bool HasReplacement() const { return (mpReplacement.get() != NULL); } + inline bool HasLosslessReplacement() const; + void Invalidate() { mpReplacement.reset(); mpCompressor.reset(); mbIsUpToDate = false; } + bool IsPrecious() const { return mbIsPrecious; } void SetPrecious (bool bIsPrecious) { mbIsPrecious = bIsPrecious; } private: @@ -88,7 +88,7 @@ class BitmapCache::CacheBitmapContainer : public std::unordered_map<CacheKey, CacheEntry, CacheHash> { public: - CacheBitmapContainer (void) {} + CacheBitmapContainer() {} }; namespace { @@ -138,12 +138,12 @@ BitmapCache::BitmapCache (const sal_Int32 nMaximalNormalCacheSize) mpCacheCompactor = CacheCompactor::Create(*this,mnMaximalNormalCacheSize); } -BitmapCache::~BitmapCache (void) +BitmapCache::~BitmapCache() { Clear(); } -void BitmapCache::Clear (void) +void BitmapCache::Clear() { ::osl::MutexGuard aGuard (maMutex); @@ -251,7 +251,7 @@ bool BitmapCache::InvalidateBitmap (const CacheKey& rKey) return false; } -void BitmapCache::InvalidateCache (void) +void BitmapCache::InvalidateCache() { ::osl::MutexGuard aGuard (maMutex); @@ -330,7 +330,7 @@ void BitmapCache::SetPrecious (const CacheKey& rKey, bool bIsPrecious) } } -void BitmapCache::ReCalculateTotalCacheSize (void) +void BitmapCache::ReCalculateTotalCacheSize() { ::osl::MutexGuard aGuard (maMutex); @@ -494,7 +494,7 @@ inline void BitmapCache::CacheEntry::Recycle (const CacheEntry& rEntry) } } -inline sal_Int32 BitmapCache::CacheEntry::GetMemorySize (void) const +inline sal_Int32 BitmapCache::CacheEntry::GetMemorySize() const { sal_Int32 nSize (0); nSize += maPreview.GetSizeBytes(); @@ -529,7 +529,7 @@ void BitmapCache::CacheEntry::Compress (const ::boost::shared_ptr<BitmapCompress } } -inline void BitmapCache::CacheEntry::Decompress (void) +inline void BitmapCache::CacheEntry::Decompress() { if (mpReplacement.get()!=NULL && mpCompressor.get()!=NULL && maPreview.IsEmpty()) { @@ -548,7 +548,7 @@ inline void BitmapCache::CacheEntry::SetPreview (const Bitmap& rPreview) mpCompressor.reset(); } -bool BitmapCache::CacheEntry::HasPreview (void) const +bool BitmapCache::CacheEntry::HasPreview() const { return ! maPreview.IsEmpty(); } @@ -558,7 +558,7 @@ inline void BitmapCache::CacheEntry::SetMarkedPreview (const Bitmap& rMarkedPrev maMarkedPreview = rMarkedPreview; } -inline bool BitmapCache::CacheEntry::HasLosslessReplacement (void) const +inline bool BitmapCache::CacheEntry::HasLosslessReplacement() const { return mpReplacement.get()!=NULL && mpCompressor.get()!=NULL diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx index c6165450f101..fe022d4ace48 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx @@ -68,22 +68,22 @@ public: /** The destructor clears the cache and relases all bitmaps still in it. */ - ~BitmapCache (void); + ~BitmapCache(); /** Remove all preview bitmaps from the cache. After this call the cache is empty. */ - void Clear (void); + void Clear(); /** Return <TRUE/> when the cache is full, i.e. the cache compactor had to be run. */ - bool IsFull (void) const { return mbIsFull;} + bool IsFull() const { return mbIsFull;} /** Return the memory size that is occupied by all non-precious bitmaps in the cache. */ - sal_Int32 GetSize (void) { return mnNormalCacheSize;} + sal_Int32 GetSize() { return mnNormalCacheSize;} /** Return <TRUE/> when a preview bitmap exists for the given key. */ @@ -118,7 +118,7 @@ public: /** Mark all preview bitmaps as not being up-to-date anymore. */ - void InvalidateCache (void); + void InvalidateCache(); /** Add or replace a bitmap for the given key. */ @@ -142,7 +142,7 @@ public: the cache size is tracked with each modification of preview bitmaps. */ - void ReCalculateTotalCacheSize (void); + void ReCalculateTotalCacheSize(); /** Use the previews in the given cache to initialize missing previews. */ diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx index dcb3f669731c..c124dc7923d2 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx @@ -39,8 +39,8 @@ public: Size maOriginalSize; DummyReplacement (const Bitmap& rPreview) : maPreview(rPreview) { } - virtual ~DummyReplacement(void) {} - virtual sal_Int32 GetMemorySize (void) const SAL_OVERRIDE { return maPreview.GetSizeBytes(); } + virtual ~DummyReplacement() {} + virtual sal_Int32 GetMemorySize() const SAL_OVERRIDE { return maPreview.GetSizeBytes(); } }; ::boost::shared_ptr<BitmapReplacement> NoBitmapCompression::Compress (const Bitmap& rBitmap) const @@ -53,7 +53,7 @@ Bitmap NoBitmapCompression::Decompress (const BitmapReplacement& rBitmapData) co return dynamic_cast<const DummyReplacement&>(rBitmapData).maPreview; } -bool NoBitmapCompression::IsLossless (void) const +bool NoBitmapCompression::IsLossless() const { return true; } @@ -72,7 +72,7 @@ Bitmap CompressionByDeletion::Decompress (const BitmapReplacement& ) const return Bitmap(); } -bool CompressionByDeletion::IsLossless (void) const +bool CompressionByDeletion::IsLossless() const { return false; } @@ -88,14 +88,14 @@ public: Size maOriginalSize; virtual ~ResolutionReducedReplacement(); - virtual sal_Int32 GetMemorySize (void) const SAL_OVERRIDE; + virtual sal_Int32 GetMemorySize() const SAL_OVERRIDE; }; ResolutionReduction::ResolutionReducedReplacement::~ResolutionReducedReplacement() { } -sal_Int32 ResolutionReduction::ResolutionReducedReplacement::GetMemorySize (void) const +sal_Int32 ResolutionReduction::ResolutionReducedReplacement::GetMemorySize() const { return maPreview.GetSizeBytes(); } @@ -133,7 +133,7 @@ Bitmap ResolutionReduction::Decompress (const BitmapReplacement& rBitmapData) co return aResult; } -bool ResolutionReduction::IsLossless (void) const +bool ResolutionReduction::IsLossless() const { return false; } @@ -146,16 +146,16 @@ public: void* mpData; sal_Int32 mnDataSize; Size maImageSize; - PngReplacement (void) + PngReplacement() : mpData(NULL), mnDataSize(0), maImageSize(0,0) {} - virtual ~PngReplacement (void) + virtual ~PngReplacement() { delete [] static_cast<char*>(mpData); } - virtual sal_Int32 GetMemorySize (void) const SAL_OVERRIDE + virtual sal_Int32 GetMemorySize() const SAL_OVERRIDE { return mnDataSize; } @@ -191,7 +191,7 @@ Bitmap PngCompression::Decompress ( return aResult; } -bool PngCompression::IsLossless (void) const +bool PngCompression::IsLossless() const { return true; } diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx index 1a218ae831db..6c40c0d4d4c4 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx @@ -53,7 +53,7 @@ public: value is used by the caller of Decompress() to decide whether to use the returned bitmap as is or if a new preview has to be created. */ - virtual bool IsLossless (void) const = 0; + virtual bool IsLossless() const = 0; protected: ~BitmapCompressor() {} @@ -66,7 +66,7 @@ protected: class BitmapReplacement { public: - virtual sal_Int32 GetMemorySize (void) const { return 0; } + virtual sal_Int32 GetMemorySize() const { return 0; } protected: ~BitmapReplacement() {} @@ -84,7 +84,7 @@ public: virtual ~NoBitmapCompression() {} virtual ::boost::shared_ptr<BitmapReplacement> Compress (const Bitmap& rpBitmap) const SAL_OVERRIDE; virtual Bitmap Decompress (const BitmapReplacement& rBitmapData) const SAL_OVERRIDE; - virtual bool IsLossless (void) const SAL_OVERRIDE; + virtual bool IsLossless() const SAL_OVERRIDE; }; /** This is another trivial bitmap compressor. Instead of compressing a @@ -99,7 +99,7 @@ public: virtual ~CompressionByDeletion() {} virtual ::boost::shared_ptr<BitmapReplacement> Compress (const Bitmap& rBitmap) const SAL_OVERRIDE; virtual Bitmap Decompress (const BitmapReplacement& rBitmapData) const SAL_OVERRIDE; - virtual bool IsLossless (void) const SAL_OVERRIDE; + virtual bool IsLossless() const SAL_OVERRIDE; }; /** Compress a preview bitmap by reducing its resolution. While the aspect @@ -118,7 +118,7 @@ public: /** Scale the replacement bitmap up to the original size. */ virtual Bitmap Decompress (const BitmapReplacement& rBitmapData) const SAL_OVERRIDE; - virtual bool IsLossless (void) const SAL_OVERRIDE; + virtual bool IsLossless() const SAL_OVERRIDE; }; /** Compress preview bitmaps using the PNG format. @@ -132,7 +132,7 @@ public: virtual ~PngCompression() {} virtual ::boost::shared_ptr<BitmapReplacement> Compress (const Bitmap& rBitmap) const SAL_OVERRIDE; virtual Bitmap Decompress (const BitmapReplacement& rBitmapData) const SAL_OVERRIDE; - virtual bool IsLossless (void) const SAL_OVERRIDE; + virtual bool IsLossless() const SAL_OVERRIDE; }; } } } // end of namespace ::sd::slidesorter::cache diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx index d0297df50b7c..14dd577c216b 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx @@ -38,12 +38,12 @@ class PageObjectViewObjectContact; namespace sd { namespace slidesorter { namespace cache { -BitmapFactory::BitmapFactory (void) +BitmapFactory::BitmapFactory() : maRenderer(NULL, false) { } -BitmapFactory::~BitmapFactory (void) +BitmapFactory::~BitmapFactory() { } diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx index 9e84e05f8208..80805787be51 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx @@ -34,8 +34,8 @@ namespace sd { namespace slidesorter { namespace cache { class BitmapFactory { public: - BitmapFactory (void); - ~BitmapFactory (void); + BitmapFactory(); + ~BitmapFactory(); Bitmap CreateBitmap ( const SdPage& rPage, diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx index 1c3af1ba1fbe..55595e165bbd 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx @@ -45,10 +45,10 @@ public: : CacheCompactor(rCache, nMaximalCacheSize) {} - virtual void RequestCompaction (void) SAL_OVERRIDE { /* Ignored */ }; + virtual void RequestCompaction() SAL_OVERRIDE { /* Ignored */ }; protected: - virtual void Run (void) SAL_OVERRIDE { /* Do nothing */ }; + virtual void Run() SAL_OVERRIDE { /* Do nothing */ }; }; /** This implementation of the CacheCompactor interface class uses one of @@ -67,7 +67,7 @@ public: const ::boost::shared_ptr< ::sd::slidesorter::cache::BitmapCompressor>& rpCompressor); protected: - virtual void Run (void) SAL_OVERRIDE; + virtual void Run() SAL_OVERRIDE; private: ::boost::shared_ptr< ::sd::slidesorter::cache::BitmapCompressor> mpCompressor; @@ -114,7 +114,7 @@ namespace sd { namespace slidesorter { namespace cache { return pCompactor; } -void CacheCompactor::RequestCompaction (void) +void CacheCompactor::RequestCompaction() { if ( ! mbIsCompactionRunning && ! maCompactionTimer.IsActive()) maCompactionTimer.Start(); @@ -166,7 +166,7 @@ CacheCompactionByCompression::CacheCompactionByCompression ( { } -void CacheCompactionByCompression::Run (void) +void CacheCompactionByCompression::Run() { if (mrCache.GetSize() > mnMaximalCacheSize) { diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx index aab64e2fea21..481a92165cf2 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx @@ -34,7 +34,7 @@ class BitmapCache; class CacheCompactor { public: - virtual ~CacheCompactor (void) {}; + virtual ~CacheCompactor() {}; /** Create a new instance of the CacheCompactor interface class. The type of compaction algorithm used depends on values from the @@ -59,7 +59,7 @@ public: /** Request a compaction of the off-screen previews in the bitmap cache. This calls via a timer the Run() method. */ - virtual void RequestCompaction (void); + virtual void RequestCompaction(); protected: BitmapCache& mrCache; @@ -72,7 +72,7 @@ protected: /** This method actually tries to reduce the total number of bytes used by the off-screen preview bitmaps. */ - virtual void Run (void) = 0; + virtual void Run() = 0; private: /** This timer is used to collect calles to RequestCompaction() and diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx index 1c842e8ec5c9..6baa2ef9b122 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx @@ -43,7 +43,7 @@ namespace ::boost::weak_ptr<CacheConfiguration> CacheConfiguration::mpWeakInstance; Timer CacheConfiguration::maReleaseTimer; -::boost::shared_ptr<CacheConfiguration> CacheConfiguration::Instance (void) +::boost::shared_ptr<CacheConfiguration> CacheConfiguration::Instance() { SolarMutexGuard aSolarGuard; CacheConfigSharedPtr &rInstancePtr = theInstance::get(); @@ -67,7 +67,7 @@ Timer CacheConfiguration::maReleaseTimer; return rInstancePtr; } -CacheConfiguration::CacheConfiguration (void) +CacheConfiguration::CacheConfiguration() { // Get the cache size from configuration. const OUString sPathToImpressConfigurationRoot("/org.openoffice.Office.Impress/"); diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx index 6003e2da39e0..ff6cc9d2ee32 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx @@ -38,7 +38,7 @@ public: seconds. Subsequent calls to this function will create a new instance. */ - static ::boost::shared_ptr<CacheConfiguration> Instance (void); + static ::boost::shared_ptr<CacheConfiguration> Instance(); /** Look up the specified value in MultiPaneGUI/SlideSorter/PreviewCache. When the specified value @@ -55,7 +55,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> mxCacheNode; - CacheConfiguration (void); + CacheConfiguration(); DECL_LINK(TimerCallback, void *); }; diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx index eae56decc898..fe4a6dda6116 100644 --- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx @@ -47,7 +47,7 @@ GenericPageCache::GenericPageCache ( "This may indicate an error."); } -GenericPageCache::~GenericPageCache (void) +GenericPageCache::~GenericPageCache() { if (mpQueueProcessor.get() != NULL) mpQueueProcessor->Stop(); @@ -59,7 +59,7 @@ GenericPageCache::~GenericPageCache (void) mpBitmapCache.reset(); } -void GenericPageCache::ProvideCacheAndProcessor (void) +void GenericPageCache::ProvideCacheAndProcessor() { if (mpBitmapCache.get() == NULL) mpBitmapCache = PageCacheManager::Instance()->GetCache( @@ -274,14 +274,14 @@ void GenericPageCache::SetPreciousFlag ( mpBitmapCache->SetPrecious(mpCacheContext->GetPage(aKey), bIsPrecious); } -void GenericPageCache::Pause (void) +void GenericPageCache::Pause() { ProvideCacheAndProcessor(); if (mpQueueProcessor.get() != NULL) mpQueueProcessor->Pause(); } -void GenericPageCache::Resume (void) +void GenericPageCache::Resume() { ProvideCacheAndProcessor(); if (mpQueueProcessor.get() != NULL) diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx index 93c9ade141ea..207dceeb531e 100644 --- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx +++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx @@ -48,7 +48,7 @@ public: const bool bDoSuperSampling, const SharedCacheContext& rpCacheContext); - ~GenericPageCache (void); + ~GenericPageCache(); /** Change the size of the preview bitmaps. This may be caused by a resize of the slide sorter window or a change of the number of @@ -124,8 +124,8 @@ public: */ void SetPreciousFlag (const CacheKey aKey, const bool bIsPrecious); - void Pause (void); - void Resume (void); + void Pause(); + void Resume(); private: ::boost::shared_ptr<BitmapCache> mpBitmapCache; @@ -145,7 +145,7 @@ private: /** Both bitmap cache and queue processor are created on demand by this method. */ - void ProvideCacheAndProcessor (void); + void ProvideCacheAndProcessor(); }; } } } // end of namespace ::sd::slidesorter::cache diff --git a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx index 34da19a50ec7..c369500f9fdf 100644 --- a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx @@ -41,7 +41,7 @@ PageCache::PageCache ( { } -PageCache::~PageCache (void) +PageCache::~PageCache() { } @@ -98,12 +98,12 @@ void PageCache::SetPreciousFlag ( mpImplementation->SetPreciousFlag(aKey, bIsPrecious); } -void PageCache::Pause (void) +void PageCache::Pause() { mpImplementation->Pause(); } -void PageCache::Resume (void) +void PageCache::Resume() { mpImplementation->Resume(); } diff --git a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx index 453683e85ca5..9e8624bb3add 100644 --- a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx +++ b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx @@ -117,7 +117,7 @@ class PageCacheManager::PageCacheContainer CacheDescriptor::Equal> { public: - PageCacheContainer (void) {} + PageCacheContainer() {} /** Compare entries in the cache container with respect to the cache address only. @@ -162,7 +162,7 @@ public: ::boost::weak_ptr<PageCacheManager> PageCacheManager::mpInstance; -::boost::shared_ptr<PageCacheManager> PageCacheManager::Instance (void) +::boost::shared_ptr<PageCacheManager> PageCacheManager::Instance() { ::boost::shared_ptr<PageCacheManager> pInstance; @@ -180,14 +180,14 @@ public: return pInstance; } -PageCacheManager::PageCacheManager (void) +PageCacheManager::PageCacheManager() : mpPageCaches(new PageCacheContainer()), mpRecentlyUsedPageCaches(new RecentlyUsedPageCaches()), mnMaximalRecentlyCacheCount(2) { } -PageCacheManager::~PageCacheManager (void) +PageCacheManager::~PageCacheManager() { } @@ -368,7 +368,7 @@ void PageCacheManager::InvalidateAllPreviewBitmaps (DocumentKey pDocument) } } -void PageCacheManager::InvalidateAllCaches (void) +void PageCacheManager::InvalidateAllCaches() { // Iterate over all caches that are currently in use and invalidate // them. diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx index 0391a785c003..61a662f92982 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx @@ -62,7 +62,7 @@ QueueProcessor::QueueProcessor ( maTimer.SetTimeout (10); } -QueueProcessor::~QueueProcessor (void) +QueueProcessor::~QueueProcessor() { } @@ -80,18 +80,18 @@ void QueueProcessor::Start (int nPriorityClass) } } -void QueueProcessor::Stop (void) +void QueueProcessor::Stop() { if (maTimer.IsActive()) maTimer.Stop(); } -void QueueProcessor::Pause (void) +void QueueProcessor::Pause() { mbIsPaused = true; } -void QueueProcessor::Resume (void) +void QueueProcessor::Resume() { mbIsPaused = false; if ( ! mrQueue.IsEmpty()) @@ -112,7 +112,7 @@ IMPL_LINK_NOARG(QueueProcessor, ProcessRequestHdl) return 1; } -void QueueProcessor::ProcessRequests (void) +void QueueProcessor::ProcessRequests() { OSL_ASSERT(mpCacheContext.get()!=NULL); diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx index 2044fdbf2056..c472383def83 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx @@ -70,9 +70,9 @@ public: of 1.) When the timer is already running it is not modified. */ void Start (int nPriorityClass = 0); - void Stop (void); - void Pause (void); - void Resume (void); + void Stop(); + void Pause(); + void Resume(); void SetPreviewSize ( const Size& rSize, @@ -103,7 +103,7 @@ private: BitmapFactory maBitmapFactory; bool mbIsPaused; - void ProcessRequests (void); + void ProcessRequests(); void ProcessOneRequest ( CacheKey aKey, const RequestPriorityClass ePriorityClass); diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx index daacee5be8ff..63f25e5ca932 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx @@ -91,7 +91,7 @@ RequestQueue::RequestQueue (const SharedCacheContext& rpCacheContext) { } -RequestQueue::~RequestQueue (void) +RequestQueue::~RequestQueue() { Clear(); } @@ -199,7 +199,7 @@ void RequestQueue::ChangeClass ( } } -CacheKey RequestQueue::GetFront (void) +CacheKey RequestQueue::GetFront() { ::osl::MutexGuard aGuard (maMutex); @@ -210,7 +210,7 @@ CacheKey RequestQueue::GetFront (void) return mpRequestQueue->begin()->maKey; } -RequestPriorityClass RequestQueue::GetFrontPriorityClass (void) +RequestPriorityClass RequestQueue::GetFrontPriorityClass() { ::osl::MutexGuard aGuard (maMutex); @@ -221,7 +221,7 @@ RequestPriorityClass RequestQueue::GetFrontPriorityClass (void) return mpRequestQueue->begin()->meClass; } -void RequestQueue::PopFront (void) +void RequestQueue::PopFront() { ::osl::MutexGuard aGuard (maMutex); @@ -243,13 +243,13 @@ void RequestQueue::PopFront (void) } } -bool RequestQueue::IsEmpty (void) +bool RequestQueue::IsEmpty() { ::osl::MutexGuard aGuard (maMutex); return mpRequestQueue->empty(); } -void RequestQueue::Clear (void) +void RequestQueue::Clear() { ::osl::MutexGuard aGuard (maMutex); diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx index be9b5909bb6d..476e21cd2d61 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx @@ -77,27 +77,27 @@ public: /** Get the request with the highest priority int the highest priority class. */ - CacheKey GetFront (void); + CacheKey GetFront(); // For debugging. - RequestPriorityClass GetFrontPriorityClass (void); + RequestPriorityClass GetFrontPriorityClass(); /** Really a synonym for RemoveRequest(GetFront()); */ - void PopFront (void); + void PopFront(); /** Returns <TRUE/> when there is no element in the queue. */ - bool IsEmpty (void); + bool IsEmpty(); /** Remove all requests from the queue. This resets the minimum and maximum priorities to their default values. */ - void Clear (void); + void Clear(); /** Return the mutex that guards the access to the priority queue. */ - ::osl::Mutex& GetMutex (void) { return maMutex;} + ::osl::Mutex& GetMutex() { return maMutex;} /** Ensure we don't hand out a page deleted before anyone got a chance to process it diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index ad76ae766faf..aae8a7eec2b7 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -136,7 +136,7 @@ SlideSorterController::SlideSorterController (SlideSorter& rSlideSorter) } } -void SlideSorterController::Init (void) +void SlideSorterController::Init() { mpCurrentSlideManager.reset(new CurrentSlideManager(mrSlideSorter)); mpPageSelector.reset(new PageSelector(mrSlideSorter)); @@ -159,7 +159,7 @@ void SlideSorterController::Init (void) GetSelectionManager()->SelectionHasChanged(); } -SlideSorterController::~SlideSorterController (void) +SlideSorterController::~SlideSorterController() { try { @@ -177,7 +177,7 @@ SlideSorterController::~SlideSorterController (void) // to shut down cleanly. } -void SlideSorterController::Dispose (void) +void SlideSorterController::Dispose() { mpInsertionIndicatorHandler->End(Animator::AM_Immediate); mpClipboard.reset(); @@ -214,50 +214,50 @@ model::SharedPageDescriptor SlideSorterController::GetPageAt ( return pDescriptorAtPoint; } -PageSelector& SlideSorterController::GetPageSelector (void) +PageSelector& SlideSorterController::GetPageSelector() { OSL_ASSERT(mpPageSelector.get()!=NULL); return *mpPageSelector.get(); } -FocusManager& SlideSorterController::GetFocusManager (void) +FocusManager& SlideSorterController::GetFocusManager() { OSL_ASSERT(mpFocusManager.get()!=NULL); return *mpFocusManager.get(); } -Clipboard& SlideSorterController::GetClipboard (void) +Clipboard& SlideSorterController::GetClipboard() { OSL_ASSERT(mpClipboard.get()!=NULL); return *mpClipboard.get(); } -ScrollBarManager& SlideSorterController::GetScrollBarManager (void) +ScrollBarManager& SlideSorterController::GetScrollBarManager() { OSL_ASSERT(mpScrollBarManager.get()!=NULL); return *mpScrollBarManager.get(); } -::boost::shared_ptr<CurrentSlideManager> SlideSorterController::GetCurrentSlideManager (void) const +::boost::shared_ptr<CurrentSlideManager> SlideSorterController::GetCurrentSlideManager() const { OSL_ASSERT(mpCurrentSlideManager.get()!=NULL); return mpCurrentSlideManager; } -::boost::shared_ptr<SlotManager> SlideSorterController::GetSlotManager (void) const +::boost::shared_ptr<SlotManager> SlideSorterController::GetSlotManager() const { OSL_ASSERT(mpSlotManager.get()!=NULL); return mpSlotManager; } -::boost::shared_ptr<SelectionManager> SlideSorterController::GetSelectionManager (void) const +::boost::shared_ptr<SelectionManager> SlideSorterController::GetSelectionManager() const { OSL_ASSERT(mpSelectionManager.get()!=NULL); return mpSelectionManager; } ::boost::shared_ptr<InsertionIndicatorHandler> - SlideSorterController::GetInsertionIndicatorHandler (void) const + SlideSorterController::GetInsertionIndicatorHandler() const { OSL_ASSERT(mpInsertionIndicatorHandler.get()!=NULL); return mpInsertionIndicatorHandler; @@ -464,12 +464,12 @@ bool SlideSorterController::Command ( return bEventHasBeenHandled; } -void SlideSorterController::LockModelChange (void) +void SlideSorterController::LockModelChange() { mnModelChangeLockCount += 1; } -void SlideSorterController::UnlockModelChange (void) +void SlideSorterController::UnlockModelChange() { mnModelChangeLockCount -= 1; if (mnModelChangeLockCount==0 && mbPostModelChangePending) @@ -478,7 +478,7 @@ void SlideSorterController::UnlockModelChange (void) } } -void SlideSorterController::PreModelChange (void) +void SlideSorterController::PreModelChange() { // Prevent PreModelChange to execute more than once per model lock. if (mbPostModelChangePending) @@ -497,7 +497,7 @@ void SlideSorterController::PreModelChange (void) mbPostModelChangePending = true; } -void SlideSorterController::PostModelChange (void) +void SlideSorterController::PostModelChange() { mbPostModelChangePending = false; mrModel.Resync(); @@ -523,7 +523,7 @@ void SlideSorterController::PostModelChange (void) ViewShellHint(ViewShellHint::HINT_COMPLEX_MODEL_CHANGE_END)); } -void SlideSorterController::HandleModelChange (void) +void SlideSorterController::HandleModelChange() { // Ignore this call when the document is not in a valid state, i.e. has // not the same number of regular and notes pages. @@ -680,7 +680,7 @@ void SlideSorterController::GetAttrState (SfxItemSet& rSet) mpSlotManager->GetAttrState (rSet); } -void SlideSorterController::UpdateAllPages (void) +void SlideSorterController::UpdateAllPages() { // Do a redraw. mrSlideSorter.GetContentWindow()->Invalidate(); @@ -760,13 +760,13 @@ rtl::Reference<FuPoor> SlideSorterController::CreateSelectionFunction (SfxReques return xFunc; } -::rtl::Reference<SelectionFunction> SlideSorterController::GetCurrentSelectionFunction (void) +::rtl::Reference<SelectionFunction> SlideSorterController::GetCurrentSelectionFunction() { rtl::Reference<FuPoor> pFunction (mrSlideSorter.GetViewShell()->GetCurrentFunction()); return ::rtl::Reference<SelectionFunction>(dynamic_cast<SelectionFunction*>(pFunction.get())); } -void SlideSorterController::PrepareEditModeChange (void) +void SlideSorterController::PrepareEditModeChange() { // Before we throw away the page descriptors we prepare for selecting // descriptors in the other mode and for restoring the current @@ -814,7 +814,7 @@ bool SlideSorterController::ChangeEditMode (EditMode eEditMode) return bResult; } -void SlideSorterController::FinishEditModeChange (void) +void SlideSorterController::FinishEditModeChange() { if (mrModel.GetEditMode() == EM_MASTERPAGE) { @@ -912,13 +912,13 @@ void SlideSorterController::SetDocumentSlides (const Reference<container::XIndex } } -VisibleAreaManager& SlideSorterController::GetVisibleAreaManager (void) const +VisibleAreaManager& SlideSorterController::GetVisibleAreaManager() const { OSL_ASSERT(mpVisibleAreaManager); return *mpVisibleAreaManager; } -void SlideSorterController::CheckForMasterPageAssignment (void) +void SlideSorterController::CheckForMasterPageAssignment() { if (mrModel.GetPageCount()%2==0) return; @@ -935,7 +935,7 @@ void SlideSorterController::CheckForMasterPageAssignment (void) } } -void SlideSorterController::CheckForSlideTransitionAssignment (void) +void SlideSorterController::CheckForSlideTransitionAssignment() { if (mrModel.GetPageCount()%2==0) return; @@ -961,12 +961,12 @@ SlideSorterController::ModelChangeLock::ModelChangeLock ( mpController->LockModelChange(); } -SlideSorterController::ModelChangeLock::~ModelChangeLock (void) +SlideSorterController::ModelChangeLock::~ModelChangeLock() { Release(); } -void SlideSorterController::ModelChangeLock::Release (void) +void SlideSorterController::ModelChangeLock::Release() { if (mpController != NULL) { diff --git a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx index 99a838866192..e2f909075953 100644 --- a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx +++ b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx @@ -37,7 +37,7 @@ public: const double nGlobalTime, const Animator::AnimationId nAnimationId, const Animator::FinishFunctor& rFinishFunctor); - ~Animation (void); + ~Animation(); /** Run next animation step. If animation has reached its end it is expired. */ @@ -47,8 +47,8 @@ public: Animator::Disposed(). The finish functor is called and the animation is marked as expired to prevent another run. */ - void Expire (void); - bool IsExpired (void) { return mbIsExpired;} + void Expire(); + bool IsExpired() { return mbIsExpired;} Animator::AnimationFunctor maAnimation; Animator::FinishFunctor maFinishFunctor; @@ -72,7 +72,7 @@ Animator::Animator (SlideSorter& rSlideSorter) maIdle.SetIdleHdl(LINK(this,Animator,TimeoutHandler)); } -Animator::~Animator (void) +Animator::~Animator() { if ( ! mbIsDisposed) { @@ -81,7 +81,7 @@ Animator::~Animator (void) } } -void Animator::Dispose (void) +void Animator::Dispose() { mbIsDisposed = true; @@ -154,7 +154,7 @@ void Animator::RemoveAnimation (const Animator::AnimationId nId) } } -void Animator::RemoveAllAnimations (void) +void Animator::RemoveAllAnimations() { ::std::for_each( maAnimations.begin(), @@ -188,7 +188,7 @@ bool Animator::ProcessAnimations (const double nTime) return bExpired; } -void Animator::CleanUpAnimationList (void) +void Animator::CleanUpAnimationList() { OSL_ASSERT( ! mbIsDisposed); if (mbIsDisposed) @@ -256,7 +256,7 @@ Animator::Animation::Animation ( Run(nGlobalTime); } -Animator::Animation::~Animation (void) +Animator::Animation::~Animation() { } @@ -286,7 +286,7 @@ bool Animator::Animation::Run (const double nGlobalTime) return mbIsExpired; } -void Animator::Animation::Expire (void) +void Animator::Animation::Expire() { if ( ! mbIsExpired) { diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx index 1157b2973e3d..d7898c1a3d9f 100644 --- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx +++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx @@ -95,7 +95,7 @@ public: if (mbIsCurrentSlideTrackingActive) mrController.GetVisibleAreaManager().DeactivateCurrentSlideTracking(); } - ~TemporarySlideTrackingDeactivator (void) + ~TemporarySlideTrackingDeactivator() { if (mbIsCurrentSlideTrackingActive) mrController.GetVisibleAreaManager().ActivateCurrentSlideTracking(); @@ -125,7 +125,7 @@ public: } } - ~UndoContext (void) + ~UndoContext() { if (mpDocument!=NULL && mpDocument->IsUndoEnabled()) mpDocument->EndUndo(); @@ -154,7 +154,7 @@ Clipboard::Clipboard (SlideSorter& rSlideSorter) { } -Clipboard::~Clipboard (void) +Clipboard::~Clipboard() { if (mnDragFinishedUserEventId != 0) Application::RemoveUserEvent(mnDragFinishedUserEventId); @@ -795,7 +795,7 @@ bool Clipboard::IsInsertionTrivial ( return mrController.GetInsertionIndicatorHandler()->IsInsertionTrivial(nDndAction); } -void Clipboard::Abort (void) +void Clipboard::Abort() { if (mxSelectionObserverContext) { diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx index ab4885a33be1..61973a7e3d71 100644 --- a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx @@ -49,7 +49,7 @@ CurrentSlideManager::CurrentSlideManager (SlideSorter& rSlideSorter) maSwitchPageDelayTimer.SetTimeoutHdl(LINK(this,CurrentSlideManager,SwitchPageCallback)); } -CurrentSlideManager::~CurrentSlideManager (void) +CurrentSlideManager::~CurrentSlideManager() { } @@ -85,7 +85,7 @@ void CurrentSlideManager::NotifyCurrentSlideChange (const sal_Int32 nSlideIndex) } } -void CurrentSlideManager::ReleaseCurrentSlide (void) +void CurrentSlideManager::ReleaseCurrentSlide() { if (mpCurrentSlide.get() != NULL) mrSlideSorter.GetView().SetState(mpCurrentSlide, PageDescriptor::ST_Current, false); @@ -94,7 +94,7 @@ void CurrentSlideManager::ReleaseCurrentSlide (void) mnCurrentSlideIndex = -1; } -bool CurrentSlideManager::IsCurrentSlideIsValid (void) +bool CurrentSlideManager::IsCurrentSlideIsValid() { return mnCurrentSlideIndex >= 0 && mnCurrentSlideIndex<mrSlideSorter.GetModel().GetPageCount(); } @@ -224,12 +224,12 @@ void CurrentSlideManager::SetCurrentSlideAtXController (const SharedPageDescript } } -void CurrentSlideManager::PrepareModelChange (void) +void CurrentSlideManager::PrepareModelChange() { mpCurrentSlide.reset(); } -void CurrentSlideManager::HandleModelChange (void) +void CurrentSlideManager::HandleModelChange() { if (mnCurrentSlideIndex >= 0) { diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx index 3338bfeac24e..3faf316f1dda 100644 --- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx +++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx @@ -63,12 +63,12 @@ DragAndDropContext::DragAndDropContext (SlideSorter& rSlideSorter) rSlideSorter.GetController().GetInsertionIndicatorHandler()->UpdateIndicatorIcon(pTransferable); } -DragAndDropContext::~DragAndDropContext (void) +DragAndDropContext::~DragAndDropContext() { SetTargetSlideSorter (NULL, Point(0,0), InsertionIndicatorHandler::UnknownMode, false); } -void DragAndDropContext::Dispose (void) +void DragAndDropContext::Dispose() { mnInsertionIndex = -1; } diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx index 9af4797e3478..c7f6f1ee6c57 100644 --- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx +++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx @@ -43,13 +43,13 @@ public: when provided, the pages in the transferable. */ DragAndDropContext (SlideSorter& rSlideSorter); - ~DragAndDropContext (void); + ~DragAndDropContext(); /** Call this method (for example as reaction to ESC key press) to avoid processing (ie moving or inserting) the substition when the called DragAndDropContext object is destroyed. */ - void Dispose (void); + void Dispose(); /** Move the substitution display by the distance the mouse has travelled since the last call to this method or to diff --git a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx index 1b9a3dc17ef6..b0acdd6ed90f 100644 --- a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx @@ -45,7 +45,7 @@ FocusManager::FocusManager (SlideSorter& rSlideSorter) mnPageIndex = 0; } -FocusManager::~FocusManager (void) +FocusManager::~FocusManager() { } @@ -159,13 +159,13 @@ void FocusManager::ShowFocus (const bool bScrollToFocus) ShowFocusIndicator(GetFocusedPageDescriptor(), bScrollToFocus); } -void FocusManager::HideFocus (void) +void FocusManager::HideFocus() { mbPageIsFocused = false; HideFocusIndicator(GetFocusedPageDescriptor()); } -bool FocusManager::ToggleFocus (void) +bool FocusManager::ToggleFocus() { if (mnPageIndex >= 0) { @@ -177,12 +177,12 @@ bool FocusManager::ToggleFocus (void) return mbPageIsFocused; } -bool FocusManager::HasFocus (void) const +bool FocusManager::HasFocus() const { return mrSlideSorter.GetContentWindow()->HasFocus(); } -model::SharedPageDescriptor FocusManager::GetFocusedPageDescriptor (void) const +model::SharedPageDescriptor FocusManager::GetFocusedPageDescriptor() const { return mrSlideSorter.GetModel().GetPageDescriptor(mnPageIndex); } @@ -202,12 +202,12 @@ void FocusManager::SetFocusedPage (sal_Int32 nPageIndex) mnPageIndex = nPageIndex; } -void FocusManager::SetFocusedPageToCurrentPage (void) +void FocusManager::SetFocusedPageToCurrentPage() { SetFocusedPage(mrSlideSorter.GetController().GetCurrentSlideManager()->GetCurrentSlide()); } -bool FocusManager::IsFocusShowing (void) const +bool FocusManager::IsFocusShowing() const { return HasFocus() && mbPageIsFocused; } @@ -258,7 +258,7 @@ void FocusManager::RemoveFocusChangeListener (const Link& rListener) ::std::find (maFocusChangeListeners.begin(), maFocusChangeListeners.end(), rListener)); } -void FocusManager::NotifyFocusChangeListeners (void) const +void FocusManager::NotifyFocusChangeListeners() const { // Create a copy of the listener list to be safe when that is modified. ::std::vector<Link> aListeners (maFocusChangeListeners); @@ -279,7 +279,7 @@ FocusManager::FocusHider::FocusHider (FocusManager& rManager) mrManager.HideFocus(); } -FocusManager::FocusHider::~FocusHider (void) +FocusManager::FocusHider::~FocusHider() { if (mbFocusVisible) mrManager.ShowFocus(); diff --git a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx index fd8dcef357da..42b932e640a8 100644 --- a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx +++ b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx @@ -47,7 +47,7 @@ InsertionIndicatorHandler::InsertionIndicatorHandler (SlideSorter& rSlideSorter) { } -InsertionIndicatorHandler::~InsertionIndicatorHandler (void) +InsertionIndicatorHandler::~InsertionIndicatorHandler() { } @@ -81,12 +81,12 @@ void InsertionIndicatorHandler::End (const controller::Animator::AnimationMode e mpInsertionIndicatorOverlay.reset(new view::InsertionIndicatorOverlay(mrSlideSorter)); } -void InsertionIndicatorHandler::ForceShow (void) +void InsertionIndicatorHandler::ForceShow() { mbIsForcedShow = true; } -void InsertionIndicatorHandler::ForceEnd (void) +void InsertionIndicatorHandler::ForceEnd() { mbIsForcedShow = false; End(Animator::AM_Immediate); @@ -129,7 +129,7 @@ void InsertionIndicatorHandler::UpdatePosition ( UpdatePosition(rMouseModelPosition, GetModeFromDndAction(nDndAction)); } -sal_Int32 InsertionIndicatorHandler::GetInsertionPageIndex (void) const +sal_Int32 InsertionIndicatorHandler::GetInsertionPageIndex() const { if (mbIsReadOnly) return -1; @@ -171,7 +171,7 @@ void InsertionIndicatorHandler::SetPosition ( } } -::boost::shared_ptr<view::InsertAnimator> InsertionIndicatorHandler::GetInsertAnimator (void) +::boost::shared_ptr<view::InsertAnimator> InsertionIndicatorHandler::GetInsertAnimator() { if ( ! mpInsertAnimator) mpInsertAnimator.reset(new view::InsertAnimator(mrSlideSorter)); @@ -240,7 +240,7 @@ InsertionIndicatorHandler::ForceShowContext::ForceShowContext ( mpHandler->ForceShow(); } -InsertionIndicatorHandler::ForceShowContext::~ForceShowContext (void) +InsertionIndicatorHandler::ForceShowContext::~ForceShowContext() { mpHandler->ForceEnd(); } diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx index b821f77a081e..149edf879839 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.cxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx @@ -136,13 +136,13 @@ Listener::Listener ( } } -Listener::~Listener (void) +Listener::~Listener() { DBG_ASSERT( !mbListeningToDocument && !mbListeningToUNODocument && !mbListeningToFrame, "sd::Listener::~Listener(), disposing() was not called, ask DBO!" ); } -void Listener::ReleaseListeners (void) +void Listener::ReleaseListeners() { if (mbListeningToDocument) { @@ -196,7 +196,7 @@ void Listener::ReleaseListeners (void) } } -void Listener::ConnectToController (void) +void Listener::ConnectToController() { ViewShell* pShell = mrSlideSorter.GetViewShell(); @@ -241,7 +241,7 @@ void Listener::ConnectToController (void) } } -void Listener::DisconnectFromController (void) +void Listener::DisconnectFromController() { if (mbListeningToController) { @@ -527,12 +527,12 @@ void SAL_CALL Listener::notifyEvent ( { } -void SAL_CALL Listener::disposing (void) +void SAL_CALL Listener::disposing() { ReleaseListeners(); } -void Listener::UpdateEditMode (void) +void Listener::UpdateEditMode() { // When there is a new controller then the edit mode may have changed at // the same time. @@ -631,7 +631,7 @@ void Listener::HandleShapeModification (const SdrPage* pPage) } } -void Listener::ThrowIfDisposed (void) +void Listener::ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) diff --git a/sd/source/ui/slidesorter/controller/SlsListener.hxx b/sd/source/ui/slidesorter/controller/SlsListener.hxx index fe2d018129ca..c00ce5680014 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.hxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.hxx @@ -72,7 +72,7 @@ class Listener { public: Listener (SlideSorter& rSlideSorter); - virtual ~Listener (void); + virtual ~Listener(); /** Connect to the current controller of the view shell as listener. This method is called once during initialization and every time a @@ -80,7 +80,7 @@ public: When the connection is successful then the flag mbListeningToController is set to <TRUE/>. */ - void ConnectToController (void); + void ConnectToController(); /** Disconnect from the current controller of the view shell as listener. This method is called once during initialization and @@ -88,7 +88,7 @@ public: exchanged. When this method terminates then mbListeningToController is <FALSE/>. */ - void DisconnectFromController (void); + void DisconnectFromController(); virtual void Notify ( SfxBroadcaster& rBroadcaster, @@ -127,7 +127,7 @@ public: frameAction (const ::com::sun::star::frame::FrameActionEvent& rEvent) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; private: SlideSorter& mrSlideSorter; @@ -153,11 +153,11 @@ private: */ ::boost::shared_ptr<SlideSorterController::ModelChangeLock> mpModelChangeLock; - void ReleaseListeners (void); + void ReleaseListeners(); /** Called when the edit mode has changed. Update model accordingly. */ - void UpdateEditMode (void); + void UpdateEditMode(); /** Handle a change in the order of slides or when the set of slides has changed, i.e. a slide has been created. @@ -173,7 +173,7 @@ private: /** This method throws a DisposedException when the object has already been disposed. */ - void ThrowIfDisposed (void) + void ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException); DECL_LINK(EventMultiplexerCallback, tools::EventMultiplexerEvent*); diff --git a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx index 3e6e9f9959c0..b9563ae7b814 100644 --- a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx +++ b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx @@ -62,7 +62,7 @@ PageSelector::PageSelector (SlideSorter& rSlideSorter) CountSelectedPages (); } -void PageSelector::SelectAllPages (void) +void PageSelector::SelectAllPages() { VisibleAreaManager::TemporaryDisabler aDisabler (mrSlideSorter); PageSelector::UpdateLock aLock (*this); @@ -72,7 +72,7 @@ void PageSelector::SelectAllPages (void) SelectPage(nPageIndex); } -void PageSelector::DeselectAllPages (void) +void PageSelector::DeselectAllPages() { VisibleAreaManager::TemporaryDisabler aDisabler (mrSlideSorter); PageSelector::UpdateLock aLock (*this); @@ -87,7 +87,7 @@ void PageSelector::DeselectAllPages (void) mpSelectionAnchor.reset(); } -void PageSelector::GetCoreSelection (void) +void PageSelector::GetCoreSelection() { PageSelector::UpdateLock aLock (*this); @@ -118,7 +118,7 @@ void PageSelector::GetCoreSelection (void) } } -void PageSelector::SetCoreSelection (void) +void PageSelector::SetCoreSelection() { model::PageEnumeration aAllPages ( model::PageEnumerationProvider::CreateAllPagesEnumeration(mrModel)); @@ -199,7 +199,7 @@ void PageSelector::DeselectPage ( } } -void PageSelector::CheckConsistency (void) const +void PageSelector::CheckConsistency() const { int nSelectionCount (0); for (int nPageIndex=0,nPageCount=mrModel.GetPageCount(); nPageIndex<nPageCount; nPageIndex++) @@ -228,12 +228,12 @@ bool PageSelector::IsPageSelected (int nPageIndex) return false; } -int PageSelector::GetPageCount (void) const +int PageSelector::GetPageCount() const { return mrModel.GetPageCount(); } -void PageSelector::CountSelectedPages (void) +void PageSelector::CountSelectedPages() { mnSelectedPageCount = 0; model::PageEnumeration aSelectedPages ( @@ -245,7 +245,7 @@ void PageSelector::CountSelectedPages (void) } } -void PageSelector::EnableBroadcasting (void) +void PageSelector::EnableBroadcasting() { if (mnBroadcastDisableLevel > 0) mnBroadcastDisableLevel --; @@ -256,12 +256,12 @@ void PageSelector::EnableBroadcasting (void) } } -void PageSelector::DisableBroadcasting (void) +void PageSelector::DisableBroadcasting() { mnBroadcastDisableLevel ++; } -::boost::shared_ptr<PageSelector::PageSelection> PageSelector::GetPageSelection (void) const +::boost::shared_ptr<PageSelector::PageSelection> PageSelector::GetPageSelection() const { ::boost::shared_ptr<PageSelection> pSelection (new PageSelection()); pSelection->reserve(GetSelectedPageCount()); @@ -346,12 +346,12 @@ PageSelector::UpdateLock::UpdateLock (PageSelector& rSelector) ++mpSelector->mnUpdateLockCount; } -PageSelector::UpdateLock::~UpdateLock (void) +PageSelector::UpdateLock::~UpdateLock() { Release(); } -void PageSelector::UpdateLock::Release (void) +void PageSelector::UpdateLock::Release() { if (mpSelector != NULL) { @@ -378,7 +378,7 @@ PageSelector::BroadcastLock::BroadcastLock (PageSelector& rSelector) mrSelector.DisableBroadcasting(); } -PageSelector::BroadcastLock::~BroadcastLock (void) +PageSelector::BroadcastLock::~BroadcastLock() { mrSelector.EnableBroadcasting(); } diff --git a/sd/source/ui/slidesorter/controller/SlsProperties.cxx b/sd/source/ui/slidesorter/controller/SlsProperties.cxx index 5165a5f14de6..a876bd2ae37f 100644 --- a/sd/source/ui/slidesorter/controller/SlsProperties.cxx +++ b/sd/source/ui/slidesorter/controller/SlsProperties.cxx @@ -23,7 +23,7 @@ namespace sd { namespace slidesorter { namespace controller { -Properties::Properties (void) +Properties::Properties() : mbIsHighlightCurrentSlide(false), mbIsShowSelection(true), mbIsShowFocus(true), @@ -41,11 +41,11 @@ Properties::Properties (void) { } -Properties::~Properties (void) +Properties::~Properties() { } -void Properties::HandleDataChangeEvent (void) +void Properties::HandleDataChangeEvent() { maBackgroundColor = Application::GetSettings().GetStyleSettings().GetWindowColor(); maTextColor = Application::GetSettings().GetStyleSettings().GetActiveTextColor(); diff --git a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx index 971c7e75aebb..5fcebfb83746 100644 --- a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx @@ -66,11 +66,11 @@ ScrollBarManager::ScrollBarManager (SlideSorter& rSlideSorter) LINK(this, ScrollBarManager, AutoScrollTimeoutHandler)); } -ScrollBarManager::~ScrollBarManager (void) +ScrollBarManager::~ScrollBarManager() { } -void ScrollBarManager::Connect (void) +void ScrollBarManager::Connect() { if (mpVerticalScrollBar != 0) { @@ -84,7 +84,7 @@ void ScrollBarManager::Connect (void) } } -void ScrollBarManager::Disconnect (void) +void ScrollBarManager::Disconnect() { if (mpVerticalScrollBar != 0) { @@ -429,7 +429,7 @@ void ScrollBarManager::SetTopLeft(const Point& rNewTopLeft) mrSlideSorter.GetView().InvalidatePageObjectVisibilities(); } -int ScrollBarManager::GetVerticalScrollBarWidth (void) const +int ScrollBarManager::GetVerticalScrollBarWidth() const { if (mpVerticalScrollBar != 0 && mpVerticalScrollBar->IsVisible()) return mpVerticalScrollBar->GetSizePixel().Width(); @@ -437,7 +437,7 @@ int ScrollBarManager::GetVerticalScrollBarWidth (void) const return 0; } -int ScrollBarManager::GetHorizontalScrollBarHeight (void) const +int ScrollBarManager::GetHorizontalScrollBarHeight() const { if (mpHorizontalScrollBar != 0 && mpHorizontalScrollBar->IsVisible()) return mpHorizontalScrollBar->GetSizePixel().Height(); @@ -501,7 +501,7 @@ void ScrollBarManager::CalcAutoScrollOffset (const Point& rMouseWindowPosition) bool ScrollBarManager::AutoScroll ( const Point& rMouseWindowPosition, - const ::boost::function<void(void)>& rAutoScrollFunctor) + const ::boost::function<void()>& rAutoScrollFunctor) { maAutoScrollFunctor = rAutoScrollFunctor; CalcAutoScrollOffset(rMouseWindowPosition); @@ -512,13 +512,13 @@ bool ScrollBarManager::AutoScroll ( return bResult; } -void ScrollBarManager::StopAutoScroll (void) +void ScrollBarManager::StopAutoScroll() { maAutoScrollTimer.Stop(); mbIsAutoScrollActive = false; } -bool ScrollBarManager::RepeatAutoScroll (void) +bool ScrollBarManager::RepeatAutoScroll() { if (maAutoScrollOffset != Size(0,0)) { @@ -546,7 +546,7 @@ bool ScrollBarManager::RepeatAutoScroll (void) void ScrollBarManager::clearAutoScrollFunctor() { - maAutoScrollFunctor = ::boost::function<void(void)>(); + maAutoScrollFunctor = ::boost::function<void()>(); } IMPL_LINK_NOARG(ScrollBarManager, AutoScrollTimeoutHandler) diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx index 64ee5effc7e8..8bef190c0ecf 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx @@ -133,7 +133,7 @@ private: whether the selection rectangle is visible or whether the page under the mouse or the one that has the focus is selected. */ - sal_uInt32 EncodeState (void) const; + sal_uInt32 EncodeState() const; }; //===== SelectionFunction::ModeHandler ======================================== @@ -145,10 +145,10 @@ public: SlideSorter& rSlideSorter, SelectionFunction& rSelectionFunction, const bool bIsMouseOverIndicatorAllowed); - virtual ~ModeHandler (void); + virtual ~ModeHandler(); - virtual Mode GetMode (void) const = 0; - virtual void Abort (void) = 0; + virtual Mode GetMode() const = 0; + virtual void Abort() = 0; virtual void ProcessEvent (EventDescriptor& rDescriptor); /** Set the selection to exactly the specified page and also set it as @@ -157,7 +157,7 @@ public: void SetCurrentPage (const model::SharedPageDescriptor& rpDescriptor); /// Deselect all pages. - void DeselectAllPages (void); + void DeselectAllPages(); void SelectOnePage (const model::SharedPageDescriptor& rpDescriptor); /** When the view on which this selection function is working is the @@ -169,7 +169,7 @@ public: const Point& rMousePosition, const InsertionIndicatorHandler::Mode eMode); - bool IsMouseOverIndicatorAllowed (void) const { return mbIsMouseOverIndicatorAllowed;} + bool IsMouseOverIndicatorAllowed() const { return mbIsMouseOverIndicatorAllowed;} protected: SlideSorter& mrSlideSorter; @@ -196,12 +196,12 @@ public: NormalModeHandler ( SlideSorter& rSlideSorter, SelectionFunction& rSelectionFunction); - virtual ~NormalModeHandler (void); + virtual ~NormalModeHandler(); - virtual SelectionFunction::Mode GetMode (void) const SAL_OVERRIDE; - virtual void Abort (void) SAL_OVERRIDE; + virtual SelectionFunction::Mode GetMode() const SAL_OVERRIDE; + virtual void Abort() SAL_OVERRIDE; - void ResetButtonDownLocation (void); + void ResetButtonDownLocation(); protected: virtual bool ProcessButtonDownEvent (SelectionFunction::EventDescriptor& rDescriptor) SAL_OVERRIDE; @@ -235,14 +235,14 @@ public: const Point& rMouseModelPosition, const sal_uInt32 nEventCode); #endif - virtual ~MultiSelectionModeHandler (void); + virtual ~MultiSelectionModeHandler(); #ifndef MACOSX void Initialize(const sal_uInt32 nEventCode); #endif - virtual SelectionFunction::Mode GetMode (void) const SAL_OVERRIDE; - virtual void Abort (void) SAL_OVERRIDE; + virtual SelectionFunction::Mode GetMode() const SAL_OVERRIDE; + virtual void Abort() SAL_OVERRIDE; virtual void ProcessEvent (SelectionFunction::EventDescriptor& rDescriptor) SAL_OVERRIDE; enum SelectionMode { SM_Normal, SM_Add, SM_Toggle }; @@ -264,7 +264,7 @@ private: sal_Int32 mnSecondIndex; void UpdateModelPosition (const Point& rMouseModelPosition); - void UpdateSelection (void); + void UpdateSelection(); /** Update the rectangle selection so that the given position becomes the new second point of the selection rectangle. @@ -292,14 +292,14 @@ public: const Point& rMousePosition, ::vcl::Window* pWindow); #endif - virtual ~DragAndDropModeHandler (void); + virtual ~DragAndDropModeHandler(); #ifndef MACOSX void Initialize(const Point& rMousePosition, ::vcl::Window* pWindow); #endif - virtual SelectionFunction::Mode GetMode (void) const SAL_OVERRIDE; - virtual void Abort (void) SAL_OVERRIDE; + virtual SelectionFunction::Mode GetMode() const SAL_OVERRIDE; + virtual void Abort() SAL_OVERRIDE; protected: virtual bool ProcessButtonUpEvent (SelectionFunction::EventDescriptor& rDescriptor) SAL_OVERRIDE; @@ -332,7 +332,7 @@ SelectionFunction::SelectionFunction ( { } -SelectionFunction::~SelectionFunction (void) +SelectionFunction::~SelectionFunction() { mpModeHandler.reset(); } @@ -376,7 +376,7 @@ bool SelectionFunction::MouseButtonUp (const MouseEvent& rEvent) return true; } -void SelectionFunction::NotifyDragFinished (void) +void SelectionFunction::NotifyDragFinished() { SwitchToNormalMode(); } @@ -599,7 +599,7 @@ void SelectionFunction::Deactivate() FuPoor::Deactivate(); } -void SelectionFunction::DoCut (void) +void SelectionFunction::DoCut() { if ( ! mrSlideSorter.GetProperties()->IsUIReadOnly()) { @@ -607,12 +607,12 @@ void SelectionFunction::DoCut (void) } } -void SelectionFunction::DoCopy (void) +void SelectionFunction::DoCopy() { mrController.GetClipboard().DoCopy(); } -void SelectionFunction::DoPaste (void) +void SelectionFunction::DoPaste() { if ( ! mrSlideSorter.GetProperties()->IsUIReadOnly()) { @@ -620,7 +620,7 @@ void SelectionFunction::DoPaste (void) } } -bool SelectionFunction::cancel (void) +bool SelectionFunction::cancel() { mrController.GetFocusManager().ToggleFocus(); return true; @@ -694,7 +694,7 @@ bool Match ( return (nEventCode & nPositivePattern)==nPositivePattern; } -void SelectionFunction::SwitchToNormalMode (void) +void SelectionFunction::SwitchToNormalMode() { if (mpModeHandler->GetMode() != NormalMode) SwitchMode(::boost::shared_ptr<ModeHandler>( @@ -756,12 +756,12 @@ void SelectionFunction::SwitchMode (const ::boost::shared_ptr<ModeHandler>& rpHa mpModeHandler = rpHandler; } -void SelectionFunction::ResetShiftKeySelectionAnchor (void) +void SelectionFunction::ResetShiftKeySelectionAnchor() { mnShiftKeySelectionAnchor = -1; } -void SelectionFunction::ResetMouseAnchor (void) +void SelectionFunction::ResetMouseAnchor() { if (mpModeHandler && mpModeHandler->GetMode() == NormalMode) { @@ -866,7 +866,7 @@ sal_uInt32 SelectionFunction::EventDescriptor::EncodeMouseEvent ( return nEventCode; } -sal_uInt32 SelectionFunction::EventDescriptor::EncodeState (void) const +sal_uInt32 SelectionFunction::EventDescriptor::EncodeState() const { sal_uInt32 nEventCode (0); @@ -894,7 +894,7 @@ SelectionFunction::ModeHandler::ModeHandler ( { } -SelectionFunction::ModeHandler::~ModeHandler (void) +SelectionFunction::ModeHandler::~ModeHandler() { } @@ -977,7 +977,7 @@ void SelectionFunction::ModeHandler::SetCurrentPage ( mrSlideSorter.GetController().GetCurrentSlideManager()->SwitchCurrentSlide(rpDescriptor); } -void SelectionFunction::ModeHandler::DeselectAllPages (void) +void SelectionFunction::ModeHandler::DeselectAllPages() { mrSlideSorter.GetController().GetPageSelector().DeselectAllPages(); mrSelectionFunction.ResetShiftKeySelectionAnchor(); @@ -1039,16 +1039,16 @@ NormalModeHandler::NormalModeHandler ( { } -NormalModeHandler::~NormalModeHandler (void) +NormalModeHandler::~NormalModeHandler() { } -SelectionFunction::Mode NormalModeHandler::GetMode (void) const +SelectionFunction::Mode NormalModeHandler::GetMode() const { return SelectionFunction::NormalMode; } -void NormalModeHandler::Abort (void) +void NormalModeHandler::Abort() { } @@ -1259,7 +1259,7 @@ void NormalModeHandler::RangeSelect (const model::SharedPageDescriptor& rpDescri } } -void NormalModeHandler::ResetButtonDownLocation (void) +void NormalModeHandler::ResetButtonDownLocation() { maButtonDownLocation = ::boost::optional<Point>(); } @@ -1294,7 +1294,7 @@ void MultiSelectionModeHandler::Initialize(const sal_uInt32 nEventCode) SetSelectionModeFromModifier(nEventCode); } -MultiSelectionModeHandler::~MultiSelectionModeHandler (void) +MultiSelectionModeHandler::~MultiSelectionModeHandler() { if (mbAutoScrollInstalled) { @@ -1305,12 +1305,12 @@ MultiSelectionModeHandler::~MultiSelectionModeHandler (void) mrSlideSorter.GetContentWindow()->SetPointer(maSavedPointer); } -SelectionFunction::Mode MultiSelectionModeHandler::GetMode (void) const +SelectionFunction::Mode MultiSelectionModeHandler::GetMode() const { return SelectionFunction::MultiSelectionMode; } -void MultiSelectionModeHandler::Abort (void) +void MultiSelectionModeHandler::Abort() { mrSlideSorter.GetView().RequestRepaint(mrSlideSorter.GetModel().RestoreSelection()); } @@ -1470,7 +1470,7 @@ void MultiSelectionModeHandler::UpdateModelPosition (const Point& rMouseModelPos UpdateSelection(); } -void MultiSelectionModeHandler::UpdateSelection (void) +void MultiSelectionModeHandler::UpdateSelection() { view::SlideSorterView::DrawLock aLock (mrSlideSorter); @@ -1533,7 +1533,7 @@ void DragAndDropModeHandler::Initialize(const Point& rMousePosition, ::vcl::Wind && pDragTransferable->GetView()==&mrSlideSorter.GetView()); } -DragAndDropModeHandler::~DragAndDropModeHandler (void) +DragAndDropModeHandler::~DragAndDropModeHandler() { if (mpDragAndDropContext) { @@ -1544,12 +1544,12 @@ DragAndDropModeHandler::~DragAndDropModeHandler (void) mrSlideSorter.GetController().GetInsertionIndicatorHandler()->End(Animator::AM_Animated); } -SelectionFunction::Mode DragAndDropModeHandler::GetMode (void) const +SelectionFunction::Mode DragAndDropModeHandler::GetMode() const { return SelectionFunction::DragAndDropMode; } -void DragAndDropModeHandler::Abort (void) +void DragAndDropModeHandler::Abort() { mrSlideSorter.GetController().GetClipboard().Abort(); if (mpDragAndDropContext) diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx index 13246b7444ec..889e3510c940 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx @@ -75,7 +75,7 @@ SelectionManager::SelectionManager (SlideSorter& rSlideSorter) { } -SelectionManager::~SelectionManager (void) +SelectionManager::~SelectionManager() { if (mnAnimationId != Animator::NotAnAnimationId) mrController.GetAnimator()->RemoveAnimation(mnAnimationId); @@ -269,7 +269,7 @@ void SelectionManager::RemoveSelectionChangeListener(const Link&rListener) rListener)); } -sal_Int32 SelectionManager::GetInsertionPosition (void) const +sal_Int32 SelectionManager::GetInsertionPosition() const { sal_Int32 nInsertionPosition (mnInsertionPosition); if (nInsertionPosition < 0) diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx index 2af4e0334cbf..9b2f8c9da7c6 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx @@ -38,13 +38,13 @@ SelectionObserver::Context::Context (SlideSorter& rSlideSorter) mpSelectionObserver->StartObservation(); } -SelectionObserver::Context::~Context(void) +SelectionObserver::Context::~Context() { if (mpSelectionObserver) mpSelectionObserver->EndObservation(); } -void SelectionObserver::Context::Abort(void) +void SelectionObserver::Context::Abort() { if (mpSelectionObserver) { @@ -63,7 +63,7 @@ SelectionObserver::SelectionObserver (SlideSorter& rSlideSorter) { } -SelectionObserver::~SelectionObserver (void) +SelectionObserver::~SelectionObserver() { } @@ -89,7 +89,7 @@ void SelectionObserver::NotifyPageEvent (const SdrPage* pSdrPage) } } -void SelectionObserver::StartObservation (void) +void SelectionObserver::StartObservation() { OSL_ASSERT(!mbIsOvservationActive); maInsertedPages.clear(); @@ -97,7 +97,7 @@ void SelectionObserver::StartObservation (void) mbIsOvservationActive = true; } -void SelectionObserver::AbortObservation (void) +void SelectionObserver::AbortObservation() { OSL_ASSERT(mbIsOvservationActive); mbIsOvservationActive = false; @@ -105,7 +105,7 @@ void SelectionObserver::AbortObservation (void) maDeletedPages.clear(); } -void SelectionObserver::EndObservation (void) +void SelectionObserver::EndObservation() { OSL_ASSERT(mbIsOvservationActive); mbIsOvservationActive = false; diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index d6ac365ef3fb..17eaee29fd1a 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -117,7 +117,7 @@ SlotManager::SlotManager (SlideSorter& rSlideSorter) { } -SlotManager::~SlotManager (void) +SlotManager::~SlotManager() { } @@ -877,7 +877,7 @@ void SlotManager::ShowSlideShow( SfxRequest& rReq) slideshowhelp::ShowSlideShow(rReq, *mrSlideSorter.GetModel().GetDocument()); } -void SlotManager::RenameSlide (void) +void SlotManager::RenameSlide() { PageKind ePageKind = mrSlideSorter.GetModel().GetPageType(); View* pDrView = &mrSlideSorter.GetView(); @@ -1186,7 +1186,7 @@ void SlotManager::ChangeSlideExclusionState ( mrSlideSorter.GetModel().GetDocument()->SetChanged(); } -sal_Int32 SlotManager::GetInsertionPosition (void) +sal_Int32 SlotManager::GetInsertionPosition() { PageSelector& rSelector (mrSlideSorter.GetController().GetPageSelector()); @@ -1233,7 +1233,7 @@ sal_Int32 SlotManager::GetInsertionPosition (void) } } -void SlotManager::NotifyEditModeChange (void) +void SlotManager::NotifyEditModeChange() { SfxBindings& rBindings (mrSlideSorter.GetViewShell()->GetViewFrame()->GetBindings()); rBindings.Invalidate(SID_PRESENTATION); diff --git a/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx b/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx index ea088a0b916d..85777682c4e2 100644 --- a/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx +++ b/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx @@ -62,7 +62,7 @@ TransferableData::TransferableData ( StartListening(*mpViewShell); } -TransferableData::~TransferableData (void) +TransferableData::~TransferableData() { if (mpViewShell != NULL) EndListening(*mpViewShell); diff --git a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx index 8ccb1106c5e6..4a29df00b43e 100644 --- a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx @@ -59,16 +59,16 @@ VisibleAreaManager::VisibleAreaManager (SlideSorter& rSlideSorter) { } -VisibleAreaManager::~VisibleAreaManager (void) +VisibleAreaManager::~VisibleAreaManager() { } -void VisibleAreaManager::ActivateCurrentSlideTracking (void) +void VisibleAreaManager::ActivateCurrentSlideTracking() { mbIsCurrentSlideTrackingActive = true; } -void VisibleAreaManager::DeactivateCurrentSlideTracking (void) +void VisibleAreaManager::DeactivateCurrentSlideTracking() { mbIsCurrentSlideTrackingActive = false; } @@ -92,14 +92,14 @@ void VisibleAreaManager::RequestVisible ( } } -void VisibleAreaManager::RequestCurrentSlideVisible (void) +void VisibleAreaManager::RequestCurrentSlideVisible() { if (mbIsCurrentSlideTrackingActive && mnDisableCount==0) RequestVisible( mrSlideSorter.GetController().GetCurrentSlideManager()->GetCurrentSlide()); } -void VisibleAreaManager::MakeVisible (void) +void VisibleAreaManager::MakeVisible() { if (maVisibleRequests.empty()) return; @@ -146,7 +146,7 @@ void VisibleAreaManager::MakeVisible (void) meRequestedAnimationMode = Animator::AM_Immediate; } -::boost::optional<Point> VisibleAreaManager::GetRequestedTopLeft (void) const +::boost::optional<Point> VisibleAreaManager::GetRequestedTopLeft() const { SharedSdWindow pWindow (mrSlideSorter.GetContentWindow()); if ( ! pWindow) @@ -208,7 +208,7 @@ VisibleAreaManager::TemporaryDisabler::TemporaryDisabler (SlideSorter& rSlideSor ++mrVisibleAreaManager.mnDisableCount; } -VisibleAreaManager::TemporaryDisabler::~TemporaryDisabler (void) +VisibleAreaManager::TemporaryDisabler::~TemporaryDisabler() { --mrVisibleAreaManager.mnDisableCount; } diff --git a/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx b/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx index 3678648b58be..eb4b40520c6b 100644 --- a/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx +++ b/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx @@ -54,7 +54,7 @@ public: /** Called to determine whether the system is idle and a preview can be created without annoying the user. */ - virtual bool IsIdle (void) = 0; + virtual bool IsIdle() = 0; /** This method is used to determine whether a page is currently visible or not. It is called when the cache becomes to large and some @@ -89,7 +89,7 @@ public: same model but have different preview sizes may access previews of each other in order to create fast previews of the previews. */ - virtual ::com::sun::star::uno::Reference<com::sun::star::uno::XInterface> GetModel (void) = 0; + virtual ::com::sun::star::uno::Reference<com::sun::star::uno::XInterface> GetModel() = 0; }; typedef ::boost::shared_ptr<CacheContext> SharedCacheContext; diff --git a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx index 62daa10e03b3..27b8e9e35baf 100644 --- a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx +++ b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx @@ -77,7 +77,7 @@ public: const bool bDoSuperSampling, const SharedCacheContext& rpCacheContext); - ~PageCache (void); + ~PageCache(); void ChangeSize( const Size& rPreviewSize, @@ -148,8 +148,8 @@ public: */ void SetPreciousFlag (const CacheKey aKey, const bool bIsPrecious); - void Pause (void); - void Resume (void); + void Pause(); + void Resume(); private: ::boost::scoped_ptr<GenericPageCache> mpImplementation; diff --git a/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx b/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx index 7a730034b98a..e6ed624f6032 100644 --- a/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx +++ b/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx @@ -47,7 +47,7 @@ public: /** Return the one instance of the PageCacheManager class. */ - static ::boost::shared_ptr<PageCacheManager> Instance (void); + static ::boost::shared_ptr<PageCacheManager> Instance(); /** Look up the cache for the given model in which the previews have the specified size. If no such cache exists, then one is created. When @@ -96,7 +96,7 @@ public: those that are not. This is used for example when the high contrast mode is turned on or off. */ - void InvalidateAllCaches (void); + void InvalidateAllCaches(); /** Call this method when a page has been deleted and its preview is not needed anymore. @@ -125,8 +125,8 @@ private: */ const sal_uInt32 mnMaximalRecentlyCacheCount; - PageCacheManager (void); - ~PageCacheManager (void); + PageCacheManager(); + ~PageCacheManager(); class Deleter; friend class Deleter; diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx index f9ff6ca44e54..3658db1f3854 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx @@ -70,11 +70,11 @@ public: /** Late initialization. Call this method once a new new object has been created. */ - void Init (void); + void Init(); - virtual ~SlideSorterController (void); + virtual ~SlideSorterController(); - void Dispose (void); + void Dispose(); /** Place and size the scroll bars and the browser window so that the given rectangle is filled. @@ -106,18 +106,18 @@ public: */ model::SharedPageDescriptor GetPageAt (const Point& rPixelPosition); - PageSelector& GetPageSelector (void); - FocusManager& GetFocusManager (void); - controller::Clipboard& GetClipboard (void); + PageSelector& GetPageSelector(); + FocusManager& GetFocusManager(); + controller::Clipboard& GetClipboard(); /** Return the object that manages the scroll bars. */ - ScrollBarManager& GetScrollBarManager (void); + ScrollBarManager& GetScrollBarManager(); - ::boost::shared_ptr<CurrentSlideManager> GetCurrentSlideManager (void) const; - ::boost::shared_ptr<SlotManager> GetSlotManager (void) const; - ::boost::shared_ptr<SelectionManager> GetSelectionManager (void) const; - ::boost::shared_ptr<InsertionIndicatorHandler> GetInsertionIndicatorHandler (void) const; + ::boost::shared_ptr<CurrentSlideManager> GetCurrentSlideManager() const; + ::boost::shared_ptr<SlotManager> GetSlotManager() const; + ::boost::shared_ptr<SelectionManager> GetSelectionManager() const; + ::boost::shared_ptr<InsertionIndicatorHandler> GetInsertionIndicatorHandler() const; /** This method forwards the call to the SlideSorterView and executes pending operations like moving selected pages into the visible area. @@ -137,7 +137,7 @@ public: void ExecCtrl (SfxRequest& rRequest); void GetAttrState (SfxItemSet& rSet); - bool IsLocked (void) const; + bool IsLocked() const; /** Create an object of this inner class to prevent updates due to model changes. @@ -145,8 +145,8 @@ public: class ModelChangeLock {public: ModelChangeLock (SlideSorterController& rController); - ~ModelChangeLock (void); - void Release (void); + ~ModelChangeLock(); + void Release(); private: SlideSorterController* mpController; }; @@ -158,14 +158,14 @@ public: This method is a convenience function that simply calls PreModelChange() and then PostModelChange(). */ - void HandleModelChange (void); + void HandleModelChange(); DECL_LINK(WindowEventHandler, VclWindowEvent*); /** Update the display of all pages. This involves a redraw and releasing previews and caches. */ - void UpdateAllPages (void); + void UpdateAllPages(); /** This factory method creates a selection function. */ @@ -175,13 +175,13 @@ public: selection function then return a reference to it. Otherwise return an empty reference. */ - ::rtl::Reference<SelectionFunction> GetCurrentSelectionFunction (void); + ::rtl::Reference<SelectionFunction> GetCurrentSelectionFunction(); /** Prepare for a change of the edit mode. Depending on the current edit mode we may save the selection so that it can be restored when later changing back to the current edit mode. */ - void PrepareEditModeChange (void); + void PrepareEditModeChange(); /** Set a new edit mode and return whether the edit mode really has been changed. For proper saving and restoring of the selection @@ -196,7 +196,7 @@ public: /** Finish the change of the edit mode. Here we may select a page or restore a previously saved selection. */ - void FinishEditModeChange (void); + void FinishEditModeChange(); /** Call this method when the name of one of the pages has changed. This is then notified to the accessibility object, when that exists. @@ -215,12 +215,12 @@ public: /** Return an Animator object. */ - ::boost::shared_ptr<Animator> GetAnimator (void) const { return mpAnimator;} + ::boost::shared_ptr<Animator> GetAnimator() const { return mpAnimator;} - VisibleAreaManager& GetVisibleAreaManager (void) const; + VisibleAreaManager& GetVisibleAreaManager() const; - void CheckForMasterPageAssignment (void); - void CheckForSlideTransitionAssignment (void); + void CheckForMasterPageAssignment(); + void CheckForSlideTransitionAssignment(); private: SlideSorter& mrSlideSorter; @@ -295,26 +295,26 @@ private: called. Ciritcal operations like releasing references to pages that do not exist anymore are executed. */ - void LockModelChange (void); + void LockModelChange(); /** Further calls to HandleModelChange() will result in a full featured update of model, view, and controller. When HandleModelChange() has been called since the last LockModelChange() then this is done right away to bring the view up-to-date. */ - void UnlockModelChange (void); + void UnlockModelChange(); /** Prepare for a model change. This method does all the things that need to be done _before_ the model changes, e.g. because they need access to the model data before the change. */ - void PreModelChange (void); + void PreModelChange(); /** Complete a model change. This includes the recreation of data structures that depend on the model and the request for a repaint to show the changes. */ - void PostModelChange (void); + void PostModelChange(); }; } } } // end of namespace ::sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx index 9bed85a76524..faf620cd9a0e 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx @@ -47,12 +47,12 @@ public: enum AnimationMode { AM_Animated, AM_Immediate }; Animator (SlideSorter& rSlideSorter); - ~Animator (void); + ~Animator(); /** When disposed the animator will stop its work immediately and not process any timer events anymore. */ - void Dispose (void); + void Dispose(); /** An animation object is called with values between 0 and 1 as single argument to its operator() method. @@ -90,7 +90,7 @@ public: slidesorter when the slide sorter bar is put into a cache due to a change of the edit mode. */ - void RemoveAllAnimations (void); + void RemoveAllAnimations(); private: SlideSorter& mrSlideSorter; @@ -118,7 +118,7 @@ private: /** Remove animations that have expired. */ - void CleanUpAnimationList (void); + void CleanUpAnimationList(); void RequestNextFrame (const double nFrameStart = 0); }; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx index 9421eef2c521..e4ffd2ff006d 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx @@ -60,7 +60,7 @@ class Clipboard { public: Clipboard (SlideSorter& rSlideSorter); - virtual ~Clipboard (void); + virtual ~Clipboard(); /** Create a slide sorter transferable from the given sd transferable. The returned transferable is set up with all @@ -96,7 +96,7 @@ public: sal_uInt16 nPage = SDRPAGE_NOTFOUND, sal_uInt16 nLayer = SDRPAGE_NOTFOUND); - void Abort (void); + void Abort(); protected: virtual sal_uInt16 DetermineInsertPosition ( diff --git a/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx index 8f767c198a93..87651fcf3f8a 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx @@ -49,7 +49,7 @@ public: */ CurrentSlideManager (SlideSorter& rSlideSorter); - ~CurrentSlideManager (void); + ~CurrentSlideManager(); /** Call this when the current page of the main view shell has been switched. Use SwitchCurrentSlide() to initiate such a switch. @@ -76,15 +76,15 @@ public: /** Return the page descriptor for the current slide. Note, that when there is no current slide then the returned pointer is empty. */ - model::SharedPageDescriptor GetCurrentSlide (void) { return mpCurrentSlide;} + model::SharedPageDescriptor GetCurrentSlide() { return mpCurrentSlide;} /** Release all references to model data. */ - void PrepareModelChange (void); + void PrepareModelChange(); /** Modify inner state in reaction to a change of the SlideSorterModel. */ - void HandleModelChange (void); + void HandleModelChange(); private: SlideSorter& mrSlideSorter; @@ -95,7 +95,7 @@ private: */ Timer maSwitchPageDelayTimer; - bool IsCurrentSlideIsValid (void); + bool IsCurrentSlideIsValid(); void SetCurrentSlideAtViewShellBase (const model::SharedPageDescriptor& rpSlide); void SetCurrentSlideAtTabControl (const model::SharedPageDescriptor& rpSlide); void SetCurrentSlideAtXController (const model::SharedPageDescriptor& rpSlide); @@ -103,7 +103,7 @@ private: /** When switching from one slide to a new current slide then this method releases all ties to the old slide. */ - void ReleaseCurrentSlide (void); + void ReleaseCurrentSlide(); /** When switching from one slide to a new current slide then this method connects to the new current slide. diff --git a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx index 12284bae8db3..c67fdf3e74bb 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx @@ -47,7 +47,7 @@ public: */ FocusManager (SlideSorter& rSlideSorter); - ~FocusManager (void); + ~FocusManager(); enum FocusMoveDirection { @@ -83,25 +83,25 @@ public: /** Hide the focus indicator. */ - void HideFocus (void); + void HideFocus(); /** Toggle the focused state of the current slide. @return Returns the focused state of the focus page after the call. */ - bool ToggleFocus (void); + bool ToggleFocus(); /** Return whether the window managed by the called focus manager has the input focus of the application. */ - bool HasFocus (void) const; + bool HasFocus() const; /** Return the descriptor of the page that currently has the focus. @return When there is no page that currently has the focus then NULL is returned. */ - model::SharedPageDescriptor GetFocusedPageDescriptor (void) const; + model::SharedPageDescriptor GetFocusedPageDescriptor() const; /** Return the index of the page that currently has the focus as it is accepted by the slide sorter model. @@ -109,7 +109,7 @@ public: When there is no page that currently has the focus then -1 is returned. */ - sal_Int32 GetFocusedPageIndex (void) const { return mnPageIndex;} + sal_Int32 GetFocusedPageIndex() const { return mnPageIndex;} /** Set the focused page to the one described by the given page descriptor. The visibility of the focus indicator is not modified. @@ -126,7 +126,7 @@ public: */ void SetFocusedPage (sal_Int32 nPageIndex); - void SetFocusedPageToCurrentPage (void); + void SetFocusedPageToCurrentPage(); /** Return <TRUE/> when the focus inidcator is currently shown. A prerequisite is that the window managed by this focus manager has @@ -134,7 +134,7 @@ public: HasFocus(). It is not necessary that the focus indicator is visible. It may have been scrolled outside the visible area. */ - bool IsFocusShowing (void) const; + bool IsFocusShowing() const; /** Add a listener that is called when the focus is shown or hidden or set to another page object. @@ -160,7 +160,7 @@ public: { public: FocusHider (FocusManager&); - ~FocusHider (void); + ~FocusHider(); private: bool mbFocusVisible; FocusManager& mrManager; @@ -211,7 +211,7 @@ private: happened. The focus may be hidden or shown or moved from one page object to another. */ - void NotifyFocusChangeListeners (void) const; + void NotifyFocusChangeListeners() const; }; } } } // end of namespace ::sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx b/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx index b094c447fee6..d4084e6cc90d 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx @@ -42,7 +42,7 @@ class InsertionIndicatorHandler { public: InsertionIndicatorHandler (SlideSorter& rSlideSorter); - ~InsertionIndicatorHandler (void); + ~InsertionIndicatorHandler(); enum Mode { CopyMode, MoveMode, UnknownMode }; static Mode GetModeFromDndAction (const sal_Int8 nDndAction); @@ -63,7 +63,7 @@ public: { public: ForceShowContext (const ::boost::shared_ptr<InsertionIndicatorHandler>& rpHandler); - ~ForceShowContext (void); + ~ForceShowContext(); private: const ::boost::shared_ptr<InsertionIndicatorHandler> mpHandler; }; @@ -84,12 +84,12 @@ public: /** Return whether the insertion marker is active. */ - bool IsActive (void) const { return mbIsActive;} + bool IsActive() const { return mbIsActive;} /** Return the insertion index that corresponds with the current graphical location of the insertion indicator. */ - sal_Int32 GetInsertionPageIndex (void) const; + sal_Int32 GetInsertionPageIndex() const; /** Determine whether moving the current selection to the current position of the insertion marker would alter the document. This @@ -121,7 +121,7 @@ private: void SetPosition ( const Point& rPoint, const Mode eMode); - ::boost::shared_ptr<view::InsertAnimator> GetInsertAnimator (void); + ::boost::shared_ptr<view::InsertAnimator> GetInsertAnimator(); /** Make the insertion indicator visible (that is the show part) and keep it visible, even when the mouse leaves the window (that is the @@ -131,8 +131,8 @@ private: In effect all calls to End() are ignored until ForceEnd() is called. */ - void ForceShow (void); - void ForceEnd (void); + void ForceShow(); + void ForceEnd(); }; } } } // end of namespace ::sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx index 5db5465be0e7..9f2051cff76e 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx @@ -55,19 +55,19 @@ class PageSelector : private ::boost::noncopyable public: PageSelector (SlideSorter& rSlideSorter); - void SelectAllPages (void); - void DeselectAllPages (void); + void SelectAllPages(); + void DeselectAllPages(); /** Update the selection state of all page descriptors to be the same as that of the corresponding pages of the SdPage objects and issue redraw requests where necessary. */ - void GetCoreSelection (void); + void GetCoreSelection(); /** Update the selection state of the SdPage objects to be the same as that of the correspinding page descriptors. */ - void SetCoreSelection (void); + void SetCoreSelection(); /** Select the specified descriptor. The selection state of the other descriptors is not affected. @@ -106,15 +106,15 @@ public: that it is self contained for iterating over all pages to select or deselect them. */ - int GetPageCount (void) const; - int GetSelectedPageCount (void) const { return mnSelectedPageCount;} + int GetPageCount() const; + int GetSelectedPageCount() const { return mnSelectedPageCount;} /** Return the anchor for a range selection. This usually is the first selected page after all pages have been deselected. @return The returned anchor may be NULL. */ - model::SharedPageDescriptor GetSelectionAnchor (void) const { return mpSelectionAnchor;} + model::SharedPageDescriptor GetSelectionAnchor() const { return mpSelectionAnchor;} typedef ::std::vector<SdPage*> PageSelection; @@ -125,7 +125,7 @@ public: even if pages are exchanged a later call to SetPageSelection() is valid. */ - ::boost::shared_ptr<PageSelection> GetPageSelection (void) const; + ::boost::shared_ptr<PageSelection> GetPageSelection() const; /** Restore a page selection according to the given selection object. @param rSelection @@ -148,7 +148,7 @@ public: /** Call this method after the model has changed to set the number of selected pages. */ - void CountSelectedPages (void); + void CountSelectedPages(); /** Use the UpdateLock whenever you do a complex selection, i.e. call more than one method in a row. An active lock prevents intermediate @@ -159,8 +159,8 @@ public: public: UpdateLock (SlideSorter& rSlideSorter); UpdateLock (PageSelector& rPageSelector); - ~UpdateLock (void); - void Release (void); + ~UpdateLock(); + void Release(); private: PageSelector* mpSelector; }; @@ -170,7 +170,7 @@ public: public: BroadcastLock (SlideSorter& rSlideSorter); BroadcastLock (PageSelector& rPageSelector); - ~BroadcastLock (void); + ~BroadcastLock(); private: PageSelector& mrSelector; }; @@ -195,17 +195,17 @@ private: DisableBroadcasting() was called before and the selection has been changed in the mean time, this change will be broadcasted. */ - void EnableBroadcasting (void); + void EnableBroadcasting(); /** Disable the broadcasting of selection change events. Subsequent changes of the selection will set a flag that triggers the sending of events when EnableBroadcasting() is called. */ - void DisableBroadcasting (void); + void DisableBroadcasting(); void UpdateCurrentPage (const bool bUpdateOnlyWhenPending = false); - void CheckConsistency (void) const; + void CheckConsistency() const; }; } } } // end of namespace ::sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx index 5c6f4ed494d4..18aad707f6c6 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx @@ -29,32 +29,32 @@ namespace sd { namespace slidesorter { namespace controller { class Properties { public: - Properties (void); - ~Properties (void); + Properties(); + ~Properties(); /** Call this method after receiving a VCLEVENT_APPLICATION_DATACHANGED event. */ - void HandleDataChangeEvent (void); + void HandleDataChangeEvent(); /** When this method returns <TRUE/> then the current slide is highlighted in the view. The default value is <FALSE/>. */ - bool IsHighlightCurrentSlide (void) const { return mbIsHighlightCurrentSlide;} + bool IsHighlightCurrentSlide() const { return mbIsHighlightCurrentSlide;} void SetHighlightCurrentSlide (const bool bIsHighlightCurrentSlide); /** When this method returns <TRUE/> then the selection is indicated in the view (typically by drawing rectangles around the selected slides.) The default value is <TRUE/>. */ - bool IsShowSelection (void) const { return mbIsShowSelection;} + bool IsShowSelection() const { return mbIsShowSelection;} void SetShowSelection (const bool bIsShowSelection); /** When this method returns <TRUE/> then the focusdselection is indicated in the view (typically by drawing dotted rectangles around the selected slides.) The default value is <TRUE/>. */ - bool IsShowFocus (void) const { return mbIsShowFocus;} + bool IsShowFocus() const { return mbIsShowFocus;} void SetShowFocus (const bool bIsShowFocus); /** When this method returns <TRUE/> then on a selection change the @@ -62,54 +62,54 @@ public: centered in the view. This can be used to center the current slide by selecting only the current slide. The default value is <FALSE/>. */ - bool IsCenterSelection (void) const { return mbIsCenterSelection;} + bool IsCenterSelection() const { return mbIsCenterSelection;} void SetCenterSelection (const bool bIsCenterSelection); /** When this mehod returns <TRUE/> then the view may try to change the visible area by scrolling it smoothly on the screen. Experimental. Default value is <FALSE/>. */ - bool IsSmoothSelectionScrolling (void) const { return mbIsSmoothSelectionScrolling;} + bool IsSmoothSelectionScrolling() const { return mbIsSmoothSelectionScrolling;} void SetSmoothSelectionScrolling (const bool bIsSmoothSelectionScrolling); /** When this method returns <TRUE/> then during a full screen presentation the previews in a slide sorter are not updated. Default value is <TRUE/>. */ - bool IsSuspendPreviewUpdatesDuringFullScreenPresentation (void) const { return mbIsSuspendPreviewUpdatesDuringFullScreenPresentation;} + bool IsSuspendPreviewUpdatesDuringFullScreenPresentation() const { return mbIsSuspendPreviewUpdatesDuringFullScreenPresentation;} void SetSuspendPreviewUpdatesDuringFullScreenPresentation (const bool bFlag); /** Return the background color. */ - Color GetBackgroundColor (void) const { return maBackgroundColor;} + Color GetBackgroundColor() const { return maBackgroundColor;} void SetBackgroundColor (const Color& rColor); /** Return the text color. */ - Color GetTextColor (void) const { return maTextColor;} + Color GetTextColor() const { return maTextColor;} void SetTextColor (const Color& rColor); /** Return the color in which selections are to be painted. */ - Color GetSelectionColor (void) const { return maSelectionColor;} + Color GetSelectionColor() const { return maSelectionColor;} void SetSelectionColor (const Color& rColor); /** Return the color used for highlighting e.g. the current slide. */ - Color GetHighlightColor (void) const { return maHighlightColor;} + Color GetHighlightColor() const { return maHighlightColor;} void SetHighlightColor (const Color& rColor); /** The UI can be set to be read only indepently from the model status. Used for instance in the presenter view. */ - bool IsUIReadOnly (void) const { return mbIsUIReadOnly;} + bool IsUIReadOnly() const { return mbIsUIReadOnly;} void SetUIReadOnly (const bool bIsUIReadOnly); /** The mouse over effect (and whether a mouse motion starts a multi selection or a drag-and-drop) can be triggered by just the preview area or the whole page object area. */ - bool IsOnlyPreviewTriggersMouseOver (void) const { return mbIsOnlyPreviewTriggersMouseOver;} + bool IsOnlyPreviewTriggersMouseOver() const { return mbIsOnlyPreviewTriggersMouseOver;} private: bool mbIsHighlightCurrentSlide; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx index 594a415d3784..ca039c316a4f 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx @@ -67,19 +67,19 @@ public: */ ScrollBarManager (SlideSorter& rSlideSorter); - ~ScrollBarManager (void); + ~ScrollBarManager(); /** Register listeners at the scroll bars. This method is called after startup of a new slide sorter object or after a reactivation of a slide sorter that for example is taken from a cache. */ - void Connect (void); + void Connect(); /** Remove listeners from the scroll bars. This method is called when the slide sorter is destroyed or when it is suspended, e.g. put into a cache for later reuse. */ - void Disconnect (void); + void Disconnect(); /** Set up the scroll bar, i.e. thumb size and position. Call this method when the content of the browser window changed, i.e. pages @@ -129,7 +129,7 @@ public: Returns 0 when the vertical scroll bar is not shown or does not exist, otherwise its width in pixel is returned. */ - int GetVerticalScrollBarWidth (void) const; + int GetVerticalScrollBarWidth() const; /** Return the height of the horizontal scroll bar, which--when shown--should be fixed in contrast to its width. @@ -137,7 +137,7 @@ public: Returns 0 when the vertical scroll bar is not shown or does not exist, otherwise its height in pixel is returned. */ - int GetHorizontalScrollBarHeight (void) const; + int GetHorizontalScrollBarHeight() const; /** Call this method to scroll a window while the mouse is in dragging a selection. If the mouse is near the window border or is outside the @@ -152,9 +152,9 @@ public: */ bool AutoScroll ( const Point& rMouseWindowPosition, - const ::boost::function<void(void)>& rAutoScrollFunctor); + const ::boost::function<void()>& rAutoScrollFunctor); - void StopAutoScroll (void); + void StopAutoScroll(); void clearAutoScrollFunctor(); @@ -215,7 +215,7 @@ private: */ SharedSdWindow mpContentWindow; - ::boost::function<void(void)> maAutoScrollFunctor; + ::boost::function<void()> maAutoScrollFunctor; void SetWindowOrigin ( double nHorizontalPosition, @@ -250,7 +250,7 @@ private: const Rectangle& rAvailableArea); void CalcAutoScrollOffset (const Point& rMouseWindowPosition); - bool RepeatAutoScroll (void); + bool RepeatAutoScroll(); DECL_LINK(HorizontalScrollBarHandler, ScrollBar*); DECL_LINK(VerticalScrollBarHandler, ScrollBar*); diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx index 6142fdf7f587..bc10d3b39618 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx @@ -55,13 +55,13 @@ public: virtual void Deactivate() SAL_OVERRIDE; /// Forward to the clipboard manager. - virtual void DoCut (void) SAL_OVERRIDE; + virtual void DoCut() SAL_OVERRIDE; /// Forward to the clipboard manager. - virtual void DoCopy (void) SAL_OVERRIDE; + virtual void DoCopy() SAL_OVERRIDE; /// Forward to the clipboard manager. - virtual void DoPaste (void) SAL_OVERRIDE; + virtual void DoPaste() SAL_OVERRIDE; /** is called when the current function should be aborted. <p> This is used when a function gets a KEY_ESCAPE but can also @@ -78,12 +78,12 @@ public: /** Turn of substitution display and insertion indicator. */ - void NotifyDragFinished (void); + void NotifyDragFinished(); /** Call when drag-and-drop or multi selection is started or stopped in order to update permission of mouse over indication. */ - void UpdateMouseOverIndicationPermission (void); + void UpdateMouseOverIndicationPermission(); class EventDescriptor; class ModeHandler; @@ -95,17 +95,17 @@ public: DragAndDropMode, ButtonMode }; - void SwitchToNormalMode (void); + void SwitchToNormalMode(); void SwitchToDragAndDropMode(const Point& rMousePosition); void SwitchToMultiSelectionMode (const Point& rMousePosition, const sal_uInt32 nEventCode); - void ResetShiftKeySelectionAnchor (void); + void ResetShiftKeySelectionAnchor(); /** Special case handling for when the context menu is hidden. This method will reinitialize the current mouse position to prevent the mouse motion during the time the context menu is displayed from being interpreted as drag-and-drop start. */ - void ResetMouseAnchor (void); + void ResetMouseAnchor(); protected: SlideSorter& mrSlideSorter; @@ -172,7 +172,7 @@ private: const bool bIsShiftDown, const bool bIsControlDown); - void StopDragAndDrop (void); + void StopDragAndDrop(); void SwitchMode (const ::boost::shared_ptr<ModeHandler>& rpHandler); }; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx index 5d5f235fa63e..1d63ead4c585 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx @@ -53,7 +53,7 @@ public: */ SelectionManager (SlideSorter& rSlideSorter); - ~SelectionManager (void); + ~SelectionManager(); /** Delete the currently selected slides. When this method returns the selection is empty. @@ -96,14 +96,14 @@ public: position of the associated insertion marker is stored here and reset the next time the selection changes. */ - sal_Int32 GetInsertionPosition (void) const; + sal_Int32 GetInsertionPosition() const; /** Store an insertion position temporarily. It is reset when the selection changes the next time. */ void SetInsertionPosition (const sal_Int32 nInsertionPosition); - ::boost::shared_ptr<SelectionObserver> GetSelectionObserver (void) const { return mpSelectionObserver;} + ::boost::shared_ptr<SelectionObserver> GetSelectionObserver() const { return mpSelectionObserver;} private: SlideSorter& mrSlideSorter; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx index 30079a495cbd..6cbeb2804795 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx @@ -41,12 +41,12 @@ class SelectionObserver { public: SelectionObserver (SlideSorter& rSlideSorter); - virtual ~SelectionObserver (void); + virtual ~SelectionObserver(); void NotifyPageEvent (const SdrPage* pPage); - void StartObservation (void); - void AbortObservation (void); - void EndObservation (void); + void StartObservation(); + void AbortObservation(); + void EndObservation(); /** Use this little class instead of calling StartObservation and EndObservation directly so that EndObservation is not forgotten or @@ -57,8 +57,8 @@ public: { public: Context (SlideSorter& rSlideSorter); - ~Context(void); - void Abort (void); + ~Context(); + void Abort(); private: ::boost::shared_ptr<SelectionObserver> mpSelectionObserver; }; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx index b8841a798465..e9db2ce099d7 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx @@ -48,7 +48,7 @@ public: */ SlotManager (SlideSorter& rSlideSorter); - ~SlotManager (void); + ~SlotManager(); void FuTemporary (SfxRequest& rRequest); void FuPermanent (SfxRequest& rRequest); @@ -72,7 +72,7 @@ public: /** Call this after a change from normal mode to master mode or back. The affected slots are invalidated. */ - void NotifyEditModeChange (void); + void NotifyEditModeChange(); private: /// The controller for which we manage the slot calls. @@ -88,7 +88,7 @@ private: /** The implementation is a copy of the code for SID_RENAMEPAGE in drviews2.cxx. */ - void RenameSlide (void); + void RenameSlide(); DECL_LINK(RenameSlideHdl, AbstractSvxNameDialog*); bool RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const OUString& rName); @@ -101,7 +101,7 @@ private: /** Use one of several ways to determine where to insert a new page. This can be the current selection or the insertion indicator. */ - sal_Int32 GetInsertionPosition (void); + sal_Int32 GetInsertionPosition(); }; } } } // end of namespace ::sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx index 57d51f28ed2e..1e60ac843b4a 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx @@ -67,13 +67,13 @@ public: TransferableData ( SlideSorterViewShell* pViewShell, const ::std::vector<TransferableData::Representative>& rRepresentatives); - virtual ~TransferableData (void); + virtual ~TransferableData(); - const ::std::vector<Representative>& GetRepresentatives (void) const { return maRepresentatives;} + const ::std::vector<Representative>& GetRepresentatives() const { return maRepresentatives;} /** Return the view shell for which the transferable was created. */ - SlideSorterViewShell* GetSourceViewShell (void) const { return mpViewShell;} + SlideSorterViewShell* GetSourceViewShell() const { return mpViewShell;} private: SlideSorterViewShell* mpViewShell; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx index b062c7a494c8..56e21137732d 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx @@ -34,18 +34,18 @@ class VisibleAreaManager { public: VisibleAreaManager (SlideSorter& rSlideSorter); - ~VisibleAreaManager (void); + ~VisibleAreaManager(); - void ActivateCurrentSlideTracking (void); - void DeactivateCurrentSlideTracking (void); - bool IsCurrentSlideTrackingActive (void) const { return mbIsCurrentSlideTrackingActive;} + void ActivateCurrentSlideTracking(); + void DeactivateCurrentSlideTracking(); + bool IsCurrentSlideTrackingActive() const { return mbIsCurrentSlideTrackingActive;} /** Request the current slide to be moved into the visible area. This request is only obeyed when the current slide tracking is active. @see ActivateCurrentSlideTracking() and DeactivateCurrentSlideTracking() */ - void RequestCurrentSlideVisible (void); + void RequestCurrentSlideVisible(); /** Request to make the specified page object visible. */ @@ -59,7 +59,7 @@ public: { public: TemporaryDisabler (SlideSorter& rSlideSorter); - ~TemporaryDisabler (void); + ~TemporaryDisabler(); private: VisibleAreaManager& mrVisibleAreaManager; }; @@ -82,8 +82,8 @@ private: bool mbIsCurrentSlideTrackingActive; int mnDisableCount; - void MakeVisible (void); - ::boost::optional<Point> GetRequestedTopLeft (void) const; + void MakeVisible(); + ::boost::optional<Point> GetRequestedTopLeft() const; }; } } } // end of namespace ::sd::slidesorter::view diff --git a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx index c5a2e73392d5..c963b76a08a0 100644 --- a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx @@ -55,13 +55,13 @@ class SlideSorterModel public: SlideSorterModel (SlideSorter& rSlideSorter); - virtual ~SlideSorterModel (void); - void Dispose (void); + virtual ~SlideSorterModel(); + void Dispose(); /** This method is present to let the view create a ShowView for displaying slides. */ - SdDrawDocument* GetDocument (void); + SdDrawDocument* GetDocument(); /** Set a new edit mode and return whether the edit mode really has been changed. When the edit mode is changed then the @@ -76,16 +76,16 @@ public: /** Set the edit mode to that currently used by the controller. */ - bool SetEditModeFromController (void); - EditMode GetEditMode (void) const { return meEditMode;} - PageKind GetPageType (void) const { return mePageKind;} + bool SetEditModeFromController(); + EditMode GetEditMode() const { return meEditMode;} + PageKind GetPageType() const { return mePageKind;} /** Return the number of slides in the document regardless of whether they are visible or not or whether they are hidden or not. The number of slides depends on the set of slides available through the XIndexAccess given to SetDocumentSlides(). */ - sal_Int32 GetPageCount (void) const; + sal_Int32 GetPageCount() const; /** Return a page descriptor for the page with the specified index. Page descriptors are created on demand. The page descriptor is @@ -145,26 +145,26 @@ public: is especially important for previews of complex pages that take some time to create. */ - void Resync (void); + void Resync(); /** Delete all descriptors that currently are in the container. The size of the container, however, is not altered. Use the AdaptSize method for that. */ - void ClearDescriptorList (void); + void ClearDescriptorList(); /** Set the selection of the document to exactly that of the called model. */ - void SynchronizeDocumentSelection (void); + void SynchronizeDocumentSelection(); /** Set the selection of the called model to exactly that of the document. */ - void SynchronizeModelSelection (void); + void SynchronizeModelSelection(); /** Return the mutex so that the caller can lock it and then safely access the model. */ - ::osl::Mutex& GetMutex (void) { return maMutex;} + ::osl::Mutex& GetMutex() { return maMutex;} /** Set the XIndexAccess from which the called SlideSorterModel takes its pages. @@ -177,20 +177,20 @@ public: /** Return the set of pages that is currently displayed by the slide sorter. */ - css::uno::Reference<css::container::XIndexAccess> GetDocumentSlides (void) const; + css::uno::Reference<css::container::XIndexAccess> GetDocumentSlides() const; /** This method is called when the edit mode has changed. It calls SetDocumentSlides() with the set of slides or master pages obtained from the model of the XController. */ - void UpdatePageList (void); + void UpdatePageList(); - bool IsReadOnly (void) const; + bool IsReadOnly() const; /** The current selection is saved by copying the ST_Selected state into ST_WasSelected for slides. */ - void SaveCurrentSelection (void); + void SaveCurrentSelection(); /** The current selection is restored from the ST_WasSelected state from the slides. @@ -198,7 +198,7 @@ public: The returned region has to be repainted to reflect the updated selection states. */ - ::vcl::Region RestoreSelection (void); + ::vcl::Region RestoreSelection(); /** Typically called from controller::Listener this method handles the insertion and deletion of single pages. @@ -220,7 +220,7 @@ private: /** Resize the descriptor container according to current values of page kind and edit mode. */ - void AdaptSize (void); + void AdaptSize(); SdPage* GetPage (const sal_Int32 nCoreIndex) const; void InsertSlide (SdPage* pPage); diff --git a/sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx b/sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx index b66a41285d08..5e6f681f23a1 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx @@ -33,12 +33,12 @@ class Enumeration public: virtual ~Enumeration() {} - virtual bool HasMoreElements (void) const = 0; + virtual bool HasMoreElements() const = 0; /** Returns T instead of T& so that it can handle shared pointers. */ - virtual T GetNextElement (void) = 0; - virtual void Rewind (void) = 0; - virtual ::std::unique_ptr<Enumeration<T> > Clone (void) = 0; + virtual T GetNextElement() = 0; + virtual void Rewind() = 0; + virtual ::std::unique_ptr<Enumeration<T> > Clone() = 0; }; } } } // end of namespace ::sd::slidesorter::model diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx index 3638af33dd86..412971e995c6 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx @@ -64,26 +64,26 @@ public: SdPage* pPage, const sal_Int32 nIndex); - ~PageDescriptor (void); + ~PageDescriptor(); /** Return the page that is represented by the descriptor as SdPage pointer . */ - SdPage* GetPage (void) const { return mpPage;} + SdPage* GetPage() const { return mpPage;} /** Return the page that is represented by the descriptor as XDrawPage reference. */ - css::uno::Reference<css::drawing::XDrawPage> GetXDrawPage (void) const { return mxPage;} + css::uno::Reference<css::drawing::XDrawPage> GetXDrawPage() const { return mxPage;} /** Returns the index of the page as it is displayed in the view as page number. The value may differ from the index returned by the XDrawPage when there are hidden slides and the XIndexAccess used to access the model filters them out. */ - sal_Int32 GetPageIndex (void) const { return mnIndex;} + sal_Int32 GetPageIndex() const { return mnIndex;} void SetPageIndex (const sal_Int32 nIndex); - bool UpdateMasterPage (void); - bool UpdateTransitionFlag (void); + bool UpdateMasterPage(); + bool UpdateTransitionFlag(); enum State { ST_Visible, ST_Selected, ST_WasSelected, ST_Focused, ST_MouseOver, ST_Current, ST_Excluded }; @@ -101,16 +101,16 @@ public: returned. When they were the same this method returns <FALSE/>. */ - bool GetCoreSelection (void); + bool GetCoreSelection(); /** Set the selection flags of the SdPage objects to the corresponding selection states of the page descriptors. */ - void SetCoreSelection (void); + void SetCoreSelection(); - VisualState& GetVisualState (void) { return maVisualState;} + VisualState& GetVisualState() { return maVisualState;} - Rectangle GetBoundingBox (void) const; + Rectangle GetBoundingBox() const; Point GetLocation (const bool bIgnoreLocation = false) const; void SetBoundingBox (const Rectangle& rBoundingBox); diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx index 959f9276dad9..247bfe25a515 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx @@ -80,26 +80,26 @@ public: /** Create and return an exact copy of the called object. */ - virtual ::std::unique_ptr<Enumeration<SharedPageDescriptor> > Clone (void) SAL_OVERRIDE; + virtual ::std::unique_ptr<Enumeration<SharedPageDescriptor> > Clone() SAL_OVERRIDE; PageEnumeration& operator= (const PageEnumeration& rEnumeration); /** Return <TRUE/> when the enumeration has more elements, i.e. it is save to call GetNextElement() at least one more time. */ - virtual bool HasMoreElements (void) const SAL_OVERRIDE; + virtual bool HasMoreElements() const SAL_OVERRIDE; /** Return the next element of the enumeration. Call the HasMoreElements() before to make sure that there exists at least one more element. Calling this method with HasMoreElements() returning <FALSE/> is an error. */ - virtual SharedPageDescriptor GetNextElement (void) SAL_OVERRIDE; + virtual SharedPageDescriptor GetNextElement() SAL_OVERRIDE; /** Rewind the enumeration so that the next call to GetNextElement() will return its first element. */ - virtual void Rewind (void) SAL_OVERRIDE; + virtual void Rewind() SAL_OVERRIDE; private: /// Implementation object. @@ -111,7 +111,7 @@ private: PageEnumeration (::std::unique_ptr<Enumeration<SharedPageDescriptor> > && pImpl); // Default constructor not implemented. - PageEnumeration (void); + PageEnumeration(); }; } } } // end of namespace ::sd::slidesorter::model diff --git a/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx b/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx index de9ef2103fba..0df22fa48819 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx @@ -42,13 +42,13 @@ public: VS_None }; VisualState (const sal_Int32 nPageId); - ~VisualState (void); + ~VisualState(); void SetVisualState (const State eState); void UpdateVisualState (const PageDescriptor& rDescriptor); - Point GetLocationOffset (void) const { return maLocationOffset;} + Point GetLocationOffset() const { return maLocationOffset;} bool SetLocationOffset (const Point& rPoint); sal_Int32 mnPageId; // For debugging diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx index e9ac85896ea0..88402e727395 100644 --- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx @@ -74,23 +74,23 @@ public: */ SlideSorterView (SlideSorter& rSlideSorter); - void Init (void); + void Init(); - virtual ~SlideSorterView (void); - void Dispose (void); + virtual ~SlideSorterView(); + void Dispose(); /** Set the general way of layouting the page objects. Note that this method does not trigger any repaints or layouts. */ bool SetOrientation (const Layouter::Orientation eOrientation); - Layouter::Orientation GetOrientation (void) const { return meOrientation;} + Layouter::Orientation GetOrientation() const { return meOrientation;} - void RequestRepaint (void); + void RequestRepaint(); void RequestRepaint (const model::SharedPageDescriptor& rDescriptor); void RequestRepaint (const Rectangle& rRepaintBox); void RequestRepaint (const ::vcl::Region& rRepaintRegion); - Rectangle GetModelArea (void); + Rectangle GetModelArea(); /** Return the index of the page that is rendered at the given position. @param rPosition @@ -101,9 +101,9 @@ public: */ sal_Int32 GetPageIndexAtPoint (const Point& rPosition) const; - view::Layouter& GetLayouter (void); + view::Layouter& GetLayouter(); - virtual void ModelHasChanged (void) SAL_OVERRIDE; + virtual void ModelHasChanged() SAL_OVERRIDE; /** This method is typically called before a model change takes place. All references to model data are released. PostModelChange() has to @@ -111,22 +111,22 @@ public: calls to Pre- and PostModelChange() are very close to each other you may call HandleModelChange() instead. */ - void PreModelChange (void); + void PreModelChange(); /** This method is typically called after a model change took place. References to model data are re-allocated. Call this method only after PreModelChange() has been called. */ - void PostModelChange (void); + void PostModelChange(); /** This method is a convenience function that simply calls PreModelChange() and then PostModelChange(). */ - void HandleModelChange (void); + void HandleModelChange(); - void HandleDrawModeChange (void); + void HandleDrawModeChange(); - void Resize (void); + void Resize(); virtual void CompleteRedraw ( OutputDevice* pDevice, const ::vcl::Region& rPaintArea, @@ -137,19 +137,19 @@ public: utl::ConfigurationBroadcaster* pBroadcaster, sal_uInt32 nHint) SAL_OVERRIDE; - void HandleDataChangeEvent (void); + void HandleDataChangeEvent(); - void Layout (void); + void Layout(); /** This tells the view that it has to re-determine the visibility of the page objects before painting them the next time. */ - void InvalidatePageObjectVisibilities (void); + void InvalidatePageObjectVisibilities(); /** Return the window to which this view renders its output. */ - // ::boost::shared_ptr<sd::Window> GetWindow (void) const; + // ::boost::shared_ptr<sd::Window> GetWindow() const; - ::boost::shared_ptr<cache::PageCache> GetPreviewCache (void); + ::boost::shared_ptr<cache::PageCache> GetPreviewCache(); /** Set the bounding box of the insertion marker in model coordinates. @@ -177,7 +177,7 @@ public: The returned pair of page object indices is empty when the second index is lower than the first. */ - Pair GetVisiblePageRange (void); + Pair GetVisiblePageRange(); /** Add a shape to the page. Typically used from inside PostModelChange(). @@ -211,26 +211,26 @@ public: const model::PageDescriptor::State eState, const bool bStateValue); - void UpdateOrientation (void); + void UpdateOrientation(); - ::boost::shared_ptr<PageObjectPainter> GetPageObjectPainter (void); - ::boost::shared_ptr<LayeredDevice> GetLayeredDevice (void) const { return mpLayeredDevice;} + ::boost::shared_ptr<PageObjectPainter> GetPageObjectPainter(); + ::boost::shared_ptr<LayeredDevice> GetLayeredDevice() const { return mpLayeredDevice;} class DrawLock { public: DrawLock (SlideSorter& rSlideSorter); - ~DrawLock (void); + ~DrawLock(); /** When the DrawLock is disposed then it will not request a repaint on destruction. */ - void Dispose (void); + void Dispose(); private: view::SlideSorterView& mrView; SharedSdWindow mpWindow; }; - ToolTip& GetToolTip (void) const; + ToolTip& GetToolTip() const; virtual void DragFinished (sal_Int8 nDropAction) SAL_OVERRIDE; @@ -263,11 +263,11 @@ private: /** Determine the visibility of all page objects. */ - void DeterminePageObjectVisibilities (void); + void DeterminePageObjectVisibilities(); - void UpdatePreciousFlags (void); - void RequestRearrange (void); - void Rearrange (void); + void UpdatePreciousFlags(); + void RequestRearrange(); + void Rearrange(); }; } } } // end of namespace ::sd::slidesorter::view diff --git a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx index d901f8353a71..6f51d058ea84 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx @@ -41,14 +41,14 @@ public: /** Return the single instance of this class. Throws a RuntimeException when no instance can be created. */ - static FontProvider& Instance (void); + static FontProvider& Instance(); /** Call this method to tell an object to release its currently used font. The next call to GetFont() will then create a new one. Typically called after a DataChange event when for instance a system font has been modified. */ - void Invalidate (void); + void Invalidate(); private: static FontProvider* mpInstance; @@ -62,8 +62,8 @@ private: */ MapMode maMapMode; - FontProvider (void); - virtual ~FontProvider (void); + FontProvider(); + virtual ~FontProvider(); FontProvider (const FontProvider&) SAL_DELETED_FUNCTION; FontProvider& operator= (const FontProvider&) SAL_DELETED_FUNCTION; diff --git a/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx b/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx index 6424c027232c..5f604726a172 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx @@ -54,7 +54,7 @@ class InsertionIndicatorOverlay { public: InsertionIndicatorOverlay (SlideSorter& rSlideSorter); - virtual ~InsertionIndicatorOverlay (void); + virtual ~InsertionIndicatorOverlay(); virtual void SetLayerInvalidator (const SharedILayerInvalidator& rpInvalidator) SAL_OVERRIDE; @@ -66,17 +66,17 @@ public: */ void SetLocation (const Point& rPosition); - Size GetSize (void) const; + Size GetSize() const; virtual void Paint ( OutputDevice& rDevice, const Rectangle& rRepaintArea) SAL_OVERRIDE; - bool IsVisible (void) const { return mbIsVisible;} - void Hide (void); - void Show (void); + bool IsVisible() const { return mbIsVisible;} + void Hide(); + void Show(); - Rectangle GetBoundingBox (void) const; + Rectangle GetBoundingBox() const; private: SlideSorter& mrSlideSorter; diff --git a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx index 4402129fc36f..eeba70945715 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx @@ -66,9 +66,9 @@ public: Layouter ( const SharedSdWindow& rpWindow, const ::boost::shared_ptr<Theme>& rpTheme); - ~Layouter (void); + ~Layouter(); - ::boost::shared_ptr<PageObjectLayouter> GetPageObjectLayouter (void) const; + ::boost::shared_ptr<PageObjectLayouter> GetPageObjectLayouter() const; /** Set the interval of valid column counts. When nMinimalColumnCount <= nMaximalColumnCount is not fulfilled then the call is ignored. @param nMinimalColumnCount @@ -107,16 +107,16 @@ public: /** Return the number of columns. */ - sal_Int32 GetColumnCount (void) const; + sal_Int32 GetColumnCount() const; sal_Int32 GetIndex (const sal_Int32 nRow, const sal_Int32 nColumn) const; /** Return the scale factor that can be set at the map mode of the output window. */ - Fraction GetScaleFactor (void) const; + Fraction GetScaleFactor() const; - Size GetPageObjectSize (void) const; + Size GetPageObjectSize() const; /** Return the bounding box in window coordinates of the nIndex-th page object. @@ -128,7 +128,7 @@ public: /** Return the bounding box in model coordinates of the page that contains the given amount of page objects. */ - Rectangle GetTotalBoundingBox (void) const; + Rectangle GetTotalBoundingBox() const; /** Return the index of the first fully or partially visible page object. This takes into account only the vertical dimension. @@ -185,8 +185,8 @@ public: const Size& rIndicatorSize, model::SlideSorterModel& rModel) const; - Range GetValidHorizontalSizeRange (void) const; - Range GetValidVerticalSizeRange (void) const; + Range GetValidHorizontalSizeRange() const; + Range GetValidVerticalSizeRange() const; class Implementation; @@ -201,7 +201,7 @@ private: class InsertPosition { public: - InsertPosition (void); + InsertPosition(); InsertPosition& operator= (const InsertPosition& rInsertPosition); bool operator== (const InsertPosition& rInsertPosition) const; bool operator!= (const InsertPosition& rInsertPosition) const; @@ -218,15 +218,15 @@ public: const Point& rLeadingOffset, const Point& rTrailingOffset); - sal_Int32 GetRow (void) const { return mnRow; } - sal_Int32 GetColumn (void) const { return mnColumn; } - sal_Int32 GetIndex (void) const { return mnIndex; } - Point GetLocation (void) const { return maLocation; } - Point GetLeadingOffset (void) const { return maLeadingOffset; } - Point GetTrailingOffset (void) const { return maTrailingOffset; } - bool IsAtRunStart (void) const { return mbIsAtRunStart; } - bool IsAtRunEnd (void) const { return mbIsAtRunEnd; } - bool IsExtraSpaceNeeded (void) const { return mbIsExtraSpaceNeeded; } + sal_Int32 GetRow() const { return mnRow; } + sal_Int32 GetColumn() const { return mnColumn; } + sal_Int32 GetIndex() const { return mnIndex; } + Point GetLocation() const { return maLocation; } + Point GetLeadingOffset() const { return maLeadingOffset; } + Point GetTrailingOffset() const { return maTrailingOffset; } + bool IsAtRunStart() const { return mbIsAtRunStart; } + bool IsAtRunEnd() const { return mbIsAtRunEnd; } + bool IsExtraSpaceNeeded() const { return mbIsExtraSpaceNeeded; } private: sal_Int32 mnRow; diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx index 56d38036cf46..426e36c830fb 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx @@ -50,7 +50,7 @@ public: const Size& rPreviewModelSize, const SharedSdWindow& rpWindow, const sal_Int32 nPageCount); - ~PageObjectLayouter(void); + ~PageObjectLayouter(); enum Part { // The focus indicator is painted outside the actual page object. @@ -115,8 +115,8 @@ public: /// the maximum size of each tile, also position independent Size GetGridMaxSize(const CoordinateSystem eCoordinateSystem); - Image GetTransitionEffectIcon (void) const { return maTransitionEffectIcon;} - Image GetCustomAnimationEffectIcon (void) const { return maCustomAnimationEffectIcon;} + Image GetTransitionEffectIcon() const { return maTransitionEffectIcon;} + Image GetCustomAnimationEffectIcon() const { return maCustomAnimationEffectIcon;} private: Rectangle GetBoundingBox ( diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx index de7d76f5fb9e..4058c063dddb 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx @@ -40,7 +40,7 @@ class PageObjectPainter { public: PageObjectPainter (const SlideSorter& rSlideSorter); - ~PageObjectPainter (void); + ~PageObjectPainter(); void PaintPageObject ( OutputDevice& rDevice, @@ -124,7 +124,7 @@ private: one owned by the general layouter. Return <TRUE/> when after the call we have a valid page object layouter. */ - bool UpdatePageObjectLayouter (void); + bool UpdatePageObjectLayouter(); }; } } } // end of namespace sd::slidesorter::view diff --git a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx index 58666fb8a7b9..568086a58b88 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx @@ -52,7 +52,7 @@ public: void Update ( const ::boost::shared_ptr<controller::Properties>& rpProperties); - // BitmapEx GetInsertIndicatorIcon (void) const; + // BitmapEx GetInsertIndicatorIcon() const; enum FontType { Font_PageNumber, diff --git a/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx b/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx index ab04aba70efe..c24484b0c3cd 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx @@ -35,7 +35,7 @@ class ToolTip { public: ToolTip (SlideSorter& rSlideSorter); - ~ToolTip (void); + ~ToolTip(); /** Set a new page. This modifies the default help text. After a page change a timer is started to delay the display of the tool tip for @@ -50,7 +50,7 @@ public: Returns whether the tool tip was visible at the time this method was called. */ - bool Hide (void); + bool Hide(); private: SlideSorter& mrSlideSorter; @@ -66,7 +66,7 @@ private: is shown after a short delay. */ void Show (const bool bForce); - void DoShow (void); + void DoShow(); DECL_LINK(DelayTrigger, void*); }; diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx index 8d0c14be2c43..9a02c8870196 100644 --- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx +++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx @@ -110,17 +110,17 @@ SlideSorterModel::SlideSorterModel (SlideSorter& rSlideSorter) { } -SlideSorterModel::~SlideSorterModel (void) +SlideSorterModel::~SlideSorterModel() { ClearDescriptorList (); } -void SlideSorterModel::Dispose (void) +void SlideSorterModel::Dispose() { ClearDescriptorList (); } -SdDrawDocument* SlideSorterModel::GetDocument (void) +SdDrawDocument* SlideSorterModel::GetDocument() { if (mrSlideSorter.GetViewShellBase() != NULL) return mrSlideSorter.GetViewShellBase()->GetDocument(); @@ -140,7 +140,7 @@ bool SlideSorterModel::SetEditMode (EditMode eEditMode) return bEditModeChanged; } -sal_Int32 SlideSorterModel::GetPageCount (void) const +sal_Int32 SlideSorterModel::GetPageCount() const { return maPageDescriptors.size(); } @@ -273,7 +273,7 @@ sal_uInt16 SlideSorterModel::GetCoreIndex (const sal_Int32 nIndex) const document: pages may have been deleted and others may have been created at the exact same memory locations. */ -void SlideSorterModel::Resync (void) +void SlideSorterModel::Resync() { ::osl::MutexGuard aGuard (maMutex); @@ -311,7 +311,7 @@ void SlideSorterModel::Resync (void) CheckModel(*this); } -void SlideSorterModel::ClearDescriptorList (void) +void SlideSorterModel::ClearDescriptorList() { DescriptorContainer aDescriptors; @@ -340,7 +340,7 @@ void SlideSorterModel::ClearDescriptorList (void) } } -void SlideSorterModel::SynchronizeDocumentSelection (void) +void SlideSorterModel::SynchronizeDocumentSelection() { ::osl::MutexGuard aGuard (maMutex); @@ -353,7 +353,7 @@ void SlideSorterModel::SynchronizeDocumentSelection (void) } } -void SlideSorterModel::SynchronizeModelSelection (void) +void SlideSorterModel::SynchronizeModelSelection() { ::osl::MutexGuard aGuard (maMutex); @@ -423,13 +423,13 @@ void SlideSorterModel::SetDocumentSlides ( mrSlideSorter.GetController().GetSlotManager()->NotifyEditModeChange(); } -Reference<container::XIndexAccess> SlideSorterModel::GetDocumentSlides (void) const +Reference<container::XIndexAccess> SlideSorterModel::GetDocumentSlides() const { ::osl::MutexGuard aGuard (maMutex); return mxSlides; } -void SlideSorterModel::UpdatePageList (void) +void SlideSorterModel::UpdatePageList() { ::osl::MutexGuard aGuard (maMutex); @@ -475,7 +475,7 @@ void SlideSorterModel::UpdatePageList (void) mrSlideSorter.GetController().SetDocumentSlides(xPages); } -void SlideSorterModel::AdaptSize (void) +void SlideSorterModel::AdaptSize() { if (mxSlides.is()) maPageDescriptors.resize(mxSlides->getCount()); @@ -483,7 +483,7 @@ void SlideSorterModel::AdaptSize (void) maPageDescriptors.resize(0); } -bool SlideSorterModel::IsReadOnly (void) const +bool SlideSorterModel::IsReadOnly() const { if (mrSlideSorter.GetViewShellBase() != NULL && mrSlideSorter.GetViewShellBase()->GetDocShell()) @@ -492,7 +492,7 @@ bool SlideSorterModel::IsReadOnly (void) const return true; } -void SlideSorterModel::SaveCurrentSelection (void) +void SlideSorterModel::SaveCurrentSelection() { PageEnumeration aPages (PageEnumerationProvider::CreateAllPagesEnumeration(*this)); while (aPages.HasMoreElements()) @@ -504,7 +504,7 @@ void SlideSorterModel::SaveCurrentSelection (void) } } -vcl::Region SlideSorterModel::RestoreSelection (void) +vcl::Region SlideSorterModel::RestoreSelection() { vcl::Region aRepaintRegion; PageEnumeration aPages (PageEnumerationProvider::CreateAllPagesEnumeration(*this)); diff --git a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx index e8e377c7e026..e84b4cd22eb5 100644 --- a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx +++ b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx @@ -61,7 +61,7 @@ PageDescriptor::PageDescriptor ( } } -PageDescriptor::~PageDescriptor (void) +PageDescriptor::~PageDescriptor() { } @@ -71,7 +71,7 @@ void PageDescriptor::SetPageIndex (const sal_Int32 nNewIndex) maVisualState.mnPageId = nNewIndex; } -bool PageDescriptor::UpdateMasterPage (void) +bool PageDescriptor::UpdateMasterPage() { const SdrPage* pMaster = NULL; if (mpPage!=NULL && mpPage->TRG_HasMasterPage()) @@ -85,7 +85,7 @@ bool PageDescriptor::UpdateMasterPage (void) return false; } -bool PageDescriptor::UpdateTransitionFlag (void) +bool PageDescriptor::UpdateTransitionFlag() { bool bHasSlideTransition (false); if (mpPage != NULL) @@ -188,7 +188,7 @@ bool PageDescriptor::SetState (const State eState, const bool bNewStateValue) return bModified; } -bool PageDescriptor::GetCoreSelection (void) +bool PageDescriptor::GetCoreSelection() { if (mpPage!=NULL && mpPage->IsSelected() != mbIsSelected) return SetState(ST_Selected, !mbIsSelected); @@ -196,7 +196,7 @@ bool PageDescriptor::GetCoreSelection (void) return false; } -void PageDescriptor::SetCoreSelection (void) +void PageDescriptor::SetCoreSelection() { if (mpPage != NULL) if (HasState(ST_Selected)) @@ -209,7 +209,7 @@ void PageDescriptor::SetCoreSelection (void) } } -Rectangle PageDescriptor::GetBoundingBox (void) const +Rectangle PageDescriptor::GetBoundingBox() const { Rectangle aBox (maBoundingBox); const Point aOffset (maVisualState.GetLocationOffset()); diff --git a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx index b769ce736919..2292ec75ef32 100644 --- a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx +++ b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx @@ -38,14 +38,14 @@ public: inline PageEnumerationImpl ( const SlideSorterModel& rModel, const PageEnumeration::PagePredicate& rPredicate); - virtual ~PageEnumerationImpl (void); + virtual ~PageEnumerationImpl(); /** Create a copy of the called enumeration object. */ - virtual ::std::unique_ptr<Enumeration<SharedPageDescriptor> > Clone (void) SAL_OVERRIDE; + virtual ::std::unique_ptr<Enumeration<SharedPageDescriptor> > Clone() SAL_OVERRIDE; - virtual bool HasMoreElements (void) const SAL_OVERRIDE; - virtual SharedPageDescriptor GetNextElement (void) SAL_OVERRIDE; - virtual void Rewind (void) SAL_OVERRIDE; + virtual bool HasMoreElements() const SAL_OVERRIDE; + virtual SharedPageDescriptor GetNextElement() SAL_OVERRIDE; + virtual void Rewind() SAL_OVERRIDE; private: const SlideSorterModel& mrModel; @@ -64,7 +64,7 @@ private: /** Skip all elements that do not fulfill Predicate starting with the one pointed to by mnIndex. */ - inline void AdvanceToNextValidElement (void); + inline void AdvanceToNextValidElement(); }; } // end of anonymouse namespace @@ -106,7 +106,7 @@ PageEnumeration::PageEnumeration (const PageEnumeration& rEnumeration ) mpImpl = rEnumeration.mpImpl->Clone(); } -PageEnumeration::~PageEnumeration (void) +PageEnumeration::~PageEnumeration() { } @@ -117,23 +117,23 @@ PageEnumeration& PageEnumeration::operator= ( return *this; } -::std::unique_ptr<Enumeration<SharedPageDescriptor> > PageEnumeration::Clone (void) +::std::unique_ptr<Enumeration<SharedPageDescriptor> > PageEnumeration::Clone() { return ::std::unique_ptr<Enumeration<SharedPageDescriptor> >( new PageEnumeration (*this, true)); } -bool PageEnumeration::HasMoreElements (void) const +bool PageEnumeration::HasMoreElements() const { return mpImpl->HasMoreElements(); } -SharedPageDescriptor PageEnumeration::GetNextElement (void) +SharedPageDescriptor PageEnumeration::GetNextElement() { return mpImpl->GetNextElement(); } -void PageEnumeration::Rewind (void) +void PageEnumeration::Rewind() { return mpImpl->Rewind(); } @@ -162,23 +162,23 @@ PageEnumerationImpl::PageEnumerationImpl ( { } -PageEnumerationImpl::~PageEnumerationImpl (void) +PageEnumerationImpl::~PageEnumerationImpl() { } ::std::unique_ptr<Enumeration<SharedPageDescriptor> > - PageEnumerationImpl::Clone (void) + PageEnumerationImpl::Clone() { return ::std::unique_ptr<Enumeration<SharedPageDescriptor> >( new PageEnumerationImpl(mrModel,maPredicate,mnIndex)); } -bool PageEnumerationImpl::HasMoreElements (void) const +bool PageEnumerationImpl::HasMoreElements() const { return (mnIndex < mrModel.GetPageCount()); } -SharedPageDescriptor PageEnumerationImpl::GetNextElement (void) +SharedPageDescriptor PageEnumerationImpl::GetNextElement() { SharedPageDescriptor pDescriptor (mrModel.GetPageDescriptor(mnIndex)); @@ -189,14 +189,14 @@ SharedPageDescriptor PageEnumerationImpl::GetNextElement (void) return pDescriptor; } -void PageEnumerationImpl::Rewind (void) +void PageEnumerationImpl::Rewind() { // Go to first valid element. mnIndex = 0; AdvanceToNextValidElement(); } -void PageEnumerationImpl::AdvanceToNextValidElement (void) +void PageEnumerationImpl::AdvanceToNextValidElement() { while (mnIndex < mrModel.GetPageCount()) { diff --git a/sd/source/ui/slidesorter/model/SlsVisualState.cxx b/sd/source/ui/slidesorter/model/SlsVisualState.cxx index ef3a58708723..9accd0e2336c 100644 --- a/sd/source/ui/slidesorter/model/SlsVisualState.cxx +++ b/sd/source/ui/slidesorter/model/SlsVisualState.cxx @@ -33,7 +33,7 @@ VisualState::VisualState (const sal_Int32 nPageId) { } -VisualState::~VisualState (void) +VisualState::~VisualState() { if (mnStateAnimationId != controller::Animator::NotAnAnimationId || mnLocationAnimationId != controller::Animator::NotAnAnimationId) diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx index 9790dbc33b18..a49035773b2b 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx @@ -51,7 +51,7 @@ class ContentWindow : public ::sd::Window { public: ContentWindow(::vcl::Window& rParent, SlideSorter& rSlideSorter); - virtual ~ContentWindow (void); + virtual ~ContentWindow(); void SetCurrentFunction (const rtl::Reference<FuPoor>& rpFunction); virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; virtual void KeyInput (const KeyEvent& rEvent) SAL_OVERRIDE; @@ -147,7 +147,7 @@ SlideSorter::SlideSorter ( { } -void SlideSorter::Init (void) +void SlideSorter::Init() { if (mpViewShellBase != NULL) mxControllerWeak = mpViewShellBase->GetController(); @@ -191,7 +191,7 @@ void SlideSorter::Init (void) } } -SlideSorter::~SlideSorter (void) +SlideSorter::~SlideSorter() { mbIsValid = false; @@ -225,25 +225,25 @@ SlideSorter::~SlideSorter (void) mpContentWindow.reset(); } -model::SlideSorterModel& SlideSorter::GetModel (void) const +model::SlideSorterModel& SlideSorter::GetModel() const { OSL_ASSERT(mpSlideSorterModel.get()!=NULL); return *mpSlideSorterModel; } -view::SlideSorterView& SlideSorter::GetView (void) const +view::SlideSorterView& SlideSorter::GetView() const { OSL_ASSERT(mpSlideSorterView.get()!=NULL); return *mpSlideSorterView; } -controller::SlideSorterController& SlideSorter::GetController (void) const +controller::SlideSorterController& SlideSorter::GetController() const { OSL_ASSERT(mpSlideSorterController.get()!=NULL); return *mpSlideSorterController; } -Reference<frame::XController> SlideSorter::GetXController (void) const +Reference<frame::XController> SlideSorter::GetXController() const { Reference<frame::XController> xController(mxControllerWeak); return xController; @@ -261,7 +261,7 @@ void SlideSorter::SetupControls (::vcl::Window* ) GetVerticalScrollBar()->Show(); } -void SlideSorter::SetupListeners (void) +void SlideSorter::SetupListeners() { SharedSdWindow pWindow (GetContentWindow()); if (pWindow) @@ -288,7 +288,7 @@ void SlideSorter::SetupListeners (void) mpSlideSorterController->GetScrollBarManager().Connect(); } -void SlideSorter::ReleaseListeners (void) +void SlideSorter::ReleaseListeners() { mpSlideSorterController->GetScrollBarManager().Disconnect(); @@ -313,7 +313,7 @@ void SlideSorter::ReleaseListeners (void) WindowEventHandler)); } -void SlideSorter::CreateModelViewController (void) +void SlideSorter::CreateModelViewController() { mpSlideSorterModel.reset(CreateModel()); DBG_ASSERT (mpSlideSorterModel.get()!=NULL, @@ -333,7 +333,7 @@ void SlideSorter::CreateModelViewController (void) mpSlideSorterView->Init(); } -model::SlideSorterModel* SlideSorter::CreateModel (void) +model::SlideSorterModel* SlideSorter::CreateModel() { // Get pointers to the document. ViewShellBase* pViewShellBase = GetViewShellBase(); @@ -347,12 +347,12 @@ model::SlideSorterModel* SlideSorter::CreateModel (void) return NULL; } -view::SlideSorterView* SlideSorter::CreateView (void) +view::SlideSorterView* SlideSorter::CreateView() { return new view::SlideSorterView (*this); } -controller::SlideSorterController* SlideSorter::CreateController (void) +controller::SlideSorterController* SlideSorter::CreateController() { controller::SlideSorterController* pController = new controller::SlideSorterController (*this); @@ -431,13 +431,13 @@ void SlideSorter::SetCurrentFunction (const rtl::Reference<FuPoor>& rpFunction) } } -::boost::shared_ptr<controller::Properties> SlideSorter::GetProperties (void) const +::boost::shared_ptr<controller::Properties> SlideSorter::GetProperties() const { OSL_ASSERT(mpProperties); return mpProperties; } -::boost::shared_ptr<view::Theme> SlideSorter::GetTheme (void) const +::boost::shared_ptr<view::Theme> SlideSorter::GetTheme() const { OSL_ASSERT(mpTheme); return mpTheme; @@ -458,7 +458,7 @@ ContentWindow::ContentWindow( SetStyle(GetStyle() | WB_NOPOINTERFOCUS); } -ContentWindow::~ContentWindow (void) +ContentWindow::~ContentWindow() { } diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx index a595bf1c8bcb..d1e138e60a84 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx @@ -63,11 +63,11 @@ SlideSorterService::SlideSorterService (const Reference<XComponentContext>& rxCo (void)rxContext; } -SlideSorterService::~SlideSorterService (void) +SlideSorterService::~SlideSorterService() { } -void SAL_CALL SlideSorterService::disposing (void) +void SAL_CALL SlideSorterService::disposing() { mpSlideSorter.reset(); @@ -129,13 +129,13 @@ void SAL_CALL SlideSorterService::initialize (const Sequence<Any>& rArguments) //----- XView ----------------------------------------------------------------- -Reference<XResourceId> SAL_CALL SlideSorterService::getResourceId (void) +Reference<XResourceId> SAL_CALL SlideSorterService::getResourceId() throw (RuntimeException, std::exception) { return mxViewId; } -sal_Bool SAL_CALL SlideSorterService::isAnchorOnly (void) +sal_Bool SAL_CALL SlideSorterService::isAnchorOnly() throw (RuntimeException, std::exception) { return sal_False; @@ -193,7 +193,7 @@ void SAL_CALL SlideSorterService::setCurrentPage(const Reference<drawing::XDrawP mpSlideSorter->GetModel().GetIndex(rxSlide)); } -Reference<drawing::XDrawPage> SAL_CALL SlideSorterService::getCurrentPage (void) +Reference<drawing::XDrawPage> SAL_CALL SlideSorterService::getCurrentPage() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -205,7 +205,7 @@ Reference<drawing::XDrawPage> SAL_CALL SlideSorterService::getCurrentPage (void) //----- attributes ------------------------------------------------------------ -Reference<container::XIndexAccess> SAL_CALL SlideSorterService::getDocumentSlides (void) +Reference<container::XIndexAccess> SAL_CALL SlideSorterService::getDocumentSlides() throw (RuntimeException, std::exception) { return mpSlideSorter->GetModel().GetDocumentSlides(); @@ -220,7 +220,7 @@ void SAL_CALL SlideSorterService::setDocumentSlides ( mpSlideSorter->GetController().SetDocumentSlides(rxSlides); } -sal_Bool SAL_CALL SlideSorterService::getIsHighlightCurrentSlide (void) +sal_Bool SAL_CALL SlideSorterService::getIsHighlightCurrentSlide() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -242,7 +242,7 @@ void SAL_CALL SlideSorterService::setIsHighlightCurrentSlide (sal_Bool bValue) } } -sal_Bool SAL_CALL SlideSorterService::getIsShowSelection (void) +sal_Bool SAL_CALL SlideSorterService::getIsShowSelection() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -260,7 +260,7 @@ void SAL_CALL SlideSorterService::setIsShowSelection (sal_Bool bValue) mpSlideSorter->GetProperties()->SetShowSelection(bValue); } -sal_Bool SAL_CALL SlideSorterService::getIsShowFocus (void) +sal_Bool SAL_CALL SlideSorterService::getIsShowFocus() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -278,7 +278,7 @@ void SAL_CALL SlideSorterService::setIsShowFocus (sal_Bool bValue) mpSlideSorter->GetProperties()->SetShowFocus(bValue); } -sal_Bool SAL_CALL SlideSorterService::getIsCenterSelection (void) +sal_Bool SAL_CALL SlideSorterService::getIsCenterSelection() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -296,7 +296,7 @@ void SAL_CALL SlideSorterService::setIsCenterSelection (sal_Bool bValue) mpSlideSorter->GetProperties()->SetCenterSelection(bValue); } -sal_Bool SAL_CALL SlideSorterService::getIsSuspendPreviewUpdatesDuringFullScreenPresentation (void) +sal_Bool SAL_CALL SlideSorterService::getIsSuspendPreviewUpdatesDuringFullScreenPresentation() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -317,7 +317,7 @@ void SAL_CALL SlideSorterService::setIsSuspendPreviewUpdatesDuringFullScreenPres ->SetSuspendPreviewUpdatesDuringFullScreenPresentation(bValue); } -sal_Bool SAL_CALL SlideSorterService::getIsOrientationVertical (void) +sal_Bool SAL_CALL SlideSorterService::getIsOrientationVertical() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -337,7 +337,7 @@ void SAL_CALL SlideSorterService::setIsOrientationVertical (sal_Bool bValue) : Layouter::HORIZONTAL); } -sal_Bool SAL_CALL SlideSorterService::getIsSmoothScrolling (void) +sal_Bool SAL_CALL SlideSorterService::getIsSmoothScrolling() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -355,7 +355,7 @@ void SAL_CALL SlideSorterService::setIsSmoothScrolling (sal_Bool bValue) mpSlideSorter->GetProperties()->SetSmoothSelectionScrolling(bValue); } -util::Color SAL_CALL SlideSorterService::getBackgroundColor (void) +util::Color SAL_CALL SlideSorterService::getBackgroundColor() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -374,7 +374,7 @@ void SAL_CALL SlideSorterService::setBackgroundColor (util::Color aBackgroundCol mpSlideSorter->GetProperties()->SetBackgroundColor(Color(aBackgroundColor)); } -util::Color SAL_CALL SlideSorterService::getTextColor (void) +util::Color SAL_CALL SlideSorterService::getTextColor() throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -393,7 +393,7 @@ void SAL_CALL SlideSorterService::setTextColor (util::Color aTextColor) mpSlideSorter->GetProperties()->SetTextColor(Color(aTextColor)); } -util::Color SAL_CALL SlideSorterService::getSelectionColor (void) +util::Color SAL_CALL SlideSorterService::getSelectionColor() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -412,7 +412,7 @@ void SAL_CALL SlideSorterService::setSelectionColor (util::Color aSelectionColor mpSlideSorter->GetProperties()->SetSelectionColor(Color(aSelectionColor)); } -util::Color SAL_CALL SlideSorterService::getHighlightColor (void) +util::Color SAL_CALL SlideSorterService::getHighlightColor() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -431,7 +431,7 @@ void SAL_CALL SlideSorterService::setHighlightColor (util::Color aHighlightColor mpSlideSorter->GetProperties()->SetHighlightColor(Color(aHighlightColor)); } -sal_Bool SAL_CALL SlideSorterService::getIsUIReadOnly (void) +sal_Bool SAL_CALL SlideSorterService::getIsUIReadOnly() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -449,7 +449,7 @@ void SAL_CALL SlideSorterService::setIsUIReadOnly (sal_Bool bIsUIReadOnly) mpSlideSorter->GetProperties()->SetUIReadOnly(bIsUIReadOnly); } -void SlideSorterService::Resize (void) +void SlideSorterService::Resize() { if (mxParentWindow.is()) { @@ -460,7 +460,7 @@ void SlideSorterService::Resize (void) } } -void SlideSorterService::ThrowIfDisposed (void) +void SlideSorterService::ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException) { if (SlideSorterServiceInterfaceBase::rBHelper.bDisposed || SlideSorterServiceInterfaceBase::rBHelper.bInDispose) diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx index 4ce1b5281681..7b79b55a2dcd 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx @@ -55,8 +55,8 @@ class SlideSorterService public: explicit SlideSorterService ( const css::uno::Reference<css::uno::XComponentContext>& rxContext); - virtual ~SlideSorterService (void); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual ~SlideSorterService(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInitialization @@ -65,10 +65,10 @@ public: // XResourceId - css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId (void) + css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - sal_Bool SAL_CALL isAnchorOnly (void) + sal_Bool SAL_CALL isAnchorOnly() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XWindowListener @@ -95,86 +95,86 @@ public: const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage (void) + virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Attributes - virtual css::uno::Reference<css::container::XIndexAccess> SAL_CALL getDocumentSlides (void) + virtual css::uno::Reference<css::container::XIndexAccess> SAL_CALL getDocumentSlides() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setDocumentSlides ( const css::uno::Reference<css::container::XIndexAccess >& rxSlides) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getIsHighlightCurrentSlide (void) + virtual sal_Bool SAL_CALL getIsHighlightCurrentSlide() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setIsHighlightCurrentSlide (sal_Bool bIsHighlightCurrentSlide) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getIsShowSelection (void) + virtual sal_Bool SAL_CALL getIsShowSelection() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setIsShowSelection (sal_Bool bIsShowSelection) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getIsCenterSelection (void) + virtual sal_Bool SAL_CALL getIsCenterSelection() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setIsCenterSelection (sal_Bool bIsCenterSelection) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getIsSuspendPreviewUpdatesDuringFullScreenPresentation (void) + virtual sal_Bool SAL_CALL getIsSuspendPreviewUpdatesDuringFullScreenPresentation() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setIsSuspendPreviewUpdatesDuringFullScreenPresentation ( sal_Bool bIsSuspendPreviewUpdatesDuringFullScreenPresentation) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getIsOrientationVertical (void) + virtual sal_Bool SAL_CALL getIsOrientationVertical() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setIsOrientationVertical (sal_Bool bIsOrientationVertical) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getIsSmoothScrolling (void) + virtual sal_Bool SAL_CALL getIsSmoothScrolling() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setIsSmoothScrolling (sal_Bool bIsOrientationVertical) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::util::Color SAL_CALL getBackgroundColor (void) + virtual css::util::Color SAL_CALL getBackgroundColor() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setBackgroundColor (css::util::Color aBackgroundColor) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::util::Color SAL_CALL getTextColor (void) + virtual css::util::Color SAL_CALL getTextColor() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setTextColor (css::util::Color aTextColor) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::util::Color SAL_CALL getSelectionColor (void) + virtual css::util::Color SAL_CALL getSelectionColor() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setSelectionColor (css::util::Color aSelectionColor) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::util::Color SAL_CALL getHighlightColor (void) + virtual css::util::Color SAL_CALL getHighlightColor() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setHighlightColor (css::util::Color aHighlightColor) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getIsUIReadOnly (void) + virtual sal_Bool SAL_CALL getIsUIReadOnly() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setIsUIReadOnly (sal_Bool bIsUIReadOnly) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getIsShowFocus (void) + virtual sal_Bool SAL_CALL getIsShowFocus() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setIsShowFocus (sal_Bool bIsShowFocus) @@ -186,12 +186,12 @@ private: css::uno::Reference<css::awt::XWindow> mxParentWindow; ::boost::scoped_ptr<cppu::IPropertyArrayHelper> mpPropertyArrayHelper; - void Resize (void); + void Resize(); /** This method throws a DisposedException when the object has already been disposed. */ - void ThrowIfDisposed (void) throw (css::lang::DisposedException); + void ThrowIfDisposed() throw (css::lang::DisposedException); }; } } // end of namespace ::sd::slidesorter diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index 8f74250d4c48..cbb9c3731875 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx @@ -137,7 +137,7 @@ SlideSorterViewShell::SlideSorterViewShell ( pParentWindow->SetStyle(pParentWindow->GetStyle() | WB_DIALOGCONTROL); } -SlideSorterViewShell::~SlideSorterViewShell (void) +SlideSorterViewShell::~SlideSorterViewShell() { DisposeFunctions(); @@ -161,7 +161,7 @@ SlideSorterViewShell::~SlideSorterViewShell (void) GetFrameView()->Disconnect(); } -void SlideSorterViewShell::Initialize (void) +void SlideSorterViewShell::Initialize() { mpSlideSorter = SlideSorter::CreateSlideSorter( *this, @@ -230,7 +230,7 @@ SlideSorterViewShell* SlideSorterViewShell::GetSlideSorter (ViewShellBase& rBase return pViewShell; } -Reference<drawing::XDrawSubController> SlideSorterViewShell::CreateSubController (void) +Reference<drawing::XDrawSubController> SlideSorterViewShell::CreateSubController() { Reference<drawing::XDrawSubController> xSubController; @@ -286,7 +286,7 @@ void SlideSorterViewShell::SwitchViewFireFocus(::com::sun::star::uno::Reference< } } -SlideSorter& SlideSorterViewShell::GetSlideSorter (void) const +SlideSorter& SlideSorterViewShell::GetSlideSorter() const { OSL_ASSERT(mpSlideSorter.get()!=NULL); return *mpSlideSorter; @@ -307,7 +307,7 @@ bool SlideSorterViewShell::RelocateToParentWindow (::vcl::Window* pParentWindow) return bSuccess; } -::svl::IUndoManager* SlideSorterViewShell::ImpGetUndoManager (void) const +::svl::IUndoManager* SlideSorterViewShell::ImpGetUndoManager() const { SfxShell* pObjectBar = GetViewShellBase().GetViewShellManager()->GetTopShell(); if (pObjectBar != NULL) @@ -325,7 +325,7 @@ bool SlideSorterViewShell::RelocateToParentWindow (::vcl::Window* pParentWindow) } } -SdPage* SlideSorterViewShell::getCurrentPage(void) const +SdPage* SlideSorterViewShell::getCurrentPage() const { // since SlideSorterViewShell::GetActualPage() currently also // returns master pages, which is a wrong behaviour for GetActualPage(), @@ -333,7 +333,7 @@ SdPage* SlideSorterViewShell::getCurrentPage(void) const return const_cast<SlideSorterViewShell*>(this)->GetActualPage(); } -SdPage* SlideSorterViewShell::GetActualPage (void) +SdPage* SlideSorterViewShell::GetActualPage() { SdPage* pCurrentPage = NULL; @@ -453,7 +453,7 @@ void SlideSorterViewShell::Paint ( mpSlideSorter->GetController().Paint(rBBox,pWindow); } -void SlideSorterViewShell::ArrangeGUIElements (void) +void SlideSorterViewShell::ArrangeGUIElements() { if (IsActive()) { @@ -552,7 +552,7 @@ void SlideSorterViewShell::ReadFrameViewData (FrameView* pFrameView) } } -void SlideSorterViewShell::WriteFrameViewData (void) +void SlideSorterViewShell::WriteFrameViewData() { OSL_ASSERT(mpSlideSorter.get()!=NULL); if (mpFrameView != NULL) @@ -629,7 +629,7 @@ void SlideSorterViewShell::SetZoomRect (const Rectangle& rZoomRect) GetViewFrame()->GetBindings().Invalidate( SID_ATTR_ZOOMSLIDER ); } -void SlideSorterViewShell::UpdateScrollBars (void) +void SlideSorterViewShell::UpdateScrollBars() { // Do not call the overwritten method of the base class: We do all the // scroll bar setup by ourselves. @@ -679,7 +679,7 @@ sal_Int8 SlideSorterViewShell::ExecuteDrop ( } ::boost::shared_ptr<SlideSorterViewShell::PageSelection> - SlideSorterViewShell::GetPageSelection (void) const + SlideSorterViewShell::GetPageSelection() const { OSL_ASSERT(mpSlideSorter.get()!=NULL); return mpSlideSorter->GetController().GetPageSelector().GetPageSelection(); diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index 7b60a294f2a6..d4839971f2cc 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -89,7 +89,7 @@ namespace { { public: Painter (SlideSorterView& rView) : mrView(rView) {} - virtual ~Painter (void) {} + virtual ~Painter() {} virtual void Paint (OutputDevice& rDevice, const Rectangle& rRepaintArea) SAL_OVERRIDE { @@ -109,7 +109,7 @@ class BackgroundPainter { public: BackgroundPainter (const Color& rBackgroundColor) : maBackgroundColor(rBackgroundColor) {} - virtual ~BackgroundPainter (void) {} + virtual ~BackgroundPainter() {} virtual void Paint (OutputDevice& rDevice, const Rectangle& rRepaintArea) SAL_OVERRIDE { @@ -176,7 +176,7 @@ SlideSorterView::SlideSorterView (SlideSorter& rSlideSorter) mpLayeredDevice->RegisterPainter(pPainter, 1); } -SlideSorterView::~SlideSorterView (void) +SlideSorterView::~SlideSorterView() { if ( ! mbIsDisposed) { @@ -185,12 +185,12 @@ SlideSorterView::~SlideSorterView (void) } } -void SlideSorterView::Init (void) +void SlideSorterView::Init() { HandleModelChange(); } -void SlideSorterView::Dispose (void) +void SlideSorterView::Dispose() { mpSelectionPainter.reset(); @@ -229,24 +229,24 @@ sal_Int32 SlideSorterView::GetPageIndexAtPoint (const Point& rWindowPosition) co return nIndex; } -Layouter& SlideSorterView::GetLayouter (void) +Layouter& SlideSorterView::GetLayouter() { return *mpLayouter.get(); } -void SlideSorterView::ModelHasChanged (void) +void SlideSorterView::ModelHasChanged() { // Ignore this call. Rely on hints sent by the model to get informed of // model changes. } -void SlideSorterView::PreModelChange (void) +void SlideSorterView::PreModelChange() { // Reset the slide under the mouse. It will be re-set in PostModelChange(). SetPageUnderMouse(SharedPageDescriptor()); } -void SlideSorterView::PostModelChange (void) +void SlideSorterView::PostModelChange() { // In PreModelChange() the page objects have been released. Here we // create new ones. @@ -265,13 +265,13 @@ void SlideSorterView::PostModelChange (void) describe the type of change so that existing page objects can be reused. */ -void SlideSorterView::HandleModelChange (void) +void SlideSorterView::HandleModelChange() { PreModelChange (); PostModelChange(); } -void SlideSorterView::HandleDrawModeChange (void) +void SlideSorterView::HandleDrawModeChange() { // Replace the preview cache with a new and empty one. The // PreviewRenderer that is used by the cache is replaced by this as @@ -282,7 +282,7 @@ void SlideSorterView::HandleDrawModeChange (void) RequestRepaint(); } -void SlideSorterView::HandleDataChangeEvent (void) +void SlideSorterView::HandleDataChangeEvent() { GetPageObjectPainter()->SetTheme(mrSlideSorter.GetTheme()); @@ -295,7 +295,7 @@ void SlideSorterView::HandleDataChangeEvent (void) RequestRepaint(); } -void SlideSorterView::Resize (void) +void SlideSorterView::Resize() { UpdateOrientation(); @@ -303,13 +303,13 @@ void SlideSorterView::Resize (void) RequestRearrange(); } -void SlideSorterView::RequestRearrange (void) +void SlideSorterView::RequestRearrange() { mbIsRearrangePending = true; Rearrange(); } -void SlideSorterView::Rearrange (void) +void SlideSorterView::Rearrange() { if ( ! mbIsRearrangePending) return; @@ -338,7 +338,7 @@ void SlideSorterView::Rearrange (void) } } -void SlideSorterView::UpdateOrientation (void) +void SlideSorterView::UpdateOrientation() { // The layout of slides depends on whether the slide sorter is // displayed in the center or the side pane. @@ -443,12 +443,12 @@ void SlideSorterView::Layout () InvalidatePageObjectVisibilities (); } -void SlideSorterView::InvalidatePageObjectVisibilities (void) +void SlideSorterView::InvalidatePageObjectVisibilities() { mbPageObjectVisibilitiesValid = false; } -void SlideSorterView::DeterminePageObjectVisibilities (void) +void SlideSorterView::DeterminePageObjectVisibilities() { SharedSdWindow pWindow (mrSlideSorter.GetContentWindow()); if (pWindow) @@ -502,7 +502,7 @@ void SlideSorterView::DeterminePageObjectVisibilities (void) } } -void SlideSorterView::UpdatePreciousFlags (void) +void SlideSorterView::UpdatePreciousFlags() { if (mbPreciousFlagUpdatePending) { @@ -545,7 +545,7 @@ bool SlideSorterView::SetOrientation (const Layouter::Orientation eOrientation) return false; } -void SlideSorterView::RequestRepaint (void) +void SlideSorterView::RequestRepaint() { SharedSdWindow pWindow (mrSlideSorter.GetContentWindow()); if (pWindow) @@ -584,7 +584,7 @@ void SlideSorterView::RequestRepaint (const vcl::Region& rRepaintRegion) } } -Rectangle SlideSorterView::GetModelArea (void) +Rectangle SlideSorterView::GetModelArea() { return mpLayouter->GetTotalBoundingBox(); } @@ -698,7 +698,7 @@ void SlideSorterView::ConfigurationChanged ( } -::boost::shared_ptr<cache::PageCache> SlideSorterView::GetPreviewCache (void) +::boost::shared_ptr<cache::PageCache> SlideSorterView::GetPreviewCache() { SharedSdWindow pWindow (mrSlideSorter.GetContentWindow()); if (pWindow && mpPreviewCache.get() == NULL) @@ -713,7 +713,7 @@ void SlideSorterView::ConfigurationChanged ( return mpPreviewCache; } -Pair SlideSorterView::GetVisiblePageRange (void) +Pair SlideSorterView::GetVisiblePageRange() { if ( ! mbPageObjectVisibilitiesValid) DeterminePageObjectVisibilities(); @@ -740,7 +740,7 @@ void SlideSorterView::RemoveVisibilityChangeListener(const Link&rListener) rListener)); } -ToolTip& SlideSorterView::GetToolTip (void) const +ToolTip& SlideSorterView::GetToolTip() const { OSL_ASSERT(mpToolTip); return *mpToolTip; @@ -841,7 +841,7 @@ bool SlideSorterView::SetState ( return bModified; } -::boost::shared_ptr<PageObjectPainter> SlideSorterView::GetPageObjectPainter (void) +::boost::shared_ptr<PageObjectPainter> SlideSorterView::GetPageObjectPainter() { if ( ! mpPageObjectPainter) mpPageObjectPainter.reset(new PageObjectPainter(mrSlideSorter)); @@ -859,7 +859,7 @@ SlideSorterView::DrawLock::DrawLock (SlideSorter& rSlideSorter) ++mrView.mnLockRedrawSmph; } -SlideSorterView::DrawLock::~DrawLock (void) +SlideSorterView::DrawLock::~DrawLock() { OSL_ASSERT(mrView.mnLockRedrawSmph>0); --mrView.mnLockRedrawSmph; @@ -871,7 +871,7 @@ SlideSorterView::DrawLock::~DrawLock (void) } } -void SlideSorterView::DrawLock::Dispose (void) +void SlideSorterView::DrawLock::Dispose() { mpWindow.reset(); } diff --git a/sd/source/ui/slidesorter/view/SlsFontProvider.cxx b/sd/source/ui/slidesorter/view/SlsFontProvider.cxx index 120d428085eb..cc44e487f18a 100644 --- a/sd/source/ui/slidesorter/view/SlsFontProvider.cxx +++ b/sd/source/ui/slidesorter/view/SlsFontProvider.cxx @@ -31,7 +31,7 @@ namespace sd { namespace slidesorter { namespace view { FontProvider* FontProvider::mpInstance = NULL; -FontProvider& FontProvider::Instance (void) +FontProvider& FontProvider::Instance() { if (mpInstance == NULL) { @@ -62,17 +62,17 @@ FontProvider& FontProvider::Instance (void) return *mpInstance; } -FontProvider::FontProvider (void) +FontProvider::FontProvider() : maFont(), maMapMode() { } -FontProvider::~FontProvider (void) +FontProvider::~FontProvider() { } -void FontProvider::Invalidate (void) +void FontProvider::Invalidate() { maFont.reset(); } diff --git a/sd/source/ui/slidesorter/view/SlsFramePainter.cxx b/sd/source/ui/slidesorter/view/SlsFramePainter.cxx index 07e9d2865e06..dd0c03fcdcfc 100644 --- a/sd/source/ui/slidesorter/view/SlsFramePainter.cxx +++ b/sd/source/ui/slidesorter/view/SlsFramePainter.cxx @@ -49,7 +49,7 @@ FramePainter::FramePainter (const BitmapEx& rShadowBitmap) } } -FramePainter::~FramePainter (void) +FramePainter::~FramePainter() { } diff --git a/sd/source/ui/slidesorter/view/SlsFramePainter.hxx b/sd/source/ui/slidesorter/view/SlsFramePainter.hxx index b0f1b55168fe..cc3a93cd17cb 100644 --- a/sd/source/ui/slidesorter/view/SlsFramePainter.hxx +++ b/sd/source/ui/slidesorter/view/SlsFramePainter.hxx @@ -28,7 +28,7 @@ class FramePainter { public: FramePainter (const BitmapEx& rBitmap); - ~FramePainter (void); + ~FramePainter(); /** Paint a border around the given box by using a set of bitmaps for the corners and sides. diff --git a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx index 8fb9eba6deab..980487e7d4e1 100644 --- a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx +++ b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx @@ -40,10 +40,10 @@ class AnimatorAccess public: virtual void AddRun (const ::boost::shared_ptr<PageObjectRun>& rRun) = 0; virtual void RemoveRun (const ::boost::shared_ptr<PageObjectRun>& rRun) = 0; - virtual model::SlideSorterModel& GetModel (void) const = 0; - virtual view::SlideSorterView& GetView (void) const = 0; - virtual ::boost::shared_ptr<controller::Animator> GetAnimator (void) = 0; - virtual SharedSdWindow GetContentWindow (void) = 0; + virtual model::SlideSorterModel& GetModel() const = 0; + virtual view::SlideSorterView& GetView() const = 0; + virtual ::boost::shared_ptr<controller::Animator> GetAnimator() = 0; + virtual SharedSdWindow GetContentWindow() = 0; protected: ~AnimatorAccess() {} @@ -60,7 +60,7 @@ public: const sal_Int32 nRunIndex, const sal_Int32 nStartIndex, const sal_Int32 nEndIndex); - ~PageObjectRun (void); + ~PageObjectRun(); void operator () (const double nTime); @@ -99,7 +99,7 @@ private: AnimatorAccess& mrAnimatorAccess; ::boost::function<double(double)> maAccelerationFunction; - void RestartAnimation (void); + void RestartAnimation(); }; typedef ::boost::shared_ptr<PageObjectRun> SharedPageObjectRun; @@ -116,7 +116,7 @@ class InsertAnimator::Implementation : public AnimatorAccess { public: Implementation (SlideSorter& rSlideSorter); - virtual ~Implementation (void); + virtual ~Implementation(); void SetInsertPosition ( const InsertPosition& rInsertPosition, @@ -125,10 +125,10 @@ public: virtual void AddRun (const ::boost::shared_ptr<PageObjectRun>& rRun) SAL_OVERRIDE; virtual void RemoveRun (const ::boost::shared_ptr<PageObjectRun>& rRun) SAL_OVERRIDE; - virtual model::SlideSorterModel& GetModel (void) const SAL_OVERRIDE { return mrModel; } - virtual view::SlideSorterView& GetView (void) const SAL_OVERRIDE { return mrView; } - virtual ::boost::shared_ptr<controller::Animator> GetAnimator (void) SAL_OVERRIDE { return mpAnimator; } - virtual SharedSdWindow GetContentWindow (void) SAL_OVERRIDE { return mrSlideSorter.GetContentWindow(); } + virtual model::SlideSorterModel& GetModel() const SAL_OVERRIDE { return mrModel; } + virtual view::SlideSorterView& GetView() const SAL_OVERRIDE { return mrView; } + virtual ::boost::shared_ptr<controller::Animator> GetAnimator() SAL_OVERRIDE { return mpAnimator; } + virtual SharedSdWindow GetContentWindow() SAL_OVERRIDE { return mrSlideSorter.GetContentWindow(); } private: model::SlideSorterModel& mrModel; @@ -175,7 +175,7 @@ InsertAnimator::Implementation::Implementation (SlideSorter& rSlideSorter) { } -InsertAnimator::Implementation::~Implementation (void) +InsertAnimator::Implementation::~Implementation() { SetInsertPosition(InsertPosition(), controller::Animator::AM_Immediate); } @@ -321,7 +321,7 @@ PageObjectRun::PageObjectRun ( maEndOffset.resize(nEndIndex - nStartIndex + 1); } -PageObjectRun::~PageObjectRun (void) +PageObjectRun::~PageObjectRun() { } @@ -385,7 +385,7 @@ void PageObjectRun::ResetOffsets (const controller::Animator::AnimationMode eMod mrAnimatorAccess.RemoveRun(shared_from_this()); } -void PageObjectRun::RestartAnimation (void) +void PageObjectRun::RestartAnimation() { // Stop the current animation. if (mnAnimationId != controller::Animator::NotAnAnimationId) diff --git a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx index 6862a69dccd1..2675746f4306 100644 --- a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx +++ b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx @@ -75,7 +75,7 @@ InsertionIndicatorOverlay::InsertionIndicatorOverlay (SlideSorter& rSlideSorter) { } -InsertionIndicatorOverlay::~InsertionIndicatorOverlay (void) +InsertionIndicatorOverlay::~InsertionIndicatorOverlay() { Hide(); } @@ -319,7 +319,7 @@ void InsertionIndicatorOverlay::SetLayerInvalidator (const SharedILayerInvalidat mpLayerInvalidator->Invalidate(GetBoundingBox()); } -void InsertionIndicatorOverlay::Show (void) +void InsertionIndicatorOverlay::Show() { if ( ! mbIsVisible) { @@ -336,7 +336,7 @@ void InsertionIndicatorOverlay::Show (void) } } -void InsertionIndicatorOverlay::Hide (void) +void InsertionIndicatorOverlay::Hide() { if (mbIsVisible) { @@ -353,12 +353,12 @@ void InsertionIndicatorOverlay::Hide (void) } } -Rectangle InsertionIndicatorOverlay::GetBoundingBox (void) const +Rectangle InsertionIndicatorOverlay::GetBoundingBox() const { return Rectangle(maLocation, maIcon.GetSizePixel()); } -Size InsertionIndicatorOverlay::GetSize (void) const +Size InsertionIndicatorOverlay::GetSize() const { return Size( maIcon.GetSizePixel().Width() + 10, diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx index 0916912ef48e..ffbd7d686c64 100644 --- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx +++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx @@ -104,8 +104,8 @@ void ForAllRectangles (const vcl::Region& rRegion, ::boost::function<void(const class Layer : private ::boost::noncopyable { public: - Layer (void); - ~Layer (void); + Layer(); + ~Layer(); void Initialize (const SharedSdWindow& rpTargetWindow); void InvalidateRectangle (const Rectangle& rInvalidationBox); @@ -117,8 +117,8 @@ public: void Resize (const Size& rSize); void AddPainter (const SharedILayerPainter& rpPainter); void RemovePainter (const SharedILayerPainter& rpPainter); - bool HasPainter (void) const; - void Dispose (void); + bool HasPainter() const; + void Dispose(); private: ::boost::shared_ptr<VirtualDevice> mpLayerDevice; @@ -168,7 +168,7 @@ LayeredDevice::LayeredDevice (const SharedSdWindow& rpTargetWindow) mpBackBuffer->SetOutputSizePixel(mpTargetWindow->GetSizePixel()); } -LayeredDevice::~LayeredDevice (void) +LayeredDevice::~LayeredDevice() { } @@ -290,20 +290,20 @@ void LayeredDevice::RepaintRectangle (const Rectangle& rRepaintRectangle) } } -void LayeredDevice::Resize (void) +void LayeredDevice::Resize() { const Size aSize (mpTargetWindow->GetSizePixel()); mpBackBuffer->SetOutputSizePixel(aSize); ::std::for_each(mpLayers->begin(), mpLayers->end(), ::boost::bind(&Layer::Resize, _1, aSize)); } -void LayeredDevice::Dispose (void) +void LayeredDevice::Dispose() { ::std::for_each(mpLayers->begin(), mpLayers->end(), ::boost::bind(&Layer::Dispose, _1)); mpLayers->clear(); } -bool LayeredDevice::HandleMapModeChange (void) +bool LayeredDevice::HandleMapModeChange() { const MapMode& rMapMode (mpTargetWindow->GetMapMode()); if (maSavedMapMode == rMapMode) @@ -368,14 +368,14 @@ bool LayeredDevice::HandleMapModeChange (void) //===== Layer ================================================================= -Layer::Layer (void) +Layer::Layer() : mpLayerDevice(), maPainters(), maInvalidationRegion() { } -Layer::~Layer (void) +Layer::~Layer() { } @@ -485,12 +485,12 @@ void Layer::RemovePainter (const SharedILayerPainter& rpPainter) } } -bool Layer::HasPainter (void) const +bool Layer::HasPainter() const { return !maPainters.empty(); } -void Layer::Dispose (void) +void Layer::Dispose() { maPainters.clear(); } diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx index 454074376fce..4cbbf5b22d59 100644 --- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx +++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx @@ -46,7 +46,7 @@ class LayeredDevice { public: LayeredDevice (const SharedSdWindow& rpTargetWindow); - ~LayeredDevice (void); + ~LayeredDevice(); void Invalidate ( const Rectangle& rInvalidationBox, @@ -64,12 +64,12 @@ public: const SharedILayerPainter& rPainter, const sal_Int32 nLayer); - bool HandleMapModeChange (void); + bool HandleMapModeChange(); void Repaint (const vcl::Region& rRepaintRegion); - void Resize (void); + void Resize(); - void Dispose (void); + void Dispose(); private: SharedSdWindow mpTargetWindow; diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx index 155652f3d487..fd85c1c61b9f 100644 --- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx +++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx @@ -78,7 +78,7 @@ public: const Implementation& rImplementation, const Layouter::Orientation eOrientation); - virtual Layouter::Orientation GetOrientation (void) const = 0; + virtual Layouter::Orientation GetOrientation() const = 0; bool Rearrange ( const Size& rWindowSize, @@ -172,8 +172,8 @@ public: model::SlideSorterModel& rModel, const sal_Int32 nIndex) const; - Range GetValidHorizontalSizeRange (void) const; - Range GetValidVerticalSizeRange (void) const; + Range GetValidHorizontalSizeRange() const; + Range GetValidVerticalSizeRange() const; Range GetRangeOfVisiblePageObjects (const Rectangle& aVisibleArea) const; sal_Int32 GetIndex ( @@ -194,9 +194,9 @@ public: const sal_Int32 nRow, const sal_Int32 nColumn) const; - Rectangle GetTotalBoundingBox (void) const; + Rectangle GetTotalBoundingBox() const; - virtual ~Implementation (void); + virtual ~Implementation(); protected: Implementation ( @@ -227,7 +227,7 @@ class VerticalImplementation : public Layouter::Implementation public: VerticalImplementation (const Implementation& rImplementation); - virtual Layouter::Orientation GetOrientation (void) const SAL_OVERRIDE; + virtual Layouter::Orientation GetOrientation() const SAL_OVERRIDE; void CalculateLogicalInsertPosition ( const Point& rModelPosition, @@ -249,7 +249,7 @@ class HorizontalImplementation : public Layouter::Implementation public: HorizontalImplementation (const Implementation& rImplementation); - virtual Layouter::Orientation GetOrientation (void) const SAL_OVERRIDE; + virtual Layouter::Orientation GetOrientation() const SAL_OVERRIDE; void CalculateLogicalInsertPosition ( const Point& rModelPosition, @@ -275,7 +275,7 @@ public: const ::boost::shared_ptr<view::Theme>& rpTheme); GridImplementation (const Implementation& rImplementation); - virtual Layouter::Orientation GetOrientation (void) const SAL_OVERRIDE; + virtual Layouter::Orientation GetOrientation() const SAL_OVERRIDE; void CalculateLogicalInsertPosition ( const Point& rModelPosition, @@ -299,11 +299,11 @@ Layouter::Layouter ( { } -Layouter::~Layouter (void) +Layouter::~Layouter() { } -::boost::shared_ptr<PageObjectLayouter> Layouter::GetPageObjectLayouter (void) const +::boost::shared_ptr<PageObjectLayouter> Layouter::GetPageObjectLayouter() const { return mpImplementation->mpPageObjectLayouter; } @@ -333,7 +333,7 @@ bool Layouter::Rearrange ( return mpImplementation->Rearrange(rWindowSize, rPageSize, nPageCount); } -sal_Int32 Layouter::GetColumnCount (void) const +sal_Int32 Layouter::GetColumnCount() const { return mpImplementation->mnColumnCount; } @@ -343,7 +343,7 @@ sal_Int32 Layouter::GetIndex (const sal_Int32 nRow, const sal_Int32 nColumn) con return mpImplementation->GetIndex(nRow,nColumn,true); } -Size Layouter::GetPageObjectSize (void) const +Size Layouter::GetPageObjectSize() const { return mpImplementation->maPageObjectSize; } @@ -355,7 +355,7 @@ Rectangle Layouter::GetPageObjectBox ( return mpImplementation->GetPageObjectBox(nIndex, bIncludeBorderAndGap); } -Rectangle Layouter::GetTotalBoundingBox (void) const +Rectangle Layouter::GetTotalBoundingBox() const { return mpImplementation->GetTotalBoundingBox(); } @@ -377,12 +377,12 @@ InsertPosition Layouter::GetInsertPosition ( return aPosition; } -Range Layouter::GetValidHorizontalSizeRange (void) const +Range Layouter::GetValidHorizontalSizeRange() const { return mpImplementation->GetValidHorizontalSizeRange(); } -Range Layouter::GetValidVerticalSizeRange (void) const +Range Layouter::GetValidVerticalSizeRange() const { return mpImplementation->GetValidVerticalSizeRange(); } @@ -484,7 +484,7 @@ Layouter::Implementation::Implementation (const Implementation& rImplementation) { } -Layouter::Implementation::~Implementation (void) +Layouter::Implementation::~Implementation() { } @@ -813,14 +813,14 @@ Rectangle Layouter::Implementation::GetInnerBoundingBox ( PageObjectLayouter::ModelCoordinateSystem, true); } -Range Layouter::Implementation::GetValidHorizontalSizeRange (void) const +Range Layouter::Implementation::GetValidHorizontalSizeRange() const { return Range( mnLeftBorder + maMinimalSize.Width() + mnRightBorder, mnLeftBorder + maMaximalSize.Width() + mnRightBorder); } -Range Layouter::Implementation::GetValidVerticalSizeRange (void) const +Range Layouter::Implementation::GetValidVerticalSizeRange() const { return Range( mnTopBorder + maMinimalSize.Height() + mnBottomBorder, @@ -962,7 +962,7 @@ Rectangle Layouter::Implementation::AddBorderAndGap ( return aBoundingBox; } -Rectangle Layouter::Implementation::GetTotalBoundingBox (void) const +Rectangle Layouter::Implementation::GetTotalBoundingBox() const { sal_Int32 nHorizontalSize = 0; sal_Int32 nVerticalSize = 0; @@ -1012,7 +1012,7 @@ HorizontalImplementation::HorizontalImplementation (const Implementation& rImple { } -Layouter::Orientation HorizontalImplementation::GetOrientation (void) const +Layouter::Orientation HorizontalImplementation::GetOrientation() const { return Layouter::HORIZONTAL; } @@ -1063,7 +1063,7 @@ VerticalImplementation::VerticalImplementation (const Implementation& rImplement { } -Layouter::Orientation VerticalImplementation::GetOrientation (void) const +Layouter::Orientation VerticalImplementation::GetOrientation() const { return Layouter::VERTICAL; } @@ -1113,7 +1113,7 @@ GridImplementation::GridImplementation (const Implementation& rImplementation) { } -Layouter::Orientation GridImplementation::GetOrientation (void) const +Layouter::Orientation GridImplementation::GetOrientation() const { return Layouter::GRID; } @@ -1186,7 +1186,7 @@ void GridImplementation::CalculateLogicalInsertPosition ( //===== InsertPosition ======================================================== -InsertPosition::InsertPosition (void) +InsertPosition::InsertPosition() : mnRow(-1), mnColumn(-1), mnIndex(-1), diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx index 7d82198d722e..7a32476deb43 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx @@ -91,7 +91,7 @@ PageObjectLayouter::PageObjectLayouter ( aIconSize); } -PageObjectLayouter::~PageObjectLayouter(void) +PageObjectLayouter::~PageObjectLayouter() { } diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx index bb1d48e73b9b..d5b9d8a92b36 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx @@ -61,7 +61,7 @@ PageObjectPainter::PageObjectPainter ( mpFocusBorderPainter->AdaptColor(aColor, true); } -PageObjectPainter::~PageObjectPainter (void) +PageObjectPainter::~PageObjectPainter() { } @@ -87,7 +87,7 @@ void PageObjectPainter::PaintPageObject ( } } -bool PageObjectPainter::UpdatePageObjectLayouter (void) +bool PageObjectPainter::UpdatePageObjectLayouter() { // The page object layouter is quite volatile. It may have been replaced // since the last call. Update it now. diff --git a/sd/source/ui/slidesorter/view/SlsResource.hxx b/sd/source/ui/slidesorter/view/SlsResource.hxx index 9869e0339b3e..6695c00fc322 100644 --- a/sd/source/ui/slidesorter/view/SlsResource.hxx +++ b/sd/source/ui/slidesorter/view/SlsResource.hxx @@ -30,7 +30,7 @@ class LocalResource : public Resource { public: LocalResource (const sal_uInt16 nResourceId) : Resource(SdResId(nResourceId)){} - ~LocalResource (void) { FreeResource(); } + ~LocalResource() { FreeResource(); } }; } } } // end of namespace ::sd::slidesorter::view diff --git a/sd/source/ui/slidesorter/view/SlsToolTip.cxx b/sd/source/ui/slidesorter/view/SlsToolTip.cxx index 954052c0b3e7..16ba566729be 100644 --- a/sd/source/ui/slidesorter/view/SlsToolTip.cxx +++ b/sd/source/ui/slidesorter/view/SlsToolTip.cxx @@ -44,7 +44,7 @@ ToolTip::ToolTip (SlideSorter& rSlideSorter) maHiddenTimer.SetTimeout(rHelpSettings.GetTipDelay()); } -ToolTip::~ToolTip (void) +ToolTip::~ToolTip() { maShowTimer.Stop(); maHiddenTimer.Stop(); @@ -100,7 +100,7 @@ void ToolTip::Show (const bool bNoDelay) maShowTimer.Start(); } -void ToolTip::DoShow (void) +void ToolTip::DoShow() { if (maShowTimer.IsActive()) { @@ -142,7 +142,7 @@ void ToolTip::DoShow (void) } } -bool ToolTip::Hide (void) +bool ToolTip::Hide() { if (mnHelpWindowHandle>0) { diff --git a/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx b/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx index ba109d64aa16..e4f99d20a654 100644 --- a/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx +++ b/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx @@ -41,7 +41,7 @@ ViewCacheContext::ViewCacheContext (SlideSorter& rSlideSorter) { } -ViewCacheContext::~ViewCacheContext (void) +ViewCacheContext::~ViewCacheContext() { } @@ -63,7 +63,7 @@ void ViewCacheContext::NotifyPreviewCreation ( } } -bool ViewCacheContext::IsIdle (void) +bool ViewCacheContext::IsIdle() { sal_Int32 nIdleState (tools::IdleDetection::GetIdleState(mrSlideSorter.GetContentWindow().get())); if (nIdleState == tools::IdleDetection::IDET_IDLE) @@ -112,7 +112,7 @@ model::SharedPageDescriptor ViewCacheContext::GetDescriptor (cache::CacheKey aKe return mrModel.GetPageDescriptor(nPageIndex); } -::com::sun::star::uno::Reference<com::sun::star::uno::XInterface> ViewCacheContext::GetModel (void) +::com::sun::star::uno::Reference<com::sun::star::uno::XInterface> ViewCacheContext::GetModel() { if (mrModel.GetDocument() == NULL) return NULL; diff --git a/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx b/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx index 14ee3ca65fa2..19b814a73879 100644 --- a/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx +++ b/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx @@ -40,14 +40,14 @@ class ViewCacheContext : public cache::CacheContext { public: ViewCacheContext (SlideSorter& rSlideSorter); - virtual ~ViewCacheContext (void); + virtual ~ViewCacheContext(); virtual void NotifyPreviewCreation (cache::CacheKey aKey, const Bitmap& rPreview) SAL_OVERRIDE; - virtual bool IsIdle (void) SAL_OVERRIDE; + virtual bool IsIdle() SAL_OVERRIDE; virtual bool IsVisible (cache::CacheKey aKey) SAL_OVERRIDE; virtual const SdrPage* GetPage (cache::CacheKey aKey) SAL_OVERRIDE; virtual ::boost::shared_ptr<std::vector<cache::CacheKey> > GetEntryList (bool bVisible) SAL_OVERRIDE; virtual sal_Int32 GetPriority (cache::CacheKey aKey) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference<com::sun::star::uno::XInterface> GetModel (void) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference<com::sun::star::uno::XInterface> GetModel() SAL_OVERRIDE; private: model::SlideSorterModel& mrModel; diff --git a/sd/source/ui/table/tableobjectbar.hxx b/sd/source/ui/table/tableobjectbar.hxx index b62a4f63236e..2fd290ae9383 100644 --- a/sd/source/ui/table/tableobjectbar.hxx +++ b/sd/source/ui/table/tableobjectbar.hxx @@ -46,7 +46,7 @@ private: public: TableObjectBar( ::sd::ViewShell* pSdViewShell, ::sd::View* pSdView); - virtual ~TableObjectBar (void); + virtual ~TableObjectBar(); void GetState( SfxItemSet& rSet ); void GetAttrState( SfxItemSet& rSet ); diff --git a/sd/source/ui/tools/AsynchronousCall.cxx b/sd/source/ui/tools/AsynchronousCall.cxx index 13b890406291..1a3639409570 100644 --- a/sd/source/ui/tools/AsynchronousCall.cxx +++ b/sd/source/ui/tools/AsynchronousCall.cxx @@ -23,7 +23,7 @@ namespace sd { namespace tools { -AsynchronousCall::AsynchronousCall (void) +AsynchronousCall::AsynchronousCall() : maTimer(), mpFunction() { @@ -31,7 +31,7 @@ AsynchronousCall::AsynchronousCall (void) maTimer.SetTimeoutHdl(aCallback); } -AsynchronousCall::~AsynchronousCall (void) +AsynchronousCall::~AsynchronousCall() { mpFunction.reset(); maTimer.Stop(); diff --git a/sd/source/ui/tools/ConfigurationAccess.cxx b/sd/source/ui/tools/ConfigurationAccess.cxx index eb22a2f663a6..565a152e3135 100644 --- a/sd/source/ui/tools/ConfigurationAccess.cxx +++ b/sd/source/ui/tools/ConfigurationAccess.cxx @@ -123,7 +123,7 @@ Any ConfigurationAccess::GetConfigurationNode ( return Any(); } -void ConfigurationAccess::CommitChanges (void) +void ConfigurationAccess::CommitChanges() { Reference<util::XChangesBatch> xConfiguration (mxRoot, UNO_QUERY); if (xConfiguration.is()) diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx index ede1c01f2abb..f23d9fd0a267 100644 --- a/sd/source/ui/tools/EventMultiplexer.cxx +++ b/sd/source/ui/tools/EventMultiplexer.cxx @@ -65,7 +65,7 @@ class EventMultiplexer::Implementation { public: Implementation (ViewShellBase& rBase); - virtual ~Implementation (void); + virtual ~Implementation(); void AddEventListener ( Link& rCallback, @@ -111,7 +111,7 @@ public: const ::com::sun::star::drawing::framework::ConfigurationChangeEvent& rEvent) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; protected: virtual void Notify ( @@ -140,10 +140,10 @@ private: ::com::sun::star::drawing::framework::XConfigurationController> mxConfigurationControllerWeak; - void ReleaseListeners (void); + void ReleaseListeners(); - void ConnectToController (void); - void DisconnectFromController (void); + void ConnectToController(); + void DisconnectFromController(); void CallListeners ( EventMultiplexerEvent::EventId eId, @@ -152,7 +152,7 @@ private: /** This method throws a DisposedException when the object has already been disposed. */ - void ThrowIfDisposed (void) + void ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException); DECL_LINK(SlideSorterSelectionChangeListener, void*); @@ -169,7 +169,7 @@ EventMultiplexer::EventMultiplexer (ViewShellBase& rBase) mpImpl->acquire(); } -EventMultiplexer::~EventMultiplexer (void) +EventMultiplexer::~EventMultiplexer() { try { @@ -278,13 +278,13 @@ EventMultiplexer::Implementation::Implementation (ViewShellBase& rBase) } } -EventMultiplexer::Implementation::~Implementation (void) +EventMultiplexer::Implementation::~Implementation() { DBG_ASSERT( !mbListeningToFrame, "sd::EventMultiplexer::Implementation::~Implementation(), disposing was not called!" ); } -void EventMultiplexer::Implementation::ReleaseListeners (void) +void EventMultiplexer::Implementation::ReleaseListeners() { if (mbListeningToFrame) { @@ -359,7 +359,7 @@ void EventMultiplexer::Implementation::RemoveEventListener ( } } -void EventMultiplexer::Implementation::ConnectToController (void) +void EventMultiplexer::Implementation::ConnectToController() { // Just in case that we missed some event we now disconnect from the old // controller. @@ -421,7 +421,7 @@ void EventMultiplexer::Implementation::ConnectToController (void) } } -void EventMultiplexer::Implementation::DisconnectFromController (void) +void EventMultiplexer::Implementation::DisconnectFromController() { if (mbListeningToController) { @@ -629,13 +629,13 @@ void SAL_CALL EventMultiplexer::Implementation::notifyConfigurationChange ( } -void SAL_CALL EventMultiplexer::Implementation::disposing (void) +void SAL_CALL EventMultiplexer::Implementation::disposing() { CallListeners (EventMultiplexerEvent::EID_DISPOSING); ReleaseListeners(); } -void EventMultiplexer::Implementation::ThrowIfDisposed (void) +void EventMultiplexer::Implementation::ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) diff --git a/sd/source/ui/tools/IconCache.cxx b/sd/source/ui/tools/IconCache.cxx index ae895876c912..54563201282f 100644 --- a/sd/source/ui/tools/IconCache.cxx +++ b/sd/source/ui/tools/IconCache.cxx @@ -65,7 +65,7 @@ Image IconCache::Implementation::GetIcon (sal_uInt16 nResourceId) //===== IconCache ============================================================= //static -IconCache& IconCache::Instance (void) +IconCache& IconCache::Instance() { if (Implementation::mpInstance == NULL) { @@ -95,12 +95,12 @@ Image IconCache::GetIcon (sal_uInt16 nResourceId) return mpImpl->GetIcon (nResourceId); } -IconCache::IconCache (void) +IconCache::IconCache() : mpImpl (new Implementation()) { } -IconCache::~IconCache (void) +IconCache::~IconCache() { // empty } diff --git a/sd/source/ui/tools/IdleDetection.cxx b/sd/source/ui/tools/IdleDetection.cxx index df7c23e337f1..ed16b2f92a3a 100644 --- a/sd/source/ui/tools/IdleDetection.cxx +++ b/sd/source/ui/tools/IdleDetection.cxx @@ -41,7 +41,7 @@ sal_Int32 IdleDetection::GetIdleState (const vcl::Window* pWindow) return nResult; } -sal_Int32 IdleDetection::CheckInputPending (void) +sal_Int32 IdleDetection::CheckInputPending() { if (Application::AnyInput(VclInputFlags::MOUSE | VclInputFlags::KEYBOARD | VclInputFlags::PAINT)) return IDET_SYSTEM_EVENT_PENDING; @@ -49,7 +49,7 @@ sal_Int32 IdleDetection::CheckInputPending (void) return IDET_IDLE; } -sal_Int32 IdleDetection::CheckSlideShowRunning (void) +sal_Int32 IdleDetection::CheckSlideShowRunning() { sal_Int32 eResult (IDET_IDLE); diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx index a43b9966c42b..bff275971dde 100644 --- a/sd/source/ui/tools/PreviewRenderer.cxx +++ b/sd/source/ui/tools/PreviewRenderer.cxx @@ -51,8 +51,8 @@ namespace { class ViewRedirector : public ::sdr::contact::ViewObjectContactRedirector { public: - ViewRedirector (void); - virtual ~ViewRedirector (void); + ViewRedirector(); + virtual ~ViewRedirector(); virtual drawinglayer::primitive2d::Primitive2DSequence createRedirectedPrimitive2DSequence( const sdr::contact::ViewObjectContact& rOriginal, const sdr::contact::DisplayInfo& rDisplayInfo) SAL_OVERRIDE; @@ -81,7 +81,7 @@ PreviewRenderer::PreviewRenderer ( } } -PreviewRenderer::~PreviewRenderer (void) +PreviewRenderer::~PreviewRenderer() { if (mpDocShellOfView != NULL) EndListening (*mpDocShellOfView); @@ -282,7 +282,7 @@ bool PreviewRenderer::Initialize ( return true; } -void PreviewRenderer::Cleanup (void) +void PreviewRenderer::Cleanup() { mpView->HideSdrPage(); } @@ -352,7 +352,7 @@ void PreviewRenderer::PaintSubstitutionText (const OUString& rSubstitutionText) } } -void PreviewRenderer::PaintFrame (void) +void PreviewRenderer::PaintFrame() { if (mbHasFrame) { @@ -505,11 +505,11 @@ void PreviewRenderer::Notify(SfxBroadcaster&, const SfxHint& rHint) namespace { -ViewRedirector::ViewRedirector (void) +ViewRedirector::ViewRedirector() { } -ViewRedirector::~ViewRedirector (void) +ViewRedirector::~ViewRedirector() { } diff --git a/sd/source/ui/tools/PropertySet.cxx b/sd/source/ui/tools/PropertySet.cxx index 66fecd19a58f..eb7c06d0b0fa 100644 --- a/sd/source/ui/tools/PropertySet.cxx +++ b/sd/source/ui/tools/PropertySet.cxx @@ -26,23 +26,23 @@ using namespace ::com::sun::star::uno; namespace sd { namespace tools { -PropertySet::PropertySet (void) +PropertySet::PropertySet() : PropertySetInterfaceBase(m_aMutex), mpChangeListeners(new ChangeListenerContainer()) { } -PropertySet::~PropertySet (void) +PropertySet::~PropertySet() { } -void SAL_CALL PropertySet::disposing (void) +void SAL_CALL PropertySet::disposing() { } //----- XPropertySet ---------------------------------------------------------- -Reference<beans::XPropertySetInfo> SAL_CALL PropertySet::getPropertySetInfo (void) +Reference<beans::XPropertySetInfo> SAL_CALL PropertySet::getPropertySetInfo() throw(RuntimeException, std::exception) { return NULL; @@ -173,7 +173,7 @@ void PropertySet::CallListeners ( } } -void PropertySet::ThrowIfDisposed (void) +void PropertySet::ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) diff --git a/sd/source/ui/tools/SdGlobalResourceContainer.cxx b/sd/source/ui/tools/SdGlobalResourceContainer.cxx index 7bc31789a6c9..88eab7dd0518 100644 --- a/sd/source/ui/tools/SdGlobalResourceContainer.cxx +++ b/sd/source/ui/tools/SdGlobalResourceContainer.cxx @@ -51,7 +51,7 @@ private: }; // static -SdGlobalResourceContainer& SdGlobalResourceContainer::Instance (void) +SdGlobalResourceContainer& SdGlobalResourceContainer::Instance() { DBG_ASSERT(Implementation::mpInstance!=NULL, "SdGlobalResourceContainer::Instance(): instance has been deleted"); @@ -125,13 +125,13 @@ void SdGlobalResourceContainer::AddResource (const Reference<XInterface>& rxReso } } -SdGlobalResourceContainer::SdGlobalResourceContainer (void) +SdGlobalResourceContainer::SdGlobalResourceContainer() : mpImpl (new SdGlobalResourceContainer::Implementation()) { Implementation::mpInstance = this; } -SdGlobalResourceContainer::~SdGlobalResourceContainer (void) +SdGlobalResourceContainer::~SdGlobalResourceContainer() { ::osl::MutexGuard aGuard (mpImpl->maMutex); diff --git a/sd/source/ui/tools/SlotStateListener.cxx b/sd/source/ui/tools/SlotStateListener.cxx index 1091a34dc4d8..017ff5e215ec 100644 --- a/sd/source/ui/tools/SlotStateListener.cxx +++ b/sd/source/ui/tools/SlotStateListener.cxx @@ -44,7 +44,7 @@ SlotStateListener::SlotStateListener ( ObserveSlot(rSlotName); } -SlotStateListener::~SlotStateListener (void) +SlotStateListener::~SlotStateListener() { ReleaseListeners(); } @@ -86,7 +86,7 @@ void SlotStateListener::ObserveSlot (const OUString& rSlotName) } } -void SlotStateListener::disposing (void) +void SlotStateListener::disposing() { ReleaseListeners(); mxDispatchProviderWeak = uno::WeakReference<frame::XDispatchProvider>(NULL); @@ -126,7 +126,7 @@ void SlotStateListener::statusChanged ( maCallback.Call(&sSlotName); } -void SlotStateListener::ReleaseListeners (void) +void SlotStateListener::ReleaseListeners() { if ( ! maRegisteredURLList.empty()) { @@ -151,7 +151,7 @@ void SAL_CALL SlotStateListener::disposing ( { } -void SlotStateListener::ThrowIfDisposed (void) +void SlotStateListener::ThrowIfDisposed() throw (lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) diff --git a/sd/source/ui/tools/TimerBasedTaskExecution.cxx b/sd/source/ui/tools/TimerBasedTaskExecution.cxx index 4525b36be635..03335f7e06e4 100644 --- a/sd/source/ui/tools/TimerBasedTaskExecution.cxx +++ b/sd/source/ui/tools/TimerBasedTaskExecution.cxx @@ -52,7 +52,7 @@ public: return pExecution; } -void TimerBasedTaskExecution::Release (void) +void TimerBasedTaskExecution::Release() { maTimer.Stop(); mpSelf.reset(); @@ -94,7 +94,7 @@ TimerBasedTaskExecution::TimerBasedTaskExecution ( maTimer.Start(); } -TimerBasedTaskExecution::~TimerBasedTaskExecution (void) +TimerBasedTaskExecution::~TimerBasedTaskExecution() { maTimer.Stop(); } diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index 71c1cc5b8904..f38f68e7ff48 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -81,7 +81,7 @@ DrawController::DrawController (ViewShellBase& rBase) throw() ProvideFrameworkControllers(); } -DrawController::~DrawController (void) throw() +DrawController::~DrawController() throw() { } @@ -106,7 +106,7 @@ IMPLEMENT_FORWARD_XINTERFACE2( // XTypeProvider -Sequence<Type> SAL_CALL DrawController::getTypes (void) +Sequence<Type> SAL_CALL DrawController::getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -127,7 +127,7 @@ IMPLEMENT_GET_IMPLEMENTATION_ID(DrawController); // XComponent -void SAL_CALL DrawController::dispose (void) +void SAL_CALL DrawController::dispose() throw( RuntimeException, std::exception ) { if( !mbDisposing ) @@ -219,7 +219,7 @@ sal_Bool SAL_CALL DrawController::supportsService (const OUString& rsServiceName return cppu::supportsService(this, rsServiceName); } -Sequence<OUString> SAL_CALL DrawController::getSupportedServiceNames (void) +Sequence<OUString> SAL_CALL DrawController::getSupportedServiceNames() throw(RuntimeException, std::exception) { ThrowIfDisposed(); @@ -325,7 +325,7 @@ void SAL_CALL DrawController::setCurrentPage( const Reference< drawing::XDrawPag mxSubController->setCurrentPage(xPage); } -Reference< drawing::XDrawPage > SAL_CALL DrawController::getCurrentPage (void) +Reference< drawing::XDrawPage > SAL_CALL DrawController::getCurrentPage() throw(RuntimeException, std::exception) { ThrowIfDisposed(); @@ -510,7 +510,7 @@ void DrawController::FirePropertyChange ( } -void DrawController::BroadcastContextChange (void) const +void DrawController::BroadcastContextChange() const { ::boost::shared_ptr<ViewShell> pViewShell (mpBase->GetMainViewShell()); if ( ! pViewShell) @@ -553,7 +553,7 @@ void DrawController::BroadcastContextChange (void) const ContextChangeEventMultiplexer::NotifyContextChange(mpBase, eContext); } -void DrawController::ReleaseViewShellBase (void) +void DrawController::ReleaseViewShellBase() { DisposeFrameworkControllers(); mpBase = NULL; @@ -562,7 +562,7 @@ void DrawController::ReleaseViewShellBase (void) //===== XControllerManager ============================================================== Reference<XConfigurationController> SAL_CALL - DrawController::getConfigurationController (void) + DrawController::getConfigurationController() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -571,7 +571,7 @@ Reference<XConfigurationController> SAL_CALL } Reference<XModuleController> SAL_CALL - DrawController::getModuleController (void) + DrawController::getModuleController() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -586,7 +586,7 @@ namespace class theDrawControllerUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theDrawControllerUnoTunnelId> {}; } -const Sequence<sal_Int8>& DrawController::getUnoTunnelId (void) +const Sequence<sal_Int8>& DrawController::getUnoTunnelId() { return theDrawControllerUnoTunnelId::get().getSeq(); } @@ -825,7 +825,7 @@ void DrawController::getFastPropertyValue ( } } -void DrawController::ProvideFrameworkControllers (void) +void DrawController::ProvideFrameworkControllers() { SolarMutexGuard aGuard; try @@ -847,7 +847,7 @@ void DrawController::ProvideFrameworkControllers (void) } } -void DrawController::DisposeFrameworkControllers (void) +void DrawController::DisposeFrameworkControllers() { Reference<XComponent> xComponent (mxModuleController, UNO_QUERY); if (xComponent.is()) @@ -858,7 +858,7 @@ void DrawController::DisposeFrameworkControllers (void) xComponent->dispose(); } -void DrawController::ThrowIfDisposed (void) const +void DrawController::ThrowIfDisposed() const throw (::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose || mbDisposing) diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx index c073db21d60e..88b478774ad9 100644 --- a/sd/source/ui/unoidl/SdUnoDrawView.cxx +++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx @@ -63,7 +63,7 @@ SdUnoDrawView::~SdUnoDrawView() throw() { } -bool SdUnoDrawView::getMasterPageMode(void) const throw() +bool SdUnoDrawView::getMasterPageMode() const throw() { return (mrDrawViewShell.GetEditMode() == EM_MASTERPAGE); } @@ -78,7 +78,7 @@ void SdUnoDrawView::setMasterPageMode (bool bMasterPageMode) throw() } } -bool SdUnoDrawView::getLayerMode(void) const throw() +bool SdUnoDrawView::getLayerMode() const throw() { return mrDrawViewShell.IsLayerModeActive(); } @@ -93,7 +93,7 @@ void SdUnoDrawView::setLayerMode (bool bLayerMode) throw() } } -Reference<drawing::XLayer> SdUnoDrawView::getActiveLayer (void) throw () +Reference<drawing::XLayer> SdUnoDrawView::getActiveLayer() throw () { Reference<drawing::XLayer> xCurrentLayer; @@ -456,7 +456,7 @@ Reference< drawing::XDrawPage > SAL_CALL SdUnoDrawView::getCurrentPage() return xPage; } -sal_Int16 SdUnoDrawView::GetZoom(void) const +sal_Int16 SdUnoDrawView::GetZoom() const { if (mrDrawViewShell.GetActiveWindow() ) { @@ -533,7 +533,7 @@ void SdUnoDrawView::SetZoomType ( sal_Int16 nType ) } } -SdXImpressDocument* SdUnoDrawView::GetModel (void) const throw() +SdXImpressDocument* SdUnoDrawView::GetModel() const throw() { if (mrView.GetDocSh()!=NULL) { diff --git a/sd/source/ui/unoidl/SdUnoOutlineView.cxx b/sd/source/ui/unoidl/SdUnoOutlineView.cxx index edc40f63c5e1..6068012cca77 100644 --- a/sd/source/ui/unoidl/SdUnoOutlineView.cxx +++ b/sd/source/ui/unoidl/SdUnoOutlineView.cxx @@ -43,11 +43,11 @@ SdUnoOutlineView::SdUnoOutlineView( { } -SdUnoOutlineView::~SdUnoOutlineView (void) throw() +SdUnoOutlineView::~SdUnoOutlineView() throw() { } -void SAL_CALL SdUnoOutlineView::disposing (void) +void SAL_CALL SdUnoOutlineView::disposing() { } @@ -94,7 +94,7 @@ void SAL_CALL SdUnoOutlineView::setCurrentPage ( mrOutlineViewShell.SetCurrentPage(pSdPage); } -Reference< drawing::XDrawPage > SAL_CALL SdUnoOutlineView::getCurrentPage (void) +Reference< drawing::XDrawPage > SAL_CALL SdUnoOutlineView::getCurrentPage() throw(RuntimeException, std::exception) { Reference<drawing::XDrawPage> xPage; diff --git a/sd/source/ui/unoidl/SdUnoSlideView.cxx b/sd/source/ui/unoidl/SdUnoSlideView.cxx index dc11cc2ad6a5..cd3a8b2f570e 100644 --- a/sd/source/ui/unoidl/SdUnoSlideView.cxx +++ b/sd/source/ui/unoidl/SdUnoSlideView.cxx @@ -44,7 +44,7 @@ SdUnoSlideView::SdUnoSlideView ( { } -SdUnoSlideView::~SdUnoSlideView (void) throw() +SdUnoSlideView::~SdUnoSlideView() throw() { } @@ -84,7 +84,7 @@ sal_Bool SAL_CALL SdUnoSlideView::select (const Any& aSelection) return bOk; } -Any SAL_CALL SdUnoSlideView::getSelection (void) +Any SAL_CALL SdUnoSlideView::getSelection() throw(RuntimeException, std::exception) { Any aResult; @@ -141,7 +141,7 @@ void SAL_CALL SdUnoSlideView::setCurrentPage ( } css::uno::Reference<css::drawing::XDrawPage > SAL_CALL - SdUnoSlideView::getCurrentPage (void) + SdUnoSlideView::getCurrentPage() throw(css::uno::RuntimeException, std::exception) { return mrSlideSorter.GetController().GetCurrentSlideManager()->GetCurrentSlide()->GetXDrawPage(); diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx index 05ca4eae7b1d..0a553f9222d8 100644 --- a/sd/source/ui/unoidl/facreg.cxx +++ b/sd/source/ui/unoidl/facreg.cxx @@ -47,7 +47,7 @@ typedef std::unordered_map<OUString, FactoryId, OUStringHash> FactoryMap; namespace { static ::boost::shared_ptr<FactoryMap> spFactoryMap; -::boost::shared_ptr<FactoryMap> GetFactoryMap (void) +::boost::shared_ptr<FactoryMap> GetFactoryMap() { if (spFactoryMap.get() == NULL) { diff --git a/sd/source/ui/unoidl/randomnode.cxx b/sd/source/ui/unoidl/randomnode.cxx index 05a460f967b2..3b4d83308cf0 100644 --- a/sd/source/ui/unoidl/randomnode.cxx +++ b/sd/source/ui/unoidl/randomnode.cxx @@ -89,7 +89,7 @@ public: // XServiceInfo OUString SAL_CALL getImplementationName() throw(std::exception) SAL_OVERRIDE; - Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(std::exception) SAL_OVERRIDE; + Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception) SAL_OVERRIDE; // XAnimationNode @@ -559,7 +559,7 @@ sal_Bool RandomAnimationNode::supportsService(const OUString& ServiceName) throw } // XServiceInfo -Sequence< OUString > RandomAnimationNode::getSupportedServiceNames(void) throw(std::exception) +Sequence< OUString > RandomAnimationNode::getSupportedServiceNames() throw(std::exception) { Sequence< OUString > aSeq( 2 ); aSeq[0] = "com.sun.star.animations.ParallelTimeContainer"; diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx index 802fe7e99e51..f4e294818d14 100644 --- a/sd/source/ui/unoidl/unolayer.cxx +++ b/sd/source/ui/unoidl/unolayer.cxx @@ -388,7 +388,7 @@ void SdLayer::set( LayerAttribute what, bool flag ) throw() } // ::com::sun::star::container::XChild -uno::Reference<uno::XInterface> SAL_CALL SdLayer::getParent (void) +uno::Reference<uno::XInterface> SAL_CALL SdLayer::getParent() throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/sd/source/ui/view/FormShellManager.cxx b/sd/source/ui/view/FormShellManager.cxx index 5a72e6691027..989790d0fb42 100644 --- a/sd/source/ui/view/FormShellManager.cxx +++ b/sd/source/ui/view/FormShellManager.cxx @@ -67,7 +67,7 @@ FormShellManager::FormShellManager (ViewShellBase& rBase) RegisterAtCenterPane(); } -FormShellManager::~FormShellManager (void) +FormShellManager::~FormShellManager() { SetFormShell(NULL); UnregisterAtCenterPane(); @@ -126,7 +126,7 @@ void FormShellManager::SetFormShell (FmFormShell* pFormShell) } } -void FormShellManager::RegisterAtCenterPane (void) +void FormShellManager::RegisterAtCenterPane() { ViewShell* pShell = mrBase.GetMainViewShell().get(); if (pShell == NULL) @@ -156,7 +156,7 @@ void FormShellManager::RegisterAtCenterPane (void) mrBase.GetViewShellManager()->ActivateSubShell(*pShell, RID_FORMLAYER_TOOLBOX); } -void FormShellManager::UnregisterAtCenterPane (void) +void FormShellManager::UnregisterAtCenterPane() { if (mpMainViewShellWindow != NULL) { diff --git a/sd/source/ui/view/GraphicViewShellBase.cxx b/sd/source/ui/view/GraphicViewShellBase.cxx index de893a1c45c4..02dee459801b 100644 --- a/sd/source/ui/view/GraphicViewShellBase.cxx +++ b/sd/source/ui/view/GraphicViewShellBase.cxx @@ -61,7 +61,7 @@ GraphicViewShellBase::GraphicViewShellBase ( { } -GraphicViewShellBase::~GraphicViewShellBase (void) +GraphicViewShellBase::~GraphicViewShellBase() { } @@ -93,7 +93,7 @@ void GraphicViewShellBase::Execute (SfxRequest& rRequest) } -void GraphicViewShellBase::InitializeFramework (void) +void GraphicViewShellBase::InitializeFramework() { com::sun::star::uno::Reference<com::sun::star::frame::XController> xController (GetController()); diff --git a/sd/source/ui/view/ImpressViewShellBase.cxx b/sd/source/ui/view/ImpressViewShellBase.cxx index 3bb4d592e285..531a0c8b8e9c 100644 --- a/sd/source/ui/view/ImpressViewShellBase.cxx +++ b/sd/source/ui/view/ImpressViewShellBase.cxx @@ -63,7 +63,7 @@ ImpressViewShellBase::ImpressViewShellBase ( MasterPageObserver::Instance().RegisterDocument (*GetDocShell()->GetDoc()); } -ImpressViewShellBase::~ImpressViewShellBase (void) +ImpressViewShellBase::~ImpressViewShellBase() { MasterPageObserver::Instance().UnregisterDocument (*GetDocShell()->GetDoc()); } @@ -86,7 +86,7 @@ void ImpressViewShellBase::Execute (SfxRequest& rRequest) } } -void ImpressViewShellBase::InitializeFramework (void) +void ImpressViewShellBase::InitializeFramework() { ::com::sun::star::uno::Reference<com::sun::star::frame::XController> xController (GetController()); diff --git a/sd/source/ui/view/OutlineViewShellBase.cxx b/sd/source/ui/view/OutlineViewShellBase.cxx index 5eae3be98e9f..625de08c2de6 100644 --- a/sd/source/ui/view/OutlineViewShellBase.cxx +++ b/sd/source/ui/view/OutlineViewShellBase.cxx @@ -59,7 +59,7 @@ OutlineViewShellBase::OutlineViewShellBase ( { } -OutlineViewShellBase::~OutlineViewShellBase (void) +OutlineViewShellBase::~OutlineViewShellBase() { } diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index 469d1f82905f..1a08634b5851 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -89,13 +89,13 @@ public: */ EditMode meOriginalEditMode; - Implementation (void); - ~Implementation (void); + Implementation(); + ~Implementation(); /** Return the OutlinerView that was provided by the last call to ProvideOutlinerView() (or NULL when there was no such call.) */ - OutlinerView* GetOutlinerView (void) { return mpOutlineView;} + OutlinerView* GetOutlinerView() { return mpOutlineView;} /** Provide in the member mpOutlineView an instance of OutlinerView that is either taken from the ViewShell, when it is an OutlineViewShell, @@ -108,7 +108,7 @@ public: /** This method is called when the OutlinerView is no longer used. */ - void ReleaseOutlinerView (void); + void ReleaseOutlinerView(); private: /** Flag that specifies whether we own the outline view pointed to by @@ -221,7 +221,7 @@ Outliner::Outliner( SdDrawDocument* pDoc, sal_uInt16 nMode ) } /// Nothing spectecular in the destructor. -Outliner::~Outliner (void) +Outliner::~Outliner() { mpImpl.reset(); } @@ -246,7 +246,7 @@ Outliner::~Outliner (void) directly operate on it. No switching into other views takes place.</li> </ol> */ -void Outliner::PrepareSpelling (void) +void Outliner::PrepareSpelling() { mbPrepareSpellingPending = false; @@ -277,7 +277,7 @@ void Outliner::PrepareSpelling (void) ClearModifyFlag(); } -void Outliner::StartSpelling (void) +void Outliner::StartSpelling() { meMode = SPELL; mbDirectionIsForward = true; @@ -293,7 +293,7 @@ void Outliner::StartSpelling(EditView& rView, unsigned char c) /** Free all resources acquired during the search/spell check. After a spell check the start position is restored here. */ -void Outliner::EndSpelling (void) +void Outliner::EndSpelling() { // Keep old view shell alive until we release the outliner view. ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock()); @@ -390,7 +390,7 @@ bool Outliner::SpellNextDocument() /** * check next text object */ -::svx::SpellPortions Outliner::GetNextSpellSentence (void) +::svx::SpellPortions Outliner::GetNextSpellSentence() { ::svx::SpellPortions aResult; @@ -580,7 +580,7 @@ void Outliner::Initialize (bool bDirectionIsForward) maLastValidPosition = *::sd::outliner::OutlinerContainer(this).current(); } -bool Outliner::SearchAndReplaceAll (void) +bool Outliner::SearchAndReplaceAll() { // Save the current position to be restored after having replaced all // matches. @@ -628,7 +628,7 @@ bool Outliner::SearchAndReplaceAll (void) return true; } -bool Outliner::SearchAndReplaceOnce (void) +bool Outliner::SearchAndReplaceOnce() { DetectChange (); @@ -722,7 +722,7 @@ bool Outliner::SearchAndReplaceOnce (void) /** Try to detect whether the document or the view (shell) has changed since the last time <member>StartSearchAndReplace()</member> has been called. */ -void Outliner::DetectChange (void) +void Outliner::DetectChange() { ::sd::outliner::IteratorPosition aPosition (maCurrentPosition); @@ -929,7 +929,7 @@ void Outliner::RestoreStartPosition() expressed by setting one of the flags <member>mbFoundObject</member> or <member>mbEndOfSearch</member> to <TRUE/>. */ -void Outliner::ProvideNextTextObject (void) +void Outliner::ProvideNextTextObject() { mbEndOfSearch = false; mbFoundObject = false; @@ -998,7 +998,7 @@ void Outliner::ProvideNextTextObject (void) while ( ! (mbFoundObject || mbEndOfSearch)); } -void Outliner::EndOfSearch (void) +void Outliner::EndOfSearch() { ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock()); if ( ! pViewShell) @@ -1048,7 +1048,7 @@ void Outliner::EndOfSearch (void) } } -void Outliner::ShowEndOfSearchDialog (void) +void Outliner::ShowEndOfSearchDialog() { OUString aString; if (meMode == SEARCH) @@ -1075,7 +1075,7 @@ void Outliner::ShowEndOfSearchDialog (void) mbWholeDocumentProcessed = true; } -bool Outliner::ShowWrapArroundDialog (void) +bool Outliner::ShowWrapArroundDialog() { bool bDoWrapArround = false; @@ -1148,7 +1148,7 @@ void Outliner::PutTextIntoOutliner() } } -void Outliner::PrepareSpellCheck (void) +void Outliner::PrepareSpellCheck() { EESpellState eState = HasSpellErrors(); DBG_ASSERT(eState != EE_SPELL_NOSPELLER, "No SpellChecker"); @@ -1181,7 +1181,7 @@ void Outliner::PrepareSpellCheck (void) } } -void Outliner::PrepareSearchAndReplace (void) +void Outliner::PrepareSearchAndReplace() { if (HasText( *mpSearchItem )) { @@ -1326,7 +1326,7 @@ IMPL_LINK_INLINE_START( Outliner, SpellError, void *, nLang ) } IMPL_LINK_INLINE_END( Outliner, SpellError, void *, nLang ) -ESelection Outliner::GetSearchStartPosition (void) +ESelection Outliner::GetSearchStartPosition() { ESelection aPosition; if (mbDirectionIsForward) @@ -1352,7 +1352,7 @@ ESelection Outliner::GetSearchStartPosition (void) return aPosition; } -bool Outliner::HasNoPreviousMatch (void) +bool Outliner::HasNoPreviousMatch() { OutlinerView* pOutlinerView = mpImpl->GetOutlinerView(); @@ -1363,7 +1363,7 @@ bool Outliner::HasNoPreviousMatch (void) return pOutlinerView->GetSelection().IsEqual(GetSearchStartPosition ()); } -bool Outliner::HandleFailedSearch (void) +bool Outliner::HandleFailedSearch() { bool bContinueSearch = false; @@ -1429,7 +1429,7 @@ void Outliner::SetViewShell (const ::boost::shared_ptr<ViewShell>& rpViewShell) } } -void Outliner::HandleChangedSelection (void) +void Outliner::HandleChangedSelection() { maMarkListCopy.clear(); mbRestrictSearchToSelection = mpView->AreObjectsMarked(); @@ -1482,7 +1482,7 @@ void Outliner::StartConversion( sal_Int16 nSourceLanguage, sal_Int16 nTargetLan /** Prepare to do a text conversion on the current text object. This includes putting it into edit mode. */ -void Outliner::PrepareConversion (void) +void Outliner::PrepareConversion() { SetUpdateMode(true); if( HasConvertibleTextPortion( mnConversionLanguage ) ) @@ -1503,7 +1503,7 @@ void Outliner::PrepareConversion (void) } } -void Outliner::BeginConversion (void) +void Outliner::BeginConversion() { SetRefDevice( SD_MOD()->GetRefDevice( *mpDrawDocument->GetDocSh() ) ); @@ -1617,14 +1617,14 @@ sal_uInt16 Outliner::ShowModalMessageBox (Dialog& rMessageBox) //===== Outliner::Implementation ============================================== -Outliner::Implementation::Implementation (void) +Outliner::Implementation::Implementation() : meOriginalEditMode(EM_PAGE), mbOwnOutlineView(false), mpOutlineView(NULL) { } -Outliner::Implementation::~Implementation (void) +Outliner::Implementation::~Implementation() { if (mbOwnOutlineView && mpOutlineView!=NULL) { @@ -1698,7 +1698,7 @@ void Outliner::Implementation::ProvideOutlinerView ( } } -void Outliner::Implementation::ReleaseOutlinerView (void) +void Outliner::Implementation::ReleaseOutlinerView() { if (mbOwnOutlineView) { diff --git a/sd/source/ui/view/OutlinerIterator.cxx b/sd/source/ui/view/OutlinerIterator.cxx index d755b92277ba..2fcd500b986f 100644 --- a/sd/source/ui/view/OutlinerIterator.cxx +++ b/sd/source/ui/view/OutlinerIterator.cxx @@ -36,7 +36,7 @@ namespace sd { namespace outliner { //===== IteratorPosition ====================================================== -IteratorPosition::IteratorPosition (void) +IteratorPosition::IteratorPosition() : mnText(0) , mnPageIndex(-1) , mePageKind(PK_STANDARD) @@ -53,7 +53,7 @@ IteratorPosition::IteratorPosition (const IteratorPosition& aPosition) { } -IteratorPosition::~IteratorPosition (void) +IteratorPosition::~IteratorPosition() { } @@ -145,7 +145,7 @@ bool Iterator::operator!= (const Iterator& rIterator) return ! operator==(rIterator); } -void Iterator::Reverse (void) +void Iterator::Reverse() { if (mpIterator != NULL) mpIterator->Reverse(); @@ -158,17 +158,17 @@ OutlinerContainer::OutlinerContainer (Outliner* pOutliner) { } -Iterator OutlinerContainer::begin (void) +Iterator OutlinerContainer::begin() { return CreateIterator (BEGIN); } -Iterator OutlinerContainer::end (void) +Iterator OutlinerContainer::end() { return CreateIterator (END); } -Iterator OutlinerContainer::current (void) +Iterator OutlinerContainer::current() { return CreateIterator (CURRENT); } @@ -398,7 +398,7 @@ IteratorImplBase::IteratorImplBase( SdDrawDocument* pDocument, maPosition.meEditMode = eEditMode; } -IteratorImplBase::~IteratorImplBase (void) +IteratorImplBase::~IteratorImplBase() {} bool IteratorImplBase::operator== (const IteratorImplBase& rIterator) const @@ -414,7 +414,7 @@ bool IteratorImplBase::IsEqual (const IteratorImplBase& rIterator, IteratorType return maPosition == rIterator.maPosition; } -const IteratorPosition& IteratorImplBase::GetPosition (void) +const IteratorPosition& IteratorImplBase::GetPosition() { return maPosition; } @@ -431,7 +431,7 @@ IteratorImplBase* IteratorImplBase::Clone (IteratorImplBase* pObject) const return pObject; } -void IteratorImplBase::Reverse (void) +void IteratorImplBase::Reverse() { mbDirectionIsForward = ! mbDirectionIsForward; } @@ -450,7 +450,7 @@ SelectionIteratorImpl::SelectionIteratorImpl ( { } -SelectionIteratorImpl::~SelectionIteratorImpl (void) +SelectionIteratorImpl::~SelectionIteratorImpl() {} IteratorImplBase* SelectionIteratorImpl::Clone (IteratorImplBase* pObject) const @@ -462,7 +462,7 @@ IteratorImplBase* SelectionIteratorImpl::Clone (IteratorImplBase* pObject) const return pIterator; } -void SelectionIteratorImpl::GotoNextText (void) +void SelectionIteratorImpl::GotoNextText() { SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( mrObjectList.at(mnObjectIndex).get() ); if (mbDirectionIsForward) @@ -510,7 +510,7 @@ void SelectionIteratorImpl::GotoNextText (void) } } -const IteratorPosition& SelectionIteratorImpl::GetPosition (void) +const IteratorPosition& SelectionIteratorImpl::GetPosition() { maPosition.mxObject = mrObjectList.at(mnObjectIndex); @@ -567,7 +567,7 @@ ViewIteratorImpl::ViewIteratorImpl ( SetPage (nPageIndex); } -ViewIteratorImpl::~ViewIteratorImpl (void) +ViewIteratorImpl::~ViewIteratorImpl() { } @@ -596,7 +596,7 @@ IteratorImplBase* ViewIteratorImpl::Clone (IteratorImplBase* pObject) const return pIterator; } -void ViewIteratorImpl::GotoNextText(void) +void ViewIteratorImpl::GotoNextText() { SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( maPosition.mxObject.get() ); if( pTextObj ) @@ -700,7 +700,7 @@ void ViewIteratorImpl::SetPage (sal_Int32 nPageIndex) } -void ViewIteratorImpl::Reverse (void) +void ViewIteratorImpl::Reverse() { IteratorImplBase::Reverse (); @@ -740,7 +740,7 @@ DocumentIteratorImpl::DocumentIteratorImpl ( mnPageCount = pDocument->GetMasterSdPageCount(ePageKind); } -DocumentIteratorImpl::~DocumentIteratorImpl (void) +DocumentIteratorImpl::~DocumentIteratorImpl() {} IteratorImplBase* DocumentIteratorImpl::Clone (IteratorImplBase* pObject) const @@ -754,7 +754,7 @@ IteratorImplBase* DocumentIteratorImpl::Clone (IteratorImplBase* pObject) const return ViewIteratorImpl::Clone (pIterator); } -void DocumentIteratorImpl::GotoNextText (void) +void DocumentIteratorImpl::GotoNextText() { bool bSetToOnePastLastPage = false; bool bViewChanged = false; diff --git a/sd/source/ui/view/PresentationViewShellBase.cxx b/sd/source/ui/view/PresentationViewShellBase.cxx index 00b0f73deb5d..a5173da3a559 100644 --- a/sd/source/ui/view/PresentationViewShellBase.cxx +++ b/sd/source/ui/view/PresentationViewShellBase.cxx @@ -80,11 +80,11 @@ PresentationViewShellBase::PresentationViewShellBase ( } } -PresentationViewShellBase::~PresentationViewShellBase (void) +PresentationViewShellBase::~PresentationViewShellBase() { } -void PresentationViewShellBase::InitializeFramework (void) +void PresentationViewShellBase::InitializeFramework() { com::sun::star::uno::Reference<com::sun::star::frame::XController> xController (GetController()); diff --git a/sd/source/ui/view/SlideSorterViewShellBase.cxx b/sd/source/ui/view/SlideSorterViewShellBase.cxx index 97fa71d43f75..21a26baf0163 100644 --- a/sd/source/ui/view/SlideSorterViewShellBase.cxx +++ b/sd/source/ui/view/SlideSorterViewShellBase.cxx @@ -61,7 +61,7 @@ SlideSorterViewShellBase::SlideSorterViewShellBase ( { } -SlideSorterViewShellBase::~SlideSorterViewShellBase (void) +SlideSorterViewShellBase::~SlideSorterViewShellBase() { } diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index 69dfe86f9a7c..3b5b281b13de 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -61,7 +61,7 @@ class LayouterLock { public: LayouterLock (const Reference<frame::XLayoutManager>& rxLayouter); - ~LayouterLock (void); + ~LayouterLock(); private: Reference<frame::XLayoutManager> mxLayouter; }; @@ -74,7 +74,7 @@ typedef ::std::vector<OUString> NameList; class ToolBarList { public: - ToolBarList (void); + ToolBarList(); void ClearGroup (sd::ToolBarManager::ToolBarGroup eGroup); void AddToolBar (sd::ToolBarManager::ToolBarGroup eGroup, const OUString& rsName); @@ -85,7 +85,7 @@ public: void MarkToolBarAsActive (const OUString& rsName); void MarkToolBarAsNotActive (const OUString& rsName); - void MarkAllToolBarsAsNotActive (void); + void MarkAllToolBarsAsNotActive(); private: typedef ::std::map<sd::ToolBarManager::ToolBarGroup,NameList> Groups; @@ -116,7 +116,7 @@ public: /** Create a new object with an empty current list and an empty requested list. */ - ToolBarShellList (void); + ToolBarShellList(); /** Remove all shells from a group. Calling this method should normally not be necessary because after the construction or after a call to @@ -247,12 +247,12 @@ public: const ::boost::shared_ptr<sd::tools::EventMultiplexer>& rpMultiplexer, const ::boost::shared_ptr<ViewShellManager>& rpViewShellManager, const ::boost::shared_ptr<ToolBarManager>& rpToolBarManager); - ~Implementation (void); + ~Implementation(); void SetValid (bool bValid); void ResetToolBars (ToolBarGroup eGroup); - void ResetAllToolBars (void); + void ResetAllToolBars(); void AddToolBar (ToolBarGroup eGroup, const OUString& rsToolBarName); void AddToolBarShell (ToolBarGroup eGroup, ShellId nToolBarId); void RemoveToolBar (ToolBarGroup eGroup, const OUString& rsToolBarName); @@ -263,14 +263,14 @@ public: shells are destroyed anyway and without calling this method they would still be referenced. */ - void ReleaseAllToolBarShells (void); + void ReleaseAllToolBarShells(); - void ToolBarsDestroyed(void); + void ToolBarsDestroyed(); - void RequestUpdate (void); + void RequestUpdate(); - void PreUpdate (void); - void PostUpdate (void); + void PreUpdate(); + void PostUpdate(); /** Tell the XLayoutManager about the tool bars that we would like to be shown. @param rpLayouterLock @@ -285,16 +285,16 @@ public: public: UpdateLockImplementation (Implementation& rImplementation) : mrImplementation(rImplementation) { mrImplementation.LockUpdate(); } - ~UpdateLockImplementation (void) { mrImplementation.UnlockUpdate(); } + ~UpdateLockImplementation() { mrImplementation.UnlockUpdate(); } private: Implementation& mrImplementation; }; - void LockViewShellManager (void); - void LockUpdate (void); - void UnlockUpdate (void); + void LockViewShellManager(); + void LockUpdate(); + void UnlockUpdate(); - ToolBarRules& GetToolBarRules (void) { return maToolBarRules;} + ToolBarRules& GetToolBarRules() { return maToolBarRules;} private: const static OUString msToolBarResourcePrefix; @@ -358,16 +358,16 @@ const OUString ToolBarManager::msTableObjectBar("tableobjectbar"); return pManager; } -ToolBarManager::ToolBarManager (void) +ToolBarManager::ToolBarManager() : mpImpl() { } -ToolBarManager::~ToolBarManager (void) +ToolBarManager::~ToolBarManager() { } -void ToolBarManager::Shutdown (void) +void ToolBarManager::Shutdown() { if (mpImpl.get() != NULL) mpImpl.reset(); @@ -382,7 +382,7 @@ void ToolBarManager::ResetToolBars (ToolBarGroup eGroup) } } -void ToolBarManager::ResetAllToolBars (void) +void ToolBarManager::ResetAllToolBars() { if (mpImpl.get() != NULL) { @@ -448,31 +448,31 @@ void ToolBarManager::SetToolBarShell ( } } -void ToolBarManager::PreUpdate (void) +void ToolBarManager::PreUpdate() { if (mpImpl.get()!=NULL) mpImpl->PreUpdate(); } -void ToolBarManager::RequestUpdate (void) +void ToolBarManager::RequestUpdate() { if (mpImpl.get()!=NULL) mpImpl->RequestUpdate(); } -void ToolBarManager::LockViewShellManager (void) +void ToolBarManager::LockViewShellManager() { if (mpImpl.get() != NULL) mpImpl->LockViewShellManager(); } -void ToolBarManager::LockUpdate (void) +void ToolBarManager::LockUpdate() { if (mpImpl.get()!=NULL) mpImpl->LockUpdate(); } -void ToolBarManager::UnlockUpdate (void) +void ToolBarManager::UnlockUpdate() { if (mpImpl.get()!=NULL) mpImpl->UnlockUpdate(); @@ -504,7 +504,7 @@ void ToolBarManager::SelectionHasChanged ( mpImpl->GetToolBarRules().SelectionHasChanged(rViewShell,rView); } -void ToolBarManager::ToolBarsDestroyed(void) +void ToolBarManager::ToolBarsDestroyed() { if (mpImpl.get() != NULL) mpImpl->ToolBarsDestroyed(); @@ -548,7 +548,7 @@ ToolBarManager::Implementation::Implementation ( First unregister listeners, which may post user events. Then remove pending user events. */ -ToolBarManager::Implementation::~Implementation (void) +ToolBarManager::Implementation::~Implementation() { // Unregister at broadcasters. Link aLink (LINK(this,ToolBarManager::Implementation,EventMultiplexerCallback)); @@ -561,7 +561,7 @@ ToolBarManager::Implementation::~Implementation (void) Application::RemoveUserEvent(mnPendingSetValidCall); } -void ToolBarManager::Implementation::ToolBarsDestroyed(void) +void ToolBarManager::Implementation::ToolBarsDestroyed() { maToolBarList.MarkAllToolBarsAsNotActive(); } @@ -610,7 +610,7 @@ void ToolBarManager::Implementation::ResetToolBars (ToolBarGroup eGroup) mbPreUpdatePending = true; } -void ToolBarManager::Implementation::ResetAllToolBars (void) +void ToolBarManager::Implementation::ResetAllToolBars() { SAL_INFO("sd.view", OSL_THIS_FUNC << ": resetting all tool bars"); for (int i=TBG__FIRST; i<=TBG__LAST; ++i) @@ -659,13 +659,13 @@ void ToolBarManager::Implementation::AddToolBarShell ( } } -void ToolBarManager::Implementation::ReleaseAllToolBarShells (void) +void ToolBarManager::Implementation::ReleaseAllToolBarShells() { maToolBarShellList.ReleaseAllShells(GetToolBarRules()); maToolBarShellList.UpdateShells(mrBase.GetMainViewShell(), mrBase.GetViewShellManager()); } -void ToolBarManager::Implementation::RequestUpdate (void) +void ToolBarManager::Implementation::RequestUpdate() { if (mnPendingUpdateCall == 0) { @@ -674,7 +674,7 @@ void ToolBarManager::Implementation::RequestUpdate (void) } } -void ToolBarManager::Implementation::PreUpdate (void) +void ToolBarManager::Implementation::PreUpdate() { ::osl::MutexGuard aGuard(maMutex); @@ -706,7 +706,7 @@ void ToolBarManager::Implementation::PreUpdate (void) } } -void ToolBarManager::Implementation::PostUpdate (void) +void ToolBarManager::Implementation::PostUpdate() { ::osl::MutexGuard aGuard(maMutex); @@ -737,14 +737,14 @@ void ToolBarManager::Implementation::PostUpdate (void) } } -void ToolBarManager::Implementation::LockViewShellManager (void) +void ToolBarManager::Implementation::LockViewShellManager() { if (mpViewShellManagerLock.get() == NULL) mpViewShellManagerLock.reset( new ViewShellManager::UpdateLock(mrBase.GetViewShellManager())); } -void ToolBarManager::Implementation::LockUpdate (void) +void ToolBarManager::Implementation::LockUpdate() { SAL_INFO("sd.view", OSL_THIS_FUNC << ": LockUpdate " << mnLockCount); ::osl::MutexGuard aGuard(maMutex); @@ -759,7 +759,7 @@ void ToolBarManager::Implementation::LockUpdate (void) ++mnLockCount; } -void ToolBarManager::Implementation::UnlockUpdate (void) +void ToolBarManager::Implementation::UnlockUpdate() { SAL_INFO("sd.view", OSL_THIS_FUNC << ": UnlockUpdate " << mnLockCount); ::osl::MutexGuard aGuard(maMutex); @@ -951,7 +951,7 @@ LayouterLock::LayouterLock (const Reference<frame::XLayoutManager>& rxLayouter) mxLayouter->lock(); } -LayouterLock::~LayouterLock (void) +LayouterLock::~LayouterLock() { SAL_INFO("sd.view", OSL_THIS_FUNC << ": ~LayouterLock " << (mxLayouter.is() ? 1 :0)); if (mxLayouter.is()) @@ -1204,7 +1204,7 @@ void ToolBarRules::SubShellRemoved ( //===== ToolBarList =========================================================== -ToolBarList::ToolBarList (void) +ToolBarList::ToolBarList() : maGroups(), maActiveToolBars() { @@ -1316,7 +1316,7 @@ void ToolBarList::MarkToolBarAsNotActive (const OUString& rsName) ::std::find(maActiveToolBars.begin(),maActiveToolBars.end(), rsName)); } -void ToolBarList::MarkAllToolBarsAsNotActive (void) +void ToolBarList::MarkAllToolBarsAsNotActive() { maActiveToolBars.clear(); } @@ -1331,7 +1331,7 @@ ToolBarShellList::ShellDescriptor::ShellDescriptor ( { } -ToolBarShellList::ToolBarShellList (void) +ToolBarShellList::ToolBarShellList() : maNewList() , maCurrentList() { diff --git a/sd/source/ui/view/ViewClipboard.cxx b/sd/source/ui/view/ViewClipboard.cxx index a699cfdc3635..063dfaf69ff0 100644 --- a/sd/source/ui/view/ViewClipboard.cxx +++ b/sd/source/ui/view/ViewClipboard.cxx @@ -41,7 +41,7 @@ ViewClipboard::ViewClipboard (::sd::View& rView) { } -ViewClipboard::~ViewClipboard (void) +ViewClipboard::~ViewClipboard() { } diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 1f175917e4da..7f55add6c3fd 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -146,9 +146,9 @@ public: ::boost::shared_ptr<FormShellManager> mpFormShellManager; Implementation (ViewShellBase& rBase); - ~Implementation (void); + ~Implementation(); - void LateInit (void); + void LateInit(); /** Show or hide the ViewTabBar. @param bShow @@ -182,7 +182,7 @@ public: void GetSlotState (SfxItemSet& rSet); - void ProcessRestoreEditingViewSlot (void); + void ProcessRestoreEditingViewSlot(); private: ViewShellBase& mrBase; @@ -203,7 +203,7 @@ class FocusForwardingWindow : public vcl::Window { public: FocusForwardingWindow (vcl::Window& rParentWindow, ViewShellBase& rBase); - virtual ~FocusForwardingWindow (void); + virtual ~FocusForwardingWindow(); virtual void KeyInput (const KeyEvent& rEvent) SAL_OVERRIDE; virtual void Command (const CommandEvent& rEvent) SAL_OVERRIDE; @@ -262,7 +262,7 @@ ViewShellBase::ViewShellBase ( (and/or being prepared to being destroyed) is important. Change it only when you know what you are doing. */ -ViewShellBase::~ViewShellBase (void) +ViewShellBase::~ViewShellBase() { // Tell the controller that the ViewShellBase is not available anymore. if (mpImpl->mpController.get() != NULL) @@ -360,12 +360,12 @@ void ViewShellBase::LateInit (const OUString& rsDefaultView) } } -::boost::shared_ptr<ViewShellManager> ViewShellBase::GetViewShellManager (void) const +::boost::shared_ptr<ViewShellManager> ViewShellBase::GetViewShellManager() const { return mpImpl->mpViewShellManager; } -::boost::shared_ptr<ViewShell> ViewShellBase::GetMainViewShell (void) const +::boost::shared_ptr<ViewShell> ViewShellBase::GetMainViewShell() const { ::boost::shared_ptr<ViewShell> pMainViewShell ( framework::FrameworkHelper::Instance(*const_cast<ViewShellBase*>(this)) @@ -418,7 +418,7 @@ void ViewShellBase::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) } } -void ViewShellBase::InitializeFramework (void) +void ViewShellBase::InitializeFramework() { } @@ -465,7 +465,7 @@ void ViewShellBase::OuterResizePixel (const Point& rOrigin, const Size &rSize) mpImpl->ResizePixel (rOrigin, rSize, true); } -void ViewShellBase::Rearrange (void) +void ViewShellBase::Rearrange() { OSL_ASSERT(GetViewFrame()!=NULL); @@ -497,7 +497,7 @@ ErrCode ViewShellBase::DoVerb (long nVerb) return aResult; } -Reference<view::XRenderable> ViewShellBase::GetRenderable (void) +Reference<view::XRenderable> ViewShellBase::GetRenderable() { // Create a new DocumentRenderer on every call. It observes the life // time of this ViewShellBase object. @@ -782,7 +782,7 @@ void ViewShellBase::ReadUserData (const OUString& rString, bool bBrowse) pShell->ReadUserData (rString); } -SdrView* ViewShellBase::GetDrawView (void) const +SdrView* ViewShellBase::GetDrawView() const { // Forward call to main sub shell. ViewShell* pShell = GetMainViewShell().get(); @@ -841,7 +841,7 @@ void ViewShellBase::ShowUIControls (bool bVisible) Rearrange(); } -OUString ViewShellBase::GetInitialViewShellType (void) +OUString ViewShellBase::GetInitialViewShellType() { OUString sRequestedView (FrameworkHelper::msImpressViewURL); @@ -912,7 +912,7 @@ void ViewShellBase::StartPresentation() GetViewFrame()->GetDispatcher()->Execute(SID_PRESENTATION, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD ); } -::boost::shared_ptr<tools::EventMultiplexer> ViewShellBase::GetEventMultiplexer (void) +::boost::shared_ptr<tools::EventMultiplexer> ViewShellBase::GetEventMultiplexer() { OSL_ASSERT(mpImpl.get()!=NULL); OSL_ASSERT(mpImpl->mpEventMultiplexer.get()!=NULL); @@ -920,12 +920,12 @@ void ViewShellBase::StartPresentation() return mpImpl->mpEventMultiplexer; } -const Rectangle& ViewShellBase::getClientRectangle (void) const +const Rectangle& ViewShellBase::getClientRectangle() const { return mpImpl->maClientArea; } -::boost::shared_ptr<ToolBarManager> ViewShellBase::GetToolBarManager (void) const +::boost::shared_ptr<ToolBarManager> ViewShellBase::GetToolBarManager() const { OSL_ASSERT(mpImpl.get()!=NULL); OSL_ASSERT(mpImpl->mpToolBarManager.get()!=NULL); @@ -933,7 +933,7 @@ const Rectangle& ViewShellBase::getClientRectangle (void) const return mpImpl->mpToolBarManager; } -::boost::shared_ptr<FormShellManager> ViewShellBase::GetFormShellManager (void) const +::boost::shared_ptr<FormShellManager> ViewShellBase::GetFormShellManager() const { OSL_ASSERT(mpImpl.get()!=NULL); OSL_ASSERT(mpImpl->mpFormShellManager.get()!=NULL); @@ -941,7 +941,7 @@ const Rectangle& ViewShellBase::getClientRectangle (void) const return mpImpl->mpFormShellManager; } -DrawController& ViewShellBase::GetDrawController (void) const +DrawController& ViewShellBase::GetDrawController() const { OSL_ASSERT(mpImpl.get()!=NULL); @@ -955,7 +955,7 @@ void ViewShellBase::SetViewTabBar (const ::rtl::Reference<ViewTabBar>& rViewTabB mpImpl->mpViewTabBar = rViewTabBar; } -::vcl::Window* ViewShellBase::GetViewWindow (void) +::vcl::Window* ViewShellBase::GetViewWindow() { OSL_ASSERT(mpImpl.get()!=NULL); @@ -1023,7 +1023,7 @@ ViewShellBase::Implementation::Implementation (ViewShellBase& rBase) { } -ViewShellBase::Implementation::~Implementation (void) +ViewShellBase::Implementation::~Implementation() { mpController = NULL; mpViewTabBar = NULL; @@ -1031,12 +1031,12 @@ ViewShellBase::Implementation::~Implementation (void) mpToolBarManager.reset(); } -void ViewShellBase::Implementation::LateInit (void) +void ViewShellBase::Implementation::LateInit() { mpController = new DrawController(mrBase); } -void ViewShellBase::Implementation::ProcessRestoreEditingViewSlot (void) +void ViewShellBase::Implementation::ProcessRestoreEditingViewSlot() { ViewShell* pViewShell = mrBase.GetMainViewShell().get(); if (pViewShell != NULL) @@ -1383,7 +1383,7 @@ FocusForwardingWindow::FocusForwardingWindow ( SAL_INFO("sd.view", "created FocusForwardingWindow at " << this); } -FocusForwardingWindow::~FocusForwardingWindow (void) +FocusForwardingWindow::~FocusForwardingWindow() { SAL_INFO("sd.view", "destroyed FocusForwardingWindow at " << this); } diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index b7e5f322d03d..727b7c7b801b 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -73,7 +73,7 @@ ViewShell::Implementation::Implementation (ViewShell& rViewShell) { } -ViewShell::Implementation::~Implementation (void) +ViewShell::Implementation::~Implementation() { if ( ! mpUpdateLockForMouse.expired()) { @@ -281,7 +281,7 @@ void ViewShell::Implementation::AssignLayout ( SfxRequest& rRequest, PageKind eP } } -sal_uInt16 ViewShell::Implementation::GetViewId (void) +sal_uInt16 ViewShell::Implementation::GetViewId() { switch (mrViewShell.GetShellType()) { @@ -312,7 +312,7 @@ sal_uInt16 ViewShell::Implementation::GetViewId (void) } } -SvxIMapDlg* ViewShell::Implementation::GetImageMapDialog (void) +SvxIMapDlg* ViewShell::Implementation::GetImageMapDialog() { SvxIMapDlg* pDialog = NULL; SfxChildWindow* pChildWindow = SfxViewFrame::Current()->GetChildWindow( @@ -376,7 +376,7 @@ void ViewShell::Implementation::ToolBarManagerLock::Release (bool bForce) } } -ViewShell::Implementation::ToolBarManagerLock::~ToolBarManagerLock (void) +ViewShell::Implementation::ToolBarManagerLock::~ToolBarManagerLock() { mpLock.reset(); } diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx index 4587c0550e27..f6e3b11be435 100644 --- a/sd/source/ui/view/ViewShellManager.cxx +++ b/sd/source/ui/view/ViewShellManager.cxx @@ -58,8 +58,8 @@ public: ShellDescriptor (SfxShell* pShell, ShellId nId); ShellDescriptor (const ShellDescriptor& rDescriptor); ShellDescriptor& operator= (const ShellDescriptor& rDescriptor); - bool IsMainViewShell (void) const; - ::vcl::Window* GetWindow (void) const; + bool IsMainViewShell() const; + ::vcl::Window* GetWindow() const; }; /** This functor can be used to search for a shell in an STL container when the @@ -96,7 +96,7 @@ public: Implementation ( ViewShellManager& rManager, ViewShellBase& rBase); - ~Implementation (void); + ~Implementation(); void AddShellFactory ( const SfxShell* pViewShell, @@ -115,9 +115,9 @@ public: void DeactivateSubShell (const SfxShell& rParentShell, ShellId nId); void MoveToTop (const SfxShell& rParentShell); SfxShell* GetShell (ShellId nId) const; - SfxShell* GetTopShell (void) const; - SfxShell* GetTopViewShell (void) const; - void Shutdown (void); + SfxShell* GetTopShell() const; + SfxShell* GetTopViewShell() const; + void Shutdown(); void InvalidateAllSubShells (const SfxShell* pParentShell); /** Remove all shells from the SFX stack above and including the given @@ -129,7 +129,7 @@ public: { public: UpdateLock (Implementation& rImpl) : mrImpl(rImpl) {mrImpl.LockUpdate();} - ~UpdateLock (void) {mrImpl.UnlockUpdate();}; + ~UpdateLock() {mrImpl.UnlockUpdate();}; private: Implementation& mrImpl; }; @@ -140,13 +140,13 @@ public: to the shell stack to prevent multiple rebuilds of the shell stack and resulting broadcasts. */ - void LockUpdate (void); + void LockUpdate(); /** Allow updates of the shell stack. This method has to be called the same number of times as LockUpdate() to really allow a rebuild of the shell stack. */ - void UnlockUpdate (void); + void UnlockUpdate(); private: ViewShellBase& mrBase; @@ -195,9 +195,9 @@ private: SfxShell* mpTopViewShell; - void UpdateShellStack (void); + void UpdateShellStack(); - void CreateShells (void); + void CreateShells(); /** This method rebuilds the stack of shells that are stacked upon the view shell base. @@ -208,7 +208,7 @@ private: #if OSL_DEBUG_LEVEL >= 2 void DumpShellStack (const ShellStack& rStack); - void DumpSfxShellStack (void); + void DumpSfxShellStack(); #endif /** To be called before a shell is taken fom the SFX shell stack. This @@ -237,7 +237,7 @@ ViewShellManager::ViewShellManager (ViewShellBase& rBase) { } -ViewShellManager::~ViewShellManager (void) +ViewShellManager::~ViewShellManager() { } @@ -322,7 +322,7 @@ SfxShell* ViewShellManager::GetShell (ShellId nId) const return NULL; } -SfxShell* ViewShellManager::GetTopShell (void) const +SfxShell* ViewShellManager::GetTopShell() const { if (mbValid) return mpImpl->GetTopShell(); @@ -330,7 +330,7 @@ SfxShell* ViewShellManager::GetTopShell (void) const return NULL; } -SfxShell* ViewShellManager::GetTopViewShell (void) const +SfxShell* ViewShellManager::GetTopViewShell() const { if (mbValid) return mpImpl->GetTopViewShell(); @@ -338,7 +338,7 @@ SfxShell* ViewShellManager::GetTopViewShell (void) const return NULL; } -void ViewShellManager::Shutdown (void) +void ViewShellManager::Shutdown() { if (mbValid) { @@ -347,12 +347,12 @@ void ViewShellManager::Shutdown (void) } } -void ViewShellManager::LockUpdate (void) +void ViewShellManager::LockUpdate() { mpImpl->LockUpdate(); } -void ViewShellManager::UnlockUpdate (void) +void ViewShellManager::UnlockUpdate() { mpImpl->UnlockUpdate(); } @@ -378,7 +378,7 @@ ViewShellManager::Implementation::Implementation ( (void)rManager; } -ViewShellManager::Implementation::~Implementation (void) +ViewShellManager::Implementation::~Implementation() { Shutdown(); } @@ -712,23 +712,23 @@ SfxShell* ViewShellManager::Implementation::GetShell (ShellId nId) const return pShell; } -SfxShell* ViewShellManager::Implementation::GetTopShell (void) const +SfxShell* ViewShellManager::Implementation::GetTopShell() const { OSL_ASSERT(mpTopShell == mrBase.GetSubShell(0)); return mpTopShell; } -SfxShell* ViewShellManager::Implementation::GetTopViewShell (void) const +SfxShell* ViewShellManager::Implementation::GetTopViewShell() const { return mpTopViewShell; } -void ViewShellManager::Implementation::LockUpdate (void) +void ViewShellManager::Implementation::LockUpdate() { mnUpdateLockCount++; } -void ViewShellManager::Implementation::UnlockUpdate (void) +void ViewShellManager::Implementation::UnlockUpdate() { ::osl::MutexGuard aGuard (maMutex); @@ -753,7 +753,7 @@ void ViewShellManager::Implementation::UnlockUpdate (void) 6. Push all shells of the internal stack on the SFX shell stack that are not already present on the later. */ -void ViewShellManager::Implementation::UpdateShellStack (void) +void ViewShellManager::Implementation::UpdateShellStack() { ::osl::MutexGuard aGuard (maMutex); @@ -916,7 +916,7 @@ void ViewShellManager::Implementation::TakeShellsFromStack (const SfxShell* pShe #endif } -void ViewShellManager::Implementation::CreateShells (void) +void ViewShellManager::Implementation::CreateShells() { ::osl::MutexGuard aGuard (maMutex); @@ -1115,7 +1115,7 @@ void ViewShellManager::Implementation::InvalidateAllSubShells (const SfxShell* p } } -void ViewShellManager::Implementation::Shutdown (void) +void ViewShellManager::Implementation::Shutdown() { ::osl::MutexGuard aGuard (maMutex); @@ -1161,7 +1161,7 @@ void ViewShellManager::Implementation::DumpShellStack (const ShellStack& rStack) SAL_INFO("sd.view", OSL_THIS_FUNC << " null"); } -void ViewShellManager::Implementation::DumpSfxShellStack (void) +void ViewShellManager::Implementation::DumpSfxShellStack() { ShellStack aSfxShellStack; sal_uInt16 nIndex (0); @@ -1212,7 +1212,7 @@ void ViewShellManager::Implementation::SetFormShell ( namespace { -ShellDescriptor::ShellDescriptor (void) +ShellDescriptor::ShellDescriptor() : mpShell(NULL), mnId(0), mpFactory(), @@ -1250,7 +1250,7 @@ ShellDescriptor& ShellDescriptor::operator= (const ShellDescriptor& rDescriptor) return *this; } -bool ShellDescriptor::IsMainViewShell (void) const +bool ShellDescriptor::IsMainViewShell() const { ViewShell* pViewShell = dynamic_cast<ViewShell*>(mpShell); if (pViewShell != NULL) @@ -1259,7 +1259,7 @@ bool ShellDescriptor::IsMainViewShell (void) const return false; } -vcl::Window* ShellDescriptor::GetWindow (void) const +vcl::Window* ShellDescriptor::GetWindow() const { ViewShell* pViewShell = dynamic_cast<ViewShell*>(mpShell); if (pViewShell != NULL) diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx index 1cc8abaecd88..f8ca2e57aae2 100644 --- a/sd/source/ui/view/ViewTabBar.cxx +++ b/sd/source/ui/view/ViewTabBar.cxx @@ -71,7 +71,7 @@ public: vcl::Window* pParentWindow, const ::rtl::Reference<ViewTabBar>& rpViewTabBar); virtual void Paint (const Rectangle& rRect) SAL_OVERRIDE; - virtual void ActivatePage (void) SAL_OVERRIDE; + virtual void ActivatePage() SAL_OVERRIDE; private: ::rtl::Reference<ViewTabBar> mpViewTabBar; }; @@ -134,11 +134,11 @@ ViewTabBar::ViewTabBar ( } } -ViewTabBar::~ViewTabBar (void) +ViewTabBar::~ViewTabBar() { } -void ViewTabBar::disposing (void) +void ViewTabBar::disposing() { if (mpViewShellBase != NULL && mxViewTabBarId->isBoundToURL( @@ -295,7 +295,7 @@ sal_Bool SAL_CALL ViewTabBar::hasTabBarButton (const TabBarButton& rButton) return HasTabBarButton(rButton); } -Sequence<TabBarButton> SAL_CALL ViewTabBar::getTabBarButtons (void) +Sequence<TabBarButton> SAL_CALL ViewTabBar::getTabBarButtons() throw (::com::sun::star::uno::RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; @@ -304,13 +304,13 @@ Sequence<TabBarButton> SAL_CALL ViewTabBar::getTabBarButtons (void) //----- XResource ------------------------------------------------------------- -Reference<XResourceId> SAL_CALL ViewTabBar::getResourceId (void) +Reference<XResourceId> SAL_CALL ViewTabBar::getResourceId() throw (RuntimeException, std::exception) { return mxViewTabBarId; } -sal_Bool SAL_CALL ViewTabBar::isAnchorOnly (void) +sal_Bool SAL_CALL ViewTabBar::isAnchorOnly() throw (RuntimeException, std::exception) { return false; @@ -323,7 +323,7 @@ namespace class theViewTabBarUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theViewTabBarUnoTunnelId > {}; } -const Sequence<sal_Int8>& ViewTabBar::getUnoTunnelId (void) +const Sequence<sal_Int8>& ViewTabBar::getUnoTunnelId() { return theViewTabBarUnoTunnelId::get().getSeq(); } @@ -342,7 +342,7 @@ sal_Int64 SAL_CALL ViewTabBar::getSomething (const Sequence<sal_Int8>& rId) return nResult; } -bool ViewTabBar::ActivatePage (void) +bool ViewTabBar::ActivatePage() { try { @@ -395,7 +395,7 @@ bool ViewTabBar::ActivatePage (void) return false; } -int ViewTabBar::GetHeight (void) +int ViewTabBar::GetHeight() { int nHeight (0); @@ -499,7 +499,7 @@ bool ViewTabBar::HasTabBarButton ( } ::com::sun::star::uno::Sequence<com::sun::star::drawing::framework::TabBarButton> - ViewTabBar::GetTabBarButtons (void) + ViewTabBar::GetTabBarButtons() { sal_uInt32 nCount (maTabBarButtons.size()); ::com::sun::star::uno::Sequence<com::sun::star::drawing::framework::TabBarButton> @@ -511,7 +511,7 @@ bool ViewTabBar::HasTabBarButton ( return aList; } -void ViewTabBar::UpdateActiveButton (void) +void ViewTabBar::UpdateActiveButton() { Reference<XView> xView; if (mpViewShellBase != NULL) @@ -532,7 +532,7 @@ void ViewTabBar::UpdateActiveButton (void) } } -void ViewTabBar::UpdateTabBarButtons (void) +void ViewTabBar::UpdateTabBarButtons() { TabBarButtonList::const_iterator iTab; sal_uInt16 nPageCount (mpTabControl->GetPageCount()); @@ -584,7 +584,7 @@ void TabBarControl::Paint (const Rectangle& rRect) SetLineColor (aOriginalLineColor); } -void TabBarControl::ActivatePage (void) +void TabBarControl::ActivatePage() { if (mpViewTabBar->ActivatePage()) { diff --git a/sd/source/ui/view/WindowUpdater.cxx b/sd/source/ui/view/WindowUpdater.cxx index 1c308f21652d..4a2e0aa0f6aa 100644 --- a/sd/source/ui/view/WindowUpdater.cxx +++ b/sd/source/ui/view/WindowUpdater.cxx @@ -32,14 +32,14 @@ namespace sd { -WindowUpdater::WindowUpdater (void) +WindowUpdater::WindowUpdater() : mpViewShell (NULL), mpDocument (NULL) { maCTLOptions.AddListener(this); } -WindowUpdater::~WindowUpdater (void) throw () +WindowUpdater::~WindowUpdater() throw () { maCTLOptions.RemoveListener(this); } diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 606fae612bfe..d275d61076f9 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -156,7 +156,7 @@ namespace * Called, if state of selection of view is changed */ -void DrawViewShell::SelectionHasChanged (void) +void DrawViewShell::SelectionHasChanged() { Invalidate(); diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx index e3e184be7b29..9fbdf055e37a 100644 --- a/sd/source/ui/view/drviews5.cxx +++ b/sd/source/ui/view/drviews5.cxx @@ -85,7 +85,7 @@ void DrawViewShell::ModelHasChanged() } } -void DrawViewShell::Resize (void) +void DrawViewShell::Resize() { ViewShell::Resize(); @@ -101,7 +101,7 @@ void DrawViewShell::Resize (void) } } -void DrawViewShell::ArrangeGUIElements (void) +void DrawViewShell::ArrangeGUIElements() { // Retrieve the current size (thickness) of the scroll bars. That is // the width of the vertical and the height of the horizontal scroll @@ -564,7 +564,7 @@ void DrawViewShell::VisAreaChanged(const Rectangle& rRect) return ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>(); } -int DrawViewShell::GetActiveTabLayerIndex (void) const +int DrawViewShell::GetActiveTabLayerIndex() const { const LayerTabBar* pBar = const_cast<DrawViewShell*>(this)->GetLayerTabControl (); @@ -594,12 +594,12 @@ void DrawViewShell::SetActiveTabLayerIndex (int nIndex) } } -LayerTabBar* DrawViewShell::GetLayerTabControl (void) +LayerTabBar* DrawViewShell::GetLayerTabControl() { return mpLayerTabBar.get(); } -int DrawViewShell::GetTabLayerCount (void) const +int DrawViewShell::GetTabLayerCount() const { const LayerTabBar* pBar = const_cast<DrawViewShell*>(this)->GetLayerTabControl (); diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index 420a884012b0..6b66f374e1ae 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -387,7 +387,7 @@ void DrawViewShell::Init (bool bIsMainViewShell) StartListening (*GetDocSh()); } -void DrawViewShell::Shutdown (void) +void DrawViewShell::Shutdown() { ViewShell::Shutdown(); @@ -398,7 +398,7 @@ void DrawViewShell::Shutdown (void) } } -css::uno::Reference<css::drawing::XDrawSubController> DrawViewShell::CreateSubController (void) +css::uno::Reference<css::drawing::XDrawSubController> DrawViewShell::CreateSubController() { css::uno::Reference<css::drawing::XDrawSubController> xSubController; @@ -799,7 +799,7 @@ void DrawViewShell::GetAnnotationState (SfxItemSet& rItemSet ) mpAnnotationManager->GetAnnotationState( rItemSet ); } -::rtl::OUString DrawViewShell::GetSidebarContextName (void) const +::rtl::OUString DrawViewShell::GetSidebarContextName() const { ::svx::sidebar::SelectionAnalyzer::ViewType eViewType (::svx::sidebar::SelectionAnalyzer::VT_Standard); switch (mePageKind) diff --git a/sd/source/ui/view/grviewsh.cxx b/sd/source/ui/view/grviewsh.cxx index 1f94f01bd8a8..751fb19e92e6 100644 --- a/sd/source/ui/view/grviewsh.cxx +++ b/sd/source/ui/view/grviewsh.cxx @@ -44,11 +44,11 @@ GraphicViewShell::GraphicViewShell ( ConstructGraphicViewShell(); } -GraphicViewShell::~GraphicViewShell (void) +GraphicViewShell::~GraphicViewShell() { } -void GraphicViewShell::ConstructGraphicViewShell(void) +void GraphicViewShell::ConstructGraphicViewShell() { meShellType = ST_DRAW; @@ -69,7 +69,7 @@ void GraphicViewShell::ChangeEditMode ( DrawViewShell::ChangeEditMode (eMode, true); } -void GraphicViewShell::ArrangeGUIElements (void) +void GraphicViewShell::ArrangeGUIElements() { if (mpLayerTabBar.get()!=NULL && mpLayerTabBar->IsVisible()) { diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 850a9f99fbc9..fe3ff77142c4 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -168,7 +168,7 @@ void OutlineViewShell::Construct(DrawDocShell* ) GetActiveWindow()->SetUniqueId( HID_SDOUTLINEVIEWSHELL ); } -Reference<drawing::XDrawSubController> OutlineViewShell::CreateSubController (void) +Reference<drawing::XDrawSubController> OutlineViewShell::CreateSubController() { Reference<drawing::XDrawSubController> xSubController; @@ -231,7 +231,7 @@ OutlineViewShell::~OutlineViewShell() } } -void OutlineViewShell::Shutdown (void) +void OutlineViewShell::Shutdown() { ViewShell::Shutdown(); diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index 483de85d82eb..669106eb9e56 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -202,7 +202,7 @@ OutlineView::~OutlineView() } } -void OutlineView::ConnectToApplication (void) +void OutlineView::ConnectToApplication() { // When the mode is switched to outline the main view shell grabs focus. // This is done for getting cut/copy/paste commands on slides in the left @@ -216,7 +216,7 @@ void OutlineView::ConnectToApplication (void) Application::AddEventListener(LINK(this, OutlineView, AppEventListenerHdl)); } -void OutlineView::DisconnectFromApplication (void) +void OutlineView::DisconnectFromApplication() { Application::RemoveEventListener(LINK(this, OutlineView, AppEventListenerHdl)); } diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx index ba4305394cc6..7182979fb944 100644 --- a/sd/source/ui/view/presvish.cxx +++ b/sd/source/ui/view/presvish.cxx @@ -84,7 +84,7 @@ PresentationViewShell::PresentationViewShell( SfxViewFrame* pFrame, ViewShellBas meShellType = ST_PRESENTATION; } -PresentationViewShell::~PresentationViewShell (void) +PresentationViewShell::~PresentationViewShell() { if( GetDocSh() && GetDocSh()->GetCreateMode() == SfxObjectCreateMode::EMBEDDED && !maOldVisArea.IsEmpty() ) GetDocSh()->SetVisArea( maOldVisArea ); @@ -148,7 +148,7 @@ void PresentationViewShell::Paint( const Rectangle& rRect, ::sd::Window* ) xSlideShow->paint(rRect); } -void PresentationViewShell::Resize (void) +void PresentationViewShell::Resize() { ViewShell::Resize(); // do not call DrawViewShell here! diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index 8506ec0d492e..2165faaa8355 100644 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -92,7 +92,7 @@ Window::Window(vcl::Window* pParent) EnableRTL(false); } -Window::~Window (void) +Window::~Window() { if (mpViewShell != NULL) { @@ -178,7 +178,7 @@ void Window::SetMaxZoom (long int nMax) mnMaxZoom = (sal_uInt16) nMax; } -long Window::GetZoom (void) const +long Window::GetZoom() const { if( GetMapMode().GetScaleX().GetDenominator() ) { @@ -567,7 +567,7 @@ void Window::UpdateMapOrigin(bool bInvalidate) Invalidate(); } -void Window::UpdateMapMode (void) +void Window::UpdateMapMode() { maWinPos -= maViewOrigin; Size aPix(maWinPos.X(), maWinPos.Y()); @@ -943,7 +943,7 @@ void Window::DropScroll(const Point& rMousePos) ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> - Window::CreateAccessible (void) + Window::CreateAccessible() { // If current viewshell is PresentationViewShell, just return empty because the correct ShowWin will be created later. if (mpViewShell && mpViewShell->ISA(PresentationViewShell)) diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx index 194d065e6eb3..908e3e570905 100644 --- a/sd/source/ui/view/tabcontr.cxx +++ b/sd/source/ui/view/tabcontr.cxx @@ -351,13 +351,13 @@ bool TabControl::DeactivatePage() return pDrViewSh->IsSwitchPageAllowed(); } -void TabControl::SendActivatePageEvent (void) +void TabControl::SendActivatePageEvent() { CallEventListeners (VCLEVENT_TABBAR_PAGEACTIVATED, reinterpret_cast<void*>(GetCurPageId())); } -void TabControl::SendDeactivatePageEvent (void) +void TabControl::SendDeactivatePageEvent() { CallEventListeners (VCLEVENT_TABBAR_PAGEDEACTIVATED, reinterpret_cast<void*>(GetCurPageId())); diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 4e51b2e883d6..c55978711639 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -93,7 +93,7 @@ class ViewShellObjectBarFactory { public: ViewShellObjectBarFactory (::sd::ViewShell& rViewShell); - virtual ~ViewShellObjectBarFactory (void); + virtual ~ViewShellObjectBarFactory(); virtual SfxShell* CreateShell ( ::sd::ShellId nId, vcl::Window* pParentWindow, @@ -111,13 +111,13 @@ private: namespace sd { -bool ViewShell::IsPageFlipMode(void) const +bool ViewShell::IsPageFlipMode() const { return this->ISA(DrawViewShell) && mpContentWindow.get() != NULL && mpContentWindow->GetVisibleHeight() >= 1.0; } -SfxViewFrame* ViewShell::GetViewFrame (void) const +SfxViewFrame* ViewShell::GetViewFrame() const { const SfxViewShell* pViewShell = GetViewShell(); if (pViewShell != NULL) @@ -170,7 +170,7 @@ ViewShell::~ViewShell() /** * common initialization part of both constructors */ -void ViewShell::construct(void) +void ViewShell::construct() { mbHasRulers = false; mpActiveWindow = 0; @@ -237,7 +237,7 @@ void ViewShell::construct(void) GetViewShellBase().GetViewShellManager()->AddSubShellFactory(this,mpImpl->mpSubShellFactory); } -void ViewShell::doShow(void) +void ViewShell::doShow() { mpContentWindow->Show(); static_cast< vcl::Window*>(mpContentWindow.get())->Resize(); @@ -270,7 +270,7 @@ void ViewShell::Init (bool bIsMainViewShell) SetActiveWindow (mpContentWindow.get()); } -void ViewShell::Exit (void) +void ViewShell::Exit() { sd::View* pView = GetView(); if (pView!=NULL && pView->IsTextEdit()) @@ -394,7 +394,7 @@ void ViewShell::Deactivate(bool bIsMDIActivate) SfxShell::Deactivate(bIsMDIActivate); } -void ViewShell::Shutdown (void) +void ViewShell::Shutdown() { Exit (); } @@ -778,7 +778,7 @@ bool ViewShell::HandleScrollCommand(const CommandEvent& rCEvt, ::sd::Window* pWi return bDone; } -void ViewShell::SetupRulers (void) +void ViewShell::SetupRulers() { if(mbHasRulers && (mpContentWindow.get() != NULL) && !SlideShow::IsRunning(GetViewShellBase())) { @@ -887,7 +887,7 @@ const SfxPoolItem* ViewShell::GetNumBulletItem(SfxItemSet& aNewAttr, sal_uInt16& return pTmpItem; } -void ViewShell::Resize (void) +void ViewShell::Resize() { SetupRulers (); @@ -946,7 +946,7 @@ SvBorder ViewShell::GetBorder (bool ) return aBorder; } -void ViewShell::ArrangeGUIElements (void) +void ViewShell::ArrangeGUIElements() { if (mpImpl->mbArrangeActive) return; @@ -1090,7 +1090,7 @@ void ViewShell::UpdatePreview (SdPage*, bool ) // useful is still done. } -::svl::IUndoManager* ViewShell::ImpGetUndoManager (void) const +::svl::IUndoManager* ViewShell::ImpGetUndoManager() const { const ViewShell* pMainViewShell = GetViewShellBase().GetMainViewShell().get(); @@ -1329,27 +1329,27 @@ ViewShell::CreateAccessibleDocumentView (::sd::Window* ) ::com::sun::star::accessibility::XAccessible> (); } -::sd::WindowUpdater* ViewShell::GetWindowUpdater (void) const +::sd::WindowUpdater* ViewShell::GetWindowUpdater() const { return mpWindowUpdater.get(); } -ViewShellBase& ViewShell::GetViewShellBase (void) const +ViewShellBase& ViewShell::GetViewShellBase() const { return *static_cast<ViewShellBase*>(GetViewShell()); } -ViewShell::ShellType ViewShell::GetShellType (void) const +ViewShell::ShellType ViewShell::GetShellType() const { return meShellType; } -DrawDocShell* ViewShell::GetDocSh (void) const +DrawDocShell* ViewShell::GetDocSh() const { return GetViewShellBase().GetDocShell(); } -SdDrawDocument* ViewShell::GetDoc (void) const +SdDrawDocument* ViewShell::GetDoc() const { return GetViewShellBase().GetDocument(); } @@ -1430,7 +1430,7 @@ void ViewShell::DisposeFunctions() } } -bool ViewShell::IsMainViewShell (void) const +bool ViewShell::IsMainViewShell() const { return mpImpl->mbIsMainViewShell; } @@ -1545,7 +1545,7 @@ ViewShellObjectBarFactory::ViewShellObjectBarFactory ( { } -ViewShellObjectBarFactory::~ViewShellObjectBarFactory (void) +ViewShellObjectBarFactory::~ViewShellObjectBarFactory() { for (ShellCache::iterator aI(maShellCache.begin()); aI!=maShellCache.end(); diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx index 148e5661a371..18136b1e792d 100644 --- a/sdext/source/presenter/PresenterAccessibility.cxx +++ b/sdext/source/presenter/PresenterAccessibility.cxx @@ -70,16 +70,16 @@ public: const css::lang::Locale& rLocale, const sal_Int16 nRole, const OUString& rsName); - void LateInitialization (void); + void LateInitialization(); - virtual ~AccessibleObject (void); + virtual ~AccessibleObject(); virtual void SetWindow ( const css::uno::Reference<css::awt::XWindow>& rxContentWindow, const css::uno::Reference<css::awt::XWindow>& rxBorderWindow); void SetAccessibleParent (const css::uno::Reference<css::accessibility::XAccessible>& rxAccessibleParent); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; void AddChild (const ::rtl::Reference<AccessibleObject>& rpChild); void RemoveChild (const ::rtl::Reference<AccessibleObject>& rpChild); @@ -92,7 +92,7 @@ public: const css::uno::Any& rOldValue, const css::uno::Any& rNewValue); - void UpdateStateSet (void); + void UpdateStateSet(); //----- XComponent --------------------------------------------------- @@ -106,42 +106,42 @@ public: //----- XAccessible ------------------------------------------------------- virtual css::uno::Reference<css::accessibility::XAccessibleContext> SAL_CALL - getAccessibleContext (void) + getAccessibleContext() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //----- XAccessibleContext ---------------------------------------------- - virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) + virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleParent (void) + virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleParent() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent (void) + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int16 SAL_CALL getAccessibleRole (void) + virtual sal_Int16 SAL_CALL getAccessibleRole() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getAccessibleDescription (void) + virtual OUString SAL_CALL getAccessibleDescription() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getAccessibleName (void) + virtual OUString SAL_CALL getAccessibleName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference<css::accessibility::XAccessibleRelationSet> SAL_CALL - getAccessibleRelationSet (void) + getAccessibleRelationSet() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference<css::accessibility::XAccessibleStateSet> SAL_CALL - getAccessibleStateSet (void) + getAccessibleStateSet() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::lang::Locale SAL_CALL getLocale (void) + virtual css::lang::Locale SAL_CALL getLocale() throw (css::uno::RuntimeException, css::accessibility::IllegalAccessibleComponentStateException, std::exception) SAL_OVERRIDE; @@ -156,25 +156,25 @@ public: const css::awt::Point& aPoint) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::awt::Rectangle SAL_CALL getBounds (void) + virtual css::awt::Rectangle SAL_CALL getBounds() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::awt::Point SAL_CALL getLocation (void) + virtual css::awt::Point SAL_CALL getLocation() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::awt::Point SAL_CALL getLocationOnScreen (void) + virtual css::awt::Point SAL_CALL getLocationOnScreen() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::awt::Size SAL_CALL getSize (void) + virtual css::awt::Size SAL_CALL getSize() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL grabFocus (void) + virtual void SAL_CALL grabFocus() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getForeground (void) + virtual sal_Int32 SAL_CALL getForeground() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getBackground (void) + virtual sal_Int32 SAL_CALL getBackground() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //----- XAccessibleEventBroadcaster -------------------------------------- @@ -218,9 +218,9 @@ protected: ::std::vector<rtl::Reference<AccessibleObject> > maChildren; ::std::vector<Reference<XAccessibleEventListener> > maListeners; - virtual awt::Point GetRelativeLocation (void); - virtual awt::Size GetSize (void); - virtual awt::Point GetAbsoluteParentLocation (void); + virtual awt::Point GetRelativeLocation(); + virtual awt::Size GetSize(); + virtual awt::Point GetAbsoluteParentLocation(); virtual bool GetWindowState (const sal_Int16 nType) const; @@ -246,13 +246,13 @@ class AccessibleStateSet { public: AccessibleStateSet (const sal_Int32 nStateSet); - virtual ~AccessibleStateSet (void); + virtual ~AccessibleStateSet(); static sal_uInt32 GetStateMask (const sal_Int16 nType); //----- XAccessibleStateSet ----------------------------------------------- - virtual sal_Bool SAL_CALL isEmpty (void) + virtual sal_Bool SAL_CALL isEmpty() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL contains (sal_Int16 nState) @@ -261,7 +261,7 @@ public: virtual sal_Bool SAL_CALL containsAll (const css::uno::Sequence<sal_Int16>& rStateSet) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence<sal_Int16> SAL_CALL getStates (void) + virtual css::uno::Sequence<sal_Int16> SAL_CALL getStates() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: @@ -281,8 +281,8 @@ class AccessibleRelationSet public AccessibleRelationSetInterfaceBase { public: - AccessibleRelationSet (void); - virtual ~AccessibleRelationSet (void); + AccessibleRelationSet(); + virtual ~AccessibleRelationSet(); void AddRelation ( const sal_Int16 nRelationType, @@ -290,7 +290,7 @@ public: //----- XAccessibleRelationSet -------------------------------------------- - virtual sal_Int32 SAL_CALL getRelationCount (void) + virtual sal_Int32 SAL_CALL getRelationCount() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual AccessibleRelation SAL_CALL getRelation (sal_Int32 nIndex) @@ -326,17 +326,17 @@ public: const SharedPresenterTextParagraph& rpParagraph, const sal_Int32 nParagraphIndex); - virtual ~AccessibleParagraph (void); + virtual ~AccessibleParagraph(); //----- XAccessibleContext ------------------------------------------------ virtual css::uno::Reference<css::accessibility::XAccessibleRelationSet> SAL_CALL - getAccessibleRelationSet (void) + getAccessibleRelationSet() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //----- XAccessibleText --------------------------------------------------- - virtual sal_Int32 SAL_CALL getCaretPosition (void) + virtual sal_Int32 SAL_CALL getCaretPosition() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL setCaretPosition (sal_Int32 nIndex) @@ -354,25 +354,25 @@ public: virtual css::awt::Rectangle SAL_CALL getCharacterBounds (sal_Int32 nIndex) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getCharacterCount (void) + virtual sal_Int32 SAL_CALL getCharacterCount() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getIndexAtPoint (const css::awt::Point& rPoint) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getSelectedText (void) + virtual OUString SAL_CALL getSelectedText() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getSelectionStart (void) + virtual sal_Int32 SAL_CALL getSelectionStart() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getSelectionEnd (void) + virtual sal_Int32 SAL_CALL getSelectionEnd() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL setSelection (sal_Int32 nStartIndex, sal_Int32 nEndIndex) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getText (void) + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getTextRange ( @@ -405,9 +405,9 @@ public: throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual awt::Point GetRelativeLocation (void) SAL_OVERRIDE; - virtual awt::Size GetSize (void) SAL_OVERRIDE; - virtual awt::Point GetAbsoluteParentLocation (void) SAL_OVERRIDE; + virtual awt::Point GetRelativeLocation() SAL_OVERRIDE; + virtual awt::Size GetSize() SAL_OVERRIDE; + virtual awt::Point GetAbsoluteParentLocation() SAL_OVERRIDE; virtual bool GetWindowState (const sal_Int16 nType) const SAL_OVERRIDE; private: @@ -507,7 +507,7 @@ private: const sal_Int32 nOldCharacterIndex, const sal_Int32 nNewParagraphIndex, const sal_Int32 nNewCharacterIndex); - void HandleTextChange (void); + void HandleTextChange(); }; //===== AccessibleFocusManager ================================================ @@ -518,7 +518,7 @@ private: class AccessibleFocusManager { public: - static ::boost::shared_ptr<AccessibleFocusManager> Instance (void); + static ::boost::shared_ptr<AccessibleFocusManager> Instance(); void AddFocusableObject (const ::rtl::Reference<PresenterAccessible::AccessibleObject>& rpObject); void RemoveFocusableObject (const ::rtl::Reference<PresenterAccessible::AccessibleObject>& rpObject); @@ -529,7 +529,7 @@ private: static ::boost::shared_ptr<AccessibleFocusManager> mpInstance; ::std::vector<rtl::Reference<PresenterAccessible::AccessibleObject> > maFocusableObjects; - AccessibleFocusManager (void); + AccessibleFocusManager(); }; //===== PresenterAccessible =================================================== @@ -557,11 +557,11 @@ PresenterAccessible::PresenterAccessible ( mxMainPane->setAccessible(this); } -PresenterAccessible::~PresenterAccessible (void) +PresenterAccessible::~PresenterAccessible() { } -PresenterPaneContainer::SharedPaneDescriptor PresenterAccessible::GetPreviewPane (void) const +PresenterPaneContainer::SharedPaneDescriptor PresenterAccessible::GetPreviewPane() const { PresenterPaneContainer::SharedPaneDescriptor pPreviewPane; @@ -583,7 +583,7 @@ PresenterPaneContainer::SharedPaneDescriptor PresenterAccessible::GetPreviewPane return pPreviewPane; } -void PresenterAccessible::UpdateAccessibilityHierarchy (void) +void PresenterAccessible::UpdateAccessibilityHierarchy() { if ( ! mpPresenterController.is()) return; @@ -712,7 +712,7 @@ void PresenterAccessible::NotifyCurrentSlideChange ( AccessibleFocusManager::Instance()->FocusObject(mpAccessiblePreview); } -void SAL_CALL PresenterAccessible::disposing (void) +void SAL_CALL PresenterAccessible::disposing() { UpdateAccessibilityHierarchy( NULL, @@ -737,7 +737,7 @@ void SAL_CALL PresenterAccessible::disposing (void) //----- XAccessible ----------------------------------------------------------- -Reference<XAccessibleContext> SAL_CALL PresenterAccessible::getAccessibleContext (void) +Reference<XAccessibleContext> SAL_CALL PresenterAccessible::getAccessibleContext() throw (css::uno::RuntimeException, std::exception) { if ( ! mpAccessibleConsole.is()) @@ -820,12 +820,12 @@ PresenterAccessible::AccessibleObject::AccessibleObject ( { } -void PresenterAccessible::AccessibleObject::LateInitialization (void) +void PresenterAccessible::AccessibleObject::LateInitialization() { AccessibleFocusManager::Instance()->AddFocusableObject(this); } -PresenterAccessible::AccessibleObject::~AccessibleObject (void) +PresenterAccessible::AccessibleObject::~AccessibleObject() { } @@ -860,7 +860,7 @@ void PresenterAccessible::AccessibleObject::SetAccessibleParent ( mxParentAccessible = rxAccessibleParent; } -void SAL_CALL PresenterAccessible::AccessibleObject::disposing (void) +void SAL_CALL PresenterAccessible::AccessibleObject::disposing() { AccessibleFocusManager::Instance()->RemoveFocusableObject(this); SetWindow(NULL, NULL); @@ -869,7 +869,7 @@ void SAL_CALL PresenterAccessible::AccessibleObject::disposing (void) //----- XAccessible ------------------------------------------------------- Reference<XAccessibleContext> SAL_CALL - PresenterAccessible::AccessibleObject::getAccessibleContext (void) + PresenterAccessible::AccessibleObject::getAccessibleContext() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -879,7 +879,7 @@ Reference<XAccessibleContext> SAL_CALL //----- XAccessibleContext ---------------------------------------------- -sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getAccessibleChildCount (void) +sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getAccessibleChildCount() throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -902,7 +902,7 @@ Reference<XAccessible> SAL_CALL } Reference<XAccessible> SAL_CALL - PresenterAccessible::AccessibleObject::getAccessibleParent (void) + PresenterAccessible::AccessibleObject::getAccessibleParent() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -911,7 +911,7 @@ Reference<XAccessible> SAL_CALL } sal_Int32 SAL_CALL - PresenterAccessible::AccessibleObject::getAccessibleIndexInParent (void) + PresenterAccessible::AccessibleObject::getAccessibleIndexInParent() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -933,7 +933,7 @@ sal_Int32 SAL_CALL } sal_Int16 SAL_CALL - PresenterAccessible::AccessibleObject::getAccessibleRole (void) + PresenterAccessible::AccessibleObject::getAccessibleRole() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -942,7 +942,7 @@ sal_Int16 SAL_CALL } OUString SAL_CALL - PresenterAccessible::AccessibleObject::getAccessibleDescription (void) + PresenterAccessible::AccessibleObject::getAccessibleDescription() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -951,7 +951,7 @@ OUString SAL_CALL } OUString SAL_CALL - PresenterAccessible::AccessibleObject::getAccessibleName (void) + PresenterAccessible::AccessibleObject::getAccessibleName() throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -960,7 +960,7 @@ OUString SAL_CALL } Reference<XAccessibleRelationSet> SAL_CALL - PresenterAccessible::AccessibleObject::getAccessibleRelationSet (void) + PresenterAccessible::AccessibleObject::getAccessibleRelationSet() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -969,7 +969,7 @@ Reference<XAccessibleRelationSet> SAL_CALL } Reference<XAccessibleStateSet> SAL_CALL - PresenterAccessible::AccessibleObject::getAccessibleStateSet (void) + PresenterAccessible::AccessibleObject::getAccessibleStateSet() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -978,7 +978,7 @@ Reference<XAccessibleStateSet> SAL_CALL } lang::Locale SAL_CALL - PresenterAccessible::AccessibleObject::getLocale (void) + PresenterAccessible::AccessibleObject::getLocale() throw (RuntimeException, IllegalAccessibleComponentStateException, std::exception) { @@ -1023,7 +1023,7 @@ Reference<XAccessible> SAL_CALL return Reference<XAccessible>(); } -awt::Rectangle SAL_CALL PresenterAccessible::AccessibleObject::getBounds (void) +awt::Rectangle SAL_CALL PresenterAccessible::AccessibleObject::getBounds() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1036,7 +1036,7 @@ awt::Rectangle SAL_CALL PresenterAccessible::AccessibleObject::getBounds (void) return awt::Rectangle (aLocation.X, aLocation.Y, aSize.Width, aSize.Height); } -awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocation (void) +awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocation() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1046,7 +1046,7 @@ awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocation (void) return aLocation; } -awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocationOnScreen (void) +awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocationOnScreen() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1059,7 +1059,7 @@ awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocationOnScreen ( aRelativeLocation.Y + aParentLocationOnScreen.Y); } -awt::Size SAL_CALL PresenterAccessible::AccessibleObject::getSize (void) +awt::Size SAL_CALL PresenterAccessible::AccessibleObject::getSize() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1069,7 +1069,7 @@ awt::Size SAL_CALL PresenterAccessible::AccessibleObject::getSize (void) return aSize; } -void SAL_CALL PresenterAccessible::AccessibleObject::grabFocus (void) +void SAL_CALL PresenterAccessible::AccessibleObject::grabFocus() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1079,7 +1079,7 @@ void SAL_CALL PresenterAccessible::AccessibleObject::grabFocus (void) mxContentWindow->setFocus(); } -sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getForeground (void) +sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getForeground() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1087,7 +1087,7 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getForeground (void) return 0x00ffffff; } -sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getBackground (void) +sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getBackground() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1205,7 +1205,7 @@ bool PresenterAccessible::AccessibleObject::GetWindowState (const sal_Int16 nTyp } } -void PresenterAccessible::AccessibleObject::UpdateStateSet (void) +void PresenterAccessible::AccessibleObject::UpdateStateSet() { UpdateState(AccessibleStateType::FOCUSABLE, true); UpdateState(AccessibleStateType::VISIBLE, true); @@ -1372,7 +1372,7 @@ AccessibleStateSet::AccessibleStateSet (const sal_Int32 nStateSet) { } -AccessibleStateSet::~AccessibleStateSet (void) +AccessibleStateSet::~AccessibleStateSet() { } @@ -1388,7 +1388,7 @@ sal_uInt32 AccessibleStateSet::GetStateMask (const sal_Int16 nState) //----- XAccessibleStateSet --------------------------------------------------- -sal_Bool SAL_CALL AccessibleStateSet::isEmpty (void) +sal_Bool SAL_CALL AccessibleStateSet::isEmpty() throw (css::uno::RuntimeException, std::exception) { return mnStateSet==0; @@ -1411,7 +1411,7 @@ sal_Bool SAL_CALL AccessibleStateSet::containsAll (const css::uno::Sequence<sal_ return sal_True; } -css::uno::Sequence<sal_Int16> SAL_CALL AccessibleStateSet::getStates (void) +css::uno::Sequence<sal_Int16> SAL_CALL AccessibleStateSet::getStates() throw (css::uno::RuntimeException, std::exception) { ::std::vector<sal_Int16> aStates; @@ -1424,13 +1424,13 @@ css::uno::Sequence<sal_Int16> SAL_CALL AccessibleStateSet::getStates (void) //===== AccessibleRelationSet ================================================= -AccessibleRelationSet::AccessibleRelationSet (void) +AccessibleRelationSet::AccessibleRelationSet() : AccessibleRelationSetInterfaceBase(m_aMutex), maRelations() { } -AccessibleRelationSet::~AccessibleRelationSet (void) +AccessibleRelationSet::~AccessibleRelationSet() { } @@ -1446,7 +1446,7 @@ void AccessibleRelationSet::AddRelation ( //----- XAccessibleRelationSet ------------------------------------------------ -sal_Int32 SAL_CALL AccessibleRelationSet::getRelationCount (void) +sal_Int32 SAL_CALL AccessibleRelationSet::getRelationCount() throw (css::uno::RuntimeException, std::exception) { return maRelations.size(); @@ -1501,14 +1501,14 @@ PresenterAccessible::AccessibleParagraph::AccessibleParagraph ( { } -PresenterAccessible::AccessibleParagraph::~AccessibleParagraph (void) +PresenterAccessible::AccessibleParagraph::~AccessibleParagraph() { } //----- XAccessibleContext ---------------------------------------------------- Reference<XAccessibleRelationSet> SAL_CALL - PresenterAccessible::AccessibleParagraph::getAccessibleRelationSet (void) + PresenterAccessible::AccessibleParagraph::getAccessibleRelationSet() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1537,7 +1537,7 @@ Reference<XAccessibleRelationSet> SAL_CALL //----- XAccessibleText ------------------------------------------------------- -sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getCaretPosition (void) +sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getCaretPosition() throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1628,7 +1628,7 @@ awt::Rectangle SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacterBo return aCharacterBox; } -sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacterCount (void) +sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacterCount() throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1653,7 +1653,7 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getIndexAtPoint ( return nIndex; } -OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectedText (void) +OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectedText() throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1661,7 +1661,7 @@ OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectedText (voi return getTextRange(getSelectionStart(), getSelectionEnd()); } -sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectionStart (void) +sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectionStart() throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1669,7 +1669,7 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectionStart ( return getCaretPosition(); } -sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectionEnd (void) +sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectionEnd() throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1688,7 +1688,7 @@ sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::setSelection ( return setCaretPosition(nStartIndex); } -OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getText (void) +OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getText() throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1783,7 +1783,7 @@ sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::copyText ( //----- protected ------------------------------------------------------------- -awt::Point PresenterAccessible::AccessibleParagraph::GetRelativeLocation (void) +awt::Point PresenterAccessible::AccessibleParagraph::GetRelativeLocation() { awt::Point aLocation (AccessibleObject::GetRelativeLocation()); if (mpParagraph) @@ -1796,7 +1796,7 @@ awt::Point PresenterAccessible::AccessibleParagraph::GetRelativeLocation (void) return aLocation; } -awt::Size PresenterAccessible::AccessibleParagraph::GetSize (void) +awt::Size PresenterAccessible::AccessibleParagraph::GetSize() { if (mpParagraph) return mpParagraph->GetSize(); @@ -1804,7 +1804,7 @@ awt::Size PresenterAccessible::AccessibleParagraph::GetSize (void) return AccessibleObject::GetSize(); } -awt::Point PresenterAccessible::AccessibleParagraph::GetAbsoluteParentLocation (void) +awt::Point PresenterAccessible::AccessibleParagraph::GetAbsoluteParentLocation() { if (mxParentAccessible.is()) { @@ -1889,7 +1889,7 @@ void AccessibleNotes::SetTextView ( mpTextView->GetCaret()->SetCaretMotionBroadcaster( ::boost::function<void(sal_Int32,sal_Int32,sal_Int32,sal_Int32)>()); mpTextView->SetTextChangeBroadcaster( - ::boost::function<void(void)>()); + ::boost::function<void()>()); } mpTextView = rpTextView; @@ -1999,7 +1999,7 @@ void AccessibleNotes::NotifyCaretChange ( } } -void AccessibleNotes::HandleTextChange (void) +void AccessibleNotes::HandleTextChange() { SetTextView(mpTextView); } @@ -2008,7 +2008,7 @@ void AccessibleNotes::HandleTextChange (void) ::boost::shared_ptr<AccessibleFocusManager> AccessibleFocusManager::mpInstance; -::boost::shared_ptr<AccessibleFocusManager> AccessibleFocusManager::Instance (void) +::boost::shared_ptr<AccessibleFocusManager> AccessibleFocusManager::Instance() { if ( ! mpInstance) { @@ -2017,7 +2017,7 @@ void AccessibleNotes::HandleTextChange (void) return mpInstance; } -AccessibleFocusManager::AccessibleFocusManager (void) +AccessibleFocusManager::AccessibleFocusManager() : maFocusableObjects() { } diff --git a/sdext/source/presenter/PresenterAccessibility.hxx b/sdext/source/presenter/PresenterAccessibility.hxx index 58317e73afa7..c3c429ffb755 100644 --- a/sdext/source/presenter/PresenterAccessibility.hxx +++ b/sdext/source/presenter/PresenterAccessibility.hxx @@ -62,22 +62,22 @@ public: const css::uno::Reference<css::uno::XComponentContext>& rxContext, const ::rtl::Reference<PresenterController>& rpPresenterController, const css::uno::Reference<css::drawing::framework::XPane>& rxMainPane); - virtual ~PresenterAccessible (void); + virtual ~PresenterAccessible(); void SetAccessibleParent (const css::uno::Reference<css::accessibility::XAccessible>& rxAccessibleParent); - void UpdateAccessibilityHierarchy (void); + void UpdateAccessibilityHierarchy(); void NotifyCurrentSlideChange ( const sal_Int32 nCurrentSlideIndex, const sal_Int32 nSlideCount); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; //----- XAccessible ------------------------------------------------------- virtual css::uno::Reference<css::accessibility::XAccessibleContext> SAL_CALL - getAccessibleContext (void) + getAccessibleContext() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //----- XFocusListener ---------------------------------------------------- @@ -123,7 +123,7 @@ private: const css::uno::Reference<css::awt::XWindow>& rxNotesContentWindow, const css::uno::Reference<css::awt::XWindow>& rxNotesBorderWindow, const ::boost::shared_ptr<PresenterTextView>& rpNotesTextView); - PresenterPaneContainer::SharedPaneDescriptor GetPreviewPane (void) const; + PresenterPaneContainer::SharedPaneDescriptor GetPreviewPane() const; }; } } // end of namespace ::sd::presenter diff --git a/sdext/source/presenter/PresenterBitmapContainer.cxx b/sdext/source/presenter/PresenterBitmapContainer.cxx index afc5d24f5f4f..c8e7ac92ce87 100644 --- a/sdext/source/presenter/PresenterBitmapContainer.cxx +++ b/sdext/source/presenter/PresenterBitmapContainer.cxx @@ -96,7 +96,7 @@ void PresenterBitmapContainer::Initialize ( } } -PresenterBitmapContainer::~PresenterBitmapContainer (void) +PresenterBitmapContainer::~PresenterBitmapContainer() { maIconContainer.clear(); } @@ -280,7 +280,7 @@ PresenterBitmapContainer::BitmapDescriptor::TexturingMode //===== PresenterBitmapContainer::BitmapSet =================================== -PresenterBitmapContainer::BitmapDescriptor::BitmapDescriptor (void) +PresenterBitmapContainer::BitmapDescriptor::BitmapDescriptor() : mnWidth(0), mnHeight(0), mnXOffset(0), diff --git a/sdext/source/presenter/PresenterBitmapContainer.hxx b/sdext/source/presenter/PresenterBitmapContainer.hxx index 05092f59c4b2..22349efa1e29 100644 --- a/sdext/source/presenter/PresenterBitmapContainer.hxx +++ b/sdext/source/presenter/PresenterBitmapContainer.hxx @@ -49,7 +49,7 @@ public: class BitmapDescriptor { public: - BitmapDescriptor (void); + BitmapDescriptor(); BitmapDescriptor (const ::boost::shared_ptr<BitmapDescriptor>& rpDefault); enum Mode {Normal, MouseOver, ButtonDown, Disabled, Mask}; @@ -99,7 +99,7 @@ public: const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext, const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, const css::uno::Reference<css::drawing::XPresenterHelper>& rxPresenterHelper = NULL); - ~PresenterBitmapContainer (void); + ~PresenterBitmapContainer(); void Initialize ( const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext); diff --git a/sdext/source/presenter/PresenterButton.cxx b/sdext/source/presenter/PresenterButton.cxx index c7696bb8cd32..a4c23d28dcff 100644 --- a/sdext/source/presenter/PresenterButton.cxx +++ b/sdext/source/presenter/PresenterButton.cxx @@ -144,11 +144,11 @@ PresenterButton::PresenterButton ( } } -PresenterButton::~PresenterButton (void) +PresenterButton::~PresenterButton() { } -void SAL_CALL PresenterButton::disposing (void) +void SAL_CALL PresenterButton::disposing() { if (mxCanvas.is()) { @@ -222,7 +222,7 @@ void PresenterButton::SetCanvas ( } } -css::geometry::IntegerSize2D PresenterButton::GetSize (void) +css::geometry::IntegerSize2D PresenterButton::GetSize() { if (maButtonSize.Width < 0) CalculateButtonSize(); @@ -363,7 +363,7 @@ void SAL_CALL PresenterButton::disposing (const css::lang::EventObject& rEvent) -css::geometry::IntegerSize2D PresenterButton::CalculateButtonSize (void) +css::geometry::IntegerSize2D PresenterButton::CalculateButtonSize() { if (mpFont.get()!=NULL && !mpFont->mxFont.is() && mxCanvas.is()) mpFont->PrepareFont(mxCanvas); @@ -421,7 +421,7 @@ void PresenterButton::RenderButton ( aRenderState); } -void PresenterButton::Invalidate (void) +void PresenterButton::Invalidate() { mpPresenterController->GetPaintManager()->Invalidate(mxWindow); } @@ -439,7 +439,7 @@ Reference<rendering::XBitmap> PresenterButton::GetBitmap ( } } -void PresenterButton::SetupButtonBitmaps (void) +void PresenterButton::SetupButtonBitmaps() { if ( ! mxCanvas.is()) return; @@ -503,7 +503,7 @@ Reference<beans::XPropertySet> PresenterButton::GetConfigurationProperties ( UNO_QUERY); } -void PresenterButton::ThrowIfDisposed (void) const +void PresenterButton::ThrowIfDisposed() const throw (::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) diff --git a/sdext/source/presenter/PresenterButton.hxx b/sdext/source/presenter/PresenterButton.hxx index eb9a60af3b67..5af832883ddc 100644 --- a/sdext/source/presenter/PresenterButton.hxx +++ b/sdext/source/presenter/PresenterButton.hxx @@ -64,15 +64,15 @@ public: const css::uno::Reference<css::awt::XWindow>& rxParentWindow, const css::uno::Reference<css::rendering::XCanvas>& rxParentCanvas, const OUString& rsConfigurationName); - virtual ~PresenterButton (void); + virtual ~PresenterButton(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; void SetCenter (const css::geometry::RealPoint2D& rLocation); void SetCanvas ( const css::uno::Reference<css::rendering::XCanvas>& rxParentCanvas, const css::uno::Reference<css::awt::XWindow>& rxParentWindow); - css::geometry::IntegerSize2D GetSize (void); + css::geometry::IntegerSize2D GetSize(); // XWindowListener @@ -152,17 +152,17 @@ private: const SharedBitmapDescriptor& rpLeft, const SharedBitmapDescriptor& rpCenter, const SharedBitmapDescriptor& rpRight); - css::geometry::IntegerSize2D CalculateButtonSize (void); - void Invalidate (void); + css::geometry::IntegerSize2D CalculateButtonSize(); + void Invalidate(); static css::uno::Reference<css::rendering::XBitmap> GetBitmap ( const SharedBitmapDescriptor& mpIcon, const PresenterBitmapDescriptor::Mode eMode); - void SetupButtonBitmaps (void); + void SetupButtonBitmaps(); static css::uno::Reference<css::beans::XPropertySet> GetConfigurationProperties ( const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext, const OUString& rsConfgurationName); - void ThrowIfDisposed (void) const + void ThrowIfDisposed() const throw (css::lang::DisposedException); }; diff --git a/sdext/source/presenter/PresenterCanvasHelper.cxx b/sdext/source/presenter/PresenterCanvasHelper.cxx index 596fda71237c..dc07dafd84d6 100644 --- a/sdext/source/presenter/PresenterCanvasHelper.cxx +++ b/sdext/source/presenter/PresenterCanvasHelper.cxx @@ -30,7 +30,7 @@ using namespace ::com::sun::star::uno; namespace sdext { namespace presenter { -PresenterCanvasHelper::PresenterCanvasHelper (void) +PresenterCanvasHelper::PresenterCanvasHelper() : maDefaultViewState( geometry::AffineMatrix2D(1,0,0, 0,1,0), NULL), @@ -42,7 +42,7 @@ PresenterCanvasHelper::PresenterCanvasHelper (void) { } -PresenterCanvasHelper::~PresenterCanvasHelper (void) +PresenterCanvasHelper::~PresenterCanvasHelper() { } diff --git a/sdext/source/presenter/PresenterCanvasHelper.hxx b/sdext/source/presenter/PresenterCanvasHelper.hxx index 6b20cc7c841d..35a813e95532 100644 --- a/sdext/source/presenter/PresenterCanvasHelper.hxx +++ b/sdext/source/presenter/PresenterCanvasHelper.hxx @@ -38,8 +38,8 @@ class PresenterCanvasHelper : ::boost::noncopyable { public: - PresenterCanvasHelper (void); - ~PresenterCanvasHelper (void); + PresenterCanvasHelper(); + ~PresenterCanvasHelper(); void Paint ( const SharedBitmapDescriptor& rpBitmap, diff --git a/sdext/source/presenter/PresenterConfigurationAccess.cxx b/sdext/source/presenter/PresenterConfigurationAccess.cxx index 641fa4d20f45..16914a9e917b 100644 --- a/sdext/source/presenter/PresenterConfigurationAccess.cxx +++ b/sdext/source/presenter/PresenterConfigurationAccess.cxx @@ -83,11 +83,11 @@ PresenterConfigurationAccess::PresenterConfigurationAccess ( } } -PresenterConfigurationAccess::~PresenterConfigurationAccess (void) +PresenterConfigurationAccess::~PresenterConfigurationAccess() { } -bool PresenterConfigurationAccess::IsValid (void) const +bool PresenterConfigurationAccess::IsValid() const { return mxRoot.is(); } @@ -176,7 +176,7 @@ Reference<beans::XPropertySet> PresenterConfigurationAccess::GetNodeProperties ( return Reference<beans::XPropertySet>(GetConfigurationNode(rxNode, rsPathToNode), UNO_QUERY); } -void PresenterConfigurationAccess::CommitChanges (void) +void PresenterConfigurationAccess::CommitChanges() { Reference<util::XChangesBatch> xConfiguration (mxRoot, UNO_QUERY); if (xConfiguration.is()) diff --git a/sdext/source/presenter/PresenterConfigurationAccess.hxx b/sdext/source/presenter/PresenterConfigurationAccess.hxx index 9add5205a348..ef2a6b443057 100644 --- a/sdext/source/presenter/PresenterConfigurationAccess.hxx +++ b/sdext/source/presenter/PresenterConfigurationAccess.hxx @@ -67,7 +67,7 @@ public: const OUString& rsRootName, WriteMode eMode); - ~PresenterConfigurationAccess (void); + ~PresenterConfigurationAccess(); /** Return a configuration node below the root of the called object. @param rsPathToNode @@ -81,7 +81,7 @@ public: GoToChild() left the called PresenterConfigurationAccess object in a valid state. */ - bool IsValid (void) const; + bool IsValid() const; /** Move the focused node to the (possibly indirect) child specified by the given path. */ @@ -119,7 +119,7 @@ public: This call is ignored when the called ConfigurationAccess object was not create with read-write mode. */ - void CommitChanges (void); + void CommitChanges(); typedef ::boost::function<void( const OUString&, diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx index e416a732c870..180e2fdfc043 100644 --- a/sdext/source/presenter/PresenterController.cxx +++ b/sdext/source/presenter/PresenterController.cxx @@ -187,11 +187,11 @@ PresenterController::PresenterController ( } } -PresenterController::~PresenterController (void) +PresenterController::~PresenterController() { } -void PresenterController::disposing (void) +void PresenterController::disposing() { maInstances.erase(mxController->getFrame()); @@ -320,7 +320,7 @@ void PresenterController::GetSlides (const sal_Int32 nOffset) } } -void PresenterController::UpdatePaneTitles (void) +void PresenterController::UpdatePaneTitles() { if ( ! mxSlideShowController.is()) return; @@ -415,7 +415,7 @@ void PresenterController::UpdatePaneTitles (void) } } -void PresenterController::UpdateViews (void) +void PresenterController::UpdateViews() { // Tell all views about the slides they should display. PresenterPaneContainer::PaneList::const_iterator iPane; @@ -449,43 +449,43 @@ PresenterTheme::SharedFontDescriptor return PresenterTheme::SharedFontDescriptor(); } -::boost::shared_ptr<PresenterTheme> PresenterController::GetTheme (void) const +::boost::shared_ptr<PresenterTheme> PresenterController::GetTheme() const { return mpTheme; } -::rtl::Reference<PresenterWindowManager> PresenterController::GetWindowManager (void) const +::rtl::Reference<PresenterWindowManager> PresenterController::GetWindowManager() const { return mpWindowManager; } Reference<presentation::XSlideShowController> - PresenterController::GetSlideShowController(void) const + PresenterController::GetSlideShowController() const { return mxSlideShowController; } -rtl::Reference<PresenterPaneContainer> PresenterController::GetPaneContainer (void) const +rtl::Reference<PresenterPaneContainer> PresenterController::GetPaneContainer() const { return mpPaneContainer; } -::rtl::Reference<PresenterPaneBorderPainter> PresenterController::GetPaneBorderPainter (void) const +::rtl::Reference<PresenterPaneBorderPainter> PresenterController::GetPaneBorderPainter() const { return mpPaneBorderPainter; } -::boost::shared_ptr<PresenterCanvasHelper> PresenterController::GetCanvasHelper (void) const +::boost::shared_ptr<PresenterCanvasHelper> PresenterController::GetCanvasHelper() const { return mpCanvasHelper; } -Reference<drawing::XPresenterHelper> PresenterController::GetPresenterHelper (void) const +Reference<drawing::XPresenterHelper> PresenterController::GetPresenterHelper() const { return mxPresenterHelper; } -::boost::shared_ptr<PresenterPaintManager> PresenterController::GetPaintManager (void) const +::boost::shared_ptr<PresenterPaintManager> PresenterController::GetPaintManager() const { return mpPaintManager; } @@ -568,12 +568,12 @@ util::URL PresenterController::CreateURLFromString (const OUString& rsURL) const } Reference<drawing::framework::XConfigurationController> - PresenterController::GetConfigurationController (void) const + PresenterController::GetConfigurationController() const { return mxConfigurationController; } -Reference<drawing::XDrawPage> PresenterController::GetCurrentSlide (void) const +Reference<drawing::XDrawPage> PresenterController::GetCurrentSlide() const { return mxCurrentSlide; } @@ -1142,7 +1142,7 @@ void PresenterController::LoadTheme (const Reference<XPane>& rxPane) mpTheme.reset(new PresenterTheme(mxComponentContext, OUString(), rxPane->getCanvas())); } -double PresenterController::GetSlideAspectRatio (void) const +double PresenterController::GetSlideAspectRatio() const { double nSlideAspectRatio (28.0/21.0); @@ -1203,7 +1203,7 @@ void PresenterController::UpdatePendingSlideNumber (const sal_Int32 nPendingSlid 0)); } -void PresenterController::ThrowIfDisposed (void) const +void PresenterController::ThrowIfDisposed() const throw (::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) @@ -1214,7 +1214,7 @@ void PresenterController::ThrowIfDisposed (void) const } } -void PresenterController::SwitchMonitors (void) +void PresenterController::SwitchMonitors() { Reference<lang::XEventListener> xScreen( mxScreen ); if (!xScreen.is()) diff --git a/sdext/source/presenter/PresenterController.hxx b/sdext/source/presenter/PresenterController.hxx index ff2eac9258f8..88d3d3ad1ca7 100644 --- a/sdext/source/presenter/PresenterController.hxx +++ b/sdext/source/presenter/PresenterController.hxx @@ -87,9 +87,9 @@ public: const css::uno::Reference<css::presentation::XSlideShowController>& rxSlideShowController, const rtl::Reference<PresenterPaneContainer>& rpPaneContainer, const css::uno::Reference<css::drawing::framework::XResourceId>& rxMainPaneId); - virtual ~PresenterController (void); + virtual ~PresenterController(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; void UpdateCurrentSlide (const sal_Int32 nOffset); @@ -97,34 +97,34 @@ public: GetViewBackground (const OUString& rsViewURL) const; PresenterTheme::SharedFontDescriptor GetViewFont (const OUString& rsViewURL) const; - ::boost::shared_ptr<PresenterTheme> GetTheme (void) const; - ::rtl::Reference<PresenterWindowManager> GetWindowManager (void) const; + ::boost::shared_ptr<PresenterTheme> GetTheme() const; + ::rtl::Reference<PresenterWindowManager> GetWindowManager() const; css::uno::Reference<css::presentation::XSlideShowController> - GetSlideShowController (void) const; - rtl::Reference<PresenterPaneContainer> GetPaneContainer (void) const; - ::rtl::Reference<PresenterPaneBorderPainter> GetPaneBorderPainter (void) const; - ::boost::shared_ptr<PresenterCanvasHelper> GetCanvasHelper (void) const; - css::uno::Reference<css::drawing::XPresenterHelper> GetPresenterHelper (void) const; - ::boost::shared_ptr<PresenterPaintManager> GetPaintManager (void) const; - void HideSlideSorter (void); - double GetSlideAspectRatio (void) const; + GetSlideShowController() const; + rtl::Reference<PresenterPaneContainer> GetPaneContainer() const; + ::rtl::Reference<PresenterPaneBorderPainter> GetPaneBorderPainter() const; + ::boost::shared_ptr<PresenterCanvasHelper> GetCanvasHelper() const; + css::uno::Reference<css::drawing::XPresenterHelper> GetPresenterHelper() const; + ::boost::shared_ptr<PresenterPaintManager> GetPaintManager() const; + void HideSlideSorter(); + double GetSlideAspectRatio() const; void ShowView (const OUString& rsViewURL); void HideView (const OUString& rsViewURL); - void SwitchMonitors (void); + void SwitchMonitors(); void DispatchUnoCommand (const OUString& rsCommand) const; css::uno::Reference<css::frame::XDispatch> GetDispatch ( const css::util::URL& rURL) const; css::util::URL CreateURLFromString (const OUString& rsURL) const; css::uno::Reference<css::drawing::framework::XConfigurationController> - GetConfigurationController (void) const; - css::uno::Reference<css::drawing::XDrawPage> GetCurrentSlide (void) const; + GetConfigurationController() const; + css::uno::Reference<css::drawing::XDrawPage> GetCurrentSlide() const; static bool HasTransition (css::uno::Reference<css::drawing::XDrawPage>& rxPage); static bool HasCustomAnimation (css::uno::Reference<css::drawing::XDrawPage>& rxPage); void SetAccessibilityActiveState (const bool bIsActive); - bool IsAccessibilityActive (void) const { return mbIsAccessibilityActive;} + bool IsAccessibilityActive() const { return mbIsAccessibilityActive;} void HandleMouseClick (const css::awt::MouseEvent& rEvent); - void UpdatePaneTitles (void); + void UpdatePaneTitles(); /** Request activation or deactivation of (some of) the views according to the given parameters. @@ -218,10 +218,10 @@ private: ::rtl::Reference<PresenterAccessible> mpAccessibleObject; bool mbIsAccessibilityActive; - void InitializePresenterScreen (void); + void InitializePresenterScreen(); void InitializeSlideShowView (const css::uno::Reference<css::uno::XInterface>& rxView); void GetSlides (const sal_Int32 nOffset); - void UpdateViews (void); + void UpdateViews(); void InitializeMainPane (const css::uno::Reference<css::drawing::framework::XPane>& rxPane); void LoadTheme (const css::uno::Reference<css::drawing::framework::XPane>& rxPane); void UpdatePendingSlideNumber (const sal_Int32 nPendingSlideNumber); @@ -238,7 +238,7 @@ private: */ void HandleNumericKeyPress (const sal_Int32 nKey, const sal_Int32 nModifiers); - void ThrowIfDisposed (void) const throw (css::lang::DisposedException); + void ThrowIfDisposed() const throw (css::lang::DisposedException); }; } } // end of namespace ::sdext::presenter diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx b/sdext/source/presenter/PresenterCurrentSlideObserver.cxx index 664f460056fd..4ee448c91e1a 100644 --- a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx +++ b/sdext/source/presenter/PresenterCurrentSlideObserver.cxx @@ -45,11 +45,11 @@ PresenterCurrentSlideObserver::PresenterCurrentSlideObserver ( } } -PresenterCurrentSlideObserver::~PresenterCurrentSlideObserver (void) +PresenterCurrentSlideObserver::~PresenterCurrentSlideObserver() { } -void SAL_CALL PresenterCurrentSlideObserver::disposing (void) +void SAL_CALL PresenterCurrentSlideObserver::disposing() { // Disconnect form the slide show controller. if(mxSlideShowController.is()) @@ -83,12 +83,12 @@ void SAL_CALL PresenterCurrentSlideObserver::repeat ( (void)rNode; } -void SAL_CALL PresenterCurrentSlideObserver::paused (void) +void SAL_CALL PresenterCurrentSlideObserver::paused() throw (com::sun::star::uno::RuntimeException, std::exception) { } -void SAL_CALL PresenterCurrentSlideObserver::resumed (void) +void SAL_CALL PresenterCurrentSlideObserver::resumed() throw (css::uno::RuntimeException, std::exception) { } @@ -110,19 +110,19 @@ void SAL_CALL PresenterCurrentSlideObserver::hyperLinkClicked (const OUString &) { } -void SAL_CALL PresenterCurrentSlideObserver::slideTransitionStarted (void) +void SAL_CALL PresenterCurrentSlideObserver::slideTransitionStarted() throw (css::uno::RuntimeException, std::exception) { if( mpPresenterController.is() ) mpPresenterController->UpdateCurrentSlide(0); } -void SAL_CALL PresenterCurrentSlideObserver::slideTransitionEnded (void) +void SAL_CALL PresenterCurrentSlideObserver::slideTransitionEnded() throw (css::uno::RuntimeException, std::exception) { } -void SAL_CALL PresenterCurrentSlideObserver::slideAnimationsEnded (void) +void SAL_CALL PresenterCurrentSlideObserver::slideAnimationsEnded() throw (css::uno::RuntimeException, std::exception) { } diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx index a13ae02018f1..1e9848269222 100644 --- a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx +++ b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx @@ -52,9 +52,9 @@ public: PresenterCurrentSlideObserver ( const ::rtl::Reference<PresenterController>& rxPresenterController, const css::uno::Reference<css::presentation::XSlideShowController>& rxSlideShowController); - virtual ~PresenterCurrentSlideObserver (void); + virtual ~PresenterCurrentSlideObserver(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XSlideShowListener virtual void SAL_CALL paused( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sdext/source/presenter/PresenterFrameworkObserver.cxx b/sdext/source/presenter/PresenterFrameworkObserver.cxx index 6bb3a8d9fe0a..b3dc3859a58d 100644 --- a/sdext/source/presenter/PresenterFrameworkObserver.cxx +++ b/sdext/source/presenter/PresenterFrameworkObserver.cxx @@ -60,7 +60,7 @@ PresenterFrameworkObserver::PresenterFrameworkObserver ( } } -PresenterFrameworkObserver::~PresenterFrameworkObserver (void) +PresenterFrameworkObserver::~PresenterFrameworkObserver() { } @@ -75,19 +75,19 @@ void PresenterFrameworkObserver::RunOnUpdateEnd ( rAction); } -bool PresenterFrameworkObserver::True (void) +bool PresenterFrameworkObserver::True() { return true; } -void SAL_CALL PresenterFrameworkObserver::disposing (void) +void SAL_CALL PresenterFrameworkObserver::disposing() { if ( ! maAction.empty()) maAction(false); Shutdown(); } -void PresenterFrameworkObserver::Shutdown (void) +void PresenterFrameworkObserver::Shutdown() { maAction = Action(); maPredicate = Predicate(); diff --git a/sdext/source/presenter/PresenterFrameworkObserver.hxx b/sdext/source/presenter/PresenterFrameworkObserver.hxx index c9df45487355..3ebc2cb59140 100644 --- a/sdext/source/presenter/PresenterFrameworkObserver.hxx +++ b/sdext/source/presenter/PresenterFrameworkObserver.hxx @@ -42,14 +42,14 @@ class PresenterFrameworkObserver public PresenterFrameworkObserverInterfaceBase { public: - typedef ::boost::function<bool(void)> Predicate; + typedef ::boost::function<bool()> Predicate; typedef ::boost::function<void(bool)> Action; static void RunOnUpdateEnd ( const css::uno::Reference<css::drawing::framework::XConfigurationController>&rxController, const Action& rAction); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL notifyConfigurationChange ( @@ -77,13 +77,13 @@ private: const OUString& rsEventName, const Predicate& rPredicate, const Action& rAction); - virtual ~PresenterFrameworkObserver (void); + virtual ~PresenterFrameworkObserver(); - void Shutdown (void); + void Shutdown(); /** Predicate that always returns true. */ - static bool True (void); + static bool True(); }; } } // end of namespace ::sdext::presenter diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx index d0d22bfc6250..c2cb2e0e0864 100644 --- a/sdext/source/presenter/PresenterHelpView.cxx +++ b/sdext/source/presenter/PresenterHelpView.cxx @@ -51,11 +51,11 @@ namespace { class LineDescriptor { public: - LineDescriptor(void); + LineDescriptor(); void AddPart ( const OUString& rsLine, const css::uno::Reference<css::rendering::XCanvasFont>& rxFont); - bool IsEmpty (void) const; + bool IsEmpty() const; OUString msLine; geometry::RealSize2D maSize; @@ -83,7 +83,7 @@ namespace { const rendering::ViewState& rViewState, rendering::RenderState& rRenderState, const css::uno::Reference<css::rendering::XCanvasFont>& rxFont) const; - double GetHeight (void) const; + double GetHeight() const; private: const OUString msText; @@ -182,11 +182,11 @@ PresenterHelpView::PresenterHelpView ( } } -PresenterHelpView::~PresenterHelpView (void) +PresenterHelpView::~PresenterHelpView() { } -void SAL_CALL PresenterHelpView::disposing (void) +void SAL_CALL PresenterHelpView::disposing() { mxViewId = NULL; @@ -353,7 +353,7 @@ void PresenterHelpView::Paint (const awt::Rectangle& rUpdateBox) xSpriteCanvas->updateScreen(sal_False); } -void PresenterHelpView::ReadHelpStrings (void) +void PresenterHelpView::ReadHelpStrings() { mpTextContainer.reset(new TextContainer()); PresenterConfigurationAccess aConfiguration ( @@ -383,7 +383,7 @@ void PresenterHelpView::ProcessString ( new Block(sLeftText, sRightText, mpFont->mxFont, mnMaximalWidth))); } -void PresenterHelpView::CheckFontSize (void) +void PresenterHelpView::CheckFontSize() { if (mpFont.get() == NULL) return; @@ -449,14 +449,14 @@ void PresenterHelpView::CheckFontSize (void) //----- XResourceId ----------------------------------------------------------- -Reference<XResourceId> SAL_CALL PresenterHelpView::getResourceId (void) +Reference<XResourceId> SAL_CALL PresenterHelpView::getResourceId() throw (RuntimeException, std::exception) { ThrowIfDisposed(); return mxViewId; } -sal_Bool SAL_CALL PresenterHelpView::isAnchorOnly (void) +sal_Bool SAL_CALL PresenterHelpView::isAnchorOnly() throw (RuntimeException, std::exception) { return false; @@ -464,7 +464,7 @@ sal_Bool SAL_CALL PresenterHelpView::isAnchorOnly (void) -void PresenterHelpView::ProvideCanvas (void) +void PresenterHelpView::ProvideCanvas() { if ( ! mxCanvas.is() && mxPane.is()) { @@ -480,7 +480,7 @@ void PresenterHelpView::ProvideCanvas (void) } } -void PresenterHelpView::Resize (void) +void PresenterHelpView::Resize() { if (mpCloseButton.get() != NULL && mxWindow.is()) { @@ -499,7 +499,7 @@ void PresenterHelpView::Resize (void) } } -void PresenterHelpView::ThrowIfDisposed (void) +void PresenterHelpView::ThrowIfDisposed() throw (lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) @@ -514,7 +514,7 @@ void PresenterHelpView::ThrowIfDisposed (void) namespace { -LineDescriptor::LineDescriptor (void) +LineDescriptor::LineDescriptor() : msLine(), maSize(0,0), mnVerticalOffset(0) @@ -530,7 +530,7 @@ void LineDescriptor::AddPart ( CalculateSize(rxFont); } -bool LineDescriptor::IsEmpty (void) const +bool LineDescriptor::IsEmpty() const { return msLine.isEmpty(); } @@ -610,7 +610,7 @@ double LineDescriptorList::Paint( return nY - rBBox.Y1; } -double LineDescriptorList::GetHeight (void) const +double LineDescriptorList::GetHeight() const { double nHeight (0); vector<LineDescriptor>::const_iterator iLine (mpLineDescriptors->begin()); diff --git a/sdext/source/presenter/PresenterHelpView.hxx b/sdext/source/presenter/PresenterHelpView.hxx index 1b4e4887d1d1..7792d79389b9 100644 --- a/sdext/source/presenter/PresenterHelpView.hxx +++ b/sdext/source/presenter/PresenterHelpView.hxx @@ -55,9 +55,9 @@ public: const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId, const css::uno::Reference<css::frame::XController>& rxController, const ::rtl::Reference<PresenterController>& rpPresenterController); - virtual ~PresenterHelpView (void); + virtual ~PresenterHelpView(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // lang::XEventListener @@ -86,10 +86,10 @@ public: // XResourceId - virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId (void) + virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isAnchorOnly (void) + virtual sal_Bool SAL_CALL isAnchorOnly() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: @@ -107,22 +107,22 @@ private: sal_Int32 mnSeparatorY; sal_Int32 mnMaximalWidth; - void ProvideCanvas (void); - void Resize (void); + void ProvideCanvas(); + void Resize(); void Paint (const css::awt::Rectangle& rRedrawArea); - void ReadHelpStrings (void); + void ReadHelpStrings(); void ProcessString ( const css::uno::Reference<css::beans::XPropertySet>& rsProperties); /** Find a font size, so that all text can be displayed at the same time. */ - void CheckFontSize (void); + void CheckFontSize(); /** This method throws a DisposedException when the object has already been disposed. */ - void ThrowIfDisposed (void) + void ThrowIfDisposed() throw (css::lang::DisposedException); }; diff --git a/sdext/source/presenter/PresenterNotesView.cxx b/sdext/source/presenter/PresenterNotesView.cxx index 26191735870c..8bb5a0458b7e 100644 --- a/sdext/source/presenter/PresenterNotesView.cxx +++ b/sdext/source/presenter/PresenterNotesView.cxx @@ -133,11 +133,11 @@ PresenterNotesView::PresenterNotesView ( } } -PresenterNotesView::~PresenterNotesView (void) +PresenterNotesView::~PresenterNotesView() { } -void SAL_CALL PresenterNotesView::disposing (void) +void SAL_CALL PresenterNotesView::disposing() { if (mxParentWindow.is()) { @@ -332,13 +332,13 @@ void SAL_CALL PresenterNotesView::windowPaint (const awt::PaintEvent& rEvent) //----- XResourceId ----------------------------------------------------------- -Reference<XResourceId> SAL_CALL PresenterNotesView::getResourceId (void) +Reference<XResourceId> SAL_CALL PresenterNotesView::getResourceId() throw (RuntimeException, std::exception) { return mxViewId; } -sal_Bool SAL_CALL PresenterNotesView::isAnchorOnly (void) +sal_Bool SAL_CALL PresenterNotesView::isAnchorOnly() throw (RuntimeException, std::exception) { return false; @@ -364,7 +364,7 @@ void SAL_CALL PresenterNotesView::setCurrentPage (const Reference<drawing::XDraw SetSlide(mxCurrentNotesPage); } -Reference<drawing::XDrawPage> SAL_CALL PresenterNotesView::getCurrentPage (void) +Reference<drawing::XDrawPage> SAL_CALL PresenterNotesView::getCurrentPage() throw (RuntimeException, std::exception) { return NULL; @@ -422,7 +422,7 @@ void SAL_CALL PresenterNotesView::keyReleased (const awt::KeyEvent& rEvent) -void PresenterNotesView::Layout (void) +void PresenterNotesView::Layout() { if ( ! mxParentWindow.is()) return; @@ -604,7 +604,7 @@ void PresenterNotesView::PaintText (const awt::Rectangle& rUpdateBox) xSpriteCanvas->updateScreen(sal_False); } -void PresenterNotesView::Invalidate (void) +void PresenterNotesView::Invalidate() { mpPresenterController->GetPaintManager()->Invalidate( mxParentWindow, @@ -674,12 +674,12 @@ void PresenterNotesView::ChangeFontSize (const sal_Int32 nSizeChange) } } -::boost::shared_ptr<PresenterTextView> PresenterNotesView::GetTextView (void) const +::boost::shared_ptr<PresenterTextView> PresenterNotesView::GetTextView() const { return mpTextView; } -void PresenterNotesView::UpdateScrollBar (void) +void PresenterNotesView::UpdateScrollBar() { if (mpScrollBar.get() != NULL) { @@ -700,7 +700,7 @@ void PresenterNotesView::UpdateScrollBar (void) } } -void PresenterNotesView::ThrowIfDisposed (void) +void PresenterNotesView::ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) diff --git a/sdext/source/presenter/PresenterNotesView.hxx b/sdext/source/presenter/PresenterNotesView.hxx index 1489455f9856..16a8e949e917 100644 --- a/sdext/source/presenter/PresenterNotesView.hxx +++ b/sdext/source/presenter/PresenterNotesView.hxx @@ -70,9 +70,9 @@ public: const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId, const css::uno::Reference<css::frame::XController>& rxController, const ::rtl::Reference<PresenterController>& rpPresenterController); - virtual ~PresenterNotesView (void); + virtual ~PresenterNotesView(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; /** Typically called from setCurrentSlide() with the notes page that is associed with the slide given to setCurrentSlide(). @@ -85,7 +85,7 @@ public: void ChangeFontSize (const sal_Int32 nSizeChange); - ::boost::shared_ptr<PresenterTextView> GetTextView (void) const; + ::boost::shared_ptr<PresenterTextView> GetTextView() const; // lang::XEventListener @@ -114,10 +114,10 @@ public: // XResourceId - virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId (void) + virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isAnchorOnly (void) + virtual sal_Bool SAL_CALL isAnchorOnly() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDrawView @@ -126,7 +126,7 @@ public: const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage (void) + virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XKeyListener @@ -158,20 +158,20 @@ private: void CreateToolBar ( const css::uno::Reference<css::uno::XComponentContext>& rxContext, const ::rtl::Reference<PresenterController>& rpPresenterController); - void Layout (void); + void Layout(); void Paint (const css::awt::Rectangle& rUpdateBox); void PaintToolBar (const css::awt::Rectangle& rUpdateBox); void PaintText (const css::awt::Rectangle& rUpdateBox); - void Invalidate (void); + void Invalidate(); void Scroll (const double nDistance); void SetTop (const double nTop); - void UpdateScrollBar (void); + void UpdateScrollBar(); void MoveCaret (const sal_Int32 nDistance); /** This method throws a DisposedException when the object has already been disposed. */ - void ThrowIfDisposed (void) + void ThrowIfDisposed() throw (css::lang::DisposedException); }; diff --git a/sdext/source/presenter/PresenterPane.cxx b/sdext/source/presenter/PresenterPane.cxx index 18a099e6ab49..6c1ccd37744c 100644 --- a/sdext/source/presenter/PresenterPane.cxx +++ b/sdext/source/presenter/PresenterPane.cxx @@ -49,20 +49,20 @@ PresenterPane::PresenterPane ( UNO_QUERY_THROW); } -PresenterPane::~PresenterPane (void) +PresenterPane::~PresenterPane() { } //----- XPane ----------------------------------------------------------------- -Reference<awt::XWindow> SAL_CALL PresenterPane::getWindow (void) +Reference<awt::XWindow> SAL_CALL PresenterPane::getWindow() throw (RuntimeException, std::exception) { ThrowIfDisposed(); return mxContentWindow; } -Reference<rendering::XCanvas> SAL_CALL PresenterPane::getCanvas (void) +Reference<rendering::XCanvas> SAL_CALL PresenterPane::getCanvas() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -175,7 +175,7 @@ void PresenterPane::Invalidate (const css::awt::Rectangle& rRepaintBox) mpPresenterController->GetPaintManager()->Invalidate(mxParentWindow, rRepaintBox); } -void PresenterPane::UpdateBoundingBox (void) +void PresenterPane::UpdateBoundingBox() { if (mxBorderWindow.is() && IsVisible()) maBoundingBox = mxBorderWindow->getPosSize(); diff --git a/sdext/source/presenter/PresenterPane.hxx b/sdext/source/presenter/PresenterPane.hxx index 1a534372e0ba..eb93173bfa81 100644 --- a/sdext/source/presenter/PresenterPane.hxx +++ b/sdext/source/presenter/PresenterPane.hxx @@ -47,19 +47,19 @@ public: PresenterPane ( const css::uno::Reference<css::uno::XComponentContext>& rxContext, const ::rtl::Reference<PresenterController>& rpPresenterController); - virtual ~PresenterPane (void); + virtual ~PresenterPane(); - static OUString getImplementationName_static (void); - static css::uno::Sequence< OUString > getSupportedServiceNames_static (void); + static OUString getImplementationName_static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_static(); static css::uno::Reference<css::uno::XInterface> Create( const css::uno::Reference<css::uno::XComponentContext>& rxContext); // XPane - css::uno::Reference<css::awt::XWindow> SAL_CALL getWindow (void) + css::uno::Reference<css::awt::XWindow> SAL_CALL getWindow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - css::uno::Reference<css::rendering::XCanvas> SAL_CALL getCanvas (void) + css::uno::Reference<css::rendering::XCanvas> SAL_CALL getCanvas() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XWindowListener @@ -93,7 +93,7 @@ private: void Invalidate ( const css::awt::Rectangle& rRepaintBox); - void UpdateBoundingBox (void); + void UpdateBoundingBox(); }; } } // end of namespace ::sd::presenter diff --git a/sdext/source/presenter/PresenterPaneBase.cxx b/sdext/source/presenter/PresenterPaneBase.cxx index 2cd5c1d5709f..0195c66b827c 100644 --- a/sdext/source/presenter/PresenterPaneBase.cxx +++ b/sdext/source/presenter/PresenterPaneBase.cxx @@ -63,11 +63,11 @@ PresenterPaneBase::PresenterPaneBase ( mxPresenterHelper = mpPresenterController->GetPresenterHelper(); } -PresenterPaneBase::~PresenterPaneBase (void) +PresenterPaneBase::~PresenterPaneBase() { } -void PresenterPaneBase::disposing (void) +void PresenterPaneBase::disposing() { if (mxBorderWindow.is()) { @@ -116,13 +116,13 @@ void PresenterPaneBase::SetTitle (const OUString& rsTitle) mpPresenterController->GetPaintManager()->Invalidate(mxBorderWindow); } -OUString PresenterPaneBase::GetTitle (void) const +OUString PresenterPaneBase::GetTitle() const { return msTitle; } Reference<drawing::framework::XPaneBorderPainter> - PresenterPaneBase::GetPaneBorderPainter (void) const + PresenterPaneBase::GetPaneBorderPainter() const { return mxBorderPainter; } @@ -156,7 +156,7 @@ void PresenterPaneBase::SetCalloutAnchor (const css::awt::Point& rCalloutAnchor) mpPresenterController->GetPaintManager()->Invalidate(mxBorderWindow); } -awt::Point PresenterPaneBase::GetCalloutAnchor (void) const +awt::Point PresenterPaneBase::GetCalloutAnchor() const { return maCalloutAnchor; } @@ -260,14 +260,14 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments) //----- XResourceId ----------------------------------------------------------- -Reference<XResourceId> SAL_CALL PresenterPaneBase::getResourceId (void) +Reference<XResourceId> SAL_CALL PresenterPaneBase::getResourceId() throw (RuntimeException, std::exception) { ThrowIfDisposed(); return mxPaneId; } -sal_Bool SAL_CALL PresenterPaneBase::isAnchorOnly (void) +sal_Bool SAL_CALL PresenterPaneBase::isAnchorOnly() throw (RuntimeException, std::exception) { return true; @@ -338,12 +338,12 @@ void PresenterPaneBase::CreateWindows ( } } -Reference<awt::XWindow> PresenterPaneBase::GetBorderWindow (void) const +Reference<awt::XWindow> PresenterPaneBase::GetBorderWindow() const { return mxBorderWindow; } -void PresenterPaneBase::ToTop (void) +void PresenterPaneBase::ToTop() { if (mxPresenterHelper.is()) mxPresenterHelper->toTop(mxContentWindow); @@ -411,7 +411,7 @@ void PresenterPaneBase::PaintBorder (const awt::Rectangle& rUpdateBox) } } -void PresenterPaneBase::LayoutContextWindow (void) +void PresenterPaneBase::LayoutContextWindow() { OSL_ASSERT(mxPaneId.is()); OSL_ASSERT(mxBorderWindow.is()); @@ -432,7 +432,7 @@ void PresenterPaneBase::LayoutContextWindow (void) } } -bool PresenterPaneBase::IsVisible (void) const +bool PresenterPaneBase::IsVisible() const { Reference<awt::XWindow2> xWindow2 (mxBorderPainter, UNO_QUERY); if (xWindow2.is()) @@ -441,7 +441,7 @@ bool PresenterPaneBase::IsVisible (void) const return false; } -void PresenterPaneBase::ThrowIfDisposed (void) +void PresenterPaneBase::ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) diff --git a/sdext/source/presenter/PresenterPaneBase.hxx b/sdext/source/presenter/PresenterPaneBase.hxx index fec447bb4a0e..700c440c78bd 100644 --- a/sdext/source/presenter/PresenterPaneBase.hxx +++ b/sdext/source/presenter/PresenterPaneBase.hxx @@ -67,17 +67,17 @@ public: PresenterPaneBase ( const css::uno::Reference<css::uno::XComponentContext>& rxContext, const ::rtl::Reference<PresenterController>& rpPresenterController); - virtual ~PresenterPaneBase (void); + virtual ~PresenterPaneBase(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; - css::uno::Reference<css::awt::XWindow> GetBorderWindow (void) const; + css::uno::Reference<css::awt::XWindow> GetBorderWindow() const; void SetBackground (const SharedBitmapDescriptor& rpBackground); void SetTitle (const OUString& rsTitle); - OUString GetTitle (void) const; - css::uno::Reference<css::drawing::framework::XPaneBorderPainter> GetPaneBorderPainter (void) const; + OUString GetTitle() const; + css::uno::Reference<css::drawing::framework::XPaneBorderPainter> GetPaneBorderPainter() const; void SetCalloutAnchor (const css::awt::Point& rAnchorPosition); - css::awt::Point GetCalloutAnchor (void) const; + css::awt::Point GetCalloutAnchor() const; // XInitialization @@ -86,10 +86,10 @@ public: // XResourceId - virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId (void) + virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isAnchorOnly (void) + virtual sal_Bool SAL_CALL isAnchorOnly() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XWindowListener @@ -138,14 +138,14 @@ protected: const css::awt::Rectangle& rCenterBox, const css::awt::Rectangle& rUpdateBox); void PaintBorder (const css::awt::Rectangle& rUpdateRectangle); - void ToTop (void); - void LayoutContextWindow (void); - bool IsVisible (void) const; + void ToTop(); + void LayoutContextWindow(); + bool IsVisible() const; /** This method throws a DisposedException when the object has already been disposed. */ - void ThrowIfDisposed (void) + void ThrowIfDisposed() throw (css::lang::DisposedException); }; diff --git a/sdext/source/presenter/PresenterPaneBorderManager.cxx b/sdext/source/presenter/PresenterPaneBorderManager.cxx index 4ddaa937f3e9..b5a09797f278 100644 --- a/sdext/source/presenter/PresenterPaneBorderManager.cxx +++ b/sdext/source/presenter/PresenterPaneBorderManager.cxx @@ -43,12 +43,12 @@ namespace sdext { namespace presenter { //===== Service =============================================================== -OUString PresenterPaneBorderManager::getImplementationName_static (void) +OUString PresenterPaneBorderManager::getImplementationName_static() { return OUString("com.sun.star.comp.Draw.PresenterPaneBorderManager"); } -Sequence<OUString> PresenterPaneBorderManager::getSupportedServiceNames_static (void) +Sequence<OUString> PresenterPaneBorderManager::getSupportedServiceNames_static() { static const OUString sServiceName( "com.sun.star.drawing.PresenterPaneBorderManager"); @@ -91,11 +91,11 @@ PresenterPaneBorderManager::PresenterPaneBorderManager ( } } -PresenterPaneBorderManager::~PresenterPaneBorderManager (void) +PresenterPaneBorderManager::~PresenterPaneBorderManager() { } -void PresenterPaneBorderManager::disposing (void) +void PresenterPaneBorderManager::disposing() { WindowList::const_iterator iDescriptor; for (iDescriptor=maWindowList.begin(); iDescriptor!=maWindowList.end(); ++iDescriptor) @@ -491,7 +491,7 @@ void PresenterPaneBorderManager::ReleaseMouse (const Reference<awt::XWindow>& rx mxPresenterHelper->releaseMouse(rxWindow); } -void PresenterPaneBorderManager::ThrowIfDisposed (void) +void PresenterPaneBorderManager::ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) diff --git a/sdext/source/presenter/PresenterPaneBorderManager.hxx b/sdext/source/presenter/PresenterPaneBorderManager.hxx index 94472dcba718..d69cbc1f709f 100644 --- a/sdext/source/presenter/PresenterPaneBorderManager.hxx +++ b/sdext/source/presenter/PresenterPaneBorderManager.hxx @@ -66,12 +66,12 @@ public: PresenterPaneBorderManager ( const css::uno::Reference<css::uno::XComponentContext>& rxContext, const ::rtl::Reference<PresenterController>& rpPresenterController); - virtual ~PresenterPaneBorderManager (void); + virtual ~PresenterPaneBorderManager(); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing(); - static OUString getImplementationName_static (void); - static css::uno::Sequence< OUString > getSupportedServiceNames_static (void); + static OUString getImplementationName_static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_static(); static css::uno::Reference<css::uno::XInterface> Create( const css::uno::Reference<css::uno::XComponentContext>& rxContext); @@ -141,7 +141,7 @@ private: /** This method throws a DisposedException when the object has already been disposed. */ - void ThrowIfDisposed (void) + void ThrowIfDisposed() throw (css::lang::DisposedException); }; diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sdext/source/presenter/PresenterPaneBorderPainter.cxx index 8e3378f9ef91..b40434d32b59 100644 --- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx +++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx @@ -49,7 +49,7 @@ namespace { class BorderSize { public: - BorderSize (void); + BorderSize(); sal_Int32 mnLeft; sal_Int32 mnTop; sal_Int32 mnRight; @@ -92,7 +92,7 @@ namespace { BorderSize maTotalBorderSize; enum Side { Left, Top, Right, Bottom }; private: - void UpdateBorderSizes (void); + void UpdateBorderSizes(); SharedBitmapDescriptor GetBitmap( const ::boost::shared_ptr<PresenterTheme>& rpTheme, const OUString& rsStyleName, @@ -106,7 +106,7 @@ public: Renderer ( const Reference<XComponentContext>& rxContext, const ::boost::shared_ptr<PresenterTheme>& rpTheme); - ~Renderer (void); + ~Renderer(); void SetCanvas (const Reference<rendering::XCanvas>& rxCanvas); void PaintBorder ( @@ -163,7 +163,7 @@ PresenterPaneBorderPainter::PresenterPaneBorderPainter ( { } -PresenterPaneBorderPainter::~PresenterPaneBorderPainter (void) +PresenterPaneBorderPainter::~PresenterPaneBorderPainter() { } @@ -325,7 +325,7 @@ bool PresenterPaneBorderPainter::ProvideTheme (const Reference<rendering::XCanva return bModified; } -bool PresenterPaneBorderPainter::ProvideTheme (void) +bool PresenterPaneBorderPainter::ProvideTheme() { if (mpTheme.get() == NULL) { @@ -375,7 +375,7 @@ awt::Rectangle PresenterPaneBorderPainter::RemoveBorder ( return rOuterBox; } -void PresenterPaneBorderPainter::ThrowIfDisposed (void) const +void PresenterPaneBorderPainter::ThrowIfDisposed() const throw (::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) @@ -414,7 +414,7 @@ PresenterPaneBorderPainter::Renderer::Renderer ( } } -PresenterPaneBorderPainter::Renderer::~Renderer (void) +PresenterPaneBorderPainter::Renderer::~Renderer() { } @@ -783,7 +783,7 @@ namespace { //===== BorderSize ============================================================ -BorderSize::BorderSize (void) +BorderSize::BorderSize() : mnLeft(0), mnTop(0), mnRight(0), @@ -932,7 +932,7 @@ const Reference<rendering::XCanvasFont> RendererPaneStyle::GetFont ( return mpFont->mxFont; } -void RendererPaneStyle::UpdateBorderSizes (void) +void RendererPaneStyle::UpdateBorderSizes() { maTotalBorderSize.mnLeft = maInnerBorderSize.mnLeft + maOuterBorderSize.mnLeft; maTotalBorderSize.mnTop = maInnerBorderSize.mnTop + maOuterBorderSize.mnTop; diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.hxx b/sdext/source/presenter/PresenterPaneBorderPainter.hxx index 028e0182e37e..79d4a3dd3e4f 100644 --- a/sdext/source/presenter/PresenterPaneBorderPainter.hxx +++ b/sdext/source/presenter/PresenterPaneBorderPainter.hxx @@ -55,7 +55,7 @@ class PresenterPaneBorderPainter public: PresenterPaneBorderPainter ( const css::uno::Reference<css::uno::XComponentContext>& rxContext); - virtual ~PresenterPaneBorderPainter (void); + virtual ~PresenterPaneBorderPainter(); /** Transform the bounding box of the window content to the outer bounding box of the border that is painted around it. @@ -136,9 +136,9 @@ private: */ bool ProvideTheme ( const css::uno::Reference<css::rendering::XCanvas>& rxCanvas); - bool ProvideTheme (void); + bool ProvideTheme(); - void ThrowIfDisposed (void) const + void ThrowIfDisposed() const throw (css::lang::DisposedException); }; diff --git a/sdext/source/presenter/PresenterPaneContainer.cxx b/sdext/source/presenter/PresenterPaneContainer.cxx index c271cdb51b23..74dfb1c288f2 100644 --- a/sdext/source/presenter/PresenterPaneContainer.cxx +++ b/sdext/source/presenter/PresenterPaneContainer.cxx @@ -47,7 +47,7 @@ PresenterPaneContainer::PresenterPaneContainer ( } } -PresenterPaneContainer::~PresenterPaneContainer (void) +PresenterPaneContainer::~PresenterPaneContainer() { } @@ -101,7 +101,7 @@ void PresenterPaneContainer::PreparePane ( } } -void SAL_CALL PresenterPaneContainer::disposing (void) +void SAL_CALL PresenterPaneContainer::disposing() { PaneList::iterator iPane (maPanes.begin()); PaneList::const_iterator iEnd (maPanes.end()); diff --git a/sdext/source/presenter/PresenterPaneContainer.hxx b/sdext/source/presenter/PresenterPaneContainer.hxx index de4254129df0..d12913c042c9 100644 --- a/sdext/source/presenter/PresenterPaneContainer.hxx +++ b/sdext/source/presenter/PresenterPaneContainer.hxx @@ -61,9 +61,9 @@ class PresenterPaneContainer public: PresenterPaneContainer ( const css::uno::Reference<css::uno::XComponentContext>& rxContext); - virtual ~PresenterPaneContainer (void); + virtual ~PresenterPaneContainer(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; typedef ::boost::function1<void, const css::uno::Reference<css::drawing::framework::XView>&> ViewInitializationFunction; diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx b/sdext/source/presenter/PresenterPaneFactory.cxx index 956a5b4c3666..6eee8bd1d7cc 100644 --- a/sdext/source/presenter/PresenterPaneFactory.cxx +++ b/sdext/source/presenter/PresenterPaneFactory.cxx @@ -111,11 +111,11 @@ void PresenterPaneFactory::Register (const Reference<frame::XController>& rxCont } } -PresenterPaneFactory::~PresenterPaneFactory (void) +PresenterPaneFactory::~PresenterPaneFactory() { } -void SAL_CALL PresenterPaneFactory::disposing (void) +void SAL_CALL PresenterPaneFactory::disposing() throw (RuntimeException) { Reference<XConfigurationController> xCC (mxConfigurationControllerWeak); @@ -321,7 +321,7 @@ Reference<XResource> PresenterPaneFactory::CreatePane ( return Reference<XResource>(static_cast<XWeak*>(xPane.get()), UNO_QUERY_THROW); } -void PresenterPaneFactory::ThrowIfDisposed (void) const +void PresenterPaneFactory::ThrowIfDisposed() const throw (::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) diff --git a/sdext/source/presenter/PresenterPaneFactory.hxx b/sdext/source/presenter/PresenterPaneFactory.hxx index 9a55a8e3646e..0d7106ac4cce 100644 --- a/sdext/source/presenter/PresenterPaneFactory.hxx +++ b/sdext/source/presenter/PresenterPaneFactory.hxx @@ -71,14 +71,14 @@ public: const css::uno::Reference<css::uno::XComponentContext>& rxContext, const css::uno::Reference<css::frame::XController>& rxController, const ::rtl::Reference<PresenterController>& rpPresenterController); - virtual ~PresenterPaneFactory (void); + virtual ~PresenterPaneFactory(); - static OUString getImplementationName_static (void); - static css::uno::Sequence< OUString > getSupportedServiceNames_static (void); + static OUString getImplementationName_static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_static(); static css::uno::Reference<css::uno::XInterface> Create( const css::uno::Reference<css::uno::XComponentContext>& rxContext); - virtual void SAL_CALL disposing (void) + virtual void SAL_CALL disposing() throw (css::uno::RuntimeException) SAL_OVERRIDE; // XResourceFactory @@ -119,7 +119,7 @@ private: const css::uno::Reference<css::drawing::framework::XPane>& rxParentPane, const bool bIsSpritePane); - void ThrowIfDisposed (void) const throw (css::lang::DisposedException); + void ThrowIfDisposed() const throw (css::lang::DisposedException); }; } } diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx index 60a762632aef..8d5d3be89e78 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.cxx +++ b/sdext/source/presenter/PresenterProtocolHandler.cxx @@ -49,9 +49,9 @@ namespace { { public: virtual ~Command() {} - virtual void Execute (void) = 0; - virtual bool IsEnabled (void) const { return true; } - virtual Any GetState (void) const { return Any(sal_False); } + virtual void Execute() = 0; + virtual bool IsEnabled() const { return true; } + virtual Any GetState() const { return Any(sal_False); } }; class GotoPreviousSlideCommand : public Command @@ -59,9 +59,9 @@ namespace { public: GotoPreviousSlideCommand ( const rtl::Reference<PresenterController>& rpPresenterController); - virtual ~GotoPreviousSlideCommand (void) {} - virtual void Execute (void) SAL_OVERRIDE; - virtual bool IsEnabled (void) const SAL_OVERRIDE; + virtual ~GotoPreviousSlideCommand() {} + virtual void Execute() SAL_OVERRIDE; + virtual bool IsEnabled() const SAL_OVERRIDE; private: rtl::Reference<PresenterController> mpPresenterController; }; @@ -71,12 +71,12 @@ namespace { public: GotoNextSlideCommand ( const rtl::Reference<PresenterController>& rpPresenterController); - virtual ~GotoNextSlideCommand (void) {} - virtual void Execute (void) SAL_OVERRIDE; + virtual ~GotoNextSlideCommand() {} + virtual void Execute() SAL_OVERRIDE; // The next slide command is always enabled, even when the current slide // is the last slide: from the last slide it goes to the pause slide, // and from there it ends the slide show. - virtual bool IsEnabled (void) const SAL_OVERRIDE { return true; } + virtual bool IsEnabled() const SAL_OVERRIDE { return true; } private: rtl::Reference<PresenterController> mpPresenterController; }; @@ -86,8 +86,8 @@ namespace { public: GotoNextEffectCommand ( const rtl::Reference<PresenterController>& rpPresenterController); - virtual ~GotoNextEffectCommand (void) {} - virtual void Execute (void) SAL_OVERRIDE; + virtual ~GotoNextEffectCommand() {} + virtual void Execute() SAL_OVERRIDE; private: rtl::Reference<PresenterController> mpPresenterController; }; @@ -97,8 +97,8 @@ namespace { public: SwitchMonitorCommand ( const rtl::Reference<PresenterController>& rpPresenterController); - virtual ~SwitchMonitorCommand (void) {} - virtual void Execute (void) SAL_OVERRIDE; + virtual ~SwitchMonitorCommand() {} + virtual void Execute() SAL_OVERRIDE; private: rtl::Reference<PresenterController> mpPresenterController; }; @@ -109,9 +109,9 @@ namespace { SetNotesViewCommand ( const bool bOn, const rtl::Reference<PresenterController>& rpPresenterController); - virtual ~SetNotesViewCommand (void) {} - virtual void Execute (void) SAL_OVERRIDE; - virtual Any GetState (void) const SAL_OVERRIDE; + virtual ~SetNotesViewCommand() {} + virtual void Execute() SAL_OVERRIDE; + virtual Any GetState() const SAL_OVERRIDE; private: bool mbOn; rtl::Reference<PresenterController> mpPresenterController; @@ -124,9 +124,9 @@ namespace { SetSlideSorterCommand ( const bool bOn, const rtl::Reference<PresenterController>& rpPresenterController); - virtual ~SetSlideSorterCommand (void) {} - virtual void Execute (void) SAL_OVERRIDE; - virtual Any GetState (void) const SAL_OVERRIDE; + virtual ~SetSlideSorterCommand() {} + virtual void Execute() SAL_OVERRIDE; + virtual Any GetState() const SAL_OVERRIDE; private: bool mbOn; rtl::Reference<PresenterController> mpPresenterController; @@ -138,9 +138,9 @@ namespace { SetHelpViewCommand ( const bool bOn, const rtl::Reference<PresenterController>& rpPresenterController); - virtual ~SetHelpViewCommand (void) {} - virtual void Execute (void) SAL_OVERRIDE; - virtual Any GetState (void) const SAL_OVERRIDE; + virtual ~SetHelpViewCommand() {} + virtual void Execute() SAL_OVERRIDE; + virtual Any GetState() const SAL_OVERRIDE; private: bool mbOn; rtl::Reference<PresenterController> mpPresenterController; @@ -152,11 +152,11 @@ namespace { NotesFontSizeCommand( const rtl::Reference<PresenterController>& rpPresenterController, const sal_Int32 nSizeChange); - virtual ~NotesFontSizeCommand (void) {} - virtual void Execute (void) SAL_OVERRIDE; - virtual Any GetState (void) const SAL_OVERRIDE; + virtual ~NotesFontSizeCommand() {} + virtual void Execute() SAL_OVERRIDE; + virtual Any GetState() const SAL_OVERRIDE; protected: - ::rtl::Reference<PresenterNotesView> GetNotesView (void) const; + ::rtl::Reference<PresenterNotesView> GetNotesView() const; private: rtl::Reference<PresenterController> mpPresenterController; const sal_Int32 mnSizeChange; @@ -185,7 +185,7 @@ public: const OUString& rsURLPath, const ::rtl::Reference<PresenterController>& rpPresenterController); - void SAL_CALL disposing (void) SAL_OVERRIDE; + void SAL_CALL disposing() SAL_OVERRIDE; static Command* CreateCommand ( const OUString& rsURLPath, const ::rtl::Reference<PresenterController>& rpPresenterController); @@ -227,19 +227,19 @@ private: Dispatch ( const OUString& rsURLPath, const ::rtl::Reference<PresenterController>& rpPresenterController); - virtual ~Dispatch (void); + virtual ~Dispatch(); - void ThrowIfDisposed (void) const throw (css::lang::DisposedException); + void ThrowIfDisposed() const throw (css::lang::DisposedException); }; //----- Service --------------------------------------------------------------- -OUString PresenterProtocolHandler::getImplementationName_static (void) +OUString PresenterProtocolHandler::getImplementationName_static() { return OUString("org.libreoffice.comp.PresenterScreenProtocolHandler"); } -Sequence<OUString> PresenterProtocolHandler::getSupportedServiceNames_static (void) +Sequence<OUString> PresenterProtocolHandler::getSupportedServiceNames_static() { static const OUString sServiceName("com.sun.star.frame.ProtocolHandler"); return Sequence<OUString>(&sServiceName, 1); @@ -259,11 +259,11 @@ PresenterProtocolHandler::PresenterProtocolHandler (const Reference<XComponentCo (void)rxContext; } -PresenterProtocolHandler::~PresenterProtocolHandler (void) +PresenterProtocolHandler::~PresenterProtocolHandler() { } -void SAL_CALL PresenterProtocolHandler::disposing (void) +void SAL_CALL PresenterProtocolHandler::disposing() { } @@ -342,7 +342,7 @@ Sequence<Reference<frame::XDispatch> > SAL_CALL PresenterProtocolHandler::queryD -void PresenterProtocolHandler::ThrowIfDisposed (void) const +void PresenterProtocolHandler::ThrowIfDisposed() const throw (::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) @@ -419,11 +419,11 @@ Command* PresenterProtocolHandler::Dispatch::CreateCommand ( return NULL; } -PresenterProtocolHandler::Dispatch::~Dispatch (void) +PresenterProtocolHandler::Dispatch::~Dispatch() { } -void PresenterProtocolHandler::Dispatch::disposing (void) +void PresenterProtocolHandler::Dispatch::disposing() { if (mbIsListeningToWindowManager) { @@ -498,7 +498,7 @@ void SAL_CALL PresenterProtocolHandler::Dispatch::removeStatusListener ( throw RuntimeException(); } -void PresenterProtocolHandler::Dispatch::ThrowIfDisposed (void) const +void PresenterProtocolHandler::Dispatch::ThrowIfDisposed() const throw (::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) @@ -538,7 +538,7 @@ GotoPreviousSlideCommand::GotoPreviousSlideCommand ( { } -void GotoPreviousSlideCommand::Execute (void) +void GotoPreviousSlideCommand::Execute() { if ( ! mpPresenterController.is()) return; @@ -549,7 +549,7 @@ void GotoPreviousSlideCommand::Execute (void) mpPresenterController->GetSlideShowController()->gotoPreviousSlide(); } -bool GotoPreviousSlideCommand::IsEnabled (void) const +bool GotoPreviousSlideCommand::IsEnabled() const { if ( ! mpPresenterController.is()) return false; @@ -568,7 +568,7 @@ GotoNextEffectCommand::GotoNextEffectCommand ( { } -void GotoNextEffectCommand::Execute (void) +void GotoNextEffectCommand::Execute() { if ( ! mpPresenterController.is()) return; @@ -587,7 +587,7 @@ GotoNextSlideCommand::GotoNextSlideCommand ( { } -void GotoNextSlideCommand::Execute (void) +void GotoNextSlideCommand::Execute() { if ( ! mpPresenterController.is()) return; @@ -606,7 +606,7 @@ SwitchMonitorCommand::SwitchMonitorCommand ( { } -void SwitchMonitorCommand::Execute (void) +void SwitchMonitorCommand::Execute() { mpPresenterController->SwitchMonitors(); } @@ -621,7 +621,7 @@ SetNotesViewCommand::SetNotesViewCommand ( { } -void SetNotesViewCommand::Execute (void) +void SetNotesViewCommand::Execute() { if ( ! mpPresenterController.is()) return; @@ -637,7 +637,7 @@ void SetNotesViewCommand::Execute (void) pWindowManager->SetViewMode(PresenterWindowManager::VM_Standard); } -Any SetNotesViewCommand::GetState (void) const +Any SetNotesViewCommand::GetState() const { if ( ! mpPresenterController.is()) return Any(false); @@ -666,7 +666,7 @@ SetSlideSorterCommand::SetSlideSorterCommand ( { } -void SetSlideSorterCommand::Execute (void) +void SetSlideSorterCommand::Execute() { if ( ! mpPresenterController.is()) return; @@ -679,7 +679,7 @@ void SetSlideSorterCommand::Execute (void) pWindowManager->SetSlideSorterState(mbOn); } -Any SetSlideSorterCommand::GetState (void) const +Any SetSlideSorterCommand::GetState() const { if ( ! mpPresenterController.is()) return Any(false); @@ -702,7 +702,7 @@ SetHelpViewCommand::SetHelpViewCommand ( { } -void SetHelpViewCommand::Execute (void) +void SetHelpViewCommand::Execute() { if ( ! mpPresenterController.is()) return; @@ -715,7 +715,7 @@ void SetHelpViewCommand::Execute (void) pWindowManager->SetHelpViewState(mbOn); } -Any SetHelpViewCommand::GetState (void) const +Any SetHelpViewCommand::GetState() const { if ( ! mpPresenterController.is()) return Any(false); @@ -738,7 +738,7 @@ NotesFontSizeCommand::NotesFontSizeCommand( { } -::rtl::Reference<PresenterNotesView> NotesFontSizeCommand::GetNotesView (void) const +::rtl::Reference<PresenterNotesView> NotesFontSizeCommand::GetNotesView() const { if (mpPresenterController.get() == NULL) return NULL; @@ -752,14 +752,14 @@ NotesFontSizeCommand::NotesFontSizeCommand( return dynamic_cast<PresenterNotesView*>(pDescriptor->mxView.get()); } -void NotesFontSizeCommand::Execute (void) +void NotesFontSizeCommand::Execute() { ::rtl::Reference<PresenterNotesView> pView (GetNotesView()); if (pView.is()) pView->ChangeFontSize(mnSizeChange); } -Any NotesFontSizeCommand::GetState (void) const +Any NotesFontSizeCommand::GetState() const { return Any(); } diff --git a/sdext/source/presenter/PresenterProtocolHandler.hxx b/sdext/source/presenter/PresenterProtocolHandler.hxx index ecae6661329c..81121fe6b10f 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.hxx +++ b/sdext/source/presenter/PresenterProtocolHandler.hxx @@ -47,12 +47,12 @@ class PresenterProtocolHandler { public: PresenterProtocolHandler (const css::uno::Reference<css::uno::XComponentContext>& rxContext); - virtual ~PresenterProtocolHandler (void); + virtual ~PresenterProtocolHandler(); - void SAL_CALL disposing (void) SAL_OVERRIDE; + void SAL_CALL disposing() SAL_OVERRIDE; - static OUString getImplementationName_static (void); - static css::uno::Sequence< OUString > getSupportedServiceNames_static (void); + static OUString getImplementationName_static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_static(); static css::uno::Reference<css::uno::XInterface> Create( const css::uno::Reference<css::uno::XComponentContext>& rxContext); @@ -89,7 +89,7 @@ private: class Dispatch; ::rtl::Reference<PresenterController> mpPresenterController; - void ThrowIfDisposed (void) const throw (css::lang::DisposedException); + void ThrowIfDisposed() const throw (css::lang::DisposedException); }; } } diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx index 022dcb80cabb..11cae1cdffeb 100644 --- a/sdext/source/presenter/PresenterScreen.cxx +++ b/sdext/source/presenter/PresenterScreen.cxx @@ -67,10 +67,10 @@ namespace { PresenterScreenListener ( const css::uno::Reference<css::uno::XComponentContext>& rxContext, const css::uno::Reference<css::frame::XModel2>& rxModel); - virtual ~PresenterScreenListener (void); + virtual ~PresenterScreenListener(); - void Initialize (void); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + void Initialize(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; // document::XEventListener @@ -85,18 +85,18 @@ namespace { css::uno::Reference<css::uno::XComponentContext> mxComponentContext; rtl::Reference<PresenterScreen> mpPresenterScreen; - void ThrowIfDisposed (void) const throw (::com::sun::star::lang::DisposedException); + void ThrowIfDisposed() const throw (::com::sun::star::lang::DisposedException); }; } //----- Service --------------------------------------------------------------- -OUString PresenterScreenJob::getImplementationName_static (void) +OUString PresenterScreenJob::getImplementationName_static() { return OUString("org.libreoffice.comp.PresenterScreenJob"); } -Sequence<OUString> PresenterScreenJob::getSupportedServiceNames_static (void) +Sequence<OUString> PresenterScreenJob::getSupportedServiceNames_static() { return Sequence<OUString>(); } @@ -114,11 +114,11 @@ PresenterScreenJob::PresenterScreenJob (const Reference<XComponentContext>& rxCo { } -PresenterScreenJob::~PresenterScreenJob (void) +PresenterScreenJob::~PresenterScreenJob() { } -void SAL_CALL PresenterScreenJob::disposing (void) +void SAL_CALL PresenterScreenJob::disposing() { mxComponentContext = NULL; } @@ -182,7 +182,7 @@ PresenterScreenListener::PresenterScreenListener ( { } -void PresenterScreenListener::Initialize (void) +void PresenterScreenListener::Initialize() { Reference< document::XEventListener > xDocListener( static_cast< document::XEventListener* >(this), UNO_QUERY); @@ -191,11 +191,11 @@ void PresenterScreenListener::Initialize (void) xDocBroadcaster->addEventListener(xDocListener); } -PresenterScreenListener::~PresenterScreenListener (void) +PresenterScreenListener::~PresenterScreenListener() { } -void SAL_CALL PresenterScreenListener::disposing (void) +void SAL_CALL PresenterScreenListener::disposing() { Reference< document::XEventBroadcaster > xDocBroadcaster( mxModel, UNO_QUERY ); if( xDocBroadcaster.is() ) @@ -246,7 +246,7 @@ void SAL_CALL PresenterScreenListener::disposing (const css::lang::EventObject& } } -void PresenterScreenListener::ThrowIfDisposed (void) const throw ( +void PresenterScreenListener::ThrowIfDisposed() const throw ( ::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) @@ -282,7 +282,7 @@ PresenterScreen::PresenterScreen ( { } -PresenterScreen::~PresenterScreen (void) +PresenterScreen::~PresenterScreen() { } @@ -297,7 +297,7 @@ bool PresenterScreen::isPresenterScreenEnabled(const css::uno::Reference<css::un >>= dEnablePresenterScreen; return dEnablePresenterScreen; } -void SAL_CALL PresenterScreen::disposing (void) +void SAL_CALL PresenterScreen::disposing() { Reference<XConfigurationController> xCC (mxConfigurationControllerWeak); if (xCC.is() && mxSavedConfiguration.is()) @@ -327,7 +327,7 @@ void SAL_CALL PresenterScreen::disposing (const lang::EventObject& /*rEvent*/) -void PresenterScreen::InitializePresenterScreen (void) +void PresenterScreen::InitializePresenterScreen() { try { @@ -567,7 +567,7 @@ Reference<drawing::framework::XResourceId> PresenterScreen::GetMainPaneId ( + OUString::number(nScreen)); } -void PresenterScreen::RequestShutdownPresenterScreen (void) +void PresenterScreen::RequestShutdownPresenterScreen() { // Restore the configuration that was active before the presenter screen // has been activated. Now, that the presenter screen is displayed in @@ -593,7 +593,7 @@ void PresenterScreen::RequestShutdownPresenterScreen (void) } } -void PresenterScreen::ShutdownPresenterScreen (void) +void PresenterScreen::ShutdownPresenterScreen() { Reference<lang::XComponent> xViewFactoryComponent (mxViewFactory, UNO_QUERY); if (xViewFactoryComponent.is()) diff --git a/sdext/source/presenter/PresenterScreen.hxx b/sdext/source/presenter/PresenterScreen.hxx index 3c7088910e40..44931fbbcfaf 100644 --- a/sdext/source/presenter/PresenterScreen.hxx +++ b/sdext/source/presenter/PresenterScreen.hxx @@ -60,12 +60,12 @@ class PresenterScreenJob public PresenterScreenJobInterfaceBase { public: - static OUString getImplementationName_static (void); - static css::uno::Sequence< OUString > getSupportedServiceNames_static (void); + static OUString getImplementationName_static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_static(); static css::uno::Reference<css::uno::XInterface> Create( const css::uno::Reference<css::uno::XComponentContext>& rxContext); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XJob @@ -77,7 +77,7 @@ public: private: PresenterScreenJob (const css::uno::Reference<css::uno::XComponentContext>& rxContext); - virtual ~PresenterScreenJob (void); + virtual ~PresenterScreenJob(); css::uno::Reference<css::uno::XComponentContext> mxComponentContext; }; @@ -102,25 +102,25 @@ public: PresenterScreen ( const css::uno::Reference<css::uno::XComponentContext>& rxContext, const css::uno::Reference<css::frame::XModel2>& rxModel); - virtual ~PresenterScreen (void); + virtual ~PresenterScreen(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; static bool isPresenterScreenEnabled( const css::uno::Reference<css::uno::XComponentContext>& rxContext); /** Make the presenter screen visible. */ - void InitializePresenterScreen (void); + void InitializePresenterScreen(); /** Do not call ShutdownPresenterScreen() directly. Call RequestShutdownPresenterScreen() instead. It will issue an asynchronous call to ShutdownPresenterScreen() when that is safe. */ - void RequestShutdownPresenterScreen (void); + void RequestShutdownPresenterScreen(); /** Switch / converse monitors between presenter view and slide output */ - void SwitchMonitors (void); + void SwitchMonitors(); // XEventListener @@ -155,7 +155,7 @@ private: typedef ::std::map<OUString,ViewDescriptor> ViewDescriptorContainer; ViewDescriptorContainer maViewDescriptors; - void ShutdownPresenterScreen (void); + void ShutdownPresenterScreen(); /** Create and initialize the factory for presenter view specific panes. */ diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx index 4b147a844d1c..bfcccdc62607 100644 --- a/sdext/source/presenter/PresenterScrollBar.cxx +++ b/sdext/source/presenter/PresenterScrollBar.cxx @@ -50,14 +50,14 @@ class PresenterScrollBar::MousePressRepeater { public: MousePressRepeater (const ::rtl::Reference<PresenterScrollBar>& rpScrollBar); - void Dispose (void); + void Dispose(); void Start (const PresenterScrollBar::Area& reArea); - void Stop (void); + void Stop(); void SetMouseArea (const PresenterScrollBar::Area& reArea); private: void Callback (const TimeValue& rCurrentTime); - void Execute (void); + void Execute(); sal_Int32 mnMousePressRepeaterTaskId; ::rtl::Reference<PresenterScrollBar> mpScrollBar; @@ -139,11 +139,11 @@ PresenterScrollBar::PresenterScrollBar ( } } -PresenterScrollBar::~PresenterScrollBar (void) +PresenterScrollBar::~PresenterScrollBar() { } -void SAL_CALL PresenterScrollBar::disposing (void) +void SAL_CALL PresenterScrollBar::disposing() { mpMousePressRepeater->Dispose(); @@ -280,7 +280,7 @@ void PresenterScrollBar::SetBackground (const SharedBitmapDescriptor& rpBackgrou mpBackgroundBitmap = rpBackgroundBitmap; } -void PresenterScrollBar::CheckValues (void) +void PresenterScrollBar::CheckValues() { mnThumbPosition = ValidateThumbPosition(mnThumbPosition); } @@ -540,7 +540,7 @@ void PresenterScrollBar::PaintBitmap( } } -void PresenterScrollBar::NotifyThumbPositionChange (void) +void PresenterScrollBar::NotifyThumbPositionChange() { if ( ! mbIsNotificationActive) { @@ -636,7 +636,7 @@ PresenterVerticalScrollBar::PresenterVerticalScrollBar ( { } -PresenterVerticalScrollBar::~PresenterVerticalScrollBar (void) +PresenterVerticalScrollBar::~PresenterVerticalScrollBar() { } @@ -669,7 +669,7 @@ void PresenterVerticalScrollBar::UpdateDragAnchor (const double nDragDistance) maDragAnchor.Y += nDragDistance * nPagerHeight / mnTotalSize; } -sal_Int32 PresenterVerticalScrollBar::GetSize (void) const +sal_Int32 PresenterVerticalScrollBar::GetSize() const { return mnScrollBarWidth; } @@ -686,7 +686,7 @@ double PresenterVerticalScrollBar::GetMinor (const double nX, const double nY) c return nX; } -void PresenterVerticalScrollBar::UpdateBorders (void) +void PresenterVerticalScrollBar::UpdateBorders() { const awt::Rectangle aWindowBox (mxWindow->getPosSize()); double nBottom = aWindowBox.Height; @@ -752,7 +752,7 @@ void PresenterVerticalScrollBar::UpdateBorders (void) maBox[Pager]); } -void PresenterVerticalScrollBar::UpdateBitmaps (void) +void PresenterVerticalScrollBar::UpdateBitmaps() { if (mpBitmaps.get() != NULL) { @@ -816,7 +816,7 @@ PresenterScrollBar::MousePressRepeater::MousePressRepeater ( { } -void PresenterScrollBar::MousePressRepeater::Dispose (void) +void PresenterScrollBar::MousePressRepeater::Dispose() { Stop(); mpScrollBar = NULL; @@ -843,7 +843,7 @@ void PresenterScrollBar::MousePressRepeater::Start (const PresenterScrollBar::Ar } } -void PresenterScrollBar::MousePressRepeater::Stop (void) +void PresenterScrollBar::MousePressRepeater::Stop() { if (mnMousePressRepeaterTaskId != PresenterTimer::NotAValidTaskId) { @@ -877,7 +877,7 @@ void PresenterScrollBar::MousePressRepeater::Callback (const TimeValue& rCurrent Execute(); } -void PresenterScrollBar::MousePressRepeater::Execute (void) +void PresenterScrollBar::MousePressRepeater::Execute() { const double nThumbPosition (mpScrollBar->GetThumbPosition()); switch (meMouseArea) diff --git a/sdext/source/presenter/PresenterScrollBar.hxx b/sdext/source/presenter/PresenterScrollBar.hxx index 543d81d2086b..e9b3992273ac 100644 --- a/sdext/source/presenter/PresenterScrollBar.hxx +++ b/sdext/source/presenter/PresenterScrollBar.hxx @@ -56,9 +56,9 @@ class PresenterScrollBar { public: typedef ::boost::function<void(double)> ThumbMotionListener; - virtual ~PresenterScrollBar (void); + virtual ~PresenterScrollBar(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; void SetVisible (const bool bIsVisible); @@ -75,7 +75,7 @@ public: double nPosition, const bool bAsynchronousRepaint); - double GetThumbPosition (void) const { return mnThumbPosition;} + double GetThumbPosition() const { return mnThumbPosition;} /** Set the upper border of the slider range. */ @@ -86,10 +86,10 @@ public: A value not larger than the last value given to SetTotalSize(). */ void SetThumbSize (const double nThumbSize); - double GetThumbSize (void) const { return mnThumbSize;} + double GetThumbSize() const { return mnThumbSize;} void SetLineHeight (const double nLineHeight); - double GetLineHeight (void) const { return mnLineHeight;} + double GetLineHeight() const { return mnLineHeight;} /** Set the canvas that is used for painting the scroll bar. */ @@ -100,7 +100,7 @@ public: /** Call this after changing total size or thumb position or size to move the thumb to a valid position. */ - void CheckValues (void); + void CheckValues(); /** On some occasions it is necessary to trigger the painting of a scrollbar from the outside. @@ -109,7 +109,7 @@ public: const css::awt::Rectangle& rUpdateBox, bool bNoClip = false); - virtual sal_Int32 GetSize (void) const = 0; + virtual sal_Int32 GetSize() const = 0; // XWindowListener @@ -193,8 +193,8 @@ protected: virtual void UpdateDragAnchor (const double nDragDistance) = 0; virtual css::geometry::RealPoint2D GetPoint (const double nMajor, const double nMinor) const = 0; virtual double GetMinor (const double nX, const double nY) const = 0; - virtual void UpdateBorders (void) = 0; - virtual void UpdateBitmaps (void) = 0; + virtual void UpdateBorders() = 0; + virtual void UpdateBitmaps() = 0; virtual void PaintComposite( const css::awt::Rectangle& rRepaintBox, const Area eArea, @@ -217,7 +217,7 @@ protected: const css::awt::Rectangle& rRepaintBox, const Area eArea, const SharedBitmapDescriptor& rpBitmaps); - void NotifyThumbPositionChange (void); + void NotifyThumbPositionChange(); void UpdateWidthOrHeight (sal_Int32& rSize, const SharedBitmapDescriptor& rpDescriptor); css::uno::Reference<css::rendering::XBitmap> GetBitmap ( @@ -252,16 +252,16 @@ public: const css::uno::Reference<css::awt::XWindow>& rxParentWindow, const ::boost::shared_ptr<PresenterPaintManager>& rpPaintManager, const ::boost::function<void(double)>& rThumbMotionListener); - virtual ~PresenterVerticalScrollBar (void); - virtual sal_Int32 GetSize (void) const SAL_OVERRIDE; + virtual ~PresenterVerticalScrollBar(); + virtual sal_Int32 GetSize() const SAL_OVERRIDE; protected: virtual double GetDragDistance (const sal_Int32 nX, const sal_Int32 nY) const SAL_OVERRIDE; virtual void UpdateDragAnchor (const double nDragDistance) SAL_OVERRIDE; virtual css::geometry::RealPoint2D GetPoint (const double nMajor, const double nMinor) const SAL_OVERRIDE; virtual double GetMinor (const double nX, const double nY) const SAL_OVERRIDE; - virtual void UpdateBorders (void) SAL_OVERRIDE; - virtual void UpdateBitmaps (void) SAL_OVERRIDE; + virtual void UpdateBorders() SAL_OVERRIDE; + virtual void UpdateBitmaps() SAL_OVERRIDE; virtual void PaintComposite( const css::awt::Rectangle& rRepaintBox, const Area eArea, diff --git a/sdext/source/presenter/PresenterSlidePreview.cxx b/sdext/source/presenter/PresenterSlidePreview.cxx index 75817bf10924..2610348377bd 100644 --- a/sdext/source/presenter/PresenterSlidePreview.cxx +++ b/sdext/source/presenter/PresenterSlidePreview.cxx @@ -105,11 +105,11 @@ PresenterSlidePreview::PresenterSlidePreview ( Resize(); } -PresenterSlidePreview::~PresenterSlidePreview (void) +PresenterSlidePreview::~PresenterSlidePreview() { } -void SAL_CALL PresenterSlidePreview::disposing (void) +void SAL_CALL PresenterSlidePreview::disposing() { if (mxWindow.is()) { @@ -126,13 +126,13 @@ void SAL_CALL PresenterSlidePreview::disposing (void) //----- XResourceId ----------------------------------------------------------- -Reference<XResourceId> SAL_CALL PresenterSlidePreview::getResourceId (void) +Reference<XResourceId> SAL_CALL PresenterSlidePreview::getResourceId() throw (RuntimeException, std::exception) { return mxViewId; } -sal_Bool SAL_CALL PresenterSlidePreview::isAnchorOnly (void) +sal_Bool SAL_CALL PresenterSlidePreview::isAnchorOnly() throw (RuntimeException, std::exception) { return false; @@ -209,7 +209,7 @@ void SAL_CALL PresenterSlidePreview::setCurrentPage (const Reference<drawing::XD SetSlide(rxSlide); } -Reference<drawing::XDrawPage> SAL_CALL PresenterSlidePreview::getCurrentPage (void) +Reference<drawing::XDrawPage> SAL_CALL PresenterSlidePreview::getCurrentPage() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -365,7 +365,7 @@ void PresenterSlidePreview::Paint (const awt::Rectangle& rBoundingBox) xSpriteCanvas->updateScreen(sal_False); } -void PresenterSlidePreview::Resize (void) +void PresenterSlidePreview::Resize() { if (mxPreviewRenderer.is() && mxPreview.is()) { @@ -386,7 +386,7 @@ void PresenterSlidePreview::Resize (void) SetSlide(mxCurrentSlide); } -void PresenterSlidePreview::ThrowIfDisposed (void) +void PresenterSlidePreview::ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException) { if (PresenterSlidePreviewInterfaceBase::rBHelper.bDisposed || PresenterSlidePreviewInterfaceBase::rBHelper.bInDispose) diff --git a/sdext/source/presenter/PresenterSlidePreview.hxx b/sdext/source/presenter/PresenterSlidePreview.hxx index 2a983fb51c27..f3b2c8432083 100644 --- a/sdext/source/presenter/PresenterSlidePreview.hxx +++ b/sdext/source/presenter/PresenterSlidePreview.hxx @@ -66,15 +66,15 @@ public: const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId, const css::uno::Reference<css::drawing::framework::XPane>& rxAnchorPane, const ::rtl::Reference<PresenterController>& rpPresenterController); - virtual ~PresenterSlidePreview (void); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual ~PresenterSlidePreview(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XResourceId - virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId (void) + virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isAnchorOnly (void) + virtual sal_Bool SAL_CALL isAnchorOnly() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XWindowListener @@ -106,7 +106,7 @@ public: const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage (void) + virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: @@ -146,12 +146,12 @@ private: /** React to a resize of the anchor pane. */ - void Resize (void); + void Resize(); /** This method throws a DisposedException when the object has already been disposed. */ - void ThrowIfDisposed (void) throw (css::lang::DisposedException); + void ThrowIfDisposed() throw (css::lang::DisposedException); }; } } // end of namespace ::sd::presenter diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx index b01338d4672b..b3308e2b221c 100644 --- a/sdext/source/presenter/PresenterSlideShowView.cxx +++ b/sdext/source/presenter/PresenterSlideShowView.cxx @@ -91,7 +91,7 @@ PresenterSlideShowView::PresenterSlideShowView ( } } -void PresenterSlideShowView::LateInit (void) +void PresenterSlideShowView::LateInit() { mxSlideShow = Reference<presentation::XSlideShow> ( mxSlideShowController->getSlideShow(), UNO_QUERY_THROW); @@ -175,11 +175,11 @@ void PresenterSlideShowView::LateInit (void) >>= msClickToExitPresentationTitle; } -PresenterSlideShowView::~PresenterSlideShowView (void) +PresenterSlideShowView::~PresenterSlideShowView() { } -void PresenterSlideShowView::disposing (void) +void PresenterSlideShowView::disposing() { // Tell all listeners that we are disposed. lang::EventObject aEvent; @@ -296,7 +296,7 @@ void SAL_CALL PresenterSlideShowView::setCurrentPage ( } } -css::uno::Reference<css::drawing::XDrawPage> SAL_CALL PresenterSlideShowView::getCurrentPage (void) +css::uno::Reference<css::drawing::XDrawPage> SAL_CALL PresenterSlideShowView::getCurrentPage() throw (css::uno::RuntimeException, std::exception) { return mxCurrentSlide; @@ -304,7 +304,7 @@ css::uno::Reference<css::drawing::XDrawPage> SAL_CALL PresenterSlideShowView::ge //----- CachablePresenterView ------------------------------------------------- -void PresenterSlideShowView::ReleaseView (void) +void PresenterSlideShowView::ReleaseView() { if (mxSlideShow.is() && mbIsViewAdded) { @@ -315,7 +315,7 @@ void PresenterSlideShowView::ReleaseView (void) //----- XSlideShowView -------------------------------------------------------- -Reference<rendering::XSpriteCanvas> SAL_CALL PresenterSlideShowView::getCanvas (void) +Reference<rendering::XSpriteCanvas> SAL_CALL PresenterSlideShowView::getCanvas() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -323,7 +323,7 @@ Reference<rendering::XSpriteCanvas> SAL_CALL PresenterSlideShowView::getCanvas ( return Reference<rendering::XSpriteCanvas>(mxViewCanvas, UNO_QUERY); } -void SAL_CALL PresenterSlideShowView::clear (void) +void SAL_CALL PresenterSlideShowView::clear() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -351,7 +351,7 @@ void SAL_CALL PresenterSlideShowView::clear (void) } } -geometry::AffineMatrix2D SAL_CALL PresenterSlideShowView::getTransformation (void) +geometry::AffineMatrix2D SAL_CALL PresenterSlideShowView::getTransformation() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -378,7 +378,7 @@ geometry::AffineMatrix2D SAL_CALL PresenterSlideShowView::getTransformation (voi } } -geometry::IntegerSize2D SAL_CALL PresenterSlideShowView::getTranslationOffset(void) +geometry::IntegerSize2D SAL_CALL PresenterSlideShowView::getTranslationOffset() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -655,13 +655,13 @@ void SAL_CALL PresenterSlideShowView::windowHidden (const lang::EventObject& rEv //----- XView ----------------------------------------------------------------- -Reference<XResourceId> SAL_CALL PresenterSlideShowView::getResourceId (void) +Reference<XResourceId> SAL_CALL PresenterSlideShowView::getResourceId() throw(RuntimeException, std::exception) { return mxViewId; } -sal_Bool SAL_CALL PresenterSlideShowView::isAnchorOnly (void) +sal_Bool SAL_CALL PresenterSlideShowView::isAnchorOnly() throw (RuntimeException, std::exception) { return false; @@ -669,7 +669,7 @@ sal_Bool SAL_CALL PresenterSlideShowView::isAnchorOnly (void) //----- CachablePresenterView ------------------------------------------------- -void PresenterSlideShowView::ActivatePresenterView (void) +void PresenterSlideShowView::ActivatePresenterView() { if (mxSlideShow.is() && ! mbIsViewAdded) { @@ -678,7 +678,7 @@ void PresenterSlideShowView::ActivatePresenterView (void) } } -void PresenterSlideShowView::DeactivatePresenterView (void) +void PresenterSlideShowView::DeactivatePresenterView() { if (mxSlideShow.is() && mbIsViewAdded) { @@ -877,7 +877,7 @@ Reference<rendering::XCanvas> PresenterSlideShowView::CreateViewCanvas ( rxViewWindow); } -void PresenterSlideShowView::Resize (void) +void PresenterSlideShowView::Resize() { if ( ! mxWindow.is() || ! mxViewWindow.is()) return; @@ -933,7 +933,7 @@ void PresenterSlideShowView::Resize (void) mbIsForcedPaintPending = true; } -void PresenterSlideShowView::ForceRepaint (void) +void PresenterSlideShowView::ForceRepaint() { if (mxSlideShow.is() && mbIsViewAdded) { @@ -942,7 +942,7 @@ void PresenterSlideShowView::ForceRepaint (void) } } -void PresenterSlideShowView::CreateBackgroundPolygons (void) +void PresenterSlideShowView::CreateBackgroundPolygons() { const awt::Rectangle aWindowBox (mxWindow->getPosSize()); const awt::Rectangle aViewWindowBox (mxViewWindow->getPosSize()); @@ -989,7 +989,7 @@ void PresenterSlideShowView::CreateBackgroundPolygons (void) } } -void PresenterSlideShowView::ThrowIfDisposed (void) +void PresenterSlideShowView::ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) diff --git a/sdext/source/presenter/PresenterSlideShowView.hxx b/sdext/source/presenter/PresenterSlideShowView.hxx index 4aeb637572b5..36b527f97e16 100644 --- a/sdext/source/presenter/PresenterSlideShowView.hxx +++ b/sdext/source/presenter/PresenterSlideShowView.hxx @@ -69,28 +69,28 @@ public: const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId, const css::uno::Reference<css::frame::XController>& rxController, const ::rtl::Reference<PresenterController>& rpPresenterController); - virtual ~PresenterSlideShowView (void); + virtual ~PresenterSlideShowView(); - void LateInit (void); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + void LateInit(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; // CachablePresenterView - virtual void ReleaseView (void) SAL_OVERRIDE; + virtual void ReleaseView() SAL_OVERRIDE; // XSlideShowView virtual css::uno::Reference< - css::rendering::XSpriteCanvas > SAL_CALL getCanvas (void) + css::rendering::XSpriteCanvas > SAL_CALL getCanvas() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL clear (void) + virtual void SAL_CALL clear() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::geometry::AffineMatrix2D SAL_CALL getTransformation (void) + virtual css::geometry::AffineMatrix2D SAL_CALL getTransformation() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::geometry::IntegerSize2D SAL_CALL getTranslationOffset(void) + virtual css::geometry::IntegerSize2D SAL_CALL getTranslationOffset() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addTransformationChangedListener( @@ -185,10 +185,10 @@ public: // XView virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL - getResourceId (void) + getResourceId() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isAnchorOnly (void) + virtual sal_Bool SAL_CALL isAnchorOnly() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDrawView @@ -197,14 +197,14 @@ public: const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage (void) + virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // CachablePresenterView - virtual void ActivatePresenterView (void) SAL_OVERRIDE; + virtual void ActivatePresenterView() SAL_OVERRIDE; - virtual void DeactivatePresenterView (void) SAL_OVERRIDE; + virtual void DeactivatePresenterView() SAL_OVERRIDE; private: css::uno::Reference<css::uno::XComponentContext> mxComponentContext; @@ -253,7 +253,7 @@ private: css::uno::Reference<css::rendering::XCanvas> CreateViewCanvas ( const css::uno::Reference<css::awt::XWindow>& rxWindow) const; - void Resize (void); + void Resize(); void PaintOuterWindow (const css::awt::Rectangle& rRepaintBox); void PaintInnerWindow (const css::awt::PaintEvent& rEvent); @@ -265,14 +265,14 @@ private: Call this method when the back buffer may have changed its content, like when the window has been moved but not resized. */ - void ForceRepaint (void); + void ForceRepaint(); - void CreateBackgroundPolygons (void); + void CreateBackgroundPolygons(); /** This method throws a DisposedException when the object has already been disposed. */ - void ThrowIfDisposed (void) + void ThrowIfDisposed() throw (css::lang::DisposedException); void impl_addAndConfigureView(); diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx index 098e85dfc972..c1024c600706 100644 --- a/sdext/source/presenter/PresenterSlideSorter.cxx +++ b/sdext/source/presenter/PresenterSlideSorter.cxx @@ -86,8 +86,8 @@ public: Layout (const ::rtl::Reference<PresenterScrollBar>& rpVerticalScrollBar); void Update (const geometry::RealRectangle2D& rBoundingBox, const double nSlideAspectRatio); - void SetupVisibleArea (void); - void UpdateScrollBars (void); + void SetupVisibleArea(); + void UpdateScrollBars(); bool IsScrollBarNeeded (const sal_Int32 nSlideCount); geometry::RealPoint2D GetLocalPosition (const geometry::RealPoint2D& rWindowPoint) const; geometry::RealPoint2D GetWindowPosition(const geometry::RealPoint2D& rLocalPoint) const; @@ -102,8 +102,8 @@ public: const sal_Int32 nRelativeVerticalPosition) const; css::awt::Rectangle GetBoundingBox (const sal_Int32 nSlideIndex) const; void ForAllVisibleSlides (const ::boost::function<void(sal_Int32)>& rAction); - sal_Int32 GetFirstVisibleSlideIndex (void) const; - sal_Int32 GetLastVisibleSlideIndex (void) const; + sal_Int32 GetFirstVisibleSlideIndex() const; + sal_Int32 GetLastVisibleSlideIndex() const; bool SetHorizontalOffset (const double nOffset); bool SetVerticalOffset (const double nOffset); @@ -143,7 +143,7 @@ public: const ::boost::shared_ptr<PresenterTheme>& rpTheme, const Reference<awt::XWindow>& rxInvalidateTarget, const ::boost::shared_ptr<PresenterPaintManager>& rpPaintManager); - ~MouseOverManager (void); + ~MouseOverManager(); void Paint ( const sal_Int32 nSlideIndex, @@ -176,7 +176,7 @@ private: Reference<rendering::XBitmap> CreateBitmap ( const OUString& rsText, const sal_Int32 nMaximalWidth) const; - void Invalidate (void); + void Invalidate(); geometry::IntegerSize2D CalculateLabelSize ( const OUString& rsText) const; OUString GetFittingText (const OUString& rsText, const double nMaximalWidth) const; @@ -193,7 +193,7 @@ public: CurrentSlideFrameRenderer ( const css::uno::Reference<css::uno::XComponentContext>& rxContext, const css::uno::Reference<css::rendering::XCanvas>& rxCanvas); - ~CurrentSlideFrameRenderer (void); + ~CurrentSlideFrameRenderer(); void PaintCurrentSlideFrame ( const awt::Rectangle& rSlideBoundingBox, @@ -365,11 +365,11 @@ PresenterSlideSorter::PresenterSlideSorter ( } } -PresenterSlideSorter::~PresenterSlideSorter (void) +PresenterSlideSorter::~PresenterSlideSorter() { } -void SAL_CALL PresenterSlideSorter::disposing (void) +void SAL_CALL PresenterSlideSorter::disposing() { mxComponentContext = NULL; mxViewId = NULL; @@ -606,14 +606,14 @@ void SAL_CALL PresenterSlideSorter::mouseDragged (const css::awt::MouseEvent& rE //----- XResourceId ----------------------------------------------------------- -Reference<XResourceId> SAL_CALL PresenterSlideSorter::getResourceId (void) +Reference<XResourceId> SAL_CALL PresenterSlideSorter::getResourceId() throw (RuntimeException, std::exception) { ThrowIfDisposed(); return mxViewId; } -sal_Bool SAL_CALL PresenterSlideSorter::isAnchorOnly (void) +sal_Bool SAL_CALL PresenterSlideSorter::isAnchorOnly() throw (RuntimeException, std::exception) { return false; @@ -674,7 +674,7 @@ void SAL_CALL PresenterSlideSorter::setCurrentPage (const Reference<drawing::XDr } } -Reference<drawing::XDrawPage> SAL_CALL PresenterSlideSorter::getCurrentPage (void) +Reference<drawing::XDrawPage> SAL_CALL PresenterSlideSorter::getCurrentPage() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -683,7 +683,7 @@ Reference<drawing::XDrawPage> SAL_CALL PresenterSlideSorter::getCurrentPage (voi -void PresenterSlideSorter::UpdateLayout (void) +void PresenterSlideSorter::UpdateLayout() { if ( ! mxWindow.is()) return; @@ -842,7 +842,7 @@ void PresenterSlideSorter::ClearBackground ( awt::Rectangle()); } -double PresenterSlideSorter::GetSlideAspectRatio (void) const +double PresenterSlideSorter::GetSlideAspectRatio() const { double nSlideAspectRatio (28.0/21.0); @@ -1094,7 +1094,7 @@ void PresenterSlideSorter::GotoSlide (const sal_Int32 nSlideIndex) mxSlideShowController->gotoSlideIndex(nSlideIndex); } -bool PresenterSlideSorter::ProvideCanvas (void) +bool PresenterSlideSorter::ProvideCanvas() { if ( ! mxCanvas.is()) { @@ -1113,7 +1113,7 @@ bool PresenterSlideSorter::ProvideCanvas (void) return mxCanvas.is(); } -void PresenterSlideSorter::ThrowIfDisposed (void) +void PresenterSlideSorter::ThrowIfDisposed() throw (lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) @@ -1245,7 +1245,7 @@ void PresenterSlideSorter::Layout::Update ( / 2); } -void PresenterSlideSorter::Layout::SetupVisibleArea (void) +void PresenterSlideSorter::Layout::SetupVisibleArea() { geometry::RealPoint2D aPoint (GetLocalPosition( geometry::RealPoint2D(maBoundingBox.X1, maBoundingBox.Y1))); @@ -1408,12 +1408,12 @@ void PresenterSlideSorter::Layout::ForAllVisibleSlides (const ::boost::function< } } -sal_Int32 PresenterSlideSorter::Layout::GetFirstVisibleSlideIndex (void) const +sal_Int32 PresenterSlideSorter::Layout::GetFirstVisibleSlideIndex() const { return GetIndex(mnFirstVisibleRow, mnFirstVisibleColumn); } -sal_Int32 PresenterSlideSorter::Layout::GetLastVisibleSlideIndex (void) const +sal_Int32 PresenterSlideSorter::Layout::GetLastVisibleSlideIndex() const { return ::std::min( GetIndex(mnLastVisibleRow, mnLastVisibleColumn), @@ -1446,7 +1446,7 @@ bool PresenterSlideSorter::Layout::SetVerticalOffset (const double nOffset) return false; } -void PresenterSlideSorter::Layout::UpdateScrollBars (void) +void PresenterSlideSorter::Layout::UpdateScrollBars() { sal_Int32 nTotalRowCount (0); nTotalRowCount = sal_Int32(ceil(double(mnSlideCount) / double(mnColumnCount))); @@ -1514,7 +1514,7 @@ PresenterSlideSorter::MouseOverManager::MouseOverManager ( } } -PresenterSlideSorter::MouseOverManager::~MouseOverManager (void) +PresenterSlideSorter::MouseOverManager::~MouseOverManager() { } @@ -1768,7 +1768,7 @@ void PresenterSlideSorter::MouseOverManager::PaintButtonBackground ( xRightLabelBitmap); } -void PresenterSlideSorter::MouseOverManager::Invalidate (void) +void PresenterSlideSorter::MouseOverManager::Invalidate() { if (mpPaintManager.get() != NULL) mpPaintManager->Invalidate(mxInvalidateTarget, maSlideBoundingBox, true); @@ -1850,7 +1850,7 @@ PresenterSlideSorter::CurrentSlideFrameRenderer::CurrentSlideFrameRenderer ( } } -PresenterSlideSorter::CurrentSlideFrameRenderer::~CurrentSlideFrameRenderer (void) +PresenterSlideSorter::CurrentSlideFrameRenderer::~CurrentSlideFrameRenderer() { } diff --git a/sdext/source/presenter/PresenterSlideSorter.hxx b/sdext/source/presenter/PresenterSlideSorter.hxx index 53128fbc84ed..abbe11c9c06f 100644 --- a/sdext/source/presenter/PresenterSlideSorter.hxx +++ b/sdext/source/presenter/PresenterSlideSorter.hxx @@ -70,9 +70,9 @@ public: const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId, const css::uno::Reference<css::frame::XController>& rxController, const ::rtl::Reference<PresenterController>& rpPresenterController); - virtual ~PresenterSlideSorter (void); + virtual ~PresenterSlideSorter(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; static void SetActiveState (const bool bIsActive); @@ -125,10 +125,10 @@ public: // XResourceId - virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId (void) + virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isAnchorOnly (void) + virtual sal_Bool SAL_CALL isAnchorOnly() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertyChangeListener @@ -149,7 +149,7 @@ public: const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage (void) + virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: @@ -179,7 +179,7 @@ private: ::boost::shared_ptr<CurrentSlideFrameRenderer> mpCurrentSlideFrameRenderer; css::uno::Reference<css::rendering::XPolyPolygon2D> mxPreviewFrame; - void UpdateLayout (void); + void UpdateLayout(); css::geometry::RealRectangle2D PlaceScrollBars ( const css::geometry::RealRectangle2D& rUpperBox); void PlaceCloseButton ( @@ -189,7 +189,7 @@ private: void ClearBackground ( const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, const css::awt::Rectangle& rRedrawArea); - double GetSlideAspectRatio (void) const; + double GetSlideAspectRatio() const; css::uno::Reference<css::rendering::XBitmap> GetPreview (const sal_Int32 nSlideIndex); void PaintPreview ( const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, @@ -199,12 +199,12 @@ private: void SetHorizontalOffset (const double nXOffset); void SetVerticalOffset (const double nYOffset); void GotoSlide (const sal_Int32 nSlideIndex); - bool ProvideCanvas (void); + bool ProvideCanvas(); /** This method throws a DisposedException when the object has already been disposed. */ - void ThrowIfDisposed (void) + void ThrowIfDisposed() throw (css::lang::DisposedException); }; diff --git a/sdext/source/presenter/PresenterSprite.cxx b/sdext/source/presenter/PresenterSprite.cxx index f66bcddd35ed..64949d0c7c18 100644 --- a/sdext/source/presenter/PresenterSprite.cxx +++ b/sdext/source/presenter/PresenterSprite.cxx @@ -30,7 +30,7 @@ using ::com::sun::star::uno::UNO_QUERY; namespace sdext { namespace presenter { -PresenterSprite::PresenterSprite (void) +PresenterSprite::PresenterSprite() : mxSpriteFactory(), mxSprite(), maSize(0,0), @@ -41,7 +41,7 @@ PresenterSprite::PresenterSprite (void) { } -PresenterSprite::~PresenterSprite (void) +PresenterSprite::~PresenterSprite() { if (mxSprite.is()) { @@ -65,7 +65,7 @@ void PresenterSprite::SetFactory ( } } -css::uno::Reference<css::rendering::XCanvas> PresenterSprite::GetCanvas (void) +css::uno::Reference<css::rendering::XCanvas> PresenterSprite::GetCanvas() { ProvideSprite(); if (mxSprite.is()) @@ -74,7 +74,7 @@ css::uno::Reference<css::rendering::XCanvas> PresenterSprite::GetCanvas (void) return NULL; } -void PresenterSprite::Show (void) +void PresenterSprite::Show() { mbIsVisible = true; if (mxSprite.is()) @@ -83,7 +83,7 @@ void PresenterSprite::Show (void) ProvideSprite(); } -void PresenterSprite::Hide (void) +void PresenterSprite::Hide() { mbIsVisible = false; if (mxSprite.is()) @@ -116,13 +116,13 @@ void PresenterSprite::MoveTo (const css::geometry::RealPoint2D& rLocation) ); } -void PresenterSprite::Update (void) +void PresenterSprite::Update() { if (mxSpriteFactory.is()) mxSpriteFactory->updateScreen(sal_False); } -void PresenterSprite::ProvideSprite (void) +void PresenterSprite::ProvideSprite() { if ( ! mxSprite.is() && mxSpriteFactory.is() @@ -150,7 +150,7 @@ void PresenterSprite::ProvideSprite (void) } } -void PresenterSprite::DisposeSprite (void) +void PresenterSprite::DisposeSprite() { if (mxSprite.is()) { diff --git a/sdext/source/presenter/PresenterSprite.hxx b/sdext/source/presenter/PresenterSprite.hxx index 3eeeb6bc7d28..594caa6e7757 100644 --- a/sdext/source/presenter/PresenterSprite.hxx +++ b/sdext/source/presenter/PresenterSprite.hxx @@ -37,8 +37,8 @@ class PresenterSprite : private ::boost::noncopyable { public: - PresenterSprite (void); - virtual ~PresenterSprite (void); + PresenterSprite(); + virtual ~PresenterSprite(); /** The given sprite canvas is used as factory to create the sprite that is wrapped by objects of this class. @@ -47,15 +47,15 @@ public: void SetFactory ( const css::uno::Reference<css::rendering::XSpriteCanvas>& rxSpriteFactory); - css::uno::Reference<css::rendering::XCanvas> GetCanvas (void); + css::uno::Reference<css::rendering::XCanvas> GetCanvas(); - void Show (void); - void Hide (void); + void Show(); + void Hide(); void Resize (const css::geometry::RealSize2D& rSize); void MoveTo (const css::geometry::RealPoint2D& rLocation); - void Update (void); + void Update(); private: css::uno::Reference<css::rendering::XSpriteCanvas> mxSpriteFactory; @@ -66,8 +66,8 @@ private: double mnPriority; double mnAlpha; - void ProvideSprite (void); - void DisposeSprite (void); + void ProvideSprite(); + void DisposeSprite(); }; } } diff --git a/sdext/source/presenter/PresenterSpritePane.cxx b/sdext/source/presenter/PresenterSpritePane.cxx index ed7df848670a..a12015e0076f 100644 --- a/sdext/source/presenter/PresenterSpritePane.cxx +++ b/sdext/source/presenter/PresenterSpritePane.cxx @@ -47,11 +47,11 @@ PresenterSpritePane::PresenterSpritePane (const Reference<XComponentContext>& rx UNO_QUERY_THROW); } -PresenterSpritePane::~PresenterSpritePane (void) +PresenterSpritePane::~PresenterSpritePane() { } -void PresenterSpritePane::disposing (void) +void PresenterSpritePane::disposing() { mpSprite->SetFactory(NULL); mxParentWindow = NULL; @@ -61,14 +61,14 @@ void PresenterSpritePane::disposing (void) //----- XPane ----------------------------------------------------------------- -Reference<awt::XWindow> SAL_CALL PresenterSpritePane::getWindow (void) +Reference<awt::XWindow> SAL_CALL PresenterSpritePane::getWindow() throw (RuntimeException, std::exception) { ThrowIfDisposed(); return mxContentWindow; } -Reference<rendering::XCanvas> SAL_CALL PresenterSpritePane::getCanvas (void) +Reference<rendering::XCanvas> SAL_CALL PresenterSpritePane::getCanvas() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -148,12 +148,12 @@ void SAL_CALL PresenterSpritePane::windowPaint (const awt::PaintEvent& rEvent) -::boost::shared_ptr<PresenterSprite> PresenterSpritePane::GetSprite (void) +::boost::shared_ptr<PresenterSprite> PresenterSpritePane::GetSprite() { return mpSprite; } -void PresenterSpritePane::UpdateCanvases (void) +void PresenterSpritePane::UpdateCanvases() { Reference<XComponent> xContentCanvasComponent (mxContentCanvas, UNO_QUERY); if (xContentCanvasComponent.is()) diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sdext/source/presenter/PresenterTextView.cxx index 7a6ab95fe78f..6ce7e3235ae6 100644 --- a/sdext/source/presenter/PresenterTextView.cxx +++ b/sdext/source/presenter/PresenterTextView.cxx @@ -139,7 +139,7 @@ void PresenterTextView::SetText (const Reference<text::XText>& rxText) } void PresenterTextView::SetTextChangeBroadcaster ( - const ::boost::function<void(void)>& rBroadcaster) + const ::boost::function<void()>& rBroadcaster) { maTextChangeBroadcaster = rBroadcaster; } @@ -166,7 +166,7 @@ void PresenterTextView::SetSize (const css::geometry::RealSize2D& rSize) RequestFormat(); } -double PresenterTextView::GetTotalTextHeight (void) +double PresenterTextView::GetTotalTextHeight() { double nTotalHeight (0); @@ -394,7 +394,7 @@ void PresenterTextView::Paint ( } } -SharedPresenterTextCaret PresenterTextView::GetCaret (void) const +SharedPresenterTextCaret PresenterTextView::GetCaret() const { return mpCaret; } @@ -413,12 +413,12 @@ awt::Rectangle PresenterTextView::GetCaretBounds ( //----- private --------------------------------------------------------------- -void PresenterTextView::RequestFormat (void) +void PresenterTextView::RequestFormat() { mbIsFormatPending = true; } -void PresenterTextView::Format (void) +void PresenterTextView::Format() { mbIsFormatPending = false; @@ -437,7 +437,7 @@ void PresenterTextView::Format (void) maTextChangeBroadcaster(); } -sal_Int32 PresenterTextView::GetParagraphCount (void) const +sal_Int32 PresenterTextView::GetParagraphCount() const { return maParagraphs.size(); } @@ -668,7 +668,7 @@ sal_Int32 PresenterTextParagraph::GetWordBoundary( return maWordBoundaries[nIndex]; } -sal_Int32 PresenterTextParagraph::GetCaretPosition (void) const +sal_Int32 PresenterTextParagraph::GetCaretPosition() const { if (mpCaret && mpCaret->GetParagraphIndex()==mnParagraphIndex) return mpCaret->GetCharacterIndex(); @@ -688,14 +688,14 @@ void PresenterTextParagraph::SetOrigin (const double nXOrigin, const double nYOr mnYOrigin = nYOrigin; } -awt::Point PresenterTextParagraph::GetRelativeLocation (void) const +awt::Point PresenterTextParagraph::GetRelativeLocation() const { return awt::Point( sal_Int32(mnXOrigin), sal_Int32(mnYOrigin + mnVerticalOffset)); } -awt::Size PresenterTextParagraph::GetSize (void) +awt::Size PresenterTextParagraph::GetSize() { return awt::Size( sal_Int32(mnWidth), @@ -763,7 +763,7 @@ void PresenterTextParagraph::AddLine ( rCurrentLine.startPos = rCurrentLine.endPos; } -double PresenterTextParagraph::GetTotalTextHeight (void) +double PresenterTextParagraph::GetTotalTextHeight() { return maLines.size() * mnLineHeight; } @@ -773,7 +773,7 @@ void PresenterTextParagraph::SetCharacterOffset (const sal_Int32 nCharacterOffse mnCharacterOffset = nCharacterOffset; } -sal_Int32 PresenterTextParagraph::GetCharacterCount (void) const +sal_Int32 PresenterTextParagraph::GetCharacterCount() const { return msParagraphText.getLength(); } @@ -792,7 +792,7 @@ sal_Unicode PresenterTextParagraph::GetCharacter ( } } -OUString PresenterTextParagraph::GetText (void) const +OUString PresenterTextParagraph::GetText() const { return msParagraphText; } @@ -998,7 +998,7 @@ sal_Int32 PresenterTextParagraph::GetIndexAtPoint (const awt::Point& rPoint) con return -1; } -sal_Int8 PresenterTextParagraph::GetTextDirection (void) const +sal_Int8 PresenterTextParagraph::GetTextDirection() const { // Find first portion that has a non-neutral text direction. sal_Int32 nPosition (0); @@ -1046,7 +1046,7 @@ sal_Int8 PresenterTextParagraph::GetTextDirection (void) const return nTextDirection; } -bool PresenterTextParagraph::IsTextReferencePointLeft (void) const +bool PresenterTextParagraph::IsTextReferencePointLeft() const { return mnWritingMode != text::WritingMode2::RL_TB; } @@ -1103,12 +1103,12 @@ PresenterTextCaret::PresenterTextCaret ( { } -PresenterTextCaret::~PresenterTextCaret (void) +PresenterTextCaret::~PresenterTextCaret() { HideCaret(); } -void PresenterTextCaret::ShowCaret (void) +void PresenterTextCaret::ShowCaret() { if (mnCaretBlinkTaskId == 0) { @@ -1120,7 +1120,7 @@ void PresenterTextCaret::ShowCaret (void) mbIsCaretVisible = true; } -void PresenterTextCaret::HideCaret (void) +void PresenterTextCaret::HideCaret() { if (mnCaretBlinkTaskId != 0) { @@ -1175,12 +1175,12 @@ void PresenterTextCaret::SetCaretMotionBroadcaster ( maBroadcaster = rBroadcaster; } -css::awt::Rectangle PresenterTextCaret::GetBounds (void) const +css::awt::Rectangle PresenterTextCaret::GetBounds() const { return maCaretBounds; } -void PresenterTextCaret::InvertCaret (void) +void PresenterTextCaret::InvertCaret() { mbIsCaretVisible = !mbIsCaretVisible; if (mnParagraphIndex >= 0) @@ -1213,7 +1213,7 @@ PresenterTextParagraph::Line::Line ( { } -void PresenterTextParagraph::Line::ProvideCellBoxes (void) +void PresenterTextParagraph::Line::ProvideCellBoxes() { if ( ! IsEmpty() && maCellBoxes.getLength()==0) { @@ -1245,7 +1245,7 @@ void PresenterTextParagraph::Line::ProvideLayoutedLine ( } } -bool PresenterTextParagraph::Line::IsEmpty (void) const +bool PresenterTextParagraph::Line::IsEmpty() const { return mnLineStartCharacterIndex >= mnLineEndCharacterIndex; } diff --git a/sdext/source/presenter/PresenterTextView.hxx b/sdext/source/presenter/PresenterTextView.hxx index 60beb1bb21ef..349e9df6902b 100644 --- a/sdext/source/presenter/PresenterTextView.hxx +++ b/sdext/source/presenter/PresenterTextView.hxx @@ -45,18 +45,18 @@ public: rCharacterBoundsAccess, const ::boost::function<void(const css::awt::Rectangle&)>& rInvalidator); - ~PresenterTextCaret (void); + ~PresenterTextCaret(); - void ShowCaret (void); - void HideCaret (void); + void ShowCaret(); + void HideCaret(); - sal_Int32 GetParagraphIndex (void) const { return mnParagraphIndex;} - sal_Int32 GetCharacterIndex (void) const { return mnCharacterIndex;} + sal_Int32 GetParagraphIndex() const { return mnParagraphIndex;} + sal_Int32 GetCharacterIndex() const { return mnCharacterIndex;} void SetPosition ( const sal_Int32 nParagraphIndex, const sal_Int32 nCharacterIndex); - bool IsVisible (void) const { return mbIsCaretVisible;} + bool IsVisible() const { return mbIsCaretVisible;} /** Set a (possibly empty) functor that broadcasts changes of the caret position. This is used when a PresenterTextView object is set at @@ -66,7 +66,7 @@ public: void SetCaretMotionBroadcaster ( const ::boost::function<void(sal_Int32,sal_Int32,sal_Int32,sal_Int32)>& rBroadcaster); - css::awt::Rectangle GetBounds (void) const; + css::awt::Rectangle GetBounds() const; private: sal_Int32 mnParagraphIndex; @@ -78,7 +78,7 @@ private: ::boost::function<void(sal_Int32,sal_Int32,sal_Int32,sal_Int32)> maBroadcaster; css::awt::Rectangle maCaretBounds; - void InvertCaret (void); + void InvertCaret(); }; typedef ::boost::shared_ptr<PresenterTextCaret> SharedPresenterTextCaret; @@ -104,12 +104,12 @@ public: const double nClipTop, const double nClipBottom); - double GetTotalTextHeight (void); + double GetTotalTextHeight(); void SetCharacterOffset (const sal_Int32 nCharacterOffset); - sal_Int32 GetCharacterCount (void) const; + sal_Int32 GetCharacterCount() const; sal_Unicode GetCharacter (const sal_Int32 nGlobalCharacterIndex) const; - OUString GetText (void) const; + OUString GetText() const; css::accessibility::TextSegment GetTextSegment ( const sal_Int32 nOffset, const sal_Int32 nGlobalCharacterIndex, @@ -133,11 +133,11 @@ public: sal_Int32 GetWordBoundary( const sal_Int32 nLocalCharacterIndex, const sal_Int32 nDistance); - sal_Int32 GetCaretPosition (void) const; + sal_Int32 GetCaretPosition() const; void SetCaretPosition (const sal_Int32 nPosition) const; void SetOrigin (const double nXOrigin, const double nYOrigin); - css::awt::Point GetRelativeLocation (void) const; - css::awt::Size GetSize (void); + css::awt::Point GetRelativeLocation() const; + css::awt::Size GetSize(); private: OUString msParagraphText; @@ -175,8 +175,8 @@ private: const OUString& rsParagraphText, const PresenterTheme::SharedFontDescriptor& rpFont, const sal_Int8 nTextDirection); - void ProvideCellBoxes (void); - bool IsEmpty (void) const; + void ProvideCellBoxes(); + bool IsEmpty() const; }; css::uno::Reference<css::i18n::XBreakIterator> mxBreakIterator; @@ -206,8 +206,8 @@ private: const PresenterTheme::SharedFontDescriptor& rpFont); void AddLine ( css::i18n::Boundary& rCurrentLine); - sal_Int8 GetTextDirection (void) const; - bool IsTextReferencePointLeft (void) const; + sal_Int8 GetTextDirection() const; + bool IsTextReferencePointLeft() const; }; typedef ::boost::shared_ptr<PresenterTextParagraph> SharedPresenterTextParagraph; @@ -222,11 +222,11 @@ public: const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, const ::boost::function<void(const css::awt::Rectangle&)>& rInvalidator); void SetText (const css::uno::Reference<css::text::XText>& rxText); - void SetTextChangeBroadcaster (const ::boost::function<void(void)>& rBroadcaster); + void SetTextChangeBroadcaster (const ::boost::function<void()>& rBroadcaster); void SetLocation (const css::geometry::RealPoint2D& rLocation); void SetSize (const css::geometry::RealSize2D& rSize); - double GetTotalTextHeight (void); + double GetTotalTextHeight(); void SetFont (const PresenterTheme::SharedFontDescriptor& rpFont); @@ -248,9 +248,9 @@ public: void Paint (const css::awt::Rectangle& rUpdateBox); - SharedPresenterTextCaret GetCaret (void) const; + SharedPresenterTextCaret GetCaret() const; - sal_Int32 GetParagraphCount (void) const; + sal_Int32 GetParagraphCount() const; SharedPresenterTextParagraph GetParagraph (const sal_Int32 nParagraphIndex) const; private: @@ -268,10 +268,10 @@ private: const ::boost::function<void(const css::awt::Rectangle&)> maInvalidator; bool mbIsFormatPending; sal_Int32 mnCharacterCount; - ::boost::function<void(void)> maTextChangeBroadcaster; + ::boost::function<void()> maTextChangeBroadcaster; - void RequestFormat (void); - void Format (void); + void RequestFormat(); + void Format(); SharedPresenterTextParagraph GetParagraphForCharacterIndex (const sal_Int32 nCharacterIndex) const; css::awt::Rectangle GetCaretBounds ( const sal_Int32 nParagraphIndex, diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx index b71bec671d47..36387a2861b1 100644 --- a/sdext/source/presenter/PresenterTheme.cxx +++ b/sdext/source/presenter/PresenterTheme.cxx @@ -47,7 +47,7 @@ class BorderSize public: const static sal_Int32 mnInvalidValue = -10000; - BorderSize (void) : mnLeft(mnInvalidValue), + BorderSize() : mnLeft(mnInvalidValue), mnTop(mnInvalidValue), mnRight(mnInvalidValue), mnBottom(mnInvalidValue) {} @@ -57,7 +57,7 @@ public: sal_Int32 mnRight; sal_Int32 mnBottom; - vector<sal_Int32> ToVector (void) + vector<sal_Int32> ToVector() { vector<sal_Int32> aSequence (4); aSequence[0] = mnLeft == mnInvalidValue ? 0 : mnLeft; @@ -94,7 +94,7 @@ public: ReadContext ( const Reference<XComponentContext>& rxContext, const Reference<rendering::XCanvas>& rxCanvas); - ~ReadContext (void); + ~ReadContext(); /** Read data describing a font from the node that can be reached from the given root via the given path. @@ -126,8 +126,8 @@ private: class PaneStyle { public: - PaneStyle (void); - ~PaneStyle (void); + PaneStyle(); + ~PaneStyle(); const SharedBitmapDescriptor GetBitmap (const OUString& sBitmapName) const; @@ -138,7 +138,7 @@ public: BorderSize maOuterBorderSize; ::boost::shared_ptr<PresenterBitmapContainer> mpBitmaps; - PresenterTheme::SharedFontDescriptor GetFont (void) const; + PresenterTheme::SharedFontDescriptor GetFont() const; }; typedef ::boost::shared_ptr<PaneStyle> SharedPaneStyle; @@ -167,12 +167,12 @@ private: class ViewStyle { public: - ViewStyle (void); - ~ViewStyle (void); + ViewStyle(); + ~ViewStyle(); const SharedBitmapDescriptor GetBitmap (const OUString& sBitmapName) const; - PresenterTheme::SharedFontDescriptor GetFont (void) const; + PresenterTheme::SharedFontDescriptor GetFont() const; OUString msStyleName; ::boost::shared_ptr<ViewStyle> mpParentStyle; @@ -235,7 +235,7 @@ public: const OUString& rsName, const Reference<container::XHierarchicalNameAccess>& rThemeRoot, const OUString& rsNodeName); - ~Theme (void); + ~Theme(); void Read ( PresenterConfigurationAccess& rConfiguration, @@ -279,11 +279,11 @@ PresenterTheme::PresenterTheme ( mpTheme = ReadTheme(); } -PresenterTheme::~PresenterTheme (void) +PresenterTheme::~PresenterTheme() { } -::boost::shared_ptr<PresenterTheme::Theme> PresenterTheme::ReadTheme (void) +::boost::shared_ptr<PresenterTheme::Theme> PresenterTheme::ReadTheme() { ReadContext aReadContext(mxContext, mxCanvas); @@ -295,7 +295,7 @@ PresenterTheme::~PresenterTheme (void) return aReadContext.ReadTheme(aConfiguration, msThemeName); } -bool PresenterTheme::HasCanvas (void) const +bool PresenterTheme::HasCanvas() const { return mxCanvas.is(); } @@ -461,7 +461,7 @@ SharedBitmapDescriptor PresenterTheme::GetBitmap ( return SharedBitmapDescriptor(); } -::boost::shared_ptr<PresenterBitmapContainer> PresenterTheme::GetBitmapContainer (void) const +::boost::shared_ptr<PresenterBitmapContainer> PresenterTheme::GetBitmapContainer() const { if (mpTheme.get() != NULL) return mpTheme->mpIconContainer; @@ -601,7 +601,7 @@ PresenterTheme::Theme::Theme ( { } -PresenterTheme::Theme::~Theme (void) +PresenterTheme::Theme::~Theme() { } @@ -713,7 +713,7 @@ ReadContext::ReadContext ( } } -ReadContext::~ReadContext (void) +ReadContext::~ReadContext() { } @@ -940,7 +940,7 @@ SharedPaneStyle PaneStyleContainer::GetPaneStyle (const OUString& rsStyleName) c //===== PaneStyle ============================================================= -PaneStyle::PaneStyle (void) +PaneStyle::PaneStyle() : msStyleName(), mpParentStyle(), mpFont(), @@ -950,7 +950,7 @@ PaneStyle::PaneStyle (void) { } -PaneStyle::~PaneStyle (void) +PaneStyle::~PaneStyle() { } @@ -969,7 +969,7 @@ const SharedBitmapDescriptor PaneStyle::GetBitmap (const OUString& rsBitmapName) return SharedBitmapDescriptor(); } -PresenterTheme::SharedFontDescriptor PaneStyle::GetFont (void) const +PresenterTheme::SharedFontDescriptor PaneStyle::GetFont() const { if (mpFont.get() != NULL) return mpFont; @@ -1060,7 +1060,7 @@ SharedViewStyle ViewStyleContainer::GetViewStyle (const OUString& rsStyleName) c //===== ViewStyle ============================================================= -ViewStyle::ViewStyle (void) +ViewStyle::ViewStyle() : msStyleName(), mpParentStyle(), mpFont(), @@ -1068,7 +1068,7 @@ ViewStyle::ViewStyle (void) { } -ViewStyle::~ViewStyle (void) +ViewStyle::~ViewStyle() { } @@ -1080,7 +1080,7 @@ const SharedBitmapDescriptor ViewStyle::GetBitmap (const OUString& rsBitmapName) return SharedBitmapDescriptor(); } -PresenterTheme::SharedFontDescriptor ViewStyle::GetFont (void) const +PresenterTheme::SharedFontDescriptor ViewStyle::GetFont() const { if (mpFont.get() != NULL) return mpFont; diff --git a/sdext/source/presenter/PresenterTheme.hxx b/sdext/source/presenter/PresenterTheme.hxx index 12789c1988ce..651859e59bd3 100644 --- a/sdext/source/presenter/PresenterTheme.hxx +++ b/sdext/source/presenter/PresenterTheme.hxx @@ -62,9 +62,9 @@ public: const css::uno::Reference<css::uno::XComponentContext>& rxContext, const OUString& rsThemeName, const css::uno::Reference<css::rendering::XCanvas>& rxCanvas); - ~PresenterTheme (void); + ~PresenterTheme(); - bool HasCanvas (void) const; + bool HasCanvas() const; void ProvideCanvas (const css::uno::Reference<css::rendering::XCanvas>& rxCanvas); OUString GetStyleName (const OUString& rsResourceURL) const; @@ -106,7 +106,7 @@ public: SharedBitmapDescriptor GetBitmap ( const OUString& rsBitmapName) const; - ::boost::shared_ptr<PresenterBitmapContainer> GetBitmapContainer (void) const; + ::boost::shared_ptr<PresenterBitmapContainer> GetBitmapContainer() const; SharedFontDescriptor GetFont ( const OUString& rsStyleName) const; @@ -130,7 +130,7 @@ private: ::boost::shared_ptr<PresenterBitmapContainer> mpBitmapContainer; css::uno::Reference<css::rendering::XCanvas> mxCanvas; - ::boost::shared_ptr<Theme> ReadTheme (void); + ::boost::shared_ptr<Theme> ReadTheme(); }; } } // end of namespace ::sd::presenter diff --git a/sdext/source/presenter/PresenterTimer.cxx b/sdext/source/presenter/PresenterTimer.cxx index a54a3cb866dd..0af44829382b 100644 --- a/sdext/source/presenter/PresenterTimer.cxx +++ b/sdext/source/presenter/PresenterTimer.cxx @@ -42,7 +42,7 @@ public: const TimeValue& rDueTime, const sal_Int64 nRepeatIntervall, const sal_Int32 nTaskId); - ~TimerTask (void) {} + ~TimerTask() {} PresenterTimer::Task maTask; TimeValue maDueTime; @@ -71,7 +71,7 @@ class TimerScheduler public ::osl::Thread { public: - static ::boost::shared_ptr<TimerScheduler> Instance (void); + static ::boost::shared_ptr<TimerScheduler> Instance(); static SharedTimerTask CreateTimerTask ( const PresenterTimer::Task& rTask, const TimeValue& rDueTime, @@ -102,13 +102,13 @@ private: ::osl::Mutex maCurrentTaskMutex; SharedTimerTask mpCurrentTask; - TimerScheduler (void); - virtual ~TimerScheduler (void); + TimerScheduler(); + virtual ~TimerScheduler(); class Deleter {public: void operator () (TimerScheduler* pScheduler) { delete pScheduler; } }; friend class Deleter; - virtual void SAL_CALL run (void) SAL_OVERRIDE; - virtual void SAL_CALL onTerminated (void) SAL_OVERRIDE { mpLateDestroy.reset(); } + virtual void SAL_CALL run() SAL_OVERRIDE; + virtual void SAL_CALL onTerminated() SAL_OVERRIDE { mpLateDestroy.reset(); } }; } // end of anonymous namespace @@ -146,7 +146,7 @@ void PresenterTimer::CancelTask (const sal_Int32 nTaskId) ::osl::Mutex TimerScheduler::maInstanceMutex; sal_Int32 TimerScheduler::mnTaskId = PresenterTimer::NotAValidTaskId; -::boost::shared_ptr<TimerScheduler> TimerScheduler::Instance (void) +::boost::shared_ptr<TimerScheduler> TimerScheduler::Instance() { ::osl::MutexGuard aGuard (maInstanceMutex); if (mpInstance.get() == NULL) @@ -157,7 +157,7 @@ sal_Int32 TimerScheduler::mnTaskId = PresenterTimer::NotAValidTaskId; return mpInstance; } -TimerScheduler::TimerScheduler (void) +TimerScheduler::TimerScheduler() : maTaskContainerMutex(), maScheduledTasks(), maCurrentTaskMutex(), @@ -165,7 +165,7 @@ TimerScheduler::TimerScheduler (void) { } -TimerScheduler::~TimerScheduler (void) +TimerScheduler::~TimerScheduler() { } @@ -222,7 +222,7 @@ void TimerScheduler::CancelTask (const sal_Int32 nTaskId) // Let the main-loop cleanup in it's own time } -void SAL_CALL TimerScheduler::run (void) +void SAL_CALL TimerScheduler::run() { osl_setThreadName("sdext::presenter::TimerScheduler"); @@ -393,7 +393,7 @@ PresenterClockTimer::PresenterClockTimer (const Reference<XComponentContext>& rx UNO_QUERY_THROW); } -PresenterClockTimer::~PresenterClockTimer (void) +PresenterClockTimer::~PresenterClockTimer() { if (mnTimerTaskId != PresenterTimer::NotAValidTaskId) { @@ -445,7 +445,7 @@ void PresenterClockTimer::RemoveListener (const SharedListener& rListener) } } -oslDateTime PresenterClockTimer::GetCurrentTime (void) +oslDateTime PresenterClockTimer::GetCurrentTime() { TimeValue aCurrentTime; TimerScheduler::GetCurrentTime(aCurrentTime); diff --git a/sdext/source/presenter/PresenterTimer.hxx b/sdext/source/presenter/PresenterTimer.hxx index f4db79904f49..8e37a8b2a7fe 100644 --- a/sdext/source/presenter/PresenterTimer.hxx +++ b/sdext/source/presenter/PresenterTimer.hxx @@ -89,7 +89,7 @@ public: void AddListener (const SharedListener& rListener); void RemoveListener (const SharedListener& rListener); - static oslDateTime GetCurrentTime (void); + static oslDateTime GetCurrentTime(); // XCallback @@ -109,7 +109,7 @@ private: PresenterClockTimer ( const css::uno::Reference<css::uno::XComponentContext>& rxContext); - virtual ~PresenterClockTimer (void); + virtual ~PresenterClockTimer(); void CheckCurrentTime (const TimeValue& rCurrentTime); }; diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx index 05d88a6dc2ea..a850602bebfe 100644 --- a/sdext/source/presenter/PresenterToolBar.cxx +++ b/sdext/source/presenter/PresenterToolBar.cxx @@ -66,14 +66,14 @@ namespace { class Text { public: - Text (void); + Text(); Text ( const OUString& rsText, const PresenterTheme::SharedFontDescriptor& rpFont); void SetText (const OUString& rsText); - OUString GetText (void) const; - PresenterTheme::SharedFontDescriptor GetFont (void) const; + OUString GetText() const; + PresenterTheme::SharedFontDescriptor GetFont() const; void Paint ( const Reference<rendering::XCanvas>& rxCanvas, @@ -93,7 +93,7 @@ namespace { : private ::boost::noncopyable { public: - ElementMode (void); + ElementMode(); SharedBitmapDescriptor mpIcon; OUString msAction; @@ -132,16 +132,16 @@ namespace { { public: Element (const ::rtl::Reference<PresenterToolBar>& rpToolBar); - virtual ~Element (void); + virtual ~Element(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; virtual void SetModes ( const SharedElementMode& rpNormalMode, const SharedElementMode& rpMouseOverMode, const SharedElementMode& rpSelectedMode, const SharedElementMode& rpDisabledMode); - void CurrentSlideHasChanged (void); + void CurrentSlideHasChanged(); void SetLocation (const awt::Point& rLocation); void SetSize (const geometry::RealSize2D& rSize); virtual void Paint ( @@ -149,12 +149,12 @@ namespace { const rendering::ViewState& rViewState) = 0; awt::Size GetBoundingSize ( const Reference<rendering::XCanvas>& rxCanvas); - awt::Rectangle GetBoundingBox (void) const; + awt::Rectangle GetBoundingBox() const; virtual bool SetState (const bool bIsOver, const bool bIsPressed); void Invalidate (const bool bSynchronous = true); bool IsOutside (const awt::Rectangle& rBox); - virtual bool IsFilling (void) const; - void UpdateState (void); + virtual bool IsFilling() const; + void UpdateState(); // lang::XEventListener @@ -187,7 +187,7 @@ namespace { virtual awt::Size CreateBoundingSize ( const Reference<rendering::XCanvas>& rxCanvas) = 0; - bool IsEnabled (void) const { return mbIsEnabled;} + bool IsEnabled() const { return mbIsEnabled;} private: bool mbIsEnabled; }; @@ -209,8 +209,8 @@ namespace { static ::rtl::Reference<Element> Create ( const ::rtl::Reference<PresenterToolBar>& rpToolBar); - virtual ~Button (void); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual ~Button(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; virtual void Paint ( const Reference<rendering::XCanvas>& rxCanvas, @@ -229,12 +229,12 @@ namespace { bool mbIsListenerRegistered; Button (const ::rtl::Reference<PresenterToolBar>& rpToolBar); - void Initialize (void); + void Initialize(); void PaintIcon ( const Reference<rendering::XCanvas>& rxCanvas, const sal_Int32 nTextHeight, const rendering::ViewState& rViewState); - PresenterBitmapDescriptor::Mode GetMode (void) const; + PresenterBitmapDescriptor::Mode GetMode() const; }; //===== Label ================================================================= @@ -260,7 +260,7 @@ namespace { class TimeFormatter { public: - TimeFormatter (void); + TimeFormatter(); OUString FormatTime (const oslDateTime& rTime); private: bool mbIs24HourFormat; @@ -271,19 +271,19 @@ namespace { class TimeLabel : public Label { public: - void ConnectToTimer (void); + void ConnectToTimer(); virtual void TimeHasChanged (const oslDateTime& rCurrentTime) = 0; protected: TimeLabel(const ::rtl::Reference<PresenterToolBar>& rpToolBar); using Element::disposing; - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; private: class Listener : public PresenterClockTimer::Listener { public: Listener (const ::rtl::Reference<TimeLabel>& rxLabel) : mxLabel(rxLabel) {} - virtual ~Listener (void) {} + virtual ~Listener() {} virtual void TimeHasChanged (const oslDateTime& rCurrentTime) SAL_OVERRIDE { if (mxLabel.is()) mxLabel->TimeHasChanged(rCurrentTime); } private: @@ -305,7 +305,7 @@ namespace { private: TimeFormatter maTimeFormatter; CurrentTimeLabel (const ::rtl::Reference<PresenterToolBar>& rpToolBar); - virtual ~CurrentTimeLabel (void); + virtual ~CurrentTimeLabel(); virtual void TimeHasChanged (const oslDateTime& rCurrentTime) SAL_OVERRIDE; }; @@ -323,7 +323,7 @@ namespace { TimeFormatter maTimeFormatter; TimeValue maStartTimeValue; PresentationTimeLabel (const ::rtl::Reference<PresenterToolBar>& rpToolBar); - virtual ~PresentationTimeLabel (void); + virtual ~PresentationTimeLabel(); virtual void TimeHasChanged (const oslDateTime& rCurrentTime) SAL_OVERRIDE; }; @@ -334,7 +334,7 @@ namespace { virtual void Paint ( const Reference<rendering::XCanvas>& rxCanvas, const rendering::ViewState& rViewState) SAL_OVERRIDE; - virtual bool IsFilling (void) const SAL_OVERRIDE; + virtual bool IsFilling() const SAL_OVERRIDE; protected: virtual awt::Size CreateBoundingSize ( @@ -348,7 +348,7 @@ namespace { virtual void Paint ( const Reference<rendering::XCanvas>& rxCanvas, const rendering::ViewState& rViewState) SAL_OVERRIDE; - virtual bool IsFilling (void) const SAL_OVERRIDE; + virtual bool IsFilling() const SAL_OVERRIDE; protected: virtual awt::Size CreateBoundingSize ( @@ -413,11 +413,11 @@ void PresenterToolBar::Initialize ( } } -PresenterToolBar::~PresenterToolBar (void) +PresenterToolBar::~PresenterToolBar() { } -void SAL_CALL PresenterToolBar::disposing (void) +void SAL_CALL PresenterToolBar::disposing() { if (mxWindow.is()) { @@ -466,7 +466,7 @@ void PresenterToolBar::InvalidateArea ( bSynchronous); } -void PresenterToolBar::RequestLayout (void) +void PresenterToolBar::RequestLayout() { mbIsLayoutPending = true; @@ -477,19 +477,19 @@ void PresenterToolBar::RequestLayout (void) xManager->Invalidate(mxWindow); } -geometry::RealSize2D PresenterToolBar::GetMinimalSize (void) +geometry::RealSize2D PresenterToolBar::GetMinimalSize() { if (mbIsLayoutPending) Layout(mxCanvas); return maMinimalSize; } -::rtl::Reference<PresenterController> PresenterToolBar::GetPresenterController (void) const +::rtl::Reference<PresenterController> PresenterToolBar::GetPresenterController() const { return mpPresenterController; } -Reference<XComponentContext> PresenterToolBar::GetComponentContext (void) const +Reference<XComponentContext> PresenterToolBar::GetComponentContext() const { return mxComponentContext; } @@ -613,7 +613,7 @@ void SAL_CALL PresenterToolBar::setCurrentPage (const Reference<drawing::XDrawPa } } -Reference<drawing::XDrawPage> SAL_CALL PresenterToolBar::getCurrentPage (void) +Reference<drawing::XDrawPage> SAL_CALL PresenterToolBar::getCurrentPage() throw (RuntimeException, std::exception) { return mxCurrentSlide; @@ -1000,7 +1000,7 @@ void PresenterToolBar::Paint ( } } -void PresenterToolBar::UpdateSlideNumber (void) +void PresenterToolBar::UpdateSlideNumber() { if( mxSlideShowController.is() ) { @@ -1053,7 +1053,7 @@ void PresenterToolBar::CheckMouseOver ( } } -void PresenterToolBar::ThrowIfDisposed (void) const +void PresenterToolBar::ThrowIfDisposed() const throw (::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) @@ -1115,11 +1115,11 @@ PresenterToolBarView::PresenterToolBarView ( } } -PresenterToolBarView::~PresenterToolBarView (void) +PresenterToolBarView::~PresenterToolBarView() { } -void SAL_CALL PresenterToolBarView::disposing (void) +void SAL_CALL PresenterToolBarView::disposing() { Reference<lang::XComponent> xComponent (static_cast<XWeak*>(mpToolBar.get()), UNO_QUERY); mpToolBar = NULL; @@ -1139,7 +1139,7 @@ void SAL_CALL PresenterToolBarView::disposing (void) } -::rtl::Reference<PresenterToolBar> PresenterToolBarView::GetPresenterToolBar (void) const +::rtl::Reference<PresenterToolBar> PresenterToolBarView::GetPresenterToolBar() const { return mpToolBar; } @@ -1169,13 +1169,13 @@ void SAL_CALL PresenterToolBarView::disposing (const lang::EventObject& rEventOb //----- XResourceId ----------------------------------------------------------- -Reference<XResourceId> SAL_CALL PresenterToolBarView::getResourceId (void) +Reference<XResourceId> SAL_CALL PresenterToolBarView::getResourceId() throw (RuntimeException, std::exception) { return mxViewId; } -sal_Bool SAL_CALL PresenterToolBarView::isAnchorOnly (void) +sal_Bool SAL_CALL PresenterToolBarView::isAnchorOnly() throw (RuntimeException, std::exception) { return false; @@ -1191,7 +1191,7 @@ void SAL_CALL PresenterToolBarView::setCurrentPage (const Reference<drawing::XDr xToolBar->setCurrentPage(rxSlide); } -Reference<drawing::XDrawPage> SAL_CALL PresenterToolBarView::getCurrentPage (void) +Reference<drawing::XDrawPage> SAL_CALL PresenterToolBarView::getCurrentPage() throw (RuntimeException, std::exception) { return NULL; @@ -1224,7 +1224,7 @@ Element::Element ( } } -Element::~Element (void) +Element::~Element() { } @@ -1241,7 +1241,7 @@ void Element::SetModes ( mpMode = rpNormalMode; } -void Element::disposing (void) +void Element::disposing() { } @@ -1252,12 +1252,12 @@ awt::Size Element::GetBoundingSize ( return maSize; } -awt::Rectangle Element::GetBoundingBox (void) const +awt::Rectangle Element::GetBoundingBox() const { return awt::Rectangle(maLocation.X,maLocation.Y, maSize.Width, maSize.Height); } -void Element::CurrentSlideHasChanged (void) +void Element::CurrentSlideHasChanged() { UpdateState(); } @@ -1344,12 +1344,12 @@ bool Element::IsOutside (const awt::Rectangle& rBox) } -bool Element::IsFilling (void) const +bool Element::IsFilling() const { return false; } -void Element::UpdateState (void) +void Element::UpdateState() { OSL_ASSERT(mpToolBar.get() != NULL); OSL_ASSERT(mpToolBar->GetPresenterController().get() != NULL); @@ -1407,7 +1407,7 @@ void SAL_CALL Element::statusChanged (const css::frame::FeatureStateEvent& rEven namespace { -ElementMode::ElementMode (void) +ElementMode::ElementMode() : mpIcon(), msAction(), maText() @@ -1494,17 +1494,17 @@ Button::Button ( OSL_ASSERT(mpToolBar->GetPresenterController()->GetWindowManager().is()); } -Button::~Button (void) +Button::~Button() { } -void Button::Initialize (void) +void Button::Initialize() { mpToolBar->GetPresenterController()->GetWindowManager()->AddLayoutListener(this); mbIsListenerRegistered = true; } -void Button::disposing (void) +void Button::disposing() { OSL_ASSERT(mpToolBar.get() != NULL); if (mpToolBar.get() != NULL @@ -1609,7 +1609,7 @@ void Button::PaintIcon ( } } -PresenterBitmapDescriptor::Mode Button::GetMode (void) const +PresenterBitmapDescriptor::Mode Button::GetMode() const { if ( ! IsEnabled()) return PresenterBitmapDescriptor::Disabled; @@ -1697,7 +1697,7 @@ bool Label::SetState (const bool bIsOver, const bool bIsPressed) namespace { -Text::Text (void) +Text::Text() : msText(), mpFont() { @@ -1716,12 +1716,12 @@ void Text::SetText (const OUString& rsText) msText = rsText; } -OUString Text::GetText (void) const +OUString Text::GetText() const { return msText; } -PresenterTheme::SharedFontDescriptor Text::GetFont (void) const +PresenterTheme::SharedFontDescriptor Text::GetFont() const { return mpFont; } @@ -1791,7 +1791,7 @@ geometry::RealRectangle2D Text::GetBoundingBox (const Reference<rendering::XCanv //===== TimeFormatter ========================================================= -TimeFormatter::TimeFormatter (void) +TimeFormatter::TimeFormatter() : mbIs24HourFormat(true), mbIsAmPmFormat(false), mbIsShowSeconds(true) @@ -1847,13 +1847,13 @@ TimeLabel::TimeLabel (const ::rtl::Reference<PresenterToolBar>& rpToolBar) { } -void SAL_CALL TimeLabel::disposing (void) +void SAL_CALL TimeLabel::disposing() { PresenterClockTimer::Instance(mpToolBar->GetComponentContext())->RemoveListener(mpListener); mpListener.reset(); } -void TimeLabel::ConnectToTimer (void) +void TimeLabel::ConnectToTimer() { mpListener.reset(new Listener(this)); PresenterClockTimer::Instance(mpToolBar->GetComponentContext())->AddListener(mpListener); @@ -1869,7 +1869,7 @@ void TimeLabel::ConnectToTimer (void) return ::rtl::Reference<Element>(pElement.get()); } -CurrentTimeLabel::~CurrentTimeLabel (void) +CurrentTimeLabel::~CurrentTimeLabel() { } @@ -1906,7 +1906,7 @@ void CurrentTimeLabel::SetModes ( return ::rtl::Reference<Element>(pElement.get()); } -PresentationTimeLabel::~PresentationTimeLabel (void) +PresentationTimeLabel::~PresentationTimeLabel() { } @@ -2010,7 +2010,7 @@ awt::Size VerticalSeparator::CreateBoundingSize ( return awt::Size(1,20); } -bool VerticalSeparator::IsFilling (void) const +bool VerticalSeparator::IsFilling() const { return true; } @@ -2061,7 +2061,7 @@ awt::Size HorizontalSeparator::CreateBoundingSize ( return awt::Size(20,1); } -bool HorizontalSeparator::IsFilling (void) const +bool HorizontalSeparator::IsFilling() const { return true; } diff --git a/sdext/source/presenter/PresenterToolBar.hxx b/sdext/source/presenter/PresenterToolBar.hxx index 47e1c6133088..42c225c076a9 100644 --- a/sdext/source/presenter/PresenterToolBar.hxx +++ b/sdext/source/presenter/PresenterToolBar.hxx @@ -76,7 +76,7 @@ class PresenterToolBar public CachablePresenterView { public: - typedef ::boost::function<void(void)> Action; + typedef ::boost::function<void()> Action; enum Anchor { Left, Center, Right }; @@ -86,21 +86,21 @@ public: const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, const ::rtl::Reference<PresenterController>& rpPresenterController, const Anchor eAnchor); - virtual ~PresenterToolBar (void); + virtual ~PresenterToolBar(); void Initialize ( const OUString& rsConfigurationPath); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; void InvalidateArea ( const css::awt::Rectangle& rRepaintBox, const bool bSynchronous); - void RequestLayout (void); - css::geometry::RealSize2D GetMinimalSize (void); - ::rtl::Reference<PresenterController> GetPresenterController (void) const; - css::uno::Reference<css::uno::XComponentContext> GetComponentContext (void) const; + void RequestLayout(); + css::geometry::RealSize2D GetMinimalSize(); + ::rtl::Reference<PresenterController> GetPresenterController() const; + css::uno::Reference<css::uno::XComponentContext> GetComponentContext() const; // lang::XEventListener @@ -155,7 +155,7 @@ public: const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage (void) + virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; class Context; @@ -201,7 +201,7 @@ private: const css::awt::Rectangle& rUpdateBox, const css::rendering::ViewState& rViewState); - void UpdateSlideNumber (void); + void UpdateSlideNumber(); void CheckMouseOver ( const css::awt::MouseEvent& rEvent, @@ -215,7 +215,7 @@ private: /** This method throws a DisposedException when the object has already been disposed. */ - void ThrowIfDisposed (void) const + void ThrowIfDisposed() const throw (css::lang::DisposedException); }; @@ -232,11 +232,11 @@ public: const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId, const css::uno::Reference<css::frame::XController>& rxController, const ::rtl::Reference<PresenterController>& rpPresenterController); - virtual ~PresenterToolBarView (void); + virtual ~PresenterToolBarView(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; - ::rtl::Reference<PresenterToolBar> GetPresenterToolBar (void) const; + ::rtl::Reference<PresenterToolBar> GetPresenterToolBar() const; // XPaintListener @@ -251,10 +251,10 @@ public: // XResourceId - virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId (void) + virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isAnchorOnly (void) + virtual sal_Bool SAL_CALL isAnchorOnly() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDrawView @@ -263,7 +263,7 @@ public: const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage (void) + virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: diff --git a/sdext/source/presenter/PresenterUIPainter.hxx b/sdext/source/presenter/PresenterUIPainter.hxx index ae65b3bf0b4a..c1461489817a 100644 --- a/sdext/source/presenter/PresenterUIPainter.hxx +++ b/sdext/source/presenter/PresenterUIPainter.hxx @@ -34,8 +34,8 @@ class PresenterUIPainter : ::boost::noncopyable { public: - PresenterUIPainter (void); - ~PresenterUIPainter (void); + PresenterUIPainter(); + ~PresenterUIPainter(); static void PaintHorizontalBitmapComposite ( const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx index 30611b3204d0..ab884974acc6 100644 --- a/sdext/source/presenter/PresenterViewFactory.cxx +++ b/sdext/source/presenter/PresenterViewFactory.cxx @@ -74,7 +74,7 @@ public: : PresenterSlidePreview(rxContext, rxViewId, rxAnchorPane, rpPresenterController) { } - virtual ~NextSlidePreview (void) {} + virtual ~NextSlidePreview() {} virtual void SAL_CALL setCurrentPage ( const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE @@ -176,11 +176,11 @@ void PresenterViewFactory::Register (const Reference<frame::XController>& rxCont } } -PresenterViewFactory::~PresenterViewFactory (void) +PresenterViewFactory::~PresenterViewFactory() { } -void SAL_CALL PresenterViewFactory::disposing (void) +void SAL_CALL PresenterViewFactory::disposing() throw (RuntimeException) { if (mxConfigurationController.is()) @@ -514,7 +514,7 @@ Reference<XView> PresenterViewFactory::CreateHelpView( mpPresenterController)); } -void PresenterViewFactory::ThrowIfDisposed (void) const +void PresenterViewFactory::ThrowIfDisposed() const throw (::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) @@ -528,22 +528,22 @@ void PresenterViewFactory::ThrowIfDisposed (void) const //===== CachablePresenterView ================================================= -CachablePresenterView::CachablePresenterView (void) +CachablePresenterView::CachablePresenterView() : mbIsPresenterViewActive(true) { } -void CachablePresenterView::ActivatePresenterView (void) +void CachablePresenterView::ActivatePresenterView() { mbIsPresenterViewActive = true; } -void CachablePresenterView::DeactivatePresenterView (void) +void CachablePresenterView::DeactivatePresenterView() { mbIsPresenterViewActive = false; } -void CachablePresenterView::ReleaseView (void) +void CachablePresenterView::ReleaseView() { } diff --git a/sdext/source/presenter/PresenterViewFactory.hxx b/sdext/source/presenter/PresenterViewFactory.hxx index d9a7a4572703..0510ba4ced12 100644 --- a/sdext/source/presenter/PresenterViewFactory.hxx +++ b/sdext/source/presenter/PresenterViewFactory.hxx @@ -46,23 +46,23 @@ namespace { class CachablePresenterView { public: - virtual void ActivatePresenterView (void); + virtual void ActivatePresenterView(); /** Called when the view is put into a cache. The view must not paint itself while being deactive. */ - virtual void DeactivatePresenterView (void); + virtual void DeactivatePresenterView(); /** Called before the view is disposed. This gives the view the opportunity to trigger actions that may lead to (synchronous) callbacks that do not result in DisposedExceptions. */ - virtual void ReleaseView (void); + virtual void ReleaseView(); protected: bool mbIsPresenterViewActive; - CachablePresenterView (void); + CachablePresenterView(); ~CachablePresenterView() {} }; @@ -96,14 +96,14 @@ public: const css::uno::Reference<css::uno::XComponentContext>& rxContext, const css::uno::Reference<css::frame::XController>& rxController, const ::rtl::Reference<PresenterController>& rpPresenterController); - virtual ~PresenterViewFactory (void); + virtual ~PresenterViewFactory(); - static OUString getImplementationName_static (void); - static css::uno::Sequence< OUString > getSupportedServiceNames_static (void); + static OUString getImplementationName_static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_static(); static css::uno::Reference<css::uno::XInterface> Create( const css::uno::Reference<css::uno::XComponentContext>& rxContext); - virtual void SAL_CALL disposing (void) + virtual void SAL_CALL disposing() throw (css::uno::RuntimeException) SAL_OVERRIDE; // XResourceFactory @@ -163,7 +163,7 @@ private: const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId, const css::uno::Reference<css::drawing::framework::XPane>& rxAnchorPane); - void ThrowIfDisposed (void) const throw (css::lang::DisposedException); + void ThrowIfDisposed() const throw (css::lang::DisposedException); }; } } diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx index 95406faee57b..0fce6117345b 100644 --- a/sdext/source/presenter/PresenterWindowManager.cxx +++ b/sdext/source/presenter/PresenterWindowManager.cxx @@ -90,11 +90,11 @@ PresenterWindowManager::PresenterWindowManager ( UpdateWindowList(); } -PresenterWindowManager::~PresenterWindowManager (void) +PresenterWindowManager::~PresenterWindowManager() { } -void SAL_CALL PresenterWindowManager::disposing (void) +void SAL_CALL PresenterWindowManager::disposing() { NotifyDisposing(); @@ -515,7 +515,7 @@ void PresenterWindowManager::SetViewMode (const ViewMode eMode) StoreViewMode(eMode); } -PresenterWindowManager::ViewMode PresenterWindowManager::GetViewMode (void) const +PresenterWindowManager::ViewMode PresenterWindowManager::GetViewMode() const { if (mbIsHelpViewActive) return VM_Help; @@ -527,7 +527,7 @@ PresenterWindowManager::ViewMode PresenterWindowManager::GetViewMode (void) cons return VM_Standard; } -void PresenterWindowManager::RestoreViewMode (void) +void PresenterWindowManager::RestoreViewMode() { sal_Int32 nMode (0); PresenterConfigurationAccess aConfiguration ( @@ -608,7 +608,7 @@ void PresenterWindowManager::RemoveLayoutListener ( } } -void PresenterWindowManager::Layout (void) +void PresenterWindowManager::Layout() { if (mxParentWindow.is() && ! mbIsLayouting) { @@ -646,7 +646,7 @@ void PresenterWindowManager::Layout (void) } } -void PresenterWindowManager::LayoutStandardMode (void) +void PresenterWindowManager::LayoutStandardMode() { awt::Rectangle aBox = mxParentWindow->getPosSize(); @@ -703,7 +703,7 @@ void PresenterWindowManager::LayoutStandardMode (void) LayoutToolBar(); } -void PresenterWindowManager::LayoutNotesMode (void) +void PresenterWindowManager::LayoutNotesMode() { awt::Rectangle aBox = mxParentWindow->getPosSize(); @@ -788,7 +788,7 @@ void PresenterWindowManager::LayoutNotesMode (void) } -void PresenterWindowManager::LayoutSlideSorterMode (void) +void PresenterWindowManager::LayoutSlideSorterMode() { const geometry::RealRectangle2D aToolBarBox (LayoutToolBar()); @@ -802,7 +802,7 @@ void PresenterWindowManager::LayoutSlideSorterMode (void) aToolBarBox.Y1 - 2*nGap); } -void PresenterWindowManager::LayoutHelpMode (void) +void PresenterWindowManager::LayoutHelpMode() { const geometry::RealRectangle2D aToolBarBox (LayoutToolBar()); @@ -818,7 +818,7 @@ void PresenterWindowManager::LayoutHelpMode (void) aToolBarBox.Y1 - 2*nGap); } -geometry::RealRectangle2D PresenterWindowManager::LayoutToolBar (void) +geometry::RealRectangle2D PresenterWindowManager::LayoutToolBar() { double nToolBarWidth (400); double nToolBarHeight (80); @@ -898,7 +898,7 @@ awt::Size PresenterWindowManager::CalculatePaneSize ( return awt::Size(aOuterBox.Width, aOuterBox.Height); } -void PresenterWindowManager::NotifyLayoutModeChange (void) +void PresenterWindowManager::NotifyLayoutModeChange() { document::EventObject aEvent; aEvent.Source = Reference<XInterface>(static_cast<XWeak*>(this)); @@ -925,7 +925,7 @@ void PresenterWindowManager::NotifyLayoutModeChange (void) } } -void PresenterWindowManager::NotifyDisposing (void) +void PresenterWindowManager::NotifyDisposing() { lang::EventObject aEvent; aEvent.Source = static_cast<XWeak*>(this); @@ -1054,7 +1054,7 @@ void PresenterWindowManager::PaintBackground (const awt::Rectangle& rUpdateBox) } } -void PresenterWindowManager::ProvideBackgroundBitmap (void) +void PresenterWindowManager::ProvideBackgroundBitmap() { if ( ! mxScaledBackgroundBitmap.is()) { @@ -1087,7 +1087,7 @@ void PresenterWindowManager::ProvideBackgroundBitmap (void) } } -Reference<rendering::XPolyPolygon2D> PresenterWindowManager::CreateClipPolyPolygon (void) const +Reference<rendering::XPolyPolygon2D> PresenterWindowManager::CreateClipPolyPolygon() const { // Create a clip polygon that includes the whole update area but has the // content windows as holes. @@ -1125,7 +1125,7 @@ Reference<rendering::XPolyPolygon2D> PresenterWindowManager::CreateClipPolyPolyg return xPolyPolygon; } -void PresenterWindowManager::UpdateWindowList (void) +void PresenterWindowManager::UpdateWindowList() { #ifdef ENABLE_PANE_RESIZING try @@ -1176,11 +1176,11 @@ void PresenterWindowManager::UpdateWindowList (void) #endif } -void PresenterWindowManager::Invalidate (void) +void PresenterWindowManager::Invalidate() { mpPresenterController->GetPaintManager()->Invalidate(mxParentWindow); } -void PresenterWindowManager::Update (void) +void PresenterWindowManager::Update() { mxClipPolygon = NULL; mbIsLayoutPending = true; @@ -1189,7 +1189,7 @@ void PresenterWindowManager::Update (void) Invalidate(); } -void PresenterWindowManager::ThrowIfDisposed (void) const +void PresenterWindowManager::ThrowIfDisposed() const throw (::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) diff --git a/sdext/source/presenter/PresenterWindowManager.hxx b/sdext/source/presenter/PresenterWindowManager.hxx index a8475e2b54bb..c9355b5511cf 100644 --- a/sdext/source/presenter/PresenterWindowManager.hxx +++ b/sdext/source/presenter/PresenterWindowManager.hxx @@ -71,9 +71,9 @@ public: const css::uno::Reference<css::uno::XComponentContext>& rxContext, const ::rtl::Reference<PresenterPaneContainer>& rpPaneContainer, const ::rtl::Reference<PresenterController>& rpPresenterController); - virtual ~PresenterWindowManager (void); + virtual ~PresenterWindowManager(); - void SAL_CALL disposing (void) SAL_OVERRIDE; + void SAL_CALL disposing() SAL_OVERRIDE; void SetParentPane (const css::uno::Reference<css::drawing::framework::XPane>& rxPane); void SetTheme (const ::boost::shared_ptr<PresenterTheme>& rpTheme); @@ -85,8 +85,8 @@ public: const double nWidth, const double nHeight); void SetPaneBorderPainter (const ::rtl::Reference<PresenterPaneBorderPainter>& rPainter); - void Update (void); - void Layout (void); + void Update(); + void Layout(); void SetSlideSorterState (bool bIsActive); void SetHelpViewState (bool bIsActive); @@ -102,12 +102,12 @@ public: */ void SetViewMode (const ViewMode eMode); - ViewMode GetViewMode (void) const; + ViewMode GetViewMode() const; /** Restore the layout mode (or slide sorter state) from the configuration. */ - void RestoreViewMode (void); + void RestoreViewMode(); void AddLayoutListener ( const css::uno::Reference<css::document::XEventListener>& rxListener); @@ -191,26 +191,26 @@ private: bool PaintChildren (const css::awt::PaintEvent& rEvent) const; void UpdateWindowSize (const css::uno::Reference<css::awt::XWindow>& rxBorderWindow); void PaintBackground (const css::awt::Rectangle& rUpdateBox); - void ProvideBackgroundBitmap (void); - css::uno::Reference<css::rendering::XPolyPolygon2D> CreateClipPolyPolygon (void) const; + void ProvideBackgroundBitmap(); + css::uno::Reference<css::rendering::XPolyPolygon2D> CreateClipPolyPolygon() const; void ToTop (); - static void UpdateWindowList (void); + static void UpdateWindowList(); bool ChildNeedsRepaint ( const css::uno::Reference<css::drawing::framework::XPane>& rxPane) const; - void Invalidate (void); + void Invalidate(); void StoreViewMode (const ViewMode eViewMode); - void LayoutStandardMode (void); - void LayoutNotesMode (void); - void LayoutSlideSorterMode (void); - void LayoutHelpMode (void); + void LayoutStandardMode(); + void LayoutNotesMode(); + void LayoutSlideSorterMode(); + void LayoutHelpMode(); /** Layout the tool bar and return its outer bounding box. */ - css::geometry::RealRectangle2D LayoutToolBar (void); + css::geometry::RealRectangle2D LayoutToolBar(); css::awt::Size CalculatePaneSize ( const double nOuterWidth, @@ -218,11 +218,11 @@ private: /** Notify changes of the layout mode and of the slide sorter state. */ - void NotifyLayoutModeChange (void); + void NotifyLayoutModeChange(); - void NotifyDisposing (void); + void NotifyDisposing(); - void ThrowIfDisposed (void) const throw (css::lang::DisposedException); + void ThrowIfDisposed() const throw (css::lang::DisposedException); }; } } diff --git a/sfx2/inc/sidebar/ContextChangeBroadcaster.hxx b/sfx2/inc/sidebar/ContextChangeBroadcaster.hxx index 1db08173fda3..5a2ba3c5243f 100644 --- a/sfx2/inc/sidebar/ContextChangeBroadcaster.hxx +++ b/sfx2/inc/sidebar/ContextChangeBroadcaster.hxx @@ -31,8 +31,8 @@ namespace sfx2 { namespace sidebar { class ContextChangeBroadcaster { public: - ContextChangeBroadcaster (void); - ~ContextChangeBroadcaster (void); + ContextChangeBroadcaster(); + ~ContextChangeBroadcaster(); void Initialize (const ::rtl::OUString& rsContextName); diff --git a/sfx2/inc/sidebar/PopupContainer.hxx b/sfx2/inc/sidebar/PopupContainer.hxx index 764b9af1cea7..e34b207ffacc 100644 --- a/sfx2/inc/sidebar/PopupContainer.hxx +++ b/sfx2/inc/sidebar/PopupContainer.hxx @@ -28,7 +28,7 @@ class SFX2_DLLPUBLIC PopupContainer : public FloatingWindow { public: PopupContainer (vcl::Window* pParent); - virtual ~PopupContainer (void); + virtual ~PopupContainer(); virtual long Notify (NotifyEvent& rNEvt); }; diff --git a/sfx2/source/control/thumbnailviewacc.cxx b/sfx2/source/control/thumbnailviewacc.cxx index 4d0886e8de2f..c29e797b4c47 100644 --- a/sfx2/source/control/thumbnailviewacc.cxx +++ b/sfx2/source/control/thumbnailviewacc.cxx @@ -94,7 +94,7 @@ ThumbnailViewAcc* ThumbnailViewAcc::getImplementation( const uno::Reference< uno } } -void ThumbnailViewAcc::GetFocus (void) +void ThumbnailViewAcc::GetFocus() { mbIsFocused = true; @@ -106,7 +106,7 @@ void ThumbnailViewAcc::GetFocus (void) aOldState, aNewState); } -void ThumbnailViewAcc::LoseFocus (void) +void ThumbnailViewAcc::LoseFocus() { mbIsFocused = false; @@ -536,7 +536,7 @@ sal_Int64 SAL_CALL ThumbnailViewAcc::getSomething( const uno::Sequence< sal_Int8 return nRet; } -void SAL_CALL ThumbnailViewAcc::disposing (void) +void SAL_CALL ThumbnailViewAcc::disposing() { ::std::vector<uno::Reference<accessibility::XAccessibleEventListener> > aListenerListCopy; @@ -571,7 +571,7 @@ void SAL_CALL ThumbnailViewAcc::disposing (void) } } -sal_uInt16 ThumbnailViewAcc::getItemCount (void) const +sal_uInt16 ThumbnailViewAcc::getItemCount() const { return mpParent->ImplGetVisibleItemCount(); } @@ -581,7 +581,7 @@ ThumbnailViewItem* ThumbnailViewAcc::getItem (sal_uInt16 nIndex) const return mpParent->ImplGetVisibleItem (static_cast<sal_uInt16>(nIndex)); } -void ThumbnailViewAcc::ThrowIfDisposed (void) +void ThumbnailViewAcc::ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) diff --git a/sfx2/source/control/thumbnailviewacc.hxx b/sfx2/source/control/thumbnailviewacc.hxx index 3eae0c037e66..2190d35100da 100644 --- a/sfx2/source/control/thumbnailviewacc.hxx +++ b/sfx2/source/control/thumbnailviewacc.hxx @@ -69,12 +69,12 @@ public: /** Called by the corresponding ValueSet when it gets the focus. Stores the new focus state and broadcasts a state change event. */ - void GetFocus (void); + void GetFocus(); /** Called by the corresponding ValueSet when it loses the focus. Stores the new focus state and broadcasts a state change event. */ - void LoseFocus (void); + void LoseFocus(); // XComponent virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE @@ -139,11 +139,11 @@ private: /** Tell all listeners that the object is dying. This callback is usually called from the WeakComponentImplHelper class. */ - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; /** Return the number of items. This takes the None-Item into account. */ - sal_uInt16 getItemCount (void) const; + sal_uInt16 getItemCount() const; /** Return the item associated with the given index. The None-Item is taken into account which, when present, is taken to be the first @@ -161,7 +161,7 @@ private: DisposedException is thrown to inform the (indirect) caller of the foul deed. */ - void ThrowIfDisposed (void) + void ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException); }; diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 33f532b9b293..ac7d9ec2e081 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -356,7 +356,7 @@ void FileDialogHelper_Impl::SaveLastUsedFilter( const OUString& _rContextIdentif makeAny( getFilterWithExtension( getFilter() ) ) ); } -void FileDialogHelper_Impl::SaveLastUsedFilter( void ) +void FileDialogHelper_Impl::SaveLastUsedFilter() { const OUString* pConfigId = GetLastFilterConfigId( meContext ); if( pConfigId ) diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx index b947ca9adecd..b9e069680095 100644 --- a/sfx2/source/dialog/filedlgimpl.hxx +++ b/sfx2/source/dialog/filedlgimpl.hxx @@ -139,7 +139,7 @@ namespace sfx2 void LoadLastUsedFilter( const OUString& _rContextIdentifier ); void SaveLastUsedFilter( const OUString& _rContextIdentifier ); - void SaveLastUsedFilter( void ); + void SaveLastUsedFilter(); void implInitializeFileName( ); diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index 250d6e56ad5f..461feacf5031 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -63,7 +63,7 @@ namespace { } } - ~DeactivateUpdateMode( void ) + ~DeactivateUpdateMode() { if ( mbUpdateMode ) { diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index cc726c4d1cb9..633af8b531e6 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -228,7 +228,7 @@ SfxActionListBox::SfxActionListBox(SfxCommonTemplateDialog_Impl* pParent, WinBit EnableContextMenuHandling(); } -PopupMenu* SfxActionListBox::CreateContextMenu( void ) +PopupMenu* SfxActionListBox::CreateContextMenu() { if( !( GetSelectionCount() > 0 ) ) @@ -251,7 +251,7 @@ SfxTemplatePanelControl::SfxTemplatePanelControl(SfxBindings* pBindings, vcl::Wi SetStyle(GetStyle() & ~WB_DOCKABLE); } -SfxTemplatePanelControl::~SfxTemplatePanelControl (void) +SfxTemplatePanelControl::~SfxTemplatePanelControl() { } @@ -274,7 +274,7 @@ void SfxTemplatePanelControl::Resize() DockingWindow::Resize(); } -void SfxTemplatePanelControl::FreeResource (void) +void SfxTemplatePanelControl::FreeResource() { DockingWindow::FreeResource(); } @@ -2033,7 +2033,7 @@ void SfxCommonTemplateDialog_Impl::EnableExample_Impl(sal_uInt16 nId, bool bEnab EnableItem(nId, bEnable); } -PopupMenu* SfxCommonTemplateDialog_Impl::CreateContextMenu( void ) +PopupMenu* SfxCommonTemplateDialog_Impl::CreateContextMenu() { if ( bBindingUpdate ) { @@ -2064,7 +2064,7 @@ SfxTemplateDialog_Impl::SfxTemplateDialog_Impl( Initialize(); } -void SfxTemplateDialog_Impl::Initialize (void) +void SfxTemplateDialog_Impl::Initialize() { SfxCommonTemplateDialog_Impl::Initialize(); diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index a983a7f130e1..c11a859fc764 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -131,7 +131,7 @@ public: } void MakeExpanded_Impl(ExpandedEntries_t& rEntries) const; - virtual PopupMenu* CreateContextMenu( void ) SAL_OVERRIDE; + virtual PopupMenu* CreateContextMenu() SAL_OVERRIDE; }; class SfxActionListBox : public DropListBox_Impl @@ -140,7 +140,7 @@ protected: public: SfxActionListBox( SfxCommonTemplateDialog_Impl* pParent, WinBits nWinBits ); - virtual PopupMenu* CreateContextMenu( void ) SAL_OVERRIDE; + virtual PopupMenu* CreateContextMenu() SAL_OVERRIDE; }; class SfxCommonTemplateDialog_Impl : public SfxListener @@ -325,31 +325,31 @@ public: return pCurObjShell; } - inline bool CanEdit( void ) const + inline bool CanEdit() const { return bCanEdit; } - inline bool CanDel( void ) const + inline bool CanDel() const { return bCanDel; } - inline bool CanNew( void ) const + inline bool CanNew() const { return bCanNew; } - inline bool CanHide( void ) const + inline bool CanHide() const { return bCanHide; } - inline bool CanShow( void ) const + inline bool CanShow() const { return bCanShow; } // normally for derivates from SvTreeListBoxes, but in this case the dialog handles context menus - PopupMenu* CreateContextMenu( void ); + PopupMenu* CreateContextMenu(); }; class DropToolBox_Impl : public ToolBox, public DropTargetHelper diff --git a/sfx2/source/sidebar/Accessible.cxx b/sfx2/source/sidebar/Accessible.cxx index 00c669eee6c4..7cf157e012f2 100644 --- a/sfx2/source/sidebar/Accessible.cxx +++ b/sfx2/source/sidebar/Accessible.cxx @@ -31,18 +31,18 @@ Accessible::Accessible ( { } -Accessible::~Accessible (void) +Accessible::~Accessible() { } -void SAL_CALL Accessible::disposing (void) +void SAL_CALL Accessible::disposing() { Reference<XComponent> xComponent (mxContext, UNO_QUERY); if (xComponent.is()) xComponent->dispose(); } -Reference<accessibility::XAccessibleContext> SAL_CALL Accessible::getAccessibleContext (void) +Reference<accessibility::XAccessibleContext> SAL_CALL Accessible::getAccessibleContext() throw (css::uno::RuntimeException, std::exception) { return mxContext; diff --git a/sfx2/source/sidebar/Accessible.hxx b/sfx2/source/sidebar/Accessible.hxx index 8e9ddcdf34f0..790a5f43b490 100644 --- a/sfx2/source/sidebar/Accessible.hxx +++ b/sfx2/source/sidebar/Accessible.hxx @@ -49,11 +49,11 @@ class Accessible public: Accessible ( const css::uno::Reference<css::accessibility::XAccessibleContext>& rxContext); - virtual ~Accessible (void); + virtual ~Accessible(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XAccessible - virtual css::uno::Reference<css::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext (void) + virtual css::uno::Reference<css::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: diff --git a/sfx2/source/sidebar/AccessibleTitleBar.cxx b/sfx2/source/sidebar/AccessibleTitleBar.cxx index a3713ec801e6..5405837c3046 100644 --- a/sfx2/source/sidebar/AccessibleTitleBar.cxx +++ b/sfx2/source/sidebar/AccessibleTitleBar.cxx @@ -45,7 +45,7 @@ AccessibleTitleBar::AccessibleTitleBar (VCLXWindow* pWindow) { } -AccessibleTitleBar::~AccessibleTitleBar (void) +AccessibleTitleBar::~AccessibleTitleBar() { } diff --git a/sfx2/source/sidebar/AccessibleTitleBar.hxx b/sfx2/source/sidebar/AccessibleTitleBar.hxx index 9e6f6d1e5cb4..2b39c8f1f9df 100644 --- a/sfx2/source/sidebar/AccessibleTitleBar.hxx +++ b/sfx2/source/sidebar/AccessibleTitleBar.hxx @@ -37,7 +37,7 @@ protected: private: AccessibleTitleBar (VCLXWindow* pWindow); - virtual ~AccessibleTitleBar (void); + virtual ~AccessibleTitleBar(); }; } } // end of namespace sfx2::sidebar diff --git a/sfx2/source/sidebar/AsynchronousCall.cxx b/sfx2/source/sidebar/AsynchronousCall.cxx index 7dee20afe958..5814d2b6acf0 100644 --- a/sfx2/source/sidebar/AsynchronousCall.cxx +++ b/sfx2/source/sidebar/AsynchronousCall.cxx @@ -21,7 +21,7 @@ namespace sfx2 { namespace sidebar { -AsynchronousCall::AsynchronousCall (void) +AsynchronousCall::AsynchronousCall() : maAction(), mnCallId(0) { @@ -33,7 +33,7 @@ AsynchronousCall::AsynchronousCall (const Action& rAction) { } -AsynchronousCall::~AsynchronousCall (void) +AsynchronousCall::~AsynchronousCall() { CancelRequest(); } diff --git a/sfx2/source/sidebar/AsynchronousCall.hxx b/sfx2/source/sidebar/AsynchronousCall.hxx index d18b8302b617..338505c83e4b 100644 --- a/sfx2/source/sidebar/AsynchronousCall.hxx +++ b/sfx2/source/sidebar/AsynchronousCall.hxx @@ -32,14 +32,14 @@ namespace sfx2 { namespace sidebar { class AsynchronousCall { public: - typedef ::boost::function<void(void)> Action; + typedef ::boost::function<void()> Action; - AsynchronousCall (void); + AsynchronousCall(); AsynchronousCall (const Action& rAction); - ~AsynchronousCall (void); + ~AsynchronousCall(); - void RequestCall (void); - void CancelRequest (void); + void RequestCall(); + void CancelRequest(); private: Action maAction; diff --git a/sfx2/source/sidebar/CommandInfoProvider.cxx b/sfx2/source/sidebar/CommandInfoProvider.cxx index 6ee034d65386..46bda049eac1 100644 --- a/sfx2/source/sidebar/CommandInfoProvider.cxx +++ b/sfx2/source/sidebar/CommandInfoProvider.cxx @@ -53,10 +53,10 @@ namespace if (mxFrame.is()) mxFrame->addEventListener(this); } - virtual ~FrameListener (void) + virtual ~FrameListener() { } - virtual void SAL_CALL disposing (void) SAL_OVERRIDE + virtual void SAL_CALL disposing() SAL_OVERRIDE { if (mxFrame.is()) mxFrame->removeEventListener(this); @@ -77,13 +77,13 @@ namespace namespace sfx2 { namespace sidebar { -CommandInfoProvider& CommandInfoProvider::Instance (void) +CommandInfoProvider& CommandInfoProvider::Instance() { static CommandInfoProvider aProvider; return aProvider; } -CommandInfoProvider::CommandInfoProvider (void) +CommandInfoProvider::CommandInfoProvider() : mxContext(comphelper::getProcessComponentContext()), mxCachedDataFrame(), mxCachedDocumentAcceleratorConfiguration(), @@ -94,7 +94,7 @@ CommandInfoProvider::CommandInfoProvider (void) { } -CommandInfoProvider::~CommandInfoProvider (void) +CommandInfoProvider::~CommandInfoProvider() { if (mxFrameListener.is()) { @@ -141,7 +141,7 @@ void CommandInfoProvider::SetFrame (const Reference<frame::XFrame>& rxFrame) } } -Reference<ui::XAcceleratorConfiguration> CommandInfoProvider::GetDocumentAcceleratorConfiguration (void) +Reference<ui::XAcceleratorConfiguration> CommandInfoProvider::GetDocumentAcceleratorConfiguration() { if ( ! mxCachedDocumentAcceleratorConfiguration.is()) { @@ -172,7 +172,7 @@ Reference<ui::XAcceleratorConfiguration> CommandInfoProvider::GetDocumentAcceler return mxCachedDocumentAcceleratorConfiguration; } -Reference<ui::XAcceleratorConfiguration> CommandInfoProvider::GetModuleAcceleratorConfiguration (void) +Reference<ui::XAcceleratorConfiguration> CommandInfoProvider::GetModuleAcceleratorConfiguration() { if ( ! mxCachedModuleAcceleratorConfiguration.is()) { @@ -193,7 +193,7 @@ Reference<ui::XAcceleratorConfiguration> CommandInfoProvider::GetModuleAccelerat return mxCachedModuleAcceleratorConfiguration; } -Reference<ui::XAcceleratorConfiguration> CommandInfoProvider::GetGlobalAcceleratorConfiguration (void) +Reference<ui::XAcceleratorConfiguration> CommandInfoProvider::GetGlobalAcceleratorConfiguration() { // Get the global accelerator configuration. if ( ! mxCachedGlobalAcceleratorConfiguration.is()) @@ -204,7 +204,7 @@ Reference<ui::XAcceleratorConfiguration> CommandInfoProvider::GetGlobalAccelerat return mxCachedGlobalAcceleratorConfiguration; } -OUString CommandInfoProvider::GetModuleIdentifier (void) +OUString CommandInfoProvider::GetModuleIdentifier() { if (msCachedModuleIdentifier.getLength() == 0) { diff --git a/sfx2/source/sidebar/Context.cxx b/sfx2/source/sidebar/Context.cxx index 630c8dbae39a..27d35dd48817 100644 --- a/sfx2/source/sidebar/Context.cxx +++ b/sfx2/source/sidebar/Context.cxx @@ -28,7 +28,7 @@ const sal_Int32 Context::ApplicationWildcardMatch = 1; const sal_Int32 Context::ContextWildcardMatch = 2; const sal_Int32 Context::OptimalMatch = 0; // Neither application nor context name is "any". -Context::Context (void) +Context::Context() : msApplication(AnyApplicationName), msContext(AnyContextName) { diff --git a/sfx2/source/sidebar/Context.hxx b/sfx2/source/sidebar/Context.hxx index 22fc590c8615..b9430baedfb3 100644 --- a/sfx2/source/sidebar/Context.hxx +++ b/sfx2/source/sidebar/Context.hxx @@ -31,7 +31,7 @@ public: ::rtl::OUString msApplication; ::rtl::OUString msContext; - Context (void); + Context(); Context ( const ::rtl::OUString& rsApplication, const ::rtl::OUString& rsContext); diff --git a/sfx2/source/sidebar/ContextChangeBroadcaster.cxx b/sfx2/source/sidebar/ContextChangeBroadcaster.cxx index ea761f0bcf58..5ede4a575ad6 100644 --- a/sfx2/source/sidebar/ContextChangeBroadcaster.cxx +++ b/sfx2/source/sidebar/ContextChangeBroadcaster.cxx @@ -30,13 +30,13 @@ using namespace css::uno; namespace sfx2 { namespace sidebar { -ContextChangeBroadcaster::ContextChangeBroadcaster (void) +ContextChangeBroadcaster::ContextChangeBroadcaster() : msContextName(), mbIsBroadcasterEnabled(true) { } -ContextChangeBroadcaster::~ContextChangeBroadcaster (void) +ContextChangeBroadcaster::~ContextChangeBroadcaster() { } diff --git a/sfx2/source/sidebar/ContextList.cxx b/sfx2/source/sidebar/ContextList.cxx index c46118a69e5f..a64b43a8f5af 100644 --- a/sfx2/source/sidebar/ContextList.cxx +++ b/sfx2/source/sidebar/ContextList.cxx @@ -23,12 +23,12 @@ using ::rtl::OUString; namespace sfx2 { namespace sidebar { -ContextList::ContextList (void) +ContextList::ContextList() : maEntries() { } -ContextList::~ContextList (void) +ContextList::~ContextList() { } diff --git a/sfx2/source/sidebar/ContextList.hxx b/sfx2/source/sidebar/ContextList.hxx index 47e561857515..98860078de93 100644 --- a/sfx2/source/sidebar/ContextList.hxx +++ b/sfx2/source/sidebar/ContextList.hxx @@ -32,8 +32,8 @@ namespace sfx2 { namespace sidebar { class ContextList { public: - ContextList (void); - ~ContextList (void); + ContextList(); + ~ContextList(); class Entry { diff --git a/sfx2/source/sidebar/ControllerItem.cxx b/sfx2/source/sidebar/ControllerItem.cxx index db7f155b0879..729e2b210164 100644 --- a/sfx2/source/sidebar/ControllerItem.cxx +++ b/sfx2/source/sidebar/ControllerItem.cxx @@ -55,10 +55,10 @@ namespace if (mxFrame.is()) mxFrame->addFrameActionListener(this); } - virtual ~FrameActionListener (void) + virtual ~FrameActionListener() { } - virtual void SAL_CALL disposing (void) SAL_OVERRIDE + virtual void SAL_CALL disposing() SAL_OVERRIDE { SolarMutexGuard g; if (mxFrame.is()) @@ -115,7 +115,7 @@ ControllerItem::ControllerItem ( { } -ControllerItem::~ControllerItem (void) +ControllerItem::~ControllerItem() { if (mxFrameActionListener.is()) mxFrameActionListener->dispose(); @@ -153,31 +153,31 @@ bool ControllerItem::IsEnabled (SfxItemState eState) const return true; } -void ControllerItem::RequestUpdate (void) +void ControllerItem::RequestUpdate() { SfxPoolItem* pState = NULL; const SfxItemState eState (GetBindings().QueryState(GetId(), pState)); mrItemUpdateReceiver.NotifyItemUpdate(GetId(), eState, pState, IsEnabled(eState)); } -void ControllerItem::NotifyFrameContextChange (void) +void ControllerItem::NotifyFrameContextChange() { RequestUpdate(); } -void ControllerItem::ResetFrame (void) +void ControllerItem::ResetFrame() { mxFrame = NULL; } -::rtl::OUString ControllerItem::GetLabel (void) const +::rtl::OUString ControllerItem::GetLabel() const { return CommandInfoProvider::Instance().GetLabelForCommand( ".uno:" + msCommandName, mxFrame); } -::rtl::OUString ControllerItem::GetHelpText (void) const +::rtl::OUString ControllerItem::GetHelpText() const { Help* pHelp = Application::GetHelp(); if (pHelp != NULL) @@ -191,7 +191,7 @@ void ControllerItem::ResetFrame (void) return ::rtl::OUString(); } -Image ControllerItem::GetIcon (void) const +Image ControllerItem::GetIcon() const { return GetImage(mxFrame, ".uno:" + msCommandName, false); } diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx index 1013f9d7a39f..831c05325d8c 100644 --- a/sfx2/source/sidebar/Deck.cxx +++ b/sfx2/source/sidebar/Deck.cxx @@ -42,7 +42,7 @@ namespace sfx2 { namespace sidebar { Deck::Deck ( const DeckDescriptor& rDeckDescriptor, vcl::Window* pParentWindow, - const ::boost::function<void(void)>& rCloserAction) + const ::boost::function<void()>& rCloserAction) : Window(pParentWindow, 0), msId(rDeckDescriptor.msId), maIcon(), @@ -73,7 +73,7 @@ Deck::Deck ( #endif } -Deck::~Deck (void) +Deck::~Deck() { Dispose(); @@ -83,7 +83,7 @@ Deck::~Deck (void) maPanels.clear(); } -void Deck::Dispose (void) +void Deck::Dispose() { SharedPanelContainer aPanels; aPanels.swap(maPanels); @@ -106,12 +106,12 @@ void Deck::Dispose (void) mpVerticalScrollBar.reset(); } -DeckTitleBar* Deck::GetTitleBar (void) const +DeckTitleBar* Deck::GetTitleBar() const { return mpTitleBar.get(); } -Rectangle Deck::GetContentArea (void) const +Rectangle Deck::GetContentArea() const { const Size aWindowSize (GetSizePixel()); const int nBorderSize (Theme::GetInteger(Theme::Int_DeckBorderSize)); @@ -217,7 +217,7 @@ void Deck::SetPanels (const SharedPanelContainer& rPanels) RequestLayout(); } -void Deck::RequestLayout (void) +void Deck::RequestLayout() { mnMinimalWidth = 0; @@ -232,7 +232,7 @@ void Deck::RequestLayout (void) *mpVerticalScrollBar); } -vcl::Window* Deck::GetPanelParentWindow (void) +vcl::Window* Deck::GetPanelParentWindow() { return mpScrollContainer.get(); } @@ -297,7 +297,7 @@ void Deck::PrintWindowSubTree (vcl::Window* pRoot, int nIndentation) PrintWindowSubTree(pRoot->GetChild(nIndex), nIndentation+1); } -void Deck::PrintWindowTree (void) +void Deck::PrintWindowTree() { PrintWindowSubTree(this, 0); } @@ -323,7 +323,7 @@ Deck::ScrollContainerWindow::ScrollContainerWindow (vcl::Window* pParentWindow) #endif } -Deck::ScrollContainerWindow::~ScrollContainerWindow (void) +Deck::ScrollContainerWindow::~ScrollContainerWindow() { } diff --git a/sfx2/source/sidebar/Deck.hxx b/sfx2/source/sidebar/Deck.hxx index 215bb3be1490..ddb5354b21e1 100644 --- a/sfx2/source/sidebar/Deck.hxx +++ b/sfx2/source/sidebar/Deck.hxx @@ -45,18 +45,18 @@ public: Deck ( const DeckDescriptor& rDeckDescriptor, vcl::Window* pParentWindow, - const ::boost::function<void(void)>& rCloserAction); - virtual ~Deck (void); + const ::boost::function<void()>& rCloserAction); + virtual ~Deck(); - void Dispose (void); + void Dispose(); - const ::rtl::OUString& GetId (void) const { return msId;} - DeckTitleBar* GetTitleBar (void) const; - Rectangle GetContentArea (void) const; + const ::rtl::OUString& GetId() const { return msId;} + DeckTitleBar* GetTitleBar() const; + Rectangle GetContentArea() const; void SetPanels (const SharedPanelContainer& rPanels); - const SharedPanelContainer& GetPanels (void) const { return maPanels;} - void RequestLayout (void); - vcl::Window* GetPanelParentWindow (void); + const SharedPanelContainer& GetPanels() const { return maPanels;} + void RequestLayout(); + vcl::Window* GetPanelParentWindow(); /** Try to make the panel completely visible. When the whole panel does not fit then make its top visible @@ -77,7 +77,7 @@ public: { public: ScrollContainerWindow (vcl::Window* pParentWindow); - virtual ~ScrollContainerWindow (void); + virtual ~ScrollContainerWindow(); virtual void Paint (const Rectangle& rUpdateArea) SAL_OVERRIDE; void SetSeparators (const ::std::vector<sal_Int32>& rSeparators); private: diff --git a/sfx2/source/sidebar/DeckDescriptor.cxx b/sfx2/source/sidebar/DeckDescriptor.cxx index 13396112144e..9981b79fe1da 100644 --- a/sfx2/source/sidebar/DeckDescriptor.cxx +++ b/sfx2/source/sidebar/DeckDescriptor.cxx @@ -21,7 +21,7 @@ namespace sfx2 { namespace sidebar { -DeckDescriptor::DeckDescriptor (void) +DeckDescriptor::DeckDescriptor() : msTitle(), msId(), msIconURL(), @@ -51,7 +51,7 @@ DeckDescriptor::DeckDescriptor (const DeckDescriptor& rOther) { } -DeckDescriptor::~DeckDescriptor (void) +DeckDescriptor::~DeckDescriptor() { } diff --git a/sfx2/source/sidebar/DeckDescriptor.hxx b/sfx2/source/sidebar/DeckDescriptor.hxx index fc3f09f9debd..3ea1db1cf4dc 100644 --- a/sfx2/source/sidebar/DeckDescriptor.hxx +++ b/sfx2/source/sidebar/DeckDescriptor.hxx @@ -40,9 +40,9 @@ public: bool mbIsEnabled; sal_Int32 mnOrderIndex; - DeckDescriptor (void); + DeckDescriptor(); DeckDescriptor (const DeckDescriptor& rOther); - ~DeckDescriptor (void); + ~DeckDescriptor(); }; } } // end of namespace sfx2::sidebar diff --git a/sfx2/source/sidebar/DeckLayouter.cxx b/sfx2/source/sidebar/DeckLayouter.cxx index 984b61bedd2e..aae65c611950 100644 --- a/sfx2/source/sidebar/DeckLayouter.cxx +++ b/sfx2/source/sidebar/DeckLayouter.cxx @@ -50,7 +50,7 @@ namespace { sal_Int32 mnPanelIndex; bool mbShowTitleBar; - LayoutItem (void) + LayoutItem() : mpPanel(),maLayoutSize(0,0,0),mnDistributedHeight(0),mnWeight(0),mnPanelIndex(0),mbShowTitleBar(true) {} }; diff --git a/sfx2/source/sidebar/DeckTitleBar.cxx b/sfx2/source/sidebar/DeckTitleBar.cxx index 0294ce930788..9c296b1f3f3d 100644 --- a/sfx2/source/sidebar/DeckTitleBar.cxx +++ b/sfx2/source/sidebar/DeckTitleBar.cxx @@ -36,7 +36,7 @@ static const sal_Int32 gaRightGripPadding (3); DeckTitleBar::DeckTitleBar ( const ::rtl::OUString& rsTitle, vcl::Window* pParentWindow, - const ::boost::function<void(void)>& rCloserAction) + const ::boost::function<void()>& rCloserAction) : TitleBar(rsTitle, pParentWindow, GetBackgroundPaint()), mnCloserItemIndex(1), maCloserAction(rCloserAction), @@ -52,7 +52,7 @@ DeckTitleBar::DeckTitleBar ( #endif } -DeckTitleBar::~DeckTitleBar (void) +DeckTitleBar::~DeckTitleBar() { } @@ -92,12 +92,12 @@ void DeckTitleBar::PaintDecoration (const Rectangle& rTitleBarBox) (void)rTitleBarBox; } -sidebar::Paint DeckTitleBar::GetBackgroundPaint (void) +sidebar::Paint DeckTitleBar::GetBackgroundPaint() { return Theme::GetPaint(Theme::Paint_DeckTitleBarBackground); } -Color DeckTitleBar::GetTextColor (void) +Color DeckTitleBar::GetTextColor() { return Theme::GetColor(Theme::Color_DeckTitleFont); } @@ -109,7 +109,7 @@ void DeckTitleBar::HandleToolBoxItemClick (const sal_uInt16 nItemIndex) maCloserAction(); } -css::uno::Reference<css::accessibility::XAccessible> DeckTitleBar::CreateAccessible (void) +css::uno::Reference<css::accessibility::XAccessible> DeckTitleBar::CreateAccessible() { const ::rtl::OUString sAccessibleName(msTitle); SetAccessibleName(sAccessibleName); diff --git a/sfx2/source/sidebar/DeckTitleBar.hxx b/sfx2/source/sidebar/DeckTitleBar.hxx index 5f163caf1c56..d481b2d842d3 100644 --- a/sfx2/source/sidebar/DeckTitleBar.hxx +++ b/sfx2/source/sidebar/DeckTitleBar.hxx @@ -32,8 +32,8 @@ public: DeckTitleBar ( const ::rtl::OUString& rsTitle, vcl::Window* pParentWindow, - const ::boost::function<void(void)>& rCloserAction); - virtual ~DeckTitleBar (void); + const ::boost::function<void()>& rCloserAction); + virtual ~DeckTitleBar(); void SetCloserVisible (const bool bIsCloserVisible); @@ -42,14 +42,14 @@ public: protected: virtual Rectangle GetTitleArea (const Rectangle& rTitleBarBox) SAL_OVERRIDE; virtual void PaintDecoration (const Rectangle& rTitleBarBox) SAL_OVERRIDE; - virtual sidebar::Paint GetBackgroundPaint (void) SAL_OVERRIDE; - virtual Color GetTextColor (void) SAL_OVERRIDE; + virtual sidebar::Paint GetBackgroundPaint() SAL_OVERRIDE; + virtual Color GetTextColor() SAL_OVERRIDE; virtual void HandleToolBoxItemClick (const sal_uInt16 nItemIndex) SAL_OVERRIDE; - virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible (void) SAL_OVERRIDE; + virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() SAL_OVERRIDE; private: const sal_uInt16 mnCloserItemIndex; - const ::boost::function<void(void)> maCloserAction; + const ::boost::function<void()> maCloserAction; bool mbIsCloserVisible; }; diff --git a/sfx2/source/sidebar/EnumContext.cxx b/sfx2/source/sidebar/EnumContext.cxx index e89f5627f7bb..9f8a63077f18 100644 --- a/sfx2/source/sidebar/EnumContext.cxx +++ b/sfx2/source/sidebar/EnumContext.cxx @@ -41,7 +41,7 @@ static ContextVector maContextVector; const sal_Int32 EnumContext::NoMatch = 4; const sal_Int32 EnumContext::OptimalMatch = 0; // Neither application nor context name is "any". -EnumContext::EnumContext (void) +EnumContext::EnumContext() : meApplication(Application_None), meContext(Context_Unknown) { @@ -63,12 +63,12 @@ EnumContext::EnumContext ( { } -sal_Int32 EnumContext::GetCombinedContext_DI (void) const +sal_Int32 EnumContext::GetCombinedContext_DI() const { return CombinedEnumContext(GetApplication_DI(), meContext); } -EnumContext::Application EnumContext::GetApplication_DI (void) const +EnumContext::Application EnumContext::GetApplication_DI() const { switch (meApplication) { @@ -110,7 +110,7 @@ void EnumContext::AddEntry (const ::rtl::OUString& rsName, const Application eAp maApplicationVector[eApplication]=rsName; } -void EnumContext::ProvideApplicationContainers (void) +void EnumContext::ProvideApplicationContainers() { if (maApplicationMap.empty()) { @@ -162,7 +162,7 @@ void EnumContext::AddEntry (const ::rtl::OUString& rsName, const Context eApplic maContextVector[eApplication] = rsName; } -void EnumContext::ProvideContextContainers (void) +void EnumContext::ProvideContextContainers() { if (maContextMap.empty()) { diff --git a/sfx2/source/sidebar/FocusManager.cxx b/sfx2/source/sidebar/FocusManager.cxx index af116e67c605..1dae58556cbd 100644 --- a/sfx2/source/sidebar/FocusManager.cxx +++ b/sfx2/source/sidebar/FocusManager.cxx @@ -46,24 +46,24 @@ FocusManager::FocusManager (const ::boost::function<void(const Panel&)>& rShowPa { } -FocusManager::~FocusManager (void) +FocusManager::~FocusManager() { Clear(); } -void FocusManager::GrabFocus (void) +void FocusManager::GrabFocus() { FocusDeckTitle(); } -void FocusManager::Clear (void) +void FocusManager::Clear() { SetDeckTitle(NULL); ClearPanels(); ClearButtons(); } -void FocusManager::ClearPanels (void) +void FocusManager::ClearPanels() { ::std::vector<Panel*> aPanels; aPanels.swap(maPanels); @@ -82,7 +82,7 @@ void FocusManager::ClearPanels (void) } } -void FocusManager::ClearButtons (void) +void FocusManager::ClearButtons() { ::std::vector<Button*> aButtons; aButtons.swap(maButtons); @@ -184,7 +184,7 @@ FocusManager::FocusLocation FocusManager::GetFocusLocation (const vcl::Window& r return FocusLocation(PC_None, -1); } -void FocusManager::FocusDeckTitle (void) +void FocusManager::FocusDeckTitle() { if (mpDeckTitleBar != NULL) { @@ -205,7 +205,7 @@ void FocusManager::FocusDeckTitle (void) FocusPanel(0, false); } -bool FocusManager::IsDeckTitleVisible (void) const +bool FocusManager::IsDeckTitleVisible() const { return mpDeckTitleBar != NULL && mpDeckTitleBar->IsVisible(); } diff --git a/sfx2/source/sidebar/FocusManager.hxx b/sfx2/source/sidebar/FocusManager.hxx index 0577c8cd88e7..4db5fe1ead64 100644 --- a/sfx2/source/sidebar/FocusManager.hxx +++ b/sfx2/source/sidebar/FocusManager.hxx @@ -51,17 +51,17 @@ class FocusManager { public: FocusManager (const ::boost::function<void(const Panel&)>& rShowPanelFunctor); - ~FocusManager (void); + ~FocusManager(); /** Forget all panels and buttons. Remove all window listeners. */ - void Clear (void); + void Clear(); /** Transfer the focus into the sidebar tree of windows. This is typically called from the SidebarChildWindow as result of pressing the F6 key. */ - void GrabFocus (void); + void GrabFocus(); void SetDeckTitle (DeckTitleBar* pDeckTitleBar); void SetPanels (const SharedPanelContainer& rPanels); @@ -99,8 +99,8 @@ private: DECL_LINK(WindowEventListener, VclSimpleEvent*); DECL_LINK(ChildEventListener, VclSimpleEvent*); - void ClearPanels (void); - void ClearButtons (void); + void ClearPanels(); + void ClearButtons(); /** Let the focus manager listen for window events for the given window. @@ -112,8 +112,8 @@ private: */ void RemoveWindow (vcl::Window& rWindow); - void FocusDeckTitle (void); - bool IsDeckTitleVisible (void) const; + void FocusDeckTitle(); + bool IsDeckTitleVisible() const; bool IsPanelTitleVisible (const sal_Int32 nPanelIndex) const; /** Set the focus to the title bar of the panel or, if the diff --git a/sfx2/source/sidebar/IContextChangeReceiver.cxx b/sfx2/source/sidebar/IContextChangeReceiver.cxx index a592b8275b6e..8a4ad0f6701d 100644 --- a/sfx2/source/sidebar/IContextChangeReceiver.cxx +++ b/sfx2/source/sidebar/IContextChangeReceiver.cxx @@ -20,7 +20,7 @@ namespace sfx2 { namespace sidebar { -IContextChangeReceiver::~IContextChangeReceiver (void) +IContextChangeReceiver::~IContextChangeReceiver() { } diff --git a/sfx2/source/sidebar/ILayoutableWindow.cxx b/sfx2/source/sidebar/ILayoutableWindow.cxx index 1b4cd53710cc..c8d740947d2f 100644 --- a/sfx2/source/sidebar/ILayoutableWindow.cxx +++ b/sfx2/source/sidebar/ILayoutableWindow.cxx @@ -20,7 +20,7 @@ namespace sfx2 { namespace sidebar { -ILayoutableWindow::~ILayoutableWindow (void) +ILayoutableWindow::~ILayoutableWindow() { } diff --git a/sfx2/source/sidebar/MenuButton.cxx b/sfx2/source/sidebar/MenuButton.cxx index 36d5a4c75236..8620b30f9b93 100644 --- a/sfx2/source/sidebar/MenuButton.cxx +++ b/sfx2/source/sidebar/MenuButton.cxx @@ -39,7 +39,7 @@ MenuButton::MenuButton (vcl::Window* pParentWindow) #endif } -MenuButton::~MenuButton (void) +MenuButton::~MenuButton() { } diff --git a/sfx2/source/sidebar/MenuButton.hxx b/sfx2/source/sidebar/MenuButton.hxx index 1be374ebf7f7..121dd991d4c6 100644 --- a/sfx2/source/sidebar/MenuButton.hxx +++ b/sfx2/source/sidebar/MenuButton.hxx @@ -28,7 +28,7 @@ class MenuButton { public: MenuButton (vcl::Window* pParentWindow); - virtual ~MenuButton (void); + virtual ~MenuButton(); virtual void Paint (const Rectangle& rUpdateArea) SAL_OVERRIDE; virtual void MouseMove (const MouseEvent& rEvent) SAL_OVERRIDE; diff --git a/sfx2/source/sidebar/Paint.cxx b/sfx2/source/sidebar/Paint.cxx index 2d3fe7d2a8c2..caa371d2acf6 100644 --- a/sfx2/source/sidebar/Paint.cxx +++ b/sfx2/source/sidebar/Paint.cxx @@ -24,7 +24,7 @@ using namespace css; namespace sfx2 { namespace sidebar { -Paint::Paint (void) +Paint::Paint() : meType(NoPaint) { } @@ -54,7 +54,7 @@ Paint Paint::Create (const css::uno::Any& rValue) return Paint(); } -const Color& Paint::GetColor (void) const +const Color& Paint::GetColor() const { if (meType != ColorPaint) { @@ -66,7 +66,7 @@ const Color& Paint::GetColor (void) const return ::boost::get<Color>(maValue); } -const Gradient& Paint::GetGradient (void) const +const Gradient& Paint::GetGradient() const { if (meType != GradientPaint) { @@ -78,7 +78,7 @@ const Gradient& Paint::GetGradient (void) const return ::boost::get<Gradient>(maValue); } -Wallpaper Paint::GetWallpaper (void) const +Wallpaper Paint::GetWallpaper() const { switch (meType) { diff --git a/sfx2/source/sidebar/Paint.hxx b/sfx2/source/sidebar/Paint.hxx index 8c1445f3940f..91b36f093bf8 100644 --- a/sfx2/source/sidebar/Paint.hxx +++ b/sfx2/source/sidebar/Paint.hxx @@ -49,7 +49,7 @@ public: static Paint Create (const css::uno::Any& rValue); // Create paint with type NoPaint. - explicit Paint (void); + explicit Paint(); // Create a Paint object for the given color. explicit Paint (const Color& rColor); @@ -57,11 +57,11 @@ public: // Create a Paint object for the given gradient. explicit Paint (const Gradient& rGradient); - Type GetType (void) const { return meType;} - const Color& GetColor (void) const; - const Gradient& GetGradient (void) const; + Type GetType() const { return meType;} + const Color& GetColor() const; + const Gradient& GetGradient() const; - Wallpaper GetWallpaper (void) const; + Wallpaper GetWallpaper() const; private: Type meType; diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx index f7666e794599..d72f15e57c22 100644 --- a/sfx2/source/sidebar/Panel.cxx +++ b/sfx2/source/sidebar/Panel.cxx @@ -47,8 +47,8 @@ Panel::Panel ( const PanelDescriptor& rPanelDescriptor, vcl::Window* pParentWindow, const bool bIsInitiallyExpanded, - const ::boost::function<void(void)>& rDeckLayoutTrigger, - const ::boost::function<Context(void)>& rContextAccess) + const ::boost::function<void()>& rDeckLayoutTrigger, + const ::boost::function<Context()>& rContextAccess) : Window(pParentWindow), msPanelId(rPanelDescriptor.msId), mpTitleBar(new PanelTitleBar( @@ -69,12 +69,12 @@ Panel::Panel ( #endif } -Panel::~Panel (void) +Panel::~Panel() { Dispose(); } -void Panel::Dispose (void) +void Panel::Dispose() { mxPanelComponent = NULL; @@ -94,7 +94,7 @@ void Panel::Dispose (void) mpTitleBar.reset(); } -PanelTitleBar* Panel::GetTitleBar (void) const +PanelTitleBar* Panel::GetTitleBar() const { return mpTitleBar.get(); } @@ -133,7 +133,7 @@ void Panel::Paint (const Rectangle& rUpdateArea) Window::Paint(rUpdateArea); } -void Panel::Resize (void) +void Panel::Resize() { Window::Resize(); @@ -151,7 +151,7 @@ void Panel::Resize (void) } } -void Panel::Activate (void) +void Panel::Activate() { Window::Activate(); } @@ -162,7 +162,7 @@ void Panel::DataChanged (const DataChangedEvent& rEvent) SetBackground(Theme::GetPaint(Theme::Paint_PanelBackground).GetWallpaper()); } -Reference<awt::XWindow> Panel::GetElementWindow (void) +Reference<awt::XWindow> Panel::GetElementWindow() { if (mxElement.is()) { diff --git a/sfx2/source/sidebar/Panel.hxx b/sfx2/source/sidebar/Panel.hxx index 219943cd7cc5..ad2c78d6e95d 100644 --- a/sfx2/source/sidebar/Panel.hxx +++ b/sfx2/source/sidebar/Panel.hxx @@ -44,26 +44,26 @@ public: const PanelDescriptor& rPanelDescriptor, vcl::Window* pParentWindow, const bool bIsInitiallyExpanded, - const ::boost::function<void(void)>& rDeckLayoutTrigger, - const ::boost::function<Context(void)>& rContextAccess); - virtual ~Panel (void); + const ::boost::function<void()>& rDeckLayoutTrigger, + const ::boost::function<Context()>& rContextAccess); + virtual ~Panel(); - void Dispose (void); + void Dispose(); - PanelTitleBar* GetTitleBar (void) const; - bool IsTitleBarOptional (void) const { return mbIsTitleBarOptional;} + PanelTitleBar* GetTitleBar() const; + bool IsTitleBarOptional() const { return mbIsTitleBarOptional;} void SetUIElement (const css::uno::Reference<css::ui::XUIElement>& rxElement); - css::uno::Reference<css::ui::XSidebarPanel> GetPanelComponent (void) const { return mxPanelComponent;} - css::uno::Reference<css::awt::XWindow> GetElementWindow (void); + css::uno::Reference<css::ui::XSidebarPanel> GetPanelComponent() const { return mxPanelComponent;} + css::uno::Reference<css::awt::XWindow> GetElementWindow(); void SetExpanded (const bool bIsExpanded); - bool IsExpanded (void) const { return mbIsExpanded;} + bool IsExpanded() const { return mbIsExpanded;} bool HasIdPredicate (const ::rtl::OUString& rsId) const; - const ::rtl::OUString& GetId (void) const { return msPanelId;} + const ::rtl::OUString& GetId() const { return msPanelId;} virtual void Paint (const Rectangle& rUpdateArea) SAL_OVERRIDE; - virtual void Resize (void) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; virtual void DataChanged (const DataChangedEvent& rEvent) SAL_OVERRIDE; - virtual void Activate (void) SAL_OVERRIDE; + virtual void Activate() SAL_OVERRIDE; private: const ::rtl::OUString msPanelId; @@ -72,8 +72,8 @@ private: css::uno::Reference<css::ui::XUIElement> mxElement; css::uno::Reference<css::ui::XSidebarPanel> mxPanelComponent; bool mbIsExpanded; - const ::boost::function<void(void)> maDeckLayoutTrigger; - const ::boost::function<Context(void)> maContextAccess; + const ::boost::function<void()> maDeckLayoutTrigger; + const ::boost::function<Context()> maContextAccess; }; typedef ::boost::shared_ptr<Panel> SharedPanel; typedef ::std::vector<SharedPanel> SharedPanelContainer; diff --git a/sfx2/source/sidebar/PanelDescriptor.cxx b/sfx2/source/sidebar/PanelDescriptor.cxx index aad36f4f0aba..c7837bf36d41 100644 --- a/sfx2/source/sidebar/PanelDescriptor.cxx +++ b/sfx2/source/sidebar/PanelDescriptor.cxx @@ -21,7 +21,7 @@ namespace sfx2 { namespace sidebar { -PanelDescriptor::PanelDescriptor (void) +PanelDescriptor::PanelDescriptor() : msTitle(), mbIsTitleBarOptional(false), msId(), @@ -53,7 +53,7 @@ PanelDescriptor::PanelDescriptor (const PanelDescriptor& rOther) { } -PanelDescriptor::~PanelDescriptor (void) +PanelDescriptor::~PanelDescriptor() { } diff --git a/sfx2/source/sidebar/PanelDescriptor.hxx b/sfx2/source/sidebar/PanelDescriptor.hxx index c2ae4afb44d9..d1a20d253967 100644 --- a/sfx2/source/sidebar/PanelDescriptor.hxx +++ b/sfx2/source/sidebar/PanelDescriptor.hxx @@ -41,9 +41,9 @@ public: bool mbShowForReadOnlyDocuments; bool mbWantsCanvas; - PanelDescriptor (void); + PanelDescriptor(); PanelDescriptor (const PanelDescriptor& rPanelDescriptor); - ~PanelDescriptor (void); + ~PanelDescriptor(); }; } } // end of namespace sfx2::sidebar diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx b/sfx2/source/sidebar/PanelTitleBar.cxx index 5437c5312a0c..b8cf19fbc507 100644 --- a/sfx2/source/sidebar/PanelTitleBar.cxx +++ b/sfx2/source/sidebar/PanelTitleBar.cxx @@ -58,7 +58,7 @@ PanelTitleBar::PanelTitleBar ( #endif } -PanelTitleBar::~PanelTitleBar (void) +PanelTitleBar::~PanelTitleBar() { } @@ -129,12 +129,12 @@ void PanelTitleBar::PaintDecoration (const Rectangle& rTitleBarBox) } } -Paint PanelTitleBar::GetBackgroundPaint (void) +Paint PanelTitleBar::GetBackgroundPaint() { return Theme::GetPaint(Theme::Paint_PanelTitleBarBackground); } -Color PanelTitleBar::GetTextColor (void) +Color PanelTitleBar::GetTextColor() { return Theme::GetColor(Theme::Color_PanelTitleFont); } @@ -159,7 +159,7 @@ void PanelTitleBar::HandleToolBoxItemClick (const sal_uInt16 nItemIndex) } } -Reference<accessibility::XAccessible> PanelTitleBar::CreateAccessible (void) +Reference<accessibility::XAccessible> PanelTitleBar::CreateAccessible() { const ::rtl::OUString sAccessibleName(msAccessibleNamePrefix + msTitle); SetAccessibleName(sAccessibleName); diff --git a/sfx2/source/sidebar/PanelTitleBar.hxx b/sfx2/source/sidebar/PanelTitleBar.hxx index 51af11d2c176..37effd70726f 100644 --- a/sfx2/source/sidebar/PanelTitleBar.hxx +++ b/sfx2/source/sidebar/PanelTitleBar.hxx @@ -36,7 +36,7 @@ public: const ::rtl::OUString& rsTitle, vcl::Window* pParentWindow, Panel* pPanel ); - virtual ~PanelTitleBar (void); + virtual ~PanelTitleBar(); void SetMoreOptionsCommand ( const ::rtl::OUString& rsCommandName, @@ -49,10 +49,10 @@ public: protected: virtual Rectangle GetTitleArea (const Rectangle& rTitleBarBox) SAL_OVERRIDE; virtual void PaintDecoration (const Rectangle& rTitleBarBox) SAL_OVERRIDE; - virtual sidebar::Paint GetBackgroundPaint (void) SAL_OVERRIDE; - virtual Color GetTextColor (void) SAL_OVERRIDE; + virtual sidebar::Paint GetBackgroundPaint() SAL_OVERRIDE; + virtual Color GetTextColor() SAL_OVERRIDE; virtual void HandleToolBoxItemClick (const sal_uInt16 nItemIndex) SAL_OVERRIDE; - virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible (void) SAL_OVERRIDE; + virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() SAL_OVERRIDE; private: bool mbIsLeftButtonDown; diff --git a/sfx2/source/sidebar/PopupContainer.cxx b/sfx2/source/sidebar/PopupContainer.cxx index 0952765fb8b6..0b52d1fddc7e 100644 --- a/sfx2/source/sidebar/PopupContainer.cxx +++ b/sfx2/source/sidebar/PopupContainer.cxx @@ -27,7 +27,7 @@ PopupContainer::PopupContainer (vcl::Window* pParent) { } -PopupContainer::~PopupContainer (void) +PopupContainer::~PopupContainer() { } diff --git a/sfx2/source/sidebar/ResourceManager.cxx b/sfx2/source/sidebar/ResourceManager.cxx index 570480391993..c5bfa88359bd 100644 --- a/sfx2/source/sidebar/ResourceManager.cxx +++ b/sfx2/source/sidebar/ResourceManager.cxx @@ -38,13 +38,13 @@ using namespace css::uno; namespace sfx2 { namespace sidebar { -ResourceManager& ResourceManager::Instance (void) +ResourceManager& ResourceManager::Instance() { static ResourceManager maInstance; return maInstance; } -ResourceManager::ResourceManager (void) +ResourceManager::ResourceManager() : maDecks(), maPanels(), maProcessedApplications() @@ -53,7 +53,7 @@ ResourceManager::ResourceManager (void) ReadPanelList(); } -ResourceManager::~ResourceManager (void) +ResourceManager::~ResourceManager() { maPanels.clear(); maDecks.clear(); @@ -192,7 +192,7 @@ const ResourceManager::PanelContextDescriptorContainer& ResourceManager::GetMatc return rPanelIds; } -void ResourceManager::ReadDeckList (void) +void ResourceManager::ReadDeckList() { const ::utl::OConfigurationTreeRoot aDeckRootNode ( ::comphelper::getProcessComponentContext(), @@ -244,7 +244,7 @@ void ResourceManager::ReadDeckList (void) maDecks.resize(nWriteIndex); } -void ResourceManager::ReadPanelList (void) +void ResourceManager::ReadPanelList() { const ::utl::OConfigurationTreeRoot aPanelRootNode ( ::comphelper::getProcessComponentContext(), diff --git a/sfx2/source/sidebar/ResourceManager.hxx b/sfx2/source/sidebar/ResourceManager.hxx index c8e2d07678a0..57fc5beaf993 100644 --- a/sfx2/source/sidebar/ResourceManager.hxx +++ b/sfx2/source/sidebar/ResourceManager.hxx @@ -39,7 +39,7 @@ class ContextList; class ResourceManager { public: - static ResourceManager& Instance (void); + static ResourceManager& Instance(); const DeckDescriptor* GetDeckDescriptor ( const ::rtl::OUString& rsDeckId) const; @@ -96,8 +96,8 @@ public: const Context& rContext); private: - ResourceManager (void); - ~ResourceManager (void); + ResourceManager(); + ~ResourceManager(); typedef ::std::vector<DeckDescriptor> DeckContainer; DeckContainer maDecks; @@ -105,8 +105,8 @@ private: PanelContainer maPanels; mutable ::std::set<rtl::OUString> maProcessedApplications; - void ReadDeckList (void); - void ReadPanelList (void); + void ReadDeckList(); + void ReadPanelList(); void ReadContextList ( const ::utl::OConfigurationNode& rNode, ContextList& rContextList, diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index eb2554df744d..af144a19e510 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -153,7 +153,7 @@ SidebarController::SidebarController ( xWeakController)); } -SidebarController::~SidebarController (void) +SidebarController::~SidebarController() { } @@ -171,7 +171,7 @@ SidebarController* SidebarController::GetSidebarControllerForFrame ( return dynamic_cast<SidebarController*>(xController.get()); } -void SAL_CALL SidebarController::disposing (void) +void SAL_CALL SidebarController::disposing() { SidebarControllerContainer::iterator iEntry (maSidebarControllerContainer.find(mxFrame)); if (iEntry != maSidebarControllerContainer.end()) @@ -269,7 +269,7 @@ void SAL_CALL SidebarController::statusChanged (const css::frame::FeatureStateEv } } -void SAL_CALL SidebarController::requestLayout (void) +void SAL_CALL SidebarController::requestLayout() throw(css::uno::RuntimeException, std::exception) { sal_Int32 nMinimalWidth = 0; @@ -281,14 +281,14 @@ void SAL_CALL SidebarController::requestLayout (void) RestrictWidth(nMinimalWidth); } -void SidebarController::BroadcastPropertyChange (void) +void SidebarController::BroadcastPropertyChange() { DataChangedEvent aEvent (DataChangedEventType::USER); mpParentWindow->NotifyAllChildren(aEvent); mpParentWindow->Invalidate(INVALIDATE_CHILDREN); } -void SidebarController::NotifyResize (void) +void SidebarController::NotifyResize() { if (mpTabBar == 0) { @@ -419,7 +419,7 @@ void SidebarController::ProcessNewWidth (const sal_Int32 nNewWidth) } } -void SidebarController::UpdateConfigurations (void) +void SidebarController::UpdateConfigurations() { if (maCurrentContext != maRequestedContext || mnRequestedForceFlags!=SwitchFlag_NoForce) @@ -958,7 +958,7 @@ IMPL_LINK(SidebarController, OnMenuItemSelected, Menu*, pMenu) return 1; } -void SidebarController::RequestCloseDeck (void) +void SidebarController::RequestCloseDeck() { mbIsDeckRequestedOpen = false; UpdateDeckOpenState(); @@ -967,7 +967,7 @@ void SidebarController::RequestCloseDeck (void) mpTabBar->RemoveDeckHighlight(); } -void SidebarController::RequestOpenDeck (void) +void SidebarController::RequestOpenDeck() { mbIsDeckRequestedOpen = true; UpdateDeckOpenState(); @@ -978,7 +978,7 @@ bool SidebarController::IsDeckVisible(const OUString& rsDeckId) return mbIsDeckOpen && mbIsDeckOpen.get() && msCurrentDeckId == rsDeckId; } -void SidebarController::UpdateDeckOpenState (void) +void SidebarController::UpdateDeckOpenState() { if ( ! mbIsDeckRequestedOpen) // No state requested. @@ -1014,7 +1014,7 @@ void SidebarController::UpdateDeckOpenState (void) } } -bool SidebarController::CanModifyChildWindowWidth (void) +bool SidebarController::CanModifyChildWindowWidth() { SfxSplitWindow* pSplitWindow = GetSplitWindow(); if (pSplitWindow == NULL) @@ -1069,7 +1069,7 @@ void SidebarController::RestrictWidth (sal_Int32 nWidth) } } -SfxSplitWindow* SidebarController::GetSplitWindow (void) +SfxSplitWindow* SidebarController::GetSplitWindow() { if (mpParentWindow != NULL) { @@ -1125,7 +1125,7 @@ void SidebarController::UpdateCloseIndicator (const bool bCloseAfterDrag) } } -void SidebarController::UpdateTitleBarIcons (void) +void SidebarController::UpdateTitleBarIcons() { if ( ! mpCurrentDeck) return; diff --git a/sfx2/source/sidebar/SidebarController.hxx b/sfx2/source/sidebar/SidebarController.hxx index 15c694d85fea..14705d91ca02 100644 --- a/sfx2/source/sidebar/SidebarController.hxx +++ b/sfx2/source/sidebar/SidebarController.hxx @@ -76,7 +76,7 @@ public: SidebarController( SidebarDockingWindow* pParentWindow, const css::uno::Reference<css::frame::XFrame>& rxFrame); - virtual ~SidebarController (void); + virtual ~SidebarController(); /** Return the SidebarController object that is associated with the given XFrame. @@ -104,10 +104,10 @@ public: throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ui::XSidebar - virtual void SAL_CALL requestLayout (void) + virtual void SAL_CALL requestLayout() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - void NotifyResize (void); + void NotifyResize(); /** In some situations it is necessary to force an update of the current deck and its panels. One reason is a change of the @@ -125,17 +125,17 @@ public: /** Show only the tab bar, not the deck. */ - void RequestCloseDeck (void); + void RequestCloseDeck(); /** Open the deck area and restore the parent window to its old width. */ - void RequestOpenDeck (void); + void RequestOpenDeck(); /** Returns true when the given deck is the currently visible deck */ bool IsDeckVisible (const ::rtl::OUString& rsDeckId); - FocusManager& GetFocusManager (void) { return maFocusManager;} + FocusManager& GetFocusManager() { return maFocusManager;} private: typedef ::std::map< @@ -191,7 +191,7 @@ private: DECL_LINK(WindowEventHandler, VclWindowEvent*); /** Make maRequestedContext the current context. */ - void UpdateConfigurations (void); + void UpdateConfigurations(); css::uno::Reference<css::ui::XUIElement> CreateUIElement ( const css::uno::Reference<css::awt::XWindowPeer>& rxWindow, @@ -214,13 +214,13 @@ private: ::boost::shared_ptr<PopupMenu> CreatePopupMenu ( const ::std::vector<TabBar::DeckMenuData>& rMenuData) const; DECL_LINK(OnMenuItemSelected, Menu*); - void BroadcastPropertyChange (void); + void BroadcastPropertyChange(); /** The close of the deck changes the width of the child window. That is only possible if there is no other docking window docked above or below the sidebar. Return whether the width of the child window can be modified. */ - bool CanModifyChildWindowWidth (void); + bool CanModifyChildWindowWidth(); /** Set the child window container to a new width. Return the old width. @@ -231,11 +231,11 @@ private: the panels. This is called once when a deck is created and every time when a data change event is processed. */ - void UpdateTitleBarIcons (void); + void UpdateTitleBarIcons(); - void UpdateDeckOpenState (void); + void UpdateDeckOpenState(); void RestrictWidth (sal_Int32 nWidth); - SfxSplitWindow* GetSplitWindow (void); + SfxSplitWindow* GetSplitWindow(); void ProcessNewWidth (const sal_Int32 nNewWidth); void UpdateCloseIndicator (const bool bIsIndicatorVisible); @@ -245,9 +245,9 @@ private: */ void ShowPanel (const Panel& rPanel); - Context GetCurrentContext (void) const { return maCurrentContext;} + Context GetCurrentContext() const { return maCurrentContext;} - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; }; } } // end of namespace sfx2::sidebar diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx b/sfx2/source/sidebar/SidebarDockingWindow.cxx index 5ccf6fe60674..f67240c1a06c 100644 --- a/sfx2/source/sidebar/SidebarDockingWindow.cxx +++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx @@ -51,12 +51,12 @@ SidebarDockingWindow::SidebarDockingWindow( } } -SidebarDockingWindow::~SidebarDockingWindow (void) +SidebarDockingWindow::~SidebarDockingWindow() { DoDispose(); } -void SidebarDockingWindow::DoDispose (void) +void SidebarDockingWindow::DoDispose() { Reference<lang::XComponent> xComponent (static_cast<XWeak*>(mpSidebarController.get()), UNO_QUERY); mpSidebarController.clear(); @@ -75,7 +75,7 @@ void SidebarDockingWindow::GetFocus() } // fdo#87217 -bool SidebarDockingWindow::Close (void) +bool SidebarDockingWindow::Close() { return SfxDockingWindow::Close(); } diff --git a/sfx2/source/sidebar/SidebarDockingWindow.hxx b/sfx2/source/sidebar/SidebarDockingWindow.hxx index c15422601c9b..47724b4d3520 100644 --- a/sfx2/source/sidebar/SidebarDockingWindow.hxx +++ b/sfx2/source/sidebar/SidebarDockingWindow.hxx @@ -38,13 +38,13 @@ public: SidebarChildWindow& rChildWindow, vcl::Window* pParent, WinBits nBits); - virtual ~SidebarDockingWindow (void); + virtual ~SidebarDockingWindow(); - virtual bool Close (void) SAL_OVERRIDE; + virtual bool Close() SAL_OVERRIDE; protected: // Window overridables - virtual void GetFocus (void) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; virtual SfxChildAlignment CheckAlignment ( SfxChildAlignment eCurrentAlignment, @@ -53,7 +53,7 @@ protected: private: ::rtl::Reference<sfx2::sidebar::SidebarController> mpSidebarController; - void DoDispose (void); + void DoDispose(); }; } } // end of namespace sfx2::sidebar diff --git a/sfx2/source/sidebar/SidebarPanelBase.cxx b/sfx2/source/sidebar/SidebarPanelBase.cxx index a1b54dba617e..fbe51379f322 100644 --- a/sfx2/source/sidebar/SidebarPanelBase.cxx +++ b/sfx2/source/sidebar/SidebarPanelBase.cxx @@ -74,11 +74,11 @@ SidebarPanelBase::SidebarPanelBase ( } } -SidebarPanelBase::~SidebarPanelBase (void) +SidebarPanelBase::~SidebarPanelBase() { } -void SAL_CALL SidebarPanelBase::disposing (void) +void SAL_CALL SidebarPanelBase::disposing() throw (css::uno::RuntimeException) { if (mpControl != NULL) @@ -124,25 +124,25 @@ void SAL_CALL SidebarPanelBase::disposing ( mpControl = NULL; } -css::uno::Reference<css::frame::XFrame> SAL_CALL SidebarPanelBase::getFrame (void) +css::uno::Reference<css::frame::XFrame> SAL_CALL SidebarPanelBase::getFrame() throw(css::uno::RuntimeException, std::exception) { return mxFrame; } -::rtl::OUString SAL_CALL SidebarPanelBase::getResourceURL (void) +::rtl::OUString SAL_CALL SidebarPanelBase::getResourceURL() throw(css::uno::RuntimeException, std::exception) { return msResourceURL; } -sal_Int16 SAL_CALL SidebarPanelBase::getType (void) +sal_Int16 SAL_CALL SidebarPanelBase::getType() throw(css::uno::RuntimeException, std::exception) { return ui::UIElementType::TOOLPANEL; } -Reference<XInterface> SAL_CALL SidebarPanelBase::getRealInterface (void) +Reference<XInterface> SAL_CALL SidebarPanelBase::getRealInterface() throw(css::uno::RuntimeException, std::exception) { return Reference<XInterface>(static_cast<XWeak*>(this)); @@ -158,7 +158,7 @@ Reference<accessibility::XAccessible> SAL_CALL SidebarPanelBase::createAccessibl return NULL; } -Reference<awt::XWindow> SAL_CALL SidebarPanelBase::getWindow (void) +Reference<awt::XWindow> SAL_CALL SidebarPanelBase::getWindow() throw(css::uno::RuntimeException, std::exception) { if (mpControl != NULL) diff --git a/sfx2/source/sidebar/SidebarResource.hxx b/sfx2/source/sidebar/SidebarResource.hxx index fb107a2ecb3a..3a6363a49b0d 100644 --- a/sfx2/source/sidebar/SidebarResource.hxx +++ b/sfx2/source/sidebar/SidebarResource.hxx @@ -26,8 +26,8 @@ class SidebarResource : public Resource { public: - SidebarResource (void) : Resource(SfxResId(RID_SIDEBAR_RESOURCE)){} - ~SidebarResource (void) { FreeResource(); } + SidebarResource() : Resource(SfxResId(RID_SIDEBAR_RESOURCE)){} + ~SidebarResource() { FreeResource(); } }; #endif diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx index 023919f7cfbb..e1987fd8c9cc 100644 --- a/sfx2/source/sidebar/SidebarToolBox.cxx +++ b/sfx2/source/sidebar/SidebarToolBox.cxx @@ -55,7 +55,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSidebarToolBox(vcl::Wi return new SidebarToolBox(pParent); } -SidebarToolBox::~SidebarToolBox (void) +SidebarToolBox::~SidebarToolBox() { ControllerContainer aControllers; aControllers.swap(maControllers); @@ -207,7 +207,7 @@ sal_uInt16 SidebarToolBox::GetItemIdForSubToolbarName (const OUString& rsSubTool return 0; } -void SidebarToolBox::RegisterHandlers (void) +void SidebarToolBox::RegisterHandlers() { if ( ! mbAreHandlersRegistered) { diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx index d5196da235e4..7f63755b5b82 100644 --- a/sfx2/source/sidebar/TabBar.cxx +++ b/sfx2/source/sidebar/TabBar.cxx @@ -62,7 +62,7 @@ TabBar::TabBar ( #endif } -TabBar::~TabBar (void) +TabBar::~TabBar() { } @@ -77,7 +77,7 @@ void TabBar::Paint (const Rectangle& rUpdateArea) Point(GetSizePixel().Width()-nHorizontalPadding, mnMenuSeparatorY)); } -sal_Int32 TabBar::GetDefaultWidth (void) +sal_Int32 TabBar::GetDefaultWidth() { return Theme::GetInteger(Theme::Int_TabItemWidth) + Theme::GetInteger(Theme::Int_TabBarLeftPadding) @@ -128,7 +128,7 @@ void TabBar::SetDecks ( Layout(); } -void TabBar::UpdateButtonIcons (void) +void TabBar::UpdateButtonIcons() { Image aImage = Theme::GetImage(Theme::Image_TabBarMenu); if ( mpMenuButton->GetDPIScaleFactor() > 1 ) @@ -162,7 +162,7 @@ void TabBar::UpdateButtonIcons (void) Invalidate(); } -void TabBar::Layout (void) +void TabBar::Layout() { const SvBorder aPadding ( Theme::GetInteger(Theme::Int_TabBarLeftPadding), @@ -295,7 +295,7 @@ void TabBar::ToggleHideFlag (const sal_Int32 nIndex) } } -void TabBar::RestoreHideFlags (void) +void TabBar::RestoreHideFlags() { bool bNeedsLayout (false); for(ItemContainer::iterator iItem(maItems.begin()),iEnd(maItems.end()); diff --git a/sfx2/source/sidebar/TabBar.hxx b/sfx2/source/sidebar/TabBar.hxx index 97772749a1f3..a0c14ab0d4ff 100644 --- a/sfx2/source/sidebar/TabBar.hxx +++ b/sfx2/source/sidebar/TabBar.hxx @@ -67,13 +67,13 @@ public: const css::uno::Reference<css::frame::XFrame>& rxFrame, const ::boost::function<void(const ::rtl::OUString&rsDeckId)>& rDeckActivationFunctor, const PopupMenuProvider& rPopupMenuProvider); - virtual ~TabBar (void); + virtual ~TabBar(); virtual void Paint (const Rectangle& rUpdateArea) SAL_OVERRIDE; virtual void DataChanged (const DataChangedEvent& rDataChangedEvent) SAL_OVERRIDE; virtual bool Notify (NotifyEvent& rEvent) SAL_OVERRIDE; - static sal_Int32 GetDefaultWidth (void); + static sal_Int32 GetDefaultWidth(); void SetDecks ( const ResourceManager::DeckContextDescriptorContainer& rDecks); @@ -87,7 +87,7 @@ public: const sal_Int32 nFirstIndex); const ::rtl::OUString GetDeckIdForIndex (const sal_Int32 nIndex) const; void ToggleHideFlag (const sal_Int32 nIndex); - void RestoreHideFlags (void); + void RestoreHideFlags(); void UpdateFocusManager (FocusManager& rFocusManager); @@ -112,11 +112,11 @@ private: RadioButton* CreateTabItem (const DeckDescriptor& rDeckDescriptor); Image GetItemImage (const DeckDescriptor& rDeskDescriptor) const; - void Layout (void); - void UpdateButtonIcons (void); + void Layout(); + void UpdateButtonIcons(); - ::boost::shared_ptr<PopupMenu> CreatePopupMenu (void) const; - void ShowPopupMenu (void) const; + ::boost::shared_ptr<PopupMenu> CreatePopupMenu() const; + void ShowPopupMenu() const; DECL_LINK(OnToolboxClicked, void*); }; diff --git a/sfx2/source/sidebar/TabItem.cxx b/sfx2/source/sidebar/TabItem.cxx index ec763a0250f9..476803bae488 100644 --- a/sfx2/source/sidebar/TabItem.cxx +++ b/sfx2/source/sidebar/TabItem.cxx @@ -42,7 +42,7 @@ TabItem::TabItem (vcl::Window* pParentWindow) #endif } -TabItem::~TabItem (void) +TabItem::~TabItem() { } diff --git a/sfx2/source/sidebar/TabItem.hxx b/sfx2/source/sidebar/TabItem.hxx index 4d9521143185..33fa016aceb3 100644 --- a/sfx2/source/sidebar/TabItem.hxx +++ b/sfx2/source/sidebar/TabItem.hxx @@ -34,7 +34,7 @@ class TabItem { public: TabItem (vcl::Window* pParentWindow); - virtual ~TabItem (void); + virtual ~TabItem(); virtual void Paint (const Rectangle& rUpdateArea) SAL_OVERRIDE; virtual void MouseMove (const MouseEvent& rEvent) SAL_OVERRIDE; diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx index c3596b13bca3..c93691e28254 100644 --- a/sfx2/source/sidebar/Theme.cxx +++ b/sfx2/source/sidebar/Theme.cxx @@ -56,7 +56,7 @@ Theme::Theme() SetupPropertyMaps(); } -Theme::~Theme (void) +Theme::~Theme() { } @@ -115,13 +115,13 @@ bool Theme::GetBoolean (const ThemeItem eItem) return rTheme.maBooleans[nIndex]; } -bool Theme::IsHighContrastMode (void) +bool Theme::IsHighContrastMode() { const Theme& rTheme (GetCurrentTheme()); return rTheme.mbIsHighContrastMode; } -void Theme::HandleDataChange (void) +void Theme::HandleDataChange() { Theme& rTheme (GetCurrentTheme()); @@ -135,7 +135,7 @@ void Theme::HandleDataChange (void) GetCurrentTheme().UpdateTheme(); } -void Theme::InitializeTheme (void) +void Theme::InitializeTheme() { setPropertyValue( maPropertyIdToNameMap[Bool_UseSymphonyIcons], @@ -145,7 +145,7 @@ void Theme::InitializeTheme (void) Any(false)); } -void Theme::UpdateTheme (void) +void Theme::UpdateTheme() { SidebarResource aLocalResource; @@ -387,7 +387,7 @@ void Theme::UpdateTheme (void) } } -void SAL_CALL Theme::disposing (void) +void SAL_CALL Theme::disposing() { ChangeListeners aListeners; aListeners.swap(maChangeListeners); @@ -417,12 +417,12 @@ void SAL_CALL Theme::disposing (void) } } -Reference<beans::XPropertySet> Theme::GetPropertySet (void) +Reference<beans::XPropertySet> Theme::GetPropertySet() { return Reference<beans::XPropertySet>(static_cast<XWeak*>(&GetCurrentTheme()), UNO_QUERY); } -Reference<beans::XPropertySetInfo> SAL_CALL Theme::getPropertySetInfo (void) +Reference<beans::XPropertySetInfo> SAL_CALL Theme::getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) { return Reference<beans::XPropertySetInfo>(this); @@ -612,7 +612,7 @@ void SAL_CALL Theme::removeVetoableChangeListener( } } -css::uno::Sequence<css::beans::Property> SAL_CALL Theme::getProperties (void) +css::uno::Sequence<css::beans::Property> SAL_CALL Theme::getProperties() throw(css::uno::RuntimeException, std::exception) { ::std::vector<beans::Property> aProperties; @@ -672,7 +672,7 @@ sal_Bool SAL_CALL Theme::hasPropertyByName (const ::rtl::OUString& rsPropertyNam return sal_True; } -void Theme::SetupPropertyMaps (void) +void Theme::SetupPropertyMaps() { maPropertyIdToNameMap.resize(__Post_Rect); maImages.resize(__Image_Color - __Pre_Image - 1); diff --git a/sfx2/source/sidebar/TitleBar.cxx b/sfx2/source/sidebar/TitleBar.cxx index fa9b8c23a1d7..ff5687336811 100644 --- a/sfx2/source/sidebar/TitleBar.cxx +++ b/sfx2/source/sidebar/TitleBar.cxx @@ -50,7 +50,7 @@ TitleBar::TitleBar ( maToolBox.SetSelectHdl(LINK(this, TitleBar, SelectionHandler)); } -TitleBar::~TitleBar (void) +TitleBar::~TitleBar() { } @@ -113,7 +113,7 @@ void TitleBar::HandleToolBoxItemClick (const sal_uInt16 nItemIndex) // Any real processing has to be done in derived class. } -css::uno::Reference<css::accessibility::XAccessible> TitleBar::CreateAccessible (void) +css::uno::Reference<css::accessibility::XAccessible> TitleBar::CreateAccessible() { SetAccessibleRole(css::accessibility::AccessibleRole::PANEL); return AccessibleTitleBar::Create(*this); diff --git a/sfx2/source/sidebar/TitleBar.hxx b/sfx2/source/sidebar/TitleBar.hxx index cf50dfe74def..735eca4e25a3 100644 --- a/sfx2/source/sidebar/TitleBar.hxx +++ b/sfx2/source/sidebar/TitleBar.hxx @@ -34,7 +34,7 @@ public: const ::rtl::OUString& rsTitle, vcl::Window* pParentWindow, const sidebar::Paint& rInitialBackgroundPaint); - virtual ~TitleBar (void); + virtual ~TitleBar(); void SetTitle (const ::rtl::OUString& rsTitle); void SetIcon (const Image& rIcon); @@ -48,8 +48,8 @@ public: long nHeight, sal_uInt16 nFlags = WINDOW_POSSIZE_ALL) SAL_OVERRIDE; - ToolBox& GetToolBox (void) { return maToolBox;} - const ToolBox& GetToolBox (void) const { return maToolBox;} + ToolBox& GetToolBox() { return maToolBox;} + const ToolBox& GetToolBox() const { return maToolBox;} protected: SidebarToolBox maToolBox; @@ -58,10 +58,10 @@ protected: virtual Rectangle GetTitleArea (const Rectangle& rTitleBarBox) = 0; virtual void PaintDecoration (const Rectangle& rTitleBarBox) = 0; void PaintFocus (const Rectangle& rFocusBox); - virtual sidebar::Paint GetBackgroundPaint (void) = 0; - virtual Color GetTextColor (void) = 0; + virtual sidebar::Paint GetBackgroundPaint() = 0; + virtual Color GetTextColor() = 0; virtual void HandleToolBoxItemClick (const sal_uInt16 nItemIndex); - virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible (void) SAL_OVERRIDE; + virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() SAL_OVERRIDE; private: Image maIcon; diff --git a/sfx2/source/sidebar/ToolBox.hxx b/sfx2/source/sidebar/ToolBox.hxx index 0742c5cb912d..834d7cb2b7a0 100644 --- a/sfx2/source/sidebar/ToolBox.hxx +++ b/sfx2/source/sidebar/ToolBox.hxx @@ -28,7 +28,7 @@ class ToolBox { public: MenuButton (vcl::Window* pParentWindow); - virtual ~MenuButton (void); + virtual ~MenuButton(); virtual void Paint (const Rectangle& rUpdateArea); virtual void MouseMove (const MouseEvent& rEvent); diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index e9fc0af43150..4bed8b2f3b59 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -211,7 +211,7 @@ public: } virtual void SAL_CALL start(const OUString& aText, sal_Int32 nRange) throw(RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL end(void) throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL end() throw(RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setText(const OUString& aText) throw(RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setValue(sal_Int32 nValue) throw(RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL reset() throw(RuntimeException, std::exception) SAL_OVERRIDE; @@ -238,7 +238,7 @@ void SAL_CALL SfxStatusIndicator::start(const OUString& aText, sal_Int32 nRange) } } -void SAL_CALL SfxStatusIndicator::end(void) throw(RuntimeException, std::exception) +void SAL_CALL SfxStatusIndicator::end() throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( xOwner.is() ) diff --git a/shell/inc/internal/columninfo.hxx b/shell/inc/internal/columninfo.hxx index 68328777e1ac..8009e58f01cb 100644 --- a/shell/inc/internal/columninfo.hxx +++ b/shell/inc/internal/columninfo.hxx @@ -44,9 +44,9 @@ public: REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject); - virtual ULONG STDMETHODCALLTYPE AddRef( void); + virtual ULONG STDMETHODCALLTYPE AddRef(); - virtual ULONG STDMETHODCALLTYPE Release( void); + virtual ULONG STDMETHODCALLTYPE Release(); // IColumnProvider diff --git a/shell/inc/internal/contentreader.hxx b/shell/inc/internal/contentreader.hxx index a6a4e2e8a235..c64e868941d2 100644 --- a/shell/inc/internal/contentreader.hxx +++ b/shell/inc/internal/contentreader.hxx @@ -98,7 +98,7 @@ protected: @return style of the current content. */ - ::std::wstring getCurrentContentStyle( void ); + ::std::wstring getCurrentContentStyle(); /** add chunk into Chunk Buffer. */ diff --git a/shell/inc/internal/infotips.hxx b/shell/inc/internal/infotips.hxx index ec6615acace8..275be8e30ff3 100644 --- a/shell/inc/internal/infotips.hxx +++ b/shell/inc/internal/infotips.hxx @@ -45,9 +45,9 @@ public: REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject); - virtual ULONG STDMETHODCALLTYPE AddRef( void); + virtual ULONG STDMETHODCALLTYPE AddRef(); - virtual ULONG STDMETHODCALLTYPE Release( void); + virtual ULONG STDMETHODCALLTYPE Release(); // IQueryInfo methods @@ -67,7 +67,7 @@ public: // IPersistFile methods - virtual HRESULT STDMETHODCALLTYPE IsDirty(void); + virtual HRESULT STDMETHODCALLTYPE IsDirty(); virtual HRESULT STDMETHODCALLTYPE Load( /* [in] */ LPCOLESTR pszFileName, diff --git a/shell/inc/internal/propertyhdl.hxx b/shell/inc/internal/propertyhdl.hxx index e3ec5bf78ee2..0985b411ca69 100644 --- a/shell/inc/internal/propertyhdl.hxx +++ b/shell/inc/internal/propertyhdl.hxx @@ -49,8 +49,8 @@ public: virtual HRESULT STDMETHODCALLTYPE QueryInterface( REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject ); - virtual ULONG STDMETHODCALLTYPE AddRef( void ); - virtual ULONG STDMETHODCALLTYPE Release( void ); + virtual ULONG STDMETHODCALLTYPE AddRef(); + virtual ULONG STDMETHODCALLTYPE Release(); // IPropertyStore @@ -92,8 +92,8 @@ public: virtual HRESULT STDMETHODCALLTYPE QueryInterface( REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject); - virtual ULONG STDMETHODCALLTYPE AddRef( void ); - virtual ULONG STDMETHODCALLTYPE Release( void ); + virtual ULONG STDMETHODCALLTYPE AddRef(); + virtual ULONG STDMETHODCALLTYPE Release(); // IClassFactory methods diff --git a/shell/inc/internal/propsheets.hxx b/shell/inc/internal/propsheets.hxx index 16c887eb2429..6e134b8095dd 100644 --- a/shell/inc/internal/propsheets.hxx +++ b/shell/inc/internal/propsheets.hxx @@ -47,9 +47,9 @@ public: REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject); - virtual ULONG STDMETHODCALLTYPE AddRef( void); + virtual ULONG STDMETHODCALLTYPE AddRef(); - virtual ULONG STDMETHODCALLTYPE Release( void); + virtual ULONG STDMETHODCALLTYPE Release(); // IShellExtInit diff --git a/shell/inc/internal/thumbviewer.hxx b/shell/inc/internal/thumbviewer.hxx index 8a3bbed166af..0620476c2835 100644 --- a/shell/inc/internal/thumbviewer.hxx +++ b/shell/inc/internal/thumbviewer.hxx @@ -53,9 +53,9 @@ public: REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject); - virtual ULONG STDMETHODCALLTYPE AddRef( void); + virtual ULONG STDMETHODCALLTYPE AddRef(); - virtual ULONG STDMETHODCALLTYPE Release( void); + virtual ULONG STDMETHODCALLTYPE Release(); // IExtractImage methods diff --git a/shell/source/backends/localebe/localebackend.cxx b/shell/source/backends/localebe/localebackend.cxx index f2190d17fbfa..4b5c34a50be1 100644 --- a/shell/source/backends/localebe/localebackend.cxx +++ b/shell/source/backends/localebe/localebackend.cxx @@ -211,7 +211,7 @@ LocaleBackend::LocaleBackend() -LocaleBackend::~LocaleBackend(void) +LocaleBackend::~LocaleBackend() { } @@ -224,7 +224,7 @@ LocaleBackend* LocaleBackend::createInstance() -OUString LocaleBackend::getLocale(void) +OUString LocaleBackend::getLocale() { #if defined WNT return ImplGetLocale( GetUserDefaultLCID() ); @@ -237,7 +237,7 @@ OUString LocaleBackend::getLocale(void) -OUString LocaleBackend::getUILocale(void) +OUString LocaleBackend::getUILocale() { #if defined WNT return ImplGetLocale( MAKELCID(GetUserDefaultUILanguage(), SORT_DEFAULT) ); @@ -250,7 +250,7 @@ OUString LocaleBackend::getUILocale(void) -OUString LocaleBackend::getSystemLocale(void) +OUString LocaleBackend::getSystemLocale() { // note: the implementation differs from getLocale() only on Windows #if defined WNT @@ -302,17 +302,17 @@ css::uno::Any LocaleBackend::getPropertyValue( -OUString SAL_CALL LocaleBackend::getBackendName(void) { +OUString SAL_CALL LocaleBackend::getBackendName() { return OUString("com.sun.star.comp.configuration.backend.LocaleBackend") ; } -OUString SAL_CALL LocaleBackend::getImplementationName(void) +OUString SAL_CALL LocaleBackend::getImplementationName() throw (uno::RuntimeException, std::exception) { return getBackendName() ; } -uno::Sequence<OUString> SAL_CALL LocaleBackend::getBackendServiceNames(void) +uno::Sequence<OUString> SAL_CALL LocaleBackend::getBackendServiceNames() { uno::Sequence<OUString> aServiceNameList(1); aServiceNameList[0] = "com.sun.star.configuration.backend.LocaleBackend"; @@ -325,7 +325,7 @@ sal_Bool SAL_CALL LocaleBackend::supportsService(const OUString& aServiceName) return cppu::supportsService(this, aServiceName); } -uno::Sequence<OUString> SAL_CALL LocaleBackend::getSupportedServiceNames(void) +uno::Sequence<OUString> SAL_CALL LocaleBackend::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) { return getBackendServiceNames() ; diff --git a/shell/source/backends/localebe/localebackend.hxx b/shell/source/backends/localebe/localebackend.hxx index 59a7fbbb108c..29ca23c1d8bd 100644 --- a/shell/source/backends/localebe/localebackend.hxx +++ b/shell/source/backends/localebe/localebackend.hxx @@ -55,13 +55,13 @@ class LocaleBackend : public ::cppu::WeakImplHelper2 < @return implementation name */ - static OUString SAL_CALL getBackendName(void) ; + static OUString SAL_CALL getBackendName() ; /** Provides the supported services names @return service names */ - static uno::Sequence<OUString> SAL_CALL getBackendServiceNames(void) ; + static uno::Sequence<OUString> SAL_CALL getBackendServiceNames() ; // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL @@ -123,17 +123,17 @@ class LocaleBackend : public ::cppu::WeakImplHelper2 < LocaleBackend(); /** Destructor */ - virtual ~LocaleBackend(void) ; + virtual ~LocaleBackend() ; private: // Returns the user locale - static OUString getLocale(void); + static OUString getLocale(); // Returns the user UI locale - static OUString getUILocale(void); + static OUString getUILocale(); // Returns the system default locale - static OUString getSystemLocale(void); + static OUString getSystemLocale(); } ; diff --git a/shell/source/backends/macbe/macbackend.hxx b/shell/source/backends/macbe/macbackend.hxx index 75d3288ca799..1486d1d9ccfc 100644 --- a/shell/source/backends/macbe/macbackend.hxx +++ b/shell/source/backends/macbe/macbackend.hxx @@ -53,14 +53,14 @@ public: @return implementation name */ - static OUString SAL_CALL getBackendName(void); + static OUString SAL_CALL getBackendName(); /** Provides the supported services names @return service names */ - static uno::Sequence<OUString> SAL_CALL getBackendServiceNames(void); + static uno::Sequence<OUString> SAL_CALL getBackendServiceNames(); // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL @@ -123,7 +123,7 @@ protected: MacOSXBackend(); /** Destructor */ - virtual ~MacOSXBackend(void); + virtual ~MacOSXBackend(); }; #endif // INCLUDED_SHELL_SOURCE_BACKENDS_MACBE_MACBACKEND_HXX diff --git a/shell/source/backends/wininetbe/wininetbackend.cxx b/shell/source/backends/wininetbe/wininetbackend.cxx index 1c6b4de581d6..23aed71fcf01 100644 --- a/shell/source/backends/wininetbe/wininetbackend.cxx +++ b/shell/source/backends/wininetbe/wininetbackend.cxx @@ -298,7 +298,7 @@ WinInetBackend::WinInetBackend() -WinInetBackend::~WinInetBackend(void) +WinInetBackend::~WinInetBackend() { } @@ -362,19 +362,19 @@ css::uno::Any WinInetBackend::getPropertyValue( -OUString SAL_CALL WinInetBackend::getBackendName(void) { +OUString SAL_CALL WinInetBackend::getBackendName() { return OUString("com.sun.star.comp.configuration.backend.WinInetBackend") ; } -OUString SAL_CALL WinInetBackend::getImplementationName(void) +OUString SAL_CALL WinInetBackend::getImplementationName() throw (uno::RuntimeException) { return getBackendName() ; } -uno::Sequence<OUString> SAL_CALL WinInetBackend::getBackendServiceNames(void) +uno::Sequence<OUString> SAL_CALL WinInetBackend::getBackendServiceNames() { uno::Sequence<OUString> aServiceNameList(1); aServiceNameList[0] = "com.sun.star.configuration.backend.WinInetBackend"; @@ -388,7 +388,7 @@ sal_Bool SAL_CALL WinInetBackend::supportsService(const OUString& aServiceName) return cppu::supportsService(this, aServiceName); } -uno::Sequence<OUString> SAL_CALL WinInetBackend::getSupportedServiceNames(void) +uno::Sequence<OUString> SAL_CALL WinInetBackend::getSupportedServiceNames() throw (uno::RuntimeException) { return getBackendServiceNames() ; diff --git a/shell/source/backends/wininetbe/wininetbackend.hxx b/shell/source/backends/wininetbe/wininetbackend.hxx index 57d6e8333705..a2b87079da63 100644 --- a/shell/source/backends/wininetbe/wininetbackend.hxx +++ b/shell/source/backends/wininetbe/wininetbackend.hxx @@ -55,13 +55,13 @@ class WinInetBackend : public ::cppu::WeakImplHelper2 < @return implementation name */ - static OUString SAL_CALL getBackendName(void) ; + static OUString SAL_CALL getBackendName() ; /** Provides the supported services names @return service names */ - static uno::Sequence<OUString> SAL_CALL getBackendServiceNames(void) ; + static uno::Sequence<OUString> SAL_CALL getBackendServiceNames() ; // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL @@ -123,7 +123,7 @@ class WinInetBackend : public ::cppu::WeakImplHelper2 < WinInetBackend(); /** Destructor */ - ~WinInetBackend(void) ; + ~WinInetBackend() ; private: com::sun::star::beans::Optional< com::sun::star::uno::Any > diff --git a/shell/source/win32/ooofilereader/autostyletag.hxx b/shell/source/win32/ooofilereader/autostyletag.hxx index 6b2140f34ec7..34c563f44635 100644 --- a/shell/source/win32/ooofilereader/autostyletag.hxx +++ b/shell/source/win32/ooofilereader/autostyletag.hxx @@ -49,7 +49,7 @@ class CAutoStyleTag : public ITag void setStyle( ::std::wstring const & Style ); void setLocale(const LocaleSet_t& Locale); - void clearStyleLocalePair( void ); + void clearStyleLocalePair(); inline StyleLocalePair_t getStyleLocalePair() const{ return m_CurrentStyleLocalePair; }; inline bool isFull() const { diff --git a/shell/source/win32/ooofilereader/contentreader.cxx b/shell/source/win32/ooofilereader/contentreader.cxx index 3c22a1a11481..6f9a9602f6f7 100644 --- a/shell/source/win32/ooofilereader/contentreader.cxx +++ b/shell/source/win32/ooofilereader/contentreader.cxx @@ -79,7 +79,7 @@ try /** destructor. */ -CContentReader::~CContentReader( void ) +CContentReader::~CContentReader() { } @@ -119,7 +119,7 @@ ITag* CContentReader::chooseTagReader( const std::wstring& tag_name, const XmlTa /** get style of the current content. */ -::std::wstring CContentReader::getCurrentContentStyle( void ) +::std::wstring CContentReader::getCurrentContentStyle() { assert( !m_TagBuilderStack.empty() ); ITag* pTagBuilder = m_TagBuilderStack.top(); diff --git a/shell/source/win32/ooofilereader/dummytag.hxx b/shell/source/win32/ooofilereader/dummytag.hxx index a1be1198e62c..da954c7400a4 100644 --- a/shell/source/win32/ooofilereader/dummytag.hxx +++ b/shell/source/win32/ooofilereader/dummytag.hxx @@ -41,7 +41,7 @@ class CDummyTag : public ITag virtual void addAttributes(const XmlTagAttributes_t& /*attributes*/){}; - virtual std::wstring getTagContent( void ) + virtual std::wstring getTagContent() { return EMPTY_STRING; }; diff --git a/shell/source/win32/ooofilereader/itag.hxx b/shell/source/win32/ooofilereader/itag.hxx index eb8667d1e5c2..d2b63b5b4c2f 100644 --- a/shell/source/win32/ooofilereader/itag.hxx +++ b/shell/source/win32/ooofilereader/itag.hxx @@ -37,7 +37,7 @@ class ITag virtual void endTag() = 0; virtual void addCharacters(const std::wstring& characters) = 0; virtual void addAttributes(const XmlTagAttributes_t& attributes) = 0; - virtual ::std::wstring getTagContent( void ) = 0; + virtual ::std::wstring getTagContent() = 0; virtual ::std::wstring const getTagAttribute( ::std::wstring const & attrname ) = 0; }; diff --git a/shell/source/win32/ooofilereader/metainforeader.cxx b/shell/source/win32/ooofilereader/metainforeader.cxx index be0c7ee5576e..b4273bdc89b6 100644 --- a/shell/source/win32/ooofilereader/metainforeader.cxx +++ b/shell/source/win32/ooofilereader/metainforeader.cxx @@ -117,7 +117,7 @@ try /** destructor. */ -CMetaInfoReader::~CMetaInfoReader( void ) +CMetaInfoReader::~CMetaInfoReader() { delete m_pKeywords_Builder; delete m_pSimple_Builder; diff --git a/shell/source/win32/shlxthandler/classfactory.cxx b/shell/source/win32/shlxthandler/classfactory.cxx index d3a14b9aee92..977b3ce8168e 100644 --- a/shell/source/win32/shlxthandler/classfactory.cxx +++ b/shell/source/win32/shlxthandler/classfactory.cxx @@ -71,14 +71,14 @@ HRESULT STDMETHODCALLTYPE CClassFactory::QueryInterface(REFIID riid, void __RPC_ -ULONG STDMETHODCALLTYPE CClassFactory::AddRef(void) +ULONG STDMETHODCALLTYPE CClassFactory::AddRef() { return InterlockedIncrement(&m_RefCnt); } -ULONG STDMETHODCALLTYPE CClassFactory::Release(void) +ULONG STDMETHODCALLTYPE CClassFactory::Release() { long refcnt = InterlockedDecrement(&m_RefCnt); diff --git a/shell/source/win32/shlxthandler/classfactory.hxx b/shell/source/win32/shlxthandler/classfactory.hxx index 075a2381171a..131c8e01d17d 100644 --- a/shell/source/win32/shlxthandler/classfactory.hxx +++ b/shell/source/win32/shlxthandler/classfactory.hxx @@ -42,9 +42,9 @@ public: REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject); - virtual ULONG STDMETHODCALLTYPE AddRef(void); + virtual ULONG STDMETHODCALLTYPE AddRef(); - virtual ULONG STDMETHODCALLTYPE Release(void); + virtual ULONG STDMETHODCALLTYPE Release(); // IClassFactory methods diff --git a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx index 9eeb252d182c..e503bc3a3e51 100644 --- a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx +++ b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx @@ -84,14 +84,14 @@ HRESULT STDMETHODCALLTYPE CColumnInfo::QueryInterface(REFIID riid, void __RPC_FA -ULONG STDMETHODCALLTYPE CColumnInfo::AddRef(void) +ULONG STDMETHODCALLTYPE CColumnInfo::AddRef() { return InterlockedIncrement(&m_RefCnt); } -ULONG STDMETHODCALLTYPE CColumnInfo::Release( void) +ULONG STDMETHODCALLTYPE CColumnInfo::Release() { long refcnt = InterlockedDecrement(&m_RefCnt); diff --git a/shell/source/win32/shlxthandler/infotips/infotips.cxx b/shell/source/win32/shlxthandler/infotips/infotips.cxx index abfb8d69e8a6..657bcf279d12 100644 --- a/shell/source/win32/shlxthandler/infotips/infotips.cxx +++ b/shell/source/win32/shlxthandler/infotips/infotips.cxx @@ -84,14 +84,14 @@ HRESULT STDMETHODCALLTYPE CInfoTip::QueryInterface(REFIID riid, void __RPC_FAR * -ULONG STDMETHODCALLTYPE CInfoTip::AddRef(void) +ULONG STDMETHODCALLTYPE CInfoTip::AddRef() { return InterlockedIncrement(&m_RefCnt); } -ULONG STDMETHODCALLTYPE CInfoTip::Release( void) +ULONG STDMETHODCALLTYPE CInfoTip::Release() { long refcnt = InterlockedDecrement(&m_RefCnt); @@ -347,7 +347,7 @@ HRESULT STDMETHODCALLTYPE CInfoTip::Load(LPCOLESTR pszFileName, DWORD /*dwMode*/ -HRESULT STDMETHODCALLTYPE CInfoTip::IsDirty(void) +HRESULT STDMETHODCALLTYPE CInfoTip::IsDirty() { return E_NOTIMPL; } diff --git a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx index acc0174f635b..f38070621406 100644 --- a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx +++ b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx @@ -117,13 +117,13 @@ HRESULT STDMETHODCALLTYPE CPropertyHdl::QueryInterface(REFIID riid, void __RPC_F } -ULONG STDMETHODCALLTYPE CPropertyHdl::AddRef( void ) +ULONG STDMETHODCALLTYPE CPropertyHdl::AddRef() { return InterlockedIncrement( &m_RefCnt ); } -ULONG STDMETHODCALLTYPE CPropertyHdl::Release( void ) +ULONG STDMETHODCALLTYPE CPropertyHdl::Release() { long refcnt = InterlockedDecrement( &m_RefCnt ); @@ -343,13 +343,13 @@ HRESULT STDMETHODCALLTYPE CClassFactory::QueryInterface( REFIID riid, void __RPC } -ULONG STDMETHODCALLTYPE CClassFactory::AddRef( void ) +ULONG STDMETHODCALLTYPE CClassFactory::AddRef() { return InterlockedIncrement( &m_RefCnt ); } -ULONG STDMETHODCALLTYPE CClassFactory::Release( void ) +ULONG STDMETHODCALLTYPE CClassFactory::Release() { long refcnt = InterlockedDecrement( &m_RefCnt ); @@ -423,7 +423,7 @@ extern "C" STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void** ppv) } -extern "C" STDAPI DllCanUnloadNow( void ) +extern "C" STDAPI DllCanUnloadNow() { OutputDebugStringFormat( "DllCanUnloadNow.\n" ); if (CClassFactory::IsLocked() || g_DllRefCnt > 0) diff --git a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx index 0cfa944f4c64..6d1a146bfd34 100644 --- a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx +++ b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx @@ -99,7 +99,7 @@ HRESULT STDMETHODCALLTYPE CPropertySheet::QueryInterface( -ULONG STDMETHODCALLTYPE CPropertySheet::AddRef(void) +ULONG STDMETHODCALLTYPE CPropertySheet::AddRef() { OutputDebugStringFormat("CPropertySheet::AddRef [%d]", m_RefCnt ); return InterlockedIncrement(&m_RefCnt); @@ -107,7 +107,7 @@ ULONG STDMETHODCALLTYPE CPropertySheet::AddRef(void) -ULONG STDMETHODCALLTYPE CPropertySheet::Release(void) +ULONG STDMETHODCALLTYPE CPropertySheet::Release() { OutputDebugStringFormat("CPropertySheet::Release [%d]", m_RefCnt ); long refcnt = InterlockedDecrement(&m_RefCnt); diff --git a/shell/source/win32/shlxthandler/shlxthdl.cxx b/shell/source/win32/shlxthandler/shlxthdl.cxx index 80460e8fe4d7..fb6c1f44af42 100644 --- a/shell/source/win32/shlxthandler/shlxthdl.cxx +++ b/shell/source/win32/shlxthandler/shlxthdl.cxx @@ -397,7 +397,7 @@ extern "C" STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void** ppv) return S_OK; } -extern "C" STDAPI DllCanUnloadNow(void) +extern "C" STDAPI DllCanUnloadNow() { if (CClassFactory::IsLocked() || g_DllRefCnt > 0) return S_FALSE; diff --git a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx index 6519a96fc610..3062f8402966 100644 --- a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx +++ b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx @@ -124,7 +124,7 @@ public: // IUnknown virtual ULONG STDMETHODCALLTYPE AddRef(); - virtual ULONG STDMETHODCALLTYPE Release( void); + virtual ULONG STDMETHODCALLTYPE Release(); virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject); // IStream @@ -134,7 +134,7 @@ public: virtual HRESULT STDMETHODCALLTYPE SetSize(ULARGE_INTEGER libNewSize); virtual HRESULT STDMETHODCALLTYPE CopyTo(IStream *pstm, ULARGE_INTEGER cb, ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten); virtual HRESULT STDMETHODCALLTYPE Commit(DWORD grfCommitFlags); - virtual HRESULT STDMETHODCALLTYPE Revert(void); + virtual HRESULT STDMETHODCALLTYPE Revert(); virtual HRESULT STDMETHODCALLTYPE LockRegion(ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType); virtual HRESULT STDMETHODCALLTYPE UnlockRegion(ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType); virtual HRESULT STDMETHODCALLTYPE Stat(STATSTG *pstatstg, DWORD grfStatFlag); @@ -155,12 +155,12 @@ StreamOnZipBuffer::StreamOnZipBuffer(const ZipFile::ZipContentBuffer_t& zip_buff // IUnknown methods -ULONG STDMETHODCALLTYPE StreamOnZipBuffer::AddRef(void) +ULONG STDMETHODCALLTYPE StreamOnZipBuffer::AddRef() { return InterlockedIncrement(&ref_count_); } -ULONG STDMETHODCALLTYPE StreamOnZipBuffer::Release( void) +ULONG STDMETHODCALLTYPE StreamOnZipBuffer::Release() { long refcnt = InterlockedDecrement(&ref_count_); @@ -275,7 +275,7 @@ HRESULT STDMETHODCALLTYPE StreamOnZipBuffer::CopyTo(IStream *, ULARGE_INTEGER, U HRESULT STDMETHODCALLTYPE StreamOnZipBuffer::Commit(DWORD) { return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE StreamOnZipBuffer::Revert(void) +HRESULT STDMETHODCALLTYPE StreamOnZipBuffer::Revert() { return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE StreamOnZipBuffer::LockRegion(ULARGE_INTEGER, ULARGE_INTEGER, DWORD) @@ -339,12 +339,12 @@ HRESULT STDMETHODCALLTYPE CThumbviewer::QueryInterface(REFIID riid, void __RPC_F return E_NOINTERFACE; } -ULONG STDMETHODCALLTYPE CThumbviewer::AddRef(void) +ULONG STDMETHODCALLTYPE CThumbviewer::AddRef() { return InterlockedIncrement(&ref_count_); } -ULONG STDMETHODCALLTYPE CThumbviewer::Release( void) +ULONG STDMETHODCALLTYPE CThumbviewer::Release() { long refcnt = InterlockedDecrement(&ref_count_); diff --git a/slideshow/source/engine/effectrewinder.cxx b/slideshow/source/engine/effectrewinder.cxx index b5a29fa63217..94985986a02c 100644 --- a/slideshow/source/engine/effectrewinder.cxx +++ b/slideshow/source/engine/effectrewinder.cxx @@ -44,12 +44,12 @@ namespace { class RewinderEventHandler : public EventHandler { public: - typedef ::boost::function<bool(void)> Action; + typedef ::boost::function<bool()> Action; RewinderEventHandler (const Action& rAction) : maAction(rAction) {} - virtual ~RewinderEventHandler (void) {} + virtual ~RewinderEventHandler() {} private: const Action maAction; - virtual bool handleEvent (void) SAL_OVERRIDE { return maAction(); } + virtual bool handleEvent() SAL_OVERRIDE { return maAction(); } }; @@ -59,7 +59,7 @@ class RewinderAnimationEventHandler : public AnimationEventHandler public: typedef ::boost::function<bool(const AnimationNodeSharedPtr& rpNode)> Action; RewinderAnimationEventHandler (const Action& rAction) : maAction(rAction) {} - virtual ~RewinderAnimationEventHandler (void) {} + virtual ~RewinderAnimationEventHandler() {} private: const Action maAction; virtual bool handleAnimationEvent (const AnimationNodeSharedPtr& rpNode) SAL_OVERRIDE @@ -94,7 +94,7 @@ EffectRewinder::EffectRewinder ( -void EffectRewinder::initialize (void) +void EffectRewinder::initialize() { // Add some event handlers so that we are informed when // a) an animation is started (we then check whether that belongs to a @@ -121,7 +121,7 @@ void EffectRewinder::initialize (void) -EffectRewinder::~EffectRewinder (void) +EffectRewinder::~EffectRewinder() { dispose(); } @@ -129,7 +129,7 @@ EffectRewinder::~EffectRewinder (void) -void EffectRewinder::dispose (void) +void EffectRewinder::dispose() { if (mpAsynchronousRewindEvent) { @@ -170,8 +170,8 @@ void EffectRewinder::setRootAnimationNode ( bool EffectRewinder::rewind ( const ::boost::shared_ptr<ScreenUpdater::UpdateLock>& rpPaintLock, - const ::boost::function<void(void)>& rSlideRewindFunctor, - const ::boost::function<void(void)>& rPreviousSlideFunctor) + const ::boost::function<void()>& rSlideRewindFunctor, + const ::boost::function<void()>& rPreviousSlideFunctor) { mpPaintLock = rpPaintLock; @@ -227,7 +227,7 @@ bool EffectRewinder::rewind ( -void EffectRewinder::skipAllMainSequenceEffects (void) +void EffectRewinder::skipAllMainSequenceEffects() { // Do not allow nested rewinds. if (mpAsynchronousRewindEvent) @@ -243,7 +243,7 @@ void EffectRewinder::skipAllMainSequenceEffects (void) this, nTotalMainSequenceEffectCount, false, - ::boost::function<void(void)>()), + ::boost::function<void()>()), "EffectRewinder::asynchronousRewind"); mrEventQueue.addEvent(mpAsynchronousRewindEvent); } @@ -251,7 +251,7 @@ void EffectRewinder::skipAllMainSequenceEffects (void) -sal_Int32 EffectRewinder::countMainSequenceEffects (void) +sal_Int32 EffectRewinder::countMainSequenceEffects() { // Determine the number of main sequence effects. sal_Int32 nMainSequenceNodeCount (0); @@ -294,7 +294,7 @@ sal_Int32 EffectRewinder::countMainSequenceEffects (void) -void EffectRewinder::skipSingleMainSequenceEffects (void) +void EffectRewinder::skipSingleMainSequenceEffects() { // This basically just starts the next effect and then skips over its // animation. @@ -307,7 +307,7 @@ void EffectRewinder::skipSingleMainSequenceEffects (void) -bool EffectRewinder::resetEffectCount (void) +bool EffectRewinder::resetEffectCount() { mnMainSequenceEffectCount = 0; return false; @@ -354,7 +354,7 @@ bool EffectRewinder::notifyAnimationStart (const AnimationNodeSharedPtr& rpNode) void EffectRewinder::asynchronousRewind ( sal_Int32 nEffectCount, const bool bRedisplayCurrentSlide, - const boost::function<void(void)>& rSlideRewindFunctor) + const boost::function<void()>& rSlideRewindFunctor) { OSL_ASSERT(mpAsynchronousRewindEvent); @@ -398,7 +398,7 @@ void EffectRewinder::asynchronousRewind ( void EffectRewinder::asynchronousRewindToPreviousSlide ( - const ::boost::function<void(void)>& rSlideRewindFunctor) + const ::boost::function<void()>& rSlideRewindFunctor) { OSL_ASSERT(mpAsynchronousRewindEvent); diff --git a/slideshow/source/engine/effectrewinder.hxx b/slideshow/source/engine/effectrewinder.hxx index d334e2a85761..e44a63faa58b 100644 --- a/slideshow/source/engine/effectrewinder.hxx +++ b/slideshow/source/engine/effectrewinder.hxx @@ -53,13 +53,13 @@ public: EventMultiplexer& rEventMultiplexer, EventQueue& rEventQueue, UserEventQueue& rUserEventQueue); - ~EffectRewinder (void); + ~EffectRewinder(); /** Call Dispose() before the ownder of an EffectRewinder object dies so that the EffectRewinder can release all references to the owner. */ - void dispose (void); + void dispose(); /** Store the root node of the animation tree. It is used in CountMainSequenceEffects() to count the number of main sequence @@ -90,13 +90,13 @@ public: */ bool rewind ( const ::boost::shared_ptr<ScreenUpdater::UpdateLock>& rpPaintLock, - const ::boost::function<void(void)>& rSlideRewindFunctor, - const ::boost::function<void(void)>& rPreviousSlideFunctor); + const ::boost::function<void()>& rSlideRewindFunctor, + const ::boost::function<void()>& rPreviousSlideFunctor); /** Call this method after gotoPreviousEffect() triggered a slide change to the previous slide. */ - void skipAllMainSequenceEffects (void); + void skipAllMainSequenceEffects(); private: EventMultiplexer& mrEventMultiplexer; @@ -122,9 +122,9 @@ private: bool mbNonUserTriggeredMainSequenceEffectSeen; - void initialize (void); + void initialize(); - bool resetEffectCount (void); + bool resetEffectCount(); /** Called by listeners when an animation (not necessarily of a main sequence effect) starts. */ @@ -133,11 +133,11 @@ private: /** Count the number of effects (or effect groups) in the main effect sequence. */ - sal_Int32 countMainSequenceEffects (void); + sal_Int32 countMainSequenceEffects(); /** Skip the next main sequence effect. */ - void skipSingleMainSequenceEffects (void); + void skipSingleMainSequenceEffects(); /** Rewind the last effect of the main effect sequence by replaying all previous effects. @@ -152,7 +152,7 @@ private: void asynchronousRewind ( sal_Int32 nEffectCount, const bool bRedisplayCurrentSlide, - const boost::function<void(void)>& rSlideRewindFunctor); + const boost::function<void()>& rSlideRewindFunctor); /** Go to the previous slide and replay all of its main sequence effects (or effect groups). @@ -160,7 +160,7 @@ private: This functor is used to go to the previous slide. */ void asynchronousRewindToPreviousSlide ( - const ::boost::function<void(void)>& rPreviousSlideFunctor); + const ::boost::function<void()>& rPreviousSlideFunctor); }; } } // end of namespace ::slideshow::internal diff --git a/slideshow/source/engine/screenupdater.cxx b/slideshow/source/engine/screenupdater.cxx index ddb8b597c307..5210182ed887 100644 --- a/slideshow/source/engine/screenupdater.cxx +++ b/slideshow/source/engine/screenupdater.cxx @@ -32,8 +32,8 @@ namespace { { public: UpdateLock (::slideshow::internal::ScreenUpdater& rUpdater, const bool bStartLocked); - virtual ~UpdateLock (void); - virtual void Activate (void) SAL_OVERRIDE; + virtual ~UpdateLock(); + virtual void Activate() SAL_OVERRIDE; private: ::slideshow::internal::ScreenUpdater& mrUpdater; bool mbIsActivated; @@ -200,13 +200,13 @@ namespace internal boost::mem_fn(&View::updateScreen) ); } - void ScreenUpdater::lockUpdates (void) + void ScreenUpdater::lockUpdates() { ++mpImpl->mnLockCount; OSL_ASSERT(mpImpl->mnLockCount>0); } - void ScreenUpdater::unlockUpdates (void) + void ScreenUpdater::unlockUpdates() { OSL_ASSERT(mpImpl->mnLockCount>0); if (mpImpl->mnLockCount > 0) @@ -241,7 +241,7 @@ UpdateLock::UpdateLock ( -UpdateLock::~UpdateLock (void) +UpdateLock::~UpdateLock() { if (mbIsActivated) mrUpdater.unlockUpdates(); @@ -250,7 +250,7 @@ UpdateLock::~UpdateLock (void) -void UpdateLock::Activate (void) +void UpdateLock::Activate() { if ( ! mbIsActivated) { diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index 3fc76235e7f7..a101eb1a295e 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -132,24 +132,24 @@ public: /** Set the current time as the time at which the current frame is displayed. From this the target time of the next frame is derived. */ - void MarkCurrentFrame (void); + void MarkCurrentFrame(); /** When there is time left until the next frame is due then wait. Otherwise return without delay. */ - void Synchronize (void); + void Synchronize(); /** Activate frame synchronization when an animation is active and frames are to be displayed in a steady rate. While active Synchronize() will wait until the frame duration time has passed. */ - void Activate (void); + void Activate(); /** Deactivate frame sychronization when no animation is active and the time between frames depends on user actions and other external sources. While deactivated Synchronize() will return without delay. */ - void Deactivate (void); + void Deactivate(); private: /** The timer that is used for synchronization is independent from the @@ -337,7 +337,7 @@ private: change takes place. Furthermore it does not show the slide transition. */ - void redisplayCurrentSlide (void); + void redisplayCurrentSlide(); protected: // WeakComponentImplHelperBase @@ -403,13 +403,13 @@ private: Do not call this method directly. Use WaitSymbolLock instead. */ - void requestWaitSymbol (void); - void releaseWaitSymbol (void); + void requestWaitSymbol(); + void releaseWaitSymbol(); class WaitSymbolLock {public: WaitSymbolLock(SlideShowImpl& rSlideShowImpl) : mrSlideShowImpl(rSlideShowImpl) { mrSlideShowImpl.requestWaitSymbol(); } - ~WaitSymbolLock(void) + ~WaitSymbolLock() { mrSlideShowImpl.releaseWaitSymbol(); } private: SlideShowImpl& mrSlideShowImpl; }; @@ -420,7 +420,7 @@ private: /** This method is called asynchronously to finish the rewinding of an effect to the previous slide that was initiated earlier. */ - void rewindEffectToPreviousSlide (void); + void rewindEffectToPreviousSlide(); /// all registered views UnoViewContainer maViewContainer; @@ -943,7 +943,7 @@ SlideSharedPtr SlideShowImpl::makeSlide( return pSlide; } -void SlideShowImpl::requestWaitSymbol (void) +void SlideShowImpl::requestWaitSymbol() { ++mnWaitSymbolRequestCount; OSL_ASSERT(mnWaitSymbolRequestCount>0); @@ -960,7 +960,7 @@ void SlideShowImpl::requestWaitSymbol (void) } } -void SlideShowImpl::releaseWaitSymbol (void) +void SlideShowImpl::releaseWaitSymbol() { --mnWaitSymbolRequestCount; OSL_ASSERT(mnWaitSymbolRequestCount>=0); @@ -1201,7 +1201,7 @@ void SlideShowImpl::displaySlide( maEffectRewinder.skipAllMainSequenceEffects(); } -void SlideShowImpl::redisplayCurrentSlide (void) +void SlideShowImpl::redisplayCurrentSlide() { osl::MutexGuard const guard( m_aMutex ); @@ -1267,7 +1267,7 @@ sal_Bool SlideShowImpl::previousEffect() throw (uno::RuntimeException, std::exce } } -void SlideShowImpl::rewindEffectToPreviousSlide (void) +void SlideShowImpl::rewindEffectToPreviousSlide() { // Show the wait symbol now and prevent it from showing temporary slide // content while effects are played back. @@ -2434,12 +2434,12 @@ FrameSynchronization::FrameSynchronization (const double nFrameDuration) MarkCurrentFrame(); } -void FrameSynchronization::MarkCurrentFrame (void) +void FrameSynchronization::MarkCurrentFrame() { mnNextFrameTargetTime = maTimer.getElapsedTime() + mnFrameDuration; } -void FrameSynchronization::Synchronize (void) +void FrameSynchronization::Synchronize() { if (mbIsActive) { @@ -2451,12 +2451,12 @@ void FrameSynchronization::Synchronize (void) MarkCurrentFrame(); } -void FrameSynchronization::Activate (void) +void FrameSynchronization::Activate() { mbIsActive = true; } -void FrameSynchronization::Deactivate (void) +void FrameSynchronization::Deactivate() { mbIsActive = false; } diff --git a/slideshow/source/engine/slideview.cxx b/slideshow/source/engine/slideview.cxx index a0dab4db4164..90d38699dab1 100644 --- a/slideshow/source/engine/slideview.cxx +++ b/slideshow/source/engine/slideview.cxx @@ -716,7 +716,7 @@ private: virtual void _dispose() SAL_OVERRIDE; virtual uno::Reference<presentation::XSlideShowView> getUnoView()const SAL_OVERRIDE; virtual void setIsSoundEnabled (const bool bValue) SAL_OVERRIDE; - virtual bool isSoundEnabled (void) const SAL_OVERRIDE; + virtual bool isSoundEnabled() const SAL_OVERRIDE; // XEventListener: virtual void SAL_CALL disposing( lang::EventObject const& evt ) @@ -1017,7 +1017,7 @@ void SlideView::setIsSoundEnabled (const bool bValue) mbIsSoundEnabled = bValue; } -bool SlideView::isSoundEnabled (void) const +bool SlideView::isSoundEnabled() const { return mbIsSoundEnabled; } diff --git a/slideshow/source/engine/usereventqueue.cxx b/slideshow/source/engine/usereventqueue.cxx index 8404dc43f80a..af5f0529920d 100644 --- a/slideshow/source/engine/usereventqueue.cxx +++ b/slideshow/source/engine/usereventqueue.cxx @@ -247,7 +247,7 @@ public: { mbSkipTriggersNextEffect = bSkipTriggersNextEffect; } /// Skip the current effect but do not trigger the next effect. - void skipEffect (void) { handleEvent_impl(false); } + void skipEffect() { handleEvent_impl(false); } private: virtual bool handleEvent_impl() SAL_OVERRIDE @@ -804,7 +804,7 @@ void UserEventQueue::registerMouseLeaveEvent( const EventSharedPtr& rEvent, 0.0 /* default prio */ ) ); } -void UserEventQueue::callSkipEffectEventHandler (void) +void UserEventQueue::callSkipEffectEventHandler() { ::boost::shared_ptr<SkipEffectEventHandler> pHandler ( ::boost::dynamic_pointer_cast<SkipEffectEventHandler>(mpSkipEffectEventHandler)); diff --git a/slideshow/source/inc/event.hxx b/slideshow/source/inc/event.hxx index fad06458370d..60e9727a3874 100644 --- a/slideshow/source/inc/event.hxx +++ b/slideshow/source/inc/event.hxx @@ -64,7 +64,7 @@ public: */ virtual double getActivationTime( double nCurrentTime ) const = 0; - const OUString& GetDescription (void) const { return msDescription; } + const OUString& GetDescription() const { return msDescription; } private: const OUString msDescription; diff --git a/slideshow/source/inc/screenupdater.hxx b/slideshow/source/inc/screenupdater.hxx index 183d031f3235..ade40964a3ca 100644 --- a/slideshow/source/inc/screenupdater.hxx +++ b/slideshow/source/inc/screenupdater.hxx @@ -102,7 +102,7 @@ namespace slideshow class UpdateLock { public: - virtual void Activate (void) = 0; + virtual void Activate() = 0; protected: ~UpdateLock() {} @@ -119,12 +119,12 @@ namespace slideshow /** Lock updates to prevent intermediate repaints. */ - void lockUpdates (void); + void lockUpdates(); /** When called as often as lockUpdates() then commitUpdates() is called. */ - void unlockUpdates (void); + void unlockUpdates(); private: struct ImplScreenUpdater; diff --git a/slideshow/source/inc/unoview.hxx b/slideshow/source/inc/unoview.hxx index 0a96cd2580ab..81ad021dcdad 100644 --- a/slideshow/source/inc/unoview.hxx +++ b/slideshow/source/inc/unoview.hxx @@ -60,7 +60,7 @@ namespace slideshow /** Return whether the sound play back is enabled. */ - virtual bool isSoundEnabled (void) const = 0; + virtual bool isSoundEnabled() const = 0; /** Tell the view whether it may play sounds. Disabling this can be used to prevent different views to play the same diff --git a/slideshow/source/inc/usereventqueue.hxx b/slideshow/source/inc/usereventqueue.hxx index a09c962ef2d3..61dbab91a710 100644 --- a/slideshow/source/inc/usereventqueue.hxx +++ b/slideshow/source/inc/usereventqueue.hxx @@ -222,7 +222,7 @@ public: or key presses that trigger the next effect. This method allows the skipping of effects to be triggered programatically. */ - void callSkipEffectEventHandler (void); + void callSkipEffectEventHandler(); private: /** Generically register an event on one of the handlers. diff --git a/slideshow/test/testview.cxx b/slideshow/test/testview.cxx index b382fac2cfd3..0901f1c866b9 100644 --- a/slideshow/test/testview.cxx +++ b/slideshow/test/testview.cxx @@ -277,7 +277,7 @@ public: mbDisposed = true; } - virtual bool isSoundEnabled (void) const + virtual bool isSoundEnabled() const { return true; } diff --git a/sot/source/base/filelist.cxx b/sot/source/base/filelist.cxx index 01cb1c88888a..95fdf83822eb 100644 --- a/sot/source/base/filelist.cxx +++ b/sot/source/base/filelist.cxx @@ -38,7 +38,7 @@ FileList::~FileList() ClearAll(); } -void FileList::ClearAll( void ) +void FileList::ClearAll() { aStrList.clear(); } @@ -147,7 +147,7 @@ OUString FileList::GetFile( size_t i ) const return aStr; } -size_t FileList::Count( void ) const +size_t FileList::Count() const { return aStrList.size(); } diff --git a/starmath/inc/unomodel.hxx b/starmath/inc/unomodel.hxx index b6a1db01318a..7e4223ffeb8e 100644 --- a/starmath/inc/unomodel.hxx +++ b/starmath/inc/unomodel.hxx @@ -84,9 +84,9 @@ public: virtual void SAL_CALL render( sal_Int32 nRenderer, const ::com::sun::star::uno::Any& rSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rxOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xParent ) throw( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx index 71df78c4cccf..d60f4d0e8f5b 100644 --- a/starmath/source/mathmlimport.cxx +++ b/starmath/source/mathmlimport.cxx @@ -493,7 +493,7 @@ throw(uno::RuntimeException, std::exception) return SvXMLImport::getSomething( rId ); } -void SmXMLImport::endDocument(void) +void SmXMLImport::endDocument() throw(xml::sax::SAXException, uno::RuntimeException, std::exception) { //Set the resulted tree into the SmDocShell where it belongs @@ -1666,7 +1666,7 @@ public: }; -void SmXMLNoneContext_Impl::EndElement(void) +void SmXMLNoneContext_Impl::EndElement() { SmToken aToken; aToken.cMathChar = '\0'; diff --git a/starmath/source/mathmlimport.hxx b/starmath/source/mathmlimport.hxx index 3703f699ae29..88571fcc9755 100644 --- a/starmath/source/mathmlimport.hxx +++ b/starmath/source/mathmlimport.hxx @@ -96,7 +96,7 @@ public: sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); - void SAL_CALL endDocument(void) + void SAL_CALL endDocument() throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx index 597afed3fb3e..fe337b41ff54 100644 --- a/starmath/source/unomodel.cxx +++ b/starmath/source/unomodel.cxx @@ -400,7 +400,7 @@ static sal_Int16 lcl_AnyToINT16(const uno::Any& rAny) return nRet; } -OUString SmModel::getImplementationName(void) throw( uno::RuntimeException, std::exception ) +OUString SmModel::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.Math.FormulaDocument"); } @@ -410,7 +410,7 @@ sal_Bool SmModel::supportsService(const OUString& rServiceName) throw( uno::Runt return cppu::supportsService(this, rServiceName); } -uno::Sequence< OUString > SmModel::getSupportedServiceNames(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SmModel::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { return uno::Sequence<OUString>{ "com.sun.star.document.OfficeDocument", diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx index b78c1f4925bf..7acd1494f717 100644 --- a/stoc/source/implementationregistration/implreg.cxx +++ b/stoc/source/implementationregistration/implreg.cxx @@ -1206,7 +1206,7 @@ public: // XServiceInfo OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(RuntimeException, std::exception) SAL_OVERRIDE; - Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(RuntimeException, std::exception) SAL_OVERRIDE; + Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) SAL_OVERRIDE; // XImplementationRegistration virtual void SAL_CALL registerImplementation( @@ -1300,7 +1300,7 @@ sal_Bool ImplementationRegistration::supportsService(const OUString& ServiceName } // XServiceInfo -Sequence< OUString > ImplementationRegistration::getSupportedServiceNames(void) throw(RuntimeException, std::exception) +Sequence< OUString > ImplementationRegistration::getSupportedServiceNames() throw(RuntimeException, std::exception) { Sequence< OUString > seqNames(1); seqNames[0] = "com.sun.star.registry.ImplementationRegistration"; diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx index da6b0a7be99a..67a610091518 100644 --- a/stoc/source/inspect/introspection.cxx +++ b/stoc/source/inspect/introspection.cxx @@ -239,11 +239,11 @@ public: // void setPropertyValueByIndex(Any& obj, sal_Int32 nIndex, const Any& aValue) const; Any getPropertyValueByIndex(const Any& obj, sal_Int32 nIndex) const; - Sequence<Property> getProperties(void) const { return maAllPropertySeq; } - Sequence< Reference<XIdlMethod> > getMethods(void) const { return maAllMethodSeq; } - Sequence< Type > getSupportedListeners(void) const { return maSupportedListenerSeq; } - Sequence<sal_Int32> getPropertyConcepts(void) const { return maPropertyConceptSeq; } - Sequence<sal_Int32> getMethodConcepts(void) const { return maMethodConceptSeq; } + Sequence<Property> getProperties() const { return maAllPropertySeq; } + Sequence< Reference<XIdlMethod> > getMethods() const { return maAllMethodSeq; } + Sequence< Type > getSupportedListeners() const { return maSupportedListenerSeq; } + Sequence<sal_Int32> getPropertyConcepts() const { return maPropertyConceptSeq; } + Sequence<sal_Int32> getMethodConcepts() const { return maMethodConceptSeq; } }; @@ -699,9 +699,9 @@ public: virtual ~ImplIntrospectionAccess(); // Methoden von XIntrospectionAccess - virtual sal_Int32 SAL_CALL getSuppliedMethodConcepts(void) + virtual sal_Int32 SAL_CALL getSuppliedMethodConcepts() throw( RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getSuppliedPropertyConcepts(void) + virtual sal_Int32 SAL_CALL getSuppliedPropertyConcepts() throw( RuntimeException, std::exception ) SAL_OVERRIDE; virtual Property SAL_CALL getProperty(const OUString& Name, sal_Int32 PropertyConcepts) throw( NoSuchElementException, RuntimeException, std::exception ) SAL_OVERRIDE; @@ -715,14 +715,14 @@ public: throw( RuntimeException, std::exception ) SAL_OVERRIDE; virtual Sequence< Reference<XIdlMethod> > SAL_CALL getMethods(sal_Int32 MethodConcepts) throw( RuntimeException, std::exception ) SAL_OVERRIDE; - virtual Sequence< Type > SAL_CALL getSupportedListeners(void) + virtual Sequence< Type > SAL_CALL getSupportedListeners() throw( RuntimeException, std::exception ) SAL_OVERRIDE; using OWeakObject::queryAdapter; virtual Reference<XInterface> SAL_CALL queryAdapter( const Type& rType ) throw( IllegalTypeException, RuntimeException, std::exception ) SAL_OVERRIDE; // Methoden von XMaterialHolder - virtual Any SAL_CALL getMaterial(void) throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual Any SAL_CALL getMaterial() throw(RuntimeException, std::exception) SAL_OVERRIDE; // Methoden von XExactName virtual OUString SAL_CALL getExactName( const OUString& rApproximateName ) throw( RuntimeException, std::exception ) SAL_OVERRIDE; @@ -812,18 +812,18 @@ public: throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) SAL_OVERRIDE; // Methoden von XPropertySetInfo - virtual Sequence< Property > SAL_CALL getProperties(void) throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual Sequence< Property > SAL_CALL getProperties() throw( RuntimeException, std::exception ) SAL_OVERRIDE; virtual Property SAL_CALL getPropertyByName(const OUString& Name) throw( RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& Name) throw( RuntimeException, std::exception ) SAL_OVERRIDE; // Methoden von XElementAccess - virtual Type SAL_CALL getElementType(void) throw( RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements(void) throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual Type SAL_CALL getElementType() throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements() throw( RuntimeException, std::exception ) SAL_OVERRIDE; // Methoden von XNameAccess virtual Any SAL_CALL getByName(const OUString& Name) throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) SAL_OVERRIDE; - virtual Sequence< OUString > SAL_CALL getElementNames(void) throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual Sequence< OUString > SAL_CALL getElementNames() throw( RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( RuntimeException, std::exception ) SAL_OVERRIDE; // Methoden von XNameContainer @@ -835,7 +835,7 @@ public: throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) SAL_OVERRIDE; // Methoden von XIndexAccess - virtual sal_Int32 SAL_CALL getCount(void) throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw( RuntimeException, std::exception ) SAL_OVERRIDE; virtual Any SAL_CALL getByIndex(sal_Int32 Index) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) SAL_OVERRIDE; @@ -848,7 +848,7 @@ public: throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) SAL_OVERRIDE; // Methoden von XEnumerationAccess - virtual Reference<XEnumeration> SAL_CALL createEnumeration(void) throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual Reference<XEnumeration> SAL_CALL createEnumeration() throw( RuntimeException, std::exception ) SAL_OVERRIDE; // Methoden von XIdlArray virtual void SAL_CALL realloc(Any& array, sal_Int32 length) @@ -917,7 +917,7 @@ Any SAL_CALL ImplIntrospectionAdapter::queryInterface( const Type& rType ) // Methoden von XPropertySet -Reference<XPropertySetInfo> ImplIntrospectionAdapter::getPropertySetInfo(void) +Reference<XPropertySetInfo> ImplIntrospectionAdapter::getPropertySetInfo() throw( RuntimeException, std::exception ) { return (XPropertySetInfo *)this; @@ -1000,7 +1000,7 @@ Any ImplIntrospectionAdapter::getFastPropertyValue(sal_Int32) } // Methoden von XPropertySetInfo -Sequence< Property > ImplIntrospectionAdapter::getProperties(void) throw( RuntimeException, std::exception ) +Sequence< Property > ImplIntrospectionAdapter::getProperties() throw( RuntimeException, std::exception ) { return mpStaticImpl->getProperties(); } @@ -1018,12 +1018,12 @@ sal_Bool ImplIntrospectionAdapter::hasPropertyByName(const OUString& Name) } // Methoden von XElementAccess -Type ImplIntrospectionAdapter::getElementType(void) throw( RuntimeException, std::exception ) +Type ImplIntrospectionAdapter::getElementType() throw( RuntimeException, std::exception ) { return mxObjElementAccess->getElementType(); } -sal_Bool ImplIntrospectionAdapter::hasElements(void) throw( RuntimeException, std::exception ) +sal_Bool ImplIntrospectionAdapter::hasElements() throw( RuntimeException, std::exception ) { return mxObjElementAccess->hasElements(); } @@ -1035,7 +1035,7 @@ Any ImplIntrospectionAdapter::getByName(const OUString& Name) return mxObjNameAccess->getByName( Name ); } -Sequence< OUString > ImplIntrospectionAdapter::getElementNames(void) +Sequence< OUString > ImplIntrospectionAdapter::getElementNames() throw( RuntimeException, std::exception ) { return mxObjNameAccess->getElementNames(); @@ -1067,8 +1067,8 @@ void ImplIntrospectionAdapter::removeByName(const OUString& Name) } // Methoden von XIndexAccess -// Schon in XNameAccess: virtual Reference<XIdlClass> getElementType(void) const -sal_Int32 ImplIntrospectionAdapter::getCount(void) throw( RuntimeException, std::exception ) +// Schon in XNameAccess: virtual Reference<XIdlClass> getElementType() const +sal_Int32 ImplIntrospectionAdapter::getCount() throw( RuntimeException, std::exception ) { return mxObjIndexAccess->getCount(); } @@ -1099,8 +1099,8 @@ void ImplIntrospectionAdapter::removeByIndex(sal_Int32 Index) } // Methoden von XEnumerationAccess -// Schon in XNameAccess: virtual Reference<XIdlClass> getElementType(void) const; -Reference<XEnumeration> ImplIntrospectionAdapter::createEnumeration(void) throw( RuntimeException, std::exception ) +// Schon in XNameAccess: virtual Reference<XIdlClass> getElementType() const; +Reference<XEnumeration> ImplIntrospectionAdapter::createEnumeration() throw( RuntimeException, std::exception ) { return mxObjEnumerationAccess->createEnumeration(); } @@ -1136,7 +1136,7 @@ void ImplIntrospectionAdapter::set(Any& array, sal_Int32 index, const Any& value // Methoden von XIntrospectionAccess -sal_Int32 ImplIntrospectionAccess::getSuppliedMethodConcepts(void) +sal_Int32 ImplIntrospectionAccess::getSuppliedMethodConcepts() throw( RuntimeException, std::exception ) { return MethodConcept::DANGEROUS | @@ -1147,7 +1147,7 @@ sal_Int32 ImplIntrospectionAccess::getSuppliedMethodConcepts(void) INDEXCONTAINER; } -sal_Int32 ImplIntrospectionAccess::getSuppliedPropertyConcepts(void) +sal_Int32 ImplIntrospectionAccess::getSuppliedPropertyConcepts() throw( RuntimeException, std::exception ) { return PropertyConcept::DANGEROUS | @@ -1338,7 +1338,7 @@ Sequence< Reference<XIdlMethod> > ImplIntrospectionAccess::getMethods(sal_Int32 return maLastMethodSeq; } -Sequence< Type > ImplIntrospectionAccess::getSupportedListeners(void) +Sequence< Type > ImplIntrospectionAccess::getSupportedListeners() throw( RuntimeException, std::exception ) { return mpStaticImpl->getSupportedListeners(); @@ -1361,7 +1361,7 @@ Reference<XInterface> SAL_CALL ImplIntrospectionAccess::queryAdapter( const Type } // Methoden von XMaterialHolder -Any ImplIntrospectionAccess::getMaterial(void) throw(RuntimeException, std::exception) +Any ImplIntrospectionAccess::getMaterial() throw(RuntimeException, std::exception) { return maInspectedObject; } diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx index 5a29982b6cef..da5ff896e63a 100644 --- a/stoc/source/invocation/invocation.cxx +++ b/stoc/source/invocation/invocation.cxx @@ -116,10 +116,10 @@ public: throw( RuntimeException, std::exception) SAL_OVERRIDE; // Methoden von XMaterialHolder - virtual Any SAL_CALL getMaterial(void) throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual Any SAL_CALL getMaterial() throw(RuntimeException, std::exception) SAL_OVERRIDE; // XInvocation - virtual Reference<XIntrospectionAccess> SAL_CALL getIntrospection(void) throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual Reference<XIntrospectionAccess> SAL_CALL getIntrospection() throw( RuntimeException, std::exception ) SAL_OVERRIDE; virtual Any SAL_CALL invoke(const OUString& FunctionName, const Sequence< Any >& Params, Sequence< sal_Int16 >& OutParamIndex, Sequence< Any >& OutParam) throw( IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setValue(const OUString& PropertyName, const Any& Value) @@ -139,10 +139,10 @@ public: // All Access and Container methods are not thread save // XElementAccess - virtual Type SAL_CALL getElementType(void) throw( RuntimeException, std::exception ) SAL_OVERRIDE + virtual Type SAL_CALL getElementType() throw( RuntimeException, std::exception ) SAL_OVERRIDE { return _xElementAccess->getElementType(); } - virtual sal_Bool SAL_CALL hasElements(void) throw( RuntimeException, std::exception ) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasElements() throw( RuntimeException, std::exception ) SAL_OVERRIDE { return _xElementAccess->hasElements(); } // XNameContainer @@ -163,7 +163,7 @@ public: throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) SAL_OVERRIDE { return _xNameAccess->getByName( Name ); } - virtual Sequence<OUString> SAL_CALL getElementNames(void) throw( RuntimeException, std::exception ) SAL_OVERRIDE + virtual Sequence<OUString> SAL_CALL getElementNames() throw( RuntimeException, std::exception ) SAL_OVERRIDE { return _xNameAccess->getElementNames(); } virtual sal_Bool SAL_CALL hasByName( const OUString& Name ) throw( RuntimeException, std::exception ) SAL_OVERRIDE @@ -183,7 +183,7 @@ public: { _xIndexContainer->removeByIndex( Index ); } // XIndexAccess - virtual sal_Int32 SAL_CALL getCount(void) throw( RuntimeException, std::exception ) SAL_OVERRIDE + virtual sal_Int32 SAL_CALL getCount() throw( RuntimeException, std::exception ) SAL_OVERRIDE { return _xIndexAccess->getCount(); } virtual Any SAL_CALL getByIndex( sal_Int32 Index ) @@ -191,7 +191,7 @@ public: { return _xIndexAccess->getByIndex( Index ); } // XEnumerationAccess - virtual Reference<XEnumeration> SAL_CALL createEnumeration(void) throw( RuntimeException, std::exception ) SAL_OVERRIDE + virtual Reference<XEnumeration> SAL_CALL createEnumeration() throw( RuntimeException, std::exception ) SAL_OVERRIDE { return _xEnumerationAccess->createEnumeration(); } // XExactName @@ -329,7 +329,7 @@ Any SAL_CALL Invocation_Impl::queryInterface( const Type & aType ) -Any Invocation_Impl::getMaterial(void) throw(RuntimeException, std::exception) +Any Invocation_Impl::getMaterial() throw(RuntimeException, std::exception) { // AB, 12.2.1999 Sicherstellen, dass das Material wenn moeglich // aus der direkten Invocation bzw. von der Introspection geholt @@ -456,7 +456,7 @@ OUString Invocation_Impl::getExactName( const OUString& rApproximateName ) } -Reference<XIntrospectionAccess> Invocation_Impl::getIntrospection(void) +Reference<XIntrospectionAccess> Invocation_Impl::getIntrospection() throw( RuntimeException, std::exception ) { if( _xDirect.is() ) @@ -973,7 +973,7 @@ void Invocation_Impl::fillInfoForMethod // XTypeProvider -Sequence< Type > SAL_CALL Invocation_Impl::getTypes(void) throw( RuntimeException, std::exception ) +Sequence< Type > SAL_CALL Invocation_Impl::getTypes() throw( RuntimeException, std::exception ) { static Sequence< Type > const * s_pTypes = 0; if (! s_pTypes) @@ -1057,10 +1057,10 @@ public: // XServiceInfo OUString SAL_CALL getImplementationName() throw( RuntimeException, std::exception ) SAL_OVERRIDE; sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( RuntimeException, std::exception ) SAL_OVERRIDE; - Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( RuntimeException, std::exception ) SAL_OVERRIDE; + Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( RuntimeException, std::exception ) SAL_OVERRIDE; // XSingleServiceFactory - Reference<XInterface> SAL_CALL createInstance(void) throw( Exception, RuntimeException, std::exception ) SAL_OVERRIDE; + Reference<XInterface> SAL_CALL createInstance() throw( Exception, RuntimeException, std::exception ) SAL_OVERRIDE; Reference<XInterface> SAL_CALL createInstanceWithArguments( const Sequence<Any>& rArguments ) throw( Exception, RuntimeException, std::exception ) SAL_OVERRIDE; private: @@ -1099,13 +1099,13 @@ sal_Bool InvocationService::supportsService(const OUString& ServiceName) throw( } // XServiceInfo -Sequence< OUString > InvocationService::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) +Sequence< OUString > InvocationService::getSupportedServiceNames() throw( RuntimeException, std::exception ) { return inv_getSupportedServiceNames(); } -Reference<XInterface> InvocationService::createInstance(void) throw( Exception, RuntimeException, std::exception ) +Reference<XInterface> InvocationService::createInstance() throw( Exception, RuntimeException, std::exception ) { //TODO:throw( Exception("no default construction of invocation adapter possible!", *this) ); return Reference<XInterface>(); // dummy diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx index 7b013674f996..f343a7d7b378 100644 --- a/stoc/source/typeconv/convert.cxx +++ b/stoc/source/typeconv/convert.cxx @@ -254,7 +254,7 @@ public: virtual OUString SAL_CALL getImplementationName() throw( RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( RuntimeException, std::exception ) SAL_OVERRIDE; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(void) + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( RuntimeException, std::exception ) SAL_OVERRIDE; // XTypeConverter @@ -281,7 +281,7 @@ sal_Bool TypeConverter_Impl::supportsService(const OUString& ServiceName) throw( } // XServiceInfo -Sequence< OUString > TypeConverter_Impl::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) +Sequence< OUString > TypeConverter_Impl::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > seqNames(1); seqNames.getArray()[0] = "com.sun.star.script.Converter"; diff --git a/stoc/test/testcorefl.cxx b/stoc/test/testcorefl.cxx index aa3719abbc85..63ab8ca308eb 100644 --- a/stoc/test/testcorefl.cxx +++ b/stoc/test/testcorefl.cxx @@ -61,7 +61,7 @@ class OInterfaceA : public WeakImplHelper1< XInterfaceA > { public: - virtual void SAL_CALL methodA(void) throw (RuntimeException) + virtual void SAL_CALL methodA() throw (RuntimeException) {} virtual void SAL_CALL methodB(sal_Int16 /*aShort*/) throw (RuntimeException) diff --git a/stoc/test/testintrosp.cxx b/stoc/test/testintrosp.cxx index b3908eb7e771..9e89f6987215 100644 --- a/stoc/test/testintrosp.cxx +++ b/stoc/test/testintrosp.cxx @@ -196,7 +196,7 @@ public: }; -Sequence< Property > ImplPropertySetInfo::getProperties(void) +Sequence< Property > ImplPropertySetInfo::getProperties() throw( RuntimeException ) { static Sequence<Property> * pSeq = NULL; @@ -300,7 +300,7 @@ class ImplIntroTest : public ImplIntroTestHelper Reference< XVetoableChangeListener > aVetoPropChangeListener; OUString aVetoPropChangeListenerStr; - void Init( void ); + void Init(); public: ImplIntroTest( const Reference< XMultiServiceFactory > & xMgr ) @@ -420,7 +420,7 @@ public: throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException); }; -void ImplIntroTest::Init( void ) +void ImplIntroTest::Init() { // set unique name static sal_Int32 nObjCount = 0; @@ -525,7 +525,7 @@ Any ImplIntroTest::getPropertyValue( const OUString& PropertyName ) return Any(); } -OUString ImplIntroTest::getFirstName(void) +OUString ImplIntroTest::getFirstName() throw(RuntimeException) { return OUString( OUString("Markus") ); diff --git a/stoc/test/testsmgr_cpnt.cxx b/stoc/test/testsmgr_cpnt.cxx index 33d29837010c..807016dcc04a 100644 --- a/stoc/test/testsmgr_cpnt.cxx +++ b/stoc/test/testsmgr_cpnt.cxx @@ -95,8 +95,8 @@ public: // XServiceInfo OUString SAL_CALL getImplementationName() throw(); sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(); - Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(); - static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(void) throw(); + Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(); + static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static() throw(); private: // static XIdlClassRef getStaticIdlClass(); @@ -144,7 +144,7 @@ sal_Bool Test_Manager_Impl::supportsService( const OUString& ServiceName ) throw // Test_Manager_Impl::getSupportedServiceNames -Sequence< OUString > Test_Manager_Impl::getSupportedServiceNames(void) throw () +Sequence< OUString > Test_Manager_Impl::getSupportedServiceNames() throw () { return getSupportedServiceNames_Static(); } @@ -152,7 +152,7 @@ Sequence< OUString > Test_Manager_Impl::getSupportedServiceNames(void) throw () // Test_Manager_Impl::getSupportedServiceNames_Static -Sequence< OUString > Test_Manager_Impl::getSupportedServiceNames_Static(void) throw () +Sequence< OUString > Test_Manager_Impl::getSupportedServiceNames_Static() throw () { Sequence< OUString > aSNS( 2 ); aSNS.getArray()[0] = SERVICE_NAME; diff --git a/store/source/storbase.cxx b/store/source/storbase.cxx index fb14595bdf01..a96c97bd0c08 100644 --- a/store/source/storbase.cxx +++ b/store/source/storbase.cxx @@ -165,7 +165,7 @@ PageData::Allocator::createInstance (rtl::Reference< PageData::Allocator > & rxA /* * ~OStorePageObject. */ -OStorePageObject::~OStorePageObject (void) +OStorePageObject::~OStorePageObject() { } diff --git a/store/source/storbase.hxx b/store/source/storbase.hxx index 83b3ab68c4b9..83dd44888219 100644 --- a/store/source/storbase.hxx +++ b/store/source/storbase.hxx @@ -794,13 +794,13 @@ public: /** State. */ - inline bool dirty (void) const; - inline void clean (void); - inline void touch (void); + inline bool dirty() const; + inline void clean(); + inline void touch(); /** Location. */ - inline sal_uInt32 location (void) const; + inline sal_uInt32 location() const; inline void location (sal_uInt32 nAddr); protected: @@ -817,7 +817,7 @@ protected: /** Destruction. */ - virtual ~OStorePageObject (void); + virtual ~OStorePageObject(); public: template< class U > @@ -847,22 +847,22 @@ public: virtual storeError verify (sal_uInt32 nAddr) const = 0; }; -inline bool OStorePageObject::dirty (void) const +inline bool OStorePageObject::dirty() const { return m_bDirty; } -inline void OStorePageObject::clean (void) +inline void OStorePageObject::clean() { m_bDirty = false; } -inline void OStorePageObject::touch (void) +inline void OStorePageObject::touch() { m_bDirty = true; } -inline sal_uInt32 OStorePageObject::location (void) const +inline sal_uInt32 OStorePageObject::location() const { return m_xPage->location(); } diff --git a/store/source/storbios.cxx b/store/source/storbios.cxx index 1e777ff178e1..3f9ec2d93052 100644 --- a/store/source/storbios.cxx +++ b/store/source/storbios.cxx @@ -89,11 +89,11 @@ struct OStoreSuperBlock /** unused(Count|Head|Insert|Remove|Reset). */ - sal_uInt32 unusedCount (void) const + sal_uInt32 unusedCount() const { return store::ntohl(m_nUnused); } - const L& unusedHead (void) const + const L& unusedHead() const { return m_aUnused; } @@ -109,7 +109,7 @@ struct OStoreSuperBlock m_nUnused = store::htonl(nUnused - 1); m_aUnused = rLink; } - void unusedReset (void) + void unusedReset() { m_nUnused = store::htonl(0); m_aUnused = L(0); @@ -528,7 +528,7 @@ OStorePageBIOS::AceCache::destroy (OStorePageBIOS::Ace * ace) /* * OStorePageBIOS. */ -OStorePageBIOS::OStorePageBIOS (void) +OStorePageBIOS::OStorePageBIOS() : m_xLockBytes (NULL), m_pSuper (NULL), m_bWriteable (false) @@ -538,7 +538,7 @@ OStorePageBIOS::OStorePageBIOS (void) /* * ~OStorePageBIOS. */ -OStorePageBIOS::~OStorePageBIOS (void) +OStorePageBIOS::~OStorePageBIOS() { cleanup_Impl(); } @@ -786,7 +786,7 @@ storeError OStorePageBIOS::releasePage (const OStorePageDescriptor& rDescr) * getRefererCount. * Precond: none. */ -sal_uInt32 OStorePageBIOS::getRefererCount (void) +sal_uInt32 OStorePageBIOS::getRefererCount() { // Acquire exclusive access. osl::MutexGuard aGuard (m_aMutex); @@ -971,7 +971,7 @@ storeError OStorePageBIOS::close() * flush. * Precond: initialized. */ -storeError OStorePageBIOS::flush (void) +storeError OStorePageBIOS::flush() { // Acquire exclusive access. osl::MutexGuard aGuard (m_aMutex); diff --git a/store/source/storbios.hxx b/store/source/storbios.hxx index ceffce7e4ebc..0380b134485e 100644 --- a/store/source/storbios.hxx +++ b/store/source/storbios.hxx @@ -45,7 +45,7 @@ class OStorePageBIOS : public store::OStoreObject public: /** Construction. */ - OStorePageBIOS (void); + OStorePageBIOS(); /** Conversion into Mutex& */ @@ -79,11 +79,11 @@ public: /** isWriteable. */ - inline bool isWriteable (void) const; + inline bool isWriteable() const; /** isValid. */ - inline bool isValid (void) const; + inline bool isValid() const; /** Page Access. */ @@ -92,7 +92,7 @@ public: storeError releasePage (const OStorePageDescriptor& rDescr); - sal_uInt32 getRefererCount (void); + sal_uInt32 getRefererCount(); /** Page Allocation. */ @@ -119,12 +119,12 @@ public: /** close. * @return store_E_None upon success. */ - storeError close (void); + storeError close(); /** flush. * @return store_E_None upon success. */ - storeError flush (void); + storeError flush(); /** size. */ @@ -142,11 +142,11 @@ public: /** Construction. */ - inline ScanContext (void); + inline ScanContext(); /** isValid. */ - inline bool isValid (void) const; + inline bool isValid() const; }; /** scanBegin. @@ -164,7 +164,7 @@ public: protected: /** Destruction (OReference). */ - virtual ~OStorePageBIOS (void); + virtual ~OStorePageBIOS(); private: /** Representation. @@ -227,20 +227,20 @@ inline OStorePageBIOS::operator osl::Mutex& (void) const { return (osl::Mutex&)m_aMutex; } -inline bool OStorePageBIOS::isWriteable (void) const +inline bool OStorePageBIOS::isWriteable() const { return m_bWriteable; } -inline bool OStorePageBIOS::isValid (void) const +inline bool OStorePageBIOS::isValid() const { return m_xLockBytes.is(); } -inline OStorePageBIOS::ScanContext::ScanContext (void) +inline OStorePageBIOS::ScanContext::ScanContext() : m_aDescr (0, 0, 0), m_nSize (0), m_nMagic (0) { } -inline bool OStorePageBIOS::ScanContext::isValid (void) const +inline bool OStorePageBIOS::ScanContext::isValid() const { return (m_aDescr.m_nAddr < m_nSize); } diff --git a/store/source/storcach.cxx b/store/source/storcach.cxx index 5146ee13d979..072679cd0e0f 100644 --- a/store/source/storcach.cxx +++ b/store/source/storcach.cxx @@ -276,7 +276,7 @@ public: protected: // Destruction - virtual ~PageCache_Impl (void); + virtual ~PageCache_Impl(); }; } // namespace store diff --git a/store/source/stordata.hxx b/store/source/stordata.hxx index 52bfb8ac63e7..a8b131778778 100644 --- a/store/source/stordata.hxx +++ b/store/source/stordata.hxx @@ -306,7 +306,7 @@ struct OStorePageNameBlock /** initialize. */ - void initialize (void) + void initialize() { m_aGuard = G(); m_aKey = K(); @@ -316,7 +316,7 @@ struct OStorePageNameBlock /** Construction. */ - OStorePageNameBlock (void) + OStorePageNameBlock() : m_aGuard(), m_aKey(), m_nAttrib (0) { memset (m_pData, 0, sizeof(m_pData)); @@ -373,7 +373,7 @@ struct OStoreDirectoryDataBlock /** Construction. */ - LinkDescriptor (void) + LinkDescriptor() : m_nIndex0 ((sal_uInt16)(~0)), m_nIndex1 ((sal_uInt16)(~0)), m_nIndex2 ((sal_uInt16)(~0)), @@ -394,7 +394,7 @@ struct OStoreDirectoryDataBlock /** initialize. */ - void initialize (void) + void initialize() { memset(m_pDirect, STORE_PAGE_NULL, sizeof(m_pDirect)); memset(m_pSingle, STORE_PAGE_NULL, sizeof(m_pSingle)); @@ -404,7 +404,7 @@ struct OStoreDirectoryDataBlock /** Construction. */ - LinkTable (void) + LinkTable() { initialize(); } @@ -422,7 +422,7 @@ struct OStoreDirectoryDataBlock /** initialize. */ - void initialize (void) + void initialize() { m_aGuard = G(); m_aTable.initialize(); @@ -431,7 +431,7 @@ struct OStoreDirectoryDataBlock /** Construction. */ - OStoreDirectoryDataBlock (void) + OStoreDirectoryDataBlock() : m_aGuard(), m_aTable(), m_nDataLen (0) {} @@ -575,7 +575,7 @@ struct OStoreDirectoryPageData : public store::OStorePageData /** initialize. */ - void initialize (void) + void initialize() { base::m_aGuard.m_nMagic = store::htonl(self::theTypeId); base::m_aDescr.m_nUsed = store::htons(self::thePageSize); @@ -687,7 +687,7 @@ public: /** attrib. */ - sal_uInt32 attrib (void) const + sal_uInt32 attrib() const { return store::ntohl(PAGE().m_aNameBlock.m_nAttrib); } @@ -699,7 +699,7 @@ public: /** key. */ - OStorePageKey key (void) const + OStorePageKey key() const { return PAGE().m_aNameBlock.m_aKey; } @@ -711,7 +711,7 @@ public: /** path. */ - sal_uInt32 path (void) const + sal_uInt32 path() const { page const & rPage = PAGE(); const sal_Char * pszName = rPage.m_aNameBlock.m_pData; @@ -729,7 +729,7 @@ public: /** dataLength. */ - sal_uInt32 dataLength (void) const + sal_uInt32 dataLength() const { return store::ntohl(PAGE().m_aDataBlock.m_nDataLen); } diff --git a/store/source/stordir.cxx b/store/source/stordir.cxx index c319b9a2de44..77ea3f0afd47 100644 --- a/store/source/stordir.cxx +++ b/store/source/stordir.cxx @@ -68,7 +68,7 @@ const sal_uInt32 OStoreDirectory_Impl::m_nTypeId = sal_uInt32(0x89191107); /* * OStoreDirectory_Impl. */ -OStoreDirectory_Impl::OStoreDirectory_Impl (void) +OStoreDirectory_Impl::OStoreDirectory_Impl() : m_xManager (), m_aDescr (0, 0, 0), m_nPath (0), @@ -78,7 +78,7 @@ OStoreDirectory_Impl::OStoreDirectory_Impl (void) /* * ~OStoreDirectory_Impl. */ -OStoreDirectory_Impl::~OStoreDirectory_Impl (void) +OStoreDirectory_Impl::~OStoreDirectory_Impl() { if (m_xManager.is()) { diff --git a/store/source/stordir.hxx b/store/source/stordir.hxx index 58764784918f..8fb9de74798e 100644 --- a/store/source/stordir.hxx +++ b/store/source/stordir.hxx @@ -45,7 +45,7 @@ class OStoreDirectory_Impl : public store::OStoreObject public: /** Construction. */ - OStoreDirectory_Impl (void); + OStoreDirectory_Impl(); /** create (two-phase construction). * @param pManager [in] @@ -75,7 +75,7 @@ public: protected: /** Destruction. */ - virtual ~OStoreDirectory_Impl (void); + virtual ~OStoreDirectory_Impl(); private: /** IStoreHandle TypeId. diff --git a/store/source/storlckb.cxx b/store/source/storlckb.cxx index 0db186b94df2..b6afa2d086c8 100644 --- a/store/source/storlckb.cxx +++ b/store/source/storlckb.cxx @@ -44,7 +44,7 @@ const sal_uInt32 OStoreLockBytes::m_nTypeId = sal_uInt32(0x94190310); /* * OStoreLockBytes. */ -OStoreLockBytes::OStoreLockBytes (void) +OStoreLockBytes::OStoreLockBytes() : m_xManager (), m_xNode (), m_bWriteable (false) @@ -54,7 +54,7 @@ OStoreLockBytes::OStoreLockBytes (void) /* * ~OStoreLockBytes. */ -OStoreLockBytes::~OStoreLockBytes (void) +OStoreLockBytes::~OStoreLockBytes() { if (m_xManager.is() && m_xNode.is()) { @@ -351,7 +351,7 @@ storeError OStoreLockBytes::writeAt ( /* * flush. */ -storeError OStoreLockBytes::flush (void) +storeError OStoreLockBytes::flush() { if (!m_xManager.is()) return store_E_InvalidAccess; diff --git a/store/source/storlckb.hxx b/store/source/storlckb.hxx index 2b1b1c680e1c..67c4a14aea4d 100644 --- a/store/source/storlckb.hxx +++ b/store/source/storlckb.hxx @@ -45,7 +45,7 @@ class OStoreLockBytes : public store::OStoreObject public: /** Construction. */ - OStoreLockBytes (void); + OStoreLockBytes(); /** create (two-phase construction). * @param pManager [in] @@ -89,7 +89,7 @@ public: /** flush. * @return store_E_None upon success */ - storeError flush (void); + storeError flush(); /** setSize. * @param nSize [in] @@ -110,7 +110,7 @@ public: protected: /** Destruction (OReference). */ - virtual ~OStoreLockBytes (void); + virtual ~OStoreLockBytes(); private: /** IStoreHandle TypeId. diff --git a/store/source/storpage.cxx b/store/source/storpage.cxx index 5599eef9a5c4..d6b186c074e5 100644 --- a/store/source/storpage.cxx +++ b/store/source/storpage.cxx @@ -47,14 +47,14 @@ const sal_uInt32 OStorePageManager::m_nTypeId = sal_uInt32(0x62190120); /* * OStorePageManager. */ -OStorePageManager::OStorePageManager (void) +OStorePageManager::OStorePageManager() { } /* * ~OStorePageManager. */ -OStorePageManager::~OStorePageManager (void) +OStorePageManager::~OStorePageManager() { } @@ -798,7 +798,7 @@ struct RebuildContext /** Construction. */ - RebuildContext (void) + RebuildContext() : m_xBIOS (new OStorePageBIOS()), m_nPageSize (0) {} diff --git a/store/source/storpage.hxx b/store/source/storpage.hxx index 1ff3f9f00b25..f400a3fbd25e 100644 --- a/store/source/storpage.hxx +++ b/store/source/storpage.hxx @@ -45,7 +45,7 @@ class OStorePageManager : public store::OStorePageBIOS public: /** Construction. */ - OStorePageManager (void); + OStorePageManager(); /** Initialization (two-phase construction). */ @@ -58,7 +58,7 @@ public: * @return sal_True upon successful initialization, * sal_False otherwise. */ - inline bool isValid (void) const; + inline bool isValid() const; /** DirectoryPage I/O (managed). */ @@ -135,7 +135,7 @@ public: protected: /** Destruction. */ - virtual ~OStorePageManager (void); + virtual ~OStorePageManager(); private: /** Implementation. @@ -188,7 +188,7 @@ private: OStorePageManager& operator= (const OStorePageManager&) SAL_DELETED_FUNCTION; }; -inline bool OStorePageManager::isValid (void) const +inline bool OStorePageManager::isValid() const { return (base::isValid() /* @@@ NYI && (m_aRoot.is()) */); } diff --git a/store/source/stortree.hxx b/store/source/stortree.hxx index f91d94bd98e3..2cfe8f2ee683 100644 --- a/store/source/stortree.hxx +++ b/store/source/stortree.hxx @@ -126,28 +126,28 @@ struct OStoreBTreeNodeData : public store::OStorePageData /** capacity. */ - sal_uInt16 capacity (void) const + sal_uInt16 capacity() const { return (store::ntohs(base::m_aDescr.m_nSize) - self::thePageSize); } /** capacityCount (must be even). */ - sal_uInt16 capacityCount (void) const + sal_uInt16 capacityCount() const { return sal_uInt16(capacity() / sizeof(T)); } /** usage. */ - sal_uInt16 usage (void) const + sal_uInt16 usage() const { return (store::ntohs(base::m_aDescr.m_nUsed) - self::thePageSize); } /** usageCount. */ - sal_uInt16 usageCount (void) const + sal_uInt16 usageCount() const { return sal_uInt16(usage() / sizeof(T)); } @@ -186,7 +186,7 @@ struct OStoreBTreeNodeData : public store::OStorePageData /** depth. */ - sal_uInt32 depth (void) const + sal_uInt32 depth() const { return store::ntohl(self::m_aGuard.m_nMagic); } @@ -204,7 +204,7 @@ struct OStoreBTreeNodeData : public store::OStorePageData /** querySplit. */ - bool querySplit (void) const + bool querySplit() const { return (!(usageCount() < capacityCount())); } diff --git a/svl/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx index 93e6c53b54ed..1aaab84ef676 100644 --- a/svl/source/config/ctloptions.cxx +++ b/svl/source/config/ctloptions.cxx @@ -71,7 +71,7 @@ public: bool IsCTLSequenceChecking() const { return m_bCTLSequenceChecking;} void SetCTLSequenceCheckingRestricted( bool _bEnable ); - bool IsCTLSequenceCheckingRestricted( void ) const { return m_bCTLRestricted; } + bool IsCTLSequenceCheckingRestricted() const { return m_bCTLRestricted; } void SetCTLSequenceCheckingTypeAndReplace( bool _bEnable ); bool IsCTLSequenceCheckingTypeAndReplace() const { return m_bCTLTypeAndReplace; } @@ -439,7 +439,7 @@ void SvtCTLOptions::SetCTLSequenceCheckingRestricted( bool _bEnable ) pCTLOptions->SetCTLSequenceCheckingRestricted(_bEnable); } -bool SvtCTLOptions::IsCTLSequenceCheckingRestricted( void ) const +bool SvtCTLOptions::IsCTLSequenceCheckingRestricted() const { assert(pCTLOptions->IsLoaded()); return pCTLOptions->IsCTLSequenceCheckingRestricted(); diff --git a/svl/source/misc/inethist.cxx b/svl/source/misc/inethist.cxx index 98a3009b215f..984cef027120 100644 --- a/svl/source/misc/inethist.cxx +++ b/svl/source/misc/inethist.cxx @@ -58,7 +58,7 @@ class INetURLHistory_Impl: private boost::noncopyable /** Initialization. */ - void initialize (void) + void initialize() { m_nMagic = INETHIST_MAGIC_HEAD; m_nNext = 0; @@ -121,7 +121,7 @@ class INetURLHistory_Impl: private boost::noncopyable /** Initialization. */ - void initialize (void); + void initialize(); static sal_uInt16 capacity() { @@ -159,8 +159,8 @@ class INetURLHistory_Impl: private boost::noncopyable } public: - INetURLHistory_Impl (void); - ~INetURLHistory_Impl (void); + INetURLHistory_Impl(); + ~INetURLHistory_Impl(); /** putUrl/queryUrl. */ @@ -168,16 +168,16 @@ public: bool queryUrl (const OUString &rUrl); }; -INetURLHistory_Impl::INetURLHistory_Impl (void) +INetURLHistory_Impl::INetURLHistory_Impl() { initialize(); } -INetURLHistory_Impl::~INetURLHistory_Impl (void) +INetURLHistory_Impl::~INetURLHistory_Impl() { } -void INetURLHistory_Impl::initialize (void) +void INetURLHistory_Impl::initialize() { m_aHead.initialize(); diff --git a/svtools/inc/vclxaccessibleheaderbar.hxx b/svtools/inc/vclxaccessibleheaderbar.hxx index f283821e3b2a..ff750f9b6aee 100644 --- a/svtools/inc/vclxaccessibleheaderbar.hxx +++ b/svtools/inc/vclxaccessibleheaderbar.hxx @@ -55,7 +55,7 @@ public: virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateChild(sal_Int32 i); private: diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 8ec816f3af49..a9a225623994 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -208,7 +208,7 @@ public: DECL_LINK(ResetQuickSearch_Impl, void *); - virtual PopupMenu* CreateContextMenu( void ) SAL_OVERRIDE; + virtual PopupMenu* CreateContextMenu() SAL_OVERRIDE; virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopentry ) SAL_OVERRIDE; }; @@ -717,7 +717,7 @@ void ViewTabListBox_Impl::KeyInput( const KeyEvent& rKEvt ) -PopupMenu* ViewTabListBox_Impl::CreateContextMenu( void ) +PopupMenu* ViewTabListBox_Impl::CreateContextMenu() { bool bEnableDelete = mbEnableDelete; bool bEnableRename = mbEnableRename; diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx index b63059251b62..5da446e15e1e 100644 --- a/svtools/source/contnr/svlbitm.cxx +++ b/svtools/source/contnr/svlbitm.cxx @@ -159,7 +159,7 @@ void SvLBoxButtonData::SetDefaultImages( const Control* pCtrl ) } } -bool SvLBoxButtonData::HasDefaultImages( void ) const +bool SvLBoxButtonData::HasDefaultImages() const { return pImpl->bDefaultImages; } diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index 447b9f87d72c..c73321a8a762 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -3796,7 +3796,7 @@ void SvTreeListBox::InitStartEntry() pImp->pStartEntry = GetModel()->First(); } -PopupMenu* SvTreeListBox::CreateContextMenu( void ) +PopupMenu* SvTreeListBox::CreateContextMenu() { return NULL; } @@ -3806,7 +3806,7 @@ void SvTreeListBox::ExcecuteContextMenuAction( sal_uInt16 ) DBG_WARNING( "SvTreeListBox::ExcecuteContextMenuAction(): now there's happening nothing!" ); } -void SvTreeListBox::EnableContextMenuHandling( void ) +void SvTreeListBox::EnableContextMenuHandling() { assert(pImp && "-SvTreeListBox::EnableContextMenuHandling(): No implementation!"); pImp->bContextMenuHandling = true; diff --git a/svtools/source/control/accessibleruler.cxx b/svtools/source/control/accessibleruler.cxx index 179d7cea5a5b..42d476ac09f7 100644 --- a/svtools/source/control/accessibleruler.cxx +++ b/svtools/source/control/accessibleruler.cxx @@ -68,7 +68,7 @@ SvtRulerAccessible::~SvtRulerAccessible() //===== XAccessible ========================================================= -uno::Reference< XAccessibleContext > SAL_CALL SvtRulerAccessible::getAccessibleContext( void ) throw( RuntimeException, std::exception ) +uno::Reference< XAccessibleContext > SAL_CALL SvtRulerAccessible::getAccessibleContext() throw( RuntimeException, std::exception ) { return this; } @@ -128,7 +128,7 @@ bool SAL_CALL SvtRulerAccessible::isVisible() throw( RuntimeException ) } //===== XAccessibleContext ================================================== -sal_Int32 SAL_CALL SvtRulerAccessible::getAccessibleChildCount( void ) throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvtRulerAccessible::getAccessibleChildCount() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -145,12 +145,12 @@ uno::Reference< XAccessible > SAL_CALL SvtRulerAccessible::getAccessibleChild( s return xChild; } -uno::Reference< XAccessible > SAL_CALL SvtRulerAccessible::getAccessibleParent( void ) throw( RuntimeException, std::exception ) +uno::Reference< XAccessible > SAL_CALL SvtRulerAccessible::getAccessibleParent() throw( RuntimeException, std::exception ) { return mxParent; } -sal_Int32 SAL_CALL SvtRulerAccessible::getAccessibleIndexInParent( void ) throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvtRulerAccessible::getAccessibleIndexInParent() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); // Use a simple but slow solution for now. Optimize later. @@ -176,18 +176,18 @@ sal_Int32 SAL_CALL SvtRulerAccessible::getAccessibleIndexInParent( void ) throw( return -1; } -sal_Int16 SAL_CALL SvtRulerAccessible::getAccessibleRole( void ) throw( RuntimeException, std::exception ) +sal_Int16 SAL_CALL SvtRulerAccessible::getAccessibleRole() throw( RuntimeException, std::exception ) { return AccessibleRole::RULER; } -OUString SAL_CALL SvtRulerAccessible::getAccessibleDescription( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL SvtRulerAccessible::getAccessibleDescription() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); return msDescription; } -OUString SAL_CALL SvtRulerAccessible::getAccessibleName( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL SvtRulerAccessible::getAccessibleName() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); return msName; @@ -196,13 +196,13 @@ OUString SAL_CALL SvtRulerAccessible::getAccessibleName( void ) throw( RuntimeEx /** Return empty uno::Reference to indicate that the relation set is not supported. */ -uno::Reference< XAccessibleRelationSet > SAL_CALL SvtRulerAccessible::getAccessibleRelationSet( void ) throw( RuntimeException, std::exception ) +uno::Reference< XAccessibleRelationSet > SAL_CALL SvtRulerAccessible::getAccessibleRelationSet() throw( RuntimeException, std::exception ) { return uno::Reference< XAccessibleRelationSet >(); } -uno::Reference< XAccessibleStateSet > SAL_CALL SvtRulerAccessible::getAccessibleStateSet( void ) throw( RuntimeException, std::exception ) +uno::Reference< XAccessibleStateSet > SAL_CALL SvtRulerAccessible::getAccessibleStateSet() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper; @@ -232,7 +232,7 @@ uno::Reference< XAccessibleStateSet > SAL_CALL SvtRulerAccessible::getAccessible return pStateSetHelper; } -lang::Locale SAL_CALL SvtRulerAccessible::getLocale( void ) throw( IllegalAccessibleComponentStateException, RuntimeException, std::exception ) +lang::Locale SAL_CALL SvtRulerAccessible::getLocale() throw( IllegalAccessibleComponentStateException, RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); if( mxParent.is() ) @@ -308,7 +308,7 @@ sal_Int32 SvtRulerAccessible::getBackground( ) } //===== XServiceInfo ======================================================== -OUString SAL_CALL SvtRulerAccessible::getImplementationName( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL SvtRulerAccessible::getImplementationName() throw( RuntimeException, std::exception ) { return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.ui.SvtRulerAccessible" ) ); } @@ -318,14 +318,14 @@ sal_Bool SAL_CALL SvtRulerAccessible::supportsService( const OUString& sServiceN return cppu::supportsService( this, sServiceName ); } -Sequence< OUString > SAL_CALL SvtRulerAccessible::getSupportedServiceNames( void ) throw( RuntimeException, std::exception ) +Sequence< OUString > SAL_CALL SvtRulerAccessible::getSupportedServiceNames() throw( RuntimeException, std::exception ) { const OUString sServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.accessibility.AccessibleContext" ) ); return Sequence< OUString >( &sServiceName, 1 ); } //===== XTypeProvider ======================================================= -Sequence< sal_Int8 > SAL_CALL SvtRulerAccessible::getImplementationId( void ) throw( RuntimeException, std::exception ) +Sequence< sal_Int8 > SAL_CALL SvtRulerAccessible::getImplementationId() throw( RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } @@ -354,7 +354,7 @@ void SAL_CALL SvtRulerAccessible::disposing() } } -Rectangle SvtRulerAccessible::GetBoundingBoxOnScreen( void ) throw( RuntimeException ) +Rectangle SvtRulerAccessible::GetBoundingBoxOnScreen() throw( RuntimeException ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -363,7 +363,7 @@ Rectangle SvtRulerAccessible::GetBoundingBoxOnScreen( void ) throw( RuntimeExcep return Rectangle( mpRepr->GetParent()->OutputToAbsoluteScreenPixel( mpRepr->GetPosPixel() ), mpRepr->GetSizePixel() ); } -Rectangle SvtRulerAccessible::GetBoundingBox( void ) throw( RuntimeException ) +Rectangle SvtRulerAccessible::GetBoundingBox() throw( RuntimeException ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -373,7 +373,7 @@ Rectangle SvtRulerAccessible::GetBoundingBox( void ) throw( RuntimeException ) return Rectangle( mpRepr->GetPosPixel(), mpRepr->GetSizePixel() ); } -void SvtRulerAccessible::ThrowExceptionIfNotAlive( void ) throw( lang::DisposedException ) +void SvtRulerAccessible::ThrowExceptionIfNotAlive() throw( lang::DisposedException ) { if( IsNotAlive() ) throw lang::DisposedException(); diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index f0767ff83d87..1388134fa4f2 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -812,7 +812,7 @@ sal_uInt16 LineListBox::GetEntryStyle( sal_Int32 nPos ) const return ( pData ) ? pData->GetStyle() : table::BorderLineStyle::NONE; } -bool LineListBox::UpdatePaintLineColor( void ) +bool LineListBox::UpdatePaintLineColor() { const StyleSettings& rSettings = GetSettings().GetStyleSettings(); Color aNewCol( rSettings.GetWindowColor().IsDark()? rSettings.GetLabelTextColor() : aColor ); diff --git a/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx index 14d05edd3df7..7e32cbd0848a 100644 --- a/svtools/source/control/toolbarmenuacc.cxx +++ b/svtools/source/control/toolbarmenuacc.cxx @@ -529,7 +529,7 @@ void SAL_CALL ToolbarMenuAcc::deselectAccessibleChild( sal_Int32 nChildIndex ) t -void SAL_CALL ToolbarMenuAcc::disposing (void) +void SAL_CALL ToolbarMenuAcc::disposing() { EventListenerVector aListenerListCopy; @@ -563,7 +563,7 @@ void SAL_CALL ToolbarMenuAcc::disposing (void) } } -void ToolbarMenuAcc::ThrowIfDisposed (void) throw (DisposedException) +void ToolbarMenuAcc::ThrowIfDisposed() throw (DisposedException) { if(rBHelper.bDisposed || rBHelper.bInDispose || !mpParent) { @@ -589,7 +589,7 @@ ToolbarMenuEntryAcc::~ToolbarMenuEntryAcc() -void SAL_CALL ToolbarMenuEntryAcc::disposing (void) +void SAL_CALL ToolbarMenuEntryAcc::disposing() { EventListenerVector aListenerListCopy; diff --git a/svtools/source/control/toolbarmenuimp.hxx b/svtools/source/control/toolbarmenuimp.hxx index 8029dea5b303..6cecb4736afe 100644 --- a/svtools/source/control/toolbarmenuimp.hxx +++ b/svtools/source/control/toolbarmenuimp.hxx @@ -187,14 +187,14 @@ private: /** Tell all listeners that the object is dying. This callback is usually called from the WeakComponentImplHelper class. */ - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; /** Check whether or not the object has been disposed (or is in the state of being disposed). If that is the case then DisposedException is thrown to inform the (indirect) caller of the foul deed. */ - void ThrowIfDisposed (void) throw (::com::sun::star::lang::DisposedException); + void ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException); }; @@ -260,7 +260,7 @@ private: /** Tell all listeners that the object is dying. This callback is usually called from the WeakComponentImplHelper class. */ - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; }; diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx index f552ee5d030c..341b2b47fbb9 100644 --- a/svtools/source/control/valueacc.cxx +++ b/svtools/source/control/valueacc.cxx @@ -142,7 +142,7 @@ ValueSetAcc* ValueSetAcc::getImplementation( const uno::Reference< uno::XInterfa -void ValueSetAcc::GetFocus (void) +void ValueSetAcc::GetFocus() { mbIsFocused = true; @@ -156,7 +156,7 @@ void ValueSetAcc::GetFocus (void) -void ValueSetAcc::LoseFocus (void) +void ValueSetAcc::LoseFocus() { mbIsFocused = false; @@ -674,7 +674,7 @@ sal_Int64 SAL_CALL ValueSetAcc::getSomething( const uno::Sequence< sal_Int8 >& r -void SAL_CALL ValueSetAcc::disposing (void) +void SAL_CALL ValueSetAcc::disposing() { ::std::vector<uno::Reference<accessibility::XAccessibleEventListener> > aListenerListCopy; @@ -710,7 +710,7 @@ void SAL_CALL ValueSetAcc::disposing (void) } -sal_uInt16 ValueSetAcc::getItemCount (void) const +sal_uInt16 ValueSetAcc::getItemCount() const { sal_uInt16 nCount = mpParent->ImplGetVisibleItemCount(); // When the None-Item is visible then increase the number of items by @@ -743,7 +743,7 @@ ValueSetItem* ValueSetAcc::getItem (sal_uInt16 nIndex) const -void ValueSetAcc::ThrowIfDisposed (void) +void ValueSetAcc::ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx index d04207434810..17fe872967d5 100644 --- a/svtools/source/control/valueimp.hxx +++ b/svtools/source/control/valueimp.hxx @@ -96,12 +96,12 @@ public: /** Called by the corresponding ValueSet when it gets the focus. Stores the new focus state and broadcasts a state change event. */ - void GetFocus (void); + void GetFocus(); /** Called by the corresponding ValueSet when it loses the focus. Stores the new focus state and broadcasts a state change event. */ - void LoseFocus (void); + void LoseFocus(); // XComponent virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE @@ -166,11 +166,11 @@ private: /** Tell all listeners that the object is dying. This callback is usually called from the WeakComponentImplHelper class. */ - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; /** Return the number of items. This takes the None-Item into account. */ - sal_uInt16 getItemCount (void) const; + sal_uInt16 getItemCount() const; /** Return the item associated with the given index. The None-Item is taken into account which, when present, is taken to be the first @@ -188,7 +188,7 @@ private: DisposedException is thrown to inform the (indirect) caller of the foul deed. */ - void ThrowIfDisposed (void) + void ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException); /** Check whether the value set has a 'none' field, i.e. a field (button) @@ -197,7 +197,7 @@ private: Returns <true/> if there is a 'none' field and <false/> if it is missing. */ - bool HasNoneField (void) const; + bool HasNoneField() const; }; class ValueItemAcc : public ::cppu::WeakImplHelper5< ::com::sun::star::accessibility::XAccessible, diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx index 187956adf699..1bb9e736fddb 100644 --- a/svtools/source/inc/unoiface.hxx +++ b/svtools/source/inc/unoiface.hxx @@ -187,9 +187,9 @@ public: ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > getFormatsSupplier(void) const; + ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > getFormatsSupplier() const; void setFormatsSupplier(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > & xSupplier); - sal_Int32 getFormatKey(void) const; + sal_Int32 getFormatKey() const; void setFormatKey(sal_Int32 nKey); void SetValue(const ::com::sun::star::uno::Any& rValue); diff --git a/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx index 4a604dad69f2..b1baf3e903d7 100644 --- a/svtools/source/uno/unoevent.cxx +++ b/svtools/source/uno/unoevent.cxx @@ -151,7 +151,7 @@ sal_Bool SvBaseEventDescriptor::supportsService(const OUString& rServiceName) return cppu::supportsService(this, rServiceName); } -Sequence<OUString> SvBaseEventDescriptor::getSupportedServiceNames(void) +Sequence<OUString> SvBaseEventDescriptor::getSupportedServiceNames() throw(RuntimeException, std::exception) { Sequence<OUString> aSequence(1); diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx index e9bf072fe318..1bda41b744fc 100644 --- a/svtools/source/uno/unoiface.cxx +++ b/svtools/source/uno/unoiface.cxx @@ -1025,7 +1025,7 @@ void SVTXFormattedField::setProperty( const OUString& PropertyName, const ::com: return aReturn; } -::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > SVTXFormattedField::getFormatsSupplier(void) const +::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > SVTXFormattedField::getFormatsSupplier() const { return ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > (m_pCurrentSupplier); } @@ -1337,7 +1337,7 @@ void SVTXFormattedField::setFormatsSupplier(const ::com::sun::star::uno::Referen } -sal_Int32 SVTXFormattedField::getFormatKey(void) const +sal_Int32 SVTXFormattedField::getFormatKey() const { FormattedField* pField = GetFormattedField(); return pField ? pField->GetFormatKey() : 0; diff --git a/svx/inc/AccessibleTableShape.hxx b/svx/inc/AccessibleTableShape.hxx index a531837de3eb..934fd33d50e0 100644 --- a/svx/inc/AccessibleTableShape.hxx +++ b/svx/inc/AccessibleTableShape.hxx @@ -57,7 +57,7 @@ public: AccessibleTableShape( const AccessibleShapeInfo& rShapeInfo, const AccessibleShapeTreeInfo& rShapeTreeInfo ); virtual ~AccessibleTableShape( ); - virtual void Init (void) SAL_OVERRIDE; + virtual void Init() SAL_OVERRIDE; // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -71,7 +71,7 @@ public: virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int16 SAL_CALL getAccessibleRole (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleTable virtual sal_Int32 SAL_CALL getAccessibleRowCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -140,7 +140,7 @@ public: AccessibleCell* GetActiveAccessibleCell(); protected: - virtual OUString CreateAccessibleBaseName(void) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + virtual OUString CreateAccessibleBaseName() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; sdr::table::SvxTableController* getTableController(); diff --git a/svx/inc/GalleryControl.hxx b/svx/inc/GalleryControl.hxx index 8b58d7639ac5..f85af689ce4a 100644 --- a/svx/inc/GalleryControl.hxx +++ b/svx/inc/GalleryControl.hxx @@ -43,7 +43,7 @@ public: GalleryControl ( SfxBindings* pBindings, vcl::Window* pParentWindow); - virtual ~GalleryControl (void); + virtual ~GalleryControl(); bool GalleryKeyInput( const KeyEvent& rKEvt, vcl::Window* pWindow); @@ -55,15 +55,15 @@ private: Size maLastSize; bool mbIsInitialResize; - void InitSettings (void); + void InitSettings(); - virtual void Resize (void) SAL_OVERRIDE; - virtual void GetFocus (void) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; DECL_LINK(SplitHdl, void*); protected: - void ThemeSelectionHasChanged (void); + void ThemeSelectionHasChanged(); }; } } // end of namespace svx::sidebar diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx index a6cb01783966..a9215eb20c0c 100644 --- a/svx/source/accessibility/AccessibleControlShape.cxx +++ b/svx/source/accessibility/AccessibleControlShape.cxx @@ -125,7 +125,7 @@ AccessibleControlShape::AccessibleControlShape ( osl_atomic_decrement( &m_refCount ); } -AccessibleControlShape::~AccessibleControlShape (void) +AccessibleControlShape::~AccessibleControlShape() { m_pChildManager->release(); m_pChildManager = NULL; @@ -279,12 +279,12 @@ void AccessibleControlShape::Init() } } -Reference< XAccessibleContext > SAL_CALL AccessibleControlShape::getAccessibleContext(void) throw (RuntimeException, std::exception) +Reference< XAccessibleContext > SAL_CALL AccessibleControlShape::getAccessibleContext() throw (RuntimeException, std::exception) { return AccessibleShape::getAccessibleContext (); } -void SAL_CALL AccessibleControlShape::grabFocus(void) throw (RuntimeException, std::exception) +void SAL_CALL AccessibleControlShape::grabFocus() throw (RuntimeException, std::exception) { if ( !m_xUnoControl.is() || !isAliveMode( m_xUnoControl ) ) { @@ -300,12 +300,12 @@ void SAL_CALL AccessibleControlShape::grabFocus(void) throw (RuntimeException, } } -OUString SAL_CALL AccessibleControlShape::getImplementationName(void) throw (RuntimeException, std::exception) +OUString SAL_CALL AccessibleControlShape::getImplementationName() throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.accessibility.AccessibleControlShape" ); } -OUString AccessibleControlShape::CreateAccessibleBaseName(void) throw (RuntimeException) +OUString AccessibleControlShape::CreateAccessibleBaseName() throw (RuntimeException) { OUString sName; @@ -329,7 +329,7 @@ OUString AccessibleControlShape::CreateAccessibleBaseName(void) throw (RuntimeEx OUString - AccessibleControlShape::CreateAccessibleDescription (void) + AccessibleControlShape::CreateAccessibleDescription() throw (RuntimeException) { DescriptionGenerator aDG (mxShape); @@ -608,7 +608,7 @@ Reference< XAccessibleRelationSet > SAL_CALL AccessibleControlShape::getAccessib return xSet; } -OUString AccessibleControlShape::CreateAccessibleName (void) throw (RuntimeException) +OUString AccessibleControlShape::CreateAccessibleName() throw (RuntimeException) { ensureControlModelAccess(); @@ -640,7 +640,7 @@ OUString AccessibleControlShape::CreateAccessibleName (void) throw (RuntimeExcep return sName; } -void SAL_CALL AccessibleControlShape::disposing (void) +void SAL_CALL AccessibleControlShape::disposing() { // ensure we're not listening m_bListeningForName = ensureListeningState( m_bListeningForName, false, lcl_getPreferredAccNameProperty( m_xModelPropsMeta ) ); diff --git a/svx/source/accessibility/AccessibleGraphicShape.cxx b/svx/source/accessibility/AccessibleGraphicShape.cxx index bd39f4b4975c..a688a8a0995f 100644 --- a/svx/source/accessibility/AccessibleGraphicShape.cxx +++ b/svx/source/accessibility/AccessibleGraphicShape.cxx @@ -41,12 +41,12 @@ AccessibleGraphicShape::AccessibleGraphicShape ( -AccessibleGraphicShape::~AccessibleGraphicShape (void) +AccessibleGraphicShape::~AccessibleGraphicShape() { } // XAccessibleImage -OUString SAL_CALL AccessibleGraphicShape::getAccessibleImageDescription (void) +OUString SAL_CALL AccessibleGraphicShape::getAccessibleImageDescription() throw (::com::sun::star::uno::RuntimeException, std::exception) { if (m_pShape) @@ -57,7 +57,7 @@ OUString SAL_CALL AccessibleGraphicShape::getAccessibleImageDescription (void) -sal_Int32 SAL_CALL AccessibleGraphicShape::getAccessibleImageHeight (void) +sal_Int32 SAL_CALL AccessibleGraphicShape::getAccessibleImageHeight() throw (::com::sun::star::uno::RuntimeException, std::exception) { return AccessibleShape::getSize().Height; @@ -66,7 +66,7 @@ sal_Int32 SAL_CALL AccessibleGraphicShape::getAccessibleImageHeight (void) -sal_Int32 SAL_CALL AccessibleGraphicShape::getAccessibleImageWidth (void) +sal_Int32 SAL_CALL AccessibleGraphicShape::getAccessibleImageWidth() throw (::com::sun::star::uno::RuntimeException, std::exception) { return AccessibleShape::getSize().Width; @@ -87,7 +87,7 @@ com::sun::star::uno::Any SAL_CALL void SAL_CALL - AccessibleGraphicShape::acquire (void) + AccessibleGraphicShape::acquire() throw () { AccessibleShape::acquire (); @@ -96,7 +96,7 @@ void SAL_CALL void SAL_CALL - AccessibleGraphicShape::release (void) + AccessibleGraphicShape::release() throw () { AccessibleShape::release (); @@ -104,7 +104,7 @@ void SAL_CALL // XServiceInfo OUString SAL_CALL - AccessibleGraphicShape::getImplementationName (void) + AccessibleGraphicShape::getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString("AccessibleGraphicShape"); @@ -114,7 +114,7 @@ OUString SAL_CALL ::com::sun::star::uno::Sequence< OUString> SAL_CALL - AccessibleGraphicShape::getSupportedServiceNames (void) + AccessibleGraphicShape::getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -132,7 +132,7 @@ OUString SAL_CALL // XTypeProvider uno::Sequence<uno::Type> SAL_CALL - AccessibleGraphicShape::getTypes (void) + AccessibleGraphicShape::getTypes() throw (uno::RuntimeException, std::exception) { // Get list of types from the context base implementation... @@ -152,7 +152,7 @@ uno::Sequence<uno::Type> SAL_CALL /// Create the base name of this object, i.e. the name without appended number. OUString - AccessibleGraphicShape::CreateAccessibleBaseName (void) + AccessibleGraphicShape::CreateAccessibleBaseName() throw (::com::sun::star::uno::RuntimeException) { OUString sName; @@ -174,7 +174,7 @@ OUString return sName; } -OUString AccessibleGraphicShape::CreateAccessibleDescription (void) +OUString AccessibleGraphicShape::CreateAccessibleDescription() throw (::com::sun::star::uno::RuntimeException) { //Don't use the same information for accessible name and accessible description. @@ -187,7 +187,7 @@ OUString AccessibleGraphicShape::CreateAccessibleDescription (void) } // Return this object's role. -sal_Int16 SAL_CALL AccessibleGraphicShape::getAccessibleRole (void) +sal_Int16 SAL_CALL AccessibleGraphicShape::getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) { if( m_pShape->GetModel()->GetImageMapForObject(m_pShape) != NULL ) diff --git a/svx/source/accessibility/AccessibleOLEShape.cxx b/svx/source/accessibility/AccessibleOLEShape.cxx index 9e5c27f80b20..3c4bbac8387a 100644 --- a/svx/source/accessibility/AccessibleOLEShape.cxx +++ b/svx/source/accessibility/AccessibleOLEShape.cxx @@ -41,12 +41,12 @@ AccessibleOLEShape::AccessibleOLEShape ( -AccessibleOLEShape::~AccessibleOLEShape (void) +AccessibleOLEShape::~AccessibleOLEShape() { } // XAccessibleAction -sal_Int32 SAL_CALL AccessibleOLEShape::getAccessibleActionCount (void) +sal_Int32 SAL_CALL AccessibleOLEShape::getAccessibleActionCount() throw (::com::sun::star::uno::RuntimeException, std::exception) { return 0; @@ -96,7 +96,7 @@ com::sun::star::uno::Any SAL_CALL void SAL_CALL - AccessibleOLEShape::acquire (void) + AccessibleOLEShape::acquire() throw () { AccessibleShape::acquire (); @@ -105,7 +105,7 @@ void SAL_CALL void SAL_CALL - AccessibleOLEShape::release (void) + AccessibleOLEShape::release() throw () { AccessibleShape::release (); @@ -113,7 +113,7 @@ void SAL_CALL // XServiceInfo OUString SAL_CALL - AccessibleOLEShape::getImplementationName (void) + AccessibleOLEShape::getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString("AccessibleOLEShape"); @@ -123,7 +123,7 @@ OUString SAL_CALL ::com::sun::star::uno::Sequence< OUString> SAL_CALL - AccessibleOLEShape::getSupportedServiceNames (void) + AccessibleOLEShape::getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -141,7 +141,7 @@ OUString SAL_CALL // XTypeProvider uno::Sequence<uno::Type> SAL_CALL - AccessibleOLEShape::getTypes (void) + AccessibleOLEShape::getTypes() throw (uno::RuntimeException, std::exception) { // Get list of types from the context base implementation... @@ -173,7 +173,7 @@ uno::Any SAL_CALL AccessibleOLEShape::getExtendedAttributes() /// Set this object's name if is different to the current name. OUString - AccessibleOLEShape::CreateAccessibleBaseName (void) + AccessibleOLEShape::CreateAccessibleBaseName() throw (::com::sun::star::uno::RuntimeException) { OUString sName; @@ -207,7 +207,7 @@ OUString OUString - AccessibleOLEShape::CreateAccessibleDescription (void) + AccessibleOLEShape::CreateAccessibleDescription() throw (::com::sun::star::uno::RuntimeException) { return CreateAccessibleName (); diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index 45ce17b92747..2f9c3741a50e 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -114,7 +114,7 @@ AccessibleShape::AccessibleShape ( UpdateNameAndDescription(); } -AccessibleShape::~AccessibleShape (void) +AccessibleShape::~AccessibleShape() { delete mpChildrenManager; delete mpText; @@ -125,7 +125,7 @@ AccessibleShape::~AccessibleShape (void) // broadcasters would still hold a strong reference to this object. } -void AccessibleShape::Init (void) +void AccessibleShape::Init() { // Update the OPAQUE and SELECTED shape. UpdateStates (); @@ -194,7 +194,7 @@ void AccessibleShape::Init (void) -void AccessibleShape::UpdateStates (void) +void AccessibleShape::UpdateStates() { ::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get()); @@ -313,7 +313,7 @@ bool AccessibleShape::GetState (sal_Int16 aState) } // OverWrite the parent's getAccessibleName method -OUString SAL_CALL AccessibleShape::getAccessibleName (void) +OUString SAL_CALL AccessibleShape::getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -323,7 +323,7 @@ OUString SAL_CALL AccessibleShape::getAccessibleName (void) return CreateAccessibleName(); } -OUString SAL_CALL AccessibleShape::getAccessibleDescription (void) +OUString SAL_CALL AccessibleShape::getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -391,7 +391,7 @@ uno::Reference<XAccessible> SAL_CALL } uno::Reference<XAccessibleRelationSet> SAL_CALL - AccessibleShape::getAccessibleRelationSet (void) + AccessibleShape::getAccessibleRelationSet() throw (::com::sun::star::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); @@ -418,7 +418,7 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL VISIBLE */ uno::Reference<XAccessibleStateSet> SAL_CALL - AccessibleShape::getAccessibleStateSet (void) + AccessibleShape::getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); @@ -552,7 +552,7 @@ uno::Reference<XAccessible > SAL_CALL -awt::Rectangle SAL_CALL AccessibleShape::getBounds (void) +awt::Rectangle SAL_CALL AccessibleShape::getBounds() throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -667,7 +667,7 @@ awt::Rectangle SAL_CALL AccessibleShape::getBounds (void) -awt::Point SAL_CALL AccessibleShape::getLocation (void) +awt::Point SAL_CALL AccessibleShape::getLocation() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -678,7 +678,7 @@ awt::Point SAL_CALL AccessibleShape::getLocation (void) -awt::Point SAL_CALL AccessibleShape::getLocationOnScreen (void) +awt::Point SAL_CALL AccessibleShape::getLocationOnScreen() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -703,7 +703,7 @@ awt::Point SAL_CALL AccessibleShape::getLocationOnScreen (void) -awt::Size SAL_CALL AccessibleShape::getSize (void) +awt::Size SAL_CALL AccessibleShape::getSize() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -714,7 +714,7 @@ awt::Size SAL_CALL AccessibleShape::getSize (void) -sal_Int32 SAL_CALL AccessibleShape::getForeground (void) +sal_Int32 SAL_CALL AccessibleShape::getForeground() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -740,7 +740,7 @@ sal_Int32 SAL_CALL AccessibleShape::getForeground (void) -sal_Int32 SAL_CALL AccessibleShape::getBackground (void) +sal_Int32 SAL_CALL AccessibleShape::getBackground() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -833,7 +833,7 @@ com::sun::star::uno::Any SAL_CALL void SAL_CALL - AccessibleShape::acquire (void) + AccessibleShape::acquire() throw () { AccessibleContextBase::acquire (); @@ -843,7 +843,7 @@ void SAL_CALL void SAL_CALL - AccessibleShape::release (void) + AccessibleShape::release() throw () { AccessibleContextBase::release (); @@ -965,7 +965,7 @@ uno::Any SAL_CALL AccessibleShape::getExtendedAttributes() // XServiceInfo OUString SAL_CALL - AccessibleShape::getImplementationName (void) + AccessibleShape::getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString("AccessibleShape"); @@ -975,7 +975,7 @@ OUString SAL_CALL uno::Sequence<OUString> SAL_CALL - AccessibleShape::getSupportedServiceNames (void) + AccessibleShape::getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -993,7 +993,7 @@ uno::Sequence<OUString> SAL_CALL // XTypeProvider uno::Sequence<uno::Type> SAL_CALL - AccessibleShape::getTypes (void) + AccessibleShape::getTypes() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -1146,14 +1146,14 @@ void AccessibleShape::ViewForwarderChanged (ChangeType aChangeType, // protected internal // Set this object's name if is different to the current name. -OUString AccessibleShape::CreateAccessibleBaseName (void) +OUString AccessibleShape::CreateAccessibleBaseName() throw (::com::sun::star::uno::RuntimeException) { return ShapeTypeHandler::CreateAccessibleBaseName( mxShape ); } -OUString AccessibleShape::CreateAccessibleName (void) +OUString AccessibleShape::CreateAccessibleName() throw (::com::sun::star::uno::RuntimeException) { return GetFullAccessibleName(this); @@ -1196,7 +1196,7 @@ OUString AccessibleShape::GetFullAccessibleName (AccessibleShape *shape) } OUString - AccessibleShape::CreateAccessibleDescription (void) + AccessibleShape::CreateAccessibleDescription() throw (::com::sun::star::uno::RuntimeException) { DescriptionGenerator aDG (mxShape); @@ -1266,7 +1266,7 @@ OUString // protected -void AccessibleShape::disposing (void) +void AccessibleShape::disposing() { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard (maMutex); @@ -1311,7 +1311,7 @@ void AccessibleShape::disposing (void) } sal_Int32 SAL_CALL - AccessibleShape::getAccessibleIndexInParent (void) + AccessibleShape::getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -1326,7 +1326,7 @@ sal_Int32 SAL_CALL -void AccessibleShape::UpdateNameAndDescription (void) +void AccessibleShape::UpdateNameAndDescription() { // Ignore missing title, name, or description. There are fallbacks for // them. @@ -1359,7 +1359,7 @@ void AccessibleShape::UpdateNameAndDescription (void) } // Return this object's role. -sal_Int16 SAL_CALL AccessibleShape::getAccessibleRole (void) +sal_Int16 SAL_CALL AccessibleShape::getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) { sal_Int16 nAccessibleRole = AccessibleRole::SHAPE ; diff --git a/svx/source/accessibility/AccessibleShapeInfo.cxx b/svx/source/accessibility/AccessibleShapeInfo.cxx index ef9f09c58d09..d2e324c80217 100644 --- a/svx/source/accessibility/AccessibleShapeInfo.cxx +++ b/svx/source/accessibility/AccessibleShapeInfo.cxx @@ -64,7 +64,7 @@ AccessibleShapeInfo::AccessibleShapeInfo (const AccessibleShapeInfo &rOther) } -AccessibleShapeInfo::~AccessibleShapeInfo (void) +AccessibleShapeInfo::~AccessibleShapeInfo() { // empty. } diff --git a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx index 3be00eee0bf4..89476a4535f3 100644 --- a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx +++ b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx @@ -26,7 +26,7 @@ using ::com::sun::star::uno::Reference; namespace accessibility { -AccessibleShapeTreeInfo::AccessibleShapeTreeInfo (void) +AccessibleShapeTreeInfo::AccessibleShapeTreeInfo() : mpView (NULL), mpWindow (NULL), mpViewForwarder (NULL) @@ -68,7 +68,7 @@ AccessibleShapeTreeInfo& AccessibleShapeTreeInfo::operator= (const AccessibleSha -AccessibleShapeTreeInfo::~AccessibleShapeTreeInfo (void) +AccessibleShapeTreeInfo::~AccessibleShapeTreeInfo() { //empty } diff --git a/svx/source/accessibility/ChildrenManager.cxx b/svx/source/accessibility/ChildrenManager.cxx index 134f17ff1821..ada8b29df564 100644 --- a/svx/source/accessibility/ChildrenManager.cxx +++ b/svx/source/accessibility/ChildrenManager.cxx @@ -46,7 +46,7 @@ ChildrenManager::ChildrenManager ( -ChildrenManager::~ChildrenManager (void) +ChildrenManager::~ChildrenManager() { if (mpImpl != NULL) mpImpl->dispose(); @@ -55,7 +55,7 @@ ChildrenManager::~ChildrenManager (void) OSL_TRACE ("~ChildrenManager"); } -long ChildrenManager::GetChildCount (void) const throw () +long ChildrenManager::GetChildCount() const throw () { assert(mpImpl != NULL); return mpImpl->GetChildCount(); @@ -104,7 +104,7 @@ void ChildrenManager::AddAccessibleShape (css::uno::Reference<css::accessibility mpImpl->AddAccessibleShape (shape); } -void ChildrenManager::ClearAccessibleShapeList (void) +void ChildrenManager::ClearAccessibleShapeList() { assert(mpImpl != NULL); mpImpl->ClearAccessibleShapeList (); @@ -116,19 +116,19 @@ void ChildrenManager::SetInfo (AccessibleShapeTreeInfo& rShapeTreeInfo) mpImpl->SetInfo (rShapeTreeInfo); } -void ChildrenManager::UpdateSelection (void) +void ChildrenManager::UpdateSelection() { assert(mpImpl != NULL); mpImpl->UpdateSelection (); } -bool ChildrenManager::HasFocus (void) +bool ChildrenManager::HasFocus() { assert(mpImpl != NULL); return mpImpl->HasFocus (); } -void ChildrenManager::RemoveFocus (void) +void ChildrenManager::RemoveFocus() { assert(mpImpl != NULL); mpImpl->RemoveFocus (); diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx index 869c5dd4acfc..4cea26f20bf6 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.cxx +++ b/svx/source/accessibility/ChildrenManagerImpl.cxx @@ -73,7 +73,7 @@ ChildrenManagerImpl::ChildrenManagerImpl ( -ChildrenManagerImpl::~ChildrenManagerImpl (void) +ChildrenManagerImpl::~ChildrenManagerImpl() { DBG_ASSERT (rBHelper.bDisposed || rBHelper.bInDispose, "~AccessibleDrawDocumentView: object has not been disposed"); @@ -82,7 +82,7 @@ ChildrenManagerImpl::~ChildrenManagerImpl (void) -void ChildrenManagerImpl::Init (void) +void ChildrenManagerImpl::Init() { // Register as view::XSelectionChangeListener. Reference<frame::XController> xController(maShapeTreeInfo.GetController()); @@ -106,7 +106,7 @@ void ChildrenManagerImpl::Init (void) -long ChildrenManagerImpl::GetChildCount (void) const throw () +long ChildrenManagerImpl::GetChildCount() const throw () { return maVisibleChildren.size(); } @@ -558,7 +558,7 @@ void ChildrenManagerImpl::AddAccessibleShape (css::uno::Reference<css::accessibi -void ChildrenManagerImpl::ClearAccessibleShapeList (void) +void ChildrenManagerImpl::ClearAccessibleShapeList() { // Copy the list of (visible) shapes to local lists and clear the // originals. @@ -723,7 +723,7 @@ void SAL_CALL -void ChildrenManagerImpl::impl_dispose (void) +void ChildrenManagerImpl::impl_dispose() { Reference<frame::XController> xController(maShapeTreeInfo.GetController()); // Remove from broadcasters. @@ -768,7 +768,7 @@ void ChildrenManagerImpl::impl_dispose (void) -void SAL_CALL ChildrenManagerImpl::disposing (void) +void SAL_CALL ChildrenManagerImpl::disposing() { impl_dispose(); } @@ -886,7 +886,7 @@ uno::Reference<XAccessible> unfocused. If the controller's frame is not active then all shapes are unfocused. */ -void ChildrenManagerImpl::UpdateSelection (void) +void ChildrenManagerImpl::UpdateSelection() { Reference<frame::XController> xController(maShapeTreeInfo.GetController()); Reference<view::XSelectionSupplier> xSelectionSupplier ( @@ -1054,7 +1054,7 @@ void ChildrenManagerImpl::UpdateSelection (void) -bool ChildrenManagerImpl::HasFocus (void) +bool ChildrenManagerImpl::HasFocus() { return mpFocusedShape != NULL; } @@ -1062,7 +1062,7 @@ bool ChildrenManagerImpl::HasFocus (void) -void ChildrenManagerImpl::RemoveFocus (void) +void ChildrenManagerImpl::RemoveFocus() { if (mpFocusedShape != NULL) { @@ -1120,14 +1120,14 @@ ChildDescriptor::ChildDescriptor (const Reference<XAccessible>& rxAccessibleShap -ChildDescriptor::~ChildDescriptor (void) +ChildDescriptor::~ChildDescriptor() { } -AccessibleShape* ChildDescriptor::GetAccessibleShape (void) const +AccessibleShape* ChildDescriptor::GetAccessibleShape() const { return static_cast<AccessibleShape*> (mxAccessibleShape.get()); } diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx index 93769e05f2e9..1e0ec534a98e 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.hxx +++ b/svx/source/accessibility/ChildrenManagerImpl.hxx @@ -107,18 +107,18 @@ public: /** If there still are managed children these are disposed and released. */ - virtual ~ChildrenManagerImpl (void); + virtual ~ChildrenManagerImpl(); /** Do that part of the initialization that you can not or should not do in the constructor like registering at broadcasters. */ - void Init (void); + void Init(); /** Return the number of currently visible accessible children. @return If there are no children a 0 is returned. */ - long GetChildCount (void) const throw (); + long GetChildCount() const throw (); ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape> GetChildShape(long nIndex) @@ -214,7 +214,7 @@ public: /** Clear the lists of accessible shapes and that of visible accessible shapes. The list of UNO shapes is not modified. */ - void ClearAccessibleShapeList (void); + void ClearAccessibleShapeList(); /** Set a new event shape tree info. Call this method to inform the children manager of a change of the info bundle. @@ -227,7 +227,7 @@ public: according to the given selection. This includes setting <em>and</em> resetting the states. */ - void UpdateSelection (void); + void UpdateSelection(); /** Return whether one of the shapes managed by this object has currently the focus. @@ -235,13 +235,13 @@ public: Returns <true/> when there is a shape that has the focus and <false/> when there is no such shape. */ - bool HasFocus (void); + bool HasFocus(); /** When there is a shape that currently has the focus, i.e. <member>HasFocus()</member> returns <true/> then remove the focus from that shape. Otherwise nothing changes. */ - void RemoveFocus (void); + void RemoveFocus(); // lang::XEventListener virtual void SAL_CALL @@ -352,9 +352,9 @@ protected: /** This method is called from the component helper base class while disposing. */ - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; - void impl_dispose (void); + void impl_dispose(); private: /** Names of new accessible objects are disambiguated with this index. @@ -487,7 +487,7 @@ public: shape is empty or it can not be transformed into a pointer to the desired class. */ - AccessibleShape* GetAccessibleShape (void) const; + AccessibleShape* GetAccessibleShape() const; /** set the index _nIndex at the accessible shape @param _nIndex @@ -515,7 +515,7 @@ public: explicit ChildDescriptor (const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxAccessibleShape); - ~ChildDescriptor (void); + ~ChildDescriptor(); /** Dispose the accessible object of this descriptor. If that object does not exist then do nothing. diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx index 9b19877512b0..ebb3fe34f809 100644 --- a/svx/source/accessibility/DescriptionGenerator.cxx +++ b/svx/source/accessibility/DescriptionGenerator.cxx @@ -64,7 +64,7 @@ DescriptionGenerator::DescriptionGenerator ( -DescriptionGenerator::~DescriptionGenerator (void) +DescriptionGenerator::~DescriptionGenerator() { } @@ -202,7 +202,7 @@ void DescriptionGenerator::AppendString (const OUString& sString) -void DescriptionGenerator::AddLineProperties (void) +void DescriptionGenerator::AddLineProperties() { AddProperty ("LineColor", DescriptionGenerator::COLOR, SIP_XA_LINECOLOR); AddProperty ("LineDashName", DescriptionGenerator::STRING, @@ -216,7 +216,7 @@ void DescriptionGenerator::AddLineProperties (void) /** The fill style is described by the property "FillStyle". Depending on its value a hatch-, gradient-, or bitmap name is appended. */ -void DescriptionGenerator::AddFillProperties (void) +void DescriptionGenerator::AddFillProperties() { AddProperty ("FillStyle", DescriptionGenerator::FILL_STYLE, SIP_XA_FILLSTYLE); } @@ -224,7 +224,7 @@ void DescriptionGenerator::AddFillProperties (void) -void DescriptionGenerator::Add3DProperties (void) +void DescriptionGenerator::Add3DProperties() { AddProperty ("D3DMaterialColor", DescriptionGenerator::COLOR, RID_SVXSTR_A11Y_3D_MATERIAL_COLOR); @@ -235,7 +235,7 @@ void DescriptionGenerator::Add3DProperties (void) -void DescriptionGenerator::AddTextProperties (void) +void DescriptionGenerator::AddTextProperties() { AddProperty ("CharColor", DescriptionGenerator::COLOR); AddFillProperties (); diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx index ecb05b5fedcc..a00131c50183 100644 --- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx +++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx @@ -175,7 +175,7 @@ Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessible( } // XAccessible -Reference< XAccessibleContext > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleContext( void ) throw( RuntimeException, std::exception ) +Reference< XAccessibleContext > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleContext() throw( RuntimeException, std::exception ) { return this; } @@ -264,7 +264,7 @@ awt::Size SAL_CALL SvxGraphCtrlAccessibleContext::getSize() throw( RuntimeExcept } // XAccessibleContext -sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChildCount( void ) throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChildCount() throw( RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -327,14 +327,14 @@ Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleCh -Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleParent( void ) throw( RuntimeException, std::exception ) +Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleParent() throw( RuntimeException, std::exception ) { return mxParent; } -sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleIndexInParent( void ) throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleIndexInParent() throw( RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; // Use a simple but slow solution for now. Optimize later. @@ -366,14 +366,14 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleIndexInParent( vo -sal_Int16 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleRole( void ) throw( RuntimeException, std::exception ) +sal_Int16 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleRole() throw( RuntimeException, std::exception ) { return AccessibleRole::PANEL; } -OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleDescription( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleDescription() throw( RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; return msDescription; @@ -381,7 +381,7 @@ OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleDescription( void -OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleName( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleName() throw( RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; return msName; @@ -392,14 +392,14 @@ OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleName( void ) throw /** Return empty reference to indicate that the relation set is not supported. */ -Reference< XAccessibleRelationSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleRelationSet( void ) throw( RuntimeException, std::exception ) +Reference< XAccessibleRelationSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleRelationSet() throw( RuntimeException, std::exception ) { return Reference< XAccessibleRelationSet >(); } -Reference< XAccessibleStateSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleStateSet( void ) throw( RuntimeException, std::exception ) +Reference< XAccessibleStateSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleStateSet() throw( RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -424,7 +424,7 @@ Reference< XAccessibleStateSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAcce -lang::Locale SAL_CALL SvxGraphCtrlAccessibleContext::getLocale( void ) throw( IllegalAccessibleComponentStateException, RuntimeException, std::exception ) +lang::Locale SAL_CALL SvxGraphCtrlAccessibleContext::getLocale() throw( IllegalAccessibleComponentStateException, RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -484,7 +484,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::grabFocus() throw( RuntimeException mpControl->GrabFocus(); } -sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getForeground (void) +sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getForeground() throw (::com::sun::star::uno::RuntimeException, std::exception) { svtools::ColorConfig aColorConfig; @@ -492,7 +492,7 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getForeground (void) return static_cast<sal_Int32>(nColor); } -sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getBackground (void) +sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getBackground() throw (::com::sun::star::uno::RuntimeException, std::exception) { sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor(); @@ -500,7 +500,7 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getBackground (void) } // XServiceInfo -OUString SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationName( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationName() throw( RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.ui.SvxGraphCtrlAccessibleContext" ); } @@ -510,7 +510,7 @@ sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::supportsService( const OUString return cppu::supportsService(this, sServiceName); } -Sequence< OUString > SAL_CALL SvxGraphCtrlAccessibleContext::getSupportedServiceNames( void ) throw( RuntimeException, std::exception ) +Sequence< OUString > SAL_CALL SvxGraphCtrlAccessibleContext::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aSNs( 3 ); @@ -522,13 +522,13 @@ Sequence< OUString > SAL_CALL SvxGraphCtrlAccessibleContext::getSupportedService } // XTypeProvider -Sequence<sal_Int8> SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationId( void ) throw( RuntimeException, std::exception ) +Sequence<sal_Int8> SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationId() throw( RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } // XServiceName -OUString SvxGraphCtrlAccessibleContext::getServiceName( void ) throw( RuntimeException, std::exception ) +OUString SvxGraphCtrlAccessibleContext::getServiceName() throw( RuntimeException, std::exception ) { return OUString( "com.sun.star.accessibility.AccessibleContext" ); } @@ -725,7 +725,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::disposing() -Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBoxOnScreen( void ) throw( RuntimeException ) +Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBoxOnScreen() throw( RuntimeException ) { ::SolarMutexGuard aGuard; @@ -744,7 +744,7 @@ Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBoxOnScreen( void ) throw( R between the absolute coordinates of the bounding boxes of this control and its parent in the accessibility tree. */ -Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBox( void ) throw( RuntimeException ) +Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBox() throw( RuntimeException ) { ::SolarMutexGuard aGuard; @@ -816,14 +816,14 @@ void SvxGraphCtrlAccessibleContext::Notify( SfxBroadcaster& /*rBC*/, const SfxHi } // IAccessibleViewforwarder -bool SvxGraphCtrlAccessibleContext::IsValid (void) const +bool SvxGraphCtrlAccessibleContext::IsValid() const { return true; } -Rectangle SvxGraphCtrlAccessibleContext::GetVisibleArea (void) const +Rectangle SvxGraphCtrlAccessibleContext::GetVisibleArea() const { Rectangle aVisArea; diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx index 44fa312551d5..2581573e4993 100644 --- a/svx/source/accessibility/ShapeTypeHandler.cxx +++ b/svx/source/accessibility/ShapeTypeHandler.cxx @@ -54,7 +54,7 @@ AccessibleShape* -ShapeTypeHandler& ShapeTypeHandler::Instance (void) +ShapeTypeHandler& ShapeTypeHandler::Instance() { // Using double check pattern to make sure that exactly one instance of // the shape type handler is instantiated. @@ -133,7 +133,7 @@ AccessibleShape* /** Create the single instance of this class and initialize its list of type descriptors with an entry of an unknown type. */ -ShapeTypeHandler::ShapeTypeHandler (void) +ShapeTypeHandler::ShapeTypeHandler() : maShapeTypeDescriptorList (1) { // Make sure that at least the UNKNOWN entry is present. @@ -147,7 +147,7 @@ ShapeTypeHandler::ShapeTypeHandler (void) -ShapeTypeHandler::~ShapeTypeHandler (void) +ShapeTypeHandler::~ShapeTypeHandler() { // Because this class is a singleton and the only instance, whose // destructor has just been called, is pointed to from instance, diff --git a/svx/source/accessibility/SvxShapeTypes.cxx b/svx/source/accessibility/SvxShapeTypes.cxx index 1f1346a8e27e..261c7fd6527e 100644 --- a/svx/source/accessibility/SvxShapeTypes.cxx +++ b/svx/source/accessibility/SvxShapeTypes.cxx @@ -84,7 +84,7 @@ AccessibleShape* CreateSvxAccessibleShape ( } } -void RegisterDrawShapeTypes (void) +void RegisterDrawShapeTypes() { /** List of shape type descriptors corresponding to the <type>SvxShapeTypes</type> enum. diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx index 0498e6acac62..5357656db43b 100644 --- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx +++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx @@ -583,7 +583,7 @@ SvxPixelCtlAccessibleChild::~SvxPixelCtlAccessibleChild() } // XAccessible -uno::Reference< XAccessibleContext> SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleContext( void ) throw( RuntimeException, std::exception ) +uno::Reference< XAccessibleContext> SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleContext() throw( RuntimeException, std::exception ) { return this; } @@ -652,7 +652,7 @@ sal_Int32 SvxPixelCtlAccessibleChild::getBackground( ) } // XAccessibleContext -sal_Int32 SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleChildCount( void ) throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleChildCount() throw( RuntimeException, std::exception ) { return 0; } @@ -663,29 +663,29 @@ uno::Reference< XAccessible > SAL_CALL SvxPixelCtlAccessibleChild::getAccessible throw lang::IndexOutOfBoundsException(); } -uno::Reference< XAccessible > SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleParent( void ) throw( RuntimeException, std::exception ) +uno::Reference< XAccessible > SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleParent() throw( RuntimeException, std::exception ) { return mxParent; } -sal_Int32 SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleIndexInParent( void ) throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleIndexInParent() throw( RuntimeException, std::exception ) { return mnIndexInParent; } -sal_Int16 SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleRole( void ) throw( RuntimeException, std::exception ) +sal_Int16 SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleRole() throw( RuntimeException, std::exception ) { return AccessibleRole::CHECK_BOX; } -OUString SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleDescription( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleDescription() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); return GetName(); } -OUString SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleName( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleName() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); return GetName(); @@ -694,12 +694,12 @@ OUString SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleName( void ) throw( R /** Return empty uno::Reference to indicate that the relation set is not supported. */ -uno::Reference<XAccessibleRelationSet> SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleRelationSet( void ) throw( RuntimeException, std::exception ) +uno::Reference<XAccessibleRelationSet> SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleRelationSet() throw( RuntimeException, std::exception ) { return uno::Reference< XAccessibleRelationSet >(); } -uno::Reference< XAccessibleStateSet > SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleStateSet( void ) throw( RuntimeException, std::exception ) +uno::Reference< XAccessibleStateSet > SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleStateSet() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper; @@ -730,7 +730,7 @@ uno::Reference< XAccessibleStateSet > SAL_CALL SvxPixelCtlAccessibleChild::getAc return pStateSetHelper; } -lang::Locale SAL_CALL SvxPixelCtlAccessibleChild::getLocale( void ) throw( IllegalAccessibleComponentStateException, RuntimeException, std::exception ) +lang::Locale SAL_CALL SvxPixelCtlAccessibleChild::getLocale() throw( IllegalAccessibleComponentStateException, RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); if( mxParent.is() ) @@ -778,7 +778,7 @@ void SAL_CALL SvxPixelCtlAccessibleChild::removeAccessibleEventListener( const u } // XServiceInfo -OUString SAL_CALL SvxPixelCtlAccessibleChild::getImplementationName( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxPixelCtlAccessibleChild::getImplementationName() throw( RuntimeException, std::exception ) { return OUString( RTL_CONSTASCII_USTRINGPARAM( "SvxPixelCtlAccessibleChild" ) ); } @@ -788,7 +788,7 @@ sal_Bool SAL_CALL SvxPixelCtlAccessibleChild::supportsService( const OUString& r return cppu::supportsService( this, rServiceName ); } -Sequence< OUString > SAL_CALL SvxPixelCtlAccessibleChild::getSupportedServiceNames( void ) throw( RuntimeException, std::exception ) +Sequence< OUString > SAL_CALL SvxPixelCtlAccessibleChild::getSupportedServiceNames() throw( RuntimeException, std::exception ) { uno::Sequence< OUString > aRet(3); OUString* pArray = aRet.getArray(); @@ -824,13 +824,13 @@ void SAL_CALL SvxPixelCtlAccessibleChild::disposing() } } -void SvxPixelCtlAccessibleChild::ThrowExceptionIfNotAlive( void ) throw( lang::DisposedException ) +void SvxPixelCtlAccessibleChild::ThrowExceptionIfNotAlive() throw( lang::DisposedException ) { if( IsNotAlive() ) throw lang::DisposedException(); } -Rectangle SvxPixelCtlAccessibleChild::GetBoundingBoxOnScreen( void ) throw( RuntimeException ) +Rectangle SvxPixelCtlAccessibleChild::GetBoundingBoxOnScreen() throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -840,7 +840,7 @@ Rectangle SvxPixelCtlAccessibleChild::GetBoundingBoxOnScreen( void ) throw( Runt return Rectangle( mrParentWindow.OutputToAbsoluteScreenPixel( aRect.TopLeft() ), aRect.GetSize() ); } -Rectangle SvxPixelCtlAccessibleChild::GetBoundingBox( void ) throw( RuntimeException ) +Rectangle SvxPixelCtlAccessibleChild::GetBoundingBox() throw( RuntimeException ) { // no guard necessary, because no one changes mpBoundingBox after creating it ThrowExceptionIfNotAlive(); diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx index 0fd553d8aa68..2c87389ff5e2 100644 --- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx +++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx @@ -181,7 +181,7 @@ SvxRectCtlAccessibleContext::~SvxRectCtlAccessibleContext() } // XAccessible -Reference< XAccessibleContext > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleContext( void ) throw( RuntimeException, std::exception ) +Reference< XAccessibleContext > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleContext() throw( RuntimeException, std::exception ) { return this; } @@ -244,7 +244,7 @@ bool SAL_CALL SvxRectCtlAccessibleContext::isVisible() throw( RuntimeException ) } // XAccessibleContext -sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChildCount( void ) throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChildCount() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -291,12 +291,12 @@ Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChil return xChild; } -Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleParent( void ) throw( RuntimeException, std::exception ) +Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleParent() throw( RuntimeException, std::exception ) { return mxParent; } -sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleIndexInParent( void ) throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleIndexInParent() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); // Use a simple but slow solution for now. Optimize later. @@ -322,18 +322,18 @@ sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleIndexInParent( void return -1; } -sal_Int16 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleRole( void ) throw( RuntimeException, std::exception ) +sal_Int16 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleRole() throw( RuntimeException, std::exception ) { return AccessibleRole::PANEL; } -OUString SAL_CALL SvxRectCtlAccessibleContext::getAccessibleDescription( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxRectCtlAccessibleContext::getAccessibleDescription() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); return msDescription + " Please use arrow key to selection."; } -OUString SAL_CALL SvxRectCtlAccessibleContext::getAccessibleName( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxRectCtlAccessibleContext::getAccessibleName() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); return msName; @@ -342,7 +342,7 @@ OUString SAL_CALL SvxRectCtlAccessibleContext::getAccessibleName( void ) throw( /** Return empty reference to indicate that the relation set is not supported. */ -Reference< XAccessibleRelationSet > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleRelationSet( void ) throw( RuntimeException, std::exception ) +Reference< XAccessibleRelationSet > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleRelationSet() throw( RuntimeException, std::exception ) { //return Reference< XAccessibleRelationSet >(); utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper; @@ -369,7 +369,7 @@ Reference< XAccessibleRelationSet > SAL_CALL SvxRectCtlAccessibleContext::getAcc return xSet; } -Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleStateSet( void ) throw( RuntimeException, std::exception ) +Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleStateSet() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper; @@ -393,7 +393,7 @@ Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlAccessibleContext::getAccess return pStateSetHelper; } -lang::Locale SAL_CALL SvxRectCtlAccessibleContext::getLocale( void ) throw( IllegalAccessibleComponentStateException, RuntimeException, std::exception ) +lang::Locale SAL_CALL SvxRectCtlAccessibleContext::getLocale() throw( IllegalAccessibleComponentStateException, RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); if( mxParent.is() ) @@ -469,7 +469,7 @@ sal_Int32 SvxRectCtlAccessibleContext::getBackground( ) } // XServiceInfo -OUString SAL_CALL SvxRectCtlAccessibleContext::getImplementationName( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxRectCtlAccessibleContext::getImplementationName() throw( RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.ui.SvxRectCtlAccessibleContext" ); } @@ -479,14 +479,14 @@ sal_Bool SAL_CALL SvxRectCtlAccessibleContext::supportsService( const OUString& return cppu::supportsService(this, sServiceName); } -Sequence< OUString > SAL_CALL SvxRectCtlAccessibleContext::getSupportedServiceNames( void ) throw( RuntimeException, std::exception ) +Sequence< OUString > SAL_CALL SvxRectCtlAccessibleContext::getSupportedServiceNames() throw( RuntimeException, std::exception ) { const OUString sServiceName( "com.sun.star.accessibility.AccessibleContext" ); return Sequence< OUString >( &sServiceName, 1 ); } // XTypeProvider -Sequence< sal_Int8 > SAL_CALL SvxRectCtlAccessibleContext::getImplementationId( void ) throw( RuntimeException, std::exception ) +Sequence< sal_Int8 > SAL_CALL SvxRectCtlAccessibleContext::getImplementationId() throw( RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } @@ -683,7 +683,7 @@ void SAL_CALL SvxRectCtlAccessibleContext::disposing() } } -Rectangle SvxRectCtlAccessibleContext::GetBoundingBoxOnScreen( void ) throw( RuntimeException ) +Rectangle SvxRectCtlAccessibleContext::GetBoundingBoxOnScreen() throw( RuntimeException ) { ::SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -693,7 +693,7 @@ Rectangle SvxRectCtlAccessibleContext::GetBoundingBoxOnScreen( void ) throw( Run return Rectangle( mpRepr->GetParent()->OutputToScreenPixel( mpRepr->GetPosPixel() ), mpRepr->GetSizePixel() ); } -Rectangle SvxRectCtlAccessibleContext::GetBoundingBox( void ) throw( RuntimeException ) +Rectangle SvxRectCtlAccessibleContext::GetBoundingBox() throw( RuntimeException ) { ::SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -703,7 +703,7 @@ Rectangle SvxRectCtlAccessibleContext::GetBoundingBox( void ) throw( RuntimeExce return Rectangle( mpRepr->GetPosPixel(), mpRepr->GetSizePixel() ); } -void SvxRectCtlAccessibleContext::ThrowExceptionIfNotAlive( void ) throw( lang::DisposedException ) +void SvxRectCtlAccessibleContext::ThrowExceptionIfNotAlive() throw( lang::DisposedException ) { if( IsNotAlive() ) throw lang::DisposedException(); @@ -746,7 +746,7 @@ SvxRectCtlChildAccessibleContext::~SvxRectCtlChildAccessibleContext() } // XAccessible -Reference< XAccessibleContext> SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleContext( void ) throw( RuntimeException, std::exception ) +Reference< XAccessibleContext> SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleContext() throw( RuntimeException, std::exception ) { return this; } @@ -810,7 +810,7 @@ sal_Int32 SvxRectCtlChildAccessibleContext::getBackground( ) } // XAccessibleContext -sal_Int32 SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleChildCount( void ) throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleChildCount() throw( RuntimeException, std::exception ) { return 0; } @@ -820,28 +820,28 @@ Reference< XAccessible > SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibl throw lang::IndexOutOfBoundsException(); } -Reference< XAccessible > SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleParent( void ) throw( RuntimeException, std::exception ) +Reference< XAccessible > SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleParent() throw( RuntimeException, std::exception ) { return mxParent; } -sal_Int32 SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleIndexInParent( void ) throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleIndexInParent() throw( RuntimeException, std::exception ) { return mnIndexInParent; } -sal_Int16 SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleRole( void ) throw( RuntimeException, std::exception ) +sal_Int16 SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleRole() throw( RuntimeException, std::exception ) { return AccessibleRole::RADIO_BUTTON; } -OUString SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleDescription( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleDescription() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( maMutex ); return msDescription; } -OUString SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleName( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleName() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( maMutex ); return msName; @@ -850,7 +850,7 @@ OUString SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleName( void ) th /** Return empty reference to indicate that the relation set is not supported. */ -Reference<XAccessibleRelationSet> SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleRelationSet( void ) throw( RuntimeException, std::exception ) +Reference<XAccessibleRelationSet> SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleRelationSet() throw( RuntimeException, std::exception ) { utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper; uno::Reference< css::accessibility::XAccessibleRelationSet > xSet = pRelationSetHelper; @@ -865,7 +865,7 @@ Reference<XAccessibleRelationSet> SAL_CALL SvxRectCtlChildAccessibleContext::get return xSet; } -Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleStateSet( void ) throw( RuntimeException, std::exception ) +Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleStateSet() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( maMutex ); utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper; @@ -891,7 +891,7 @@ Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlChildAccessibleContext::getA return pStateSetHelper; } -lang::Locale SAL_CALL SvxRectCtlChildAccessibleContext::getLocale( void ) throw( IllegalAccessibleComponentStateException, RuntimeException, std::exception ) +lang::Locale SAL_CALL SvxRectCtlChildAccessibleContext::getLocale() throw( IllegalAccessibleComponentStateException, RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( maMutex ); if( mxParent.is() ) @@ -1022,7 +1022,7 @@ Reference< XAccessibleKeyBinding > SvxRectCtlChildAccessibleContext::getAccessib } // XServiceInfo -OUString SAL_CALL SvxRectCtlChildAccessibleContext::getImplementationName( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxRectCtlChildAccessibleContext::getImplementationName() throw( RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.ui.SvxRectCtlChildAccessibleContext" ); } @@ -1032,14 +1032,14 @@ sal_Bool SAL_CALL SvxRectCtlChildAccessibleContext::supportsService( const OUStr return cppu::supportsService(this, sServiceName); } -Sequence< OUString > SAL_CALL SvxRectCtlChildAccessibleContext::getSupportedServiceNames( void ) throw( RuntimeException, std::exception ) +Sequence< OUString > SAL_CALL SvxRectCtlChildAccessibleContext::getSupportedServiceNames() throw( RuntimeException, std::exception ) { const OUString sServiceName ("com.sun.star.accessibility.AccessibleContext"); return Sequence< OUString >( &sServiceName, 1 ); } // XTypeProvider -Sequence< sal_Int8 > SAL_CALL SvxRectCtlChildAccessibleContext::getImplementationId( void ) throw( RuntimeException, std::exception ) +Sequence< sal_Int8 > SAL_CALL SvxRectCtlChildAccessibleContext::getImplementationId() throw( RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } @@ -1069,13 +1069,13 @@ void SAL_CALL SvxRectCtlChildAccessibleContext::disposing() } } -void SvxRectCtlChildAccessibleContext::ThrowExceptionIfNotAlive( void ) throw( lang::DisposedException ) +void SvxRectCtlChildAccessibleContext::ThrowExceptionIfNotAlive() throw( lang::DisposedException ) { if( IsNotAlive() ) throw lang::DisposedException(); } -Rectangle SvxRectCtlChildAccessibleContext::GetBoundingBoxOnScreen( void ) throw( RuntimeException ) +Rectangle SvxRectCtlChildAccessibleContext::GetBoundingBoxOnScreen() throw( RuntimeException ) { ::osl::MutexGuard aGuard( maMutex ); @@ -1085,7 +1085,7 @@ Rectangle SvxRectCtlChildAccessibleContext::GetBoundingBoxOnScreen( void ) throw return Rectangle( mrParentWindow.OutputToScreenPixel( aRect.TopLeft() ), aRect.GetSize() ); } -Rectangle SvxRectCtlChildAccessibleContext::GetBoundingBox( void ) throw( RuntimeException ) +Rectangle SvxRectCtlChildAccessibleContext::GetBoundingBox() throw( RuntimeException ) { // no guard necessary, because no one changes mpBoundingBox after creating it ThrowExceptionIfNotAlive(); diff --git a/svx/source/dialog/SpellDialogChildWindow.cxx b/svx/source/dialog/SpellDialogChildWindow.cxx index 04df8dddad1f..7f580d80ffe2 100644 --- a/svx/source/dialog/SpellDialogChildWindow.cxx +++ b/svx/source/dialog/SpellDialogChildWindow.cxx @@ -43,11 +43,11 @@ SpellDialogChildWindow::SpellDialogChildWindow ( SetHideNotDelete(true); } -SpellDialogChildWindow::~SpellDialogChildWindow (void) +SpellDialogChildWindow::~SpellDialogChildWindow() { } -SfxBindings& SpellDialogChildWindow::GetBindings (void) const +SfxBindings& SpellDialogChildWindow::GetBindings() const { OSL_ASSERT (m_pAbstractSpellDialog != NULL); return m_pAbstractSpellDialog->GetBindings(); diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index 215869e6d376..984eb164047a 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -1128,7 +1128,7 @@ bool SvxBmpMask::IsEyedropping() const /** Set an accessible name for the source color check boxes. Without this the lengthy description is read. */ -void SvxBmpMask::SetAccessibleNames (void) +void SvxBmpMask::SetAccessibleNames() { OUString sSourceColor(BMP_RESID(RID_SVXDLG_BMPMASK_STR_SOURCECOLOR).toString()); OUString sSourceColorN; diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index 75ec603653b3..28519890f12c 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -210,7 +210,7 @@ sal_uInt16 SvxShowCharSet::GetColumnPos(sal_uInt16 _nPos) const -int SvxShowCharSet::FirstInView( void ) const +int SvxShowCharSet::FirstInView() const { int nIndex = 0; if( aVscrollSB.IsVisible() ) @@ -220,7 +220,7 @@ int SvxShowCharSet::FirstInView( void ) const -int SvxShowCharSet::LastInView( void ) const +int SvxShowCharSet::LastInView() const { sal_uIntPtr nIndex = FirstInView(); nIndex += ROW_COUNT * COLUMN_COUNT - 1; diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index 075cc89b29ae..7ced4eaf2856 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -59,7 +59,7 @@ using namespace ::com::sun::star::accessibility; // Control for display and selection of the corner points and // mid point of an object -Bitmap& SvxRectCtl::GetRectBitmap( void ) +Bitmap& SvxRectCtl::GetRectBitmap() { if( !pBitmap ) InitRectBitmap(); @@ -162,7 +162,7 @@ void SvxRectCtl::Resize_Impl() } -void SvxRectCtl::InitRectBitmap( void ) +void SvxRectCtl::InitRectBitmap() { delete pBitmap; @@ -675,12 +675,12 @@ void SvxRectCtl::SetState( CTL_STATE nState ) static_cast<SvxTabPage*>(pTabPage)->PointChanged(this, eRP); } -sal_uInt8 SvxRectCtl::GetNumOfChildren( void ) const +sal_uInt8 SvxRectCtl::GetNumOfChildren() const { return ( eCS == CS_ANGLE )? 8 : 9; } -Rectangle SvxRectCtl::CalculateFocusRectangle( void ) const +Rectangle SvxRectCtl::CalculateFocusRectangle() const { Size aDstBtnSize( PixelToLogic( Size( 15, 15 ) ) ); return Rectangle( aPtNew - Point( aDstBtnSize.Width() >> 1, aDstBtnSize.Height() >> 1 ), aDstBtnSize ); @@ -1696,7 +1696,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeLineEndLB(vcl::Window return pListBox; } -LineEndLB::~LineEndLB(void) +LineEndLB::~LineEndLB() { } diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index 98a054b417d8..4b0b3920d59d 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -838,7 +838,7 @@ void SvxFontPrevWindow::SetFontWidthScale( sal_uInt16 n ) -void SvxFontPrevWindow::AutoCorrectFontColor( void ) +void SvxFontPrevWindow::AutoCorrectFontColor() { Color aFontColor( GetTextColor() ); diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 7c05cd5cfa58..e85409be5e4a 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -716,7 +716,7 @@ void SvxRubyDialog::AssertOneEntry() -void SvxRubyDialog::UpdateColors( void ) +void SvxRubyDialog::UpdateColors() { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); svtools::ColorConfig aColorConfig; diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx index 236e5d6cd766..40a34118d14a 100644 --- a/svx/source/dialog/swframeexample.cxx +++ b/svx/source/dialog/swframeexample.cxx @@ -66,7 +66,7 @@ SvxSwFrameExample::~SvxSwFrameExample() { } -void SvxSwFrameExample::InitColors_Impl( void ) +void SvxSwFrameExample::InitColors_Impl() { const StyleSettings& rSettings = GetSettings().GetStyleSettings(); m_aBgCol = Color( rSettings.GetWindowColor() ); diff --git a/svx/source/engine3d/viewpt3d2.cxx b/svx/source/engine3d/viewpt3d2.cxx index f59c25c5cd88..743b60d41a12 100644 --- a/svx/source/engine3d/viewpt3d2.cxx +++ b/svx/source/engine3d/viewpt3d2.cxx @@ -67,7 +67,7 @@ const basegfx::B3DPoint& Viewport3D::GetViewPoint() // Calculate View transformations matrix -void Viewport3D::MakeTransform(void) +void Viewport3D::MakeTransform() { if ( !bTfValid ) { diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index b5bda2378e40..cbad27e1bd6f 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -3709,7 +3709,7 @@ OUString SAL_CALL FmXEditCell::getText() throw( RuntimeException, std::exception } -OUString SAL_CALL FmXEditCell::getSelectedText( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL FmXEditCell::getSelectedText() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3732,7 +3732,7 @@ void SAL_CALL FmXEditCell::setSelection( const ::com::sun::star::awt::Selection& } -::com::sun::star::awt::Selection SAL_CALL FmXEditCell::getSelection( void ) throw( RuntimeException, std::exception ) +::com::sun::star::awt::Selection SAL_CALL FmXEditCell::getSelection() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3744,7 +3744,7 @@ void SAL_CALL FmXEditCell::setSelection( const ::com::sun::star::awt::Selection& } -sal_Bool SAL_CALL FmXEditCell::isEditable( void ) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL FmXEditCell::isEditable() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4652,7 +4652,7 @@ OUString SAL_CALL FmXFilterCell::getText() throw( RuntimeException, std::excepti } -OUString SAL_CALL FmXFilterCell::getSelectedText( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL FmXFilterCell::getSelectedText() throw( RuntimeException, std::exception ) { return getText(); } @@ -4663,13 +4663,13 @@ void SAL_CALL FmXFilterCell::setSelection( const ::com::sun::star::awt::Selectio } -::com::sun::star::awt::Selection SAL_CALL FmXFilterCell::getSelection( void ) throw( RuntimeException, std::exception ) +::com::sun::star::awt::Selection SAL_CALL FmXFilterCell::getSelection() throw( RuntimeException, std::exception ) { return ::com::sun::star::awt::Selection(); } -sal_Bool SAL_CALL FmXFilterCell::isEditable( void ) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL FmXFilterCell::isEditable() throw( RuntimeException, std::exception ) { return sal_True; } diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx index e9e8a8ffc57b..447ad5a65b91 100644 --- a/svx/source/form/fmdmod.cxx +++ b/svx/source/form/fmdmod.cxx @@ -61,7 +61,7 @@ SAL_WNOUNREACHABLE_CODE_PUSH SAL_WNOUNREACHABLE_CODE_POP -::com::sun::star::uno::Sequence< OUString > SAL_CALL SvxFmMSFactory::getAvailableServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +::com::sun::star::uno::Sequence< OUString > SAL_CALL SvxFmMSFactory::getAvailableServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) { static const OUString aSvxComponentServiceNameList[] = { diff --git a/svx/source/form/fmdpage.cxx b/svx/source/form/fmdpage.cxx index edcf75f3b60d..73bbae161c87 100644 --- a/svx/source/form/fmdpage.cxx +++ b/svx/source/form/fmdpage.cxx @@ -92,7 +92,7 @@ SdrObject *SvxFmDrawPage::_CreateSdrObject( const ::com::sun::star::uno::Referen } // XFormsSupplier -::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > SAL_CALL SvxFmDrawPage::getForms(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > SAL_CALL SvxFmDrawPage::getForms() throw( ::com::sun::star::uno::RuntimeException, std::exception ) { ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > xForms; @@ -104,7 +104,7 @@ SdrObject *SvxFmDrawPage::_CreateSdrObject( const ::com::sun::star::uno::Referen } // XFormsSupplier2 -sal_Bool SAL_CALL SvxFmDrawPage::hasForms(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL SvxFmDrawPage::hasForms() throw( ::com::sun::star::uno::RuntimeException, std::exception ) { bool bHas = false; FmFormPage* pFormPage = PTR_CAST( FmFormPage, GetSdrPage() ); @@ -114,7 +114,7 @@ sal_Bool SAL_CALL SvxFmDrawPage::hasForms(void) throw( ::com::sun::star::uno::Ru } // ::com::sun::star::lang::XServiceInfo -::com::sun::star::uno::Sequence< OUString > SAL_CALL SvxFmDrawPage::getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +::com::sun::star::uno::Sequence< OUString > SAL_CALL SvxFmDrawPage::getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) { return SvxDrawPage::getSupportedServiceNames(); } diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index af8af5cf1436..52e48aa1c5b5 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -231,18 +231,18 @@ void FormViewPageWindowAdapter::dispose() m_aControllerList.clear(); } -sal_Bool SAL_CALL FormViewPageWindowAdapter::hasElements(void) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL FormViewPageWindowAdapter::hasElements() throw( RuntimeException, std::exception ) { return getCount() != 0; } -Type SAL_CALL FormViewPageWindowAdapter::getElementType(void) throw( RuntimeException, std::exception ) +Type SAL_CALL FormViewPageWindowAdapter::getElementType() throw( RuntimeException, std::exception ) { return cppu::UnoType<XFormController>::get(); } // XIndexAccess -sal_Int32 SAL_CALL FormViewPageWindowAdapter::getCount(void) throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL FormViewPageWindowAdapter::getCount() throw( RuntimeException, std::exception ) { return m_aControllerList.size(); } diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 3497bd05de1e..04fddee8576e 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -668,7 +668,7 @@ OUString SAL_CALL FormController::getImplementationName() throw( RuntimeExceptio return OUString("org.openoffice.comp.svx.FormController"); } -Sequence< OUString> SAL_CALL FormController::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) +Sequence< OUString> SAL_CALL FormController::getSupportedServiceNames() throw( RuntimeException, std::exception ) { // service names which are supported only, but cannot be used to created an // instance at a service factory @@ -695,7 +695,7 @@ void SAL_CALL FormController::resetted(const EventObject& rEvent) throw( Runtime } -Sequence< OUString> FormController::getSupportedServiceNames_Static(void) +Sequence< OUString> FormController::getSupportedServiceNames_Static() { static Sequence< OUString> aServices; if (!aServices.getLength()) @@ -1066,14 +1066,14 @@ void SAL_CALL FormController::setActiveTerm( ::sal_Int32 _ActiveTerm ) throw (In // XElementAccess -sal_Bool SAL_CALL FormController::hasElements(void) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL FormController::hasElements() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); return !m_aChildren.empty(); } -Type SAL_CALL FormController::getElementType(void) throw( RuntimeException, std::exception ) +Type SAL_CALL FormController::getElementType() throw( RuntimeException, std::exception ) { return cppu::UnoType<XFormController>::get(); @@ -1081,7 +1081,7 @@ Type SAL_CALL FormController::getElementType(void) throw( RuntimeException, std // XEnumerationAccess -Reference< XEnumeration > SAL_CALL FormController::createEnumeration(void) throw( RuntimeException, std::exception ) +Reference< XEnumeration > SAL_CALL FormController::createEnumeration() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); return new ::comphelper::OEnumerationByIndex(this); @@ -1089,7 +1089,7 @@ Reference< XEnumeration > SAL_CALL FormController::createEnumeration(void) thro // XIndexAccess -sal_Int32 SAL_CALL FormController::getCount(void) throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL FormController::getCount() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); return m_aChildren.size(); @@ -1151,7 +1151,7 @@ void FormController::disposeAllFeaturesAndDispatchers() } -void FormController::disposing(void) +void FormController::disposing() { EventObject aEvt( *this ); @@ -2109,7 +2109,7 @@ Reference< XControlContainer > FormController::getContainer() throw( RuntimeExc } -Sequence< Reference< XControl > > FormController::getControls(void) throw( RuntimeException, std::exception ) +Sequence< Reference< XControl > > FormController::getControls() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -2957,7 +2957,7 @@ Reference< XFormOperations > SAL_CALL FormController::getFormOperations() throw } -Reference< XControl> SAL_CALL FormController::getCurrentControl(void) throw( RuntimeException, std::exception ) +Reference< XControl> SAL_CALL FormController::getCurrentControl() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -3479,7 +3479,7 @@ void FormController::setMode(const OUString& Mode) throw( NoSupportException, Ru } -OUString SAL_CALL FormController::getMode(void) throw( RuntimeException, std::exception ) +OUString SAL_CALL FormController::getMode() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -3488,7 +3488,7 @@ OUString SAL_CALL FormController::getMode(void) throw( RuntimeException, std::ex } -Sequence< OUString > SAL_CALL FormController::getSupportedModes(void) throw( RuntimeException, std::exception ) +Sequence< OUString > SAL_CALL FormController::getSupportedModes() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); diff --git a/svx/source/form/formdispatchinterceptor.cxx b/svx/source/form/formdispatchinterceptor.cxx index 157a7507fba8..603f27421f1b 100644 --- a/svx/source/form/formdispatchinterceptor.cxx +++ b/svx/source/form/formdispatchinterceptor.cxx @@ -122,7 +122,7 @@ namespace svxform } - Reference< XDispatchProvider> SAL_CALL DispatchInterceptionMultiplexer::getMasterDispatchProvider(void) throw( RuntimeException, std::exception ) + Reference< XDispatchProvider> SAL_CALL DispatchInterceptionMultiplexer::getMasterDispatchProvider() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( *m_pMutex ); return m_xMasterDispatcher; diff --git a/svx/source/gallery2/GalleryControl.cxx b/svx/source/gallery2/GalleryControl.cxx index 5c3679ecfc01..69474d0eb144 100644 --- a/svx/source/gallery2/GalleryControl.cxx +++ b/svx/source/gallery2/GalleryControl.cxx @@ -65,11 +65,11 @@ GalleryControl::GalleryControl ( InitSettings(); } -GalleryControl::~GalleryControl (void) +GalleryControl::~GalleryControl() { } -void GalleryControl::InitSettings (void) +void GalleryControl::InitSettings() { SetBackground( Wallpaper( GALLERY_DLG_COLOR ) ); SetControlBackground( GALLERY_DLG_COLOR ); @@ -93,7 +93,7 @@ void GalleryControl::InitSettings (void) mpBrowser2->SetBackground(aBackground); } -void GalleryControl::Resize (void) +void GalleryControl::Resize() { // call parent Window::Resize(); @@ -203,13 +203,13 @@ bool GalleryControl::GalleryKeyInput( const KeyEvent& rKEvt, vcl::Window* ) return bRet; } -void GalleryControl::GetFocus (void) +void GalleryControl::GetFocus() { Window::GetFocus(); mpBrowser1->GrabFocus(); } -void GalleryControl::ThemeSelectionHasChanged (void) +void GalleryControl::ThemeSelectionHasChanged() { mpBrowser2->SelectTheme(mpBrowser1->GetSelectedTheme()); } diff --git a/svx/source/gallery2/GallerySplitter.cxx b/svx/source/gallery2/GallerySplitter.cxx index cd8121ad1625..f6857f84abd1 100644 --- a/svx/source/gallery2/GallerySplitter.cxx +++ b/svx/source/gallery2/GallerySplitter.cxx @@ -22,7 +22,7 @@ GallerySplitter::GallerySplitter( vcl::Window* pParent, WinBits nStyle, - const ::boost::function<void(void)>& rDataChangeFunctor) + const ::boost::function<void()>& rDataChangeFunctor) : Splitter(pParent, nStyle) , maDataChangeFunctor(rDataChangeFunctor) { diff --git a/svx/source/gallery2/GallerySplitter.hxx b/svx/source/gallery2/GallerySplitter.hxx index f5c787d6b8f5..179ffbe99205 100644 --- a/svx/source/gallery2/GallerySplitter.hxx +++ b/svx/source/gallery2/GallerySplitter.hxx @@ -28,13 +28,13 @@ public: GallerySplitter( vcl::Window* pParent, WinBits nStyle, - const ::boost::function<void(void)>& rDataChangeFunctor); + const ::boost::function<void()>& rDataChangeFunctor); protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; private: - ::boost::function<void(void)> maDataChangeFunctor; + ::boost::function<void()> maDataChangeFunctor; }; diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index f6af4e4fb090..7d33453facd8 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -116,7 +116,7 @@ GalleryBrowser1::GalleryBrowser1( vcl::Window* pParent, Gallery* pGallery, const ::boost::function<sal_Bool(const KeyEvent&,Window*)>& rKeyInputHandler, - const ::boost::function<void(void)>& rThemeSlectionHandler) + const ::boost::function<void()>& rThemeSlectionHandler) : Control ( pParent, WB_TABSTOP ), maNewTheme ( this, WB_3DLOOK ), diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx index ce391f0d170a..a10df2ec3e7d 100644 --- a/svx/source/gallery2/galbrws1.hxx +++ b/svx/source/gallery2/galbrws1.hxx @@ -94,7 +94,7 @@ private: Image aImgImported; ::boost::function<sal_Bool(const KeyEvent&,Window*)> maKeyInputHandler; - ::boost::function<void(void)> maThemeSlectionHandler; + ::boost::function<void()> maThemeSlectionHandler; void ImplAdjustControls(); sal_uIntPtr ImplInsertThemeEntry( const GalleryThemeEntry* pEntry ); @@ -125,7 +125,7 @@ public: vcl::Window* pParent, Gallery* pGallery, const ::boost::function<sal_Bool(const KeyEvent&,Window*)>& rKeyInputHandler, - const ::boost::function<void(void)>& rThemeSlectionHandler); + const ::boost::function<void()>& rThemeSlectionHandler); virtual ~GalleryBrowser1(); void SelectTheme( const OUString& rThemeName ) { mpThemes->SelectEntry( rThemeName ); SelectThemeHdl( NULL ); } diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx index 1c0955c26f85..03248840e3e1 100644 --- a/svx/source/inc/GraphCtlAccessibleContext.hxx +++ b/svx/source/inc/GraphCtlAccessibleContext.hxx @@ -99,7 +99,7 @@ public: // XAccessible /// Return the XAccessibleContext. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL - getAccessibleContext (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getAccessibleContext() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleComponent virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& rPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -110,23 +110,23 @@ public: 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) + virtual sal_Int32 SAL_CALL getForeground() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getBackground (void) + virtual sal_Int32 SAL_CALL getBackground() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; 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, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleParent (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int16 SAL_CALL getAccessibleRole (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale (void) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleParent() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::lang::Locale SAL_CALL getLocale() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception) SAL_OVERRIDE; // virtual void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) {} // virtual void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) {} @@ -135,15 +135,15 @@ public: virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener>& xListener) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceName - virtual OUString SAL_CALL getServiceName (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getServiceName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleSelection virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -155,7 +155,7 @@ public: virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // IAccessibleViewforwarder - virtual bool IsValid (void) const SAL_OVERRIDE; + virtual bool IsValid() const SAL_OVERRIDE; virtual Rectangle GetVisibleArea() const SAL_OVERRIDE; virtual Point LogicToPixel (const Point& rPoint) const SAL_OVERRIDE; virtual Size LogicToPixel (const Size& rSize) const SAL_OVERRIDE; @@ -183,10 +183,10 @@ protected: When the object is already disposed then a <type>DisposedException</type> is thrown. */ - Rectangle GetBoundingBoxOnScreen(void) throw (::com::sun::star::uno::RuntimeException); + Rectangle GetBoundingBoxOnScreen() throw (::com::sun::star::uno::RuntimeException); /// Return the object's current bounding box relative to the parent object. - Rectangle GetBoundingBox(void) throw (::com::sun::star::uno::RuntimeException); + Rectangle GetBoundingBox() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL disposing() SAL_OVERRIDE; diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index 49bb1e3b2510..68df2a58396a 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -130,7 +130,7 @@ namespace svxform DataTreeListBox( vcl::Window* pParent, WinBits nBits ); virtual ~DataTreeListBox(); - virtual PopupMenu* CreateContextMenu( void ) SAL_OVERRIDE; + virtual PopupMenu* CreateContextMenu() SAL_OVERRIDE; virtual void ExcecuteContextMenuAction( sal_uInt16 _nSelectedPopupEntry ) SAL_OVERRIDE; virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; @@ -314,7 +314,7 @@ namespace svxform inline XPropertySet_t GetBindingForNode( const XNode_t &xNode ) { return m_xUIHelper->getBindingForNode(xNode,true); } inline OUString GetServiceNameForNode( const XNode_t &xNode ) { return m_xUIHelper->getDefaultServiceNameForNode(xNode); } - inline XFormsUIHelper1_ref GetXFormsHelper( void ) const { return m_xUIHelper; } + inline XFormsUIHelper1_ref GetXFormsHelper() const { return m_xUIHelper; } }; diff --git a/svx/source/inc/fmundo.hxx b/svx/source/inc/fmundo.hxx index 7d36fe55ff09..2e390aec2a3a 100644 --- a/svx/source/inc/fmundo.hxx +++ b/svx/source/inc/fmundo.hxx @@ -144,7 +144,7 @@ public: // UNO Anbindung // SMART_UNO_DECLARATION(FmXUndoEnvironment, ::cppu::OWeakObject); // virtual sal_Bool queryInterface(UsrUik, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>&); - // virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass>> getIdlClasses(void); + // virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass>> getIdlClasses(); void Lock() { osl_atomic_increment( &m_Locks ); } void UnLock() { osl_atomic_decrement( &m_Locks ); } diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx index c71b40b91899..1944a2eebcf1 100644 --- a/svx/source/inc/formcontroller.hxx +++ b/svx/source/inc/formcontroller.hxx @@ -230,7 +230,7 @@ namespace svxform virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& _rxListener, const ::com::sun::star::util::URL& _rURL ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::container::XChild - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> SAL_CALL getParent(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> SAL_CALL getParent() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setParent(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Parent) throw( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::lang::XEventListener @@ -266,11 +266,11 @@ namespace svxform virtual void SAL_CALL setActiveTerm( ::sal_Int32 _ActiveTerm ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::container::XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration> SAL_CALL createEnumeration(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration> SAL_CALL createEnumeration() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::container::XContainerListener virtual void SAL_CALL elementInserted(const ::com::sun::star::container::ContainerEvent& rEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -286,12 +286,12 @@ namespace svxform // XModeSelector virtual void SAL_CALL setMode(const OUString& Mode) throw( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual OUString SAL_CALL getMode(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedModes(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getMode() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedModes() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsMode(const OUString& Mode) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::container::XIndexAccess - virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 Index) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XModifyBroadcaster @@ -331,7 +331,7 @@ namespace svxform // XFormController virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormOperations > SAL_CALL getFormOperations() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> SAL_CALL getCurrentControl(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> SAL_CALL getCurrentControl() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL addActivateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormControllerListener>& l) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeActivateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormControllerListener>& l) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL addChildController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController >& _ChildController ) throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, std::exception ) SAL_OVERRIDE; @@ -342,7 +342,7 @@ namespace svxform virtual void SAL_CALL setInteractionHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _interactionHandler ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTabController - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> > SAL_CALL getControls(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> > SAL_CALL getControls() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel>& Model) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel> SAL_CALL getModel() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -398,7 +398,7 @@ namespace svxform // XServiceInfo virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XResetListener virtual sal_Bool SAL_CALL approveReset(const ::com::sun::star::lang::EventObject& rEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -409,7 +409,7 @@ namespace svxform virtual void SAL_CALL invalidateAllFeatures( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // method for registration - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); // comphelper::OPropertyArrayUsageHelper virtual void fillProperties( diff --git a/svx/source/inc/sdbdatacolumn.hxx b/svx/source/inc/sdbdatacolumn.hxx index 02cea4f5e026..37bd498c6031 100644 --- a/svx/source/inc/sdbdatacolumn.hxx +++ b/svx/source/inc/sdbdatacolumn.hxx @@ -106,7 +106,7 @@ namespace svxform inline ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray> getArray() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); // XColumnUpdate - inline void updateNull(void) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); + inline void updateNull() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); inline void updateBoolean(bool x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); inline void updateByte(sal_Int8 x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); inline void updateShort(sal_Int16 x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); diff --git a/svx/source/inc/svxpixelctlaccessiblecontext.hxx b/svx/source/inc/svxpixelctlaccessiblecontext.hxx index 089904adbe95..b87cd5299be9 100644 --- a/svx/source/inc/svxpixelctlaccessiblecontext.hxx +++ b/svx/source/inc/svxpixelctlaccessiblecontext.hxx @@ -138,16 +138,16 @@ public: void FireAccessibleEvent (short nEventId, const ::com::sun::star::uno::Any& rOld, const ::com::sun::star::uno::Any& rNew); virtual void SAL_CALL disposing() SAL_OVERRIDE; - Rectangle GetBoundingBoxOnScreen( void ) throw( ::com::sun::star::uno::RuntimeException ); + Rectangle GetBoundingBoxOnScreen() throw( ::com::sun::star::uno::RuntimeException ); - Rectangle GetBoundingBox( void ) throw( ::com::sun::star::uno::RuntimeException ); + Rectangle GetBoundingBox() throw( ::com::sun::star::uno::RuntimeException ); /// @returns true if it's disposed or in disposing - inline bool IsAlive( void ) const; + inline bool IsAlive() const; /// @returns true if it's not disposed and no in disposing - inline bool IsNotAlive( void ) const; + inline bool IsNotAlive() const; /// throws the exception DisposedException if it's not alive - void ThrowExceptionIfNotAlive( void ) throw( ::com::sun::star::lang::DisposedException ); + void ThrowExceptionIfNotAlive() throw( ::com::sun::star::lang::DisposedException ); void CheckChild(); @@ -245,9 +245,9 @@ public: void LoseFocus(); /// @returns true if it's disposed or in disposing - inline bool IsAlive( void ) const; + inline bool IsAlive() const; /// @returns true if it's not disposed and no in disposing - inline bool IsNotAlive( void ) const; + inline bool IsNotAlive() const; protected: ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> m_xCurChild; @@ -255,22 +255,22 @@ public: void NotifyChild(long nIndex, bool bSelect, bool bCheck); }; -inline bool SvxPixelCtlAccessible::IsAlive( void ) const +inline bool SvxPixelCtlAccessible::IsAlive() const { return !rBHelper.bDisposed && !rBHelper.bInDispose; } -inline bool SvxPixelCtlAccessible::IsNotAlive( void ) const +inline bool SvxPixelCtlAccessible::IsNotAlive() const { return rBHelper.bDisposed || rBHelper.bInDispose; } -inline bool SvxPixelCtlAccessibleChild::IsAlive( void ) const +inline bool SvxPixelCtlAccessibleChild::IsAlive() const { return !rBHelper.bDisposed && !rBHelper.bInDispose; } -inline bool SvxPixelCtlAccessibleChild::IsNotAlive( void ) const +inline bool SvxPixelCtlAccessibleChild::IsNotAlive() const { return rBHelper.bDisposed || rBHelper.bInDispose; } diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx index 2ef95908230d..772400605850 100644 --- a/svx/source/inc/svxrectctaccessiblecontext.hxx +++ b/svx/source/inc/svxrectctaccessiblecontext.hxx @@ -83,7 +83,7 @@ protected: public: // XAccessible virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL - getAccessibleContext( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleContext() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XAccessibleComponent virtual sal_Bool SAL_CALL @@ -117,35 +117,35 @@ public: // XAccessibleContext virtual sal_Int32 SAL_CALL - getAccessibleChildCount( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleChildCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; 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, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL - getAccessibleParent( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleParent() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL - getAccessibleIndexInParent( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleIndexInParent() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL - getAccessibleRole( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleRole() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual OUString SAL_CALL - getAccessibleDescription( void ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL - getAccessibleName( void ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL - getAccessibleRelationSet( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleRelationSet() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL - getAccessibleStateSet( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleStateSet() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::lang::Locale SAL_CALL - getLocale( void ) + getLocale() throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception ) SAL_OVERRIDE; @@ -162,17 +162,17 @@ public: // XServiceInfo virtual OUString SAL_CALL - getImplementationName( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XTypeProvider virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getImplementationId() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XAccessibleSelection virtual void SAL_CALL @@ -232,10 +232,10 @@ public: protected: /// @Return the object's current bounding box relative to the desktop. - Rectangle GetBoundingBoxOnScreen( void ) throw( ::com::sun::star::uno::RuntimeException ); + Rectangle GetBoundingBoxOnScreen() throw( ::com::sun::star::uno::RuntimeException ); /// @Return the object's current bounding box relative to the parent object. - Rectangle GetBoundingBox( void ) throw( ::com::sun::star::uno::RuntimeException ); + Rectangle GetBoundingBox() throw( ::com::sun::star::uno::RuntimeException ); /// Calls all Listener to tell they the change. void CommitChange( const com::sun::star::accessibility::AccessibleEventObject& rEvent ); @@ -243,13 +243,13 @@ protected: virtual void SAL_CALL disposing() SAL_OVERRIDE; /// @returns true if it's disposed or in disposing - inline bool IsAlive( void ) const; + inline bool IsAlive() const; /// @returns true if it's not disposed and no in disposing - inline bool IsNotAlive( void ) const; + inline bool IsNotAlive() const; /// throws the exception DisposedException if it's not alive - void ThrowExceptionIfNotAlive( void ) throw( ::com::sun::star::lang::DisposedException ); + void ThrowExceptionIfNotAlive() throw( ::com::sun::star::lang::DisposedException ); private: /** Description of this object. This is not a constant because it can @@ -281,12 +281,12 @@ private: bool mbAngleMode; }; -inline bool SvxRectCtlAccessibleContext::IsAlive( void ) const +inline bool SvxRectCtlAccessibleContext::IsAlive() const { return !rBHelper.bDisposed && !rBHelper.bInDispose; } -inline bool SvxRectCtlAccessibleContext::IsNotAlive( void ) const +inline bool SvxRectCtlAccessibleContext::IsNotAlive() const { return rBHelper.bDisposed || rBHelper.bInDispose; } @@ -315,7 +315,7 @@ protected: public: // XAccessible virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL - getAccessibleContext( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleContext() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XAccessibleComponent virtual sal_Bool SAL_CALL @@ -346,35 +346,35 @@ public: // XAccessibleContext virtual sal_Int32 SAL_CALL - getAccessibleChildCount( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleChildCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; 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, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL - getAccessibleParent( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleParent() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL - getAccessibleIndexInParent( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleIndexInParent() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL - getAccessibleRole( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleRole() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual OUString SAL_CALL - getAccessibleDescription( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleDescription() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual OUString SAL_CALL - getAccessibleName( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL - getAccessibleRelationSet( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleRelationSet() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL - getAccessibleStateSet( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleStateSet() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::lang::Locale SAL_CALL - getLocale( void ) + getLocale() throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception ) SAL_OVERRIDE; // XAccessibleEventBroadcaster @@ -408,17 +408,17 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL - getImplementationName( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XTypeProvider virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getImplementationId() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // internal /// Sets the checked status @@ -426,22 +426,22 @@ public: void FireFocusEvent(); protected: - Rectangle GetBoundingBoxOnScreen( void ) throw( ::com::sun::star::uno::RuntimeException ); + Rectangle GetBoundingBoxOnScreen() throw( ::com::sun::star::uno::RuntimeException ); - Rectangle GetBoundingBox( void ) throw( ::com::sun::star::uno::RuntimeException ); + Rectangle GetBoundingBox() throw( ::com::sun::star::uno::RuntimeException ); void CommitChange( const com::sun::star::accessibility::AccessibleEventObject& rEvent ); virtual void SAL_CALL disposing() SAL_OVERRIDE; /// @returns true if it's disposed or in disposing - inline bool IsAlive( void ) const; + inline bool IsAlive() const; /// @returns true if it's not disposed and no in disposing - inline bool IsNotAlive( void ) const; + inline bool IsNotAlive() const; /// throws the exception DisposedException if it's not alive - void ThrowExceptionIfNotAlive( void ) throw( ::com::sun::star::lang::DisposedException ); + void ThrowExceptionIfNotAlive() throw( ::com::sun::star::lang::DisposedException ); /// Mutex guarding this object. ::osl::Mutex maMutex; @@ -479,12 +479,12 @@ private: bool mbIsChecked; }; -inline bool SvxRectCtlChildAccessibleContext::IsAlive( void ) const +inline bool SvxRectCtlChildAccessibleContext::IsAlive() const { return !rBHelper.bDisposed && !rBHelper.bInDispose; } -inline bool SvxRectCtlChildAccessibleContext::IsNotAlive( void ) const +inline bool SvxRectCtlChildAccessibleContext::IsNotAlive() const { return rBHelper.bDisposed || rBHelper.bInDispose; } diff --git a/svx/source/sidebar/ColorPanel.hxx b/svx/source/sidebar/ColorPanel.hxx index d4dc6980c71f..b41b12672d05 100644 --- a/svx/source/sidebar/ColorPanel.hxx +++ b/svx/source/sidebar/ColorPanel.hxx @@ -34,10 +34,10 @@ class ColorPanel { public: ColorPanel (vcl::Window* pParent); - virtual ~ColorPanel (void); + virtual ~ColorPanel(); // From vcl::Window - virtual void Resize (void); + virtual void Resize(); virtual void DataChanged (const DataChangedEvent& rEvent); private: @@ -48,7 +48,7 @@ private: items. */ int CalculateRowCount (const Size& rItemSize, int nColumnCount); - void Fill (void); + void Fill(); }; } } // end of namespace ::svx::sidebar diff --git a/svx/source/sidebar/EmptyPanel.cxx b/svx/source/sidebar/EmptyPanel.cxx index 2d28f8a99ba2..784949a7ea3a 100644 --- a/svx/source/sidebar/EmptyPanel.cxx +++ b/svx/source/sidebar/EmptyPanel.cxx @@ -46,14 +46,14 @@ EmptyPanel::EmptyPanel (vcl::Window* pParent) -EmptyPanel::~EmptyPanel (void) +EmptyPanel::~EmptyPanel() { } -void EmptyPanel::Resize (void) +void EmptyPanel::Resize() { const Size aSize (GetSizePixel()); maMessageControl.SetSizePixel(aSize); diff --git a/svx/source/sidebar/EmptyPanel.hxx b/svx/source/sidebar/EmptyPanel.hxx index de166cf80953..1242d13ce8b8 100644 --- a/svx/source/sidebar/EmptyPanel.hxx +++ b/svx/source/sidebar/EmptyPanel.hxx @@ -35,9 +35,9 @@ class EmptyPanel { public: EmptyPanel (vcl::Window* pParent); - virtual ~EmptyPanel (void); + virtual ~EmptyPanel(); - virtual void Resize (void) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; private: FixedText maMessageControl; diff --git a/svx/source/sidebar/PanelFactory.cxx b/svx/source/sidebar/PanelFactory.cxx index e5a0cad0085b..ecc22dc7a6fc 100644 --- a/svx/source/sidebar/PanelFactory.cxx +++ b/svx/source/sidebar/PanelFactory.cxx @@ -65,8 +65,8 @@ class PanelFactory public PanelFactoryInterfaceBase { public: - PanelFactory (void); - virtual ~PanelFactory (void); + PanelFactory(); + virtual ~PanelFactory(); // XUIElementFactory css::uno::Reference<css::ui::XUIElement> SAL_CALL createUIElement ( @@ -90,7 +90,7 @@ public: { return css::uno::Sequence<OUString>{"com.sun.star.ui.UIElementFactory"}; } }; -PanelFactory::PanelFactory (void) +PanelFactory::PanelFactory() : PanelFactoryInterfaceBase(m_aMutex) { } @@ -98,7 +98,7 @@ PanelFactory::PanelFactory (void) -PanelFactory::~PanelFactory (void) +PanelFactory::~PanelFactory() { } diff --git a/svx/source/sidebar/SelectionChangeHandler.cxx b/svx/source/sidebar/SelectionChangeHandler.cxx index bf62a1dc2314..b25011fd6586 100644 --- a/svx/source/sidebar/SelectionChangeHandler.cxx +++ b/svx/source/sidebar/SelectionChangeHandler.cxx @@ -33,7 +33,7 @@ using namespace sfx2::sidebar; namespace svx { namespace sidebar { SelectionChangeHandler::SelectionChangeHandler ( - const boost::function<rtl::OUString(void)>& rSelectionChangeCallback, + const boost::function<rtl::OUString()>& rSelectionChangeCallback, const Reference<frame::XController>& rxController, const EnumContext::Context eDefaultContext) : SelectionChangeHandlerInterfaceBase(m_aMutex), @@ -47,7 +47,7 @@ SelectionChangeHandler::SelectionChangeHandler ( -SelectionChangeHandler::~SelectionChangeHandler (void) +SelectionChangeHandler::~SelectionChangeHandler() { } @@ -80,7 +80,7 @@ void SAL_CALL SelectionChangeHandler::disposing (const lang::EventObject&) -void SAL_CALL SelectionChangeHandler::disposing (void) +void SAL_CALL SelectionChangeHandler::disposing() throw (uno::RuntimeException) { if (mbIsConnected) @@ -90,7 +90,7 @@ void SAL_CALL SelectionChangeHandler::disposing (void) -void SelectionChangeHandler::Connect (void) +void SelectionChangeHandler::Connect() { uno::Reference<view::XSelectionSupplier> xSupplier (mxController, uno::UNO_QUERY); if (xSupplier.is()) @@ -103,7 +103,7 @@ void SelectionChangeHandler::Connect (void) -void SelectionChangeHandler::Disconnect (void) +void SelectionChangeHandler::Disconnect() { uno::Reference<view::XSelectionSupplier> xSupplier (mxController, uno::UNO_QUERY); if (xSupplier.is()) diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx index 024ed48b2e33..ab4a4ff4e516 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx @@ -490,7 +490,7 @@ PopupControl* AreaPropertyPanel::CreateTransparencyGradientControl (PopupContain -void AreaPropertyPanel::SetupIcons(void) +void AreaPropertyPanel::SetupIcons() { if(Theme::GetBoolean(Theme::Bool_UseSymphonyIcons)) { @@ -1262,7 +1262,7 @@ void AreaPropertyPanel::SetGradient (const XGradient& rGradient) -sal_Int32 AreaPropertyPanel::GetSelectedTransparencyTypeIndex (void) const +sal_Int32 AreaPropertyPanel::GetSelectedTransparencyTypeIndex() const { return mpLBTransType->GetSelectEntryPos(); } diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hxx b/svx/source/sidebar/area/AreaPropertyPanel.hxx index a2a9f42ffca0..39a491d34080 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.hxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.hxx @@ -78,7 +78,7 @@ public: XGradient GetGradient (const css::awt::GradientStyle eStyle) const; void SetGradient (const XGradient& rGradient); - sal_Int32 GetSelectedTransparencyTypeIndex (void) const; + sal_Int32 GetSelectedTransparencyTypeIndex() const; private: sal_uInt16 meLastXFS; @@ -151,9 +151,9 @@ private: vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings); - virtual ~AreaPropertyPanel(void); + virtual ~AreaPropertyPanel(); - void SetupIcons(void); + void SetupIcons(); void Initialize(); void Update(); void ImpUpdateTransparencies(); diff --git a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx index ebe4210ce688..61bd9f120243 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx @@ -108,7 +108,7 @@ AreaTransparencyGradientControl::AreaTransparencyGradientControl ( -AreaTransparencyGradientControl::~AreaTransparencyGradientControl (void) +AreaTransparencyGradientControl::~AreaTransparencyGradientControl() { } diff --git a/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx b/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx index 8a526175b999..3486508cb133 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx @@ -41,7 +41,7 @@ public: AreaTransparencyGradientControl ( vcl::Window* pParent, AreaPropertyPanel& rPanel); - virtual ~AreaTransparencyGradientControl (void); + virtual ~AreaTransparencyGradientControl(); void Rearrange(XFillFloatTransparenceItem* pGradientItem); void InitStatus(XFillFloatTransparenceItem* pGradientItem); diff --git a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx index 5a1971ad4e68..6a132b69a2d8 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx @@ -32,7 +32,7 @@ AreaTransparencyGradientPopup::AreaTransparencyGradientPopup ( { } -AreaTransparencyGradientPopup::~AreaTransparencyGradientPopup (void) +AreaTransparencyGradientPopup::~AreaTransparencyGradientPopup() { } diff --git a/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx b/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx index 5d6ac9e8ec7c..ebbd1987bc2e 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx @@ -36,7 +36,7 @@ public : AreaTransparencyGradientPopup ( vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator); - virtual ~AreaTransparencyGradientPopup (void); + virtual ~AreaTransparencyGradientPopup(); void Rearrange (XFillFloatTransparenceItem* pItem); }; diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx index dd371dfa0861..55caa6c2feba 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx @@ -207,7 +207,7 @@ IMPL_LINK(GraphicPropertyPanel, GammaHdl, void *, EMPTYARG) -void GraphicPropertyPanel::SetupIcons(void) +void GraphicPropertyPanel::SetupIcons() { if(Theme::GetBoolean(Theme::Bool_UseSymphonyIcons)) { diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx index 8f3babcd40e8..a44f357674d5 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx @@ -100,7 +100,7 @@ private: SfxBindings* pBindings); virtual ~GraphicPropertyPanel(); - void SetupIcons(void); + void SetupIcons(); void Initialize(); }; diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.cxx b/svx/source/sidebar/insert/InsertPropertyPanel.cxx index 7f4925b22e51..cbf133f32eca 100644 --- a/svx/source/sidebar/insert/InsertPropertyPanel.cxx +++ b/svx/source/sidebar/insert/InsertPropertyPanel.cxx @@ -75,7 +75,7 @@ InsertPropertyPanel::InsertPropertyPanel ( -InsertPropertyPanel::~InsertPropertyPanel (void) +InsertPropertyPanel::~InsertPropertyPanel() { // Remove window child listener. vcl::Window* pTopWindow = this; diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.hxx b/svx/source/sidebar/insert/InsertPropertyPanel.hxx index b0a5426b84d5..bef58fd1919c 100644 --- a/svx/source/sidebar/insert/InsertPropertyPanel.hxx +++ b/svx/source/sidebar/insert/InsertPropertyPanel.hxx @@ -41,7 +41,7 @@ public: InsertPropertyPanel ( vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame); - virtual ~InsertPropertyPanel (void); + virtual ~InsertPropertyPanel(); private: ToolBox* mpStandardShapesToolBox; diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx index 052e16e7f47b..02d7f3389aec 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.cxx +++ b/svx/source/sidebar/line/LinePropertyPanel.cxx @@ -255,7 +255,7 @@ void LinePropertyPanel::Initialize() mpLBCapStyle->SetAccessibleName(OUString("Cap Style")); } -void LinePropertyPanel::SetupIcons(void) +void LinePropertyPanel::SetupIcons() { if(Theme::GetBoolean(Theme::Bool_UseSymphonyIcons)) { @@ -755,7 +755,7 @@ PopupControl* LinePropertyPanel::CreateLineWidthPopupControl (PopupContainer* pP return new LineWidthControl(pParent, *this); } -void LinePropertyPanel::EndLineWidthPopupMode (void) +void LinePropertyPanel::EndLineWidthPopupMode() { maLineWidthPopup.Hide(); } diff --git a/svx/source/sidebar/line/LinePropertyPanel.hxx b/svx/source/sidebar/line/LinePropertyPanel.hxx index 586573f506ed..bfa573a81ce8 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.hxx +++ b/svx/source/sidebar/line/LinePropertyPanel.hxx @@ -80,7 +80,7 @@ public: void SetWidthIcon(int n); void SetWidthIcon(); - void EndLineWidthPopupMode (void); + void EndLineWidthPopupMode(); private: //ui controls @@ -136,7 +136,7 @@ private: /// bitfield bool mbWidthValuable : 1; - void SetupIcons(void); + void SetupIcons(); void Initialize(); void FillLineEndList(); void FillLineStyleList(); @@ -157,7 +157,7 @@ private: vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings); - virtual ~LinePropertyPanel(void); + virtual ~LinePropertyPanel(); PopupControl* CreateLineWidthPopupControl (PopupContainer* pParent); }; diff --git a/svx/source/sidebar/line/LineWidthControl.cxx b/svx/source/sidebar/line/LineWidthControl.cxx index bf87a3d9b193..98fb8d2e9b1f 100644 --- a/svx/source/sidebar/line/LineWidthControl.cxx +++ b/svx/source/sidebar/line/LineWidthControl.cxx @@ -64,7 +64,7 @@ LineWidthControl::LineWidthControl ( -LineWidthControl::~LineWidthControl (void) +LineWidthControl::~LineWidthControl() { delete[] rStr; } diff --git a/svx/source/sidebar/line/LineWidthControl.hxx b/svx/source/sidebar/line/LineWidthControl.hxx index c2904381647a..4afa1e595c88 100644 --- a/svx/source/sidebar/line/LineWidthControl.hxx +++ b/svx/source/sidebar/line/LineWidthControl.hxx @@ -37,7 +37,7 @@ class LineWidthControl { public: LineWidthControl (vcl::Window* pParent, LinePropertyPanel& rPanel); - virtual ~LineWidthControl (void); + virtual ~LineWidthControl(); virtual void GetFocus() SAL_OVERRIDE; virtual void Paint(const Rectangle& rect) SAL_OVERRIDE; diff --git a/svx/source/sidebar/line/LineWidthPopup.cxx b/svx/source/sidebar/line/LineWidthPopup.cxx index 5e587821b21a..686850e327e2 100644 --- a/svx/source/sidebar/line/LineWidthPopup.cxx +++ b/svx/source/sidebar/line/LineWidthPopup.cxx @@ -38,7 +38,7 @@ LineWidthPopup::LineWidthPopup ( SetPopupModeEndHandler(::boost::bind(&LineWidthPopup::PopupModeEndCallback, this)); } -LineWidthPopup::~LineWidthPopup (void) +LineWidthPopup::~LineWidthPopup() { } @@ -51,7 +51,7 @@ void LineWidthPopup::SetWidthSelect (long lValue, bool bValuable, SfxMapUnit eMa pControl->SetWidthSelect(lValue, bValuable, eMapUnit); } -void LineWidthPopup::PopupModeEndCallback (void) +void LineWidthPopup::PopupModeEndCallback() { LineWidthControl* pControl = dynamic_cast<LineWidthControl*>(mxControl.get()); if (pControl != NULL) diff --git a/svx/source/sidebar/line/LineWidthPopup.hxx b/svx/source/sidebar/line/LineWidthPopup.hxx index 8cbe0e5ee960..7a2fe7b5c8f4 100644 --- a/svx/source/sidebar/line/LineWidthPopup.hxx +++ b/svx/source/sidebar/line/LineWidthPopup.hxx @@ -35,12 +35,12 @@ public : LineWidthPopup ( vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator); - virtual ~LineWidthPopup (void); + virtual ~LineWidthPopup(); void SetWidthSelect (long lValue, bool bValuable, SfxMapUnit eMapUnit); private: - void PopupModeEndCallback (void); + void PopupModeEndCallback(); }; } } // end of namespace svx::sidebar diff --git a/svx/source/sidebar/line/LineWidthValueSet.cxx b/svx/source/sidebar/line/LineWidthValueSet.cxx index d9af174bc253..fb17d25cc84d 100644 --- a/svx/source/sidebar/line/LineWidthValueSet.cxx +++ b/svx/source/sidebar/line/LineWidthValueSet.cxx @@ -39,7 +39,7 @@ LineWidthValueSet::LineWidthValueSet ( -LineWidthValueSet::~LineWidthValueSet (void) +LineWidthValueSet::~LineWidthValueSet() { delete pVDev; delete[] strUnit; diff --git a/svx/source/sidebar/line/LineWidthValueSet.hxx b/svx/source/sidebar/line/LineWidthValueSet.hxx index 75c2b69286a1..4fe20e46208f 100644 --- a/svx/source/sidebar/line/LineWidthValueSet.hxx +++ b/svx/source/sidebar/line/LineWidthValueSet.hxx @@ -29,7 +29,7 @@ class LineWidthValueSet { public: LineWidthValueSet (vcl::Window* pParent, const ResId& rResId); - virtual ~LineWidthValueSet (void); + virtual ~LineWidthValueSet(); void SetUnit(OUString* str); void SetSelItem(sal_uInt16 nSel); diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx index a6b3f74cf6d5..c110d74502fd 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx @@ -113,7 +113,7 @@ private: const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, const css::uno::Reference<css::ui::XSidebar>& rxSidebar); - virtual ~ParaPropertyPanel (void); + virtual ~ParaPropertyPanel(); DECL_LINK(ModifyIndentHdl_Impl, void*); DECL_LINK(ClickIndent_IncDec_Hdl_Impl, ToolBox*); diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index d4011d67c0dc..b9c3c3cd5b6f 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -199,7 +199,7 @@ void PosSizePropertyPanel::Initialize() -void PosSizePropertyPanel::SetupIcons(void) +void PosSizePropertyPanel::SetupIcons() { if(Theme::GetBoolean(Theme::Bool_UseSymphonyIcons)) { diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx index e9d665673773..1d2af6c7c916 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx @@ -148,7 +148,7 @@ private: DECL_LINK( RotationHdl, void * ); DECL_LINK( FlipHdl, ToolBox * ); - void SetupIcons(void); + void SetupIcons(); void Initialize(); void executePosX(); void executePosY(); diff --git a/svx/source/sidebar/possize/SidebarDialControl.cxx b/svx/source/sidebar/possize/SidebarDialControl.cxx index 2f422a9b5166..dc30100751e6 100644 --- a/svx/source/sidebar/possize/SidebarDialControl.cxx +++ b/svx/source/sidebar/possize/SidebarDialControl.cxx @@ -35,7 +35,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSidebarDialControl(vcl return new SidebarDialControl(pParent, WB_TABSTOP); } -SidebarDialControl::~SidebarDialControl (void) +SidebarDialControl::~SidebarDialControl() { } diff --git a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx index 57ea21ad0c52..1137cdb41aaa 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx +++ b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx @@ -34,7 +34,7 @@ TextCharacterSpacingPopup::TextCharacterSpacingPopup ( SetPopupModeEndHandler(::boost::bind(&TextCharacterSpacingPopup::PopupModeEndCallback, this)); } -TextCharacterSpacingPopup::~TextCharacterSpacingPopup (void) +TextCharacterSpacingPopup::~TextCharacterSpacingPopup() { } @@ -47,7 +47,7 @@ void TextCharacterSpacingPopup::Rearrange (bool bLBAvailable,bool bAvailable, lo pControl->Rearrange(bLBAvailable,bAvailable,nKerning); } -void TextCharacterSpacingPopup::PopupModeEndCallback (void) +void TextCharacterSpacingPopup::PopupModeEndCallback() { ProvideContainerAndControl(); TextCharacterSpacingControl* pControl = dynamic_cast<TextCharacterSpacingControl*>(mxControl.get()); diff --git a/svx/source/sidebar/text/TextCharacterSpacingPopup.hxx b/svx/source/sidebar/text/TextCharacterSpacingPopup.hxx index 17ad29cfd09f..9a55c0faa8d4 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingPopup.hxx +++ b/svx/source/sidebar/text/TextCharacterSpacingPopup.hxx @@ -32,11 +32,11 @@ public : TextCharacterSpacingPopup ( vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator); - virtual ~TextCharacterSpacingPopup (void); + virtual ~TextCharacterSpacingPopup(); void Rearrange (bool bLBAvailable,bool bAvailable, long nKerning); private: - void PopupModeEndCallback (void); + void PopupModeEndCallback(); }; } } // end of namespace svx::sidebar diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx b/svx/source/sidebar/text/TextPropertyPanel.cxx index 5744f0a1449c..b069099feb56 100644 --- a/svx/source/sidebar/text/TextPropertyPanel.cxx +++ b/svx/source/sidebar/text/TextPropertyPanel.cxx @@ -114,7 +114,7 @@ TextPropertyPanel::TextPropertyPanel ( vcl::Window* pParent, const css::uno::Ref mlKerning = 0; } -TextPropertyPanel::~TextPropertyPanel (void) +TextPropertyPanel::~TextPropertyPanel() { } @@ -168,12 +168,12 @@ void TextPropertyPanel::DataChanged (const DataChangedEvent& /*rEvent*/) SetupToolboxItems(); } -void TextPropertyPanel::EndSpacingPopupMode (void) +void TextPropertyPanel::EndSpacingPopupMode() { maCharSpacePopup.Hide(); } -void TextPropertyPanel::EndUnderlinePopupMode (void) +void TextPropertyPanel::EndUnderlinePopupMode() { maUnderlinePopup.Hide(); } @@ -194,7 +194,7 @@ void TextPropertyPanel::InitToolBoxSpacing() mpToolBoxSpacing->SetSelectHdl( aLink ); } -void TextPropertyPanel::SetupToolboxItems (void) +void TextPropertyPanel::SetupToolboxItems() { maUnderlineControl.SetupToolBoxItem(*mpToolBoxFont, mpToolBoxFont->GetItemId(UNO_UNDERLINE)); maSpacingControl.SetupToolBoxItem(*mpToolBoxSpacing, mpToolBoxSpacing->GetItemId(UNO_SPACING)); diff --git a/svx/source/sidebar/text/TextPropertyPanel.hxx b/svx/source/sidebar/text/TextPropertyPanel.hxx index f0734dab09a7..7d7a229ddcfc 100644 --- a/svx/source/sidebar/text/TextPropertyPanel.hxx +++ b/svx/source/sidebar/text/TextPropertyPanel.hxx @@ -56,8 +56,8 @@ public: ::sfx2::sidebar::ControllerItem& GetSpaceController() { return maSpacingControl;} long GetSelFontSize(); - void EndSpacingPopupMode (void); - void EndUnderlinePopupMode (void); + void EndSpacingPopupMode(); + void EndUnderlinePopupMode(); Color& GetUnderlineColor() { return meUnderlineColor;} @@ -102,7 +102,7 @@ private: const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, const ::sfx2::sidebar::EnumContext& rContext); - virtual ~TextPropertyPanel (void); + virtual ~TextPropertyPanel(); PopupControl* CreateCharacterSpacingControl (PopupContainer* pParent); @@ -110,7 +110,7 @@ private: DECL_LINK(SpacingClickHdl, ToolBox*); DECL_LINK(UnderlineClickHdl, ToolBox* ); - void SetupToolboxItems (void); + void SetupToolboxItems(); void InitToolBoxFont(); void InitToolBoxSpacing(); }; diff --git a/svx/source/sidebar/text/TextUnderlinePopup.cxx b/svx/source/sidebar/text/TextUnderlinePopup.cxx index 0aab2b4e58a9..f9ce1bc4e674 100644 --- a/svx/source/sidebar/text/TextUnderlinePopup.cxx +++ b/svx/source/sidebar/text/TextUnderlinePopup.cxx @@ -32,7 +32,7 @@ TextUnderlinePopup::TextUnderlinePopup ( { } -TextUnderlinePopup::~TextUnderlinePopup (void) +TextUnderlinePopup::~TextUnderlinePopup() { } diff --git a/svx/source/sidebar/text/TextUnderlinePopup.hxx b/svx/source/sidebar/text/TextUnderlinePopup.hxx index ce4caa0b28f9..0643d927abb0 100644 --- a/svx/source/sidebar/text/TextUnderlinePopup.hxx +++ b/svx/source/sidebar/text/TextUnderlinePopup.hxx @@ -32,7 +32,7 @@ public : TextUnderlinePopup ( vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator); - virtual ~TextUnderlinePopup (void); + virtual ~TextUnderlinePopup(); void Rearrange (FontUnderline eLine); }; diff --git a/svx/source/sidebar/tools/Popup.cxx b/svx/source/sidebar/tools/Popup.cxx index 18109ec39f9d..8647fb398b16 100644 --- a/svx/source/sidebar/tools/Popup.cxx +++ b/svx/source/sidebar/tools/Popup.cxx @@ -40,7 +40,7 @@ Popup::Popup ( OSL_ASSERT(maControlCreator); } -Popup::~Popup (void) +Popup::~Popup() { mxControl.reset(); mxContainer.reset(); @@ -77,21 +77,21 @@ void Popup::Show (ToolBox& rToolBox) } } -void Popup::Hide (void) +void Popup::Hide() { if (mxContainer) if (mxContainer->IsInPopupMode()) mxContainer->EndPopupMode(); } -void Popup::SetPopupModeEndHandler (const ::boost::function<void(void)>& rCallback) +void Popup::SetPopupModeEndHandler (const ::boost::function<void()>& rCallback) { maPopupModeEndCallback = rCallback; if (mxContainer) mxContainer->SetPopupModeEndHdl(LINK(this, Popup, PopupModeEndHandler)); } -void Popup::ProvideContainerAndControl (void) +void Popup::ProvideContainerAndControl() { if ( ! (mxContainer && mxControl) && mpParent!=NULL @@ -101,7 +101,7 @@ void Popup::ProvideContainerAndControl (void) } } -void Popup::CreateContainerAndControl (void) +void Popup::CreateContainerAndControl() { mxContainer.reset(new PopupContainer(mpParent)); mxContainer->SetAccessibleName(msAccessibleName); diff --git a/svx/source/sidebar/tools/PopupContainer.cxx b/svx/source/sidebar/tools/PopupContainer.cxx index 1c37b6c6bbf0..675e80fbabf1 100644 --- a/svx/source/sidebar/tools/PopupContainer.cxx +++ b/svx/source/sidebar/tools/PopupContainer.cxx @@ -30,7 +30,7 @@ PopupContainer::PopupContainer (vcl::Window* pParent) -PopupContainer::~PopupContainer (void) +PopupContainer::~PopupContainer() { } diff --git a/svx/source/sidebar/tools/PopupControl.cxx b/svx/source/sidebar/tools/PopupControl.cxx index d8c686546e29..48a908b4938f 100644 --- a/svx/source/sidebar/tools/PopupControl.cxx +++ b/svx/source/sidebar/tools/PopupControl.cxx @@ -38,7 +38,7 @@ PopupControl::PopupControl ( -PopupControl::~PopupControl (void) +PopupControl::~PopupControl() { } diff --git a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx index 5ef7f36ca384..3927029ad371 100644 --- a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx +++ b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx @@ -42,7 +42,7 @@ ValueSetWithTextControl::ValueSetWithTextControl( } -ValueSetWithTextControl::~ValueSetWithTextControl(void) +ValueSetWithTextControl::~ValueSetWithTextControl() { } diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 2108dab7b940..3ea38340eaf4 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -840,7 +840,7 @@ void SdrObject::SetGrabBagItem(const com::sun::star::uno::Any& rVal) BroadcastObjectChange(); } -sal_uInt32 SdrObject::GetNavigationPosition (void) +sal_uInt32 SdrObject::GetNavigationPosition() { if (pObjList!=NULL && pObjList->RecalcNavigationPositions()) { diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index d3f9a931b1c1..3aec601a17f8 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -131,9 +131,9 @@ class SdrGraphicUpdater : public ::osl::Thread { public: SdrGraphicUpdater( const OUString& rFileName, const OUString& rFilterName, SdrGraphicLink& ); - virtual ~SdrGraphicUpdater( void ); + virtual ~SdrGraphicUpdater(); - void SAL_CALL Terminate( void ); + void SAL_CALL Terminate(); bool GraphicLinkChanged( const OUString& rFileName ){ return maFileName != rFileName; }; @@ -142,12 +142,12 @@ protected: /** is called from the inherited create method and acts as the main function of this thread. */ - virtual void SAL_CALL run(void) SAL_OVERRIDE; + virtual void SAL_CALL run() SAL_OVERRIDE; /** Called after the thread is terminated via the terminate method. Used to kill the thread by calling delete on this. */ - virtual void SAL_CALL onTerminated(void) SAL_OVERRIDE; + virtual void SAL_CALL onTerminated() SAL_OVERRIDE; private: @@ -167,7 +167,7 @@ SdrGraphicUpdater::SdrGraphicUpdater( const OUString& rFileName, const OUString& create(); } -SdrGraphicUpdater::~SdrGraphicUpdater( void ) +SdrGraphicUpdater::~SdrGraphicUpdater() { } @@ -176,12 +176,12 @@ void SdrGraphicUpdater::Terminate() mbIsTerminated = true; } -void SAL_CALL SdrGraphicUpdater::onTerminated(void) +void SAL_CALL SdrGraphicUpdater::onTerminated() { delete this; } -void SAL_CALL SdrGraphicUpdater::run(void) +void SAL_CALL SdrGraphicUpdater::run() { osl_setThreadName("SdrGraphicUpdater"); diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 590f847a62cb..ede8b069f5b3 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -763,7 +763,7 @@ void SdrObjList::UnGroupObj( size_t nObjNum ) -bool SdrObjList::HasObjectNavigationOrder (void) const +bool SdrObjList::HasObjectNavigationOrder() const { return mxNavigationOrder.get() != NULL; } @@ -857,7 +857,7 @@ SdrObject* SdrObjList::GetObjectForNavigationPosition (const sal_uInt32 nNavigat -void SdrObjList::ClearObjectNavigationOrder (void) +void SdrObjList::ClearObjectNavigationOrder() { mxNavigationOrder.reset(); mbIsNavigationOrderDirty = true; @@ -866,7 +866,7 @@ void SdrObjList::ClearObjectNavigationOrder (void) -bool SdrObjList::RecalcNavigationPositions (void) +bool SdrObjList::RecalcNavigationPositions() { if (mbIsNavigationOrderDirty) { diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index e04614eb363e..3770c656a2a2 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -59,14 +59,14 @@ AccessibleCell::AccessibleCell( const ::com::sun::star::uno::Reference< ::com::s -AccessibleCell::~AccessibleCell (void) +AccessibleCell::~AccessibleCell() { DBG_ASSERT( mpText == 0, "svx::AccessibleCell::~AccessibleCell(), not disposed!?" ); } -void AccessibleCell::Init (void) +void AccessibleCell::Init() { SdrView* pView = maShapeTreeInfo.GetSdrView(); const vcl::Window* pWindow = maShapeTreeInfo.GetWindow (); @@ -198,7 +198,7 @@ Reference<XAccessible> SAL_CALL AccessibleCell::getAccessibleChild (sal_Int32 nI SHOWING VISIBLE */ -Reference<XAccessibleStateSet> SAL_CALL AccessibleCell::getAccessibleStateSet (void) throw (RuntimeException, std::exception) +Reference<XAccessibleStateSet> SAL_CALL AccessibleCell::getAccessibleStateSet() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard (maMutex); @@ -313,7 +313,7 @@ Reference<XAccessible > SAL_CALL AccessibleCell::getAccessibleAtPoint ( const : -::com::sun::star::awt::Rectangle SAL_CALL AccessibleCell::getBounds(void) throw(RuntimeException, std::exception) +::com::sun::star::awt::Rectangle SAL_CALL AccessibleCell::getBounds() throw(RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard (maMutex); @@ -360,7 +360,7 @@ Reference<XAccessible > SAL_CALL AccessibleCell::getAccessibleAtPoint ( const : -::com::sun::star::awt::Point SAL_CALL AccessibleCell::getLocation(void) throw (RuntimeException, std::exception) +::com::sun::star::awt::Point SAL_CALL AccessibleCell::getLocation() throw (RuntimeException, std::exception) { ThrowIfDisposed (); ::com::sun::star::awt::Rectangle aBoundingBox(getBounds()); @@ -369,7 +369,7 @@ Reference<XAccessible > SAL_CALL AccessibleCell::getAccessibleAtPoint ( const : -::com::sun::star::awt::Point SAL_CALL AccessibleCell::getLocationOnScreen(void) throw(RuntimeException, std::exception) +::com::sun::star::awt::Point SAL_CALL AccessibleCell::getLocationOnScreen() throw(RuntimeException, std::exception) { ThrowIfDisposed (); @@ -394,7 +394,7 @@ Reference<XAccessible > SAL_CALL AccessibleCell::getAccessibleAtPoint ( const : -awt::Size SAL_CALL AccessibleCell::getSize (void) throw (RuntimeException, std::exception) +awt::Size SAL_CALL AccessibleCell::getSize() throw (RuntimeException, std::exception) { ThrowIfDisposed (); awt::Rectangle aBoundingBox (getBounds()); @@ -417,14 +417,14 @@ void SAL_CALL AccessibleCell::removeFocusListener (const ::com::sun::star::uno:: -void SAL_CALL AccessibleCell::grabFocus (void) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL AccessibleCell::grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) { AccessibleComponentBase::grabFocus(); } -sal_Int32 SAL_CALL AccessibleCell::getForeground(void) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleCell::getForeground() throw (RuntimeException, std::exception) { ThrowIfDisposed (); sal_Int32 nColor (0x0ffffffL); @@ -435,7 +435,7 @@ sal_Int32 SAL_CALL AccessibleCell::getForeground(void) throw (RuntimeException, -sal_Int32 SAL_CALL AccessibleCell::getBackground (void) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleCell::getBackground() throw (RuntimeException, std::exception) { ThrowIfDisposed (); sal_Int32 nColor (0L); @@ -448,7 +448,7 @@ sal_Int32 SAL_CALL AccessibleCell::getBackground (void) throw (RuntimeException, // XAccessibleExtendedComponent -::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL AccessibleCell::getFont (void) throw (::com::sun::star::uno::RuntimeException, std::exception) +::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL AccessibleCell::getFont() throw (::com::sun::star::uno::RuntimeException, std::exception) { //todo return AccessibleComponentBase::getFont(); @@ -456,14 +456,14 @@ sal_Int32 SAL_CALL AccessibleCell::getBackground (void) throw (RuntimeException, -OUString SAL_CALL AccessibleCell::getTitledBorderText (void) throw (::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL AccessibleCell::getTitledBorderText() throw (::com::sun::star::uno::RuntimeException, std::exception) { return AccessibleComponentBase::getTitledBorderText(); } -OUString SAL_CALL AccessibleCell::getToolTipText (void) throw (::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL AccessibleCell::getToolTipText() throw (::com::sun::star::uno::RuntimeException, std::exception) { return AccessibleComponentBase::getToolTipText(); } @@ -504,14 +504,14 @@ void SAL_CALL AccessibleCell::removeAccessibleEventListener( const Reference<XAc // XServiceInfo -OUString SAL_CALL AccessibleCell::getImplementationName(void) throw (RuntimeException, std::exception) +OUString SAL_CALL AccessibleCell::getImplementationName() throw (RuntimeException, std::exception) { return OUString("AccessibleCell"); } -Sequence<OUString> SAL_CALL AccessibleCell::getSupportedServiceNames(void) throw (RuntimeException, std::exception) +Sequence<OUString> SAL_CALL AccessibleCell::getSupportedServiceNames() throw (RuntimeException, std::exception) { ThrowIfDisposed (); @@ -545,7 +545,7 @@ void AccessibleCell::ViewForwarderChanged (ChangeType /*aChangeType*/, const IAc // protected -void AccessibleCell::disposing (void) +void AccessibleCell::disposing() { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard (maMutex); @@ -572,7 +572,7 @@ void AccessibleCell::disposing (void) AccessibleContextBase::dispose (); } -sal_Int32 SAL_CALL AccessibleCell::getAccessibleIndexInParent (void) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleCell::getAccessibleIndexInParent() throw (RuntimeException, std::exception) { ThrowIfDisposed (); return mnIndexInParent; @@ -615,7 +615,7 @@ OUString AccessibleCell::getCellName( sal_Int32 nCol, sal_Int32 nRow ) return aBuf.makeStringAndClear(); } -OUString SAL_CALL AccessibleCell::getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL AccessibleCell::getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); SolarMutexGuard aSolarGuard; @@ -646,7 +646,7 @@ void AccessibleCell::UpdateChildren() +If this is correct, we also don't need sdr::table::CellRef getCellRef(), UpdateChildren(), getCellName( sal_Int32 nCol, sal_Int32 nRow ) above + -OUString SAL_CALL AccessibleCell::getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL AccessibleCell::getAccessibleName() throw (::com::sun::star::uno::RuntimeException) { ThrowIfDisposed (); SolarMutexGuard aSolarGuard; diff --git a/svx/source/table/accessiblecell.hxx b/svx/source/table/accessiblecell.hxx index 86d31e9d38d1..f004442639bf 100644 --- a/svx/source/table/accessiblecell.hxx +++ b/svx/source/table/accessiblecell.hxx @@ -52,9 +52,9 @@ class AccessibleCell : boost::noncopyable, public AccessibleCellBase, public Acc { public: AccessibleCell( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, const sdr::table::CellRef& rCell, sal_Int32 nIndex, const AccessibleShapeTreeInfo& rShapeTreeInfo); - virtual ~AccessibleCell (void); + virtual ~AccessibleCell(); - void Init (void); + void Init(); bool operator== (const AccessibleCell& rAccessibleCell); @@ -67,11 +67,11 @@ public: virtual void SAL_CALL release( ) throw () SAL_OVERRIDE; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount(void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; 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, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet(void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; sdr::table::CellRef getCellRef() { return mxCell;} void UpdateChildren(); OUString getCellName( sal_Int32 nCol, sal_Int32 nRow ); @@ -79,28 +79,28 @@ public: // XAccessibleComponent virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; 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, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds(void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::awt::Point SAL_CALL getLocation(void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen(void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::awt::Size SAL_CALL getSize(void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Point SAL_CALL getLocation() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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 addFocusListener ( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL removeFocusListener (const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; - virtual void SAL_CALL grabFocus (void) 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 void SAL_CALL grabFocus() 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; // XAccessibleExtendedComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getTitledBorderText (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getToolTipText (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getTitledBorderText() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getToolTipText() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleEventBroadcaster virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName (void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // IAccessibleViewForwarderListener virtual void ViewForwarderChanged (ChangeType aChangeType, const IAccessibleViewForwarder* pViewForwarder) SAL_OVERRIDE; @@ -126,7 +126,7 @@ protected: sdr::table::CellRef mxCell; /// This method is called from the component helper base class while disposing. - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; AccessibleTableShape *pAccTable; diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx index 1cb7685b2004..862c39f58507 100644 --- a/svx/source/table/accessibletableshape.cxx +++ b/svx/source/table/accessibletableshape.cxx @@ -311,7 +311,7 @@ AccessibleTableShape::AccessibleTableShape( const AccessibleShapeInfo& rShapeInf -AccessibleTableShape::~AccessibleTableShape (void) +AccessibleTableShape::~AccessibleTableShape() { } @@ -380,20 +380,20 @@ void SAL_CALL AccessibleTableShape::release( ) throw () // XAccessible -Reference< XAccessibleContext > SAL_CALL AccessibleTableShape::getAccessibleContext(void) throw (RuntimeException, std::exception) +Reference< XAccessibleContext > SAL_CALL AccessibleTableShape::getAccessibleContext() throw (RuntimeException, std::exception) { return AccessibleShape::getAccessibleContext (); } -OUString SAL_CALL AccessibleTableShape::getImplementationName(void) throw (RuntimeException, std::exception) +OUString SAL_CALL AccessibleTableShape::getImplementationName() throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.accessibility.AccessibleTableShape" ); } -OUString AccessibleTableShape::CreateAccessibleBaseName(void) throw (RuntimeException) +OUString AccessibleTableShape::CreateAccessibleBaseName() throw (RuntimeException) { return OUString("TableShape"); } @@ -423,14 +423,14 @@ Reference< XAccessibleRelationSet > SAL_CALL AccessibleTableShape::getAccessible -sal_Int16 SAL_CALL AccessibleTableShape::getAccessibleRole (void) throw (RuntimeException, std::exception) +sal_Int16 SAL_CALL AccessibleTableShape::getAccessibleRole() throw (RuntimeException, std::exception) { return AccessibleRole::TABLE; } -void SAL_CALL AccessibleTableShape::disposing (void) +void SAL_CALL AccessibleTableShape::disposing() { mxImpl->dispose(); @@ -1037,13 +1037,13 @@ AccessibleTableHeaderShape::AccessibleTableHeaderShape( AccessibleTableShape* pT mbRow = bRow; } -AccessibleTableHeaderShape::~AccessibleTableHeaderShape (void) +AccessibleTableHeaderShape::~AccessibleTableHeaderShape() { mpTable = NULL; } // XAccessible -Reference< XAccessibleContext > SAL_CALL AccessibleTableHeaderShape::getAccessibleContext(void) throw (RuntimeException, std::exception) +Reference< XAccessibleContext > SAL_CALL AccessibleTableHeaderShape::getAccessibleContext() throw (RuntimeException, std::exception) { return this; } @@ -1059,43 +1059,43 @@ Reference< XAccessible > SAL_CALL AccessibleTableHeaderShape::getAccessibleChild return mpTable->getAccessibleChild( i ); } -Reference< XAccessible > SAL_CALL AccessibleTableHeaderShape::getAccessibleParent (void) throw (RuntimeException, std::exception) +Reference< XAccessible > SAL_CALL AccessibleTableHeaderShape::getAccessibleParent() throw (RuntimeException, std::exception) { Reference< XAccessible > XParent; return XParent; } -sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleIndexInParent (void) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleIndexInParent() throw (RuntimeException, std::exception) { return -1; } -sal_Int16 SAL_CALL AccessibleTableHeaderShape::getAccessibleRole (void) throw (RuntimeException, std::exception) +sal_Int16 SAL_CALL AccessibleTableHeaderShape::getAccessibleRole() throw (RuntimeException, std::exception) { return mpTable->getAccessibleRole(); } -OUString SAL_CALL AccessibleTableHeaderShape::getAccessibleDescription (void) throw (RuntimeException, std::exception) +OUString SAL_CALL AccessibleTableHeaderShape::getAccessibleDescription() throw (RuntimeException, std::exception) { return mpTable->getAccessibleDescription(); } -OUString SAL_CALL AccessibleTableHeaderShape::getAccessibleName (void) throw (RuntimeException, std::exception) +OUString SAL_CALL AccessibleTableHeaderShape::getAccessibleName() throw (RuntimeException, std::exception) { return mpTable->getAccessibleName(); } -Reference< XAccessibleStateSet > SAL_CALL AccessibleTableHeaderShape::getAccessibleStateSet (void) throw (RuntimeException, std::exception) +Reference< XAccessibleStateSet > SAL_CALL AccessibleTableHeaderShape::getAccessibleStateSet() throw (RuntimeException, std::exception) { return mpTable->getAccessibleStateSet(); } -Reference< XAccessibleRelationSet > SAL_CALL AccessibleTableHeaderShape::getAccessibleRelationSet (void) throw (RuntimeException, std::exception) +Reference< XAccessibleRelationSet > SAL_CALL AccessibleTableHeaderShape::getAccessibleRelationSet() throw (RuntimeException, std::exception) { return mpTable->getAccessibleRelationSet(); } -Locale SAL_CALL AccessibleTableHeaderShape::getLocale (void) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) +Locale SAL_CALL AccessibleTableHeaderShape::getLocale() throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) { return mpTable->getLocale(); } @@ -1111,37 +1111,37 @@ Reference< XAccessible > SAL_CALL AccessibleTableHeaderShape::getAccessibleAtPoi return mpTable->getAccessibleAtPoint( aPoint ); } -::com::sun::star::awt::Rectangle SAL_CALL AccessibleTableHeaderShape::getBounds (void) throw (RuntimeException, std::exception) +::com::sun::star::awt::Rectangle SAL_CALL AccessibleTableHeaderShape::getBounds() throw (RuntimeException, std::exception) { return mpTable->getBounds(); } -::com::sun::star::awt::Point SAL_CALL AccessibleTableHeaderShape::getLocation (void) throw (RuntimeException, std::exception) +::com::sun::star::awt::Point SAL_CALL AccessibleTableHeaderShape::getLocation() throw (RuntimeException, std::exception) { return mpTable->getLocation(); } -::com::sun::star::awt::Point SAL_CALL AccessibleTableHeaderShape::getLocationOnScreen (void) throw (RuntimeException, std::exception) +::com::sun::star::awt::Point SAL_CALL AccessibleTableHeaderShape::getLocationOnScreen() throw (RuntimeException, std::exception) { return mpTable->getLocationOnScreen(); } -::com::sun::star::awt::Size SAL_CALL AccessibleTableHeaderShape::getSize (void) throw (RuntimeException, std::exception) +::com::sun::star::awt::Size SAL_CALL AccessibleTableHeaderShape::getSize() throw (RuntimeException, std::exception) { return mpTable->getSize(); } -sal_Int32 SAL_CALL AccessibleTableHeaderShape::getForeground (void) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleTableHeaderShape::getForeground() throw (RuntimeException, std::exception) { return mpTable->getForeground(); } -sal_Int32 SAL_CALL AccessibleTableHeaderShape::getBackground (void) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleTableHeaderShape::getBackground() throw (RuntimeException, std::exception) { return mpTable->getBackground(); } -void SAL_CALL AccessibleTableHeaderShape::grabFocus (void) throw (RuntimeException, std::exception) +void SAL_CALL AccessibleTableHeaderShape::grabFocus() throw (RuntimeException, std::exception) { mpTable->grabFocus(); } diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index f78e8276db9e..8aaf2c187823 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -484,7 +484,7 @@ void SvxColorDockingWindow::Resize() -void SvxColorDockingWindow::GetFocus (void) +void SvxColorDockingWindow::GetFocus() { SfxDockingWindow::GetFocus(); // Grab the focus to the color value set so that it can be controlled diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index bee2f93e3def..836fad360479 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -594,7 +594,7 @@ void SvxLineEndWindow::SetSize() //SetMinOutputSizePixel( aSize ); } -void SvxLineEndWindow::GetFocus (void) +void SvxLineEndWindow::GetFocus() { SfxPopupWindow::GetFocus(); // Grab the focus to the line ends value set so that it can be controlled diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 8782e769deef..88a6b93f6139 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -1879,7 +1879,7 @@ struct SvxStyleToolBoxControl::Impl bool bSpecModeWriter; bool bSpecModeCalc; - inline Impl( void ) + inline Impl() :aClearForm ( SVX_RESSTR( RID_SVXSTR_CLEARFORM ) ) ,aMore ( SVX_RESSTR( RID_SVXSTR_MORE_STYLES ) ) ,bSpecModeWriter ( false ) diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index ce5c75e22124..6924b90d4343 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -4183,7 +4183,7 @@ void SAL_CALL SvxShapeRect::release() throw() // XServiceInfo -uno::Sequence< OUString > SvxShapeRect::getSupportedServiceNames(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SvxShapeRect::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { return SvxShape::getSupportedServiceNames(); } diff --git a/svx/workben/msview/xmlconfig.cxx b/svx/workben/msview/xmlconfig.cxx index 4bdd057f3b88..a3324a3027c4 100644 --- a/svx/workben/msview/xmlconfig.cxx +++ b/svx/workben/msview/xmlconfig.cxx @@ -55,8 +55,8 @@ class ConfigHandler : public ::cppu::WeakAggImplHelper1<XDocumentHandler> { public: // XDocumentHandler - virtual void SAL_CALL startDocument(void) throw( SAXException, RuntimeException ); - virtual void SAL_CALL endDocument(void) throw( SAXException, RuntimeException ); + virtual void SAL_CALL startDocument() throw( SAXException, RuntimeException ); + virtual void SAL_CALL endDocument() throw( SAXException, RuntimeException ); virtual void SAL_CALL startElement(const OUString& aName, const Reference< XAttributeList > & xAttribs) throw( SAXException, RuntimeException ); virtual void SAL_CALL endElement(const OUString& aName) throw( SAXException, RuntimeException ); virtual void SAL_CALL characters(const OUString& aChars) throw( SAXException, RuntimeException ); @@ -147,11 +147,11 @@ OUString ConfigHandler::getAttribute( const Reference< XAttributeList > & xAttri return OUString(); } -void SAL_CALL ConfigHandler::startDocument(void) throw( SAXException, RuntimeException ) +void SAL_CALL ConfigHandler::startDocument() throw( SAXException, RuntimeException ) { } -void SAL_CALL ConfigHandler::endDocument(void) throw( SAXException, RuntimeException ) +void SAL_CALL ConfigHandler::endDocument() throw( SAXException, RuntimeException ) { } diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx index b0c527af522f..97eaa42cf668 100644 --- a/sw/inc/AnnotationWin.hxx +++ b/sw/inc/AnnotationWin.hxx @@ -58,7 +58,7 @@ class SwAnnotationWin : public sw::sidebarwindows::SwSidebarWin virtual MenuButton* CreateMenuButton() SAL_OVERRIDE; private: - virtual SvxLanguageItem GetLanguage(void) SAL_OVERRIDE; + virtual SvxLanguageItem GetLanguage() SAL_OVERRIDE; sal_uInt32 CountFollowing(); SwFmtFld* mpFmtFld; diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx index 4df4582bd941..03ac80de5bd4 100644 --- a/sw/inc/SidebarWin.hxx +++ b/sw/inc/SidebarWin.hxx @@ -199,7 +199,7 @@ class SwSidebarWin : public vcl::Window private: SwSidebarWin* GetTopReplyNote(); - virtual SvxLanguageItem GetLanguage(void); + virtual SvxLanguageItem GetLanguage(); SwPostItMgr& mrMgr; SwView& mrView; diff --git a/sw/inc/SwXMLSectionList.hxx b/sw/inc/SwXMLSectionList.hxx index 0a727d57b46d..f6090c7f61ae 100644 --- a/sw/inc/SwXMLSectionList.hxx +++ b/sw/inc/SwXMLSectionList.hxx @@ -56,7 +56,7 @@ public: const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; - virtual ~SvXMLSectionListContext ( void ); + virtual ~SvXMLSectionListContext(); }; #endif diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx index bb3cd7ca0ffc..4426e3582028 100644 --- a/sw/inc/unocoll.hxx +++ b/sw/inc/unocoll.hxx @@ -278,7 +278,7 @@ public: //XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XElementAccess @@ -286,9 +286,9 @@ public: virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; static css::uno::Reference<css::text::XTextTable> GetObject(SwFrmFmt& rFmt); }; @@ -312,15 +312,15 @@ public: SwXFrames(SwDoc* pDoc, FlyCntType eSet); //XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XIndexAccess - virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XElementAccess @@ -328,9 +328,9 @@ public: virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; FlyCntType GetType()const{return eType;} @@ -344,9 +344,9 @@ public: SwXTextFrames(SwDoc* pDoc); //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; @@ -358,9 +358,9 @@ public: SwXTextGraphicObjects(SwDoc* pDoc); //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; @@ -372,9 +372,9 @@ public: SwXTextEmbeddedObjects(SwDoc* pDoc); //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; @@ -387,12 +387,12 @@ public: SwXTextSections(SwDoc* pDoc); //XIndexAccess - virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XElementAccess @@ -400,9 +400,9 @@ public: virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; static ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextSection> GetObject( SwSectionFmt& rFmt ); }; @@ -416,12 +416,12 @@ class SwXBookmarks : public SwCollectionBaseClass, SwXBookmarks(SwDoc* pDoc); //XIndexAccess - virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XElementAccess @@ -429,9 +429,9 @@ class SwXBookmarks : public SwCollectionBaseClass, virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; @@ -448,7 +448,7 @@ public: SwXNumberingRulesCollection( SwDoc* pDoc ); //XIndexAccess - virtual sal_Int32 SAL_CALL SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL SAL_CALL getCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XElementAccess @@ -475,7 +475,7 @@ public: SwXFootnotes(bool bEnd, SwDoc* pDoc); //XIndexAccess - virtual sal_Int32 SAL_CALL SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL SAL_CALL getCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XElementAccess @@ -483,9 +483,9 @@ public: virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; static ::com::sun::star::uno::Reference< ::com::sun::star::text::XFootnote> GetObject( SwDoc& rDoc, const SwFmtFtn& rFmt ); }; @@ -499,12 +499,12 @@ public: SwXReferenceMarks(SwDoc* pDoc); //XIndexAccess - virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XElementAccess @@ -512,9 +512,9 @@ public: virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx index 04b90a68c2f8..33c7bd9209a2 100644 --- a/sw/inc/unodraw.hxx +++ b/sw/inc/unodraw.hxx @@ -86,13 +86,13 @@ public: virtual ~SwXDrawPage(); //XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XIndexAccess - virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XElementAccess @@ -110,9 +110,9 @@ public: virtual void SAL_CALL ungroup(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapeGroup > & aGroup) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; SwFmDrawPage* GetSvxPage(); // renamed and outlined to detect where it's called @@ -254,17 +254,17 @@ public: //XTextContent virtual void SAL_CALL attach(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XComponent - virtual void SAL_CALL dispose(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::awt::Point SAL_CALL getPosition( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -298,7 +298,7 @@ public: virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XIndexAccess - virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XElementAccess diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx index 6434a34035fe..281098940a4f 100644 --- a/sw/inc/unoframe.hxx +++ b/sw/inc/unoframe.hxx @@ -96,7 +96,7 @@ public: TYPEINFO_OVERRIDE(); //XNamed - virtual OUString SAL_CALL getName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setName(const OUString& Name_) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XPropertySet @@ -121,7 +121,7 @@ public: virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XShapeDescriptor - virtual OUString SAL_CALL getShapeType(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getShapeType() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //Base implementation //XComponent @@ -129,12 +129,12 @@ public: virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() throw( ::com::sun::star::uno::RuntimeException, std::exception ); //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; void attachToRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange)throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); void attach( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xTextRange ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); @@ -199,14 +199,14 @@ public: virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XTextFrame - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XText - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursorByRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & aTextPosition) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XEnumerationAccess - frueher XParagraphEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -222,9 +222,9 @@ public: virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XEventsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -271,17 +271,17 @@ public: //XTextContent virtual void SAL_CALL attach(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XComponent - virtual void SAL_CALL dispose(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XEventsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -324,24 +324,24 @@ public: //XTextContent virtual void SAL_CALL attach(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XComponent - virtual void SAL_CALL dispose(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XEmbeddedObjectSupplier2 - virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > SAL_CALL getEmbeddedObject(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject > SAL_CALL getExtendedControlOverEmbeddedObject(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > SAL_CALL getEmbeddedObject() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject > SAL_CALL getExtendedControlOverEmbeddedObject() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::sal_Int64 SAL_CALL getAspect() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setAspect( ::sal_Int64 _aspect ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL getReplacementGraphic() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XEventsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sw/inc/unoredline.hxx b/sw/inc/unoredline.hxx index 23e2dfe83a5b..5739d9c30aa5 100644 --- a/sw/inc/unoredline.hxx +++ b/sw/inc/unoredline.hxx @@ -47,11 +47,11 @@ public: virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XText - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursorByRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & aTextPosition) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XElementAccess (via XEnumerationAccess) virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -85,7 +85,7 @@ public: virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XText - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursorByRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & aTextPosition) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XPropertySet @@ -98,7 +98,7 @@ public: virtual void SAL_CALL removeVetoableChangeListener( const 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, std::exception) SAL_OVERRIDE; //XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sw/inc/unoredlines.hxx b/sw/inc/unoredlines.hxx index 59775173202f..886bd51ae059 100644 --- a/sw/inc/unoredlines.hxx +++ b/sw/inc/unoredlines.hxx @@ -50,16 +50,16 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XEnumerationAccess - was: XParagraphEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; static ::com::sun::star::beans::XPropertySet* GetObject( SwRangeRedline& rRedline, SwDoc& rDoc ); }; @@ -76,13 +76,13 @@ public: SwXRedlineEnumeration(SwDoc& rDoc); //XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL nextElement(void) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasMoreElements() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL nextElement() throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: //SwClient virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx index 0e35beca9ff2..2f97eb84bc1d 100644 --- a/sw/inc/unosett.hxx +++ b/sw/inc/unosett.hxx @@ -62,9 +62,9 @@ public: virtual void SAL_CALL removeVetoableChangeListener( const 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, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; void Invalidate() {pDoc = 0;} }; @@ -92,9 +92,9 @@ public: virtual void SAL_CALL removeVetoableChangeListener( const 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, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; void Invalidate() {pDoc = 0;} }; @@ -122,9 +122,9 @@ public: virtual void SAL_CALL removeVetoableChangeListener( const 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, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; void Invalidate() {pDoc = 0;} }; @@ -183,13 +183,13 @@ public: virtual void SAL_CALL removeVetoableChangeListener( const 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, std::exception) SAL_OVERRIDE; //XNamed - virtual OUString SAL_CALL getName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setName(const OUString& Name_) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> @@ -230,9 +230,9 @@ public: void Invalidate() {SwXNumberingRules::Invalidate();} //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; @@ -288,9 +288,9 @@ public: virtual void SAL_CALL removeVetoableChangeListener( const 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, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; sal_Int32 GetSepLineWidth() const {return nSepLineWidth;} sal_Int32 GetSepLineColor() const {return nSepLineColor;} diff --git a/sw/inc/unosrch.hxx b/sw/inc/unosrch.hxx index b614822224f5..7867f502447b 100644 --- a/sw/inc/unosrch.hxx +++ b/sw/inc/unosrch.hxx @@ -78,7 +78,7 @@ public: virtual void SAL_CALL setSearchString( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XReplaceDescriptor - virtual OUString SAL_CALL getReplaceString(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getReplaceString() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setReplaceString(const OUString& aReplaceString) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XPropertySet @@ -91,17 +91,17 @@ public: virtual void SAL_CALL removeVetoableChangeListener( const 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, std::exception) SAL_OVERRIDE; //XPropertyReplace - virtual sal_Bool SAL_CALL getValueSearch(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getValueSearch() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setValueSearch(sal_Bool ValueSearch_) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > SAL_CALL getSearchAttributes(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > SAL_CALL getSearchAttributes() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setSearchAttributes(const ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& aSearchAttribs) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > SAL_CALL getReplaceAttributes(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > SAL_CALL getReplaceAttributes() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setReplaceAttributes(const ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& aSearchAttribs) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; void FillSearchItemSet(SfxItemSet& rSet) const; void FillReplaceItemSet(SfxItemSet& rSet) const; diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx index 3a81d05e2769..136c7da5daa2 100644 --- a/sw/inc/unostyle.hxx +++ b/sw/inc/unostyle.hxx @@ -74,11 +74,11 @@ public: //XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XIndexAccess - virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XElementAccess @@ -90,12 +90,12 @@ public: throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getStyleLoaderOptions(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getStyleLoaderOptions() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; class SwXStyleFamily : public cppu::WeakImplHelper @@ -117,7 +117,7 @@ public: virtual ~SwXStyleFamily(); //XIndexAccess - virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XElementAccess @@ -126,7 +126,7 @@ public: //XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XNameContainer @@ -147,9 +147,9 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; class SwXStyle : public cppu::WeakImplHelper @@ -214,13 +214,13 @@ public: virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XNamed - virtual OUString SAL_CALL getName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setName(const OUString& Name_) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XStyle - virtual sal_Bool SAL_CALL isUserDefined(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isInUse(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual OUString SAL_CALL getParentStyle(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isUserDefined() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isInUse() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getParentStyle() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setParentStyle(const OUString& aParentStyle) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XPropertySet @@ -251,9 +251,9 @@ public: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //SfxListener virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; @@ -337,7 +337,7 @@ public: SwXAutoStyles(SwDocShell& rDocShell); //XIndexAccess - virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XElementAccess @@ -346,7 +346,7 @@ public: //XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx index 3313b47a2509..20c94039808a 100644 --- a/sw/inc/unotbl.hxx +++ b/sw/inc/unotbl.hxx @@ -122,7 +122,7 @@ public: virtual sal_Int32 SAL_CALL getError( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XText - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursorByRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & aTextPosition) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setString(const OUString& aString) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -136,12 +136,12 @@ public: virtual void SAL_CALL removeVetoableChangeListener( const 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, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XEnumerationAccess - was: XParagraphEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -193,9 +193,9 @@ public: virtual void SAL_CALL removeVetoableChangeListener( const 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, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; const SwTableLine* GetTblRow() const {return pLine;} static SwTableLine* FindLine(SwTable* pTable, SwTableLine* pLine); @@ -260,9 +260,9 @@ public: virtual void SAL_CALL removeVetoableChangeListener( const 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, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //SwClient virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; @@ -352,7 +352,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XComponent - virtual void SAL_CALL dispose(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -381,7 +381,7 @@ public: virtual sal_Bool SAL_CALL isNotANumber( double nNumber ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XSortable - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL createSortDescriptor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL createSortDescriptor() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL sort(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xDescriptor) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -412,7 +412,7 @@ public: virtual void SAL_CALL removeVetoableChangeListener( const 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, std::exception) SAL_OVERRIDE; //XNamed - virtual OUString SAL_CALL getName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setName(const OUString& Name_) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XCellRangeData @@ -420,14 +420,14 @@ public: virtual void SAL_CALL setDataArray( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& aArray ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; void attachToRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange)throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); - sal_uInt16 getRowCount(void); - sal_uInt16 getColumnCount(void); + sal_uInt16 getRowCount(); + sal_uInt16 getColumnCount(); ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > GetRangeByName(SwFrmFmt* pFmt, SwTable* pTable, const OUString& sTLName, const OUString& sBRName, SwRangeDescriptor& rDesc); @@ -521,7 +521,7 @@ public: virtual void SAL_CALL setColumnDescriptions( const ::com::sun::star::uno::Sequence< OUString >& aColumnDescriptions ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XSortable - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL createSortDescriptor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL createSortDescriptor() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL sort(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xDescriptor) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -531,16 +531,16 @@ public: virtual void SAL_CALL setDataArray( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& aArray ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //SwClient virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; SwFrmFmt* GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); } - sal_uInt16 getRowCount(void); - sal_uInt16 getColumnCount(void); + sal_uInt16 getRowCount(); + sal_uInt16 getColumnCount(); const SwUnoCrsr* GetTblCrsr() const; @@ -571,7 +571,7 @@ public: TYPEINFO_OVERRIDE(); //XIndexAccess - virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XElementAccess @@ -587,9 +587,9 @@ public: std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //SwClient virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; @@ -612,7 +612,7 @@ public: TYPEINFO_OVERRIDE(); //XIndexAccess - virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XElementAccess @@ -628,9 +628,9 @@ public: std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //SwClient virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index 22375eb3cebe..ece4c3480030 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -224,8 +224,8 @@ public: virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XTextDocument - virtual css::uno::Reference< css::text::XText > SAL_CALL getText(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL reformat(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::text::XText > SAL_CALL getText() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL reformat() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XModel virtual sal_Bool SAL_CALL attachResource( const OUString& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -241,7 +241,7 @@ public: virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getCurrentSelection( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XComponent - virtual void SAL_CALL dispose(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -249,64 +249,64 @@ public: virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) throw (css::util::CloseVetoException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XLineNumberingProperties - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getLineNumberingProperties(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getLineNumberingProperties() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XChapterNumberingSupplier - virtual css::uno::Reference< css::container::XIndexReplace > SAL_CALL getChapterNumberingRules(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XIndexReplace > SAL_CALL getChapterNumberingRules() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XNumberingRulesSupplier virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getNumberingRules() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XFootnotesSupplier - virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getFootnotes(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getFootnoteSettings(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getFootnotes() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getFootnoteSettings() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XEndnotesSupplier - virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getEndnotes(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getEndnoteSettings(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getEndnotes() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getEndnoteSettings() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XReplaceable - virtual css::uno::Reference< css::util::XReplaceDescriptor > SAL_CALL createReplaceDescriptor(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::util::XReplaceDescriptor > SAL_CALL createReplaceDescriptor() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL replaceAll(const css::uno::Reference< css::util::XSearchDescriptor > & xDesc) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XSearchable - virtual css::uno::Reference< css::util::XSearchDescriptor > SAL_CALL createSearchDescriptor(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::util::XSearchDescriptor > SAL_CALL createSearchDescriptor() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL findAll(const css::uno::Reference< css::util::XSearchDescriptor > & xDesc) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL findFirst(const css::uno::Reference< css::util::XSearchDescriptor > & xDesc) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL findNext(const css::uno::Reference< css::uno::XInterface > & xStartAt, const css::uno::Reference< css::util::XSearchDescriptor > & xDesc) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XPagePrintable - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPagePrintSettings(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPagePrintSettings() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setPagePrintSettings(const css::uno::Sequence< css::beans::PropertyValue >& aSettings) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL printPages(const css::uno::Sequence< css::beans::PropertyValue >& xOptions) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XReferenceMarksSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getReferenceMarks(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getReferenceMarks() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // css::text::XTextFieldsSupplier - virtual css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL getTextFields(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTextFieldMasters(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL getTextFields() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTextFieldMasters() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // css::text::XTextEmbeddedObjectsSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getEmbeddedObjects(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getEmbeddedObjects() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // css::text::XBookmarksSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getBookmarks(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getBookmarks() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // css::text::XTextSectionsSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTextSections(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTextSections() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // css::text::XTextTablesSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTextTables(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTextTables() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // css::text::XTextGraphicObjectsSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getGraphicObjects(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getGraphicObjects() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // css::text::XTextFramesSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTextFrames(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTextFrames() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XStyleFamiliesSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getStyleFamilies(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getStyleFamilies() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XAutoStylesSupplier virtual css::uno::Reference< css::style::XAutoStyles > SAL_CALL getAutoStyles( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -317,19 +317,19 @@ public: virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments) throw( css::uno::Exception, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames(void) + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // css::drawing::XDrawPageSupplier - virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getDrawPage(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getDrawPage() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // css::text::XDocumentIndexesSupplier - virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getDocumentIndexes(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getDocumentIndexes() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -353,13 +353,13 @@ public: virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XLinkTargetSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getLinks(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getLinks() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XRedlinesSupplier virtual css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL getRedlines( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css::util::XRefreshable - virtual void SAL_CALL refresh(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL refresh() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL addRefreshListener(const css::uno::Reference< css::util::XRefreshListener > & l) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeRefreshListener(const css::uno::Reference< css::util::XRefreshListener > & l) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -462,7 +462,7 @@ public: //XNameAccess virtual css::uno::Any SAL_CALL getByName(const OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XElementAccess @@ -470,9 +470,9 @@ public: virtual sal_Bool SAL_CALL hasElements( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; void Invalidate() {pxDoc = 0;} }; @@ -501,7 +501,7 @@ public: //XNameAccess virtual css::uno::Any SAL_CALL getByName(const OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XElementAccess @@ -518,12 +518,12 @@ public: virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XLinkTargetSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getLinks(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getLinks() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; @@ -550,9 +550,9 @@ public: virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; class SwXDocumentPropertyHelper : public SvxUnoForbiddenCharsTable diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx index 42c476024181..aee976ede35a 100644 --- a/sw/source/core/access/acccell.cxx +++ b/sw/source/core/access/acccell.cxx @@ -235,7 +235,7 @@ SwAccessibleCell::~SwAccessibleCell() { } -OUString SAL_CALL SwAccessibleCell::getAccessibleDescription (void) +OUString SAL_CALL SwAccessibleCell::getAccessibleDescription() throw (uno::RuntimeException, std::exception) { return GetName(); diff --git a/sw/source/core/access/acccell.hxx b/sw/source/core/access/acccell.hxx index 9bc19460f6f5..1a9991ff7e1a 100644 --- a/sw/source/core/access/acccell.hxx +++ b/sw/source/core/access/acccell.hxx @@ -62,14 +62,14 @@ public: /// Return this object's description. virtual OUString SAL_CALL - getAccessibleDescription (void) + getAccessibleDescription() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo // Returns an identifier for the implementation of this object. virtual OUString SAL_CALL - getImplementationName (void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Return whether the specified service is supported by this class. @@ -80,7 +80,7 @@ public: // Returns a list of all supported services. In this case that is just // the AccessibleContext service. virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames (void) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void Dispose( bool bRecursive = false ) SAL_OVERRIDE; diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx index 842152e53085..3628cd829fe5 100644 --- a/sw/source/core/access/acccontext.cxx +++ b/sw/source/core/access/acccontext.cxx @@ -536,14 +536,14 @@ SwAccessibleContext::~SwAccessibleContext() } uno::Reference< XAccessibleContext > SAL_CALL - SwAccessibleContext::getAccessibleContext( void ) + SwAccessibleContext::getAccessibleContext() throw (uno::RuntimeException, std::exception) { uno::Reference < XAccessibleContext > xRet( this ); return xRet; } -sal_Int32 SAL_CALL SwAccessibleContext::getAccessibleChildCount( void ) +sal_Int32 SAL_CALL SwAccessibleContext::getAccessibleChildCount() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -623,7 +623,7 @@ uno::Reference< XAccessible> SAL_CALL return xChild; } -uno::Reference< XAccessible> SAL_CALL SwAccessibleContext::getAccessibleParent (void) +uno::Reference< XAccessible> SAL_CALL SwAccessibleContext::getAccessibleParent() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -648,7 +648,7 @@ uno::Reference< XAccessible> SAL_CALL SwAccessibleContext::getAccessibleParent ( return xAcc; } -sal_Int32 SAL_CALL SwAccessibleContext::getAccessibleIndexInParent (void) +sal_Int32 SAL_CALL SwAccessibleContext::getAccessibleIndexInParent() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -671,27 +671,27 @@ sal_Int32 SAL_CALL SwAccessibleContext::getAccessibleIndexInParent (void) return nIndex; } -sal_Int16 SAL_CALL SwAccessibleContext::getAccessibleRole (void) +sal_Int16 SAL_CALL SwAccessibleContext::getAccessibleRole() throw (uno::RuntimeException, std::exception) { return nRole; } -OUString SAL_CALL SwAccessibleContext::getAccessibleDescription (void) +OUString SAL_CALL SwAccessibleContext::getAccessibleDescription() throw (uno::RuntimeException, std::exception) { OSL_ENSURE(false, "description needs to be overriden"); THROW_RUNTIME_EXCEPTION( XAccessibleContext, "internal error (method must be overridden)" ); } -OUString SAL_CALL SwAccessibleContext::getAccessibleName (void) +OUString SAL_CALL SwAccessibleContext::getAccessibleName() throw (uno::RuntimeException, std::exception) { return sName; } uno::Reference< XAccessibleRelationSet> SAL_CALL - SwAccessibleContext::getAccessibleRelationSet (void) + SwAccessibleContext::getAccessibleRelationSet() throw (uno::RuntimeException, std::exception) { // by default there are no relations @@ -700,7 +700,7 @@ uno::Reference< XAccessibleRelationSet> SAL_CALL } uno::Reference<XAccessibleStateSet> SAL_CALL - SwAccessibleContext::getAccessibleStateSet (void) + SwAccessibleContext::getAccessibleStateSet() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -719,7 +719,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL return xStateSet; } -lang::Locale SAL_CALL SwAccessibleContext::getLocale (void) +lang::Locale SAL_CALL SwAccessibleContext::getLocale() throw (IllegalAccessibleComponentStateException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx index 81dd2d0739b1..a609f5ccb04a 100644 --- a/sw/source/core/access/acccontext.hxx +++ b/sw/source/core/access/acccontext.hxx @@ -204,12 +204,12 @@ public: // Return the XAccessibleContext. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL - getAccessibleContext (void) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getAccessibleContext() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleContext // Return the number of currently visible children. - virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) + virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Return the specified child or NULL if index is invalid. @@ -220,45 +220,45 @@ public: // Return a reference to the parent. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL - getAccessibleParent (void) + getAccessibleParent() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Return this objects index among the parents children. virtual sal_Int32 SAL_CALL - getAccessibleIndexInParent (void) + getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Return this object's role. virtual sal_Int16 SAL_CALL - getAccessibleRole (void) + getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Return this object's description. virtual OUString SAL_CALL - getAccessibleDescription (void) + getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Return the object's current name. virtual OUString SAL_CALL - getAccessibleName (void) + getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Return NULL to indicate that an empty relation set. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL - getAccessibleRelationSet (void) + getAccessibleRelationSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL - getAccessibleStateSet (void) + getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Return the parents locale or throw exception if this object has no parent yet/anymore. */ virtual ::com::sun::star::lang::Locale SAL_CALL - getLocale (void) + getLocale() throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleEventBroadcaster @@ -306,7 +306,7 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName (void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Return whether the specified service is supported by this class. */ @@ -317,7 +317,7 @@ public: /** Returns a list of all supported services. In this case that is just the AccessibleContext service. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames (void) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // thread safe C++ interface diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx index 776b7a0579d7..0e334716c7cb 100644 --- a/sw/source/core/access/accdoc.cxx +++ b/sw/source/core/access/accdoc.cxx @@ -133,7 +133,7 @@ void SwAccessibleDocumentBase::RemoveChild( vcl::Window *pWin ) } } -sal_Int32 SAL_CALL SwAccessibleDocumentBase::getAccessibleChildCount( void ) +sal_Int32 SAL_CALL SwAccessibleDocumentBase::getAccessibleChildCount() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -166,13 +166,13 @@ uno::Reference< XAccessible> SAL_CALL return SwAccessibleContext::getAccessibleChild( nIndex ); } -uno::Reference< XAccessible> SAL_CALL SwAccessibleDocumentBase::getAccessibleParent (void) +uno::Reference< XAccessible> SAL_CALL SwAccessibleDocumentBase::getAccessibleParent() throw (uno::RuntimeException, std::exception) { return mxParent; } -sal_Int32 SAL_CALL SwAccessibleDocumentBase::getAccessibleIndexInParent (void) +sal_Int32 SAL_CALL SwAccessibleDocumentBase::getAccessibleIndexInParent() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -196,13 +196,13 @@ sal_Int32 SAL_CALL SwAccessibleDocumentBase::getAccessibleIndexInParent (void) return -1L; } -OUString SAL_CALL SwAccessibleDocumentBase::getAccessibleDescription (void) +OUString SAL_CALL SwAccessibleDocumentBase::getAccessibleDescription() throw (uno::RuntimeException, std::exception) { return GetResource( STR_ACCESS_DOC_DESC ); } -OUString SAL_CALL SwAccessibleDocumentBase::getAccessibleName (void) +OUString SAL_CALL SwAccessibleDocumentBase::getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard g; diff --git a/sw/source/core/access/accdoc.hxx b/sw/source/core/access/accdoc.hxx index 7f630af8355e..953c8a1ae542 100644 --- a/sw/source/core/access/accdoc.hxx +++ b/sw/source/core/access/accdoc.hxx @@ -54,7 +54,7 @@ public: // XAccessibleContext // Return the number of currently visible children. - virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) + virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Return the specified child or NULL if index is invalid. @@ -65,19 +65,19 @@ public: // Return a reference to the parent. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL - getAccessibleParent (void) + getAccessibleParent() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Return this objects index among the parents children. virtual sal_Int32 SAL_CALL - getAccessibleIndexInParent (void) + getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Return this object's description. virtual OUString SAL_CALL - getAccessibleDescription (void) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getAccessibleDescription() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleComponent virtual sal_Bool SAL_CALL containsPoint( @@ -135,7 +135,7 @@ public: // Returns an identifier for the implementation of this object. virtual OUString SAL_CALL - getImplementationName (void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Return whether the specified service is supported by this class. @@ -146,7 +146,7 @@ public: // Returns a list of all supported services. In this case that is just // the AccessibleContext service. virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames (void) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInterface diff --git a/sw/source/core/access/accembedded.cxx b/sw/source/core/access/accembedded.cxx index cb0d021ccb89..90eabf85d952 100644 --- a/sw/source/core/access/accembedded.cxx +++ b/sw/source/core/access/accembedded.cxx @@ -59,14 +59,14 @@ com::sun::star::uno::Any SAL_CALL } void SAL_CALL - SwAccessibleEmbeddedObject::acquire (void) + SwAccessibleEmbeddedObject::acquire() throw () { SwAccessibleNoTextFrame::acquire (); } void SAL_CALL - SwAccessibleEmbeddedObject::release (void) + SwAccessibleEmbeddedObject::release() throw () { SwAccessibleNoTextFrame::release (); diff --git a/sw/source/core/access/accembedded.hxx b/sw/source/core/access/accembedded.hxx index 7a23512d3c53..1966f0d0f42b 100644 --- a/sw/source/core/access/accembedded.hxx +++ b/sw/source/core/access/accembedded.hxx @@ -42,18 +42,18 @@ public: throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL - acquire (void) + acquire() throw () SAL_OVERRIDE; virtual void SAL_CALL - release (void) + release() throw () SAL_OVERRIDE; // XServiceInfo // Returns an identifier for the implementation of this object. virtual OUString SAL_CALL - getImplementationName (void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Return whether the specified service is supported by this class. @@ -64,7 +64,7 @@ public: // Returns a list of all supported services. In this case that is just // the AccessibleContext service. virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames (void) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider diff --git a/sw/source/core/access/accfootnote.cxx b/sw/source/core/access/accfootnote.cxx index ddf7428b155a..84d728dec50b 100644 --- a/sw/source/core/access/accfootnote.cxx +++ b/sw/source/core/access/accfootnote.cxx @@ -71,7 +71,7 @@ SwAccessibleFootnote::~SwAccessibleFootnote() { } -OUString SAL_CALL SwAccessibleFootnote::getAccessibleDescription (void) +OUString SAL_CALL SwAccessibleFootnote::getAccessibleDescription() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/sw/source/core/access/accfootnote.hxx b/sw/source/core/access/accfootnote.hxx index 7ad73058cebd..b0862a25b661 100644 --- a/sw/source/core/access/accfootnote.hxx +++ b/sw/source/core/access/accfootnote.hxx @@ -40,14 +40,14 @@ public: /// Return this object's description. virtual OUString SAL_CALL - getAccessibleDescription (void) + getAccessibleDescription() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName (void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Return whether the specified service is supported by this class. */ @@ -58,7 +58,7 @@ public: /** Returns a list of all supported services. In this case that is just the AccessibleContext service. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames (void) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider diff --git a/sw/source/core/access/accgraphic.cxx b/sw/source/core/access/accgraphic.cxx index 04111a934deb..661ae5e1abda 100644 --- a/sw/source/core/access/accgraphic.cxx +++ b/sw/source/core/access/accgraphic.cxx @@ -71,7 +71,7 @@ Sequence< sal_Int8 > SAL_CALL SwAccessibleGraphic::getImplementationId() } // Return this object's role. -sal_Int16 SAL_CALL SwAccessibleGraphic::getAccessibleRole (void) +sal_Int16 SAL_CALL SwAccessibleGraphic::getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard g; diff --git a/sw/source/core/access/accgraphic.hxx b/sw/source/core/access/accgraphic.hxx index b986b250d222..39400c851e7b 100644 --- a/sw/source/core/access/accgraphic.hxx +++ b/sw/source/core/access/accgraphic.hxx @@ -35,7 +35,7 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName (void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Return whether the specified service is supported by this class. */ @@ -46,13 +46,13 @@ public: /** Returns a list of all supported services. In this case that is just the AccessibleContext service. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames (void) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return this object's role. - virtual sal_Int16 SAL_CALL getAccessibleRole (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif diff --git a/sw/source/core/access/accheaderfooter.cxx b/sw/source/core/access/accheaderfooter.cxx index 07d117db3e09..3e89f6eb81b8 100644 --- a/sw/source/core/access/accheaderfooter.cxx +++ b/sw/source/core/access/accheaderfooter.cxx @@ -62,7 +62,7 @@ SwAccessibleHeaderFooter::~SwAccessibleHeaderFooter() { } -OUString SAL_CALL SwAccessibleHeaderFooter::getAccessibleDescription (void) +OUString SAL_CALL SwAccessibleHeaderFooter::getAccessibleDescription() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/sw/source/core/access/accheaderfooter.hxx b/sw/source/core/access/accheaderfooter.hxx index 3c3597fdf5b6..97ffa34b783a 100644 --- a/sw/source/core/access/accheaderfooter.hxx +++ b/sw/source/core/access/accheaderfooter.hxx @@ -40,14 +40,14 @@ public: /// Return this object's description. virtual OUString SAL_CALL - getAccessibleDescription (void) + getAccessibleDescription() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName (void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Return whether the specified service is supported by this class. */ @@ -58,7 +58,7 @@ public: /** Returns a list of all supported services. In this case that is just the AccessibleContext service. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames (void) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx index 9e92a916038f..4be902866469 100644 --- a/sw/source/core/access/accnotextframe.cxx +++ b/sw/source/core/access/accnotextframe.cxx @@ -172,7 +172,7 @@ void SwAccessibleNoTextFrame::Dispose( bool bRecursive ) } // #i73249# -OUString SAL_CALL SwAccessibleNoTextFrame::getAccessibleName (void) +OUString SAL_CALL SwAccessibleNoTextFrame::getAccessibleName() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -187,7 +187,7 @@ OUString SAL_CALL SwAccessibleNoTextFrame::getAccessibleName (void) return SwAccessibleFrameBase::getAccessibleName(); } -OUString SAL_CALL SwAccessibleNoTextFrame::getAccessibleDescription (void) +OUString SAL_CALL SwAccessibleNoTextFrame::getAccessibleDescription() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/sw/source/core/access/accnotextframe.hxx b/sw/source/core/access/accnotextframe.hxx index 9c4874fca198..4776cdb1a471 100644 --- a/sw/source/core/access/accnotextframe.hxx +++ b/sw/source/core/access/accnotextframe.hxx @@ -60,12 +60,12 @@ public: // #i73249# - Return the object's current name. virtual OUString SAL_CALL - getAccessibleName (void) + getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return this object's description. virtual OUString SAL_CALL - getAccessibleDescription (void) + getAccessibleDescription() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInterface methods need to be implemented to disambiguate @@ -136,7 +136,7 @@ public: public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL - getAccessibleRelationSet (void) + getAccessibleRelationSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/sw/source/core/access/accpage.hxx b/sw/source/core/access/accpage.hxx index a4ab5f99a924..8a589df53de3 100644 --- a/sw/source/core/access/accpage.hxx +++ b/sw/source/core/access/accpage.hxx @@ -58,18 +58,18 @@ public: // XAccessibleContext methods that need to be overridden - virtual OUString SAL_CALL getAccessibleDescription (void) + virtual OUString SAL_CALL getAccessibleDescription() 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; virtual sal_Bool SAL_CALL supportsService ( const OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames (void) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index bc89339f7fcc..99a77d143a10 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -926,7 +926,7 @@ bool SwAccessibleParagraph::GetTextBoundary( return bRet; } -OUString SAL_CALL SwAccessibleParagraph::getAccessibleDescription (void) +OUString SAL_CALL SwAccessibleParagraph::getAccessibleDescription() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -940,7 +940,7 @@ OUString SAL_CALL SwAccessibleParagraph::getAccessibleDescription (void) return sDesc; } -lang::Locale SAL_CALL SwAccessibleParagraph::getLocale (void) +lang::Locale SAL_CALL SwAccessibleParagraph::getLocale() throw (IllegalAccessibleComponentStateException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3825,7 +3825,7 @@ bool SwAccessibleParagraph::GetSelectionAtIndex( return bRet; } -sal_Int16 SAL_CALL SwAccessibleParagraph::getAccessibleRole (void) throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Int16 SAL_CALL SwAccessibleParagraph::getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard g; diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx index 315b62d28886..52f3a2e4706d 100644 --- a/sw/source/core/access/accpara.hxx +++ b/sw/source/core/access/accpara.hxx @@ -247,25 +247,25 @@ public: virtual bool HasCursor() SAL_OVERRIDE; // required by map to remember that object com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > GetCurrentTabStop( sal_Int32 nIndex ); - virtual sal_Int16 SAL_CALL getAccessibleRole (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleContext // Return this object's description. virtual OUString SAL_CALL - getAccessibleDescription (void) + getAccessibleDescription() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Return the parents locale or throw exception if this object has no // parent yet/anymore. virtual ::com::sun::star::lang::Locale SAL_CALL - getLocale (void) + getLocale() throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // #i27138# - paragraphs are in relation CONTENT_FLOWS_FROM and/or CONTENT_FLOWS_TO virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL - getAccessibleRelationSet (void) + getAccessibleRelationSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleComponent @@ -282,7 +282,7 @@ public: // Returns an identifier for the implementation of this object. virtual OUString SAL_CALL - getImplementationName (void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Return whether the specified service is supported by this class. @@ -293,7 +293,7 @@ public: // Returns a list of all supported services. In this case that is just // the AccessibleContext service. virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames (void) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInterface diff --git a/sw/source/core/access/accpreview.cxx b/sw/source/core/access/accpreview.cxx index ff89d78deaa2..7c645f6eeeec 100644 --- a/sw/source/core/access/accpreview.cxx +++ b/sw/source/core/access/accpreview.cxx @@ -67,12 +67,12 @@ Sequence< sal_Int8 > SAL_CALL SwAccessiblePreview::getImplementationId() return css::uno::Sequence<sal_Int8>(); } -OUString SAL_CALL SwAccessiblePreview::getAccessibleDescription (void) throw (com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL SwAccessiblePreview::getAccessibleDescription() throw (com::sun::star::uno::RuntimeException, std::exception) { return GetResource( STR_ACCESS_PREVIEW_DOC_NAME ); } -OUString SAL_CALL SwAccessiblePreview::getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL SwAccessiblePreview::getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) { OUString sLclName = SwAccessibleDocumentBase::getAccessibleName(); sLclName += " "; diff --git a/sw/source/core/access/accpreview.hxx b/sw/source/core/access/accpreview.hxx index 62ea32baa3ac..0be84e02fd31 100644 --- a/sw/source/core/access/accpreview.hxx +++ b/sw/source/core/access/accpreview.hxx @@ -42,7 +42,7 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName (void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Return whether the specified service is supported by this class. @@ -55,14 +55,14 @@ public: the AccessibleContext service. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames (void) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - OUString SAL_CALL getAccessibleDescription (void) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + OUString SAL_CALL getAccessibleDescription() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void _InvalidateFocus() SAL_OVERRIDE; }; diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index 763479bf5332..0c96b054f421 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -916,7 +916,7 @@ void SwAccessibleTable::ClearTableData() mpTableData = 0; } -OUString SAL_CALL SwAccessibleTable::getAccessibleDescription (void) +OUString SAL_CALL SwAccessibleTable::getAccessibleDescription() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1898,7 +1898,7 @@ uno::Any SAL_CALL SwAccessibleTableColHeaders::queryInterface( const uno::Type& } // XAccessibleContext -sal_Int32 SAL_CALL SwAccessibleTableColHeaders::getAccessibleChildCount(void) +sal_Int32 SAL_CALL SwAccessibleTableColHeaders::getAccessibleChildCount() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1964,7 +1964,7 @@ uno::Reference< XAccessibleTable > // XServiceInfo -OUString SAL_CALL SwAccessibleTableColHeaders::getImplementationName (void) +OUString SAL_CALL SwAccessibleTableColHeaders::getImplementationName() throw (uno::RuntimeException, std::exception) { static const sal_Char sImplName[] = "com.sun.star.comp.Writer.SwAccessibleTableColumnHeadersView"; diff --git a/sw/source/core/access/acctable.hxx b/sw/source/core/access/acctable.hxx index 2bbd14ffe7d6..3dec2dd65cae 100644 --- a/sw/source/core/access/acctable.hxx +++ b/sw/source/core/access/acctable.hxx @@ -112,7 +112,7 @@ public: /// Return this object's description. virtual OUString SAL_CALL - getAccessibleDescription (void) + getAccessibleDescription() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleTable @@ -202,7 +202,7 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName (void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Return whether the specified service is supported by this class. @@ -215,7 +215,7 @@ public: the AccessibleContext service. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames (void) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // C++ interface @@ -309,7 +309,7 @@ public: // XAccessibleContext /// Return the number of currently visible children. - virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) + virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the specified child or NULL if index is invalid. @@ -334,7 +334,7 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName (void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx index 20225f6c8edf..b176c49c54de 100644 --- a/sw/source/core/access/acctextframe.cxx +++ b/sw/source/core/access/acctextframe.cxx @@ -154,14 +154,14 @@ com::sun::star::uno::Any SAL_CALL } void SAL_CALL - SwAccessibleTextFrame::acquire (void) + SwAccessibleTextFrame::acquire() throw () { SwAccessibleContext::acquire (); } void SAL_CALL - SwAccessibleTextFrame::release (void) + SwAccessibleTextFrame::release() throw () { SwAccessibleContext::release (); @@ -249,7 +249,7 @@ void SAL_CALL SwAccessibleTextFrame::deselectAccessibleChild( sal_Int32 ) } // #i73249# -OUString SAL_CALL SwAccessibleTextFrame::getAccessibleName (void) +OUString SAL_CALL SwAccessibleTextFrame::getAccessibleName() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -264,7 +264,7 @@ OUString SAL_CALL SwAccessibleTextFrame::getAccessibleName (void) return SwAccessibleFrameBase::getAccessibleName(); } -OUString SAL_CALL SwAccessibleTextFrame::getAccessibleDescription (void) +OUString SAL_CALL SwAccessibleTextFrame::getAccessibleDescription() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/sw/source/core/access/acctextframe.hxx b/sw/source/core/access/acctextframe.hxx index 04d061bc5f7f..ef0673758db3 100644 --- a/sw/source/core/access/acctextframe.hxx +++ b/sw/source/core/access/acctextframe.hxx @@ -84,11 +84,11 @@ public: // #i73249# - Return the object's current name. virtual OUString SAL_CALL - getAccessibleName (void) + getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return this object's description. virtual OUString SAL_CALL - getAccessibleDescription (void) + getAccessibleDescription() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo @@ -96,7 +96,7 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName (void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Return whether the specified service is supported by this class. @@ -109,7 +109,7 @@ public: the AccessibleContext service. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames (void) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider @@ -130,7 +130,7 @@ private: public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL - getAccessibleRelationSet (void) + getAccessibleRelationSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/sw/source/core/inc/SwXMLBlockExport.hxx b/sw/source/core/inc/SwXMLBlockExport.hxx index a0c7ed43bc89..9aed97903670 100644 --- a/sw/source/core/inc/SwXMLBlockExport.hxx +++ b/sw/source/core/inc/SwXMLBlockExport.hxx @@ -36,7 +36,7 @@ public: const OUString &rFileName, com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler); - virtual ~SwXMLBlockListExport ( void ) {} + virtual ~SwXMLBlockListExport() {} sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass) SAL_OVERRIDE; void _ExportAutoStyles() SAL_OVERRIDE {} void _ExportMasterStyles () SAL_OVERRIDE {} @@ -55,7 +55,7 @@ public: const OUString &rFileName, com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler); - virtual ~SwXMLTextBlockExport ( void ) {} + virtual ~SwXMLTextBlockExport() {} sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum /*eClass*/) SAL_OVERRIDE {return 0;} sal_uInt32 exportDoc(const OUString & rText); void _ExportAutoStyles() SAL_OVERRIDE {} diff --git a/sw/source/core/inc/SwXMLBlockImport.hxx b/sw/source/core/inc/SwXMLBlockImport.hxx index faa8c9828857..636fe29d6985 100644 --- a/sw/source/core/inc/SwXMLBlockImport.hxx +++ b/sw/source/core/inc/SwXMLBlockImport.hxx @@ -48,11 +48,11 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext, SwXMLTextBlocks &rBlocks ); - SwXMLTextBlocks& getBlockList ( void ) + SwXMLTextBlocks& getBlockList() { return rBlockList; } - virtual ~SwXMLBlockListImport ( void ) + virtual ~SwXMLBlockListImport() throw(); }; @@ -74,13 +74,13 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext, SwXMLTextBlocks &rBlocks, OUString &rNewText, bool bNewTextOnly ); - SwXMLTextBlocks& getBlockList ( void ) + SwXMLTextBlocks& getBlockList() { return rBlockList; } - virtual ~SwXMLTextBlockImport ( void ) + virtual ~SwXMLTextBlockImport() throw(); - virtual void SAL_CALL endDocument(void) + virtual void SAL_CALL endDocument() throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; diff --git a/sw/source/core/inc/SwXMLTextBlocks.hxx b/sw/source/core/inc/SwXMLTextBlocks.hxx index d87f925ddeda..5845ecc0466d 100644 --- a/sw/source/core/inc/SwXMLTextBlocks.hxx +++ b/sw/source/core/inc/SwXMLTextBlocks.hxx @@ -67,7 +67,7 @@ public: virtual sal_uLong PutText( const OUString&, const OUString&, const OUString& ) SAL_OVERRIDE; virtual sal_uLong MakeBlockList() SAL_OVERRIDE; - virtual short GetFileType ( void ) const SAL_OVERRIDE; + virtual short GetFileType() const SAL_OVERRIDE; virtual sal_uLong OpenFile( bool bReadOnly = true ) SAL_OVERRIDE; virtual void CloseFile() SAL_OVERRIDE; diff --git a/sw/source/core/inc/swblocks.hxx b/sw/source/core/inc/swblocks.hxx index 4f4344c45877..3a7280a5fd3f 100644 --- a/sw/source/core/inc/swblocks.hxx +++ b/sw/source/core/inc/swblocks.hxx @@ -97,7 +97,7 @@ public: OUString GetFileName() const {return aFile;} /// Return physical file name void SetName( const OUString& rName ) /// Logic name { aName = rName; bInfoChanged = true; } - OUString GetName( void ) + OUString GetName() { return aName; } OUString GetBaseURL() const { return sBaseURL;} diff --git a/sw/source/core/inc/unobookmark.hxx b/sw/source/core/inc/unobookmark.hxx index 4ad84465b132..2310689f00b3 100644 --- a/sw/source/core/inc/unobookmark.hxx +++ b/sw/source/core/inc/unobookmark.hxx @@ -247,7 +247,7 @@ public: ::com::sun::star::text::XTextRange > & xTextRange) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; - virtual OUString SAL_CALL getFieldType(void) + virtual OUString SAL_CALL getFieldType() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setFieldType(const OUString& description ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sw/source/core/inc/unoevent.hxx b/sw/source/core/inc/unoevent.hxx index 3cae986bae4c..cc0ff3364d4f 100644 --- a/sw/source/core/inc/unoevent.hxx +++ b/sw/source/core/inc/unoevent.hxx @@ -36,7 +36,7 @@ class SwHyperlinkEventDescriptor : public SvDetachedEventDescriptor const OUString sImplName; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: virtual ~SwHyperlinkEventDescriptor(); @@ -70,7 +70,7 @@ public: virtual ~SwFrameEventDescriptor(); - virtual OUString SAL_CALL getImplementationName(void) + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: @@ -90,7 +90,7 @@ public: virtual ~SwFrameStyleEventDescriptor(); - virtual OUString SAL_CALL getImplementationName(void) + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: diff --git a/sw/source/core/swg/SwXMLBlockImport.cxx b/sw/source/core/swg/SwXMLBlockImport.cxx index d0fa4afd0b15..e71e3790c79b 100644 --- a/sw/source/core/swg/SwXMLBlockImport.cxx +++ b/sw/source/core/swg/SwXMLBlockImport.cxx @@ -51,7 +51,7 @@ private: public: SwXMLBlockListContext( SwXMLBlockListImport& rImport, sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ); - virtual ~SwXMLBlockListContext ( void ); + virtual ~SwXMLBlockListContext(); virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) @@ -63,7 +63,7 @@ class SwXMLBlockContext : public SvXMLImportContext public: SwXMLBlockContext( SwXMLBlockListImport& rImport, sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ); - virtual ~SwXMLBlockContext ( void ); + virtual ~SwXMLBlockContext(); }; class SwXMLTextBlockDocumentContext : public SvXMLImportContext @@ -79,7 +79,7 @@ public: sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; - virtual ~SwXMLTextBlockDocumentContext ( void ); + virtual ~SwXMLTextBlockDocumentContext(); }; class SwXMLTextBlockBodyContext : public SvXMLImportContext @@ -95,7 +95,7 @@ public: sal_Int32, const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; - virtual ~SwXMLTextBlockBodyContext ( void ); + virtual ~SwXMLTextBlockBodyContext(); }; class SwXMLTextBlockTextContext : public SvXMLImportContext @@ -112,7 +112,7 @@ public: const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; - virtual ~SwXMLTextBlockTextContext ( void ); + virtual ~SwXMLTextBlockTextContext(); }; class SwXMLTextBlockParContext : public SvXMLImportContext @@ -127,7 +127,7 @@ public: virtual void SAL_CALL characters( const OUString & aChars ) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; - virtual ~SwXMLTextBlockParContext ( void ); + virtual ~SwXMLTextBlockParContext(); }; SwXMLTextBlockTokenHandler::SwXMLTextBlockTokenHandler() @@ -197,7 +197,7 @@ SwXMLBlockListContext::SwXMLBlockListContext( rImport.getBlockList().SetName( xAttrList->getValue( SwXMLBlockListToken::LIST_NAME ) ); } -SwXMLBlockListContext::~SwXMLBlockListContext ( void ) +SwXMLBlockListContext::~SwXMLBlockListContext() { } @@ -241,7 +241,7 @@ SwXMLBlockContext::SwXMLBlockContext( rImport.getBlockList().AddName( aShort, aLong, aPackageName, bTextOnly); } -SwXMLBlockContext::~SwXMLBlockContext ( void ) +SwXMLBlockContext::~SwXMLBlockContext() { } @@ -265,7 +265,7 @@ SwXMLTextBlockDocumentContext::createFastChildContext( sal_Int32 Element, return new SvXMLImportContext( rLocalRef ); } -SwXMLTextBlockDocumentContext::~SwXMLTextBlockDocumentContext ( void ) +SwXMLTextBlockDocumentContext::~SwXMLTextBlockDocumentContext() { } @@ -289,7 +289,7 @@ SwXMLTextBlockTextContext::createFastChildContext( sal_Int32 Element, return new SvXMLImportContext( rLocalRef ); } -SwXMLTextBlockTextContext::~SwXMLTextBlockTextContext ( void ) +SwXMLTextBlockTextContext::~SwXMLTextBlockTextContext() { } @@ -315,7 +315,7 @@ SwXMLTextBlockBodyContext::createFastChildContext( sal_Int32 Element, return new SvXMLImportContext( rLocalRef ); } -SwXMLTextBlockBodyContext::~SwXMLTextBlockBodyContext ( void ) +SwXMLTextBlockBodyContext::~SwXMLTextBlockBodyContext() { } @@ -334,7 +334,7 @@ void SAL_CALL SwXMLTextBlockParContext::characters( const OUString & aChars ) rLocalRef.m_rText += aChars; } -SwXMLTextBlockParContext::~SwXMLTextBlockParContext ( void ) +SwXMLTextBlockParContext::~SwXMLTextBlockParContext() { if (rLocalRef.bTextOnly) rLocalRef.m_rText += "\015"; @@ -354,7 +354,7 @@ SwXMLBlockListImport::SwXMLBlockListImport( { } -SwXMLBlockListImport::~SwXMLBlockListImport ( void ) +SwXMLBlockListImport::~SwXMLBlockListImport() throw () { } @@ -380,7 +380,7 @@ SwXMLTextBlockImport::SwXMLTextBlockImport( { } -SwXMLTextBlockImport::~SwXMLTextBlockImport ( void ) +SwXMLTextBlockImport::~SwXMLTextBlockImport() throw() { } @@ -395,7 +395,7 @@ SvXMLImportContext* SwXMLTextBlockImport::CreateFastContext( sal_Int32 Element, return SvXMLImport::CreateFastContext( Element, xAttrList ); } -void SAL_CALL SwXMLTextBlockImport::endDocument(void) +void SAL_CALL SwXMLTextBlockImport::endDocument() throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) { } diff --git a/sw/source/core/swg/SwXMLSectionList.cxx b/sw/source/core/swg/SwXMLSectionList.cxx index 4ce19c7e4eae..33102ea0716d 100644 --- a/sw/source/core/swg/SwXMLSectionList.cxx +++ b/sw/source/core/swg/SwXMLSectionList.cxx @@ -45,7 +45,7 @@ SwXMLSectionList::SwXMLSectionList( XML_NAMESPACE_TEXT ); } -SwXMLSectionList::~SwXMLSectionList ( void ) +SwXMLSectionList::~SwXMLSectionList() throw() { } @@ -116,7 +116,7 @@ SvXMLImportContext *SvXMLSectionListContext::CreateChildContext( pContext = new SvXMLSectionListContext (rLocalRef, nPrefix, rLocalName, xAttrList); return pContext; } -SvXMLSectionListContext::~SvXMLSectionListContext ( void ) +SvXMLSectionListContext::~SvXMLSectionListContext() { } diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx index 95c6b30f89b4..f2007a1d6821 100644 --- a/sw/source/core/swg/SwXMLTextBlocks.cxx +++ b/sw/source/core/swg/SwXMLTextBlocks.cxx @@ -537,7 +537,7 @@ bool SwXMLTextBlocks::IsFileUCBStorage( const OUString & rFileName) return bRet; } -short SwXMLTextBlocks::GetFileType ( void ) const +short SwXMLTextBlocks::GetFileType() const { return SWBLK_XML; } diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx b/sw/source/core/swg/SwXMLTextBlocks1.cxx index c6d90dedd1bf..2a96fba8b8b4 100644 --- a/sw/source/core/swg/SwXMLTextBlocks1.cxx +++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx @@ -416,7 +416,7 @@ sal_uLong SwXMLTextBlocks::PutBlockText( const OUString& rShort, const OUString& return nRes; } -void SwXMLTextBlocks::ReadInfo( void ) +void SwXMLTextBlocks::ReadInfo() { try { @@ -466,7 +466,7 @@ void SwXMLTextBlocks::ReadInfo( void ) { } } -void SwXMLTextBlocks::WriteInfo( void ) +void SwXMLTextBlocks::WriteInfo() { if ( xBlkRoot.is() || 0 == OpenFile ( false ) ) { diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx index 64e4bdbb7a0f..e6bc9af235e6 100644 --- a/sw/source/core/unocore/unobkm.cxx +++ b/sw/source/core/unocore/unobkm.cxx @@ -575,7 +575,7 @@ void SwXFieldmark::attachToRange( const uno::Reference < text::XTextRange >& xTe ( isReplacementObject ? IDocumentMarkAccess::MarkType::CHECKBOX_FIELDMARK : IDocumentMarkAccess::MarkType::TEXT_FIELDMARK ) ); } -OUString SwXFieldmark::getFieldType(void) +OUString SwXFieldmark::getFieldType() throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index 13c9e321e060..4357191c7fa5 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -847,7 +847,7 @@ SwXTextTables::~SwXTextTables() } -sal_Int32 SwXTextTables::getCount(void) throw( uno::RuntimeException, std::exception ) +sal_Int32 SwXTextTables::getCount() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; sal_Int32 nRet = 0; @@ -906,7 +906,7 @@ uno::Any SwXTextTables::getByName(const OUString& rItemName) return aRet; } -uno::Sequence< OUString > SwXTextTables::getElementNames(void) +uno::Sequence< OUString > SwXTextTables::getElementNames() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -957,7 +957,7 @@ uno::Type SAL_CALL return cppu::UnoType<XTextTable>::get(); } -sal_Bool SwXTextTables::hasElements(void) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTextTables::hasElements() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -965,7 +965,7 @@ sal_Bool SwXTextTables::hasElements(void) throw( uno::RuntimeException, std::exc return 0 != GetDoc()->GetTblFrmFmtCount(true); } -OUString SwXTextTables::getImplementationName(void) throw( uno::RuntimeException, std::exception ) +OUString SwXTextTables::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString("SwXTextTables"); } @@ -975,7 +975,7 @@ sal_Bool SwXTextTables::supportsService(const OUString& rServiceName) throw( uno return cppu::supportsService(this, rServiceName); } -uno::Sequence< OUString > SwXTextTables::getSupportedServiceNames(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXTextTables::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aRet(1); OUString* pArr = aRet.getArray(); @@ -1069,13 +1069,13 @@ namespace SwXFrameEnumeration(const SwDoc* const pDoc); //XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements(void) throw( RuntimeException, std::exception ) SAL_OVERRIDE; - virtual Any SAL_CALL nextElement(void) throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasMoreElements() throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual Any SAL_CALL nextElement() throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( RuntimeException, std::exception ) SAL_OVERRIDE; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( RuntimeException, std::exception ) SAL_OVERRIDE; }; } @@ -1111,14 +1111,14 @@ SwXFrameEnumeration<T>::SwXFrameEnumeration(const SwDoc* const pDoc) } template<FlyCntType T> -sal_Bool SwXFrameEnumeration<T>::hasMoreElements(void) throw( RuntimeException, std::exception ) +sal_Bool SwXFrameEnumeration<T>::hasMoreElements() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; return !m_aFrames.empty(); } template<FlyCntType T> -Any SwXFrameEnumeration<T>::nextElement(void) throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) +Any SwXFrameEnumeration<T>::nextElement() throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(m_aFrames.empty()) @@ -1129,7 +1129,7 @@ Any SwXFrameEnumeration<T>::nextElement(void) throw( NoSuchElementException, Wra } template<FlyCntType T> -OUString SwXFrameEnumeration<T>::getImplementationName(void) throw( RuntimeException, std::exception ) +OUString SwXFrameEnumeration<T>::getImplementationName() throw( RuntimeException, std::exception ) { return OUString("SwXFrameEnumeration"); } @@ -1141,12 +1141,12 @@ sal_Bool SwXFrameEnumeration<T>::supportsService(const OUString& ServiceName) th } template<FlyCntType T> -Sequence< OUString > SwXFrameEnumeration<T>::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) +Sequence< OUString > SwXFrameEnumeration<T>::getSupportedServiceNames() throw( RuntimeException, std::exception ) { return ::comphelper::makeSequence(OUString("com.sun.star.container.XEnumeration")); } -OUString SwXFrames::getImplementationName(void) throw( RuntimeException, std::exception ) +OUString SwXFrames::getImplementationName() throw( RuntimeException, std::exception ) { return OUString("SwXFrames"); } @@ -1156,7 +1156,7 @@ sal_Bool SwXFrames::supportsService(const OUString& rServiceName) throw( Runtime return cppu::supportsService(this, rServiceName); } -Sequence<OUString> SwXFrames::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) +Sequence<OUString> SwXFrames::getSupportedServiceNames() throw( RuntimeException, std::exception ) { return ::comphelper::makeSequence(OUString("com.sun.star.text.TextFrames")); } @@ -1169,7 +1169,7 @@ SwXFrames::SwXFrames(SwDoc* _pDoc, FlyCntType eSet) : SwXFrames::~SwXFrames() {} -uno::Reference<container::XEnumeration> SwXFrames::createEnumeration(void) throw(uno::RuntimeException, std::exception) +uno::Reference<container::XEnumeration> SwXFrames::createEnumeration() throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if(!IsValid()) @@ -1190,7 +1190,7 @@ uno::Reference<container::XEnumeration> SwXFrames::createEnumeration(void) throw } } -sal_Int32 SwXFrames::getCount(void) throw(uno::RuntimeException, std::exception) +sal_Int32 SwXFrames::getCount() throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if(!IsValid()) @@ -1238,7 +1238,7 @@ uno::Any SwXFrames::getByName(const OUString& rName) return lcl_UnoWrapFrame(const_cast<SwFrmFmt*>(pFmt), eType); } -uno::Sequence<OUString> SwXFrames::getElementNames(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence<OUString> SwXFrames::getElementNames() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -1287,7 +1287,7 @@ uno::Type SAL_CALL SwXFrames::getElementType() throw(uno::RuntimeException, std: } } -sal_Bool SwXFrames::hasElements(void) throw(uno::RuntimeException, std::exception) +sal_Bool SwXFrames::hasElements() throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if(!IsValid()) @@ -1296,7 +1296,7 @@ sal_Bool SwXFrames::hasElements(void) throw(uno::RuntimeException, std::exceptio } -OUString SwXTextFrames::getImplementationName(void) throw( RuntimeException, std::exception ) +OUString SwXTextFrames::getImplementationName() throw( RuntimeException, std::exception ) { return OUString("SwXTextFrames"); } @@ -1306,7 +1306,7 @@ sal_Bool SwXTextFrames::supportsService(const OUString& rServiceName) throw( Run return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SwXTextFrames::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) +Sequence< OUString > SwXTextFrames::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); OUString* pArray = aRet.getArray(); @@ -1323,7 +1323,7 @@ SwXTextFrames::~SwXTextFrames() { } -OUString SwXTextGraphicObjects::getImplementationName(void) throw( RuntimeException, std::exception ) +OUString SwXTextGraphicObjects::getImplementationName() throw( RuntimeException, std::exception ) { return OUString("SwXTextGraphicObjects"); } @@ -1333,7 +1333,7 @@ sal_Bool SwXTextGraphicObjects::supportsService(const OUString& rServiceName) th return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SwXTextGraphicObjects::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) +Sequence< OUString > SwXTextGraphicObjects::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); OUString* pArray = aRet.getArray(); @@ -1350,7 +1350,7 @@ SwXTextGraphicObjects::~SwXTextGraphicObjects() { } -OUString SwXTextEmbeddedObjects::getImplementationName(void) throw( RuntimeException, std::exception ) +OUString SwXTextEmbeddedObjects::getImplementationName() throw( RuntimeException, std::exception ) { return OUString("SwXTextEmbeddedObjects"); } @@ -1360,7 +1360,7 @@ sal_Bool SwXTextEmbeddedObjects::supportsService(const OUString& rServiceName) t return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SwXTextEmbeddedObjects::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) +Sequence< OUString > SwXTextEmbeddedObjects::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); OUString* pArray = aRet.getArray(); @@ -1377,7 +1377,7 @@ SwXTextEmbeddedObjects::~SwXTextEmbeddedObjects() { } -OUString SwXTextSections::getImplementationName(void) throw( RuntimeException, std::exception ) +OUString SwXTextSections::getImplementationName() throw( RuntimeException, std::exception ) { return OUString("SwXTextSections"); } @@ -1387,7 +1387,7 @@ sal_Bool SwXTextSections::supportsService(const OUString& rServiceName) throw( R return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SwXTextSections::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) +Sequence< OUString > SwXTextSections::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); OUString* pArray = aRet.getArray(); @@ -1404,7 +1404,7 @@ SwXTextSections::~SwXTextSections() { } -sal_Int32 SwXTextSections::getCount(void) throw( uno::RuntimeException, std::exception ) +sal_Int32 SwXTextSections::getCount() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -1480,7 +1480,7 @@ uno::Any SwXTextSections::getByName(const OUString& rName) return aRet; } -uno::Sequence< OUString > SwXTextSections::getElementNames(void) +uno::Sequence< OUString > SwXTextSections::getElementNames() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -1545,7 +1545,7 @@ uno::Type SAL_CALL SwXTextSections::getElementType() throw(uno::RuntimeException return cppu::UnoType<XTextSection>::get(); } -sal_Bool SwXTextSections::hasElements(void) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTextSections::hasElements() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; size_t nCount = 0; @@ -1564,7 +1564,7 @@ uno::Reference< XTextSection > SwXTextSections::GetObject( SwSectionFmt& rFmt ) return SwXTextSection::CreateXTextSection(&rFmt); } -OUString SwXBookmarks::getImplementationName(void) throw( RuntimeException, std::exception ) +OUString SwXBookmarks::getImplementationName() throw( RuntimeException, std::exception ) { return OUString("SwXBookmarks"); } @@ -1574,7 +1574,7 @@ sal_Bool SwXBookmarks::supportsService(const OUString& rServiceName) throw( Runt return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SwXBookmarks::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) +Sequence< OUString > SwXBookmarks::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); aRet[0] = "com.sun.star.text.Bookmarks"; @@ -1588,7 +1588,7 @@ SwXBookmarks::SwXBookmarks(SwDoc* _pDoc) : SwXBookmarks::~SwXBookmarks() { } -sal_Int32 SwXBookmarks::getCount(void) +sal_Int32 SwXBookmarks::getCount() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -1661,7 +1661,7 @@ uno::Any SwXBookmarks::getByName(const OUString& rName) return aRet; } -uno::Sequence< OUString > SwXBookmarks::getElementNames(void) +uno::Sequence< OUString > SwXBookmarks::getElementNames() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -1700,7 +1700,7 @@ uno::Type SAL_CALL SwXBookmarks::getElementType() return cppu::UnoType<XTextContent>::get(); } -sal_Bool SwXBookmarks::hasElements(void) +sal_Bool SwXBookmarks::hasElements() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -1730,7 +1730,7 @@ SwXNumberingRulesCollection::~SwXNumberingRulesCollection() { } -sal_Int32 SwXNumberingRulesCollection::getCount(void) throw( uno::RuntimeException, std::exception ) +sal_Int32 SwXNumberingRulesCollection::getCount() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -1765,7 +1765,7 @@ uno::Type SAL_CALL SwXNumberingRulesCollection::getElementType() throw(uno::Runt return cppu::UnoType<XIndexReplace>::get(); } -sal_Bool SwXNumberingRulesCollection::hasElements(void) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXNumberingRulesCollection::hasElements() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -1773,7 +1773,7 @@ sal_Bool SwXNumberingRulesCollection::hasElements(void) throw( uno::RuntimeExcep return !GetDoc()->GetNumRuleTbl().empty(); } -OUString SwXFootnotes::getImplementationName(void) throw( RuntimeException, std::exception ) +OUString SwXFootnotes::getImplementationName() throw( RuntimeException, std::exception ) { return OUString("SwXFootnotes"); } @@ -1783,7 +1783,7 @@ sal_Bool SwXFootnotes::supportsService(const OUString& rServiceName) throw( Runt return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SwXFootnotes::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) +Sequence< OUString > SwXFootnotes::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); OUString* pArray = aRet.getArray(); @@ -1801,7 +1801,7 @@ SwXFootnotes::~SwXFootnotes() { } -sal_Int32 SwXFootnotes::getCount(void) throw( uno::RuntimeException, std::exception ) +sal_Int32 SwXFootnotes::getCount() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -1860,7 +1860,7 @@ uno::Type SAL_CALL SwXFootnotes::getElementType() throw(uno::RuntimeException, s return cppu::UnoType<XFootnote>::get(); } -sal_Bool SwXFootnotes::hasElements(void) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXFootnotes::hasElements() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -1873,7 +1873,7 @@ Reference<XFootnote> SwXFootnotes::GetObject( SwDoc& rDoc, const SwFmtFtn& rF return SwXFootnote::CreateXFootnote(rDoc, &const_cast<SwFmtFtn&>(rFmt)); } -OUString SwXReferenceMarks::getImplementationName(void) throw( RuntimeException, std::exception ) +OUString SwXReferenceMarks::getImplementationName() throw( RuntimeException, std::exception ) { return OUString("SwXReferenceMarks"); } @@ -1883,7 +1883,7 @@ sal_Bool SwXReferenceMarks::supportsService(const OUString& rServiceName) throw( return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SwXReferenceMarks::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) +Sequence< OUString > SwXReferenceMarks::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); OUString* pArray = aRet.getArray(); @@ -1900,7 +1900,7 @@ SwXReferenceMarks::~SwXReferenceMarks() { } -sal_Int32 SwXReferenceMarks::getCount(void) throw( uno::RuntimeException, std::exception ) +sal_Int32 SwXReferenceMarks::getCount() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -1954,7 +1954,7 @@ uno::Any SwXReferenceMarks::getByName(const OUString& rName) return aRet; } -uno::Sequence< OUString > SwXReferenceMarks::getElementNames(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXReferenceMarks::getElementNames() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; uno::Sequence<OUString> aRet; @@ -1985,7 +1985,7 @@ uno::Type SAL_CALL SwXReferenceMarks::getElementType() throw(uno::RuntimeExcepti return cppu::UnoType<XTextContent>::get(); } -sal_Bool SwXReferenceMarks::hasElements(void) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXReferenceMarks::hasElements() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index 3cf4b01a8464..4e671b3d7560 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -385,13 +385,13 @@ namespace SwXShapesEnumeration(SwXDrawPage* const pDrawPage); //XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements(void) throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual uno::Any SAL_CALL nextElement(void) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasMoreElements() throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual uno::Any SAL_CALL nextElement() throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames(void) throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } @@ -409,13 +409,13 @@ SwXShapesEnumeration::SwXShapesEnumeration(SwXDrawPage* const pDrawPage) } } -sal_Bool SwXShapesEnumeration::hasMoreElements(void) throw(uno::RuntimeException, std::exception) +sal_Bool SwXShapesEnumeration::hasMoreElements() throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return !m_aShapes.empty(); } -uno::Any SwXShapesEnumeration::nextElement(void) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +uno::Any SwXShapesEnumeration::nextElement() throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if(m_aShapes.empty()) @@ -425,7 +425,7 @@ uno::Any SwXShapesEnumeration::nextElement(void) throw(container::NoSuchElementE return aResult; } -OUString SwXShapesEnumeration::getImplementationName(void) throw(uno::RuntimeException, std::exception) +OUString SwXShapesEnumeration::getImplementationName() throw(uno::RuntimeException, std::exception) { return OUString("SwXShapeEnumeration"); } @@ -435,19 +435,19 @@ sal_Bool SwXShapesEnumeration::supportsService(const OUString& ServiceName) thro return cppu::supportsService(this, ServiceName); } -uno::Sequence< OUString > SwXShapesEnumeration::getSupportedServiceNames(void) throw(uno::RuntimeException, std::exception) +uno::Sequence< OUString > SwXShapesEnumeration::getSupportedServiceNames() throw(uno::RuntimeException, std::exception) { return ::comphelper::makeSequence(OUString("com.sun.star.container.XEnumeration")); } -uno::Reference< container::XEnumeration > SwXDrawPage::createEnumeration(void) throw( uno::RuntimeException, std::exception ) +uno::Reference< container::XEnumeration > SwXDrawPage::createEnumeration() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; return uno::Reference< container::XEnumeration >( new SwXShapesEnumeration(this)); } -OUString SwXDrawPage::getImplementationName(void) throw( uno::RuntimeException, std::exception ) +OUString SwXDrawPage::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString("SwXDrawPage"); } @@ -457,7 +457,7 @@ sal_Bool SwXDrawPage::supportsService(const OUString& rServiceName) throw( uno:: return cppu::supportsService(this, rServiceName); } -uno::Sequence< OUString > SwXDrawPage::getSupportedServiceNames(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXDrawPage::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aRet(1); OUString* pArray = aRet.getArray(); @@ -519,7 +519,7 @@ uno::Sequence< uno::Type > SwXDrawPage::getTypes() throw( uno::RuntimeException, return aPageTypes; } -sal_Int32 SwXDrawPage::getCount(void) throw( uno::RuntimeException, std::exception ) +sal_Int32 SwXDrawPage::getCount() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!pDoc) @@ -569,12 +569,12 @@ uno::Any SwXDrawPage::getByIndex(sal_Int32 nIndex, std::set<const SwFrmFmt*>* pT return SwTextBoxHelper::getByIndex(pDrawPage->GetSdrPage(), nIndex, *pTextBoxes); } -uno::Type SwXDrawPage::getElementType(void) throw( uno::RuntimeException, std::exception ) +uno::Type SwXDrawPage::getElementType() throw( uno::RuntimeException, std::exception ) { return cppu::UnoType<drawing::XShape>::get(); } -sal_Bool SwXDrawPage::hasElements(void) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXDrawPage::hasElements() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!pDoc) @@ -1064,7 +1064,7 @@ uno::Sequence< sal_Int8 > SwXShape::getImplementationId( ) throw(uno::RuntimeEx return css::uno::Sequence<sal_Int8>(); } -uno::Reference< beans::XPropertySetInfo > SwXShape::getPropertySetInfo(void) throw( uno::RuntimeException, std::exception ) +uno::Reference< beans::XPropertySetInfo > SwXShape::getPropertySetInfo() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; uno::Reference< beans::XPropertySetInfo > aRet; @@ -2146,7 +2146,7 @@ void SwXShape::attach(const uno::Reference< text::XTextRange > & xTextRange) } } -uno::Reference< text::XTextRange > SwXShape::getAnchor(void) throw( uno::RuntimeException, std::exception ) +uno::Reference< text::XTextRange > SwXShape::getAnchor() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; uno::Reference< text::XTextRange > aRef; @@ -2168,7 +2168,7 @@ uno::Reference< text::XTextRange > SwXShape::getAnchor(void) throw( uno::Runtim return aRef; } -void SwXShape::dispose(void) throw( uno::RuntimeException, std::exception ) +void SwXShape::dispose() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; SwFrmFmt* pFmt = GetFrmFmt(); @@ -2235,7 +2235,7 @@ void SwXShape::removeEventListener( pSvxShape->removeEventListener(aListener); } -OUString SwXShape::getImplementationName(void) throw( uno::RuntimeException, std::exception ) +OUString SwXShape::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString("SwXShape"); } @@ -2245,7 +2245,7 @@ sal_Bool SwXShape::supportsService(const OUString& rServiceName) throw( uno::Run return cppu::supportsService(this, rServiceName); } -uno::Sequence< OUString > SwXShape::getSupportedServiceNames(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXShape::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aSeq; if(xShapeAgg.is()) @@ -2889,7 +2889,7 @@ void SwXGroupShape::remove( const uno::Reference< XShape >& xShape ) throw (uno: xShapes->remove(xShape); } -sal_Int32 SwXGroupShape::getCount(void) throw( uno::RuntimeException, std::exception ) +sal_Int32 SwXGroupShape::getCount() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; uno::Reference<XIndexAccess> xAcc; diff --git a/sw/source/core/unocore/unoevent.cxx b/sw/source/core/unocore/unoevent.cxx index eb84c073fafb..6bb59ef44a5f 100644 --- a/sw/source/core/unocore/unoevent.cxx +++ b/sw/source/core/unocore/unoevent.cxx @@ -110,7 +110,7 @@ SwHyperlinkEventDescriptor::~SwHyperlinkEventDescriptor() { } -OUString SwHyperlinkEventDescriptor::getImplementationName(void) +OUString SwHyperlinkEventDescriptor::getImplementationName() throw( RuntimeException, std::exception ) { return sImplName; diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index e76e0b6068a0..1d2295f8ab0b 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -2671,7 +2671,7 @@ const SwField* SwXTextField::Impl::GetField() const return 0; } -OUString SwXTextFieldMasters::getImplementationName(void) throw( uno::RuntimeException, std::exception ) +OUString SwXTextFieldMasters::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString("SwXTextFieldMasters"); } @@ -2681,7 +2681,7 @@ sal_Bool SwXTextFieldMasters::supportsService(const OUString& rServiceName) thro return cppu::supportsService(this, rServiceName); } -uno::Sequence< OUString > SwXTextFieldMasters::getSupportedServiceNames(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXTextFieldMasters::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aRet(1); OUString* pArray = aRet.getArray(); @@ -2808,7 +2808,7 @@ bool SwXTextFieldMasters::getInstanceName( return true; } -uno::Sequence< OUString > SwXTextFieldMasters::getElementNames(void) +uno::Sequence< OUString > SwXTextFieldMasters::getElementNames() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -2857,13 +2857,13 @@ sal_Bool SwXTextFieldMasters::hasByName(const OUString& rName) throw( uno::Runti return bRet; } -uno::Type SwXTextFieldMasters::getElementType(void) throw( uno::RuntimeException, std::exception ) +uno::Type SwXTextFieldMasters::getElementType() throw( uno::RuntimeException, std::exception ) { return cppu::UnoType<beans::XPropertySet>::get(); } -sal_Bool SwXTextFieldMasters::hasElements(void) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTextFieldMasters::hasElements() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -2882,7 +2882,7 @@ public: Impl() : m_RefreshListeners(m_Mutex) { } }; -OUString SwXTextFieldTypes::getImplementationName(void) throw( uno::RuntimeException, std::exception ) +OUString SwXTextFieldTypes::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString("SwXTextFieldTypes"); } @@ -2892,7 +2892,7 @@ sal_Bool SwXTextFieldTypes::supportsService(const OUString& rServiceName) throw( return cppu::supportsService(this, rServiceName); } -uno::Sequence< OUString > SwXTextFieldTypes::getSupportedServiceNames(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXTextFieldTypes::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aRet(1); OUString* pArray = aRet.getArray(); @@ -2917,7 +2917,7 @@ void SwXTextFieldTypes::Invalidate() m_pImpl->m_RefreshListeners.disposeAndClear(ev); } -uno::Reference< container::XEnumeration > SwXTextFieldTypes::createEnumeration(void) +uno::Reference< container::XEnumeration > SwXTextFieldTypes::createEnumeration() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -2926,12 +2926,12 @@ uno::Reference< container::XEnumeration > SwXTextFieldTypes::createEnumeration( return new SwXFieldEnumeration(*GetDoc()); } -uno::Type SwXTextFieldTypes::getElementType(void) throw( uno::RuntimeException, std::exception ) +uno::Type SwXTextFieldTypes::getElementType() throw( uno::RuntimeException, std::exception ) { return cppu::UnoType<text::XDependentTextField>::get(); } -sal_Bool SwXTextFieldTypes::hasElements(void) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTextFieldTypes::hasElements() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 99ee1d441559..cd7dd0101982 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -1149,7 +1149,7 @@ sal_Int64 SAL_CALL SwXFrame::getSomething( const :: uno::Sequence< sal_Int8 >& r TYPEINIT1(SwXFrame, SwClient); -OUString SwXFrame::getImplementationName(void) throw( uno::RuntimeException, std::exception ) +OUString SwXFrame::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString("SwXFrame"); } @@ -1159,7 +1159,7 @@ sal_Bool SwXFrame::supportsService(const :: OUString& rServiceName) throw( uno:: return cppu::supportsService(this, rServiceName); } -uno::Sequence< OUString > SwXFrame::getSupportedServiceNames(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXFrame::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aRet(3); aRet[0] = "com.sun.star.text.BaseFrame"; @@ -1266,7 +1266,7 @@ SwXFrame::CreateXFrame(SwDoc & rDoc, SwFrmFmt *const pFrmFmt) return xFrame; } -OUString SwXFrame::getName(void) throw( uno::RuntimeException, std::exception ) +OUString SwXFrame::getName() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; SwFrmFmt* pFmt = GetFrmFmt(); @@ -1295,7 +1295,7 @@ void SwXFrame::setName(const OUString& rName) throw( uno::RuntimeException, std: throw uno::RuntimeException(); } -uno::Reference< beans::XPropertySetInfo > SwXFrame::getPropertySetInfo(void) throw( uno::RuntimeException, std::exception ) +uno::Reference< beans::XPropertySetInfo > SwXFrame::getPropertySetInfo() throw( uno::RuntimeException, std::exception ) { uno::Reference< beans::XPropertySetInfo > xRef; static uno::Reference< beans::XPropertySetInfo > xFrmRef; @@ -2604,7 +2604,7 @@ void SwXFrame::Modify(const SfxPoolItem* pOld, const SfxPoolItem *pNew) m_pImpl->m_EventListeners.disposeAndClear(ev); } -void SwXFrame::dispose(void) throw( uno::RuntimeException, std::exception ) +void SwXFrame::dispose() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; SwFrmFmt* pFmt = GetFrmFmt(); @@ -2633,7 +2633,7 @@ void SwXFrame::dispose(void) throw( uno::RuntimeException, std::exception ) } -uno::Reference< text::XTextRange > SwXFrame::getAnchor(void) throw( uno::RuntimeException, std::exception ) +uno::Reference< text::XTextRange > SwXFrame::getAnchor() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; uno::Reference< text::XTextRange > aRef; @@ -3052,7 +3052,7 @@ void SwXFrame::attach(const uno::Reference< text::XTextRange > & xTextRange) } } -awt::Point SwXFrame::getPosition(void) throw( uno::RuntimeException, std::exception ) +awt::Point SwXFrame::getPosition() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; uno::RuntimeException aRuntime; @@ -3068,7 +3068,7 @@ void SwXFrame::setPosition(const awt::Point& /*aPosition*/) throw( uno::RuntimeE throw aRuntime; } -awt::Size SwXFrame::getSize(void) throw( uno::RuntimeException, std::exception ) +awt::Size SwXFrame::getSize() throw( uno::RuntimeException, std::exception ) { const ::uno::Any aVal = getPropertyValue("Size"); awt::Size const * pRet = static_cast<awt::Size const *>(aVal.getValue()); @@ -3082,7 +3082,7 @@ void SwXFrame::setSize(const awt::Size& aSize) setPropertyValue("Size", aVal); } -OUString SwXFrame::getShapeType(void) throw( uno::RuntimeException, std::exception ) +OUString SwXFrame::getShapeType() throw( uno::RuntimeException, std::exception ) { return OUString("FrameShape"); } @@ -3161,7 +3161,7 @@ uno::Sequence< sal_Int8 > SAL_CALL SwXTextFrame::getImplementationId( ) throw(u return css::uno::Sequence<sal_Int8>(); } -uno::Reference< text::XText > SwXTextFrame::getText(void) throw( uno::RuntimeException, std::exception ) +uno::Reference< text::XText > SwXTextFrame::getText() throw( uno::RuntimeException, std::exception ) { return this; } @@ -3187,7 +3187,7 @@ SwXTextFrame::CreateCursor() throw (uno::RuntimeException) return createTextCursor(); } -uno::Reference< text::XTextCursor > SwXTextFrame::createTextCursor(void) throw( uno::RuntimeException, std::exception ) +uno::Reference< text::XTextCursor > SwXTextFrame::createTextCursor() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; uno::Reference< text::XTextCursor > aRef; @@ -3255,7 +3255,7 @@ uno::Reference< text::XTextCursor > SwXTextFrame::createTextCursorByRange(const return aRef; } -uno::Reference< container::XEnumeration > SwXTextFrame::createEnumeration(void) throw( uno::RuntimeException, std::exception ) +uno::Reference< container::XEnumeration > SwXTextFrame::createEnumeration() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; uno::Reference< container::XEnumeration > aRef; @@ -3271,12 +3271,12 @@ uno::Reference< container::XEnumeration > SwXTextFrame::createEnumeration(void) return aRef; } -uno::Type SwXTextFrame::getElementType(void) throw( uno::RuntimeException, std::exception ) +uno::Type SwXTextFrame::getElementType() throw( uno::RuntimeException, std::exception ) { return cppu::UnoType<text::XTextRange>::get(); } -sal_Bool SwXTextFrame::hasElements(void) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTextFrame::hasElements() throw( uno::RuntimeException, std::exception ) { return sal_True; } @@ -3287,13 +3287,13 @@ void SwXTextFrame::attach(const uno::Reference< text::XTextRange > & xTextRange) SwXFrame::attach(xTextRange); } -uno::Reference< text::XTextRange > SwXTextFrame::getAnchor(void) throw( uno::RuntimeException, std::exception ) +uno::Reference< text::XTextRange > SwXTextFrame::getAnchor() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; return SwXFrame::getAnchor(); } -void SwXTextFrame::dispose(void) throw( uno::RuntimeException, std::exception ) +void SwXTextFrame::dispose() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; SwXFrame::dispose(); @@ -3309,7 +3309,7 @@ void SwXTextFrame::removeEventListener(const uno::Reference< lang::XEventListene SwXFrame::removeEventListener(aListener); } -OUString SwXTextFrame::getImplementationName(void) throw( uno::RuntimeException, std::exception ) +OUString SwXTextFrame::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString("SwXTextFrame"); } @@ -3319,7 +3319,7 @@ sal_Bool SwXTextFrame::supportsService(const OUString& rServiceName) throw( uno: return cppu::supportsService(this, rServiceName); } -uno::Sequence< OUString > SwXTextFrame::getSupportedServiceNames(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXTextFrame::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { uno::Sequence < OUString > aRet = SwXFrame::getSupportedServiceNames(); aRet.realloc(aRet.getLength() + 2); @@ -3443,13 +3443,13 @@ void SwXTextGraphicObject::attach(const uno::Reference< text::XTextRange > & xTe SwXFrame::attach(xTextRange); } -uno::Reference< text::XTextRange > SwXTextGraphicObject::getAnchor(void) throw( uno::RuntimeException, std::exception ) +uno::Reference< text::XTextRange > SwXTextGraphicObject::getAnchor() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; return SwXFrame::getAnchor(); } -void SwXTextGraphicObject::dispose(void) throw( uno::RuntimeException, std::exception ) +void SwXTextGraphicObject::dispose() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; SwXFrame::dispose(); @@ -3467,7 +3467,7 @@ void SwXTextGraphicObject::removeEventListener(const uno::Reference< lang::XEven SwXFrame::removeEventListener(aListener); } -OUString SwXTextGraphicObject::getImplementationName(void) throw( uno::RuntimeException, std::exception ) +OUString SwXTextGraphicObject::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString("SwXTextGraphicObject"); } @@ -3477,7 +3477,7 @@ sal_Bool SwXTextGraphicObject::supportsService(const OUString& rServiceName) thr return cppu::supportsService(this, rServiceName); } -uno::Sequence< OUString > SwXTextGraphicObject::getSupportedServiceNames(void) +uno::Sequence< OUString > SwXTextGraphicObject::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { uno::Sequence < OUString > aRet = SwXFrame::getSupportedServiceNames(); @@ -3575,13 +3575,13 @@ void SwXTextEmbeddedObject::attach(const uno::Reference< text::XTextRange > & xT SwXFrame::attach(xTextRange); } -uno::Reference< text::XTextRange > SwXTextEmbeddedObject::getAnchor(void) throw( uno::RuntimeException, std::exception ) +uno::Reference< text::XTextRange > SwXTextEmbeddedObject::getAnchor() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; return SwXFrame::getAnchor(); } -void SwXTextEmbeddedObject::dispose(void) throw( uno::RuntimeException, std::exception ) +void SwXTextEmbeddedObject::dispose() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; SwXFrame::dispose(); @@ -3597,7 +3597,7 @@ void SwXTextEmbeddedObject::removeEventListener(const uno::Reference< lang::XEve SwXFrame::removeEventListener(aListener); } -uno::Reference< lang::XComponent > SwXTextEmbeddedObject::getEmbeddedObject(void) throw( uno::RuntimeException, std::exception ) +uno::Reference< lang::XComponent > SwXTextEmbeddedObject::getEmbeddedObject() throw( uno::RuntimeException, std::exception ) { uno::Reference<embed::XEmbeddedObject> xObj(getExtendedControlOverEmbeddedObject()); return xObj.is() ? uno::Reference<lang::XComponent>(xObj->getComponent(), uno::UNO_QUERY) : nullptr; @@ -3689,7 +3689,7 @@ uno::Reference< graphic::XGraphic > SAL_CALL SwXTextEmbeddedObject::getReplaceme return uno::Reference< graphic::XGraphic >(); } -OUString SwXTextEmbeddedObject::getImplementationName(void) throw( uno::RuntimeException, std::exception ) +OUString SwXTextEmbeddedObject::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString("SwXTextEmbeddedObject"); } @@ -3699,7 +3699,7 @@ sal_Bool SwXTextEmbeddedObject::supportsService(const OUString& rServiceName) th return cppu::supportsService(this, rServiceName); } -uno::Sequence< OUString > SwXTextEmbeddedObject::getSupportedServiceNames(void) +uno::Sequence< OUString > SwXTextEmbeddedObject::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { uno::Sequence < OUString > aRet = SwXFrame::getSupportedServiceNames(); diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx index e97b1d94e3ce..f4e088503d5e 100644 --- a/sw/source/core/unocore/unoredline.cxx +++ b/sw/source/core/unocore/unoredline.cxx @@ -102,7 +102,7 @@ uno::Sequence<sal_Int8> SwXRedlineText::getImplementationId() return css::uno::Sequence<sal_Int8>(); } -uno::Reference<text::XTextCursor> SwXRedlineText::createTextCursor(void) +uno::Reference<text::XTextCursor> SwXRedlineText::createTextCursor() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -115,7 +115,7 @@ uno::Reference<text::XTextCursor> SwXRedlineText::createTextCursor(void) // #101929# prevent a newly created text cursor from running inside a table // because table cells have their own XText. - // Patterned after SwXTextFrame::createTextCursor(void). + // Patterned after SwXTextFrame::createTextCursor(). // skip all tables at the beginning SwTableNode* pTableNode = pUnoCursor->GetNode().FindTableNode(); @@ -155,7 +155,7 @@ uno::Reference<text::XTextCursor> SwXRedlineText::createTextCursorByRange( return xCursor; } -uno::Reference<container::XEnumeration> SwXRedlineText::createEnumeration(void) +uno::Reference<container::XEnumeration> SwXRedlineText::createEnumeration() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -527,7 +527,7 @@ void SwXRedline::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) } } -uno::Reference< container::XEnumeration > SwXRedline::createEnumeration(void) throw( uno::RuntimeException, std::exception ) +uno::Reference< container::XEnumeration > SwXRedline::createEnumeration() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; uno::Reference< container::XEnumeration > xRet; @@ -558,7 +558,7 @@ sal_Bool SwXRedline::hasElements( ) throw(uno::RuntimeException, std::exception return 0 != pRedline->GetContentIdx(); } -uno::Reference< text::XTextCursor > SwXRedline::createTextCursor(void) throw( uno::RuntimeException, std::exception ) +uno::Reference< text::XTextCursor > SwXRedline::createTextCursor() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!pDoc) diff --git a/sw/source/core/unocore/unoredlines.cxx b/sw/source/core/unocore/unoredlines.cxx index 4d15d2c5eeb0..c536fd34e2a7 100644 --- a/sw/source/core/unocore/unoredlines.cxx +++ b/sw/source/core/unocore/unoredlines.cxx @@ -72,7 +72,7 @@ uno::Any SwXRedlines::getByIndex(sal_Int32 nIndex) return aRet; } -uno::Reference< container::XEnumeration > SwXRedlines::createEnumeration(void) +uno::Reference< container::XEnumeration > SwXRedlines::createEnumeration() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -95,7 +95,7 @@ sal_Bool SwXRedlines::hasElements( ) throw(uno::RuntimeException, std::exceptio return rRedTbl.size() > 0; } -OUString SwXRedlines::getImplementationName(void) throw( uno::RuntimeException, std::exception ) +OUString SwXRedlines::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString("SwXRedlines"); } @@ -106,7 +106,7 @@ sal_Bool SwXRedlines::supportsService(const OUString& ServiceName) return cppu::supportsService(this, ServiceName); } -uno::Sequence< OUString > SwXRedlines::getSupportedServiceNames(void) +uno::Sequence< OUString > SwXRedlines::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { OSL_FAIL("not implemented"); @@ -140,14 +140,14 @@ SwXRedlineEnumeration::~SwXRedlineEnumeration() { } -sal_Bool SwXRedlineEnumeration::hasMoreElements(void) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXRedlineEnumeration::hasMoreElements() throw( uno::RuntimeException, std::exception ) { if(!pDoc) throw uno::RuntimeException(); return pDoc->getIDocumentRedlineAccess().GetRedlineTbl().size() > nCurrentIndex; } -uno::Any SwXRedlineEnumeration::nextElement(void) +uno::Any SwXRedlineEnumeration::nextElement() throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { if(!pDoc) @@ -161,7 +161,7 @@ uno::Any SwXRedlineEnumeration::nextElement(void) return aRet; } -OUString SwXRedlineEnumeration::getImplementationName(void) throw( uno::RuntimeException, std::exception ) +OUString SwXRedlineEnumeration::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString("SwXRedlineEnumeration"); } @@ -171,7 +171,7 @@ sal_Bool SwXRedlineEnumeration::supportsService(const OUString& ServiceName) thr return cppu::supportsService(this, ServiceName); } -uno::Sequence< OUString > SwXRedlineEnumeration::getSupportedServiceNames(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXRedlineEnumeration::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { return uno::Sequence< OUString >(); } diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index e4427d2bf6cb..3e9439ea3c59 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -262,7 +262,7 @@ const unsigned short aUnoToSvxAdjust[] = USHRT_MAX }; -OUString SwXFootnoteProperties::getImplementationName(void) throw( RuntimeException, std::exception ) +OUString SwXFootnoteProperties::getImplementationName() throw( RuntimeException, std::exception ) { return OUString("SwXFootnoteProperties"); } @@ -272,7 +272,7 @@ sal_Bool SwXFootnoteProperties::supportsService(const OUString& rServiceName) th return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SwXFootnoteProperties::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) +Sequence< OUString > SwXFootnoteProperties::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); OUString* pArray = aRet.getArray(); @@ -291,7 +291,7 @@ SwXFootnoteProperties::~SwXFootnoteProperties() } -uno::Reference< beans::XPropertySetInfo > SwXFootnoteProperties::getPropertySetInfo(void) +uno::Reference< beans::XPropertySetInfo > SwXFootnoteProperties::getPropertySetInfo() throw( uno::RuntimeException, std::exception ) { static uno::Reference< beans::XPropertySetInfo > aRef = m_pPropertySet->getPropertySetInfo(); @@ -566,7 +566,7 @@ void SwXFootnoteProperties::removeVetoableChangeListener( OSL_FAIL("not implemented"); } -OUString SwXEndnoteProperties::getImplementationName(void) throw( RuntimeException, std::exception ) +OUString SwXEndnoteProperties::getImplementationName() throw( RuntimeException, std::exception ) { return OUString("SwXEndnoteProperties"); } @@ -576,7 +576,7 @@ sal_Bool SwXEndnoteProperties::supportsService(const OUString& rServiceName) thr return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SwXEndnoteProperties::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) +Sequence< OUString > SwXEndnoteProperties::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); OUString* pArray = aRet.getArray(); @@ -594,7 +594,7 @@ SwXEndnoteProperties::~SwXEndnoteProperties() { } -uno::Reference< beans::XPropertySetInfo > SwXEndnoteProperties::getPropertySetInfo(void) throw( uno::RuntimeException, std::exception ) +uno::Reference< beans::XPropertySetInfo > SwXEndnoteProperties::getPropertySetInfo() throw( uno::RuntimeException, std::exception ) { static uno::Reference< beans::XPropertySetInfo > aRef = m_pPropertySet->getPropertySetInfo(); return aRef; @@ -792,7 +792,7 @@ void SwXEndnoteProperties::removeVetoableChangeListener(const OUString& /*Proper OSL_FAIL("not implemented"); } -OUString SwXLineNumberingProperties::getImplementationName(void) throw( RuntimeException, std::exception ) +OUString SwXLineNumberingProperties::getImplementationName() throw( RuntimeException, std::exception ) { return OUString("SwXLineNumberingProperties"); } @@ -802,7 +802,7 @@ sal_Bool SwXLineNumberingProperties::supportsService(const OUString& rServiceNam return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SwXLineNumberingProperties::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) +Sequence< OUString > SwXLineNumberingProperties::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); OUString* pArray = aRet.getArray(); @@ -820,7 +820,7 @@ SwXLineNumberingProperties::~SwXLineNumberingProperties() { } -uno::Reference< beans::XPropertySetInfo > SwXLineNumberingProperties::getPropertySetInfo(void) throw( uno::RuntimeException, std::exception ) +uno::Reference< beans::XPropertySetInfo > SwXLineNumberingProperties::getPropertySetInfo() throw( uno::RuntimeException, std::exception ) { static uno::Reference< beans::XPropertySetInfo > aRef = m_pPropertySet->getPropertySetInfo(); return aRef; @@ -1088,7 +1088,7 @@ sal_Int64 SwXNumberingRules::getSomething( const uno::Sequence< sal_Int8 > & rId return 0; } -OUString SwXNumberingRules::getImplementationName(void) throw( RuntimeException, std::exception ) +OUString SwXNumberingRules::getImplementationName() throw( RuntimeException, std::exception ) { return OUString("SwXNumberingRules"); } @@ -1098,7 +1098,7 @@ sal_Bool SwXNumberingRules::supportsService(const OUString& rServiceName) throw( return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SwXNumberingRules::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) +Sequence< OUString > SwXNumberingRules::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); OUString* pArray = aRet.getArray(); @@ -1243,7 +1243,7 @@ void SwXNumberingRules::replaceByIndex(sal_Int32 nIndex, const uno::Any& rElemen throw uno::RuntimeException(); } -sal_Int32 SwXNumberingRules::getCount(void) throw( uno::RuntimeException, std::exception ) +sal_Int32 SwXNumberingRules::getCount() throw( uno::RuntimeException, std::exception ) { return MAXLEVEL; } @@ -1278,13 +1278,13 @@ uno::Any SwXNumberingRules::getByIndex(sal_Int32 nIndex) return aVal; } -uno::Type SwXNumberingRules::getElementType(void) +uno::Type SwXNumberingRules::getElementType() throw( uno::RuntimeException, std::exception ) { return cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get(); } -sal_Bool SwXNumberingRules::hasElements(void) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXNumberingRules::hasElements() throw( uno::RuntimeException, std::exception ) { return sal_True; } @@ -2286,7 +2286,7 @@ void SwXNumberingRules::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew } } -OUString SwXChapterNumbering::getImplementationName(void) throw( RuntimeException, std::exception ) +OUString SwXChapterNumbering::getImplementationName() throw( RuntimeException, std::exception ) { return OUString("SwXChapterNumbering"); } @@ -2296,7 +2296,7 @@ sal_Bool SwXChapterNumbering::supportsService(const OUString& rServiceName) thro return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SwXChapterNumbering::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) +Sequence< OUString > SwXChapterNumbering::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(2); OUString* pArray = aRet.getArray(); @@ -2314,7 +2314,7 @@ SwXChapterNumbering::~SwXChapterNumbering() { } -OUString SwXTextColumns::getImplementationName(void) throw( RuntimeException, std::exception ) +OUString SwXTextColumns::getImplementationName() throw( RuntimeException, std::exception ) { return OUString("SwXTextColumns"); } @@ -2324,7 +2324,7 @@ sal_Bool SwXTextColumns::supportsService(const OUString& rServiceName) throw( Ru return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SwXTextColumns::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) +Sequence< OUString > SwXTextColumns::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); OUString* pArray = aRet.getArray(); @@ -2400,13 +2400,13 @@ SwXTextColumns::~SwXTextColumns() { } -sal_Int32 SwXTextColumns::getReferenceValue(void) throw( uno::RuntimeException, std::exception ) +sal_Int32 SwXTextColumns::getReferenceValue() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; return nReference; } -sal_Int16 SwXTextColumns::getColumnCount(void) throw( uno::RuntimeException, std::exception ) +sal_Int16 SwXTextColumns::getColumnCount() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; return static_cast< sal_Int16>( aTextColumns.getLength() ); @@ -2433,7 +2433,7 @@ void SwXTextColumns::setColumnCount(sal_Int16 nColumns) throw( uno::RuntimeExcep pCols[nColumns - 1].Width += nDiff; } -uno::Sequence< TextColumn > SwXTextColumns::getColumns(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence< TextColumn > SwXTextColumns::getColumns() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; return aTextColumns; diff --git a/sw/source/core/unocore/unosrch.cxx b/sw/source/core/unocore/unosrch.cxx index 3a5597e8e27e..7f19bf2eddf0 100644 --- a/sw/source/core/unocore/unosrch.cxx +++ b/sw/source/core/unocore/unosrch.cxx @@ -520,7 +520,7 @@ sal_Int64 SAL_CALL SwXTextSearch::getSomething( const uno::Sequence< sal_Int8 >& return 0; } -OUString SwXTextSearch::getSearchString(void) throw( uno::RuntimeException, std::exception ) +OUString SwXTextSearch::getSearchString() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; return sSearchText; @@ -533,7 +533,7 @@ void SwXTextSearch::setSearchString(const OUString& rString) sSearchText = rString; } -OUString SwXTextSearch::getReplaceString(void) throw( uno::RuntimeException, std::exception ) +OUString SwXTextSearch::getReplaceString() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; return sReplaceText; @@ -545,7 +545,7 @@ void SwXTextSearch::setReplaceString(const OUString& rReplaceString) throw( uno: sReplaceText = rReplaceString; } -uno::Reference< beans::XPropertySetInfo > SwXTextSearch::getPropertySetInfo(void) throw( uno::RuntimeException, std::exception ) +uno::Reference< beans::XPropertySetInfo > SwXTextSearch::getPropertySetInfo() throw( uno::RuntimeException, std::exception ) { static uno::Reference< beans::XPropertySetInfo > aRef = m_pPropSet->getPropertySetInfo(); return aRef; @@ -641,7 +641,7 @@ void SwXTextSearch::removeVetoableChangeListener(const OUString& /*rPropertyName OSL_FAIL("not implemented"); } -sal_Bool SwXTextSearch::getValueSearch(void) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTextSearch::getValueSearch() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; return bIsValueSearch; @@ -653,7 +653,7 @@ void SwXTextSearch::setValueSearch(sal_Bool ValueSearch_) throw( uno::RuntimeExc bIsValueSearch = ValueSearch_; } -uno::Sequence< beans::PropertyValue > SwXTextSearch::getSearchAttributes(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence< beans::PropertyValue > SwXTextSearch::getSearchAttributes() throw( uno::RuntimeException, std::exception ) { return pSearchProperties->GetProperties(); } @@ -664,7 +664,7 @@ void SwXTextSearch::setSearchAttributes(const uno::Sequence< beans::PropertyValu pSearchProperties->SetProperties(rSearchAttribs); } -uno::Sequence< beans::PropertyValue > SwXTextSearch::getReplaceAttributes(void) +uno::Sequence< beans::PropertyValue > SwXTextSearch::getReplaceAttributes() throw( uno::RuntimeException, std::exception ) { return pReplaceProperties->GetProperties(); @@ -696,7 +696,7 @@ bool SwXTextSearch::HasReplaceAttributes() const return pReplaceProperties->HasAttributes(); } -OUString SwXTextSearch::getImplementationName(void) throw( uno::RuntimeException, std::exception ) +OUString SwXTextSearch::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString("SwXTextSearch"); } @@ -706,7 +706,7 @@ sal_Bool SwXTextSearch::supportsService(const OUString& rServiceName) throw( uno return cppu::supportsService(this, rServiceName); } -uno::Sequence< OUString > SwXTextSearch::getSupportedServiceNames(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXTextSearch::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aRet(2); OUString* pArray = aRet.getArray(); diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index d6a84c7f610c..2b13e7254324 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -146,7 +146,7 @@ public: SwDoc* getDoc() const { return pDoc; } }; -OUString SwXStyleFamilies::getImplementationName(void) throw( uno::RuntimeException, std::exception ) +OUString SwXStyleFamilies::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString("SwXStyleFamilies"); } @@ -156,7 +156,7 @@ sal_Bool SwXStyleFamilies::supportsService(const OUString& rServiceName) throw( return cppu::supportsService(this, rServiceName); } -uno::Sequence< OUString > SwXStyleFamilies::getSupportedServiceNames(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXStyleFamilies::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aRet(1); OUString* pArray = aRet.getArray(); @@ -211,7 +211,7 @@ uno::Any SAL_CALL SwXStyleFamilies::getByName(const OUString& Name) return aRet; } -uno::Sequence< OUString > SwXStyleFamilies::getElementNames(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXStyleFamilies::getElementNames() throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aNames(STYLE_FAMILY_COUNT); OUString* pNames = aNames.getArray(); @@ -235,7 +235,7 @@ sal_Bool SwXStyleFamilies::hasByName(const OUString& Name) throw( uno::RuntimeEx return sal_False; } -sal_Int32 SwXStyleFamilies::getCount(void) throw( uno::RuntimeException, std::exception ) +sal_Int32 SwXStyleFamilies::getCount() throw( uno::RuntimeException, std::exception ) { return STYLE_FAMILY_COUNT; } @@ -311,14 +311,14 @@ uno::Any SwXStyleFamilies::getByIndex(sal_Int32 nIndex) return aRet; } -uno::Type SwXStyleFamilies::getElementType(void) +uno::Type SwXStyleFamilies::getElementType() throw( uno::RuntimeException, std::exception ) { return cppu::UnoType<container::XNameContainer>::get(); } -sal_Bool SwXStyleFamilies::hasElements(void) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXStyleFamilies::hasElements() throw( uno::RuntimeException, std::exception ) { return sal_True; } @@ -374,7 +374,7 @@ void SwXStyleFamilies::loadStylesFromURL(const OUString& rURL, throw uno::RuntimeException(); } -uno::Sequence< beans::PropertyValue > SwXStyleFamilies::getStyleLoaderOptions(void) +uno::Sequence< beans::PropertyValue > SwXStyleFamilies::getStyleLoaderOptions() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -389,7 +389,7 @@ uno::Sequence< beans::PropertyValue > SwXStyleFamilies::getStyleLoaderOptions(vo return aSeq; } -OUString SwXStyleFamily::getImplementationName(void) throw( uno::RuntimeException, std::exception ) +OUString SwXStyleFamily::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString("SwXStyleFamily"); } @@ -399,7 +399,7 @@ sal_Bool SwXStyleFamily::supportsService(const OUString& rServiceName) throw( un return cppu::supportsService(this, rServiceName); } -uno::Sequence< OUString > SwXStyleFamily::getSupportedServiceNames(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXStyleFamily::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aRet(1); OUString* pArray = aRet.getArray(); @@ -575,7 +575,7 @@ static sal_Int32 lcl_GetCountOrName(const SwDoc &rDoc, return nCount; } -sal_Int32 SwXStyleFamily::getCount(void) throw( uno::RuntimeException, std::exception ) +sal_Int32 SwXStyleFamily::getCount() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; return lcl_GetCountOrName ( *pDocShell->GetDoc(), eFamily, NULL ); @@ -763,7 +763,7 @@ uno::Any SwXStyleFamily::getByName(const OUString& rName) } -uno::Sequence< OUString > SwXStyleFamily::getElementNames(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXStyleFamily::getElementNames() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; std::vector< OUString > aRet; @@ -802,13 +802,13 @@ sal_Bool SwXStyleFamily::hasByName(const OUString& rName) throw( uno::RuntimeExc } -uno::Type SwXStyleFamily::getElementType(void) throw( uno::RuntimeException, std::exception ) +uno::Type SwXStyleFamily::getElementType() throw( uno::RuntimeException, std::exception ) { return cppu::UnoType<style::XStyle>::get(); } -sal_Bool SwXStyleFamily::hasElements(void) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXStyleFamily::hasElements() throw( uno::RuntimeException, std::exception ) { if(!pBasePool) throw uno::RuntimeException(); @@ -1161,7 +1161,7 @@ sal_Int64 SAL_CALL SwXStyle::getSomething( const uno::Sequence< sal_Int8 >& rId TYPEINIT1(SwXStyle, SfxListener); -OUString SwXStyle::getImplementationName(void) throw( uno::RuntimeException, std::exception ) +OUString SwXStyle::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString("SwXStyle"); } @@ -1171,7 +1171,7 @@ sal_Bool SwXStyle::supportsService(const OUString& rServiceName) throw( uno::Run return cppu::supportsService(this, rServiceName); } -uno::Sequence< OUString > SwXStyle::getSupportedServiceNames(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXStyle::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { long nCount = 1; if(SFX_STYLE_FAMILY_PARA == eFamily) @@ -1326,7 +1326,7 @@ void SwXStyle::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) } } -OUString SwXStyle::getName(void) throw( uno::RuntimeException, std::exception ) +OUString SwXStyle::getName() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(pBasePool) @@ -1366,7 +1366,7 @@ void SwXStyle::setName(const OUString& rName) throw( uno::RuntimeException, std: m_sStyleName = rName; } -sal_Bool SwXStyle::isUserDefined(void) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXStyle::isUserDefined() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; bool bRet = false; @@ -1383,7 +1383,7 @@ sal_Bool SwXStyle::isUserDefined(void) throw( uno::RuntimeException, std::except return bRet; } -sal_Bool SwXStyle::isInUse(void) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXStyle::isInUse() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; bool bRet = false; @@ -1399,7 +1399,7 @@ sal_Bool SwXStyle::isInUse(void) throw( uno::RuntimeException, std::exception ) return bRet; } -OUString SwXStyle::getParentStyle(void) throw( uno::RuntimeException, std::exception ) +OUString SwXStyle::getParentStyle() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; OUString aString; @@ -1532,7 +1532,7 @@ static uno::Reference< beans::XPropertySetInfo > lcl_getPropertySetInfo( SfxStyl return xRet; } -uno::Reference< beans::XPropertySetInfo > SwXStyle::getPropertySetInfo(void) +uno::Reference< beans::XPropertySetInfo > SwXStyle::getPropertySetInfo() throw( uno::RuntimeException, std::exception ) { return lcl_getPropertySetInfo( eFamily, bIsConditional ); @@ -4014,7 +4014,7 @@ SwXAutoStyles::~SwXAutoStyles() { } -sal_Int32 SwXAutoStyles::getCount(void) throw( uno::RuntimeException, std::exception ) +sal_Int32 SwXAutoStyles::getCount() throw( uno::RuntimeException, std::exception ) { return AUTOSTYLE_FAMILY_COUNT; } @@ -4090,7 +4090,7 @@ uno::Any SwXAutoStyles::getByName(const OUString& Name) return aRet; } -uno::Sequence< OUString > SwXAutoStyles::getElementNames(void) +uno::Sequence< OUString > SwXAutoStyles::getElementNames() throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aNames(AUTOSTYLE_FAMILY_COUNT); diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index 4ab232d114a3..9ffb595cee7a 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -875,7 +875,7 @@ bool SwXCell::IsValid() const return nullptr != pBox; } -OUString SwXCell::getFormula(void) throw( uno::RuntimeException, std::exception ) +OUString SwXCell::getFormula() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -917,7 +917,7 @@ void SwXCell::setFormula(const OUString& rFormula) throw( uno::RuntimeException, pMyDoc->getIDocumentFieldsAccess().UpdateTblFlds( &aTblUpdate ); } -double SwXCell::getValue(void) throw( uno::RuntimeException, std::exception ) +double SwXCell::getValue() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; // #i112652# a table cell may contain NaN as a value, do not filter that @@ -930,7 +930,7 @@ void SwXCell::setValue(double rValue) throw( uno::RuntimeException, std::excepti sw_setValue( *this, rValue ); } -table::CellContentType SwXCell::getType(void) throw( uno::RuntimeException, std::exception ) +table::CellContentType SwXCell::getType() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -954,14 +954,14 @@ void SwXCell::setString(const OUString& aString) throw( uno::RuntimeException, s sw_setString( *this, aString ); } -sal_Int32 SwXCell::getError(void) throw( uno::RuntimeException, std::exception ) +sal_Int32 SwXCell::getError() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; OUString sContent = getString(); return sal_Int32(sContent.equals(SwViewShell::GetShellRes()->aCalc_Error)); } -uno::Reference<text::XTextCursor> SwXCell::createTextCursor(void) throw( uno::RuntimeException, std::exception ) +uno::Reference<text::XTextCursor> SwXCell::createTextCursor() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!pStartNode && !IsValid()) @@ -994,7 +994,7 @@ uno::Reference<text::XTextCursor> SwXCell::createTextCursorByRange(const uno::Re *aPam.GetPoint(), aPam.GetMark())); } -uno::Reference< beans::XPropertySetInfo > SwXCell::getPropertySetInfo(void) throw( uno::RuntimeException, std::exception ) +uno::Reference< beans::XPropertySetInfo > SwXCell::getPropertySetInfo() throw( uno::RuntimeException, std::exception ) { static uno::Reference< beans::XPropertySetInfo > xRef = m_pPropSet->getPropertySetInfo(); return xRef; @@ -1107,7 +1107,7 @@ void SwXCell::addVetoableChangeListener(const OUString& /*rPropertyName*/, const void SwXCell::removeVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { throw uno::RuntimeException("not implemented", static_cast<cppu::OWeakObject*>(this)); }; -uno::Reference<container::XEnumeration> SwXCell::createEnumeration(void) throw( uno::RuntimeException, std::exception ) +uno::Reference<container::XEnumeration> SwXCell::createEnumeration() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -1122,12 +1122,12 @@ uno::Reference<container::XEnumeration> SwXCell::createEnumeration(void) throw( return new SwXParagraphEnumeration(this, std::move(pUnoCursor), CURSOR_TBLTEXT, pSttNd, pTable); } -uno::Type SAL_CALL SwXCell::getElementType(void) throw( uno::RuntimeException, std::exception ) +uno::Type SAL_CALL SwXCell::getElementType() throw( uno::RuntimeException, std::exception ) { return cppu::UnoType<text::XTextRange>::get(); } -sal_Bool SwXCell::hasElements(void) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXCell::hasElements() throw( uno::RuntimeException, std::exception ) { return sal_True; } @@ -1190,22 +1190,22 @@ SwTableBox* SwXCell::FindBox(SwTable* pTable, SwTableBox* pBox2) return nullptr; } -OUString SwXCell::getImplementationName(void) throw( uno::RuntimeException, std::exception ) +OUString SwXCell::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString("SwXCell"); } sal_Bool SwXCell::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } -uno::Sequence< OUString > SwXCell::getSupportedServiceNames(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXCell::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { return {"com.sun.star.text.CellProperties"}; } -OUString SwXTextTableRow::getImplementationName(void) throw( uno::RuntimeException, std::exception ) +OUString SwXTextTableRow::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString("SwXTextTableRow"); } sal_Bool SwXTextTableRow::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } -uno::Sequence< OUString > SwXTextTableRow::getSupportedServiceNames(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXTextTableRow::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { return {"com.sun.star.text.TextTableRow"}; } TYPEINIT1(SwXTextTableRow, SwClient); @@ -1219,7 +1219,7 @@ SwXTextTableRow::SwXTextTableRow(SwFrmFmt* pFmt, SwTableLine* pLn) : SwXTextTableRow::~SwXTextTableRow() { } -uno::Reference< beans::XPropertySetInfo > SwXTextTableRow::getPropertySetInfo(void) throw( uno::RuntimeException, std::exception ) +uno::Reference< beans::XPropertySetInfo > SwXTextTableRow::getPropertySetInfo() throw( uno::RuntimeException, std::exception ) { static uno::Reference<beans::XPropertySetInfo> xRef = m_pPropSet->getPropertySetInfo(); return xRef; @@ -1394,7 +1394,7 @@ SwTableLine* SwXTextTableRow::FindLine(SwTable* pTable, SwTableLine* pLine) // SwXTextTableCursor -OUString SwXTextTableCursor::getImplementationName(void) throw( uno::RuntimeException, std::exception ) +OUString SwXTextTableCursor::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString("SwXTextTableCursor"); } sal_Bool SwXTextTableCursor::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception ) @@ -1408,7 +1408,7 @@ SwDoc* SwXTextTableCursor::GetDoc() { return GetFrmFmt()->Ge const SwUnoCrsr* SwXTextTableCursor::GetCrsr() const { return static_cast<const SwUnoCrsr*>(aCrsrDepend.GetRegisteredIn()); } SwUnoCrsr* SwXTextTableCursor::GetCrsr() { return static_cast<SwUnoCrsr*>(aCrsrDepend.GetRegisteredIn()); } -uno::Sequence<OUString> SwXTextTableCursor::getSupportedServiceNames(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence<OUString> SwXTextTableCursor::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { return {"com.sun.star.text.TextTableCursor"}; } SwXTextTableCursor::SwXTextTableCursor(SwFrmFmt* pFmt, SwTableBox* pBox) : @@ -1611,7 +1611,7 @@ sal_Bool SwXTextTableCursor::splitRange(sal_Int16 Count, sal_Bool Horizontal) return bResult; } -uno::Reference< beans::XPropertySetInfo > SwXTextTableCursor::getPropertySetInfo(void) throw( uno::RuntimeException, std::exception ) +uno::Reference< beans::XPropertySetInfo > SwXTextTableCursor::getPropertySetInfo() throw( uno::RuntimeException, std::exception ) { static uno::Reference< beans::XPropertySetInfo > xRef = m_pPropSet->getPropertySetInfo(); return xRef; @@ -1994,7 +1994,7 @@ void SwXTextTable::initialize(sal_Int32 nR, sal_Int32 nC) throw( uno::RuntimeExc nColumns = static_cast<sal_uInt16>(nC); } -uno::Reference< table::XTableRows > SwXTextTable::getRows(void) throw( uno::RuntimeException, std::exception ) +uno::Reference< table::XTableRows > SwXTextTable::getRows() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; uno::Reference<table::XTableRows> xResult(m_xRows); @@ -2007,7 +2007,7 @@ uno::Reference< table::XTableRows > SwXTextTable::getRows(void) throw( uno::Run return xResult; } -uno::Reference< table::XTableColumns > SwXTextTable::getColumns(void) throw( uno::RuntimeException, std::exception ) +uno::Reference< table::XTableColumns > SwXTextTable::getColumns() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; uno::Reference<table::XTableColumns> xResult(m_xColumns); @@ -2031,7 +2031,7 @@ uno::Reference<table::XCell> SwXTextTable::getCellByName(const OUString& sCellNa return SwXCell::CreateXCell(pFmt, pBox); } -uno::Sequence<OUString> SwXTextTable::getCellNames(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence<OUString> SwXTextTable::getCellNames() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; SwFrmFmt* pFmt(GetFrmFmt()); @@ -2137,7 +2137,7 @@ void SwXTextTable::attach(const uno::Reference< text::XTextRange > & xTextRange) attachToRange(xTextRange); } -uno::Reference<text::XTextRange> SwXTextTable::getAnchor(void) +uno::Reference<text::XTextRange> SwXTextTable::getAnchor() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -2145,7 +2145,7 @@ uno::Reference<text::XTextRange> SwXTextTable::getAnchor(void) return new SwXTextRange(*pFmt); } -void SwXTextTable::dispose(void) throw( uno::RuntimeException, std::exception ) +void SwXTextTable::dispose() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; SwFrmFmt* pFmt = lcl_EnsureCoreConnected(GetFrmFmt(), static_cast<cppu::OWeakObject*>(this)); @@ -2294,7 +2294,7 @@ void SAL_CALL SwXTextTable::setDataArray(const uno::Sequence< uno::Sequence< uno return xAllRange->setDataArray(rArray); } -uno::Sequence< uno::Sequence< double > > SwXTextTable::getData(void) +uno::Sequence< uno::Sequence< double > > SwXTextTable::getData() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -2320,7 +2320,7 @@ void SwXTextTable::setData(const uno::Sequence< uno::Sequence< double > >& rData lcl_SendChartEvent(*this, m_pImpl->m_Listeners); } -uno::Sequence<OUString> SwXTextTable::getRowDescriptions(void) +uno::Sequence<OUString> SwXTextTable::getRowDescriptions() throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2344,7 +2344,7 @@ void SwXTextTable::setRowDescriptions(const uno::Sequence<OUString>& rRowDesc) xAllRange->setRowDescriptions(rRowDesc); } -uno::Sequence<OUString> SwXTextTable::getColumnDescriptions(void) +uno::Sequence<OUString> SwXTextTable::getColumnDescriptions() throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2393,14 +2393,14 @@ sal_Bool SwXTextTable::isNotANumber(double nNumber) throw( uno::RuntimeException return ( nNumber == DBL_MIN ); } -double SwXTextTable::getNotANumber(void) throw( uno::RuntimeException, std::exception ) +double SwXTextTable::getNotANumber() throw( uno::RuntimeException, std::exception ) { // We use DBL_MIN because starcalc does (which uses it because chart // wants it that way!) return DBL_MIN; } -uno::Sequence< beans::PropertyValue > SwXTextTable::createSortDescriptor(void) +uno::Sequence< beans::PropertyValue > SwXTextTable::createSortDescriptor() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -2455,7 +2455,7 @@ void SwXTextTable::autoFormat(const OUString& sAutoFmtName) } } -uno::Reference< beans::XPropertySetInfo > SwXTextTable::getPropertySetInfo(void) throw( uno::RuntimeException, std::exception ) +uno::Reference< beans::XPropertySetInfo > SwXTextTable::getPropertySetInfo() throw( uno::RuntimeException, std::exception ) { static uno::Reference< beans::XPropertySetInfo > xRef = m_pPropSet->getPropertySetInfo(); return xRef; @@ -2964,7 +2964,7 @@ void SwXTextTable::addVetoableChangeListener(const OUString& /*rPropertyName*/, void SwXTextTable::removeVetoableChangeListener(const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*xListener*/) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { throw uno::RuntimeException("Not implemented", static_cast<cppu::OWeakObject*>(this)); } -OUString SwXTextTable::getName(void) throw( uno::RuntimeException, std::exception ) +OUString SwXTextTable::getName() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; SwFrmFmt* pFmt = GetFrmFmt(); @@ -3029,7 +3029,7 @@ void SwXTextTable::setName(const OUString& rName) throw( uno::RuntimeException, m_sTableName = rName; } -sal_uInt16 SwXTextTable::getRowCount(void) +sal_uInt16 SwXTextTable::getRowCount() { SolarMutexGuard aGuard; sal_uInt16 nRet = 0; @@ -3045,7 +3045,7 @@ sal_uInt16 SwXTextTable::getRowCount(void) return nRet; } -sal_uInt16 SwXTextTable::getColumnCount(void) +sal_uInt16 SwXTextTable::getColumnCount() { SolarMutexGuard aGuard; SwFrmFmt* pFmt = GetFrmFmt(); @@ -3086,13 +3086,13 @@ void SwXTextTable::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) } } -OUString SAL_CALL SwXTextTable::getImplementationName(void) throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SwXTextTable::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString("SwXTextTable"); } sal_Bool SwXTextTable::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } -uno::Sequence<OUString> SwXTextTable::getSupportedServiceNames(void) throw(uno::RuntimeException, std::exception) +uno::Sequence<OUString> SwXTextTable::getSupportedServiceNames() throw(uno::RuntimeException, std::exception) { return { "com.sun.star.document.LinkTarget", @@ -3125,13 +3125,13 @@ sal_Int64 SAL_CALL SwXCellRange::getSomething( const uno::Sequence< sal_Int8 >& TYPEINIT1(SwXCellRange, SwClient); -OUString SwXCellRange::getImplementationName(void) throw( uno::RuntimeException, std::exception ) +OUString SwXCellRange::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString("SwXCellRange"); } sal_Bool SwXCellRange::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } -uno::Sequence<OUString> SwXCellRange::getSupportedServiceNames(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence<OUString> SwXCellRange::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { return { "com.sun.star.text.CellRange", @@ -3273,7 +3273,7 @@ uno::Reference< table::XCellRange > SwXCellRange::getCellRangeByName(const OUSt aDesc.nRight - aRgDesc.nLeft, aDesc.nBottom - aRgDesc.nTop); } -uno::Reference< beans::XPropertySetInfo > SwXCellRange::getPropertySetInfo(void) throw( uno::RuntimeException, std::exception ) +uno::Reference< beans::XPropertySetInfo > SwXCellRange::getPropertySetInfo() throw( uno::RuntimeException, std::exception ) { static uno::Reference< beans::XPropertySetInfo > xRef = m_pPropSet->getPropertySetInfo(); return xRef; @@ -3697,7 +3697,7 @@ void SAL_CALL SwXCellRange::setDataArray(const uno::Sequence< uno::Sequence< uno } } -uno::Sequence< uno::Sequence< double > > SwXCellRange::getData(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence< uno::Sequence< double > > SwXCellRange::getData() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; const sal_uInt16 nRowCount = getRowCount(); @@ -3791,11 +3791,11 @@ uno::Sequence<OUString> SwXCellRange::getLabelDescriptions(bool bRow) return vResult; } -uno::Sequence<OUString> SwXCellRange::getRowDescriptions(void) +uno::Sequence<OUString> SwXCellRange::getRowDescriptions() throw( uno::RuntimeException, std::exception ) { return getLabelDescriptions(true); } -uno::Sequence<OUString> SwXCellRange::getColumnDescriptions(void) +uno::Sequence<OUString> SwXCellRange::getColumnDescriptions() throw(uno::RuntimeException, std::exception) { return getLabelDescriptions(false); } @@ -3844,10 +3844,10 @@ throw (uno::RuntimeException, std::exception) sal_Bool SwXCellRange::isNotANumber(double /*fNumber*/) throw( uno::RuntimeException, std::exception ) { throw uno::RuntimeException("Not implemented", static_cast<cppu::OWeakObject*>(this)); } -double SwXCellRange::getNotANumber(void) throw( uno::RuntimeException, std::exception ) +double SwXCellRange::getNotANumber() throw( uno::RuntimeException, std::exception ) { throw uno::RuntimeException("Not implemented", static_cast<cppu::OWeakObject*>(this)); } -uno::Sequence< beans::PropertyValue > SwXCellRange::createSortDescriptor(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence< beans::PropertyValue > SwXCellRange::createSortDescriptor() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; return SwUnoCursorHelper::CreateSortDescriptor(true); @@ -3869,10 +3869,10 @@ void SAL_CALL SwXCellRange::sort(const uno::Sequence< beans::PropertyValue >& rD } } -sal_uInt16 SwXCellRange::getColumnCount(void) +sal_uInt16 SwXCellRange::getColumnCount() { return static_cast<sal_uInt16>(aRgDesc.nRight - aRgDesc.nLeft + 1); } -sal_uInt16 SwXCellRange::getRowCount(void) +sal_uInt16 SwXCellRange::getRowCount() { return static_cast<sal_uInt16>(aRgDesc.nBottom - aRgDesc.nTop + 1); } const SwUnoCrsr* SwXCellRange::GetTblCrsr() const @@ -3904,13 +3904,13 @@ void SwXCellRange::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) // SwXTableRows -OUString SwXTableRows::getImplementationName(void) throw( uno::RuntimeException, std::exception ) +OUString SwXTableRows::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString("SwXTableRows"); } sal_Bool SwXTableRows::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } -uno::Sequence< OUString > SwXTableRows::getSupportedServiceNames(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXTableRows::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { return { "com.sun.star.text.TableRows" }; } TYPEINIT1(SwXTableRows, SwClient); @@ -3922,7 +3922,7 @@ SwXTableRows::SwXTableRows(SwFrmFmt& rFrmFmt) : SwXTableRows::~SwXTableRows() { } -sal_Int32 SwXTableRows::getCount(void) throw( uno::RuntimeException, std::exception ) +sal_Int32 SwXTableRows::getCount() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; SwFrmFmt* pFrmFmt = GetFrmFmt(); @@ -3952,12 +3952,12 @@ uno::Any SwXTableRows::getByIndex(sal_Int32 nIndex) return uno::makeAny(xRet); } -uno::Type SAL_CALL SwXTableRows::getElementType(void) throw( uno::RuntimeException, std::exception ) +uno::Type SAL_CALL SwXTableRows::getElementType() throw( uno::RuntimeException, std::exception ) { return cppu::UnoType<beans::XPropertySet>::get(); } -sal_Bool SwXTableRows::hasElements(void) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTableRows::hasElements() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; SwFrmFmt* pFrmFmt = GetFrmFmt(); @@ -4055,13 +4055,13 @@ void SwXTableRows::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) // SwXTableColumns -OUString SwXTableColumns::getImplementationName(void) throw( uno::RuntimeException, std::exception ) +OUString SwXTableColumns::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString("SwXTableColumns"); } sal_Bool SwXTableColumns::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } -uno::Sequence< OUString > SwXTableColumns::getSupportedServiceNames(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXTableColumns::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { return { "com.sun.star.text.TableColumns"}; } TYPEINIT1(SwXTableColumns, SwClient); @@ -4073,7 +4073,7 @@ SwXTableColumns::SwXTableColumns(SwFrmFmt& rFrmFmt) : SwXTableColumns::~SwXTableColumns() { } -sal_Int32 SwXTableColumns::getCount(void) throw( uno::RuntimeException, std::exception ) +sal_Int32 SwXTableColumns::getCount() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; SwFrmFmt* pFrmFmt(lcl_EnsureCoreConnected(GetFrmFmt(), static_cast<cppu::OWeakObject*>(this))); @@ -4094,12 +4094,12 @@ uno::Any SwXTableColumns::getByIndex(sal_Int32 nIndex) return uno::makeAny(uno::Reference<uno::XInterface>()); // i#21699 not supported } -uno::Type SAL_CALL SwXTableColumns::getElementType(void) throw( uno::RuntimeException, std::exception ) +uno::Type SAL_CALL SwXTableColumns::getElementType() throw( uno::RuntimeException, std::exception ) { return cppu::UnoType<uno::XInterface>::get(); } -sal_Bool SwXTableColumns::hasElements(void) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTableColumns::hasElements() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; lcl_EnsureCoreConnected(GetFrmFmt(), static_cast<cppu::OWeakObject*>(this)); diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index e9fda23e9be0..eb806ed1d10e 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -703,7 +703,7 @@ void SwXMLImport::startDocument() } } -void SwXMLImport::endDocument( void ) +void SwXMLImport::endDocument() throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) { OSL_ENSURE( GetModel().is(), "model missing; maybe startDocument wasn't called?" ); diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx index 47b12f8a8208..74588f1b91b6 100644 --- a/sw/source/filter/xml/xmlimp.hxx +++ b/sw/source/filter/xml/xmlimp.hxx @@ -118,7 +118,7 @@ public: throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL endDocument(void) + virtual void SAL_CALL endDocument() throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XUnoTunnel diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index 0343fed1f301..54f9be13a9f2 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -92,10 +92,10 @@ class SwDropCapsPict : public Control Reference< css::i18n::XBreakIterator > xBreak; virtual void Paint(const Rectangle &rRect) SAL_OVERRIDE; - void CheckScript( void ); - Size CalcTextSize( void ); - inline void InitPrinter( void ); - void _InitPrinter( void ); + void CheckScript(); + Size CalcTextSize(); + inline void InitPrinter(); + void _InitPrinter(); void GetFontSettings( const SwDropCapsPage& _rPage, vcl::Font& _rFont, sal_uInt16 _nWhich ); void GetFirstScriptSegment(sal_Int32 &start, sal_Int32 &end, sal_uInt16 &scriptType); bool GetNextScriptSegment(size_t &nIdx, sal_Int32 &start, sal_Int32 &end, sal_uInt16 &scriptType); @@ -118,7 +118,7 @@ public: virtual ~SwDropCapsPict(); - void UpdatePaintSettings( void ); // also invalidates control! + void UpdatePaintSettings(); // also invalidates control! virtual void Resize() SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; @@ -174,7 +174,7 @@ void SwDropCapsPict::SetValues( const OUString& rText, sal_uInt8 nLines, sal_uIn UpdatePaintSettings(); } -void SwDropCapsPict::InitPrinter( void ) +void SwDropCapsPict::InitPrinter() { if( !mpPrinter ) _InitPrinter(); @@ -256,7 +256,7 @@ void SwDropCapsPict::GetFontSettings( const SwDropCapsPage& _rPage, vcl::Font& _ _rFont.SetCharSet(aFmtFont.GetCharSet()); } -void SwDropCapsPict::UpdatePaintSettings( void ) +void SwDropCapsPict::UpdatePaintSettings() { maBackColor = GetSettings().GetStyleSettings().GetWindowColor(); maTextLineColor = Color( COL_LIGHTGRAY ); @@ -404,7 +404,7 @@ void SwDropCapsPict::DrawPrev( const Point& rPt ) mpPrinter->SetFont( aOldFont ); } -void SwDropCapsPict::CheckScript( void ) +void SwDropCapsPict::CheckScript() { if( maScriptText == maText ) return; @@ -437,7 +437,7 @@ void SwDropCapsPict::CheckScript( void ) } } -Size SwDropCapsPict::CalcTextSize( void ) +Size SwDropCapsPict::CalcTextSize() { InitPrinter(); diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 30fcf862002c..28533ce50e0f 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -1504,7 +1504,7 @@ SwMarkPreview::~SwMarkPreview() { } -void SwMarkPreview::InitColors( void ) +void SwMarkPreview::InitColors() { // m_aTransCol and m_aMarkCol are _not_ changed because they are set from outside! diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index 22709debcdce..81dfcf9c75d1 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -69,7 +69,7 @@ public: virtual ~SwSequenceOptionDialog(); virtual void Apply() SAL_OVERRIDE; - bool IsApplyBorderAndShadow( void ) { return m_pApplyBorderAndShadowCB->IsChecked(); } + bool IsApplyBorderAndShadow() { return m_pApplyBorderAndShadowCB->IsChecked(); } void SetApplyBorderAndShadow( bool bSet ) { m_pApplyBorderAndShadowCB->Check(bSet); } //#i61007# order of captions diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 9fade37ddb7e..2317ca1066ab 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -824,7 +824,7 @@ SfxTabPage* SwFrmPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) return new SwFrmPage( pParent, *rSet ); } -void SwFrmPage::EnableGraficMode( void ) +void SwFrmPage::EnableGraficMode() { // i#39692 - mustn't be called more than once if(!m_pRealSizeBT->IsVisible()) diff --git a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx index b7a4f44629cc..e6bd8b2e3f1a 100644 --- a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx +++ b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx @@ -170,7 +170,7 @@ SwSpellDialogChildWindow::~SwSpellDialogChildWindow () delete m_pSpellState; } -SfxChildWinInfo SwSpellDialogChildWindow::GetInfo (void) const +SfxChildWinInfo SwSpellDialogChildWindow::GetInfo() const { SfxChildWinInfo aInfo = svx::SpellDialogChildWindow::GetInfo(); aInfo.bVisible = false; diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx index 539b5bab2177..cbc518b4185c 100644 --- a/sw/source/uibase/docvw/AnnotationWin.cxx +++ b/sw/source/uibase/docvw/AnnotationWin.cxx @@ -278,7 +278,7 @@ void SwAnnotationWin::InitAnswer(OutlinerParaObject* pText) Engine()->GetUndoManager().Clear(); } -SvxLanguageItem SwAnnotationWin::GetLanguage(void) +SvxLanguageItem SwAnnotationWin::GetLanguage() { // set initial language for outliner sal_uInt16 nScriptType = SvtLanguageOptions::GetScriptTypeOfLanguage( mpFld->GetLanguage() ); diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx index 3832f7c5c60a..93b3cae87068 100644 --- a/sw/source/uibase/docvw/SidebarWin.cxx +++ b/sw/source/uibase/docvw/SidebarWin.cxx @@ -1351,7 +1351,7 @@ void SwSidebarWin::SwitchToFieldPos() GrabFocusToDocument(); } -SvxLanguageItem SwSidebarWin::GetLanguage(void) +SvxLanguageItem SwSidebarWin::GetLanguage() { return SvxLanguageItem(SwLangHelper::GetLanguage(mrView.GetWrtShell(),RES_CHRATR_LANGUAGE),RES_CHRATR_LANGUAGE); } diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx index 7867f957c8a8..080572081d5a 100644 --- a/sw/source/uibase/inc/conttree.hxx +++ b/sw/source/uibase/inc/conttree.hxx @@ -138,7 +138,7 @@ protected: void GotoContent(SwContent* pCnt); static void SetInDrag(bool bSet) {bIsInDrag = bSet;} - virtual PopupMenu* CreateContextMenu( void ) SAL_OVERRIDE; + virtual PopupMenu* CreateContextMenu() SAL_OVERRIDE; virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) SAL_OVERRIDE; public: @@ -307,7 +307,7 @@ protected: static void SetShowShell(const SfxObjectShell*pSet) {pShowShell = pSet;} DECL_STATIC_LINK(SwGlobalTree, ShowFrameHdl, SwGlobalTree*); - virtual PopupMenu* CreateContextMenu( void ) SAL_OVERRIDE; + virtual PopupMenu* CreateContextMenu() SAL_OVERRIDE; virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) SAL_OVERRIDE; public: diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx index f4b55a91bd64..88099079a5bc 100644 --- a/sw/source/uibase/inc/frmpage.hxx +++ b/sw/source/uibase/inc/frmpage.hxx @@ -172,7 +172,7 @@ class SwFrmPage: public SfxTabPage void setOptimalFrmWidth(); void setOptimalRelWidth(); - void EnableGraficMode( void ); // hides auto check boxes and re-org controls for "Real Size" button + void EnableGraficMode(); // hides auto check boxes and re-org controls for "Real Size" button SwFrmPage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwFrmPage(); @@ -195,7 +195,7 @@ public: void SetNewFrame(bool bNewFrame) { bNew = bNewFrame; } void SetFormatUsed(bool bFmt); void SetFrmType(const OUString &rType) { sDlgType = rType; } - inline bool IsInGraficMode( void ) { return sDlgType == "PictureDialog" || sDlgType == "ObjectDialog"; } + inline bool IsInGraficMode() { return sDlgType == "PictureDialog" || sDlgType == "ObjectDialog"; } void EnableVerticalPositioning( bool bEnable ); }; diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx index 05789ce0cb9a..ba424c9b596d 100644 --- a/sw/source/uibase/inc/optpage.hxx +++ b/sw/source/uibase/inc/optpage.hxx @@ -311,7 +311,7 @@ class SwMarkPreview : public vcl::Window void Paint(const Rectangle&) SAL_OVERRIDE; void PaintPage(const Rectangle &rRect); - void InitColors( void ); + void InitColors(); protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/unoatxt.hxx b/sw/source/uibase/inc/unoatxt.hxx index f95c333eee3f..9563e16a4f01 100644 --- a/sw/source/uibase/inc/unoatxt.hxx +++ b/sw/source/uibase/inc/unoatxt.hxx @@ -69,7 +69,7 @@ public: //XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XElementAccess @@ -81,9 +81,9 @@ public: virtual void SAL_CALL removeByName(const OUString& aGroupName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; @@ -114,13 +114,13 @@ public: virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XAutoTextGroup - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTitles(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTitles() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL renameByName(const OUString& aElementName, const OUString& aNewElementName, const OUString& aNewElementTitle) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextEntry > SAL_CALL insertNewByName(const OUString& aName, const OUString& aTitle, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw( ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeByName(const OUString& aEntryName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XNamed - virtual OUString SAL_CALL getName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setName(const OUString& Name_) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XIndexAccess @@ -129,7 +129,7 @@ public: //XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasByName(const OUString& Name) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XElementAccess @@ -137,9 +137,9 @@ public: virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -207,7 +207,7 @@ public: virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XText - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursorByRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & aTextPosition) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL insertString(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, const OUString& aString, sal_Bool bAbsorb) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL insertControlCharacter(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -215,19 +215,19 @@ public: virtual void SAL_CALL removeTextContent(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & xContent) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XTextRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual OUString SAL_CALL getString(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getString() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setString(const OUString& aString) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XAutoTextEntry virtual void SAL_CALL applyTo(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange)throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XEventsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -253,7 +253,7 @@ public: virtual ~SwAutoTextEventDescriptor(); - virtual OUString SAL_CALL getImplementationName(void) + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: diff --git a/sw/source/uibase/inc/unomod.hxx b/sw/source/uibase/inc/unomod.hxx index 38df3f4deb44..5def889b8ec6 100644 --- a/sw/source/uibase/inc/unomod.hxx +++ b/sw/source/uibase/inc/unomod.hxx @@ -53,19 +53,19 @@ public: SwXModule(); //XViewSettings - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getViewSettings(void) + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getViewSettings() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XPrintSettings - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getPrintSettings(void) + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getPrintSettings() 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; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; @@ -117,11 +117,11 @@ public: SwXPrintSettings( SwXPrintSettingsType eType, SwDoc * pDoc = NULL ); //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; @@ -179,9 +179,9 @@ public: SwXViewSettings(bool bWeb, SwView* pView); //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; bool IsValid() const {return bObjectValid;} void Invalidate() {bObjectValid = false;} diff --git a/sw/source/uibase/inc/unotxvw.hxx b/sw/source/uibase/inc/unotxvw.hxx index 17187fd68db1..aa5fb76a5aec 100644 --- a/sw/source/uibase/inc/unotxvw.hxx +++ b/sw/source/uibase/inc/unotxvw.hxx @@ -104,10 +104,10 @@ 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 > & Model) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XTextViewCursorSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextViewCursor > SAL_CALL getViewCursor(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextViewCursor > SAL_CALL getViewCursor() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XViewSettings - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getViewSettings(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getViewSettings() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XRubySelection virtual ::com::sun::star::uno::Sequence< @@ -137,9 +137,9 @@ public: virtual void SAL_CALL removeVetoableChangeListener( const 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, std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XTransferableSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getTransferable( ) @@ -183,9 +183,9 @@ public: DECLARE_XINTERFACE() //XTextViewCursor - virtual sal_Bool SAL_CALL isVisible(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isVisible() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setVisible(sal_Bool bVisible) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::awt::Point SAL_CALL getPosition(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Point SAL_CALL getPosition() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XTextCursor - neu virtual void SAL_CALL collapseToStart() @@ -221,10 +221,10 @@ public: throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL jumpToPage(sal_Int16 nPage) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL jumpToNextPage(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL jumpToPreviousPage(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL jumpToEndOfPage(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL jumpToStartOfPage(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL jumpToNextPage() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL jumpToPreviousPage() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL jumpToEndOfPage() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL jumpToStartOfPage() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL getPage() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -315,9 +315,9 @@ public: std::exception) SAL_OVERRIDE; //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); diff --git a/sw/source/uibase/sidebar/PageColumnControl.cxx b/sw/source/uibase/sidebar/PageColumnControl.cxx index eaec7905f221..a8aa1223d6d7 100644 --- a/sw/source/uibase/sidebar/PageColumnControl.cxx +++ b/sw/source/uibase/sidebar/PageColumnControl.cxx @@ -75,7 +75,7 @@ PageColumnControl::PageColumnControl( FreeResource(); } -PageColumnControl::~PageColumnControl(void) +PageColumnControl::~PageColumnControl() { delete mpColumnValueSet; } diff --git a/sw/source/uibase/sidebar/PageColumnControl.hxx b/sw/source/uibase/sidebar/PageColumnControl.hxx index a5ddcda8ed1b..508951a09670 100644 --- a/sw/source/uibase/sidebar/PageColumnControl.hxx +++ b/sw/source/uibase/sidebar/PageColumnControl.hxx @@ -44,7 +44,7 @@ public: const sal_uInt16 nColumnType, const bool bLandscape ); - virtual ~PageColumnControl(void); + virtual ~PageColumnControl(); private: ::svx::sidebar::ValueSetWithTextControl* mpColumnValueSet; diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx index 7cb842960b2f..015ac8c79a90 100644 --- a/sw/source/uibase/sidebar/PageMarginControl.cxx +++ b/sw/source/uibase/sidebar/PageMarginControl.cxx @@ -131,7 +131,7 @@ PageMarginControl::PageMarginControl( FreeResource(); } -PageMarginControl::~PageMarginControl(void) +PageMarginControl::~PageMarginControl() { delete mpMarginValueSet; diff --git a/sw/source/uibase/sidebar/PageMarginControl.hxx b/sw/source/uibase/sidebar/PageMarginControl.hxx index 908b1c6ba180..6a0af3c4bea0 100644 --- a/sw/source/uibase/sidebar/PageMarginControl.hxx +++ b/sw/source/uibase/sidebar/PageMarginControl.hxx @@ -60,7 +60,7 @@ public: const bool bLandscape, const FieldUnit eFUnit, const SfxMapUnit eUnit ); - virtual ~PageMarginControl(void); + virtual ~PageMarginControl(); private: ::svx::sidebar::ValueSetWithTextControl* mpMarginValueSet; diff --git a/sw/source/uibase/sidebar/PageOrientationControl.cxx b/sw/source/uibase/sidebar/PageOrientationControl.cxx index 1d7e5a225cc8..105eecccf13b 100644 --- a/sw/source/uibase/sidebar/PageOrientationControl.cxx +++ b/sw/source/uibase/sidebar/PageOrientationControl.cxx @@ -61,7 +61,7 @@ PageOrientationControl::PageOrientationControl( FreeResource(); } -PageOrientationControl::~PageOrientationControl(void) +PageOrientationControl::~PageOrientationControl() { delete mpOrientationValueSet; } diff --git a/sw/source/uibase/sidebar/PageOrientationControl.hxx b/sw/source/uibase/sidebar/PageOrientationControl.hxx index b829cc47e61d..15d7e785b2cc 100644 --- a/sw/source/uibase/sidebar/PageOrientationControl.hxx +++ b/sw/source/uibase/sidebar/PageOrientationControl.hxx @@ -37,7 +37,7 @@ public: vcl::Window* pParent, PagePropertyPanel& rPanel, const bool bLandscape ); - virtual ~PageOrientationControl(void); + virtual ~PageOrientationControl(); private: ::svx::sidebar::ValueSetWithTextControl* mpOrientationValueSet; diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.hxx b/sw/source/uibase/sidebar/PagePropertyPanel.hxx index 76a9a0f7cb2c..68e3bb3c074d 100644 --- a/sw/source/uibase/sidebar/PagePropertyPanel.hxx +++ b/sw/source/uibase/sidebar/PagePropertyPanel.hxx @@ -102,7 +102,7 @@ namespace sw { namespace sidebar { vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame>& rxFrame, SfxBindings* pBindings ); - virtual ~PagePropertyPanel(void); + virtual ~PagePropertyPanel(); SfxBindings* mpBindings; diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx b/sw/source/uibase/sidebar/PageSizeControl.cxx index 84c8db420239..dedc35530ce8 100644 --- a/sw/source/uibase/sidebar/PageSizeControl.cxx +++ b/sw/source/uibase/sidebar/PageSizeControl.cxx @@ -141,7 +141,7 @@ PageSizeControl::PageSizeControl( FreeResource(); } -PageSizeControl::~PageSizeControl(void) +PageSizeControl::~PageSizeControl() { delete mpSizeValueSet; } diff --git a/sw/source/uibase/sidebar/PageSizeControl.hxx b/sw/source/uibase/sidebar/PageSizeControl.hxx index 2fba0461ae7b..bd3e9f0ca1b8 100644 --- a/sw/source/uibase/sidebar/PageSizeControl.hxx +++ b/sw/source/uibase/sidebar/PageSizeControl.hxx @@ -47,7 +47,7 @@ public: const Paper ePaper, const bool bLandscape, const FieldUnit eFUnit ); - virtual ~PageSizeControl(void); + virtual ~PageSizeControl(); private: ::svx::sidebar::ValueSetWithTextControl* mpSizeValueSet; diff --git a/sw/source/uibase/sidebar/SwPanelFactory.cxx b/sw/source/uibase/sidebar/SwPanelFactory.cxx index cc7984077b0d..2df61c244c27 100644 --- a/sw/source/uibase/sidebar/SwPanelFactory.cxx +++ b/sw/source/uibase/sidebar/SwPanelFactory.cxx @@ -53,8 +53,8 @@ class SwPanelFactory public PanelFactoryInterfaceBase { public: - SwPanelFactory(void); - virtual ~SwPanelFactory(void); + SwPanelFactory(); + virtual ~SwPanelFactory(); // XUIElementFactory css::uno::Reference<css::ui::XUIElement> SAL_CALL createUIElement( @@ -78,12 +78,12 @@ public: { return css::uno::Sequence<OUString>{"com.sun.star.ui.UIElementFactory"}; } }; -SwPanelFactory::SwPanelFactory (void) +SwPanelFactory::SwPanelFactory() : PanelFactoryInterfaceBase(m_aMutex) { } -SwPanelFactory::~SwPanelFactory (void) +SwPanelFactory::~SwPanelFactory() { } diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx index 6eca90ae8e04..c0490a2a39cf 100644 --- a/sw/source/uibase/uno/unoatxt.cxx +++ b/sw/source/uibase/uno/unoatxt.cxx @@ -70,7 +70,7 @@ SwXAutoTextContainer::~SwXAutoTextContainer() } -sal_Int32 SwXAutoTextContainer::getCount(void) throw( uno::RuntimeException, std::exception ) +sal_Int32 SwXAutoTextContainer::getCount() throw( uno::RuntimeException, std::exception ) { OSL_ENSURE(pGlossaries->GetGroupCnt() < static_cast<size_t>(SAL_MAX_INT32), "SwXAutoTextContainer::getCount: too many items"); @@ -87,13 +87,13 @@ uno::Any SwXAutoTextContainer::getByIndex(sal_Int32 nIndex) return getByName(pGlossaries->GetGroupName( static_cast<size_t>(nIndex) )); } -uno::Type SwXAutoTextContainer::getElementType(void) throw( uno::RuntimeException, std::exception ) +uno::Type SwXAutoTextContainer::getElementType() throw( uno::RuntimeException, std::exception ) { return cppu::UnoType<text::XAutoTextGroup>::get(); } -sal_Bool SwXAutoTextContainer::hasElements(void) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXAutoTextContainer::hasElements() throw( uno::RuntimeException, std::exception ) { // At least standard should always exists! return sal_True; @@ -115,7 +115,7 @@ uno::Any SwXAutoTextContainer::getByName(const OUString& GroupName) return makeAny( xGroup ); } -uno::Sequence< OUString > SwXAutoTextContainer::getElementNames(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXAutoTextContainer::getElementNames() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; const size_t nCount = pGlossaries->GetGroupCnt(); @@ -197,7 +197,7 @@ void SwXAutoTextContainer::removeByName(const OUString& aGroupName) pGlossaries->DelGroupDoc(sGroupName); } -OUString SwXAutoTextContainer::getImplementationName(void) throw( uno::RuntimeException, std::exception ) +OUString SwXAutoTextContainer::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString("SwXAutoTextContainer" ); } @@ -207,7 +207,7 @@ sal_Bool SwXAutoTextContainer::supportsService(const OUString& rServiceName) thr return cppu::supportsService(this, rServiceName); } -uno::Sequence< OUString > SwXAutoTextContainer::getSupportedServiceNames(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXAutoTextContainer::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { OUString sService("com.sun.star.text.AutoTextContainer"); const uno::Sequence< OUString > aSeq( &sService, 1 ); @@ -251,7 +251,7 @@ SwXAutoTextGroup::~SwXAutoTextGroup() { } -uno::Sequence< OUString > SwXAutoTextGroup::getTitles(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXAutoTextGroup::getTitles() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, false) : 0); @@ -451,7 +451,7 @@ void SwXAutoTextGroup::removeByName(const OUString& aEntryName) throw( container throw container::NoSuchElementException(); } -OUString SwXAutoTextGroup::getName(void) throw( uno::RuntimeException, std::exception ) +OUString SwXAutoTextGroup::getName() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; return sName; @@ -499,7 +499,7 @@ void SwXAutoTextGroup::setName(const OUString& rName) throw( uno::RuntimeExcepti pGlossaries = pTempGlossaries; } -sal_Int32 SwXAutoTextGroup::getCount(void) throw( uno::RuntimeException, std::exception ) +sal_Int32 SwXAutoTextGroup::getCount() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, false) : 0); @@ -521,13 +521,13 @@ uno::Any SwXAutoTextGroup::getByIndex(sal_Int32 nIndex) return getByName(pGlosGroup->GetShortName(static_cast<sal_uInt16>(nIndex))); } -uno::Type SwXAutoTextGroup::getElementType(void) throw( uno::RuntimeException, std::exception ) +uno::Type SwXAutoTextGroup::getElementType() throw( uno::RuntimeException, std::exception ) { return cppu::UnoType<text::XAutoTextEntry>::get(); } -sal_Bool SwXAutoTextGroup::hasElements(void) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXAutoTextGroup::hasElements() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, false) : 0); @@ -547,7 +547,7 @@ uno::Any SwXAutoTextGroup::getByName(const OUString& _rName) return makeAny( xEntry ); } -uno::Sequence< OUString > SwXAutoTextGroup::getElementNames(void) +uno::Sequence< OUString > SwXAutoTextGroup::getElementNames() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -586,7 +586,7 @@ sal_Bool SwXAutoTextGroup::hasByName(const OUString& rName) return bRet; } -uno::Reference< beans::XPropertySetInfo > SwXAutoTextGroup::getPropertySetInfo(void) +uno::Reference< beans::XPropertySetInfo > SwXAutoTextGroup::getPropertySetInfo() throw( uno::RuntimeException, std::exception ) { static uno::Reference< beans::XPropertySetInfo > xRet = pPropSet->getPropertySetInfo(); @@ -680,7 +680,7 @@ void SwXAutoTextGroup::Invalidate() m_sGroupName.clear(); } -OUString SwXAutoTextGroup::getImplementationName(void) throw( uno::RuntimeException, std::exception ) +OUString SwXAutoTextGroup::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString("SwXAutoTextGroup"); } @@ -690,7 +690,7 @@ sal_Bool SwXAutoTextGroup::supportsService(const OUString& rServiceName) throw( return cppu::supportsService(this, rServiceName); } -uno::Sequence< OUString > SwXAutoTextGroup::getSupportedServiceNames(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXAutoTextGroup::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aRet(1); OUString* pArray = aRet.getArray(); @@ -806,7 +806,7 @@ void SwXAutoTextEntry::GetBodyText () xBodyText = uno::Reference < lang::XServiceInfo > ( *pBodyText, uno::UNO_QUERY); } -uno::Reference< text::XTextCursor > SwXAutoTextEntry::createTextCursor(void) throw( uno::RuntimeException, std::exception ) +uno::Reference< text::XTextCursor > SwXAutoTextEntry::createTextCursor() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; EnsureBodyText(); @@ -856,28 +856,28 @@ void SwXAutoTextEntry::removeTextContent( pBodyText->removeTextContent ( xContent ); } -uno::Reference< text::XText > SwXAutoTextEntry::getText(void) throw( uno::RuntimeException, std::exception ) +uno::Reference< text::XText > SwXAutoTextEntry::getText() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; uno::Reference< text::XText > xRet = (text::XText*)this; return xRet; } -uno::Reference< text::XTextRange > SwXAutoTextEntry::getStart(void) throw( uno::RuntimeException, std::exception ) +uno::Reference< text::XTextRange > SwXAutoTextEntry::getStart() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; EnsureBodyText(); return pBodyText->getStart(); } -uno::Reference< text::XTextRange > SwXAutoTextEntry::getEnd(void) throw( uno::RuntimeException, std::exception ) +uno::Reference< text::XTextRange > SwXAutoTextEntry::getEnd() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; EnsureBodyText(); return pBodyText->getEnd(); } -OUString SwXAutoTextEntry::getString(void) throw( uno::RuntimeException, std::exception ) +OUString SwXAutoTextEntry::getString() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; EnsureBodyText(); @@ -963,7 +963,7 @@ void SwXAutoTextEntry::applyTo(const uno::Reference< text::XTextRange > & xTextR throw uno::RuntimeException(); } -OUString SwXAutoTextEntry::getImplementationName(void) throw( uno::RuntimeException, std::exception ) +OUString SwXAutoTextEntry::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString("SwXAutoTextEntry"); } @@ -973,7 +973,7 @@ sal_Bool SwXAutoTextEntry::supportsService(const OUString& rServiceName) throw( return cppu::supportsService(this, rServiceName); } -uno::Sequence< OUString > SwXAutoTextEntry::getSupportedServiceNames(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SwXAutoTextEntry::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aRet(1); OUString* pArray = aRet.getArray(); diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx index 30dcaf8e8849..da1a01efe78a 100644 --- a/sw/source/uibase/uno/unomod.cxx +++ b/sw/source/uibase/uno/unomod.cxx @@ -203,7 +203,7 @@ SwXModule::~SwXModule() delete pxPrintSettings; } -Reference< XPropertySet > SwXModule::getViewSettings(void) throw( uno::RuntimeException, std::exception ) +Reference< XPropertySet > SwXModule::getViewSettings() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!pxViewSettings) @@ -215,7 +215,7 @@ Reference< XPropertySet > SwXModule::getViewSettings(void) throw( uno::RuntimeE return *pxViewSettings; } -Reference< XPropertySet > SwXModule::getPrintSettings(void) throw( uno::RuntimeException, std::exception ) +Reference< XPropertySet > SwXModule::getPrintSettings() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!pxPrintSettings) @@ -227,7 +227,7 @@ Reference< XPropertySet > SwXModule::getPrintSettings(void) throw( uno::Runtime return *pxPrintSettings; } -OUString SwXModule::getImplementationName(void) throw( RuntimeException, std::exception ) +OUString SwXModule::getImplementationName() throw( RuntimeException, std::exception ) { return OUString( "SwXModule" ); } @@ -237,7 +237,7 @@ sal_Bool SwXModule::supportsService(const OUString& rServiceName) throw( Runtime return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SwXModule::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) +Sequence< OUString > SwXModule::getSupportedServiceNames() throw( RuntimeException, std::exception ) { OUString sService( "com.sun.star.text.GlobalSettings"); const Sequence< OUString > aSeq( &sService, 1 ); @@ -522,7 +522,7 @@ void SwXPrintSettings::_postGetValues () mpPrtOpt = NULL; } -OUString SwXPrintSettings::getImplementationName(void) throw( RuntimeException, std::exception ) +OUString SwXPrintSettings::getImplementationName() throw( RuntimeException, std::exception ) { return OUString("SwXPrintSettings"); } @@ -532,7 +532,7 @@ sal_Bool SwXPrintSettings::supportsService(const OUString& rServiceName) throw( return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SwXPrintSettings::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) +Sequence< OUString > SwXPrintSettings::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); OUString* pArray = aRet.getArray(); @@ -967,7 +967,7 @@ void SwXViewSettings::_postGetValues () mpConstViewOption = NULL; } -OUString SwXViewSettings::getImplementationName(void) throw( RuntimeException, std::exception ) +OUString SwXViewSettings::getImplementationName() throw( RuntimeException, std::exception ) { return OUString("SwXViewSettings"); } @@ -977,7 +977,7 @@ sal_Bool SwXViewSettings::supportsService(const OUString& rServiceName) throw( R return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SwXViewSettings::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) +Sequence< OUString > SwXViewSettings::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); OUString* pArray = aRet.getArray(); diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 0dca9b0d624e..f570dd9954de 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -465,7 +465,7 @@ void SwXTextDocument::GetNumberFormatter() } } -Reference< XText > SwXTextDocument::getText(void) throw( RuntimeException, std::exception ) +Reference< XText > SwXTextDocument::getText() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -478,14 +478,14 @@ Reference< XText > SwXTextDocument::getText(void) throw( RuntimeException, std: return xBodyText; } -void SwXTextDocument::reformat(void) throw( RuntimeException, std::exception ) +void SwXTextDocument::reformat() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) throw RuntimeException(); } -void SwXTextDocument::lockControllers(void) throw( RuntimeException, std::exception ) +void SwXTextDocument::lockControllers() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(IsValid()) @@ -497,7 +497,7 @@ void SwXTextDocument::lockControllers(void) throw( RuntimeException, std::except throw RuntimeException(); } -void SwXTextDocument::unlockControllers(void) throw( RuntimeException, std::exception ) +void SwXTextDocument::unlockControllers() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!aActionArr.empty()) @@ -510,13 +510,13 @@ void SwXTextDocument::unlockControllers(void) throw( RuntimeException, std::exce throw RuntimeException(); } -sal_Bool SwXTextDocument::hasControllersLocked(void) throw( RuntimeException, std::exception ) +sal_Bool SwXTextDocument::hasControllersLocked() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; return !aActionArr.empty(); } -Reference< frame::XController > SwXTextDocument::getCurrentController(void) throw( RuntimeException, std::exception ) +Reference< frame::XController > SwXTextDocument::getCurrentController() throw( RuntimeException, std::exception ) { return SfxBaseModel::getCurrentController(); } @@ -555,12 +555,12 @@ sal_Bool SwXTextDocument::attachResource(const OUString& aURL, const Sequence< b return SfxBaseModel::attachResource(aURL, aArgs); } -OUString SwXTextDocument::getURL(void) throw( RuntimeException, std::exception ) +OUString SwXTextDocument::getURL() throw( RuntimeException, std::exception ) { return SfxBaseModel::getURL(); } -Sequence< beans::PropertyValue > SwXTextDocument::getArgs(void) throw( RuntimeException, std::exception ) +Sequence< beans::PropertyValue > SwXTextDocument::getArgs() throw( RuntimeException, std::exception ) { return SfxBaseModel::getArgs(); } @@ -575,7 +575,7 @@ void SwXTextDocument::disconnectController(const Reference< frame::XController > SfxBaseModel::disconnectController(xController); } -void SwXTextDocument::dispose(void) throw( RuntimeException, std::exception ) +void SwXTextDocument::dispose() throw( RuntimeException, std::exception ) { SfxBaseModel::dispose(); } @@ -598,7 +598,7 @@ void SwXTextDocument::removeEventListener(const Reference< lang::XEventListener SfxBaseModel::removeEventListener(aListener); } -Reference< XPropertySet > SwXTextDocument::getLineNumberingProperties(void) +Reference< XPropertySet > SwXTextDocument::getLineNumberingProperties() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -615,7 +615,7 @@ Reference< XPropertySet > SwXTextDocument::getLineNumberingProperties(void) return *pxXLineNumberingProperties; } -Reference< XIndexReplace > SwXTextDocument::getChapterNumberingRules(void) +Reference< XIndexReplace > SwXTextDocument::getChapterNumberingRules() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -629,7 +629,7 @@ Reference< XIndexReplace > SwXTextDocument::getChapterNumberingRules(void) return *pxXChapterNumbering; } -Reference< XIndexAccess > SwXTextDocument::getNumberingRules(void) throw( RuntimeException, std::exception ) +Reference< XIndexAccess > SwXTextDocument::getNumberingRules() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -642,7 +642,7 @@ Reference< XIndexAccess > SwXTextDocument::getNumberingRules(void) throw( Runti return *pxXNumberingRules; } -Reference< XIndexAccess > SwXTextDocument::getFootnotes(void) throw( RuntimeException, std::exception ) +Reference< XIndexAccess > SwXTextDocument::getFootnotes() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -656,7 +656,7 @@ Reference< XIndexAccess > SwXTextDocument::getFootnotes(void) throw( RuntimeExc } Reference< XPropertySet > SAL_CALL - SwXTextDocument::getFootnoteSettings(void) throw( RuntimeException, std::exception ) + SwXTextDocument::getFootnoteSettings() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -669,7 +669,7 @@ Reference< XPropertySet > SAL_CALL return *pxXFootnoteSettings; } -Reference< XIndexAccess > SwXTextDocument::getEndnotes(void) throw( RuntimeException, std::exception ) +Reference< XIndexAccess > SwXTextDocument::getEndnotes() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -682,7 +682,7 @@ Reference< XIndexAccess > SwXTextDocument::getEndnotes(void) throw( RuntimeExce return *pxXEndnotes; } -Reference< XPropertySet > SwXTextDocument::getEndnoteSettings(void) throw( RuntimeException, std::exception ) +Reference< XPropertySet > SwXTextDocument::getEndnoteSettings() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -695,7 +695,7 @@ Reference< XPropertySet > SwXTextDocument::getEndnoteSettings(void) throw( Runt return *pxXEndnoteSettings; } -Reference< util::XReplaceDescriptor > SwXTextDocument::createReplaceDescriptor(void) +Reference< util::XReplaceDescriptor > SwXTextDocument::createReplaceDescriptor() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -789,7 +789,7 @@ sal_Int32 SwXTextDocument::replaceAll(const Reference< util::XSearchDescriptor > } -Reference< util::XSearchDescriptor > SwXTextDocument::createSearchDescriptor(void) +Reference< util::XSearchDescriptor > SwXTextDocument::createSearchDescriptor() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -986,7 +986,7 @@ Reference< XInterface > SwXTextDocument::findNext(const Reference< XInterface > return xRet; } -Sequence< beans::PropertyValue > SwXTextDocument::getPagePrintSettings(void) +Sequence< beans::PropertyValue > SwXTextDocument::getPagePrintSettings() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -1216,7 +1216,7 @@ void SwXTextDocument::printPages(const Sequence< beans::PropertyValue >& xOption throw RuntimeException(); } -Reference< XNameAccess > SwXTextDocument::getReferenceMarks(void) +Reference< XNameAccess > SwXTextDocument::getReferenceMarks() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -1230,7 +1230,7 @@ Reference< XNameAccess > SwXTextDocument::getReferenceMarks(void) return *pxXReferenceMarks; } -Reference< XEnumerationAccess > SwXTextDocument::getTextFields(void) throw( RuntimeException, std::exception ) +Reference< XEnumerationAccess > SwXTextDocument::getTextFields() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -1243,7 +1243,7 @@ Reference< XEnumerationAccess > SwXTextDocument::getTextFields(void) throw( Run return *pxXTextFieldTypes; } -Reference< XNameAccess > SwXTextDocument::getTextFieldMasters(void) +Reference< XNameAccess > SwXTextDocument::getTextFieldMasters() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -1257,7 +1257,7 @@ Reference< XNameAccess > SwXTextDocument::getTextFieldMasters(void) return *pxXTextFieldMasters; } -Reference< XNameAccess > SwXTextDocument::getEmbeddedObjects(void) throw( RuntimeException, std::exception ) +Reference< XNameAccess > SwXTextDocument::getEmbeddedObjects() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -1270,7 +1270,7 @@ Reference< XNameAccess > SwXTextDocument::getEmbeddedObjects(void) throw( Runti return *pxXEmbeddedObjects; } -Reference< XNameAccess > SwXTextDocument::getBookmarks(void) throw( RuntimeException, std::exception ) +Reference< XNameAccess > SwXTextDocument::getBookmarks() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -1283,7 +1283,7 @@ Reference< XNameAccess > SwXTextDocument::getBookmarks(void) throw( RuntimeExce return *pxXBookmarks; } -Reference< XNameAccess > SwXTextDocument::getTextSections(void) throw( RuntimeException, std::exception ) +Reference< XNameAccess > SwXTextDocument::getTextSections() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -1296,7 +1296,7 @@ Reference< XNameAccess > SwXTextDocument::getTextSections(void) throw( RuntimeE return *pxXTextSections; } -Reference< XNameAccess > SwXTextDocument::getTextTables(void) throw( RuntimeException, std::exception ) +Reference< XNameAccess > SwXTextDocument::getTextTables() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -1309,7 +1309,7 @@ Reference< XNameAccess > SwXTextDocument::getTextTables(void) throw( RuntimeExc return *pxXTextTables; } -Reference< XNameAccess > SwXTextDocument::getGraphicObjects(void) throw( RuntimeException, std::exception ) +Reference< XNameAccess > SwXTextDocument::getGraphicObjects() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -1322,7 +1322,7 @@ Reference< XNameAccess > SwXTextDocument::getGraphicObjects(void) throw( Runtim return *pxXGraphicObjects; } -Reference< XNameAccess > SwXTextDocument::getTextFrames(void) throw( RuntimeException, std::exception ) +Reference< XNameAccess > SwXTextDocument::getTextFrames() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -1335,7 +1335,7 @@ Reference< XNameAccess > SwXTextDocument::getTextFrames(void) throw( RuntimeExc return *pxXTextFrames; } -Reference< XNameAccess > SwXTextDocument::getStyleFamilies(void) throw( RuntimeException, std::exception ) +Reference< XNameAccess > SwXTextDocument::getStyleFamilies() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -1363,7 +1363,7 @@ uno::Reference< style::XAutoStyles > SwXTextDocument::getAutoStyles( ) } -Reference< drawing::XDrawPage > SwXTextDocument::getDrawPage(void) throw( RuntimeException, std::exception ) +Reference< drawing::XDrawPage > SwXTextDocument::getDrawPage() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -1741,7 +1741,7 @@ Reference< XInterface > SwXTextDocument::createInstanceWithArguments( return create(ServiceSpecifier, &Arguments); } -Sequence< OUString > SwXTextDocument::getAvailableServiceNames(void) +Sequence< OUString > SwXTextDocument::getAvailableServiceNames() throw( RuntimeException, std::exception ) { static Sequence< OUString > aServices; @@ -1765,7 +1765,7 @@ Sequence< OUString > SwXTextDocument::getAvailableServiceNames(void) return aServices; } -OUString SwXTextDocument::getImplementationName(void) throw( RuntimeException, std::exception ) +OUString SwXTextDocument::getImplementationName() throw( RuntimeException, std::exception ) { return PTR_CAST(SwGlobalDocShell, pDocShell) != nullptr ? OUString("com.sun.star.comp.Writer.GlobalDocument") @@ -1779,7 +1779,7 @@ sal_Bool SwXTextDocument::supportsService(const OUString& rServiceName) throw( R return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SwXTextDocument::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) +Sequence< OUString > SwXTextDocument::getSupportedServiceNames() throw( RuntimeException, std::exception ) { bool bWebDoc = (0 != PTR_CAST(SwWebDocShell, pDocShell)); bool bGlobalDoc = (0 != PTR_CAST(SwGlobalDocShell, pDocShell)); @@ -1801,7 +1801,7 @@ Sequence< OUString > SwXTextDocument::getSupportedServiceNames(void) throw( Runt return aRet; } -Reference< XIndexAccess > SwXTextDocument::getDocumentIndexes(void) throw( RuntimeException, std::exception ) +Reference< XIndexAccess > SwXTextDocument::getDocumentIndexes() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -1814,7 +1814,7 @@ Reference< XIndexAccess > SwXTextDocument::getDocumentIndexes(void) throw( Runt return *pxXDocumentIndexes; } -Reference< XPropertySetInfo > SwXTextDocument::getPropertySetInfo(void) throw( RuntimeException, std::exception ) +Reference< XPropertySetInfo > SwXTextDocument::getPropertySetInfo() throw( RuntimeException, std::exception ) { static Reference< XPropertySetInfo > xRet = pPropSet->getPropertySetInfo(); return xRet; @@ -2185,7 +2185,7 @@ void SwXTextDocument::removeVetoableChangeListener(const OUString& /*PropertyNam OSL_FAIL("not implemented"); } -Reference< XNameAccess > SwXTextDocument::getLinks(void) throw( RuntimeException, std::exception ) +Reference< XNameAccess > SwXTextDocument::getLinks() throw( RuntimeException, std::exception ) { if(!pxLinkTargetSupplier) { @@ -2214,7 +2214,7 @@ void SwXTextDocument::NotifyRefreshListeners() & util::XRefreshListener::refreshed, ev); } -void SwXTextDocument::refresh(void) throw( RuntimeException, std::exception ) +void SwXTextDocument::refresh() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(!IsValid()) @@ -3567,7 +3567,7 @@ Any SwXLinkTargetSupplier::getByName(const OUString& rName) return aRet; } -Sequence< OUString > SwXLinkTargetSupplier::getElementNames(void) +Sequence< OUString > SwXLinkTargetSupplier::getElementNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(7); @@ -3597,19 +3597,19 @@ sal_Bool SwXLinkTargetSupplier::hasByName(const OUString& rName) return sal_False; } -uno::Type SwXLinkTargetSupplier::getElementType(void) +uno::Type SwXLinkTargetSupplier::getElementType() throw( RuntimeException, std::exception ) { return cppu::UnoType<XPropertySet>::get(); } -sal_Bool SwXLinkTargetSupplier::hasElements(void) throw( RuntimeException, std::exception ) +sal_Bool SwXLinkTargetSupplier::hasElements() throw( RuntimeException, std::exception ) { return 0 != pxDoc; } -OUString SwXLinkTargetSupplier::getImplementationName(void) throw( RuntimeException, std::exception ) +OUString SwXLinkTargetSupplier::getImplementationName() throw( RuntimeException, std::exception ) { return OUString("SwXLinkTargetSupplier"); } @@ -3620,7 +3620,7 @@ sal_Bool SwXLinkTargetSupplier::supportsService(const OUString& rServiceName) return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SwXLinkTargetSupplier::getSupportedServiceNames(void) +Sequence< OUString > SwXLinkTargetSupplier::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); @@ -3704,7 +3704,7 @@ Any SwXLinkNameAccessWrapper::getByName(const OUString& rName) return aRet; } -Sequence< OUString > SwXLinkNameAccessWrapper::getElementNames(void) +Sequence< OUString > SwXLinkNameAccessWrapper::getElementNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet; @@ -3780,13 +3780,13 @@ sal_Bool SwXLinkNameAccessWrapper::hasByName(const OUString& rName) return bRet; } -uno::Type SwXLinkNameAccessWrapper::getElementType(void) +uno::Type SwXLinkNameAccessWrapper::getElementType() throw( RuntimeException, std::exception ) { return cppu::UnoType<XPropertySet>::get(); } -sal_Bool SwXLinkNameAccessWrapper::hasElements(void) throw( RuntimeException, std::exception ) +sal_Bool SwXLinkNameAccessWrapper::hasElements() throw( RuntimeException, std::exception ) { bool bRet = false; if(pxDoc) @@ -3800,7 +3800,7 @@ sal_Bool SwXLinkNameAccessWrapper::hasElements(void) throw( RuntimeException, st return bRet; } -Reference< XPropertySetInfo > SwXLinkNameAccessWrapper::getPropertySetInfo(void) +Reference< XPropertySetInfo > SwXLinkNameAccessWrapper::getPropertySetInfo() throw( RuntimeException, std::exception ) { static Reference< XPropertySetInfo > xRet = pPropSet->getPropertySetInfo(); @@ -3889,13 +3889,13 @@ void SwXLinkNameAccessWrapper::removeVetoableChangeListener( throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) {} -Reference< XNameAccess > SwXLinkNameAccessWrapper::getLinks(void) +Reference< XNameAccess > SwXLinkNameAccessWrapper::getLinks() throw( RuntimeException, std::exception ) { return (SwXLinkNameAccessWrapper*)this; } -OUString SwXLinkNameAccessWrapper::getImplementationName(void) throw( RuntimeException, std::exception ) +OUString SwXLinkNameAccessWrapper::getImplementationName() throw( RuntimeException, std::exception ) { return OUString("SwXLinkNameAccessWrapper"); } @@ -3906,7 +3906,7 @@ sal_Bool SwXLinkNameAccessWrapper::supportsService(const OUString& rServiceName) return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SwXLinkNameAccessWrapper::getSupportedServiceNames(void) +Sequence< OUString > SwXLinkNameAccessWrapper::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); @@ -3925,7 +3925,7 @@ SwXOutlineTarget::~SwXOutlineTarget() { } -Reference< XPropertySetInfo > SwXOutlineTarget::getPropertySetInfo(void) throw( RuntimeException, std::exception ) +Reference< XPropertySetInfo > SwXOutlineTarget::getPropertySetInfo() throw( RuntimeException, std::exception ) { static Reference< XPropertySetInfo > xRet = pPropSet->getPropertySetInfo(); return xRet; @@ -3974,7 +3974,7 @@ void SwXOutlineTarget::removeVetoableChangeListener( { } -OUString SwXOutlineTarget::getImplementationName(void) throw( RuntimeException, std::exception ) +OUString SwXOutlineTarget::getImplementationName() throw( RuntimeException, std::exception ) { return OUString("SwXOutlineTarget"); } @@ -3984,7 +3984,7 @@ sal_Bool SwXOutlineTarget::supportsService(const OUString& ServiceName) throw( R return cppu::supportsService(this, ServiceName); } -Sequence< OUString > SwXOutlineTarget::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) +Sequence< OUString > SwXOutlineTarget::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence < OUString > aRet(1); OUString* pArray = aRet.getArray(); diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx index d29561e12ba9..dbedf77c4153 100644 --- a/sw/source/uibase/uno/unotxvw.cxx +++ b/sw/source/uibase/uno/unotxvw.cxx @@ -495,7 +495,7 @@ void SAL_CALL SwXTextView::setFormDesignMode( sal_Bool _DesignMode ) throw (Runt pFormShell->SetDesignMode( _DesignMode ); } -uno::Reference< text::XTextViewCursor > SwXTextView::getViewCursor(void) throw( uno::RuntimeException, std::exception ) +uno::Reference< text::XTextViewCursor > SwXTextView::getViewCursor() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(GetView()) @@ -511,7 +511,7 @@ uno::Reference< text::XTextViewCursor > SwXTextView::getViewCursor(void) throw( throw uno::RuntimeException(); } -uno::Reference< beans::XPropertySet > SwXTextView::getViewSettings(void) throw( uno::RuntimeException, std::exception ) +uno::Reference< beans::XPropertySet > SwXTextView::getViewSettings() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if(m_pView) @@ -844,7 +844,7 @@ void SAL_CALL SwXTextView::removeVetoableChangeListener( OSL_FAIL("not implemented"); } -OUString SwXTextView::getImplementationName(void) throw( RuntimeException, std::exception ) +OUString SwXTextView::getImplementationName() throw( RuntimeException, std::exception ) { return OUString("SwXTextView"); } @@ -854,7 +854,7 @@ sal_Bool SwXTextView::supportsService(const OUString& rServiceName) throw( Runti return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SwXTextView::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) +Sequence< OUString > SwXTextView::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(2); OUString* pArray = aRet.getArray(); @@ -898,7 +898,7 @@ bool SwXTextViewCursor::IsTextSelection( bool bAllowTables ) const return bRes; } -sal_Bool SwXTextViewCursor::isVisible(void) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTextViewCursor::isVisible() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; OSL_FAIL("not implemented"); @@ -911,7 +911,7 @@ void SwXTextViewCursor::setVisible(sal_Bool /*bVisible*/) throw( uno::RuntimeExc OSL_FAIL("not implemented"); } -awt::Point SwXTextViewCursor::getPosition(void) throw( uno::RuntimeException, std::exception ) +awt::Point SwXTextViewCursor::getPosition() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; awt::Point aRet; @@ -1265,7 +1265,7 @@ sal_Bool SwXTextViewCursor::jumpToPage(sal_Int16 nPage) throw( uno::RuntimeExcep return bRet; } -sal_Bool SwXTextViewCursor::jumpToNextPage(void) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTextViewCursor::jumpToNextPage() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; bool bRet = false; @@ -1276,7 +1276,7 @@ sal_Bool SwXTextViewCursor::jumpToNextPage(void) throw( uno::RuntimeException, s return bRet; } -sal_Bool SwXTextViewCursor::jumpToPreviousPage(void) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTextViewCursor::jumpToPreviousPage() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; bool bRet = false; @@ -1287,7 +1287,7 @@ sal_Bool SwXTextViewCursor::jumpToPreviousPage(void) throw( uno::RuntimeExceptio return bRet; } -sal_Bool SwXTextViewCursor::jumpToEndOfPage(void) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTextViewCursor::jumpToEndOfPage() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; bool bRet = false; @@ -1298,7 +1298,7 @@ sal_Bool SwXTextViewCursor::jumpToEndOfPage(void) throw( uno::RuntimeException, return bRet; } -sal_Bool SwXTextViewCursor::jumpToStartOfPage(void) throw( uno::RuntimeException, std::exception ) +sal_Bool SwXTextViewCursor::jumpToStartOfPage() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; bool bRet = false; @@ -1716,7 +1716,7 @@ void SwXTextViewCursor::gotoStartOfLine(sal_Bool bExpand) throw uno::RuntimeException(); } -OUString SwXTextViewCursor::getImplementationName(void) throw( RuntimeException, std::exception ) +OUString SwXTextViewCursor::getImplementationName() throw( RuntimeException, std::exception ) { return OUString("SwXTextViewCursor"); } @@ -1726,7 +1726,7 @@ sal_Bool SwXTextViewCursor::supportsService(const OUString& rServiceName) throw( return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SwXTextViewCursor::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) +Sequence< OUString > SwXTextViewCursor::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(7); OUString* pArray = aRet.getArray(); diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index bec9651f0370..b41cbf5e998c 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -1104,7 +1104,7 @@ sal_Int8 SwContentTree::ExecuteDrop( const ExecuteDropEvent& rEvt ) // Handler for Dragging and ContextMenu -PopupMenu* SwContentTree::CreateContextMenu( void ) +PopupMenu* SwContentTree::CreateContextMenu() { PopupMenu* pPop = new PopupMenu; PopupMenu* pSubPop1 = new PopupMenu; diff --git a/toolkit/source/controls/eventcontainer.cxx b/toolkit/source/controls/eventcontainer.cxx index f90e18c52e0b..d00befb2f685 100644 --- a/toolkit/source/controls/eventcontainer.cxx +++ b/toolkit/source/controls/eventcontainer.cxx @@ -187,7 +187,7 @@ void NameContainer_Impl::removeContainerListener( const ::com::sun::star::uno::R // Ctor -ScriptEventContainer::ScriptEventContainer( void ) +ScriptEventContainer::ScriptEventContainer() : NameContainer_Impl( cppu::UnoType<ScriptEventDescriptor>::get()) { } diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx index 820322d986e8..bf62b7ca69fb 100644 --- a/toolkit/source/controls/unocontrols.cxx +++ b/toolkit/source/controls/unocontrols.cxx @@ -398,7 +398,7 @@ OUString UnoEditControl::getText() throw(uno::RuntimeException, std::exception) return aText; } -OUString UnoEditControl::getSelectedText( void ) throw(uno::RuntimeException, std::exception) +OUString UnoEditControl::getSelectedText() throw(uno::RuntimeException, std::exception) { OUString sSelected; uno::Reference< awt::XTextComponent > xText( getPeer(), uno::UNO_QUERY ); @@ -415,7 +415,7 @@ void UnoEditControl::setSelection( const awt::Selection& aSelection ) throw(uno: xText->setSelection( aSelection ); } -awt::Selection UnoEditControl::getSelection( void ) throw(uno::RuntimeException, std::exception) +awt::Selection UnoEditControl::getSelection() throw(uno::RuntimeException, std::exception) { awt::Selection aSel; uno::Reference< awt::XTextComponent > xText( getPeer(), uno::UNO_QUERY ); @@ -424,7 +424,7 @@ awt::Selection UnoEditControl::getSelection( void ) throw(uno::RuntimeException, return aSel; } -sal_Bool UnoEditControl::isEditable( void ) throw(uno::RuntimeException, std::exception) +sal_Bool UnoEditControl::isEditable() throw(uno::RuntimeException, std::exception) { return !ImplGetPropertyValue_BOOL( BASEPROPERTY_READONLY ); } diff --git a/tools/source/inet/inetstrm.cxx b/tools/source/inet/inetstrm.cxx index bc0f45bc7471..3af2fdd4043c 100644 --- a/tools/source/inet/inetstrm.cxx +++ b/tools/source/inet/inetstrm.cxx @@ -52,7 +52,7 @@ class INetMessageEncodeQPStream_Impl : public INetMessageIStream public: INetMessageEncodeQPStream_Impl(sal_uIntPtr nMsgBufferSize = 1024); - virtual ~INetMessageEncodeQPStream_Impl(void); + virtual ~INetMessageEncodeQPStream_Impl(); }; /** Quoted-Printable Decoding */ @@ -67,8 +67,8 @@ class INetMessageDecodeQPStream_Impl : public INetMessageOStream virtual int PutMsgLine(const sal_Char* pData, sal_uIntPtr nSize) SAL_OVERRIDE; public: - INetMessageDecodeQPStream_Impl(void); - virtual ~INetMessageDecodeQPStream_Impl(void); + INetMessageDecodeQPStream_Impl(); + virtual ~INetMessageDecodeQPStream_Impl(); }; /** Base64 Encoding */ @@ -92,7 +92,7 @@ class INetMessageEncode64Stream_Impl : public INetMessageIStream public: INetMessageEncode64Stream_Impl(sal_uIntPtr nMsgBufferSize = 2048); - virtual ~INetMessageEncode64Stream_Impl(void); + virtual ~INetMessageEncode64Stream_Impl(); }; /** Base64 Decoding */ @@ -109,7 +109,7 @@ class INetMessageDecode64Stream_Impl : public INetMessageOStream public: INetMessageDecode64Stream_Impl(sal_uIntPtr nMsgBufferSize = 128); - virtual ~INetMessageDecode64Stream_Impl(void); + virtual ~INetMessageDecode64Stream_Impl(); }; // INetMessageIStream @@ -128,7 +128,7 @@ INetMessageIStream::INetMessageIStream(sal_uIntPtr nBufferSize) pRead = pWrite = pBuffer; } -INetMessageIStream::~INetMessageIStream(void) +INetMessageIStream::~INetMessageIStream() { delete [] pBuffer; delete pMsgBuffer; @@ -246,7 +246,7 @@ int INetMessageIStream::GetMsgLine(sal_Char* pData, sal_uIntPtr nSize) // INetMessageOStream -INetMessageOStream::INetMessageOStream(void) +INetMessageOStream::INetMessageOStream() : pTargetMsg (NULL), bHeaderParsed (false), eOState (INETMSG_EOL_BEGIN), @@ -254,7 +254,7 @@ INetMessageOStream::INetMessageOStream(void) { } -INetMessageOStream::~INetMessageOStream(void) +INetMessageOStream::~INetMessageOStream() { if (pMsgBuffer->Tell() > 0) PutMsgLine(static_cast<const sal_Char*>(pMsgBuffer->GetData()), pMsgBuffer->Tell()); @@ -434,7 +434,7 @@ INetMessageEncodeQPStream_Impl::INetMessageEncodeQPStream_Impl( sal_uIntPtr nMsg pTokRead = pTokWrite = pTokBuffer; } -INetMessageEncodeQPStream_Impl::~INetMessageEncodeQPStream_Impl(void) +INetMessageEncodeQPStream_Impl::~INetMessageEncodeQPStream_Impl() { delete pMsgStrm; delete [] pMsgBuffer; @@ -634,7 +634,7 @@ static const sal_uInt8 pr2hex[128] = { 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10 }; -INetMessageDecodeQPStream_Impl::INetMessageDecodeQPStream_Impl(void) +INetMessageDecodeQPStream_Impl::INetMessageDecodeQPStream_Impl() : INetMessageOStream(), eState (INETMSG_EOL_BEGIN), pMsgBuffer (new SvMemoryStream), @@ -643,7 +643,7 @@ INetMessageDecodeQPStream_Impl::INetMessageDecodeQPStream_Impl(void) ParseHeader(false); } -INetMessageDecodeQPStream_Impl::~INetMessageDecodeQPStream_Impl(void) +INetMessageDecodeQPStream_Impl::~INetMessageDecodeQPStream_Impl() { delete pMsgBuffer; } @@ -756,7 +756,7 @@ INetMessageEncode64Stream_Impl::INetMessageEncode64Stream_Impl( pTokRead = pTokWrite = pTokBuffer; } -INetMessageEncode64Stream_Impl::~INetMessageEncode64Stream_Impl(void) +INetMessageEncode64Stream_Impl::~INetMessageEncode64Stream_Impl() { delete pMsgStrm; delete [] pMsgBuffer; @@ -943,7 +943,7 @@ INetMessageDecode64Stream_Impl::INetMessageDecode64Stream_Impl( pMsgRead = pMsgWrite = pMsgBuffer; } -INetMessageDecode64Stream_Impl::~INetMessageDecode64Stream_Impl(void) +INetMessageDecode64Stream_Impl::~INetMessageDecode64Stream_Impl() { delete [] pMsgBuffer; } @@ -1058,7 +1058,7 @@ INetMIMEMessageStream::INetMIMEMessageStream(sal_uIntPtr nBufferSize) { } -INetMIMEMessageStream::~INetMIMEMessageStream(void) +INetMIMEMessageStream::~INetMIMEMessageStream() { delete pChildStrm; delete pEncodeStrm; diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx index 9d48cfd08726..39a5c8dc230c 100644 --- a/ucb/source/ucp/file/bc.cxx +++ b/ucb/source/ucp/file/bc.cxx @@ -137,7 +137,7 @@ BaseContent::~BaseContent( ) void SAL_CALL -BaseContent::acquire( void ) +BaseContent::acquire() throw() { OWeakObject::acquire(); @@ -145,7 +145,7 @@ BaseContent::acquire( void ) void SAL_CALL -BaseContent::release( void ) +BaseContent::release() throw() { OWeakObject::release(); @@ -292,7 +292,7 @@ XTYPEPROVIDER_IMPL_10( BaseContent, sal_Int32 SAL_CALL -BaseContent::createCommandIdentifier( void ) +BaseContent::createCommandIdentifier() throw( RuntimeException, std::exception ) { return m_pMyShell->getCommandId(); @@ -1265,7 +1265,7 @@ void SAL_CALL BaseContent::endTask( sal_Int32 CommandId ) ContentEventNotifier* -BaseContent::cDEL( void ) +BaseContent::cDEL() { osl::MutexGuard aGuard( m_aMutex ); @@ -1307,7 +1307,7 @@ BaseContent::cEXC( const OUString& aNewName ) ContentEventNotifier* -BaseContent::cCEL( void ) +BaseContent::cCEL() { osl::MutexGuard aGuard( m_aMutex ); ContentEventNotifier* p = 0; @@ -1321,7 +1321,7 @@ BaseContent::cCEL( void ) } PropertySetInfoChangeNotifier* -BaseContent::cPSL( void ) +BaseContent::cPSL() { osl::MutexGuard aGuard( m_aMutex ); PropertySetInfoChangeNotifier* p = 0; @@ -1336,7 +1336,7 @@ BaseContent::cPSL( void ) PropertyChangeNotifier* -BaseContent::cPCL( void ) +BaseContent::cPCL() { osl::MutexGuard aGuard( m_aMutex ); @@ -1369,7 +1369,7 @@ BaseContent::cPCL( void ) } -OUString BaseContent::getKey( void ) +OUString BaseContent::getKey() { return m_aUncPath; } diff --git a/ucb/source/ucp/file/bc.hxx b/ucb/source/ucp/file/bc.hxx index f1e698728527..21b6acad5913 100644 --- a/ucb/source/ucp/file/bc.hxx +++ b/ucb/source/ucp/file/bc.hxx @@ -259,12 +259,12 @@ namespace fileaccess { // Notifier - ContentEventNotifier* cDEL( void ) SAL_OVERRIDE; + ContentEventNotifier* cDEL() SAL_OVERRIDE; ContentEventNotifier* cEXC( const OUString& aNewName ) SAL_OVERRIDE; - ContentEventNotifier* cCEL( void ) SAL_OVERRIDE; - PropertySetInfoChangeNotifier* cPSL( void ) SAL_OVERRIDE; - PropertyChangeNotifier* cPCL( void ) SAL_OVERRIDE; - OUString getKey( void ) SAL_OVERRIDE; + ContentEventNotifier* cCEL() SAL_OVERRIDE; + PropertySetInfoChangeNotifier* cPSL() SAL_OVERRIDE; + PropertyChangeNotifier* cPCL() SAL_OVERRIDE; + OUString getKey() SAL_OVERRIDE; private: // Data members diff --git a/ucb/source/ucp/file/filnot.cxx b/ucb/source/ucp/file/filnot.cxx index a66b17ac74d5..2f84445aae84 100644 --- a/ucb/source/ucp/file/filnot.cxx +++ b/ucb/source/ucp/file/filnot.cxx @@ -79,7 +79,7 @@ void ContentEventNotifier::notifyChildInserted( const OUString& aChildName ) } } -void ContentEventNotifier::notifyDeleted( void ) +void ContentEventNotifier::notifyDeleted() { ContentEvent aEvt( m_xCreatorContent, diff --git a/ucb/source/ucp/file/filnot.hxx b/ucb/source/ucp/file/filnot.hxx index 5e782d1b61e2..327ec4832fff 100644 --- a/ucb/source/ucp/file/filnot.hxx +++ b/ucb/source/ucp/file/filnot.hxx @@ -56,7 +56,7 @@ namespace fileaccess { com::sun::star::uno::Reference< com::sun::star::uno::XInterface > >& sListeners ); void notifyChildInserted( const OUString& aChildName ); - void notifyDeleted( void ); + void notifyDeleted(); void notifyRemoved( const OUString& aChildName ); void notifyExchanged( ); }; @@ -109,11 +109,11 @@ namespace fileaccess { // Side effect of this function is the change of the name virtual ContentEventNotifier* cEXC( const OUString& aNewName ) = 0; // Side effect is the change of the state of the object to "deleted". - virtual ContentEventNotifier* cDEL( void ) = 0; - virtual ContentEventNotifier* cCEL( void ) = 0; - virtual PropertySetInfoChangeNotifier* cPSL( void ) = 0; - virtual PropertyChangeNotifier* cPCL( void ) = 0; - virtual OUString getKey( void ) = 0; + virtual ContentEventNotifier* cDEL() = 0; + virtual ContentEventNotifier* cCEL() = 0; + virtual PropertySetInfoChangeNotifier* cPSL() = 0; + virtual PropertyChangeNotifier* cPCL() = 0; + virtual OUString getKey() = 0; protected: ~Notifier() {} diff --git a/ucb/source/ucp/file/filrset.hxx b/ucb/source/ucp/file/filrset.hxx index d60eff191276..625baad0db15 100644 --- a/ucb/source/ucp/file/filrset.hxx +++ b/ucb/source/ucp/file/filrset.hxx @@ -63,7 +63,7 @@ class XResultSet_impl : public Notifier, virtual ~XResultSet_impl(); - virtual ContentEventNotifier* cDEL( void ) SAL_OVERRIDE + virtual ContentEventNotifier* cDEL() SAL_OVERRIDE { return 0; } @@ -73,22 +73,22 @@ class XResultSet_impl : public Notifier, return 0; } - virtual ContentEventNotifier* cCEL( void ) SAL_OVERRIDE + virtual ContentEventNotifier* cCEL() SAL_OVERRIDE { return 0; } - virtual PropertySetInfoChangeNotifier* cPSL( void ) SAL_OVERRIDE + virtual PropertySetInfoChangeNotifier* cPSL() SAL_OVERRIDE { return 0; } - virtual PropertyChangeNotifier* cPCL( void ) SAL_OVERRIDE + virtual PropertyChangeNotifier* cPCL() SAL_OVERRIDE { return 0; } - virtual OUString getKey( void ) SAL_OVERRIDE + virtual OUString getKey() SAL_OVERRIDE { return m_aBaseDirectory; } @@ -628,7 +628,7 @@ class XResultSet_impl : public Notifier, sal_Int32 m_nMinorErrorCode; // Methods - bool SAL_CALL OneMore( void ) + bool SAL_CALL OneMore() throw( com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException ); diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx index 95391728d21c..287381294cb2 100644 --- a/ucb/source/ucp/file/filstr.cxx +++ b/ucb/source/ucp/file/filstr.cxx @@ -115,7 +115,7 @@ XStream_impl::getOutputStream( ) } -void SAL_CALL XStream_impl::truncate(void) +void SAL_CALL XStream_impl::truncate() throw( io::IOException, uno::RuntimeException, std::exception ) { if (osl::FileBase::E_None != m_aFile.setSize(0)) diff --git a/ucb/source/ucp/file/filstr.hxx b/ucb/source/ucp/file/filstr.hxx index 66e2b9878f61..6b10d1811fa2 100644 --- a/ucb/source/ucp/file/filstr.hxx +++ b/ucb/source/ucp/file/filstr.hxx @@ -73,7 +73,7 @@ class XStream_impl : public cppu::WeakImplHelper6< // XTruncate - virtual void SAL_CALL truncate( void ) + virtual void SAL_CALL truncate() throw( com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx index 37f96a9baaaa..35bd200b0b7b 100644 --- a/ucb/source/ucp/file/filtask.cxx +++ b/ucb/source/ucp/file/filtask.cxx @@ -147,7 +147,7 @@ void SAL_CALL TaskManager::installError( sal_Int32 CommandId, sal_Int32 SAL_CALL -TaskManager::getCommandId( void ) +TaskManager::getCommandId() { osl::MutexGuard aGuard( m_aMutex ); return ++m_nCommandId; diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx index 886bdd8b78ca..acf67c6dffbf 100644 --- a/ucb/source/ucp/file/filtask.hxx +++ b/ucb/source/ucp/file/filtask.hxx @@ -157,7 +157,7 @@ namespace fileaccess const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xCommandEnv ) throw( com::sun::star::ucb::DuplicateCommandIdentifierException ); - sal_Int32 SAL_CALL getCommandId( void ); + sal_Int32 SAL_CALL getCommandId(); void SAL_CALL abort( sal_Int32 CommandId ); diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx index 1a7e6a1c3abf..de4ef78c768c 100644 --- a/ucb/source/ucp/file/prov.cxx +++ b/ucb/source/ucp/file/prov.cxx @@ -425,7 +425,7 @@ XPropertySetInfoImpl2::hasPropertyByName( -void SAL_CALL FileProvider::initProperties( void ) +void SAL_CALL FileProvider::initProperties() { osl::MutexGuard aGuard( m_aMutex ); if( ! m_xPropertySetInfo.is() ) diff --git a/ucb/source/ucp/file/prov.hxx b/ucb/source/ucp/file/prov.hxx index 280e6ea44845..38d278592721 100644 --- a/ucb/source/ucp/file/prov.hxx +++ b/ucb/source/ucp/file/prov.hxx @@ -192,7 +192,7 @@ namespace fileaccess { // Members com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext; - void SAL_CALL initProperties( void ); + void SAL_CALL initProperties(); osl::Mutex m_aMutex; OUString m_HostName; OUString m_HomeDirectory; diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx index 7e880e00589b..63c0f74d6343 100644 --- a/ucb/source/ucp/file/shell.cxx +++ b/ucb/source/ucp/file/shell.cxx @@ -3051,14 +3051,14 @@ shell::getScheme( OUString& Scheme ) } OUString SAL_CALL -shell::getImplementationName_static( void ) +shell::getImplementationName_static() { return OUString("com.sun.star.comp.ucb.FileProvider"); } uno::Sequence< OUString > SAL_CALL -shell::getSupportedServiceNames_static( void ) +shell::getSupportedServiceNames_static() { OUString Supported("com.sun.star.ucb.FileContentProvider"); com::sun::star::uno::Sequence< OUString > Seq( &Supported,1 ); diff --git a/ucb/source/ucp/file/shell.hxx b/ucb/source/ucp/file/shell.hxx index 0985ed66aa6c..3d5cfe2a90af 100644 --- a/ucb/source/ucp/file/shell.hxx +++ b/ucb/source/ucp/file/shell.hxx @@ -583,9 +583,9 @@ namespace fileaccess { static void SAL_CALL getScheme( OUString& Scheme ); - static OUString SAL_CALL getImplementationName_static( void ); + static OUString SAL_CALL getImplementationName_static(); - static com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( void ); + static com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); }; // end class shell diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx index 6e7d15e036b7..b492c5d582c5 100644 --- a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx +++ b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx @@ -62,12 +62,12 @@ FTPContentIdentifier::queryInterface( } -void SAL_CALL FTPContentIdentifier::acquire( void ) throw() { +void SAL_CALL FTPContentIdentifier::acquire() throw() { OWeakObject::acquire(); } -void SAL_CALL FTPContentIdentifier::release( void ) throw() { +void SAL_CALL FTPContentIdentifier::release() throw() { OWeakObject::release(); } diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.hxx b/ucb/source/ucp/ftp/ftpcontentidentifier.hxx index 6ec021c23347..e08eae7b957b 100644 --- a/ucb/source/ucp/ftp/ftpcontentidentifier.hxx +++ b/ucb/source/ucp/ftp/ftpcontentidentifier.hxx @@ -56,9 +56,9 @@ namespace ftp { queryInterface( const com::sun::star::uno::Type& rType ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL acquire( void ) throw() SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; - virtual void SAL_CALL release( void ) throw() SAL_OVERRIDE; + virtual void SAL_CALL release() throw() SAL_OVERRIDE; // XTypeProvider diff --git a/ucb/source/ucp/ftp/ftpdirp.hxx b/ucb/source/ucp/ftp/ftpdirp.hxx index c306989b838e..676a5064a35c 100644 --- a/ucb/source/ucp/ftp/ftpdirp.hxx +++ b/ucb/source/ucp/ftp/ftpdirp.hxx @@ -67,7 +67,7 @@ namespace ftp { void SetSec(sal_uInt16 seconds) { Seconds = seconds; } void SetNanoSec(sal_uInt32 nanoSec) { NanoSeconds = nanoSec; } - sal_uInt16 GetMonth(void) { return Month; } + sal_uInt16 GetMonth() { return Month; } }; @@ -92,7 +92,7 @@ namespace ftp { sal_uInt32 m_nMode; sal_uInt32 m_nSize; - FTPDirentry(void) + FTPDirentry() : m_aDate(0,0,0,0,0,0,0), m_nMode(INETCOREFTP_FILEMODE_UNKNOWN), m_nSize((sal_uInt32)(-1)) { } diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.cxx b/ucb/source/ucp/ftp/ftpresultsetbase.cxx index a1ed5f7aab07..ba9f331c7150 100644 --- a/ucb/source/ucp/ftp/ftpresultsetbase.cxx +++ b/ucb/source/ucp/ftp/ftpresultsetbase.cxx @@ -442,14 +442,14 @@ public: { } - void SAL_CALL acquire( void ) + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } - void SAL_CALL release( void ) + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); diff --git a/ucb/source/ucp/ftp/ftpurl.hxx b/ucb/source/ucp/ftp/ftpurl.hxx index 496c1768a2c7..ecb88416a0ea 100644 --- a/ucb/source/ucp/ftp/ftpurl.hxx +++ b/ucb/source/ucp/ftp/ftpurl.hxx @@ -115,7 +115,7 @@ namespace ftp { void child(const OUString& title); /** returns the unencoded title */ - OUString child(void) const; + OUString child() const; std::vector<FTPDirentry> list(sal_Int16 nMode) const throw(curl_exception); diff --git a/ucb/source/ucp/gio/gio_inputstream.cxx b/ucb/source/ucp/gio/gio_inputstream.cxx index 4a14f22c4b15..6d11bc325043 100644 --- a/ucb/source/ucp/gio/gio_inputstream.cxx +++ b/ucb/source/ucp/gio/gio_inputstream.cxx @@ -35,7 +35,7 @@ InputStream::InputStream(GFileInputStream *pStream) : Seekable(G_SEEKABLE(pStrea throw io::NotConnectedException(); } -InputStream::~InputStream( void ) +InputStream::~InputStream() { closeInput(); } diff --git a/ucb/source/ucp/gio/gio_inputstream.hxx b/ucb/source/ucp/gio/gio_inputstream.hxx index d469787e1898..bb821f2e004e 100644 --- a/ucb/source/ucp/gio/gio_inputstream.hxx +++ b/ucb/source/ucp/gio/gio_inputstream.hxx @@ -47,8 +47,8 @@ public: // XInterface virtual com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & type ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL acquire( void ) throw () SAL_OVERRIDE { OWeakObject::acquire(); } - virtual void SAL_CALL release( void ) throw() SAL_OVERRIDE { OWeakObject::release(); } + virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { OWeakObject::acquire(); } + virtual void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // XInputStream virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 > & aData, @@ -71,12 +71,12 @@ public: ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL available( void ) + virtual sal_Int32 SAL_CALL available() throw( ::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL closeInput( void ) + virtual void SAL_CALL closeInput() throw( ::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/ucb/source/ucp/gio/gio_mount.hxx b/ucb/source/ucp/gio/gio_mount.hxx index 1781b7bd1079..0f3c14559447 100644 --- a/ucb/source/ucp/gio/gio_mount.hxx +++ b/ucb/source/ucp/gio/gio_mount.hxx @@ -53,7 +53,7 @@ struct OOoMountOperationClass }; -GType ooo_mount_operation_get_type (void); +GType ooo_mount_operation_get_type(); GMountOperation *ooo_mount_operation_new(const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& rEnv); G_END_DECLS diff --git a/ucb/source/ucp/gio/gio_outputstream.cxx b/ucb/source/ucp/gio/gio_outputstream.cxx index d8cf60f9aca6..1161bc299781 100644 --- a/ucb/source/ucp/gio/gio_outputstream.cxx +++ b/ucb/source/ucp/gio/gio_outputstream.cxx @@ -35,7 +35,7 @@ OutputStream::OutputStream(GFileOutputStream *pStream) : Seekable(G_SEEKABLE(pSt throw io::NotConnectedException(); } -OutputStream::~OutputStream( void ) +OutputStream::~OutputStream() { closeOutput(); } @@ -52,7 +52,7 @@ void SAL_CALL OutputStream::writeBytes( const com::sun::star::uno::Sequence< sal convertToIOException(pError, static_cast< cppu::OWeakObject * >(this)); } -void SAL_CALL OutputStream::flush( void ) +void SAL_CALL OutputStream::flush() throw( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception ) { @@ -64,7 +64,7 @@ void SAL_CALL OutputStream::flush( void ) convertToIOException(pError, static_cast< cppu::OWeakObject * >(this)); } -void SAL_CALL OutputStream::closeOutput( void ) +void SAL_CALL OutputStream::closeOutput() throw( io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception ) { diff --git a/ucb/source/ucp/gio/gio_outputstream.hxx b/ucb/source/ucp/gio/gio_outputstream.hxx index 6dc44175b084..c5ff0a6fdf6a 100644 --- a/ucb/source/ucp/gio/gio_outputstream.hxx +++ b/ucb/source/ucp/gio/gio_outputstream.hxx @@ -47,8 +47,8 @@ public: // XInterface virtual com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & type ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL acquire( void ) throw () SAL_OVERRIDE { OWeakObject::acquire(); } - virtual void SAL_CALL release( void ) throw() SAL_OVERRIDE { OWeakObject::release(); } + virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { OWeakObject::acquire(); } + virtual void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // XOutputStream virtual void SAL_CALL writeBytes( const com::sun::star::uno::Sequence< sal_Int8 >& aData ) @@ -57,14 +57,14 @@ public: com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL flush( void ) + virtual void SAL_CALL flush() throw( com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL closeOutput( void ) + virtual void SAL_CALL closeOutput() throw( com::sun::star::io::NotConnectedException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/ucb/source/ucp/gio/gio_seekable.cxx b/ucb/source/ucp/gio/gio_seekable.cxx index ec326cfe545e..509eb29e7bed 100644 --- a/ucb/source/ucp/gio/gio_seekable.cxx +++ b/ucb/source/ucp/gio/gio_seekable.cxx @@ -35,11 +35,11 @@ Seekable::Seekable(GSeekable *pStream) : mpStream(pStream) throw io::NotConnectedException(); } -Seekable::~Seekable( void ) +Seekable::~Seekable() { } -void SAL_CALL Seekable::truncate( void ) +void SAL_CALL Seekable::truncate() throw( io::IOException, uno::RuntimeException, std::exception ) { if (!mpStream) diff --git a/ucb/source/ucp/gio/gio_seekable.hxx b/ucb/source/ucp/gio/gio_seekable.hxx index 5e7a3c45533a..ea93781c05f2 100644 --- a/ucb/source/ucp/gio/gio_seekable.hxx +++ b/ucb/source/ucp/gio/gio_seekable.hxx @@ -45,8 +45,8 @@ public: // XInterface virtual com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & type ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL acquire( void ) throw () SAL_OVERRIDE { OWeakObject::acquire(); } - virtual void SAL_CALL release( void ) throw() SAL_OVERRIDE { OWeakObject::release(); } + virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { OWeakObject::acquire(); } + virtual void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } // XSeekable virtual void SAL_CALL seek( sal_Int64 location ) @@ -63,7 +63,7 @@ public: ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XTruncate - virtual void SAL_CALL truncate( void ) + virtual void SAL_CALL truncate() throw( com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; diff --git a/ucb/source/ucp/gvfs/gvfs_stream.cxx b/ucb/source/ucp/gvfs/gvfs_stream.cxx index db2fc812e586..e453b98f1ed0 100644 --- a/ucb/source/ucp/gvfs/gvfs_stream.cxx +++ b/ucb/source/ucp/gvfs/gvfs_stream.cxx @@ -40,7 +40,7 @@ Stream::Stream( GnomeVFSHandle *handle, gnome_vfs_file_info_copy (&m_info, aInfo); } -Stream::~Stream( void ) +Stream::~Stream() { if (m_handle) { gnome_vfs_close (m_handle); @@ -173,7 +173,7 @@ sal_Int32 SAL_CALL Stream::available( ) return 0; // cf. filinpstr.cxx } -void SAL_CALL Stream::closeInput( void ) +void SAL_CALL Stream::closeInput() throw( NotConnectedException, IOException, RuntimeException ) @@ -241,7 +241,7 @@ sal_Int64 SAL_CALL Stream::getLength() // XTruncate -void SAL_CALL Stream::truncate( void ) +void SAL_CALL Stream::truncate() throw( com::sun::star::io::IOException, com::sun::star::uno::RuntimeException ) { @@ -281,13 +281,13 @@ void SAL_CALL Stream::writeBytes( const com::sun::star::uno::Sequence< sal_Int8 } } -void SAL_CALL Stream::flush( void ) +void SAL_CALL Stream::flush() throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException ) { } -void SAL_CALL Stream::closeOutput( void ) +void SAL_CALL Stream::closeOutput() throw( com::sun::star::io::NotConnectedException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException ) @@ -303,7 +303,7 @@ void SAL_CALL Stream::closeOutput( void ) // Misc. -void Stream::closeStream( void ) +void Stream::closeStream() throw( ::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException ) diff --git a/ucb/source/ucp/gvfs/gvfs_stream.hxx b/ucb/source/ucp/gvfs/gvfs_stream.hxx index e58143471132..aaf249dc45ea 100644 --- a/ucb/source/ucp/gvfs/gvfs_stream.hxx +++ b/ucb/source/ucp/gvfs/gvfs_stream.hxx @@ -54,7 +54,7 @@ private: ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException ); - void closeStream( void ) + void closeStream() throw( ::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException ); @@ -67,10 +67,10 @@ public: // XInterface virtual com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & type ) throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; - virtual void SAL_CALL acquire( void ) + virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { OWeakObject::acquire(); } - virtual void SAL_CALL release( void ) + virtual void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } @@ -104,12 +104,12 @@ public: ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL available( void ) + virtual sal_Int32 SAL_CALL available() throw( ::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; - virtual void SAL_CALL closeInput( void ) + virtual void SAL_CALL closeInput() throw( ::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; @@ -135,20 +135,20 @@ public: com::sun::star::io::IOException, com::sun::star::uno::RuntimeException) SAL_OVERRIDE; - virtual void SAL_CALL flush( void ) + virtual void SAL_CALL flush() throw( com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException) SAL_OVERRIDE; - virtual void SAL_CALL closeOutput( void ) + virtual void SAL_CALL closeOutput() throw( com::sun::star::io::NotConnectedException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; // XTruncate - virtual void SAL_CALL truncate( void ) + virtual void SAL_CALL truncate() throw( com::sun::star::io::IOException, com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; }; diff --git a/ucb/source/ucp/webdav-neon/NeonInputStream.cxx b/ucb/source/ucp/webdav-neon/NeonInputStream.cxx index 8f487aac4ef8..c90c07da0dbc 100644 --- a/ucb/source/ucp/webdav-neon/NeonInputStream.cxx +++ b/ucb/source/ucp/webdav-neon/NeonInputStream.cxx @@ -37,13 +37,13 @@ using namespace com::sun::star::io; using namespace com::sun::star::uno; using namespace webdav_ucp; -NeonInputStream::NeonInputStream( void ) +NeonInputStream::NeonInputStream() : mLen( 0 ), mPos( 0 ) { } -NeonInputStream::~NeonInputStream( void ) +NeonInputStream::~NeonInputStream() { } @@ -123,7 +123,7 @@ sal_Int32 SAL_CALL NeonInputStream::available( ) return sal::static_int_cast<sal_Int32>(mLen - mPos); } -void SAL_CALL NeonInputStream::closeInput( void ) +void SAL_CALL NeonInputStream::closeInput() throw( ::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception ) diff --git a/ucb/source/ucp/webdav-neon/NeonInputStream.hxx b/ucb/source/ucp/webdav-neon/NeonInputStream.hxx index 97b5f5b8a578..fa69244c8e93 100644 --- a/ucb/source/ucp/webdav-neon/NeonInputStream.hxx +++ b/ucb/source/ucp/webdav-neon/NeonInputStream.hxx @@ -51,7 +51,7 @@ class NeonInputStream : public ::com::sun::star::io::XInputStream, sal_Int64 mPos; public: - NeonInputStream( void ); + NeonInputStream(); virtual ~NeonInputStream(); // Add some data to the end of the stream @@ -62,11 +62,11 @@ class NeonInputStream : public ::com::sun::star::io::XInputStream, const ::com::sun::star::uno::Type & type ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL acquire( void ) + virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { OWeakObject::acquire(); } - virtual void SAL_CALL release( void ) + virtual void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } @@ -94,12 +94,12 @@ class NeonInputStream : public ::com::sun::star::io::XInputStream, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL available( void ) + virtual sal_Int32 SAL_CALL available() throw( ::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL closeInput( void ) + virtual void SAL_CALL closeInput() throw( ::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/ucb/source/ucp/webdav-neon/NeonSession.hxx b/ucb/source/ucp/webdav-neon/NeonSession.hxx index fa848ba759b5..fb03927ed7e0 100644 --- a/ucb/source/ucp/webdav-neon/NeonSession.hxx +++ b/ucb/source/ucp/webdav-neon/NeonSession.hxx @@ -232,7 +232,7 @@ public: private: friend class NeonLockStore; - void Init( void ) + void Init() throw (css::uno::RuntimeException, std::exception); void Init( const DAVRequestEnvironment & rEnv ) diff --git a/ucb/source/ucp/webdav-neon/NeonUri.hxx b/ucb/source/ucp/webdav-neon/NeonUri.hxx index 3e053734714b..214a56124504 100644 --- a/ucb/source/ucp/webdav-neon/NeonUri.hxx +++ b/ucb/source/ucp/webdav-neon/NeonUri.hxx @@ -63,22 +63,22 @@ class NeonUri bool operator!= ( const NeonUri & rOther ) const { return !operator==( rOther ); } - const OUString & GetURI( void ) const + const OUString & GetURI() const { return mURI; }; - const OUString & GetScheme( void ) const + const OUString & GetScheme() const { return mScheme; }; - const OUString & GetUserInfo( void ) const + const OUString & GetUserInfo() const { return mUserInfo; }; - const OUString & GetHost( void ) const + const OUString & GetHost() const { return mHostName; }; - sal_Int32 GetPort( void ) const + sal_Int32 GetPort() const { return mPort; }; - const OUString & GetPath( void ) const + const OUString & GetPath() const { return mPath; }; - OUString GetPathBaseName ( void ) const; + OUString GetPathBaseName() const; - OUString GetPathBaseNameUnescaped ( void ) const; + OUString GetPathBaseNameUnescaped() const; void SetScheme (const OUString& scheme) { mScheme = scheme; calculateURI (); }; diff --git a/ucb/source/ucp/webdav/SerfInputStream.cxx b/ucb/source/ucp/webdav/SerfInputStream.cxx index 2c8672ffc263..0c3a5b68d054 100644 --- a/ucb/source/ucp/webdav/SerfInputStream.cxx +++ b/ucb/source/ucp/webdav/SerfInputStream.cxx @@ -32,7 +32,7 @@ using namespace http_dav_ucp; // Constructor -SerfInputStream::SerfInputStream( void ) +SerfInputStream::SerfInputStream() : mLen( 0 ), mPos( 0 ) { @@ -41,7 +41,7 @@ SerfInputStream::SerfInputStream( void ) // Destructor -SerfInputStream::~SerfInputStream( void ) +SerfInputStream::~SerfInputStream() { } @@ -142,7 +142,7 @@ sal_Int32 SAL_CALL SerfInputStream::available( ) // closeInput -void SAL_CALL SerfInputStream::closeInput( void ) +void SAL_CALL SerfInputStream::closeInput() throw( ::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException ) diff --git a/ucb/source/ucp/webdav/SerfInputStream.hxx b/ucb/source/ucp/webdav/SerfInputStream.hxx index d06a84acbd42..1d35c3ebe44a 100644 --- a/ucb/source/ucp/webdav/SerfInputStream.hxx +++ b/ucb/source/ucp/webdav/SerfInputStream.hxx @@ -46,7 +46,7 @@ class SerfInputStream : public ::com::sun::star::io::XInputStream, sal_Int64 mPos; public: - SerfInputStream( void ); + SerfInputStream(); virtual ~SerfInputStream(); // Add some data to the end of the stream @@ -57,11 +57,11 @@ class SerfInputStream : public ::com::sun::star::io::XInputStream, const ::com::sun::star::uno::Type & type ) throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; - virtual void SAL_CALL acquire( void ) + virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { OWeakObject::acquire(); } - virtual void SAL_CALL release( void ) + virtual void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } @@ -89,12 +89,12 @@ class SerfInputStream : public ::com::sun::star::io::XInputStream, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL available( void ) + virtual sal_Int32 SAL_CALL available() throw( ::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; - virtual void SAL_CALL closeInput( void ) + virtual void SAL_CALL closeInput() throw( ::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; diff --git a/ucb/source/ucp/webdav/SerfSession.hxx b/ucb/source/ucp/webdav/SerfSession.hxx index 897613ccbfa3..a2f5402059ce 100644 --- a/ucb/source/ucp/webdav/SerfSession.hxx +++ b/ucb/source/ucp/webdav/SerfSession.hxx @@ -253,7 +253,7 @@ public: private: friend class SerfLockStore; - void Init( void ) + void Init() throw ( DAVException ); void Init( const DAVRequestEnvironment & rEnv ) diff --git a/ucb/source/ucp/webdav/SerfUri.hxx b/ucb/source/ucp/webdav/SerfUri.hxx index 02362340f6b0..dc88d74cf816 100644 --- a/ucb/source/ucp/webdav/SerfUri.hxx +++ b/ucb/source/ucp/webdav/SerfUri.hxx @@ -62,22 +62,22 @@ class SerfUri { return mAprUri; } - const OUString & GetURI( void ) const + const OUString & GetURI() const { return mURI; }; - const OUString & GetScheme( void ) const + const OUString & GetScheme() const { return mScheme; }; - const OUString & GetUserInfo( void ) const + const OUString & GetUserInfo() const { return mUserInfo; }; - const OUString & GetHost( void ) const + const OUString & GetHost() const { return mHostName; }; - sal_Int32 GetPort( void ) const + sal_Int32 GetPort() const { return mPort; }; - const OUString & GetPath( void ) const + const OUString & GetPath() const { return mPath; }; - OUString GetPathBaseName ( void ) const; + OUString GetPathBaseName() const; - OUString GetPathBaseNameUnescaped ( void ) const; + OUString GetPathBaseNameUnescaped() const; void SetScheme (const OUString& scheme) { mScheme = scheme; calculateURI (); }; diff --git a/ucbhelper/source/provider/fd_inputstream.cxx b/ucbhelper/source/provider/fd_inputstream.cxx index af2abda11273..d469fb75d584 100644 --- a/ucbhelper/source/provider/fd_inputstream.cxx +++ b/ucbhelper/source/provider/fd_inputstream.cxx @@ -109,7 +109,7 @@ namespace ucbhelper - sal_Int32 SAL_CALL FdInputStream::available(void) + sal_Int32 SAL_CALL FdInputStream::available() throw(NotConnectedException, IOException, RuntimeException, std::exception) @@ -119,7 +119,7 @@ namespace ucbhelper - void SAL_CALL FdInputStream::closeInput(void) + void SAL_CALL FdInputStream::closeInput() throw(NotConnectedException, IOException, RuntimeException, std::exception) diff --git a/unotools/source/accessibility/accessiblerelationsethelper.cxx b/unotools/source/accessibility/accessiblerelationsethelper.cxx index 6881e608e6e5..3ea79605a11d 100644 --- a/unotools/source/accessibility/accessiblerelationsethelper.cxx +++ b/unotools/source/accessibility/accessiblerelationsethelper.cxx @@ -138,7 +138,7 @@ AccessibleRelationSetHelper::AccessibleRelationSetHelper (const AccessibleRelati mpHelperImpl = new AccessibleRelationSetHelperImpl(); } -AccessibleRelationSetHelper::~AccessibleRelationSetHelper(void) +AccessibleRelationSetHelper::~AccessibleRelationSetHelper() { delete mpHelperImpl; } @@ -229,7 +229,7 @@ void AccessibleRelationSetHelper::AddRelation(const AccessibleRelation& rRelatio //===== XTypeProvider ======================================================= uno::Sequence< ::com::sun::star::uno::Type> - AccessibleRelationSetHelper::getTypes (void) + AccessibleRelationSetHelper::getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) { osl::MutexGuard aGuard (maMutex); @@ -243,7 +243,7 @@ uno::Sequence< ::com::sun::star::uno::Type> } uno::Sequence<sal_Int8> SAL_CALL - AccessibleRelationSetHelper::getImplementationId (void) + AccessibleRelationSetHelper::getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); diff --git a/unotools/source/accessibility/accessiblestatesethelper.cxx b/unotools/source/accessibility/accessiblestatesethelper.cxx index a1b2f87670a5..2ed4117be4cb 100644 --- a/unotools/source/accessibility/accessiblestatesethelper.cxx +++ b/unotools/source/accessibility/accessiblestatesethelper.cxx @@ -148,7 +148,7 @@ AccessibleStateSetHelper::AccessibleStateSetHelper (const AccessibleStateSetHelp mpHelperImpl = new AccessibleStateSetHelperImpl(); } -AccessibleStateSetHelper::~AccessibleStateSetHelper(void) +AccessibleStateSetHelper::~AccessibleStateSetHelper() { delete mpHelperImpl; } @@ -242,7 +242,7 @@ void AccessibleStateSetHelper::RemoveState(sal_Int16 aState) //===== XTypeProvider ======================================================= uno::Sequence< ::com::sun::star::uno::Type> - AccessibleStateSetHelper::getTypes (void) + AccessibleStateSetHelper::getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) { const ::com::sun::star::uno::Type aTypeList[] = { @@ -255,7 +255,7 @@ uno::Sequence< ::com::sun::star::uno::Type> } uno::Sequence<sal_Int8> SAL_CALL - AccessibleStateSetHelper::getImplementationId (void) + AccessibleStateSetHelper::getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx index 71dcb5a233ae..cf5c3b9d188a 100644 --- a/unotools/source/config/securityoptions.cxx +++ b/unotools/source/config/securityoptions.cxx @@ -153,7 +153,7 @@ class SvtSecurityOptions_Impl : public ConfigItem *//*-*****************************************************************************************************/ void SetProperty( sal_Int32 nHandle, const Any& rValue, bool bReadOnly ); - void LoadAuthors( void ); + void LoadAuthors(); static sal_Int32 GetHandle( const OUString& rPropertyName ); bool GetOption( SvtSecurityOptions::EOption eOption, bool*& rpValue, bool*& rpRO ); @@ -406,7 +406,7 @@ void SvtSecurityOptions_Impl::SetProperty( sal_Int32 nProperty, const Any& rValu } } -void SvtSecurityOptions_Impl::LoadAuthors( void ) +void SvtSecurityOptions_Impl::LoadAuthors() { m_seqTrustedAuthors.realloc( 0 ); // first clear Sequence< OUString > lAuthors = GetNodeNames( PROPERTYNAME_MACRO_TRUSTEDAUTHORS ); diff --git a/unotools/source/config/xmlaccelcfg.cxx b/unotools/source/config/xmlaccelcfg.cxx index 6e906c8b5992..47796e6364a3 100644 --- a/unotools/source/config/xmlaccelcfg.cxx +++ b/unotools/source/config/xmlaccelcfg.cxx @@ -74,12 +74,12 @@ OUString OReadAccelatorDocumentHandler::getErrorLineString() return OUString(); } -void SAL_CALL OReadAccelatorDocumentHandler::startDocument(void) +void SAL_CALL OReadAccelatorDocumentHandler::startDocument() throw ( SAXException, RuntimeException, std::exception ) { } -void SAL_CALL OReadAccelatorDocumentHandler::endDocument(void) +void SAL_CALL OReadAccelatorDocumentHandler::endDocument() throw( SAXException, RuntimeException, std::exception ) { if ( m_nElementDepth > 0 ) diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx index c3b60498dff5..e5dd6b2da1e1 100644 --- a/unotools/source/ucbhelper/ucblockbytes.cxx +++ b/unotools/source/ucbhelper/ucblockbytes.cxx @@ -82,14 +82,14 @@ public: // XActiveDataControl. virtual void SAL_CALL addListener ( const Reference<XStreamListener> &/*rxListener*/) throw(RuntimeException, std::exception) SAL_OVERRIDE {} virtual void SAL_CALL removeListener ( const Reference<XStreamListener> &/*rxListener*/) throw(RuntimeException, std::exception) SAL_OVERRIDE {} - virtual void SAL_CALL start (void) throw(RuntimeException, std::exception) SAL_OVERRIDE {} - virtual void SAL_CALL terminate (void) throw(RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL start() throw(RuntimeException, std::exception) SAL_OVERRIDE {} + virtual void SAL_CALL terminate() throw(RuntimeException, std::exception) SAL_OVERRIDE { m_xLockBytes->terminate_Impl(); } // XActiveDataSink. virtual void SAL_CALL setInputStream ( const Reference<XInputStream> &rxInputStream) throw(RuntimeException, std::exception) SAL_OVERRIDE { m_xLockBytes->setInputStream_Impl (rxInputStream); } - virtual Reference<XInputStream> SAL_CALL getInputStream (void) throw(RuntimeException, std::exception) SAL_OVERRIDE + virtual Reference<XInputStream> SAL_CALL getInputStream() throw(RuntimeException, std::exception) SAL_OVERRIDE { return m_xLockBytes->getInputStream_Impl(); } }; @@ -109,8 +109,8 @@ public: // XActiveDataControl. virtual void SAL_CALL addListener ( const Reference<XStreamListener> &/*rxListener*/) throw(RuntimeException, std::exception) SAL_OVERRIDE {} virtual void SAL_CALL removeListener ( const Reference<XStreamListener> &/*rxListener*/) throw(RuntimeException, std::exception) SAL_OVERRIDE {} - virtual void SAL_CALL start (void) throw(RuntimeException, std::exception) SAL_OVERRIDE {} - virtual void SAL_CALL terminate (void) throw(RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL start() throw(RuntimeException, std::exception) SAL_OVERRIDE {} + virtual void SAL_CALL terminate() throw(RuntimeException, std::exception) SAL_OVERRIDE { m_xLockBytes->terminate_Impl(); } // XActiveDataStreamer diff --git a/unotools/source/ucbhelper/ucblockbytes.hxx b/unotools/source/ucbhelper/ucblockbytes.hxx index e19c919dedb4..10ef2830c9eb 100644 --- a/unotools/source/ucbhelper/ucblockbytes.hxx +++ b/unotools/source/ucbhelper/ucblockbytes.hxx @@ -107,7 +107,7 @@ class UcbLockBytes : public virtual SvLockBytes UcbLockBytes( UcbLockBytesHandler* pHandler ); protected: - virtual ~UcbLockBytes (void); + virtual ~UcbLockBytes(); public: // properties: Referer, PostMimeType @@ -145,7 +145,7 @@ public: bool setInputStream_Impl( const ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > &rxInputStream, bool bSetXSeekable = true ); bool setStream_Impl( const ::com::sun::star::uno::Reference < ::com::sun::star::io::XStream > &rxStream ); - void terminate_Impl (void); + void terminate_Impl(); ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > getInputStream_Impl() const { diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index e7c73023452c..d6a2116321f8 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -980,7 +980,7 @@ void ServerFont::InitGlyphData( sal_GlyphId aGlyphId, GlyphData& rGD ) const FT_Done_Glyph( pGlyphFT ); } -bool ServerFont::GetAntialiasAdvice( void ) const +bool ServerFont::GetAntialiasAdvice() const { if( GetFontSelData().mbNonAntialiased || (mnPrioAntiAlias<=0) ) return false; diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx index 4f98620893e8..4a17997b6de2 100644 --- a/vcl/generic/glyphs/gcach_layout.cxx +++ b/vcl/generic/glyphs/gcach_layout.cxx @@ -270,7 +270,7 @@ static hb_bool_t getGlyphContourPoint(hb_font_t* /*font*/, void* pFontData, return ret; } -static hb_font_funcs_t* getFontFuncs(void) +static hb_font_funcs_t* getFontFuncs() { static hb_font_funcs_t* funcs = hb_font_funcs_create(); @@ -296,7 +296,7 @@ static unsigned int unicodeDecomposeCompatibility(hb_unicode_funcs_t* /*ufuncs*/ return 0; } -static hb_unicode_funcs_t* getUnicodeFuncs(void) +static hb_unicode_funcs_t* getUnicodeFuncs() { static hb_unicode_funcs_t* ufuncs = hb_unicode_funcs_create(hb_icu_get_unicode_funcs()); hb_unicode_funcs_set_decompose_compatibility_func(ufuncs, unicodeDecomposeCompatibility, NULL, NULL); diff --git a/vcl/inc/fontsubset.hxx b/vcl/inc/fontsubset.hxx index c571658f01e4..a92b70519638 100644 --- a/vcl/inc/fontsubset.hxx +++ b/vcl/inc/fontsubset.hxx @@ -32,8 +32,8 @@ namespace vcl { struct _TrueTypeFont; } ///< SFT's idea of a TTF font class VCL_DLLPUBLIC FontSubsetInfo { public: - explicit FontSubsetInfo( void ); - virtual ~FontSubsetInfo( void ); + explicit FontSubsetInfo(); + virtual ~FontSubsetInfo(); enum FontType { NO_FONT = 0, diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx index ae9e30b9c59a..c7c21233646b 100644 --- a/vcl/inc/generic/glyphcache.hxx +++ b/vcl/inc/generic/glyphcache.hxx @@ -200,7 +200,7 @@ public: sal_GlyphId GetRawGlyphIndex( sal_UCS4, sal_UCS4 = 0 ) const; sal_GlyphId FixupGlyphIndex( sal_GlyphId aGlyphId, sal_UCS4 ) const; bool GetGlyphOutline( sal_GlyphId aGlyphId, ::basegfx::B2DPolyPolygon& ) const; - bool GetAntialiasAdvice( void ) const; + bool GetAntialiasAdvice() const; bool GetGlyphBitmap1( sal_GlyphId aGlyphId, RawBitmap& ) const; bool GetGlyphBitmap8( sal_GlyphId aGlyphId, RawBitmap& ) const; diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx index 6bbcb29f658f..6d54ca9a0864 100644 --- a/vcl/inc/salframe.hxx +++ b/vcl/inc/salframe.hxx @@ -166,7 +166,7 @@ public: virtual void SetPointerPos( long nX, long nY ) = 0; // flush output buffer - virtual void Flush( void) = 0; + virtual void Flush() = 0; virtual void Flush( const Rectangle& ); // flush output buffer, wait till outstanding operations are done virtual void Sync() = 0; diff --git a/vcl/inc/unx/gtk/atkbridge.hxx b/vcl/inc/unx/gtk/atkbridge.hxx index 480ce917fc5e..7efe4c6cb4d8 100644 --- a/vcl/inc/unx/gtk/atkbridge.hxx +++ b/vcl/inc/unx/gtk/atkbridge.hxx @@ -22,8 +22,8 @@ #include <vclpluginapi.h> -bool VCLPLUG_GTK_PUBLIC InitAtkBridge(void); -void VCLPLUG_GTK_PUBLIC DeInitAtkBridge(void); +bool VCLPLUG_GTK_PUBLIC InitAtkBridge(); +void VCLPLUG_GTK_PUBLIC DeInitAtkBridge(); #endif diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index 2eb0634cc51d..58b9aa5e563d 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -365,7 +365,7 @@ public: virtual void SetTitle( const OUString& rTitle ) SAL_OVERRIDE; virtual void SetIcon( sal_uInt16 nIcon ) SAL_OVERRIDE; virtual void SetMenu( SalMenu *pSalMenu ) SAL_OVERRIDE; - SalMenu* GetMenu( void ); + SalMenu* GetMenu(); virtual void DrawMenuBar() SAL_OVERRIDE; void EnsureAppMenuWatch(); @@ -457,7 +457,7 @@ public: extern "C" { -GType ooo_fixed_get_type( void ); +GType ooo_fixed_get_type(); } // extern "C" diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx index da85f00ca705..beb188df8de0 100644 --- a/vcl/osx/salframe.cxx +++ b/vcl/osx/salframe.cxx @@ -863,7 +863,7 @@ void AquaSalFrame::SetPointerPos( long nX, long nY ) CGDisplayMoveCursorToPoint( mainDisplayID, aPoint ); } -void AquaSalFrame::Flush( void ) +void AquaSalFrame::Flush() { if( !(mbGraphics && mpGraphics && mpNSView && mbShown) ) return; diff --git a/vcl/quartz/CTRunData.hxx b/vcl/quartz/CTRunData.hxx index 40c2a0a5ddd3..915146773c7e 100644 --- a/vcl/quartz/CTRunData.hxx +++ b/vcl/quartz/CTRunData.hxx @@ -34,7 +34,7 @@ public: const CFIndex* m_pStringIndices; CGPoint* m_pAdjPositions; CTRunData(CTRunRef pRun, int start); - ~CTRunData(void); + ~CTRunData(); }; #endif /* NDef CTRunData_Included */ diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx index 7b47cfc0f857..584ceaa4a6be 100644 --- a/vcl/quartz/ctfonts.cxx +++ b/vcl/quartz/ctfonts.cxx @@ -109,7 +109,7 @@ CoreTextStyle::CoreTextStyle( const FontSelectPattern& rFSD ) #endif } -CoreTextStyle::~CoreTextStyle( void ) +CoreTextStyle::~CoreTextStyle() { if( mpStyleDict ) CFRelease( mpStyleDict ); @@ -218,7 +218,7 @@ bool CoreTextStyle::GetGlyphOutline( sal_GlyphId aGlyphId, basegfx::B2DPolyPolyg return true; } -PhysicalFontFace* CoreTextFontData::Clone( void ) const +PhysicalFontFace* CoreTextFontData::Clone() const { return new CoreTextFontData( *this); } @@ -432,7 +432,7 @@ CoreTextFontData* SystemFontList::GetFontDataFromId( sal_IntPtr nFontId ) const return (*it).second; } -bool SystemFontList::Init( void ) +bool SystemFontList::Init() { // enumerate available system fonts static const int nMaxDictEntries = 8; @@ -450,7 +450,7 @@ bool SystemFontList::Init( void ) return true; } -SystemFontList* GetCoretextFontList( void ) +SystemFontList* GetCoretextFontList() { SystemFontList* pList = new SystemFontList(); if( !pList->Init() ) { diff --git a/vcl/quartz/ctfonts.hxx b/vcl/quartz/ctfonts.hxx index e4b536d0ff52..b896c6a9150e 100644 --- a/vcl/quartz/ctfonts.hxx +++ b/vcl/quartz/ctfonts.hxx @@ -26,7 +26,7 @@ #endif #include "sallayout.hxx" -SystemFontList* GetCoretextFontList(void); +SystemFontList* GetCoretextFontList(); ImplDevFontAttributes DevFontFromCTFontDescriptor( CTFontDescriptorRef, bool* ); #endif // INCLUDED_VCL_QUARTZ_CTFONTS_HXX diff --git a/vcl/quartz/ctlayout.cxx b/vcl/quartz/ctlayout.cxx index d9c823def393..b9d4f1b99b2c 100644 --- a/vcl/quartz/ctlayout.cxx +++ b/vcl/quartz/ctlayout.cxx @@ -31,7 +31,7 @@ class CTLayout : public SalLayout { public: explicit CTLayout( const CoreTextStyle* ); - virtual ~CTLayout( void ); + virtual ~CTLayout(); virtual bool LayoutText( ImplLayoutArgs& ) SAL_OVERRIDE; virtual void AdjustLayout( ImplLayoutArgs& ) SAL_OVERRIDE; @@ -48,15 +48,15 @@ public: virtual void GetCaretPositions( int nArraySize, long* pCaretXArray ) const SAL_OVERRIDE; virtual bool GetBoundRect( SalGraphics&, Rectangle& ) const SAL_OVERRIDE; - virtual void InitFont( void) const SAL_OVERRIDE; + virtual void InitFont() const SAL_OVERRIDE; virtual void MoveGlyph( int nStart, long nNewXPos ) SAL_OVERRIDE; virtual void DropGlyph( int nStart ) SAL_OVERRIDE; virtual void Simplify( bool bIsBase ) SAL_OVERRIDE; private: void drawCTLine(AquaSalGraphics& rAquaGraphics, CTLineRef ctline, const CoreTextStyle* const pStyle) const; - CGPoint GetTextDrawPosition(void) const; - bool CacheGlyphLayout(void) const; + CGPoint GetTextDrawPosition() const; + bool CacheGlyphLayout() const; void ApplyDXArray( ImplLayoutArgs& rArgs); const CoreTextStyle* const mpTextStyle; @@ -312,7 +312,7 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs ) // We continue using GetDrawPosition() for non-right aligned text, to minimize // any unforeseen side effects. -CGPoint CTLayout::GetTextDrawPosition(void) const +CGPoint CTLayout::GetTextDrawPosition() const { CGFloat fPosX, fPosY; @@ -587,7 +587,7 @@ void CTLayout::DrawText( SalGraphics& rGraphics ) const drawCTLine(rAquaGraphics, mpCTLine, mpTextStyle); } -bool CTLayout::CacheGlyphLayout(void) const // eew! +bool CTLayout::CacheGlyphLayout() const // eew! { m_vRunData.release(); if(!mpCTLine) @@ -891,7 +891,7 @@ void CTLayout::MoveGlyph( int /*nStart*/, long /*nNewXPos*/ ) {} void CTLayout::DropGlyph( int /*nStart*/ ) {} void CTLayout::Simplify( bool /*bIsBase*/ ) {} -SalLayout* CoreTextStyle::GetTextLayout( void ) const +SalLayout* CoreTextStyle::GetTextLayout() const { return new CTLayout( this); } diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx index 898e58d64c7a..99e10e8ec515 100644 --- a/vcl/quartz/salgdi.cxx +++ b/vcl/quartz/salgdi.cxx @@ -177,7 +177,7 @@ bool CoreTextFontData::GetFontCapabilities(vcl::FontCapabilities &rFontCapabilit return !rFontCapabilities.maUnicodeRange.empty() || !rFontCapabilities.maCodePageRange.empty(); } -void CoreTextFontData::ReadOs2Table( void ) const +void CoreTextFontData::ReadOs2Table() const { // read this only once per font if( mbOs2Read ) @@ -204,7 +204,7 @@ void CoreTextFontData::ReadOs2Table( void ) const // TODO: also analyze panose info, etc. } -void CoreTextFontData::ReadMacCmapEncoding( void ) const +void CoreTextFontData::ReadMacCmapEncoding() const { // read this only once per font if( mbCmapEncodingRead ) diff --git a/vcl/source/filter/ixpm/xpmread.cxx b/vcl/source/filter/ixpm/xpmread.cxx index 05d4d0f146bf..338069b0b2b1 100644 --- a/vcl/source/filter/ixpm/xpmread.cxx +++ b/vcl/source/filter/ixpm/xpmread.cxx @@ -539,7 +539,7 @@ bool XPMReader::ImplGetPara ( sal_uLong nNumb ) // mnStringSize contains the size of the string read. // Comments like '//' and '/*....*/' are skipped. -bool XPMReader::ImplGetString( void ) +bool XPMReader::ImplGetString() { sal_uInt8 sID[] = "/* XPM */"; sal_uInt8* pString = mpStringBuf; diff --git a/vcl/source/filter/ixpm/xpmread.hxx b/vcl/source/filter/ixpm/xpmread.hxx index 88e4c608cd7b..0c9b9d314446 100644 --- a/vcl/source/filter/ixpm/xpmread.hxx +++ b/vcl/source/filter/ixpm/xpmread.hxx @@ -84,7 +84,7 @@ private: sal_uLong mnParaSize; sal_uInt8* mpPara; - bool ImplGetString( void ); + bool ImplGetString(); bool ImplGetColor( sal_uLong ); bool ImplGetScanLine( sal_uLong ); bool ImplGetColSub( sal_uInt8* ); diff --git a/vcl/source/font/PhysicalFontCollection.cxx b/vcl/source/font/PhysicalFontCollection.cxx index f1050353d673..4295566ff59d 100644 --- a/vcl/source/font/PhysicalFontCollection.cxx +++ b/vcl/source/font/PhysicalFontCollection.cxx @@ -115,7 +115,7 @@ void PhysicalFontCollection::Clear() mbMatchData = false; } -void PhysicalFontCollection::InitGenericGlyphFallback( void ) const +void PhysicalFontCollection::InitGenericGlyphFallback() const { // normalized family names of fonts suited for glyph fallback // if a font is available related fonts can be ignored diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx index 0d8fb69971c7..2b477609ee59 100644 --- a/vcl/source/fontsubset/cff.cxx +++ b/vcl/source/fontsubset/cff.cxx @@ -323,7 +323,7 @@ public: static const int NMAXTRANS = 32; // see CFF.appendixB public: explicit CffSubsetterContext( const U8* pBasePtr, int nBaseLen); - ~CffSubsetterContext( void); + ~CffSubsetterContext(); bool initialCffRead(); bool emitAsType1( class Type1Emitter&, @@ -335,10 +335,10 @@ public: protected: int convert2Type1Ops( CffLocal*, const U8* pType2Ops, int nType2Len, U8* pType1Ops); private: - void convertOneTypeOp( void); - void convertOneTypeEsc( void); + void convertOneTypeOp(); + void convertOneTypeEsc(); void callType2Subr( bool bGlobal, int nSubrNumber); - sal_Int32 getReadOfs( void) const { return (sal_Int32)(mpReadPtr - mpBasePtr);} + sal_Int32 getReadOfs() const { return (sal_Int32)(mpReadPtr - mpBasePtr);} const U8* mpBasePtr; const U8* mpBaseEnd; @@ -363,14 +363,14 @@ private: CffLocal maCffLocal[256]; CffLocal* mpCffLocal; - void readDictOp( void); - RealType readRealVal( void); + void readDictOp(); + RealType readRealVal(); const char* getString( int nStringID); int getFDSelect( int nGlyphIndex) const; int getGlyphSID( int nGlyphIndex) const; const char* getGlyphName( int nGlyphIndex); - void read2push( void); + void read2push(); void writeType1Val( ValType); void writeTypeOp( int nTypeOp); void writeTypeEsc( int nTypeOp); @@ -382,18 +382,18 @@ public: // TODO: is public really needed? // accessing the value stack // TODO: add more checks void push( ValType nVal) { mnValStack[ mnStackIdx++] = nVal;} - ValType popVal( void) { return ((mnStackIdx>0) ? mnValStack[ --mnStackIdx] : 0);} + ValType popVal() { return ((mnStackIdx>0) ? mnValStack[ --mnStackIdx] : 0);} ValType getVal( int nIndex) const { return mnValStack[ nIndex];} - int popInt( void); - int size( void) const { return mnStackIdx;} - void clear( void) { mnStackIdx = 0;} + int popInt(); + int size() const { return mnStackIdx;} + void clear() { mnStackIdx = 0;} // accessing the charstring hints void addHints( bool bVerticalHints); // accessing other charstring specifics - bool hasCharWidth( void) const { return (maCharWidth > 0);} - ValType getCharWidth( void) const { return maCharWidth;} + bool hasCharWidth() const { return (maCharWidth > 0);} + ValType getCharWidth() const { return maCharWidth;} void setNominalWidth( ValType aWidth) { mpCffLocal->maNominalWidth = aWidth;} void setDefaultWidth( ValType aWidth) { mpCffLocal->maDefaultWidth = aWidth;} void updateWidth( bool bUseFirstVal); @@ -433,12 +433,12 @@ CffSubsetterContext::CffSubsetterContext( const U8* pBasePtr, int nBaseLen) mpCffLocal = &maCffLocal[0]; } -CffSubsetterContext::~CffSubsetterContext( void) +CffSubsetterContext::~CffSubsetterContext() { // TODO: delete[] maCffLocal; } -inline int CffSubsetterContext::popInt( void) +inline int CffSubsetterContext::popInt() { const ValType aVal = popVal(); const int nInt = static_cast<int>(aVal); @@ -504,7 +504,7 @@ void CffSubsetterContext::setCharStringType( int nVal) } } -void CffSubsetterContext::readDictOp( void) +void CffSubsetterContext::readDictOp() { ValType nVal = 0; const U8 c = *mpReadPtr; @@ -758,7 +758,7 @@ void CffSubsetterContext::writeCurveTo( int nStackPos, writeTypeOp( TYPE1OP::RCURVETO ); } -void CffSubsetterContext::convertOneTypeOp( void) +void CffSubsetterContext::convertOneTypeOp() { const int nType2Op = *(mpReadPtr++); @@ -983,7 +983,7 @@ void CffSubsetterContext::convertOneTypeOp( void) } } -void CffSubsetterContext::convertOneTypeEsc( void) +void CffSubsetterContext::convertOneTypeEsc() { const int nType2Esc = *(mpReadPtr++); ValType* pTop = &mnValStack[ mnStackIdx-1]; @@ -1393,7 +1393,7 @@ void CffSubsetterContext::seekIndexEnd( int nIndexBase) } // initialize FONTDICT specific values -CffLocal::CffLocal( void) +CffLocal::CffLocal() : mnPrivDictBase( 0) , mnPrivDictSize( 0) , mnLocalSubrOffs( 0) @@ -1419,7 +1419,7 @@ CffLocal::CffLocal( void) maFamilyOtherBlues.clear(); } -CffGlobal::CffGlobal( void) +CffGlobal::CffGlobal() : mnNameIdxBase( 0) , mnNameIdxCount( 0) , mnStringIdxBase( 0) @@ -1713,14 +1713,14 @@ class Type1Emitter { public: explicit Type1Emitter( FILE* pOutFile, bool bPfbSubset = true); - ~Type1Emitter( void); + ~Type1Emitter(); void setSubsetName( const char* ); size_t emitRawData( const char* pData, size_t nLength) const; - void emitAllRaw( void); - void emitAllHex( void); - void emitAllCrypted( void); - int tellPos( void) const; + void emitAllRaw(); + void emitAllHex(); + void emitAllCrypted(); + int tellPos() const; size_t updateLen( int nTellPos, size_t nLength); void emitValVector( const char* pLineHead, const char* pLineTail, const ValVector&); private: @@ -1747,7 +1747,7 @@ Type1Emitter::Type1Emitter( FILE* pOutFile, bool bPfbSubset) maSubsetName[0] = '\0'; } -Type1Emitter::~Type1Emitter( void) +Type1Emitter::~Type1Emitter() { if( !mpFileOut) return; @@ -1764,7 +1764,7 @@ void Type1Emitter::setSubsetName( const char* pSubsetName) maSubsetName[sizeof(maSubsetName)-1] = '\0'; } -int Type1Emitter::tellPos( void) const +int Type1Emitter::tellPos() const { int nTellPos = ftell( mpFileOut); return nTellPos; @@ -1794,7 +1794,7 @@ inline size_t Type1Emitter::emitRawData(const char* pData, size_t nLength) const return fwrite( pData, 1, nLength, mpFileOut); } -inline void Type1Emitter::emitAllRaw( void) +inline void Type1Emitter::emitAllRaw() { // writeout raw data assert( (mpPtr - maBuffer) < (int)sizeof(maBuffer)); @@ -1803,7 +1803,7 @@ inline void Type1Emitter::emitAllRaw( void) mpPtr = maBuffer; } -inline void Type1Emitter::emitAllHex( void) +inline void Type1Emitter::emitAllHex() { assert( (mpPtr - maBuffer) < (int)sizeof(maBuffer)); for( const char* p = maBuffer; p < mpPtr;) { @@ -1829,7 +1829,7 @@ inline void Type1Emitter::emitAllHex( void) mpPtr = maBuffer; } -void Type1Emitter::emitAllCrypted( void) +void Type1Emitter::emitAllCrypted() { // apply t1crypt for( char* p = maBuffer; p < mpPtr; ++p) { diff --git a/vcl/source/fontsubset/list.cxx b/vcl/source/fontsubset/list.cxx index e9cbe5dc5b26..6578183ebe0e 100644 --- a/vcl/source/fontsubset/list.cxx +++ b/vcl/source/fontsubset/list.cxx @@ -82,7 +82,7 @@ static lnode *appendPrim(list pThis, void *el) } /*- public methods */ -list listNewEmpty(void) /*- default ctor */ +list listNewEmpty() /*- default ctor */ { list pThis = static_cast<list>(rtl_allocateMemory(sizeof(struct _list))); assert(pThis != 0); diff --git a/vcl/source/fontsubset/ttcr.cxx b/vcl/source/fontsubset/ttcr.cxx index a2230391c7bf..813b5f65356a 100644 --- a/vcl/source/fontsubset/ttcr.cxx +++ b/vcl/source/fontsubset/ttcr.cxx @@ -961,7 +961,7 @@ TrueTypeTable *TrueTypeTableNew_hhea(sal_Int16 ascender, return table; } -TrueTypeTable *TrueTypeTableNew_loca(void) +TrueTypeTable *TrueTypeTableNew_loca() { TrueTypeTable* table = static_cast<TrueTypeTable*>(smalloc(sizeof(TrueTypeTable))); table->data = smalloc(sizeof(tdata_loca)); @@ -990,7 +990,7 @@ TrueTypeTable *TrueTypeTableNew_maxp( const sal_uInt8* maxp, int size) return table; } -TrueTypeTable *TrueTypeTableNew_glyf(void) +TrueTypeTable *TrueTypeTableNew_glyf() { TrueTypeTable* table = static_cast<TrueTypeTable*>(smalloc(sizeof(TrueTypeTable))); list l = listNewEmpty(); @@ -1006,7 +1006,7 @@ TrueTypeTable *TrueTypeTableNew_glyf(void) return table; } -TrueTypeTable *TrueTypeTableNew_cmap(void) +TrueTypeTable *TrueTypeTableNew_cmap() { TrueTypeTable* table = static_cast<TrueTypeTable*>(smalloc(sizeof(TrueTypeTable))); table_cmap* cmap = static_cast<table_cmap*>(smalloc(sizeof(table_cmap))); @@ -1527,7 +1527,7 @@ _inline sal_uInt32 mkTag(sal_uInt8 a, sal_uInt8 b, sal_uInt8 c, sal_uInt8 d) { return (a << 24) | (b << 16) | (c << 8) | d; } -int main(void) +int main() { TrueTypeCreator *ttcr; sal_uInt8 *t1, *t2, *t3, *t4, *t5, *t6, *t7; diff --git a/vcl/source/fontsubset/ttcr.hxx b/vcl/source/fontsubset/ttcr.hxx index ab4b2f32d879..fe24fff5a443 100644 --- a/vcl/source/fontsubset/ttcr.hxx +++ b/vcl/source/fontsubset/ttcr.hxx @@ -145,7 +145,7 @@ namespace vcl * * INTERNAL: gets called only from ProcessTables(); */ - TrueTypeTable *TrueTypeTableNew_loca(void); + TrueTypeTable *TrueTypeTableNew_loca(); /** * Creates a new 'maxp' table based on an existing maxp table. @@ -158,12 +158,12 @@ namespace vcl /** * Creates a new empty 'glyf' table. */ - TrueTypeTable *TrueTypeTableNew_glyf(void); + TrueTypeTable *TrueTypeTableNew_glyf(); /** * Creates a new empty 'cmap' table. */ - TrueTypeTable *TrueTypeTableNew_cmap(void); + TrueTypeTable *TrueTypeTableNew_cmap(); /** * Creates a new 'name' table. If n != 0 the table gets populated by diff --git a/vcl/source/fontsubset/xlat.cxx b/vcl/source/fontsubset/xlat.cxx index 3509ada02af1..53daa33bf744 100644 --- a/vcl/source/fontsubset/xlat.cxx +++ b/vcl/source/fontsubset/xlat.cxx @@ -28,8 +28,8 @@ namespace { class ConverterCache { public: - explicit ConverterCache( void ); - ~ConverterCache( void ); + explicit ConverterCache(); + ~ConverterCache(); sal_uInt16 convertOne( int nSelect, sal_Unicode ); void convertStr( int nSelect, const sal_Unicode* pSrc, sal_uInt16* pDst, int nCount ); protected: @@ -39,7 +39,7 @@ private: rtl_UnicodeToTextContext maContexts[ MAX_CVT_SELECT+1 ]; }; -ConverterCache::ConverterCache( void) +ConverterCache::ConverterCache() { for( int i = 0; i <= MAX_CVT_SELECT; ++i) { @@ -48,7 +48,7 @@ ConverterCache::ConverterCache( void) } } -ConverterCache::~ConverterCache( void) +ConverterCache::~ConverterCache() { for( int i = 0; i <= MAX_CVT_SELECT; ++i) { diff --git a/vcl/source/gdi/bmpfast.cxx b/vcl/source/gdi/bmpfast.cxx index eba1f92d2e31..10348c9029f2 100644 --- a/vcl/source/gdi/bmpfast.cxx +++ b/vcl/source/gdi/bmpfast.cxx @@ -32,7 +32,7 @@ class BasePixelPtr public: BasePixelPtr( PIXBYTE* p = NULL ) : mpPixel( p ) {} void SetRawPtr( PIXBYTE* pRawPtr ) { mpPixel = pRawPtr; } - PIXBYTE* GetRawPtr( void ) const { return mpPixel; } + PIXBYTE* GetRawPtr() const { return mpPixel; } void AddByteOffset( int nByteOffset ) { mpPixel += nByteOffset; } protected: diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx index bbb9aba7c2e0..d8e9644f8167 100644 --- a/vcl/unx/generic/app/saldata.cxx +++ b/vcl/unx/generic/app/saldata.cxx @@ -290,11 +290,11 @@ void X11SalData::Init() pXLib_->Init(); } -void X11SalData::initNWF( void ) +void X11SalData::initNWF() { } -void X11SalData::deInitNWF( void ) +void X11SalData::deInitNWF() { } @@ -420,7 +420,7 @@ void SalXLib::Init() } extern "C" { -void EmitFontpathWarning( void ) +void EmitFontpathWarning() { static Bool bOnce = False; if ( !bOnce ) diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx index 24c79db313c7..24192da59ac1 100644 --- a/vcl/unx/generic/gdi/cairotextrender.cxx +++ b/vcl/unx/generic/gdi/cairotextrender.cxx @@ -100,7 +100,7 @@ bool CairoTextRender::setFont( const FontSelectPattern *pEntry, int nFallbackLev ImplFontOptions* GetFCFontOptions( const ImplFontAttributes& rFontAttributes, int nSize); -void ImplServerFontEntry::HandleFontOptions( void ) +void ImplServerFontEntry::HandleFontOptions() { if( !mpServerFont ) return; diff --git a/vcl/unx/gtk/a11y/atkbridge.cxx b/vcl/unx/gtk/a11y/atkbridge.cxx index c82b1e18ddb2..e3ffdc668c09 100644 --- a/vcl/unx/gtk/a11y/atkbridge.cxx +++ b/vcl/unx/gtk/a11y/atkbridge.cxx @@ -25,7 +25,7 @@ #include "atkwindow.hxx" #include <stdio.h> -bool InitAtkBridge(void) +bool InitAtkBridge() { #if !GTK_CHECK_VERSION(3,0,0) const char* pVersion = atk_get_toolkit_version(); diff --git a/vcl/unx/gtk/a11y/atkfactory.cxx b/vcl/unx/gtk/a11y/atkfactory.cxx index d3cb30ad94c4..fb0cc7741799 100644 --- a/vcl/unx/gtk/a11y/atkfactory.cxx +++ b/vcl/unx/gtk/a11y/atkfactory.cxx @@ -49,7 +49,7 @@ atk_noop_object_wrapper_class_init(AtkNoOpObjectClass *klass) } static GType -atk_noop_object_wrapper_get_type(void) +atk_noop_object_wrapper_get_type() { static GType type = 0; @@ -93,7 +93,7 @@ atk_noop_object_wrapper_new() */ static GType -wrapper_factory_get_accessible_type(void) +wrapper_factory_get_accessible_type() { return atk_object_wrapper_get_type(); } @@ -148,7 +148,7 @@ wrapper_factory_class_init( AtkObjectFactoryClass *klass ) } GType -wrapper_factory_get_type (void) +wrapper_factory_get_type() { static GType t = 0; diff --git a/vcl/unx/gtk/a11y/atkfactory.hxx b/vcl/unx/gtk/a11y/atkfactory.hxx index dcd6f84938a5..c7a8add0b0d6 100644 --- a/vcl/unx/gtk/a11y/atkfactory.hxx +++ b/vcl/unx/gtk/a11y/atkfactory.hxx @@ -26,7 +26,7 @@ extern "C" { -GType wrapper_factory_get_type (void); +GType wrapper_factory_get_type(); } // extern "C" diff --git a/vcl/unx/gtk/a11y/atkhypertext.cxx b/vcl/unx/gtk/a11y/atkhypertext.cxx index 909ee30a8063..9b01e6b5bf5e 100644 --- a/vcl/unx/gtk/a11y/atkhypertext.cxx +++ b/vcl/unx/gtk/a11y/atkhypertext.cxx @@ -155,7 +155,7 @@ hyper_link_class_init (AtkHyperlinkClass *klass) } static GType -hyper_link_get_type (void) +hyper_link_get_type() { static GType type = 0; diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx index 5ffa45a4c03c..c7a1221cd340 100644 --- a/vcl/unx/gtk/a11y/atkutil.cxx +++ b/vcl/unx/gtk/a11y/atkutil.cxx @@ -683,7 +683,7 @@ static Link g_aEventListenerLink( NULL, WindowEventHandler ); extern "C" { static G_CONST_RETURN gchar * -ooo_atk_util_get_toolkit_name (void) +ooo_atk_util_get_toolkit_name() { return "VCL"; } @@ -691,7 +691,7 @@ ooo_atk_util_get_toolkit_name (void) /*****************************************************************************/ static G_CONST_RETURN gchar * -ooo_atk_util_get_toolkit_version (void) +ooo_atk_util_get_toolkit_version() { return LIBO_VERSION_DOTTED; } @@ -722,7 +722,7 @@ ooo_atk_util_class_init (AtkUtilClass *) /*****************************************************************************/ GType -ooo_atk_util_get_type (void) +ooo_atk_util_get_type() { static GType type = 0; diff --git a/vcl/unx/gtk/a11y/atkutil.hxx b/vcl/unx/gtk/a11y/atkutil.hxx index f61a4bd1c595..89cb61aeed33 100644 --- a/vcl/unx/gtk/a11y/atkutil.hxx +++ b/vcl/unx/gtk/a11y/atkutil.hxx @@ -24,7 +24,7 @@ #define OOO_TYPE_ATK_UTIL ooo_atk_util_get_type() -GType ooo_atk_util_get_type (void); +GType ooo_atk_util_get_type(); #endif diff --git a/vcl/unx/gtk/a11y/atkwindow.cxx b/vcl/unx/gtk/a11y/atkwindow.cxx index 84ef89198fe9..2e0bcdc5f055 100644 --- a/vcl/unx/gtk/a11y/atkwindow.cxx +++ b/vcl/unx/gtk/a11y/atkwindow.cxx @@ -273,7 +273,7 @@ ooo_window_wrapper_class_init (AtkObjectClass *klass, gpointer) /*****************************************************************************/ GType -ooo_window_wrapper_get_type (void) +ooo_window_wrapper_get_type() { static GType type = 0; @@ -310,7 +310,7 @@ ooo_window_wrapper_get_type (void) return type; } -void restore_gail_window_vtable (void) +void restore_gail_window_vtable() { AtkObjectClass *atk_class; gpointer data; diff --git a/vcl/unx/gtk/a11y/atkwindow.hxx b/vcl/unx/gtk/a11y/atkwindow.hxx index 40dd4e83a256..f2cdbee7b46f 100644 --- a/vcl/unx/gtk/a11y/atkwindow.hxx +++ b/vcl/unx/gtk/a11y/atkwindow.hxx @@ -24,8 +24,8 @@ #define OOO_TYPE_WINDOW_WRAPPER ooo_window_wrapper_get_type() -GType ooo_window_wrapper_get_type (void); -void restore_gail_window_vtable (void); +GType ooo_window_wrapper_get_type(); +void restore_gail_window_vtable(); #endif diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx index e2fc450d2918..30cfa9c05074 100644 --- a/vcl/unx/gtk/a11y/atkwrapper.cxx +++ b/vcl/unx/gtk/a11y/atkwrapper.cxx @@ -656,7 +656,7 @@ atk_object_wrapper_init (AtkObjectWrapper *wrapper, } // extern "C" GType -atk_object_wrapper_get_type (void) +atk_object_wrapper_get_type() { static GType type = 0; diff --git a/vcl/unx/gtk/a11y/atkwrapper.hxx b/vcl/unx/gtk/a11y/atkwrapper.hxx index 5886674f1d1d..95625ad4bca8 100644 --- a/vcl/unx/gtk/a11y/atkwrapper.hxx +++ b/vcl/unx/gtk/a11y/atkwrapper.hxx @@ -72,7 +72,7 @@ struct _AtkObjectWrapperClass AtkObjectClass aParentClass; }; -GType atk_object_wrapper_get_type (void) G_GNUC_CONST; +GType atk_object_wrapper_get_type() G_GNUC_CONST; AtkObject * atk_object_wrapper_ref( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxAccessible, bool create = true ); diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx index 8bce06f6cce8..dec58ca8088e 100644 --- a/vcl/unx/gtk/app/gtkinst.cxx +++ b/vcl/unx/gtk/app/gtkinst.cxx @@ -46,12 +46,12 @@ extern "C" { #define GET_YIELD_MUTEX() static_cast<GtkYieldMutex*>(GetSalData()->m_pInstance->GetYieldMutex()) - static void GdkThreadsEnter( void ) + static void GdkThreadsEnter() { GtkYieldMutex *pYieldMutex = GET_YIELD_MUTEX(); pYieldMutex->ThreadsEnter(); } - static void GdkThreadsLeave( void ) + static void GdkThreadsLeave() { GtkYieldMutex *pYieldMutex = GET_YIELD_MUTEX(); pYieldMutex->ThreadsLeave(); diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/app/gtksys.cxx index bda7c4a605d9..f1142210cf3e 100644 --- a/vcl/unx/gtk/app/gtksys.cxx +++ b/vcl/unx/gtk/app/gtksys.cxx @@ -107,7 +107,7 @@ GtkSalSystem::countScreenMonitors() // Including gdkx.h kills us with the Window / XWindow conflict extern "C" { #if GTK_CHECK_VERSION(3,0,0) - GType gdk_x11_display_get_type (void); + GType gdk_x11_display_get_type(); #endif int gdk_x11_screen_get_screen_number (GdkScreen *screen); } diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index c7acbbc548ae..6f67c29ae8aa 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -490,7 +490,7 @@ inline void NW_gtk_border_set_from_border( GtkBorder& aDst, const GtkBorder * pS /********************************************************* * Initialize GTK and local stuff *********************************************************/ -void GtkData::initNWF( void ) +void GtkData::initNWF() { ImplSVData* pSVData = ImplGetSVData(); @@ -563,7 +563,7 @@ void GtkData::initNWF( void ) /********************************************************* * Release GTK and local stuff *********************************************************/ -void GtkData::deInitNWF( void ) +void GtkData::deInitNWF() { for( unsigned int i = 0; i < gWidgetData.size(); i++ ) { diff --git a/vcl/unx/gtk/window/gloactiongroup.cxx b/vcl/unx/gtk/window/gloactiongroup.cxx index 69dea4054880..23307fd2a8df 100644 --- a/vcl/unx/gtk/window/gloactiongroup.cxx +++ b/vcl/unx/gtk/window/gloactiongroup.cxx @@ -49,7 +49,7 @@ G_DEFINE_TYPE (GLOAction, g_lo_action, G_TYPE_OBJECT); #endif GLOAction* -g_lo_action_new (void) +g_lo_action_new() { return G_LO_ACTION (g_object_new (G_TYPE_LO_ACTION, NULL)); } diff --git a/vcl/unx/gtk/window/glomenu.cxx b/vcl/unx/gtk/window/glomenu.cxx index 871692045590..caa314351287 100644 --- a/vcl/unx/gtk/window/glomenu.cxx +++ b/vcl/unx/gtk/window/glomenu.cxx @@ -165,7 +165,7 @@ g_lo_menu_insert_in_section (GLOMenu *menu, } GLOMenu * -g_lo_menu_new (void) +g_lo_menu_new() { return G_LO_MENU( g_object_new (G_TYPE_LO_MENU, NULL) ); } diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx index 78d561554831..3a1cae108573 100644 --- a/vcl/unx/gtk/window/gtksalframe.cxx +++ b/vcl/unx/gtk/window/gtksalframe.cxx @@ -1712,7 +1712,7 @@ void GtkSalFrame::SetMenu( SalMenu* pSalMenu ) m_pSalMenu = pSalMenu; } -SalMenu* GtkSalFrame::GetMenu( void ) +SalMenu* GtkSalFrame::GetMenu() { return m_pSalMenu; } diff --git a/vcl/unx/kde/fpicker/kdefilepicker.hxx b/vcl/unx/kde/fpicker/kdefilepicker.hxx index b586ae9a4489..819d0ecfb01f 100644 --- a/vcl/unx/kde/fpicker/kdefilepicker.hxx +++ b/vcl/unx/kde/fpicker/kdefilepicker.hxx @@ -102,17 +102,17 @@ protected: QString addExtension( const QString &rFileName ) const; void setIsSave( bool bIsSave ) { m_bIsSave = bIsSave; } - bool isSave( void ) const { return m_bIsSave; } + bool isSave() const { return m_bIsSave; } void setIsExecuting( bool bIsExecuting ) { m_bIsExecuting = bIsExecuting; } - bool isExecuting( void ) const { return m_bIsExecuting; } + bool isExecuting() const { return m_bIsExecuting; } bool isSupportedProtocol( const QString &rProtocol ) const; KURL mostLocalURL( const KURL &rURL ) const; QString localCopy( const QString &rFileName ) const; void setCanNotifySelection( bool bCanNotifySelection ) { m_bCanNotifySelection = bCanNotifySelection; } - bool canNotifySelection( void ) const { return m_bCanNotifySelection; } + bool canNotifySelection() const { return m_bCanNotifySelection; } protected slots: // Qt3 moc does not really understand #ifdef and would process both slots, diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx index bd3dbaa4a4e0..aa873b8eb892 100644 --- a/vcl/unx/kde/salnativewidgets-kde.cxx +++ b/vcl/unx/kde/salnativewidgets-kde.cxx @@ -287,13 +287,13 @@ class WidgetPainter @see m_pPushButton */ - WidgetPainter( void ); + WidgetPainter(); /** Destructor. Destruct all the cached widgets. */ - virtual ~WidgetPainter( void ); + virtual ~WidgetPainter(); /** Paints the specified widget to the X window. @@ -444,7 +444,7 @@ class WidgetPainter static QRect region2QRect( const Rectangle& rControlRegion ); }; -WidgetPainter::WidgetPainter( void ) +WidgetPainter::WidgetPainter() : m_pPushButton( NULL ), m_pRadioButton( NULL ), m_pCheckBox( NULL ), @@ -476,7 +476,7 @@ WidgetPainter::WidgetPainter( void ) { } -WidgetPainter::~WidgetPainter( void ) +WidgetPainter::~WidgetPainter() { delete m_pPushButton, m_pPushButton = NULL; delete m_pRadioButton, m_pRadioButton = NULL; diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx index e7b8899e595a..c680e4b65bcd 100644 --- a/vcl/win/source/gdi/salnativewidgets-luna.cxx +++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx @@ -91,7 +91,7 @@ public: HRESULT DrawThemeBackground( HTHEME hTheme, HDC hdc, int iPartId, int iStateId, const RECT *pRect, const RECT *pClipRect ); HRESULT DrawThemeText( HTHEME hTheme, HDC hdc, int iPartId, int iStateId, LPCWSTR pszText, int iCharCount, DWORD dwTextFlags, DWORD dwTextFlags2, const RECT *pRect ); HRESULT GetThemePartSize( HTHEME hTheme, HDC hdc, int iPartId, int iStateId, RECT *prc, THEMESIZE eSize, SIZE *psz ); - BOOL IsThemeActive( void ); + BOOL IsThemeActive(); }; static VisualStylesAPI vsAPI; @@ -174,7 +174,7 @@ HRESULT VisualStylesAPI::GetThemePartSize( HTHEME hTheme, HDC hdc, int iPartId, return S_FALSE; } -BOOL VisualStylesAPI::IsThemeActive( void ) +BOOL VisualStylesAPI::IsThemeActive() { if(lpfnIsThemeActive) return (*lpfnIsThemeActive) (); @@ -185,7 +185,7 @@ BOOL VisualStylesAPI::IsThemeActive( void ) /********************************************************* * Initialize XP theming and local stuff *********************************************************/ -void SalData::initNWF( void ) +void SalData::initNWF() { ImplSVData* pSVData = ImplGetSVData(); @@ -196,7 +196,7 @@ void SalData::initNWF( void ) // ********************************************************* // * Release theming handles // ******************************************************** -void SalData::deInitNWF( void ) +void SalData::deInitNWF() { ThemeMap::iterator iter = aThemeMap.begin(); while( iter != aThemeMap.end() ) diff --git a/vcl/win/source/gdi/winlayout.hxx b/vcl/win/source/gdi/winlayout.hxx index 188b9539cbd7..196b8e941f19 100644 --- a/vcl/win/source/gdi/winlayout.hxx +++ b/vcl/win/source/gdi/winlayout.hxx @@ -43,7 +43,7 @@ public: WinLayout(HDC, const ImplWinFontData&, ImplWinFontEntry&, bool bUseOpenGL); virtual void InitFont() const; void SetFontScale( float f ) { mfFontScale = f; } - HFONT DisableFontScaling( void) const; + HFONT DisableFontScaling() const; SCRIPT_CACHE& GetScriptCache() const; diff --git a/winaccessibility/source/UAccCOM/EnumVariant.cxx b/winaccessibility/source/UAccCOM/EnumVariant.cxx index b188906118bc..f89f969625d0 100644 --- a/winaccessibility/source/UAccCOM/EnumVariant.cxx +++ b/winaccessibility/source/UAccCOM/EnumVariant.cxx @@ -111,7 +111,7 @@ HRESULT STDMETHODCALLTYPE CEnumVariant::Skip(ULONG cElements) * @param * @return Result. */ -HRESULT STDMETHODCALLTYPE CEnumVariant::Reset( void) +HRESULT STDMETHODCALLTYPE CEnumVariant::Reset() { SolarMutexGuard g; diff --git a/winaccessibility/source/UAccCOM/UAccCOM.cxx b/winaccessibility/source/UAccCOM/UAccCOM.cxx index 90bec4a659e3..86d27d6491aa 100644 --- a/winaccessibility/source/UAccCOM/UAccCOM.cxx +++ b/winaccessibility/source/UAccCOM/UAccCOM.cxx @@ -77,7 +77,7 @@ extern "C" // Used to determine whether the DLL can be unloaded by OLE -STDAPI DllCanUnloadNow(void) +STDAPI DllCanUnloadNow() { return (_Module.GetLockCount()==0) ? S_OK : E_FAIL; } diff --git a/xmlhelp/source/cxxhelp/inc/tvread.hxx b/xmlhelp/source/cxxhelp/inc/tvread.hxx index 70449f8a1f65..d72aa9a7ebfb 100644 --- a/xmlhelp/source/cxxhelp/inc/tvread.hxx +++ b/xmlhelp/source/cxxhelp/inc/tvread.hxx @@ -284,7 +284,7 @@ namespace treeview { { public: ExtensionIteratorBase( const OUString& aLanguage ); - void init( void ); + void init(); private: com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > implGetHelpPackageFromPackage diff --git a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx index 206a37581e07..1ed291f9859e 100644 --- a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx +++ b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx @@ -104,13 +104,13 @@ Any SAL_CALL BufferedInputStream::queryInterface( const Type& rType ) throw( Run } -void SAL_CALL BufferedInputStream::acquire( void ) throw() +void SAL_CALL BufferedInputStream::acquire() throw() { OWeakObject::acquire(); } -void SAL_CALL BufferedInputStream::release( void ) throw() +void SAL_CALL BufferedInputStream::release() throw() { OWeakObject::release(); } @@ -172,7 +172,7 @@ void SAL_CALL BufferedInputStream::skipBytes( sal_Int32 nBytesToSkip ) -sal_Int32 SAL_CALL BufferedInputStream::available( void ) +sal_Int32 SAL_CALL BufferedInputStream::available() throw( NotConnectedException, IOException, RuntimeException, std::exception ) @@ -183,7 +183,7 @@ sal_Int32 SAL_CALL BufferedInputStream::available( void ) -void SAL_CALL BufferedInputStream::closeInput( void ) +void SAL_CALL BufferedInputStream::closeInput() throw( NotConnectedException, IOException, RuntimeException, std::exception ) @@ -207,7 +207,7 @@ void SAL_CALL BufferedInputStream::seek( sal_Int64 location ) -sal_Int64 SAL_CALL BufferedInputStream::getPosition( void ) +sal_Int64 SAL_CALL BufferedInputStream::getPosition() throw( IOException, RuntimeException, std::exception ) { @@ -217,7 +217,7 @@ sal_Int64 SAL_CALL BufferedInputStream::getPosition( void ) -sal_Int64 SAL_CALL BufferedInputStream::getLength( void ) throw( IOException,RuntimeException, std::exception ) +sal_Int64 SAL_CALL BufferedInputStream::getLength() throw( IOException,RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); return m_nBufferSize; diff --git a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx index f126fe6645fc..80f4128738ae 100644 --- a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx +++ b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx @@ -51,9 +51,9 @@ namespace chelp { queryInterface( const com::sun::star::uno::Type& rType ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL acquire( void ) throw() SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; - virtual void SAL_CALL release( void ) throw() SAL_OVERRIDE; + virtual void SAL_CALL release() throw() SAL_OVERRIDE; virtual sal_Int32 SAL_CALL readBytes( com::sun::star::uno::Sequence< sal_Int8 >& aData, @@ -76,12 +76,12 @@ namespace chelp { com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL available( void ) + virtual sal_Int32 SAL_CALL available() throw( com::sun::star::io::NotConnectedException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL closeInput( void ) + virtual void SAL_CALL closeInput() throw( com::sun::star::io::NotConnectedException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -91,11 +91,11 @@ namespace chelp { com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Int64 SAL_CALL getPosition( void ) + virtual sal_Int64 SAL_CALL getPosition() throw( com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Int64 SAL_CALL getLength( void ) + virtual sal_Int64 SAL_CALL getLength() throw( com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx index 78ec84c0ae48..29eeea1b7198 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.hxx +++ b/xmlhelp/source/cxxhelp/provider/databases.hxx @@ -346,7 +346,7 @@ namespace chelp { Databases& rDatabases, const OUString& aInitialModule, const OUString& aLanguage ); ExtensionIteratorBase( Databases& rDatabases, const OUString& aInitialModule, const OUString& aLanguage ); - void init( void ); + void init(); private: com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > implGetHelpPackageFromPackage diff --git a/xmlhelp/source/cxxhelp/provider/db.cxx b/xmlhelp/source/cxxhelp/provider/db.cxx index 8a834d0cb7ae..93b0c65614a2 100644 --- a/xmlhelp/source/cxxhelp/provider/db.cxx +++ b/xmlhelp/source/cxxhelp/provider/db.cxx @@ -122,7 +122,7 @@ void Hdf::createHashMap( bool bOptimizeForPerformance ) } } -void Hdf::releaseHashMap( void ) +void Hdf::releaseHashMap() { if( m_pStringToDataMap != NULL ) { @@ -205,7 +205,7 @@ bool Hdf::getValueForKey( const OString& rKey, HDFData& rValue ) return bSuccess; } -bool Hdf::startIteration( void ) +bool Hdf::startIteration() { bool bSuccess = false; @@ -246,7 +246,7 @@ bool Hdf::getNextKeyAndValue( HDFData& rKey, HDFData& rValue ) return bSuccess; } -void Hdf::stopIteration( void ) +void Hdf::stopIteration() { m_aItData = Sequence<sal_Int8>(); m_pItData = NULL; diff --git a/xmlhelp/source/cxxhelp/provider/db.hxx b/xmlhelp/source/cxxhelp/provider/db.hxx index a0ee6b88d001..7bf3fe11c2d9 100644 --- a/xmlhelp/source/cxxhelp/provider/db.hxx +++ b/xmlhelp/source/cxxhelp/provider/db.hxx @@ -49,7 +49,7 @@ namespace helpdatafileproxy { void copyToBuffer( const char* pSrcData, int nSize ); public: - HDFData( void ) + HDFData() : m_nSize( 0 ) , m_pBuffer( NULL ) {} @@ -101,13 +101,13 @@ namespace helpdatafileproxy { { releaseHashMap(); } void createHashMap( bool bOptimizeForPerformance = false ); - void releaseHashMap( void ); + void releaseHashMap(); bool getValueForKey( const OString& rKey, HDFData& rValue ); - bool startIteration( void ); + bool startIteration(); bool getNextKeyAndValue( HDFData& rKey, HDFData& rValue ); - void stopIteration( void ); + void stopIteration(); }; } diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx index 525cc975fc47..0bee13306e1e 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx @@ -436,14 +436,14 @@ public: { } - void SAL_CALL acquire( void ) + void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } - void SAL_CALL release( void ) + void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx index 6c86d789e587..3db0233a09c7 100644 --- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx +++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx @@ -332,8 +332,8 @@ public: virtual ~InputStreamTransformer(); virtual Any SAL_CALL queryInterface( const Type& rType ) throw( RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL acquire( void ) throw() SAL_OVERRIDE; - virtual void SAL_CALL release( void ) throw() SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; + virtual void SAL_CALL release() throw() SAL_OVERRIDE; virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& aData,sal_Int32 nBytesToRead ) throw( NotConnectedException, @@ -352,11 +352,11 @@ public: IOException, RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL available( void ) throw( NotConnectedException, + virtual sal_Int32 SAL_CALL available() throw( NotConnectedException, IOException, RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL closeInput( void ) throw( NotConnectedException, + virtual void SAL_CALL closeInput() throw( NotConnectedException, IOException, RuntimeException, std::exception ) SAL_OVERRIDE; @@ -364,9 +364,9 @@ public: IOException, RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Int64 SAL_CALL getPosition( void ) throw( IOException,RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL getPosition() throw( IOException,RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Int64 SAL_CALL getLength( void ) throw( IOException,RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL getLength() throw( IOException,RuntimeException, std::exception ) SAL_OVERRIDE; void addToBuffer( const char* buffer,int len ); @@ -1026,14 +1026,14 @@ Any SAL_CALL InputStreamTransformer::queryInterface( const Type& rType ) throw( -void SAL_CALL InputStreamTransformer::acquire( void ) throw() +void SAL_CALL InputStreamTransformer::acquire() throw() { OWeakObject::acquire(); } -void SAL_CALL InputStreamTransformer::release( void ) throw() +void SAL_CALL InputStreamTransformer::release() throw() { OWeakObject::release(); } @@ -1086,7 +1086,7 @@ void SAL_CALL InputStreamTransformer::skipBytes( sal_Int32 nBytesToSkip ) throw( -sal_Int32 SAL_CALL InputStreamTransformer::available( void ) throw( NotConnectedException, +sal_Int32 SAL_CALL InputStreamTransformer::available() throw( NotConnectedException, IOException, RuntimeException, std::exception ) { @@ -1096,7 +1096,7 @@ sal_Int32 SAL_CALL InputStreamTransformer::available( void ) throw( NotConnected -void SAL_CALL InputStreamTransformer::closeInput( void ) throw( NotConnectedException, +void SAL_CALL InputStreamTransformer::closeInput() throw( NotConnectedException, IOException, RuntimeException, std::exception ) { @@ -1120,7 +1120,7 @@ void SAL_CALL InputStreamTransformer::seek( sal_Int64 location ) throw( IllegalA -sal_Int64 SAL_CALL InputStreamTransformer::getPosition( void ) throw( IOException, +sal_Int64 SAL_CALL InputStreamTransformer::getPosition() throw( IOException, RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -1129,7 +1129,7 @@ sal_Int64 SAL_CALL InputStreamTransformer::getPosition( void ) throw( IOExceptio -sal_Int64 SAL_CALL InputStreamTransformer::getLength( void ) throw( IOException,RuntimeException, std::exception ) +sal_Int64 SAL_CALL InputStreamTransformer::getLength() throw( IOException,RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); diff --git a/xmlhelp/source/treeview/tvfactory.cxx b/xmlhelp/source/treeview/tvfactory.cxx index a101b174c849..e76fcfeb4a25 100644 --- a/xmlhelp/source/treeview/tvfactory.cxx +++ b/xmlhelp/source/treeview/tvfactory.cxx @@ -57,7 +57,7 @@ sal_Bool SAL_CALL TVFactory::supportsService( const OUString& ServiceName ) } Sequence< OUString > SAL_CALL -TVFactory::getSupportedServiceNames( void ) +TVFactory::getSupportedServiceNames() throw( RuntimeException, std::exception ) { return TVFactory::getSupportedServiceNames_static(); diff --git a/xmloff/source/chart/MultiPropertySetHandler.hxx b/xmloff/source/chart/MultiPropertySetHandler.hxx index 6a119f3c2c5e..0991e675c25f 100644 --- a/xmloff/source/chart/MultiPropertySetHandler.hxx +++ b/xmloff/source/chart/MultiPropertySetHandler.hxx @@ -123,7 +123,7 @@ public: */ MultiPropertySetHandler (::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> xObject); - ~MultiPropertySetHandler (void); + ~MultiPropertySetHandler(); /** @descr Add a property to handle. The type given implicitly by the reference to a variable is used to create an instance of the PropertyWrapper template class. @@ -143,7 +143,7 @@ public: @return If none of the two interfaces is supported or using them both fails then sal_False is returned. Else True is returned. */ - inline bool GetProperties (void); + inline bool GetProperties(); private: /** @descr Try to use the XMultiPropertySet interface to get the property @@ -180,14 +180,14 @@ MultiPropertySetHandler::MultiPropertySetHandler (::com::sun::star::uno::Referen { } -MultiPropertySetHandler::~MultiPropertySetHandler (void) +MultiPropertySetHandler::~MultiPropertySetHandler() { ::std::map< OUString, PropertyWrapperBase*, OUStringComparison>::iterator I; for (I=aPropertyList.begin(); I!=aPropertyList.end(); ++I) delete I->second; } -bool MultiPropertySetHandler::GetProperties (void) +bool MultiPropertySetHandler::GetProperties() { ::std::map< OUString, PropertyWrapperBase*, OUStringComparison>::iterator I; ::com::sun::star::uno::Sequence< OUString> aNameList (aPropertyList.size()); diff --git a/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx b/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx index eb9c4f3e68e1..63e00c332472 100644 --- a/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx +++ b/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx @@ -35,13 +35,13 @@ XMLEmbeddedObjectExportFilter::~XMLEmbeddedObjectExportFilter () throw() { } -void SAL_CALL XMLEmbeddedObjectExportFilter::startDocument( void ) +void SAL_CALL XMLEmbeddedObjectExportFilter::startDocument() throw( SAXException, RuntimeException, std::exception ) { // do nothing, filter this } -void SAL_CALL XMLEmbeddedObjectExportFilter::endDocument( void ) +void SAL_CALL XMLEmbeddedObjectExportFilter::endDocument() throw( SAXException, RuntimeException, std::exception) { // do nothing, filter this @@ -90,14 +90,14 @@ void SAL_CALL XMLEmbeddedObjectExportFilter::setDocumentLocator( } // XExtendedDocumentHandler -void SAL_CALL XMLEmbeddedObjectExportFilter::startCDATA( void ) +void SAL_CALL XMLEmbeddedObjectExportFilter::startCDATA() throw(SAXException, RuntimeException, std::exception) { if( xExtHandler.is() ) xExtHandler->startCDATA(); } -void SAL_CALL XMLEmbeddedObjectExportFilter::endCDATA( void ) +void SAL_CALL XMLEmbeddedObjectExportFilter::endCDATA() throw(RuntimeException, std::exception) { if( xExtHandler.is() ) @@ -111,7 +111,7 @@ void SAL_CALL XMLEmbeddedObjectExportFilter::comment( const OUString& rComment ) xExtHandler->comment( rComment ); } -void SAL_CALL XMLEmbeddedObjectExportFilter::allowLineBreak( void ) +void SAL_CALL XMLEmbeddedObjectExportFilter::allowLineBreak() throw(SAXException, RuntimeException, std::exception) { if( xExtHandler.is() ) diff --git a/xmloff/source/core/attrlist.cxx b/xmloff/source/core/attrlist.cxx index a7513706e8fe..148b23e99cb4 100644 --- a/xmloff/source/core/attrlist.cxx +++ b/xmloff/source/core/attrlist.cxx @@ -70,7 +70,7 @@ struct SvXMLAttributeList_Impl -sal_Int16 SAL_CALL SvXMLAttributeList::getLength(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +sal_Int16 SAL_CALL SvXMLAttributeList::getLength() throw( ::com::sun::star::uno::RuntimeException, std::exception ) { return sal::static_int_cast< sal_Int16 >(m_pImpl->vecAttribute.size()); } diff --git a/xmloff/source/core/unoatrcn.cxx b/xmloff/source/core/unoatrcn.cxx index 1f4dfba3a76c..5c2bc39c8a53 100644 --- a/xmloff/source/core/unoatrcn.cxx +++ b/xmloff/source/core/unoatrcn.cxx @@ -50,13 +50,13 @@ SvUnoAttributeContainer::~SvUnoAttributeContainer() } // container::XElementAccess -uno::Type SAL_CALL SvUnoAttributeContainer::getElementType(void) +uno::Type SAL_CALL SvUnoAttributeContainer::getElementType() throw( uno::RuntimeException, std::exception ) { return cppu::UnoType<xml::AttributeData>::get(); } -sal_Bool SAL_CALL SvUnoAttributeContainer::hasElements(void) +sal_Bool SAL_CALL SvUnoAttributeContainer::hasElements() throw( uno::RuntimeException, std::exception ) { return mpContainer->GetAttrCount() != 0; @@ -131,7 +131,7 @@ uno::Any SAL_CALL SvUnoAttributeContainer::getByName(const OUString& aName) return aAny; } -uno::Sequence< OUString > SAL_CALL SvUnoAttributeContainer::getElementNames(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SAL_CALL SvUnoAttributeContainer::getElementNames() throw( uno::RuntimeException, std::exception ) { const sal_uInt16 nAttrCount = mpContainer->GetAttrCount(); @@ -248,12 +248,12 @@ void SAL_CALL SvUnoAttributeContainer::removeByName(const OUString& Name) } //XServiceInfo -OUString SAL_CALL SvUnoAttributeContainer::getImplementationName(void) throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SvUnoAttributeContainer::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString( "SvUnoAttributeContainer" ); } -uno::Sequence< OUString > SvUnoAttributeContainer::getSupportedServiceNames(void) +uno::Sequence< OUString > SvUnoAttributeContainer::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { OUString aSN( "com.sun.star.xml.AttributeContainer" ); diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index 922f49034e3e..9ac5a7a327e0 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -877,11 +877,11 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL } // XExtendedDocumentHandler -void SAL_CALL SvXMLImport::startCDATA( void ) throw(xml::sax::SAXException, uno::RuntimeException, std::exception) +void SAL_CALL SvXMLImport::startCDATA() throw(xml::sax::SAXException, uno::RuntimeException, std::exception) { } -void SAL_CALL SvXMLImport::endCDATA( void ) throw(uno::RuntimeException, std::exception) +void SAL_CALL SvXMLImport::endCDATA() throw(uno::RuntimeException, std::exception) { } @@ -890,7 +890,7 @@ void SAL_CALL SvXMLImport::comment( const OUString& ) { } -void SAL_CALL SvXMLImport::allowLineBreak( void ) +void SAL_CALL SvXMLImport::allowLineBreak() throw(xml::sax::SAXException, uno::RuntimeException, std::exception) { } diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx index 2e369b48da1f..068449ec8e39 100644 --- a/xmloff/source/meta/xmlversion.cxx +++ b/xmloff/source/meta/xmlversion.cxx @@ -109,7 +109,7 @@ XMLVersionListImport::XMLVersionListImport( xmloff::token::GetXMLToken(xmloff::token::XML_N_VERSIONS_LIST), XML_NAMESPACE_FRAMEWORK ); } -XMLVersionListImport::~XMLVersionListImport( void ) throw() +XMLVersionListImport::~XMLVersionListImport() throw() {} SvXMLImportContext *XMLVersionListImport::CreateContext( @@ -141,7 +141,7 @@ XMLVersionListContext::XMLVersionListContext( XMLVersionListImport& rImport, { } -XMLVersionListContext::~XMLVersionListContext( void ) +XMLVersionListContext::~XMLVersionListContext() {} SvXMLImportContext *XMLVersionListContext::CreateChildContext( sal_uInt16 nPrefix, @@ -216,7 +216,7 @@ XMLVersionContext::XMLVersionContext( XMLVersionListImport& rImport, aList[nLength] = aInfo; } -XMLVersionContext::~XMLVersionContext( void ) +XMLVersionContext::~XMLVersionContext() {} bool XMLVersionContext::ParseISODateTimeString( diff --git a/xmloff/source/transform/MutableAttrList.cxx b/xmloff/source/transform/MutableAttrList.cxx index dedb6edea8cf..7839fead2c70 100644 --- a/xmloff/source/transform/MutableAttrList.cxx +++ b/xmloff/source/transform/MutableAttrList.cxx @@ -88,7 +88,7 @@ sal_Int64 SAL_CALL XMLMutableAttributeList::getSomething( return 0; } -sal_Int16 SAL_CALL XMLMutableAttributeList::getLength(void) +sal_Int16 SAL_CALL XMLMutableAttributeList::getLength() throw( RuntimeException, std::exception ) { return m_xAttrList->getLength(); diff --git a/xmloff/source/transform/MutableAttrList.hxx b/xmloff/source/transform/MutableAttrList.hxx index 5383f22dd342..eb287c52f71b 100644 --- a/xmloff/source/transform/MutableAttrList.hxx +++ b/xmloff/source/transform/MutableAttrList.hxx @@ -53,7 +53,7 @@ public: virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::xml::sax::XAttributeList - virtual sal_Int16 SAL_CALL getLength(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL getLength() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual OUString SAL_CALL getTypeByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx index 6ec9363980de..79fb4fe909d3 100644 --- a/xmloff/source/transform/OOo2Oasis.cxx +++ b/xmloff/source/transform/OOo2Oasis.cxx @@ -1935,7 +1935,7 @@ void SAL_CALL OOo2OasisTransformer::initialize( Initialize( rArguments ); } -void SAL_CALL OOo2OasisTransformer::startDocument( void ) +void SAL_CALL OOo2OasisTransformer::startDocument() throw( SAXException, RuntimeException, std::exception ) { if( !GetDocHandler().is() ) diff --git a/xmloff/source/transform/OOo2Oasis.hxx b/xmloff/source/transform/OOo2Oasis.hxx index f2e9bc6c3628..085b9f991184 100644 --- a/xmloff/source/transform/OOo2Oasis.hxx +++ b/xmloff/source/transform/OOo2Oasis.hxx @@ -94,7 +94,7 @@ public: void SAL_CALL Initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::xml::sax::XDocumentHandler - virtual void SAL_CALL startDocument(void) + virtual void SAL_CALL startDocument() throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual OUString GetEventName( const OUString& rName, diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx index 4a6ba52dd58c..8d8e12ed37ce 100644 --- a/xmloff/source/transform/TransformerBase.cxx +++ b/xmloff/source/transform/TransformerBase.cxx @@ -209,13 +209,13 @@ XMLTransformerBase::~XMLTransformerBase() throw () delete m_pTokenMap; } -void SAL_CALL XMLTransformerBase::startDocument( void ) +void SAL_CALL XMLTransformerBase::startDocument() throw( SAXException, RuntimeException, std::exception ) { m_xHandler->startDocument(); } -void SAL_CALL XMLTransformerBase::endDocument( void ) +void SAL_CALL XMLTransformerBase::endDocument() throw( SAXException, RuntimeException, std::exception) { m_xHandler->endDocument(); @@ -382,13 +382,13 @@ void SAL_CALL XMLTransformerBase::setDocumentLocator( const Reference< XLocator } // XExtendedDocumentHandler -void SAL_CALL XMLTransformerBase::startCDATA( void ) throw(SAXException, RuntimeException, std::exception) +void SAL_CALL XMLTransformerBase::startCDATA() throw(SAXException, RuntimeException, std::exception) { if( m_xExtHandler.is() ) m_xExtHandler->startCDATA(); } -void SAL_CALL XMLTransformerBase::endCDATA( void ) throw(RuntimeException, std::exception) +void SAL_CALL XMLTransformerBase::endCDATA() throw(RuntimeException, std::exception) { if( m_xExtHandler.is() ) m_xExtHandler->endCDATA(); @@ -401,7 +401,7 @@ void SAL_CALL XMLTransformerBase::comment( const OUString& rComment ) m_xExtHandler->comment( rComment ); } -void SAL_CALL XMLTransformerBase::allowLineBreak( void ) +void SAL_CALL XMLTransformerBase::allowLineBreak() throw(SAXException, RuntimeException, std::exception) { if( m_xExtHandler.is() ) diff --git a/xmloff/source/transform/TransformerBase.hxx b/xmloff/source/transform/TransformerBase.hxx index 893a3c064084..ec95efcda74a 100644 --- a/xmloff/source/transform/TransformerBase.hxx +++ b/xmloff/source/transform/TransformerBase.hxx @@ -87,9 +87,9 @@ public: virtual ~XMLTransformerBase() throw(); // ::com::sun::star::xml::sax::XDocumentHandler - virtual void SAL_CALL startDocument(void) + virtual void SAL_CALL startDocument() throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL endDocument(void) + virtual void SAL_CALL endDocument() throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL startElement(const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttribs) @@ -107,11 +107,11 @@ public: throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::xml::sax::XExtendedDocumentHandler - virtual void SAL_CALL startCDATA(void) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL endCDATA(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL startCDATA() throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL endCDATA() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL comment(const OUString& sComment) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL allowLineBreak(void) + virtual void SAL_CALL allowLineBreak() throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL unknown(const OUString& sString) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx index 40bafdd4c755..f12837a49ca2 100644 --- a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx +++ b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx @@ -54,7 +54,7 @@ private: bool mbInitialized; - sal_uInt16 GetSelectedEntryPos( void ) const; + sal_uInt16 GetSelectedEntryPos() const; DECL_LINK(ViewButtonHdl, void *); DECL_LINK( CertificateHighlightHdl, void* ); DECL_LINK( CertificateSelectHdl, void* ); diff --git a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx index 4e9188616099..f3eea2ba062d 100644 --- a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx +++ b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx @@ -102,7 +102,7 @@ private: vcl::Font m_aFixedWidthFont; DECL_LINK( ElementSelectHdl, void* ); - void Clear( void ); + void Clear(); void InsertElement( const OUString& _rField, const OUString& _rValue, const OUString& _rDetails, bool _bFixedWidthFont = false ); public: @@ -129,7 +129,7 @@ private: DECL_LINK( ViewCertHdl, void* ); DECL_LINK( CertSelectHdl, void* ); - void Clear( void ); + void Clear(); SvTreeListEntry* InsertCert( SvTreeListEntry* _pParent, const OUString& _rName, css::uno::Reference< css::security::XCertificate > rxCert, bool bValid); diff --git a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx index 63c16d71293f..2707fe5e2ccd 100644 --- a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx +++ b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx @@ -87,7 +87,7 @@ public: mpDlg = pTabDlg; } - virtual void ClosePage( void ) = 0; + virtual void ClosePage() = 0; }; class MacroSecurityLevelTP : public MacroSecurityTP @@ -106,7 +106,7 @@ protected: public: MacroSecurityLevelTP( vcl::Window* pParent, MacroSecurity* _pDlg ); - virtual void ClosePage( void ) SAL_OVERRIDE; + virtual void ClosePage() SAL_OVERRIDE; }; @@ -134,7 +134,7 @@ private: DECL_LINK( TrustCertLBSelectHdl, void* ); DECL_LINK( TrustFileLocLBSelectHdl, void* ); - void FillCertLB( void ); + void FillCertLB(); void ImplCheckButtons(); public: @@ -142,7 +142,7 @@ public: virtual ~MacroSecurityTrustedSourcesTP(); virtual void ActivatePage() SAL_OVERRIDE; - virtual void ClosePage( void ) SAL_OVERRIDE; + virtual void ClosePage() SAL_OVERRIDE; }; diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx index c475a3c4be0e..4f822527997b 100644 --- a/xmlsecurity/source/dialogs/certificatechooser.cxx +++ b/xmlsecurity/source/dialogs/certificatechooser.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star; #define INVAL_SEL 0xFFFF -sal_uInt16 CertificateChooser::GetSelectedEntryPos( void ) const +sal_uInt16 CertificateChooser::GetSelectedEntryPos() const { sal_uInt16 nSel = INVAL_SEL; diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx index 309a29a6bbf2..7a14960be47c 100644 --- a/xmlsecurity/source/dialogs/certificateviewer.cxx +++ b/xmlsecurity/source/dialogs/certificateviewer.cxx @@ -151,7 +151,7 @@ inline Details_UserDatat::Details_UserDatat( const OUString& _rTxt, bool _bFixed } -void CertificateViewerDetailsTP::Clear( void ) +void CertificateViewerDetailsTP::Clear() { m_pValueDetails->SetText( OUString() ); sal_uLong i = 0; @@ -393,7 +393,7 @@ IMPL_LINK_NOARG(CertificateViewerCertPathTP, CertSelectHdl) return 0; } -void CertificateViewerCertPathTP::Clear( void ) +void CertificateViewerCertPathTP::Clear() { mpCertStatusML->SetText( OUString() ); sal_uLong i = 0; diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx index e5246617540a..c06982339d02 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.cxx +++ b/xmlsecurity/source/dialogs/macrosecurity.cxx @@ -167,7 +167,7 @@ IMPL_LINK_NOARG(MacroSecurityLevelTP, RadioButtonHdl) return 0; } -void MacroSecurityLevelTP::ClosePage( void ) +void MacroSecurityLevelTP::ClosePage() { mpDlg->maSecOptions.SetMacroSecurityLevel( mnCurLevel ); } @@ -296,7 +296,7 @@ IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, TrustFileLocLBSelectHdl) return 0; } -void MacroSecurityTrustedSourcesTP::FillCertLB( void ) +void MacroSecurityTrustedSourcesTP::FillCertLB() { m_pTrustCertLB->Clear(); @@ -403,7 +403,7 @@ void MacroSecurityTrustedSourcesTP::ActivatePage() FillCertLB(); } -void MacroSecurityTrustedSourcesTP::ClosePage( void ) +void MacroSecurityTrustedSourcesTP::ClosePage() { sal_Int32 nEntryCnt = m_pTrustFileLocLB->GetEntryCount(); if( nEntryCnt ) diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx b/xmlsecurity/source/dialogs/resourcemanager.cxx index ed2c02c8d9da..83420b9d9a16 100644 --- a/xmlsecurity/source/dialogs/resourcemanager.cxx +++ b/xmlsecurity/source/dialogs/resourcemanager.cxx @@ -36,14 +36,14 @@ namespace XmlSec static ResMgr* pResMgr = 0; static SvtSysLocale* pSysLocale = 0; - ResMgr* GetResMgr( void ) + ResMgr* GetResMgr() { if (!pResMgr) pResMgr = ResMgr::CreateResMgr("xmlsec"); return pResMgr; } - const LocaleDataWrapper& GetLocaleData( void ) + const LocaleDataWrapper& GetLocaleData() { if (!pSysLocale) pSysLocale = new SvtSysLocale; diff --git a/xmlsecurity/source/dialogs/resourcemanager.hxx b/xmlsecurity/source/dialogs/resourcemanager.hxx index 5d7cebcf4a73..992e33909e74 100644 --- a/xmlsecurity/source/dialogs/resourcemanager.hxx +++ b/xmlsecurity/source/dialogs/resourcemanager.hxx @@ -34,9 +34,9 @@ class LocaleDataWrapper; namespace XmlSec { - ResMgr* GetResMgr( void ); + ResMgr* GetResMgr(); - const LocaleDataWrapper& GetLocaleData( void ); + const LocaleDataWrapper& GetLocaleData(); DateTime GetDateTime( const ::com::sun::star::util::DateTime& _rDT ); OUString GetDateTimeString( const ::com::sun::star::util::DateTime& _rDT ); OUString GetDateString( const ::com::sun::star::util::DateTime& _rDT ); diff --git a/xmlsecurity/source/xmlsec/saxhelper.cxx b/xmlsecurity/source/xmlsec/saxhelper.cxx index 075167865815..be771e099251 100644 --- a/xmlsecurity/source/xmlsec/saxhelper.cxx +++ b/xmlsecurity/source/xmlsec/saxhelper.cxx @@ -217,7 +217,7 @@ void SAXHelper::setCurrentNode(const xmlNodePtr pNode) /** * XDocumentHandler -- start an xml document */ -void SAXHelper::startDocument( void ) +void SAXHelper::startDocument() throw( cssxs::SAXException , cssu::RuntimeException ) { if( m_pParserCtxt == NULL) @@ -246,7 +246,7 @@ void SAXHelper::startDocument( void ) /** * XDocumentHandler -- end an xml document */ -void SAXHelper::endDocument( void ) +void SAXHelper::endDocument() throw( cssxs::SAXException , cssu::RuntimeException ) { m_pSaxHandler->endDocument( m_pParserCtxt ) ; diff --git a/xmlsecurity/source/xmlsec/saxhelper.hxx b/xmlsecurity/source/xmlsec/saxhelper.hxx index 4683d3fa8f03..bdd2099125da 100644 --- a/xmlsecurity/source/xmlsec/saxhelper.hxx +++ b/xmlsecurity/source/xmlsec/saxhelper.hxx @@ -45,10 +45,10 @@ class SAXHelper void setCurrentNode(const xmlNodePtr pNode); xmlDocPtr getDocument() { return m_pParserCtxt->myDoc;} - void startDocument( void ) + void startDocument() throw( ::com::sun::star::xml::sax::SAXException , ::com::sun::star::uno::RuntimeException ) ; - void endDocument( void ) + void endDocument() throw( ::com::sun::star::xml::sax::SAXException , ::com::sun::star::uno::RuntimeException ) ; void startElement( diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx index 469cdeb030c4..69f6c5130ab5 100644 --- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx +++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx @@ -37,7 +37,7 @@ XMLElementWrapper_XmlSecImpl::XMLElementWrapper_XmlSecImpl(const xmlNodePtr pNod /* XUnoTunnel */ -cssu::Sequence< sal_Int8 > XMLElementWrapper_XmlSecImpl::getUnoTunnelImplementationId( void ) +cssu::Sequence< sal_Int8 > XMLElementWrapper_XmlSecImpl::getUnoTunnelImplementationId() throw (cssu::RuntimeException) { static ::cppu::OImplementationId* pId = 0; diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx index eb029cade1a8..4ecaf789b7b3 100644 --- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx +++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx @@ -65,7 +65,7 @@ public: /* com::sun::star::lang::XUnoTunnel */ virtual sal_Int64 SAL_CALL getSomething( const com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - static com::sun::star::uno::Sequence < sal_Int8 > getUnoTunnelImplementationId( void ) + static com::sun::star::uno::Sequence < sal_Int8 > getUnoTunnelImplementationId() throw(com::sun::star::uno::RuntimeException); /* com::sun::star::lang::XServiceInfo */ diff --git a/xmlsecurity/source/xmlsec/xmlstreamio.cxx b/xmlsecurity/source/xmlsec/xmlstreamio.cxx index 1034e8bde594..032ee47dae22 100644 --- a/xmlsecurity/source/xmlsec/xmlstreamio.cxx +++ b/xmlsecurity/source/xmlsec/xmlstreamio.cxx @@ -197,7 +197,7 @@ int xmlRegisterStreamInputCallbacks( return 0 ; } -int xmlUnregisterStreamInputCallbacks( void ) +int xmlUnregisterStreamInputCallbacks() { if( ( enableXmlStreamIO & XMLSTREAMIO_REGISTERED ) ) { //Clear the uir-stream binding diff --git a/xmlsecurity/source/xmlsec/xmlstreamio.hxx b/xmlsecurity/source/xmlsec/xmlstreamio.hxx index f0d566ff6ece..4765a0299816 100644 --- a/xmlsecurity/source/xmlsec/xmlstreamio.hxx +++ b/xmlsecurity/source/xmlsec/xmlstreamio.hxx @@ -23,14 +23,14 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/xml/crypto/XUriBinding.hpp> -int xmlEnableStreamInputCallbacks( void ) ; -void xmlDisableStreamInputCallbacks( void ) ; +int xmlEnableStreamInputCallbacks() ; +void xmlDisableStreamInputCallbacks() ; int xmlRegisterStreamInputCallbacks( ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XUriBinding >& aUriBinding ) ; -int xmlUnregisterStreamInputCallbacks( void ) ; +int xmlUnregisterStreamInputCallbacks() ; #endif // INCLUDED_XMLSECURITY_SOURCE_XMLSEC_XMLSTREAMIO_HXX |