Repository.mk | 3 bin/check-elf-dynamic-objects | 2 bin/update_pch | 1 chart2/IwyuFilter_chart2.yaml | 12 chart2/Library_chartcontroller.mk | 2 chart2/Library_chartcore.mk | 17 chart2/Library_chartopengl.mk | 64 chart2/Module_chart2.mk | 6 chart2/Package_opengl.mk | 41 chart2/inc/ChartModel.hxx | 15 chart2/inc/ChartView.hxx | 10 chart2/inc/bitmaps.hlst | 2 chart2/inc/pch/precompiled_chartopengl.cxx | 12 chart2/inc/pch/precompiled_chartopengl.hxx | 36 chart2/inc/strings.hrc | 2 chart2/inc/unonames.hxx | 1 chart2/opengl/backgroundFragmentShader.glsl | 19 chart2/opengl/backgroundVertexShader.glsl | 23 chart2/opengl/commonFragmentShader.glsl | 20 chart2/opengl/commonVertexShader.glsl | 23 chart2/opengl/debugFragmentShader.glsl | 19 chart2/opengl/debugVertexShader.glsl | 21 chart2/opengl/pickingFragmentShader.glsl | 24 chart2/opengl/pickingVertexShader.glsl | 28 chart2/opengl/renderTextureFragmentShader.glsl | 21 chart2/opengl/renderTextureVertexShader.glsl | 21 chart2/opengl/screenTextFragmentShader.glsl | 23 chart2/opengl/screenTextVertexShader.glsl | 21 chart2/opengl/shape3DFragmentShader.glsl | 112 chart2/opengl/shape3DFragmentShaderBatch.glsl | 108 chart2/opengl/shape3DFragmentShaderBatchScroll.glsl | 112 chart2/opengl/shape3DFragmentShaderV300.glsl | 93 chart2/opengl/shape3DVertexShader.glsl | 32 chart2/opengl/shape3DVertexShaderBatch.glsl | 36 chart2/opengl/shape3DVertexShaderBatchScroll.glsl | 41 chart2/opengl/shape3DVertexShaderV300.glsl | 36 chart2/opengl/symbolFragmentShader.glsl | 101 chart2/opengl/symbolVertexShader.glsl | 23 chart2/opengl/textFragmentShader.glsl | 23 chart2/opengl/textFragmentShaderBatch.glsl | 24 chart2/opengl/textVertexShader.glsl | 22 chart2/opengl/textVertexShaderBatch.glsl | 24 chart2/source/chartcore.component | 5 chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx | 11 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx | 10 chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx | 136 chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.hxx | 38 chart2/source/controller/dialogs/ChartTypeDialogController.cxx | 19 chart2/source/controller/dialogs/ChartTypeDialogController.hxx | 1 chart2/source/controller/dialogs/GL3DBarChartDialogController.cxx | 57 chart2/source/controller/dialogs/GL3DBarChartDialogController.hxx | 36 chart2/source/controller/dialogs/tp_ChartType.cxx | 53 chart2/source/controller/dialogs/tp_ChartType.hxx | 2 chart2/source/controller/inc/ChartWindow.hxx | 1 chart2/source/controller/main/ChartController.cxx | 4 chart2/source/controller/main/ChartWindow.cxx | 52 chart2/source/inc/FastPropertyIdRanges.hxx | 1 chart2/source/inc/servicenames_charttypes.hxx | 1 chart2/source/model/main/ChartModel.cxx | 26 chart2/source/model/template/ChartTypeManager.cxx | 16 chart2/source/model/template/GL3DBarChartType.cxx | 166 chart2/source/model/template/GL3DBarChartType.hxx | 58 chart2/source/model/template/GL3DBarChartTypeTemplate.cxx | 195 chart2/source/model/template/GL3DBarChartTypeTemplate.hxx | 62 chart2/source/view/charttypes/GL3DBarChart.cxx | 1503 ----- chart2/source/view/inc/3DChartObjects.hxx | 159 chart2/source/view/inc/AbstractShapeFactory.hxx | 9 chart2/source/view/inc/GL3DBarChart.hxx | 210 chart2/source/view/inc/GL3DPlotterBase.hxx | 35 chart2/source/view/inc/GL3DRenderer.hxx | 491 - chart2/source/view/inc/OpenglShapeFactory.hxx | 206 chart2/source/view/inc/ShapeFactory.hxx | 8 chart2/source/view/inc/StaticGeometry.h | 135 chart2/source/view/main/3DChartObjects.cxx | 234 chart2/source/view/main/AbstractShapeFactory.cxx | 60 chart2/source/view/main/ChartView.cxx | 250 chart2/source/view/main/DummyXShape.cxx | 1099 ---- chart2/source/view/main/DummyXShape.hxx | 402 - chart2/source/view/main/GL3DPlotterBase.cxx | 18 chart2/source/view/main/GL3DRenderer.cxx | 2600 ---------- chart2/source/view/main/OpenGLRender.cxx | 1024 --- chart2/source/view/main/OpenGLRender.hxx | 192 chart2/source/view/main/OpenglShapeFactory.cxx | 504 - chart2/uiconfig/ui/tp_ChartType.ui | 27 compilerplugins/clang/constantparam.booleans.results | 16 compilerplugins/clang/constantparam.numbers.results | 20 compilerplugins/clang/singlevalfields.results | 3 compilerplugins/clang/unusedenumconstants.writeonly.results | 12 compilerplugins/clang/unusedfields.only-used-in-constructor.results | 10 compilerplugins/clang/unusedfields.untouched.results | 10 compilerplugins/clang/unusedfields.writeonly.results | 8 dev/null |binary embeddedobj/source/general/docholder.cxx | 3 icon-themes/breeze_svg/chart2/res/gl3dbar_roundrect.svg | 1 icon-themes/breeze_svg/chart2/res/typegl3dbar_16.svg | 10 icon-themes/colibre_svg/chart2/res/gl3dbar_roundrect.svg | 1 icon-themes/colibre_svg/chart2/res/typegl3dbar_16.svg | 1 icon-themes/elementary_svg/chart2/res/gl3dbar_roundrect.svg | 1 icon-themes/elementary_svg/chart2/res/typegl3dbar_16.svg | 1 include/svtools/embedhlp.hxx | 2 include/svx/charthelper.hxx | 3 include/svx/svdoole2.hxx | 1 include/xmloff/xmltoken.hxx | 2 offapi/UnoApi_offapi.mk | 1 offapi/com/sun/star/chart2/X3DChartWindowProvider.idl | 33 offapi/com/sun/star/chart2/XChartDocument.idl | 4 sc/source/ui/drawfunc/fuins2.cxx | 1 sc/source/ui/view/tabvwsh4.cxx | 1 sfx2/source/view/ipclient.cxx | 6 sfx2/source/view/viewsh.cxx | 3 solenv/bin/native-code.py | 1 solenv/clang-format/blacklist | 24 svtools/source/misc/embedhlp.cxx | 25 svx/source/sdr/contact/viewobjectcontact.cxx | 8 svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx | 3 svx/source/svdraw/charthelper.cxx | 31 svx/source/svdraw/svdoole2.cxx | 17 sw/source/core/doc/notxtfrm.cxx | 5 xmloff/source/chart/PropertyMap.hxx | 3 xmloff/source/chart/SchXMLTools.cxx | 9 xmloff/source/chart/SchXMLTools.hxx | 1 xmloff/source/core/xmltoken.cxx | 2 xmloff/source/token/tokens.txt | 2 123 files changed, 13 insertions(+), 11664 deletions(-)
New commits: commit 026e2623f7f498432e6dc970fb06145dfc77dc45 Author: Markus Mohrhard <[email protected]> AuthorDate: Mon Jul 16 22:58:53 2018 +0200 Commit: Markus Mohrhard <[email protected]> CommitDate: Tue Jul 17 02:59:19 2018 +0200 remove the GL based 3D charts Change-Id: Ia578c71ae70aa0a85b49fa50138edf90f961b1e9 Reviewed-on: https://gerrit.libreoffice.org/57533 Tested-by: Jenkins Reviewed-by: Markus Mohrhard <[email protected]> diff --git a/Repository.mk b/Repository.mk index e8e5af6e81f8..3907ee680922 100644 --- a/Repository.mk +++ b/Repository.mk @@ -345,9 +345,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ canvastools \ chartcore \ chartcontroller \ - $(if $(ENABLE_HEADLESS),, \ - chartopengl \ - ) \ $(call gb_Helper_optional,OPENCL,clew) \ $(if $(filter $(OS),WNT),,cmdmail) \ cppcanvas \ diff --git a/bin/check-elf-dynamic-objects b/bin/check-elf-dynamic-objects index f5e4b0e0d4e1..0c5ca1e37487 100755 --- a/bin/check-elf-dynamic-objects +++ b/bin/check-elf-dynamic-objects @@ -152,7 +152,7 @@ local file="$1" */libdesktop_detectorlo.so|*/ui-previewer|*/oosplash|*/gengal.bin) whitelist="${whitelist} ${x11whitelist}" ;; - */libvclplug_genlo.so|*/libchartcorelo.so|*/libavmediaogl.so|*/libOGLTranslo.so|*/liboglcanvaslo.so|*/libchartopengllo.so) + */libvclplug_genlo.so|*/libchartcorelo.so|*/libavmediaogl.so|*/libOGLTranslo.so|*/liboglcanvaslo.so) whitelist="${whitelist} ${x11whitelist} ${openglwhitelist}" ;; */libvcllo.so) diff --git a/bin/update_pch b/bin/update_pch index 9b04e4cd4470..8d0c1599056a 100755 --- a/bin/update_pch +++ b/bin/update_pch @@ -47,7 +47,6 @@ DEFAULTS = \ 'basic.sb' : ( 2, EXCLUDE, EXCLUDE, INCLUDE), # 10.7 'chart2.chartcontroller' : ( 6, EXCLUDE, INCLUDE, INCLUDE), # 18.4 'chart2.chartcore' : ( 3, EXCLUDE, EXCLUDE, INCLUDE), # 22.5 - 'chart2.chartopengl' : (12, EXCLUDE, EXCLUDE, EXCLUDE), # 5.3 'comphelper.comphelper' : ( 4, EXCLUDE, INCLUDE, INCLUDE), # 7.6 'configmgr.configmgr' : ( 6, EXCLUDE, INCLUDE, INCLUDE), # 6.0 'connectivity.ado' : ( 2, EXCLUDE, EXCLUDE, EXCLUDE), # 6.4 diff --git a/chart2/IwyuFilter_chart2.yaml b/chart2/IwyuFilter_chart2.yaml index f95dad4807b7..9566f7cf9a15 100644 --- a/chart2/IwyuFilter_chart2.yaml +++ b/chart2/IwyuFilter_chart2.yaml @@ -348,18 +348,6 @@ blacklist: chart2/source/view/inc/Linear3DTransformation.hxx: # base class has to be a complete type - com/sun/star/chart2/XTransformation.hpp - chart2/source/view/inc/GL3DRenderer.hxx: - # base class has to be a complete type - - boost/shared_array.hpp - - map - - vector - chart2/source/view/inc/GL3DBarChart.hxx: - # base class has to be a complete type - - deque - - memory - - vector - - GL3DPlotterBase.hxx - - vcl/idle.hxx chart2/source/view/inc/VLineProperties.hxx: # base class has to be a complete type - com/sun/star/uno/Reference.h diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk index 7c0cc90a1d14..ae8535e5fa3c 100644 --- a/chart2/Library_chartcontroller.mk +++ b/chart2/Library_chartcontroller.mk @@ -75,7 +75,6 @@ $(eval $(call gb_Library_add_exception_objects,chartcontroller,\ chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty \ chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties \ chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty \ - chart2/source/controller/chartapiwrapper/WrappedGL3DProperties \ chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty \ chart2/source/controller/chartapiwrapper/WrappedScaleProperty \ chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties \ @@ -88,7 +87,6 @@ $(eval $(call gb_Library_add_exception_objects,chartcontroller,\ chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty \ chart2/source/controller/dialogs/ChangingResource \ chart2/source/controller/dialogs/ChartTypeDialogController \ - chart2/source/controller/dialogs/GL3DBarChartDialogController \ chart2/source/controller/dialogs/DataBrowser \ chart2/source/controller/dialogs/DataBrowserModel \ chart2/source/controller/dialogs/DialogModel \ diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk index 69d4c0552636..bed8c218d79b 100644 --- a/chart2/Library_chartcore.mk +++ b/chart2/Library_chartcore.mk @@ -23,17 +23,10 @@ $(eval $(call gb_Library_add_defs,chartcore,\ -DOOO_DLLIMPLEMENTATION_CHARTVIEW \ )) -ifeq ($(SYSTEM_GLM),TRUE) -$(eval $(call gb_Library_add_defs,chartcore,\ - -DGLM_ENABLE_EXPERIMENTAL \ -)) -endif - $(eval $(call gb_Library_set_precompiled_header,chartcore,$(SRCDIR)/chart2/inc/pch/precompiled_chartcore)) $(eval $(call gb_Library_use_externals,chartcore,\ boost_headers \ - glm_headers \ )) ifeq ($(ENABLE_HEADLESS),) @@ -125,14 +118,6 @@ $(eval $(call gb_Library_add_exception_objects,chartcore,\ chart2/source/view/main/VTitle \ chart2/source/view/main/VButton \ )) -ifeq ($(ENABLE_HEADLESS),) -$(eval $(call gb_Library_add_exception_objects,chartcore,\ - chart2/source/view/main/3DChartObjects \ - chart2/source/view/main/GL3DPlotterBase \ - chart2/source/view/main/GL3DRenderer \ - chart2/source/view/charttypes/GL3DBarChart \ -)) -endif # model pieces ... $(eval $(call gb_Library_add_exception_objects,chartcore,\ @@ -172,8 +157,6 @@ $(eval $(call gb_Library_add_exception_objects,chartcore,\ chart2/source/model/template/ColumnLineDataInterpreter \ chart2/source/model/template/DataInterpreter \ chart2/source/model/template/FilledNetChartType \ - chart2/source/model/template/GL3DBarChartType \ - chart2/source/model/template/GL3DBarChartTypeTemplate \ chart2/source/model/template/LineChartType \ chart2/source/model/template/LineChartTypeTemplate \ chart2/source/model/template/NetChartType \ diff --git a/chart2/Library_chartopengl.mk b/chart2/Library_chartopengl.mk deleted file mode 100644 index 8b5a22c4ab66..000000000000 --- a/chart2/Library_chartopengl.mk +++ /dev/null @@ -1,64 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# 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/. -# - -$(eval $(call gb_Library_Library,chartopengl)) - -$(eval $(call gb_Library_set_include,chartopengl,\ - -I$(SRCDIR)/chart2/inc \ - -I$(SRCDIR)/chart2/source/model/inc \ - -I$(SRCDIR)/chart2/source/view/inc \ - -I$(SRCDIR)/chart2/source/inc \ - $$(INCLUDE) \ -)) - -$(eval $(call gb_Library_set_precompiled_header,chartopengl,$(SRCDIR)/chart2/inc/pch/precompiled_chartopengl)) - -$(eval $(call gb_Library_use_externals,chartopengl,\ - boost_headers \ - glm_headers \ - epoxy \ -)) - -$(eval $(call gb_Library_use_sdk_api,chartopengl)) - -$(eval $(call gb_Library_use_libraries,chartopengl,\ - basegfx \ - chartcore \ - comphelper \ - cppu \ - cppuhelper \ - drawinglayer \ - editeng \ - fwe \ - i18nlangtag \ - sal \ - sfx \ - svl \ - svt \ - svxcore \ - tl \ - tk \ - ucbhelper \ - utl \ - vcl \ -)) - -$(eval $(call gb_Library_add_exception_objects,chartopengl,\ - chart2/source/view/main/OpenglShapeFactory \ - chart2/source/view/main/DummyXShape \ - chart2/source/view/main/OpenGLRender \ -)) - -ifeq ($(SYSTEM_GLM),TRUE) -$(eval $(call gb_Library_add_defs,chartopengl,\ - -DGLM_ENABLE_EXPERIMENTAL \ -)) -endif - -# vim: set noet sw=4 ts=4: diff --git a/chart2/Module_chart2.mk b/chart2/Module_chart2.mk index c044d016a91a..8576bf560f50 100644 --- a/chart2/Module_chart2.mk +++ b/chart2/Module_chart2.mk @@ -14,12 +14,6 @@ $(eval $(call gb_Module_add_targets,chart2,\ Library_chartcore \ UIConfig_chart2 \ )) -ifeq ($(ENABLE_HEADLESS),) -$(eval $(call gb_Module_add_targets,chart2,\ - Library_chartopengl \ - Package_opengl \ - )) -endif $(eval $(call gb_Module_add_l10n_targets,chart2,\ AllLangMoTarget_chart \ diff --git a/chart2/Package_opengl.mk b/chart2/Package_opengl.mk deleted file mode 100644 index aa12a9578366..000000000000 --- a/chart2/Package_opengl.mk +++ /dev/null @@ -1,41 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# 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/. -# - -$(eval $(call gb_Package_Package,chart2_opengl_shader,$(SRCDIR)/chart2/opengl)) - -$(eval $(call gb_Package_add_files,chart2_opengl_shader,$(LIBO_ETC_FOLDER)/opengl,\ - backgroundFragmentShader.glsl \ - backgroundVertexShader.glsl \ - commonFragmentShader.glsl \ - commonVertexShader.glsl \ - debugFragmentShader.glsl \ - debugVertexShader.glsl \ - pickingVertexShader.glsl \ - pickingFragmentShader.glsl \ - symbolFragmentShader.glsl \ - symbolVertexShader.glsl \ - textFragmentShader.glsl \ - textVertexShader.glsl \ - screenTextFragmentShader.glsl \ - screenTextVertexShader.glsl \ - shape3DFragmentShader.glsl \ - shape3DVertexShader.glsl \ - renderTextureVertexShader.glsl \ - renderTextureFragmentShader.glsl \ - shape3DFragmentShaderBatch.glsl \ - shape3DVertexShaderBatch.glsl \ - shape3DFragmentShaderV300.glsl \ - shape3DVertexShaderV300.glsl \ - textFragmentShaderBatch.glsl \ - textVertexShaderBatch.glsl \ - shape3DFragmentShaderBatchScroll.glsl \ - shape3DVertexShaderBatchScroll.glsl \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx index 880cebccedbf..dcf21fc02130 100644 --- a/chart2/inc/ChartModel.hxx +++ b/chart2/inc/ChartModel.hxx @@ -46,7 +46,6 @@ #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/chart2/XTitled.hpp> -#include <com/sun/star/chart2/X3DChartWindowProvider.hpp> #include <com/sun/star/frame/XLoadable.hpp> #include <com/sun/star/datatransfer/XTransferable.hpp> @@ -68,7 +67,6 @@ namespace com { namespace sun { namespace star { namespace frame { class XModel; namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } class SvNumberFormatter; -class OpenGLWindow; namespace chart { @@ -100,7 +98,6 @@ typedef cppu::WeakImplHelper< ,css::document::XDocumentPropertiesSupplier ,css::chart2::data::XDataSource ,css::document::XUndoManagerSupplier - ,css::chart2::X3DChartWindowProvider ,css::util::XUpdatable ,css::qa::XDumper > @@ -371,8 +368,6 @@ public: virtual void SAL_CALL createDefaultChart() override; - virtual sal_Bool SAL_CALL isOpenGLChart() override; - // ____ XDataReceiver (public API) ____ virtual void SAL_CALL attachDataProvider( const css::uno::Reference< css::chart2::data::XDataProvider >& xProvider ) override; @@ -450,9 +445,6 @@ public: // ____ XDataSource ____ allows access to the currently used data and data ranges virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() override; - // X3DChartWindowProvider - virtual void SAL_CALL setWindow( sal_uInt64 nWindowPtr ) override; - // XUpdatable virtual void SAL_CALL update() override; @@ -475,16 +467,9 @@ public: void removeDataProviders(); -#if HAVE_FEATURE_OPENGL - OpenGLWindow* getOpenGLWindow() { return mpOpenGLWindow;} -#endif - private: sal_Int32 mnStart; sal_Int32 mnEnd; -#if HAVE_FEATURE_OPENGL - VclPtr<OpenGLWindow> mpOpenGLWindow; -#endif }; } // namespace chart diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx index 0736062c201e..9d71af8c8eab 100644 --- a/chart2/inc/ChartView.hxx +++ b/chart2/inc/ChartView.hxx @@ -54,8 +54,6 @@ namespace chart { class VCoordinateSystem; class DrawModelWrapper; class VDataSeries; -class GL3DPlotterBase; -class GL2DRenderer; struct CreateShapeParam2D; struct TimeBasedInfo @@ -96,7 +94,6 @@ class ChartView : public ::cppu::WeakImplHelper< , public ExplicitValueProvider , private SfxListener { - friend class GL2DRenderer; private: void init(); @@ -182,14 +179,11 @@ public: virtual OUString SAL_CALL dump() override; void setViewDirty(); - void updateOpenGLWindow(); private: //methods void createShapes(); void createShapes2D( const css::awt::Size& rPageSize ); bool createAxisTitleShapes2D( CreateShapeParam2D& rParam, const css::awt::Size& rPageSize ); - void createShapes3D(); - bool isReal3DChart(); void getMetaFile( const css::uno::Reference< css::io::XOutputStream >& xOutStream , bool bUseHighContrast ); SdrPage* getSdrPage(); @@ -201,8 +195,6 @@ private: //methods void impl_updateView( bool bCheckLockedCtrler = true ); - void render(); - css::awt::Rectangle impl_createDiagramAndContent( const CreateShapeParam2D& rParam, const css::awt::Size& rPageSize ); DECL_LINK( UpdateTimeBased, Timer*, void ); @@ -255,10 +247,8 @@ private: //member css::awt::Rectangle m_aResultingDiagramRectangleExcludingAxes; - std::shared_ptr<GL3DPlotterBase> m_pGL3DPlotter; TimeBasedInfo maTimeBased; osl::Mutex maTimeMutex; - std::unique_ptr<GL2DRenderer> mp2DRenderer; }; } diff --git a/chart2/inc/bitmaps.hlst b/chart2/inc/bitmaps.hlst index 4e8a3109a5c4..3274c7fa7c9e 100644 --- a/chart2/inc/bitmaps.hlst +++ b/chart2/inc/bitmaps.hlst @@ -20,9 +20,7 @@ #define BMP_TYPE_STOCK "chart2/res/typestock_16.png" #define BMP_TYPE_COLUMN_LINE "chart2/res/typecolumnline_16.png" #define BMP_TYPE_BUBBLE "chart2/res/typebubble_16.png" -#define BMP_TYPE_GL3D_BAR "chart2/res/typegl3dbar_16.png" #define BMP_BUBBLE_1 "chart2/res/bubble_52x60.png" -#define BMP_GL3D_BAR_ROUNDRECT "chart2/res/gl3dbar_roundrect.png" #define BMP_AREAS_2D "chart2/res/areas_52x60.png" #define BMP_AREAS_2D_1 "chart2/res/areaspiled_52x60.png" #define BMP_AREAS_2D_3 "chart2/res/areasfull_52x60.png" diff --git a/chart2/inc/pch/precompiled_chartopengl.cxx b/chart2/inc/pch/precompiled_chartopengl.cxx deleted file mode 100644 index 985b84c0a382..000000000000 --- a/chart2/inc/pch/precompiled_chartopengl.cxx +++ /dev/null @@ -1,12 +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/. - */ - -#include "precompiled_chartopengl.hxx" - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/inc/pch/precompiled_chartopengl.hxx b/chart2/inc/pch/precompiled_chartopengl.hxx deleted file mode 100644 index e34013354c75..000000000000 --- a/chart2/inc/pch/precompiled_chartopengl.hxx +++ /dev/null @@ -1,36 +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 has been autogenerated by update_pch.sh. It is possible to edit it - manually (such as when an include file has been moved/renamed/removed). All such - manual changes will be rewritten by the next run of update_pch.sh (which presumably - also fixes all possible problems, so it's usually better to use it). - - Generated on 2017-09-20 22:51:46 using: - ./bin/update_pch chart2 chartopengl --cutoff=12 --exclude:system --exclude:module --exclude:local - - If after updating build fails, use the following command to locate conflicting headers: - ./bin/update_pch_bisect ./chart2/inc/pch/precompiled_chartopengl.hxx "make chart2.build" --find-conflicts -*/ - -#include <ostream> -#include <osl/interlck.h> -#include <osl/mutex.hxx> -#include <osl/thread.hxx> -#include <rtl/instance.hxx> -#include <rtl/math.hxx> -#include <rtl/ref.hxx> -#include <rtl/stringutils.hxx> -#include <rtl/textenc.h> -#include <rtl/ustring.h> -#include <sal/config.h> -#include <sal/log.hxx> - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/inc/strings.hrc b/chart2/inc/strings.hrc index e4a1844d1f18..e2eb6085f8f0 100644 --- a/chart2/inc/strings.hrc +++ b/chart2/inc/strings.hrc @@ -184,8 +184,6 @@ #define STR_FILLED NC_("STR_FILLED", "Filled") #define STR_TYPE_BUBBLE NC_("STR_TYPE_BUBBLE", "Bubble") #define STR_BUBBLE_1 NC_("STR_BUBBLE_1", "Bubble Chart") -#define STR_TYPE_GL3D_BAR NC_("STR_TYPE_GL3D_BAR", "GL3D Bar") -#define STR_GL3D_BAR NC_("STR_GL3D_BAR", "GL3D Bar Chart") #define STR_INVALID_NUMBER NC_("STR_INVALID_NUMBER", "Numbers are required. Check your input.") #define STR_STEP_GT_ZERO NC_("STR_STEP_GT_ZERO", "The major interval requires a positive number. Check your input.") diff --git a/chart2/inc/unonames.hxx b/chart2/inc/unonames.hxx index 44c3bf67d3cb..ba8011431809 100644 --- a/chart2/inc/unonames.hxx +++ b/chart2/inc/unonames.hxx @@ -11,7 +11,6 @@ #define INCLUDED_CHART2_INC_UNONAMES_HXX #define CHART_UNONAME_SORT_BY_XVALUES "SortByXValues" -#define CHART_UNONAME_ROUNDED_EDGE "RoundedEdge" #define CHART_UNONAME_SPLINE_TYPE "SplineType" #define CHART_UNONAME_SPLINE_ORDER "SplineOrder" #define CHART_UNONAME_SPLINE_RESOLUTION "SplineResolution" diff --git a/chart2/opengl/backgroundFragmentShader.glsl b/chart2/opengl/backgroundFragmentShader.glsl deleted file mode 100644 index d602b21a3488..000000000000 --- a/chart2/opengl/backgroundFragmentShader.glsl +++ /dev/null @@ -1,19 +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/. - */ - -#version 150 core - -in vec4 fragmentColor; - -void main() -{ - gl_FragColor = fragmentColor; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/opengl/backgroundVertexShader.glsl b/chart2/opengl/backgroundVertexShader.glsl deleted file mode 100644 index bf7937cafffd..000000000000 --- a/chart2/opengl/backgroundVertexShader.glsl +++ /dev/null @@ -1,23 +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/. - */ - -#version 150 core - -in vec3 vPosition; -uniform mat4 MVP; -in vec4 vColor; -out vec4 fragmentColor; - -void main() -{ - gl_Position = MVP * vec4(vPosition, 1); - fragmentColor = vColor; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/opengl/commonFragmentShader.glsl b/chart2/opengl/commonFragmentShader.glsl deleted file mode 100644 index bb2482b4a57b..000000000000 --- a/chart2/opengl/commonFragmentShader.glsl +++ /dev/null @@ -1,20 +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/. - */ - -#version 150 core - -in vec4 fragmentColor; -out vec4 actualColor; - -void main() -{ - actualColor = fragmentColor; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/opengl/commonVertexShader.glsl b/chart2/opengl/commonVertexShader.glsl deleted file mode 100644 index 145d4db2fcae..000000000000 --- a/chart2/opengl/commonVertexShader.glsl +++ /dev/null @@ -1,23 +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/. - */ - -#version 150 core - -in vec3 vPosition; -uniform mat4 MVP; -uniform vec4 vColor; -out vec4 fragmentColor; - -void main() -{ - gl_Position = MVP * vec4(vPosition, 1); - fragmentColor = vColor; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/opengl/debugFragmentShader.glsl b/chart2/opengl/debugFragmentShader.glsl deleted file mode 100644 index 92b005edc862..000000000000 --- a/chart2/opengl/debugFragmentShader.glsl +++ /dev/null @@ -1,19 +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/. - */ - -#version 150 core - -in vec4 fragmentColor; - -void main() -{ - gl_FragColor = vec4(1.0, 1.0, 0.0, 0.5); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/opengl/debugVertexShader.glsl b/chart2/opengl/debugVertexShader.glsl deleted file mode 100644 index a542da88b911..000000000000 --- a/chart2/opengl/debugVertexShader.glsl +++ /dev/null @@ -1,21 +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/. - */ - -#version 150 core - -in vec3 vPosition; -uniform vec4 vColor; -out vec4 fragmentColor; - -void main() -{ - gl_Position = vec4(vPosition, 1); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/opengl/pickingFragmentShader.glsl b/chart2/opengl/pickingFragmentShader.glsl deleted file mode 100644 index 6262216a6d77..000000000000 --- a/chart2/opengl/pickingFragmentShader.glsl +++ /dev/null @@ -1,24 +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/. - */ - -#version 150 core - -uniform float minCoordX; -in vec3 positionWorldspace; -in vec4 fragmentColor; -out vec4 actualColor; - -void main() -{ - if (positionWorldspace.x <= minCoordX) - discard; - actualColor = fragmentColor; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/opengl/pickingVertexShader.glsl b/chart2/opengl/pickingVertexShader.glsl deleted file mode 100644 index 9dc5a1463a23..000000000000 --- a/chart2/opengl/pickingVertexShader.glsl +++ /dev/null @@ -1,28 +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/. - */ - -#version 150 core - -in vec3 vPosition; -uniform mat4 MVP; -uniform mat4 M; -uniform vec4 vColor; -uniform float minCoordX; -uniform float maxCoordX; -out vec4 fragmentColor; -out vec3 positionWorldspace; -void main() -{ - positionWorldspace = (M * vec4(vPosition,1)).xyz; - positionWorldspace.x = clamp(positionWorldspace.x, minCoordX, maxCoordX); - gl_Position = MVP * vec4(vPosition, 1); - fragmentColor = vColor; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/opengl/renderTextureFragmentShader.glsl b/chart2/opengl/renderTextureFragmentShader.glsl deleted file mode 100644 index 52dfde821a7d..000000000000 --- a/chart2/opengl/renderTextureFragmentShader.glsl +++ /dev/null @@ -1,21 +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/. - */ - -#version 150 core - -uniform sampler2D RenderTex; -in vec2 vTexCoord; -out vec4 actualColor; - -void main() -{ - actualColor = vec4(texture(RenderTex, vTexCoord).rgb, 1.0); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/opengl/renderTextureVertexShader.glsl b/chart2/opengl/renderTextureVertexShader.glsl deleted file mode 100644 index b9307fb32527..000000000000 --- a/chart2/opengl/renderTextureVertexShader.glsl +++ /dev/null @@ -1,21 +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/. - */ - -#version 150 core - -in vec4 vPosition; -in vec2 texCoord; -out vec2 vTexCoord; -void main() -{ - gl_Position = vPosition; - vTexCoord = texCoord; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/opengl/screenTextFragmentShader.glsl b/chart2/opengl/screenTextFragmentShader.glsl deleted file mode 100644 index f60b54fd4248..000000000000 --- a/chart2/opengl/screenTextFragmentShader.glsl +++ /dev/null @@ -1,23 +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/. - */ - -#version 150 core - -in vec2 vTexCoord; -uniform sampler2D TextTex; -uniform vec4 textColor; -out vec4 actualColor; -void main() -{ - vec3 color = texture2D(TextTex, vTexCoord).rgb; - actualColor = ((1.0 - color.r) == 0.0) ? vec4(0.0, 0.0, 0.0, textColor.a) : - vec4(textColor.rgb, 1.0); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/opengl/screenTextVertexShader.glsl b/chart2/opengl/screenTextVertexShader.glsl deleted file mode 100644 index b0ab221cb032..000000000000 --- a/chart2/opengl/screenTextVertexShader.glsl +++ /dev/null @@ -1,21 +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/. - */ - -#version 150 core - -in vec3 vPosition; -in vec2 texCoord; -out vec2 vTexCoord; -void main() -{ - gl_Position = vec4(vPosition, 1); - vTexCoord = texCoord; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/opengl/shape3DFragmentShader.glsl b/chart2/opengl/shape3DFragmentShader.glsl deleted file mode 100644 index 5c1614ce3252..000000000000 --- a/chart2/opengl/shape3DFragmentShader.glsl +++ /dev/null @@ -1,112 +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/. - */ - -#version 330 core -#define MAX_LIGHT_NUM 8 - -in vec3 positionWorldspace; -in vec3 normalCameraspace; -uniform mat4 V; -out vec4 actualColor; -struct MaterialParameters -{ - vec4 ambient; - vec4 diffuse; - vec4 specular; - vec4 materialColor; - - int twoSidesLighting; - float shininess; - float pad; - float pad1; -}; - -layout(std140) uniform GlobalMaterialParameters -{ - MaterialParameters matralParameter; -}Material; - -struct LightSource -{ - vec4 lightColor; - vec4 positionWorldspace; - float lightPower; - float pad1; - float pad2; - float pad3; -}; - -layout(std140) uniform GlobalLights -{ - int lightNum; - vec4 ambient; - LightSource light[MAX_LIGHT_NUM]; -} Lights; - -void main() -{ - vec3 colorTotal = vec3(0.0f, 0.0f, 0.0f); - - vec3 vertexPositionCameraspace = (V * vec4(positionWorldspace,1)).xyz; - - vec3 MaterialDiffuseColor = Material.matralParameter.materialColor.rgb; - - vec3 normalDirectionCameraspace = normalCameraspace; - vec3 eyeDirectionCameraspace = normalize(vec3(0, 0, 0) - vertexPositionCameraspace); - float attenuation = 1.0; - int i = 0; - vec3 lightDirectionCameraspace; - vec3 vertexToLightSource; - - vec3 lightAmbient = Lights.ambient.rgb * - MaterialDiffuseColor * - Material.matralParameter.ambient.rgb - * 5.0; - - if ((Material.matralParameter.twoSidesLighting == 1) && (!gl_FrontFacing)) - { - normalDirectionCameraspace = -normalDirectionCameraspace; - } - for (i = 0; i < Lights.lightNum; i++) - { - float LightPower = Lights.light[i].lightPower; - lightDirectionCameraspace = normalize((V * Lights.light[i].positionWorldspace).xyz); - - float cosTheta = clamp(dot(normalDirectionCameraspace,lightDirectionCameraspace), 0,1); - vec3 lightDiffuse = LightPower * - attenuation * - Lights.light[i].lightColor.rgb * - MaterialDiffuseColor * - Material.matralParameter.diffuse.rgb * - cosTheta; - - vec3 specularReflection; - if (dot(normalDirectionCameraspace, lightDirectionCameraspace) < 0) - { - specularReflection = vec3(0.0, 0.0, 0.0); - } - else - { - vec3 R = reflect(-lightDirectionCameraspace,normalDirectionCameraspace); - float cosAlpha = clamp(dot(eyeDirectionCameraspace, R), 0,1); - specularReflection = attenuation * - LightPower * - Lights.light[i].lightColor.rgb * - Material.matralParameter.specular.rgb * - MaterialDiffuseColor * - pow(max(0.0, cosAlpha), Material.matralParameter.shininess); - } - colorTotal += lightDiffuse + specularReflection; - - } - colorTotal += lightAmbient; - actualColor = vec4(colorTotal, 1.0); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/opengl/shape3DFragmentShaderBatch.glsl b/chart2/opengl/shape3DFragmentShaderBatch.glsl deleted file mode 100644 index e2a096155bc2..000000000000 --- a/chart2/opengl/shape3DFragmentShaderBatch.glsl +++ /dev/null @@ -1,108 +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/. - */ - -#version 330 core -#define MAX_LIGHT_NUM 8 - -in vec3 positionWorldspace; -in vec3 normalCameraspace; -in vec4 fragBarColor; -uniform mat4 V; -out vec4 actualColor; -struct MaterialParameters -{ - vec4 ambient; - vec4 diffuse; - vec4 specular; - vec4 materialColor; - - int twoSidesLighting; - float shininess; - float pad; - float pad1; -}; - -layout(std140) uniform GlobalMaterialParameters -{ - MaterialParameters matralParameter; -}Material; - -struct LightSource -{ - vec4 lightColor; - vec4 positionWorldspace; - float lightPower; - float pad1; - float pad2; - float pad3; -}; - -layout(std140) uniform GlobalLights -{ - int lightNum; - vec4 ambient; - LightSource light[MAX_LIGHT_NUM]; -} Lights; - -void main() -{ - vec3 colorTotal = vec3(0.0f, 0.0f, 0.0f); - - vec3 vertexPositionCameraspace = (V * vec4(positionWorldspace,1)).xyz; - - vec3 MaterialDiffuseColor = fragBarColor.rgb; - - vec3 normalDirectionCameraspace = normalCameraspace; - vec3 eyeDirectionCameraspace = normalize(vec3(0, 0, 0) - vertexPositionCameraspace); - float attenuation = 1.0; - int i = 0; - vec3 lightDirectionCameraspace; - vec3 vertexToLightSource; - - vec3 lightAmbient = Lights.ambient.rgb * - MaterialDiffuseColor * - Material.matralParameter.ambient.rgb; - - for (i = 0; i < Lights.lightNum; i++) - { - float LightPower = Lights.light[i].lightPower; - lightDirectionCameraspace = normalize((V * Lights.light[i].positionWorldspace).xyz); - - float cosTheta = clamp(dot(normalDirectionCameraspace,lightDirectionCameraspace), 0,1); - vec3 lightDiffuse = LightPower * - attenuation * - Lights.light[i].lightColor.rgb * - MaterialDiffuseColor * - Material.matralParameter.diffuse.rgb * - cosTheta; - - vec3 specularReflection; - if (dot(normalDirectionCameraspace, lightDirectionCameraspace) < 0) - { - specularReflection = vec3(0.0, 0.0, 0.0); - } - else - { - vec3 R = reflect(-lightDirectionCameraspace,normalDirectionCameraspace); - float cosAlpha = clamp(dot(eyeDirectionCameraspace, R), 0,1); - specularReflection = attenuation * - LightPower * - Lights.light[i].lightColor.rgb * - Material.matralParameter.specular.rgb * - MaterialDiffuseColor * - pow(max(0.0, cosAlpha), Material.matralParameter.shininess); - } - colorTotal += lightDiffuse + specularReflection; - - } - colorTotal += lightAmbient; - actualColor = vec4(colorTotal, 1.0); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/opengl/shape3DFragmentShaderBatchScroll.glsl b/chart2/opengl/shape3DFragmentShaderBatchScroll.glsl deleted file mode 100644 index a4686a31e26a..000000000000 --- a/chart2/opengl/shape3DFragmentShaderBatchScroll.glsl +++ /dev/null @@ -1,112 +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/. - */ - -#version 330 core -#define MAX_LIGHT_NUM 8 - -in vec3 positionWorldspace; -in vec3 normalCameraspace; -in vec4 fragBarColor; -uniform mat4 V; -uniform int undraw; -uniform float minCoordX; -out vec4 actualColor; -struct MaterialParameters -{ - vec4 ambient; - vec4 diffuse; - vec4 specular; - vec4 materialColor; - - int twoSidesLighting; - float shininess; - float pad; - float pad1; -}; - -layout(std140) uniform GlobalMaterialParameters -{ - MaterialParameters matralParameter; -}Material; - -struct LightSource -{ - vec4 lightColor; - vec4 positionWorldspace; - float lightPower; - float pad1; - float pad2; - float pad3; -}; - -layout(std140) uniform GlobalLights -{ - int lightNum; - vec4 ambient; - LightSource light[MAX_LIGHT_NUM]; -} Lights; - -void main() -{ - if ((positionWorldspace.x <= minCoordX) && (undraw == 1)) - discard; - vec3 colorTotal = vec3(0.0f, 0.0f, 0.0f); - - vec3 vertexPositionCameraspace = (V * vec4(positionWorldspace,1)).xyz; - - vec3 MaterialDiffuseColor = fragBarColor.rgb; - - vec3 normalDirectionCameraspace = normalCameraspace; - vec3 eyeDirectionCameraspace = normalize(vec3(0, 0, 0) - vertexPositionCameraspace); - float attenuation = 1.0; - int i = 0; - vec3 lightDirectionCameraspace; - vec3 vertexToLightSource; - - vec3 lightAmbient = Lights.ambient.rgb * - MaterialDiffuseColor * - Material.matralParameter.ambient.rgb; - - for (i = 0; i < Lights.lightNum; i++) - { - float LightPower = Lights.light[i].lightPower; - lightDirectionCameraspace = normalize((V * Lights.light[i].positionWorldspace).xyz); - - float cosTheta = clamp(dot(normalDirectionCameraspace,lightDirectionCameraspace), 0,1); - vec3 lightDiffuse = LightPower * - attenuation * - Lights.light[i].lightColor.rgb * - MaterialDiffuseColor * - Material.matralParameter.diffuse.rgb * - cosTheta; - - vec3 specularReflection; - if (dot(normalDirectionCameraspace, lightDirectionCameraspace) < 0) - { - specularReflection = vec3(0.0, 0.0, 0.0); - } - else - { - vec3 R = reflect(-lightDirectionCameraspace,normalDirectionCameraspace); - float cosAlpha = clamp(dot(eyeDirectionCameraspace, R), 0,1); - specularReflection = attenuation * - LightPower * - Lights.light[i].lightColor.rgb * - Material.matralParameter.specular.rgb * - MaterialDiffuseColor * - pow(max(0.0, cosAlpha), Material.matralParameter.shininess); - } - colorTotal += lightDiffuse + specularReflection; - - } - colorTotal += lightAmbient; - actualColor = vec4(colorTotal, 1.0); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/opengl/shape3DFragmentShaderV300.glsl b/chart2/opengl/shape3DFragmentShaderV300.glsl deleted file mode 100644 index 9a8ddeaa9b54..000000000000 --- a/chart2/opengl/shape3DFragmentShaderV300.glsl +++ /dev/null @@ -1,93 +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/. - */ - -#version 150 core - -#define MAX_LIGHT_NUM 8 - -in vec3 positionWorldspace; -in vec3 normalCameraspace; - -uniform mat4 V; -uniform vec4 materialAmbient; -uniform vec4 materialDiffuse; -uniform vec4 materialSpecular; -uniform vec4 materialColor; -uniform int twoSidesLighting; -uniform float materialShininess; -uniform vec4 lightColor[MAX_LIGHT_NUM]; -uniform vec4 lightPosWorldspace[MAX_LIGHT_NUM]; -uniform float lightPower[MAX_LIGHT_NUM]; -uniform int lightNum; -uniform vec4 lightAmbient; -uniform int undraw; -uniform float minCoordX; - -void main() -{ - if ((positionWorldspace.x <= minCoordX) && (undraw == 1)) - discard; - vec3 colorTotal = vec3(0.0f, 0.0f, 0.0f); - - vec3 vertexPositionCameraspace = (V * vec4(positionWorldspace,1)).xyz; - - vec3 MaterialDiffuseColor = materialColor.rgb; - - vec3 normalDirectionCameraspace = normalCameraspace; - vec3 eyeDirectionCameraspace = normalize(vec3(0, 0, 0) - vertexPositionCameraspace); - float attenuation = 1.0; - int i = 0; - vec3 lightDirectionCameraspace; - vec3 vertexToLightSource; - - vec3 totalAmbient = lightAmbient.rgb * - MaterialDiffuseColor * - materialAmbient.rgb; - - if ((twoSidesLighting == 1) && (!gl_FrontFacing)) - { - normalDirectionCameraspace = -normalDirectionCameraspace; - } - for (i = 0; i < lightNum; i++) - { - float LightPower = lightPower[i]; - lightDirectionCameraspace = normalize((V * lightPosWorldspace[i]).xyz); - - float cosTheta = clamp(dot(normalDirectionCameraspace,lightDirectionCameraspace), 0,1); - vec3 lightDiffuse = LightPower * - attenuation * - lightColor[i].rgb * - MaterialDiffuseColor * - materialDiffuse.rgb * - cosTheta; - - vec3 specularReflection; - if (dot(normalDirectionCameraspace, lightDirectionCameraspace) < 0) - { - specularReflection = vec3(0.0, 0.0, 0.0); - } - else - { - vec3 R = reflect(-lightDirectionCameraspace,normalDirectionCameraspace); - float cosAlpha = clamp(dot(eyeDirectionCameraspace, R), 0,1); - specularReflection = attenuation * - LightPower * - lightColor[i].rgb * - materialSpecular.rgb * - MaterialDiffuseColor * - pow(max(0.0, cosAlpha), materialShininess); - } - colorTotal += lightDiffuse + specularReflection; - - } - colorTotal += totalAmbient; - gl_FragColor = vec4(colorTotal, 1.0); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/opengl/shape3DVertexShader.glsl b/chart2/opengl/shape3DVertexShader.glsl deleted file mode 100644 index 9b763c968e15..000000000000 --- a/chart2/opengl/shape3DVertexShader.glsl +++ /dev/null @@ -1,32 +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/. - */ - -#version 330 core - -in vec3 vertexPositionModelspace; -in vec3 vertexNormalModelspace; - -out vec3 positionWorldspace; -out vec3 normalCameraspace; - -uniform mat4 P; -uniform mat4 M; -uniform mat4 V; -uniform mat3 normalMatrix; - -void main() -{ - positionWorldspace = (M * vec4(vertexPositionModelspace,1)).xyz; - - gl_Position = P * V * vec4(positionWorldspace,1); - - normalCameraspace = normalize(mat3(V) * normalMatrix * vertexNormalModelspace); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/opengl/shape3DVertexShaderBatch.glsl b/chart2/opengl/shape3DVertexShaderBatch.glsl deleted file mode 100644 index 46a91a23a86b..000000000000 --- a/chart2/opengl/shape3DVertexShaderBatch.glsl +++ /dev/null @@ -1,36 +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/. - */ - -#version 330 core - -in vec3 vertexPositionModelspace; -in vec3 vertexNormalModelspace; -in mat4 M; -in mat3 normalMatrix; -in vec4 barColor; - -out vec3 positionWorldspace; -out vec3 normalCameraspace; -out vec4 fragBarColor; - -uniform mat4 P; -uniform mat4 V; - -void main() -{ - gl_Position = P * V * M * vec4(vertexPositionModelspace,1); - - positionWorldspace = (M * vec4(vertexPositionModelspace,1)).xyz; - - normalCameraspace = normalize(mat3(V) * normalMatrix * vertexNormalModelspace); - - fragBarColor = barColor; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/opengl/shape3DVertexShaderBatchScroll.glsl b/chart2/opengl/shape3DVertexShaderBatchScroll.glsl deleted file mode 100644 index 2caff6e8d4d3..000000000000 --- a/chart2/opengl/shape3DVertexShaderBatchScroll.glsl +++ /dev/null @@ -1,41 +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/. - */ - -#version 330 core - -in vec3 vertexPositionModelspace; -in vec3 vertexNormalModelspace; -in mat4 M; -in mat3 normalMatrix; -in vec4 barColor; - -out vec3 positionWorldspace; -out vec3 normalCameraspace; -out vec4 fragBarColor; - -uniform mat4 P; -uniform mat4 V; -uniform mat4 transMatrix; -uniform float minCoordX; -uniform float maxCoordX; - -void main() -{ - positionWorldspace = (transMatrix * M * vec4(vertexPositionModelspace,1)).xyz; - - positionWorldspace.x = clamp(positionWorldspace.x, minCoordX, maxCoordX); - - gl_Position = P * V * vec4(positionWorldspace,1); - - normalCameraspace = normalize(mat3(V) * normalMatrix * vertexNormalModelspace); - - fragBarColor = barColor; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/opengl/shape3DVertexShaderV300.glsl b/chart2/opengl/shape3DVertexShaderV300.glsl deleted file mode 100644 index c5072fd0b55e..000000000000 --- a/chart2/opengl/shape3DVertexShaderV300.glsl +++ /dev/null @@ -1,36 +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/. - */ - -#version 150 core - -in vec3 vertexPositionModelspace; -in vec3 vertexNormalModelspace; - -out vec3 positionWorldspace; -out vec3 normalCameraspace; - -uniform mat4 P; -uniform mat4 M; -uniform mat4 V; -uniform mat3 normalMatrix; -uniform float minCoordX; -uniform float maxCoordX; - -void main() -{ - positionWorldspace = (M * vec4(vertexPositionModelspace,1)).xyz; - - positionWorldspace.x = clamp(positionWorldspace.x, minCoordX, maxCoordX); - - gl_Position = P * V * vec4(positionWorldspace,1); - - normalCameraspace = normalize(mat3(V) * normalMatrix * vertexNormalModelspace); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/opengl/symbolFragmentShader.glsl b/chart2/opengl/symbolFragmentShader.glsl deleted file mode 100644 index f9b6dfa9b71a..000000000000 --- a/chart2/opengl/symbolFragmentShader.glsl +++ /dev/null @@ -1,101 +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/. - */ - -#version 150 core - -in vec4 fragmentColor; -uniform int shape; - -void main() -{ - vec2 p = gl_PointCoord * 2.0 - vec2(1.0); // (0,0) in the center - if(shape == 0) - { - } - else if(shape == 1) //diamond - { - if (abs(p.x) + abs(p.y) > 1) - discard; - } - else if(shape == 2) // arrow - { - if(p.y < 0 && (abs(p.x) + abs(p.y)) > 1) - discard; - else if(p.y > 0 && abs(p.x) > 0.5) - discard; - } - else if(shape == 3) //arrow up - { - if(p.y > 0 && (abs(p.x) + abs(p.y)) > 1) - discard; - else if(p.y < 0 && abs(p.x) > 0.5) - discard; - } - else if(shape == 4) // arrow right - { - if(p.x > 0 && (abs(p.x) + abs(p.y)) > 1) - discard; - else if(p.x < 0 && abs(p.y) > 0.5) - discard; - } - else if(shape == 5) // arrow left - { - if(p.x < 0 && (abs(p.x) + abs(p.y)) > 1) - discard; - else if(p.x > 0 && abs(p.y) > 0.5) - discard; - } - else if(shape == 6) // hour glass - { - if(abs(p.x) < abs(p.y)) - discard; - } - else if(shape == 7) // bow tie - { - if(abs(p.y) < abs(p.x)) - discard; - } - else if(shape == 8) // circle - { - if(dot(p.x, p.y) > 1) - discard; - } - else if(shape == 9) // star - { - if(sqrt(abs(p.x))+sqrt(abs(p.y)) > 1) - discard; - } - else if(shape == 10) // X - { - if(abs(abs(p.x) - abs(p.y)) > 0.2) - discard; - } - else if(shape == 11) // Plus - { - if(abs(p.x) > 0.2 && abs(p.y) > 0.2) - discard; - } - else if(shape == 12) // asterisk - { - } - else if(shape == 13) // horizontal bar - { - if(abs(p.y) > 0.2) - discard; - } - else if(shape == 14) // vertical bar - { - if(abs(p.x) > 0.2) - discard; - } - - gl_FragColor = fragmentColor; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/opengl/symbolVertexShader.glsl b/chart2/opengl/symbolVertexShader.glsl deleted file mode 100644 index c5603b5e79d1..000000000000 --- a/chart2/opengl/symbolVertexShader.glsl +++ /dev/null @@ -1,23 +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/. - */ - -#version 150 core - -in vec3 vPosition; -uniform mat4 MVP; -uniform vec4 vColor; -out vec4 fragmentColor; - -void main() -{ - gl_Position = MVP * vec4(vPosition, 1); - fragmentColor = vColor; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/opengl/textFragmentShader.glsl b/chart2/opengl/textFragmentShader.glsl deleted file mode 100644 index 16be8c6ae0f0..000000000000 --- a/chart2/opengl/textFragmentShader.glsl +++ /dev/null @@ -1,23 +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/. - */ - -#version 150 core - -uniform sampler2D TextTex; -in vec2 vTexCoord; -out vec4 actualColor; - - -void main() -{ - vec3 color = texture(TextTex, vTexCoord).rgb; - actualColor = vec4(color, 1.0 - color.r); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/opengl/textFragmentShaderBatch.glsl b/chart2/opengl/textFragmentShaderBatch.glsl deleted file mode 100644 index c97812bd0879..000000000000 --- a/chart2/opengl/textFragmentShaderBatch.glsl +++ /dev/null @@ -1,24 +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/. - */ - -#version 330 core - -#extension GL_EXT_texture_array : enable - -uniform sampler2DArray texArray; -in vec3 vTexCoord; - -out vec4 actualColor; -void main() -{ - vec3 color = texture(texArray, vTexCoord.xyz).rgb; - actualColor = vec4(color, 1.0 - color.r); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/opengl/textVertexShader.glsl b/chart2/opengl/textVertexShader.glsl deleted file mode 100644 index 351da30b5f79..000000000000 --- a/chart2/opengl/textVertexShader.glsl +++ /dev/null @@ -1,22 +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/. - */ - -#version 150 core - -in vec3 vPosition; -uniform mat4 MVP; -in vec2 texCoord; -out vec2 vTexCoord; -void main() -{ - gl_Position = MVP * vec4(vPosition, 1); - vTexCoord = texCoord; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/opengl/textVertexShaderBatch.glsl b/chart2/opengl/textVertexShaderBatch.glsl deleted file mode 100644 index d5ae4967d345..000000000000 --- a/chart2/opengl/textVertexShaderBatch.glsl +++ /dev/null @@ -1,24 +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/. - */ - -#version 330 core - -in vec3 vPosition; -in vec3 texCoord; - -out vec3 vTexCoord; -uniform mat4 MVP; - -void main() -{ - gl_Position = MVP * vec4(vPosition, 1); - vTexCoord = texCoord; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/chartcore.component b/chart2/source/chartcore.component index 45c87f93d633..f58ba98ba3ac 100644 --- a/chart2/source/chartcore.component +++ b/chart2/source/chartcore.component @@ -122,11 +122,6 @@ <service name="com.sun.star.chart2.BubbleChartType"/> <service name="com.sun.star.chart2.ChartType"/> </implementation> - <implementation name="com.sun.star.comp.chart.GL3DBarChartType" - constructor="com_sun_star_comp_chart_GL3DBarChartType_get_implementation"> - <service name="com.sun.star.chart2.GL3DBarChartType"/> - <service name="com.sun.star.chart2.ChartType"/> - </implementation> <implementation name="com.sun.star.comp.chart.CandleStickChartType" constructor="com_sun_star_comp_chart_CandleStickChartType_get_implementation"> <service name="com.sun.star.beans.PropertySet"/> diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index 5a80655bae99..7b91382525ab 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -91,7 +91,6 @@ enum eServiceType SERVICE_NAME_STOCK_DIAGRAM, SERVICE_NAME_XY_DIAGRAM, SERVICE_NAME_BUBBLE_DIAGRAM, - SERVICE_NAME_GL3DBAR_DIAGRAM, SERVICE_NAME_DASH_TABLE, SERVICE_NAME_GARDIENT_TABLE, @@ -120,7 +119,6 @@ tServiceNameMap & lcl_getStaticServiceNameMap() {"com.sun.star.chart.StockDiagram", SERVICE_NAME_STOCK_DIAGRAM}, {"com.sun.star.chart.XYDiagram", SERVICE_NAME_XY_DIAGRAM}, {"com.sun.star.chart.BubbleDiagram", SERVICE_NAME_BUBBLE_DIAGRAM}, - {"com.sun.star.chart.GL3DBarDiagram", SERVICE_NAME_GL3DBAR_DIAGRAM}, {"com.sun.star.drawing.DashTable", SERVICE_NAME_DASH_TABLE}, {"com.sun.star.drawing.GradientTable", SERVICE_NAME_GARDIENT_TABLE}, @@ -1167,15 +1165,6 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance( bCreateDiagram = true; } break; - case SERVICE_NAME_GL3DBAR_DIAGRAM: - if( xManagerFact.is()) - { - xTemplate.set( - xManagerFact->createInstance("com.sun.star.chart2.template.GL3DBar"), - uno::UNO_QUERY ); - bCreateDiagram = true; - } - break; case SERVICE_NAME_DASH_TABLE: case SERVICE_NAME_GARDIENT_TABLE: diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx index 1d72050806ab..1a4dbfc8cb5f 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx @@ -38,7 +38,6 @@ #include "WrappedSplineProperties.hxx" #include "WrappedStockProperties.hxx" #include "WrappedSceneProperty.hxx" -#include "WrappedGL3DProperties.hxx" #include <RelativePositionHelper.hxx> #include <ControllerLockGuard.hxx> #include <ModifyListenerHelper.hxx> @@ -426,7 +425,6 @@ private: WrappedSplineProperties::addProperties( aProperties ); WrappedStockProperties::addProperties( aProperties ); WrappedAutomaticPositionProperties::addProperties( aProperties ); - WrappedGL3DProperties::addProperties(aProperties); std::sort( aProperties.begin(), aProperties.end(), ::chart::PropertyNameLess() ); @@ -480,9 +478,6 @@ OUString lcl_getDiagramType( const OUString & rTemplateServiceName ) { const OUString aName( rTemplateServiceName.copy( aPrefix.getLength())); - if (aName.indexOf("GL3DBar") != -1) - return OUString("com.sun.star.chart.GL3DBarDiagram"); - // "Area" "StackedArea" "PercentStackedArea" "ThreeDArea" // "StackedThreeDArea" "PercentStackedThreeDArea" if( aName.indexOf( "Area" ) != -1 ) @@ -556,8 +551,8 @@ const tMakeStringStringMap& lcl_getChartTypeNameMap() {"com.sun.star.chart2.FilledNetChartType", "com.sun.star.chart.FilledNetDiagram"}, {"com.sun.star.chart2.NetChartType", "com.sun.star.chart.NetDiagram"}, {"com.sun.star.chart2.CandleStickChartType", "com.sun.star.chart.StockDiagram"}, - {"com.sun.star.chart2.BubbleChartType", "com.sun.star.chart.BubbleDiagram"}, - {"com.sun.star.chart2.GL3DBarChartType", "com.sun.star.chart.GL3DBarDiagram"}}; + {"com.sun.star.chart2.BubbleChartType", "com.sun.star.chart.BubbleDiagram"} + }; return g_aChartTypeNameMap; } @@ -1859,7 +1854,6 @@ const std::vector< WrappedProperty* > DiagramWrapper::createWrappedProperties() WrappedSplineProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact ); WrappedStockProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact ); WrappedAutomaticPositionProperties::addWrappedProperties( aWrappedProperties ); - WrappedGL3DProperties::addWrappedProperties(aWrappedProperties, m_spChart2ModelContact); aWrappedProperties.push_back( new WrappedDataRowSourceProperty( m_spChart2ModelContact ) ); aWrappedProperties.push_back( new WrappedStackingProperty( StackMode::YStacked,m_spChart2ModelContact ) ); diff --git a/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx deleted file mode 100644 index eab0ec631580..000000000000 --- a/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx +++ /dev/null @@ -1,136 +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/. - */ - -#include "WrappedGL3DProperties.hxx" -#include "Chart2ModelContact.hxx" -#include <FastPropertyIdRanges.hxx> -#include <unonames.hxx> -#include <WrappedProperty.hxx> -#include <DiagramHelper.hxx> - -#include <com/sun/star/beans/PropertyAttribute.hpp> -#include <com/sun/star/chart2/XDiagram.hpp> - -using namespace com::sun::star; - -namespace chart { namespace wrapper { - -namespace { - -enum -{ - PROP_GL3DCHARTTYPE_ROUNDED_EDGE = FAST_PROPERTY_ID_START_GL_3D -}; - -class WrappedGL3DProperty : public WrappedProperty -{ - uno::Any maDefault; - std::shared_ptr<Chart2ModelContact> mpModelContact; - -private: - uno::Reference<chart2::XChartType> getChartType() const - { - uno::Reference<chart2::XDiagram> xDiagram = mpModelContact->getChart2Diagram(); - uno::Sequence<uno::Reference<chart2::XChartType> > aCTs = - DiagramHelper::getChartTypesFromDiagram(xDiagram); - - for (sal_Int32 i = 0; i < aCTs.getLength(); ++i) - { - uno::Reference<chart2::XChartType> xThisCT = aCTs[i]; - if (xThisCT->getChartType() == "com.sun.star.chart2.GL3DBarChartType") - // Found the right chart type. - return xThisCT; - } - - return uno::Reference<chart2::XChartType>(); - } - -public: - WrappedGL3DProperty( const OUString& rInName, const OUString& rOutName, const uno::Any& rDefault, const std::shared_ptr<Chart2ModelContact>& pContact ) : - WrappedProperty(rInName, rOutName), maDefault(rDefault), mpModelContact(pContact) {} - - virtual uno::Any getPropertyValue( const uno::Reference<beans::XPropertySet>& /*xInnerPS*/ ) const override - { - uno::Reference<chart2::XChartType> xCT = getChartType(); - if (!xCT.is()) - return uno::Any(); - - try - { - uno::Reference<beans::XPropertySet> xPS(xCT, uno::UNO_QUERY_THROW); - return xPS->getPropertyValue(CHART_UNONAME_ROUNDED_EDGE); - } - catch ( const uno::Exception& ) {} - - return uno::Any(); - }; - - virtual void setPropertyValue( - const uno::Any& rOutValue, const uno::Reference<beans::XPropertySet>& /*xInnerPS*/ ) const override - { - uno::Reference<chart2::XChartType> xCT = getChartType(); - if (!xCT.is()) - return; - - try - { - uno::Reference<beans::XPropertySet> xPS(xCT, uno::UNO_QUERY_THROW); - return xPS->setPropertyValue(CHART_UNONAME_ROUNDED_EDGE, rOutValue); - } - catch ( const uno::Exception& ) {} - } - - virtual void setPropertyToDefault( const uno::Reference<beans::XPropertyState>& /*xInnerPropState*/ ) const override - { - uno::Reference<chart2::XChartType> xCT = getChartType(); - if (!xCT.is()) - return; - - try - { - uno::Reference<beans::XPropertySet> xPS(xCT, uno::UNO_QUERY_THROW); - return xPS->setPropertyValue(CHART_UNONAME_ROUNDED_EDGE, maDefault); - } - catch ( const uno::Exception& ) {} - } - - virtual uno::Any getPropertyDefault( const uno::Reference<beans::XPropertyState>& /*xInnerPS*/ ) const override - { - return maDefault; - } - - virtual beans::PropertyState getPropertyState( const uno::Reference<beans::XPropertyState>& /*xInnerPS*/ ) const override - { - return beans::PropertyState_DIRECT_VALUE; - } -}; - -} - -void WrappedGL3DProperties::addProperties( std::vector<css::beans::Property> & rOutProps ) -{ - rOutProps.emplace_back( - CHART_UNONAME_ROUNDED_EDGE, - PROP_GL3DCHARTTYPE_ROUNDED_EDGE, - cppu::UnoType<bool>::get(), - beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT - ); -} - -void WrappedGL3DProperties::addWrappedProperties( - std::vector<WrappedProperty*>& rList, const std::shared_ptr<Chart2ModelContact>& pChart2ModelContact ) -{ - rList.push_back( - new WrappedGL3DProperty( - CHART_UNONAME_ROUNDED_EDGE, CHART_UNONAME_ROUNDED_EDGE, uno::Any(false), pChart2ModelContact)); -} - -}} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.hxx deleted file mode 100644 index 39ced85e215c..000000000000 --- a/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.hxx +++ /dev/null @@ -1,38 +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/. - */ - -#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDGL3DPROPERTIES_HXX -#define INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDGL3DPROPERTIES_HXX - -#include <memory> -#include <vector> - -#include <com/sun/star/beans/Property.hpp> - -namespace chart { - -class WrappedProperty; - -namespace wrapper { - -class Chart2ModelContact; - -class WrappedGL3DProperties -{ -public: - static void addProperties( std::vector<css::beans::Property> & rOutProps ); - static void addWrappedProperties( - std::vector<WrappedProperty*>& rList, const std::shared_ptr<Chart2ModelContact>& pChart2ModelContact ); -}; - -}} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index c87b765b0a8e..2a158f8a7297 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx @@ -159,12 +159,6 @@ ChartTypeParameter ChartTypeDialogController::getChartTypeParameterForService( //not all templates need to support Geometry3D ex.Context.is();//to have debug information without compilation warnings } - - try - { - xTemplateProps->getPropertyValue(CHART_UNONAME_ROUNDED_EDGE) >>= aRet.mbRoundedEdge; - } - catch ( const uno::Exception& ) {} } return aRet; } @@ -302,14 +296,6 @@ uno::Reference< XChartTypeTemplate > ChartTypeDialogController::getCurrentTempla try { - xTemplateProps->setPropertyValue(CHART_UNONAME_ROUNDED_EDGE, uno::Any(rParameter.mbRoundedEdge)); - } - catch ( const uno::Exception& ) - { - } - - try - { setTemplateProperties( xTemplateProps ); } catch( const uno::Exception & ) @@ -380,11 +366,6 @@ bool ChartTypeDialogController::shouldShow_SortByXValuesResourceGroup() const return false; } -bool ChartTypeDialogController::shouldShow_GL3DResourceGroup() const -{ - return false; -} - void ChartTypeDialogController::showExtraControls( VclBuilderContainer* /*pParent*/ ) { } diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx index 1e3830e981f9..af880d115a53 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx @@ -101,7 +101,6 @@ public: virtual bool shouldShow_SplineControl() const; virtual bool shouldShow_GeometryControl() const; virtual bool shouldShow_SortByXValuesResourceGroup() const; - virtual bool shouldShow_GL3DResourceGroup() const; virtual void showExtraControls(VclBuilderContainer* pParent); virtual void hideExtraControls() const; diff --git a/chart2/source/controller/dialogs/GL3DBarChartDialogController.cxx b/chart2/source/controller/dialogs/GL3DBarChartDialogController.cxx deleted file mode 100644 index a1f568ae083d..000000000000 --- a/chart2/source/controller/dialogs/GL3DBarChartDialogController.cxx +++ /dev/null @@ -1,57 +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/. - */ - -#include "GL3DBarChartDialogController.hxx" -#include <strings.hrc> -#include <bitmaps.hlst> -#include <ResId.hxx> -#include <svtools/valueset.hxx> - -namespace chart { - -GL3DBarChartDialogController::GL3DBarChartDialogController() {} - -GL3DBarChartDialogController::~GL3DBarChartDialogController() {} - -bool GL3DBarChartDialogController::shouldShow_GL3DResourceGroup() const -{ - return true; -} - -OUString GL3DBarChartDialogController::getName() -{ - return SchResId(STR_TYPE_GL3D_BAR); -} - -Image GL3DBarChartDialogController::getImage() -{ - return Image(BitmapEx(BMP_TYPE_GL3D_BAR)); -} - -const tTemplateServiceChartTypeParameterMap& -GL3DBarChartDialogController::getTemplateMap() const -{ - static tTemplateServiceChartTypeParameterMap aMap{ - {"com.sun.star.chart2.template.GL3DBar", ChartTypeParameter(1)}, - {"com.sun.star.chart2.template.GL3DBarRoundedRectangle", ChartTypeParameter(2)}}; - return aMap; -} - -void GL3DBarChartDialogController::fillSubTypeList( - ValueSet& rSubTypeList, const ChartTypeParameter& /*rParameter*/ ) -{ - rSubTypeList.Clear(); - rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_GL3D_BAR_ROUNDRECT))); - - rSubTypeList.SetItemText(1, SchResId(STR_GL3D_BAR)); -} - -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/GL3DBarChartDialogController.hxx b/chart2/source/controller/dialogs/GL3DBarChartDialogController.hxx deleted file mode 100644 index 2d5d0a66b15b..000000000000 --- a/chart2/source/controller/dialogs/GL3DBarChartDialogController.hxx +++ /dev/null @@ -1,36 +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/. - */ - -#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_GL3DBARCHARTDIALOGCONTROLLER_HXX -#define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_GL3DBARCHARTDIALOGCONTROLLER_HXX - -#include "ChartTypeDialogController.hxx" - -namespace chart { - -class GL3DBarChartDialogController : public ChartTypeDialogController -{ -public: - GL3DBarChartDialogController(); - virtual ~GL3DBarChartDialogController() override; - - virtual bool shouldShow_GL3DResourceGroup() const override; - - virtual OUString getName() override; - virtual Image getImage() override; - virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const override; - - virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ) override; -}; - -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index 79a66e74034d..13e81edf86ed 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -24,7 +24,6 @@ #include <DiagramHelper.hxx> #include "res_BarGeometry.hxx" #include <ControllerLockGuard.hxx> -#include "GL3DBarChartDialogController.hxx" #include <unonames.hxx> #include <svtools/controldims.hxx> @@ -261,48 +260,6 @@ IMPL_LINK_NOARG(StackingResourceGroup, StackingEnableHdl, CheckBox&, void) m_pChangeListener->stateChanged(this); } -class GL3DResourceGroup : public ChangingResource -{ -public: - explicit GL3DResourceGroup( VclBuilderContainer* pWindow ); - - void showControls( bool bShow ); - void fillControls( const ChartTypeParameter& rParam ); - void fillParameter( ChartTypeParameter& rParam ); - -private: - DECL_LINK( SettingChangedHdl, CheckBox&, void ); -private: - VclPtr<CheckBox> m_pCB_RoundedEdge; -}; - -GL3DResourceGroup::GL3DResourceGroup( VclBuilderContainer* pWindow ) -{ - pWindow->get(m_pCB_RoundedEdge, "rounded-edge"); - m_pCB_RoundedEdge->SetToggleHdl( LINK(this, GL3DResourceGroup, SettingChangedHdl) ); -} - -void GL3DResourceGroup::showControls( bool bShow ) -{ - m_pCB_RoundedEdge->Show(bShow); -} - -void GL3DResourceGroup::fillControls( const ChartTypeParameter& rParam ) -{ - m_pCB_RoundedEdge->Check(rParam.mbRoundedEdge); -} - -void GL3DResourceGroup::fillParameter( ChartTypeParameter& rParam ) -{ - rParam.mbRoundedEdge = m_pCB_RoundedEdge->IsChecked(); -} - -IMPL_LINK_NOARG( GL3DResourceGroup, SettingChangedHdl, CheckBox&, void ) -{ - if (m_pChangeListener) - m_pChangeListener->stateChanged(this); -} - class SplinePropertiesDialog : public weld::GenericDialogController { public: @@ -662,7 +619,6 @@ ChartTypeTabPage::ChartTypeTabPage(vcl::Window* pParent , m_pSplineResourceGroup( new SplineResourceGroup(this) ) , m_pGeometryResourceGroup( new GeometryResourceGroup( this ) ) , m_pSortByXValuesResourceGroup( new SortByXValuesResourceGroup( this ) ) - , m_pGL3DResourceGroup(new GL3DResourceGroup(this)) , m_xChartModel( xChartModel ) , m_aChartTypeDialogControllerList(0) , m_pCurrentMainType(nullptr) @@ -728,8 +684,6 @@ ChartTypeTabPage::ChartTypeTabPage(vcl::Window* pParent m_aChartTypeDialogControllerList.emplace_back(new CombiColumnLineChartDialogController() ); SvtMiscOptions aOpts; - if ( aOpts.IsExperimentalMode() ) - m_aChartTypeDialogControllerList.emplace_back(new GL3DBarChartDialogController()); for (auto const& elem : m_aChartTypeDialogControllerList) { @@ -742,7 +696,6 @@ ChartTypeTabPage::ChartTypeTabPage(vcl::Window* pParent m_pSplineResourceGroup->setChangeListener( this ); m_pGeometryResourceGroup->setChangeListener( this ); m_pSortByXValuesResourceGroup->setChangeListener( this ); - m_pGL3DResourceGroup->setChangeListener(this); } ChartTypeTabPage::~ChartTypeTabPage() @@ -761,7 +714,6 @@ void ChartTypeTabPage::dispose() m_pSplineResourceGroup.reset(); m_pGeometryResourceGroup.reset(); m_pSortByXValuesResourceGroup.reset(); - m_pGL3DResourceGroup.reset(); m_pFT_ChooseType.clear(); m_pMainTypeList.clear(); m_pSubTypeList.clear(); @@ -777,7 +729,6 @@ ChartTypeParameter ChartTypeTabPage::getCurrentParamter() const m_pSplineResourceGroup->fillParameter( aParameter ); m_pGeometryResourceGroup->fillParameter( aParameter ); m_pSortByXValuesResourceGroup->fillParameter( aParameter ); - m_pGL3DResourceGroup->fillParameter(aParameter); return aParameter; } @@ -902,8 +853,6 @@ void ChartTypeTabPage::showAllControls( ChartTypeDialogController& rTypeControll m_pGeometryResourceGroup->showControls( bShow ); bShow = rTypeController.shouldShow_SortByXValuesResourceGroup(); m_pSortByXValuesResourceGroup->showControls( bShow ); - bShow = rTypeController.shouldShow_GL3DResourceGroup(); - m_pGL3DResourceGroup->showControls(bShow); rTypeController.showExtraControls(this); } @@ -920,7 +869,6 @@ void ChartTypeTabPage::fillAllControls( const ChartTypeParameter& rParameter, bo m_pSplineResourceGroup->fillControls( rParameter ); m_pGeometryResourceGroup->fillControls( rParameter ); m_pSortByXValuesResourceGroup->fillControls( rParameter ); - m_pGL3DResourceGroup->fillControls(rParameter); m_nChangingCalls--; } @@ -981,7 +929,6 @@ void ChartTypeTabPage::initializePage() m_pSplineResourceGroup->showControls( false ); m_pGeometryResourceGroup->showControls( false ); m_pSortByXValuesResourceGroup->showControls( false ); - m_pGL3DResourceGroup->showControls(false); } } diff --git a/chart2/source/controller/dialogs/tp_ChartType.hxx b/chart2/source/controller/dialogs/tp_ChartType.hxx index 2be2646761c0..8da17cb9781e 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.hxx +++ b/chart2/source/controller/dialogs/tp_ChartType.hxx @@ -43,7 +43,6 @@ class SplineResourceGroup; class GeometryResourceGroup; class ChartTypeParameter; class SortByXValuesResourceGroup; -class GL3DResourceGroup; class ChartTypeTabPage final : public ResourceChangeListener, public svt::OWizardPage, public ChartTypeTemplateProvider { @@ -82,7 +81,6 @@ private: std::unique_ptr<SplineResourceGroup> m_pSplineResourceGroup; std::unique_ptr<GeometryResourceGroup> m_pGeometryResourceGroup; std::unique_ptr<SortByXValuesResourceGroup> m_pSortByXValuesResourceGroup; - std::unique_ptr<GL3DResourceGroup> m_pGL3DResourceGroup; css::uno::Reference< css::chart2::XChartDocument > m_xChartModel; diff --git a/chart2/source/controller/inc/ChartWindow.hxx b/chart2/source/controller/inc/ChartWindow.hxx index e4020c64e114..dc754a3651c9 100644 --- a/chart2/source/controller/inc/ChartWindow.hxx +++ b/chart2/source/controller/inc/ChartWindow.hxx @@ -82,7 +82,6 @@ private: ChartController* m_pWindowController; bool m_bInPaint; VclPtr<vcl::Window> m_pViewShellWindow; - VclPtr<vcl::Window> m_pOpenGLWindow; void adjustHighContrastMode(); }; diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index c42390ad9b53..b0c27a4e6a43 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -796,10 +796,6 @@ void SAL_CALL ChartController::dispose() //--release all resources and references { - uno::Reference< chart2::X3DChartWindowProvider > x3DWindowProvider(getModel(), uno::UNO_QUERY); - if(x3DWindowProvider.is()) - x3DWindowProvider->setWindow(0); - uno::Reference< util::XModeChangeBroadcaster > xViewBroadcaster( m_xChartView, uno::UNO_QUERY ); if( xViewBroadcaster.is() ) xViewBroadcaster->removeModeChangeListener(this); diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx index a0f7c31de47d..0453a6ed48d3 100644 --- a/chart2/source/controller/main/ChartWindow.cxx +++ b/chart2/source/controller/main/ChartWindow.cxx @@ -23,10 +23,8 @@ #include <uiobject.hxx> #include <vcl/help.hxx> -#include <vcl/openglwin.hxx> #include <vcl/settings.hxx> #include <config_features.h> -#include <com/sun/star/chart2/X3DChartWindowProvider.hpp> #include <sfx2/ipclient.hxx> #include <sfx2/viewsh.hxx> @@ -58,11 +56,6 @@ ChartWindow::ChartWindow( ChartController* pController, vcl::Window* pParent, Wi , m_pWindowController( pController ) , m_bInPaint(false) , m_pViewShellWindow( nullptr ) -#if HAVE_FEATURE_OPENGL - , m_pOpenGLWindow(VclPtr<OpenGLWindow>::Create(this, false)) -#else - , m_pOpenGLWindow(nullptr) -#endif { set_id("chart_window"); SetHelpId( HID_SCH_WIN_DOCUMENT ); @@ -73,17 +66,6 @@ ChartWindow::ChartWindow( ChartController* pController, vcl::Window* pParent, Wi EnableRTL( false ); if( pParent ) pParent->EnableRTL( false );// #i96215# necessary for a correct position of the context menu in rtl mode - - if( m_pOpenGLWindow ) - { - m_pOpenGLWindow->Show(); - uno::Reference< chart2::X3DChartWindowProvider > x3DWindowProvider(pController->getModel(), uno::UNO_QUERY_THROW); - sal_uInt64 nWindowPtr = reinterpret_cast<sal_uInt64>(m_pOpenGLWindow.get()); - x3DWindowProvider->setWindow(nWindowPtr); - uno::Reference<util::XUpdatable> const xUpdatable(x3DWindowProvider, - uno::UNO_QUERY_THROW); - xUpdatable->update(); - } } ChartWindow::~ChartWindow() @@ -93,15 +75,6 @@ ChartWindow::~ChartWindow() void ChartWindow::dispose() { - if (m_pWindowController && m_pWindowController->getModel().is()) - { - uno::Reference< chart2::X3DChartWindowProvider > x3DWindowProvider(m_pWindowController->getModel(), uno::UNO_QUERY_THROW); - x3DWindowProvider->setWindow(0); - uno::Reference<util::XUpdatable> const xUpdatable(x3DWindowProvider, - uno::UNO_QUERY_THROW); - xUpdatable->update(); - } - m_pOpenGLWindow.disposeAndClear(); m_pViewShellWindow.clear(); vcl::Window::dispose(); } @@ -122,11 +95,7 @@ void ChartWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rectang return; m_bInPaint = true; - if (m_pOpenGLWindow && m_pOpenGLWindow->IsVisible()) - { - m_pOpenGLWindow->Paint(rRenderContext, rRect); - } - else if (m_pWindowController) + if (m_pWindowController) { m_pWindowController->execute_Paint(rRenderContext, rRect); } @@ -173,9 +142,6 @@ void ChartWindow::Resize() m_pWindowController->execute_Resize(); else Window::Resize(); - - if( m_pOpenGLWindow ) - m_pOpenGLWindow->SetSizePixel(GetSizePixel()); } void ChartWindow::Activate() @@ -293,40 +259,24 @@ void ChartWindow::adjustHighContrastMode() void ChartWindow::ForceInvalidate() { vcl::Window::Invalidate(); - if(m_pOpenGLWindow) - { - m_pOpenGLWindow->Invalidate(); - } } void ChartWindow::Invalidate( InvalidateFlags nFlags ) { if( m_bInPaint ) // #i101928# superfluous paint calls while entering and editing charts" return; vcl::Window::Invalidate( nFlags ); - if(m_pOpenGLWindow) - { - m_pOpenGLWindow->Invalidate( nFlags ); - } } void ChartWindow::Invalidate( const tools::Rectangle& rRect, InvalidateFlags nFlags ) { if( m_bInPaint ) // #i101928# superfluous paint calls while entering and editing charts" return; vcl::Window::Invalidate( rRect, nFlags ); - if(m_pOpenGLWindow) - { - m_pOpenGLWindow->Invalidate( rRect, nFlags ); - } } void ChartWindow::Invalidate( const vcl::Region& rRegion, InvalidateFlags nFlags ) { if( m_bInPaint ) // #i101928# superfluous paint calls while entering and editing charts" return; vcl::Window::Invalidate( rRegion, nFlags ); - if(m_pOpenGLWindow) - { - m_pOpenGLWindow->Invalidate( rRegion, nFlags ); - } } void ChartWindow::LogicInvalidate(const tools::Rectangle* pRectangle) diff --git a/chart2/source/inc/FastPropertyIdRanges.hxx b/chart2/source/inc/FastPropertyIdRanges.hxx index d848babacde1..a2572c5117fc 100644 --- a/chart2/source/inc/FastPropertyIdRanges.hxx +++ b/chart2/source/inc/FastPropertyIdRanges.hxx @@ -41,7 +41,6 @@ enum FastPropertyIdRanges FAST_PROPERTY_ID_START_CHART_STOCK_PROP = FAST_PROPERTY_ID_START + 16000, FAST_PROPERTY_ID_START_CHART_AUTOPOSITION_PROP = FAST_PROPERTY_ID_START + 17000, FAST_PROPERTY_ID_START_SCALE_TEXT_PROP = FAST_PROPERTY_ID_START + 18000, - FAST_PROPERTY_ID_START_GL_3D = FAST_PROPERTY_ID_START + 19000 }; } // namespace chart diff --git a/chart2/source/inc/servicenames_charttypes.hxx b/chart2/source/inc/servicenames_charttypes.hxx index 6fc24d10b789..9a1ee83db019 100644 --- a/chart2/source/inc/servicenames_charttypes.hxx +++ b/chart2/source/inc/servicenames_charttypes.hxx @@ -31,7 +31,6 @@ namespace chart { #define CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET "com.sun.star.chart2.FilledNetChartType" #define CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK "com.sun.star.chart2.CandleStickChartType" #define CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE "com.sun.star.chart2.BubbleChartType" -#define CHART2_SERVICE_NAME_CHARTTYPE_GL3DBAR "com.sun.star.chart2.GL3DBarChartType" } //namespace chart diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index 4eabcba9560c..2560796e6c61 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -35,8 +35,6 @@ #include <ModifyListenerHelper.hxx> #include <svx/charthelper.hxx> -#include <vcl/openglwin.hxx> - #include <com/sun/star/chart/ChartDataRowSource.hpp> #include <com/sun/star/chart2/data/XPivotTableDataProvider.hpp> @@ -114,9 +112,6 @@ ChartModel::ChartModel(uno::Reference<uno::XComponentContext > const & xContext) "com.sun.star.xml.NamespaceMap", "com.sun.star.comp.chart.XMLNameSpaceMap" ), uno::UNO_QUERY) , mnStart(0) , mnEnd(0) -#if HAVE_FEATURE_OPENGL - , mpOpenGLWindow(nullptr) -#endif { osl_atomic_increment(&m_refCount); { @@ -158,9 +153,6 @@ ChartModel::ChartModel( const ChartModel & rOther ) , m_xInternalDataProvider( rOther.m_xInternalDataProvider ) , mnStart(rOther.mnStart) , mnEnd(rOther.mnEnd) -#if HAVE_FEATURE_OPENGL - , mpOpenGLWindow(nullptr) -#endif { osl_atomic_increment(&m_refCount); { @@ -946,11 +938,6 @@ void SAL_CALL ChartModel::createDefaultChart() insertDefaultChart(); } -sal_Bool SAL_CALL ChartModel::isOpenGLChart() -{ - return ChartHelper::isGL3DDiagram(m_xDiagram); -} - // ____ XTitled ____ uno::Reference< chart2::XTitle > SAL_CALL ChartModel::getTitleObject() { @@ -1309,16 +1296,6 @@ void ChartModel::setTimeBasedRange(sal_Int32 nStart, sal_Int32 nEnd) mbTimeBased = true; } -void ChartModel::setWindow( const sal_uInt64 nWindowPtr ) -{ -#if HAVE_FEATURE_OPENGL - OpenGLWindow* pWindow = reinterpret_cast<OpenGLWindow*>(nWindowPtr); - mpOpenGLWindow = pWindow; -#else - (void)nWindowPtr; -#endif -} - void ChartModel::update() { if(!mxChartView.is()) @@ -1327,9 +1304,6 @@ void ChartModel::update() } mxChartView->setViewDirty(); mxChartView->update(); -#if HAVE_FEATURE_OPENGL - mxChartView->updateOpenGLWindow(); -#endif } bool ChartModel::isDataFromSpreadsheet() diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx index 6028279d8b35..44684adb2c6c 100644 --- a/chart2/source/model/template/ChartTypeManager.cxx +++ b/chart2/source/model/template/ChartTypeManager.cxx @@ -32,9 +32,6 @@ #include "NetChartTypeTemplate.hxx" #include "BubbleChartTypeTemplate.hxx" #include <config_features.h> -#if HAVE_FEATURE_OPENGL -#include "GL3DBarChartTypeTemplate.hxx" -#endif #include <cppuhelper/component_context.hxx> #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/container/XContentEnumerationAccess.hpp> @@ -123,8 +120,6 @@ enum TemplateId TEMPLATE_STOCKVOLUMELOWHIGHCLOSE, TEMPLATE_STOCKVOLUMEOPENLOWHIGHCLOSE, TEMPLATE_BUBBLE, - TEMPLATE_GL3DBAR, - TEMPLATE_GL3DBAR_ROUNDED_RECTANGLE, // TEMPLATE_SURFACE, // TEMPLATE_ADDIN, TEMPLATE_NOT_FOUND = 0xffff @@ -199,8 +194,6 @@ const tTemplateMapType & lcl_DefaultChartTypeMap() {"com.sun.star.chart2.template.StockVolumeLowHighClose", TEMPLATE_STOCKVOLUMELOWHIGHCLOSE}, {"com.sun.star.chart2.template.StockVolumeOpenLowHighClose", TEMPLATE_STOCKVOLUMEOPENLOWHIGHCLOSE}, {"com.sun.star.chart2.template.Bubble", TEMPLATE_BUBBLE}, - {"com.sun.star.chart2.template.GL3DBar", TEMPLATE_GL3DBAR}, - {"com.sun.star.chart2.template.GL3DBarRoundedRectangle", TEMPLATE_GL3DBAR_ROUNDED_RECTANGLE}, // {"com.sun.star.chart2.template.Surface", TEMPLATE_SURFACE}, // {"com.sun.star.chart2.template.Addin", TEMPLATE_ADDIN}, }; @@ -530,16 +523,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartTypeManager::createInstance( case TEMPLATE_BUBBLE: xTemplate.set( new BubbleChartTypeTemplate( m_xContext, aServiceSpecifier )); break; -#if HAVE_FEATURE_OPENGL - case TEMPLATE_GL3DBAR: - xTemplate.set(new GL3DBarChartTypeTemplate(m_xContext, aServiceSpecifier)); - break; - case TEMPLATE_GL3DBAR_ROUNDED_RECTANGLE: - xTemplate.set(new GL3DBarChartTypeTemplate(m_xContext, aServiceSpecifier)); - break; -#else default: break; -#endif // case TEMPLATE_SURFACE: // case TEMPLATE_ADDIN: // break; diff --git a/chart2/source/model/template/GL3DBarChartType.cxx b/chart2/source/model/template/GL3DBarChartType.cxx deleted file mode 100644 index 34f7a516307c..000000000000 --- a/chart2/source/model/template/GL3DBarChartType.cxx +++ /dev/null @@ -1,166 +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/. - */ - -#include "GL3DBarChartType.hxx" -#include <servicenames_charttypes.hxx> -#include <PropertyHelper.hxx> -#include <unonames.hxx> -#include <cppuhelper/supportsservice.hxx> - -#include <com/sun/star/beans/Property.hpp> -#include <com/sun/star/beans/PropertyAttribute.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> - -using namespace com::sun::star; - -namespace chart { - -namespace { - -enum -{ - PROP_GL3DCHARTTYPE_ROUNDED_EDGE -}; - -struct DefaultsInitializer -{ - tPropertyValueMap* operator()() - { - static tPropertyValueMap aStaticDefaults; - - if (aStaticDefaults.empty()) - addDefaults(aStaticDefaults); - - return &aStaticDefaults; - } -private: - - static void addDefaults( tPropertyValueMap & rOutMap ) - { - PropertyHelper::setPropertyValueDefault(rOutMap, PROP_GL3DCHARTTYPE_ROUNDED_EDGE, false); - } -}; - -struct Defaults : public rtl::StaticAggregate<tPropertyValueMap, DefaultsInitializer> {}; - -struct InfoHelperInitializer -{ - cppu::OPropertyArrayHelper* operator()() - { - static cppu::OPropertyArrayHelper aHelper(getProperties()); - return &aHelper; - } - - static uno::Sequence<beans::Property> getProperties() - { - uno::Sequence<beans::Property> aRet(1); - - aRet[0] = beans::Property( - CHART_UNONAME_ROUNDED_EDGE, - PROP_GL3DCHARTTYPE_ROUNDED_EDGE, - cppu::UnoType<bool>::get(), - beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT); - - return aRet; - } -}; - -struct InfoHelper : public rtl::StaticAggregate<cppu::OPropertyArrayHelper, InfoHelperInitializer> {}; - -struct ChartTypeInfoInitializer -{ - uno::Reference<beans::XPropertySetInfo>* operator()() - { - static uno::Reference<beans::XPropertySetInfo> xPropertySetInfo; - - if (!xPropertySetInfo.is()) - xPropertySetInfo = cppu::OPropertySetHelper::createPropertySetInfo(*InfoHelper::get()); - - return &xPropertySetInfo; - } -}; - -struct ChartTypeInfo : public rtl::StaticAggregate<uno::Reference<beans::XPropertySetInfo>, ChartTypeInfoInitializer> {}; - -} - -GL3DBarChartType::GL3DBarChartType() -{ -} - -GL3DBarChartType::GL3DBarChartType( const GL3DBarChartType& rOther ) : - ChartType(rOther) -{ -} - -GL3DBarChartType::~GL3DBarChartType() {} - -OUString SAL_CALL GL3DBarChartType::getImplementationName() -{ - return OUString("com.sun.star.comp.chart.GL3DBarChartType"); -} - -sal_Bool SAL_CALL GL3DBarChartType::supportsService( const OUString& rServiceName ) -{ - return cppu::supportsService(this, rServiceName); -} - -css::uno::Sequence< OUString > SAL_CALL GL3DBarChartType::getSupportedServiceNames() -{ - return { - CHART2_SERVICE_NAME_CHARTTYPE_GL3DBAR, - "com.sun.star.chart2.ChartType", - "com.sun.star.beans.PropertySet" }; -} - -OUString SAL_CALL GL3DBarChartType::getChartType() -{ - return OUString(CHART2_SERVICE_NAME_CHARTTYPE_GL3DBAR); -} - -uno::Sequence<OUString> GL3DBarChartType::getSupportedPropertyRoles() -{ - uno::Sequence< OUString > aPropRoles { "FillColor" }; - - return aPropRoles; -} - -css::uno::Reference<css::util::XCloneable> -GL3DBarChartType::createClone() -{ - return uno::Reference<util::XCloneable>(new GL3DBarChartType(*this)); -} - -css::uno::Any GL3DBarChartType::GetDefaultValue( sal_Int32 nHandle ) const -{ - const tPropertyValueMap& rDefaults = *Defaults::get(); - tPropertyValueMap::const_iterator it = rDefaults.find(nHandle); - return it == rDefaults.end() ? uno::Any() : it->second; -} - -cppu::IPropertyArrayHelper& GL3DBarChartType::getInfoHelper() -{ - return *InfoHelper::get(); -} - -css::uno::Reference<css::beans::XPropertySetInfo> GL3DBarChartType::getPropertySetInfo() -{ - return *ChartTypeInfo::get(); -} - -} - -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * -com_sun_star_comp_chart_GL3DBarChartType_get_implementation(css::uno::XComponentContext * /*context*/, - css::uno::Sequence<css::uno::Any> const &) -{ - return cppu::acquire(new ::chart::GL3DBarChartType); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/model/template/GL3DBarChartType.hxx b/chart2/source/model/template/GL3DBarChartType.hxx deleted file mode 100644 index 09bacd33c803..000000000000 --- a/chart2/source/model/template/GL3DBarChartType.hxx +++ /dev/null @@ -1,58 +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/. - */ - -#ifndef INCLUDED_CHART2_SOURCE_MODEL_TEMPLATE_GL3DBARCHARTTYPE_HXX -#define INCLUDED_CHART2_SOURCE_MODEL_TEMPLATE_GL3DBARCHARTTYPE_HXX - -#include "ChartType.hxx" - -namespace chart { - -/** - * Chart type that represents 3 dimensional data content in 3D space using - * OpenGL. - */ -class GL3DBarChartType final : public ChartType -{ -public: - explicit GL3DBarChartType(); - virtual ~GL3DBarChartType() override; - - virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedPropertyRoles() override; - virtual OUString SAL_CALL - getImplementationName() override; - virtual sal_Bool SAL_CALL - supportsService( const OUString& ServiceName ) override; - virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() override; - -private: - GL3DBarChartType( const GL3DBarChartType& rOther ); - - virtual OUString SAL_CALL getChartType() override; - - virtual css::uno::Reference<css::util::XCloneable> SAL_CALL - createClone() override; - - // OPropertySet - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; - - virtual cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; - - // XPropertySet - virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL - getPropertySetInfo() override; -}; - -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx b/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx deleted file mode 100644 index ba7022da71b5..000000000000 --- a/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx +++ /dev/null @@ -1,195 +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/. - */ - -#include "GL3DBarChartTypeTemplate.hxx" -#include "GL3DBarChartType.hxx" - -#include <servicenames_charttypes.hxx> -#include <PropertyHelper.hxx> -#include <DiagramHelper.hxx> -#include <unonames.hxx> - -#include <com/sun/star/beans/Property.hpp> -#include <com/sun/star/beans/PropertyAttribute.hpp> -#include <tools/diagnose_ex.h> - -using namespace com::sun::star; - -namespace chart { - -namespace { - -enum -{ - PROP_GL3DCHARTTYPE_ROUNDED_EDGE -}; - -struct DefaultsInitializer -{ - tPropertyValueMap* operator()() - { - static tPropertyValueMap aStaticDefaults; - - if (aStaticDefaults.empty()) - addDefaults(aStaticDefaults); - - return &aStaticDefaults; - } -private: - - static void addDefaults( tPropertyValueMap & rOutMap ) - { - PropertyHelper::setPropertyValueDefault(rOutMap, PROP_GL3DCHARTTYPE_ROUNDED_EDGE, false); - } -}; - -struct Defaults : public rtl::StaticAggregate<tPropertyValueMap, DefaultsInitializer> {}; - -struct InfoHelperInitializer -{ - cppu::OPropertyArrayHelper* operator()() - { - static cppu::OPropertyArrayHelper aHelper(getProperties()); - return &aHelper; - } - - static uno::Sequence<beans::Property> getProperties() - { - uno::Sequence<beans::Property> aRet(1); - - aRet[0] = beans::Property( - CHART_UNONAME_ROUNDED_EDGE, - PROP_GL3DCHARTTYPE_ROUNDED_EDGE, - cppu::UnoType<bool>::get(), - beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT); - - return aRet; - } -}; - -struct InfoHelper : public rtl::StaticAggregate<cppu::OPropertyArrayHelper, InfoHelperInitializer> {}; - -struct ChartTypeInfoInitializer -{ - uno::Reference<beans::XPropertySetInfo>* operator()() - { - static uno::Reference<beans::XPropertySetInfo> xPropertySetInfo; - - if (!xPropertySetInfo.is()) - xPropertySetInfo = cppu::OPropertySetHelper::createPropertySetInfo(*InfoHelper::get()); - - return &xPropertySetInfo; - } -}; - -struct ChartTypeInfo : public rtl::StaticAggregate<uno::Reference<beans::XPropertySetInfo>, ChartTypeInfoInitializer> {}; - -} - -GL3DBarChartTypeTemplate::GL3DBarChartTypeTemplate( - const uno::Reference<uno::XComponentContext>& xContext, const OUString& rServiceName ) : - property::OPropertySet(m_aMutex), - ChartTypeTemplate(xContext, rServiceName) {} - -GL3DBarChartTypeTemplate::~GL3DBarChartTypeTemplate() {} - -uno::Reference<chart2::XChartType> GL3DBarChartTypeTemplate::getChartTypeForIndex( sal_Int32 /*nChartTypeIndex*/ ) -{ - uno::Reference<chart2::XChartType> xResult; - - try - { - uno::Reference<lang::XMultiServiceFactory> xFact( - GetComponentContext()->getServiceManager(), uno::UNO_QUERY_THROW); - - xResult.set(xFact->createInstance(CHART2_SERVICE_NAME_CHARTTYPE_GL3DBAR), uno::UNO_QUERY_THROW); - - uno::Reference<beans::XPropertySet> xCTProp(xResult, uno::UNO_QUERY); - if (xCTProp.is()) - { ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
