diff options
| author | burcinakalin <brcnakalin@gmail.com> | 2016-01-27 16:06:25 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-01-27 21:18:10 +0000 |
| commit | 6a00a34d374bc1780b1448d10750e4129214e294 (patch) | |
| tree | f28acf44453f85975f55a9385f0c5a97d4109484 | |
| parent | 9faa18cd0ae8a6893cd51fc7df8807b9567b6bd0 (diff) | |
tdf#95416 Get rid of #include "../foo/bar.hxx" style includes
Change-Id: Ie05b032012124699c7f774f4b04bdf3d686e228e
Signed-off-by: burcinakalin <brcnakalin@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/21840
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | sw/source/ui/envelp/label1.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/envelp/labfmt.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/envelp/swuilabimp.hxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/inc/labimp.hxx (renamed from sw/source/uibase/envelp/labimp.hxx) | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index 63e03d19da67..ae931682d6ec 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 c92a0cf54f93..c85dd0029432 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 0b6207fb58d2..896502cdccfb 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 index 982132fd3d32..ff1dbe54cfde 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: */ |