sc/source/ui/app/scdll.cxx | 3 ---
sc/source/ui/formdlg/dwfunctr.cxx | 33 ---------------------------------
sc/source/ui/inc/dwfunctr.hxx | 10 ----------
sc/source/ui/view/tabvwsh.cxx | 1 -
4 files changed, 47 deletions(-)
New commits:
commit 682c07cc3f023a2a0f036f48700fca16b6b62c19
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Jan 29 15:38:26 2016 +0000
so ScFunctionChildWindow doesn't appear to be needed anymore
Change-Id: I24f9bda13befc05de7376683a5b70d2b98ea8ecf
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 86e2117..907e768 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 2f1a849..d86cc50 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 4b907a5..a6f54e3 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 480dd22..c5a97b5 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());
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
