-Werror,-Wnon-virtual-dtor

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

Change-Id: I4449a6f69f45a5b294b1906d0ce8a1a8a52c1d7f

3 files changed, 7 insertions, 11 deletions

diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
index 5a82692af2f2..91720ea71253 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
@@ -31,6 +31,7 @@
 
 #include "FilePicker.hxx"
 #include "controlaccess.hxx"
+#include "customcontrolfactory.hxx"
 #include <rtl/ustrbuf.hxx>
 #include <rtl/string.hxx>
 #include <osl/thread.hxx>
@@ -84,8 +85,7 @@ CWinFileOpenImpl::CWinFileOpenImpl(
     CFileOpenDialog(bFileOpenDialog, dwFlags, dwTemplateId, hInstance),
     m_filterContainer(new CFilterContainer()),
     m_Preview(new CPreviewAdapter(hInstance)),
-    m_CustomControlFactory(new CCustomControlFactory()),
-    m_CustomControls(m_CustomControlFactory->CreateCustomControlContainer()),
+    m_CustomControls(CCustomControlFactory::CreateCustomControlContainer()),
     m_FilePicker(aFilePicker),
     m_bInitialSelChanged(sal_True),
     m_HelpPopupWindow(hInstance, m_hwndFileOpenDlg),
@@ -550,7 +550,7 @@ void SAL_CALL CWinFileOpenImpl::InitControlLabel(HWND hWnd)
 void SAL_CALL CWinFileOpenImpl::InitCustomControlContainer(HWND hCustomControl)
 {
     m_CustomControls->AddControl(
-        m_CustomControlFactory->CreateCustomControl(hCustomControl,m_hwndFileOpenDlg));
+        CCustomControlFactory::CreateCustomControl(hCustomControl,m_hwndFileOpenDlg));
 }
 
 
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
index e25a2fa77759..10eef106c6c3 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
@@ -29,7 +29,6 @@
 #include "previewadapter.hxx"
 #include "helppopupwindow.hxx"
 #include "customcontrol.hxx"
-#include "customcontrolfactory.hxx"
 #include "../misc/resourceprovider.hxx"
 
 #include <utility>
@@ -181,7 +180,6 @@ private:
 private:
     std::unique_ptr<CFilterContainer>       m_filterContainer;
     std::unique_ptr<CPreviewAdapter>        m_Preview;
-    std::unique_ptr<CCustomControlFactory>  m_CustomControlFactory;
     std::unique_ptr<CCustomControl>         m_CustomControls;
     CFilePicker*                            m_FilePicker;
     WNDPROC                                 m_pfnOldDlgProc;
diff --git a/fpicker/source/win32/filepicker/customcontrolfactory.hxx b/fpicker/source/win32/filepicker/customcontrolfactory.hxx
index 868d21e720dc..46043b4cd745 100644
--- a/fpicker/source/win32/filepicker/customcontrolfactory.hxx
+++ b/fpicker/source/win32/filepicker/customcontrolfactory.hxx
@@ -30,17 +30,15 @@
 
 class CCustomControl;
 
-class CCustomControlFactory
+namespace CCustomControlFactory
 {
-public:
-
     // The CCustomControl instances will be created on the heap
     // and the client is responsible for deleting this instances
     // (he adopts ownership)
-    virtual CCustomControl* CreateCustomControl(HWND aControlHandle, HWND aParentHandle);
+    CCustomControl* CreateCustomControl(HWND aControlHandle, HWND aParentHandle);
 
-    virtual CCustomControl* CreateCustomControlContainer();
-};
+    CCustomControl* CreateCustomControlContainer();
+}
 
 #endif