Kaydet (Commit) 4b9740b4 authored tarafından Kohei Yoshida's avatar Kohei Yoshida

Remove duplicate defines and put it into a common place.

Change-Id: I55415985f37970e4d1ba8605e6d22c45198fe19f
üst 8450a99c
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include "DiagramHelper.hxx" #include "DiagramHelper.hxx"
#include "ChartTypeHelper.hxx" #include "ChartTypeHelper.hxx"
#include "ThreeDHelper.hxx" #include "ThreeDHelper.hxx"
#include "defines.hxx"
#include <svx/sdr/overlay/overlaypolypolygon.hxx> #include <svx/sdr/overlay/overlaypolypolygon.hxx>
#include <svx/sdr/overlay/overlaymanager.hxx> #include <svx/sdr/overlay/overlaymanager.hxx>
...@@ -37,8 +38,6 @@ ...@@ -37,8 +38,6 @@
#include <svx/sdr/contact/viewcontactofe3dscene.hxx> #include <svx/sdr/contact/viewcontactofe3dscene.hxx>
#include <drawinglayer/geometry/viewinformation3d.hxx> #include <drawinglayer/geometry/viewinformation3d.hxx>
#define FIXED_SIZE_FOR_3D_CHART_VOLUME (10000.0)
//............................................................................. //.............................................................................
namespace chart namespace chart
{ {
......
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef __CHART2_DEFINES_HXX__
#define __CHART2_DEFINES_HXX__
#define FIXED_SIZE_FOR_3D_CHART_VOLUME 10000.0
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
#include "ChartTypeHelper.hxx" #include "ChartTypeHelper.hxx"
#include "BaseGFXHelper.hxx" #include "BaseGFXHelper.hxx"
#include "DataSeriesHelper.hxx" #include "DataSeriesHelper.hxx"
#include "defines.hxx"
#include <editeng/unoprnms.hxx> #include <editeng/unoprnms.hxx>
#include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/beans/XPropertyState.hpp>
#include <com/sun/star/chart2/XDiagram.hpp> #include <com/sun/star/chart2/XDiagram.hpp>
...@@ -43,8 +45,6 @@ using ::rtl::math::cos; ...@@ -43,8 +45,6 @@ using ::rtl::math::cos;
using ::rtl::math::sin; using ::rtl::math::sin;
using ::rtl::math::tan; using ::rtl::math::tan;
#define FIXED_SIZE_FOR_3D_CHART_VOLUME (10000.0)
namespace namespace
{ {
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include "VAxisBase.hxx" #include "VAxisBase.hxx"
#include "ViewDefines.hxx" #include "ViewDefines.hxx"
#include "DataSeriesHelper.hxx" #include "DataSeriesHelper.hxx"
#include "defines.hxx"
#include "chartview/ExplicitValueProvider.hxx" #include "chartview/ExplicitValueProvider.hxx"
#include <com/sun/star/chart2/AxisType.hpp> #include <com/sun/star/chart2/AxisType.hpp>
#include <com/sun/star/chart2/XChartTypeContainer.hpp> #include <com/sun/star/chart2/XChartTypeContainer.hpp>
......
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
#include "RelativePositionHelper.hxx" #include "RelativePositionHelper.hxx"
#include "DateHelper.hxx" #include "DateHelper.hxx"
#include "DiagramHelper.hxx" #include "DiagramHelper.hxx"
#include "defines.hxx"
//only for creation: @todo remove if all plotter are uno components and instanciated via servicefactory //only for creation: @todo remove if all plotter are uno components and instanciated via servicefactory
#include "BarChart.hxx" #include "BarChart.hxx"
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include "CommonConverters.hxx" #include "CommonConverters.hxx"
#include "ChartTypeHelper.hxx" #include "ChartTypeHelper.hxx"
#include "ThreeDHelper.hxx" #include "ThreeDHelper.hxx"
#include "defines.hxx"
#include <editeng/unoprnms.hxx> #include <editeng/unoprnms.hxx>
#include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/drawing/FillStyle.hpp>
#include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/drawing/LineStyle.hpp>
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of * except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#ifndef _CHART_COMMONDEFINES_HXX #ifndef __CHART2_VIEWDEFINES_HXX__
#define _CHART_COMMONDEFINES_HXX #define __CHART2_VIEWDEFINES_HXX__
namespace chart namespace chart
{ {
...@@ -26,7 +26,6 @@ namespace chart ...@@ -26,7 +26,6 @@ namespace chart
// //
//========================================================================= //=========================================================================
#define CHART_3DOBJECT_SEGMENTCOUNT ((sal_Int32)32) #define CHART_3DOBJECT_SEGMENTCOUNT ((sal_Int32)32)
#define FIXED_SIZE_FOR_3D_CHART_VOLUME (10000.0)
//There needs to be a little distance betweengrid lines and walls in 3D, otherwise the lines are partly hidden by the walls //There needs to be a little distance betweengrid lines and walls in 3D, otherwise the lines are partly hidden by the walls
#define GRID_TO_WALL_DISTANCE (1.0) #define GRID_TO_WALL_DISTANCE (1.0)
......
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
#include "BaseGFXHelper.hxx" #include "BaseGFXHelper.hxx"
#include "DataSeriesHelper.hxx" #include "DataSeriesHelper.hxx"
#include "DateHelper.hxx" #include "DateHelper.hxx"
#include "defines.hxx"
#include <rtl/uuid.h> #include <rtl/uuid.h>
#include <comphelper/scopeguard.hxx> #include <comphelper/scopeguard.hxx>
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include "ShapeFactory.hxx" #include "ShapeFactory.hxx"
#include "PropertyMapper.hxx" #include "PropertyMapper.hxx"
#include "DateHelper.hxx" #include "DateHelper.hxx"
#include "defines.hxx"
#include <com/sun/star/chart/TimeUnit.hpp> #include <com/sun/star/chart/TimeUnit.hpp>
#include <com/sun/star/chart2/AxisType.hpp> #include <com/sun/star/chart2/AxisType.hpp>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment