shell/inc/basereader.hxx | 72 ++++
shell/inc/columninfo.hxx | 71 ++++
shell/inc/config.hxx | 92 ++++++
shell/inc/contentreader.hxx | 121
+++++++
shell/inc/fileextensions.hxx | 62 ++++
shell/inc/global.hxx | 35 ++
shell/inc/i_xml_parser_event_handler.hxx | 63 ++++
shell/inc/infotips.hxx | 94 ++++++
shell/inc/internal/basereader.hxx | 72 ----
shell/inc/internal/columninfo.hxx | 71 ----
shell/inc/internal/config.hxx | 92 ------
shell/inc/internal/contentreader.hxx | 121
-------
shell/inc/internal/fileextensions.hxx | 62 ----
shell/inc/internal/global.hxx | 35 --
shell/inc/internal/i_xml_parser_event_handler.hxx | 63 ----
shell/inc/internal/infotips.hxx | 94 ------
shell/inc/internal/iso8601_converter.hxx | 41 --
shell/inc/internal/metainforeader.hxx | 143
---------
shell/inc/internal/propertyhdl.hxx | 117
-------
shell/inc/internal/propsheets.hxx | 88 -----
shell/inc/internal/registry.hxx | 63 ----
shell/inc/internal/resource.h | 72 ----
shell/inc/internal/shlxthdl.hxx | 49 ---
shell/inc/internal/stream_helper.hxx | 53 ---
shell/inc/internal/thumbviewer.hxx | 114
-------
shell/inc/internal/types.hxx | 81 -----
shell/inc/internal/utilities.hxx | 135
--------
shell/inc/internal/xml_parser.hxx | 109
-------
shell/inc/internal/zipfile.hxx | 152
----------
shell/inc/iso8601_converter.hxx | 41 ++
shell/inc/metainforeader.hxx | 143
+++++++++
shell/inc/propertyhdl.hxx | 117
+++++++
shell/inc/propsheets.hxx | 88 +++++
shell/inc/registry.hxx | 63 ++++
shell/inc/resource.h | 72 ++++
shell/inc/shlxthdl.hxx | 49 +++
shell/inc/stream_helper.hxx | 53 +++
shell/inc/thumbviewer.hxx | 114
+++++++
shell/inc/types.hxx | 81 +++++
shell/inc/utilities.hxx | 135
++++++++
shell/inc/xml_parser.hxx | 109
+++++++
shell/inc/zipfile.hxx | 152
++++++++++
shell/qa/zip/testzipimpl.hxx | 2
shell/qa/zip/ziptest.cxx | 2
shell/source/all/xml_parser.cxx | 6
shell/source/unix/sysshell/recently_used_file_handler.cxx | 4
shell/source/win32/ooofilereader/basereader.cxx | 4
shell/source/win32/ooofilereader/contentreader.cxx | 2
shell/source/win32/ooofilereader/itag.hxx | 4
shell/source/win32/ooofilereader/metainforeader.cxx | 2
shell/source/win32/shlxthandler/classfactory.cxx | 12
shell/source/win32/shlxthandler/columninfo/columninfo.cxx | 12
shell/source/win32/shlxthandler/infotips/infotips.cxx | 24 -
shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx | 10
shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx | 2
shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx | 2
shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx | 14
shell/source/win32/shlxthandler/propsheets/document_statistic.cxx | 12
shell/source/win32/shlxthandler/propsheets/document_statistic.hxx | 2
shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx | 6
shell/source/win32/shlxthandler/propsheets/propsheets.cxx | 10
shell/source/win32/shlxthandler/res/rcheader.txt | 2
shell/source/win32/shlxthandler/shlxthdl.cxx | 12
shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx | 18 -
shell/source/win32/shlxthandler/util/fileextensions.cxx | 2
shell/source/win32/shlxthandler/util/iso8601_converter.cxx | 4
shell/source/win32/shlxthandler/util/registry.cxx | 2
shell/source/win32/shlxthandler/util/utilities.cxx | 4
shell/source/win32/zipfile/zipexcptn.cxx | 2
shell/source/win32/zipfile/zipfile.cxx | 8
70 files changed, 1920 insertions(+), 1920 deletions(-)
New commits:
commit c076babe3ce636d60a699f66e4912c4d043b0412
Author: Tor Lillqvist <t...@collabora.com>
Date: Thu Apr 7 12:43:39 2016 +0300
Drop pointless "internal" directory level for already internal include files
Change-Id: I1ece44616704483cd4d9d2b6204329414f82a98c
diff --git a/shell/inc/internal/basereader.hxx b/shell/inc/basereader.hxx
similarity index 89%
rename from shell/inc/internal/basereader.hxx
rename to shell/inc/basereader.hxx
index def9292..577684c 100644
--- a/shell/inc/internal/basereader.hxx
+++ b/shell/inc/basereader.hxx
@@ -20,14 +20,14 @@
#ifndef INCLUDED_SHELL_INC_INTERNAL_BASEREADER_HXX
#define INCLUDED_SHELL_INC_INTERNAL_BASEREADER_HXX
-#include "internal/global.hxx"
-#include "internal/types.hxx"
-#include "internal/config.hxx"
-#include "internal/utilities.hxx"
-#include "internal/i_xml_parser_event_handler.hxx"
-
-#include "internal/xml_parser.hxx"
-#include "internal/zipfile.hxx"
+#include "global.hxx"
+#include "types.hxx"
+#include "config.hxx"
+#include "utilities.hxx"
+#include "i_xml_parser_event_handler.hxx"
+
+#include "xml_parser.hxx"
+#include "zipfile.hxx"
class CBaseReader : public i_xml_parser_event_handler
{
diff --git a/shell/inc/internal/columninfo.hxx b/shell/inc/columninfo.hxx
similarity index 100%
rename from shell/inc/internal/columninfo.hxx
rename to shell/inc/columninfo.hxx
diff --git a/shell/inc/internal/config.hxx b/shell/inc/config.hxx
similarity index 100%
rename from shell/inc/internal/config.hxx
rename to shell/inc/config.hxx
diff --git a/shell/inc/internal/contentreader.hxx b/shell/inc/contentreader.hxx
similarity index 99%
rename from shell/inc/internal/contentreader.hxx
rename to shell/inc/contentreader.hxx
index c64e868..2b20e98 100644
--- a/shell/inc/internal/contentreader.hxx
+++ b/shell/inc/contentreader.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SHELL_INC_INTERNAL_CONTENTREADER_HXX
#define INCLUDED_SHELL_INC_INTERNAL_CONTENTREADER_HXX
-#include "internal/basereader.hxx"
+#include "basereader.hxx"
#include <stack>
class ITag;
diff --git a/shell/inc/internal/fileextensions.hxx
b/shell/inc/fileextensions.hxx
similarity index 98%
rename from shell/inc/internal/fileextensions.hxx
rename to shell/inc/fileextensions.hxx
index 53c9106..0c46a40 100644
--- a/shell/inc/internal/fileextensions.hxx
+++ b/shell/inc/fileextensions.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SHELL_INC_INTERNAL_FILEEXTENSIONS_HXX
#define INCLUDED_SHELL_INC_INTERNAL_FILEEXTENSIONS_HXX
-#include "internal/global.hxx"
+#include "global.hxx"
#include <string>
diff --git a/shell/inc/internal/global.hxx b/shell/inc/global.hxx
similarity index 100%
rename from shell/inc/internal/global.hxx
rename to shell/inc/global.hxx
diff --git a/shell/inc/internal/i_xml_parser_event_handler.hxx
b/shell/inc/i_xml_parser_event_handler.hxx
similarity index 100%
rename from shell/inc/internal/i_xml_parser_event_handler.hxx
rename to shell/inc/i_xml_parser_event_handler.hxx
diff --git a/shell/inc/internal/infotips.hxx b/shell/inc/infotips.hxx
similarity index 100%
rename from shell/inc/internal/infotips.hxx
rename to shell/inc/infotips.hxx
diff --git a/shell/inc/internal/iso8601_converter.hxx
b/shell/inc/iso8601_converter.hxx
similarity index 100%
rename from shell/inc/internal/iso8601_converter.hxx
rename to shell/inc/iso8601_converter.hxx
diff --git a/shell/inc/internal/metainforeader.hxx
b/shell/inc/metainforeader.hxx
similarity index 98%
rename from shell/inc/internal/metainforeader.hxx
rename to shell/inc/metainforeader.hxx
index 047bf77..814f658 100644
--- a/shell/inc/internal/metainforeader.hxx
+++ b/shell/inc/metainforeader.hxx
@@ -20,8 +20,8 @@
#ifndef INCLUDED_SHELL_INC_INTERNAL_METAINFOREADER_HXX
#define INCLUDED_SHELL_INC_INTERNAL_METAINFOREADER_HXX
-#include "internal/basereader.hxx"
-#include "internal/types.hxx"
+#include "basereader.hxx"
+#include "types.hxx"
#include <stack>
class ITag;
diff --git a/shell/inc/internal/propertyhdl.hxx b/shell/inc/propertyhdl.hxx
similarity index 100%
rename from shell/inc/internal/propertyhdl.hxx
rename to shell/inc/propertyhdl.hxx
diff --git a/shell/inc/internal/propsheets.hxx b/shell/inc/propsheets.hxx
similarity index 98%
rename from shell/inc/internal/propsheets.hxx
rename to shell/inc/propsheets.hxx
index 6e134b8..f427856 100644
--- a/shell/inc/internal/propsheets.hxx
+++ b/shell/inc/propsheets.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SHELL_INC_INTERNAL_PROPSHEETS_HXX
#define INCLUDED_SHELL_INC_INTERNAL_PROPSHEETS_HXX
-#include "internal/metainforeader.hxx"
+#include "metainforeader.hxx"
#if defined _MSC_VER
#pragma warning(push, 1)
diff --git a/shell/inc/internal/registry.hxx b/shell/inc/registry.hxx
similarity index 100%
rename from shell/inc/internal/registry.hxx
rename to shell/inc/registry.hxx
diff --git a/shell/inc/internal/resource.h b/shell/inc/resource.h
similarity index 100%
rename from shell/inc/internal/resource.h
rename to shell/inc/resource.h
diff --git a/shell/inc/internal/shlxthdl.hxx b/shell/inc/shlxthdl.hxx
similarity index 100%
rename from shell/inc/internal/shlxthdl.hxx
rename to shell/inc/shlxthdl.hxx
diff --git a/shell/inc/internal/stream_helper.hxx b/shell/inc/stream_helper.hxx
similarity index 98%
rename from shell/inc/internal/stream_helper.hxx
rename to shell/inc/stream_helper.hxx
index 306366d..ec9af1b 100644
--- a/shell/inc/internal/stream_helper.hxx
+++ b/shell/inc/stream_helper.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SHELL_INC_INTERNAL_STREAM_HELPER_HXX
#define INCLUDED_SHELL_INC_INTERNAL_STREAM_HELPER_HXX
-#include "internal/types.hxx"
+#include "types.hxx"
struct IStream;
diff --git a/shell/inc/internal/thumbviewer.hxx b/shell/inc/thumbviewer.hxx
similarity index 100%
rename from shell/inc/internal/thumbviewer.hxx
rename to shell/inc/thumbviewer.hxx
diff --git a/shell/inc/internal/types.hxx b/shell/inc/types.hxx
similarity index 100%
rename from shell/inc/internal/types.hxx
rename to shell/inc/types.hxx
diff --git a/shell/inc/internal/utilities.hxx b/shell/inc/utilities.hxx
similarity index 99%
rename from shell/inc/internal/utilities.hxx
rename to shell/inc/utilities.hxx
index efc7c2d..0351e91 100644
--- a/shell/inc/internal/utilities.hxx
+++ b/shell/inc/utilities.hxx
@@ -31,7 +31,7 @@
#include <stdio.h>
#include <fcntl.h>
#include <io.h>
-#include "internal/types.hxx"
+#include "types.hxx"
#include <string>
#define STRSAFE_NO_DEPRECATE
diff --git a/shell/inc/internal/xml_parser.hxx b/shell/inc/xml_parser.hxx
similarity index 100%
rename from shell/inc/internal/xml_parser.hxx
rename to shell/inc/xml_parser.hxx
diff --git a/shell/inc/internal/zipfile.hxx b/shell/inc/zipfile.hxx
similarity index 100%
rename from shell/inc/internal/zipfile.hxx
rename to shell/inc/zipfile.hxx
diff --git a/shell/qa/zip/testzipimpl.hxx b/shell/qa/zip/testzipimpl.hxx
index 6a2afc0..8d81fec 100644
--- a/shell/qa/zip/testzipimpl.hxx
+++ b/shell/qa/zip/testzipimpl.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SHELL_QA_ZIP_TESTZIPIMPL_HXX
#define INCLUDED_SHELL_QA_ZIP_TESTZIPIMPL_HXX
-#include "internal/zipfile.hxx"
+#include "zipfile.hxx"
#include <string>
#include <vector>
#include <algorithm>
diff --git a/shell/qa/zip/ziptest.cxx b/shell/qa/zip/ziptest.cxx
index 5898a01..e89d2e8 100644
--- a/shell/qa/zip/ziptest.cxx
+++ b/shell/qa/zip/ziptest.cxx
@@ -32,7 +32,7 @@
#include "cppunit/extensions/HelperMacros.h"
#include "cppunit/plugin/TestPlugIn.h"
#include <string>
-#include "internal/stream_helper.hxx"
+#include "stream_helper.hxx"
#include "testzipimpl.hxx"
using namespace std;
diff --git a/shell/source/all/xml_parser.cxx b/shell/source/all/xml_parser.cxx
index 6d55721..3c4dd0b 100644
--- a/shell/source/all/xml_parser.cxx
+++ b/shell/source/all/xml_parser.cxx
@@ -18,11 +18,11 @@
*/
-#include "internal/xml_parser.hxx"
-#include "internal/i_xml_parser_event_handler.hxx"
+#include "xml_parser.hxx"
+#include "i_xml_parser_event_handler.hxx"
#ifdef _WIN32
-#include "internal/utilities.hxx"
+#include "utilities.hxx"
#else
#define UTF8ToWString(s) s
#endif
diff --git a/shell/source/unix/sysshell/recently_used_file_handler.cxx
b/shell/source/unix/sysshell/recently_used_file_handler.cxx
index 3049bcf..0d5ded1 100644
--- a/shell/source/unix/sysshell/recently_used_file_handler.cxx
+++ b/shell/source/unix/sysshell/recently_used_file_handler.cxx
@@ -29,8 +29,8 @@
#include <osl/diagnose.h>
#include "recently_used_file.hxx"
-#include "internal/xml_parser.hxx"
-#include "internal/i_xml_parser_event_handler.hxx"
+#include "xml_parser.hxx"
+#include "i_xml_parser_event_handler.hxx"
#include <map>
#include <vector>
diff --git a/shell/source/win32/ooofilereader/basereader.cxx
b/shell/source/win32/ooofilereader/basereader.cxx
index 823618a..d2e9773 100644
--- a/shell/source/win32/ooofilereader/basereader.cxx
+++ b/shell/source/win32/ooofilereader/basereader.cxx
@@ -17,9 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "internal/basereader.hxx"
+#include "basereader.hxx"
-#include "internal/xml_parser.hxx"
+#include "xml_parser.hxx"
#include "assert.h"
#include <memory>
diff --git a/shell/source/win32/ooofilereader/contentreader.cxx
b/shell/source/win32/ooofilereader/contentreader.cxx
index f2dedcd..ef2b774 100644
--- a/shell/source/win32/ooofilereader/contentreader.cxx
+++ b/shell/source/win32/ooofilereader/contentreader.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "internal/contentreader.hxx"
+#include "contentreader.hxx"
#include "dummytag.hxx"
#include "simpletag.hxx"
#include "autostyletag.hxx"
diff --git a/shell/source/win32/ooofilereader/itag.hxx
b/shell/source/win32/ooofilereader/itag.hxx
index d2b63b5..234c313 100644
--- a/shell/source/win32/ooofilereader/itag.hxx
+++ b/shell/source/win32/ooofilereader/itag.hxx
@@ -21,8 +21,8 @@
#ifndef INCLUDED_SHELL_SOURCE_WIN32_OOOFILEREADER_ITAG_HXX
#define INCLUDED_SHELL_SOURCE_WIN32_OOOFILEREADER_ITAG_HXX
-#include "internal/config.hxx"
-#include "internal/types.hxx"
+#include "config.hxx"
+#include "types.hxx"
/*************************** interface of tag readers
***************************/
diff --git a/shell/source/win32/ooofilereader/metainforeader.cxx
b/shell/source/win32/ooofilereader/metainforeader.cxx
index b45b850..0490b95 100644
--- a/shell/source/win32/ooofilereader/metainforeader.cxx
+++ b/shell/source/win32/ooofilereader/metainforeader.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "internal/metainforeader.hxx"
+#include "metainforeader.hxx"
#include "dummytag.hxx"
#include "simpletag.hxx"
#include "keywordstag.hxx"
diff --git a/shell/source/win32/shlxthandler/classfactory.cxx
b/shell/source/win32/shlxthandler/classfactory.cxx
index 9ca1efe..4e15e85 100644
--- a/shell/source/win32/shlxthandler/classfactory.cxx
+++ b/shell/source/win32/shlxthandler/classfactory.cxx
@@ -17,18 +17,18 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "internal/global.hxx"
+#include "global.hxx"
#include "classfactory.hxx"
-#include "internal/infotips.hxx"
-#include "internal/propsheets.hxx"
-#include "internal/columninfo.hxx"
+#include "infotips.hxx"
+#include "propsheets.hxx"
+#include "columninfo.hxx"
#ifdef __MINGW32__
#include <algorithm>
using ::std::max;
using ::std::min;
#endif
-#include "internal/thumbviewer.hxx"
-#include "internal/shlxthdl.hxx"
+#include "thumbviewer.hxx"
+#include "shlxthdl.hxx"
long CClassFactory::s_ServerLocks = 0;
diff --git a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx
b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx
index c72c298..6cfbcda 100644
--- a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx
+++ b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx
@@ -17,12 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "internal/global.hxx"
-#include "internal/columninfo.hxx"
-#include "internal/fileextensions.hxx"
-#include "internal/metainforeader.hxx"
-#include "internal/utilities.hxx"
-#include "internal/config.hxx"
+#include "global.hxx"
+#include "columninfo.hxx"
+#include "fileextensions.hxx"
+#include "metainforeader.hxx"
+#include "utilities.hxx"
+#include "config.hxx"
#include <sal/macros.h>
#include <malloc.h>
diff --git a/shell/source/win32/shlxthandler/infotips/infotips.cxx
b/shell/source/win32/shlxthandler/infotips/infotips.cxx
index 6f30948..d8fc781 100644
--- a/shell/source/win32/shlxthandler/infotips/infotips.cxx
+++ b/shell/source/win32/shlxthandler/infotips/infotips.cxx
@@ -17,18 +17,18 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "internal/global.hxx"
-#include "internal/infotips.hxx"
-#include "internal/shlxthdl.hxx"
-#include "internal/metainforeader.hxx"
-#include "internal/contentreader.hxx"
-#include "internal/utilities.hxx"
-#include "internal/registry.hxx"
-#include "internal/fileextensions.hxx"
-#include "internal/iso8601_converter.hxx"
-#include "internal/config.hxx"
-
-#include "internal/resource.h"
+#include "global.hxx"
+#include "infotips.hxx"
+#include "shlxthdl.hxx"
+#include "metainforeader.hxx"
+#include "contentreader.hxx"
+#include "utilities.hxx"
+#include "registry.hxx"
+#include "fileextensions.hxx"
+#include "iso8601_converter.hxx"
+#include "config.hxx"
+
+#include "resource.h"
#include <stdio.h>
#include <utility>
#include <stdlib.h>
diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
index ea266ac..bbcdebb 100644
--- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
@@ -28,10 +28,10 @@
// Platform: Windows 2000, Windows XP
-#include "internal/contentreader.hxx"
-#include "internal/metainforeader.hxx"
-#include "internal/registry.hxx"
-#include "internal/fileextensions.hxx"
+#include "contentreader.hxx"
+#include "metainforeader.hxx"
+#include "registry.hxx"
+#include "fileextensions.hxx"
// Include file Purpose
@@ -66,7 +66,7 @@
using ::std::min;
#endif
-#include "internal/stream_helper.hxx"
+#include "stream_helper.hxx"
//C-------------------------------------------------------------------------
// Class: COooFilter
diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx
b/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx
index bad8da1..b448951 100644
--- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx
+++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SHELL_SOURCE_WIN32_SHLXTHANDLER_OOOFILT_OOOFILT_HXX
#define INCLUDED_SHELL_SOURCE_WIN32_SHLXTHANDLER_OOOFILT_OOOFILT_HXX
-#include "internal/types.hxx"
+#include "types.hxx"
//+-------------------------------------------------------------------------
// Contents: LibreOffice filter declarations
diff --git a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
index f1fb321..57cf217 100644
--- a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
@@ -28,7 +28,7 @@
#include <stdio.h>
#include <objidl.h>
-#include "internal/stream_helper.hxx"
+#include "stream_helper.hxx"
BufferStream::BufferStream(IStream *str) :
stream(str)
diff --git a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
index 1f8e7aa..4e02b25 100644
--- a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
+++ b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
@@ -17,12 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "internal/global.hxx"
-#include "internal/propertyhdl.hxx"
-#include "internal/fileextensions.hxx"
-#include "internal/metainforeader.hxx"
-#include "internal/utilities.hxx"
-#include "internal/config.hxx"
+#include "global.hxx"
+#include "propertyhdl.hxx"
+#include "fileextensions.hxx"
+#include "metainforeader.hxx"
+#include "utilities.hxx"
+#include "config.hxx"
#include <propkey.h>
#include <propvarutil.h>
@@ -31,7 +31,7 @@
#include <malloc.h>
#include <strsafe.h>
-#include "internal/stream_helper.hxx"
+#include "stream_helper.hxx"
// Module global
diff --git a/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx
b/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx
index 4d4bafa..668f253 100644
--- a/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx
+++ b/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx
@@ -22,12 +22,12 @@
#pragma warning (disable : 4786 4503)
#endif
#include "document_statistic.hxx"
-#include "internal/utilities.hxx"
-#include "internal/metainforeader.hxx"
-#include "internal/resource.h"
-#include "internal/fileextensions.hxx"
-#include "internal/config.hxx"
-#include "internal/iso8601_converter.hxx"
+#include "utilities.hxx"
+#include "metainforeader.hxx"
+#include "resource.h"
+#include "fileextensions.hxx"
+#include "config.hxx"
+#include "iso8601_converter.hxx"
const bool READONLY = false;
diff --git a/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx
b/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx
index 1a4a21d..ae979a5 100644
--- a/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx
+++ b/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx
@@ -23,7 +23,7 @@
#include <utility>
#include <string>
#include <vector>
-#include "internal/metainforeader.hxx"
+#include "metainforeader.hxx"
struct statistic_item
diff --git a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
index 90d6b7f..caaf1e5 100644
--- a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
+++ b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
@@ -24,12 +24,12 @@
#include "listviewbuilder.hxx"
#include "document_statistic.hxx"
-#include "internal/utilities.hxx"
-#include "internal/config.hxx"
+#include "utilities.hxx"
+#include "config.hxx"
#include <commctrl.h>
#include <tchar.h>
-#include "internal/resource.h"
+#include "resource.h"
list_view_builder_ptr create_list_view_builder(
diff --git a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
index aa938e5..af5b214 100644
--- a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
+++ b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
@@ -17,12 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "internal/config.hxx"
-#include "internal/global.hxx"
+#include "config.hxx"
+#include "global.hxx"
-#include "internal/propsheets.hxx"
-#include "internal/utilities.hxx"
-#include "internal/resource.h"
+#include "propsheets.hxx"
+#include "utilities.hxx"
+#include "resource.h"
#include "listviewbuilder.hxx"
#if defined _MSC_VER
diff --git a/shell/source/win32/shlxthandler/res/rcheader.txt
b/shell/source/win32/shlxthandler/res/rcheader.txt
index 065bf2a..42fb81e 100644
--- a/shell/source/win32/shlxthandler/res/rcheader.txt
+++ b/shell/source/win32/shlxthandler/res/rcheader.txt
@@ -3,7 +3,7 @@
#define CB_ADDSTRING (WM_USER+3)
#define IDC_STATIC (-1)
-#include "internal/resource.h"
+#include "resource.h"
MANIFEST_RESOURCE_ID RT_MANIFEST "shlxthdl.manifest"
diff --git a/shell/source/win32/shlxthandler/shlxthdl.cxx
b/shell/source/win32/shlxthandler/shlxthdl.cxx
index 821e91b..e168618 100644
--- a/shell/source/win32/shlxthandler/shlxthdl.cxx
+++ b/shell/source/win32/shlxthandler/shlxthdl.cxx
@@ -17,13 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "internal/config.hxx"
-#include "internal/global.hxx"
-#include "internal/shlxthdl.hxx"
+#include "config.hxx"
+#include "global.hxx"
+#include "shlxthdl.hxx"
#include "classfactory.hxx"
-#include "internal/registry.hxx"
-#include "internal/fileextensions.hxx"
-#include "internal/utilities.hxx"
+#include "registry.hxx"
+#include "fileextensions.hxx"
+#include "utilities.hxx"
#include <tchar.h>
#include <string>
diff --git a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
index 84e77f2..63f1eec 100644
--- a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
+++ b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
@@ -20,17 +20,17 @@
#ifndef DONT_HAVE_GDIPLUS
-#include "internal/global.hxx"
+#include "global.hxx"
-#include "internal/thumbviewer.hxx"
-#include "internal/shlxthdl.hxx"
-#include "internal/registry.hxx"
-#include "internal/fileextensions.hxx"
-#include "internal/config.hxx"
-#include "internal/zipfile.hxx"
-#include "internal/utilities.hxx"
+#include "thumbviewer.hxx"
+#include "shlxthdl.hxx"
+#include "registry.hxx"
+#include "fileextensions.hxx"
+#include "config.hxx"
+#include "zipfile.hxx"
+#include "utilities.hxx"
-#include "internal/resource.h"
+#include "resource.h"
#include <stdio.h>
#include <utility>
diff --git a/shell/source/win32/shlxthandler/util/fileextensions.cxx
b/shell/source/win32/shlxthandler/util/fileextensions.cxx
index 8d0028d..607421c 100644
--- a/shell/source/win32/shlxthandler/util/fileextensions.cxx
+++ b/shell/source/win32/shlxthandler/util/fileextensions.cxx
@@ -18,7 +18,7 @@
*/
#include "algorithm"
-#include "internal/fileextensions.hxx"
+#include "fileextensions.hxx"
#include <sal/macros.h>
diff --git a/shell/source/win32/shlxthandler/util/iso8601_converter.cxx
b/shell/source/win32/shlxthandler/util/iso8601_converter.cxx
index a033978..36ab617 100644
--- a/shell/source/win32/shlxthandler/util/iso8601_converter.cxx
+++ b/shell/source/win32/shlxthandler/util/iso8601_converter.cxx
@@ -21,8 +21,8 @@
#include <stdlib.h>
-#include "internal/iso8601_converter.hxx"
-#include "internal/utilities.hxx"
+#include "iso8601_converter.hxx"
+#include "utilities.hxx"
#include <sstream>
#include <iomanip>
diff --git a/shell/source/win32/shlxthandler/util/registry.cxx
b/shell/source/win32/shlxthandler/util/registry.cxx
index ed000de..f74b09f 100644
--- a/shell/source/win32/shlxthandler/util/registry.cxx
+++ b/shell/source/win32/shlxthandler/util/registry.cxx
@@ -26,7 +26,7 @@
#pragma warning(pop)
#endif
#include <malloc.h>
-#include "internal/registry.hxx"
+#include "registry.hxx"
#if defined _MSC_VER
#pragma warning(push, 1)
diff --git a/shell/source/win32/shlxthandler/util/utilities.cxx
b/shell/source/win32/shlxthandler/util/utilities.cxx
index 18ccdb0..c372db4 100644
--- a/shell/source/win32/shlxthandler/util/utilities.cxx
+++ b/shell/source/win32/shlxthandler/util/utilities.cxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "internal/config.hxx"
-#include "internal/utilities.hxx"
+#include "config.hxx"
+#include "utilities.hxx"
#ifdef _WIN32_WINNT_WINBLUE
#include <VersionHelpers.h>
diff --git a/shell/source/win32/zipfile/zipexcptn.cxx
b/shell/source/win32/zipfile/zipexcptn.cxx
index f421650..23e90e6 100644
--- a/shell/source/win32/zipfile/zipexcptn.cxx
+++ b/shell/source/win32/zipfile/zipexcptn.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "internal/global.hxx"
+#include "global.hxx"
#include "zipexcptn.hxx"
diff --git a/shell/source/win32/zipfile/zipfile.cxx
b/shell/source/win32/zipfile/zipfile.cxx
index c701f8e..f4cab62 100644
--- a/shell/source/win32/zipfile/zipfile.cxx
+++ b/shell/source/win32/zipfile/zipfile.cxx
@@ -18,10 +18,10 @@
*/
#include "zipexcptn.hxx"
-#include "internal/zipfile.hxx"
-#include "internal/global.hxx"
-#include "internal/types.hxx"
-#include "internal/stream_helper.hxx"
+#include "zipfile.hxx"
+#include "global.hxx"
+#include "types.hxx"
+#include "stream_helper.hxx"
#include <malloc.h>
#include <algorithm>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
