only IMG_PRIMARY_KEY is actually used

Change-Id: Ie888ed93f0d511e0c040af32f41e8350113b586c

6 files changed, 6 insertions, 45 deletions

diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index 4c6cd0838c83..386a401966f9 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -105,6 +105,7 @@
 #define QUERYFOLDER_TREE_ICON           RID_IMAGE_START +  6
 #define QUERY_TREE_ICON                 RID_IMAGE_START +  7
 #define DATABASE_TREE_ICON              RID_IMAGE_START +  8
+#define BMP_PRIMARY_KEY                 RID_IMAGE_START +  9
 // free
 #define IMG_PKEYICON                    RID_IMAGE_START + 12
 // free
@@ -121,7 +122,6 @@
 #define FORMFOLDER_TREE_ICON            RID_IMAGE_START + 55
 
 // image lists
-#define IMG_JOINS                       RID_IMAGELIST_START +  0
 #define IMG_INDEX_DLG_SC                RID_IMAGELIST_START +  1
 #define IMG_INDEX_DLG_LC                RID_IMAGELIST_START +  3
 
diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx
index 49ae18ccd1e2..e7a6e3f1e233 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -216,7 +216,6 @@ OUString OWizTypeSelectControl::getAutoIncrementValue() const
     return static_cast<OWizTypeSelect*>(m_pParentTabPage.get())->m_sAutoIncrementValue;
 }
 
-#define IMG_PRIMARY_KEY 1
 OWizTypeSelect::OWizTypeSelect( vcl::Window* pParent, SvStream* _pStream )
                :OWizardPage( pParent, "TypeSelect", "dbaccess/ui/typeselectpage.ui")
                ,m_pTypeControl(VclPtr<OWizTypeSelectControl>::Create(get<VclVBox>("control_container"), this) )
@@ -235,10 +234,7 @@ OWizTypeSelect::OWizTypeSelect( vcl::Window* pParent, SvStream* _pStream )
 
     m_pColumnNames->SetSelectHdl(LINK(this,OWizTypeSelect,ColumnSelectHdl));
 
-    ModuleRes aModuleRes(IMG_JOINS);
-    ImageList aImageList(aModuleRes);
-    m_imgPKey = aImageList.GetImage(IMG_PRIMARY_KEY);
-
+    m_imgPKey = Image(BitmapEx(ModuleRes(BMP_PRIMARY_KEY)));
 
     m_pTypeControl->Show();
     m_pTypeControl->Init();
diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx
index 6f5ae57a7f35..c56735f87538 100644
--- a/dbaccess/source/ui/querydesign/QTableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx
@@ -28,7 +28,6 @@
 #include <vcl/image.hxx>
 #include "TableWindowListBox.hxx"
 #include "dbu_qry.hrc"
-#include "Query.hrc"
 #include <com/sun/star/sdbcx/XKeysSupplier.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
diff --git a/dbaccess/source/ui/querydesign/Query.hrc b/dbaccess/source/ui/querydesign/Query.hrc
deleted file mode 100644
index 75e2c02b3f0d..000000000000
--- a/dbaccess/source/ui/querydesign/Query.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 DBAUI_QUERY_HRC
-#define DBAUI_QUERY_HRC
-
-#define IMG_PRIMARY_KEY                 1
-#define IMG_FOREIGN_KEY                 2
-
-#endif // DBAUI_QUERY_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx
index a03e64744cfb..66fe9de949b6 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -37,7 +37,6 @@
 #include "querycontroller.hxx"
 #include "dbu_qry.hrc"
 #include "dbustrings.hrc"
-#include "Query.hrc"
 #include <comphelper/extract.hxx>
 #include "UITools.hxx"
 #include "TableWindowAccess.hxx"
@@ -193,10 +192,9 @@ bool OTableWindow::FillListBox()
         if ( xContainer.is() )
             m_pContainerListener = new ::comphelper::OContainerListenerAdapter(this,xContainer);
     }
+
     // mark all primary keys with special image
-    ModuleRes TmpRes(IMG_JOINS);
-    ImageList aImageList(TmpRes);
-    Image aPrimKeyImage = aImageList.GetImage(IMG_PRIMARY_KEY);
+    Image aPrimKeyImage = Image(BitmapEx(ModuleRes(BMP_PRIMARY_KEY)));
 
     if (GetData()->IsShowAll())
     {
diff --git a/dbaccess/source/ui/querydesign/query.src b/dbaccess/source/ui/querydesign/query.src
index 14c49a2d6ff4..eaaa29dbe17a 100644
--- a/dbaccess/source/ui/querydesign/query.src
+++ b/dbaccess/source/ui/querydesign/query.src
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include "dbu_qry.hrc"
-#include "Query.hrc"
 #include <sfx2/cntids.hrc>
 #include "browserids.hxx"
 #include "dbaccess_helpid.hrc"
@@ -77,13 +76,9 @@ Menu RID_QUERYCOLPOPUPMENU
     };
 };
 
-ImageList IMG_JOINS
+Bitmap BMP_PRIMARY_KEY
 {
-    Prefix = "jo";
-    IdList = {
-        IMG_PRIMARY_KEY; IMG_FOREIGN_KEY;
-    };
-    IdCount = { 2; };
+    File = "jo01.png";
 };
 
 String STR_QUERY_UNDO_TABWINSHOW