changehid: #i111874# remove SmartId, make HID of type rtl::OString, fill in dummies for all explicit help ids

4 files changed, 95 insertions, 77 deletions

diff --git a/tools/inc/tools/rc.h b/tools/inc/tools/rc.h
index bd499717a3a4..e11aed2937fd 100644
--- a/tools/inc/tools/rc.h
+++ b/tools/inc/tools/rc.h
@@ -50,6 +50,7 @@ typedef short RSWND_STYLE;
 #define WINDOW_EXTRALONG                0x0800
 #define WINDOW_UNIQUEID                 0x1000
 #define WINDOW_BORDER_STYLE             0x2000
+#define WINDOW_HELPID                   0x4000
 
 // Definition der Struktur die alle "WorkWindow"-Resourcen haben
 #define WORKWIN_SHOWNORMAL              0
diff --git a/tools/inc/tools/rc.hxx b/tools/inc/tools/rc.hxx
index 4bf1827a1ab6..15e077c3c62c 100644
--- a/tools/inc/tools/rc.hxx
+++ b/tools/inc/tools/rc.hxx
@@ -87,6 +87,9 @@ class TOOLS_DLLPUBLIC Resource
     // read a string from resource data and increment pointer
     UniString ReadStringRes()
     { return m_pResMgr->ReadString(); }
+    // read a byte string from resource data and increment pointer
+    rtl::OString ReadByteStringRes()
+    { return m_pResMgr->ReadByteString(); }
 
     // Gibt die Resource frei (this-Zeiger fuer Fehlerueberpruefung)
     // free the resource from m_pResMgr's stack (pass this ptr for validation)
diff --git a/tools/inc/tools/resmgr.hxx b/tools/inc/tools/resmgr.hxx
index b19524139078..93442701d939 100644
--- a/tools/inc/tools/resmgr.hxx
+++ b/tools/inc/tools/resmgr.hxx
@@ -181,8 +181,10 @@ public:
     static sal_uInt32   GetObjSize( RSHEADER_TYPE* pHT )
                             { return( pHT->GetGlobOff() ); }
 
-    // Liefert einen String aus der Resource
+    // returns a string and its length out of the resource
     static sal_uInt32   GetString( UniString& rStr, const BYTE* pStr );
+    // returns a byte string and its length out of the resource
+    static sal_uInt32   GetByteString( rtl::OString& rStr, const BYTE* pStr );
 
     // Groesse eines Strings in der Resource
     static sal_uInt32   GetStringSize( sal_uInt32 nLen )
@@ -209,9 +211,10 @@ public:
     INT16               ReadShort();
     INT32               ReadLong();
     UniString           ReadString();
+    rtl::OString        ReadByteString();
 
-     // generate auto help id for current resource stack
-    ULONG               GetAutoHelpId();
+    // generate auto help id for current resource stack
+    rtl::OString        GetAutoHelpId();
 
     static void         SetReadStringHook( ResHookProc pProc );
     static ResHookProc  GetReadStringHook();
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index daeaf8e4c3a5..df8506bb090b 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -46,6 +46,7 @@
 #include <osl/file.hxx>
 #include <osl/mutex.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <rtl/strbuf.hxx>
 #include <tools/urlobj.hxx>
 #include <rtl/instance.hxx>
 #include <rtl/bootstrap.hxx>
@@ -1370,6 +1371,13 @@ sal_uInt32 ResMgr::GetString( UniString& rStr, const BYTE* pStr )
     return nRet;
 }
 
+sal_uInt32 ResMgr::GetByteString( rtl::OString& rStr, const BYTE* pStr )
+{
+    sal_uInt32 nRet = GetStringSize( pStr );
+    rStr = rtl::OString( (const sal_Char*)pStr, nRet );
+    return nRet;
+}
+
 // ------------------------------------------------------------------
 
 sal_uInt32 ResMgr::GetStringSize( const BYTE* pStr )
@@ -1765,90 +1773,93 @@ UniString ResMgr::ReadString()
     return aRet;
 }
 
+rtl::OString ResMgr::ReadByteString()
+{
+    osl::Guard<osl::Mutex> aGuard( getResMgrMutex() );
+
+    if( pFallbackResMgr )
+        return pFallbackResMgr->ReadByteString();
+
+    rtl::OString aRet;
+
+    const ImpRCStack& rTop = aStack[nCurStack];
+    if( (rTop.Flags & RC_NOTFOUND) )
+    {
+        #if OSL_DEBUG_LEVEL > 0
+        aRet = OString( "<resource not found>" );
+        #endif
+    }
+    else
+        Increment( GetByteString( aRet, (const BYTE*)GetClass() ) );
+
+    return aRet;
+}
+
 // -----------------------------------------------------------------------
 
-ULONG ResMgr::GetAutoHelpId()
+rtl::OString ResMgr::GetAutoHelpId()
 {
     osl::Guard<osl::Mutex> aGuard( getResMgrMutex() );
 
     if( pFallbackResMgr )
         return pFallbackResMgr->GetAutoHelpId();
 
-    DBG_ASSERT( nCurStack, "resource stack empty in Auto help id generation" );
-    if( nCurStack < 1 || nCurStack > 2 )
-        return 0;
-
-    const ImpRCStack *pRC = StackTop( nCurStack==1 ? 0 : 1 );
-
-    DBG_ASSERT( pRC->pResource, "MM hat gesagt, dass der immer einen hat" );
-    ULONG nGID = pRC->pResource->GetId();
-
-    if( !nGID || nGID > 32767 )
-        return 0;
-
-    ULONG nHID = 0;
-
-    // GGGg gggg::gggg gggg::ggLL LLLl::llll llll
-    switch( pRC->pResource->GetRT() ) { // maximal 7
-        case RSC_DOCKINGWINDOW:
-            nHID += 0x20000000L;
-        case RSC_WORKWIN:
-            nHID += 0x20000000L;
-        case RSC_MODELESSDIALOG:
-            nHID += 0x20000000L;
-        case RSC_FLOATINGWINDOW:
-            nHID += 0x20000000L;
-        case RSC_MODALDIALOG:
-            nHID += 0x20000000L;
-        case RSC_TABPAGE:
-            nHID += 0x20000000L;
-
-            if( nCurStack == 2 ) {
-                pRC = StackTop();
-                ULONG nLID = pRC->pResource->GetId();
-
-                if( !nLID || nLID > 511 )
-                    return 0;
-
-                switch( pRC->pResource->GetRT() ) { // maximal 32
-                    case RSC_TABCONTROL:        nHID |= 0x0000; break;
-                    case RSC_RADIOBUTTON:       nHID |= 0x0200; break;
-                    case RSC_CHECKBOX:          nHID |= 0x0400; break;
-                    case RSC_TRISTATEBOX:       nHID |= 0x0600; break;
-                    case RSC_EDIT:              nHID |= 0x0800; break;
-                    case RSC_MULTILINEEDIT:     nHID |= 0x0A00; break;
-                    case RSC_MULTILISTBOX:      nHID |= 0x0C00; break;
-                    case RSC_LISTBOX:           nHID |= 0x0E00; break;
-                    case RSC_COMBOBOX:          nHID |= 0x1000; break;
-                    case RSC_PUSHBUTTON:        nHID |= 0x1200; break;
-                    case RSC_SPINFIELD:         nHID |= 0x1400; break;
-                    case RSC_PATTERNFIELD:      nHID |= 0x1600; break;
-                    case RSC_NUMERICFIELD:      nHID |= 0x1800; break;
-                    case RSC_METRICFIELD:       nHID |= 0x1A00; break;
-                    case RSC_CURRENCYFIELD:     nHID |= 0x1C00; break;
-                    case RSC_DATEFIELD:         nHID |= 0x1E00; break;
-                    case RSC_TIMEFIELD:         nHID |= 0x2000; break;
-                    case RSC_IMAGERADIOBUTTON:  nHID |= 0x2200; break;
-                    case RSC_NUMERICBOX:        nHID |= 0x2400; break;
-                    case RSC_METRICBOX:         nHID |= 0x2600; break;
-                    case RSC_CURRENCYBOX:       nHID |= 0x2800; break;
-                    case RSC_DATEBOX:           nHID |= 0x2A00; break;
-                    case RSC_TIMEBOX:           nHID |= 0x2C00; break;
-                    case RSC_IMAGEBUTTON:       nHID |= 0x2E00; break;
-                    case RSC_MENUBUTTON:        nHID |= 0x3000; break;
-                    case RSC_MOREBUTTON:        nHID |= 0x3200; break;
-                    default:
-                        return 0;
-                } // of switch
-                nHID |= nLID;
-            } // of if
-            break;
+    OSL_ENSURE( nCurStack, "resource stack empty in Auto help id generation" );
+    if( nCurStack < 1  )
+        return rtl::OString();
+
+    // prepare HID, start with resource prefix
+    rtl::OStringBuffer aHID( 32 );
+    aHID.append( rtl::OUStringToOString( pImpRes->aPrefix, RTL_TEXTENCODING_UTF8 ) );
+    aHID.append( ':' );
+
+    // append type
+    const ImpRCStack *pRC = StackTop();
+    OSL_ENSURE( pRC, "missing resource stack level" );
+
+    switch( pRC->pResource->GetRT() ) { // maximal 32
+        case RSC_TABCONTROL:        aHID.append( "TabControl" );       break;
+        case RSC_RADIOBUTTON:       aHID.append( "RadioButton" );      break;
+        case RSC_CHECKBOX:          aHID.append( "CheckBox" );         break;
+        case RSC_TRISTATEBOX:       aHID.append( "TristateBox" );      break;
+        case RSC_EDIT:              aHID.append( "Edit" );             break;
+        case RSC_MULTILINEEDIT:     aHID.append( "MultilineEdit" );    break;
+        case RSC_MULTILISTBOX:      aHID.append( "MultiListBox" );     break;
+        case RSC_LISTBOX:           aHID.append( "ListBox" );          break;
+        case RSC_COMBOBOX:          aHID.append( "Combobox" );         break;
+        case RSC_PUSHBUTTON:        aHID.append( "PushButton" );       break;
+        case RSC_SPINFIELD:         aHID.append( "SpinField" );        break;
+        case RSC_PATTERNFIELD:      aHID.append( "PatternField" );     break;
+        case RSC_NUMERICFIELD:      aHID.append( "NumericField" );     break;
+        case RSC_METRICFIELD:       aHID.append( "MetricField" );      break;
+        case RSC_CURRENCYFIELD:     aHID.append( "CurrencyField" );    break;
+        case RSC_DATEFIELD:         aHID.append( "DateField" );        break;
+        case RSC_TIMEFIELD:         aHID.append( "TimeField" );        break;
+        case RSC_IMAGERADIOBUTTON:  aHID.append( "ImageRadioButton" ); break;
+        case RSC_NUMERICBOX:        aHID.append( "NumericBox" );       break;
+        case RSC_METRICBOX:         aHID.append( "MetricBox" );        break;
+        case RSC_CURRENCYBOX:       aHID.append( "CurrencyBox" );      break;
+        case RSC_DATEBOX:           aHID.append( "DateBox" );          break;
+        case RSC_TIMEBOX:           aHID.append( "TimeBox" );          break;
+        case RSC_IMAGEBUTTON:       aHID.append( "ImageButton" );      break;
+        case RSC_MENUBUTTON:        aHID.append( "MenuButton" );       break;
+        case RSC_MOREBUTTON:        aHID.append( "MoreButton" );       break;
         default:
-            return 0;
-    } // of switch
-    nHID |= nGID << 14;
+            ;
+    }
+
+    // append resource id hierarchy
+    for( int nOff = nCurStack-1; nOff >= 0; nOff-- )
+    {
+        aHID.append( ':' );
+        pRC = StackTop( nOff );
+
+        OSL_ENSURE( pRC->pResource, "missing resource in resource stack level !" );
+        if( pRC->pResource )
+            aHID.append( sal_Int32( pRC->pResource->GetId() ) );
+    }
 
-    return nHID;
+    return aHID.makeStringAndClear();
 }
 
 // -----------------------------------------------------------------------