tdf#68871: Remove the old Elements panel from Math

Conflicts:
	starmath/inc/toolbox.hxx
	starmath/source/toolbox.cxx

Change-Id: Ie148d57dc14ed3f38566c24ee027f23e25987810
Reviewed-on: https://gerrit.libreoffice.org/15599
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

9 files changed, 0 insertions, 728 deletions

diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk
index 5358b59ef2ea..203143f09fe8 100644
--- a/starmath/Library_sm.mk
+++ b/starmath/Library_sm.mk
@@ -84,7 +84,6 @@ $(eval $(call gb_Library_add_exception_objects,sm,\
         starmath/source/smdll \
         starmath/source/smmod \
         starmath/source/symbol \
-        starmath/source/toolbox \
         starmath/source/tmpdevice \
         starmath/source/typemap \
         starmath/source/unodoc \
diff --git a/starmath/UIConfig_smath.mk b/starmath/UIConfig_smath.mk
index 8eb535d9940c..a798bf751bb7 100644
--- a/starmath/UIConfig_smath.mk
+++ b/starmath/UIConfig_smath.mk
@@ -27,7 +27,6 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/smath,\
 	starmath/uiconfig/smath/ui/alignmentdialog \
 	starmath/uiconfig/smath/ui/catalogdialog \
 	starmath/uiconfig/smath/ui/dockingelements \
-	starmath/uiconfig/smath/ui/floatingelements \
 	starmath/uiconfig/smath/ui/fontdialog \
 	starmath/uiconfig/smath/ui/fontsizedialog \
 	starmath/uiconfig/smath/ui/fonttypedialog \
diff --git a/starmath/inc/toolbox.hxx b/starmath/inc/toolbox.hxx
deleted file mode 100644
index 5c03f5210e22..000000000000
--- a/starmath/inc/toolbox.hxx
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_STARMATH_INC_TOOLBOX_HXX
-#define INCLUDED_STARMATH_INC_TOOLBOX_HXX
-
-#include <sfx2/basedlgs.hxx>
-#include <sfx2/childwin.hxx>
-#include <vcl/toolbox.hxx>
-
-#include "smmod.hxx"
-#include "config.hxx"
-#include "toolbox.hrc"
-
-class SmToolBoxWindow : public SfxFloatingWindow
-{
-
-protected:
-    VclPtr<ToolBox>    m_pToolBoxCat;
-    sal_uInt16  m_nUnbinopsId;
-    sal_uInt16  m_nRelationsId;
-    sal_uInt16  m_nSetoperationsId;
-    sal_uInt16  m_nFunctionsId;
-    sal_uInt16  m_nOperatorsId;
-    sal_uInt16  m_nAttributesId;
-    sal_uInt16  m_nBracketsId;
-    sal_uInt16  m_nFormatId;
-    sal_uInt16  m_nMiscId;
-    VclPtr<ToolBox>    pToolBoxCmd;
-    VclPtr<ToolBox>    vToolBoxCategories[NUM_TBX_CATEGORIES];
-    ImageList  *aImageLists [NUM_TBX_CATEGORIES + 1];   /* regular */
-    sal_uInt16      nActiveCategoryRID;
-
-    virtual bool    Close() SAL_OVERRIDE;
-    virtual void    GetFocus() SAL_OVERRIDE;
-
-    void            ApplyImageLists( sal_uInt16 nCategoryRID );
-
-    DECL_LINK_TYPED( CategoryClickHdl, ToolBox*, void );
-    DECL_LINK_TYPED( CmdSelectHdl, ToolBox*, void );
-
-    SmViewShell * GetView();
-    const ImageList * GetImageList( sal_uInt16 nResId );
-
-    sal_uInt16 MapToolbarIdToCategory(sal_uInt16 nId) const;
-
-public:
-    SmToolBoxWindow(SfxBindings    *pBindings,
-                    SfxChildWindow *pChildWindow,
-                    Window         *pParent);
-    virtual ~SmToolBoxWindow();
-    virtual void dispose() SAL_OVERRIDE;
-
-    // Window
-    virtual void    StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE;
-    virtual void    DataChanged( const DataChangedEvent &rEvt ) SAL_OVERRIDE;
-
-    void        AdjustPos();
-    void        SetCategory(sal_uInt16 nCategory);
-};
-
-/**************************************************************************/
-
-class SmToolBoxWrapper : public SfxChildWindow
-{
-    SFX_DECL_CHILDWINDOW_WITHID(SmToolBoxWrapper);
-
-protected:
-    SmToolBoxWrapper(vcl::Window *pParentWindow,
-                     sal_uInt16, SfxBindings*, SfxChildWinInfo*);
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 8ceb44924dc4..12083e489158 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -79,7 +79,6 @@
 #include <smdll.hxx>
 #include <starmath.hrc>
 #include <symbol.hxx>
-#include <toolbox.hxx>
 #include <unomodel.hxx>
 #include <utility.hxx>
 #include <view.hxx>
diff --git a/starmath/source/smdll.cxx b/starmath/source/smdll.cxx
index eea84b3e6080..d8335211daed 100644
--- a/starmath/source/smdll.cxx
+++ b/starmath/source/smdll.cxx
@@ -31,7 +31,6 @@
 
 #include <smdll.hxx>
 #include <document.hxx>
-#include <toolbox.hxx>
 #include <view.hxx>
 
 #include <ElementsDockingWindow.hxx>
@@ -74,7 +73,6 @@ namespace
         SvxUndoRedoControl::RegisterControl(SID_REDO, pModule);
         XmlSecStatusBarControl::RegisterControl(SID_SIGNATURE, pModule);
 
-        SmToolBoxWrapper::RegisterChildWindow(true);
         SmCmdBoxWrapper::RegisterChildWindow(true);
         SmElementsDockingWindowWrapper::RegisterChildWindow(true);
 
diff --git a/starmath/source/toolbox.cxx b/starmath/source/toolbox.cxx
deleted file mode 100644
index 0182ce404f3a..000000000000
--- a/starmath/source/toolbox.cxx
+++ /dev/null
@@ -1,367 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <svl/eitem.hxx>
-#include <sfx2/app.hxx>
-#include <svl/intitem.hxx>
-#include <svtools/imgdef.hxx>
-#include <sfx2/dispatch.hxx>
-#include <sfx2/imgmgr.hxx>
-#include <vcl/wrkwin.hxx>
-#include <vcl/settings.hxx>
-
-#include "toolbox.hxx"
-#include "starmath.hrc"
-#include "toolbox.hrc"
-#include "view.hxx"
-
-
-
-
-static sal_uInt16  GetImageListRID( sal_uInt16 nCategoryRID )
-{
-    sal_uInt16 nRes = 0xFFFF;
-    switch (nCategoryRID)
-    {
-        case RID_UNBINOPS_CAT       : nRes = RID_IL_UNBINOPS; break;
-        case RID_RELATIONS_CAT      : nRes = RID_IL_RELATIONS; break;
-        case RID_SETOPERATIONS_CAT  : nRes = RID_IL_SETOPERATIONS; break;
-        case RID_FUNCTIONS_CAT      : nRes = RID_IL_FUNCTIONS; break;
-        case RID_OPERATORS_CAT      : nRes = RID_IL_OPERATORS; break;
-        case RID_ATTRIBUTES_CAT     : nRes = RID_IL_ATTRIBUTES; break;
-        case RID_BRACKETS_CAT       : nRes = RID_IL_BRACKETS; break;
-        case RID_FORMAT_CAT         : nRes = RID_IL_FORMAT; break;
-        case RID_MISC_CAT           : nRes = RID_IL_MISC; break;
-        default :
-            SAL_WARN( "starmath", "unknown category" );
-    }
-    return nRes;
-}
-
-
-static sal_Int16  GetToolBoxCategoriesIndex( sal_uInt16 nCategoryRID )
-{
-    sal_Int16 nIdx = -1;
-    switch (nCategoryRID)
-    {
-        case RID_UNBINOPS_CAT       : nIdx = 0; break;
-        case RID_RELATIONS_CAT      : nIdx = 1; break;
-        case RID_SETOPERATIONS_CAT  : nIdx = 2; break;
-        case RID_FUNCTIONS_CAT      : nIdx = 3; break;
-        case RID_OPERATORS_CAT      : nIdx = 4; break;
-        case RID_ATTRIBUTES_CAT     : nIdx = 5; break;
-        case RID_BRACKETS_CAT       : nIdx = 6; break;
-        case RID_FORMAT_CAT         : nIdx = 7; break;
-        case RID_MISC_CAT           : nIdx = 8; break;
-        default:
-            ;
-    }
-    return nIdx;
-}
-
-
-static sal_uInt16  GetCategoryRID( sal_uInt16 nResId )
-{
-    sal_uInt16 nRes = 0xFFFF;
-    switch (nResId)
-    {
-        case RID_IL_UNBINOPS       : nRes = RID_UNBINOPS_CAT; break;
-        case RID_IL_RELATIONS      : nRes = RID_RELATIONS_CAT; break;
-        case RID_IL_SETOPERATIONS  : nRes = RID_SETOPERATIONS_CAT; break;
-        case RID_IL_FUNCTIONS      : nRes = RID_FUNCTIONS_CAT; break;
-        case RID_IL_OPERATORS      : nRes = RID_OPERATORS_CAT; break;
-        case RID_IL_ATTRIBUTES     : nRes = RID_ATTRIBUTES_CAT; break;
-        case RID_IL_BRACKETS       : nRes = RID_BRACKETS_CAT; break;
-        case RID_IL_FORMAT         : nRes = RID_FORMAT_CAT; break;
-        case RID_IL_MISC           : nRes = RID_MISC_CAT; break;
-        default :
-            SAL_WARN( "starmath", "unknown category" );
-            break;
-    }
-    return nRes;
-}
-
-SmToolBoxWindow::SmToolBoxWindow(SfxBindings *pTmpBindings,
-                                 SfxChildWindow *pChildWindow,
-                                 vcl::Window *pParent)
-    : SfxFloatingWindow(pTmpBindings, pChildWindow, pParent, "FloatingElements",
-        "modules/smath/ui/floatingelements.ui")
-{
-    get(m_pToolBoxCat, "catalog");
-    m_nUnbinopsId = m_pToolBoxCat->GetItemId("RID_UNBINOPS_CAT");
-    m_nRelationsId = m_pToolBoxCat->GetItemId("RID_RELATIONS_CAT");
-    m_nSetoperationsId = m_pToolBoxCat->GetItemId("RID_SETOPERATIONS_CAT");
-    m_nFunctionsId = m_pToolBoxCat->GetItemId("RID_FUNCTIONS_CAT");
-    m_nOperatorsId = m_pToolBoxCat->GetItemId("RID_OPERATORS_CAT");
-    m_nAttributesId = m_pToolBoxCat->GetItemId("RID_ATTRIBUTES_CAT");
-    m_nBracketsId = m_pToolBoxCat->GetItemId("RID_BRACKETS_CAT");
-    m_nFormatId = m_pToolBoxCat->GetItemId("RID_FORMAT_CAT");
-    m_nMiscId = m_pToolBoxCat->GetItemId("RID_MISC_CAT");
-    m_pToolBoxCat->InsertSpace(7);
-    m_pToolBoxCat->InsertBreak(5);
-    m_pToolBoxCat->SetLineCount(2);
-
-    // allow for cursor travelling between toolbox and sub-categories
-    SetStyle( GetStyle() | WB_DIALOGCONTROL );
-
-    nActiveCategoryRID = USHRT_MAX;
-
-    m_pToolBoxCat->SetClickHdl(LINK(this, SmToolBoxWindow, CategoryClickHdl));
-
-    sal_uInt16 i;
-    for (i = 0;  i < NUM_TBX_CATEGORIES;  ++i)
-    {
-        VclPtrInstance<ToolBox> pBox(get<vcl::Window>("box"), SmResId( TOOLBOX_CAT_A + i ));
-        vToolBoxCategories[i] = pBox;
-        pBox->SetSelectHdl(LINK(this, SmToolBoxWindow, CmdSelectHdl));
-    }
-    pToolBoxCmd = vToolBoxCategories[0];
-
-    for (i = 0;  i <= NUM_TBX_CATEGORIES; ++i)
-        aImageLists [i] = 0;
-}
-
-SmToolBoxWindow::~SmToolBoxWindow()
-{
-    disposeOnce();
-}
-
-void SmToolBoxWindow::dispose()
-{
-    int i;
-    for (i = 0;  i < NUM_TBX_CATEGORIES;  ++i)
-        vToolBoxCategories[i].disposeAndClear();
-
-    pToolBoxCmd = 0;
-    for (i = 0;  i < NUM_TBX_CATEGORIES + 1;  ++i)
-    {
-        delete aImageLists[i];
-        aImageLists[i] = 0;
-    }
-    m_pToolBoxCat.clear();
-    pToolBoxCmd.clear();
-    SfxFloatingWindow::dispose();
-}
-
-SmViewShell * SmToolBoxWindow::GetView()
-{
-    SfxViewShell *pView = GetBindings().GetDispatcher()->GetFrame()->GetViewShell();
-    return PTR_CAST(SmViewShell, pView);
-}
-
-const ImageList * SmToolBoxWindow::GetImageList( sal_uInt16 nResId )
-{
-    // creates the image list via its resource id and stores that
-    // list for later use in the respective array.
-
-    const ImageList *pIL = 0;
-
-    // get index to use
-    sal_uInt16 nCategoryRID = GetCategoryRID( nResId );
-    sal_Int16 nIndex = GetToolBoxCategoriesIndex( nCategoryRID );
-
-    if (nIndex >= 0)
-    {
-        ImageList **pImgList = aImageLists;
-        if (!pImgList[ nIndex ])
-            pImgList[ nIndex ] = new ImageList( SmResId(nResId) );
-        pIL = pImgList[ nIndex ];
-    }
-
-    OSL_ENSURE( pIL, "image list not found!" );
-    return pIL;
-}
-
-
-void SmToolBoxWindow::ApplyImageLists( sal_uInt16 nCategoryRID )
-{
-    // set image list for active (visible) category of 'catalog'
-    sal_Int16 nIdx = GetToolBoxCategoriesIndex( nCategoryRID );
-    sal_uInt16 nResId = GetImageListRID( nCategoryRID );
-    const ImageList *pImageList = GetImageList( nResId );
-    OSL_ENSURE( pImageList && nIdx >= 0, "image list or index missing" );
-    if (pImageList && nIdx >= 0)
-        vToolBoxCategories[ nIdx ]->SetImageList( *pImageList );
-}
-
-void SmToolBoxWindow::DataChanged( const DataChangedEvent &rEvt )
-{
-    if ( (rEvt.GetType() == DataChangedEventType::SETTINGS) && (rEvt.GetFlags() & AllSettingsFlags::STYLE) )
-        ApplyImageLists( nActiveCategoryRID );
-
-    SfxFloatingWindow::DataChanged( rEvt );
-}
-
-void SmToolBoxWindow::StateChanged( StateChangedType nStateChange )
-{
-    static bool bSetPosition = true;
-    if (StateChangedType::InitShow == nStateChange)
-    {
-        SetCategory( nActiveCategoryRID == USHRT_MAX ? RID_UNBINOPS_CAT : nActiveCategoryRID );
-
-        // calculate initial position to be used after creation of the window...
-        if (bSetPosition)
-        {
-            AdjustPos();
-            bSetPosition = false;
-        }
-    }
-    //... otherwise the base class will remember the last position of the window
-    SfxFloatingWindow::StateChanged( nStateChange );
-}
-
-void SmToolBoxWindow::AdjustPos()
-{
-    SmViewShell *pView = GetView();
-    OSL_ENSURE( pView, "view shell missing" );
-    Point aPos( 50, 75 );
-    if (pView)
-    {
-        Size aWndSize(GetOutputSizePixel());
-        SmGraphicWindow &rWin = pView->GetGraphicWindow();
-        aPos = Point( rWin.OutputToScreenPixel(
-                        Point( rWin.GetSizePixel().Width() - aWndSize.Width(), 0) ) );
-    }
-    if (aPos.X() < 0)
-        aPos.X() = 0;
-    if (aPos.Y() < 0)
-        aPos.Y() = 0;
-    SetPosPixel( aPos );
-}
-
-bool SmToolBoxWindow::Close()
-{
-    SmViewShell *pViewSh = GetView();
-    if (pViewSh)
-        pViewSh->GetViewFrame()->GetDispatcher()->Execute(
-                SID_TOOLBOX, SfxCallMode::RECORD,
-                new SfxBoolItem(SID_TOOLBOX, false), 0L);
-    return true;
-}
-
-void SmToolBoxWindow::GetFocus()
-{
-    // give focus to category toolbox
-    // (allow for cursor travelling when a category is selected with the mouse)
-    m_pToolBoxCat->GrabFocus();
-}
-
-void SmToolBoxWindow::SetCategory(sal_uInt16 nCategoryRID)
-{
-    if (nCategoryRID != nActiveCategoryRID)
-        ApplyImageLists( nCategoryRID );
-
-    sal_uInt16 nLines;
-    // check for valid resource id
-    switch (nCategoryRID)
-    {
-        case RID_UNBINOPS_CAT :     nLines = 4; break;
-        case RID_RELATIONS_CAT:     nLines = 7; break;
-        case RID_SETOPERATIONS_CAT: nLines = 5; break;
-        case RID_FUNCTIONS_CAT:     nLines = 5; break;
-        case RID_OPERATORS_CAT:     nLines = 3; break;
-        case RID_ATTRIBUTES_CAT:    nLines = 5; break;
-        case RID_MISC_CAT:          nLines = 4; break;
-        case RID_BRACKETS_CAT:      nLines = 5; break;
-        case RID_FORMAT_CAT:        nLines = 3; break;
-        default:
-            // nothing to be done
-            return;
-    }
-
-    pToolBoxCmd->Hide();
-
-    sal_Int16 nIdx = GetToolBoxCategoriesIndex( nCategoryRID );
-        OSL_ENSURE( nIdx >= 0, "unknown category" );
-    if (nIdx >= 0)
-        pToolBoxCmd = vToolBoxCategories[nIdx];
-
-    // calculate actual size of window to use
-    Size aCatSize( m_pToolBoxCat->CalcWindowSizePixel( 2 ) );
-    Size aCmdSize( pToolBoxCmd->CalcWindowSizePixel( nLines ) );
-        OSL_ENSURE( aCatSize.Width() == aCmdSize.Width(), "width mismatch" );
-    // main window settings
-    Size  aWndSize ( aCatSize.Width(), pToolBoxCmd->GetPosPixel().Y() + aCmdSize.Height() + 3);
-    SetOutputSizePixel( aWndSize );
-
-    if (nActiveCategoryRID)
-            m_pToolBoxCat->CheckItem(nActiveCategoryRID, false);
-    nActiveCategoryRID = nCategoryRID;
-        m_pToolBoxCat->CheckItem(nActiveCategoryRID, true);
-
-    pToolBoxCmd->Show();
-}
-
-sal_uInt16 SmToolBoxWindow::MapToolbarIdToCategory(sal_uInt16 nId) const
-{
-    if (nId == m_nUnbinopsId)
-        return RID_UNBINOPS_CAT;
-    if (nId == m_nRelationsId)
-        return RID_RELATIONS_CAT;
-    if (nId == m_nSetoperationsId)
-        return RID_SETOPERATIONS_CAT;
-    if (nId == m_nFunctionsId)
-        return RID_FUNCTIONS_CAT;
-    if (nId == m_nOperatorsId)
-        return RID_OPERATORS_CAT;
-    if (nId == m_nAttributesId)
-        return RID_ATTRIBUTES_CAT;
-    if (nId == m_nBracketsId)
-        return RID_BRACKETS_CAT;
-    if (nId == m_nFormatId)
-        return RID_FORMAT_CAT;
-    return RID_MISC_CAT;
-}
-
-IMPL_LINK_TYPED( SmToolBoxWindow, CategoryClickHdl, ToolBox*, pToolBox, void)
-{
-    sal_uInt16 nItemId = pToolBox->GetCurItemId();
-    if (nItemId != 0)
-    {
-        SetCategory(MapToolbarIdToCategory(nItemId));
-    }
-}
-
-IMPL_LINK_TYPED( SmToolBoxWindow, CmdSelectHdl, ToolBox*, pToolBox, void)
-{
-    SmViewShell *pViewSh = GetView();
-    if (pViewSh)
-        pViewSh->GetViewFrame()->GetDispatcher()->Execute(
-                SID_INSERTCOMMAND, SfxCallMode::RECORD,
-                new SfxInt16Item(SID_INSERTCOMMAND, pToolBox->GetCurItemId()), 0L);
-}
-
-
-/**************************************************************************/
-
-SFX_IMPL_FLOATINGWINDOW_WITHID(SmToolBoxWrapper, SID_TOOLBOXWINDOW);
-
-SmToolBoxWrapper::SmToolBoxWrapper(vcl::Window *pParentWindow,
-                                   sal_uInt16 nId, SfxBindings* pBindings,
-                                   SfxChildWinInfo *pInfo) :
-    SfxChildWindow(pParentWindow, nId)
-{
-    eChildAlignment = SfxChildAlignment::NOALIGNMENT;
-
-    pWindow.reset(VclPtr<SmToolBoxWindow>::Create(pBindings, this, pParentWindow));
-    static_cast<SfxFloatingWindow *>(pWindow.get())->Initialize(pInfo);
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/source/toolbox.src b/starmath/source/toolbox.src
index 648b8c288efd..484f33b2a6d7 100644
--- a/starmath/source/toolbox.src
+++ b/starmath/source/toolbox.src
@@ -1411,35 +1411,6 @@
         };
     };
 
-#define UNBINOPS_IDLIST         \
-    IdList =                \
-    {                       \
-        RID_PLUSX ;         \
-        RID_MINUSX ;        \
-        RID_PLUSMINUSX ;    \
-        RID_MINUSPLUSX ;    \
-        RID_XPLUSY ;        \
-        RID_XCDOTY ;        \
-        RID_XTIMESY ;       \
-        RID_XSYMTIMESY ;    \
-        RID_XMINUSY ;       \
-        RID_XOVERY ;        \
-        RID_XDIVY ;         \
-        RID_XSYMDIVIDEY ;   \
-        RID_NEGX ;          \
-        RID_XANDY ;         \
-        RID_XORY ;          \
-        RID_XCIRCY ;        \
-    };                      \
-    IdCount = { 16 ; };
-
-    ImageList RID_IL_UNBINOPS
-    {
-        Prefix = "un";
-        MaskColor = IMAGE_STDBTN_COLOR ;
-        UNBINOPS_IDLIST
-    };
-
 #define RELATIONS_IDLIST         \
     IdList =                \
     {                       \
@@ -1710,26 +1681,4 @@
         MISC_IDLIST
     };
 
-#define CATALOG_IDLIST                  \
-    IdList =                        \
-    {                               \
-        RID_UNBINOPS_CAT ;          \
-        RID_RELATIONS_CAT ;         \
-        RID_SETOPERATIONS_CAT ;     \
-        RID_FUNCTIONS_CAT ;         \
-        RID_OPERATORS_CAT ;         \
-        RID_ATTRIBUTES_CAT ;        \
-        RID_MISC_CAT ;              \
-        RID_BRACKETS_CAT ;          \
-        RID_FORMAT_CAT ;            \
-    };                              \
-    IdCount = { 9 ; };
-
-    ImageList RID_IL_CATALOG
-    {
-        Prefix = "im";
-        MaskColor = IMAGE_STDBTN_COLOR ;
-        CATALOG_IDLIST
-    };
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index f8937e340c32..3de112fd4616 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -68,7 +68,6 @@
 #include "dialog.hxx"
 #include "document.hxx"
 #include "starmath.hrc"
-#include "toolbox.hxx"
 #include "mathmlimport.hxx"
 #include "cursor.hxx"
 #include "accessibility.hxx"
@@ -935,7 +934,6 @@ void SmViewShell::InitInterface_Impl()
     //Dummy-Objectbar, to avoid quiver while activating
 
     GetStaticInterface()->RegisterChildWindow(SID_TASKPANE);
-    GetStaticInterface()->RegisterChildWindow(SmToolBoxWrapper::GetChildWindowId());
     GetStaticInterface()->RegisterChildWindow(SmCmdBoxWrapper::GetChildWindowId());
     GetStaticInterface()->RegisterChildWindow(SmElementsDockingWindowWrapper::GetChildWindowId());
 }
@@ -1801,12 +1799,6 @@ void SmViewShell::Execute(SfxRequest& rReq)
         }
         break;
 
-        case SID_TOOLBOX:
-        {
-            GetViewFrame()->ToggleChildWindow( SmToolBoxWrapper::GetChildWindowId() );
-        }
-        break;
-
         case SID_ELEMENTSDOCKINGWINDOW:
         {
             GetViewFrame()->ToggleChildWindow( SmElementsDockingWindowWrapper::GetChildWindowId() );
@@ -1919,17 +1911,6 @@ void SmViewShell::GetState(SfxItemSet &rSet)
                 rSet.Put(SfxBoolItem(SID_ELEMENTSDOCKINGWINDOW, bState));
             }
             break;
-        case SID_TOOLBOX:
-            {
-                bool bState = false;
-                SfxChildWindow *pChildWnd = GetViewFrame()->
-                        GetChildWindow( SmToolBoxWrapper::GetChildWindowId() );
-                if (pChildWnd  &&  pChildWnd->GetWindow()->IsVisible())
-                    bState = true;
-                rSet.Put(SfxBoolItem(SID_TOOLBOX, bState));
-            }
-            break;
-
         }
     }
 }
diff --git a/starmath/uiconfig/smath/ui/floatingelements.ui b/starmath/uiconfig/smath/ui/floatingelements.ui
deleted file mode 100644
index 899644a593bf..000000000000
--- a/starmath/uiconfig/smath/ui/floatingelements.ui
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
-<interface>
-  <requires lib="gtk+" version="3.0"/>
-  <object class="GtkWindow" id="FloatingElements">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="hexpand">True</property>
-    <property name="vexpand">True</property>
-    <property name="border_width">6</property>
-    <property name="title" translatable="yes">Elements</property>
-    <property name="resizable">False</property>
-    <property name="type_hint">utility</property>
-    <property name="has_resize_grip">False</property>
-    <child>
-      <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="hexpand">True</property>
-        <property name="vexpand">True</property>
-        <property name="row_spacing">12</property>
-        <child>
-          <object class="GtkSeparator" id="separator1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkToolbar" id="catalog">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="toolbar_style">icons</property>
-            <property name="show_arrow">False</property>
-            <child>
-              <object class="GtkToolButton" id="RID_UNBINOPS_CAT">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="action_name">RID_UNBINOPS_CAT</property>
-                <property name="label" translatable="yes">Unary/Binary Operators</property>
-                <property name="use_underline">True</property>
-                <property name="icon_name">starmath/res/im21101.png</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkToolButton" id="RID_RELATIONS_CAT">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="action_name">RID_RELATIONS_CAT</property>
-                <property name="label" translatable="yes">Relations</property>
-                <property name="use_underline">True</property>
-                <property name="icon_name">starmath/res/im21102.png</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkToolButton" id="RID_SETOPERATIONS_CAT">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="action_name">RID_SETOPERATIONS_CAT</property>
-                <property name="label" translatable="yes">Set Operations</property>
-                <property name="use_underline">True</property>
-                <property name="icon_name">starmath/res/im21103.png</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkToolButton" id="RID_FUNCTIONS_CAT">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="action_name">RID_FUNCTIONS_CAT</property>
-                <property name="label" translatable="yes">Functions</property>
-                <property name="use_underline">True</property>
-                <property name="icon_name">starmath/res/im21104.png</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkToolButton" id="RID_OPERATORS_CAT">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="action_name">RID_OPERATORS_CAT</property>
-                <property name="label" translatable="yes">Operators</property>
-                <property name="use_underline">True</property>
-                <property name="icon_name">starmath/res/im21105.png</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkToolButton" id="RID_ATTRIBUTES_CAT">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="action_name">RID_ATTRIBUTES_CAT</property>
-                <property name="label" translatable="yes">Attributes</property>
-                <property name="use_underline">True</property>
-                <property name="icon_name">starmath/res/im21106.png</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkToolButton" id="RID_MISC_CAT">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="action_name">RID_MISC_CAT</property>
-                <property name="label" translatable="yes">Others</property>
-                <property name="use_underline">True</property>
-                <property name="icon_name">starmath/res/im21117.png</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkToolButton" id="RID_BRACKETS_CAT">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="action_name">RID_BRACKETS_CAT</property>
-                <property name="label" translatable="yes">Brackets</property>
-                <property name="use_underline">True</property>
-                <property name="icon_name">starmath/res/im21107.png</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkToolButton" id="RID_FORMAT_CAT">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="action_name">RID_FORMAT_CAT</property>
-                <property name="label" translatable="yes">Formats</property>
-                <property name="use_underline">True</property>
-                <property name="icon_name">starmath/res/im21108.png</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="hexpand">True</property>
-            <property name="vexpand">True</property>
-            <property name="orientation">vertical</property>
-            <child>
-              <placeholder/>
-            </child>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>