[Libreoffice-commits] core.git: sd/source

Arnold Dumas arnold at dumas.at
Mon Oct 17 08:01:27 UTC 2016 

 sd/source/core/drawdoc.cxx                  |   10 +++++-----
 sd/source/core/drawdoc2.cxx                 |    6 +++---
 sd/source/core/drawdoc3.cxx                 |   18 +++++++++---------
 sd/source/core/sdpage2.cxx                  |    2 +-
 sd/source/core/stlfamily.cxx                |    2 +-
 sd/source/core/stlsheet.cxx                 |    4 ++--
 sd/source/core/undo/undoobjects.cxx         |    4 ++--
 sd/source/filter/grf/sdgrffilter.cxx        |   12 ++++++------
 sd/source/filter/sdfilter.cxx               |    2 +-
 sd/source/ui/unoidl/UnoDocumentSettings.cxx |    4 ++--
 10 files changed, 32 insertions(+), 32 deletions(-)

New commits:
commit 2b3cf45bb557d95aa67b5bc4eb1ba549e7638d6b
Author: Arnold Dumas <arnold at dumas.at>
Date:   Sun Oct 16 19:27:45 2016 +0200

    tdf#95416: Get rid of #include ../foo/bar.hxx style includes
    
    Change-Id: I6c6e0d4e013c5101f7b78bb8506a6f1f0e1b1497
    Reviewed-on: https://gerrit.libreoffice.org/29934
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index 12ab9f2..39a463e 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -93,11 +93,11 @@
 #include "cusshow.hxx"
 #include "customshowlist.hxx"
 #include "DrawDocShell.hxx"
-#include "../ui/inc/GraphicDocShell.hxx"
-#include "../ui/inc/sdxfer.hxx"
-#include "../ui/inc/ViewShell.hxx"
-#include "../ui/inc/optsitem.hxx"
-#include "../ui/inc/FrameView.hxx"
+#include "GraphicDocShell.hxx"
+#include "sdxfer.hxx"
+#include "ViewShell.hxx"
+#include "optsitem.hxx"
+#include "FrameView.hxx"
 #include <undo/undomanager.hxx>
 
 #include <tools/tenccvt.hxx>
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index deebe82..875d544 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -64,9 +64,9 @@
 #include "undo/undomanager.hxx"
 
 #include "DrawDocShell.hxx"
-#include "../ui/inc/FrameView.hxx"
-#include "../ui/inc/cfgids.hxx"
-#include "../ui/inc/strings.hrc"
+#include "FrameView.hxx"
+#include "cfgids.hxx"
+#include "strings.hrc"
 
 #include "PageListWatcher.hxx"
 #include <vcl/virdev.hxx>
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index d977abc..68c8c12 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -53,16 +53,16 @@
 #include "customshowlist.hxx"
 #include "sdxfer.hxx"
 
-#include "../ui/inc/unmovss.hxx"
-#include "../ui/inc/unchss.hxx"
-#include "../ui/inc/unprlout.hxx"
+#include "unmovss.hxx"
+#include "unchss.hxx"
+#include "unprlout.hxx"
 #include "DrawDocShell.hxx"
-#include "../ui/inc/GraphicDocShell.hxx"
-#include "../ui/inc/ViewShell.hxx"
-#include "../ui/inc/View.hxx"
-#include "../ui/inc/ViewShellBase.hxx"
-#include "../ui/inc/cfgids.hxx"
-#include "../ui/inc/strings.hrc"
+#include "GraphicDocShell.hxx"
+#include "ViewShell.hxx"
+#include "View.hxx"
+#include "ViewShellBase.hxx"
+#include "cfgids.hxx"
+#include "strings.hrc"
 
 using namespace ::com::sun::star;
 
diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx
index fb04c49..9291581 100644
--- a/sd/source/core/sdpage2.cxx
+++ b/sd/source/core/sdpage2.cxx
@@ -41,7 +41,7 @@
 #include "pglink.hxx"
 #include "anminfo.hxx"
 
-#include "../ui/inc/strings.hrc"
+#include "strings.hrc"
 #include "DrawDocShell.hxx"
 
 #include <tools/tenccvt.hxx>
diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx
index 7d7e5fc..cca0024 100644
--- a/sd/source/core/stlfamily.cxx
+++ b/sd/source/core/stlfamily.cxx
@@ -28,7 +28,7 @@
 
 #include <svx/unoprov.hxx>
 
-#include "../ui/inc/strings.hrc"
+#include "strings.hrc"
 #include "stlfamily.hxx"
 #include "stlsheet.hxx"
 #include "sdresid.hxx"
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 41ee42b..cf76a45 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -50,8 +50,8 @@
 #include "app.hrc"
 #include "glob.hxx"
 #include "helpids.h"
-#include "../ui/inc/DrawViewShell.hxx"
-#include "../ui/inc/ViewShellBase.hxx"
+#include "DrawViewShell.hxx"
+#include "ViewShellBase.hxx"
 #include <editeng/boxitem.hxx>
 
 #include <memory>
diff --git a/sd/source/core/undo/undoobjects.cxx b/sd/source/core/undo/undoobjects.cxx
index bfe80f6..d4e7d63 100644
--- a/sd/source/core/undo/undoobjects.cxx
+++ b/sd/source/core/undo/undoobjects.cxx
@@ -22,8 +22,8 @@
 #include "CustomAnimationEffect.hxx"
 #include "drawdoc.hxx"
 #include "undoanim.hxx"
-#include "../../ui/inc/ViewShell.hxx"
-#include "../../ui/inc/ViewShellBase.hxx"
+#include "ViewShell.hxx"
+#include "ViewShellBase.hxx"
 #include "DrawDocShell.hxx"
 
 using namespace sd;
diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx
index 5c02019..6f53645 100644
--- a/sd/source/filter/grf/sdgrffilter.cxx
+++ b/sd/source/filter/grf/sdgrffilter.cxx
@@ -38,11 +38,11 @@
 #include <svx/svdograf.hxx>
 #include <svx/svdpagv.hxx>
 
-#include "../../ui/inc/strings.hrc"
-#include "../../ui/inc/DrawViewShell.hxx"
+#include "strings.hrc"
+#include "DrawViewShell.hxx"
 #include "DrawDocShell.hxx"
-#include "../../ui/inc/ClientView.hxx"
-#include "../../ui/inc/FrameView.hxx"
+#include "ClientView.hxx"
+#include "FrameView.hxx"
 
 #include "comphelper/anytostring.hxx"
 #include "cppuhelper/exc_hlp.hxx"
@@ -57,7 +57,7 @@
 #include "drawdoc.hxx"
 #include "sdresid.hxx"
 #include "sdgrffilter.hxx"
-#include "../../ui/inc/ViewShellBase.hxx"
+#include "ViewShellBase.hxx"
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/PropertyValues.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -66,7 +66,7 @@
 #include <com/sun/star/document/XExporter.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <com/sun/star/drawing/XDrawView.hpp>
-#include "../../ui/inc/DrawController.hxx"
+#include "DrawController.hxx"
 #include <cppuhelper/implbase.hxx>
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/task/XInteractionHandler.hpp>
diff --git a/sd/source/filter/sdfilter.cxx b/sd/source/filter/sdfilter.cxx
index c21cf23..84f0e9a 100644
--- a/sd/source/filter/sdfilter.cxx
+++ b/sd/source/filter/sdfilter.cxx
@@ -28,7 +28,7 @@
 #include <svl/itemset.hxx>
 
 #include "DrawDocShell.hxx"
-#include "../ui/inc/strings.hrc"
+#include "strings.hrc"
 
 #include "sdresid.hxx"
 #include "pres.hxx"
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
index 4c7f98d..8e408bb 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
@@ -43,8 +43,8 @@
 #include "optsitem.hxx"
 #include <sfx2/printer.hxx>
 #include "sdattr.hxx"
-#include "../inc/ViewShell.hxx"
-#include "../inc/FrameView.hxx"
+#include "ViewShell.hxx"
+#include "FrameView.hxx"
 #include "Outliner.hxx"
 #include <xmloff/settingsstore.hxx>
 #include <editeng/editstat.hxx>

More information about the Libreoffice-commits mailing list