diff options
71 files changed, 843 insertions, 431 deletions
diff --git a/automation/inc/automation/commtypes.hxx b/automation/inc/automation/commtypes.hxx index 00c0172fa..e7ac39e37 100644 --- a/automation/inc/automation/commtypes.hxx +++ b/automation/inc/automation/commtypes.hxx @@ -52,6 +52,7 @@ #include <sal/types.h> typedef sal_Unicode comm_UniChar; +#include "rtl/string.hxx" // this is a trick to be sure the SO types are unknown, so the compiler will yell at us in case we use them #ifndef _SOLAR_H @@ -93,7 +94,7 @@ typedef UINT32 comm_UINT32; typedef sal_uInt16 comm_WORD; typedef sal_uInt32 comm_DWORD; -class SmartId; +class rtl::OString; class String; #define comm_String String diff --git a/automation/source/inc/cmdbasestream.hxx b/automation/source/inc/cmdbasestream.hxx index 22ffe4e26..8eca54de2 100644 --- a/automation/source/inc/cmdbasestream.hxx +++ b/automation/source/inc/cmdbasestream.hxx @@ -38,6 +38,7 @@ #include <automation/commtypes.hxx> #include "icommstream.hxx" +#include "rtl/string.hxx" class CmdBaseStream { @@ -48,20 +49,20 @@ protected: public: - void GenError( SmartId *pUId, comm_String *pString ); + void GenError( rtl::OString *pUId, comm_String *pString ); void GenReturn( comm_USHORT nRet, comm_ULONG nNr ); - void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_ULONG nNr ); - void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_String *pString ); - void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_BOOL bBool ); - void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_ULONG nNr, comm_String *pString, comm_BOOL bBool ); + void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_ULONG nNr ); + void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_String *pString ); + void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_BOOL bBool ); + void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_ULONG nNr, comm_String *pString, comm_BOOL bBool ); // MacroRecorder - void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod ); - void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod, comm_String *pString ); - void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod, comm_String *pString, comm_BOOL bBool ); - void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod, comm_BOOL bBool ); - void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod, comm_ULONG nNr ); + void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod ); + void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_String *pString ); + void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_String *pString, comm_BOOL bBool ); + void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_BOOL bBool ); + void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_ULONG nNr ); void Read ( comm_USHORT &nNr ); void Read ( comm_ULONG &nNr ); @@ -76,10 +77,10 @@ public: // Complex Datatypes to be handled system dependent virtual void Read ( comm_String *&pString ); - virtual void Read ( SmartId* &pId ); + virtual void Read ( rtl::OString* &pId ); virtual void Write( comm_String *pString ); - virtual void Write( SmartId* pId ); + virtual void Write( rtl::OString* pId ); }; #endif diff --git a/automation/source/inc/testapp.hxx b/automation/source/inc/testapp.hxx index 7d6eb4070..a70ccadf0 100644 --- a/automation/source/inc/testapp.hxx +++ b/automation/source/inc/testapp.hxx @@ -30,7 +30,6 @@ #include <basic/sbmod.hxx> #include <basic/testtool.hxx> -#include <vcl/smartid.hxx> class CommunicationLink; class CommunicationManagerClientViaSocketTT; @@ -129,7 +128,7 @@ private: BOOL bReturnOK; // Bricht WaitForAnswer ab CRevNames *pShortNames; // Aktuell verwendete Controls, zur gewinnung des Namens aus Fehlermeldung ULONG nSequence; // Sequence um Antwort und Anfrage zu syncronisieren - SmartId aNextReturnId; // Id des Returnwertes i.e. UId + rtl::OString aNextReturnId; // Id des Returnwertes i.e. UId void ReplaceNumbers(String &aText); // Zahlen im String mit speziellem Format in Namen umwandeln String aLastRecordedKontext;// Keeps the last kontext recorded by the Macro Recorder diff --git a/automation/source/miniapp/testapp.cxx b/automation/source/miniapp/testapp.cxx index f0e0a86aa..f7d1eb1a4 100644 --- a/automation/source/miniapp/testapp.cxx +++ b/automation/source/miniapp/testapp.cxx @@ -122,7 +122,8 @@ void MainWindow::Tree(GHEditWindow *aEditWin, Window *pBase, USHORT Indent) aText.SearchAndReplaceAllAscii("\n",CUniString("\\n")); aEditWin->AddText(String(sIndent).AppendAscii("Text: ").Append(aText).AppendAscii("\n")); - aEditWin->AddText(String(sIndent).AppendAscii("Help: ").Append(String::CreateFromInt64(pBase->GetHelpId())).AppendAscii(":").Append(pBase->GetQuickHelpText()).AppendAscii(":").Append(pBase->GetHelpText()).AppendAscii("\n")); + // FIXME: HELPID + aEditWin->AddText(String(sIndent).AppendAscii("Help: ").Append(String(rtl::OStringToOUString(pBase->GetHelpId(), RTL_TEXTENCODING_UTF8))).AppendAscii(":").Append(pBase->GetQuickHelpText()).AppendAscii(":").Append(pBase->GetHelpText()).AppendAscii("\n")); USHORT i; for (i = 0 ; i < pBase->GetChildCount() ; i++) diff --git a/automation/source/server/cmdbasestream.cxx b/automation/source/server/cmdbasestream.cxx index 20cf93c7d..afd305577 100644 --- a/automation/source/server/cmdbasestream.cxx +++ b/automation/source/server/cmdbasestream.cxx @@ -49,7 +49,7 @@ CmdBaseStream::~CmdBaseStream() { } -void CmdBaseStream::GenError (SmartId *pUId, comm_String *pString ) +void CmdBaseStream::GenError (rtl::OString *pUId, comm_String *pString ) { Write(comm_USHORT(SIReturnError)); Write(pUId); @@ -64,7 +64,7 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_ULONG nUId ) Write(comm_USHORT(PARAM_NONE)); // Typ der folgenden Parameter } -void CmdBaseStream::GenReturn (comm_USHORT nRet, SmartId *pUId, comm_ULONG nNr ) +void CmdBaseStream::GenReturn (comm_USHORT nRet, rtl::OString *pUId, comm_ULONG nNr ) { Write(comm_USHORT(SIReturn)); Write(nRet); @@ -73,7 +73,7 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, SmartId *pUId, comm_ULONG nNr ) Write(nNr); } -void CmdBaseStream::GenReturn (comm_USHORT nRet, SmartId *pUId, comm_String *pString ) +void CmdBaseStream::GenReturn (comm_USHORT nRet, rtl::OString *pUId, comm_String *pString ) { Write(comm_USHORT(SIReturn)); Write(nRet); @@ -82,7 +82,7 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, SmartId *pUId, comm_String *pSt Write(pString); } -void CmdBaseStream::GenReturn (comm_USHORT nRet, SmartId *pUId, comm_BOOL bBool ) +void CmdBaseStream::GenReturn (comm_USHORT nRet, rtl::OString *pUId, comm_BOOL bBool ) { Write(comm_USHORT(SIReturn)); Write(nRet); @@ -91,7 +91,7 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, SmartId *pUId, comm_BOOL bBool Write(bBool); } -void CmdBaseStream::GenReturn (comm_USHORT nRet, SmartId *pUId, comm_ULONG nNr, comm_String *pString, comm_BOOL bBool ) +void CmdBaseStream::GenReturn (comm_USHORT nRet, rtl::OString *pUId, comm_ULONG nNr, comm_String *pString, comm_BOOL bBool ) { Write(comm_USHORT(SIReturn)); Write(nRet); @@ -103,7 +103,7 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, SmartId *pUId, comm_ULONG nNr, } // MacroRecorder -void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod ) +void CmdBaseStream::GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod ) { Write(comm_USHORT(SIReturn)); Write(nRet); @@ -112,7 +112,7 @@ void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMet Write(nMethod); } -void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod, comm_String *pString ) +void CmdBaseStream::GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_String *pString ) { Write(comm_USHORT(SIReturn)); Write(nRet); @@ -122,7 +122,7 @@ void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMet Write(pString); } -void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod, comm_String *pString, comm_BOOL bBool ) +void CmdBaseStream::GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_String *pString, comm_BOOL bBool ) { Write(comm_USHORT(SIReturn)); Write(nRet); @@ -133,7 +133,7 @@ void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMet Write(bBool); } -void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod, comm_BOOL bBool ) +void CmdBaseStream::GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_BOOL bBool ) { Write(comm_USHORT(SIReturn)); Write(nRet); @@ -143,7 +143,7 @@ void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMet Write(bBool); } -void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod, comm_ULONG nNr ) +void CmdBaseStream::GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_ULONG nNr ) { Write(comm_USHORT(SIReturn)); Write(nRet); @@ -282,10 +282,10 @@ void CmdBaseStream::Read ( comm_String* &pString ) (void) pString; /* avoid warning about unused parameter */ DBG_ERROR("Read ( comm_String* &pString ) Not Implemented"); } -void CmdBaseStream::Read ( SmartId* &pId ) +void CmdBaseStream::Read ( rtl::OString* &pId ) { (void) pId; /* avoid warning about unused parameter */ - DBG_ERROR("Read ( SmartId* &pId ) Not Implemented"); + DBG_ERROR("Read ( rtl::OString* &pId ) Not Implemented"); } void CmdBaseStream::Write( comm_String *pString ) @@ -293,9 +293,9 @@ void CmdBaseStream::Write( comm_String *pString ) (void) pString; /* avoid warning about unused parameter */ DBG_ERROR("Write( comm_String *pString ) Not Implemented"); } -void CmdBaseStream::Write( SmartId* pId ) +void CmdBaseStream::Write( rtl::OString* pId ) { (void) pId; /* avoid warning about unused parameter */ - DBG_ERROR("Write( SmartId* pId ) Not Implemented"); + DBG_ERROR("Write( rtl::OString* pId ) Not Implemented"); } diff --git a/automation/source/server/recorder.cxx b/automation/source/server/recorder.cxx index 380222ad8..549a073b4 100644 --- a/automation/source/server/recorder.cxx +++ b/automation/source/server/recorder.cxx @@ -105,30 +105,34 @@ IMPL_LINK( MacroRecorder, HookRefreshHdl, void*, EMPTYARG ) return 0; } -void MacroRecorder::LogVCL( SmartId aParentID, USHORT nVCLWindowType, SmartId aID, String aMethod, USHORT nParam ) +void MacroRecorder::LogVCL( rtl::OString aParentID, USHORT nVCLWindowType, rtl::OString aID, String aMethod, USHORT nParam ) { - ::comphelper::UiEventsLogger::logVcl( aParentID.GetText(), nVCLWindowType, aID.GetText(), aMethod, nParam ); + // FIXME: HELPID + ::comphelper::UiEventsLogger::logVcl( rtl::OStringToOUString( aParentID, RTL_TEXTENCODING_UTF8 ), nVCLWindowType, rtl::OStringToOUString( aID, RTL_TEXTENCODING_UTF8 ), aMethod, nParam ); } -void MacroRecorder::LogVCL( SmartId aParentID, USHORT nVCLWindowType, SmartId aID, String aMethod ) +void MacroRecorder::LogVCL( rtl::OString aParentID, USHORT nVCLWindowType, rtl::OString aID, String aMethod ) { - ::comphelper::UiEventsLogger::logVcl( aParentID.GetText(), nVCLWindowType, aID.GetText(), aMethod ); + // FIXME: HELPID + ::comphelper::UiEventsLogger::logVcl( rtl::OStringToOUString( aParentID, RTL_TEXTENCODING_UTF8 ), nVCLWindowType, rtl::OStringToOUString( aID, RTL_TEXTENCODING_UTF8 ), aMethod ); } Window* MacroRecorder::GetParentWithID( Window* pThis ) { Window *pOverlap = pThis->GetWindow( WINDOW_OVERLAP ); - while ( pOverlap != pThis && !pThis->GetSmartUniqueOrHelpId().HasAny() && pThis->GET_REAL_PARENT() ) + // FIXME: HELPID + while ( pOverlap != pThis && !pThis->GetUniqueOrHelpId().getLength() && pThis->GET_REAL_PARENT() ) pThis = pThis->GET_REAL_PARENT(); return pThis; } -SmartId MacroRecorder::GetParentID( Window* pThis ) +rtl::OString MacroRecorder::GetParentID( Window* pThis ) { + // FIXME: HELPID if ( pThis->GetParent() ) - return pThis->GetParent()->GetSmartUniqueOrHelpId(); + return pThis->GetParent()->GetUniqueOrHelpId(); else - return SmartId(); + return rtl::OString(); } IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) @@ -177,7 +181,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) } if ( m_bLog ) { -// HACK Too many KeyEvents generated LogVCL( SmartId(), 0, aKeyUniqueID, CUniString("TypeKeys"), aKeyString.Len() ); +// HACK Too many KeyEvents generated LogVCL( rtl::OString(), 0, aKeyUniqueID, CUniString("TypeKeys"), aKeyString.Len() ); } // cleanup aKeyString.Erase(); @@ -193,12 +197,16 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) case VCLEVENT_WINDOW_ACTIVATE: if ( m_bRecord ) { - StatementList::pRet->GenReturn( RET_MacroRecorder, SmartId(), (comm_USHORT)(M_SetPage|M_RET_NUM_CONTROL), static_cast<comm_ULONG>(pWin->GetSmartUniqueOrHelpId().GetNum()) ); //GetNum() ULONG != comm_ULONG on 64bit + // FIXME: HELPID + #if 0 + StatementList::pRet->GenReturn( RET_MacroRecorder, rtl::OString(), (comm_USHORT)(M_SetPage|M_RET_NUM_CONTROL), static_cast<comm_ULONG>(pWin->GetUniqueOrHelpId().GetNum()) ); //GetNum() ULONG != comm_ULONG on 64bit + #endif bSendData = TRUE; } if ( m_bLog ) { - LogVCL( SmartId(), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), CUniString("SetPage") ); + // FIXME: HELPID + LogVCL( rtl::OString(), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("SetPage") ); } break; } @@ -213,12 +221,16 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) { if ( m_bRecord ) { - StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), (comm_USHORT)M_Check ); + // FIXME: HELPID + #if 0 + StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Check ); + #endif bSendData = TRUE; } if ( m_bLog ) { - LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), CUniString("Check") ); + // FIXME: HELPID + LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Check") ); } } } @@ -243,12 +255,16 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) } if ( m_bRecord ) { + // FIXME: HELPID + #if 0 StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), nMethod ); + #endif bSendData = TRUE; } if ( m_bLog ) { - LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), aMethod ); + // FIXME: HELPID + LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), aMethod ); } } break; @@ -277,12 +293,16 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) case VCLEVENT_LISTBOX_SELECT: if ( m_bRecord ) { - StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), (comm_USHORT)M_Select, comm_ULONG( ((ListBox*)pWin)->GetSelectEntryPos() +1 ) ); + // FIXME: HELPID + #if 0 + StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Select, comm_ULONG( ((ListBox*)pWin)->GetSelectEntryPos() +1 ) ); + #endif bSendData = TRUE; } if ( m_bLog ) { - LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), CUniString("Select"), ((ListBox*)pWin)->GetSelectEntryPos() ); + // FIXME: HELPID + LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Select"), ((ListBox*)pWin)->GetSelectEntryPos() ); } break; } @@ -312,13 +332,17 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) Sound::Beep(); else { - StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), (comm_USHORT)M_Select, (comm_ULONG) nPos+1 ); + // FIXME: HELPID + #if 0 + StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Select, (comm_ULONG) nPos+1 ); + #endif bSendData = TRUE; } } if ( m_bLog ) { - LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), CUniString("Select"), nPos ); + // FIXME: HELPID + LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Select"), nPos ); } } } @@ -334,7 +358,8 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) case VCLEVENT_BUTTON_CLICK: Window* pParent = pWin->GetParent(); BOOL bDone = FALSE; - if ( pParent->IsDialog() && !pWin->GetSmartUniqueOrHelpId().HasAny() ) + // FIXME: HELPID + if ( pParent->IsDialog() && !pWin->GetUniqueOrHelpId().getLength() ) { switch ( pParent->GetType() ) { @@ -373,18 +398,23 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) } if ( m_bRecord ) { + // FIXME: HELPID + #if 0 if ( nMethod != M_Click ) - StatementList::pRet->GenReturn( RET_MacroRecorder, SmartId( 0 ), nMethod ); + StatementList::pRet->GenReturn( RET_MacroRecorder, rtl::OString( 0 ), nMethod ); else - StatementList::pRet->GenReturn( RET_MacroRecorder, SmartId( 0 ), nMethod, (comm_ULONG)nCurrentButtonId ); + StatementList::pRet->GenReturn( RET_MacroRecorder, rtl::OString( 0 ), nMethod, (comm_ULONG)nCurrentButtonId ); + #endif bSendData = TRUE; } if ( m_bLog ) { if ( nMethod != M_Click ) - LogVCL( SmartId(), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), aMethod ); + // FIXME: HELPID + LogVCL( rtl::OString(), pWin->GetType(), pWin->GetUniqueOrHelpId(), aMethod ); else - LogVCL( SmartId(), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), aMethod, nCurrentButtonId ); + // FIXME: HELPID + LogVCL( rtl::OString(), pWin->GetType(), pWin->GetUniqueOrHelpId(), aMethod, nCurrentButtonId ); bDone = TRUE; } } @@ -403,12 +433,16 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) } if ( m_bRecord ) { + // FIXME: HELPID + #if 0 StatementList::pRet->GenReturn( RET_MacroRecorder, pParent->GetSmartUniqueOrHelpId(), nMethod ); + #endif bSendData = TRUE; } if ( m_bLog ) { - LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), aMethod ); + // FIXME: HELPID + LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), aMethod ); bDone = TRUE; } } @@ -417,16 +451,21 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) } if ( m_bRecord ) { - if ( !bSendData && pWin->GetSmartUniqueOrHelpId().HasAny() ) + // FIXME: HELPID + if ( !bSendData && pWin->GetUniqueOrHelpId().getLength() ) { + // FIXME: HELPID + #if 0 StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), (comm_USHORT)M_Click ); + #endif bSendData = TRUE; } } if ( m_bLog ) { if ( !bDone ) - LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), CUniString("Click") ); + // FIXME: HELPID + LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Click") ); } } break; @@ -480,12 +519,16 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) } if ( m_bRecord ) { - StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), nMethod ); + // FIXME: HELPID + #if 0 + StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), nMethod ); + #endif bSendData = TRUE; } if ( m_bLog ) { - LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), aMethod ); + // FIXME: HELPID + LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), aMethod ); } } break; @@ -502,12 +545,16 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) case VCLEVENT_BUTTON_CLICK: if ( m_bRecord ) { - StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), (comm_USHORT)M_Click ); + // FIXME: HELPID + #if 0 + StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Click ); + #endif bSendData = TRUE; } if ( m_bLog ) { - LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), CUniString("Click") ); + // FIXME: HELPID + LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Click") ); } break; /* Keyevent or Timeout @@ -540,12 +587,15 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) // compare to 1 for floating ToolBoxes if ( m_bRecord ) { - if ( !pWin->GetSmartUniqueOrHelpId().HasAny() || pWin->GetSmartUniqueOrHelpId().Matches( 1 ) ) + // FIXME: HELPID + #if 0 + if ( !pWin->GetUniqueOrHelpId().getLength() || pWin->GetUniqueOrHelpId().Matches( 1 ) ) // generate direct Button access - StatementList::pRet->GenReturn( RET_MacroRecorder, SmartId( pTB->GetItemCommand( pTB->GetCurItemId() ) ), (comm_USHORT)(M_Click) ); + StatementList::pRet->GenReturn( RET_MacroRecorder, rtl::OString( pTB->GetItemCommand( pTB->GetCurItemId() ) ), (comm_USHORT)(M_Click) ); else // access via Toolbox - StatementList::pRet->GenReturn( RET_MacroRecorder, pTB->GetSmartUniqueOrHelpId(), (comm_USHORT)(M_Click|M_RET_NUM_CONTROL), static_cast<comm_ULONG>(pTB->GetHelpId( pTB->GetCurItemId() )) ); // GetHelpId() ULONG != comm_ULONG on 64bit + StatementList::pRet->GenReturn( RET_MacroRecorder, pTB->GetUniqueOrHelpId(), (comm_USHORT)(M_Click|M_RET_NUM_CONTROL), static_cast<comm_ULONG>(pTB->GetHelpId( pTB->GetCurItemId() )) ); // GetHelpId() ULONG != comm_ULONG on 64bit + #endif bSendData = TRUE; } /* not needed if ( m_bLog ) @@ -566,7 +616,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) // { // if ( !pWin->GetSmartUniqueOrHelpId().HasAny() || pWin->GetSmartUniqueOrHelpId().Matches( 1 ) ) // // generate direct Button access -// StatementList::pRet->GenReturn( RET_MacroRecorder, SmartId( pActionParent->GetHelpId( pActionParent->GetCurItemId() ) ), (comm_USHORT)(M_TearOff) ); +// StatementList::pRet->GenReturn( RET_MacroRecorder, rtl::OString( pActionParent->GetHelpId( pActionParent->GetCurItemId() ) ), (comm_USHORT)(M_TearOff) ); // else // // access via Toolbox // StatementList::pRet->GenReturn( RET_MacroRecorder, pActionParent->GetSmartUniqueOrHelpId(), (comm_USHORT)(M_TearOff|M_RET_NUM_CONTROL), static_cast<comm_ULONG>(pActionParent->GetHelpId( pActionParent->GetCurItemId() )) ); // GetHelpId() ULONG != comm_ULONG on 64bit @@ -574,7 +624,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) // } // if ( m_bLog ) // { -// LogVCL( pActionParent->GetSmartUniqueOrHelpId(), pWin->GetType(), SmartId( pActionParent->GetHelpId( pActionParent->GetCurItemId() ) ), CUniString("TearOff") ); +// LogVCL( pActionParent->GetSmartUniqueOrHelpId(), pWin->GetType(), rtl::OString( pActionParent->GetHelpId( pActionParent->GetCurItemId() ) ), CUniString("TearOff") ); // } // } // pActionParent = NULL; @@ -676,11 +726,12 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) Window *pIdWin = GetParentWithID( pWin ); if ( pIdWin != pWin ) bKeyFollowFocus = TRUE; - aKeyUniqueID = pIdWin->GetSmartUniqueOrHelpId(); + // FIXME: HELPID + aKeyUniqueID = pIdWin->GetUniqueOrHelpId(); if ( m_bLog ) { // HACK Too many KeyEvents generated if ( aKeyString.Len() == 0 ) -// HACK Too many KeyEvents generated LogVCL( SmartId(), 0, aKeyUniqueID, CUniString("TypeKeysStart") ); +// HACK Too many KeyEvents generated LogVCL( rtl::OString(), 0, aKeyUniqueID, CUniString("TypeKeysStart") ); } if ( ( !aKeyCode.IsMod1() && !aKeyCode.IsMod2() ) && (( aKeyCode.GetGroup() == KEYGROUP_NUM) || @@ -1024,12 +1075,16 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) { if ( m_bRecord ) { - StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), M_SetText, aEditModifyString ); + // FIXME: HELPID + #if 0 + StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), M_SetText, aEditModifyString ); + #endif bSendData = TRUE; } if ( m_bLog ) { - LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), CUniString("Modify") ); + // FIXME: HELPID + LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Modify") ); } pEditModify = NULL; aEditModifyString.Erase(); //could be somewhat lengthy diff --git a/automation/source/server/recorder.hxx b/automation/source/server/recorder.hxx index 845d21a3c..3d7117728 100644 --- a/automation/source/server/recorder.hxx +++ b/automation/source/server/recorder.hxx @@ -27,7 +27,6 @@ #include <tools/string.hxx> #include <tools/link.hxx> -#include <vcl/smartid.hxx> #include <vcl/timer.hxx> class ToolBox; @@ -38,7 +37,7 @@ class MacroRecorder { private: Window* GetParentWithID( Window* pThis ); - SmartId GetParentID( Window* pThis ); + rtl::OString GetParentID( Window* pThis ); Link aEventListenerHdl; DECL_LINK( EventListener, VclSimpleEvent* ); @@ -51,7 +50,7 @@ private: // record keys String aKeyString; - SmartId aKeyUniqueID; // has to be remembered seperately since Window might be gone when needed + rtl::OString aKeyUniqueID; // has to be remembered seperately since Window might be gone when needed Window* pKeyWin; BOOL bKeyFollowFocus; @@ -60,8 +59,8 @@ private: void RemoveEventHooks(); DECL_LINK( HookRefreshHdl, void* ); - void LogVCL( SmartId aParentID, USHORT nVCLWindowType, SmartId aID, String aMethod, USHORT aParam ); - void LogVCL( SmartId aParentID, USHORT nVCLWindowType, SmartId aID, String aMethod ); + void LogVCL( rtl::OString aParentID, USHORT nVCLWindowType, rtl::OString aID, String aMethod, USHORT aParam ); + void LogVCL( rtl::OString aParentID, USHORT nVCLWindowType, rtl::OString aID, String aMethod ); static MacroRecorder *pMacroRecorder; diff --git a/automation/source/server/retstrm.cxx b/automation/source/server/retstrm.cxx index 2a462a63a..447b64721 100644 --- a/automation/source/server/retstrm.cxx +++ b/automation/source/server/retstrm.cxx @@ -47,17 +47,17 @@ RetStream::~RetStream() delete pSammel; } -void RetStream::GenError ( SmartId aUId, String aString ) +void RetStream::GenError ( rtl::OString aUId, String aString ) { CmdBaseStream::GenError ( &aUId, &aString ); } -void RetStream::GenReturn ( USHORT nRet, SmartId aUId, String aString ) +void RetStream::GenReturn ( USHORT nRet, rtl::OString aUId, String aString ) { CmdBaseStream::GenReturn ( nRet, &aUId, &aString ); } -void RetStream::GenReturn ( USHORT nRet, SmartId aUId, SbxValue &aValue ) +void RetStream::GenReturn ( USHORT nRet, rtl::OString aUId, SbxValue &aValue ) { Write(USHORT(SIReturn)); Write(nRet); @@ -66,17 +66,17 @@ void RetStream::GenReturn ( USHORT nRet, SmartId aUId, SbxValue &aValue ) Write(aValue); } -void RetStream::GenReturn ( USHORT nRet, SmartId aUId, comm_ULONG nNr, String aString, BOOL bBool ) +void RetStream::GenReturn ( USHORT nRet, rtl::OString aUId, comm_ULONG nNr, String aString, BOOL bBool ) { CmdBaseStream::GenReturn ( nRet, &aUId, nNr, &aString, bBool ); } -void RetStream::GenReturn( USHORT nRet, SmartId aUId, comm_USHORT nMethod, String aString ) +void RetStream::GenReturn( USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, String aString ) { CmdBaseStream::GenReturn ( nRet, &aUId, nMethod, &aString ); } -void RetStream::GenReturn( USHORT nRet, SmartId aUId, comm_USHORT nMethod, String aString, BOOL bBool ) +void RetStream::GenReturn( USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, String aString, BOOL bBool ) { CmdBaseStream::GenReturn ( nRet, &aUId, nMethod, &aString, bBool ); } @@ -93,9 +93,11 @@ void RetStream::Write( SbxValue &aValue ) aValue.Store( *pSammel ); } -void RetStream::Write( SmartId* pId ) +void RetStream::Write( rtl::OString* pId ) { - DBG_ASSERT( !pId->HasString() || !pId->HasNumeric(), "SmartId contains Number and String. using String only." ); + // FIXME: HELPID + #if 0 + DBG_ASSERT( !pId->HasString() || !pId->HasNumeric(), "rtl::OString contains Number and String. using String only." ); if ( pId->HasString() ) { String aTmp( pId->GetStr() ); @@ -103,6 +105,7 @@ void RetStream::Write( SmartId* pId ) } else Write( static_cast<comm_ULONG>(pId->GetNum()) ); ////GetNum() ULONG != comm_ULONG on 64bit + #endif } diff --git a/automation/source/server/retstrm.hxx b/automation/source/server/retstrm.hxx index af7b005e1..cf909119d 100644 --- a/automation/source/server/retstrm.hxx +++ b/automation/source/server/retstrm.hxx @@ -28,7 +28,6 @@ #define _RETSTRM_HXX #include <basic/sbxvar.hxx> -#include <vcl/smartid.hxx> #include "cmdbasestream.hxx" class SvStream; @@ -43,24 +42,24 @@ public: using CmdBaseStream::GenError; // void GenError( comm_ULONG nError, const comm_UniChar* aString, comm_USHORT nLenInChars ){CmdBaseStream::GenError( nError, aString, nLenInChars );} // new - void GenError( SmartId aUId, String aString ); + void GenError( rtl::OString aUId, String aString ); using CmdBaseStream::GenReturn; void GenReturn( comm_USHORT nRet, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, nNr );} - void GenReturn( comm_USHORT nRet, SmartId aUId, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nNr );} - void GenReturn( comm_USHORT nRet, SmartId aUId, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, bBool );} + void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nNr );} + void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, bBool );} // MacroRecorder - void GenReturn( comm_USHORT nRet, SmartId aUId, comm_USHORT nMethod ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod );} - void GenReturn( comm_USHORT nRet, SmartId aUId, comm_USHORT nMethod, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, bBool );} - void GenReturn( comm_USHORT nRet, SmartId aUId, comm_USHORT nMethod, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, nNr );} + void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_USHORT nMethod ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod );} + void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, bBool );} + void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, nNr );} // new - void GenReturn( USHORT nRet, SmartId aUId, String aString ); - void GenReturn( USHORT nRet, SmartId aUId, SbxValue &aValue ); - void GenReturn( USHORT nRet, SmartId aUId, comm_ULONG nNr, String aString, BOOL bBool ); + void GenReturn( USHORT nRet, rtl::OString aUId, String aString ); + void GenReturn( USHORT nRet, rtl::OString aUId, SbxValue &aValue ); + void GenReturn( USHORT nRet, rtl::OString aUId, comm_ULONG nNr, String aString, BOOL bBool ); // MacroRecorder - void GenReturn( USHORT nRet, SmartId aUId, comm_USHORT nMethod, String aString ); - void GenReturn( USHORT nRet, SmartId aUId, comm_USHORT nMethod, String aString, BOOL bBool ); + void GenReturn( USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, String aString ); + void GenReturn( USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, String aString, BOOL bBool ); void Reset(); SvStream* GetStream(); @@ -75,7 +74,7 @@ public: void Write( SbxValue &aValue ); // Complex Datatypes to be handled system dependent - virtual void Write( SmartId* pId ); + virtual void Write( rtl::OString* pId ); virtual void Write( String *pString ); SvStream *pSammel; diff --git a/automation/source/server/server.cxx b/automation/source/server/server.cxx index c9ee5c2b6..d9c3fea3f 100644 --- a/automation/source/server/server.cxx +++ b/automation/source/server/server.cxx @@ -709,7 +709,7 @@ IMPL_LINK( ImplRemoteControl, CommandHdl, Application*, EMPTYARG ) m_bInsideExecutionLoop = FALSE; } - StatementList::aWindowWaitUId = SmartId(); // Warten rücksetzen, da handler sowieso verlassen wird + StatementList::aWindowWaitUId = rtl::OString(); // Warten rücksetzen, da handler sowieso verlassen wird /* if( StatementList::pFirst && !StatementList::bReadingCommands ) // Abfrage nötig, da andere CommandHdl aktiv sein können oder diff --git a/automation/source/server/sta_list.cxx b/automation/source/server/sta_list.cxx index c82c261bd..a518d28b9 100644 --- a/automation/source/server/sta_list.cxx +++ b/automation/source/server/sta_list.cxx @@ -77,15 +77,15 @@ EditWindow *StatementList::m_pDbgWin; #endif -SmartId StatementList::aWindowWaitUId = SmartId(); +rtl::OString StatementList::aWindowWaitUId = rtl::OString(); Window *StatementList::pWindowWaitPointer = NULL; -SmartId StatementList::aWindowWaitOldHelpId = SmartId(); -SmartId StatementList::aWindowWaitOldUniqueId = SmartId(); +rtl::OString StatementList::aWindowWaitOldHelpId = rtl::OString(); +rtl::OString StatementList::aWindowWaitOldUniqueId = rtl::OString(); USHORT StatementList::nUseBindings = 0; -SmartId StatementList::aSubMenuId1 = SmartId(); // Untermenüs bei PopupMenus -SmartId StatementList::aSubMenuId2 = SmartId(); // erstmal 2-Stufig -SmartId StatementList::aSubMenuId3 = SmartId(); // and now even 3 levels #i31512# +rtl::OString StatementList::aSubMenuId1 = rtl::OString(); // Untermenüs bei PopupMenus +rtl::OString StatementList::aSubMenuId2 = rtl::OString(); // erstmal 2-Stufig +rtl::OString StatementList::aSubMenuId3 = rtl::OString(); // and now even 3 levels #i31512# SystemWindow *StatementList::pMenuWindow = NULL; TTProperties *StatementList::pTTProperties = NULL; @@ -129,7 +129,8 @@ TTSettings* GetTTSettings() -#define IS_WINP_CLOSING(pWin) (pWin->GetSmartHelpId().Matches( 4321 ) && pWin->GetSmartUniqueId().Matches( 1234 )) +// FIXME: HELPID +#define IS_WINP_CLOSING(pWin) (pWin->GetHelpId().equals( "4321" ) && pWin->GetUniqueId().equals( "1234" )) /* UniString GEN_RES_STR0( ULONG nResId ) { return ResString( nResId ); } @@ -154,7 +155,7 @@ void StatementList::InitProfile() #if OSL_DEBUG_LEVEL > 1 if ( pCurrentProfileStatement != NULL && pCurrentProfileStatement != this ) - pRet->GenReturn( RET_ProfileInfo, SmartId(), CUniString("InitProfile von anderem Statement gerufen ohne SendProfile\n") ); + pRet->GenReturn( RET_ProfileInfo, rtl::OString(), CUniString("InitProfile von anderem Statement gerufen ohne SendProfile\n") ); #endif pCurrentProfileStatement = this; } @@ -170,18 +171,18 @@ void StatementList::SendProfile( String aText ) pProfiler->EndProfileInterval(); if ( pProfiler->IsProfilingPerCommand() ) - pRet->GenReturn( RET_ProfileInfo, SmartId(), pProfiler->GetProfileLine( aText ) ); + pRet->GenReturn( RET_ProfileInfo, rtl::OString(), pProfiler->GetProfileLine( aText ) ); if ( pProfiler->IsPartitioning() ) - pRet->GenReturn( RET_ProfileInfo, SmartId( S_ProfileTime ), static_cast<comm_ULONG>(pProfiler->GetPartitioningTime()) ); // GetPartitioningTime() ULONG != comm_ULONG on 64bit + pRet->GenReturn( RET_ProfileInfo, rtl::OString( S_ProfileTime ), static_cast<comm_ULONG>(pProfiler->GetPartitioningTime()) ); // GetPartitioningTime() ULONG != comm_ULONG on 64bit } if ( pProfiler->IsAutoProfiling() ) - pRet->GenReturn( RET_ProfileInfo, SmartId(), pProfiler->GetAutoProfiling() ); + pRet->GenReturn( RET_ProfileInfo, rtl::OString(), pProfiler->GetAutoProfiling() ); #if OSL_DEBUG_LEVEL > 1 if ( pCurrentProfileStatement == NULL ) - pRet->GenReturn( RET_ProfileInfo, SmartId(), CUniString("SendProfile ohne InitProfile\n") ); + pRet->GenReturn( RET_ProfileInfo, rtl::OString(), CUniString("SendProfile ohne InitProfile\n") ); #endif pCurrentProfileStatement = NULL; } @@ -389,7 +390,9 @@ Window* StatementList::SearchClientWin( Window *pBase, Search &aSearch, BOOL May BOOL SearchUID::IsWinOK( Window *pWin ) { - if ( aUId.Matches( pWin->GetSmartUniqueOrHelpId() ) ) + // FIXME: HELPID + #if 0 + if ( aUId.Matches( pWin->GetUniqueOrHelpId() ) ) { if ( ( pWin->IsEnabled() || HasSearchFlag( SEARCH_FIND_DISABLED ) ) && pWin->IsVisible() ) return TRUE; @@ -451,10 +454,11 @@ BOOL SearchUID::IsWinOK( Window *pWin ) return FALSE; } else + #endif return FALSE; } -Window* StatementList::SearchTree( SmartId aUId ,BOOL bSearchButtonOnToolbox ) +Window* StatementList::SearchTree( rtl::OString aUId ,BOOL bSearchButtonOnToolbox ) { SearchUID aSearch(aUId,bSearchButtonOnToolbox); @@ -973,7 +977,8 @@ String StatementList::ClientTree(Window *pBase, int Indent) WRITE(sIndent); WRITEc("UId : "); - WRITE(UIdString(pBase->GetSmartUniqueOrHelpId())); + // FIXME: HELPID + WRITE(String(rtl::OStringToOUString(pBase->GetUniqueOrHelpId(), RTL_TEXTENCODING_UTF8))); WRITEc(":0x"); WRITE( String::CreateFromInt64( @@ -1038,10 +1043,11 @@ BOOL StatementList::CheckWindowWait() #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( "Close timed out. Going on!! " ); #endif - pWindowWaitPointer->SetSmartHelpId(aWindowWaitOldHelpId, SMART_SET_ALL); - pWindowWaitPointer->SetSmartUniqueId(aWindowWaitOldUniqueId, SMART_SET_ALL); + // FIXME: HELPID + pWindowWaitPointer->SetHelpId(aWindowWaitOldHelpId); + pWindowWaitPointer->SetUniqueId(aWindowWaitOldUniqueId); - aWindowWaitUId = SmartId(); + aWindowWaitUId = rtl::OString(); pWindowWaitPointer = NULL; StartTime = Time(0L); return TRUE; @@ -1050,7 +1056,7 @@ BOOL StatementList::CheckWindowWait() return FALSE; } pWindowWaitPointer = NULL; - aWindowWaitUId = SmartId(); + aWindowWaitUId = rtl::OString(); #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( "Closed, Going on.\n" ); #endif @@ -1061,10 +1067,10 @@ BOOL StatementList::CheckWindowWait() void StatementList::ReportError(String aMessage) { - ReportError ( SmartId(), aMessage ); + ReportError ( rtl::OString(), aMessage ); } -void StatementList::ReportError(SmartId aUId, String aMessage) +void StatementList::ReportError(rtl::OString aUId, String aMessage) { pRet->GenError ( aUId, aMessage ); IsError = TRUE; @@ -1078,7 +1084,7 @@ void StatementList::ReportError(String aMessage, ULONG nWhatever) void StatementList::DirectLog( ULONG nType, String aMessage ) { if ( pRet ) - pRet->GenReturn( RET_DirectLoging, SmartId(nType), aMessage ); + pRet->GenReturn( RET_DirectLoging, rtl::OString(nType), aMessage ); } diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx index 9de433452..f8871a7da 100644 --- a/automation/source/server/statemnt.cxx +++ b/automation/source/server/statemnt.cxx @@ -152,13 +152,14 @@ pfunc_osl_printDebugMessage StatementCommand::pOriginal_osl_DebugMessageFunc = N #define RESET_APPLICATION_TO_BACKING_WINDOW +// FIXME: HELPID #define SET_WINP_CLOSING(pWin) \ pWindowWaitPointer = pWin; \ - aWindowWaitUId = pControl->GetSmartUniqueOrHelpId(); \ - aWindowWaitOldHelpId = pWin->GetSmartHelpId(); \ - aWindowWaitOldUniqueId = pWin->GetSmartUniqueId(); \ - pWin->SetSmartHelpId( SmartId(4321) ); \ - pWin->SetSmartUniqueId( SmartId(1234) ); + aWindowWaitUId = pControl->GetUniqueOrHelpId(); \ + aWindowWaitOldHelpId = pWin->GetHelpId(); \ + aWindowWaitOldUniqueId = pWin->GetUniqueId(); \ + pWin->SetHelpId( rtl::OString("4321") ); \ + pWin->SetUniqueId( rtl::OString("1234") ); // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= @@ -299,8 +300,10 @@ BOOL StatementFlow::Execute() // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= // neue Hilfsfunktion, die stetig erweitert werden muss -static short ImpGetRType( Window *pWin, SmartId aUId ) +static short ImpGetRType( Window *pWin, rtl::OString aUId ) { + // FIXME: HELPID + #if 0 ULONG nUId = aUId.GetNum(); // GetNum() is always zero if no num is defined // GGGg gggg::gggg gggg::ggLL LLLl::llll llll DBG_ASSERT( pWin, "missing Parameter" ); @@ -322,6 +325,9 @@ static short ImpGetRType( Window *pWin, SmartId aUId ) #endif } } + #else + short nRT = 0; + #endif #ifdef DBG_UTIL short n = nRT; @@ -588,9 +594,9 @@ BOOL StatementSlot::Execute() if ( !bMenuClosed ) { pPopup->EndExecute(0); - aSubMenuId1 = SmartId(); - aSubMenuId2 = SmartId(); - aSubMenuId3 = SmartId(); + aSubMenuId1 = rtl::OString(); + aSubMenuId2 = rtl::OString(); + aSubMenuId3 = rtl::OString(); pMenuWindow = NULL; bMenuClosed = TRUE; #if OSL_DEBUG_LEVEL > 1 @@ -712,12 +718,12 @@ BOOL StatementSlot::Execute() { case TT_PR_ERR_NODISPATCHER: { - ReportError( SmartId(nFunctionId), GEN_RES_STR0( S_SID_EXECUTE_FAILED_NO_DISPATCHER ) ); + ReportError( rtl::OString(nFunctionId), GEN_RES_STR0( S_SID_EXECUTE_FAILED_NO_DISPATCHER ) ); } break; case TT_PR_ERR_NOEXECUTE: { - ReportError(SmartId(nFunctionId), GEN_RES_STR0( S_SID_EXECUTE_FAILED ) ); + ReportError(rtl::OString(nFunctionId), GEN_RES_STR0( S_SID_EXECUTE_FAILED ) ); } break; } @@ -769,7 +775,7 @@ StatementCommand::StatementCommand( StatementList *pAfterThis, USHORT MethodId, , bBool2(FALSE) { QueStatement( pAfterThis ); - aSmartMethodId = SmartId( nMethodId ); + aSmartMethodId = rtl::OString( nMethodId ); #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( "Directly adding Conmmand:" ); @@ -806,7 +812,7 @@ StatementCommand::StatementCommand( SCmdStream *pCmdIn ) { QueStatement( NULL ); pCmdIn->Read( nMethodId ); - aSmartMethodId = SmartId( nMethodId ); + aSmartMethodId = rtl::OString( nMethodId ); pCmdIn->Read( nParams ); if( nParams & PARAM_USHORT_1 ) pCmdIn->Read( nNr1 ); @@ -863,7 +869,7 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst return; if ( bFirst ) - pRet->GenReturn ( RET_WinInfo, SmartId(), (comm_ULONG)nConf | DH_MODE_DATA_VALID, UniString(), TRUE ); + pRet->GenReturn ( RET_WinInfo, rtl::OString(), (comm_ULONG)nConf | DH_MODE_DATA_VALID, UniString(), TRUE ); { // Klammerung, so daß der String nicht während der Rekursion bestehen bleibt String aName; @@ -933,8 +939,12 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst break; default: - if ( pBase->GetSmartUniqueOrHelpId().Equals( SmartId() ) && !( nConf & DH_MODE_ALLWIN ) ) + // FIXME: HELPID + #if 0 + if ( pBase->GetSmartUniqueOrHelpId().Equals( rtl::OString() ) && !( nConf & DH_MODE_ALLWIN ) ) bSkip = TRUE; + #endif + break; } if ( !bSkip ) @@ -962,13 +972,16 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst aTypeSuffix.AppendAscii( "/Unknown", 8 ); } - SmartId aId = pBase->GetSmartUniqueOrHelpId(); + // FIXME: HELPID + rtl::OString aId = pBase->GetUniqueOrHelpId(); + #if 0 if ( aId.HasString() || ( nConf & DH_MODE_ALLWIN ) ) - pRet->GenReturn ( RET_WinInfo, SmartId( aId.GetStr() ), (comm_ULONG)pBase->GetType(), + pRet->GenReturn ( RET_WinInfo, rtl::OString( aId.GetStr() ), (comm_ULONG)pBase->GetType(), TypeString(pBase->GetType()).Append(aTypeSuffix).AppendAscii(": ").Append(aName), FALSE ); if ( !aId.HasString() || ( nConf & DH_MODE_ALLWIN ) ) - pRet->GenReturn ( RET_WinInfo, SmartId( aId.GetNum() ), (comm_ULONG)pBase->GetType(), + pRet->GenReturn ( RET_WinInfo, rtl::OString( aId.GetNum() ), (comm_ULONG)pBase->GetType(), TypeString(pBase->GetType()).Append(aTypeSuffix).AppendAscii(": ").Append(aName), FALSE ); + #endif if ( pBase->GetType() == WINDOW_TOOLBOX ) // Buttons und Controls auf Toolboxen. @@ -989,26 +1002,32 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst pItemWin = pTB->GetItemWindow( pTB->GetItemId( i ) ); if ( pTB->GetItemType( i ) == TOOLBOXITEM_BUTTON && ( !pItemWin || !pItemWin->IsVisible() ) ) { + // FIXME: HELPID + #if 0 if ( pTB->GetItemCommand(pTB->GetItemId( i )).Len() || ( nConf & DH_MODE_ALLWIN ) ) - pRet->GenReturn ( RET_WinInfo, SmartId( pTB->GetItemCommand(pTB->GetItemId( i )) ), (comm_ULONG)WINDOW_BUTTON, + pRet->GenReturn ( RET_WinInfo, rtl::OString( pTB->GetItemCommand(pTB->GetItemId( i )) ), (comm_ULONG)WINDOW_BUTTON, TypeString(WINDOW_BUTTON).AppendAscii(": ").Append(aName), FALSE ); if ( !pTB->GetItemCommand(pTB->GetItemId( i )).Len() || ( nConf & DH_MODE_ALLWIN ) ) - pRet->GenReturn ( RET_WinInfo, SmartId( pTB->GetHelpId(pTB->GetItemId( i )) ), (comm_ULONG)WINDOW_BUTTON, + pRet->GenReturn ( RET_WinInfo, rtl::OString( pTB->GetHelpId(pTB->GetItemId( i )) ), (comm_ULONG)WINDOW_BUTTON, TypeString(WINDOW_BUTTON).AppendAscii(": ").Append(aName), FALSE ); + #endif } else { if ( pItemWin ) { + // FIXME: HELPID + #if 0 if ( pTB->GetItemCommand(pTB->GetItemId( i )).Len() || ( nConf & DH_MODE_ALLWIN ) ) - pRet->GenReturn ( RET_WinInfo, SmartId( pTB->GetItemCommand(pTB->GetItemId( i )) ), (comm_ULONG)pItemWin->GetType(), + pRet->GenReturn ( RET_WinInfo, rtl::OString( pTB->GetItemCommand(pTB->GetItemId( i )) ), (comm_ULONG)pItemWin->GetType(), TypeString(pItemWin->GetType()).AppendAscii(": ").Append(aName), FALSE ); if ( !pTB->GetItemCommand(pTB->GetItemId( i )).Len() || ( nConf & DH_MODE_ALLWIN ) ) - pRet->GenReturn ( RET_WinInfo, SmartId( pTB->GetHelpId(pTB->GetItemId( i )) ), (comm_ULONG)pItemWin->GetType(), + pRet->GenReturn ( RET_WinInfo, rtl::OString( pTB->GetHelpId(pTB->GetItemId( i )) ), (comm_ULONG)pItemWin->GetType(), TypeString(pItemWin->GetType()).AppendAscii(": ").Append(aName), FALSE ); USHORT ii; for( ii = 0 ; ii < pItemWin->GetChildCount(); ii++ ) WriteControlData( pItemWin->GetChild(ii), nConf, FALSE ); + #endif } else { @@ -1035,12 +1054,15 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst default: DBG_ERROR1( "Unknown TOOLBOXITEM %i", pTB->GetItemType( i ) ); } + // FIXME: HELPID + #if 0 if ( pTB->GetItemCommand(pTB->GetItemId( i )).Len() || ( nConf & DH_MODE_ALLWIN ) ) - pRet->GenReturn ( RET_WinInfo, SmartId( pTB->GetItemCommand(pTB->GetItemId( i )) ), (comm_ULONG)WINDOW_BASE, + pRet->GenReturn ( RET_WinInfo, rtl::OString( pTB->GetItemCommand(pTB->GetItemId( i )) ), (comm_ULONG)WINDOW_BASE, aToolBoxItemType.AppendAscii(": ").Append(aName), FALSE ); if ( !pTB->GetItemCommand(pTB->GetItemId( i )).Len() || ( nConf & DH_MODE_ALLWIN ) ) - pRet->GenReturn ( RET_WinInfo, SmartId( pTB->GetHelpId(pTB->GetItemId( i )) ), (comm_ULONG)WINDOW_BASE, + pRet->GenReturn ( RET_WinInfo, rtl::OString( pTB->GetHelpId(pTB->GetItemId( i )) ), (comm_ULONG)WINDOW_BASE, aToolBoxItemType.AppendAscii(": ").Append(aName), FALSE ); + #endif } } } @@ -1090,9 +1112,12 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst break; } - pRet->GenReturn ( RET_WinInfo, SmartId( aID ), (comm_ULONG)pBD->GetPushButton( pBD->GetButtonId(i) )->GetType(), // So daß der Text angezeigt wird! + // FIXME: HELPID + #if 0 + pRet->GenReturn ( RET_WinInfo, rtl::OString( aID ), (comm_ULONG)pBD->GetPushButton( pBD->GetButtonId(i) )->GetType(), // So daß der Text angezeigt wird! TypeString(pBD->GetPushButton( pBD->GetButtonId(i) )->GetType()).AppendAscii(": ").Append(aName) .AppendAscii(" ButtonId = ").Append(aID), FALSE ); + #endif } return; // ButtonDialog ist hier schon komplett abgehandelt. @@ -1138,12 +1163,15 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst default: DBG_ERROR1( "Unknown MENUITEM %i", pMenu->GetItemType( i ) ); } + // FIXME: HELPID + #if 0 if ( pMenu->GetItemCommand(nID).Len() || ( nConf & DH_MODE_ALLWIN ) ) - pRet->GenReturn ( RET_WinInfo, SmartId( pMenu->GetItemCommand(nID) ), (comm_ULONG)0, + pRet->GenReturn ( RET_WinInfo, rtl::OString( pMenu->GetItemCommand(nID) ), (comm_ULONG)0, aMenuItemType.AppendAscii(": ").Append(aName), FALSE ); if ( !pMenu->GetItemCommand(nID).Len() || ( nConf & DH_MODE_ALLWIN ) ) - pRet->GenReturn ( RET_WinInfo, SmartId( nID ), (comm_ULONG)0, + pRet->GenReturn ( RET_WinInfo, rtl::OString( nID ), (comm_ULONG)0, aMenuItemType.AppendAscii(": ").Append(aName), FALSE ); + #endif } } @@ -1559,12 +1587,15 @@ BOOL StatementCommand::DisplayHID() if ( GetTTSettings()->Act ) { SET_WIN(GetTTSettings()->Act); + // FIXME: HELPID + #if 0 GetTTSettings()->pDisplayHidWin->SetDisplayText(GetTTSettings()->Act->GetSmartUniqueOrHelpId().GetText().AppendAscii(" WinType: ") .Append(UniString::CreateFromInt64(GetTTSettings()->Act->GetType())).AppendAscii(" ").Append(GetTTSettings()->Act->GetText())); if ( GetTTSettings()->Act && !GetTTSettings()->Act->GetSmartUniqueId().Equals( GetTTSettings()->Act->GetSmartHelpId() ) ) GetTTSettings()->pDisplayHidWin->SetText(UniString( TTProperties::GetSvtResId( TT_ALTERNATE_CAPTION ) ).Append(GetTTSettings()->Act->GetSmartHelpId().GetText())); else GetTTSettings()->pDisplayHidWin->SetText( GetTTSettings()->aOriginalCaption ); + #endif } else GetTTSettings()->pDisplayHidWin->SetDisplayText(CUniString("Kein Window/Control gefunden")); @@ -1574,8 +1605,11 @@ BOOL StatementCommand::DisplayHID() // SET_WIN(GetTTSettings()->Act); if ( GetTTSettings()->pDisplayHidWin->IsDisplayTextModified() && GetTTSettings()->pDisplayHidWin->GetDisplayText().Len() > 0 ) { - GetTTSettings()->Act->SetSmartUniqueId( SmartId( GetTTSettings()->pDisplayHidWin->GetDisplayText().ToInt32() ) ); + // FIXME: HELPID + #if 0 + GetTTSettings()->Act->SetSmartUniqueId( rtl::OString( GetTTSettings()->pDisplayHidWin->GetDisplayText().ToInt32() ) ); GetTTSettings()->pDisplayHidWin->ClearDisplayTextModified(); + #endif } } /* if ( Application::GetLastInputInterval() > 5000 ) // 5 Sekunden lang nix geschehen @@ -2113,7 +2147,7 @@ void StatementCommand::Translate() if( (nParams & PARAM_ULONG_1) && nLNr1 ) { String aDouble; - Window *pWin = SearchTree( SmartId( nLNr1 ) ,FALSE ); + Window *pWin = SearchTree( rtl::OString( nLNr1 ) ,FALSE ); if ( pWin ) { pWin = pWin->GetWindow( WINDOW_OVERLAP ); @@ -2152,14 +2186,16 @@ void StatementCommand::Translate() { Window* pNew = pTranslationWindow->GetWindow( WINDOW_CLIENT ); // Bei Dockingwindoes das kanze Geraffel von Docking Floating überspringen - while ( IsDialog( pNew ) && !pNew->GetSmartUniqueOrHelpId().HasAny() && pNew->GetChildCount() == 1 ) + // FIXME: HELPID + while ( IsDialog( pNew ) && !pNew->GetUniqueOrHelpId().getLength() && pNew->GetChildCount() == 1 ) pNew = pNew->GetChild( 0 ); pTranslationWindow = pNew; } aTranslation = CUniString("0;"); - aTranslation += pTranslationWindow->GetSmartUniqueOrHelpId().GetText(); + // FIXME: HELPID + aTranslation += String(rtl::OStringToOUString( pTranslationWindow->GetUniqueOrHelpId(), RTL_TEXTENCODING_UTF8 )); aTranslation += ';'; aTranslation += TypeString( pTranslationWindow->GetType() ); @@ -2173,7 +2209,8 @@ void StatementCommand::Translate() if ( pParentDialog ) { - aTranslation += pParentDialog->GetSmartUniqueOrHelpId().GetText(); + // FIXME: HELPID + aTranslation += String(rtl::OStringToOUString(pParentDialog->GetUniqueOrHelpId(), RTL_TEXTENCODING_UTF8)); aTranslation += ';'; aTranslation += TypeString( pParentDialog->GetType() ); } @@ -2334,10 +2371,11 @@ BOOL StatementCommand::Execute() +// FIXME: HELPID #if OSL_DEBUG_LEVEL > 1 #define REPORT_WIN_CLOSED(pControl, aInfo) \ _REPORT_WIN_CLOSED(pControl, aInfo) \ - m_pDbgWin->AddText( aInfo.AppendAscii(" \"").Append( pControl->GetText() ).AppendAscii("\" geschlossen, RType = ").Append( TypeString(pControl->GetType()) ).AppendAscii(", UId = ").Append( UIdString(pControl->GetSmartUniqueOrHelpId()) ) ); + m_pDbgWin->AddText( aInfo.AppendAscii(" \"").Append( pControl->GetText() ).AppendAscii("\" geschlossen, RType = ").Append( TypeString(pControl->GetType()) ).AppendAscii(", UId = ").Append( rtl::OStringToOUString( pControl->GetUniqueOrHelpId(), RTL_TEXTENCODING_UTF8) ) ); #else #define REPORT_WIN_CLOSED(pControl, aInfo) _REPORT_WIN_CLOSED(pControl, aInfo) #endif @@ -2345,6 +2383,7 @@ BOOL StatementCommand::Execute() #define REPORT_WIN_CLOSEDc(pControl, aInfo ) \ REPORT_WIN_CLOSED(pControl, CUniString(aInfo) ) +// FIXME: HELPID #define _REPORT_WIN_CLOSED(pControl, aInfo) \ if ( aString1.Len() ) \ aString1 += '\n'; \ @@ -2354,7 +2393,7 @@ BOOL StatementCommand::Execute() aString1.AppendAscii("\" geschlossen, RType = ");\ aString1 += TypeString(pControl->GetType()); \ aString1.AppendAscii(", UId = "); \ - aString1 += UIdString(pControl->GetSmartUniqueOrHelpId()); + aString1 += String(rtl::OStringToOUString(pControl->GetUniqueOrHelpId(), RTL_TEXTENCODING_UTF8)); switch ( nMethodId ) @@ -2387,9 +2426,9 @@ BOOL StatementCommand::Execute() bCatchGPF = TRUE; bUsePostEvents = TRUE; - aSubMenuId1 = SmartId(); - aSubMenuId2 = SmartId(); - aSubMenuId3 = SmartId(); + aSubMenuId1 = rtl::OString(); + aSubMenuId2 = rtl::OString(); + aSubMenuId3 = rtl::OString(); pMenuWindow = NULL; } if ( !nRetryCount ) @@ -2410,12 +2449,14 @@ BOOL StatementCommand::Execute() && pControl->GetType() != WINDOW_BORDERWINDOW && nRetryCount-- ) { - short nRT = ImpGetRType( pControl, pControl->GetSmartUniqueOrHelpId() ); + // FIXME: HELPID + short nRT = ImpGetRType( pControl, pControl->GetUniqueOrHelpId() ); if ( nRT == C_TabControl && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_TABDIALOG ) { // Bei Tabcontrol den zugehörigen Tabdialog nehmen pControl = pControl->GET_REAL_PARENT(); - nRT = ImpGetRType( pControl, pControl->GetSmartUniqueOrHelpId() ); + // FIXME: HELPID + nRT = ImpGetRType( pControl, pControl->GetUniqueOrHelpId() ); } switch( nRT ) @@ -2692,7 +2733,12 @@ BOOL StatementCommand::Execute() else if ( !IsDialog(pWin) ) ReportError( GEN_RES_STR0( S_NO_DIALOG_IN_GETACTIVE ) ); else - pRet->GenReturn( RET_Value, aSmartMethodId, static_cast<comm_ULONG>(pWin->GetSmartUniqueOrHelpId().GetNum())); //GetNum() ULONG != comm_ULONG on 64bit + { + // FIXME: HELPID + #if 0 + pRet->GenReturn( RET_Value, aSmartMethodId, static_cast<comm_ULONG>(pWin->GetUniqueOrHelpId().GetNum())); //GetNum() ULONG != comm_ULONG on 64bit + #endif + } } break; case RC_UseBindings: @@ -2725,7 +2771,7 @@ BOOL StatementCommand::Execute() pProfiler->StartAutoProfiling( nNr1 ); // Der Header ist abhängig vom Modus - pRet->GenReturn( RET_ProfileInfo, SmartId(), pProfiler->GetProfileHeader() ); + pRet->GenReturn( RET_ProfileInfo, rtl::OString(), pProfiler->GetProfileHeader() ); } else if ( nParams & PARAM_USHORT_1 ) { // Partitioning initialisieren: Profile true [,nNr][,nNr][,nNr][,nNr] @@ -2738,32 +2784,32 @@ BOOL StatementCommand::Execute() // Hier werden die Parameter ans Testtool zurück übertragen. // Das ist zwar etwas eigenartig, aber ansonsten müsste man im Testtool // die einfache Struktur der Remotebefehle aufbrechen. - pRet->GenReturn( RET_ProfileInfo, SmartId( S_ProfileReset ), nAnzahl ); + pRet->GenReturn( RET_ProfileInfo, rtl::OString( S_ProfileReset ), nAnzahl ); // Und die einzelnen Grenzen - if ( nParams & PARAM_USHORT_1 ) { pRet->GenReturn( RET_ProfileInfo, SmartId( S_ProfileBorder1 ), (comm_ULONG)nNr1 ); }; - if ( nParams & PARAM_USHORT_2 ) { pRet->GenReturn( RET_ProfileInfo, SmartId( S_ProfileBorder2 ), (comm_ULONG)nNr2 ); }; - if ( nParams & PARAM_USHORT_3 ) { pRet->GenReturn( RET_ProfileInfo, SmartId( S_ProfileBorder3 ), (comm_ULONG)nNr3 ); }; - if ( nParams & PARAM_USHORT_4 ) { pRet->GenReturn( RET_ProfileInfo, SmartId( S_ProfileBorder4 ), (comm_ULONG)nNr4 ); }; + if ( nParams & PARAM_USHORT_1 ) { pRet->GenReturn( RET_ProfileInfo, rtl::OString( S_ProfileBorder1 ), (comm_ULONG)nNr1 ); }; + if ( nParams & PARAM_USHORT_2 ) { pRet->GenReturn( RET_ProfileInfo, rtl::OString( S_ProfileBorder2 ), (comm_ULONG)nNr2 ); }; + if ( nParams & PARAM_USHORT_3 ) { pRet->GenReturn( RET_ProfileInfo, rtl::OString( S_ProfileBorder3 ), (comm_ULONG)nNr3 ); }; + if ( nParams & PARAM_USHORT_4 ) { pRet->GenReturn( RET_ProfileInfo, rtl::OString( S_ProfileBorder4 ), (comm_ULONG)nNr4 ); }; pProfiler->StartPartitioning(); } else if( nParams == PARAM_STR_1 ) // Genau ein String! { // Nur einen String ins Profiling aufnehmen aString1 += '\n'; - pRet->GenReturn( RET_ProfileInfo, SmartId(), aString1 ); + pRet->GenReturn( RET_ProfileInfo, rtl::OString(), aString1 ); } else { // Normales Profiling je Kommando: profile if ( pProfiler->IsAutoProfiling() ) { - pRet->GenReturn( RET_ProfileInfo, SmartId(), pProfiler->GetAutoProfiling() ); + pRet->GenReturn( RET_ProfileInfo, rtl::OString(), pProfiler->GetAutoProfiling() ); pProfiler->StopAutoProfiling(); } pProfiler->StartProfilingPerCommand(); // Der Header ist abhängig vom Modus - pRet->GenReturn( RET_ProfileInfo, SmartId(), pProfiler->GetProfileHeader() ); + pRet->GenReturn( RET_ProfileInfo, rtl::OString(), pProfiler->GetProfileHeader() ); } } else // Profiling wieder ausschalten: Profile false @@ -2774,13 +2820,13 @@ BOOL StatementCommand::Execute() if ( pProfiler->IsAutoProfiling() ) { - pRet->GenReturn( RET_ProfileInfo, SmartId(), pProfiler->GetAutoProfiling() ); + pRet->GenReturn( RET_ProfileInfo, rtl::OString(), pProfiler->GetAutoProfiling() ); pProfiler->StopAutoProfiling(); } if ( pProfiler->IsPartitioning() ) { - pRet->GenReturn( RET_ProfileInfo, SmartId( S_ProfileDump ), (comm_ULONG)0 ); + pRet->GenReturn( RET_ProfileInfo, rtl::OString( S_ProfileDump ), (comm_ULONG)0 ); pProfiler->StopPartitioning(); } @@ -2944,12 +2990,15 @@ BOOL StatementCommand::Execute() { if ( pMenu->GetPopupMenu(nNr1) ) { + // FIXME: HELPID + #if 0 if ( !aSubMenuId1.GetNum() ) - aSubMenuId1 = SmartId(nNr1); + aSubMenuId1 = rtl::OString(nNr1); else if ( !aSubMenuId2.GetNum() ) - aSubMenuId2 = SmartId(nNr1); + aSubMenuId2 = rtl::OString(nNr1); else if ( !aSubMenuId3.GetNum() ) - aSubMenuId3 = SmartId(nNr1); + aSubMenuId3 = rtl::OString(nNr1); + #endif if ( pPopup ) pPopup->SelectEntry(nNr1); @@ -2961,17 +3010,17 @@ BOOL StatementCommand::Execute() if ( pPopup ) { pPopup->EndExecute(nNr1); - aSubMenuId1 = SmartId(); - aSubMenuId2 = SmartId(); - aSubMenuId3 = SmartId(); + aSubMenuId1 = rtl::OString(); + aSubMenuId2 = rtl::OString(); + aSubMenuId3 = rtl::OString(); pMenuWindow = NULL; } else { pMenuBar->SelectEntry(nNr1); - aSubMenuId1 = SmartId(); - aSubMenuId2 = SmartId(); - aSubMenuId3 = SmartId(); + aSubMenuId1 = rtl::OString(); + aSubMenuId2 = rtl::OString(); + aSubMenuId3 = rtl::OString(); pMenuWindow = NULL; } } @@ -3582,13 +3631,14 @@ StatementControl::StatementControl( SCmdStream *pCmdIn, USHORT nControlIdType ) { comm_ULONG nId; pCmdIn->Read( nId ); - aUId = SmartId( nId ); + aUId = rtl::OString( nId ); } else if ( nControlIdType == SIStringControl ) { String aId; pCmdIn->Read( aId ); - aUId = SmartId( aId ); + // FIXME: HELPID + aUId = rtl::OUStringToOString( aId, RTL_TEXTENCODING_UTF8 ); } else { @@ -3697,11 +3747,14 @@ static Window*ImpGetButton( Window *pBase, WinBits nMask, WinBits nWinBits ) BOOL StatementControl::ControlOK( Window *pControl, const sal_Char* cBezeichnung ) { + // FIXME: HELPID + #if 0 if ( pControl && ( ( ( IsAccessable(pControl) || (nMethodId & M_WITH_RETURN) ) && pControl->IsVisible() ) || aUId.Matches( UID_ACTIVE ) ) ) return TRUE; else + #endif { UniString aBezeichnung( cBezeichnung, RTL_TEXTENCODING_ASCII_US ); if ( aBezeichnung.Len() > 0 ) @@ -3722,7 +3775,7 @@ BOOL StatementControl::ControlOK( Window *pControl, const sal_Char* cBezeichnung } -BOOL StatementList::ValueOK( SmartId aId, String aBezeichnung, ULONG nValue, ULONG nMax ) +BOOL StatementList::ValueOK( rtl::OString aId, String aBezeichnung, ULONG nValue, ULONG nMax ) { if ( nMax < nValue ) @@ -3756,6 +3809,8 @@ USHORT StatementList::GetCurrentMenues( PopupMenu *&pPopup, MenuBar *&pMenuBar, if ( !pMenu ) return 1; + // FIXME: HELPID + #if 0 if ( aSubMenuId1.GetNum() ) { pPopup = pMenu->GetPopupMenu( @@ -3776,6 +3831,7 @@ USHORT StatementList::GetCurrentMenues( PopupMenu *&pPopup, MenuBar *&pMenuBar, sal::static_int_cast< USHORT >(aSubMenuId3.GetNum())); pMenu = pPopup; } + #endif return 0; } @@ -4016,7 +4072,10 @@ BOOL StatementControl::HandleVisibleControls( Window *pControl ) default: return FALSE; } + // FIXME: HELPID + #if 0 SendProfile( UIdString( aUId ).Append('.').Append( MethodString( nMethodId ) ) ); + #endif return TRUE; } return FALSE; @@ -4301,9 +4360,9 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) break; case M_OpenContextMenu: { - aSubMenuId1 = SmartId(); - aSubMenuId2 = SmartId(); - aSubMenuId3 = SmartId(); + aSubMenuId1 = rtl::OString(); + aSubMenuId2 = rtl::OString(); + aSubMenuId3 = rtl::OString(); pMenuWindow = NULL; Point aPos; ToolBox* pTB = (ToolBox*)pControl; @@ -4337,9 +4396,9 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) break; case M_UseMenu: { - aSubMenuId1 = SmartId(); - aSubMenuId2 = SmartId(); - aSubMenuId3 = SmartId(); + aSubMenuId1 = rtl::OString(); + aSubMenuId2 = rtl::OString(); + aSubMenuId3 = rtl::OString(); pMenuWindow = NULL; while ( pControl && !( ( pControl->GetType() == WINDOW_SYSWINDOW || pControl->GetType() == WINDOW_WORKWINDOW ) && ControlOK( pControl, "" ) ) ) @@ -4430,7 +4489,10 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) default: ReportError( aUId, GEN_RES_STR1( S_INTERNAL_ERROR, MethodString( nMethodId ) ) ); } + // FIXME: HELPID + #if 0 SendProfile( UIdString( aUId ).Append('.').Append( MethodString( nMethodId ) ) ); + #endif } break; case M_StatusGetText: @@ -4585,9 +4647,12 @@ BOOL StatementControl::Execute() #endif + // FIXME: HELPID + #if 0 if ( aUId.Matches( UID_ACTIVE ) ) pControl = GetAnyActive(); else + #endif { BOOL bSearchButtonOnToolbox = (nParams == PARAM_NONE) && ((M_Click == nMethodId) || (M_TearOff == nMethodId) || (M_IsEnabled == nMethodId) || (M_OpenMenu == nMethodId)); bSearchButtonOnToolbox |= (nParams == PARAM_USHORT_1) && (M_GetState == nMethodId); @@ -4606,6 +4671,8 @@ BOOL StatementControl::Execute() if ( pControl && pControl->GetType() == WINDOW_TOOLBOX ) { + // FIXME: HELPID + #if 0 if ( !aUId.Matches( pControl->GetSmartUniqueOrHelpId() ) ) { // Also wenn wir irgendwas auf einer Toolbox gefunden haben switch ( nMethodId ) @@ -4622,6 +4689,7 @@ BOOL StatementControl::Execute() pControl = NULL; } } + #endif } @@ -4808,22 +4876,27 @@ BOOL StatementControl::Execute() } break; case M_GetPage: + // FIXME: HELPID + #if 0 pRet->GenReturn ( RET_Value, aUId, ((TabControl*)pControl)->GetTabPage(((TabControl*)pControl)->GetCurPageId())->GetSmartUniqueOrHelpId().GetText()); + #endif break; case M_SetPage : { // Wegen lokaler Variablen + // FIXME: HELPID + #if 0 TabControl *pTControl = ((TabControl*)pControl); USHORT nActive = pTControl->GetCurPageId(); USHORT i,anz; - SmartId aID; - SmartId aWantedID; + rtl::OString aID; + rtl::OString aWantedID; if ( (nParams & PARAM_ULONG_1) ) { - aWantedID = SmartId( nLNr1 ); + aWantedID = rtl::OString( nLNr1 ); } else if ( (nParams & PARAM_STR_1) ) { - aWantedID = SmartId( aString1 ); + aWantedID = rtl::OString( aString1 ); } else ReportError( aUId, GEN_RES_STR1( S_INTERNAL_ERROR, MethodString( nMethodId ) ) ); @@ -4852,6 +4925,7 @@ BOOL StatementControl::Execute() pTControl->ActivatePage();*/ ReportError( aWantedID, GEN_RES_STR1( S_TABPAGE_NOT_FOUND, MethodString( nMethodId ) ) ); } + #endif } break; default: @@ -5279,9 +5353,9 @@ BOOL StatementControl::Execute() ImplMouseButtonUp ( pControl, aMEvnt, FORCE_DIRECT_CALL ); - aSubMenuId1 = SmartId(); - aSubMenuId2 = SmartId(); - aSubMenuId3 = SmartId(); + aSubMenuId1 = rtl::OString(); + aSubMenuId2 = rtl::OString(); + aSubMenuId3 = rtl::OString(); pMenuWindow = NULL; } break; @@ -5293,7 +5367,9 @@ BOOL StatementControl::Execute() case C_ToolBox: { ToolBox *pTB = ((ToolBox*)pControl); - if ( !aUId.Matches( pTB->GetSmartUniqueOrHelpId() ) ) // Also Button auf der ToolBox gefunden + // FIXME: HELPID + #if 0 + if ( !aUId.Matches( pTB->GetUniqueOrHelpId() ) ) // Also Button auf der ToolBox gefunden { if ( (nParams == PARAM_NONE) || (nParams == PARAM_USHORT_1) ) { // Wir fälschen einen Parameter @@ -5312,19 +5388,21 @@ BOOL StatementControl::Execute() else ReportError( aUId, GEN_RES_STR1( S_INTERNAL_ERROR, MethodString( nMethodId ) ) ); } + #endif +// FIXME: HELPID #define FIND_ITEM\ USHORT nItemPos = 0;\ BOOL bItemFound = FALSE;\ {\ - SmartId aButtonId;\ + rtl::OString aButtonId;\ if( nParams == PARAM_STR_1 )\ - aButtonId = SmartId( aString1 );\ + aButtonId = rtl::OString( rtl::OUStringToOString( aString1, RTL_TEXTENCODING_UTF8 ) );\ if( nParams == PARAM_ULONG_1 )\ - aButtonId = SmartId( nLNr1 );\ - for ( nItemPos = 0; nItemPos < pTB->GetItemCount() && !aButtonId.Matches(pTB->GetItemCommand(pTB->GetItemId(nItemPos))) &&\ - !aButtonId.Matches(pTB->GetHelpId(pTB->GetItemId(nItemPos))) ; nItemPos++ ) {}\ - bItemFound = aButtonId.Matches(pTB->GetItemCommand(pTB->GetItemId(nItemPos))) || aButtonId.Matches(pTB->GetHelpId(pTB->GetItemId(nItemPos)));\ + aButtonId = rtl::OString( ""/*nLNr1*/ );\ + for ( nItemPos = 0; nItemPos < pTB->GetItemCount() && 1/*!aButtonId.Matches(pTB->GetItemCommand(pTB->GetItemId(nItemPos)))*/ &&\ + 1/*!aButtonId.Matches(pTB->GetHelpId(pTB->GetItemId(nItemPos)))*/ ; nItemPos++ ) {}\ + bItemFound = 1/*aButtonId.Matches(pTB->GetItemCommand(pTB->GetItemId(nItemPos)))*/ || 1/*aButtonId.Matches(pTB->GetHelpId(pTB->GetItemId(nItemPos)))*/;\ if ( !bItemFound )\ ReportError( aUId, GEN_RES_STR1( S_HELPID_ON_TOOLBOX_NOT_FOUND, MethodString( nMethodId ) ) );\ else\ @@ -5386,9 +5464,9 @@ BOOL StatementControl::Execute() MouseEvent aMEvnt(aRect.Center(),1,MOUSE_SIMPLECLICK,MOUSE_LEFT); ImplMouseButtonDown( pTB, aMEvnt );*/ - aSubMenuId1 = SmartId(); - aSubMenuId2 = SmartId(); - aSubMenuId3 = SmartId(); + aSubMenuId1 = rtl::OString(); + aSubMenuId2 = rtl::OString(); + aSubMenuId3 = rtl::OString(); pMenuWindow = NULL; new StatementCommand( this, RC_MenuSelect, PARAM_USHORT_1, pTB->GetItemId(nItemPos) + TOOLBOX_MENUITEM_START ); @@ -5451,9 +5529,9 @@ BOOL StatementControl::Execute() ImplMouseButtonUp( pTB, aMEvnt); // Das Fenster ist offen. - aSubMenuId1 = SmartId(); - aSubMenuId2 = SmartId(); - aSubMenuId3 = SmartId(); + aSubMenuId1 = rtl::OString(); + aSubMenuId2 = rtl::OString(); + aSubMenuId3 = rtl::OString(); pMenuWindow = NULL; } } @@ -5475,7 +5553,10 @@ BOOL StatementControl::Execute() switch (nNr1) { case 0: + // FIXME: HELPID + #if 0 pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pTB->GetHelpId(pTB->GetItemId(nItemPos))); + #endif break; case 1: pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pTB->GetItemType(nItemPos)); @@ -6194,7 +6275,10 @@ protected: break; case M_Close: //aWindowWaitUId = aUId; - DBG_ASSERT( aUId.Matches( pControl->GetSmartUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); + // FIXME: HELPID + #if 0 + DBG_ASSERT( aUId.Matches( pControl->GetUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); + #endif SET_WINP_CLOSING(pControl); ((DockingWindow*)pControl)->Close(); break; @@ -6270,7 +6354,10 @@ protected: break; } case M_Close: - DBG_ASSERT( aUId.Matches( pControl->GetSmartUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); + // FIXME_ HELPID + #if 0 + DBG_ASSERT( aUId.Matches( pControl->GetUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); + #endif SET_WINP_CLOSING(pControl); ((FloatingWindow*)pControl)->Close(); break; @@ -6293,7 +6380,10 @@ protected: AnimateMouse( pControl, MitteOben); break; case M_Close: + // FIXME: HELPID + #if 0 DBG_ASSERT( aUId.Matches( pControl->GetSmartUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); + #endif SET_WINP_CLOSING(pControl); ((SystemWindow*)pControl)->Close(); break; @@ -6302,7 +6392,10 @@ protected: Window *pChild = GetWinByRT( pControl, WINDOW_OKBUTTON ); if( ControlOK( pChild, "OK Button" ) ) { + // FIXME: HELPID + #if 0 DBG_ASSERT( aUId.Matches( pControl->GetSmartUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); + #endif SET_WINP_CLOSING(pControl); ((Button*)pChild)->Click(); } @@ -6313,7 +6406,10 @@ protected: Window *pChild = GetWinByRT( pControl, WINDOW_CANCELBUTTON ); if( ControlOK( pChild, "Cancel Button" ) ) { + // FIXME: HELPID + #if 0 DBG_ASSERT( aUId.Matches( pControl->GetSmartUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); + #endif SET_WINP_CLOSING(pControl); ((Button*)pChild)->Click(); } @@ -6350,7 +6446,10 @@ protected: AnimateMouse( pControl, MitteOben); break; case M_Close: + // FIXME: HELPID + #if 0 DBG_ASSERT( aUId.Matches( pControl->GetSmartUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); + #endif SET_WINP_CLOSING(pControl); ((WorkWindow*)pControl)->Close(); break; @@ -6575,7 +6674,10 @@ protected: #endif if ( bStatementDone ) { + // FIXME: HELPID + #if 0 SendProfile( UIdString( aUId ).Append('.').Append( MethodString( nMethodId ) ) ); + #endif delete this; } else diff --git a/automation/source/server/statemnt.hxx b/automation/source/server/statemnt.hxx index 1a3efa9df..93992d979 100644 --- a/automation/source/server/statemnt.hxx +++ b/automation/source/server/statemnt.hxx @@ -54,7 +54,6 @@ #include <basic/sbstar.hxx> #include <vcl/event.hxx> #include <com/sun/star/beans/PropertyValue.hpp> -#include <vcl/smartid.hxx> #include <automation/commtypes.hxx> class Window; @@ -241,7 +240,7 @@ public: protected: static Window* SearchClientWin( Window *pBase, Search &aSearch, BOOL MaybeBase = TRUE ); - Window* SearchTree( SmartId aUId, BOOL bSearchButtonOnToolbox = FALSE ); + Window* SearchTree( rtl::OString aUId, BOOL bSearchButtonOnToolbox = FALSE ); Window* GetActive( WindowType nRT, BOOL MaybeBase = TRUE ); Window* GetFocus( WindowType nRT, BOOL MaybeBase = TRUE ); Window* GetAnyActive( BOOL MaybeBase = TRUE ); @@ -253,7 +252,7 @@ protected: Window* GetDocWin( USHORT nNr ); USHORT GetDocWinCount(); Window* GetFadeSplitWin( Window *pBase, WindowAlign nAlign, BOOL MaybeBase = TRUE ); - BOOL ValueOK(SmartId nId, String aBezeichnung, ULONG nValue, ULONG nMax); + BOOL ValueOK(rtl::OString nId, String aBezeichnung, ULONG nValue, ULONG nMax); USHORT GetCurrentMenues( PopupMenu *&pPopup, MenuBar *&pMenuBar, Menu *&pMenu ); @@ -274,7 +273,7 @@ public: ***************************************************************************/ void ReportError(String aMessage); - void ReportError(SmartId aUId, String aMessage); + void ReportError(rtl::OString aUId, String aMessage); void ReportError(String aMessage, ULONG nWhatever); static void DirectLog( ULONG nType, String aString ); @@ -285,18 +284,18 @@ public: StatementList *pNext; static StatementList /**pCurrent,*/ *pFirst; static BOOL bReadingCommands; - static SmartId aWindowWaitUId; + static rtl::OString aWindowWaitUId; static Window *pWindowWaitPointer; - static SmartId aWindowWaitOldHelpId; - static SmartId aWindowWaitOldUniqueId; + static rtl::OString aWindowWaitOldHelpId; + static rtl::OString aWindowWaitOldUniqueId; static RetStream *pRet; static BOOL IsError; static BOOL bDying; static BOOL bExecuting; // Gesetzt, wenn ein Befehl rescheduled ohne einen neuen Befehl zu erlauben BOOL bWasExecuting; // Wurde bei einem MaybeResetSafeReschedule resettet, so wird der Zustand danach wiederhergestellt - static SmartId aSubMenuId1; // Untermenüs bei PopupMenus - static SmartId aSubMenuId2; // erstmal 2-Stufig - static SmartId aSubMenuId3; // and now even 3 levels #i31512# + static rtl::OString aSubMenuId1; // Untermenüs bei PopupMenus + static rtl::OString aSubMenuId2; // erstmal 2-Stufig + static rtl::OString aSubMenuId3; // and now even 3 levels #i31512# static SystemWindow *pMenuWindow; // when using MenuBar as base for MenuCommands static TTProperties *pTTProperties; // Hier stehen die SlotIDs aus dem SFX drin @@ -350,7 +349,7 @@ class StatementCommand : public StatementList // Befehl ausführen (wintree, rese friend class ImplRemoteControl; protected: USHORT nMethodId; - SmartId aSmartMethodId; + rtl::OString aSmartMethodId; USHORT nParams; comm_USHORT nNr1,nNr2,nNr3,nNr4; comm_ULONG nLNr1; @@ -385,7 +384,7 @@ enum TTHotSpots { MitteLinks, Mitte, MitteOben }; class StatementControl : public StatementList { protected: - SmartId aUId; + rtl::OString aUId; USHORT nMethodId; USHORT nParams; comm_USHORT nNr1,nNr2,nNr3,nNr4; @@ -436,10 +435,10 @@ class SearchUID : public Search { Window *pMaybeResult; Window *pAlternateResult; - SmartId aUId; + rtl::OString aUId; BOOL bSearchButtonOnToolbox; public: - SearchUID( SmartId aUIdP, BOOL bSearchButtonOnToolboxP ): Search( SEARCH_FOCUS_FIRST ), pMaybeResult(NULL), pAlternateResult(NULL), aUId(aUIdP), bSearchButtonOnToolbox(bSearchButtonOnToolboxP) {} + SearchUID( rtl::OString aUIdP, BOOL bSearchButtonOnToolboxP ): Search( SEARCH_FOCUS_FIRST ), pMaybeResult(NULL), pAlternateResult(NULL), aUId(aUIdP), bSearchButtonOnToolbox(bSearchButtonOnToolboxP) {} virtual BOOL IsWinOK( Window *pWin ); Window* GetMaybeWin() { return pMaybeResult; } Window* GetAlternateResultWin() { return pAlternateResult; } diff --git a/automation/source/testtool/cmdstrm.cxx b/automation/source/testtool/cmdstrm.cxx index 755ca1fac..6b2f7ac98 100644 --- a/automation/source/testtool/cmdstrm.cxx +++ b/automation/source/testtool/cmdstrm.cxx @@ -98,11 +98,12 @@ String CmdStream::WandleKeyEventString( String aKeys ) { Token = Work.GetToken(0,' '); Work.Erase(0,Token.Len()+1); - ControlDef WhatName(Token,SmartId()); + ControlDef WhatName(Token,rtl::OString()); USHORT nElement; if (pKeyCodes->Seek_Entry(&WhatName,&nElement)) { - USHORT nCode = (USHORT) pKeyCodes->GetObject(nElement)->pData->aUId.GetNum(); + // FIXME: HELPID + USHORT nCode = 0;//(USHORT) pKeyCodes->GetObject(nElement)->pData->aUId.GetNum(); if ( nCode >= KEY_SHIFT ) nModify ^= nCode; else diff --git a/automation/source/testtool/cretstrm.hxx b/automation/source/testtool/cretstrm.hxx index 4f5b3b0d9..4ccd65cbd 100644 --- a/automation/source/testtool/cretstrm.hxx +++ b/automation/source/testtool/cretstrm.hxx @@ -45,7 +45,7 @@ public: void Read ( comm_USHORT &nNr ){CmdBaseStream::Read ( nNr );} void Read ( comm_ULONG &nNr ){CmdBaseStream::Read ( nNr );} // void Read ( comm_UniChar* &aString, comm_USHORT &nLenInChars ){CmdBaseStream::Read ( aString, nLenInChars );} - virtual void Read ( SmartId* &pId ){CmdBaseStream::Read ( pId );} + virtual void Read ( rtl::OString* &pId ){CmdBaseStream::Read ( pId );} void Read ( comm_BOOL &bBool ){CmdBaseStream::Read ( bBool );} // new void Read( String &aString ); diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx index e2f861438..2e0b23748 100644 --- a/automation/source/testtool/objtest.cxx +++ b/automation/source/testtool/objtest.cxx @@ -137,7 +137,7 @@ CErrors *TestToolObj::pFehlerListe = NULL; // Hier werden die Fehler des Testto DBG_NAME( ControlItem ) DBG_NAME( ControlDef ) -ControlItem::ControlItem( const sal_Char *Name, SmartId aUIdP ) +ControlItem::ControlItem( const sal_Char *Name, rtl::OString aUIdP ) { DBG_CTOR(ControlItem,0); InitData(); @@ -145,7 +145,7 @@ DBG_CTOR(ControlItem,0); pData->aUId = aUIdP; } -ControlItem::ControlItem( const String &Name, SmartId aUIdP ) +ControlItem::ControlItem( const String &Name, rtl::OString aUIdP ) { DBG_CTOR(ControlItem,0); InitData(); @@ -196,7 +196,7 @@ ControlSon::~ControlSon() } } -ControlItemSon::ControlItemSon(const String &Name, SmartId aUIdP ) +ControlItemSon::ControlItemSon(const String &Name, rtl::OString aUIdP ) : ControlItem( Name, aUIdP ) {} @@ -226,6 +226,8 @@ BOOL ControlDef::operator == (const ControlItem &rPar) void ControlDef::Write( SvStream &aStream ) { + // FIXME: HELPID + #if 0 if ( pSons ) aStream.WriteByteString( String('*').Append( pData->Kurzname ), RTL_TEXTENCODING_UTF8 ); else @@ -238,9 +240,10 @@ void ControlDef::Write( SvStream &aStream ) if ( pSons ) for ( USHORT i = 0 ; pSons->Count() > i ; i++ ) ((ControlDef*)(*pSons)[i])->Write(aStream); + #endif } -ControlDef::ControlDef(const String &Name, SmartId aUIdP ) +ControlDef::ControlDef(const String &Name, rtl::OString aUIdP ) : ControlItemSon( Name, aUIdP) { DBG_CTOR(ControlDef,0); @@ -292,7 +295,7 @@ BOOL ControlItemUId::operator == (const ControlItem &rPar) SV_IMPL_OP_PTRARR_SORT( CNames, ControlItem* ) -void CRevNames::Insert( String aName, SmartId aUId, ULONG nSeq ) +void CRevNames::Insert( String aName, rtl::OString aUId, ULONG nSeq ) { ControlItem *pRN = new ReverseName(aName,aUId,nSeq); USHORT nPos; @@ -307,7 +310,7 @@ void CRevNames::Insert( String aName, SmartId aUId, ULONG nSeq ) } -String CRevNames::GetName( SmartId aUId ) +String CRevNames::GetName( rtl::OString aUId ) { ReverseName *pRN = new ReverseName(UniString(),aUId,0); USHORT nPos; @@ -318,10 +321,15 @@ String CRevNames::GetName( SmartId aUId ) return GetObject(nPos)->pData->Kurzname; else { + // FIXME: HELPID + #if 0 if ( aUId.Matches( UID_ACTIVE ) ) return CUniString("Active"); else return GEN_RES_STR1( S_NAME_NOT_THERE, aUId.GetText() ); + #else + return String(); + #endif } } @@ -686,7 +694,12 @@ void TestToolObj::InitTestToolObj() SbxTransportMethod *pMeth = new SbxTransportMethod( SbxVARIANT ); pMeth->SetName( pRCommands->GetObject( i )->pData->Kurzname ); pMeth->SetUserData( ID_RemoteCommand ); + // FIXME: HELPID + #if 0 pMeth->nValue = pRCommands->GetObject( i )->pData->aUId.GetNum(); + #else + pMeth->nValue = 0; + #endif Insert( pMeth ); StartListening( pMeth->GetBroadcaster(), TRUE ); } @@ -866,7 +879,7 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, B SvFileStream Stream; String aLine,aShortname,aLongname; - SmartId aUId; + rtl::OString aUId; xub_StrLen nLineNr; USHORT nElement; ControlDef *pNewDef, *pNewDef2; @@ -884,7 +897,7 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, B ReadFlat( aFileName ,pUIds, TRUE ); if ( !pUIds ) return; - pNewDef = new ControlDef("Active",SmartId(0)); + pNewDef = new ControlDef("Active",rtl::OString()); const ControlItem *pItem = pNewDef; if (! pUIds->Insert(pItem)) { @@ -986,7 +999,7 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, B if ( aShortname.GetChar(0) == '+' ) // Kompletten Eintrag kopieren { aShortname.Erase(0,1); - ControlDef WhatName(aLongname,SmartId()); + ControlDef WhatName(aLongname,rtl::OString()); ControlDef *OldTree; if (pNames->Seek_Entry(&WhatName,&nElement)) { @@ -1015,11 +1028,15 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, B else { + // FIXME: HELPID + #if 0 if (aShortname.CompareIgnoreCaseToAscii("*Active") == COMPARE_EQUAL) - aUId = SmartId( UID_ACTIVE ); - else if ( !bUnoName && !bMozillaName ) + aUId = rtl::OString( UID_ACTIVE ); + else + #endif + if ( !bUnoName && !bMozillaName ) { // Bestimmen der ID aus der Hid.Lst - ControlDef WhatName(aLongname,SmartId()); + ControlDef WhatName(aLongname,rtl::OString()); if (pUIds->Seek_Entry(&WhatName,&nElement)) aUId = pUIds->GetObject(nElement)->pData->aUId; else @@ -1030,14 +1047,17 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, B } else { + // FIXME: HELPID + #if 0 if ( bUnoName ) - aUId = SmartId( aLongname ); + aUId = rtl::OString( aLongname ); else if ( bMozillaName ) - aUId = SmartId( aLongname ); + aUId = rtl::OString( aLongname ); else { DBG_ERROR("Unknown URL schema"); } + #endif } @@ -1121,7 +1141,7 @@ void TestToolObj::ReadFlat( String Filename, CNames *&pNames, BOOL bSortByName ) { SvFileStream Stream; String aLine,aLongname; - SmartId aUId; + rtl::OString aUId; xub_StrLen nLineNr; ControlItem *pNewItem; USHORT nDoubleCount = 0; @@ -1162,7 +1182,7 @@ void TestToolObj::ReadFlat( String Filename, CNames *&pNames, BOOL bSortByName ) } aLongname = aLine.GetToken(0,cMyDelim); - aUId = SmartId( (ULONG)aLine.GetToken(1,cMyDelim).ToInt64() ); + aUId = rtl::OString( (ULONG)aLine.GetToken(1,cMyDelim).ToInt64() ); if ( bSortByName ) pNewItem = new ControlDef( aLongname, aUId ); @@ -1211,7 +1231,7 @@ void ReadFlatArray( const ControlDefLoad arWas [], CNames *&pNames ) while ( String::CreateFromAscii(arWas[nIndex].Kurzname).Len() > 0 ) { - SmartId aUId (arWas[nIndex].nUId); + rtl::OString aUId (arWas[nIndex].nUId); const ControlItem *pX = new ControlDef( arWas[nIndex].Kurzname, aUId); pNames->C40_PTR_INSERT(ControlItem, pX); nIndex++; @@ -1472,7 +1492,7 @@ BOOL TestToolObj::ReadNamesBin( String Filename, CNames *&pSIds, CNames *&pContr { SvFileStream aStream; String aName,aURL; - SmartId aUId; + rtl::OString aUId; ControlDef *pNewDef, *pNewDef2; ControlDef *pFatherDef = NULL; @@ -1510,13 +1530,16 @@ BOOL TestToolObj::ReadNamesBin( String Filename, CNames *&pSIds, CNames *&pContr { String aStrId; aStream.ReadByteString( aStrId, RTL_TEXTENCODING_UTF8 ); - aUId = SmartId( aStrId ); + // FIXME: HELPID + #if 0 + aUId = rtl::OString( aStrId ); + #endif } else { comm_ULONG nUId; aStream >> nUId; - aUId = SmartId( nUId ); + aUId = rtl::OString( nUId ); } if (aName.GetChar(0) == '*' || bIsFlat ) // Globaler Kurzname (Dialogname oder SId) @@ -1661,7 +1684,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, USHORT nElement; SbxVariableRef pArg = rPar->Get( 1 ); String aKontext = pArg->GetString(); - ControlDef WhatName(aKontext,SmartId()); + ControlDef WhatName(aKontext,rtl::OString()); if (m_pControls && m_pControls->Seek_Entry(&WhatName,&nElement)) { m_pNameKontext = ((ControlDef*)m_pControls->GetObject(nElement))->GetSons(); @@ -2154,7 +2177,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, ((Controls*)pVar)->PutULong( ((Controls*)pVar)->pMethodVar->GetULong() ); ((Controls*)pVar)->pMethodVar->SetUserData(ID_Control); - pShortNames->Insert( CUniString("xxx"), SmartId( ((Controls*)pVar)->pMethodVar->nValue ), nSequence ); + pShortNames->Insert( CUniString("xxx"), rtl::OString( ((Controls*)pVar)->pMethodVar->nValue ), nSequence ); nOldValue = ((Controls*)pVar)->GetULong(); @@ -2193,7 +2216,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, if ( !IsError() && ((SbxTransportMethod*)pVar)->nValue & M_WITH_RETURN ) { pImpl->pNextReturn = ((SbxTransportMethod*)pVar); - aNextReturnId = SmartId( ((SbxTransportMethod*)pVar)->nValue ); + aNextReturnId = rtl::OString( ((SbxTransportMethod*)pVar)->nValue ); } if ( SingleCommandBlock ) EndBlock(); @@ -2266,13 +2289,16 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, { In->GenCmdControl (pMember->GetULong(), (USHORT)((SbxTransportMethod*)pVar)->nValue, rPar); - aNextReturnId = SmartId( pMember->GetULong() ); + aNextReturnId = rtl::OString( pMember->GetULong() ); } else { In->GenCmdControl (pMember->GetString(), (USHORT)((SbxTransportMethod*)pVar)->nValue, rPar); - aNextReturnId = SmartId( pMember->GetString() ); + // FIXME: HELPID + #if 0 + aNextReturnId = rtl::OString( pMember->GetString() ); + #endif } } @@ -2283,7 +2309,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, else { pImpl->pNextReturn = NULL; - aNextReturnId = SmartId(); + aNextReturnId = rtl::OString(); } } @@ -2839,7 +2865,7 @@ SbxVariable* TestToolObj::Find( const String& aStr, SbxClassType aType) { USHORT nElement; - ControlDef *pWhatName = new ControlDef(aStr,SmartId()); + ControlDef *pWhatName = new ControlDef(aStr,rtl::OString()); /// nach Controls suchen if (m_pNameKontext && m_pNameKontext->Seek_Entry(pWhatName,&nElement)) @@ -2854,9 +2880,12 @@ SbxVariable* TestToolObj::Find( const String& aStr, SbxClassType aType) // Will be set on method-child further down + // FIXME: HELPID + #if 0 if ( pWhatName->pData->aUId.HasNumeric() ) pImpl->pControlsObj->SetUserData( ID_Control ); else + #endif pImpl->pControlsObj->SetUserData( ID_StringControl ); pShortNames->Insert(pWhatName->pData->Kurzname,pWhatName->pData->aUId,nSequence); @@ -2869,10 +2898,13 @@ SbxVariable* TestToolObj::Find( const String& aStr, SbxClassType aType) pImpl->pControlsObj->SetDfltProperty(pID); pMember = pID; } + // FIXME: HELPID + #if 0 if ( pWhatName->pData->aUId.HasNumeric() ) pMember->PutULong(pWhatName->pData->aUId.GetNum()); else pMember->PutString(pWhatName->pData->aUId.GetStr()); + #endif pMember = pImpl->pControlsObj->Find(CUniString("name"),SbxCLASS_DONTCARE); if ( pMember != NULL ) @@ -2892,6 +2924,8 @@ SbxVariable* TestToolObj::Find( const String& aStr, SbxClassType aType) pWhatName = ( (ControlDef*)m_pSIds->GetObject( nElement ) ); pMyVar->SetName( pWhatName->pData->Kurzname ); + // FIXME: HELPID + #if 0 if ( pWhatName->pData->aUId.HasNumeric() ) { pMyVar->SetUserData( ID_Dispatch ); @@ -2903,6 +2937,7 @@ SbxVariable* TestToolObj::Find( const String& aStr, SbxClassType aType) pMyVar->SetUserData( ID_UNODispatch ); pMyVar->aUnoSlot = pWhatName->pData->aUId.GetStr(); } + #endif return pMyVar; } @@ -2910,7 +2945,7 @@ SbxVariable* TestToolObj::Find( const String& aStr, SbxClassType aType) if ( aStr.Copy( aStr.Len()-3, 3 ).CompareIgnoreCaseToAscii("_ID") == COMPARE_EQUAL && m_pSIds ) { delete pWhatName; - pWhatName = new ControlDef( aStr.Copy( 0, aStr.Len()-3 ), SmartId() ); + pWhatName = new ControlDef( aStr.Copy( 0, aStr.Len()-3 ), rtl::OString() ); if ( m_pSIds->Seek_Entry( pWhatName, &nElement ) ) { // Nach slots suchen SbxVariable *pReturn = new SbxVariable; @@ -2918,10 +2953,13 @@ SbxVariable* TestToolObj::Find( const String& aStr, SbxClassType aType) pWhatName = ( (ControlDef*)m_pSIds->GetObject( nElement ) ); pReturn->SetName( pWhatName->pData->Kurzname ); + // FIXME: HELPID + #if 0 if ( pWhatName->pData->aUId.HasNumeric() ) pReturn->PutULong(pWhatName->pData->aUId.GetNum()); else pReturn->PutString(pWhatName->pData->aUId.GetStr()); + #endif return pReturn; } } @@ -3320,7 +3358,8 @@ void TestToolObj::SortControlsByNumber( BOOL bIncludeActive ) } if ( !bIncludeActive ) { - ControlItem *pZeroItem = new ControlItemUId( UniString(), SmartId(0) ); + // FIXME: HELPID + ControlItem *pZeroItem = new ControlItemUId( UniString(), rtl::OString() ); USHORT nNr; if ( m_pReverseControls->Seek_Entry( pZeroItem, &nNr ) ) { @@ -3356,19 +3395,25 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) case SIReturn: { USHORT nRet,nParams; - SmartId aUId; + rtl::OString aUId; pRetStream->Read(nRet); if ( pRetStream->GetNextType() == BinString ) { String aUStrId; // UniqueStringID Used for Mozilla Integration pRetStream->Read( aUStrId ); - aUId = SmartId( aUStrId ); + // FIXME: HELPID + #if 0 + aUId = rtl::OString( aUStrId ); + #endif } else { comm_ULONG nUId; pRetStream->Read( nUId ); // bei Sequence einfach die Sequence - aUId = SmartId( nUId ); + // FIXME: HELPID + #if 0 + aUId = rtl::OString( nUId ); + #endif } pRetStream->Read(nParams); @@ -3397,6 +3442,8 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) { case RET_Sequence: { + // FIXME: HELPID + #if 0 ULONG nUId = aUId.GetNum(); if ( nSequence != nUId ) { @@ -3407,6 +3454,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) { nClearSequence = nUId; } + #endif } break; case RET_Value: @@ -3415,6 +3463,8 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) // ULONG nHintUserData = pImpl->pNextReturn->GetParent()->GetUserData(); // pImpl->pNextReturn->GetParent()->SetUserData(0); // if ( nUId == pImpl->pNextReturn->GetParent()->GetULong() ) + // FIXME: HELPID + #if 0 if ( aNextReturnId.Matches( aUId ) ) { if( nParams & PARAM_ULONG_1 ) @@ -3438,6 +3488,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) { ADD_ERROR(SbxERR_BAD_ACTION, GEN_RES_STR0(S_RETURNED_VALUE_ID_MISSMATCH) ) } + #endif // pImpl->pNextReturn->GetParent()->SetUserData(nHintUserData); pImpl->pNextReturn = NULL; } @@ -3468,7 +3519,10 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) } WinInfoRec *pWinInfo = new WinInfoRec; + // FIXME: HELPID + #if 0 pWinInfo->aUId = aUId.GetText(); + #endif pWinInfo->nRType = (USHORT)nLNr1; // just ULONG for Transport, data is always USHORT pWinInfo->aRName = aString1; pWinInfo->bIsReset = bBool1; @@ -3504,7 +3558,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) ControlItem *pNewItem = new ControlItemUId( String(), aUId ); if ( pReverseControlsKontext->Seek_Entry(pNewItem,&nNr) ) { -// SmartId aID = pReverseControlsKontext->GetObject(nNr)->pData->aUId; +// rtl::OString aID = pReverseControlsKontext->GetObject(nNr)->pData->aUId; pWinInfo->aKurzname += pReverseControlsKontext->GetObject(nNr)->pData->Kurzname; } delete pNewItem; @@ -3521,6 +3575,8 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) } // Langname feststellen + // FIXME: HELPID + #if 0 if ( aUId.HasString() ) { // use the String ID since there is no LongName in hid.lst pWinInfo->aLangname = aUId.GetStr(); @@ -3536,6 +3592,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) delete pNewItem; } } + #endif aWinInfoHdl.Call( pWinInfo ); @@ -3544,6 +3601,8 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) break; case RET_ProfileInfo: { + // FIXME: HELPID + #if 0 ULONG nUId = aUId.GetNum(); if ( nParams & PARAM_STR_1 ) { @@ -3672,10 +3731,13 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) break; } } + #endif } break; case RET_DirectLoging: { + // FIXME: HELPID + #if 0 ULONG nUId = aUId.GetNum(); switch ( nUId ) { @@ -3694,6 +3756,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) default: ; } + #endif } break; case RET_MacroRecorder: @@ -3724,7 +3787,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) if ( m_pReverseControls ) { USHORT nNr; - ControlItem *pNewItem = new ControlItemUId( String(), SmartId( nLNr1 ) ); + ControlItem *pNewItem = new ControlItemUId( String(), rtl::OString( nLNr1 ) ); if ( m_pReverseControls->Seek_Entry(pNewItem,&nNr) ) aULongNames = m_pReverseControls->GetObject(nNr)->pData->Kurzname; delete pNewItem; @@ -3959,18 +4022,24 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) case SIReturnError: { String aString; - SmartId aUId; + rtl::OString aUId; if ( pRetStream->GetNextType() == BinString ) { String aUStrId; // UniqueStringID Used for Mozilla Integration pRetStream->Read( aUStrId ); - aUId = SmartId( aUStrId ); + // FIXME: HELPID + #if 0 + aUId = rtl::OString( aUStrId ); + #endif } else { comm_ULONG nUId; pRetStream->Read( nUId ); // bei Sequence einfach die Sequence - aUId = SmartId( nUId ); + // FIXME: HELPID + #if 0 + aUId = rtl::OString( nUId ); + #endif } pRetStream->Read( aString ); ReplaceNumbers (aString); @@ -4016,9 +4085,14 @@ String TestToolObj::GetMethodName( ULONG nMethodId ) ReadFlatArray( Controls::arClasses, Controls::pClasses ); if ( Controls::pClasses ) { + // FIXME: HELPID + #if 0 for ( nElement = 0 ; nElement < Controls::pClasses->Count() ; nElement++ ) if ( Controls::pClasses->GetObject(nElement)->pData->aUId.Matches( nMethodId ) ) return Controls::pClasses->GetObject(nElement)->pData->Kurzname; + #else + (void)nElement; + #endif } return String(); } @@ -4030,9 +4104,14 @@ String TestToolObj::GetKeyName( USHORT nKeyCode ) ReadFlatArray( CmdStream::arKeyCodes, CmdStream::pKeyCodes ); if ( CmdStream::pKeyCodes ) { + // FIXME: HELPID + #if 0 for ( nElement = 0 ; nElement < CmdStream::pKeyCodes->Count() ; nElement++ ) if ( CmdStream::pKeyCodes->GetObject(nElement)->pData->aUId.Matches( nKeyCode ) ) return CmdStream::pKeyCodes->GetObject(nElement)->pData->Kurzname; + #else + (void)nElement; + #endif } return CUniString( "UnknownKeyCode" ); } @@ -4061,7 +4140,7 @@ static ControlDefLoad __READONLY_DATA arRes_Type [] = bFound = FALSE; if ( aType.CompareTo(UIdKenn) == COMPARE_EQUAL ) { - aResult = pShortNames->GetName(SmartId(nNumber)); + aResult = pShortNames->GetName(rtl::OString(nNumber)); bFound = TRUE; } if ( aType.CompareTo(MethodKenn ) == COMPARE_EQUAL ) @@ -4078,12 +4157,17 @@ static ControlDefLoad __READONLY_DATA arRes_Type [] = USHORT nElement; if ( pRCommands ) { + // FIXME: HELPID + #if 0 for ( nElement = 0 ; nElement < pRCommands->Count() ; nElement++ ) if ( pRCommands->GetObject(nElement)->pData->aUId.Matches( nNumber ) ) { aResult = pRCommands->GetObject(nElement)->pData->Kurzname; nElement = pRCommands->Count(); } + #else + (void)nElement; + #endif } } if ( aType.CompareTo(TypeKenn ) == COMPARE_EQUAL ) @@ -4095,17 +4179,22 @@ static ControlDefLoad __READONLY_DATA arRes_Type [] = USHORT nElement; if ( pRTypes ) { + // FIXME: HELPID + #if 0 for ( nElement = 0 ; nElement < pRTypes->Count() ; nElement++ ) if ( pRTypes->GetObject(nElement)->pData->aUId.Matches( nNumber ) ) { aResult = pRTypes->GetObject(nElement)->pData->Kurzname; nElement = pRTypes->Count(); } + #else + (void)nElement; + #endif } } if ( aType.CompareTo(SlotKenn ) == COMPARE_EQUAL ) { - aResult = pShortNames->GetName(SmartId(nNumber)); + aResult = pShortNames->GetName(rtl::OString(nNumber)); bFound = TRUE; } if ( aType.CompareTo(TabKenn ) == COMPARE_EQUAL ) @@ -4142,7 +4231,7 @@ SbTextType TestToolObj::GetSymbolType( const String &rSymbol, BOOL bWasControl ) } - ControlDef WhatName( rSymbol, SmartId() ); + ControlDef WhatName( rSymbol, rtl::OString() ); if ( bWasControl ) { @@ -4233,11 +4322,12 @@ SbxVariable* Controls::Find( const String& aStr, SbxClassType aType) USHORT nElement; - ControlDef WhatName(aStr,SmartId()); + ControlDef WhatName(aStr,rtl::OString()); if (pClasses && pClasses->Seek_Entry(&WhatName,&nElement)) { pMethodVar->SetName(aStr); - ULONG nUId = pClasses->GetObject(nElement)->pData->aUId.GetNum(); + // FIXME: HELPID + ULONG nUId = 0;//pClasses->GetObject(nElement)->pData->aUId.GetNum(); pMethodVar->nValue = nUId; pMethodVar->SetUserData( GetUserData() ); diff --git a/automation/source/testtool/objtest.hxx b/automation/source/testtool/objtest.hxx index e9c46d257..1429d506d 100644 --- a/automation/source/testtool/objtest.hxx +++ b/automation/source/testtool/objtest.hxx @@ -35,7 +35,6 @@ #include <testtool.hxx> #include "cmdstrm.hxx" #include <basic/basicrt.hxx> -#include <vcl/smartid.hxx> #include "httprequest.hxx" #include <map> @@ -106,7 +105,7 @@ class ControlData { public: String Kurzname; - SmartId aUId; + rtl::OString aUId; }; DBG_NAMEEX( ControlItem ) @@ -118,8 +117,8 @@ private: public: ControlData *pData; - ControlItem( const char *Name, SmartId aUIdP ); - ControlItem( const String &Name, SmartId aUIdP ); + ControlItem( const char *Name, rtl::OString aUIdP ); + ControlItem( const String &Name, rtl::OString aUIdP ); // ControlItem( const String &Name, const String &URL, const URLType aType ); // ControlItem( const String &Name, const String &URL, const ULONG nUId ); // ControlItem( const char *Name, const String &URL, const ULONG nUId ); @@ -158,9 +157,9 @@ public: class ControlItemSon : public ControlItem, public ControlSon { public: - ControlItemSon(const char *Name, SmartId aUIdP ) + ControlItemSon(const char *Name, rtl::OString aUIdP ) : ControlItem( Name, aUIdP ) {} - ControlItemSon(const String &Name, SmartId aUIdP ); + ControlItemSon(const String &Name, rtl::OString aUIdP ); // ControlItemSon(const String &Name, const String &URL, const URLType aType ); // ControlItemSon(const String &Name, const String &URL, const ULONG nUId ); // ControlItemSon(const char *Name, const String &URL, const ULONG nUId ); @@ -170,9 +169,9 @@ public: class ControlDef : public ControlItemSon { public: - ControlDef(const char *Name, SmartId aUIdP ) + ControlDef(const char *Name, rtl::OString aUIdP ) : ControlItemSon( Name, aUIdP ) {DBG_CTOR(ControlDef,0);} - ControlDef(const String &Name, SmartId aUIdP ); + ControlDef(const String &Name, rtl::OString aUIdP ); // ControlDef(const String &Name, const String &URL, const URLType aType ); ControlDef(const String &aOldName, const String &aNewName, ControlDef *pOriginal, BOOL bWithSons = FALSE ); ~ControlDef() {DBG_DTOR(ControlDef,0);} @@ -185,7 +184,7 @@ public: class ControlItemUId : public ControlItem { public: - ControlItemUId(String Name, SmartId aUIdP) + ControlItemUId(String Name, rtl::OString aUIdP) : ControlItem( Name, aUIdP){} virtual BOOL operator < (const ControlItem &rPar); virtual BOOL operator == (const ControlItem &rPar); @@ -194,7 +193,7 @@ public: class ControlItemUIdSon : public ControlItemUId, public ControlSon { public: - ControlItemUIdSon(String Name, SmartId aUIdP) : ControlItemUId( Name, aUIdP) {} + ControlItemUIdSon(String Name, rtl::OString aUIdP) : ControlItemUId( Name, aUIdP) {} MK_SON_ACCESS( ControlItemUId ) }; @@ -203,14 +202,14 @@ class ReverseName : public ControlItemUId public: ULONG LastSequence; - ReverseName(String Name, SmartId aUIdP, ULONG nSeq) : ControlItemUId( Name, aUIdP), LastSequence(nSeq) {} + ReverseName(String Name, rtl::OString aUIdP, ULONG nSeq) : ControlItemUId( Name, aUIdP), LastSequence(nSeq) {} }; class CRevNames: public CNames { public: - void Insert( String aName, SmartId aUId, ULONG nSeq ); - String GetName( SmartId aUId ); + void Insert( String aName, rtl::OString aUId, ULONG nSeq ); + String GetName( rtl::OString aUId ); void Invalidate ( ULONG nSeq ); }; diff --git a/basctl/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx index c1041f9b0..00670fdac 100644 --- a/basctl/source/basicide/basdoc.cxx +++ b/basctl/source/basicide/basdoc.cxx @@ -103,7 +103,8 @@ void BasicDocShell::FillStatusBar( StatusBar& rStatusBar ) // signatures rStatusBar.InsertItem( SID_SIGNATURE, XmlSecStatusBarControl::GetDefItemWidth( rStatusBar ), SIB_USERDRAW ); - rStatusBar.SetHelpId(SID_SIGNATURE, SID_SIGNATURE); + // FIXME: HELPID + rStatusBar.SetHelpId(SID_SIGNATURE, ""/*SID_SIGNATURE*/); // Position aTmp.Erase(); diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 027ce45b6..75129d190 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -177,7 +177,8 @@ EditorWindow::EditorWindow( Window* pParent ) : Wallpaper(GetSettings().GetStyleSettings().GetFieldColor())); SetPointer( Pointer( POINTER_TEXT ) ); - SetHelpId( HID_BASICIDE_EDITORWINDOW ); + // FIXME: HELPID + SetHelpId( ""/*HID_BASICIDE_EDITORWINDOW*/ ); pSourceViewConfig->AddListener(this); } @@ -948,7 +949,8 @@ BreakPointWindow::BreakPointWindow( Window* pParent ) : // Falls in EditEngine autom. gescrollt wurde, wuesste ich sonst nicht, // wo ich gerade stehe. - SetHelpId( HID_BASICIDE_BREAKPOINTWINDOW ); + // FIXME: HELPID + SetHelpId( ""/*HID_BASICIDE_BREAKPOINTWINDOW*/ ); } @@ -1187,7 +1189,8 @@ WatchWindow::WatchWindow( Window* pParent ) : nVirtToolBoxHeight = aXEdit.GetSizePixel().Height() + 7; nHeaderBarHeight = 16; - aTreeListBox.SetHelpId(HID_BASICIDE_WATCHWINDOW_LIST); + // FIXME: HELPID + aTreeListBox.SetHelpId(""/*HID_BASICIDE_WATCHWINDOW_LIST*/); aTreeListBox.EnableInplaceEditing( TRUE ); aTreeListBox.SetSelectHdl( LINK( this, WatchWindow, TreeListHdl ) ); aTreeListBox.SetPosPixel( Point( DWBORDER, nVirtToolBoxHeight + nHeaderBarHeight ) ); @@ -1239,7 +1242,8 @@ WatchWindow::WatchWindow( Window* pParent ) : SetText( String( IDEResId( RID_STR_WATCHNAME ) ) ); - SetHelpId( HID_BASICIDE_WATCHWINDOW ); + // FIXME: HELPID + SetHelpId( ""/*HID_BASICIDE_WATCHWINDOW*/ ); // make watch window keyboard accessible GetSystemWindow()->GetTaskPaneList()->AddWindow( this ); @@ -1522,7 +1526,8 @@ StackWindow::StackWindow( Window* pParent ) : aGotoCallButton( this, IDEResId( RID_IMGBTN_GOTOCALL ) ), aStackStr( IDEResId( RID_STR_STACK ) ) { - aTreeListBox.SetHelpId(HID_BASICIDE_STACKWINDOW_LIST); + // FIXME: HELPID + aTreeListBox.SetHelpId(""/*HID_BASICIDE_STACKWINDOW_LIST*/); aTreeListBox.SetPosPixel( Point( DWBORDER, nVirtToolBoxHeight ) ); aTreeListBox.SetHighlightRange(); aTreeListBox.SetSelectionMode( NO_SELECTION ); @@ -1531,7 +1536,8 @@ StackWindow::StackWindow( Window* pParent ) : SetText( String( IDEResId( RID_STR_STACKNAME ) ) ); - SetHelpId( HID_BASICIDE_STACKWINDOW ); + // FIXME: HELPID + SetHelpId( ""/*HID_BASICIDE_STACKWINDOW*/ ); aGotoCallButton.SetClickHdl( LINK( this, StackWindow, ButtonHdl ) ); aGotoCallButton.SetPosPixel( Point( DWBORDER, 2 ) ); diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index 67ee7d8b0..5fd56c780 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -124,7 +124,8 @@ DialogWindow::DialogWindow( Window* pParent, const ScriptDocument& rDocument, St pEditor->GetModel()->SetNotifyUndoActionHdl( LINK(this, DialogWindow, NotifyUndoActionHdl)); - SetHelpId( HID_BASICIDE_DIALOGWINDOW ); + // FIXME: HELPID + SetHelpId( ""/*HID_BASICIDE_DIALOGWINDOW*/ ); // set readonly mode for readonly libraries ::rtl::OUString aOULibName( aLibName ); diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx index c6af09a89..b21a21040 100644 --- a/basctl/source/basicide/basides1.cxx +++ b/basctl/source/basicide/basides1.cxx @@ -1065,14 +1065,16 @@ void BasicIDEShell::SetCurWindow( IDEBaseWindow* pNewWin, BOOL bUpdateTabBar, BO AdjustPosSizePixel( Point( 0, 0 ), GetViewFrame()->GetWindow().GetOutputSizePixel() ); if( pCurWin->IsA( TYPE( ModulWindow ) ) ) { - GetViewFrame()->GetWindow().SetHelpId( HID_BASICIDE_MODULWINDOW ); + // FIXME: HELPID + GetViewFrame()->GetWindow().SetHelpId( ""/*HID_BASICIDE_MODULWINDOW*/ ); pModulLayout->SetModulWindow( (ModulWindow*)pCurWin ); pModulLayout->Show(); } else { pModulLayout->Hide(); - GetViewFrame()->GetWindow().SetHelpId( HID_BASICIDE_DIALOGWINDOW ); + // FIXME: HELPID + GetViewFrame()->GetWindow().SetHelpId( ""/*HID_BASICIDE_DIALOGWINDOW*/ ); } if ( bRememberAsCurrent ) @@ -1121,7 +1123,8 @@ void BasicIDEShell::SetCurWindow( IDEBaseWindow* pNewWin, BOOL bUpdateTabBar, BO else { SetWindow( pModulLayout ); - GetViewFrame()->GetWindow().SetHelpId( HID_BASICIDE_MODULWINDOW ); + // FIXME: HELPID + GetViewFrame()->GetWindow().SetHelpId( ""/*HID_BASICIDE_MODULWINDOW*/ ); SfxObjectShell::SetCurrentComponent( NULL ); } SetUndoManager( pCurWin ? pCurWin->GetUndoManager() : 0 ); diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx index 7bffee8ba..a17633c11 100644 --- a/basctl/source/basicide/bastypes.cxx +++ b/basctl/source/basicide/bastypes.cxx @@ -521,7 +521,8 @@ BasicIDETabBar::BasicIDETabBar( Window* pParent ) : { EnableEditMode( TRUE ); - SetHelpId( HID_BASICIDE_TABBAR ); + // FIXME: HELPID + SetHelpId( ""/*HID_BASICIDE_TABBAR*/ ); } void __EXPORT BasicIDETabBar::MouseButtonDown( const MouseEvent& rMEvt ) diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx index b907e57d1..8d84f9590 100644 --- a/basctl/source/dlged/managelang.cxx +++ b/basctl/source/dlged/managelang.cxx @@ -323,7 +323,8 @@ SetDefaultLanguageDialog::SetDefaultLanguageDialog( Window* pParent, Localizatio if ( m_pLocalizationMgr->isLibraryLocalized() ) { // change to "Add Interface Language" mode - SetHelpId( HID_BASICIDE_ADDNEW_LANGUAGE ); + // FIXME: HELPID + SetHelpId( ""/*HID_BASICIDE_ADDNEW_LANGUAGE*/ ); m_pCheckLangLB = new SvxCheckListBox( this, IDEResId( LB_ADD_LANGUAGE ) ); SetText( String( IDEResId( STR_ADDLANG_TITLE ) ) ); m_aLanguageFT.SetText( String( IDEResId( STR_ADDLANG_LABEL ) ) ); diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 211deeffb..4a90a5ccb 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -2629,7 +2629,8 @@ IMPL_LINK( SvxMenuConfigPage, MenuSelectHdl, MenuButton *, pButton ) String aDesc = CUI_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME ); SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc ); - pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_MENU ); + // FIXME: HELPID + pNameDialog->SetHelpId( ""/*HID_SVX_CONFIG_RENAME_MENU*/ ); pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_RENAME_MENU ) ); bool ret = pNameDialog->Execute(); @@ -2687,7 +2688,8 @@ IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton ) String aDesc = CUI_RESSSTR( RID_SVXSTR_SUBMENU_NAME ); SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc ); - pNameDialog->SetHelpId( HID_SVX_CONFIG_NAME_SUBMENU ); + // FIXME: HELPID + pNameDialog->SetHelpId( ""/*HID_SVX_CONFIG_NAME_SUBMENU*/ ); pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_ADD_SUBMENU ) ); bool ret = pNameDialog->Execute(); @@ -2733,7 +2735,8 @@ IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton ) String aDesc = CUI_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME ); SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc ); - pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_MENU_ITEM ); + // FIXME: HELPID + pNameDialog->SetHelpId( ""/*HID_SVX_CONFIG_RENAME_MENU_ITEM*/ ); pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_RENAME_MENU ) ); bool ret = pNameDialog->Execute(); @@ -3129,16 +3132,21 @@ SvxConfigEntry::GetHelpText() { if ( aHelpText.getLength() == 0 ) { + #if 0 OUString helpid = OUString::createFromAscii( "helpid:" ); if ( aHelpURL.indexOf( helpid ) != -1 ) { aHelpURL = aHelpURL.copy( helpid.getLength() ); } + #endif Help* pHelp = Application::GetHelp(); + #if 0 if ( aHelpURL.toInt32() != 0 ) + #endif { - aHelpText = pHelp->GetHelpText( aHelpURL.toInt32(), NULL ); + // FIXME: HELPID + aHelpText = pHelp->GetHelpText( aHelpURL/*.toInt32()*/, NULL ); } if ( aHelpText.getLength() == 0 && aCommand.getLength() != 0 ) @@ -3343,19 +3351,26 @@ SvxToolbarConfigPage::SvxToolbarConfigPage( : SvxConfigPage( pParent, rSet ) { - SetHelpId( HID_SVX_CONFIG_TOOLBAR ); + // FIXME: HELPID + SetHelpId( ""/*HID_SVX_CONFIG_TOOLBAR*/ ); aContentsListBox = new SvxToolbarEntriesListBox(this, CUI_RES(BOX_ENTRIES)); FreeResource(); PositionContentsListBox(); aContentsListBox->SetZOrder( &aAddCommandsButton, WINDOW_ZORDER_BEFOR ); - aContentsListBox->SetHelpId( HID_SVX_CONFIG_TOOLBAR_CONTENTS ); - aNewTopLevelButton.SetHelpId( HID_SVX_NEW_TOOLBAR ); - aModifyTopLevelButton.SetHelpId( HID_SVX_MODIFY_TOOLBAR ); - aAddCommandsButton.SetHelpId( HID_SVX_NEW_TOOLBAR_ITEM ); - aModifyCommandButton.SetHelpId( HID_SVX_MODIFY_TOOLBAR_ITEM ); - aSaveInListBox.SetHelpId( HID_SVX_SAVE_IN ); + // FIXME: HELPID + aContentsListBox->SetHelpId( ""/*HID_SVX_CONFIG_TOOLBAR_CONTENTS*/ ); + // FIXME: HELPID + aNewTopLevelButton.SetHelpId( ""/*HID_SVX_NEW_TOOLBAR*/ ); + // FIXME: HELPID + aModifyTopLevelButton.SetHelpId( ""/*HID_SVX_MODIFY_TOOLBAR*/ ); + // FIXME: HELPID + aAddCommandsButton.SetHelpId( ""/*HID_SVX_NEW_TOOLBAR_ITEM*/ ); + // FIXME: HELPID + aModifyCommandButton.SetHelpId( ""/*HID_SVX_MODIFY_TOOLBAR_ITEM*/ ); + // FIXME: HELPID + aSaveInListBox.SetHelpId( ""/*HID_SVX_SAVE_IN*/ ); aTopLevelSeparator.SetText( CUI_RES ( RID_SVXSTR_PRODUCTNAME_TOOLBARS ) ); @@ -3571,7 +3586,8 @@ IMPL_LINK( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton ) String aDesc = CUI_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME ); SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc ); - pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_TOOLBAR ); + // FIXME: HELPID + pNameDialog->SetHelpId( ""/*HID_SVX_CONFIG_RENAME_TOOLBAR*/ ); pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_RENAME_TOOLBAR ) ); bool ret = pNameDialog->Execute(); @@ -3662,7 +3678,8 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton ) String aDesc = CUI_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME ); SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc ); - pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM ); + // FIXME: HELPID + pNameDialog->SetHelpId( ""/*HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM*/ ); pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_RENAME_TOOLBAR ) ); bool ret = pNameDialog->Execute(); diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx index a002b3b07..6dcd0b848 100644 --- a/cui/source/customize/eventdlg.cxx +++ b/cui/source/customize/eventdlg.cxx @@ -89,7 +89,8 @@ SvxEventConfigPage::SvxEventConfigPage( Window *pParent, const SfxItemSet& rSet, // must be done after FreeResource is called InitResources(); - mpImpl->pEventLB->GetListBox().SetHelpId( HID_SVX_MACRO_LB_EVENT ); + // FIXME: HELPID + mpImpl->pEventLB->GetListBox().SetHelpId( ""/*HID_SVX_MACRO_LB_EVENT*/ ); aSaveInListBox.SetSelectHdl( LINK( this, SvxEventConfigPage, SelectHdl_Impl ) ); diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 188d1d0b4..f19e6aa89 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -170,7 +170,8 @@ _HeaderTabListBox::_HeaderTabListBox( Window* pParent, const ResId& rId ) : maListBox( this, WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP ), maHeaderBar( this, WB_BUTTONSTYLE | WB_BOTTOMBORDER ) { - maListBox.SetHelpId( HID_MACRO_HEADERTABLISTBOX ); + // FIXME: HELPID + maListBox.SetHelpId( ""/*HID_MACRO_HEADERTABLISTBOX*/ ); } _HeaderTabListBox::~_HeaderTabListBox() @@ -874,7 +875,8 @@ SvxMacroTabPage::SvxMacroTabPage( Window* pParent, const Reference< frame::XFram // must be done after FreeResource is called InitResources(); - mpImpl->pEventLB->GetListBox().SetHelpId( HID_SVX_MACRO_LB_EVENT ); + // FIXME: HELPID + mpImpl->pEventLB->GetListBox().SetHelpId( ""/*HID_SVX_MACRO_LB_EVENT*/ ); InitAndSetHandler( xNameReplace, Reference< container::XNameReplace>(0), Reference< util::XModifiable >(0)); DisplayAppEvents(true); diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index f4329ffef..070c2264d 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -249,13 +249,20 @@ SpellDialog::SpellDialog( pImpl = new SpellDialog_Impl; //HelpIds - aClosePB. SetHelpId(HID_SPLDLG_BUTTON_CLOSE ); - aIgnorePB. SetHelpId(HID_SPLDLG_BUTTON_IGNORE ); - aIgnoreAllPB. SetHelpId(HID_SPLDLG_BUTTON_IGNOREALL); - aIgnoreRulePB. SetHelpId(HID_SPLDLG_BUTTON_IGNORERULE); - aChangePB. SetHelpId(HID_SPLDLG_BUTTON_CHANGE ); - aChangeAllPB. SetHelpId(HID_SPLDLG_BUTTON_CHANGEALL); - aExplainPB. SetHelpId(HID_SPLDLG_BUTTON_EXPLAIN ); + // FIXME: HELPID + aClosePB. SetHelpId(""/*HID_SPLDLG_BUTTON_CLOSE*/ ); + // FIXME: HELPID + aIgnorePB. SetHelpId(""/*HID_SPLDLG_BUTTON_IGNORE*/ ); + // FIXME: HELPID + aIgnoreAllPB. SetHelpId(""/*HID_SPLDLG_BUTTON_IGNOREALL*/); + // FIXME: HELPID + aIgnoreRulePB. SetHelpId(""/*HID_SPLDLG_BUTTON_IGNORERULE*/); + // FIXME: HELPID + aChangePB. SetHelpId(""/*HID_SPLDLG_BUTTON_CHANGE*/ ); + // FIXME: HELPID + aChangeAllPB. SetHelpId(""/*HID_SPLDLG_BUTTON_CHANGEALL*/); + // FIXME: HELPID + aExplainPB. SetHelpId(""/*HID_SPLDLG_BUTTON_EXPLAIN*/ ); Init_Impl(); // disable controls if service is missing diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 9e0792333..5e5acc3aa 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -678,7 +678,8 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData ) String aType( CUI_RES( RID_SVXSTR_GALLERYPROPS_GALTHEME ) ); BOOL bReadOnly = pThm->IsReadOnly() && !pThm->IsImported(); - aEdtMSName.SetHelpId( HID_GALLERY_EDIT_MSNAME ); + // FIXME: HELPID + aEdtMSName.SetHelpId( ""/*HID_GALLERY_EDIT_MSNAME*/ ); aEdtMSName.SetText( pThm->GetName() ); aEdtMSName.SetReadOnly( bReadOnly ); diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index edbfb7f4d..b6cac5d6f 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -511,9 +511,12 @@ namespace svx } void SuggestionDisplay::SetHelpIds() { - this->SetHelpId( HID_HANGULDLG_SUGGESTIONS ); - m_aValueSet.SetHelpId( HID_HANGULDLG_SUGGESTIONS_GRID ); - m_aListBox.SetHelpId( HID_HANGULDLG_SUGGESTIONS_LIST ); + // FIXME: HELPID + this->SetHelpId( ""/*HID_HANGULDLG_SUGGESTIONS*/ ); + // FIXME: HELPID + m_aValueSet.SetHelpId( ""/*HID_HANGULDLG_SUGGESTIONS_GRID*/ ); + // FIXME: HELPID + m_aListBox.SetHelpId( ""/*HID_HANGULDLG_SUGGESTIONS_LIST*/ ); } //========================================================================= @@ -619,13 +622,20 @@ namespace svx // initial control values m_aSimpleConversion.Check(); - m_pPlayground->GetButton(SvxCommonLinguisticControl::eClose )->SetHelpId(HID_HANGULDLG_BUTTON_CLOSE ); - m_pPlayground->GetButton(SvxCommonLinguisticControl::eIgnore )->SetHelpId(HID_HANGULDLG_BUTTON_IGNORE ); - m_pPlayground->GetButton(SvxCommonLinguisticControl::eIgnoreAll )->SetHelpId(HID_HANGULDLG_BUTTON_IGNOREALL); - m_pPlayground->GetButton(SvxCommonLinguisticControl::eChange )->SetHelpId(HID_HANGULDLG_BUTTON_CHANGE ); - m_pPlayground->GetButton(SvxCommonLinguisticControl::eChangeAll )->SetHelpId(HID_HANGULDLG_BUTTON_CHANGEALL); - m_pPlayground->GetButton(SvxCommonLinguisticControl::eOptions )->SetHelpId(HID_HANGULDLG_BUTTON_OPTIONS ); - m_pPlayground->GetWordInputControl().SetHelpId(HID_HANGULDLG_EDIT_NEWWORD); + // FIXME: HELPID + m_pPlayground->GetButton(SvxCommonLinguisticControl::eClose )->SetHelpId(""/*HID_HANGULDLG_BUTTON_CLOSE*/ ); + // FIXME: HELPID + m_pPlayground->GetButton(SvxCommonLinguisticControl::eIgnore )->SetHelpId(""/*HID_HANGULDLG_BUTTON_IGNORE*/ ); + // FIXME: HELPID + m_pPlayground->GetButton(SvxCommonLinguisticControl::eIgnoreAll )->SetHelpId(""/*HID_HANGULDLG_BUTTON_IGNOREALL*/); + // FIXME: HELPID + m_pPlayground->GetButton(SvxCommonLinguisticControl::eChange )->SetHelpId(""/*HID_HANGULDLG_BUTTON_CHANGE*/ ); + // FIXME: HELPID + m_pPlayground->GetButton(SvxCommonLinguisticControl::eChangeAll )->SetHelpId(""/*HID_HANGULDLG_BUTTON_CHANGEALL*/); + // FIXME: HELPID + m_pPlayground->GetButton(SvxCommonLinguisticControl::eOptions )->SetHelpId(""/*HID_HANGULDLG_BUTTON_OPTIONS*/ ); + // FIXME: HELPID + m_pPlayground->GetWordInputControl().SetHelpId(""/*HID_HANGULDLG_EDIT_NEWWORD*/); FreeResource(); diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index aaef6b219..98a70f21b 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -78,7 +78,8 @@ SvxHyperlinkDocTp::SvxHyperlinkDocTp ( Window *pParent, const SfxItemSet& rItemS maCbbPath.Show(); String aFileScheme( INET_FILE_SCHEME, RTL_TEXTENCODING_ASCII_US ); maCbbPath.SetBaseURL(aFileScheme); - maCbbPath.SetHelpId( HID_HYPERDLG_DOC_PATH ); + // FIXME: HELPID + maCbbPath.SetHelpId( ""/*HID_HYPERDLG_DOC_PATH*/ ); SetExchangeSupport (); diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index 29a778c80..929e40e26 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -83,7 +83,8 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window *pParent, maCbbTarget.SetPosSizePixel ( LogicToPixel( Point( COL_2, 25 ), MAP_APPFONT ), LogicToPixel( Size ( 176 - COL_DIFF, 60), MAP_APPFONT ) ); maCbbTarget.Show(); - maCbbTarget.SetHelpId( HID_HYPERDLG_INET_PATH ); + // FIXME: HELPID + maCbbTarget.SetHelpId( ""/*HID_HYPERDLG_INET_PATH*/ ); // Find Path to Std-Doc String aStrBasePaths( SvtPathOptions().GetTemplatePath() ); diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx index cd135d65c..7c5bb049e 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -74,7 +74,8 @@ SvxHyperlinkMailTp::SvxHyperlinkMailTp ( Window *pParent, const SfxItemSet& rIte LogicToPixel( Size ( 176 - COL_DIFF, 60), MAP_APPFONT ) ); maCbbReceiver.Show(); - maCbbReceiver.SetHelpId( HID_HYPERDLG_MAIL_PATH ); + // FIXME: HELPID + maCbbReceiver.SetHelpId( ""/*HID_HYPERDLG_MAIL_PATH*/ ); SetExchangeSupport (); diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index 2d0dab48f..e27a080ed 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -300,7 +300,8 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId, maIconCtrl.Show(); maIconCtrl.SetChoiceWithCursor ( TRUE ); maIconCtrl.SetSelectionMode( SINGLE_SELECTION ); - maIconCtrl.SetHelpId( HID_ICCDIALOG_CHOICECTRL ); + // FIXME: HELPID + maIconCtrl.SetHelpId( ""/*HID_ICCDIALOG_CHOICECTRL*/ ); // ItemSet if ( pSet ) @@ -311,11 +312,14 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId, // Buttons aOKBtn.SetClickHdl ( LINK( this, IconChoiceDialog, OkHdl ) ); - aOKBtn.SetHelpId( HID_ICCDIALOG_OK_BTN ); - aCancelBtn.SetHelpId( HID_ICCDIALOG_CANCEL_BTN ); + // FIXME: HELPID + aOKBtn.SetHelpId( ""/*HID_ICCDIALOG_OK_BTN*/ ); + // FIXME: HELPID + aCancelBtn.SetHelpId( ""/*HID_ICCDIALOG_CANCEL_BTN*/ ); aResetBtn.SetClickHdl( LINK( this, IconChoiceDialog, ResetHdl ) ); aResetBtn.SetText( CUI_RESSTR(RID_SVXSTR_ICONCHOICEDLG_RESETBUT) ); - aResetBtn.SetHelpId( HID_ICCDIALOG_RESET_BTN ); + // FIXME: HELPID + aResetBtn.SetHelpId( ""/*HID_ICCDIALOG_RESET_BTN*/ ); aOKBtn.Show(); aCancelBtn.Show(); aHelpBtn.Show(); diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx index 7068074b9..534401ed3 100644 --- a/cui/source/dialogs/insrc.cxx +++ b/cui/source/dialogs/insrc.cxx @@ -70,7 +70,8 @@ SvxInsRowColDlg::SvxInsRowColDlg(Window* pParent, bool bCol, ULONG nHelpId ) aTmp += aRow; } SetText( aTmp ); - SetHelpId( nHelpId ); + // FIXME: HELPID + SetHelpId( ""/*nHelpId*/ ); } short SvxInsRowColDlg::Execute(void) diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index 965aefe35..836d4a5bf 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -109,7 +109,8 @@ SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, LinkManager* pMgr, BOOL bHtml { FreeResource(); - aTbLinks.SetHelpId(HID_LINKDLG_TABLB); + // FIXME: HELPID + aTbLinks.SetHelpId(""/*HID_LINKDLG_TABLB*/); aTbLinks.SetSelectionMode( MULTIPLE_SELECTION ); aTbLinks.SetTabs( &nTabs[0], MAP_APPFONT ); aTbLinks.Resize(); // OS: Hack fuer richtige Selektion diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx index cbfe0ac65..d773a7509 100644 --- a/cui/source/dialogs/pastedlg.cxx +++ b/cui/source/dialogs/pastedlg.cxx @@ -63,8 +63,10 @@ SvPasteObjectDialog::SvPasteObjectDialog( Window* pParent ) aSObject( CUI_RES( S_OBJECT ) ) { FreeResource(); - SetHelpId( HID_PASTE_DLG ); - SetUniqueId( HID_PASTE_DLG ); + // FIXME: HELPID + SetHelpId( ""/*HID_PASTE_DLG*/ ); + // FIXME: HELPID + SetUniqueId( ""/*HID_PASTE_DLG*/ ); Font aFont = aFtObjectSource.GetFont(); aFont.SetWeight( WEIGHT_LIGHT ); diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx index 758addd34..6379ad752 100644 --- a/cui/source/dialogs/postdlg.cxx +++ b/cui/source/dialogs/postdlg.cxx @@ -89,10 +89,14 @@ SvxPostItDialog::SvxPostItDialog( Window* pParent, { if (bRedline) // HelpIDs fuer Redlining { - SetHelpId(HID_REDLINING_DLG); - aEditED.SetHelpId(HID_REDLINING_EDIT); - aPrevBtn.SetHelpId(HID_REDLINING_PREV); - aNextBtn.SetHelpId(HID_REDLINING_NEXT); + // FIXME: HELPID + SetHelpId(""/*HID_REDLINING_DLG*/); + // FIXME: HELPID + aEditED.SetHelpId(""/*HID_REDLINING_EDIT*/); + // FIXME: HELPID + aPrevBtn.SetHelpId(""/*HID_REDLINING_PREV*/); + // FIXME: HELPID + aNextBtn.SetHelpId(""/*HID_REDLINING_NEXT*/); } aPrevBtn.SetClickHdl( LINK( this, SvxPostItDialog, PrevHdl ) ); diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 996c24971..02efd57cf 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -729,7 +729,8 @@ void AbstractSvxNameDialog_Impl::SetEditHelpId(ULONG nHelpId) } void AbstractSvxNameDialog_Impl::SetHelpId( ULONG nHelpId ) { - pDlg->SetHelpId( nHelpId ); + // FIXME: HELPID + pDlg->SetHelpId( ""/*nHelpId*/ ); } void AbstractSvxNameDialog_Impl::SetText( const XubString& rStr ) { @@ -843,7 +844,8 @@ void AbstractSvxMultiFileDialog_Impl::SetTitle( const String& rNewTitle ) void AbstractSvxMultiFileDialog_Impl::SetHelpId( ULONG nHelpId ) { - pDlg->SetHelpId( nHelpId ); + // FIXME: HELPID + pDlg->SetHelpId( ""/*nHelpId*/ ); } Window * AbstractSvxHpLinkDlg_Impl::GetWindow() @@ -1889,7 +1891,8 @@ SfxAbstractInsertObjectDialog* AbstractDialogFactory_Impl::CreateInsertObjectDia if ( pDlg ) { - pDlg->SetHelpId( nSlotId ); + // FIXME: HELPID + pDlg->SetHelpId( ""/*nSlotId*/ ); return new AbstractInsertObjectDialog_Impl( pDlg ); } return 0; @@ -1908,7 +1911,8 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( Window* p if ( pDlg ) { - pDlg->SetHelpId( nSlotId ); + // FIXME: HELPID + pDlg->SetHelpId( ""/*nSlotId*/ ); return new VclAbstractDialog_Impl( pDlg ); } return 0; diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 9ddade3b3..cd2b52b31 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -744,7 +744,8 @@ public: aBtnOK.Enable( rLink.Call( this ) > 0 ); } - void SetEditHelpId(ULONG nHelpId) {aEdtName.SetHelpId(nHelpId);} + // FIXME: HELPID + void SetEditHelpId(ULONG /*nHelpId*/) {aEdtName.SetHelpId(""/*nHelpId*/);} }; class SvxIconSelectorDialog : public ModalDialog diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx index 0df32f85a..36fbec656 100644 --- a/cui/source/inc/dlgname.hxx +++ b/cui/source/inc/dlgname.hxx @@ -91,7 +91,8 @@ public: aBtnOK.Enable( rLink.Call( this ) > 0 ); } - void SetEditHelpId(ULONG nHelpId) {aEdtName.SetHelpId(nHelpId);} + // FIXME: HELPID + void SetEditHelpId(ULONG /*nHelpId*/) {aEdtName.SetHelpId(""/*nHelpId*/);} }; /////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index 269fd24de..ede659aed 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -114,8 +114,10 @@ namespace offapp { SetStyle((GetStyle() & ~WB_HSCROLL) | WB_AUTOHSCROLL); - SetUniqueId(UID_OFA_CONNPOOL_DRIVERLIST_BACK); - GetDataWindow().SetHelpId(HID_OFA_CONNPOOL_DRIVERLIST); + // FIXME: HELPID + SetUniqueId(""/*UID_OFA_CONNPOOL_DRIVERLIST_BACK*/); + // FIXME: HELPID + GetDataWindow().SetHelpId(""/*HID_OFA_CONNPOOL_DRIVERLIST*/); } //-------------------------------------------------------------------- diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index f73435fce..c45df4f53 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -169,8 +169,10 @@ DbRegistrationOptionsPage::DbRegistrationOptionsPage( Window* pParent, const Sfx pPathBox->InitHeaderBar( pHeaderBar ); pPathBox->SetHighlightRange(); - pPathBox->SetHelpId( HID_DBPATH_CTL_PATH ); - pHeaderBar->SetHelpId( HID_DBPATH_HEADERBAR ); + // FIXME: HELPID + pPathBox->SetHelpId( ""/*HID_DBPATH_CTL_PATH*/ ); + // FIXME: HELPID + pHeaderBar->SetHelpId( ""/*HID_DBPATH_HEADERBAR*/ ); pPathBox->Show(); pHeaderBar->Show(); diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index e214a5e73..34e6dc5cb 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -97,7 +97,8 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( Window* pParent, aNewPnt.Y() += nDelta; aNewDelTBX.SetPosPixel( aNewPnt ); - aCheckLB.SetHelpId(HID_OFA_FONT_SUBST_CLB); + // FIXME: HELPID + aCheckLB.SetHelpId(""/*HID_OFA_FONT_SUBST_CLB*/); aCheckLB.SetWindowBits(aCheckLB.GetStyle()|WB_HSCROLL|WB_VSCROLL); aCheckLB.SetSelectionMode(MULTIPLE_SELECTION); aCheckLB.SortByCol(2); diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index c3398ed28..485a731b5 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -815,7 +815,8 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe else aCheckBoxes[i]->Hide(); aCheckBoxes[i]->SetBackground(aTransparentWall); - aCheckBoxes[i]->SetHelpId(HID_COLORPAGE_CHECKBOX_START + i); + // FIXME: HELPID + aCheckBoxes[i]->SetHelpId(""/*HID_COLORPAGE_CHECKBOX_START + i*/); if(bSetTextColor) aCheckBoxes[i]->SetTextColor(aRCheckCol); } @@ -854,13 +855,15 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe XColorEntry* pEntry = aColorTable.GetColor(i); aColorBoxes[0]->InsertEntry( pEntry->GetColor(), pEntry->GetName() ); } - aColorBoxes[0]->SetHelpId(HID_COLORPAGE_LISTBOX_START); + // FIXME: HELPID + aColorBoxes[0]->SetHelpId(""/*HID_COLORPAGE_LISTBOX_START*/); for( sal_Int32 i = 1; i < nCount; i++ ) { if(aColorBoxes[i]) { aColorBoxes[i]->CopyEntries( *aColorBoxes[0] ); - aColorBoxes[i]->SetHelpId(HID_COLORPAGE_LISTBOX_START + i); + // FIXME: HELPID + aColorBoxes[i]->SetHelpId(""/*HID_COLORPAGE_LISTBOX_START + i*/); } } } @@ -1018,7 +1021,8 @@ ColorConfigCtrl_Impl::ColorConfigCtrl_Impl( const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); aScrollWindow.SetBackground(Wallpaper(rStyleSettings.GetFieldColor())); - aScrollWindow.SetHelpId( HID_OPTIONS_COLORCONFIG_COLORLIST_WIN ); + // FIXME: HELPID + aScrollWindow.SetHelpId( ""/*HID_OPTIONS_COLORCONFIG_COLORLIST_WIN*/ ); aVScroll.EnableDrag(); aVScroll.Show(); aHeaderHB.SetPosSizePixel( diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index 51034c944..1eab42b61 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -163,8 +163,9 @@ OfaMSFilterTabPage2::OfaMSFilterTabPage2( Window* pParent, (( sHeader += '\t' ) += sHeader2 ) += '\t'; aCheckLB.InsertHeaderEntry( sHeader, HEADERBAR_APPEND, HIB_CENTER | HIB_VCENTER | HIB_FIXEDPOS | HIB_FIXED ); - - aCheckLB.SetHelpId( HID_OFAPAGE_MSFLTR2_CLB ); + + // FIXME: HELPID + aCheckLB.SetHelpId( ""/*HID_OFAPAGE_MSFLTR2_CLB*/ ); aCheckLB.SetWindowBits( WB_HSCROLL| WB_VSCROLL ); } diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 1e784fec2..aba25f5b6 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -197,7 +197,8 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet sHeader += '\t'; m_aJavaList.InsertHeaderEntry( sHeader, HEADERBAR_APPEND, HIB_LEFT ); - m_aJavaList.SetHelpId( HID_OPTIONS_JAVA_LIST ); + // FIXME: HELPID + m_aJavaList.SetHelpId( ""/*HID_OPTIONS_JAVA_LIST*/ ); FreeResource(); diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 132344e37..8b6c9067b 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -1141,7 +1141,8 @@ SvxLinguTabPage::SvxLinguTabPage( Window* pParent, pCheckButtonData = NULL; aLinguModulesCLB.SetWindowBits( WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE ); - aLinguModulesCLB.SetHelpId(HID_CLB_LINGU_MODULES ); + // FIXME: HELPID + aLinguModulesCLB.SetHelpId(""/*HID_CLB_LINGU_MODULES*/ ); aLinguModulesCLB.SetHighlightRange(); aLinguModulesCLB.SetSelectHdl( LINK( this, SvxLinguTabPage, SelectHdl_Impl )); aLinguModulesCLB.SetDoubleClickHdl(LINK(this, SvxLinguTabPage, BoxDoubleClickHdl_Impl)); @@ -1151,7 +1152,8 @@ SvxLinguTabPage::SvxLinguTabPage( Window* pParent, aLinguOptionsEditPB.SetClickHdl( LINK( this, SvxLinguTabPage, ClickHdl_Impl )); aLinguDicsCLB.SetWindowBits( WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE ); - aLinguDicsCLB.SetHelpId(HID_CLB_EDIT_MODULES_DICS ); + // FIXME: HELPID + aLinguDicsCLB.SetHelpId(""/*HID_CLB_EDIT_MODULES_DICS*/ ); aLinguDicsCLB.SetHighlightRange(); aLinguDicsCLB.SetSelectHdl( LINK( this, SvxLinguTabPage, SelectHdl_Impl )); aLinguDicsCLB.SetCheckButtonHdl(LINK(this, SvxLinguTabPage, BoxCheckButtonHdl_Impl)); @@ -1161,7 +1163,8 @@ SvxLinguTabPage::SvxLinguTabPage( Window* pParent, aLinguDicsDelPB.SetClickHdl( LINK( this, SvxLinguTabPage, ClickHdl_Impl )); aLinguOptionsCLB.SetWindowBits( WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE ); - aLinguOptionsCLB.SetHelpId(HID_CLB_LINGU_OPTIONS ); + // FIXME: HELPID + aLinguOptionsCLB.SetHelpId(""/*HID_CLB_LINGU_OPTIONS*/ ); aLinguOptionsCLB.SetHighlightRange(); aLinguOptionsCLB.SetSelectHdl( LINK( this, SvxLinguTabPage, SelectHdl_Impl )); aLinguOptionsCLB.SetDoubleClickHdl(LINK(this, SvxLinguTabPage, BoxDoubleClickHdl_Impl)); @@ -2052,7 +2055,8 @@ SvxEditModulesDlg::SvxEditModulesDlg(Window* pParent, SvxLinguData_Impl& rData) aModulesCLB.SetWindowBits( WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE ); aModulesCLB.SetHighlightRange(); - aModulesCLB.SetHelpId(HID_CLB_EDIT_MODULES_MODULES ); + // FIXME: HELPID + aModulesCLB.SetHelpId(""/*HID_CLB_EDIT_MODULES_MODULES*/ ); aModulesCLB.SetSelectHdl( LINK( this, SvxEditModulesDlg, SelectHdl_Impl )); aModulesCLB.SetCheckButtonHdl( LINK( this, SvxEditModulesDlg, BoxCheckButtonHdl_Impl) ); diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 75b9c7832..a4f9dbc44 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -263,8 +263,10 @@ SvxPathTabPage::SvxPathTabPage( Window* pParent, const SfxItemSet& rSet ) : pPathBox->SetTabs( &nTabs[0], MAP_APPFONT ); pPathBox->InitHeaderBar( pHeaderBar ); pPathBox->SetHighlightRange(); - pPathBox->SetHelpId( HID_OPTPATH_CTL_PATH ); - pHeaderBar->SetHelpId( HID_OPTPATH_HEADERBAR ); + // FIXME: HELPID + pPathBox->SetHelpId( ""/*HID_OPTPATH_CTL_PATH*/ ); + // FIXME: HELPID + pHeaderBar->SetHelpId( ""/*HID_OPTPATH_HEADERBAR*/ ); pPathBox->Show(); pHeaderBar->Show(); diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index c18c52ff5..15c7d7fda 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -889,7 +889,8 @@ void OfaTreeOptionsDialog::InitTreeAndHandler() aPageImagesHC = ImageList( ResId( RID_IMGLIST_TREEOPT_HC, *pIsoRes ) ); delete pIsoRes; - aTreeLB.SetHelpId( HID_OFADLG_TREELISTBOX ); + // FIXME: HELPID + aTreeLB.SetHelpId( ""/*HID_OFADLG_TREELISTBOX*/ ); aTreeLB.SetWindowBits( WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HASLINES | WB_HASLINESATROOT | WB_CLIPCHILDREN | WB_HSCROLL | WB_FORCE_MAKEVISIBLE ); diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index d274cb016..bdefb8766 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -105,7 +105,8 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) : aLanguageFT.SetZOrder(0, WINDOW_ZORDER_FIRST); aLanguageLB.SetZOrder(&aLanguageFT, WINDOW_ZORDER_BEHIND); - aLanguageLB.SetHelpId(HID_AUTOCORR_LANGUAGE); + // FIXME: HELPID + aLanguageLB.SetHelpId(""/*HID_AUTOCORR_LANGUAGE*/); FreeResource(); AddTabPage(RID_OFAPAGE_AUTOCORR_OPTIONS, OfaAutocorrOptionsPage::Create, 0); @@ -228,7 +229,8 @@ OfaAutocorrOptionsPage::OfaAutocorrOptionsPage( Window* pParent, { FreeResource(); - aCheckLB.SetHelpId(HID_OFAPAGE_AUTOCORR_CLB); + // FIXME: HELPID + aCheckLB.SetHelpId(""/*HID_OFAPAGE_AUTOCORR_CLB*/); } /*-----------------14.10.96 15.58------------------- @@ -492,7 +494,8 @@ OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( Window* pParent, //typ. Anfuehrungszeichen einsetzen SvtSysLocale aSysLcl; - aCheckLB.SetHelpId(HID_OFAPAGE_AUTOFORMAT_CLB); + // FIXME: HELPID + aCheckLB.SetHelpId(""/*HID_OFAPAGE_AUTOFORMAT_CLB*/); aCheckLB.SetWindowBits(WB_HSCROLL| WB_VSCROLL); aCheckLB.SetSelectHdl(LINK(this, OfaSwAutoFmtOptionsPage, SelectHdl)); @@ -2062,8 +2065,10 @@ OfaQuoteTabPage::OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ) : BOOL bShowSWOptions = FALSE; - aCheckLB.SetHelpId( HID_OFAPAGE_QUOTE_CLB ); - aSwCheckLB.SetHelpId( HID_OFAPAGE_QUOTE_SW_CLB ); + // FIXME: HELPID + aCheckLB.SetHelpId( ""/*HID_OFAPAGE_QUOTE_CLB*/ ); + // FIXME: HELPID + aSwCheckLB.SetHelpId( ""/*HID_OFAPAGE_QUOTE_SW_CLB*/ ); SFX_ITEMSET_ARG( &rSet, pItem, SfxBoolItem, SID_AUTO_CORRECT_DLG, FALSE ); if ( pItem && pItem->GetValue() ) diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 368859a5a..19804e471 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -243,7 +243,8 @@ SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(Window* pParent, SetExchangeSupport(); pExamplesVS->SetSelectHdl(LINK(this, SvxSingleNumPickTabPage, NumSelectHdl_Impl)); pExamplesVS->SetDoubleClickHdl(LINK(this, SvxSingleNumPickTabPage, DoubleClickHdl_Impl)); - pExamplesVS->SetHelpId(HID_VALUESET_SINGLENUM ); + // FIXME: HELPID + pExamplesVS->SetHelpId(""/*HID_VALUESET_SINGLENUM*/ ); Reference<XDefaultNumberingProvider> xDefNum = lcl_GetNumberingProvider(); if(xDefNum.is()) @@ -472,7 +473,8 @@ SvxBulletPickTabPage::SvxBulletPickTabPage(Window* pParent, SetExchangeSupport(); pExamplesVS->SetSelectHdl(LINK(this, SvxBulletPickTabPage, NumSelectHdl_Impl)); pExamplesVS->SetDoubleClickHdl(LINK(this, SvxBulletPickTabPage, DoubleClickHdl_Impl)); - pExamplesVS->SetHelpId(HID_VALUESET_BULLET ); + // FIXME: HELPID + pExamplesVS->SetHelpId(""/*HID_VALUESET_BULLET*/ ); } /*-----------------07.02.97 12.10------------------- @@ -675,7 +677,8 @@ SvxNumPickTabPage::SvxNumPickTabPage(Window* pParent, pExamplesVS->SetSelectHdl(LINK(this, SvxNumPickTabPage, NumSelectHdl_Impl)); pExamplesVS->SetDoubleClickHdl(LINK(this, SvxNumPickTabPage, DoubleClickHdl_Impl)); - pExamplesVS->SetHelpId(HID_VALUESET_NUM ); + // FIXME: HELPID + pExamplesVS->SetHelpId(""/*HID_VALUESET_NUM*/ ); Reference<XDefaultNumberingProvider> xDefNum = lcl_GetNumberingProvider(); if(xDefNum.is()) @@ -991,7 +994,8 @@ SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent, // Grafiknamen ermitteln GalleryExplorer::FillObjList(GALLERY_THEME_BULLETS, aGrfNames); - pExamplesVS->SetHelpId(HID_VALUESET_NUMBMP ); + // FIXME: HELPID + pExamplesVS->SetHelpId(""/*HID_VALUESET_NUMBMP*/ ); for(USHORT i = 0; i < aGrfNames.Count(); i++) { pExamplesVS->InsertItem( i + 1, i); diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 3eb168cee..8e7d5fa1d 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -645,7 +645,8 @@ IMPL_LINK( SvxBitmapTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) pWarnBox = new WarningBox( DLGWIN, WinBits( WB_OK_CANCEL ), String( ResId( nError, rMgr ) ) ); - pWarnBox->SetHelpId( HID_WARN_NAME_DUPLICATE ); + // FIXME: HELPID + pWarnBox->SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); } if( pWarnBox->Execute() != RET_OK ) @@ -775,7 +776,8 @@ IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG ) pWarnBox = new WarningBox( DLGWIN, WinBits( WB_OK_CANCEL ), String( ResId( nError, rMgr ) ) ); - pWarnBox->SetHelpId( HID_WARN_NAME_DUPLICATE ); + // FIXME: HELPID + pWarnBox->SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); } @@ -887,7 +889,8 @@ IMPL_LINK( SvxBitmapTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) else { WarningBox aBox( DLGWIN, WinBits( WB_OK ), String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - aBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); + // FIXME: HELPID + aBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); aBox.Execute(); } } diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 3a3be44a6..146664a15 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -488,7 +488,8 @@ IMPL_LINK( SvxColorTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) { WarningBox aWarningBox( DLGWIN, WinBits( WB_OK ), String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - aWarningBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); + // FIXME: HELPID + aWarningBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); aWarningBox.Execute(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); @@ -574,7 +575,8 @@ IMPL_LINK( SvxColorTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) { WarningBox aWarningBox( DLGWIN, WinBits( WB_OK ), String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - aWarningBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); + // FIXME: HELPID + aWarningBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); aWarningBox.Execute(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); @@ -1036,9 +1038,12 @@ IMPL_LINK( SvxColorTabPage, SelectColorModelHdl_Impl, void *, EMPTYARG ) aMtrFldColorModel4.Hide(); aMtrFldColorModel4.SetValue( 0L ); - aMtrFldColorModel1.SetHelpId( HID_TPCOLOR_RGB_1 ); - aMtrFldColorModel2.SetHelpId( HID_TPCOLOR_RGB_2 ); - aMtrFldColorModel3.SetHelpId( HID_TPCOLOR_RGB_3 ); + // FIXME: HELPID + aMtrFldColorModel1.SetHelpId( ""/*HID_TPCOLOR_RGB_1*/ ); + // FIXME: HELPID + aMtrFldColorModel2.SetHelpId( ""/*HID_TPCOLOR_RGB_2*/ ); + // FIXME: HELPID + aMtrFldColorModel3.SetHelpId( ""/*HID_TPCOLOR_RGB_3*/ ); // Da der alte HelpText noch am Control steht wuerde // ein Umsetzen der HelpID alleine nichts bewirken @@ -1082,9 +1087,12 @@ IMPL_LINK( SvxColorTabPage, SelectColorModelHdl_Impl, void *, EMPTYARG ) aFtColorModel4.Show(); aMtrFldColorModel4.Show(); - aMtrFldColorModel1.SetHelpId( HID_TPCOLOR_CMYK_1 ); - aMtrFldColorModel2.SetHelpId( HID_TPCOLOR_CMYK_2 ); - aMtrFldColorModel3.SetHelpId( HID_TPCOLOR_CMYK_3 ); + // FIXME: HELPID + aMtrFldColorModel1.SetHelpId( ""/*HID_TPCOLOR_CMYK_1*/ ); + // FIXME: HELPID + aMtrFldColorModel2.SetHelpId( ""/*HID_TPCOLOR_CMYK_2*/ ); + // FIXME: HELPID + aMtrFldColorModel3.SetHelpId( ""/*HID_TPCOLOR_CMYK_3*/ ); // s.o. aMtrFldColorModel1.SetHelpText( String() ); diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 69c05ff11..d3a08740b 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -482,7 +482,8 @@ IMPL_LINK( SvxGradientTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) pWarnBox = new WarningBox( DLGWIN, WinBits( WB_OK_CANCEL ), String( ResId( nError, rMgr ) ) ); - pWarnBox->SetHelpId( HID_WARN_NAME_DUPLICATE ); + // FIXME: HELPID + pWarnBox->SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); } if( pWarnBox->Execute() != RET_OK ) @@ -599,7 +600,8 @@ IMPL_LINK( SvxGradientTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) else { WarningBox aBox( DLGWIN, WinBits( WB_OK ),String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - aBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); + // FIXME: HELPID + aBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); aBox.Execute(); } diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 04c7dc89d..da66f8cbd 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -546,7 +546,8 @@ IMPL_LINK( SvxHatchTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) pWarnBox = new WarningBox( DLGWIN, WinBits( WB_OK_CANCEL ), String( ResId( nError, rMgr ) ) ); - pWarnBox->SetHelpId( HID_WARN_NAME_DUPLICATE ); + // FIXME: HELPID + pWarnBox->SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); } if( pWarnBox->Execute() != RET_OK ) @@ -659,7 +660,8 @@ IMPL_LINK( SvxHatchTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) else { WarningBox aBox( DLGWIN, WinBits( WB_OK ),String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - aBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); + // FIXME: HELPID + aBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); aBox.Execute(); } } diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index f3b766632..f89eeeabb 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -639,7 +639,8 @@ IMPL_LINK( SvxLineDefTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) else { WarningBox aBox( DLGWIN, WinBits( WB_OK ),String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - aBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); + // FIXME: HELPID + aBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); aBox.Execute(); } } @@ -720,7 +721,8 @@ IMPL_LINK( SvxLineDefTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) else { WarningBox aBox( DLGWIN, WinBits( WB_OK ), String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - aBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); + // FIXME: HELPID + aBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); aBox.Execute(); } } diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 8bc4ba4a6..faca35567 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -372,7 +372,8 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) { WarningBox aWarningBox( DLGWIN, WinBits( WB_OK ), String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - aWarningBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); + // FIXME: HELPID + aWarningBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); aWarningBox.Execute(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); @@ -520,7 +521,8 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) else { WarningBox aBox( DLGWIN, WinBits( WB_OK ),String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - aBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); + // FIXME: HELPID + aBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); aBox.Execute(); } } diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx index f18639451..135f8f01c 100644 --- a/extensions/source/abpilot/abspilot.cxx +++ b/extensions/source/abpilot/abspilot.cxx @@ -106,11 +106,16 @@ namespace abp WZS_INVALID_STATE ); - m_pPrevPage->SetHelpId(HID_ABSPILOT_PREVIOUS); - m_pNextPage->SetHelpId(HID_ABSPILOT_NEXT); - m_pCancel->SetHelpId(HID_ABSPILOT_CANCEL); - m_pFinish->SetHelpId(HID_ABSPILOT_FINISH); - m_pHelp->SetUniqueId(UID_ABSPILOT_HELP); + // FIXME: HELPID + m_pPrevPage->SetHelpId(""/*HID_ABSPILOT_PREVIOUS*/); + // FIXME: HELPID + m_pNextPage->SetHelpId(""/*HID_ABSPILOT_NEXT*/); + // FIXME: HELPID + m_pCancel->SetHelpId(""/*HID_ABSPILOT_CANCEL*/); + // FIXME: HELPID + m_pFinish->SetHelpId(""/*HID_ABSPILOT_FINISH*/); + // FIXME: HELPID + m_pHelp->SetUniqueId(""/*UID_ABSPILOT_HELP*/); m_pCancel->SetClickHdl( LINK( this, OAddessBookSourcePilot, OnCancelClicked) ); diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx index 06fdc21ea..d95c74224 100644 --- a/extensions/source/bibliography/framectr.cxx +++ b/extensions/source/bibliography/framectr.cxx @@ -198,7 +198,8 @@ BibFrameController_Impl::BibFrameController_Impl( const uno::Reference< awt::XWi ,pBibMod(NULL) { Window* pParent = VCLUnoHelper::GetWindow( xWindow ); - pParent->SetUniqueId(UID_BIB_FRAME_WINDOW); + // FIXME: HELPID + pParent->SetUniqueId(""/*UID_BIB_FRAME_WINDOW*/); bDisposing=sal_False; bHierarchical=sal_True; pImp = new BibFrameCtrl_Impl; diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx index 77439de9c..773e83e0a 100644 --- a/extensions/source/bibliography/general.cxx +++ b/extensions/source/bibliography/general.cxx @@ -245,7 +245,8 @@ BibGeneralPage::BibGeneralPage(Window* pParent, BibDataManager* pMan): pDatMan(pMan) { aControlParentWin.Show(); - aControlParentWin.SetHelpId(HID_BIB_CONTROL_PARENT); + // FIXME: HELPID + aControlParentWin.SetHelpId(""/*HID_BIB_CONTROL_PARENT*/); aStdSize = GetOutputSizePixel(); aBibTypeArr[0] = String(BibResId(ST_TYPE_ARTICLE)); diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx index 90afc61d9..1c16d15c4 100644 --- a/extensions/source/dbpilots/gridwizard.cxx +++ b/extensions/source/dbpilots/gridwizard.cxx @@ -65,10 +65,14 @@ namespace dbp { initControlSettings(&m_aSettings); - m_pPrevPage->SetHelpId(HID_GRIDWIZARD_PREVIOUS); - m_pNextPage->SetHelpId(HID_GRIDWIZARD_NEXT); - m_pCancel->SetHelpId(HID_GRIDWIZARD_CANCEL); - m_pFinish->SetHelpId(HID_GRIDWIZARD_FINISH); + // FIXME: HELPID + m_pPrevPage->SetHelpId(""/*HID_GRIDWIZARD_PREVIOUS*/); + // FIXME: HELPID + m_pNextPage->SetHelpId(""/*HID_GRIDWIZARD_NEXT*/); + // FIXME: HELPID + m_pCancel->SetHelpId(""/*HID_GRIDWIZARD_CANCEL*/); + // FIXME: HELPID + m_pFinish->SetHelpId(""/*HID_GRIDWIZARD_FINISH*/); // if we do not need the data source selection page ... if (!needDatasourceSelection()) diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx index 2656ef71d..46da996dc 100644 --- a/extensions/source/dbpilots/groupboxwiz.cxx +++ b/extensions/source/dbpilots/groupboxwiz.cxx @@ -66,10 +66,14 @@ namespace dbp { initControlSettings(&m_aSettings); - m_pPrevPage->SetHelpId(HID_GROUPWIZARD_PREVIOUS); - m_pNextPage->SetHelpId(HID_GROUPWIZARD_NEXT); - m_pCancel->SetHelpId(HID_GROUPWIZARD_CANCEL); - m_pFinish->SetHelpId(HID_GROUPWIZARD_FINISH); + // FIXME: HELPID + m_pPrevPage->SetHelpId(""/*HID_GROUPWIZARD_PREVIOUS*/); + // FIXME: HELPID + m_pNextPage->SetHelpId(""/*HID_GROUPWIZARD_NEXT*/); + // FIXME: HELPID + m_pCancel->SetHelpId(""/*HID_GROUPWIZARD_CANCEL*/); + // FIXME: HELPID + m_pFinish->SetHelpId(""/*HID_GROUPWIZARD_FINISH*/); } //--------------------------------------------------------------------- diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx index 2c71eca4a..0e9a0e194 100644 --- a/extensions/source/dbpilots/listcombowizard.cxx +++ b/extensions/source/dbpilots/listcombowizard.cxx @@ -67,10 +67,14 @@ namespace dbp { initControlSettings(&m_aSettings); - m_pPrevPage->SetHelpId(HID_LISTWIZARD_PREVIOUS); - m_pNextPage->SetHelpId(HID_LISTWIZARD_NEXT); - m_pCancel->SetHelpId(HID_LISTWIZARD_CANCEL); - m_pFinish->SetHelpId(HID_LISTWIZARD_FINISH); + // FIXME: HELPID + m_pPrevPage->SetHelpId(""/*HID_LISTWIZARD_PREVIOUS*/); + // FIXME: HELPID + m_pNextPage->SetHelpId(""/*HID_LISTWIZARD_NEXT*/); + // FIXME: HELPID + m_pCancel->SetHelpId(""/*HID_LISTWIZARD_CANCEL*/); + // FIXME: HELPID + m_pFinish->SetHelpId(""/*HID_LISTWIZARD_FINISH*/); // if we do not need the data source selection page ... if (!needDatasourceSelection()) diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx index acf577350..8787a577b 100644 --- a/extensions/source/propctrlr/browserline.cxx +++ b/extensions/source/propctrlr/browserline.cxx @@ -105,20 +105,25 @@ namespace pcr } //------------------------------------------------------------------ - void OBrowserLine::SetComponentHelpIds( const SmartId& _rHelpId, sal_uInt32 _bPrimaryButtonId, sal_uInt32 _nSecondaryButtonId ) + void OBrowserLine::SetComponentHelpIds( const rtl::OString& _rHelpId, sal_uInt32 _bPrimaryButtonId, sal_uInt32 _nSecondaryButtonId ) { if ( m_pControlWindow ) - m_pControlWindow->SetSmartHelpId( _rHelpId ); + // FIXME: HELPID + m_pControlWindow->SetHelpId( _rHelpId ); if ( m_pBrowseButton ) { - m_pBrowseButton->SetSmartHelpId( _rHelpId ); - m_pBrowseButton->SetUniqueId( _bPrimaryButtonId ); + // FIXME: HELPID + m_pBrowseButton->SetHelpId( _rHelpId ); + // FIXME: HELPID + m_pBrowseButton->SetUniqueId( ""/*_bPrimaryButtonId*/ ); if ( m_pAdditionalBrowseButton ) { - m_pAdditionalBrowseButton->SetSmartHelpId( _rHelpId ); - m_pAdditionalBrowseButton->SetUniqueId( _nSecondaryButtonId ); + // FIXME: HELPID + m_pAdditionalBrowseButton->SetHelpId( _rHelpId ); + // FIXME: HELPID + m_pAdditionalBrowseButton->SetUniqueId( ""/*_nSecondaryButtonId*/ ); } } } diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx index f7b92524c..8883f6a8b 100644 --- a/extensions/source/propctrlr/browserline.hxx +++ b/extensions/source/propctrlr/browserline.hxx @@ -92,7 +92,8 @@ namespace pcr const ::rtl::OUString& GetEntryName() const { return m_sEntryName; } - void SetComponentHelpIds( const SmartId& _rHelpId, sal_uInt32 _bPrimaryButtonId, sal_uInt32 _nSecondaryButtonId ); + // FIXME: HELPID + void SetComponentHelpIds( const rtl::OString& _rHelpId, sal_uInt32 _bPrimaryButtonId, sal_uInt32 _nSecondaryButtonId ); void SetTitle(const String& rString ); void FullFillTitleString(); diff --git a/extensions/source/propctrlr/pcrcommon.cxx b/extensions/source/propctrlr/pcrcommon.cxx index 8949e9b40..e6c90c083 100644 --- a/extensions/source/propctrlr/pcrcommon.cxx +++ b/extensions/source/propctrlr/pcrcommon.cxx @@ -51,12 +51,17 @@ namespace pcr //= HelpIdUrl //======================================================================== //------------------------------------------------------------------------ - SmartId HelpIdUrl::getHelpId( const ::rtl::OUString& _rHelpURL ) + rtl::OString HelpIdUrl::getHelpId( const ::rtl::OUString& _rHelpURL ) { + // FIXME: HELPID + #if 0 SmartId aSmartHelpId( _rHelpURL ); if ( 0 == _rHelpURL.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "HID:" ) ) ) aSmartHelpId = SmartId( _rHelpURL.copy( sizeof( "HID:" ) - 1 ).toInt32() ); return aSmartHelpId; + #else + return rtl::OUStringToOString( _rHelpURL, RTL_TEXTENCODING_UTF8 ); + #endif } //------------------------------------------------------------------------ diff --git a/extensions/source/propctrlr/pcrcommon.hxx b/extensions/source/propctrlr/pcrcommon.hxx index d8699e6f4..1b34cc5eb 100644 --- a/extensions/source/propctrlr/pcrcommon.hxx +++ b/extensions/source/propctrlr/pcrcommon.hxx @@ -37,7 +37,6 @@ #include <com/sun/star/beans/PropertyChangeEvent.hpp> /** === end UNO includes === **/ -#include <vcl/smartid.hxx> #include <tools/string.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <comphelper/listenernotification.hxx> @@ -78,7 +77,8 @@ namespace pcr class HelpIdUrl { public: - static SmartId getHelpId( const ::rtl::OUString& _rHelpURL ); + // FIXME: HELPID + static rtl::OString getHelpId( const ::rtl::OUString& _rHelpURL ); static ::rtl::OUString getHelpURL( sal_uInt32 _nHelpId ); }; diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 26f0da8df..a270b3a76 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -1273,7 +1273,8 @@ namespace pcr // this category does not yet exist. This is allowed, as an inspector model might be lazy, and not provide // any category information of its own. In this case, we have a fallback ... m_aPageIds[ aDescriptor.Category ] = - getPropertyBox().AppendPage( aDescriptor.Category, SmartId() ); + // FIXME: HELPID + getPropertyBox().AppendPage( aDescriptor.Category, rtl::OString() ); nTargetPageId = impl_getPageIdForCategory_nothrow( aDescriptor.Category ); } diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx index 6a47ab17a..1cd840f4e 100644 --- a/extensions/source/propctrlr/propertyeditor.cxx +++ b/extensions/source/propctrlr/propertyeditor.cxx @@ -220,7 +220,7 @@ namespace pcr } //------------------------------------------------------------------ - sal_uInt16 OPropertyEditor::AppendPage( const String & _rText, const SmartId& _rHelpId ) + sal_uInt16 OPropertyEditor::AppendPage( const String & _rText, const rtl::OString& _rHelpId ) { // obtain a new id sal_uInt16 nId = m_nNextId++; @@ -236,7 +236,8 @@ namespace pcr pPage->getListBox().SetObserver(m_pObserver); pPage->getListBox().EnableHelpSection( m_bHasHelpSection ); pPage->getListBox().SetHelpLineLimites( m_nMinHelpLines, m_nMaxHelpLines ); - pPage->SetSmartHelpId( _rHelpId ); + // FIXME: HELPID + pPage->SetHelpId( _rHelpId ); // immediately activate the page m_aTabControl.SetTabPage(nId, pPage); @@ -248,8 +249,13 @@ namespace pcr //------------------------------------------------------------------ void OPropertyEditor::SetHelpId( sal_uInt32 nHelpId ) { - Control::SetHelpId(0); + Control::SetHelpId(""); + // FIXME: HELPID + #if 0 m_aTabControl.SetHelpId(nHelpId); + #else + (void)nHelpId; + #endif } //------------------------------------------------------------------ diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx index 5898b7053..2f8cd97f2 100644 --- a/extensions/source/propctrlr/propertyeditor.hxx +++ b/extensions/source/propctrlr/propertyeditor.hxx @@ -98,7 +98,8 @@ namespace pcr void SetHelpLineLimites( sal_Int32 _nMinLines, sal_Int32 _nMaxLines ); void SetHelpId( sal_uInt32 nHelpId ); - sal_uInt16 AppendPage( const String& r, const SmartId& _rHelpId ); + // FIXME: HELPID + sal_uInt16 AppendPage( const String& r, const rtl::OString& _rHelpId ); void SetPage( sal_uInt16 ); void RemovePage(sal_uInt16 nID); sal_uInt16 GetCurPage(); diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index 1f6a3c170..b750b351b 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -210,7 +210,8 @@ DigitalSignaturesDialog::DigitalSignaturesDialog( ,m_bWarningShowSignMacro(false) { // --> PB #i48253 the tablistbox needs its own unique id - maSignaturesLB.Window::SetUniqueId( HID_XMLSEC_TREE_SIGNATURESDLG ); + // FIXME: HELPID + maSignaturesLB.Window::SetUniqueId( ""/*HID_XMLSEC_TREE_SIGNATURESDLG*/ ); // <-- static long nTabs[] = { 4, 0, 6*DS_LB_WIDTH/100, 36*DS_LB_WIDTH/100, 74*DS_LB_WIDTH/100 }; maSignaturesLB.SetTabs( &nTabs[ 0 ] ); |