-Werror,-Wnon-virtual-dtor

Why was CDTransObjFactory a class with virtual functions in the first place?

Change-Id: I315243a2268be67e03feb923ca7f64fd37818337

4 files changed, 15 insertions, 21 deletions

diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx b/dtrans/source/win32/dtobj/DOTransferable.cxx
index e57b745e6f7d..74de0dcb0c93 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.cxx
+++ b/dtrans/source/win32/dtobj/DOTransferable.cxx
@@ -58,7 +58,18 @@ namespace
 
 } // end namespace
 
-// ctor
+Reference< XTransferable > SAL_CALL CDOTransferable::create( const Reference< XComponentContext >& rxContext,
+                                                                                     IDataObjectPtr pIDataObject )
+{
+    CDOTransferable* pTransf = new CDOTransferable(rxContext, pIDataObject);
+    Reference<XTransferable> refDOTransf(pTransf);
+
+    pTransf->acquire();
+    pTransf->initFlavorList();
+    pTransf->release();
+
+    return refDOTransf;
+}
 
 CDOTransferable::CDOTransferable(
     const Reference< XComponentContext >& rxContext, IDataObjectPtr rDataObject ) :
diff --git a/dtrans/source/win32/dtobj/DOTransferable.hxx b/dtrans/source/win32/dtobj/DOTransferable.hxx
index cf3af73dc4f2..1f110089b4ea 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.hxx
+++ b/dtrans/source/win32/dtobj/DOTransferable.hxx
@@ -31,7 +31,6 @@
 #include <systools/win32/comtools.hxx>
 
 // forward
-class CDTransObjFactory;
 class CFormatEtc;
 
 class CDOTransferable : public ::cppu::WeakImplHelper<
@@ -41,6 +40,9 @@ class CDOTransferable : public ::cppu::WeakImplHelper<
 public:
     typedef css::uno::Sequence< sal_Int8 > ByteSequence_t;
 
+    static css::uno::Reference< css::datatransfer::XTransferable > create(
+        const css::uno::Reference< css::uno::XComponentContext >& rxContext, IDataObjectPtr pIDataObject );
+
     // XTransferable
 
     virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor )
@@ -58,7 +60,6 @@ public:
     (css::uno::RuntimeException);
 
 private:
-    // should be created only by CDTransObjFactory
     explicit CDOTransferable(
         const css::uno::Reference< css::uno::XComponentContext >& rxContext,
         IDataObjectPtr rDataObject );
@@ -103,8 +104,6 @@ private:
 private:
     CDOTransferable( const CDOTransferable& );
     CDOTransferable& operator=( const CDOTransferable& );
-
-    friend class CDTransObjFactory;
 };
 
 #endif
diff --git a/dtrans/source/win32/dtobj/DtObjFactory.cxx b/dtrans/source/win32/dtobj/DtObjFactory.cxx
index 584c695772c5..579efe21161f 100644
--- a/dtrans/source/win32/dtobj/DtObjFactory.cxx
+++ b/dtrans/source/win32/dtobj/DtObjFactory.cxx
@@ -21,8 +21,6 @@
 
 #include "XTDataObject.hxx"
 
-#include "DOTransferable.hxx"
-
 // namespace directives
 
 using namespace com::sun::star::uno;
@@ -37,17 +35,4 @@ IDataObjectPtr SAL_CALL CDTransObjFactory::createDataObjFromTransferable(const R
     return (IDataObjectPtr(new CXTDataObject(rxContext, refXTransferable)));
 }
 
-Reference< XTransferable > SAL_CALL CDTransObjFactory::createTransferableFromDataObj( const Reference< XComponentContext >& rxContext,
-                                                                                     IDataObjectPtr pIDataObject )
-{
-    CDOTransferable* pTransf = new CDOTransferable(rxContext, pIDataObject);
-    Reference<XTransferable> refDOTransf(pTransf);
-
-    pTransf->acquire();
-    pTransf->initFlavorList();
-    pTransf->release();
-
-    return refDOTransf;
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/source/win32/dtobj/XNotifyingDataObject.cxx b/dtrans/source/win32/dtobj/XNotifyingDataObject.cxx
index 49546050dcfb..35b42e6801bc 100644
--- a/dtrans/source/win32/dtobj/XNotifyingDataObject.cxx
+++ b/dtrans/source/win32/dtobj/XNotifyingDataObject.cxx
@@ -21,7 +21,6 @@
 #include "XNotifyingDataObject.hxx"
 #include "../clipb/WinClipbImpl.hxx"
 #include "../clipb/WinClipboard.hxx"
-#include "../../inc/DtObjFactory.hxx"
 
 #ifdef __MINGW32__
 #if defined __uuidof