remove extensions bitmaps from .src files

resulting in the removal of a updchk .res file

Change-Id: I7a6f3601f25763253ba34590a1970ca8a042db23

4 files changed, 30 insertions, 197 deletions

diff --git a/extensions/source/propctrlr/formresid.hrc b/extensions/source/propctrlr/formresid.hrc
index c4b0862e5724..893dedf84c3b 100644
--- a/extensions/source/propctrlr/formresid.hrc
+++ b/extensions/source/propctrlr/formresid.hrc
@@ -309,34 +309,6 @@
 #define RID_RSC_ENUM_WHEEL_BEHAVIOR         ( RID_PROPCONTROLLER_START + 30 )
 #define RID_RSC_ENUM_TEXT_ANCHOR_TYPE       ( RID_PROPCONTROLLER_START + 31 )
 #define RID_RSC_ENUM_SHEET_ANCHOR_TYPE      ( RID_PROPCONTROLLER_START + 32 )
-#define RID_EXTBMP_CONTROL                  ( RID_PROPCONTROLLER_START + 33 )
-#define RID_EXTBMP_BUTTON                   ( RID_PROPCONTROLLER_START + 34 )
-#define RID_EXTBMP_RADIOBUTTON              ( RID_PROPCONTROLLER_START + 35 )
-#define RID_EXTBMP_CHECKBOX                 ( RID_PROPCONTROLLER_START + 36 )
-#define RID_EXTBMP_FIXEDTEXT                ( RID_PROPCONTROLLER_START + 37 )
-#define RID_EXTBMP_GROUPBOX                 ( RID_PROPCONTROLLER_START + 38 )
-#define RID_EXTBMP_EDITBOX                  ( RID_PROPCONTROLLER_START + 39 )
-#define RID_EXTBMP_LISTBOX                  ( RID_PROPCONTROLLER_START + 40 )
-#define RID_EXTBMP_COMBOBOX                 ( RID_PROPCONTROLLER_START + 41 )
-#define RID_EXTBMP_GRID                     ( RID_PROPCONTROLLER_START + 42 )
-#define RID_EXTBMP_IMAGEBUTTON              ( RID_PROPCONTROLLER_START + 43 )
-#define RID_EXTBMP_FILECONTROL              ( RID_PROPCONTROLLER_START + 44 )
-#define RID_EXTBMP_DATEFIELD                ( RID_PROPCONTROLLER_START + 45 )
-#define RID_EXTBMP_TIMEFIELD                ( RID_PROPCONTROLLER_START + 46 )
-#define RID_EXTBMP_NUMERICFIELD             ( RID_PROPCONTROLLER_START + 47 )
-#define RID_EXTBMP_CURRENCYFIELD            ( RID_PROPCONTROLLER_START + 48 )
-#define RID_EXTBMP_PATTERNFIELD             ( RID_PROPCONTROLLER_START + 49 )
-#define RID_EXTBMP_IMAGECONTROL             ( RID_PROPCONTROLLER_START + 50 )
-#define RID_EXTBMP_HIDDEN                   ( RID_PROPCONTROLLER_START + 51 )
-#define RID_EXTBMP_FORMATTEDFIELD           ( RID_PROPCONTROLLER_START + 52 )
-#define RID_EXTBMP_FILTER                   ( RID_PROPCONTROLLER_START + 53 )
-#define RID_EXTBMP_FORMS                    ( RID_PROPCONTROLLER_START + 54 )
-#define RID_EXTBMP_FORM                     ( RID_PROPCONTROLLER_START + 55 )
-#define RID_EXTBMP_COLLAPSEDNODE            ( RID_PROPCONTROLLER_START + 56 )
-#define RID_EXTBMP_EXPANDEDNODE             ( RID_PROPCONTROLLER_START + 57 )
-#define RID_EXTBMP_SCROLLBAR                ( RID_PROPCONTROLLER_START + 58 )
-#define RID_EXTBMP_SPINBUTTON               ( RID_PROPCONTROLLER_START + 59 )
-#define RID_EXTBMP_NAVIGATIONBAR            ( RID_PROPCONTROLLER_START + 60 )
 
 #endif
 
diff --git a/extensions/source/propctrlr/pcrmiscres.src b/extensions/source/propctrlr/pcrmiscres.src
index b587bb78cd15..a37b6783d1ff 100644
--- a/extensions/source/propctrlr/pcrmiscres.src
+++ b/extensions/source/propctrlr/pcrmiscres.src
@@ -24,147 +24,6 @@ String RID_STR_CONFIRM_DELETE_DATA_TYPE
     Text [ en-US ] = "Do you want to delete the data type '#type#' from the model?\n"
              "Please note that this will affect all controls which are bound to this data type.";
 };
-
-Bitmap RID_EXTBMP_CONTROL
-{
-    File = "sx10144.png";
-};
-
-Bitmap RID_EXTBMP_BUTTON
-{
-    File = "sx10594.png";
-};
-
-Bitmap RID_EXTBMP_RADIOBUTTON
-{
-    File = "sx10595.png";
-};
-
-Bitmap RID_EXTBMP_CHECKBOX
-{
-    File = "sx10596.png";
-};
-
-Bitmap RID_EXTBMP_FIXEDTEXT
-{
-    File = "sx10597.png";
-};
-
-Bitmap RID_EXTBMP_GROUPBOX
-{
-    File = "sx10598.png";
-};
-
-Bitmap RID_EXTBMP_EDITBOX
-{
-    File = "sx10599.png";
-};
-
-Bitmap RID_EXTBMP_LISTBOX
-{
-    File = "sx10600.png";
-};
-
-Bitmap RID_EXTBMP_COMBOBOX
-{
-    File = "sx10601.png";
-};
-
-Bitmap RID_EXTBMP_GRID
-{
-    File = "sx10603.png";
-};
-
-Bitmap RID_EXTBMP_IMAGEBUTTON
-{
-    File = "sx10604.png";
-};
-
-Bitmap RID_EXTBMP_FILECONTROL
-{
-    File = "sx10605.png";
-};
-
-Bitmap RID_EXTBMP_DATEFIELD
-{
-    File = "sx10704.png";
-};
-
-Bitmap RID_EXTBMP_TIMEFIELD
-{
-    File = "sx10705.png";
-};
-
-Bitmap RID_EXTBMP_NUMERICFIELD
-{
-    File = "sx10706.png";
-};
-
-Bitmap RID_EXTBMP_CURRENCYFIELD
-{
-    File = "sx10707.png";
-};
-
-Bitmap RID_EXTBMP_PATTERNFIELD
-{
-    File = "sx10708.png";
-};
-
-Bitmap RID_EXTBMP_IMAGECONTROL
-{
-    File = "sx10710.png";
-};
-
-Bitmap RID_EXTBMP_HIDDEN
-{
-    File = "sx18022.png";
-};
-
-Bitmap RID_EXTBMP_FORMATTEDFIELD
-{
-    File = "sx10728.png";
-};
-
-Bitmap RID_EXTBMP_FILTER
-{
-    File = "sx10715.png";
-};
-
-Bitmap RID_EXTBMP_FORMS
-{
-    File = "sx18013.png";
-};
-
-Bitmap RID_EXTBMP_FORM
-{
-    File = "sx10593.png";
-};
-
-Bitmap RID_EXTBMP_COLLAPSEDNODE
-{
-    File = "sx18002.png";
-};
-
-Bitmap RID_EXTBMP_EXPANDEDNODE
-{
-    File = "sx18003.png";
-};
-
-Bitmap RID_EXTBMP_SCROLLBAR
-{
-    File = "sx10768.png";
-};
-
-Bitmap RID_EXTBMP_SPINBUTTON
-{
-    File = "sx10769.png";
-};
-
-Bitmap RID_EXTBMP_NAVIGATIONBAR
-{
-    File = "sx10607.png";
-};
-
 String RID_STR_PROPTITLE_PUSHBUTTON
 {
     Text [ en-US ] = "Button" ;
diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx
index 8849c8e838ef..ffec0db1ca00 100644
--- a/extensions/source/propctrlr/selectlabeldialog.cxx
+++ b/extensions/source/propctrlr/selectlabeldialog.cxx
@@ -19,6 +19,7 @@
 
 #include "selectlabeldialog.hxx"
 #include "formresid.hrc"
+#include "bitmaps.hlst"
 #include "formbrowsertools.hxx"
 #include "formstrings.hxx"
 #include <com/sun/star/form/FormComponentType.hpp>
@@ -64,8 +65,8 @@ namespace pcr
         m_pControlTree->EnableInplaceEditing( false );
         m_pControlTree->SetStyle(m_pControlTree->GetStyle() | WB_BORDER | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HSCROLL);
 
-        m_pControlTree->SetNodeBitmaps(Image(BitmapEx(PcrRes(RID_EXTBMP_COLLAPSEDNODE))),
-                                       Image(BitmapEx(PcrRes(RID_EXTBMP_EXPANDEDNODE))));
+        m_pControlTree->SetNodeBitmaps(Image(BitmapEx(RID_EXTBMP_COLLAPSEDNODE)),
+                                       Image(BitmapEx(RID_EXTBMP_EXPANDEDNODE)));
         m_pControlTree->SetSelectHdl(LINK(this, OSelectLabelDialog, OnEntrySelected));
         m_pControlTree->SetDeselectHdl(LINK(this, OSelectLabelDialog, OnEntrySelected));
 
@@ -99,7 +100,7 @@ namespace pcr
             sal_Int16 nClassId = 0;
             try { nClassId = ::comphelper::getINT16(m_xControlModel->getPropertyValue(PROPERTY_CLASSID)); } catch(...) { }
             m_sRequiredService = (FormComponentType::RADIOBUTTON == nClassId) ? OUString(SERVICE_COMPONENT_GROUPBOX) : OUString(SERVICE_COMPONENT_FIXEDTEXT);
-            m_aRequiredControlImage = Image(BitmapEx(PcrRes(FormComponentType::RADIOBUTTON == nClassId ? RID_EXTBMP_GROUPBOX : RID_EXTBMP_FIXEDTEXT)));
+            m_aRequiredControlImage = Image(BitmapEx(FormComponentType::RADIOBUTTON == nClassId ? OUStringLiteral(RID_EXTBMP_GROUPBOX) : OUStringLiteral(RID_EXTBMP_FIXEDTEXT)));
 
             // calc the currently set label control (so InsertEntries can calc m_pInitialSelection)
             Any aCurrentLabelControl( m_xControlModel->getPropertyValue(PROPERTY_CONTROLLABEL) );
@@ -110,7 +111,7 @@ namespace pcr
                 aCurrentLabelControl >>= m_xInitialLabelControl;
 
             // insert the root
-            Image aRootImage(BitmapEx(PcrRes(RID_EXTBMP_FORMS)));
+            Image aRootImage(BitmapEx(RID_EXTBMP_FORMS));
             SvTreeListEntry* pRoot = m_pControlTree->InsertEntry(PcrRes(RID_STR_FORMS).toString(), aRootImage, aRootImage);
 
             // build the tree
@@ -198,7 +199,7 @@ namespace pcr
                 Reference< XIndexAccess >  xCont(xAsSet, UNO_QUERY);
                 if (xCont.is() && xCont->getCount())
                 {   // yes -> step down
-                    Image aFormImage(BitmapEx(PcrRes(RID_EXTBMP_FORM)));
+                    Image aFormImage(BitmapEx(RID_EXTBMP_FORM));
                     SvTreeListEntry* pCont = m_pControlTree->InsertEntry(sName, aFormImage, aFormImage, pContainerEntry);
                     sal_Int32 nContChildren = InsertEntries(xCont, pCont);
                     if (nContChildren)
diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx
index faae6af08fcf..580ffca78cb2 100644
--- a/extensions/source/propctrlr/taborder.cxx
+++ b/extensions/source/propctrlr/taborder.cxx
@@ -21,6 +21,7 @@
 
 #include "modulepcr.hxx"
 #include "formresid.hrc"
+#include "bitmaps.hlst"
 #include "formstrings.hxx"
 #include <comphelper/types.hxx>
 #include <comphelper/property.hxx>
@@ -44,39 +45,39 @@ namespace pcr
 
     Image GetImage( const Reference< XPropertySet >& _rxSet )
     {
-        sal_uInt16 nImageId = RID_EXTBMP_CONTROL;
+        OUString sImageId = RID_EXTBMP_CONTROL;
         // TODO: classify controls also in Basic propbrw
         if ( _rxSet.is() && ::comphelper::hasProperty( PROPERTY_CLASSID, _rxSet ) )
         {
             switch( ::comphelper::getINT16( _rxSet->getPropertyValue( PROPERTY_CLASSID ) ) )
             {
-            case FormComponentType::COMMANDBUTTON:  nImageId = RID_EXTBMP_BUTTON; break;
-            case FormComponentType::FIXEDTEXT:      nImageId = RID_EXTBMP_FIXEDTEXT; break;
-            case FormComponentType::TEXTFIELD:      nImageId = RID_EXTBMP_EDITBOX; break;
-            case FormComponentType::RADIOBUTTON:    nImageId = RID_EXTBMP_RADIOBUTTON; break;
-            case FormComponentType::CHECKBOX:       nImageId = RID_EXTBMP_CHECKBOX; break;
-            case FormComponentType::LISTBOX:        nImageId = RID_EXTBMP_LISTBOX; break;
-            case FormComponentType::COMBOBOX:       nImageId = RID_EXTBMP_COMBOBOX; break;
-            case FormComponentType::GROUPBOX:       nImageId = RID_EXTBMP_GROUPBOX; break;
-            case FormComponentType::IMAGEBUTTON:    nImageId = RID_EXTBMP_IMAGEBUTTON; break;
-            case FormComponentType::FILECONTROL:    nImageId = RID_EXTBMP_FILECONTROL; break;
-            case FormComponentType::HIDDENCONTROL:  nImageId = RID_EXTBMP_HIDDEN; break;
-            case FormComponentType::DATEFIELD:      nImageId = RID_EXTBMP_DATEFIELD; break;
-            case FormComponentType::TIMEFIELD:      nImageId = RID_EXTBMP_TIMEFIELD; break;
-            case FormComponentType::NUMERICFIELD:   nImageId = RID_EXTBMP_NUMERICFIELD; break;
-            case FormComponentType::CURRENCYFIELD:  nImageId = RID_EXTBMP_CURRENCYFIELD; break;
-            case FormComponentType::PATTERNFIELD:   nImageId = RID_EXTBMP_PATTERNFIELD; break;
-            case FormComponentType::IMAGECONTROL:   nImageId = RID_EXTBMP_IMAGECONTROL; break;
-            case FormComponentType::GRIDCONTROL:    nImageId = RID_EXTBMP_GRID; break;
-            case FormComponentType::SCROLLBAR:      nImageId = RID_EXTBMP_SCROLLBAR; break;
-            case FormComponentType::SPINBUTTON:     nImageId = RID_EXTBMP_SPINBUTTON; break;
-            case FormComponentType::NAVIGATIONBAR:  nImageId = RID_EXTBMP_NAVIGATIONBAR; break;
+            case FormComponentType::COMMANDBUTTON:  sImageId = RID_EXTBMP_BUTTON; break;
+            case FormComponentType::FIXEDTEXT:      sImageId = RID_EXTBMP_FIXEDTEXT; break;
+            case FormComponentType::TEXTFIELD:      sImageId = RID_EXTBMP_EDITBOX; break;
+            case FormComponentType::RADIOBUTTON:    sImageId = RID_EXTBMP_RADIOBUTTON; break;
+            case FormComponentType::CHECKBOX:       sImageId = RID_EXTBMP_CHECKBOX; break;
+            case FormComponentType::LISTBOX:        sImageId = RID_EXTBMP_LISTBOX; break;
+            case FormComponentType::COMBOBOX:       sImageId = RID_EXTBMP_COMBOBOX; break;
+            case FormComponentType::GROUPBOX:       sImageId = RID_EXTBMP_GROUPBOX; break;
+            case FormComponentType::IMAGEBUTTON:    sImageId = RID_EXTBMP_IMAGEBUTTON; break;
+            case FormComponentType::FILECONTROL:    sImageId = RID_EXTBMP_FILECONTROL; break;
+            case FormComponentType::HIDDENCONTROL:  sImageId = RID_EXTBMP_HIDDEN; break;
+            case FormComponentType::DATEFIELD:      sImageId = RID_EXTBMP_DATEFIELD; break;
+            case FormComponentType::TIMEFIELD:      sImageId = RID_EXTBMP_TIMEFIELD; break;
+            case FormComponentType::NUMERICFIELD:   sImageId = RID_EXTBMP_NUMERICFIELD; break;
+            case FormComponentType::CURRENCYFIELD:  sImageId = RID_EXTBMP_CURRENCYFIELD; break;
+            case FormComponentType::PATTERNFIELD:   sImageId = RID_EXTBMP_PATTERNFIELD; break;
+            case FormComponentType::IMAGECONTROL:   sImageId = RID_EXTBMP_IMAGECONTROL; break;
+            case FormComponentType::GRIDCONTROL:    sImageId = RID_EXTBMP_GRID; break;
+            case FormComponentType::SCROLLBAR:      sImageId = RID_EXTBMP_SCROLLBAR; break;
+            case FormComponentType::SPINBUTTON:     sImageId = RID_EXTBMP_SPINBUTTON; break;
+            case FormComponentType::NAVIGATIONBAR:  sImageId = RID_EXTBMP_NAVIGATIONBAR; break;
             default:
                 OSL_FAIL( "TabOrderDialog::GetImage: unknown control type" );
             }
         }
 
-        return Image(BitmapEx(PcrRes(nImageId)));;
+        return Image(BitmapEx(sImageId));;
     }
 
     }