summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-01-29 15:38:26 +0000
committerCaolán McNamara <caolanm@redhat.com>2016-01-31 11:45:14 +0000
commit682c07cc3f023a2a0f036f48700fca16b6b62c19 (patch)
treeca6b9f1238ee59b18f6874c67b79a2ae9369888b
parent4b970fb14052796f85c9c2fb443222fc3a292b5a (diff)
so ScFunctionChildWindow doesn't appear to be needed anymore
Change-Id: I24f9bda13befc05de7376683a5b70d2b98ea8ecf
-rw-r--r--sc/source/ui/app/scdll.cxx3
-rw-r--r--sc/source/ui/formdlg/dwfunctr.cxx33
-rw-r--r--sc/source/ui/inc/dwfunctr.hxx10
-rw-r--r--sc/source/ui/view/tabvwsh.cxx1
4 files changed, 0 insertions, 47 deletions
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 86e21175dd09..907e768147ad 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -244,9 +244,6 @@ void ScDLL::Init()
ScZTestDialogWrapper ::RegisterChildWindow(false, pMod);
ScChiSquareTestDialogWrapper ::RegisterChildWindow(false, pMod);
- // First docking Window for Calc
- ScFunctionChildWindow ::RegisterChildWindow(false, pMod);
-
// Redlining Window
ScAcceptChgDlgWrapper ::RegisterChildWindow(false, pMod);
ScSimpleRefDlgWrapper ::RegisterChildWindow(false, pMod, SfxChildWindowFlags::ALWAYSAVAILABLE|SfxChildWindowFlags::NEVERHIDE );
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx
index 2f1a84919da1..d86cc5021612 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -39,39 +39,6 @@
#include "dwfunctr.hrc"
#include "dwfunctr.hxx"
-SFX_IMPL_DOCKINGWINDOW_WITHID( ScFunctionChildWindow, FID_FUNCTION_BOX )
-
-/*************************************************************************
-#* Member: ScFunctionChildWindow
-#*------------------------------------------------------------------------
-#*
-#* Klasse: ScFunctionChildWindow
-#*
-#* Funktion: Konstruktor der Klasse ScFunctionChildWindow
-#* Ableitung vom SfxChildWindow als "Behaelter" fuer
-#* Funktions- Fenster in Clac
-#*
-#* Input: ---
-#*
-#* Output: ---
-#*
-#************************************************************************/
-
-ScFunctionChildWindow::ScFunctionChildWindow( vcl::Window* pParentP,
- sal_uInt16 nId,
- SfxBindings* pBindings,
- SfxChildWinInfo* pInfo ) :
- SfxChildWindow( pParentP, nId )
-{
- VclPtr<ScFunctionDockWin> pWin = VclPtr<ScFunctionDockWin>::Create( pBindings, this,
- pParentP, ScResId( FID_FUNCTION_BOX ) );
- SetWindow(pWin);
-
- SetAlignment(SfxChildAlignment::RIGHT);
-
- pWin->Initialize( pInfo );
-}
-
/*************************************************************************
#* Member: ScFunctionDockWin
#*------------------------------------------------------------------------
diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx
index 4b907a5a8f53..a6f54e346217 100644
--- a/sc/source/ui/inc/dwfunctr.hxx
+++ b/sc/source/ui/inc/dwfunctr.hxx
@@ -32,16 +32,6 @@
#include "privsplt.hxx"
#include "funcdesc.hxx"
-/** Derivation of SfxChildWindow as "containers" for Controller */
-class ScFunctionChildWindow : public SfxChildWindow
-{
- public:
- ScFunctionChildWindow( vcl::Window*, sal_uInt16, SfxBindings*,
- SfxChildWinInfo* );
-
- SFX_DECL_CHILDWINDOW_WITHID(ScFunctionChildWindow);
-};
-
class ScFunctionDockWin : public SfxDockingWindow, public SfxListener
{
diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx
index 480dd2262a2c..c5a97b52790f 100644
--- a/sc/source/ui/view/tabvwsh.cxx
+++ b/sc/source/ui/view/tabvwsh.cxx
@@ -76,7 +76,6 @@ void ScTabViewShell::InitInterface_Impl()
GetStaticInterface()->RegisterChildWindow(ScColRowNameRangesDlgWrapper::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(ScFormulaDlgWrapper::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(SvxIMapDlgChildWindow::GetChildWindowId());
- GetStaticInterface()->RegisterChildWindow(ScFunctionChildWindow::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(ScFormulaDlgWrapper::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(ScAcceptChgDlgWrapper::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(ScHighlightChgDlgWrapper::GetChildWindowId());