[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang include/svx svx/source

Stephan Bergmann sbergman at redhat.com
Mon Oct 16 15:32:50 UTC 2017 

 compilerplugins/clang/datamembershadow.cxx        |    4 +---
 include/svx/IAccessibleParent.hxx                 |    2 +-
 include/svx/sidebar/AreaPropertyPanelBase.hxx     |    2 +-
 include/svx/sidebar/LinePropertyPanelBase.hxx     |    2 +-
 svx/source/accessibility/AccessibleTextHelper.cxx |    2 +-
 svx/source/inc/DefaultShapesPanel.hxx             |    4 ++--
 svx/source/inc/ShapesUtil.hxx                     |    4 ++--
 svx/source/inc/cell.hxx                           |    4 ++--
 svx/source/inc/celltypes.hxx                      |    4 ++--
 svx/source/inc/tablemodel.hxx                     |    4 ++--
 svx/source/sidebar/PanelFactory.cxx               |    2 +-
 svx/source/unodraw/unoshtxt.cxx                   |    2 +-
 12 files changed, 17 insertions(+), 19 deletions(-)

New commits:
commit 2d3535a78aa1b3e2714adfa65cd73bd0fe02427e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Oct 16 17:31:23 2017 +0200

    Move svx include files to common include directory
    
    ...that are included from various source directories.  Change done in
    preparation of loplugin:includeform.
    
    Change-Id: I9191e80aa721c376f17219e4d10eb83929e38e14

diff --git a/compilerplugins/clang/datamembershadow.cxx b/compilerplugins/clang/datamembershadow.cxx
index b946b7001759..d07055675ad9 100644
--- a/compilerplugins/clang/datamembershadow.cxx
+++ b/compilerplugins/clang/datamembershadow.cxx
@@ -85,9 +85,7 @@ bool DataMemberShadow::VisitFieldDecl(FieldDecl const * fieldDecl)
     if (loplugin::isSamePathname(aFileName, SRCDIR "/store/source/stortree.hxx")
         || loplugin::isSamePathname(aFileName, SRCDIR "/store/source/stordata.hxx"))
         return true;
-    if (loplugin::isSamePathname(aFileName, SRCDIR "/svx/source/table/cell.hxx")
-        || loplugin::isSamePathname(aFileName, SRCDIR "/svx/source/unodraw/../table/cell.hxx")
-        || loplugin::isSamePathname(aFileName, SRCDIR "/svx/source/accessibility/../table/cell.hxx"))
+    if (loplugin::isSamePathname(aFileName, SRCDIR "/svx/source/inc/cell.hxx"))
         return true;
     if (loplugin::isSamePathname(aFileName, SRCDIR "/sw/source/uibase/inc/dbtree.hxx"))
         return true;
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx
index 0bc3a55b39ee..4859d2e15031 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -62,7 +62,7 @@
 #include "editeng/AccessibleEditableTextPara.hxx"
 #include <svx/svdmodel.hxx>
 #include <svx/svdpntv.hxx>
-#include "../table/cell.hxx"
+#include "cell.hxx"
 #include "../table/accessiblecell.hxx"
 #include <editeng/editdata.hxx>
 #include <editeng/editeng.hxx>
diff --git a/svx/source/sidebar/shapes/DefaultShapesPanel.hxx b/svx/source/inc/DefaultShapesPanel.hxx
similarity index 93%
rename from svx/source/sidebar/shapes/DefaultShapesPanel.hxx
rename to svx/source/inc/DefaultShapesPanel.hxx
index 073e2a1ee151..3759b1d859cd 100644
--- a/svx/source/sidebar/shapes/DefaultShapesPanel.hxx
+++ b/svx/source/inc/DefaultShapesPanel.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_SD_SOURCE_SIDEBAR_INSERT_DEFAULTSHAPESPANEL_HXX
-#define INCLUDED_SD_SOURCE_SIDEBAR_INSERT_DEFAULTSHAPESPANEL_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_DEFAULTSHAPESPANEL_HXX
+#define INCLUDED_SVX_SOURCE_INC_DEFAULTSHAPESPANEL_HXX
 
 #include <vcl/ctrl.hxx>
 #include <com/sun/star/frame/XFrame.hpp>
diff --git a/svx/source/sidebar/shapes/ShapesUtil.hxx b/svx/source/inc/ShapesUtil.hxx
similarity index 88%
rename from svx/source/sidebar/shapes/ShapesUtil.hxx
rename to svx/source/inc/ShapesUtil.hxx
index 0ac33f574b45..e6385c9a69d0 100644
--- a/svx/source/sidebar/shapes/ShapesUtil.hxx
+++ b/svx/source/inc/ShapesUtil.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_SVX_SOURCE_SIDEBAR_SHAPES_SHAPESUTIL_HXX
-#define INCLUDED_SVX_SOURCE_SIDEBAR_SHAPES_SHAPESUTIL_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_SHAPESUTIL_HXX
+#define INCLUDED_SVX_SOURCE_INC_SHAPESUTIL_HXX
 #include <map>
 #include <rtl/ustring.hxx>
 
diff --git a/svx/source/table/cell.hxx b/svx/source/inc/cell.hxx
similarity index 99%
rename from svx/source/table/cell.hxx
rename to svx/source/inc/cell.hxx
index 1bd063dac3f6..3a061c58475d 100644
--- a/svx/source/table/cell.hxx
+++ b/svx/source/inc/cell.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVX_SOURCE_TABLE_CELL_HXX
-#define INCLUDED_SVX_SOURCE_TABLE_CELL_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_CELL_HXX
+#define INCLUDED_SVX_SOURCE_INC_CELL_HXX
 
 #include <com/sun/star/table/XMergeableCell.hpp>
 #include <com/sun/star/awt/XLayoutConstrains.hpp>
diff --git a/svx/source/table/celltypes.hxx b/svx/source/inc/celltypes.hxx
similarity index 96%
rename from svx/source/table/celltypes.hxx
rename to svx/source/inc/celltypes.hxx
index 2200e1661a59..6296ac42d7da 100644
--- a/svx/source/table/celltypes.hxx
+++ b/svx/source/inc/celltypes.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVX_SOURCE_TABLE_CELLTYPES_HXX
-#define INCLUDED_SVX_SOURCE_TABLE_CELLTYPES_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_CELLTYPES_HXX
+#define INCLUDED_SVX_SOURCE_INC_CELLTYPES_HXX
 
 #include <rtl/ref.hxx>
 #include <vector>
diff --git a/svx/source/table/tablemodel.hxx b/svx/source/inc/tablemodel.hxx
similarity index 98%
rename from svx/source/table/tablemodel.hxx
rename to svx/source/inc/tablemodel.hxx
index e5027da121fa..5c1ac7a86e6d 100644
--- a/svx/source/table/tablemodel.hxx
+++ b/svx/source/inc/tablemodel.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVX_SOURCE_TABLE_TABLEMODEL_HXX
-#define INCLUDED_SVX_SOURCE_TABLE_TABLEMODEL_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_TABLEMODEL_HXX
+#define INCLUDED_SVX_SOURCE_INC_TABLEMODEL_HXX
 
 #include <sal/types.h>
 #include <com/sun/star/util/XBroadcaster.hpp>
diff --git a/svx/source/sidebar/PanelFactory.cxx b/svx/source/sidebar/PanelFactory.cxx
index 2a1787e2013b..837a6ca486b1 100644
--- a/svx/source/sidebar/PanelFactory.cxx
+++ b/svx/source/sidebar/PanelFactory.cxx
@@ -25,7 +25,7 @@
 #include "graphic/GraphicPropertyPanel.hxx"
 #include "line/LinePropertyPanel.hxx"
 #include "possize/PosSizePropertyPanel.hxx"
-#include "shapes/DefaultShapesPanel.hxx"
+#include "DefaultShapesPanel.hxx"
 #include "media/MediaPlaybackPanel.hxx"
 #include "GalleryControl.hxx"
 #include "EmptyPanel.hxx"
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index cfb3cbb9499a..21a46709095f 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -47,7 +47,7 @@
 #include <com/sun/star/linguistic2/LinguServiceManager.hpp>
 #include <comphelper/processfactory.hxx>
 #include <svx/svdotable.hxx>
-#include "../table/cell.hxx"
+#include "cell.hxx"
 #include <svx/sdrpaintwindow.hxx>
 
 
commit f589797f1cb4085f0ba69f3dab2d31e0cbbf701e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Oct 16 17:29:58 2017 +0200

    Make include/svx include files found through global -Iinclude
    
    ...instead of implicitly next to the including file, in preparation of
    loplugin:includeform
    
    Change-Id: I7649ea007d46102731893489bf3b5ff976a573f3

diff --git a/include/svx/IAccessibleParent.hxx b/include/svx/IAccessibleParent.hxx
index 36d1cb848340..08b142483ece 100644
--- a/include/svx/IAccessibleParent.hxx
+++ b/include/svx/IAccessibleParent.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
 #include <sal/types.h>
-#include "AccessibleControlShape.hxx"
+#include "svx/AccessibleControlShape.hxx"
 namespace accessibility {
 
 class AccessibleShape;
diff --git a/include/svx/sidebar/AreaPropertyPanelBase.hxx b/include/svx/sidebar/AreaPropertyPanelBase.hxx
index e2d332461d03..acfbb19d7f0d 100644
--- a/include/svx/sidebar/AreaPropertyPanelBase.hxx
+++ b/include/svx/sidebar/AreaPropertyPanelBase.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_SVX_SOURCE_SIDEBAR_AREA_AREAPROPERTYPANELBASE_HXX
 
 #include <memory>
-#include "AreaTransparencyGradientPopup.hxx"
+#include "svx/sidebar/AreaTransparencyGradientPopup.hxx"
 #include <vcl/ctrl.hxx>
 #include <sfx2/sidebar/SidebarPanelBase.hxx>
 #include <sfx2/sidebar/ControllerItem.hxx>
diff --git a/include/svx/sidebar/LinePropertyPanelBase.hxx b/include/svx/sidebar/LinePropertyPanelBase.hxx
index dd4452e7944c..09917d622dea 100644
--- a/include/svx/sidebar/LinePropertyPanelBase.hxx
+++ b/include/svx/sidebar/LinePropertyPanelBase.hxx
@@ -29,7 +29,7 @@
 #include <memory>
 #include <svx/sidebar/PanelLayout.hxx>
 #include <svx/xtable.hxx>
-#include "LineWidthPopup.hxx"
+#include "svx/sidebar/LineWidthPopup.hxx"
 #include <svx/svxdllapi.h>

More information about the Libreoffice-commits mailing list