diff options
author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-07-29 02:46:50 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-07-30 05:45:22 +0200 |
commit | 57dcf78e6b17777f499fd7e7c2ee8d129bf0f79b (patch) | |
tree | 9a555967efb2810cd156a66291c331ad63eb2956 | |
parent | fee180f13d48c1fa97a3ecde4b2067e5b0f13fc2 (diff) |
provide structure for chart line panel
Change-Id: I75204a012e4bc59f40a06db814bb9057a1cf8598
-rw-r--r-- | chart2/Library_chartcontroller.mk | 1 | ||||
-rw-r--r-- | chart2/source/controller/sidebar/Chart2PanelFactory.cxx | 3 | ||||
-rw-r--r-- | chart2/source/controller/sidebar/ChartLinePanel.cxx | 211 | ||||
-rw-r--r-- | chart2/source/controller/sidebar/ChartLinePanel.hxx | 104 | ||||
-rw-r--r-- | include/svx/sidebar/LinePropertyPanelBase.hxx (renamed from svx/source/sidebar/line/LinePropertyPanelBase.hxx) | 3 | ||||
-rw-r--r-- | include/svx/sidebar/LineWidthPopup.hxx (renamed from svx/source/sidebar/line/LineWidthPopup.hxx) | 0 | ||||
-rw-r--r-- | svx/source/sidebar/line/LinePropertyPanel.hxx | 3 | ||||
-rw-r--r-- | svx/source/sidebar/line/LinePropertyPanelBase.cxx | 2 | ||||
-rw-r--r-- | svx/source/sidebar/line/LineWidthControl.cxx | 2 | ||||
-rw-r--r-- | svx/source/sidebar/line/LineWidthPopup.cxx | 5 |
10 files changed, 327 insertions, 7 deletions
diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk index 2e03a7e7c134..1dbb89a36c2b 100644 --- a/chart2/Library_chartcontroller.mk +++ b/chart2/Library_chartcontroller.mk @@ -192,6 +192,7 @@ $(eval $(call gb_Library_add_exception_objects,chartcontroller,\ chart2/source/controller/sidebar/ChartAxisPanel \ chart2/source/controller/sidebar/ChartElementsPanel \ chart2/source/controller/sidebar/ChartErrorBarPanel \ + chart2/source/controller/sidebar/ChartLinePanel \ chart2/source/controller/sidebar/ChartSeriesPanel \ chart2/source/controller/sidebar/ChartSidebarModifyListener \ chart2/source/controller/sidebar/ChartSidebarSelectionListener \ diff --git a/chart2/source/controller/sidebar/Chart2PanelFactory.cxx b/chart2/source/controller/sidebar/Chart2PanelFactory.cxx index d45ad8446193..97a96db9ca82 100644 --- a/chart2/source/controller/sidebar/Chart2PanelFactory.cxx +++ b/chart2/source/controller/sidebar/Chart2PanelFactory.cxx @@ -35,6 +35,7 @@ #include "ChartAxisPanel.hxx" #include "ChartErrorBarPanel.hxx" #include "ChartAreaPanel.hxx" +#include "ChartLinePanel.hxx" using namespace css::uno; using ::rtl::OUString; @@ -99,6 +100,8 @@ Reference<css::ui::XUIElement> SAL_CALL ChartPanelFactory::createUIElement ( pPanel = ChartErrorBarPanel::Create(pParentWindow, xFrame, pController); else if (rsResourceURL.endsWith("/AreaPanel")) pPanel = ChartAreaPanel::Create(pParentWindow, xFrame, pController); + else if (rsResourceURL.endsWith("/LinePanel")) + pPanel = ChartLinePanel::Create(pParentWindow, xFrame, pController); if (pPanel) xElement = sfx2::sidebar::SidebarPanelBase::Create( diff --git a/chart2/source/controller/sidebar/ChartLinePanel.cxx b/chart2/source/controller/sidebar/ChartLinePanel.cxx new file mode 100644 index 000000000000..26736d3087d2 --- /dev/null +++ b/chart2/source/controller/sidebar/ChartLinePanel.cxx @@ -0,0 +1,211 @@ +/* -*- 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/. + */ + +#include "ChartLinePanel.hxx" + +#include "PropertyHelper.hxx" +#include "ChartController.hxx" + +#include <com/sun/star/view/XSelectionSupplier.hpp> + +namespace chart { namespace sidebar { + +namespace { + +OUString getCID(css::uno::Reference<css::frame::XModel> xModel) +{ + css::uno::Reference<css::frame::XController> xController(xModel->getCurrentController()); + css::uno::Reference<css::view::XSelectionSupplier> xSelectionSupplier(xController, css::uno::UNO_QUERY); + if (!xSelectionSupplier.is()) + return OUString(); + + css::uno::Any aAny = xSelectionSupplier->getSelection(); + if (!aAny.hasValue()) + return OUString(); + + OUString aCID; + aAny >>= aCID; + + return aCID; +} + +css::uno::Reference<css::beans::XPropertySet> getPropSet( + css::uno::Reference<css::frame::XModel> xModel) +{ + OUString aCID = getCID(xModel); + css::uno::Reference<css::beans::XPropertySet> xPropSet = + ObjectIdentifier::getObjectPropertySet(aCID, xModel); + + ObjectType eType = ObjectIdentifier::getObjectType(aCID); + if (eType == OBJECTTYPE_DIAGRAM) + { + css::uno::Reference<css::chart2::XDiagram> xDiagram( + xPropSet, css::uno::UNO_QUERY); + if (!xDiagram.is()) + return xPropSet; + + xPropSet.set(xDiagram->getWall()); + } + + return xPropSet; +} + +class PreventUpdate +{ +public: + PreventUpdate(bool& bUpdate): + mbUpdate(bUpdate) + { + mbUpdate = false; + } + + ~PreventUpdate() + { + mbUpdate = true; + } + +private: + bool& mbUpdate; +}; + +} + +VclPtr<vcl::Window> ChartLinePanel::Create( + vcl::Window* pParent, + const css::uno::Reference<css::frame::XFrame>& rxFrame, + ChartController* pController) +{ + if (pParent == NULL) + throw css::lang::IllegalArgumentException("no parent Window given to ChartAxisPanel::Create", NULL, 0); + if (!rxFrame.is()) + throw css::lang::IllegalArgumentException("no XFrame given to ChartAxisPanel::Create", NULL, 1); + + return VclPtr<ChartLinePanel>::Create( + pParent, rxFrame, pController); +} + +ChartLinePanel::ChartLinePanel(vcl::Window* pParent, + const css::uno::Reference<css::frame::XFrame>& rxFrame, + ChartController* pController): + svx::sidebar::LinePropertyPanelBase(pParent, rxFrame), + mxModel(pController->getModel()), + mxListener(new ChartSidebarModifyListener(this)), + mxSelectionListener(new ChartSidebarSelectionListener(this)), + mbUpdate(true) +{ + std::vector<ObjectType> aAcceptedTypes { OBJECTTYPE_PAGE, OBJECTTYPE_DIAGRAM, OBJECTTYPE_DATA_SERIES, OBJECTTYPE_TITLE, OBJECTTYPE_LEGEND}; + mxSelectionListener->setAcceptedTypes(aAcceptedTypes); + Initialize(); +} + +ChartLinePanel::~ChartLinePanel() +{ + disposeOnce(); +} + +void ChartLinePanel::dispose() +{ + css::uno::Reference<css::util::XModifyBroadcaster> xBroadcaster(mxModel, css::uno::UNO_QUERY_THROW); + xBroadcaster->removeModifyListener(mxListener); + + css::uno::Reference<css::view::XSelectionSupplier> xSelectionSupplier(mxModel->getCurrentController(), css::uno::UNO_QUERY); + if (xSelectionSupplier.is()) + xSelectionSupplier->removeSelectionChangeListener(mxSelectionListener.get()); + + LinePropertyPanelBase::dispose(); +} + +void ChartLinePanel::Initialize() +{ + css::uno::Reference<css::util::XModifyBroadcaster> xBroadcaster(mxModel, css::uno::UNO_QUERY_THROW); + xBroadcaster->addModifyListener(mxListener); + + css::uno::Reference<css::view::XSelectionSupplier> xSelectionSupplier(mxModel->getCurrentController(), css::uno::UNO_QUERY); + if (xSelectionSupplier.is()) + xSelectionSupplier->addSelectionChangeListener(mxSelectionListener.get()); + + updateData(); +} + +void ChartLinePanel::updateData() +{ + if (!mbUpdate) + return; + + css::uno::Reference<css::beans::XPropertySet> xPropSet = getPropSet(mxModel); + if (!xPropSet.is()) + return; + +} + +void ChartLinePanel::modelInvalid() +{ +} + +void ChartLinePanel::selectionChanged(bool bCorrectType) +{ + if (bCorrectType) + updateData(); +} + +void ChartLinePanel::SelectionInvalid() +{ +} + +void ChartLinePanel::updateModel( + css::uno::Reference<css::frame::XModel> xModel) +{ + css::uno::Reference<css::util::XModifyBroadcaster> xBroadcaster(mxModel, css::uno::UNO_QUERY_THROW); + xBroadcaster->removeModifyListener(mxListener); + + mxModel = xModel; + + css::uno::Reference<css::util::XModifyBroadcaster> xBroadcasterNew(mxModel, css::uno::UNO_QUERY_THROW); + xBroadcasterNew->addModifyListener(mxListener); + + css::uno::Reference<css::view::XSelectionSupplier> xSelectionSupplier(mxModel->getCurrentController(), css::uno::UNO_QUERY); + if (xSelectionSupplier.is()) + xSelectionSupplier->addSelectionChangeListener(mxSelectionListener.get()); +} + +void ChartLinePanel::setLineStyle(const XLineStyleItem& /*rItem*/) +{ +} + +void ChartLinePanel::setLineDash(const XLineDashItem& /*rItem*/) +{ +} + +void ChartLinePanel::setLineEndStyle(const XLineEndItem* /*pItem*/) +{ +} + +void ChartLinePanel::setLineStartStyle(const XLineStartItem* /*pItem*/) +{ +} + +void ChartLinePanel::setLineJoint(const XLineJointItem* /*pItem*/) +{ +} + +void ChartLinePanel::setLineCap(const XLineCapItem* /*pItem*/) +{ +} + +void ChartLinePanel::setLineTransparency(const XLineTransparenceItem& /*rItem*/) +{ +} + +void ChartLinePanel::setLineWidth(const XLineWidthItem& /*rItem*/) +{ +} + +} } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/sidebar/ChartLinePanel.hxx b/chart2/source/controller/sidebar/ChartLinePanel.hxx new file mode 100644 index 000000000000..a2b2ea5b881f --- /dev/null +++ b/chart2/source/controller/sidebar/ChartLinePanel.hxx @@ -0,0 +1,104 @@ +/* -*- 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/. + */ + +#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_SIDEBAR_CHARTLINEPANEL_HXX +#define INCLUDED_CHART2_SOURCE_CONTROLLER_SIDEBAR_CHARTLINEPANEL_HXX + +#include <vcl/ctrl.hxx> +#include <sfx2/sidebar/ControllerItem.hxx> +#include <sfx2/sidebar/SidebarModelUpdate.hxx> +#include <svx/xgrad.hxx> +#include <svx/itemwin.hxx> +#include <svx/xfillit0.hxx> +#include <svx/xflclit.hxx> +#include <svx/xflgrit.hxx> +#include <svx/xflhtit.hxx> +#include <svx/xbtmpit.hxx> +#include <svx/drawitem.hxx> +#include <svx/sidebar/PanelLayout.hxx> +#include <svl/intitem.hxx> +#include <com/sun/star/ui/XUIElement.hpp> +#include <boost/scoped_ptr.hpp> + +#include <svx/sidebar/LinePropertyPanelBase.hxx> + +#include "ChartSidebarModifyListener.hxx" +#include "ChartSidebarSelectionListener.hxx" + +class XFillFloatTransparenceItem; +class XFillTransparenceItem; +class XFillStyleItem; +class XFillGradientItem; +class XFillColorItem; +class XFillHatchItem; +class XFillBitmapItem; + +namespace chart { + +class ChartController; + +namespace sidebar { + +class ChartLinePanel : public svx::sidebar::LinePropertyPanelBase, + public sfx2::sidebar::SidebarModelUpdate, + public ChartSidebarModifyListenerParent, + public ChartSidebarSelectionListenerParent +{ +public: + static VclPtr<vcl::Window> Create( + vcl::Window* pParent, + const css::uno::Reference<css::frame::XFrame>& rxFrame, + ChartController* pController); + + // constructor/destuctor + ChartLinePanel( + vcl::Window* pParent, + const css::uno::Reference<css::frame::XFrame>& rxFrame, + ChartController* pController); + + virtual ~ChartLinePanel(); + + virtual void updateData() SAL_OVERRIDE; + virtual void modelInvalid() SAL_OVERRIDE; + + virtual void selectionChanged(bool bCorrectType) SAL_OVERRIDE; + virtual void SelectionInvalid() SAL_OVERRIDE; + + virtual void dispose() SAL_OVERRIDE; + + virtual void updateModel(css::uno::Reference<css::frame::XModel> xModel) SAL_OVERRIDE; + + virtual void setLineWidth(const XLineWidthItem& rItem) SAL_OVERRIDE; + +protected: + + virtual void setLineStyle(const XLineStyleItem& rItem) SAL_OVERRIDE; + virtual void setLineDash(const XLineDashItem& rItem) SAL_OVERRIDE; + virtual void setLineEndStyle(const XLineEndItem* pItem) SAL_OVERRIDE; + virtual void setLineStartStyle(const XLineStartItem* pItem) SAL_OVERRIDE; + virtual void setLineTransparency(const XLineTransparenceItem& rItem) SAL_OVERRIDE; + virtual void setLineJoint(const XLineJointItem* pItem) SAL_OVERRIDE; + virtual void setLineCap(const XLineCapItem* pItem) SAL_OVERRIDE; + +private: + + css::uno::Reference<css::frame::XModel> mxModel; + css::uno::Reference<css::util::XModifyListener> mxListener; + rtl::Reference<ChartSidebarSelectionListener> mxSelectionListener; + + void Initialize(); + + bool mbUpdate; +}; + +} } // end of namespace svx::sidebar + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.hxx b/include/svx/sidebar/LinePropertyPanelBase.hxx index e5dd0d9897e1..6133061ee79f 100644 --- a/svx/source/sidebar/line/LinePropertyPanelBase.hxx +++ b/include/svx/sidebar/LinePropertyPanelBase.hxx @@ -30,6 +30,7 @@ #include <svx/sidebar/PanelLayout.hxx> #include <svx/xtable.hxx> #include "LineWidthPopup.hxx" +#include <svx/svxdllapi.h> class XLineStyleItem; @@ -61,7 +62,7 @@ namespace sidebar class PopupContainer; class LineWidthControl; -class LinePropertyPanelBase : public PanelLayout +class SVX_DLLPUBLIC LinePropertyPanelBase : public PanelLayout { public: virtual ~LinePropertyPanelBase(); diff --git a/svx/source/sidebar/line/LineWidthPopup.hxx b/include/svx/sidebar/LineWidthPopup.hxx index 772934fb07b3..772934fb07b3 100644 --- a/svx/source/sidebar/line/LineWidthPopup.hxx +++ b/include/svx/sidebar/LineWidthPopup.hxx diff --git a/svx/source/sidebar/line/LinePropertyPanel.hxx b/svx/source/sidebar/line/LinePropertyPanel.hxx index 6a94423cd4cd..45f90f90b558 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.hxx +++ b/svx/source/sidebar/line/LinePropertyPanel.hxx @@ -29,8 +29,7 @@ #include <memory> #include <svx/sidebar/PanelLayout.hxx> #include <svx/xtable.hxx> -#include "LineWidthPopup.hxx" -#include "LinePropertyPanelBase.hxx" +#include <svx/sidebar/LinePropertyPanelBase.hxx> class XLineStyleItem; diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx index 14ad854b5609..c04fa3f2b402 100644 --- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx +++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx @@ -19,7 +19,7 @@ #include <sfx2/sidebar/ResourceDefinitions.hrc> #include <sfx2/sidebar/Theme.hxx> #include <sfx2/sidebar/ControlFactory.hxx> -#include <LinePropertyPanelBase.hxx> +#include <svx/sidebar/LinePropertyPanelBase.hxx> #include <LinePropertyPanel.hrc> #include <svx/dialogs.hrc> #include <svx/dialmgr.hxx> diff --git a/svx/source/sidebar/line/LineWidthControl.cxx b/svx/source/sidebar/line/LineWidthControl.cxx index 2bee185dbdaa..4053c495a047 100644 --- a/svx/source/sidebar/line/LineWidthControl.cxx +++ b/svx/source/sidebar/line/LineWidthControl.cxx @@ -18,7 +18,7 @@ */ #include "LineWidthControl.hxx" #include "LinePropertyPanel.hrc" -#include "LinePropertyPanelBase.hxx" +#include <svx/sidebar/LinePropertyPanelBase.hxx> #include <svx/dialogs.hrc> #include <svx/dialmgr.hxx> diff --git a/svx/source/sidebar/line/LineWidthPopup.cxx b/svx/source/sidebar/line/LineWidthPopup.cxx index 968a58d91193..351d12d11bc3 100644 --- a/svx/source/sidebar/line/LineWidthPopup.cxx +++ b/svx/source/sidebar/line/LineWidthPopup.cxx @@ -16,9 +16,10 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "LineWidthPopup.hxx" +#include <svx/sidebar/LineWidthPopup.hxx> #include "LineWidthControl.hxx" -#include "LinePropertyPanel.hxx" + +#include <svx/sidebar/LinePropertyPanelBase.hxx> #include <unotools/viewoptions.hxx> |