[Libreoffice-commits] core.git: include/xmloff xmloff/inc xmloff/source

[Miklos Vajna]

 xmloff/inc/xmlmultiimagehelper.hxx         |    6 +++---
 xmloff/source/core/xmlmultiimagehelper.cxx |    2 +-
 xmloff/source/draw/ximpshap.hxx            |    2 +-
 xmloff/source/text/XMLTextFrameContext.hxx |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 22c6554c98e210e48813127b5f460d633bae08e7
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon May 29 14:48:17 2017 +0200

    xmloff: move in xmlmultiimagehelper.hxx from include/
    
    Since it's not used outside xmloff.
    
    Change-Id: Ibec67db2106300b6d4a91ce07d779e16e028eb2a
    Reviewed-on: https://gerrit.libreoffice.org/38144
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/include/xmloff/xmlmultiimagehelper.hxx b/xmloff/inc/xmlmultiimagehelper.hxx
similarity index 93%
rename from include/xmloff/xmlmultiimagehelper.hxx
rename to xmloff/inc/xmlmultiimagehelper.hxx
index 4a14d1ac4a77..ee2df0f53c74 100644
--- a/include/xmloff/xmlmultiimagehelper.hxx
+++ b/xmloff/inc/xmlmultiimagehelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_XMLOFF_XMLMULTIIMAGEHELPER_HXX
-#define INCLUDED_XMLOFF_XMLMULTIIMAGEHELPER_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLMULTIIMAGEHELPER_HXX
+#define INCLUDED_XMLOFF_INC_XMLMULTIIMAGEHELPER_HXX
 
 #include <sal/types.h>
 #include <xmloff/xmlimp.hxx>
@@ -54,6 +54,6 @@ public:
 };
 
 
-#endif // INCLUDED_XMLOFF_XMLMULTIIMAGEHELPER_HXX
+#endif // INCLUDED_XMLOFF_INC_XMLMULTIIMAGEHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/xmlmultiimagehelper.cxx b/xmloff/source/core/xmlmultiimagehelper.cxx
index 4397d5ab144a..897528c565c5 100644
--- a/xmloff/source/core/xmlmultiimagehelper.cxx
+++ b/xmloff/source/core/xmlmultiimagehelper.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <xmloff/xmlmultiimagehelper.hxx>
 #include <rtl/ustring.hxx>
+#include "xmlmultiimagehelper.hxx"
 
 using namespace ::com::sun::star;
 
diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx
index 56bdd7f84934..407710e6c1c9 100644
--- a/xmloff/source/draw/ximpshap.hxx
+++ b/xmloff/source/draw/ximpshap.hxx
@@ -38,7 +38,7 @@
 #include "xexptran.hxx"
 #include <vector>
 #include <xmloff/shapeimport.hxx>
-#include <xmloff/xmlmultiimagehelper.hxx>
+#include "xmlmultiimagehelper.hxx"
 #include <basegfx/matrix/b2dhommatrix.hxx>
 
 template<typename EnumT> struct SvXMLEnumMapEntry;
diff --git a/xmloff/source/text/XMLTextFrameContext.hxx b/xmloff/source/text/XMLTextFrameContext.hxx
index 2f82ea50ffac..22587c16dd4f 100644
--- a/xmloff/source/text/XMLTextFrameContext.hxx
+++ b/xmloff/source/text/XMLTextFrameContext.hxx
@@ -24,7 +24,7 @@
 
 #include <com/sun/star/text/TextContentAnchorType.hpp>
 #include <xmloff/xmlictxt.hxx>
-#include <xmloff/xmlmultiimagehelper.hxx>
+#include "xmlmultiimagehelper.hxx"
 
 namespace com { namespace sun { namespace star {
     namespace text { class XTextCursor; class XTextContent; }