[Libreoffice-commits] core.git: Branch 'feature/chart-sidebar' - 3 commits - chart2/Library_chartcontroller.mk chart2/source include/svx svx/source
Markus Mohrhard
markus.mohrhard at googlemail.com
Mon Jul 20 14:51:32 PDT 2015
chart2/Library_chartcontroller.mk | 1
chart2/source/controller/sidebar/Chart2PanelFactory.cxx | 3
chart2/source/controller/sidebar/ChartAreaPanel.cxx | 84 ++++++
chart2/source/controller/sidebar/ChartAreaPanel.hxx | 76 +++++
include/svx/sidebar/AreaPropertyPanelBase.hxx | 166 ++++++++++++
include/svx/sidebar/AreaTransparencyGradientPopup.hxx | 48 +++
svx/source/sidebar/area/AreaPropertyPanel.hxx | 2
svx/source/sidebar/area/AreaPropertyPanelBase.cxx | 5
svx/source/sidebar/area/AreaPropertyPanelBase.hxx | 165 -----------
svx/source/sidebar/area/AreaTransparencyGradientControl.cxx | 2
svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx | 2
svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx | 48 ---
12 files changed, 384 insertions(+), 218 deletions(-)
New commits:
commit 79982bbd1d924c3e8d4b27ea214f82282e6d5f96
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Mon Jul 20 23:48:58 2015 +0200
fix the widget name
Change-Id: I889bf792dca59dca6750e4fb05d819a205f6ea21
diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index b5e5443..7754371 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -58,7 +58,7 @@ const sal_Int32 AreaPropertyPanelBase::DEFAULT_BORDER = 0;
AreaPropertyPanelBase::AreaPropertyPanelBase(
vcl::Window* pParent,
const css::uno::Reference<css::frame::XFrame>& rxFrame)
- : PanelLayout(pParent, "AreaPropertyPanelBase", "svx/ui/sidebararea.ui", rxFrame),
+ : PanelLayout(pParent, "AreaPropertyPanel", "svx/ui/sidebararea.ui", rxFrame),
meLastXFS(static_cast<sal_uInt16>(-1)),
mnLastPosGradient(0),
mnLastPosHatch(0),
commit 61e2c8e70050adf52171bb8afbc3186e8b3677ae
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Mon Jul 20 23:46:27 2015 +0200
add skeleton for chart area sidebar panel
Change-Id: I5dc78fede2a51396086a8e4fde627c83c383de24
diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk
index 85df1bc..198640e 100644
--- a/chart2/Library_chartcontroller.mk
+++ b/chart2/Library_chartcontroller.mk
@@ -188,6 +188,7 @@ $(eval $(call gb_Library_add_exception_objects,chartcontroller,\
chart2/source/controller/main/UndoCommandDispatch \
chart2/source/controller/main/UndoGuard \
chart2/source/controller/sidebar/Chart2PanelFactory \
+ chart2/source/controller/sidebar/ChartAreaPanel \
chart2/source/controller/sidebar/ChartAxisPanel \
chart2/source/controller/sidebar/ChartElementsPanel \
chart2/source/controller/sidebar/ChartErrorBarPanel \
diff --git a/chart2/source/controller/sidebar/Chart2PanelFactory.cxx b/chart2/source/controller/sidebar/Chart2PanelFactory.cxx
index a81304b..d45ad84 100644
--- a/chart2/source/controller/sidebar/Chart2PanelFactory.cxx
+++ b/chart2/source/controller/sidebar/Chart2PanelFactory.cxx
@@ -34,6 +34,7 @@
#include "ChartController.hxx"
#include "ChartAxisPanel.hxx"
#include "ChartErrorBarPanel.hxx"
+#include "ChartAreaPanel.hxx"
using namespace css::uno;
using ::rtl::OUString;
@@ -96,6 +97,8 @@ Reference<css::ui::XUIElement> SAL_CALL ChartPanelFactory::createUIElement (
pPanel = ChartAxisPanel::Create(pParentWindow, xFrame, pController);
else if (rsResourceURL.endsWith("/ErrorBarPanel"))
pPanel = ChartErrorBarPanel::Create(pParentWindow, xFrame, pController);
+ else if (rsResourceURL.endsWith("/AreaPanel"))
+ pPanel = ChartAreaPanel::Create(pParentWindow, xFrame, pController);
if (pPanel)
xElement = sfx2::sidebar::SidebarPanelBase::Create(
diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.cxx b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
new file mode 100644
index 0000000..a4241c9
--- /dev/null
+++ b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
@@ -0,0 +1,84 @@
+/* -*- 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 "ChartAreaPanel.hxx"
+
+#include "ChartController.hxx"
+
+namespace chart { namespace sidebar {
+
+VclPtr<vcl::Window> ChartAreaPanel::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<ChartAreaPanel>::Create(
+ pParent, rxFrame, pController);
+}
+
+ChartAreaPanel::ChartAreaPanel(vcl::Window* pParent,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
+ ChartController* /*pController*/):
+ svx::sidebar::AreaPropertyPanelBase(pParent, rxFrame)
+{
+}
+
+ChartAreaPanel::~ChartAreaPanel()
+{
+ disposeOnce();
+}
+
+void ChartAreaPanel::setFillTransparence(const XFillTransparenceItem& /*rItem*/)
+{
+
+}
+
+void ChartAreaPanel::setFillFloatTransparence(const XFillFloatTransparenceItem& /*rItem*/)
+{
+
+}
+
+void ChartAreaPanel::setFillStyle(const XFillStyleItem& /*rItem*/)
+{
+
+}
+
+void ChartAreaPanel::setFillStyleAndColor(const XFillStyleItem* /*pStyleItem*/,
+ const XFillColorItem& /*rColorItem*/)
+{
+
+}
+
+void ChartAreaPanel::setFillStyleAndGradient(const XFillStyleItem* /*pStyleItem*/,
+ const XFillGradientItem& /*rGradientItem*/)
+{
+
+}
+
+void ChartAreaPanel::setFillStyleAndHatch(const XFillStyleItem* /*pStyleItem*/,
+ const XFillHatchItem& /*rHatchItem*/)
+{
+
+}
+
+void ChartAreaPanel::setFillStyleAndBitmap(const XFillStyleItem* /*pStyleItem*/,
+ const XFillBitmapItem& /*rBitmapItem*/)
+{
+
+}
+
+
+} }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.hxx b/chart2/source/controller/sidebar/ChartAreaPanel.hxx
new file mode 100644
index 0000000..4f4ac8b
--- /dev/null
+++ b/chart2/source/controller/sidebar/ChartAreaPanel.hxx
@@ -0,0 +1,76 @@
+/* -*- 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_CHARTAREAPANEL_HXX
+#define INCLUDED_CHART2_SOURCE_CONTROLLER_SIDEBAR_CHARTAREAPANEL_HXX
+
+#include <vcl/ctrl.hxx>
+#include <sfx2/sidebar/ControllerItem.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/AreaPropertyPanelBase.hxx>
+
+class XFillFloatTransparenceItem;
+class XFillTransparenceItem;
+class XFillStyleItem;
+class XFillGradientItem;
+class XFillColorItem;
+class XFillHatchItem;
+class XFillBitmapItem;
+
+namespace chart {
+
+class ChartController;
+
+namespace sidebar {
+
+class ChartAreaPanel : public svx::sidebar::AreaPropertyPanelBase
+{
+public:
+ static VclPtr<vcl::Window> Create(
+ vcl::Window* pParent,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
+ ChartController* pController);
+
+ // constructor/destuctor
+ ChartAreaPanel(
+ vcl::Window* pParent,
+ const css::uno::Reference<css::frame::XFrame>& rxFrame,
+ ChartController* pController);
+
+ virtual ~ChartAreaPanel();
+
+ virtual void setFillTransparence(const XFillTransparenceItem& rItem);
+ virtual void setFillFloatTransparence(const XFillFloatTransparenceItem& rItem);
+ virtual void setFillStyle(const XFillStyleItem& rItem);
+ virtual void setFillStyleAndColor(const XFillStyleItem* pStyleItem, const XFillColorItem& rColorItem);
+ virtual void setFillStyleAndGradient(const XFillStyleItem* pStyleItem, const XFillGradientItem& rGradientItem);
+ virtual void setFillStyleAndHatch(const XFillStyleItem* pStyleItem, const XFillHatchItem& rHatchItem);
+ virtual void setFillStyleAndBitmap(const XFillStyleItem* pStyleItem, const XFillBitmapItem& rBitmapItem);
+
+private:
+
+};
+
+} } // end of namespace svx::sidebar
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 756579d80dfbf298c16d06f5ba0ea9c5ea95c780
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Mon Jul 20 23:14:02 2015 +0200
move header file to public include dir
we will need it in chart2 so make it available
Change-Id: I9ef1feebc2e0086e0647349b4e92f9fc9cdd4e8c
diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.hxx b/include/svx/sidebar/AreaPropertyPanelBase.hxx
similarity index 98%
rename from svx/source/sidebar/area/AreaPropertyPanelBase.hxx
rename to include/svx/sidebar/AreaPropertyPanelBase.hxx
index 5abc15bd..45bda7d 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.hxx
+++ b/include/svx/sidebar/AreaPropertyPanelBase.hxx
@@ -39,6 +39,7 @@
#include <svl/intitem.hxx>
#include <com/sun/star/ui/XUIElement.hpp>
#include <boost/scoped_ptr.hpp>
+#include <svx/svxdllapi.h>
class XFillFloatTransparenceItem;
class XFillTransparenceItem;
@@ -53,7 +54,7 @@ namespace svx { namespace sidebar {
class PopupContainer;
class AreaTransparencyGradientControl;
-class AreaPropertyPanelBase
+class SVX_DLLPUBLIC AreaPropertyPanelBase
: public PanelLayout,
public ::sfx2::sidebar::ControllerItem::ItemUpdateReceiverInterface
{
diff --git a/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx b/include/svx/sidebar/AreaTransparencyGradientPopup.hxx
similarity index 100%
rename from svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx
rename to include/svx/sidebar/AreaTransparencyGradientPopup.hxx
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hxx b/svx/source/sidebar/area/AreaPropertyPanel.hxx
index ec805d7..135154c 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.hxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.hxx
@@ -34,7 +34,7 @@
#include <com/sun/star/ui/XUIElement.hpp>
#include <boost/scoped_ptr.hpp>
-#include "AreaPropertyPanelBase.hxx"
+#include <svx/sidebar/AreaPropertyPanelBase.hxx>
class XFillFloatTransparenceItem;
class XFillTransparenceItem;
diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index f13599c..b5e5443 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -21,7 +21,7 @@
#include <sfx2/sidebar/ResourceDefinitions.hrc>
#include <sfx2/sidebar/ControlFactory.hxx>
-#include <AreaPropertyPanelBase.hxx>
+#include <svx/sidebar/AreaPropertyPanelBase.hxx>
#include <AreaPropertyPanel.hrc>
#include <svx/dialogs.hrc>
#include <svx/dialmgr.hxx>
@@ -37,6 +37,7 @@
#include <svx/svxitems.hrc>
#include <vcl/toolbox.hxx>
#include <svtools/toolbarmenu.hxx>
+#include <svx/tbcontrl.hxx>
#include <boost/bind.hpp>
diff --git a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx
index 04151a8..76b2b28 100644
--- a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx
+++ b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "AreaTransparencyGradientControl.hxx"
-#include "AreaPropertyPanelBase.hxx"
+#include <svx/sidebar/AreaPropertyPanelBase.hxx>
#include "AreaPropertyPanel.hrc"
#include <svx/dialogs.hrc>
diff --git a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx
index 46477e5..fb01754 100644
--- a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx
+++ b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx
@@ -16,7 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "AreaTransparencyGradientPopup.hxx"
+#include <svx/sidebar/AreaTransparencyGradientPopup.hxx>
#include "AreaTransparencyGradientControl.hxx"
namespace svx { namespace sidebar {
More information about the Libreoffice-commits
mailing list