sw/source/ui/envelp/label1.cxx | 2
sw/source/ui/envelp/labfmt.cxx | 2
sw/source/ui/envelp/swuilabimp.hxx | 2
sw/source/uibase/envelp/labimp.hxx | 81 -------------------------------------
sw/source/uibase/inc/labimp.hxx | 81 +++++++++++++++++++++++++++++++++++++
5 files changed, 84 insertions(+), 84 deletions(-)
New commits:
commit 6a00a34d374bc1780b1448d10750e4129214e294
Author: burcinakalin <brcnaka...@gmail.com>
Date: Wed Jan 27 16:06:25 2016 +0200
tdf#95416 Get rid of #include "../foo/bar.hxx" style includes
Change-Id: Ie05b032012124699c7f774f4b04bdf3d686e228e
Signed-off-by: burcinakalin <brcnaka...@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/21840
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index 63e03d1..ae93168 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -24,7 +24,7 @@
#include <swtypes.hxx>
#include <wrtsh.hxx>
#include <initui.hxx>
-#include <../../uibase/envelp/labimp.hxx>
+#include "labimp.hxx"
#include <labfmt.hxx>
#include <labprt.hxx>
#include <unotools.hxx>
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index c92a0cf..c85dd00 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -27,7 +27,7 @@
#include "swtypes.hxx"
#include "cmdid.h"
#include "label.hxx"
-#include "../../uibase/envelp/labimp.hxx"
+#include "labimp.hxx"
#include "labimg.hxx"
#include "labfmt.hxx"
#include "uitool.hxx"
diff --git a/sw/source/ui/envelp/swuilabimp.hxx
b/sw/source/ui/envelp/swuilabimp.hxx
index 0b6207f..896502c 100644
--- a/sw/source/ui/envelp/swuilabimp.hxx
+++ b/sw/source/ui/envelp/swuilabimp.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_SW_SOURCE_UI_ENVELP_SWUILABIMP_HXX
#define INCLUDED_SW_SOURCE_UI_ENVELP_SWUILABIMP_HXX
-#include "../../uibase/envelp/labimp.hxx"
+#include "labimp.hxx"
#include <com/sun/star/text/XAutoTextContainer2.hpp>
#include <vcl/layout.hxx>
diff --git a/sw/source/uibase/envelp/labimp.hxx
b/sw/source/uibase/inc/labimp.hxx
similarity index 95%
rename from sw/source/uibase/envelp/labimp.hxx
rename to sw/source/uibase/inc/labimp.hxx
index 982132f..ff1dbe5 100644
--- a/sw/source/uibase/envelp/labimp.hxx
+++ b/sw/source/uibase/inc/labimp.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_SW_SOURCE_UIBASE_ENVELP_LABIMP_HXX
-#define INCLUDED_SW_SOURCE_UIBASE_ENVELP_LABIMP_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_LABIMP_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_LABIMP_HXX
#include <sfx2/tabdlg.hxx>
#include <vcl/lstbox.hxx>
@@ -76,6 +76,6 @@
#define GETFLDVAL(rField)
(rField).Denormalize((rField).GetValue(FUNIT_TWIP))
#define SETFLDVAL(rField, lValue)
(rField).SetValue((rField).Normalize(lValue), FUNIT_TWIP)
-#endif
+#endif // INCLUDED_SW_SOURCE_UIBASE_INC_LABIMP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
