[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - default_images/framework shell/inc shell/prj

[Matthias Seidel]

 dev/null                       |binary
 shell/inc/internal/types.hxx   |    5 +++++
 shell/inc/internal/zipfile.hxx |    4 ++++
 shell/prj/build.lst            |    2 ++
 4 files changed, 11 insertions(+)

New commits:
commit c9ec60287f6514810b85fd23ce91b1840d0ba3c8
Author: Matthias Seidel <mseidel at apache.org>
Date:   Sat Dec 2 13:01:27 2017 +0000

    Remove unused graphics

diff --git a/default_images/framework/res/beta/backing-beta.png b/default_images/framework/res/beta/backing-beta.png
deleted file mode 100755
index 4ff3f6d0edff..000000000000
Binary files a/default_images/framework/res/beta/backing-beta.png and /dev/null differ
diff --git a/default_images/framework/res/beta/backing_rtl_left-beta.png b/default_images/framework/res/beta/backing_rtl_left-beta.png
deleted file mode 100755
index d4d123bcfb05..000000000000
Binary files a/default_images/framework/res/beta/backing_rtl_left-beta.png and /dev/null differ
commit f29bf060cc443830c0f7234f7865af8442f05bcd
Author: Yuri Dario <ydario at apache.org>
Date:   Sat Dec 2 12:08:07 2017 +0000

    #i126518# build ooofilereader library using zlib/minizip system headers on OS/2.

diff --git a/shell/inc/internal/types.hxx b/shell/inc/internal/types.hxx
index 6a16fddc9672..985ce023af21 100644
--- a/shell/inc/internal/types.hxx
+++ b/shell/inc/internal/types.hxx
@@ -29,8 +29,13 @@
 #include <utility>
 #include <vector>
 #include <stack>
+#ifdef OS2
+#include <zlib.h>
+#include <minizip/ioapi.h>
+#else
 #include <external/zlib/zlib.h>
 #include <external/zlib/ioapi.h>
+#endif
 
 
 typedef std::vector<std::wstring> StringList_t;
diff --git a/shell/inc/internal/zipfile.hxx b/shell/inc/internal/zipfile.hxx
index 194620806cc9..fe9d040ba7e9 100644
--- a/shell/inc/internal/zipfile.hxx
+++ b/shell/inc/internal/zipfile.hxx
@@ -29,7 +29,11 @@
 #endif
 
 
+#ifdef OS2
+#include <minizip/unzip.h>
+#else
 #include <external/zlib/unzip.h>
+#endif
 
 
 #include <string>
diff --git a/shell/prj/build.lst b/shell/prj/build.lst
index 991069863daa..7d887dab6b65 100644
--- a/shell/prj/build.lst
+++ b/shell/prj/build.lst
@@ -13,7 +13,9 @@ sl    shell\source\unix\sysshell                   nmake   -   u   sl_unix_syssh
 sl    shell\source\tools\lngconvex                 nmake   -   w   sl_win32_lngconv sl_inc NULL
 sl    shell\source\tools\regsvrex                  nmake   -   w   sl_win32_regsvrex  sl_inc NULL
 sl    shell\source\all\zipfile                     nmake   -   w   sl_all_zipfile  sl_inc NULL
+sl    shell\source\all\zipfile                     nmake   -   p   sl_all_zipfile  sl_inc NULL
 sl    shell\source\all\ooofilereader               nmake   -   w   sl_all_ooofilereader sl_all_zipfile.w sl_all sl_inc NULL
+sl    shell\source\all\ooofilereader               nmake   -   p   sl_all_ooofilereader sl_all_zipfile.p sl_all sl_inc NULL
 sl    shell\source\win32\shlxthandler\res          nmake   -   w   sl_win32_shlxthandler_res sl_win32_lngconv.w sl_inc NULL
 sl    shell\source\win32\shlxthandler\util         nmake   -   w   sl_win32_shlxthandler_util  sl_inc NULL
 sl    shell\source\win32\shlxthandler\propsheets   nmake   -   w   sl_win32_shlxthandler_propsheets  sl_inc NULL