summaryrefslogtreecommitdiff
path: root/include/connectivity
diff options
context:
space:
mode:
Diffstat (limited to 'include/connectivity')
-rw-r--r--include/connectivity/sdbcx/VCatalog.hxx2
-rw-r--r--include/connectivity/sdbcx/VCollection.hxx2
-rw-r--r--include/connectivity/sdbcx/VColumn.hxx2
-rw-r--r--include/connectivity/sdbcx/VGroup.hxx2
-rw-r--r--include/connectivity/sdbcx/VIndex.hxx2
-rw-r--r--include/connectivity/sdbcx/VTable.hxx4
-rw-r--r--include/connectivity/sdbcx/VUser.hxx2
-rw-r--r--include/connectivity/sqlbison_exports.hxx2
-rw-r--r--include/connectivity/sqlscan.hxx4
9 files changed, 11 insertions, 11 deletions
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