remove bitmaps from .src files

and into includeable .hlst files, add them to
postprocess/CustomTarget_images.mk
to continue only including used bitmaps in icon-theme zips

Change-Id: I5c24c3eca93a9c4101bcdcacb0e4b2712133968e
Reviewed-on: https://gerrit.libreoffice.org/36941
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

5 files changed, 19 insertions, 30 deletions

diff --git a/connectivity/Library_hsqldb.mk b/connectivity/Library_hsqldb.mk
index d1c2bed9e1f8..0685402145bb 100644
--- a/connectivity/Library_hsqldb.mk
+++ b/connectivity/Library_hsqldb.mk
@@ -10,6 +10,7 @@
 $(eval $(call gb_Library_Library,hsqldb))
 
 $(eval $(call gb_Library_set_include,hsqldb,\
+	-I$(SRCDIR)/connectivity/inc \
 	-I$(SRCDIR)/connectivity/source/inc \
 	$$(INCLUDE) \
 ))
diff --git a/connectivity/inc/bitmaps.hlst b/connectivity/inc/bitmaps.hlst
new file mode 100644
index 000000000000..d51533745e2e
--- /dev/null
+++ b/connectivity/inc/bitmaps.hlst
@@ -0,0 +1,17 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_CONNECTIVITY_INC_BITMAPS_HRC
+#define INCLUDED_CONNECTIVITY_INC_BITMAPS_HRC
+
+#define LINKED_TEXT_TABLE_IMAGE_RESOURCE        "dbaccess/res/linked_text_table.png"
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx
index 7f7032525ae5..fbb86796442f 100644
--- a/connectivity/source/drivers/hsqldb/HConnection.cxx
+++ b/connectivity/source/drivers/hsqldb/HConnection.cxx
@@ -20,7 +20,7 @@
 
 #include "hsqldb/HConnection.hxx"
 #include "hsqldb/HTools.hxx"
-#include "hsqlui.hrc"
+#include "bitmaps.hlst"
 
 #include <connectivity/dbtools.hxx>
 
@@ -323,7 +323,6 @@ namespace connectivity { namespace hsqldb
             // load the graphic from the global graphic repository
             aImageURL.append( "private:graphicrepository/" );
             // the relative path within the images.zip
-            aImageURL.append( "database/" );
             aImageURL.append( LINKED_TEXT_TABLE_IMAGE_RESOURCE );
             // the name of the graphic to use
             OUString sImageURL( aImageURL.makeStringAndClear() );
diff --git a/connectivity/source/drivers/hsqldb/hsqlui.hrc b/connectivity/source/drivers/hsqldb/hsqlui.hrc
deleted file mode 100644
index 6ca44358cc30..000000000000
--- a/connectivity/source/drivers/hsqldb/hsqlui.hrc
+++ /dev/null
@@ -1,27 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef CONNECTIVITY_HSQLUI_HRC
-#define CONNECTIVITY_HSQLUI_HRC
-
-#define LINKED_TEXT_TABLE_IMAGE_RESOURCE        "linked_text_table.png"
-
-#endif // CONNECTIVITY_HSQLUI_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/hsqldb/hsqlui.ilst b/connectivity/source/drivers/hsqldb/hsqlui.ilst
deleted file mode 100644
index 9590ff4d9e20..000000000000
--- a/connectivity/source/drivers/hsqldb/hsqlui.ilst
+++ /dev/null
@@ -1 +0,0 @@
-%MODULE%/database/linked_text_table.png