svx/source/dialog/page.hrc | 6 +++---
svx/source/dialog/papersizelistbox.cxx | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 7124613c81a77d504b2b9de5dadb17ab736255e6
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Nov 1 18:12:06 2017 +0100
page.hrc is only included from svx/source/dialog
...but itself includes svx/source/dialog/page.h, which only happens to work
because of -I$(dir $(3)) in gb_CObject__command_pattern (in
solenv/gbuild/platform/com_{GCC,MSC}_class.mk). Clean that up by moving the
file.
Change-Id: I9f5f4b6884d9ec7357caaffa050c7b516762d71a
Reviewed-on: https://gerrit.libreoffice.org/44172
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/svx/inc/page.hrc b/svx/source/dialog/page.hrc
similarity index 98%
rename from svx/inc/page.hrc
rename to svx/source/dialog/page.hrc
index 2907c6ee72f2..fc42b08e21f3 100644
--- a/svx/inc/page.hrc
+++ b/svx/source/dialog/page.hrc
@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_INC_PAGE_HRC
-#define INCLUDED_SVX_INC_PAGE_HRC
+#ifndef INCLUDED_SVX_SOURCE_DIALOG_PAGE_HRC
+#define INCLUDED_SVX_SOURCE_DIALOG_PAGE_HRC
-#include <page.h>
+#include "page.h"
#include <utility>
#define NC_(Context, String) (Context "\004" u8##String)
diff --git a/svx/source/dialog/papersizelistbox.cxx
b/svx/source/dialog/papersizelistbox.cxx
index 94d93aa92caa..1ec9c17c0da4 100644
--- a/svx/source/dialog/papersizelistbox.cxx
+++ b/svx/source/dialog/papersizelistbox.cxx
@@ -21,7 +21,7 @@
#include <svx/dialmgr.hxx>
#include <svx/papersizelistbox.hxx>
#include <vcl/builderfactory.hxx>
-#include <page.hrc>
+#include "page.hrc"
PaperSizeListBox::PaperSizeListBox(vcl::Window* pParent)
: ListBox( pParent, WB_BORDER | WB_DROPDOWN)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
