diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-03-21 17:43:00 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-03-22 10:43:16 +0100 |
commit | f4349688a42d22ec845035c6db960e2e338543ad (patch) | |
tree | 0b09ff83bad5981973a68b05252f71e19e4eb751 | |
parent | 19997cdac6bbb046f3f7dc0b1f57c42bd05fc8c8 (diff) |
TableDesignBox is unused
since...
commit 57ca02a7486090f1dd63977bb8fb351f9bf9a7f3
Date: Wed Apr 18 00:04:09 2018 +0200
NB Impress tabbed toolbar big update
Change-Id: I357a65b5f71ff9960f36d2e4ae64117509b41a48
Reviewed-on: https://gerrit.libreoffice.org/69536
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | extras/source/glade/libreoffice-catalog.xml.in | 3 | ||||
-rw-r--r-- | sd/Library_sd.mk | 1 | ||||
-rw-r--r-- | sd/source/ui/table/TableDesignBox.cxx | 80 | ||||
-rw-r--r-- | solenv/clang-format/blacklist | 1 |
4 files changed, 0 insertions, 85 deletions
diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in index b746936d8ecf..2379ecc64e16 100644 --- a/extras/source/glade/libreoffice-catalog.xml.in +++ b/extras/source/glade/libreoffice-catalog.xml.in @@ -486,9 +486,6 @@ <glade-widget-class title="Horizontal box hiding children depending on its priorities" name="sfxlo-PriorityMergedHBox" generic-name="PriorityMergedHBox" parent="GtkBox" icon-name="widget-gtk-box"/> - <glade-widget-class title="Table Design Control" name="sdlo-TableDesignBox" - generic-name="TableDesignBox" parent="GtkImage" - icon-name="widget-gtk-image"/> <glade-widget-class title="Box which can move own content to the popup" name="sfxlo-DropdownBox" generic-name="DropdownBox" parent="GtkBox" icon-name="widget-gtk-box"/> diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index e0cff8ce0d2c..cf181c303a95 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -400,7 +400,6 @@ $(eval $(call gb_Library_add_exception_objects,sd,\ sd/source/ui/slidesorter/view/SlsTheme \ sd/source/ui/slidesorter/view/SlsToolTip \ sd/source/ui/slidesorter/view/SlsViewCacheContext \ - sd/source/ui/table/TableDesignBox \ sd/source/ui/table/TableDesignPane \ sd/source/ui/table/tablefunction \ sd/source/ui/table/tableobjectbar \ diff --git a/sd/source/ui/table/TableDesignBox.cxx b/sd/source/ui/table/TableDesignBox.cxx deleted file mode 100644 index 2f7de8d64e9a..000000000000 --- a/sd/source/ui/table/TableDesignBox.cxx +++ /dev/null @@ -1,80 +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 <ViewShellBase.hxx> -#include <sfx2/viewfrm.hxx> -#include "TableDesignPane.hxx" -#include <vcl/builderfactory.hxx> -#include <vcl/layout.hxx> - -namespace sd -{ - -class TableDesignBox : public VclVBox -{ - VclPtr<TableDesignPane> m_pPane; - bool m_bIsInitialized; - -public: - explicit TableDesignBox(vcl::Window* pParent); - ~TableDesignBox() override; - - virtual void dispose() override; - virtual void StateChanged(StateChangedType nStateChange) override; -}; - -VCL_BUILDER_FACTORY(TableDesignBox); - -TableDesignBox::TableDesignBox(vcl::Window* pParent) - : VclVBox(pParent) - , m_bIsInitialized(false) -{ -} - -TableDesignBox::~TableDesignBox() -{ - disposeOnce(); -} - -void TableDesignBox::dispose() -{ - m_pPane.disposeAndClear(); - VclVBox::dispose(); -} - -void TableDesignBox::StateChanged(StateChangedType nStateChange) -{ - if(SfxViewFrame::Current() && !m_bIsInitialized) - { - ViewShellBase* pBase = ViewShellBase::GetViewShellBase(SfxViewFrame::Current()); - - if(pBase) - { - m_pPane = VclPtr<TableDesignPane>::Create(this, *pBase, false); - m_pPane->Show(); - m_pPane->SetSizePixel(GetSizePixel()); - m_bIsInitialized = true; - } - } - VclVBox::StateChanged(nStateChange); -} - -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 2f817031469c..9d0b6069e1cd 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -12464,7 +12464,6 @@ sd/source/ui/slidesorter/view/SlsTheme.cxx sd/source/ui/slidesorter/view/SlsToolTip.cxx sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx -sd/source/ui/table/TableDesignBox.cxx sd/source/ui/table/TableDesignPane.cxx sd/source/ui/table/TableDesignPane.hxx sd/source/ui/table/tablefunction.cxx |