summaryrefslogtreecommitdiff
path: root/ucb
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-03-14 13:27:56 +0100
committerStephan Bergmann <sbergman@redhat.com>2012-03-14 13:32:02 +0100
commit6e67c03dc0225fc66343546b14e902b9d238b1a3 (patch)
tree6e078783d65e280a721b4e46f0ae0ca6b950f121 /ucb
parentfe4be5047988782f3143a1af505c5eecb3f2af5a (diff)
Enable -Wnon-virtual-dtor for GCC 4.6
...which has the necessary features to support it. Change a lot of classes to either contain a protected non-virtual dtor (which is backwards compatible, so even works for cppumaker-generated UNO headers) or a public virtual one. cppuhelper/propertysetmixin.hxx still needs to disable the warning, as the relevant class has a non-virtual dtor but friends, which would still cause GCC to warn. Includes a patch for libcmis, intended to be upstreamed.
Diffstat (limited to 'ucb')
-rw-r--r--ucb/source/ucp/file/filnot.hxx3
-rw-r--r--ucb/source/ucp/ftp/ftpcfunc.hxx4
-rw-r--r--ucb/source/ucp/ftp/ftphandleprovider.hxx3
-rw-r--r--ucb/source/ucp/ftp/ftpstrcont.hxx5
-rw-r--r--ucb/source/ucp/ftp/ftpurl.hxx5
-rw-r--r--ucb/source/ucp/tdoc/tdoc_docmgr.hxx3
6 files changed, 19 insertions, 4 deletions
diff --git a/ucb/source/ucp/file/filnot.hxx b/ucb/source/ucp/file/filnot.hxx
index 789455af7602..3c146acde5ad 100644
--- a/ucb/source/ucp/file/filnot.hxx
+++ b/ucb/source/ucp/file/filnot.hxx
@@ -130,6 +130,9 @@ namespace fileaccess {
virtual PropertySetInfoChangeNotifier* cPSL( void ) = 0;
virtual PropertyChangeNotifier* cPCL( void ) = 0;
virtual rtl::OUString getKey( void ) = 0;
+
+ protected:
+ ~Notifier() {}
};
diff --git a/ucb/source/ucp/ftp/ftpcfunc.hxx b/ucb/source/ucp/ftp/ftpcfunc.hxx
index 3696e23d7ad6..607e27720dc1 100644
--- a/ucb/source/ucp/ftp/ftpcfunc.hxx
+++ b/ucb/source/ucp/ftp/ftpcfunc.hxx
@@ -42,8 +42,10 @@ namespace ftp {
class FTPStreamContainer
{
public:
-
virtual size_t write(void *buffer,size_t size,size_t nmemb) = 0;
+
+ protected:
+ ~FTPStreamContainer() {}
};
}
diff --git a/ucb/source/ucp/ftp/ftphandleprovider.hxx b/ucb/source/ucp/ftp/ftphandleprovider.hxx
index bebded5e77a5..e55d8bb1de18 100644
--- a/ucb/source/ucp/ftp/ftphandleprovider.hxx
+++ b/ucb/source/ucp/ftp/ftphandleprovider.hxx
@@ -24,6 +24,9 @@ namespace ftp {
const rtl::OUString& username,
const rtl::OUString& password,
const rtl::OUString& account) = 0;
+
+ protected:
+ ~FTPHandleProvider() {}
};
diff --git a/ucb/source/ucp/ftp/ftpstrcont.hxx b/ucb/source/ucp/ftp/ftpstrcont.hxx
index 6799b0dd821a..e7f87b760906 100644
--- a/ucb/source/ucp/ftp/ftpstrcont.hxx
+++ b/ucb/source/ucp/ftp/ftpstrcont.hxx
@@ -52,7 +52,8 @@ namespace ftp {
FTPOutputStreamContainer(const com::sun::star::uno::Reference<
com::sun::star::io::XOutputStream>& out);
- virtual ~FTPOutputStreamContainer() {}
+
+ virtual ~FTPOutputStreamContainer() {}
virtual size_t write(void *buffer,size_t size,size_t nmemb);
@@ -71,6 +72,8 @@ namespace ftp {
FTPInputStreamContainer(FTPInputStream* out);
+ virtual ~FTPInputStreamContainer() {}
+
virtual size_t write(void *buffer,size_t size,size_t nmemb);
com::sun::star::uno::Reference<
diff --git a/ucb/source/ucp/ftp/ftpurl.hxx b/ucb/source/ucp/ftp/ftpurl.hxx
index 62802654ab18..e411045bf1f9 100644
--- a/ucb/source/ucp/ftp/ftpurl.hxx
+++ b/ucb/source/ucp/ftp/ftpurl.hxx
@@ -80,11 +80,12 @@ namespace ftp {
};
class CurlInput {
-
public:
-
// returns the number of bytes actually read
virtual sal_Int32 read(sal_Int8 *dest,sal_Int32 nBytesRequested) = 0;
+
+ protected:
+ ~CurlInput() {}
};
diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx
index e1e478bfcc3c..9b40fe323d10 100644
--- a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx
@@ -49,6 +49,9 @@ namespace tdoc_ucp {
public:
virtual void notifyDocumentOpened( const rtl::OUString & rDocId ) = 0;
virtual void notifyDocumentClosed( const rtl::OUString & rDocId ) = 0;
+
+ protected:
+ ~OfficeDocumentsEventListener() {}
};
//=======================================================================