[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - chart2/source solenv/clang-format
Muhammet Kara (via logerrit)
logerrit at kemper.freedesktop.org
Thu Oct 17 12:46:13 UTC 2019
chart2/source/controller/dialogs/ChangingResource.cxx | 2 +-
chart2/source/controller/dialogs/ChartTypeDialogController.cxx | 2 +-
chart2/source/controller/dialogs/dlg_CreationWizard.cxx | 2 +-
chart2/source/controller/dialogs/dlg_DataSource.cxx | 2 +-
chart2/source/controller/dialogs/tp_ChartType.hxx | 4 ++--
chart2/source/controller/dialogs/tp_DataSource.cxx | 2 +-
chart2/source/controller/dialogs/tp_RangeChooser.cxx | 2 +-
chart2/source/inc/ChartTypeDialogController.hxx | 2 +-
solenv/clang-format/blacklist | 6 +++---
9 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 6f7034aa89c75b705b2e575493cbc82ab37d8299
Author: Muhammet Kara <muhammet.kara at collabora.com>
AuthorDate: Wed Oct 16 22:05:18 2019 +0300
Commit: Muhammet Kara <muhammet.kara at collabora.com>
CommitDate: Thu Oct 17 14:45:28 2019 +0200
chart2: Move some headers to inc
So that they will be accessible from
inside the sidebar dir.
Change-Id: Iaf7b1a800a3b35a5c497d8122f68c97c8cdc9eff
Reviewed-on: https://gerrit.libreoffice.org/80922
Reviewed-by: Muhammet Kara <muhammet.kara at collabora.com>
Tested-by: Muhammet Kara <muhammet.kara at collabora.com>
diff --git a/chart2/source/controller/dialogs/ChangingResource.cxx b/chart2/source/controller/dialogs/ChangingResource.cxx
index 6e1ba1c67274..c50f274dadd4 100644
--- a/chart2/source/controller/dialogs/ChangingResource.cxx
+++ b/chart2/source/controller/dialogs/ChangingResource.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "ChangingResource.hxx"
+#include <ChangingResource.hxx>
namespace chart
{
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index 56a7a2173c88..3c34c96982f3 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "ChartTypeDialogController.hxx"
+#include <ChartTypeDialogController.hxx>
#include <ResId.hxx>
#include <strings.hrc>
#include <bitmaps.hlst>
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index c9da0b2227e7..60fbf69c289a 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -27,7 +27,7 @@
#include "tp_RangeChooser.hxx"
#include "tp_Wizard_TitlesAndObjects.hxx"
#include "tp_DataSource.hxx"
-#include "ChartTypeTemplateProvider.hxx"
+#include <ChartTypeTemplateProvider.hxx>
#include "DialogModel.hxx"
#define CHART_WIZARD_PAGEWIDTH 250
diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx
index 86651bcfd6bd..fdbafd92b693 100644
--- a/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -20,7 +20,7 @@
#include <dlg_DataSource.hxx>
#include <strings.hrc>
#include <ResId.hxx>
-#include "ChartTypeTemplateProvider.hxx"
+#include <ChartTypeTemplateProvider.hxx>
#include <DiagramHelper.hxx>
#include <ChartModel.hxx>
#include "DialogModel.hxx"
diff --git a/chart2/source/controller/dialogs/tp_ChartType.hxx b/chart2/source/controller/dialogs/tp_ChartType.hxx
index 4470ed60443d..22b354a22ad3 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.hxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.hxx
@@ -22,8 +22,8 @@
#include <vector>
-#include "ChartTypeDialogController.hxx"
-#include "ChartTypeTemplateProvider.hxx"
+#include <ChartTypeDialogController.hxx>
+#include <ChartTypeTemplateProvider.hxx>
#include <TimerTriggeredControllerLock.hxx>
#include <svtools/wizardmachine.hxx>
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 758664428019..16c2d7f59222 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -21,7 +21,7 @@
#include <strings.hrc>
#include <ResId.hxx>
#include <chartview/ChartSfxItemIds.hxx>
-#include "ChartTypeTemplateProvider.hxx"
+#include <ChartTypeTemplateProvider.hxx>
#include <RangeSelectionHelper.hxx>
#include <DataSeriesHelper.hxx>
#include <ControllerLockGuard.hxx>
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index 130ab64df371..c809f757125d 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -20,7 +20,7 @@
#include "tp_RangeChooser.hxx"
#include <DataSourceHelper.hxx>
#include <DiagramHelper.hxx>
-#include "ChartTypeTemplateProvider.hxx"
+#include <ChartTypeTemplateProvider.hxx>
#include "DialogModel.hxx"
#include <RangeSelectionHelper.hxx>
#include <TabPageNotifiable.hxx>
diff --git a/chart2/source/controller/dialogs/ChangingResource.hxx b/chart2/source/inc/ChangingResource.hxx
similarity index 100%
rename from chart2/source/controller/dialogs/ChangingResource.hxx
rename to chart2/source/inc/ChangingResource.hxx
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx b/chart2/source/inc/ChartTypeDialogController.hxx
similarity index 99%
rename from chart2/source/controller/dialogs/ChartTypeDialogController.hxx
rename to chart2/source/inc/ChartTypeDialogController.hxx
index 2985d31b10db..4a38768e9f77 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
+++ b/chart2/source/inc/ChartTypeDialogController.hxx
@@ -24,7 +24,7 @@
#include <map>
-#include "ChangingResource.hxx"
+#include <ChangingResource.hxx>
#include <ThreeDHelper.hxx>
#include <com/sun/star/chart2/CurveStyle.hpp>
diff --git a/chart2/source/controller/dialogs/ChartTypeTemplateProvider.hxx b/chart2/source/inc/ChartTypeTemplateProvider.hxx
similarity index 100%
rename from chart2/source/controller/dialogs/ChartTypeTemplateProvider.hxx
rename to chart2/source/inc/ChartTypeTemplateProvider.hxx
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index ff7ff284e0cb..0f46e3b6630c 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -949,10 +949,7 @@ chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx
chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx
chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx
chart2/source/controller/dialogs/ChangingResource.cxx
-chart2/source/controller/dialogs/ChangingResource.hxx
chart2/source/controller/dialogs/ChartTypeDialogController.cxx
-chart2/source/controller/dialogs/ChartTypeDialogController.hxx
-chart2/source/controller/dialogs/ChartTypeTemplateProvider.hxx
chart2/source/controller/dialogs/DataBrowser.cxx
chart2/source/controller/dialogs/DataBrowser.hxx
chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -1181,9 +1178,12 @@ chart2/source/inc/AxisHelper.hxx
chart2/source/inc/AxisIndexDefines.hxx
chart2/source/inc/BaseGFXHelper.hxx
chart2/source/inc/CachedDataSequence.hxx
+chart2/source/inc/ChangingResource.hxx
chart2/source/inc/CharacterProperties.hxx
chart2/source/inc/ChartModelHelper.hxx
+chart2/source/inc/ChartTypeDialogController.hxx
chart2/source/inc/ChartTypeHelper.hxx
+chart2/source/inc/ChartTypeTemplateProvider.hxx
chart2/source/inc/ChartViewHelper.hxx
chart2/source/inc/CloneHelper.hxx
chart2/source/inc/ColorPerPointHelper.hxx
More information about the Libreoffice-commits
mailing list