diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-10-04 17:14:33 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-10-04 17:25:13 +0100 |
commit | 349f4923e265d76cfd76627796dc93e99e0b5d02 (patch) | |
tree | 02c169c16cb9cfcfd05f1ec8131edafddfa2e7c2 /svx/source/sidebar | |
parent | 5d812cae7eacccb7819a46ae45c577295db9f190 (diff) |
can now remove both PopupContainer copies
the recently unused svx one, and the forgotten not-built sfx2 one
Change-Id: I1a4ede49dc74bb71f250ee3eee999d1a3dfbee57
Diffstat (limited to 'svx/source/sidebar')
-rw-r--r-- | svx/source/sidebar/area/AreaPropertyPanel.cxx | 1 | ||||
-rw-r--r-- | svx/source/sidebar/area/AreaPropertyPanel.hxx | 1 | ||||
-rw-r--r-- | svx/source/sidebar/area/AreaPropertyPanelBase.cxx | 1 | ||||
-rw-r--r-- | svx/source/sidebar/line/LinePropertyPanel.cxx | 1 | ||||
-rw-r--r-- | svx/source/sidebar/line/LinePropertyPanel.hxx | 2 | ||||
-rw-r--r-- | svx/source/sidebar/line/LinePropertyPanelBase.cxx | 1 | ||||
-rw-r--r-- | svx/source/sidebar/text/TextPropertyPanel.cxx | 2 | ||||
-rw-r--r-- | svx/source/sidebar/text/TextPropertyPanel.hxx | 2 | ||||
-rw-r--r-- | svx/source/sidebar/tools/PopupContainer.cxx | 51 |
9 files changed, 0 insertions, 62 deletions
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx index 1afba46385f1..e2610a71d352 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx @@ -16,7 +16,6 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "svx/sidebar/PopupContainer.hxx" #include "AreaTransparencyGradientControl.hxx" #include <sfx2/sidebar/ResourceDefinitions.hrc> diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hxx b/svx/source/sidebar/area/AreaPropertyPanel.hxx index 458ace7ce6c4..98758557cf5e 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.hxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.hxx @@ -45,7 +45,6 @@ class XFillBitmapItem; namespace svx { namespace sidebar { -class PopupContainer; class AreaTransparencyGradientControl; class AreaPropertyPanel : public AreaPropertyPanelBase diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx index 6cb5b08c2254..a48fbf60c172 100644 --- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx @@ -16,7 +16,6 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "svx/sidebar/PopupContainer.hxx" #include "AreaTransparencyGradientControl.hxx" #include <sfx2/sidebar/ResourceDefinitions.hrc> diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx index 45f68d5b3fed..20791b56f127 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.cxx +++ b/svx/source/sidebar/line/LinePropertyPanel.cxx @@ -45,7 +45,6 @@ #include <svx/xlnedit.hxx> #include <svx/xlncapit.hxx> #include <svx/xlinjoit.hxx> -#include "svx/sidebar/PopupContainer.hxx" using namespace css; using namespace css::uno; diff --git a/svx/source/sidebar/line/LinePropertyPanel.hxx b/svx/source/sidebar/line/LinePropertyPanel.hxx index 4d6531ad5bc4..0dd37aa8c075 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.hxx +++ b/svx/source/sidebar/line/LinePropertyPanel.hxx @@ -55,8 +55,6 @@ namespace svx namespace sidebar { -class PopupContainer; - class LinePropertyPanel : public LinePropertyPanelBase, public sfx2::sidebar::IContextChangeReceiver, public sfx2::sidebar::ControllerItem::ItemUpdateReceiverInterface diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx index 653a13fe8f5f..41688c851b29 100644 --- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx +++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx @@ -45,7 +45,6 @@ #include <svx/xlnedit.hxx> #include <svx/xlncapit.hxx> #include <svx/xlinjoit.hxx> -#include "svx/sidebar/PopupContainer.hxx" using namespace css; using namespace css::uno; diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx b/svx/source/sidebar/text/TextPropertyPanel.cxx index b8afb5e750de..6014b1fa067a 100644 --- a/svx/source/sidebar/text/TextPropertyPanel.cxx +++ b/svx/source/sidebar/text/TextPropertyPanel.cxx @@ -27,8 +27,6 @@ #include <svtools/unitconv.hxx> #include <vcl/toolbox.hxx> -#include <svx/sidebar/PopupContainer.hxx> - using namespace css; using namespace css::uno; diff --git a/svx/source/sidebar/text/TextPropertyPanel.hxx b/svx/source/sidebar/text/TextPropertyPanel.hxx index 13ba78aed883..e3d3b4ecf060 100644 --- a/svx/source/sidebar/text/TextPropertyPanel.hxx +++ b/svx/source/sidebar/text/TextPropertyPanel.hxx @@ -35,8 +35,6 @@ class ToolBox; namespace svx { namespace sidebar { -class PopupContainer; - class TextPropertyPanel : public PanelLayout, public ::sfx2::sidebar::IContextChangeReceiver, diff --git a/svx/source/sidebar/tools/PopupContainer.cxx b/svx/source/sidebar/tools/PopupContainer.cxx deleted file mode 100644 index efb478dfa764..000000000000 --- a/svx/source/sidebar/tools/PopupContainer.cxx +++ /dev/null @@ -1,51 +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 "svx/sidebar/PopupContainer.hxx" -#include <sfx2/sidebar/Theme.hxx> -#include <vcl/gradient.hxx> - -namespace svx { namespace sidebar { - -PopupContainer::PopupContainer (vcl::Window* pParent) - : FloatingWindow(pParent, WB_SYSTEMWINDOW | WB_3DLOOK) // | WB_POPUP_FOCUSWIN) -{ -} - -PopupContainer::~PopupContainer() -{ - disposeOnce(); -} - -bool PopupContainer::Notify (NotifyEvent& rEvent) -{ - if (rEvent.GetType() == MouseNotifyEvent::LOSEFOCUS) - { - if ( ! HasChildPathFocus(true)) - { - EndPopupMode(); - } - } - - return FloatingWindow::Notify(rEvent); -} - - -} } // end of namespace svx::sidebar - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |