summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/svx/sidebar/AreaPropertyPanelBase.hxx1
-rw-r--r--include/svx/sidebar/PopupContainer.hxx47
-rw-r--r--sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx1
-rw-r--r--sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx3
-rw-r--r--sfx2/inc/sidebar/PopupContainer.hxx40
-rw-r--r--sfx2/source/sidebar/PopupContainer.cxx46
-rw-r--r--svx/Library_svx.mk1
-rw-r--r--svx/inc/pch/precompiled_svx.hxx1
-rw-r--r--svx/source/sidebar/area/AreaPropertyPanel.cxx1
-rw-r--r--svx/source/sidebar/area/AreaPropertyPanel.hxx1
-rw-r--r--svx/source/sidebar/area/AreaPropertyPanelBase.cxx1
-rw-r--r--svx/source/sidebar/line/LinePropertyPanel.cxx1
-rw-r--r--svx/source/sidebar/line/LinePropertyPanel.hxx2
-rw-r--r--svx/source/sidebar/line/LinePropertyPanelBase.cxx1
-rw-r--r--svx/source/sidebar/text/TextPropertyPanel.cxx2
-rw-r--r--svx/source/sidebar/text/TextPropertyPanel.hxx2
-rw-r--r--svx/source/sidebar/tools/PopupContainer.cxx51
-rw-r--r--sw/source/uibase/sidebar/PagePropertyPanel.cxx2
18 files changed, 0 insertions, 204 deletions
diff --git a/include/svx/sidebar/AreaPropertyPanelBase.hxx b/include/svx/sidebar/AreaPropertyPanelBase.hxx
index 2454084e1cdd..b3a37c068b79 100644
--- a/include/svx/sidebar/AreaPropertyPanelBase.hxx
+++ b/include/svx/sidebar/AreaPropertyPanelBase.hxx
@@ -53,7 +53,6 @@ class XFillBitmapItem;
namespace svx { namespace sidebar {
-class PopupContainer;
class AreaTransparencyGradientControl;
class SVX_DLLPUBLIC AreaPropertyPanelBase
diff --git a/include/svx/sidebar/PopupContainer.hxx b/include/svx/sidebar/PopupContainer.hxx
deleted file mode 100644
index f46e77eddbe9..000000000000
--- a/include/svx/sidebar/PopupContainer.hxx
+++ /dev/null
@@ -1,47 +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_SVX_SIDEBAR_POPUPCONTAINER_HXX
-#define INCLUDED_SVX_SIDEBAR_POPUPCONTAINER_HXX
-
-#include <svx/svxdllapi.h>
-#include <vcl/floatwin.hxx>
-
-namespace svx { namespace sidebar {
-
-/** Simple base class for popup container windows used by sidebar
- related drop downs.
- It initializes the underlying floating window with the right
- flags and closes the drop down when appropriate.
-*/
-class SVX_DLLPUBLIC PopupContainer
- : public FloatingWindow
-{
-public:
- PopupContainer (vcl::Window* pParent);
- virtual ~PopupContainer() override;
-
- virtual bool Notify (NotifyEvent& rNEvt) override;
-};
-
-
-} } // end of namespace svx::sidebar
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
index 74fdafdba32a..be8a6f2e8471 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
@@ -33,7 +33,6 @@
#include <editeng/lineitem.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
-#include <svx/sidebar/PopupContainer.hxx>
#include "CellLineStyleControl.hxx"
#include "CellBorderUpdater.hxx"
#include "CellBorderStyleControl.hxx"
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
index a6cfcb0ae66b..20347c2eef5e 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
@@ -28,9 +28,6 @@
#include <memory>
class FixedText;
-namespace svx { namespace sidebar {
- class PopupContainer;
-}}
namespace sc { namespace sidebar {
class CellLineStyleControl;
class CellBorderUpdater;
diff --git a/sfx2/inc/sidebar/PopupContainer.hxx b/sfx2/inc/sidebar/PopupContainer.hxx
deleted file mode 100644
index e34b207ffacc..000000000000
--- a/sfx2/inc/sidebar/PopupContainer.hxx
+++ /dev/null
@@ -1,40 +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_SFX2_INC_SIDEBAR_POPUPCONTAINER_HXX
-#define INCLUDED_SFX2_INC_SIDEBAR_POPUPCONTAINER_HXX
-
-#include <sfx2/dllapi.h>
-#include <vcl/floatwin.hxx>
-
-namespace sfx2 { namespace sidebar {
-
-class SFX2_DLLPUBLIC PopupContainer : public FloatingWindow
-{
-public:
- PopupContainer (vcl::Window* pParent);
- virtual ~PopupContainer();
-
- virtual long Notify (NotifyEvent& rNEvt);
-};
-
-} } // end of namespace sfx2::sidebar
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/PopupContainer.cxx b/sfx2/source/sidebar/PopupContainer.cxx
deleted file mode 100644
index 0b52d1fddc7e..000000000000
--- a/sfx2/source/sidebar/PopupContainer.cxx
+++ /dev/null
@@ -1,46 +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 "precompiled_sfx2.hxx"
-
-#include <sidebar/PopupContainer.hxx>
-
-namespace sfx2 { namespace sidebar {
-
-PopupContainer::PopupContainer (vcl::Window* pParent)
- : FloatingWindow(pParent, WB_SYSTEMWINDOW | WB_3DLOOK)
-{
-}
-
-PopupContainer::~PopupContainer()
-{
-}
-
-long PopupContainer::Notify (NotifyEvent& rEvent)
-{
- if (rEvent.GetType() == MouseNotifyEvent::LOSEFOCUS)
- {
- if( ! HasChildPathFocus(sal_True))
- EndPopupMode();
- }
- return FloatingWindow::Notify(rEvent);
-}
-
-} } // end of namespace sfx2::sidebar
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index 8ff123242783..3f801e7e4bec 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -206,7 +206,6 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
svx/source/sidebar/possize/SidebarDialControl \
svx/source/sidebar/shapes/DefaultShapesPanel \
svx/source/sidebar/shapes/ShapesUtil \
- svx/source/sidebar/tools/PopupContainer \
svx/source/sidebar/tools/ValueSetWithTextControl \
svx/source/stbctrls/pszctrl \
svx/source/stbctrls/insctrl \
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index b2ed4cccf93f..9317ad193bc3 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -437,7 +437,6 @@
#include <svx/sdasitm.hxx>
#include <svx/sdrpaintwindow.hxx>
#include <svx/sidebar/LinePropertyPanelBase.hxx>
-#include <svx/sidebar/PopupContainer.hxx>
#include <svx/srchdlg.hxx>
#include <svx/svddef.hxx>
#include <svx/svdetc.hxx>
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: */
diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.cxx b/sw/source/uibase/sidebar/PagePropertyPanel.cxx
index a051a472d7c5..508cb3e15a16 100644
--- a/sw/source/uibase/sidebar/PagePropertyPanel.cxx
+++ b/sw/source/uibase/sidebar/PagePropertyPanel.cxx
@@ -23,8 +23,6 @@
#include "PagePropertyPanel.hxx"
-#include <svx/sidebar/PopupContainer.hxx>
-
#include <swtypes.hxx>
#include <cmdid.h>