Drop pointless "internal" directory level for already internal include files

Change-Id: I1ece44616704483cd4d9d2b6204329414f82a98c

shell/inc/internal/basereader.hxx → 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
 {

shell/inc/internal/contentreader.hxx → 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;

shell/inc/internal/fileextensions.hxx → 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>
 

shell/inc/internal/metainforeader.hxx → 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;

shell/inc/internal/propsheets.hxx → 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)

shell/inc/internal/stream_helper.hxx → 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;
 

shell/inc/internal/utilities.hxx → 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

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>

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;
 

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

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>

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>

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"

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   ***************************/
 

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"

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;

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>

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>

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

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

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)

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

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;
 

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

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(

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

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"
 

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>

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>

shell/source/win32/shlxthandler/util/fileextensions.cxx

@@ -18,7 +18,7 @@
  */
 
 #include "algorithm"
-#include "internal/fileextensions.hxx"
+#include "fileextensions.hxx"
 #include <sal/macros.h>
 
 

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>

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)

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>

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"
 
 

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>