From 0325cb7921252c530656c1c4dd8dd8aa8401f30e Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Fri, 4 Jun 2010 13:46:22 +0200 Subject: changehid: #i111874# remove SmartId, make HID of type rtl::OString, fill in dummies for all explicit help ids --- automation/inc/automation/commtypes.hxx | 3 +- automation/source/inc/cmdbasestream.hxx | 25 +- automation/source/inc/testapp.hxx | 3 +- automation/source/miniapp/testapp.cxx | 3 +- automation/source/server/cmdbasestream.cxx | 28 +- automation/source/server/recorder.cxx | 133 +++++++--- automation/source/server/recorder.hxx | 9 +- automation/source/server/retstrm.cxx | 19 +- automation/source/server/retstrm.hxx | 25 +- automation/source/server/server.cxx | 2 +- automation/source/server/sta_list.cxx | 50 ++-- automation/source/server/statemnt.cxx | 284 ++++++++++++++------- automation/source/server/statemnt.hxx | 27 +- automation/source/testtool/cmdstrm.cxx | 5 +- automation/source/testtool/cretstrm.hxx | 2 +- automation/source/testtool/objtest.cxx | 174 ++++++++++--- automation/source/testtool/objtest.hxx | 25 +- basctl/source/basicide/basdoc.cxx | 3 +- basctl/source/basicide/baside2b.cxx | 18 +- basctl/source/basicide/baside3.cxx | 3 +- basctl/source/basicide/basides1.cxx | 9 +- basctl/source/basicide/bastypes.cxx | 3 +- basctl/source/dlged/managelang.cxx | 3 +- cui/source/customize/cfg.cxx | 43 +++- cui/source/customize/eventdlg.cxx | 3 +- cui/source/customize/macropg.cxx | 6 +- cui/source/dialogs/SpellDialog.cxx | 21 +- cui/source/dialogs/cuigaldlg.cxx | 3 +- cui/source/dialogs/hangulhanjadlg.cxx | 30 ++- cui/source/dialogs/hldoctp.cxx | 3 +- cui/source/dialogs/hlinettp.cxx | 3 +- cui/source/dialogs/hlmailtp.cxx | 3 +- cui/source/dialogs/iconcdlg.cxx | 12 +- cui/source/dialogs/insrc.cxx | 3 +- cui/source/dialogs/linkdlg.cxx | 3 +- cui/source/dialogs/pastedlg.cxx | 6 +- cui/source/dialogs/postdlg.cxx | 12 +- cui/source/factory/dlgfact.cxx | 12 +- cui/source/inc/cfg.hxx | 3 +- cui/source/inc/dlgname.hxx | 3 +- cui/source/options/connpooloptions.cxx | 6 +- cui/source/options/dbregister.cxx | 6 +- cui/source/options/fontsubs.cxx | 3 +- cui/source/options/optcolor.cxx | 12 +- cui/source/options/optfltr.cxx | 5 +- cui/source/options/optjava.cxx | 3 +- cui/source/options/optlingu.cxx | 12 +- cui/source/options/optpath.cxx | 6 +- cui/source/options/treeopt.cxx | 3 +- cui/source/tabpages/autocdlg.cxx | 15 +- cui/source/tabpages/numpages.cxx | 12 +- cui/source/tabpages/tpbitmap.cxx | 9 +- cui/source/tabpages/tpcolor.cxx | 24 +- cui/source/tabpages/tpgradnt.cxx | 6 +- cui/source/tabpages/tphatch.cxx | 6 +- cui/source/tabpages/tplnedef.cxx | 6 +- cui/source/tabpages/tplneend.cxx | 6 +- extensions/source/abpilot/abspilot.cxx | 15 +- extensions/source/bibliography/framectr.cxx | 3 +- extensions/source/bibliography/general.cxx | 3 +- extensions/source/dbpilots/gridwizard.cxx | 12 +- extensions/source/dbpilots/groupboxwiz.cxx | 12 +- extensions/source/dbpilots/listcombowizard.cxx | 12 +- extensions/source/propctrlr/browserline.cxx | 17 +- extensions/source/propctrlr/browserline.hxx | 3 +- extensions/source/propctrlr/pcrcommon.cxx | 7 +- extensions/source/propctrlr/pcrcommon.hxx | 4 +- extensions/source/propctrlr/propcontroller.cxx | 3 +- extensions/source/propctrlr/propertyeditor.cxx | 12 +- extensions/source/propctrlr/propertyeditor.hxx | 3 +- .../source/dialogs/digitalsignaturesdialog.cxx | 3 +- 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 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 #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 #include -#include 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(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(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(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(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(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 #include -#include #include 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(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 -#include #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(pProfiler->GetPartitioningTime()) ); // GetPartitioningTime() ULONG != comm_ULONG on 64bit + pRet->GenReturn( RET_ProfileInfo, rtl::OString( S_ProfileTime ), static_cast(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(pWin->GetSmartUniqueOrHelpId().GetNum())); //GetNum() ULONG != comm_ULONG on 64bit + { + // FIXME: HELPID + #if 0 + pRet->GenReturn( RET_Value, aSmartMethodId, static_cast(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 #include #include -#include #include 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 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 #include "cmdstrm.hxx" #include -#include #include "httprequest.hxx" #include @@ -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 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 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 /** === end UNO includes === **/ -#include #include #include #include @@ -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 ] ); -- cgit v1.2.3 From a3d49b8594c31c4d89a84f6bea8f78b8695b6d40 Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Fri, 4 Jun 2010 19:27:35 +0200 Subject: fix warnings --- automation/source/server/retstrm.cxx | 2 ++ automation/source/server/sta_list.cxx | 2 ++ automation/source/server/statemnt.cxx | 1 + automation/source/testtool/objtest.cxx | 4 ++++ 4 files changed, 9 insertions(+) diff --git a/automation/source/server/retstrm.cxx b/automation/source/server/retstrm.cxx index 447b64721..7091cc386 100644 --- a/automation/source/server/retstrm.cxx +++ b/automation/source/server/retstrm.cxx @@ -105,6 +105,8 @@ void RetStream::Write( rtl::OString* pId ) } else Write( static_cast(pId->GetNum()) ); ////GetNum() ULONG != comm_ULONG on 64bit + #else + (void)pId; #endif } diff --git a/automation/source/server/sta_list.cxx b/automation/source/server/sta_list.cxx index a518d28b9..695018e14 100644 --- a/automation/source/server/sta_list.cxx +++ b/automation/source/server/sta_list.cxx @@ -454,6 +454,8 @@ BOOL SearchUID::IsWinOK( Window *pWin ) return FALSE; } else + #else + (void)pWin; #endif return FALSE; } diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx index f8871a7da..20480761f 100644 --- a/automation/source/server/statemnt.cxx +++ b/automation/source/server/statemnt.cxx @@ -327,6 +327,7 @@ static short ImpGetRType( Window *pWin, rtl::OString aUId ) } #else short nRT = 0; + (void)aUId; #endif #ifdef DBG_UTIL diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx index 2e0b23748..452484089 100644 --- a/automation/source/testtool/objtest.cxx +++ b/automation/source/testtool/objtest.cxx @@ -240,6 +240,8 @@ void ControlDef::Write( SvStream &aStream ) if ( pSons ) for ( USHORT i = 0 ; pSons->Count() > i ; i++ ) ((ControlDef*)(*pSons)[i])->Write(aStream); + #else + (void)aStream; #endif } @@ -4092,6 +4094,7 @@ String TestToolObj::GetMethodName( ULONG nMethodId ) return Controls::pClasses->GetObject(nElement)->pData->Kurzname; #else (void)nElement; + (void)nMethodId; #endif } return String(); @@ -4111,6 +4114,7 @@ String TestToolObj::GetKeyName( USHORT nKeyCode ) return CmdStream::pKeyCodes->GetObject(nElement)->pData->Kurzname; #else (void)nElement; + (void)nKeyCode; #endif } return CUniString( "UnknownKeyCode" ); -- cgit v1.2.3 From 05305167d8b6cbc1d8a01dae8397cf0da78c3fc9 Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Fri, 4 Jun 2010 20:07:26 +0200 Subject: fix windows compile --- automation/source/server/sta_list.cxx | 7 +++++-- automation/source/testtool/objtest.cxx | 23 +++++++++++++++-------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/automation/source/server/sta_list.cxx b/automation/source/server/sta_list.cxx index 695018e14..9cfceeefb 100644 --- a/automation/source/server/sta_list.cxx +++ b/automation/source/server/sta_list.cxx @@ -174,7 +174,8 @@ void StatementList::SendProfile( String aText ) pRet->GenReturn( RET_ProfileInfo, rtl::OString(), pProfiler->GetProfileLine( aText ) ); if ( pProfiler->IsPartitioning() ) - pRet->GenReturn( RET_ProfileInfo, rtl::OString( S_ProfileTime ), static_cast(pProfiler->GetPartitioningTime()) ); // GetPartitioningTime() ULONG != comm_ULONG on 64bit + // FIXME: HELPID + pRet->GenReturn( RET_ProfileInfo, rtl::OString( /*S_ProfileTime*/ ), static_cast(pProfiler->GetPartitioningTime()) ); // GetPartitioningTime() ULONG != comm_ULONG on 64bit } if ( pProfiler->IsAutoProfiling() ) @@ -1086,7 +1087,9 @@ void StatementList::ReportError(String aMessage, ULONG nWhatever) void StatementList::DirectLog( ULONG nType, String aMessage ) { if ( pRet ) - pRet->GenReturn( RET_DirectLoging, rtl::OString(nType), aMessage ); + // FIXME: HELPID + pRet->GenReturn( RET_DirectLoging, rtl::OString(/*nType*/), aMessage ); + (void) nType; } diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx index 452484089..880741ea2 100644 --- a/automation/source/testtool/objtest.cxx +++ b/automation/source/testtool/objtest.cxx @@ -1184,7 +1184,8 @@ void TestToolObj::ReadFlat( String Filename, CNames *&pNames, BOOL bSortByName ) } aLongname = aLine.GetToken(0,cMyDelim); - aUId = rtl::OString( (ULONG)aLine.GetToken(1,cMyDelim).ToInt64() ); + // FIXME: HELPID + aUId = rtl::OUStringToOString( aLine.GetToken(1,cMyDelim), RTL_TEXTENCODING_UTF8 ); if ( bSortByName ) pNewItem = new ControlDef( aLongname, aUId ); @@ -1233,7 +1234,8 @@ void ReadFlatArray( const ControlDefLoad arWas [], CNames *&pNames ) while ( String::CreateFromAscii(arWas[nIndex].Kurzname).Len() > 0 ) { - rtl::OString aUId (arWas[nIndex].nUId); + // FIXME: HELPID + rtl::OString aUId;// (arWas[nIndex].nUId); const ControlItem *pX = new ControlDef( arWas[nIndex].Kurzname, aUId); pNames->C40_PTR_INSERT(ControlItem, pX); nIndex++; @@ -1541,7 +1543,7 @@ BOOL TestToolObj::ReadNamesBin( String Filename, CNames *&pSIds, CNames *&pContr { comm_ULONG nUId; aStream >> nUId; - aUId = rtl::OString( nUId ); + aUId = rtl::OString();// nUId; } if (aName.GetChar(0) == '*' || bIsFlat ) // Globaler Kurzname (Dialogname oder SId) @@ -2218,7 +2220,8 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, if ( !IsError() && ((SbxTransportMethod*)pVar)->nValue & M_WITH_RETURN ) { pImpl->pNextReturn = ((SbxTransportMethod*)pVar); - aNextReturnId = rtl::OString( ((SbxTransportMethod*)pVar)->nValue ); + // FIXME: HELPID + aNextReturnId = rtl::OString();// ((SbxTransportMethod*)pVar)->nValue ); } if ( SingleCommandBlock ) EndBlock(); @@ -2291,7 +2294,8 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, { In->GenCmdControl (pMember->GetULong(), (USHORT)((SbxTransportMethod*)pVar)->nValue, rPar); - aNextReturnId = rtl::OString( pMember->GetULong() ); + // FIXME: HELPID + aNextReturnId = rtl::OString();// pMember->GetULong() ); } else { @@ -3789,7 +3793,8 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) if ( m_pReverseControls ) { USHORT nNr; - ControlItem *pNewItem = new ControlItemUId( String(), rtl::OString( nLNr1 ) ); + // FIXME: HELPID + ControlItem *pNewItem = new ControlItemUId( String(), rtl::OString( /*nLNr1*/ ) ); if ( m_pReverseControls->Seek_Entry(pNewItem,&nNr) ) aULongNames = m_pReverseControls->GetObject(nNr)->pData->Kurzname; delete pNewItem; @@ -4144,7 +4149,8 @@ static ControlDefLoad __READONLY_DATA arRes_Type [] = bFound = FALSE; if ( aType.CompareTo(UIdKenn) == COMPARE_EQUAL ) { - aResult = pShortNames->GetName(rtl::OString(nNumber)); + // FIXME: HELPID + aResult = pShortNames->GetName(rtl::OString(/*nNumber*/)); bFound = TRUE; } if ( aType.CompareTo(MethodKenn ) == COMPARE_EQUAL ) @@ -4198,7 +4204,8 @@ static ControlDefLoad __READONLY_DATA arRes_Type [] = } if ( aType.CompareTo(SlotKenn ) == COMPARE_EQUAL ) { - aResult = pShortNames->GetName(rtl::OString(nNumber)); + // FIXME: HELPID + aResult = pShortNames->GetName(rtl::OString(/*nNumber*/)); bFound = TRUE; } if ( aType.CompareTo(TabKenn ) == COMPARE_EQUAL ) -- cgit v1.2.3 From 5545a6f1cab4772647e742ea9876f798409ec761 Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Sat, 5 Jun 2010 13:58:32 +0200 Subject: fix warnings --- cui/source/dialogs/insrc.cxx | 1 + cui/source/factory/dlgfact.cxx | 2 ++ extensions/source/propctrlr/browserline.cxx | 2 ++ 3 files changed, 5 insertions(+) diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx index 534401ed3..4a5acd95c 100644 --- a/cui/source/dialogs/insrc.cxx +++ b/cui/source/dialogs/insrc.cxx @@ -72,6 +72,7 @@ SvxInsRowColDlg::SvxInsRowColDlg(Window* pParent, bool bCol, ULONG nHelpId ) SetText( aTmp ); // FIXME: HELPID SetHelpId( ""/*nHelpId*/ ); + (void)nHelpId; } short SvxInsRowColDlg::Execute(void) diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 02efd57cf..8b0240f06 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -731,6 +731,7 @@ void AbstractSvxNameDialog_Impl::SetHelpId( ULONG nHelpId ) { // FIXME: HELPID pDlg->SetHelpId( ""/*nHelpId*/ ); + (void)nHelpId; } void AbstractSvxNameDialog_Impl::SetText( const XubString& rStr ) { @@ -846,6 +847,7 @@ void AbstractSvxMultiFileDialog_Impl::SetHelpId( ULONG nHelpId ) { // FIXME: HELPID pDlg->SetHelpId( ""/*nHelpId*/ ); + (void)nHelpId; } Window * AbstractSvxHpLinkDlg_Impl::GetWindow() diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx index 8787a577b..c4ebf2fa5 100644 --- a/extensions/source/propctrlr/browserline.cxx +++ b/extensions/source/propctrlr/browserline.cxx @@ -117,6 +117,7 @@ namespace pcr m_pBrowseButton->SetHelpId( _rHelpId ); // FIXME: HELPID m_pBrowseButton->SetUniqueId( ""/*_bPrimaryButtonId*/ ); + (void)_bPrimaryButtonId; if ( m_pAdditionalBrowseButton ) { @@ -124,6 +125,7 @@ namespace pcr m_pAdditionalBrowseButton->SetHelpId( _rHelpId ); // FIXME: HELPID m_pAdditionalBrowseButton->SetUniqueId( ""/*_nSecondaryButtonId*/ ); + (void)_nSecondaryButtonId; } } } -- cgit v1.2.3 From 08b09445b7a6410796948c53133328f526797d8c Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Mon, 7 Jun 2010 11:58:56 +0200 Subject: fix warnings --- extensions/source/propctrlr/browserview.cxx | 3 ++- extensions/source/propctrlr/propertyeditor.cxx | 3 +++ extensions/source/propctrlr/propertyeditor.hxx | 1 - 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/extensions/source/propctrlr/browserview.cxx b/extensions/source/propctrlr/browserview.cxx index 0bf7be375..dd39f1bae 100644 --- a/extensions/source/propctrlr/browserview.cxx +++ b/extensions/source/propctrlr/browserview.cxx @@ -56,7 +56,8 @@ namespace pcr DBG_CTOR(OPropertyBrowserView,NULL); m_pPropBox = new OPropertyEditor( this ); - m_pPropBox->SetHelpId(HID_FM_PROPDLG_TABCTR); + // FIXME: HELPID + m_pPropBox->SetHelpId(""/*HID_FM_PROPDLG_TABCTR*/); m_pPropBox->setPageActivationHandler(LINK(this, OPropertyBrowserView, OnPageActivation)); m_pPropBox->Show(); diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx index 1cd840f4e..6e9a731bc 100644 --- a/extensions/source/propctrlr/propertyeditor.cxx +++ b/extensions/source/propctrlr/propertyeditor.cxx @@ -246,6 +246,8 @@ namespace pcr return nId; } +// FIXME: HELPID +#if 0 //------------------------------------------------------------------ void OPropertyEditor::SetHelpId( sal_uInt32 nHelpId ) { @@ -257,6 +259,7 @@ namespace pcr (void)nHelpId; #endif } +#endif //------------------------------------------------------------------ void OPropertyEditor::RemovePage(sal_uInt16 nID) diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx index 2f8cd97f2..1533ae1da 100644 --- a/extensions/source/propctrlr/propertyeditor.hxx +++ b/extensions/source/propctrlr/propertyeditor.hxx @@ -97,7 +97,6 @@ namespace pcr void SetHelpText( const ::rtl::OUString& _rHelpText ); void SetHelpLineLimites( sal_Int32 _nMinLines, sal_Int32 _nMaxLines ); - void SetHelpId( sal_uInt32 nHelpId ); // FIXME: HELPID sal_uInt16 AppendPage( const String& r, const rtl::OString& _rHelpId ); void SetPage( sal_uInt16 ); -- cgit v1.2.3 From c04f962b57b5807be04f625ff6a2e5aaa11caea8 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Sat, 10 Jul 2010 18:21:24 +0200 Subject: CWS changehid: #i111874#: change code to support HelpIds as byte strings --- automation/source/miniapp/servres.src | 4 - automation/source/miniapp/servuid.hxx | 22 +- basctl/inc/helpid.hrc | 78 +-- basctl/source/basicide/basdoc.cxx | 37 -- basctl/source/basicide/basdoc.hxx | 1 - basctl/source/basicide/baside2b.cxx | 18 +- basctl/source/basicide/baside3.cxx | 3 +- basctl/source/basicide/basides1.cxx | 9 +- basctl/source/basicide/basidesh.src | 16 +- basctl/source/basicide/bastypes.cxx | 3 +- basctl/source/basicide/makefile.mk | 2 +- basctl/source/basicide/tbxctl.src | 273 -------- basctl/source/dlged/managelang.cxx | 3 +- cui/source/customize/cfg.cxx | 112 +--- cui/source/customize/eventdlg.cxx | 3 +- cui/source/customize/macropg.cxx | 6 +- cui/source/dialogs/SpellDialog.cxx | 21 +- cui/source/dialogs/charmap.src | 24 +- cui/source/dialogs/cuigaldlg.cxx | 3 +- cui/source/dialogs/grfflt.src | 10 +- cui/source/dialogs/hangulhanjadlg.cxx | 30 +- cui/source/dialogs/hldoctp.cxx | 3 +- cui/source/dialogs/hlinettp.cxx | 3 +- cui/source/dialogs/hlmailtp.cxx | 3 +- cui/source/dialogs/hyperdlg.src | 2 +- cui/source/dialogs/iconcdlg.cxx | 12 +- cui/source/dialogs/insrc.cxx | 6 +- cui/source/dialogs/linkdlg.cxx | 3 +- cui/source/dialogs/pastedlg.cxx | 6 +- cui/source/dialogs/postdlg.cxx | 12 +- cui/source/dialogs/postdlg.src | 3 +- cui/source/dialogs/thesdlg.src | 2 +- cui/source/dialogs/zoom.cxx | 2 +- cui/source/dialogs/zoom.src | 3 +- cui/source/factory/dlgfact.cxx | 56 +- cui/source/factory/dlgfact.hxx | 12 +- cui/source/inc/cfg.hxx | 3 +- cui/source/inc/dlgname.hxx | 3 +- cui/source/inc/helpid.hrc | 698 ++++++++++----------- cui/source/inc/insrc.hxx | 2 +- cui/source/options/connpooloptions.cxx | 6 +- cui/source/options/dbregister.cxx | 6 +- cui/source/options/fontsubs.cxx | 3 +- cui/source/options/optcolor.cxx | 102 ++- cui/source/options/optfltr.cxx | 5 +- cui/source/options/optjava.cxx | 3 +- cui/source/options/optlingu.cxx | 12 +- cui/source/options/optpath.cxx | 6 +- cui/source/options/treeopt.cxx | 3 +- cui/source/tabpages/autocdlg.cxx | 15 +- cui/source/tabpages/autocdlg.src | 2 +- cui/source/tabpages/numpages.cxx | 12 +- cui/source/tabpages/tpbitmap.cxx | 9 +- cui/source/tabpages/tpcolor.cxx | 24 +- cui/source/tabpages/tpgradnt.cxx | 6 +- cui/source/tabpages/tphatch.cxx | 6 +- cui/source/tabpages/tplnedef.cxx | 6 +- cui/source/tabpages/tplneend.cxx | 6 +- extensions/inc/abpilot.hrc | 18 +- extensions/inc/bibliography.hrc | 100 ++- extensions/inc/dbpilots.hrc | 38 +- extensions/inc/propctrlr.hrc | 599 +++++++++--------- extensions/inc/update.hrc | 26 +- extensions/source/abpilot/abspilot.cxx | 15 +- extensions/source/bibliography/datman.cxx | 4 +- extensions/source/bibliography/framectr.cxx | 3 +- extensions/source/bibliography/general.cxx | 17 +- extensions/source/bibliography/general.hxx | 4 +- extensions/source/bibliography/toolbar.src | 77 +-- extensions/source/dbpilots/gridwizard.cxx | 12 +- extensions/source/dbpilots/groupboxwiz.cxx | 12 +- extensions/source/dbpilots/listcombowizard.cxx | 12 +- extensions/source/propctrlr/browserline.cxx | 13 +- extensions/source/propctrlr/browserline.hxx | 3 +- extensions/source/propctrlr/browserlistbox.cxx | 4 +- extensions/source/propctrlr/browserview.cxx | 3 +- .../source/propctrlr/defaultforminspection.cxx | 2 +- .../source/propctrlr/eformspropertyhandler.cxx | 12 +- extensions/source/propctrlr/eventhandler.cxx | 16 +- extensions/source/propctrlr/eventhandler.hxx | 14 +- .../source/propctrlr/formcomponenthandler.cxx | 36 +- extensions/source/propctrlr/formmetadata.cxx | 14 +- extensions/source/propctrlr/formmetadata.hxx | 2 +- extensions/source/propctrlr/pcrcommon.cxx | 16 +- extensions/source/propctrlr/pcrcommon.hxx | 3 +- extensions/source/propctrlr/propcontroller.cxx | 1 - extensions/source/propctrlr/propertyeditor.cxx | 15 +- extensions/source/propctrlr/propertyeditor.hxx | 2 +- extensions/source/propctrlr/propertyinfo.hxx | 3 +- .../propctrlr/xsdvalidationpropertyhandler.cxx | 4 +- extensions/source/update/check/updatehdl.cxx | 20 +- .../source/dialogs/digitalsignaturesdialog.cxx | 3 +- xmlsecurity/source/dialogs/helpids.hrc | 44 +- 93 files changed, 1158 insertions(+), 1753 deletions(-) delete mode 100644 basctl/source/basicide/tbxctl.src diff --git a/automation/source/miniapp/servres.src b/automation/source/miniapp/servres.src index a0516a94a..cf553c394 100644 --- a/automation/source/miniapp/servres.src +++ b/automation/source/miniapp/servres.src @@ -54,7 +54,6 @@ ModalDialog GROSSER_TEST_DLG }; OKButton 1 { - HelpID = 1 ; Pos = MAP_APPFONT ( 132 , 92 ) ; Size = MAP_APPFONT ( 64 , 12 ) ; TabStop = TRUE ; @@ -176,7 +175,6 @@ Menu MENU_CLIENT MenuItem { Identifier = IDM_FILE ; - HelpID = IDM_FILE_HELP ; Text = "~File" ; SubMenu = Menu { @@ -185,7 +183,6 @@ Menu MENU_CLIENT MenuItem { Identifier = IDM_FILE_OPEN_TEST ; - HelpID = IDM_FILE_OPEN_TEST_HELP ; Text = "~Open Test Window" ; }; MenuItem @@ -196,7 +193,6 @@ Menu MENU_CLIENT MenuItem { Identifier = IDM_FILE_EXIT ; - HelpID = IDM_FILE_EXIT_HELP ; Text = "~Beenden" ; AccelKey = KeyCode { diff --git a/automation/source/miniapp/servuid.hxx b/automation/source/miniapp/servuid.hxx index 87bba9fa9..26ec5174a 100644 --- a/automation/source/miniapp/servuid.hxx +++ b/automation/source/miniapp/servuid.hxx @@ -24,14 +24,14 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define UID_GROSSER_TEST_DLG 101 -#define UID_CheckBox 202 -#define UID_TriStateBox 303 -#define UID_OKButton 404 -#define UID_TimeField 505 -#define UID_MultiLineEdit 606 -#define UID_RadioButton1 707 -#define UID_RadioButton2 708 -#define UID_MultiListBox 809 -#define UID_ComboBox 910 -#define UID_DateBox 1011 +#define UID_GROSSER_TEST_DLG "AUTOMATION_UID_GROSSER_TEST_DLG" +#define UID_CheckBox "AUTOMATION_UID_CheckBox" +#define UID_TriStateBox "AUTOMATION_UID_TriStateBox" +#define UID_OKButton "AUTOMATION_UID_OKButton" +#define UID_TimeField "AUTOMATION_UID_TimeField" +#define UID_MultiLineEdit "AUTOMATION_UID_MultiLineEdit" +#define UID_RadioButton1 "AUTOMATION_UID_RadioButton1" +#define UID_RadioButton2 "AUTOMATION_UID_RadioButton2" +#define UID_MultiListBox "AUTOMATION_UID_MultiListBox" +#define UID_ComboBox "AUTOMATION_UID_ComboBox" +#define UID_DateBox "AUTOMATION_UID_DateBox" diff --git a/basctl/inc/helpid.hrc b/basctl/inc/helpid.hrc index be1f441e2..926e0deb5 100644 --- a/basctl/inc/helpid.hrc +++ b/basctl/inc/helpid.hrc @@ -33,53 +33,53 @@ // Help-Ids -------------------------------------------------------------- -#define HID_BASICIDE_TOOLBOX (HID_BASICIDE_START + 0) -#define HID_BASICIDE_OBJECTS (HID_BASICIDE_START + 1) -#define HID_MACRO_OPTIONS (HID_BASICIDE_START + 2) -#define HID_BASICIDE_BRKPNTS (HID_BASICIDE_START + 3) -#define HID_BASICIDE_MODULS (HID_BASICIDE_START + 4) -#define HID_BASICIDE_LIBS_TP (HID_BASICIDE_START + 5) -#define HID_BASICIDE_LIBS_DLG (HID_BASICIDE_START + 6) -#define HID_BASICIDE_CONTROLS (HID_BASICIDE_START + 7) -#define HID_BASICIDE_MACROS (HID_BASICIDE_START + 8) -#define HID_BASICIDE_LIBS (HID_BASICIDE_START + 9) -#define HID_BASICIDE_ORG_TC (HID_BASICIDE_START + 10) +#define HID_BASICIDE_TOOLBOX "BASCTL_HID_BASICIDE_TOOLBOX" +#define HID_BASICIDE_OBJECTS "BASCTL_HID_BASICIDE_OBJECTS" +#define HID_MACRO_OPTIONS "BASCTL_HID_MACRO_OPTIONS" +#define HID_BASICIDE_BRKPNTS "BASCTL_HID_BASICIDE_BRKPNTS" +#define HID_BASICIDE_MODULS "BASCTL_HID_BASICIDE_MODULS" +#define HID_BASICIDE_LIBS_TP "BASCTL_HID_BASICIDE_LIBS_TP" +#define HID_BASICIDE_LIBS_DLG "BASCTL_HID_BASICIDE_LIBS_DLG" +#define HID_BASICIDE_CONTROLS "BASCTL_HID_BASICIDE_CONTROLS" +#define HID_BASICIDE_MACROS "BASCTL_HID_BASICIDE_MACROS" +#define HID_BASICIDE_LIBS "BASCTL_HID_BASICIDE_LIBS" +#define HID_BASICIDE_ORG_TC "BASCTL_HID_BASICIDE_ORG_TC" -#define HID_BASICIDE_MODULES_TREE (HID_BASICIDE_START + 11) -#define HID_BASICIDE_LIBS_TREE (HID_BASICIDE_START + 12) -#define HID_BASICIDE_LIBSDLG_TREE (HID_BASICIDE_START + 13) -#define HID_BASICIDE_OBJECTCAT (HID_BASICIDE_START + 14) +#define HID_BASICIDE_MODULES_TREE "BASCTL_HID_BASICIDE_MODULES_TREE" +#define HID_BASICIDE_LIBS_TREE "BASCTL_HID_BASICIDE_LIBS_TREE" +#define HID_BASICIDE_LIBSDLG_TREE "BASCTL_HID_BASICIDE_LIBSDLG_TREE" +#define HID_BASICIDE_OBJECTCAT "BASCTL_HID_BASICIDE_OBJECTCAT" -#define HID_BASICIDE_PROP_BROWSER (HID_BASICIDE_START + 15) +#define HID_BASICIDE_PROP_BROWSER "BASCTL_HID_BASICIDE_PROP_BROWSER" -#define HID_BASICIDE_PROP_BROWSER_LBOX (HID_BASICIDE_START + 16) +#define HID_BASICIDE_PROP_BROWSER_LBOX "BASCTL_HID_BASICIDE_PROP_BROWSER_LBOX" -#define HID_BASICIDE_OBJCAT_SHOW (HID_BASICIDE_START + 17) -#define HID_BASICIDE_OBJCAT_PROPS (HID_BASICIDE_START + 18) -#define HID_BASICIDE_OBJCAT_HELP (HID_BASICIDE_START + 19) +#define HID_BASICIDE_OBJCAT_SHOW "BASCTL_HID_BASICIDE_OBJCAT_SHOW" +#define HID_BASICIDE_OBJCAT_PROPS "BASCTL_HID_BASICIDE_OBJCAT_PROPS" +#define HID_BASICIDE_OBJCAT_HELP "BASCTL_HID_BASICIDE_OBJCAT_HELP" -#define HID_BASICIDE_BRKDLG (HID_BASICIDE_START + 20) -#define HID_BASICIDE_ACTIV (HID_BASICIDE_START + 21) -#define HID_BASICIDE_BRKPROPS (HID_BASICIDE_START + 22) -#define HID_BASICIDE_REMOVEWATCH (HID_BASICIDE_START + 23) -#define HID_BASICIDE_GOTOALL (HID_BASICIDE_START + 24) +#define HID_BASICIDE_BRKDLG "BASCTL_HID_BASICIDE_BRKDLG" +#define HID_BASICIDE_ACTIV "BASCTL_HID_BASICIDE_ACTIV" +#define HID_BASICIDE_BRKPROPS "BASCTL_HID_BASICIDE_BRKPROPS" +#define HID_BASICIDE_REMOVEWATCH "BASCTL_HID_BASICIDE_REMOVEWATCH" +#define HID_BASICIDE_GOTOALL "BASCTL_HID_BASICIDE_GOTOALL" -#define HID_BASICIDE_MODULWINDOW (HID_BASICIDE_START + 25) -#define HID_BASICIDE_DIALOGWINDOW (HID_BASICIDE_START + 26) +#define HID_BASICIDE_MODULWINDOW "BASCTL_HID_BASICIDE_MODULWINDOW" +#define HID_BASICIDE_DIALOGWINDOW "BASCTL_HID_BASICIDE_DIALOGWINDOW" -#define HID_BASICIDE_EDITORWINDOW (HID_BASICIDE_START + 27) -#define HID_BASICIDE_BREAKPOINTWINDOW (HID_BASICIDE_START + 28) -#define HID_BASICIDE_WATCHWINDOW (HID_BASICIDE_START + 29) -#define HID_BASICIDE_STACKWINDOW (HID_BASICIDE_START + 30) -#define HID_BASICIDE_TABBAR (HID_BASICIDE_START + 31) -#define HID_BASICIDE_WATCHWINDOW_EDIT (HID_BASICIDE_START + 32) -#define HID_BASICIDE_WATCHWINDOW_LIST (HID_BASICIDE_START + 33) -#define HID_BASICIDE_STACKWINDOW_LIST (HID_BASICIDE_START + 34) +#define HID_BASICIDE_EDITORWINDOW "BASCTL_HID_BASICIDE_EDITORWINDOW" +#define HID_BASICIDE_BREAKPOINTWINDOW "BASCTL_HID_BASICIDE_BREAKPOINTWINDOW" +#define HID_BASICIDE_WATCHWINDOW "BASCTL_HID_BASICIDE_WATCHWINDOW" +#define HID_BASICIDE_STACKWINDOW "BASCTL_HID_BASICIDE_STACKWINDOW" +#define HID_BASICIDE_TABBAR "BASCTL_HID_BASICIDE_TABBAR" +#define HID_BASICIDE_WATCHWINDOW_EDIT "BASCTL_HID_BASICIDE_WATCHWINDOW_EDIT" +#define HID_BASICIDE_WATCHWINDOW_LIST "BASCTL_HID_BASICIDE_WATCHWINDOW_LIST" +#define HID_BASICIDE_STACKWINDOW_LIST "BASCTL_HID_BASICIDE_STACKWINDOW_LIST" -#define HID_BASICIDE_MANAGE_LANGUAGE (HID_BASICIDE_START + 35) -#define HID_BASICIDE_SETDEFAULT_LANGUAGE (HID_BASICIDE_START + 36) -#define HID_BASICIDE_ADDNEW_LANGUAGE (HID_BASICIDE_START + 37) -#define HID_BASICIDE_ADDNEW_CONTROL (HID_BASICIDE_START + 38) +#define HID_BASICIDE_MANAGE_LANGUAGE "BASCTL_HID_BASICIDE_MANAGE_LANGUAGE" +#define HID_BASICIDE_SETDEFAULT_LANGUAGE "BASCTL_HID_BASICIDE_SETDEFAULT_LANGUAGE" +#define HID_BASICIDE_ADDNEW_LANGUAGE "BASCTL_HID_BASICIDE_ADDNEW_LANGUAGE" +#define HID_BASICIDE_ADDNEW_CONTROL "BASCTL_HID_BASICIDE_ADDNEW_CONTROL" #endif diff --git a/basctl/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx index 00670fdac..5fd7c4139 100644 --- a/basctl/source/basicide/basdoc.cxx +++ b/basctl/source/basicide/basdoc.cxx @@ -88,43 +88,6 @@ void BasicDocShell::SetPrinter( SfxPrinter* pPr ) } } -void BasicDocShell::FillStatusBar( StatusBar& rStatusBar ) -{ - String aTmp; - - // Titel - aTmp.Fill( 30, 'X' ); - rStatusBar.InsertItem( SID_BASICIDE_STAT_TITLE, - rStatusBar.GetTextWidth( aTmp ), SIB_AUTOSIZE | SIB_LEFT); - - // Modify - rStatusBar.InsertItem( SID_DOC_MODIFIED, - rStatusBar.GetTextWidth( '*' ) ); - - // signatures - rStatusBar.InsertItem( SID_SIGNATURE, XmlSecStatusBarControl::GetDefItemWidth( rStatusBar ), SIB_USERDRAW ); - // FIXME: HELPID - rStatusBar.SetHelpId(SID_SIGNATURE, ""/*SID_SIGNATURE*/); - - // Position - aTmp.Erase(); - aTmp.Fill( 15, 'X' ); - rStatusBar.InsertItem( SID_BASICIDE_STAT_POS, - rStatusBar.GetTextWidth( aTmp ), SIB_LEFT); - - // Insert/Overwrite - rStatusBar.InsertItem( SID_ATTR_INSERT, - rStatusBar.GetTextWidth( String( RTL_CONSTASCII_USTRINGPARAM( "XXXXX" /* "EINFG" */ ) ) ) ); - - // Uhrzeit - aTmp.Fill( 20, 'X' ); - rStatusBar.InsertItem( SID_ATTR_SIZE, - rStatusBar.GetTextWidth( aTmp ), SIB_AUTOSIZE | SIB_LEFT | SIB_USERDRAW ); - -// return pStatusBar; - -} - void BasicDocShell::FillClass( SvGlobalName*, sal_uInt32*, String*, String*, String*, sal_Int32, sal_Bool bTemplate) const { (void)bTemplate; diff --git a/basctl/source/basicide/basdoc.hxx b/basctl/source/basicide/basdoc.hxx index 92aa8ed33..eff5afe19 100644 --- a/basctl/source/basicide/basdoc.hxx +++ b/basctl/source/basicide/basdoc.hxx @@ -39,7 +39,6 @@ class BasicDocShell: public SfxObjectShell SfxPrinter* pPrinter; protected: - virtual void FillStatusBar( StatusBar& rBar); virtual void Draw( OutputDevice *, const JobSetup & rSetup, USHORT nAspect = ASPECT_CONTENT ); virtual void FillClass( SvGlobalName * pClassName, diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 75129d190..027ce45b6 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -177,8 +177,7 @@ EditorWindow::EditorWindow( Window* pParent ) : Wallpaper(GetSettings().GetStyleSettings().GetFieldColor())); SetPointer( Pointer( POINTER_TEXT ) ); - // FIXME: HELPID - SetHelpId( ""/*HID_BASICIDE_EDITORWINDOW*/ ); + SetHelpId( HID_BASICIDE_EDITORWINDOW ); pSourceViewConfig->AddListener(this); } @@ -949,8 +948,7 @@ BreakPointWindow::BreakPointWindow( Window* pParent ) : // Falls in EditEngine autom. gescrollt wurde, wuesste ich sonst nicht, // wo ich gerade stehe. - // FIXME: HELPID - SetHelpId( ""/*HID_BASICIDE_BREAKPOINTWINDOW*/ ); + SetHelpId( HID_BASICIDE_BREAKPOINTWINDOW ); } @@ -1189,8 +1187,7 @@ WatchWindow::WatchWindow( Window* pParent ) : nVirtToolBoxHeight = aXEdit.GetSizePixel().Height() + 7; nHeaderBarHeight = 16; - // FIXME: HELPID - aTreeListBox.SetHelpId(""/*HID_BASICIDE_WATCHWINDOW_LIST*/); + aTreeListBox.SetHelpId(HID_BASICIDE_WATCHWINDOW_LIST); aTreeListBox.EnableInplaceEditing( TRUE ); aTreeListBox.SetSelectHdl( LINK( this, WatchWindow, TreeListHdl ) ); aTreeListBox.SetPosPixel( Point( DWBORDER, nVirtToolBoxHeight + nHeaderBarHeight ) ); @@ -1242,8 +1239,7 @@ WatchWindow::WatchWindow( Window* pParent ) : SetText( String( IDEResId( RID_STR_WATCHNAME ) ) ); - // FIXME: HELPID - SetHelpId( ""/*HID_BASICIDE_WATCHWINDOW*/ ); + SetHelpId( HID_BASICIDE_WATCHWINDOW ); // make watch window keyboard accessible GetSystemWindow()->GetTaskPaneList()->AddWindow( this ); @@ -1526,8 +1522,7 @@ StackWindow::StackWindow( Window* pParent ) : aGotoCallButton( this, IDEResId( RID_IMGBTN_GOTOCALL ) ), aStackStr( IDEResId( RID_STR_STACK ) ) { - // FIXME: HELPID - aTreeListBox.SetHelpId(""/*HID_BASICIDE_STACKWINDOW_LIST*/); + aTreeListBox.SetHelpId(HID_BASICIDE_STACKWINDOW_LIST); aTreeListBox.SetPosPixel( Point( DWBORDER, nVirtToolBoxHeight ) ); aTreeListBox.SetHighlightRange(); aTreeListBox.SetSelectionMode( NO_SELECTION ); @@ -1536,8 +1531,7 @@ StackWindow::StackWindow( Window* pParent ) : SetText( String( IDEResId( RID_STR_STACKNAME ) ) ); - // FIXME: HELPID - SetHelpId( ""/*HID_BASICIDE_STACKWINDOW*/ ); + 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 5fd56c780..67ee7d8b0 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -124,8 +124,7 @@ DialogWindow::DialogWindow( Window* pParent, const ScriptDocument& rDocument, St pEditor->GetModel()->SetNotifyUndoActionHdl( LINK(this, DialogWindow, NotifyUndoActionHdl)); - // FIXME: HELPID - SetHelpId( ""/*HID_BASICIDE_DIALOGWINDOW*/ ); + 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 b21a21040..c6af09a89 100644 --- a/basctl/source/basicide/basides1.cxx +++ b/basctl/source/basicide/basides1.cxx @@ -1065,16 +1065,14 @@ void BasicIDEShell::SetCurWindow( IDEBaseWindow* pNewWin, BOOL bUpdateTabBar, BO AdjustPosSizePixel( Point( 0, 0 ), GetViewFrame()->GetWindow().GetOutputSizePixel() ); if( pCurWin->IsA( TYPE( ModulWindow ) ) ) { - // FIXME: HELPID - GetViewFrame()->GetWindow().SetHelpId( ""/*HID_BASICIDE_MODULWINDOW*/ ); + GetViewFrame()->GetWindow().SetHelpId( HID_BASICIDE_MODULWINDOW ); pModulLayout->SetModulWindow( (ModulWindow*)pCurWin ); pModulLayout->Show(); } else { pModulLayout->Hide(); - // FIXME: HELPID - GetViewFrame()->GetWindow().SetHelpId( ""/*HID_BASICIDE_DIALOGWINDOW*/ ); + GetViewFrame()->GetWindow().SetHelpId( HID_BASICIDE_DIALOGWINDOW ); } if ( bRememberAsCurrent ) @@ -1123,8 +1121,7 @@ void BasicIDEShell::SetCurWindow( IDEBaseWindow* pNewWin, BOOL bUpdateTabBar, BO else { SetWindow( pModulLayout ); - // FIXME: HELPID - GetViewFrame()->GetWindow().SetHelpId( ""/*HID_BASICIDE_MODULWINDOW*/ ); + GetViewFrame()->GetWindow().SetHelpId( HID_BASICIDE_MODULWINDOW ); SfxObjectShell::SetCurrentComponent( NULL ); } SetUndoManager( pCurWin ? pCurWin->GetUndoManager() : 0 ); diff --git a/basctl/source/basicide/basidesh.src b/basctl/source/basicide/basidesh.src index f2543b1f2..9a4173c0e 100644 --- a/basctl/source/basicide/basidesh.src +++ b/basctl/source/basicide/basidesh.src @@ -31,6 +31,8 @@ #include #endif #include "dlgresid.hrc" +#include +#include #define MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; }; @@ -442,13 +444,13 @@ Menu RID_POPUP_TABBAR MenuItem { Identifier = SID_BASICIDE_NEWMODULE ; - HelpId = SID_BASICIDE_NEWMODULE ; + HelpId = CMD_SID_BASICIDE_NEWMODULE ; Text [ en-US ] = "BASIC Module" ; }; MenuItem { Identifier = SID_BASICIDE_NEWDIALOG ; - HelpId = SID_BASICIDE_NEWDIALOG ; + HelpId = CMD_SID_BASICIDE_NEWDIALOG ; Text [ en-US ] = "BASIC Dialog" ; }; }; @@ -458,7 +460,7 @@ Menu RID_POPUP_TABBAR MenuItem { Identifier = SID_BASICIDE_DELETECURRENT ; - HelpId = SID_BASICIDE_DELETECURRENT ; + HelpId = CMD_SID_BASICIDE_DELETECURRENT ; /* ### ACHTUNG: Neuer Text in Resource? Löschen : L÷schen */ Text [ en-US ] = "Delete" ; /* ### ACHTUNG: Neuer Text in Resource? Modul oder Dialog löschen : Modul oder Dialog l÷schen */ @@ -466,13 +468,13 @@ Menu RID_POPUP_TABBAR MenuItem { Identifier = SID_BASICIDE_RENAMECURRENT ; - HelpId = SID_BASICIDE_RENAMECURRENT ; + HelpId = CMD_SID_BASICIDE_RENAMECURRENT ; Text [ en-US ] = "Rename" ; }; MenuItem { Identifier = SID_BASICIDE_HIDECURPAGE ; - HelpId = SID_BASICIDE_HIDECURPAGE ; + HelpId = CMD_SID_BASICIDE_HIDECURPAGE ; Text [ en-US ] = "Hide" ; }; MenuItem @@ -482,7 +484,7 @@ Menu RID_POPUP_TABBAR MenuItem { Identifier = SID_BASICIDE_MODULEDLG ; - HelpId = SID_BASICIDE_MODULEDLG ; + HelpId = CMD_SID_BASICIDE_MODULEDLG ; Text [ en-US ] = "Modules..." ; }; }; @@ -495,7 +497,7 @@ Menu RID_POPUP_DLGED MenuItem { Identifier = SID_SHOW_PROPERTYBROWSER ; - HelpId = SID_SHOW_PROPERTYBROWSER ; + HelpId = CMD_SID_SHOW_PROPERTYBROWSER ; Text [ en-US ] = "Properties..."; }; }; diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx index a17633c11..7bffee8ba 100644 --- a/basctl/source/basicide/bastypes.cxx +++ b/basctl/source/basicide/bastypes.cxx @@ -521,8 +521,7 @@ BasicIDETabBar::BasicIDETabBar( Window* pParent ) : { EnableEditMode( TRUE ); - // FIXME: HELPID - SetHelpId( ""/*HID_BASICIDE_TABBAR*/ ); + SetHelpId( HID_BASICIDE_TABBAR ); } void __EXPORT BasicIDETabBar::MouseButtonDown( const MouseEvent& rMEvt ) diff --git a/basctl/source/basicide/makefile.mk b/basctl/source/basicide/makefile.mk index 62c475511..8854e6bfc 100644 --- a/basctl/source/basicide/makefile.mk +++ b/basctl/source/basicide/makefile.mk @@ -81,7 +81,7 @@ SLOFILES = $(EXCEPTIONSFILES) \ $(SLO)$/objdlg.obj \ SRS1NAME=$(TARGET) -SRC1FILES= basidesh.src macrodlg.src moptions.src moduldlg.src objdlg.src brkdlg.src tbxctl.src basicprint.src +SRC1FILES= basidesh.src macrodlg.src moptions.src moduldlg.src objdlg.src brkdlg.src basicprint.src .INCLUDE : target.mk diff --git a/basctl/source/basicide/tbxctl.src b/basctl/source/basicide/tbxctl.src deleted file mode 100644 index defe36e46..000000000 --- a/basctl/source/basicide/tbxctl.src +++ /dev/null @@ -1,273 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "svx/svxids.hrc" -#include "tbxctl.hrc" -#include "helpid.hrc" -FloatingWindow RID_TBXCONTROLS -{ - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE ; - SVLook = TRUE ; - HelpId = HID_BASICIDE_CONTROLS ; - Text [ en-US ] = "Controls" ; - String RID_TOOLBOX - { - Text [ en-US ] = "Controls" ; - }; -}; -ToolBox RID_TOOLBOX -{ - SVLook = TRUE ; - // HelpId = HID_BASICIDE_CONTROLS ; - LineCount = 2 ; - ItemList = - { - ToolBoxItem - { - HelpId = SID_INSERT_PUSHBUTTON ; - Identifier = SID_INSERT_PUSHBUTTON ; - RadioCheck = TRUE ; - Text [ en-US ] = "Button" ; - /* ### ACHTUNG: Neuer Text in Resource? CommandButton einfügen : CommandButton einf³gen */ - }; - ToolBoxItem - { - HelpId = SID_INSERT_CHECKBOX ; - Identifier = SID_INSERT_CHECKBOX ; - RadioCheck = TRUE ; - Text [ en-US ] = "Check Box" ; - /* ### ACHTUNG: Neuer Text in Resource? CheckBox einfügen : CheckBox einf³gen */ - }; - ToolBoxItem - { - HelpId = SID_INSERT_FIXEDTEXT ; - Identifier = SID_INSERT_FIXEDTEXT ; - RadioCheck = TRUE ; - Text [ en-US ] = "Label field" ; - /* ### ACHTUNG: Neuer Text in Resource? Label einfügen : Label einf³gen */ - }; - ToolBoxItem - { - HelpId = SID_INSERT_LISTBOX ; - Identifier = SID_INSERT_LISTBOX ; - RadioCheck = TRUE ; - Text [ en-US ] = "List Box" ; - /* ### ACHTUNG: Neuer Text in Resource? ListBox einfügen : ListBox einf³gen */ - }; - ToolBoxItem - { - HelpId = SID_INSERT_HSCROLLBAR ; - Identifier = SID_INSERT_HSCROLLBAR ; - RadioCheck = TRUE ; - Text [ en-US ] = "Horizontal Scroll Bar" ; - /* ### ACHTUNG: Neuer Text in Resource? Horizontale ScrollBar einfügen : Horizontale ScrollBar einf³gen */ - }; - ToolBoxItem - { - HelpId = SID_INSERT_GROUPBOX ; - Identifier = SID_INSERT_GROUPBOX ; - RadioCheck = TRUE ; - Text [ en-US ] = "Group Box" ; - /* ### ACHTUNG: Neuer Text in Resource? GroupBox einfügen : GroupBox einf³gen */ - }; - ToolBoxItem - { - HelpId = SID_INSERT_HFIXEDLINE ; - Identifier = SID_INSERT_HFIXEDLINE ; - RadioCheck = TRUE ; - Text [ en-US ] = "Horizontal Line" ; - }; - ToolBoxItem - { - HelpId = SID_INSERT_DATEFIELD ; - Identifier = SID_INSERT_DATEFIELD ; - RadioCheck = TRUE ; - Text [ en-US ] = "Date Field"; - }; - ToolBoxItem - { - HelpId = SID_INSERT_NUMERICFIELD ; - Identifier = SID_INSERT_NUMERICFIELD ; - RadioCheck = TRUE ; - Text [ en-US ] = "Numeric Field"; - }; - ToolBoxItem - { - HelpId = SID_INSERT_FORMATTEDFIELD ; - Identifier = SID_INSERT_FORMATTEDFIELD ; - RadioCheck = TRUE ; - Text [ en-US ] = "Formatted Field"; - }; - ToolBoxItem - { - HelpId = SID_INSERT_FILECONTROL ; - Identifier = SID_INSERT_FILECONTROL ; - RadioCheck = TRUE ; - Text [ en-US ] = "File Selection"; - }; - ToolBoxItem - { - HelpId = SID_INSERT_TREECONTROL ; - Identifier = SID_INSERT_TREECONTROL ; - RadioCheck = TRUE ; - Text [ en-US ] = "Tree Control"; - }; - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - ToolBoxItem - { - HelpId = SID_SHOW_PROPERTYBROWSER ; - Identifier = SID_SHOW_PROPERTYBROWSER ; - Text [ en-US ] = "Properties" ; - }; - ToolBoxItem { Type = TOOLBOXITEM_BREAK ; }; - ToolBoxItem - { - HelpId = SID_INSERT_IMAGECONTROL ; - Identifier = SID_INSERT_IMAGECONTROL ; - RadioCheck = TRUE ; - Text [ en-US ] = "Image Control" ; - }; - ToolBoxItem - { - HelpId = SID_INSERT_RADIOBUTTON ; - Identifier = SID_INSERT_RADIOBUTTON ; - RadioCheck = TRUE ; - Text [ en-US ] = "Option Button" ; - /* ### ACHTUNG: Neuer Text in Resource? RadioButton einfügen : RadioButton einf³gen */ - }; - ToolBoxItem - { - HelpId = SID_INSERT_EDIT ; - Identifier = SID_INSERT_EDIT ; - RadioCheck = TRUE ; - Text [ en-US ] = "Text Box" ; - /* ### ACHTUNG: Neuer Text in Resource? Edit einfügen : Edit einf³gen */ - }; - ToolBoxItem - { - HelpId = SID_INSERT_COMBOBOX ; - Identifier = SID_INSERT_COMBOBOX ; - RadioCheck = TRUE ; - Text [ en-US ] = "Combo Box" ; - /* ### ACHTUNG: Neuer Text in Resource? ComboBox einfügen : ComboBox einf³gen */ - }; - ToolBoxItem - { - HelpId = SID_INSERT_VSCROLLBAR ; - Identifier = SID_INSERT_VSCROLLBAR ; - RadioCheck = TRUE ; - Text [ en-US ] = "Vertical Scroll Bar" ; - /* ### ACHTUNG: Neuer Text in Resource? Vertikale ScrollBar einfügen : Vertikale ScrollBar einf³gen */ - }; - ToolBoxItem - { - HelpId = SID_INSERT_PROGRESSBAR ; - Identifier = SID_INSERT_PROGRESSBAR ; - RadioCheck = TRUE ; - Text [ en-US ] = "Progress Bar" ; - }; - ToolBoxItem - { - HelpId = SID_INSERT_VFIXEDLINE ; - Identifier = SID_INSERT_VFIXEDLINE ; - RadioCheck = TRUE ; - Text [ en-US ] = "Vertical Line" ; - }; - ToolBoxItem - { - HelpId = SID_INSERT_TIMEFIELD ; - Identifier = SID_INSERT_TIMEFIELD ; - RadioCheck = TRUE ; - Text [ en-US ] = "Time Field"; - }; - ToolBoxItem - { - HelpId = SID_INSERT_CURRENCYFIELD ; - Identifier = SID_INSERT_CURRENCYFIELD ; - RadioCheck = TRUE ; - Text [ en-US ] = "Currency Field"; - }; - ToolBoxItem - { - HelpId = SID_INSERT_PATTERNFIELD ; - Identifier = SID_INSERT_PATTERNFIELD ; - RadioCheck = TRUE ; - Text [ en-US ] = "Pattern Field"; - }; - ToolBoxItem - { - HelpId = SID_INSERT_SELECT ; - Identifier = SID_INSERT_SELECT ; - RadioCheck = TRUE ; - Text [ en-US ] = "Select" ; - }; - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - ToolBoxItem - { - HelpId = SID_DIALOG_TESTMODE ; - Identifier = SID_DIALOG_TESTMODE ; - Text [ en-US ] = "Activate Test Mode" ; - }; - }; -}; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx index 8d84f9590..b907e57d1 100644 --- a/basctl/source/dlged/managelang.cxx +++ b/basctl/source/dlged/managelang.cxx @@ -323,8 +323,7 @@ SetDefaultLanguageDialog::SetDefaultLanguageDialog( Window* pParent, Localizatio if ( m_pLocalizationMgr->isLibraryLocalized() ) { // change to "Add Interface Language" mode - // FIXME: HELPID - SetHelpId( ""/*HID_BASICIDE_ADDNEW_LANGUAGE*/ ); + 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 4a90a5ccb..373c96457 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -112,7 +112,6 @@ #define ENTRY_HEIGHT 16 static const char ITEM_DESCRIPTOR_COMMANDURL[] = "CommandURL"; -static const char ITEM_DESCRIPTOR_HELPURL[] = "HelpURL"; static const char ITEM_DESCRIPTOR_CONTAINER[] = "ItemDescriptorContainer"; static const char ITEM_DESCRIPTOR_LABEL[] = "Label"; static const char ITEM_DESCRIPTOR_TYPE[] = "Type"; @@ -518,7 +517,6 @@ bool GetMenuItemData( const uno::Reference< container::XIndexAccess >& rItemContainer, sal_Int32 nIndex, OUString& rCommandURL, - OUString& rHelpURL, OUString& rLabel, sal_uInt16& rType, uno::Reference< container::XIndexAccess >& rSubMenu ) @@ -534,10 +532,6 @@ bool GetMenuItemData( { aProp[i].Value >>= rCommandURL; } - else if ( aProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_HELPURL )) - { - aProp[i].Value >>= rHelpURL; - } else if ( aProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_CONTAINER )) { aProp[i].Value >>= rSubMenu; @@ -566,7 +560,6 @@ bool GetToolbarItemData( const uno::Reference< container::XIndexAccess >& rItemContainer, sal_Int32 nIndex, OUString& rCommandURL, - OUString& rHelpURL, OUString& rLabel, sal_uInt16& rType, sal_Bool& rIsVisible, @@ -588,10 +581,6 @@ bool GetToolbarItemData( { aProp[i].Value >>= rStyle; } - else if ( aProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_HELPURL )) - { - aProp[i].Value >>= rHelpURL; - } else if (aProp[i].Name.equalsAscii(ITEM_DESCRIPTOR_CONTAINER)) { aProp[i].Value >>= rSubMenu; @@ -634,13 +623,10 @@ ConvertSvxConfigEntry( static const OUString aDescriptorLabel( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_LABEL ) ); - static const OUString aDescriptorHelpURL( - RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_HELPURL ) ); - static const OUString aDescriptorContainer( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_CONTAINER ) ); - uno::Sequence< beans::PropertyValue > aPropSeq( 4 ); + uno::Sequence< beans::PropertyValue > aPropSeq( 3 ); aPropSeq[0].Name = aDescriptorCommandURL; aPropSeq[0].Value <<= rtl::OUString( pEntry->GetCommand() ); @@ -698,9 +684,6 @@ ConvertSvxConfigEntry( aPropSeq[2].Value <<= rtl::OUString( pEntry->GetName() ); } - aPropSeq[3].Name = aDescriptorHelpURL; - aPropSeq[3].Value <<= rtl::OUString( pEntry->GetHelpURL() ); - return aPropSeq; } @@ -718,16 +701,13 @@ ConvertToolbarEntry( static const OUString aDescriptorLabel( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_LABEL ) ); - static const OUString aDescriptorHelpURL( - RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_HELPURL ) ); - static const OUString aDescriptorContainer( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_CONTAINER ) ); static const OUString aIsVisible( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_ISVISIBLE ) ); - uno::Sequence< beans::PropertyValue > aPropSeq( 5 ); + uno::Sequence< beans::PropertyValue > aPropSeq( 4 ); aPropSeq[0].Name = aDescriptorCommandURL; aPropSeq[0].Value <<= rtl::OUString( pEntry->GetCommand() ); @@ -785,11 +765,8 @@ ConvertToolbarEntry( aPropSeq[2].Value <<= rtl::OUString( pEntry->GetName() ); } - aPropSeq[3].Name = aDescriptorHelpURL; - aPropSeq[3].Value <<= rtl::OUString( pEntry->GetHelpURL() ); - - aPropSeq[4].Name = aIsVisible; - aPropSeq[4].Value <<= pEntry->IsVisible(); + aPropSeq[3].Name = aIsVisible; + aPropSeq[3].Value <<= pEntry->IsVisible(); return aPropSeq; } @@ -1183,14 +1160,13 @@ bool MenuSaveInData::LoadSubMenus( { uno::Reference< container::XIndexAccess > xSubMenu; OUString aCommandURL; - OUString aHelpURL; OUString aLabel; bool bIsUserDefined = TRUE; sal_uInt16 nType( css::ui::ItemType::DEFAULT ); bool bItem = GetMenuItemData( xMenuSettings, nIndex, - aCommandURL, aHelpURL, aLabel, nType, xSubMenu ); + aCommandURL, aLabel, nType, xSubMenu ); if ( bItem ) { @@ -1232,7 +1208,6 @@ bool MenuSaveInData::LoadSubMenus( aLabel, aCommandURL, TRUE ); pEntry->SetUserDefined( bIsUserDefined ); - pEntry->SetHelpURL( aHelpURL ); pEntries->push_back( pEntry ); @@ -1257,7 +1232,6 @@ bool MenuSaveInData::LoadSubMenus( SvxConfigEntry* pEntry = new SvxConfigEntry( aLabel, aCommandURL, FALSE ); pEntry->SetUserDefined( bIsUserDefined ); - pEntry->SetHelpURL( aHelpURL ); pEntries->push_back( pEntry ); } } @@ -2154,7 +2128,6 @@ SvLBoxEntry* SvxConfigPage::AddFunction( SvxConfigEntry* pNewEntryData = new SvxConfigEntry( aDisplayName, aURL, FALSE ); pNewEntryData->SetUserDefined( TRUE ); - pNewEntryData->SetHelpURL( aURL ); // check that this function is not already in the menu SvxConfigEntry* pParent = GetTopLevelSelection(); @@ -2629,8 +2602,7 @@ IMPL_LINK( SvxMenuConfigPage, MenuSelectHdl, MenuButton *, pButton ) String aDesc = CUI_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME ); SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc ); - // FIXME: HELPID - pNameDialog->SetHelpId( ""/*HID_SVX_CONFIG_RENAME_MENU*/ ); + pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_MENU ); pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_RENAME_MENU ) ); bool ret = pNameDialog->Execute(); @@ -2688,8 +2660,7 @@ IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton ) String aDesc = CUI_RESSSTR( RID_SVXSTR_SUBMENU_NAME ); SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc ); - // FIXME: HELPID - pNameDialog->SetHelpId( ""/*HID_SVX_CONFIG_NAME_SUBMENU*/ ); + pNameDialog->SetHelpId( HID_SVX_CONFIG_NAME_SUBMENU ); pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_ADD_SUBMENU ) ); bool ret = pNameDialog->Execute(); @@ -2735,8 +2706,7 @@ IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton ) String aDesc = CUI_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME ); SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc ); - // FIXME: HELPID - pNameDialog->SetHelpId( ""/*HID_SVX_CONFIG_RENAME_MENU_ITEM*/ ); + pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_MENU_ITEM ); pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_RENAME_MENU ) ); bool ret = pNameDialog->Execute(); @@ -3073,7 +3043,6 @@ SvxConfigEntry::SvxConfigEntry( pEntries( 0 ) { sal_uInt16 nType( css::ui::ItemType::DEFAULT ); - OUString aHelpURL_; for ( sal_Int32 i = 0; i < rProperties.getLength(); i++ ) { @@ -3081,10 +3050,6 @@ SvxConfigEntry::SvxConfigEntry( { rProperties[i].Value >>= aCommand; } - else if ( rProperties[i].Name.equalsAscii( ITEM_DESCRIPTOR_HELPURL )) - { - rProperties[i].Value >>= aHelpURL_; - } else if ( rProperties[i].Name.equalsAscii( ITEM_DESCRIPTOR_LABEL )) { rProperties[i].Value >>= aLabel; @@ -3132,26 +3097,9 @@ 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 - { - // FIXME: HELPID - aHelpText = pHelp->GetHelpText( aHelpURL/*.toInt32()*/, NULL ); - } - - if ( aHelpText.getLength() == 0 && aCommand.getLength() != 0 ) + if ( aCommand.getLength() ) { - aHelpText = pHelp->GetHelpText( aCommand, NULL ); + aHelpText = Application::GetHelp()->GetHelpText( aCommand, NULL ); } } @@ -3182,10 +3130,7 @@ SvxConfigEntry::GetProperties( static const OUString aDescriptorLabel( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_LABEL ) ); - static const OUString aDescriptorHelpURL( - RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_HELPURL ) ); - - uno::Sequence< beans::PropertyValue > aPropSeq( 4 ); + uno::Sequence< beans::PropertyValue > aPropSeq( 3 ); aPropSeq[0].Name = aDescriptorCommandURL; aPropSeq[0].Value <<= rtl::OUString( GetCommand() ); @@ -3243,9 +3188,6 @@ SvxConfigEntry::GetProperties( aPropSeq[2].Value <<= rtl::OUString( GetName() ); } - aPropSeq[3].Name = aDescriptorHelpURL; - aPropSeq[3].Value <<= rtl::OUString( GetHelpURL() ); - return aPropSeq; } @@ -3351,26 +3293,19 @@ SvxToolbarConfigPage::SvxToolbarConfigPage( : SvxConfigPage( pParent, rSet ) { - // FIXME: HELPID - SetHelpId( ""/*HID_SVX_CONFIG_TOOLBAR*/ ); + SetHelpId( HID_SVX_CONFIG_TOOLBAR ); aContentsListBox = new SvxToolbarEntriesListBox(this, CUI_RES(BOX_ENTRIES)); FreeResource(); PositionContentsListBox(); aContentsListBox->SetZOrder( &aAddCommandsButton, WINDOW_ZORDER_BEFOR ); - // 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*/ ); + 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 ); aTopLevelSeparator.SetText( CUI_RES ( RID_SVXSTR_PRODUCTNAME_TOOLBARS ) ); @@ -3586,8 +3521,7 @@ IMPL_LINK( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton ) String aDesc = CUI_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME ); SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc ); - // FIXME: HELPID - pNameDialog->SetHelpId( ""/*HID_SVX_CONFIG_RENAME_TOOLBAR*/ ); + pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_TOOLBAR ); pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_RENAME_TOOLBAR ) ); bool ret = pNameDialog->Execute(); @@ -3678,8 +3612,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton ) String aDesc = CUI_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME ); SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc ); - // FIXME: HELPID - pNameDialog->SetHelpId( ""/*HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM*/ ); + pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM ); pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_RENAME_TOOLBAR ) ); bool ret = pNameDialog->Execute(); @@ -4767,7 +4700,6 @@ bool ToolbarSaveInData::LoadToolbar( { uno::Reference< container::XIndexAccess > xSubMenu; OUString aCommandURL; - OUString aHelpURL; OUString aLabel; bool bIsUserDefined = TRUE; sal_Bool bIsVisible; @@ -4776,7 +4708,7 @@ bool ToolbarSaveInData::LoadToolbar( sal_uInt16 nType( css::ui::ItemType::DEFAULT ); bool bItem = GetToolbarItemData( xToolbarSettings, nIndex, aCommandURL, - aHelpURL, aLabel, nType, bIsVisible, nStyle, xSubMenu ); + aLabel, nType, bIsVisible, nStyle, xSubMenu ); if ( bItem ) { @@ -4817,7 +4749,6 @@ bool ToolbarSaveInData::LoadToolbar( aLabel, aCommandURL, TRUE ); pEntry->SetUserDefined( bIsUserDefined ); - pEntry->SetHelpURL( aHelpURL ); pEntry->SetVisible( bIsVisible ); pEntries->push_back( pEntry ); @@ -4829,7 +4760,6 @@ bool ToolbarSaveInData::LoadToolbar( SvxConfigEntry* pEntry = new SvxConfigEntry( aLabel, aCommandURL, FALSE ); pEntry->SetUserDefined( bIsUserDefined ); - pEntry->SetHelpURL( aHelpURL ); pEntry->SetVisible( bIsVisible ); pEntry->SetStyle( nStyle ); pEntries->push_back( pEntry ); diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx index 6dcd0b848..a002b3b07 100644 --- a/cui/source/customize/eventdlg.cxx +++ b/cui/source/customize/eventdlg.cxx @@ -89,8 +89,7 @@ SvxEventConfigPage::SvxEventConfigPage( Window *pParent, const SfxItemSet& rSet, // must be done after FreeResource is called InitResources(); - // FIXME: HELPID - mpImpl->pEventLB->GetListBox().SetHelpId( ""/*HID_SVX_MACRO_LB_EVENT*/ ); + 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 f19e6aa89..188d1d0b4 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -170,8 +170,7 @@ _HeaderTabListBox::_HeaderTabListBox( Window* pParent, const ResId& rId ) : maListBox( this, WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP ), maHeaderBar( this, WB_BUTTONSTYLE | WB_BOTTOMBORDER ) { - // FIXME: HELPID - maListBox.SetHelpId( ""/*HID_MACRO_HEADERTABLISTBOX*/ ); + maListBox.SetHelpId( HID_MACRO_HEADERTABLISTBOX ); } _HeaderTabListBox::~_HeaderTabListBox() @@ -875,8 +874,7 @@ SvxMacroTabPage::SvxMacroTabPage( Window* pParent, const Reference< frame::XFram // must be done after FreeResource is called InitResources(); - // FIXME: HELPID - mpImpl->pEventLB->GetListBox().SetHelpId( ""/*HID_SVX_MACRO_LB_EVENT*/ ); + 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 070c2264d..f4329ffef 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -249,20 +249,13 @@ SpellDialog::SpellDialog( pImpl = new SpellDialog_Impl; //HelpIds - // 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*/ ); + 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 ); Init_Impl(); // disable controls if service is missing diff --git a/cui/source/dialogs/charmap.src b/cui/source/dialogs/charmap.src index 835ab608a..2eed0827e 100644 --- a/cui/source/dialogs/charmap.src +++ b/cui/source/dialogs/charmap.src @@ -35,10 +35,9 @@ // RID_SVXDLG_CHARMAP ---------------------------------------------------- ModalDialog RID_SVXDLG_CHARMAP { - HelpId = SID_CHARMAP ; + HelpId = CMD_SID_CHARMAP ; SvLook = TRUE ; Text [ en-US ] = "Special Characters"; -/* Size = MAP_APPFONT ( 297 , 169 ) ; */ Size = MAP_APPFONT ( 297 , 153 ) ; OutputSize = TRUE ; Moveable = TRUE ; @@ -92,7 +91,6 @@ ModalDialog RID_SVXDLG_CHARMAP { HelpId = HID_CHARMAP_CTL_SHOWTEXT ; Pos = MAP_APPFONT ( 46 , 137 ) ; -/* Size = MAP_APPFONT ( 190 , 16 ) ; */ Size = MAP_APPFONT ( 244 , 16 ) ; Group = TRUE ; }; @@ -134,26 +132,6 @@ ModalDialog RID_SVXDLG_CHARMAP Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Delete"; }; -/* - PushButton BT_ASSIGN - { - Pos = MAP_APPFONT ( 242 , 140 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - Text [ en-US ] = "~Assign shortcut..."; - }; - FixedText FT_ASSIGN - { - Pos = MAP_APPFONT ( 6 , 156 ) ; - Size = MAP_APPFONT ( 100 , 8 ) ; - Left = TRUE ; - Text [ en-US ] = "Shortcut key: "; - }; - Control CT_ASSIGN - { - Pos = MAP_APPFONT ( 60 , 156 ) ; - Size = MAP_APPFONT ( 160 , 8 ) ; - }; -*/ }; // ********************************************************************** EOF diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 5e5acc3aa..9e0792333 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -678,8 +678,7 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData ) String aType( CUI_RES( RID_SVXSTR_GALLERYPROPS_GALTHEME ) ); BOOL bReadOnly = pThm->IsReadOnly() && !pThm->IsImported(); - // FIXME: HELPID - aEdtMSName.SetHelpId( ""/*HID_GALLERY_EDIT_MSNAME*/ ); + aEdtMSName.SetHelpId( HID_GALLERY_EDIT_MSNAME ); aEdtMSName.SetText( pThm->GetName() ); aEdtMSName.SetReadOnly( bReadOnly ); diff --git a/cui/source/dialogs/grfflt.src b/cui/source/dialogs/grfflt.src index f91a66790..2f81522ed 100644 --- a/cui/source/dialogs/grfflt.src +++ b/cui/source/dialogs/grfflt.src @@ -37,7 +37,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC { - HelpID = SID_GRFFILTER_MOSAIC; + HelpID = CMD_SID_GRFFILTER_MOSAIC; OutputSize = TRUE ; Moveable = TRUE ; SVLook = TRUE ; @@ -141,7 +141,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC ModalDialog RID_SVX_GRFFILTER_DLG_SOLARIZE { - HelpID = SID_GRFFILTER_SOLARIZE; + HelpID = CMD_SID_GRFFILTER_SOLARIZE; OutputSize = TRUE ; Moveable = TRUE ; SVLook = TRUE ; @@ -218,7 +218,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SOLARIZE ModalDialog RID_SVX_GRFFILTER_DLG_SEPIA { - HelpID = SID_GRFFILTER_SEPIA; + HelpID = CMD_SID_GRFFILTER_SEPIA; OutputSize = TRUE ; Moveable = TRUE ; SVLook = TRUE ; @@ -290,7 +290,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SEPIA ModalDialog RID_SVX_GRFFILTER_DLG_POSTER { - HelpID = SID_GRFFILTER_POSTER; + HelpID = CMD_SID_GRFFILTER_POSTER; OutputSize = TRUE ; Moveable = TRUE ; SVLook = TRUE ; @@ -365,7 +365,7 @@ TabPage RID_SVX_GRFFILTER_DLG_EMBOSS_TAB ModalDialog RID_SVX_GRFFILTER_DLG_EMBOSS { - HelpID = SID_GRFFILTER_EMBOSS; + HelpID = CMD_SID_GRFFILTER_EMBOSS; OutputSize = TRUE ; Moveable = TRUE ; SVLook = TRUE ; diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index b6cac5d6f..edbfb7f4d 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -511,12 +511,9 @@ namespace svx } void SuggestionDisplay::SetHelpIds() { - // 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*/ ); + this->SetHelpId( HID_HANGULDLG_SUGGESTIONS ); + m_aValueSet.SetHelpId( HID_HANGULDLG_SUGGESTIONS_GRID ); + m_aListBox.SetHelpId( HID_HANGULDLG_SUGGESTIONS_LIST ); } //========================================================================= @@ -622,20 +619,13 @@ namespace svx // initial control values m_aSimpleConversion.Check(); - // 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*/); + 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); FreeResource(); diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index 98a70f21b..aaef6b219 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -78,8 +78,7 @@ SvxHyperlinkDocTp::SvxHyperlinkDocTp ( Window *pParent, const SfxItemSet& rItemS maCbbPath.Show(); String aFileScheme( INET_FILE_SCHEME, RTL_TEXTENCODING_ASCII_US ); maCbbPath.SetBaseURL(aFileScheme); - // FIXME: HELPID - maCbbPath.SetHelpId( ""/*HID_HYPERDLG_DOC_PATH*/ ); + maCbbPath.SetHelpId( HID_HYPERDLG_DOC_PATH ); SetExchangeSupport (); diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index 929e40e26..29a778c80 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -83,8 +83,7 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window *pParent, maCbbTarget.SetPosSizePixel ( LogicToPixel( Point( COL_2, 25 ), MAP_APPFONT ), LogicToPixel( Size ( 176 - COL_DIFF, 60), MAP_APPFONT ) ); maCbbTarget.Show(); - // FIXME: HELPID - maCbbTarget.SetHelpId( ""/*HID_HYPERDLG_INET_PATH*/ ); + 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 7c5bb049e..cd135d65c 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -74,8 +74,7 @@ SvxHyperlinkMailTp::SvxHyperlinkMailTp ( Window *pParent, const SfxItemSet& rIte LogicToPixel( Size ( 176 - COL_DIFF, 60), MAP_APPFONT ) ); maCbbReceiver.Show(); - // FIXME: HELPID - maCbbReceiver.SetHelpId( ""/*HID_HYPERDLG_MAIL_PATH*/ ); + maCbbReceiver.SetHelpId( HID_HYPERDLG_MAIL_PATH ); SetExchangeSupport (); diff --git a/cui/source/dialogs/hyperdlg.src b/cui/source/dialogs/hyperdlg.src index 614c3a41b..505291753 100644 --- a/cui/source/dialogs/hyperdlg.src +++ b/cui/source/dialogs/hyperdlg.src @@ -746,7 +746,7 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT *************************************************************************/ ModalDialog RID_SVXDLG_NEWHYPERLINK { - HelpID = SID_HYPERLINK_DIALOG; + HelpID = CMD_SID_HYPERLINK_DIALOG; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 325 , 185 ) ; diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index e27a080ed..2d0dab48f 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -300,8 +300,7 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId, maIconCtrl.Show(); maIconCtrl.SetChoiceWithCursor ( TRUE ); maIconCtrl.SetSelectionMode( SINGLE_SELECTION ); - // FIXME: HELPID - maIconCtrl.SetHelpId( ""/*HID_ICCDIALOG_CHOICECTRL*/ ); + maIconCtrl.SetHelpId( HID_ICCDIALOG_CHOICECTRL ); // ItemSet if ( pSet ) @@ -312,14 +311,11 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId, // Buttons aOKBtn.SetClickHdl ( LINK( this, IconChoiceDialog, OkHdl ) ); - // FIXME: HELPID - aOKBtn.SetHelpId( ""/*HID_ICCDIALOG_OK_BTN*/ ); - // FIXME: HELPID - aCancelBtn.SetHelpId( ""/*HID_ICCDIALOG_CANCEL_BTN*/ ); + aOKBtn.SetHelpId( HID_ICCDIALOG_OK_BTN ); + aCancelBtn.SetHelpId( HID_ICCDIALOG_CANCEL_BTN ); aResetBtn.SetClickHdl( LINK( this, IconChoiceDialog, ResetHdl ) ); aResetBtn.SetText( CUI_RESSTR(RID_SVXSTR_ICONCHOICEDLG_RESETBUT) ); - // FIXME: HELPID - aResetBtn.SetHelpId( ""/*HID_ICCDIALOG_RESET_BTN*/ ); + 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 4a5acd95c..aac403097 100644 --- a/cui/source/dialogs/insrc.cxx +++ b/cui/source/dialogs/insrc.cxx @@ -44,7 +44,7 @@ sal_uInt16 SvxInsRowColDlg::getInsertCount() const return static_cast< sal_uInt16 >( aCountEdit.GetValue() ); } -SvxInsRowColDlg::SvxInsRowColDlg(Window* pParent, bool bCol, ULONG nHelpId ) +SvxInsRowColDlg::SvxInsRowColDlg(Window* pParent, bool bCol, const rtl::OString& sHelpId ) : ModalDialog( pParent, CUI_RES(DLG_INS_ROW_COL) ), aCount( this, CUI_RES( FT_COUNT ) ), aCountEdit( this, CUI_RES( ED_COUNT ) ), @@ -70,9 +70,7 @@ SvxInsRowColDlg::SvxInsRowColDlg(Window* pParent, bool bCol, ULONG nHelpId ) aTmp += aRow; } SetText( aTmp ); - // FIXME: HELPID - SetHelpId( ""/*nHelpId*/ ); - (void)nHelpId; + SetHelpId( sHelpId ); } short SvxInsRowColDlg::Execute(void) diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index 836d4a5bf..965aefe35 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -109,8 +109,7 @@ SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, LinkManager* pMgr, BOOL bHtml { FreeResource(); - // FIXME: HELPID - aTbLinks.SetHelpId(""/*HID_LINKDLG_TABLB*/); + 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 d773a7509..cbfe0ac65 100644 --- a/cui/source/dialogs/pastedlg.cxx +++ b/cui/source/dialogs/pastedlg.cxx @@ -63,10 +63,8 @@ SvPasteObjectDialog::SvPasteObjectDialog( Window* pParent ) aSObject( CUI_RES( S_OBJECT ) ) { FreeResource(); - // FIXME: HELPID - SetHelpId( ""/*HID_PASTE_DLG*/ ); - // FIXME: HELPID - SetUniqueId( ""/*HID_PASTE_DLG*/ ); + SetHelpId( HID_PASTE_DLG ); + 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 6379ad752..758addd34 100644 --- a/cui/source/dialogs/postdlg.cxx +++ b/cui/source/dialogs/postdlg.cxx @@ -89,14 +89,10 @@ SvxPostItDialog::SvxPostItDialog( Window* pParent, { if (bRedline) // HelpIDs fuer Redlining { - // 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*/); + SetHelpId(HID_REDLINING_DLG); + aEditED.SetHelpId(HID_REDLINING_EDIT); + aPrevBtn.SetHelpId(HID_REDLINING_PREV); + aNextBtn.SetHelpId(HID_REDLINING_NEXT); } aPrevBtn.SetClickHdl( LINK( this, SvxPostItDialog, PrevHdl ) ); diff --git a/cui/source/dialogs/postdlg.src b/cui/source/dialogs/postdlg.src index c05b45134..6b55eb877 100644 --- a/cui/source/dialogs/postdlg.src +++ b/cui/source/dialogs/postdlg.src @@ -27,12 +27,13 @@ // include --------------------------------------------------------------- #include #include "postdlg.hrc" +#include "helpid.hrc" #include // for RID_SVXDLG_POSTIT // RID_SVXDLG_POSTIT ----------------------------------------------------- ModalDialog RID_SVXDLG_POSTIT { - HelpId = SID_POSTIT ; + HelpId = HID_POSTIT_DIALOG ; OutputSize = TRUE ; SvLook = TRUE ; Size = MAP_APPFONT ( 198 , 134 ) ; diff --git a/cui/source/dialogs/thesdlg.src b/cui/source/dialogs/thesdlg.src index f5ee36a7e..f07540d12 100644 --- a/cui/source/dialogs/thesdlg.src +++ b/cui/source/dialogs/thesdlg.src @@ -35,7 +35,7 @@ // RID_SVXDLG_THES ------------------------------------------------------- ModalDialog RID_SVXDLG_THESAURUS { - HelpId = SID_THESAURUS ; + HelpId = CMD_SID_THESAURUS ; OutputSize = TRUE ; Size = MAP_APPFONT ( 285 , 116 ) ; Text [ en-US ] = "Thesaurus" ; diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx index 0c15cff54..9214a3af6 100644 --- a/cui/source/dialogs/zoom.cxx +++ b/cui/source/dialogs/zoom.cxx @@ -218,7 +218,7 @@ SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) : { #if ENABLE_LAYOUT - SetHelpId (SID_ATTR_ZOOM); + SetHelpId (".uno:Zoom"); #endif /* ENABLE_LAYOUT */ Link aLink = LINK( this, SvxZoomDialog, UserHdl ); a100Btn.SetClickHdl( aLink ); diff --git a/cui/source/dialogs/zoom.src b/cui/source/dialogs/zoom.src index 54b995f3d..341d33144 100644 --- a/cui/source/dialogs/zoom.src +++ b/cui/source/dialogs/zoom.src @@ -28,11 +28,12 @@ #include #include "zoom.hrc" #include // for RID_SVXDLG_ZOOM +#include "helpid.hrc" // RID_SVXDLG_ZOOM ------------------------------------------------------- ModalDialog RID_SVXDLG_ZOOM { - HelpId = SID_ATTR_ZOOM ; + HelpId = CMD_SID_ATTR_ZOOM; OutputSize = TRUE ; SvLook = TRUE ; Size = MAP_APPFONT ( 242 , 112 ) ; diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 8b0240f06..1d67c3c76 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -723,15 +723,13 @@ void AbstractSvxNameDialog_Impl::SetCheckNameHdl( const Link& rLink, bool bCheck else pDlg->SetCheckNameHdl( Link(), bCheckImmediately ); } -void AbstractSvxNameDialog_Impl::SetEditHelpId(ULONG nHelpId) +void AbstractSvxNameDialog_Impl::SetEditHelpId(const rtl::OString& aHelpId) { - pDlg->SetEditHelpId( nHelpId ); + pDlg->SetEditHelpId( aHelpId ); } -void AbstractSvxNameDialog_Impl::SetHelpId( ULONG nHelpId ) +void AbstractSvxNameDialog_Impl::SetHelpId( const rtl::OString& aHelpId ) { - // FIXME: HELPID - pDlg->SetHelpId( ""/*nHelpId*/ ); - (void)nHelpId; + pDlg->SetHelpId( aHelpId ); } void AbstractSvxNameDialog_Impl::SetText( const XubString& rStr ) { @@ -843,11 +841,9 @@ void AbstractSvxMultiFileDialog_Impl::SetTitle( const String& rNewTitle ) pDlg->SetText( rNewTitle ); } -void AbstractSvxMultiFileDialog_Impl::SetHelpId( ULONG nHelpId ) +void AbstractSvxMultiFileDialog_Impl::SetHelpId( const rtl::OString& aHelpId ) { - // FIXME: HELPID - pDlg->SetHelpId( ""/*nHelpId*/ ); - (void)nHelpId; + pDlg->SetHelpId( aHelpId ); } Window * AbstractSvxHpLinkDlg_Impl::GetWindow() @@ -1877,49 +1873,41 @@ GetTabPageRanges AbstractDialogFactory_Impl::GetTabPageRangesFunc( USHORT nId ) return 0; } -SfxAbstractInsertObjectDialog* AbstractDialogFactory_Impl::CreateInsertObjectDialog( Window* pParent, USHORT nSlotId, +SfxAbstractInsertObjectDialog* AbstractDialogFactory_Impl::CreateInsertObjectDialog( Window* pParent, const rtl::OUString& rCommand, const Reference < com::sun::star::embed::XStorage >& xStor, const SvObjectServerList* pList ) { InsertObjectDialog_Impl* pDlg=0; - switch ( nSlotId ) - { - case SID_INSERT_OBJECT : pDlg = new SvInsertOleDlg( pParent, xStor, pList ); break; - case SID_INSERT_PLUGIN : pDlg = new SvInsertPlugInDialog( pParent, xStor ); break; - case SID_INSERT_APPLET : pDlg = new SvInsertAppletDialog( pParent, xStor ); break; - case SID_INSERT_FLOATINGFRAME : pDlg = new SfxInsertFloatingFrameDialog( pParent, xStor ); break; - default: break; - } + if ( rCommand.equalsAscii(".uno:InsertObject" ) ) + pDlg = new SvInsertOleDlg( pParent, xStor, pList ); + else if ( rCommand.equalsAscii(".uno:InsertPlugin" ) ) + pDlg = new SvInsertPlugInDialog( pParent, xStor ); + else if ( rCommand.equalsAscii(".uno:InsertObjectFloatingFrame" ) ) + pDlg = new SfxInsertFloatingFrameDialog( pParent, xStor ); if ( pDlg ) { - // FIXME: HELPID - pDlg->SetHelpId( ""/*nSlotId*/ ); + pDlg->SetHelpId( rtl::OString( rCommand, rCommand.getLength(), RTL_TEXTENCODING_UTF8 ) ); return new AbstractInsertObjectDialog_Impl( pDlg ); } return 0; } -VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( Window* pParent, USHORT nSlotId, +VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( Window* pParent, const rtl::OUString& rCommand, const Reference < com::sun::star::embed::XEmbeddedObject >& xObj ) { InsertObjectDialog_Impl* pDlg=0; - switch ( nSlotId ) - { - case SID_INSERT_APPLET : pDlg = new SvInsertAppletDialog( pParent, xObj ); break; - case SID_INSERT_FLOATINGFRAME : pDlg = new SfxInsertFloatingFrameDialog( pParent, xObj ); break; - default: break; - } - - if ( pDlg ) + if ( rCommand.equalsAscii(".uno:InsertObjectFloatingFrame" ) ) { - // FIXME: HELPID - pDlg->SetHelpId( ""/*nSlotId*/ ); + pDlg = new SfxInsertFloatingFrameDialog( pParent, xObj ); + pDlg->SetHelpId( rtl::OString( rCommand, rCommand.getLength(), RTL_TEXTENCODING_UTF8 ) ); return new VclAbstractDialog_Impl( pDlg ); } return 0; } + + SfxAbstractPasteDialog* AbstractDialogFactory_Impl::CreatePasteDialog( Window* pParent ) { return new AbstractPasteDialog_Impl( new SvPasteObjectDialog( pParent ) ); @@ -1954,7 +1942,7 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateOptionsDialog( return new VclAbstractDialog_Impl( new OfaTreeOptionsDialog( pParent, rExtensionId ) ); } -SvxAbstractInsRowColDlg* AbstractDialogFactory_Impl::CreateSvxInsRowColDlg( Window* pParent, bool bCol, ULONG nHelpId ) +SvxAbstractInsRowColDlg* AbstractDialogFactory_Impl::CreateSvxInsRowColDlg( Window* pParent, bool bCol, const rtl::OString& sHelpId ) { - return new SvxInsRowColDlg( pParent, bCol, nHelpId ); + return new SvxInsRowColDlg( pParent, bCol, sHelpId ); } diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index f2ab0196c..aa7183a7d 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -414,9 +414,9 @@ class AbstractSvxNameDialog_Impl :public AbstractSvxNameDialog DECL_ABSTDLG_BASE(AbstractSvxNameDialog_Impl,SvxNameDialog) virtual void GetName( String& rName ) ; virtual void SetCheckNameHdl( const Link& rLink, bool bCheckImmediately = false ) ; - virtual void SetEditHelpId(ULONG nHelpId) ; + virtual void SetEditHelpId(const rtl::OString&) ; //from class Window - virtual void SetHelpId( ULONG nHelpId ) ; + virtual void SetHelpId( const rtl::OString& ) ; virtual void SetText( const XubString& rStr ) ; private: Link aCheckNameHdl; @@ -486,7 +486,7 @@ class AbstractSvxMultiFileDialog_Impl :public AbstractSvxMultiFileDialog virtual void EnableRadioButtonMode(); virtual void SetTitle( const String& rNewTitle ); //From Class Window - virtual void SetHelpId( ULONG nHelpId ) ; + virtual void SetHelpId( const rtl::OString& ) ; }; //for SvxMultiFileDialog end @@ -636,10 +636,10 @@ public: const SfxItemSet& rAttr, SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone, SvxDistributeVertical eVer = SvxDistributeVerticalNone); - virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, USHORT nSlotId, + virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, const rtl::OUString& rCommmand, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStor, const SvObjectServerList* pList = 0 ); - virtual VclAbstractDialog* CreateEditObjectDialog( Window* pParent, USHORT nSlotId, + virtual VclAbstractDialog* CreateEditObjectDialog( Window* pParent, const rtl::OUString& rCommmand, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj ); virtual SfxAbstractPasteDialog* CreatePasteDialog( Window* pParent ); virtual SfxAbstractLinksDialog* CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, BOOL bHTML, sfx2::SvBaseLink* p=0 ); @@ -795,7 +795,7 @@ public: virtual VclAbstractDialog* CreateOptionsDialog( Window* pParent, const rtl::OUString& rExtensionId, const rtl::OUString& rApplicationContext ); - virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, ULONG nHelpId ); + virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, const rtl::OString& sHelpId ); }; #endif diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index cd2b52b31..bb12bd961 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -744,8 +744,7 @@ public: aBtnOK.Enable( rLink.Call( this ) > 0 ); } - // FIXME: HELPID - void SetEditHelpId(ULONG /*nHelpId*/) {aEdtName.SetHelpId(""/*nHelpId*/);} + void SetEditHelpId( const rtl::OString& aHelpId) {aEdtName.SetHelpId(aHelpId);} }; class SvxIconSelectorDialog : public ModalDialog diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx index 36fbec656..77bd8fbd4 100644 --- a/cui/source/inc/dlgname.hxx +++ b/cui/source/inc/dlgname.hxx @@ -91,8 +91,7 @@ public: aBtnOK.Enable( rLink.Call( this ) > 0 ); } - // FIXME: HELPID - void SetEditHelpId(ULONG /*nHelpId*/) {aEdtName.SetHelpId(""/*nHelpId*/);} + void SetEditHelpId( const rtl::OString& aHelpId) {aEdtName.SetHelpId(aHelpId);} }; /////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc index ff033f98a..35d23bd00 100644 --- a/cui/source/inc/helpid.hrc +++ b/cui/source/inc/helpid.hrc @@ -29,362 +29,352 @@ // include --------------------------------------------------------------- #include +#include +#include // Help-Ids -------------------------------------------------------------- -#define HID_OPTIONS_COLOR (HID_CUI_START + 1) -#define HID_OPTIONS_SAVE (HID_CUI_START + 2) -#define HID_OPTIONS_PATH (HID_CUI_START + 3) -#define HID_OPTIONS_GENERAL (HID_CUI_START + 4) -#define HID_OPTIONS_LINGU (HID_CUI_START + 5) -#define HID_OPTIONS_SPELL (HID_CUI_START + 6) -#define HID_OPTIONS_DICT_NEW (HID_CUI_START + 7) -#define HID_OPTIONS_DICT_EDIT (HID_CUI_START + 8) -#define HID_OPTIONS_INET (HID_CUI_START + 9) -#define HID_OPTIONS_CHART_DEFCOLORS (HID_CUI_START + 10) -#define HID_OPTIONS_CTL (HID_CUI_START + 11) -#define HID_OPTIONS_PROXY (HID_CUI_START + 12) -#define HID_OPTIONS_SEARCH (HID_CUI_START + 13) -#define HID_OPTIONS_MAIL (HID_CUI_START + 14) -#define HID_OPTIONS_ASIAN_LAYOUT (HID_CUI_START + 15) -#define HID_CLB_EDIT_MODULES_DICS (HID_CUI_START + 16) -#define HID_CLB_EDIT_MODULES_MODULES (HID_CUI_START + 17) -#define HID_CLB_LINGU_MODULES (HID_CUI_START + 18) -#define HID_CLB_LINGU_OPTIONS (HID_CUI_START + 19) -#define HID_EDIT_MODULES (HID_CUI_START + 20) -#define HID_LNGDLG_NUM_PREBREAK (HID_CUI_START + 21) -#define HID_OPTIONS_COLORCONFIG (HID_CUI_START + 22) -#define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME (HID_CUI_START + 23) -#define HID_OPTIONS_ACCESSIBILITYCONFIG (HID_CUI_START + 24) -#define HID_OPTIONS_COLORCONFIG_COLORLIST_WIN (HID_CUI_START + 25) -#define HID_OPTIONS_COLORCONFIG_NAME_SCHEME (HID_CUI_START + 26) -#define HID_OPTIONS_PATHS_SELECTFOLDER (HID_CUI_START + 27) -#define HID_OPTIONS_JAVA (HID_CUI_START + 28) -#define HID_OPTIONS_JAVA_LIST (HID_CUI_START + 29) -#define HID_OPTIONS_JAVA_PARAMETER (HID_CUI_START + 30) -#define HID_OPTIONS_JAVA_CLASSPATH (HID_CUI_START + 31) -#define HID_SVXPAGE_JSEARCH_OPTIONS (HID_CUI_START + 32) -#define HID_SVXDLG_FILTER_WARNING (HID_CUI_START + 33) -#define HID_SVX_OPTIONS_ONLINEUPDATE (HID_CUI_START + 34) -#define HID_DLG_SECURITY_OPTIONS (HID_CUI_START + 35) -#define HID_OFADLG_OPTIONS_TREE (HID_CUI_START + 36) -#define HID_OFA_CONNPOOL_DRIVERLIST (HID_CUI_START + 37) -#define UID_OFA_CONNPOOL_DRIVERLIST_BACK (HID_CUI_START + 38) -#define HID_OFA_FONT_SUBST_CLB (HID_CUI_START + 39) -#define HID_OFA_TP_MISC (HID_CUI_START + 40) -#define HID_OFA_TP_VIEW (HID_CUI_START + 41) -#define HID_OFA_TP_LANGUAGES (HID_CUI_START + 42) -#define HID_OFA_TP_MEMORY (HID_CUI_START + 43) -#define HID_DBPATH_CTL_PATH (HID_CUI_START + 44) -#define HID_DBPATH_HEADERBAR (HID_CUI_START + 45) -#define HID_OFAPAGE_SMARTTAG_OPTIONS (HID_CUI_START + 46) -#define HID_OFAPAGE_MSFLTR2_CLB (HID_CUI_START + 47) -#define HID_OPTPATH_CTL_PATH (HID_CUI_START + 48) -#define HID_OFADLG_TREELISTBOX (HID_CUI_START + 49) -#define HID_DLG_WEBCONNECTION_INFO (HID_CUI_START + 50) -#define HID_OPTIONS_DICT_EDIT_ENTRIES_LIST (HID_CUI_START + 51) -#define HID_OPTPATH_HEADERBAR (HID_CUI_START + 52) -#define HID_WARN_NAME_DUPLICATE (HID_CUI_START + 53) -#define HID_COLORPAGE_LISTBOX_START (HID_CUI_START + 54) -#define HID_COLORPAGE_DOCCOLOR_LB (HID_CUI_START + 54) -#define HID_COLORPAGE_DOCBOUNDARIES_LB (HID_CUI_START + 55) -#define HID_COLORPAGE_APPBACKGROUND_LB (HID_CUI_START + 56) -#define HID_COLORPAGE_OBJECTBOUNDARIES_LB (HID_CUI_START + 57) -#define HID_COLORPAGE_TABLEBOUNDARIES_LB (HID_CUI_START + 58) -#define HID_COLORPAGE_FONTCOLOR_LB (HID_CUI_START + 59) -#define HID_COLORPAGE_LINKS_LB (HID_CUI_START + 60) -#define HID_COLORPAGE_LINKSVISITED_LB (HID_CUI_START + 61) -#define HID_COLORPAGE_ANCHOR_LB (HID_CUI_START + 62) -#define HID_COLORPAGE_SPELL_LB (HID_CUI_START + 63) -#define HID_COLORPAGE_WRITERTEXTGRID_LB (HID_CUI_START + 64) -#define HID_COLORPAGE_WRITERFIELDSHADINGS_LB (HID_CUI_START + 65) -#define HID_COLORPAGE_WRITERIDXSHADINGS_LB (HID_CUI_START + 66) -#define HID_COLORPAGE_WRITERDIRECTCURSOR_LB (HID_CUI_START + 67) -#define HID_COLORPAGE_WRITERNOTESINDICATOR_LB (HID_CUI_START + 68) -#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB (HID_CUI_START + 69) -#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB (HID_CUI_START + 70) -#define HID_COLORPAGE_WRITERPAGEBREAKS_LB (HID_CUI_START + 71) -#define HID_COLORPAGE_HTMLSGML_LB (HID_CUI_START + 72) -#define HID_COLORPAGE_HTMLCOMMENT_LB (HID_CUI_START + 73) -#define HID_COLORPAGE_HTMLKEYWORD_LB (HID_CUI_START + 74) -#define HID_COLORPAGE_HTMLUNKNOWN_LB (HID_CUI_START + 75) -#define HID_COLORPAGE_CALCGRID_LB (HID_CUI_START + 76) -#define HID_COLORPAGE_CALCPAGEBREAK_LB (HID_CUI_START + 77) -#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB (HID_CUI_START + 78) -#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB (HID_CUI_START + 79) -#define HID_COLORPAGE_CALCDETECTIVE_LB (HID_CUI_START + 80) -#define HID_COLORPAGE_CALCDETECTIVEERROR_LB (HID_CUI_START + 81) -#define HID_COLORPAGE_CALCREFERENCE_LB (HID_CUI_START + 82) -#define HID_COLORPAGE_CALCNOTESBACKGROUND_LB (HID_CUI_START + 83) -#define HID_COLORPAGE_DRAWGRID_LB (HID_CUI_START + 84) -#define HID_COLORPAGE_DRAWDRAWING_LB (HID_CUI_START + 85) -#define HID_COLORPAGE_DRAWFILL_LB (HID_CUI_START + 86) -#define HID_COLORPAGE_BASICIDENTIFIER_LB (HID_CUI_START + 87) -#define HID_COLORPAGE_BASICCOMMENT_LB (HID_CUI_START + 88) -#define HID_COLORPAGE_BASICNUMBER_LB (HID_CUI_START + 89) -#define HID_COLORPAGE_BASICSTRING_LB (HID_CUI_START + 90) -#define HID_COLORPAGE_BASICOPERATOR_LB (HID_CUI_START + 91) -#define HID_COLORPAGE_BASICKEYWORD_LB (HID_CUI_START + 92) -#define HID_COLORPAGE_BASICERROR_LB (HID_CUI_START + 93) -#define HID_COLORPAGE_CHECKBOX_START (HID_CUI_START + 94) -#define HID_COLORPAGE_DOCCOLOR_CB (HID_CUI_START + 94) -#define HID_COLORPAGE_DOCBOUNDARIES_CB (HID_CUI_START + 95) -#define HID_COLORPAGE_APPBACKGROUND_CB (HID_CUI_START + 96) -#define HID_COLORPAGE_OBJECTBOUNDARIES_CB (HID_CUI_START + 97) -#define HID_COLORPAGE_TABLEBOUNDARIES_CB (HID_CUI_START + 98) -#define HID_COLORPAGE_FONTCOLOR_CB (HID_CUI_START + 99) -#define HID_COLORPAGE_LINKS_CB (HID_CUI_START + 100) -#define HID_COLORPAGE_LINKSVISITED_CB (HID_CUI_START + 101) -#define HID_COLORPAGE_ANCHOR_CB (HID_CUI_START + 102) -#define HID_COLORPAGE_SPELL_CB (HID_CUI_START + 103) -#define HID_COLORPAGE_WRITERTEXTGRID_CB (HID_CUI_START + 104) -#define HID_COLORPAGE_WRITERFIELDSHADINGS_CB (HID_CUI_START + 105) -#define HID_COLORPAGE_WRITERIDXSHADINGS_CB (HID_CUI_START + 106) -#define HID_COLORPAGE_WRITERDIRECTCURSOR_CB (HID_CUI_START + 107) -#define HID_COLORPAGE_WRITERNOTESINDICATOR_CB (HID_CUI_START + 108) -#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB (HID_CUI_START + 109) -#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB (HID_CUI_START + 110) -#define HID_COLORPAGE_WRITERPAGEBREAKS_CB (HID_CUI_START + 111) -#define HID_COLORPAGE_HTMLSGML_CB (HID_CUI_START + 112) -#define HID_COLORPAGE_HTMLCOMMENT_CB (HID_CUI_START + 113) -#define HID_COLORPAGE_HTMLKEYWORD_CB (HID_CUI_START + 114) -#define HID_COLORPAGE_HTMLUNKNOWN_CB (HID_CUI_START + 115) -#define HID_COLORPAGE_CALCGRID_CB (HID_CUI_START + 116) -#define HID_COLORPAGE_CALCPAGEBREAK_CB (HID_CUI_START + 117) -#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_CB (HID_CUI_START + 118) -#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_CB (HID_CUI_START + 119) -#define HID_COLORPAGE_CALCDETECTIVE_CB (HID_CUI_START + 120) -#define HID_COLORPAGE_CALCDETECTIVEERROR_CB (HID_CUI_START + 121) -#define HID_COLORPAGE_CALCREFERENCE_CB (HID_CUI_START + 122) -#define HID_COLORPAGE_CALCNOTESBACKGROUND_CB (HID_CUI_START + 123) -#define HID_COLORPAGE_DRAWGRID_CB (HID_CUI_START + 124) -#define HID_COLORPAGE_DRAWDRAWING_CB (HID_CUI_START + 125) -#define HID_COLORPAGE_DRAWFILL_CB (HID_CUI_START + 126) -#define HID_COLORPAGE_BASICIDENTIFIER_CB (HID_CUI_START + 127) -#define HID_COLORPAGE_BASICCOMMENT_CB (HID_CUI_START + 128) -#define HID_COLORPAGE_BASICNUMBER_CB (HID_CUI_START + 129) -#define HID_COLORPAGE_BASICSTRING_CB (HID_CUI_START + 130) -#define HID_COLORPAGE_BASICOPERATOR_CB (HID_CUI_START + 131) -#define HID_COLORPAGE_BASICKEYWORD_CB (HID_CUI_START + 132) -#define HID_COLORPAGE_BASICERROR_CB (HID_CUI_START + 133) -#define HID_NUMBERINGOPT_SEL_GRF_FROM_FILE (HID_CUI_START + 134) -#define HID_SVX_MACRO_LB_EVENT (HID_CUI_START + 135) -#define HID_SVX_CONFIG_EVENT (HID_CUI_START + 136) -#define HID_CONFIG_EVENT_OFFICE_BASED (HID_CUI_START + 137) -#define HID_CONFIG_EVENT_DOCUMENT_BASED (HID_CUI_START + 138) -#define HID_SELECTOR_DIALOG (HID_CUI_START + 139) -#define HID_SELECTOR_CATEGORIES (HID_CUI_START + 140) -#define HID_SVX_CONFIG_TOOLBAR (HID_CUI_START + 141) -#define HID_SVX_CONFIG_TOOLBAR_CONTENTS (HID_CUI_START + 142) -#define HID_SELECTOR_COMMANDS (HID_CUI_START + 143) -#define HID_GALLERY_EDIT_MSNAME (HID_CUI_START + 144) -#define HID_SVX_CONFIG_MENU (HID_CUI_START + 145) -#define HID_SVX_CONFIG_MENU_CONTENTS (HID_CUI_START + 146) -#define HID_GALLERY_NEWTHEME_FINDFILES (HID_CUI_START + 147) -#define HID_GALLERY_NEWTHEME_ADDFILES (HID_CUI_START + 148) -#define HID_HANGULDLG_BUTTON_OPTIONS (HID_CUI_START + 149) -#define HID_HANGULDLG_BUTTON_CLOSE (HID_CUI_START + 150) -#define HID_HANGULDLG_BUTTON_IGNORE (HID_CUI_START + 151) -#define HID_HANGULDLG_BUTTON_IGNOREALL (HID_CUI_START + 152) -#define HID_HANGULDLG_BUTTON_CHANGE (HID_CUI_START + 153) -#define HID_HANGULDLG_BUTTON_CHANGEALL (HID_CUI_START + 154) -#define HID_OFA_FONT_SUBSTITUTION (HID_CUI_START + 155) -#define HID_HANGULDLG_EDIT_NEWWORD (HID_CUI_START + 156) -#define HID_OFA_SUBST_APPLY (HID_CUI_START + 157) -#define HID_OFA_SUBST_DELETE (HID_CUI_START + 158) -#define HID_SPLDLG_BUTTON_CLOSE (HID_CUI_START + 159) -#define HID_SPLDLG_BUTTON_IGNORE (HID_CUI_START + 160) -#define HID_SPLDLG_BUTTON_IGNOREALL (HID_CUI_START + 161) -#define HID_SPLDLG_BUTTON_CHANGE (HID_CUI_START + 162) -#define HID_SPLDLG_BUTTON_CHANGEALL (HID_CUI_START + 163) -#define HID_SPLDLG_BUTTON_EXPLAIN (HID_CUI_START + 164) -#define HID_CHARMAP_CTL_SHOWSET (HID_CUI_START + 165) -#define HID_CHARMAP_CTL_SHOWTEXT (HID_CUI_START + 166) -#define HID_CHARMAP_CTL_SHOWCHAR (HID_CUI_START + 167) -#define HID_DLG_NAME (HID_CUI_START + 168) -#define HID_DLG_MESSBOX (HID_CUI_START + 169) -#define HID_HANGULDLG_SUGGESTIONS (HID_CUI_START + 170) -#define HID_HANGULDLG_SUGGESTIONS_GRID (HID_CUI_START + 171) -#define HID_HANGULDLG_SUGGESTIONS_LIST (HID_CUI_START + 172) -#define HID_DLG_OBJECT_NAME (HID_CUI_START + 173) -#define HID_DLG_OBJECT_TITLE_DESC (HID_CUI_START + 174) -#define HID_SVX_CONFIG_MENU_ORGANIZER (HID_CUI_START + 175) -#define HID_SVX_CONFIG_ICON_SELECTOR (HID_CUI_START + 176) -#define HID_SVX_CONFIG_NAME_SUBMENU (HID_CUI_START + 177) -#define HID_SVX_CONFIG_RENAME_MENU (HID_CUI_START + 178) -#define HID_SVX_CONFIG_RENAME_MENU_ITEM (HID_CUI_START + 179) -#define HID_SVX_CONFIG_RENAME_TOOLBAR (HID_CUI_START + 180) -#define HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM (HID_CUI_START + 181) -#define HID_SVX_NEW_TOOLBAR (HID_CUI_START + 182) -#define HID_SVX_MODIFY_TOOLBAR (HID_CUI_START + 183) -#define HID_SVX_NEW_TOOLBAR_ITEM (HID_CUI_START + 184) -#define HID_SVX_CONFIG_MENU_LISTBOX (HID_CUI_START + 185) -#define HID_SVX_MODIFY_TOOLBAR_ITEM (HID_CUI_START + 186) -#define HID_SVX_SAVE_IN (HID_CUI_START + 187) -#define HID_OPTIONS_MULTIPATH_LIST (HID_CUI_START + 188) -#define HID_FM_DLG_SEARCH (HID_CUI_START + 189) -#define HID_SEARCH_TEXT (HID_CUI_START + 190) -#define HID_SEARCH_ALLFIELDS (HID_CUI_START + 191) -#define HID_GALLERY_PROPERTIES_GENERAL (HID_CUI_START + 192) -#define HID_SEARCH_FIELDSELECTION (HID_CUI_START + 193) -#define HID_SEARCH_POSITION (HID_CUI_START + 194) -#define HID_SEARCH_FORMATTER (HID_CUI_START + 195) -#define HID_SEARCH_CASE (HID_CUI_START + 196) -#define HID_SEARCH_BACKWARD (HID_CUI_START + 197) -#define HID_SEARCH_STARTOVER (HID_CUI_START + 198) -#define HID_SEARCH_WILDCARD (HID_CUI_START + 199) -#define HID_SEARCH_REGULAR (HID_CUI_START + 200) -#define HID_SEARCH_APPROX (HID_CUI_START + 201) -#define HID_SEARCH_APPROXSETTINGS (HID_CUI_START + 202) -#define HID_SEARCH_BTN_SEARCH (HID_CUI_START + 203) -#define HID_SEARCH_BTN_CLOSE (HID_CUI_START + 204) -#define HID_GALLERY_BROWSER (HID_CUI_START + 205) -#define HID_GALLERY_SEARCH (HID_CUI_START + 206) -#define HID_GALLERY_APPLY (HID_CUI_START + 207) -#define HID_SPLDLG_BUTTON_IGNORERULE (HID_CUI_START + 208) -#define HID_CONFIG_ACCEL (HID_CUI_START + 209) -#define HID_ACCELCONFIG_LISTBOX (HID_CUI_START + 210) -#define HID_CONFIGGROUP_ACC_LISTBOX (HID_CUI_START + 211) -#define HID_CONFIGFUNCTION_ACC_LISTBOX (HID_CUI_START + 212) -#define HID_MACRO_LB_EVENT (HID_CUI_START + 213) -#define HID_MACRO_GROUP (HID_CUI_START + 214) -#define HID_MACRO_MACROS (HID_CUI_START + 215) -#define HID_DIALOG_HANGULHANJA (HID_CUI_START + 216) -#define HID_HANGULHANJA_OPT_DLG (HID_CUI_START + 217) -#define HID_HANGULHANJA_NEWDICT_DLG (HID_CUI_START + 218) -#define HID_HANGULHANJA_EDIT_DLG (HID_CUI_START + 219) -#define HID_HANGULHANJA_OPT_DICTS_LB (HID_CUI_START + 220) -#define HID_MULTIPATH (HID_CUI_START + 221) -#define HID_SCRIPTORG_DIALOG (HID_CUI_START + 222) -#define HID_SCRIPTSBOX (HID_CUI_START + 223) -#define HID_SPELLCHECK (HID_CUI_START + 224) -#define HID_TPSIZE_CTRL (HID_CUI_START + 225) -#define HID_TPROTATION_CTRL1 (HID_CUI_START + 226) -#define HID_TPROTATION_CTRL2 (HID_CUI_START + 227) -#define HID_TRANS_ANGLE (HID_CUI_START + 228) -#define HID_TPPOSITION_CTRL (HID_CUI_START + 229) -#define HID_NUMBERFORMAT_LB_FORMAT (HID_CUI_START + 230) -#define HID_NUMBERFORMAT_WND_NUMBER_PREVIEW (HID_CUI_START + 231) -#define HID_TRANS_SLANT (HID_CUI_START + 232) -#define HID_TPHATCH_CTRL (HID_CUI_START + 233) -#define HID_SEARCHATTR_CTL_ATTR (HID_CUI_START + 234) -#define HID_NUMBERFORMAT_TBI_INFO (HID_CUI_START + 235) -#define HID_SEARCHATTR (HID_CUI_START + 236) -#define HID_ALIGNMENT_CTR_DIAL (HID_CUI_START + 237) -#define HID_ALIGNMENT_CTR_BORDER_LOCK (HID_CUI_START + 238) -#define HID_SEARCHSIMILARITY (HID_CUI_START + 239) -#define UID_SEARCH_RECORDSTATUS (HID_CUI_START + 240) -#define HID_OFAPAGE_AUTOCORR_CLB (HID_CUI_START + 241) -#define HID_AUTOCORR_LANGUAGE (HID_CUI_START + 242) -#define HID_OFAPAGE_AUTOFORMAT_CLB (HID_CUI_START + 243) -#define HID_TPCOLOR_RGB_1 (HID_CUI_START + 244) -#define HID_TPCOLOR_RGB_2 (HID_CUI_START + 245) -#define HID_TPCOLOR_RGB_3 (HID_CUI_START + 246) -#define HID_TPCOLOR_CMYK_1 (HID_CUI_START + 247) -#define HID_TPCOLOR_CMYK_2 (HID_CUI_START + 248) -#define HID_TPCOLOR_CMYK_3 (HID_CUI_START + 249) -#define HID_ALIGNMENT (HID_CUI_START + 250) -#define HID_OFAPAGE_AUTOCORR_OPTIONS (HID_CUI_START + 251) -#define HID_OFAPAGE_AUTOFMT_OPTIONS (HID_CUI_START + 252) -#define HID_OFAPAGE_AUTOCORR_REPLACE (HID_CUI_START + 253) -#define HID_OFACTL_AUTOCORR_REPLACE (HID_CUI_START + 254) -#define HID_OFAPAGE_AUTOCORR_EXCEPT (HID_CUI_START + 255) -#define HID_OFAPAGE_AUTOCORR_QUOTE (HID_CUI_START + 256) -#define HID_OFAPAGE_AUTOCOMPLETE_OPTIONS (HID_CUI_START + 257) -#define HID_BACKGROUND (HID_CUI_START + 258) -#define HID_BACKGROUND_CTL_BGDCOLORSET (HID_CUI_START + 259) -#define HID_BACKGROUND_CTL_POSITION (HID_CUI_START + 260) -#define HID_BORDER (HID_CUI_START + 261) -#define HID_BORDER_CTL_PRESETS (HID_CUI_START + 262) -#define HID_BORDER_CTL_SHADOWS (HID_CUI_START + 263) -#define HID_PAGE_CONNECTION (HID_CUI_START + 264) -#define HID_PAGE_CONNECTION_CTL_PREVIEW (HID_CUI_START + 265) -#define HID_PAGE_DISTRIBUTE (HID_CUI_START + 266) -#define HID_SVXPAGE_GRFCROP (HID_CUI_START + 267) -#define HID_CAPTION (HID_CUI_START + 268) -#define HID_CAPTION_CTL_TYPE (HID_CUI_START + 269) -#define HID_PAGE_MEASURE (HID_CUI_START + 270) -#define HID_MEASURE_CTL_POSITION (HID_CUI_START + 271) -#define HID_NUMBERFORMAT (HID_CUI_START + 272) -#define HID_NUMBERFORMAT_TBI_ADD (HID_CUI_START + 273) -#define HID_NUMBERFORMAT_TBI_REMOVE (HID_CUI_START + 274) -#define HID_FORMAT_PAGE (HID_CUI_START + 275) -#define HID_REDLINING_DLG (HID_CUI_START + 276) -#define HID_REDLINING_EDIT (HID_CUI_START + 277) -#define HID_REDLINING_PREV (HID_CUI_START + 278) -#define HID_REDLINING_NEXT (HID_CUI_START + 279) -#define HID_FORMAT_PARAGRAPH_STD (HID_CUI_START + 280) -#define HID_VALUESET_SINGLENUM (HID_CUI_START + 281) -#define HID_VALUESET_BULLET (HID_CUI_START + 282) -#define HID_VALUESET_NUM (HID_CUI_START + 283) -#define HID_VALUESET_NUMBMP (HID_CUI_START + 284) -#define HID_SVXPAGE_PICK_NUM (HID_CUI_START + 285) -#define HID_SVXPAGE_PICK_SINGLE_NUM (HID_CUI_START + 286) -#define HID_SVXPAGE_PICK_BMP (HID_CUI_START + 287) -#define HID_SVXPAGE_PICK_BULLET (HID_CUI_START + 288) -#define HID_SVXPAGE_NUM_OPTIONS (HID_CUI_START + 289) -#define HID_SVXPAGE_NUM_POSITION (HID_CUI_START + 290) -#define HID_MEASURE_CTL_PREVIEW (HID_CUI_START + 291) -#define HID_FORMAT_PARAGRAPH_EXT (HID_CUI_START + 292) -#define HID_FORMAT_PARAGRAPH_ALIGN (HID_CUI_START + 293) -#define HID_SVXPAGE_PARA_ASIAN (HID_CUI_START + 294) -#define HID_SVXPAGE_SWPOSSIZE (HID_CUI_START + 295) -#define HID_AREA_TRANSPARENCE (HID_CUI_START + 296) -#define HID_AREA_AREA (HID_CUI_START + 297) -#define HID_AREA_SHADOW (HID_CUI_START + 298) -#define HID_AREA_HATCH (HID_CUI_START + 299) -#define HID_AREA_BITMAP (HID_CUI_START + 300) -#define HID_TPSHADOW_CTRL (HID_CUI_START + 301) -#define HID_AREA_GRADIENT (HID_CUI_START + 302) -#define HID_LINE_ENDDEF (HID_CUI_START + 303) -#define HID_LINE_LINE (HID_CUI_START + 304) -#define HID_LINE_DEF (HID_CUI_START + 305) -#define HID_SPELLDLG_SETWORD (HID_CUI_START + 306) -#define HID_TABULATOR (HID_CUI_START + 307) -#define HID_PAGE_TEXTATTR (HID_CUI_START + 308) -#define HID_TEXTATTR_CTL_POSITION (HID_CUI_START + 309) -#define HID_TRANS_POSITION_SIZE (HID_CUI_START + 310) -#define HID_HYPHENATE (HID_CUI_START + 311) -#define HID_SVXPAGE_CHAR_NAME (HID_CUI_START + 312) -#define HID_SVXPAGE_CHAR_EFFECTS (HID_CUI_START + 313) -#define HID_SVXPAGE_CHAR_POSITION (HID_CUI_START + 314) -#define HID_HYPERLINK_INTERNET (HID_CUI_START + 315) -#define HID_HYPERLINK_MAIL (HID_CUI_START + 316) -#define HID_HYPERLINK_DOCUMENT (HID_CUI_START + 317) -#define HID_HYPERLINK_NEWDOCUMENT (HID_CUI_START + 318) -#define HID_HYPERLINK_MARKWND (HID_CUI_START + 319) -#define HID_ICCDIALOG_RESET_BTN (HID_CUI_START + 320) -#define HID_ICCDIALOG_CHOICECTRL (HID_CUI_START + 321) -#define HID_HYPERDLG_INET_PATH (HID_CUI_START + 322) -#define HID_HYPERDLG_MAIL_PATH (HID_CUI_START + 323) -#define HID_HYPERDLG_DOC_PATH (HID_CUI_START + 324) -#define HID_ICCDIALOG_OK_BTN (HID_CUI_START + 325) -#define HID_ICCDIALOG_CANCEL_BTN (HID_CUI_START + 326) -#define HID_HYPERLINK_MARKWND_APPLY (HID_CUI_START + 327) -#define HID_HYPERLINK_MARKWND_CLOSE (HID_CUI_START + 328) -#define HID_HYPERLINK_MARKWND_TREE (HID_CUI_START + 329) -#define HID_SVXPAGE_CHAR_TWOLINES (HID_CUI_START + 330) -#define HID_GRFFILTER_EMBOSS_LIGHT (HID_CUI_START + 331) -#define HID_PASTE_DLG (HID_CUI_START + 333) -#define HID_LINKDLG_TABLB (HID_CUI_START + 334) -#define HID_MACRO_HEADERTABLISTBOX (HID_CUI_START + 335) -#define HID_GALLERY_ENTER_TITLE (HID_CUI_START + 336) -#define HID_GALLERY_TITLE_EDIT (HID_CUI_START + 337) -#define HID_THES_LANGUAGE (HID_CUI_START + 338) -#define HID_OFAPAGE_QUOTE_SW_CLB (HID_CUI_START + 339) -#define HID_OFAPAGE_QUOTE_CLB (HID_CUI_START + 340) - -// please adjust ACT_SVX_HID_END2 below if you add entries here! - -// ----------------------------------------------------------------------- -// Overrun check --------------------------------------------------------- -// ----------------------------------------------------------------------- - -#define ACT_CUI_HID_END HID_CUI_START + 340 - -#if ACT_CUI_HID_END > HID_CUI_END -#error Resource-Ueberlauf in #line, #file -#endif - +#define HID_OPTIONS_COLOR "CUI_HID_OPTIONS_COLOR" +#define HID_OPTIONS_SAVE "CUI_HID_OPTIONS_SAVE" +#define HID_OPTIONS_PATH "CUI_HID_OPTIONS_PATH" +#define HID_OPTIONS_GENERAL "CUI_HID_OPTIONS_GENERAL" +#define HID_OPTIONS_LINGU "CUI_HID_OPTIONS_LINGU" +#define HID_OPTIONS_SPELL "CUI_HID_OPTIONS_SPELL" +#define HID_OPTIONS_DICT_NEW "CUI_HID_OPTIONS_DICT_NEW" +#define HID_OPTIONS_DICT_EDIT "CUI_HID_OPTIONS_DICT_EDIT" +#define HID_OPTIONS_INET "CUI_HID_OPTIONS_INET" +#define HID_OPTIONS_CHART_DEFCOLORS "CUI_HID_OPTIONS_CHART_DEFCOLORS" +#define HID_OPTIONS_CTL "CUI_HID_OPTIONS_CTL" +#define HID_OPTIONS_PROXY "CUI_HID_OPTIONS_PROXY" +#define HID_OPTIONS_SEARCH "CUI_HID_OPTIONS_SEARCH" +#define HID_OPTIONS_MAIL "CUI_HID_OPTIONS_MAIL" +#define HID_OPTIONS_ASIAN_LAYOUT "CUI_HID_OPTIONS_ASIAN_LAYOUT" +#define HID_CLB_EDIT_MODULES_DICS "CUI_HID_CLB_EDIT_MODULES_DICS" +#define HID_CLB_EDIT_MODULES_MODULES "CUI_HID_CLB_EDIT_MODULES_MODULES" +#define HID_CLB_LINGU_MODULES "CUI_HID_CLB_LINGU_MODULES" +#define HID_CLB_LINGU_OPTIONS "CUI_HID_CLB_LINGU_OPTIONS" +#define HID_EDIT_MODULES "CUI_HID_EDIT_MODULES" +#define HID_LNGDLG_NUM_PREBREAK "CUI_HID_LNGDLG_NUM_PREBREAK" +#define HID_OPTIONS_COLORCONFIG "CUI_HID_OPTIONS_COLORCONFIG" +#define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME "CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME" +#define HID_OPTIONS_ACCESSIBILITYCONFIG "CUI_HID_OPTIONS_ACCESSIBILITYCONFIG" +#define HID_OPTIONS_COLORCONFIG_COLORLIST_WIN "CUI_HID_OPTIONS_COLORCONFIG_COLORLIST_WIN" +#define HID_OPTIONS_COLORCONFIG_NAME_SCHEME "CUI_HID_OPTIONS_COLORCONFIG_NAME_SCHEME" +#define HID_OPTIONS_PATHS_SELECTFOLDER "CUI_HID_OPTIONS_PATHS_SELECTFOLDER" +#define HID_OPTIONS_JAVA "CUI_HID_OPTIONS_JAVA" +#define HID_OPTIONS_JAVA_LIST "CUI_HID_OPTIONS_JAVA_LIST" +#define HID_OPTIONS_JAVA_PARAMETER "CUI_HID_OPTIONS_JAVA_PARAMETER" +#define HID_OPTIONS_JAVA_CLASSPATH "CUI_HID_OPTIONS_JAVA_CLASSPATH" +#define HID_SVXPAGE_JSEARCH_OPTIONS "CUI_HID_SVXPAGE_JSEARCH_OPTIONS" +#define HID_SVXDLG_FILTER_WARNING "CUI_HID_SVXDLG_FILTER_WARNING" +#define HID_SVX_OPTIONS_ONLINEUPDATE "CUI_HID_SVX_OPTIONS_ONLINEUPDATE" +#define HID_DLG_SECURITY_OPTIONS "CUI_HID_DLG_SECURITY_OPTIONS" +#define HID_OFADLG_OPTIONS_TREE "CUI_HID_OFADLG_OPTIONS_TREE" +#define HID_OFA_CONNPOOL_DRIVERLIST "CUI_HID_OFA_CONNPOOL_DRIVERLIST" +#define UID_OFA_CONNPOOL_DRIVERLIST_BACK "CUI_UID_OFA_CONNPOOL_DRIVERLIST_BACK" +#define HID_OFA_FONT_SUBST_CLB "CUI_HID_OFA_FONT_SUBST_CLB" +#define HID_OFA_TP_MISC "CUI_HID_OFA_TP_MISC" +#define HID_OFA_TP_VIEW "CUI_HID_OFA_TP_VIEW" +#define HID_OFA_TP_LANGUAGES "CUI_HID_OFA_TP_LANGUAGES" +#define HID_OFA_TP_MEMORY "CUI_HID_OFA_TP_MEMORY" +#define HID_DBPATH_CTL_PATH "CUI_HID_DBPATH_CTL_PATH" +#define HID_DBPATH_HEADERBAR "CUI_HID_DBPATH_HEADERBAR" +#define HID_OFAPAGE_SMARTTAG_OPTIONS "CUI_HID_OFAPAGE_SMARTTAG_OPTIONS" +#define HID_OFAPAGE_MSFLTR2_CLB "CUI_HID_OFAPAGE_MSFLTR2_CLB" +#define HID_OPTPATH_CTL_PATH "CUI_HID_OPTPATH_CTL_PATH" +#define HID_OFADLG_TREELISTBOX "CUI_HID_OFADLG_TREELISTBOX" +#define HID_DLG_WEBCONNECTION_INFO "CUI_HID_DLG_WEBCONNECTION_INFO" +#define HID_OPTIONS_DICT_EDIT_ENTRIES_LIST "CUI_HID_OPTIONS_DICT_EDIT_ENTRIES_LIST" +#define HID_OPTPATH_HEADERBAR "CUI_HID_OPTPATH_HEADERBAR" +#define HID_WARN_NAME_DUPLICATE "CUI_HID_WARN_NAME_DUPLICATE" +#define HID_COLORPAGE_LISTBOX_START "CUI_HID_COLORPAGE_LISTBOX_START" +#define HID_COLORPAGE_DOCCOLOR_LB "CUI_HID_COLORPAGE_DOCCOLOR_LB" +#define HID_COLORPAGE_DOCBOUNDARIES_LB "CUI_HID_COLORPAGE_DOCBOUNDARIES_LB" +#define HID_COLORPAGE_APPBACKGROUND_LB "CUI_HID_COLORPAGE_APPBACKGROUND_LB" +#define HID_COLORPAGE_OBJECTBOUNDARIES_LB "CUI_HID_COLORPAGE_OBJECTBOUNDARIES_LB" +#define HID_COLORPAGE_TABLEBOUNDARIES_LB "CUI_HID_COLORPAGE_TABLEBOUNDARIES_LB" +#define HID_COLORPAGE_FONTCOLOR_LB "CUI_HID_COLORPAGE_FONTCOLOR_LB" +#define HID_COLORPAGE_LINKS_LB "CUI_HID_COLORPAGE_LINKS_LB" +#define HID_COLORPAGE_LINKSVISITED_LB "CUI_HID_COLORPAGE_LINKSVISITED_LB" +#define HID_COLORPAGE_ANCHOR_LB "CUI_HID_COLORPAGE_ANCHOR_LB" +#define HID_COLORPAGE_SPELL_LB "CUI_HID_COLORPAGE_SPELL_LB" +#define HID_COLORPAGE_WRITERTEXTGRID_LB "CUI_HID_COLORPAGE_WRITERTEXTGRID_LB" +#define HID_COLORPAGE_WRITERFIELDSHADINGS_LB "CUI_HID_COLORPAGE_WRITERFIELDSHADINGS_LB" +#define HID_COLORPAGE_WRITERIDXSHADINGS_LB "CUI_HID_COLORPAGE_WRITERIDXSHADINGS_LB" +#define HID_COLORPAGE_WRITERDIRECTCURSOR_LB "CUI_HID_COLORPAGE_WRITERDIRECTCURSOR_LB" +#define HID_COLORPAGE_WRITERNOTESINDICATOR_LB "CUI_HID_COLORPAGE_WRITERNOTESINDICATOR_LB" +#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB "CUI_HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB" +#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB "CUI_HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB" +#define HID_COLORPAGE_WRITERPAGEBREAKS_LB "CUI_HID_COLORPAGE_WRITERPAGEBREAKS_LB" +#define HID_COLORPAGE_HTMLSGML_LB "CUI_HID_COLORPAGE_HTMLSGML_LB" +#define HID_COLORPAGE_HTMLCOMMENT_LB "CUI_HID_COLORPAGE_HTMLCOMMENT_LB" +#define HID_COLORPAGE_HTMLKEYWORD_LB "CUI_HID_COLORPAGE_HTMLKEYWORD_LB" +#define HID_COLORPAGE_HTMLUNKNOWN_LB "CUI_HID_COLORPAGE_HTMLUNKNOWN_LB" +#define HID_COLORPAGE_CALCGRID_LB "CUI_HID_COLORPAGE_CALCGRID_LB" +#define HID_COLORPAGE_CALCPAGEBREAK_LB "CUI_HID_COLORPAGE_CALCPAGEBREAK_LB" +#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB "CUI_HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB" +#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB "CUI_HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB" +#define HID_COLORPAGE_CALCDETECTIVE_LB "CUI_HID_COLORPAGE_CALCDETECTIVE_LB" +#define HID_COLORPAGE_CALCDETECTIVEERROR_LB "CUI_HID_COLORPAGE_CALCDETECTIVEERROR_LB" +#define HID_COLORPAGE_CALCREFERENCE_LB "CUI_HID_COLORPAGE_CALCREFERENCE_LB" +#define HID_COLORPAGE_CALCNOTESBACKGROUND_LB "CUI_HID_COLORPAGE_CALCNOTESBACKGROUND_LB" +#define HID_COLORPAGE_DRAWGRID_LB "CUI_HID_COLORPAGE_DRAWGRID_LB" +#define HID_COLORPAGE_DRAWDRAWING_LB "CUI_HID_COLORPAGE_DRAWDRAWING_LB" +#define HID_COLORPAGE_DRAWFILL_LB "CUI_HID_COLORPAGE_DRAWFILL_LB" +#define HID_COLORPAGE_BASICIDENTIFIER_LB "CUI_HID_COLORPAGE_BASICIDENTIFIER_LB" +#define HID_COLORPAGE_BASICCOMMENT_LB "CUI_HID_COLORPAGE_BASICCOMMENT_LB" +#define HID_COLORPAGE_BASICNUMBER_LB "CUI_HID_COLORPAGE_BASICNUMBER_LB" +#define HID_COLORPAGE_BASICSTRING_LB "CUI_HID_COLORPAGE_BASICSTRING_LB" +#define HID_COLORPAGE_BASICOPERATOR_LB "CUI_HID_COLORPAGE_BASICOPERATOR_LB" +#define HID_COLORPAGE_BASICKEYWORD_LB "CUI_HID_COLORPAGE_BASICKEYWORD_LB" +#define HID_COLORPAGE_BASICERROR_LB "CUI_HID_COLORPAGE_BASICERROR_LB" +#define HID_COLORPAGE_CHECKBOX_START "CUI_HID_COLORPAGE_CHECKBOX_START" +#define HID_COLORPAGE_DOCCOLOR_CB "CUI_HID_COLORPAGE_DOCCOLOR_CB" +#define HID_COLORPAGE_DOCBOUNDARIES_CB "CUI_HID_COLORPAGE_DOCBOUNDARIES_CB" +#define HID_COLORPAGE_APPBACKGROUND_CB "CUI_HID_COLORPAGE_APPBACKGROUND_CB" +#define HID_COLORPAGE_OBJECTBOUNDARIES_CB "CUI_HID_COLORPAGE_OBJECTBOUNDARIES_CB" +#define HID_COLORPAGE_TABLEBOUNDARIES_CB "CUI_HID_COLORPAGE_TABLEBOUNDARIES_CB" +#define HID_COLORPAGE_FONTCOLOR_CB "CUI_HID_COLORPAGE_FONTCOLOR_CB" +#define HID_COLORPAGE_LINKS_CB "CUI_HID_COLORPAGE_LINKS_CB" +#define HID_COLORPAGE_LINKSVISITED_CB "CUI_HID_COLORPAGE_LINKSVISITED_CB" +#define HID_COLORPAGE_ANCHOR_CB "CUI_HID_COLORPAGE_ANCHOR_CB" +#define HID_COLORPAGE_SPELL_CB "CUI_HID_COLORPAGE_SPELL_CB" +#define HID_COLORPAGE_WRITERTEXTGRID_CB "CUI_HID_COLORPAGE_WRITERTEXTGRID_CB" +#define HID_COLORPAGE_WRITERFIELDSHADINGS_CB "CUI_HID_COLORPAGE_WRITERFIELDSHADINGS_CB" +#define HID_COLORPAGE_WRITERIDXSHADINGS_CB "CUI_HID_COLORPAGE_WRITERIDXSHADINGS_CB" +#define HID_COLORPAGE_WRITERDIRECTCURSOR_CB "CUI_HID_COLORPAGE_WRITERDIRECTCURSOR_CB" +#define HID_COLORPAGE_WRITERNOTESINDICATOR_CB "CUI_HID_COLORPAGE_WRITERNOTESINDICATOR_CB" +#define HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB "CUI_HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB" +#define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB "CUI_HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB" +#define HID_COLORPAGE_WRITERPAGEBREAKS_CB "CUI_HID_COLORPAGE_WRITERPAGEBREAKS_CB" +#define HID_COLORPAGE_HTMLSGML_CB "CUI_HID_COLORPAGE_HTMLSGML_CB" +#define HID_COLORPAGE_HTMLCOMMENT_CB "CUI_HID_COLORPAGE_HTMLCOMMENT_CB" +#define HID_COLORPAGE_HTMLKEYWORD_CB "CUI_HID_COLORPAGE_HTMLKEYWORD_CB" +#define HID_COLORPAGE_HTMLUNKNOWN_CB "CUI_HID_COLORPAGE_HTMLUNKNOWN_CB" +#define HID_COLORPAGE_CALCGRID_CB "CUI_HID_COLORPAGE_CALCGRID_CB" +#define HID_COLORPAGE_CALCPAGEBREAK_CB "CUI_HID_COLORPAGE_CALCPAGEBREAK_CB" +#define HID_COLORPAGE_CALCPAGEBREAKMANUAL_CB "CUI_HID_COLORPAGE_CALCPAGEBREAKMANUAL_CB" +#define HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_CB "CUI_HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_CB" +#define HID_COLORPAGE_CALCDETECTIVE_CB "CUI_HID_COLORPAGE_CALCDETECTIVE_CB" +#define HID_COLORPAGE_CALCDETECTIVEERROR_CB "CUI_HID_COLORPAGE_CALCDETECTIVEERROR_CB" +#define HID_COLORPAGE_CALCREFERENCE_CB "CUI_HID_COLORPAGE_CALCREFERENCE_CB" +#define HID_COLORPAGE_CALCNOTESBACKGROUND_CB "CUI_HID_COLORPAGE_CALCNOTESBACKGROUND_CB" +#define HID_COLORPAGE_DRAWGRID_CB "CUI_HID_COLORPAGE_DRAWGRID_CB" +#define HID_COLORPAGE_DRAWDRAWING_CB "CUI_HID_COLORPAGE_DRAWDRAWING_CB" +#define HID_COLORPAGE_DRAWFILL_CB "CUI_HID_COLORPAGE_DRAWFILL_CB" +#define HID_COLORPAGE_BASICIDENTIFIER_CB "CUI_HID_COLORPAGE_BASICIDENTIFIER_CB" +#define HID_COLORPAGE_BASICCOMMENT_CB "CUI_HID_COLORPAGE_BASICCOMMENT_CB" +#define HID_COLORPAGE_BASICNUMBER_CB "CUI_HID_COLORPAGE_BASICNUMBER_CB" +#define HID_COLORPAGE_BASICSTRING_CB "CUI_HID_COLORPAGE_BASICSTRING_CB" +#define HID_COLORPAGE_BASICOPERATOR_CB "CUI_HID_COLORPAGE_BASICOPERATOR_CB" +#define HID_COLORPAGE_BASICKEYWORD_CB "CUI_HID_COLORPAGE_BASICKEYWORD_CB" +#define HID_COLORPAGE_BASICERROR_CB "CUI_HID_COLORPAGE_BASICERROR_CB" +#define HID_NUMBERINGOPT_SEL_GRF_FROM_FILE "CUI_HID_NUMBERINGOPT_SEL_GRF_FROM_FILE" +#define HID_SVX_MACRO_LB_EVENT "CUI_HID_SVX_MACRO_LB_EVENT" +#define HID_SVX_CONFIG_EVENT "CUI_HID_SVX_CONFIG_EVENT" +#define HID_CONFIG_EVENT_OFFICE_BASED "CUI_HID_CONFIG_EVENT_OFFICE_BASED" +#define HID_CONFIG_EVENT_DOCUMENT_BASED "CUI_HID_CONFIG_EVENT_DOCUMENT_BASED" +#define HID_SELECTOR_DIALOG "CUI_HID_SELECTOR_DIALOG" +#define HID_SELECTOR_CATEGORIES "CUI_HID_SELECTOR_CATEGORIES" +#define HID_SVX_CONFIG_TOOLBAR "CUI_HID_SVX_CONFIG_TOOLBAR" +#define HID_SVX_CONFIG_TOOLBAR_CONTENTS "CUI_HID_SVX_CONFIG_TOOLBAR_CONTENTS" +#define HID_SELECTOR_COMMANDS "CUI_HID_SELECTOR_COMMANDS" +#define HID_GALLERY_EDIT_MSNAME "CUI_HID_GALLERY_EDIT_MSNAME" +#define HID_SVX_CONFIG_MENU "CUI_HID_SVX_CONFIG_MENU" +#define HID_SVX_CONFIG_MENU_CONTENTS "CUI_HID_SVX_CONFIG_MENU_CONTENTS" +#define HID_GALLERY_NEWTHEME_FINDFILES "CUI_HID_GALLERY_NEWTHEME_FINDFILES" +#define HID_GALLERY_NEWTHEME_ADDFILES "CUI_HID_GALLERY_NEWTHEME_ADDFILES" +#define HID_HANGULDLG_BUTTON_OPTIONS "CUI_HID_HANGULDLG_BUTTON_OPTIONS" +#define HID_HANGULDLG_BUTTON_CLOSE "CUI_HID_HANGULDLG_BUTTON_CLOSE" +#define HID_HANGULDLG_BUTTON_IGNORE "CUI_HID_HANGULDLG_BUTTON_IGNORE" +#define HID_HANGULDLG_BUTTON_IGNOREALL "CUI_HID_HANGULDLG_BUTTON_IGNOREALL" +#define HID_HANGULDLG_BUTTON_CHANGE "CUI_HID_HANGULDLG_BUTTON_CHANGE" +#define HID_HANGULDLG_BUTTON_CHANGEALL "CUI_HID_HANGULDLG_BUTTON_CHANGEALL" +#define HID_OFA_FONT_SUBSTITUTION "CUI_HID_OFA_FONT_SUBSTITUTION" +#define HID_HANGULDLG_EDIT_NEWWORD "CUI_HID_HANGULDLG_EDIT_NEWWORD" +#define HID_OFA_SUBST_APPLY "CUI_HID_OFA_SUBST_APPLY" +#define HID_OFA_SUBST_DELETE "CUI_HID_OFA_SUBST_DELETE" +#define HID_SPLDLG_BUTTON_CLOSE "CUI_HID_SPLDLG_BUTTON_CLOSE" +#define HID_SPLDLG_BUTTON_IGNORE "CUI_HID_SPLDLG_BUTTON_IGNORE" +#define HID_SPLDLG_BUTTON_IGNOREALL "CUI_HID_SPLDLG_BUTTON_IGNOREALL" +#define HID_SPLDLG_BUTTON_CHANGE "CUI_HID_SPLDLG_BUTTON_CHANGE" +#define HID_SPLDLG_BUTTON_CHANGEALL "CUI_HID_SPLDLG_BUTTON_CHANGEALL" +#define HID_SPLDLG_BUTTON_EXPLAIN "CUI_HID_SPLDLG_BUTTON_EXPLAIN" +#define HID_CHARMAP_CTL_SHOWSET "CUI_HID_CHARMAP_CTL_SHOWSET" +#define HID_CHARMAP_CTL_SHOWTEXT "CUI_HID_CHARMAP_CTL_SHOWTEXT" +#define HID_CHARMAP_CTL_SHOWCHAR "CUI_HID_CHARMAP_CTL_SHOWCHAR" +#define HID_DLG_NAME "CUI_HID_DLG_NAME" +#define HID_DLG_MESSBOX "CUI_HID_DLG_MESSBOX" +#define HID_HANGULDLG_SUGGESTIONS "CUI_HID_HANGULDLG_SUGGESTIONS" +#define HID_HANGULDLG_SUGGESTIONS_GRID "CUI_HID_HANGULDLG_SUGGESTIONS_GRID" +#define HID_HANGULDLG_SUGGESTIONS_LIST "CUI_HID_HANGULDLG_SUGGESTIONS_LIST" +#define HID_DLG_OBJECT_NAME "CUI_HID_DLG_OBJECT_NAME" +#define HID_DLG_OBJECT_TITLE_DESC "CUI_HID_DLG_OBJECT_TITLE_DESC" +#define HID_SVX_CONFIG_MENU_ORGANIZER "CUI_HID_SVX_CONFIG_MENU_ORGANIZER" +#define HID_SVX_CONFIG_ICON_SELECTOR "CUI_HID_SVX_CONFIG_ICON_SELECTOR" +#define HID_SVX_CONFIG_NAME_SUBMENU "CUI_HID_SVX_CONFIG_NAME_SUBMENU" +#define HID_SVX_CONFIG_RENAME_MENU "CUI_HID_SVX_CONFIG_RENAME_MENU" +#define HID_SVX_CONFIG_RENAME_MENU_ITEM "CUI_HID_SVX_CONFIG_RENAME_MENU_ITEM" +#define HID_SVX_CONFIG_RENAME_TOOLBAR "CUI_HID_SVX_CONFIG_RENAME_TOOLBAR" +#define HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM "CUI_HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM" +#define HID_SVX_NEW_TOOLBAR "CUI_HID_SVX_NEW_TOOLBAR" +#define HID_SVX_MODIFY_TOOLBAR "CUI_HID_SVX_MODIFY_TOOLBAR" +#define HID_SVX_NEW_TOOLBAR_ITEM "CUI_HID_SVX_NEW_TOOLBAR_ITEM" +#define HID_SVX_CONFIG_MENU_LISTBOX "CUI_HID_SVX_CONFIG_MENU_LISTBOX" +#define HID_SVX_MODIFY_TOOLBAR_ITEM "CUI_HID_SVX_MODIFY_TOOLBAR_ITEM" +#define HID_SVX_SAVE_IN "CUI_HID_SVX_SAVE_IN" +#define HID_OPTIONS_MULTIPATH_LIST "CUI_HID_OPTIONS_MULTIPATH_LIST" +#define HID_FM_DLG_SEARCH "CUI_HID_FM_DLG_SEARCH" +#define HID_SEARCH_TEXT "CUI_HID_SEARCH_TEXT" +#define HID_SEARCH_ALLFIELDS "CUI_HID_SEARCH_ALLFIELDS" +#define HID_GALLERY_PROPERTIES_GENERAL "CUI_HID_GALLERY_PROPERTIES_GENERAL" +#define HID_SEARCH_FIELDSELECTION "CUI_HID_SEARCH_FIELDSELECTION" +#define HID_SEARCH_POSITION "CUI_HID_SEARCH_POSITION" +#define HID_SEARCH_FORMATTER "CUI_HID_SEARCH_FORMATTER" +#define HID_SEARCH_CASE "CUI_HID_SEARCH_CASE" +#define HID_SEARCH_BACKWARD "CUI_HID_SEARCH_BACKWARD" +#define HID_SEARCH_STARTOVER "CUI_HID_SEARCH_STARTOVER" +#define HID_SEARCH_WILDCARD "CUI_HID_SEARCH_WILDCARD" +#define HID_SEARCH_REGULAR "CUI_HID_SEARCH_REGULAR" +#define HID_SEARCH_APPROX "CUI_HID_SEARCH_APPROX" +#define HID_SEARCH_APPROXSETTINGS "CUI_HID_SEARCH_APPROXSETTINGS" +#define HID_SEARCH_BTN_SEARCH "CUI_HID_SEARCH_BTN_SEARCH" +#define HID_SEARCH_BTN_CLOSE "CUI_HID_SEARCH_BTN_CLOSE" +#define HID_GALLERY_BROWSER "CUI_HID_GALLERY_BROWSER" +#define HID_GALLERY_SEARCH "CUI_HID_GALLERY_SEARCH" +#define HID_GALLERY_APPLY "CUI_HID_GALLERY_APPLY" +#define HID_SPLDLG_BUTTON_IGNORERULE "CUI_HID_SPLDLG_BUTTON_IGNORERULE" +#define HID_CONFIG_ACCEL "CUI_HID_CONFIG_ACCEL" +#define HID_ACCELCONFIG_LISTBOX "CUI_HID_ACCELCONFIG_LISTBOX" +#define HID_CONFIGGROUP_ACC_LISTBOX "CUI_HID_CONFIGGROUP_ACC_LISTBOX" +#define HID_CONFIGFUNCTION_ACC_LISTBOX "CUI_HID_CONFIGFUNCTION_ACC_LISTBOX" +#define HID_MACRO_LB_EVENT "CUI_HID_MACRO_LB_EVENT" +#define HID_MACRO_GROUP "CUI_HID_MACRO_GROUP" +#define HID_MACRO_MACROS "CUI_HID_MACRO_MACROS" +#define HID_DIALOG_HANGULHANJA "CUI_HID_DIALOG_HANGULHANJA" +#define HID_HANGULHANJA_OPT_DLG "CUI_HID_HANGULHANJA_OPT_DLG" +#define HID_HANGULHANJA_NEWDICT_DLG "CUI_HID_HANGULHANJA_NEWDICT_DLG" +#define HID_HANGULHANJA_EDIT_DLG "CUI_HID_HANGULHANJA_EDIT_DLG" +#define HID_HANGULHANJA_OPT_DICTS_LB "CUI_HID_HANGULHANJA_OPT_DICTS_LB" +#define HID_MULTIPATH "CUI_HID_MULTIPATH" +#define HID_SCRIPTORG_DIALOG "CUI_HID_SCRIPTORG_DIALOG" +#define HID_SCRIPTSBOX "CUI_HID_SCRIPTSBOX" +#define HID_SPELLCHECK "CUI_HID_SPELLCHECK" +#define HID_TPSIZE_CTRL "CUI_HID_TPSIZE_CTRL" +#define HID_TPROTATION_CTRL1 "CUI_HID_TPROTATION_CTRL1" +#define HID_TPROTATION_CTRL2 "CUI_HID_TPROTATION_CTRL2" +#define HID_TRANS_ANGLE "CUI_HID_TRANS_ANGLE" +#define HID_TPPOSITION_CTRL "CUI_HID_TPPOSITION_CTRL" +#define HID_NUMBERFORMAT_LB_FORMAT "CUI_HID_NUMBERFORMAT_LB_FORMAT" +#define HID_NUMBERFORMAT_WND_NUMBER_PREVIEW "CUI_HID_NUMBERFORMAT_WND_NUMBER_PREVIEW" +#define HID_TRANS_SLANT "CUI_HID_TRANS_SLANT" +#define HID_TPHATCH_CTRL "CUI_HID_TPHATCH_CTRL" +#define HID_SEARCHATTR_CTL_ATTR "CUI_HID_SEARCHATTR_CTL_ATTR" +#define HID_NUMBERFORMAT_TBI_INFO "CUI_HID_NUMBERFORMAT_TBI_INFO" +#define HID_SEARCHATTR "CUI_HID_SEARCHATTR" +#define HID_ALIGNMENT_CTR_DIAL "CUI_HID_ALIGNMENT_CTR_DIAL" +#define HID_ALIGNMENT_CTR_BORDER_LOCK "CUI_HID_ALIGNMENT_CTR_BORDER_LOCK" +#define HID_SEARCHSIMILARITY "CUI_HID_SEARCHSIMILARITY" +#define UID_SEARCH_RECORDSTATUS "CUI_UID_SEARCH_RECORDSTATUS" +#define HID_OFAPAGE_AUTOCORR_CLB "CUI_HID_OFAPAGE_AUTOCORR_CLB" +#define HID_AUTOCORR_LANGUAGE "CUI_HID_AUTOCORR_LANGUAGE" +#define HID_OFAPAGE_AUTOFORMAT_CLB "CUI_HID_OFAPAGE_AUTOFORMAT_CLB" +#define HID_TPCOLOR_RGB_1 "CUI_HID_TPCOLOR_RGB_1" +#define HID_TPCOLOR_RGB_2 "CUI_HID_TPCOLOR_RGB_2" +#define HID_TPCOLOR_RGB_3 "CUI_HID_TPCOLOR_RGB_3" +#define HID_TPCOLOR_CMYK_1 "CUI_HID_TPCOLOR_CMYK_1" +#define HID_TPCOLOR_CMYK_2 "CUI_HID_TPCOLOR_CMYK_2" +#define HID_TPCOLOR_CMYK_3 "CUI_HID_TPCOLOR_CMYK_3" +#define HID_ALIGNMENT "CUI_HID_ALIGNMENT" +#define HID_OFAPAGE_AUTOCORR_OPTIONS "CUI_HID_OFAPAGE_AUTOCORR_OPTIONS" +#define HID_OFAPAGE_AUTOFMT_OPTIONS "CUI_HID_OFAPAGE_AUTOFMT_OPTIONS" +#define HID_OFAPAGE_AUTOCORR_REPLACE "CUI_HID_OFAPAGE_AUTOCORR_REPLACE" +#define HID_OFACTL_AUTOCORR_REPLACE "CUI_HID_OFACTL_AUTOCORR_REPLACE" +#define HID_OFAPAGE_AUTOCORR_EXCEPT "CUI_HID_OFAPAGE_AUTOCORR_EXCEPT" +#define HID_OFAPAGE_AUTOCORR_QUOTE "CUI_HID_OFAPAGE_AUTOCORR_QUOTE" +#define HID_OFAPAGE_AUTOCOMPLETE_OPTIONS "CUI_HID_OFAPAGE_AUTOCOMPLETE_OPTIONS" +#define HID_BACKGROUND "CUI_HID_BACKGROUND" +#define HID_BACKGROUND_CTL_BGDCOLORSET "CUI_HID_BACKGROUND_CTL_BGDCOLORSET" +#define HID_BACKGROUND_CTL_POSITION "CUI_HID_BACKGROUND_CTL_POSITION" +#define HID_BORDER "CUI_HID_BORDER" +#define HID_BORDER_CTL_PRESETS "CUI_HID_BORDER_CTL_PRESETS" +#define HID_BORDER_CTL_SHADOWS "CUI_HID_BORDER_CTL_SHADOWS" +#define HID_PAGE_CONNECTION "CUI_HID_PAGE_CONNECTION" +#define HID_PAGE_CONNECTION_CTL_PREVIEW "CUI_HID_PAGE_CONNECTION_CTL_PREVIEW" +#define HID_PAGE_DISTRIBUTE "CUI_HID_PAGE_DISTRIBUTE" +#define HID_SVXPAGE_GRFCROP "CUI_HID_SVXPAGE_GRFCROP" +#define HID_CAPTION "CUI_HID_CAPTION" +#define HID_CAPTION_CTL_TYPE "CUI_HID_CAPTION_CTL_TYPE" +#define HID_PAGE_MEASURE "CUI_HID_PAGE_MEASURE" +#define HID_MEASURE_CTL_POSITION "CUI_HID_MEASURE_CTL_POSITION" +#define HID_NUMBERFORMAT "CUI_HID_NUMBERFORMAT" +#define HID_NUMBERFORMAT_TBI_ADD "CUI_HID_NUMBERFORMAT_TBI_ADD" +#define HID_NUMBERFORMAT_TBI_REMOVE "CUI_HID_NUMBERFORMAT_TBI_REMOVE" +#define HID_FORMAT_PAGE "CUI_HID_FORMAT_PAGE" +#define HID_REDLINING_DLG "CUI_HID_REDLINING_DLG" +#define HID_REDLINING_EDIT "CUI_HID_REDLINING_EDIT" +#define HID_REDLINING_PREV "CUI_HID_REDLINING_PREV" +#define HID_REDLINING_NEXT "CUI_HID_REDLINING_NEXT" +#define HID_FORMAT_PARAGRAPH_STD "CUI_HID_FORMAT_PARAGRAPH_STD" +#define HID_VALUESET_SINGLENUM "CUI_HID_VALUESET_SINGLENUM" +#define HID_VALUESET_BULLET "CUI_HID_VALUESET_BULLET" +#define HID_VALUESET_NUM "CUI_HID_VALUESET_NUM" +#define HID_VALUESET_NUMBMP "CUI_HID_VALUESET_NUMBMP" +#define HID_SVXPAGE_PICK_NUM "CUI_HID_SVXPAGE_PICK_NUM" +#define HID_SVXPAGE_PICK_SINGLE_NUM "CUI_HID_SVXPAGE_PICK_SINGLE_NUM" +#define HID_SVXPAGE_PICK_BMP "CUI_HID_SVXPAGE_PICK_BMP" +#define HID_SVXPAGE_PICK_BULLET "CUI_HID_SVXPAGE_PICK_BULLET" +#define HID_SVXPAGE_NUM_OPTIONS "CUI_HID_SVXPAGE_NUM_OPTIONS" +#define HID_SVXPAGE_NUM_POSITION "CUI_HID_SVXPAGE_NUM_POSITION" +#define HID_MEASURE_CTL_PREVIEW "CUI_HID_MEASURE_CTL_PREVIEW" +#define HID_FORMAT_PARAGRAPH_EXT "CUI_HID_FORMAT_PARAGRAPH_EXT" +#define HID_FORMAT_PARAGRAPH_ALIGN "CUI_HID_FORMAT_PARAGRAPH_ALIGN" +#define HID_SVXPAGE_PARA_ASIAN "CUI_HID_SVXPAGE_PARA_ASIAN" +#define HID_SVXPAGE_SWPOSSIZE "CUI_HID_SVXPAGE_SWPOSSIZE" +#define HID_AREA_TRANSPARENCE "CUI_HID_AREA_TRANSPARENCE" +#define HID_AREA_AREA "CUI_HID_AREA_AREA" +#define HID_AREA_SHADOW "CUI_HID_AREA_SHADOW" +#define HID_AREA_HATCH "CUI_HID_AREA_HATCH" +#define HID_AREA_BITMAP "CUI_HID_AREA_BITMAP" +#define HID_TPSHADOW_CTRL "CUI_HID_TPSHADOW_CTRL" +#define HID_AREA_GRADIENT "CUI_HID_AREA_GRADIENT" +#define HID_LINE_ENDDEF "CUI_HID_LINE_ENDDEF" +#define HID_LINE_LINE "CUI_HID_LINE_LINE" +#define HID_LINE_DEF "CUI_HID_LINE_DEF" +#define HID_SPELLDLG_SETWORD "CUI_HID_SPELLDLG_SETWORD" +#define HID_TABULATOR "CUI_HID_TABULATOR" +#define HID_PAGE_TEXTATTR "CUI_HID_PAGE_TEXTATTR" +#define HID_TEXTATTR_CTL_POSITION "CUI_HID_TEXTATTR_CTL_POSITION" +#define HID_TRANS_POSITION_SIZE "CUI_HID_TRANS_POSITION_SIZE" +#define HID_HYPHENATE "CUI_HID_HYPHENATE" +#define HID_SVXPAGE_CHAR_NAME "CUI_HID_SVXPAGE_CHAR_NAME" +#define HID_SVXPAGE_CHAR_EFFECTS "CUI_HID_SVXPAGE_CHAR_EFFECTS" +#define HID_SVXPAGE_CHAR_POSITION "CUI_HID_SVXPAGE_CHAR_POSITION" +#define HID_HYPERLINK_INTERNET "CUI_HID_HYPERLINK_INTERNET" +#define HID_HYPERLINK_MAIL "CUI_HID_HYPERLINK_MAIL" +#define HID_HYPERLINK_DOCUMENT "CUI_HID_HYPERLINK_DOCUMENT" +#define HID_HYPERLINK_NEWDOCUMENT "CUI_HID_HYPERLINK_NEWDOCUMENT" +#define HID_HYPERLINK_MARKWND "CUI_HID_HYPERLINK_MARKWND" +#define HID_ICCDIALOG_RESET_BTN "CUI_HID_ICCDIALOG_RESET_BTN" +#define HID_ICCDIALOG_CHOICECTRL "CUI_HID_ICCDIALOG_CHOICECTRL" +#define HID_HYPERDLG_INET_PATH "CUI_HID_HYPERDLG_INET_PATH" +#define HID_HYPERDLG_MAIL_PATH "CUI_HID_HYPERDLG_MAIL_PATH" +#define HID_HYPERDLG_DOC_PATH "CUI_HID_HYPERDLG_DOC_PATH" +#define HID_ICCDIALOG_OK_BTN "CUI_HID_ICCDIALOG_OK_BTN" +#define HID_ICCDIALOG_CANCEL_BTN "CUI_HID_ICCDIALOG_CANCEL_BTN" +#define HID_HYPERLINK_MARKWND_APPLY "CUI_HID_HYPERLINK_MARKWND_APPLY" +#define HID_HYPERLINK_MARKWND_CLOSE "CUI_HID_HYPERLINK_MARKWND_CLOSE" +#define HID_HYPERLINK_MARKWND_TREE "CUI_HID_HYPERLINK_MARKWND_TREE" +#define HID_SVXPAGE_CHAR_TWOLINES "CUI_HID_SVXPAGE_CHAR_TWOLINES" +#define HID_GRFFILTER_EMBOSS_LIGHT "CUI_HID_GRFFILTER_EMBOSS_LIGHT" +#define HID_PASTE_DLG "CUI_HID_PASTE_DLG" +#define HID_LINKDLG_TABLB "CUI_HID_LINKDLG_TABLB" +#define HID_MACRO_HEADERTABLISTBOX "CUI_HID_MACRO_HEADERTABLISTBOX" +#define HID_GALLERY_ENTER_TITLE "CUI_HID_GALLERY_ENTER_TITLE" +#define HID_GALLERY_TITLE_EDIT "CUI_HID_GALLERY_TITLE_EDIT" +#define HID_THES_LANGUAGE "CUI_HID_THES_LANGUAGE" +#define HID_OFAPAGE_QUOTE_SW_CLB "CUI_HID_OFAPAGE_QUOTE_SW_CLB" +#define HID_OFAPAGE_QUOTE_CLB "CUI_HID_OFAPAGE_QUOTE_CLB" +#define HID_POSTIT_DIALOG "CUI_HID_POSTIT_DIALOG" #endif diff --git a/cui/source/inc/insrc.hxx b/cui/source/inc/insrc.hxx index e1e11937f..adaa4b0d8 100644 --- a/cui/source/inc/insrc.hxx +++ b/cui/source/inc/insrc.hxx @@ -57,7 +57,7 @@ class SvxInsRowColDlg : public SvxAbstractInsRowColDlg, public ModalDialog bool bColumn; public: - SvxInsRowColDlg( Window* pParent, bool bCol, ULONG nHelpId ); + SvxInsRowColDlg( Window* pParent, bool bCol, const rtl::OString& sHelpId ); virtual short Execute(void); diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index ede659aed..269fd24de 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -114,10 +114,8 @@ namespace offapp { SetStyle((GetStyle() & ~WB_HSCROLL) | WB_AUTOHSCROLL); - // FIXME: HELPID - SetUniqueId(""/*UID_OFA_CONNPOOL_DRIVERLIST_BACK*/); - // FIXME: HELPID - GetDataWindow().SetHelpId(""/*HID_OFA_CONNPOOL_DRIVERLIST*/); + SetUniqueId(UID_OFA_CONNPOOL_DRIVERLIST_BACK); + GetDataWindow().SetHelpId(HID_OFA_CONNPOOL_DRIVERLIST); } //-------------------------------------------------------------------- diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index c45df4f53..f73435fce 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -169,10 +169,8 @@ DbRegistrationOptionsPage::DbRegistrationOptionsPage( Window* pParent, const Sfx pPathBox->InitHeaderBar( pHeaderBar ); pPathBox->SetHighlightRange(); - // FIXME: HELPID - pPathBox->SetHelpId( ""/*HID_DBPATH_CTL_PATH*/ ); - // FIXME: HELPID - pHeaderBar->SetHelpId( ""/*HID_DBPATH_HEADERBAR*/ ); + pPathBox->SetHelpId( HID_DBPATH_CTL_PATH ); + pHeaderBar->SetHelpId( HID_DBPATH_HEADERBAR ); pPathBox->Show(); pHeaderBar->Show(); diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index 34e6dc5cb..e214a5e73 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -97,8 +97,7 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( Window* pParent, aNewPnt.Y() += nDelta; aNewDelTBX.SetPosPixel( aNewPnt ); - // FIXME: HELPID - aCheckLB.SetHelpId(""/*HID_OFA_FONT_SUBST_CLB*/); + 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 485a731b5..3448e5095 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -60,6 +60,94 @@ using namespace ::svtools; #define GROUP_BASIC 5 #define GROUP_SQL 6 +const char* aColorLBHids[] = +{ + HID_COLORPAGE_DOCCOLOR_LB, + HID_COLORPAGE_DOCBOUNDARIES_LB, + HID_COLORPAGE_APPBACKGROUND_LB, + HID_COLORPAGE_OBJECTBOUNDARIES_LB, + HID_COLORPAGE_TABLEBOUNDARIES_LB, + HID_COLORPAGE_FONTCOLOR_LB, + HID_COLORPAGE_LINKS_LB, + HID_COLORPAGE_LINKSVISITED_LB, + HID_COLORPAGE_ANCHOR_LB, + HID_COLORPAGE_SPELL_LB, + HID_COLORPAGE_WRITERTEXTGRID_LB, + HID_COLORPAGE_WRITERFIELDSHADINGS_LB, + HID_COLORPAGE_WRITERIDXSHADINGS_LB, + HID_COLORPAGE_WRITERDIRECTCURSOR_LB, + HID_COLORPAGE_WRITERNOTESINDICATOR_LB, + HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB, + HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB, + HID_COLORPAGE_WRITERPAGEBREAKS_LB, + HID_COLORPAGE_HTMLSGML_LB, + HID_COLORPAGE_HTMLCOMMENT_LB, + HID_COLORPAGE_HTMLKEYWORD_LB, + HID_COLORPAGE_HTMLUNKNOWN_LB, + HID_COLORPAGE_CALCGRID_LB, + HID_COLORPAGE_CALCPAGEBREAK_LB, + HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB, + HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB, + HID_COLORPAGE_CALCDETECTIVE_LB, + HID_COLORPAGE_CALCDETECTIVEERROR_LB, + HID_COLORPAGE_CALCREFERENCE_LB, + HID_COLORPAGE_CALCNOTESBACKGROUND_LB, + HID_COLORPAGE_DRAWGRID_LB, + HID_COLORPAGE_DRAWDRAWING_LB, + HID_COLORPAGE_DRAWFILL_LB, + HID_COLORPAGE_BASICIDENTIFIER_LB, + HID_COLORPAGE_BASICCOMMENT_LB, + HID_COLORPAGE_BASICNUMBER_LB, + HID_COLORPAGE_BASICSTRING_LB, + HID_COLORPAGE_BASICOPERATOR_LB, + HID_COLORPAGE_BASICKEYWORD_LB, + HID_COLORPAGE_BASICERROR_LB +}; + +const char* aColorCBHids[] = +{ + HID_COLORPAGE_DOCCOLOR_CB, + HID_COLORPAGE_DOCBOUNDARIES_CB, + HID_COLORPAGE_APPBACKGROUND_CB, + HID_COLORPAGE_OBJECTBOUNDARIES_CB, + HID_COLORPAGE_TABLEBOUNDARIES_CB, + HID_COLORPAGE_FONTCOLOR_CB, + HID_COLORPAGE_LINKS_CB, + HID_COLORPAGE_LINKSVISITED_CB, + HID_COLORPAGE_ANCHOR_CB, + HID_COLORPAGE_SPELL_CB, + HID_COLORPAGE_WRITERTEXTGRID_CB, + HID_COLORPAGE_WRITERFIELDSHADINGS_CB, + HID_COLORPAGE_WRITERIDXSHADINGS_CB, + HID_COLORPAGE_WRITERDIRECTCURSOR_CB, + HID_COLORPAGE_WRITERNOTESINDICATOR_CB, + HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB, + HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB, + HID_COLORPAGE_WRITERPAGEBREAKS_CB, + HID_COLORPAGE_HTMLSGML_CB, + HID_COLORPAGE_HTMLCOMMENT_CB, + HID_COLORPAGE_HTMLKEYWORD_CB, + HID_COLORPAGE_HTMLUNKNOWN_CB, + HID_COLORPAGE_CALCGRID_CB, + HID_COLORPAGE_CALCPAGEBREAK_CB, + HID_COLORPAGE_CALCPAGEBREAKMANUAL_CB, + HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_CB, + HID_COLORPAGE_CALCDETECTIVE_CB, + HID_COLORPAGE_CALCDETECTIVEERROR_CB, + HID_COLORPAGE_CALCREFERENCE_CB, + HID_COLORPAGE_CALCNOTESBACKGROUND_CB, + HID_COLORPAGE_DRAWGRID_CB, + HID_COLORPAGE_DRAWDRAWING_CB, + HID_COLORPAGE_DRAWFILL_CB, + HID_COLORPAGE_BASICIDENTIFIER_CB, + HID_COLORPAGE_BASICCOMMENT_CB, + HID_COLORPAGE_BASICNUMBER_CB, + HID_COLORPAGE_BASICSTRING_CB, + HID_COLORPAGE_BASICOPERATOR_CB, + HID_COLORPAGE_BASICKEYWORD_CB, + HID_COLORPAGE_BASICERROR_CB +}; + /* -----------------------------2002/06/26 10:48------------------------------ ---------------------------------------------------------------------------*/ @@ -815,8 +903,7 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe else aCheckBoxes[i]->Hide(); aCheckBoxes[i]->SetBackground(aTransparentWall); - // FIXME: HELPID - aCheckBoxes[i]->SetHelpId(""/*HID_COLORPAGE_CHECKBOX_START + i*/); + aCheckBoxes[i]->SetHelpId( aColorCBHids[i] ); if(bSetTextColor) aCheckBoxes[i]->SetTextColor(aRCheckCol); } @@ -855,15 +942,15 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe XColorEntry* pEntry = aColorTable.GetColor(i); aColorBoxes[0]->InsertEntry( pEntry->GetColor(), pEntry->GetName() ); } - // FIXME: HELPID - aColorBoxes[0]->SetHelpId(""/*HID_COLORPAGE_LISTBOX_START*/); + + aColorBoxes[0]->SetHelpId( aColorLBHids[0] ); + for( sal_Int32 i = 1; i < nCount; i++ ) { if(aColorBoxes[i]) { aColorBoxes[i]->CopyEntries( *aColorBoxes[0] ); - // FIXME: HELPID - aColorBoxes[i]->SetHelpId(""/*HID_COLORPAGE_LISTBOX_START + i*/); + aColorBoxes[i]->SetHelpId( aColorLBHids[i] ); } } } @@ -1021,8 +1108,7 @@ ColorConfigCtrl_Impl::ColorConfigCtrl_Impl( const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); aScrollWindow.SetBackground(Wallpaper(rStyleSettings.GetFieldColor())); - // FIXME: HELPID - aScrollWindow.SetHelpId( ""/*HID_OPTIONS_COLORCONFIG_COLORLIST_WIN*/ ); + 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 1eab42b61..51034c944 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -163,9 +163,8 @@ OfaMSFilterTabPage2::OfaMSFilterTabPage2( Window* pParent, (( sHeader += '\t' ) += sHeader2 ) += '\t'; aCheckLB.InsertHeaderEntry( sHeader, HEADERBAR_APPEND, HIB_CENTER | HIB_VCENTER | HIB_FIXEDPOS | HIB_FIXED ); - - // FIXME: HELPID - aCheckLB.SetHelpId( ""/*HID_OFAPAGE_MSFLTR2_CLB*/ ); + + 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 aba25f5b6..1e784fec2 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -197,8 +197,7 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet sHeader += '\t'; m_aJavaList.InsertHeaderEntry( sHeader, HEADERBAR_APPEND, HIB_LEFT ); - // FIXME: HELPID - m_aJavaList.SetHelpId( ""/*HID_OPTIONS_JAVA_LIST*/ ); + m_aJavaList.SetHelpId( HID_OPTIONS_JAVA_LIST ); FreeResource(); diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 8b6c9067b..132344e37 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -1141,8 +1141,7 @@ SvxLinguTabPage::SvxLinguTabPage( Window* pParent, pCheckButtonData = NULL; aLinguModulesCLB.SetWindowBits( WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE ); - // FIXME: HELPID - aLinguModulesCLB.SetHelpId(""/*HID_CLB_LINGU_MODULES*/ ); + aLinguModulesCLB.SetHelpId(HID_CLB_LINGU_MODULES ); aLinguModulesCLB.SetHighlightRange(); aLinguModulesCLB.SetSelectHdl( LINK( this, SvxLinguTabPage, SelectHdl_Impl )); aLinguModulesCLB.SetDoubleClickHdl(LINK(this, SvxLinguTabPage, BoxDoubleClickHdl_Impl)); @@ -1152,8 +1151,7 @@ SvxLinguTabPage::SvxLinguTabPage( Window* pParent, aLinguOptionsEditPB.SetClickHdl( LINK( this, SvxLinguTabPage, ClickHdl_Impl )); aLinguDicsCLB.SetWindowBits( WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE ); - // FIXME: HELPID - aLinguDicsCLB.SetHelpId(""/*HID_CLB_EDIT_MODULES_DICS*/ ); + aLinguDicsCLB.SetHelpId(HID_CLB_EDIT_MODULES_DICS ); aLinguDicsCLB.SetHighlightRange(); aLinguDicsCLB.SetSelectHdl( LINK( this, SvxLinguTabPage, SelectHdl_Impl )); aLinguDicsCLB.SetCheckButtonHdl(LINK(this, SvxLinguTabPage, BoxCheckButtonHdl_Impl)); @@ -1163,8 +1161,7 @@ SvxLinguTabPage::SvxLinguTabPage( Window* pParent, aLinguDicsDelPB.SetClickHdl( LINK( this, SvxLinguTabPage, ClickHdl_Impl )); aLinguOptionsCLB.SetWindowBits( WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE ); - // FIXME: HELPID - aLinguOptionsCLB.SetHelpId(""/*HID_CLB_LINGU_OPTIONS*/ ); + aLinguOptionsCLB.SetHelpId(HID_CLB_LINGU_OPTIONS ); aLinguOptionsCLB.SetHighlightRange(); aLinguOptionsCLB.SetSelectHdl( LINK( this, SvxLinguTabPage, SelectHdl_Impl )); aLinguOptionsCLB.SetDoubleClickHdl(LINK(this, SvxLinguTabPage, BoxDoubleClickHdl_Impl)); @@ -2055,8 +2052,7 @@ SvxEditModulesDlg::SvxEditModulesDlg(Window* pParent, SvxLinguData_Impl& rData) aModulesCLB.SetWindowBits( WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE ); aModulesCLB.SetHighlightRange(); - // FIXME: HELPID - aModulesCLB.SetHelpId(""/*HID_CLB_EDIT_MODULES_MODULES*/ ); + 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 a4f9dbc44..75b9c7832 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -263,10 +263,8 @@ SvxPathTabPage::SvxPathTabPage( Window* pParent, const SfxItemSet& rSet ) : pPathBox->SetTabs( &nTabs[0], MAP_APPFONT ); pPathBox->InitHeaderBar( pHeaderBar ); pPathBox->SetHighlightRange(); - // FIXME: HELPID - pPathBox->SetHelpId( ""/*HID_OPTPATH_CTL_PATH*/ ); - // FIXME: HELPID - pHeaderBar->SetHelpId( ""/*HID_OPTPATH_HEADERBAR*/ ); + pPathBox->SetHelpId( HID_OPTPATH_CTL_PATH ); + pHeaderBar->SetHelpId( HID_OPTPATH_HEADERBAR ); pPathBox->Show(); pHeaderBar->Show(); diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 15c7d7fda..c18c52ff5 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -889,8 +889,7 @@ void OfaTreeOptionsDialog::InitTreeAndHandler() aPageImagesHC = ImageList( ResId( RID_IMGLIST_TREEOPT_HC, *pIsoRes ) ); delete pIsoRes; - // FIXME: HELPID - aTreeLB.SetHelpId( ""/*HID_OFADLG_TREELISTBOX*/ ); + 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 bdefb8766..d274cb016 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -105,8 +105,7 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) : aLanguageFT.SetZOrder(0, WINDOW_ZORDER_FIRST); aLanguageLB.SetZOrder(&aLanguageFT, WINDOW_ZORDER_BEHIND); - // FIXME: HELPID - aLanguageLB.SetHelpId(""/*HID_AUTOCORR_LANGUAGE*/); + aLanguageLB.SetHelpId(HID_AUTOCORR_LANGUAGE); FreeResource(); AddTabPage(RID_OFAPAGE_AUTOCORR_OPTIONS, OfaAutocorrOptionsPage::Create, 0); @@ -229,8 +228,7 @@ OfaAutocorrOptionsPage::OfaAutocorrOptionsPage( Window* pParent, { FreeResource(); - // FIXME: HELPID - aCheckLB.SetHelpId(""/*HID_OFAPAGE_AUTOCORR_CLB*/); + aCheckLB.SetHelpId(HID_OFAPAGE_AUTOCORR_CLB); } /*-----------------14.10.96 15.58------------------- @@ -494,8 +492,7 @@ OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( Window* pParent, //typ. Anfuehrungszeichen einsetzen SvtSysLocale aSysLcl; - // FIXME: HELPID - aCheckLB.SetHelpId(""/*HID_OFAPAGE_AUTOFORMAT_CLB*/); + aCheckLB.SetHelpId(HID_OFAPAGE_AUTOFORMAT_CLB); aCheckLB.SetWindowBits(WB_HSCROLL| WB_VSCROLL); aCheckLB.SetSelectHdl(LINK(this, OfaSwAutoFmtOptionsPage, SelectHdl)); @@ -2065,10 +2062,8 @@ OfaQuoteTabPage::OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ) : BOOL bShowSWOptions = FALSE; - // FIXME: HELPID - aCheckLB.SetHelpId( ""/*HID_OFAPAGE_QUOTE_CLB*/ ); - // FIXME: HELPID - aSwCheckLB.SetHelpId( ""/*HID_OFAPAGE_QUOTE_SW_CLB*/ ); + aCheckLB.SetHelpId( HID_OFAPAGE_QUOTE_CLB ); + 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/autocdlg.src b/cui/source/tabpages/autocdlg.src index eea4e599f..2a07cea17 100644 --- a/cui/source/tabpages/autocdlg.src +++ b/cui/source/tabpages/autocdlg.src @@ -247,7 +247,7 @@ TabPage RID_OFAPAGE_AUTOFMT_APPLY ModalDialog RID_OFADLG_PRCNT_SET { - HelpID = SID_AUTOFORMAT ; + HelpID = CMD_SID_AUTOFORMAT ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 155 , 43 ) ; diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 19804e471..368859a5a 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -243,8 +243,7 @@ SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(Window* pParent, SetExchangeSupport(); pExamplesVS->SetSelectHdl(LINK(this, SvxSingleNumPickTabPage, NumSelectHdl_Impl)); pExamplesVS->SetDoubleClickHdl(LINK(this, SvxSingleNumPickTabPage, DoubleClickHdl_Impl)); - // FIXME: HELPID - pExamplesVS->SetHelpId(""/*HID_VALUESET_SINGLENUM*/ ); + pExamplesVS->SetHelpId(HID_VALUESET_SINGLENUM ); Reference xDefNum = lcl_GetNumberingProvider(); if(xDefNum.is()) @@ -473,8 +472,7 @@ SvxBulletPickTabPage::SvxBulletPickTabPage(Window* pParent, SetExchangeSupport(); pExamplesVS->SetSelectHdl(LINK(this, SvxBulletPickTabPage, NumSelectHdl_Impl)); pExamplesVS->SetDoubleClickHdl(LINK(this, SvxBulletPickTabPage, DoubleClickHdl_Impl)); - // FIXME: HELPID - pExamplesVS->SetHelpId(""/*HID_VALUESET_BULLET*/ ); + pExamplesVS->SetHelpId(HID_VALUESET_BULLET ); } /*-----------------07.02.97 12.10------------------- @@ -677,8 +675,7 @@ SvxNumPickTabPage::SvxNumPickTabPage(Window* pParent, pExamplesVS->SetSelectHdl(LINK(this, SvxNumPickTabPage, NumSelectHdl_Impl)); pExamplesVS->SetDoubleClickHdl(LINK(this, SvxNumPickTabPage, DoubleClickHdl_Impl)); - // FIXME: HELPID - pExamplesVS->SetHelpId(""/*HID_VALUESET_NUM*/ ); + pExamplesVS->SetHelpId(HID_VALUESET_NUM ); Reference xDefNum = lcl_GetNumberingProvider(); if(xDefNum.is()) @@ -994,8 +991,7 @@ SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent, // Grafiknamen ermitteln GalleryExplorer::FillObjList(GALLERY_THEME_BULLETS, aGrfNames); - // FIXME: HELPID - pExamplesVS->SetHelpId(""/*HID_VALUESET_NUMBMP*/ ); + 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 8e7d5fa1d..3eb168cee 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -645,8 +645,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) pWarnBox = new WarningBox( DLGWIN, WinBits( WB_OK_CANCEL ), String( ResId( nError, rMgr ) ) ); - // FIXME: HELPID - pWarnBox->SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); + pWarnBox->SetHelpId( HID_WARN_NAME_DUPLICATE ); } if( pWarnBox->Execute() != RET_OK ) @@ -776,8 +775,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG ) pWarnBox = new WarningBox( DLGWIN, WinBits( WB_OK_CANCEL ), String( ResId( nError, rMgr ) ) ); - // FIXME: HELPID - pWarnBox->SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); + pWarnBox->SetHelpId( HID_WARN_NAME_DUPLICATE ); } @@ -889,8 +887,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) else { WarningBox aBox( DLGWIN, WinBits( WB_OK ), String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - // FIXME: HELPID - aBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); + aBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); aBox.Execute(); } } diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 146664a15..3a3be44a6 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -488,8 +488,7 @@ IMPL_LINK( SvxColorTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) { WarningBox aWarningBox( DLGWIN, WinBits( WB_OK ), String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - // FIXME: HELPID - aWarningBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); + aWarningBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); aWarningBox.Execute(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); @@ -575,8 +574,7 @@ IMPL_LINK( SvxColorTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) { WarningBox aWarningBox( DLGWIN, WinBits( WB_OK ), String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - // FIXME: HELPID - aWarningBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); + aWarningBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); aWarningBox.Execute(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); @@ -1038,12 +1036,9 @@ IMPL_LINK( SvxColorTabPage, SelectColorModelHdl_Impl, void *, EMPTYARG ) aMtrFldColorModel4.Hide(); aMtrFldColorModel4.SetValue( 0L ); - // FIXME: HELPID - aMtrFldColorModel1.SetHelpId( ""/*HID_TPCOLOR_RGB_1*/ ); - // FIXME: HELPID - aMtrFldColorModel2.SetHelpId( ""/*HID_TPCOLOR_RGB_2*/ ); - // FIXME: HELPID - aMtrFldColorModel3.SetHelpId( ""/*HID_TPCOLOR_RGB_3*/ ); + aMtrFldColorModel1.SetHelpId( HID_TPCOLOR_RGB_1 ); + aMtrFldColorModel2.SetHelpId( HID_TPCOLOR_RGB_2 ); + aMtrFldColorModel3.SetHelpId( HID_TPCOLOR_RGB_3 ); // Da der alte HelpText noch am Control steht wuerde // ein Umsetzen der HelpID alleine nichts bewirken @@ -1087,12 +1082,9 @@ IMPL_LINK( SvxColorTabPage, SelectColorModelHdl_Impl, void *, EMPTYARG ) aFtColorModel4.Show(); aMtrFldColorModel4.Show(); - // FIXME: HELPID - aMtrFldColorModel1.SetHelpId( ""/*HID_TPCOLOR_CMYK_1*/ ); - // FIXME: HELPID - aMtrFldColorModel2.SetHelpId( ""/*HID_TPCOLOR_CMYK_2*/ ); - // FIXME: HELPID - aMtrFldColorModel3.SetHelpId( ""/*HID_TPCOLOR_CMYK_3*/ ); + aMtrFldColorModel1.SetHelpId( HID_TPCOLOR_CMYK_1 ); + aMtrFldColorModel2.SetHelpId( HID_TPCOLOR_CMYK_2 ); + 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 d3a08740b..69c05ff11 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -482,8 +482,7 @@ IMPL_LINK( SvxGradientTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) pWarnBox = new WarningBox( DLGWIN, WinBits( WB_OK_CANCEL ), String( ResId( nError, rMgr ) ) ); - // FIXME: HELPID - pWarnBox->SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); + pWarnBox->SetHelpId( HID_WARN_NAME_DUPLICATE ); } if( pWarnBox->Execute() != RET_OK ) @@ -600,8 +599,7 @@ IMPL_LINK( SvxGradientTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) else { WarningBox aBox( DLGWIN, WinBits( WB_OK ),String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - // FIXME: HELPID - aBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); + aBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); aBox.Execute(); } diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index da66f8cbd..04c7dc89d 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -546,8 +546,7 @@ IMPL_LINK( SvxHatchTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) pWarnBox = new WarningBox( DLGWIN, WinBits( WB_OK_CANCEL ), String( ResId( nError, rMgr ) ) ); - // FIXME: HELPID - pWarnBox->SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); + pWarnBox->SetHelpId( HID_WARN_NAME_DUPLICATE ); } if( pWarnBox->Execute() != RET_OK ) @@ -660,8 +659,7 @@ IMPL_LINK( SvxHatchTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) else { WarningBox aBox( DLGWIN, WinBits( WB_OK ),String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - // FIXME: HELPID - aBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); + aBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); aBox.Execute(); } } diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index f89eeeabb..f3b766632 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -639,8 +639,7 @@ IMPL_LINK( SvxLineDefTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) else { WarningBox aBox( DLGWIN, WinBits( WB_OK ),String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - // FIXME: HELPID - aBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); + aBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); aBox.Execute(); } } @@ -721,8 +720,7 @@ IMPL_LINK( SvxLineDefTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) else { WarningBox aBox( DLGWIN, WinBits( WB_OK ), String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - // FIXME: HELPID - aBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); + aBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); aBox.Execute(); } } diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index faca35567..8bc4ba4a6 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -372,8 +372,7 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) { WarningBox aWarningBox( DLGWIN, WinBits( WB_OK ), String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - // FIXME: HELPID - aWarningBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); + aWarningBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); aWarningBox.Execute(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); @@ -521,8 +520,7 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) else { WarningBox aBox( DLGWIN, WinBits( WB_OK ),String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - // FIXME: HELPID - aBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); + aBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); aBox.Execute(); } } diff --git a/extensions/inc/abpilot.hrc b/extensions/inc/abpilot.hrc index aea77a3f3..3cb1e650b 100644 --- a/extensions/inc/abpilot.hrc +++ b/extensions/inc/abpilot.hrc @@ -29,17 +29,11 @@ #include "extensio.hrc" -#define HID_ABSPILOT_PREVIOUS ( HID_ABP_START + 0) -#define HID_ABSPILOT_NEXT ( HID_ABP_START + 1) -#define HID_ABSPILOT_CANCEL ( HID_ABP_START + 2) -#define HID_ABSPILOT_FINISH ( HID_ABP_START + 3) -#define UID_ABSPILOT_HELP ( HID_ABP_START + 4) -#define HID_ABSPILOT ( HID_ABP_START + 5) - // !! if you add new IDs, please also adjust HID_ABP_LAST below !! -#define HID_ABP_LAST HID_ABSPILOT - -#if HID_ABP_LAST > HID_ABP_END - #error help id range overflow (ABP) -#endif +#define HID_ABSPILOT_PREVIOUS "EXTENSIONS_HID_ABSPILOT_PREVIOUS" +#define HID_ABSPILOT_NEXT "EXTENSIONS_HID_ABSPILOT_NEXT" +#define HID_ABSPILOT_CANCEL "EXTENSIONS_HID_ABSPILOT_CANCEL" +#define HID_ABSPILOT_FINISH "EXTENSIONS_HID_ABSPILOT_FINISH" +#define UID_ABSPILOT_HELP "EXTENSIONS_UID_ABSPILOT_HELP" +#define HID_ABSPILOT "EXTENSIONS_HID_ABSPILOT" #endif // EXTENSIONS_ABPILOT_HRC diff --git a/extensions/inc/bibliography.hrc b/extensions/inc/bibliography.hrc index 90372fc0b..dc02073a3 100644 --- a/extensions/inc/bibliography.hrc +++ b/extensions/inc/bibliography.hrc @@ -29,58 +29,52 @@ #include "extensio.hrc" -#define HID_BIB_CHANGESOURCE ( HID_BIBLIO_START + 0) -#define HID_BIB_MAPPINGDLG ( HID_BIBLIO_START + 1) -#define HID_BIB_TBX_TABLE ( HID_BIBLIO_START + 2) -#define HID_BIB_TBX_SEARCH ( HID_BIBLIO_START + 3) -#define HID_BIB_TBX_AUTOFILTER ( HID_BIBLIO_START + 4) -#define HID_BIB_IDENTIFIER_POS ( HID_BIBLIO_START + 5) -#define HID_BIB_AUTHORITYTYPE_POS ( HID_BIBLIO_START + 6) -#define HID_BIB_AUTHOR_POS ( HID_BIBLIO_START + 7) -#define HID_BIB_TITLE_POS ( HID_BIBLIO_START + 8) -#define HID_BIB_YEAR_POS ( HID_BIBLIO_START + 9) -#define HID_BIB_ISBN_POS ( HID_BIBLIO_START + 10) -#define HID_BIB_BOOKTITLE_POS ( HID_BIBLIO_START + 11) -#define HID_BIB_CHAPTER_POS ( HID_BIBLIO_START + 12) -#define HID_BIB_EDITION_POS ( HID_BIBLIO_START + 13) -#define HID_BIB_EDITOR_POS ( HID_BIBLIO_START + 14) -#define HID_BIB_HOWPUBLISHED_POS ( HID_BIBLIO_START + 15) -#define HID_BIB_INSTITUTION_POS ( HID_BIBLIO_START + 16) -#define HID_BIB_JOURNAL_POS ( HID_BIBLIO_START + 17) -#define HID_BIB_MONTH_POS ( HID_BIBLIO_START + 18) -#define HID_BIB_NOTE_POS ( HID_BIBLIO_START + 19) -#define HID_BIB_ANNOTE_POS ( HID_BIBLIO_START + 20) -#define HID_BIB_NUMBER_POS ( HID_BIBLIO_START + 21) -#define HID_BIB_ORGANIZATIONS_POS ( HID_BIBLIO_START + 22) -#define HID_BIB_PAGES_POS ( HID_BIBLIO_START + 23) -#define HID_BIB_PUBLISHER_POS ( HID_BIBLIO_START + 24) -#define HID_BIB_ADDRESS_POS ( HID_BIBLIO_START + 25) -#define HID_BIB_SCHOOL_POS ( HID_BIBLIO_START + 26) -#define HID_BIB_SERIES_POS ( HID_BIBLIO_START + 27) -#define HID_BIB_REPORTTYPE_POS ( HID_BIBLIO_START + 28) -#define HID_BIB_VOLUME_POS ( HID_BIBLIO_START + 29) -#define HID_BIB_URL_POS ( HID_BIBLIO_START + 30) -#define HID_BIB_CUSTOM1_POS ( HID_BIBLIO_START + 31) -#define HID_BIB_CUSTOM2_POS ( HID_BIBLIO_START + 32) -#define HID_BIB_CUSTOM3_POS ( HID_BIBLIO_START + 33) -#define HID_BIB_CUSTOM4_POS ( HID_BIBLIO_START + 34) -#define HID_BIB_CUSTOM5_POS ( HID_BIBLIO_START + 35) -#define HID_BIB_DB_TBX ( HID_BIBLIO_START + 36) -#define HID_BIB_DB_GHIDCTRL ( HID_BIBLIO_START + 37) -#define HID_BIB_CONTROL_PAGE ( HID_BIBLIO_START + 38) -#define HID_BIB_CONTROL_PARENT ( HID_BIBLIO_START + 39) -#define UID_BIB_FRAME_WINDOW ( HID_BIBLIO_START + 40) -#define HID_BIB_DELETE_RECORD ( HID_BIBLIO_START + 41) -#define HID_BIB_INSERT_RECORD ( HID_BIBLIO_START + 42) -#define HID_BIB_DB_GRIDCTRL ( HID_BIBLIO_START + 43) -#define HID_DLG_MAPPING ( HID_BIBLIO_START + 44) -#define HID_DLG_DBCHANGE ( HID_BIBLIO_START + 45) -#define HID_SELECTION_TLB ( HID_BIBLIO_START + 46) - // !! if you add new IDs, please also adjust HID_ABP_LAST below !! -#define HID_BIB_LAST HID_SELECTION_TLB - -#if HID_BIB_LAST > HID_BIBLIO_END - #error help id range overflow (BIBLIO) -#endif +#define HID_BIB_CHANGESOURCE "EXTENSIONS_HID_BIB_CHANGESOURCE" +#define HID_BIB_MAPPINGDLG "EXTENSIONS_HID_BIB_MAPPINGDLG" +#define HID_BIB_TBX_TABLE "EXTENSIONS_HID_BIB_TBX_TABLE" +#define HID_BIB_TBX_SEARCH "EXTENSIONS_HID_BIB_TBX_SEARCH" +#define HID_BIB_TBX_AUTOFILTER "EXTENSIONS_HID_BIB_TBX_AUTOFILTER" +#define HID_BIB_IDENTIFIER_POS "EXTENSIONS_HID_BIB_IDENTIFIER_POS" +#define HID_BIB_AUTHORITYTYPE_POS "EXTENSIONS_HID_BIB_AUTHORITYTYPE_POS" +#define HID_BIB_AUTHOR_POS "EXTENSIONS_HID_BIB_AUTHOR_POS" +#define HID_BIB_TITLE_POS "EXTENSIONS_HID_BIB_TITLE_POS" +#define HID_BIB_YEAR_POS "EXTENSIONS_HID_BIB_YEAR_POS" +#define HID_BIB_ISBN_POS "EXTENSIONS_HID_BIB_ISBN_POS" +#define HID_BIB_BOOKTITLE_POS "EXTENSIONS_HID_BIB_BOOKTITLE_POS" +#define HID_BIB_CHAPTER_POS "EXTENSIONS_HID_BIB_CHAPTER_POS" +#define HID_BIB_EDITION_POS "EXTENSIONS_HID_BIB_EDITION_POS" +#define HID_BIB_EDITOR_POS "EXTENSIONS_HID_BIB_EDITOR_POS" +#define HID_BIB_HOWPUBLISHED_POS "EXTENSIONS_HID_BIB_HOWPUBLISHED_POS" +#define HID_BIB_INSTITUTION_POS "EXTENSIONS_HID_BIB_INSTITUTION_POS" +#define HID_BIB_JOURNAL_POS "EXTENSIONS_HID_BIB_JOURNAL_POS" +#define HID_BIB_MONTH_POS "EXTENSIONS_HID_BIB_MONTH_POS" +#define HID_BIB_NOTE_POS "EXTENSIONS_HID_BIB_NOTE_POS" +#define HID_BIB_ANNOTE_POS "EXTENSIONS_HID_BIB_ANNOTE_POS" +#define HID_BIB_NUMBER_POS "EXTENSIONS_HID_BIB_NUMBER_POS" +#define HID_BIB_ORGANIZATIONS_POS "EXTENSIONS_HID_BIB_ORGANIZATIONS_POS" +#define HID_BIB_PAGES_POS "EXTENSIONS_HID_BIB_PAGES_POS" +#define HID_BIB_PUBLISHER_POS "EXTENSIONS_HID_BIB_PUBLISHER_POS" +#define HID_BIB_ADDRESS_POS "EXTENSIONS_HID_BIB_ADDRESS_POS" +#define HID_BIB_SCHOOL_POS "EXTENSIONS_HID_BIB_SCHOOL_POS" +#define HID_BIB_SERIES_POS "EXTENSIONS_HID_BIB_SERIES_POS" +#define HID_BIB_REPORTTYPE_POS "EXTENSIONS_HID_BIB_REPORTTYPE_POS" +#define HID_BIB_VOLUME_POS "EXTENSIONS_HID_BIB_VOLUME_POS" +#define HID_BIB_URL_POS "EXTENSIONS_HID_BIB_URL_POS" +#define HID_BIB_CUSTOM1_POS "EXTENSIONS_HID_BIB_CUSTOM1_POS" +#define HID_BIB_CUSTOM2_POS "EXTENSIONS_HID_BIB_CUSTOM2_POS" +#define HID_BIB_CUSTOM3_POS "EXTENSIONS_HID_BIB_CUSTOM3_POS" +#define HID_BIB_CUSTOM4_POS "EXTENSIONS_HID_BIB_CUSTOM4_POS" +#define HID_BIB_CUSTOM5_POS "EXTENSIONS_HID_BIB_CUSTOM5_POS" +#define HID_BIB_DB_TBX "EXTENSIONS_HID_BIB_DB_TBX" +#define HID_BIB_DB_GHIDCTRL "EXTENSIONS_HID_BIB_DB_GHIDCTRL" +#define HID_BIB_CONTROL_PAGE "EXTENSIONS_HID_BIB_CONTROL_PAGE" +#define HID_BIB_CONTROL_PARENT "EXTENSIONS_HID_BIB_CONTROL_PARENT" +#define UID_BIB_FRAME_WINDOW "EXTENSIONS_UID_BIB_FRAME_WINDOW" +#define HID_BIB_DELETE_RECORD "EXTENSIONS_HID_BIB_DELETE_RECORD" +#define HID_BIB_INSERT_RECORD "EXTENSIONS_HID_BIB_INSERT_RECORD" +#define HID_BIB_DB_GRIDCTRL "EXTENSIONS_HID_BIB_DB_GRIDCTRL" +#define HID_DLG_MAPPING "EXTENSIONS_HID_DLG_MAPPING" +#define HID_DLG_DBCHANGE "EXTENSIONS_HID_DLG_DBCHANGE" +#define HID_SELECTION_TLB "EXTENSIONS_HID_SELECTION_TLB" #endif // EXTENSIONS_BIBLIOGRAPHY_HRC diff --git a/extensions/inc/dbpilots.hrc b/extensions/inc/dbpilots.hrc index 38a47138c..2fb9a159e 100644 --- a/extensions/inc/dbpilots.hrc +++ b/extensions/inc/dbpilots.hrc @@ -29,27 +29,21 @@ #include "extensio.hrc" -#define HID_GHIDWIZARD_PREVIOUS ( HID_DBP_START + 0) -#define HID_GHIDWIZARD_NEXT ( HID_DBP_START + 1) -#define HID_GHIDWIZARD_CANCEL ( HID_DBP_START + 2) -#define HID_GHIDWIZARD_FINISH ( HID_DBP_START + 3) -#define HID_GROUPWIZARD_PREVIOUS ( HID_DBP_START + 4) -#define HID_GROUPWIZARD_NEXT ( HID_DBP_START + 5) -#define HID_GROUPWIZARD_CANCEL ( HID_DBP_START + 6) -#define HID_GROUPWIZARD_FINISH ( HID_DBP_START + 7) -#define HID_LISTWIZARD_PREVIOUS ( HID_DBP_START + 8) -#define HID_LISTWIZARD_NEXT ( HID_DBP_START + 9) -#define HID_LISTWIZARD_CANCEL ( HID_DBP_START + 10) -#define HID_LISTWIZARD_FINISH ( HID_DBP_START + 11) -#define HID_GRIDWIZARD_PREVIOUS ( HID_DBP_START + 12) -#define HID_GRIDWIZARD_NEXT ( HID_DBP_START + 13) -#define HID_GRIDWIZARD_CANCEL ( HID_DBP_START + 14) -#define HID_GRIDWIZARD_FINISH ( HID_DBP_START + 15) - // !! if you add new IDs, please also adjust HID_ABP_LAST below !! -#define HID_DBP_LAST HID_GRIDWIZARD_FINISH - -#if HID_DBP_LAST > HID_DBP_END - #error help id range overflow (DBP) -#endif +#define HID_GHIDWIZARD_PREVIOUS "EXTENSIONS_HID_GHIDWIZARD_PREVIOUS" +#define HID_GHIDWIZARD_NEXT "EXTENSIONS_HID_GHIDWIZARD_NEXT" +#define HID_GHIDWIZARD_CANCEL "EXTENSIONS_HID_GHIDWIZARD_CANCEL" +#define HID_GHIDWIZARD_FINISH "EXTENSIONS_HID_GHIDWIZARD_FINISH" +#define HID_GROUPWIZARD_PREVIOUS "EXTENSIONS_HID_GROUPWIZARD_PREVIOUS" +#define HID_GROUPWIZARD_NEXT "EXTENSIONS_HID_GROUPWIZARD_NEXT" +#define HID_GROUPWIZARD_CANCEL "EXTENSIONS_HID_GROUPWIZARD_CANCEL" +#define HID_GROUPWIZARD_FINISH "EXTENSIONS_HID_GROUPWIZARD_FINISH" +#define HID_LISTWIZARD_PREVIOUS "EXTENSIONS_HID_LISTWIZARD_PREVIOUS" +#define HID_LISTWIZARD_NEXT "EXTENSIONS_HID_LISTWIZARD_NEXT" +#define HID_LISTWIZARD_CANCEL "EXTENSIONS_HID_LISTWIZARD_CANCEL" +#define HID_LISTWIZARD_FINISH "EXTENSIONS_HID_LISTWIZARD_FINISH" +#define HID_GRIDWIZARD_PREVIOUS "EXTENSIONS_HID_GRIDWIZARD_PREVIOUS" +#define HID_GRIDWIZARD_NEXT "EXTENSIONS_HID_GRIDWIZARD_NEXT" +#define HID_GRIDWIZARD_CANCEL "EXTENSIONS_HID_GRIDWIZARD_CANCEL" +#define HID_GRIDWIZARD_FINISH "EXTENSIONS_HID_GRIDWIZARD_FINISH" #endif // EXTENSIONS_DBPILOT_HRC diff --git a/extensions/inc/propctrlr.hrc b/extensions/inc/propctrlr.hrc index a559b3081..787dc6064 100644 --- a/extensions/inc/propctrlr.hrc +++ b/extensions/inc/propctrlr.hrc @@ -29,309 +29,304 @@ #include "extensio.hrc" -#define HID_PROP_INPUT_REQUIRED ( HID_PROPC_START + 0) -#define HID_PROP_GROUPBOX ( HID_PROPC_START + 1) -#define HID_PROP_CONTROLSOURCE ( HID_PROPC_START + 2) -#define HID_PROP_NAME ( HID_PROPC_START + 3) -#define HID_PROP_TABINDEX ( HID_PROPC_START + 4) -#define HID_PROP_MASTERFIELDS ( HID_PROPC_START + 5) -#define HID_PROP_SLAVEFIELDS ( HID_PROPC_START + 6) -#define HID_PROP_DATASOURCE ( HID_PROPC_START + 7) -#define HID_PROP_CURSORSOURCE ( HID_PROPC_START + 8) -#define HID_PROP_CURSORSOURCETYPE ( HID_PROPC_START + 9) -#define HID_PROP_CURSORTYPE ( HID_PROPC_START + 10) -#define HID_PROP_READONLY ( HID_PROPC_START + 11) -#define HID_PROP_DATAENTRY ( HID_PROPC_START + 12) -#define HID_PROP_NAVIGATION ( HID_PROPC_START + 13) -#define HID_PROP_CYCLE ( HID_PROPC_START + 14) -#define HID_PROP_ALLOW_ADDITIONS ( HID_PROPC_START + 15) -#define HID_PROP_ALLOW_EDITS ( HID_PROPC_START + 16) -#define HID_PROP_ALLOW_DELETIONS ( HID_PROPC_START + 17) -#define HID_PROP_DIRTY ( HID_PROPC_START + 18) -#define HID_PROP_OLDVALUE ( HID_PROPC_START + 19) -#define HID_PROP_VALUE ( HID_PROPC_START + 20) -#define HID_PROP_LOCKED ( HID_PROPC_START + 21) -#define HID_PROP_FORMATKEY ( HID_PROPC_START + 22) -#define HID_PROP_REQUIRED ( HID_PROPC_START + 23) -#define HID_PROP_WHEEL_BEHAVIOR ( HID_PROPC_START + 24) -#define HID_PROP_UNIQUE ( HID_PROPC_START + 25) -#define HID_PROP_CLASSID ( HID_PROPC_START + 26) -#define HID_PROP_LEFT ( HID_PROPC_START + 27) -#define HID_PROP_RIGHT ( HID_PROPC_START + 28) -#define HID_PROP_HEIGHT ( HID_PROPC_START + 29) -#define HID_PROP_WIDTH ( HID_PROPC_START + 30) -#define HID_PROP_BOUNDCOLUMN ( HID_PROPC_START + 31) -#define HID_PROP_LISTSOURCETYPE ( HID_PROPC_START + 32) -#define HID_PROP_LISTSOURCE ( HID_PROPC_START + 33) -#define HID_PROP_LISTINDEX ( HID_PROPC_START + 34) -#define HID_PROP_TEXT ( HID_PROPC_START + 35) -#define HID_PROP_LABEL ( HID_PROPC_START + 36) -#define HID_PROP_STRINGITEMLIST ( HID_PROPC_START + 37) -#define HID_PROP_SEARCHING ( HID_PROPC_START + 38) -#define HID_PROP_FONT ( HID_PROPC_START + 39) -#define HID_PROP_ROWHEIGHT ( HID_PROPC_START + 40) -#define HID_PROP_BACKGROUNDCOLOR ( HID_PROPC_START + 41) -#define HID_PROP_FILLCOLOR ( HID_PROPC_START + 42) -#define HID_PROP_LINECOLOR ( HID_PROPC_START + 43) -#define HID_PROP_BORDER ( HID_PROPC_START + 44) -#define HID_PROP_ALIGN ( HID_PROPC_START + 45) -#define HID_PROP_DROPDOWN ( HID_PROPC_START + 46) -#define HID_PROP_MULTILINE ( HID_PROPC_START + 47) -#define HID_PROP_HSCROLL ( HID_PROPC_START + 48) -#define HID_PROP_VSCROLL ( HID_PROPC_START + 49) -#define HID_PROP_TABSTOP ( HID_PROPC_START + 50) -#define HID_PROP_REFVALUE ( HID_PROPC_START + 51) -#define HID_PROP_BUTTONTYPE ( HID_PROPC_START + 52) -#define HID_PROP_SUBMIT_ACTION ( HID_PROPC_START + 53) -#define HID_PROP_SUBMIT_METHOD ( HID_PROPC_START + 54) -#define HID_PROP_SUBMIT_ENCODING ( HID_PROPC_START + 55) -#define HID_PROP_DEFAULTVALUE ( HID_PROPC_START + 56) -#define HID_PROP_SUBMIT_TARGET ( HID_PROPC_START + 57) -#define HID_PROP_DEFAULT_STATE ( HID_PROPC_START + 58) -#define HID_PROP_IMAGE_URL ( HID_PROPC_START + 59) -#define HID_PROP_DEFAULT_SELECT_SEQ ( HID_PROPC_START + 60) -#define HID_PROP_MULTISELECTION ( HID_PROPC_START + 61) -#define HID_PROP_DATE ( HID_PROPC_START + 62) -#define HID_PROP_DATEMIN ( HID_PROPC_START + 63) -#define HID_PROP_DATEMAX ( HID_PROPC_START + 64) -#define HID_PROP_DATEFORMAT ( HID_PROPC_START + 65) -#define HID_PROP_TIME ( HID_PROPC_START + 66) -#define HID_PROP_TIMEMIN ( HID_PROPC_START + 67) -#define HID_PROP_TIMEMAX ( HID_PROPC_START + 68) -#define HID_PROP_TIMEFORMAT ( HID_PROPC_START + 69) -#define HID_PROP_VALUEMIN ( HID_PROPC_START + 70) -#define HID_PROP_VALUEMAX ( HID_PROPC_START + 71) -#define HID_PROP_VALUESTEP ( HID_PROPC_START + 72) -#define HID_PROP_CURRENCYSYMBOL ( HID_PROPC_START + 73) -#define HID_PROP_EDITMASK ( HID_PROPC_START + 74) -#define HID_PROP_LITERALMASK ( HID_PROPC_START + 75) -#define HID_PROP_ENABLED ( HID_PROPC_START + 76) -#define HID_PROP_AUTOCOMPLETE ( HID_PROPC_START + 77) -#define HID_PROP_LINECOUNT ( HID_PROPC_START + 78) -#define HID_PROP_MAXTEXTLEN ( HID_PROPC_START + 79) -#define HID_PROP_SPIN ( HID_PROPC_START + 80) -#define HID_PROP_STRICTFORMAT ( HID_PROPC_START + 81) -#define HID_PROP_SHOWTHOUSANDSEP ( HID_PROPC_START + 82) -#define HID_PROP_VERTICAL_ALIGN ( HID_PROPC_START + 83) -#define HID_PROP_PRINTABLE ( HID_PROPC_START + 84) -#define HID_PROP_TARGET_URL ( HID_PROPC_START + 85) -#define HID_PROP_TARGET_FRAME ( HID_PROPC_START + 86) -#define HID_PROP_TAG ( HID_PROPC_START + 87) -#define HID_PROP_ECHO_CHAR ( HID_PROPC_START + 88) -#define HID_PROP_EMPTY_IS_NULL ( HID_PROPC_START + 89) -#define HID_PROP_DECIMAL_ACCURACY ( HID_PROPC_START + 90) -#define HID_PROP_ENABLE_VISIBLE ( HID_PROPC_START + 91) -#define HID_PROP_DEFAULT_BUTTON ( HID_PROPC_START + 92) -#define HID_PROP_HIDDEN_VALUE ( HID_PROPC_START + 93) -#define HID_PROP_TRISTATE ( HID_PROPC_START + 94) -#define HID_PROP_NAVIGATIONBAR ( HID_PROPC_START + 95) -#define HID_PROP_FILTER ( HID_PROPC_START + 96) -#define HID_PROP_SORT_CRITERIA ( HID_PROPC_START + 97) -#define HID_PROP_DEFAULT_LONG_VALUE ( HID_PROPC_START + 98) -#define HID_PROP_DEFAULT_TIME ( HID_PROPC_START + 99) -#define HID_PROP_DEFAULT_DATE ( HID_PROPC_START + 100) -#define HID_PROP_HELPTEXT ( HID_PROPC_START + 101) -#define HID_PROP_HELPURL ( HID_PROPC_START + 102) -#define HID_PROP_RECORDMARKER ( HID_PROPC_START + 103) -#define HID_PROP_FILTERPROPOSAL ( HID_PROPC_START + 104) -#define HID_PROP_EFFECTIVEMIN ( HID_PROPC_START + 105) -#define HID_PROP_EFFECTIVEMAX ( HID_PROPC_START + 106) -#define HID_PROP_EFFECTIVEDEFAULT ( HID_PROPC_START + 107) -#define HID_PROP_CONTROLLABEL ( HID_PROPC_START + 108) -#define HID_PROP_CURRSYM_POSITION ( HID_PROPC_START + 109) -#define HID_PROP_ESCAPE_PROCESSING ( HID_PROPC_START + 110) -#define HID_PROP_TITLE ( HID_PROPC_START + 111) -#define HID_PROP_STEP ( HID_PROPC_START + 112) -#define HID_PROP_PROGRESSVALUE ( HID_PROPC_START + 113) -#define HID_PROP_PROGRESSVALUE_MIN ( HID_PROPC_START + 114) -#define HID_PROP_PROGRESSVALUE_MAX ( HID_PROPC_START + 115) -#define HID_PROP_SCROLLVALUE ( HID_PROPC_START + 116) -#define HID_PROP_SCROLLVALUE_MAX ( HID_PROPC_START + 117) -#define HID_PROP_LINEINCREMENT ( HID_PROPC_START + 118) -#define HID_PROP_BLOCKINCREMENT ( HID_PROPC_START + 119) -#define HID_PROP_VISIBLESIZE ( HID_PROPC_START + 120) -#define HID_PROP_ORIENTATION ( HID_PROPC_START + 121) -#define HID_PROP_POSITIONX ( HID_PROPC_START + 122) -#define HID_PROP_POSITIONY ( HID_PROPC_START + 123) -#define HID_PROP_PUSHBUTTONTYPE ( HID_PROPC_START + 124) -#define HID_PROP_STATE ( HID_PROPC_START + 125) -#define HID_PROP_SCALEIMAGE ( HID_PROPC_START + 126) -#define HID_PROP_BOUND_CELL ( HID_PROPC_START + 127) -#define HID_PROP_LIST_CELL_RANGE ( HID_PROPC_START + 128) -#define HID_PROP_CELL_EXCHANGE_TYPE ( HID_PROPC_START + 129) -#define HID_PROP_SELECTEDITEMS ( HID_PROPC_START + 130) -#define HID_PROP_SCROLLVALUE_MIN ( HID_PROPC_START + 131) -#define HID_PROP_DEFAULT_SCROLLVALUE ( HID_PROPC_START + 132) -#define HID_PROP_REPEAT_DELAY ( HID_PROPC_START + 133) -#define HID_PROP_SYMBOLCOLOR ( HID_PROPC_START + 134) -#define HID_PROP_SPINVALUE ( HID_PROPC_START + 135) -#define HID_PROP_SPINVALUE_MIN ( HID_PROPC_START + 136) -#define HID_PROP_SPINVALUE_MAX ( HID_PROPC_START + 137) -#define HID_PROP_DEFAULT_SPINVALUE ( HID_PROPC_START + 138) -#define HID_PROP_SPININCREMENT ( HID_PROPC_START + 139) -#define HID_PROP_REPEAT ( HID_PROPC_START + 140) -#define HID_PROP_WORDBREAK ( HID_PROPC_START + 141) -#define HID_PROP_SHOW_SCROLLBARS ( HID_PROPC_START + 142) -#define HID_PROP_TABORDER_CONTROLS ( HID_PROPC_START + 143) -#define HID_FIELDLINK_DETAIL_COLUMN ( HID_PROPC_START + 144) -#define HID_FIELDLINK_MASTER_COLUMN ( HID_PROPC_START + 145) -#define UID_FIELDLINK_DETAIL1 ( HID_PROPC_START + 146) -#define UID_FIELDLINK_MASTER1 ( HID_PROPC_START + 147) -#define UID_FIELDLINK_DETAIL2 ( HID_PROPC_START + 148) -#define UID_FIELDLINK_MASTER2 ( HID_PROPC_START + 149) -#define UID_FIELDLINK_DETAIL3 ( HID_PROPC_START + 150) -#define UID_FIELDLINK_MASTER3 ( HID_PROPC_START + 151) -#define UID_FIELDLINK_DETAIL4 ( HID_PROPC_START + 152) -#define UID_FIELDLINK_MASTER4 ( HID_PROPC_START + 153) -#define HID_PROP_ICONSIZE ( HID_PROPC_START + 154) -#define HID_PROP_SHOW_POSITION ( HID_PROPC_START + 155) -#define HID_PROP_SHOW_NAVIGATION ( HID_PROPC_START + 156) -#define HID_PROP_SHOW_RECORDACTIONS ( HID_PROPC_START + 157) -#define HID_PROP_SHOW_FILTERSORT ( HID_PROPC_START + 158) -#define HID_PROP_AUTOLINEBREAK ( HID_PROPC_START + 159) -#define HID_PROP_TEXTTYPE ( HID_PROPC_START + 160) -#define HID_PROP_LINEEND_FORMAT ( HID_PROPC_START + 161) -#define HID_PROP_XSD_TOTAL_DIGITS ( HID_PROPC_START + 162) -#define HID_PROP_XSD_FRACTION_DIGITS ( HID_PROPC_START + 163) -#define HID_PROP_XSD_MAX_INCLUSIVE ( HID_PROPC_START + 164) -#define HID_PROP_XSD_MAX_EXCLUSIVE ( HID_PROPC_START + 165) -#define HID_PROP_XSD_MIN_INCLUSIVE ( HID_PROPC_START + 166) -#define HID_PROP_XSD_MIN_EXCLUSIVE ( HID_PROPC_START + 167) -#define HID_PROP_UNCHECKEDREFVALUE ( HID_PROPC_START + 168) -#define HID_PROP_SUBMISSION_ID ( HID_PROPC_START + 169) -#define UID_PROP_DLG_FONT_TYPE ( HID_PROPC_START + 170) -#define UID_PROP_DLG_IMAGE_URL ( HID_PROPC_START + 171) -#define UID_PROP_DLG_BACKGROUNDCOLOR ( HID_PROPC_START + 172) -#define UID_PROP_DLG_SYMBOLCOLOR ( HID_PROPC_START + 173) -#define UID_PROP_DLG_ATTR_DATASOURCE ( HID_PROPC_START + 174) -#define UID_PROP_DLG_ATTR_TARGET_URL ( HID_PROPC_START + 175) -#define UID_PROP_DLG_NUMBER_FORMAT ( HID_PROPC_START + 176) -#define UID_PROP_DLG_CONTROLLABEL ( HID_PROPC_START + 177) -#define UID_PROP_DLG_FILLCOLOR ( HID_PROPC_START + 178) -#define UID_PROP_DLG_TABINDEX ( HID_PROPC_START + 179) -#define UID_PROP_DLG_SQLCOMMAND ( HID_PROPC_START + 180) -#define UID_PROP_DLG_FORMLINKFIELDS ( HID_PROPC_START + 181) -#define UID_PROP_DLG_FILTER ( HID_PROPC_START + 182) -#define UID_PROP_DLG_ORDER ( HID_PROPC_START + 183) -#define UID_PROP_DLG_SELECTION ( HID_PROPC_START + 184) -#define UID_EVT_MACRODLG ( HID_PROPC_START + 185) -#define UID_BRWEVT_APPROVEACTIONPERFORMED ( HID_PROPC_START + 186) -#define UID_BRWEVT_ACTIONPERFORMED ( HID_PROPC_START + 187) -#define UID_BRWEVT_CHANGED ( HID_PROPC_START + 188) -#define UID_BRWEVT_TEXTCHANGED ( HID_PROPC_START + 189) -#define UID_BRWEVT_ITEMSTATECHANGED ( HID_PROPC_START + 190) -#define UID_BRWEVT_FOCUSGAINED ( HID_PROPC_START + 191) -#define UID_BRWEVT_FOCUSLOST ( HID_PROPC_START + 192) -#define UID_BRWEVT_KEYTYPED ( HID_PROPC_START + 193) -#define UID_BRWEVT_KEYUP ( HID_PROPC_START + 194) -#define UID_BRWEVT_MOUSEENTERED ( HID_PROPC_START + 195) -#define UID_BRWEVT_MOUSEDRAGGED ( HID_PROPC_START + 196) -#define UID_BRWEVT_MOUSEMOVED ( HID_PROPC_START + 197) -#define UID_BRWEVT_MOUSEPRESSED ( HID_PROPC_START + 198) -#define UID_BRWEVT_MOUSERELEASED ( HID_PROPC_START + 199) -#define UID_BRWEVT_MOUSEEXITED ( HID_PROPC_START + 200) -#define UID_BRWEVT_APPROVERESETTED ( HID_PROPC_START + 201) -#define UID_BRWEVT_RESETTED ( HID_PROPC_START + 202) -#define UID_BRWEVT_SUBMITTED ( HID_PROPC_START + 203) -#define UID_BRWEVT_BEFOREUPDATE ( HID_PROPC_START + 204) -#define UID_BRWEVT_AFTERUPDATE ( HID_PROPC_START + 205) -#define UID_BRWEVT_LOADED ( HID_PROPC_START + 206) -#define UID_BRWEVT_RELOADING ( HID_PROPC_START + 207) -#define UID_BRWEVT_RELOADED ( HID_PROPC_START + 208) -#define UID_BRWEVT_UNLOADING ( HID_PROPC_START + 209) -#define UID_BRWEVT_UNLOADED ( HID_PROPC_START + 210) -#define UID_BRWEVT_CONFIRMDELETE ( HID_PROPC_START + 211) -#define UID_BRWEVT_APPROVEROWCHANGE ( HID_PROPC_START + 212) -#define UID_BRWEVT_ROWCHANGE ( HID_PROPC_START + 213) -#define UID_BRWEVT_POSITIONING ( HID_PROPC_START + 214) -#define UID_BRWEVT_POSITIONED ( HID_PROPC_START + 215) -#define UID_BRWEVT_APPROVEPARAMETER ( HID_PROPC_START + 216) -#define UID_BRWEVT_ERROROCCURED ( HID_PROPC_START + 217) -#define UID_BRWEVT_ADJUSTMENTVALUECHANGED ( HID_PROPC_START + 218) -#define HID_PROP_XML_DATA_MODEL ( HID_PROPC_START + 219) -#define HID_PROP_BIND_EXPRESSION ( HID_PROPC_START + 220) -#define HID_PROP_XSD_REQUIRED ( HID_PROPC_START + 221) -#define HID_PROP_XSD_RELEVANT ( HID_PROPC_START + 222) -#define HID_PROP_XSD_READONLY ( HID_PROPC_START + 223) -#define HID_PROP_XSD_CONSTRAINT ( HID_PROPC_START + 224) -#define HID_PROP_XSD_CALCULATION ( HID_PROPC_START + 225) -#define HID_PROP_XSD_DATA_TYPE ( HID_PROPC_START + 226) -#define HID_PROP_XSD_WHITESPACES ( HID_PROPC_START + 227) -#define HID_PROP_XSD_PATTERN ( HID_PROPC_START + 228) -#define HID_PROP_XSD_LENGTH ( HID_PROPC_START + 229) -#define HID_PROP_XSD_MIN_LENGTH ( HID_PROPC_START + 230) -#define HID_PROP_XSD_MAX_LENGTH ( HID_PROPC_START + 231) -#define UID_PROP_DLG_BIND_EXPRESSION ( HID_PROPC_START + 232) -#define UID_PROP_DLG_XSD_REQUIRED ( HID_PROPC_START + 233) -#define UID_PROP_DLG_XSD_RELEVANT ( HID_PROPC_START + 234) -#define UID_PROP_DLG_XSD_READONLY ( HID_PROPC_START + 235) -#define UID_PROP_DLG_XSD_CONSTRAINT ( HID_PROPC_START + 236) -#define UID_PROP_DLG_XSD_CALCULATION ( HID_PROPC_START + 237) -#define UID_PROP_ADD_DATA_TYPE ( HID_PROPC_START + 238) -#define UID_PROP_REMOVE_DATA_TYPE ( HID_PROPC_START + 239) -#define HID_PROP_LIST_BINDING ( HID_PROPC_START + 240) -#define HID_PROP_BINDING_NAME ( HID_PROPC_START + 241) -#define HID_PROP_SELECTION_TYPE ( HID_PROPC_START + 242) -#define HID_PROP_ROOT_DISPLAYED ( HID_PROPC_START + 243) -#define HID_PROP_SHOWS_HANDLES ( HID_PROPC_START + 244) -#define HID_PROP_SHOWS_ROOT_HANDLES ( HID_PROPC_START + 245) -#define HID_PROP_EDITABLE ( HID_PROPC_START + 246) -#define HID_PROP_INVOKES_STOP_NOT_EDITING ( HID_PROPC_START + 247) -#define HID_PROP_ROW_HEIGHT ( HID_PROPC_START + 248) -#define HID_PROP_DECORATION ( HID_PROPC_START + 249) -#define HID_EVT_ACTIONPERFORMED ( HID_PROPC_START + 250) -#define HID_EVT_AFTERUPDATE ( HID_PROPC_START + 251) -#define HID_EVT_BEFOREUPDATE ( HID_PROPC_START + 252) -#define HID_EVT_CONFIRMDELETE ( HID_PROPC_START + 253) -#define HID_EVT_ERROROCCURED ( HID_PROPC_START + 254) -#define HID_EVT_FOCUSGAINED ( HID_PROPC_START + 255) -#define HID_EVT_FOCUSLOST ( HID_PROPC_START + 256) -#define HID_EVT_ITEMSTATECHANGED ( HID_PROPC_START + 257) -#define HID_EVT_KEYTYPED ( HID_PROPC_START + 258) -#define HID_EVT_LOADED ( HID_PROPC_START + 259) -#define HID_EVT_MOUSEDRAGGED ( HID_PROPC_START + 260) -#define HID_EVT_MOUSEENTERED ( HID_PROPC_START + 261) -#define HID_EVT_MOUSEEXITED ( HID_PROPC_START + 262) -#define HID_EVT_MOUSEMOVED ( HID_PROPC_START + 263) -#define HID_EVT_MOUSEPRESSED ( HID_PROPC_START + 264) -#define HID_EVT_MOUSERELEASED ( HID_PROPC_START + 265) -#define HID_EVT_POSITIONED ( HID_PROPC_START + 266) -#define HID_EVT_RESETTED ( HID_PROPC_START + 267) -#define HID_EVT_SUBMITTED ( HID_PROPC_START + 268) -#define HID_EVT_TEXTCHANGED ( HID_PROPC_START + 269) -#define HID_EVT_UNLOADED ( HID_PROPC_START + 270) -#define HID_EVT_CHANGED ( HID_PROPC_START + 271) -#define HID_EVT_APPROVEACTIONPERFORMED ( HID_PROPC_START + 272) -#define HID_EVT_APPROVERESETTED ( HID_PROPC_START + 273) -#define HID_EVT_KEYUP ( HID_PROPC_START + 274) -#define HID_EVT_APPROVEPARAMETER ( HID_PROPC_START + 275) -#define HID_EVT_POSITIONING ( HID_PROPC_START + 276) -#define HID_EVT_RELOADED ( HID_PROPC_START + 277) -#define HID_EVT_APPROVEROWCHANGE ( HID_PROPC_START + 278) -#define HID_EVT_ROWCHANGE ( HID_PROPC_START + 279) -#define HID_EVT_RELOADING ( HID_PROPC_START + 280) -#define HID_EVT_UNLOADING ( HID_PROPC_START + 281) -#define HID_EVT_ADJUSTMENTVALUECHANGED ( HID_PROPC_START + 282) -#define HID_PROP_TOGGLE ( HID_PROPC_START + 283) -#define HID_PROP_FOCUSONCLICK ( HID_PROPC_START + 284) -#define HID_PROP_HIDEINACTIVESELECTION ( HID_PROPC_START + 285) -#define HID_PROP_VISUALEFFECT ( HID_PROPC_START + 286) -#define HID_PROP_BORDERCOLOR ( HID_PROPC_START + 287) -#define UID_PROP_DLG_BORDERCOLOR ( HID_PROPC_START + 288) -#define HID_PROP_IMAGEPOSITION ( HID_PROPC_START + 289) -#define HID_PROP_NOLABEL ( HID_PROPC_START + 290) -#define HID_PROP_WRITING_MODE ( HID_PROPC_START + 291) -#define HID_PROP_ANCHOR_TYPE ( HID_PROPC_START + 292) -#define HID_FM_PROPDLG_TABCTR ( HID_PROPC_START + 293) -#define HID_FM_PROPDLG_TAB_GENERAL ( HID_PROPC_START + 294) -#define HID_FM_PROPDLG_TAB_DATA ( HID_PROPC_START + 295) -#define HID_FM_PROPDLG_TAB_EVT ( HID_PROPC_START + 296) - // please adjust HID_LAST_PROPC_ID if you add new ids here! +#define UID_PROP_DLG_FONT_TYPE "EXTENSIONS_UID_PROP_DLG_FONT_TYPE" +#define UID_PROP_DLG_IMAGE_URL "EXTENSIONS_UID_PROP_DLG_IMAGE_URL" +#define UID_PROP_DLG_BACKGROUNDCOLOR "EXTENSIONS_UID_PROP_DLG_BACKGROUNDCOLOR" +#define UID_PROP_DLG_SYMBOLCOLOR "EXTENSIONS_UID_PROP_DLG_SYMBOLCOLOR" +#define UID_PROP_DLG_ATTR_DATASOURCE "EXTENSIONS_UID_PROP_DLG_ATTR_DATASOURCE" +#define UID_PROP_DLG_ATTR_TARGET_URL "EXTENSIONS_UID_PROP_DLG_ATTR_TARGET_URL" +#define UID_PROP_DLG_NUMBER_FORMAT "EXTENSIONS_UID_PROP_DLG_NUMBER_FORMAT" +#define UID_PROP_DLG_CONTROLLABEL "EXTENSIONS_UID_PROP_DLG_CONTROLLABEL" +#define UID_PROP_DLG_FILLCOLOR "EXTENSIONS_UID_PROP_DLG_FILLCOLOR" +#define UID_PROP_DLG_TABINDEX "EXTENSIONS_UID_PROP_DLG_TABINDEX" +#define UID_PROP_DLG_SQLCOMMAND "EXTENSIONS_UID_PROP_DLG_SQLCOMMAND" +#define UID_PROP_DLG_FORMLINKFIELDS "EXTENSIONS_UID_PROP_DLG_FORMLINKFIELDS" +#define UID_PROP_DLG_FILTER "EXTENSIONS_UID_PROP_DLG_FILTER" +#define UID_PROP_DLG_ORDER "EXTENSIONS_UID_PROP_DLG_ORDER" +#define UID_PROP_DLG_SELECTION "EXTENSIONS_UID_PROP_DLG_SELECTION" +#define UID_PROP_DLG_BIND_EXPRESSION "EXTENSIONS_UID_PROP_DLG_BIND_EXPRESSION" +#define UID_PROP_DLG_XSD_REQUIRED "EXTENSIONS_UID_PROP_DLG_XSD_REQUIRED" +#define UID_PROP_DLG_XSD_RELEVANT "EXTENSIONS_UID_PROP_DLG_XSD_RELEVANT" +#define UID_PROP_DLG_XSD_READONLY "EXTENSIONS_UID_PROP_DLG_XSD_READONLY" +#define UID_PROP_DLG_XSD_CONSTRAINT "EXTENSIONS_UID_PROP_DLG_XSD_CONSTRAINT" +#define UID_PROP_DLG_XSD_CALCULATION "EXTENSIONS_UID_PROP_DLG_XSD_CALCULATION" +#define UID_PROP_ADD_DATA_TYPE "EXTENSIONS_UID_PROP_ADD_DATA_TYPE" +#define UID_PROP_REMOVE_DATA_TYPE "EXTENSIONS_UID_PROP_REMOVE_DATA_TYPE" +#define UID_PROP_DLG_BORDERCOLOR "EXTENSIONS_UID_PROP_DLG_BORDERCOLOR" -#define HID_LAST_PROPC_ID HID_FM_PROPDLG_TAB_EVT +#define UID_BRWEVT_APPROVEACTIONPERFORMED "EXTENSIONS_UID_BRWEVT_APPROVEACTIONPERFORMED" +#define UID_BRWEVT_ACTIONPERFORMED "EXTENSIONS_UID_BRWEVT_ACTIONPERFORMED" +#define UID_BRWEVT_CHANGED "EXTENSIONS_UID_BRWEVT_CHANGED" +#define UID_BRWEVT_TEXTCHANGED "EXTENSIONS_UID_BRWEVT_TEXTCHANGED" +#define UID_BRWEVT_ITEMSTATECHANGED "EXTENSIONS_UID_BRWEVT_ITEMSTATECHANGED" +#define UID_BRWEVT_FOCUSGAINED "EXTENSIONS_UID_BRWEVT_FOCUSGAINED" +#define UID_BRWEVT_FOCUSLOST "EXTENSIONS_UID_BRWEVT_FOCUSLOST" +#define UID_BRWEVT_KEYTYPED "EXTENSIONS_UID_BRWEVT_KEYTYPED" +#define UID_BRWEVT_KEYUP "EXTENSIONS_UID_BRWEVT_KEYUP" +#define UID_BRWEVT_MOUSEENTERED "EXTENSIONS_UID_BRWEVT_MOUSEENTERED" +#define UID_BRWEVT_MOUSEDRAGGED "EXTENSIONS_UID_BRWEVT_MOUSEDRAGGED" +#define UID_BRWEVT_MOUSEMOVED "EXTENSIONS_UID_BRWEVT_MOUSEMOVED" +#define UID_BRWEVT_MOUSEPRESSED "EXTENSIONS_UID_BRWEVT_MOUSEPRESSED" +#define UID_BRWEVT_MOUSERELEASED "EXTENSIONS_UID_BRWEVT_MOUSERELEASED" +#define UID_BRWEVT_MOUSEEXITED "EXTENSIONS_UID_BRWEVT_MOUSEEXITED" +#define UID_BRWEVT_APPROVERESETTED "EXTENSIONS_UID_BRWEVT_APPROVERESETTED" +#define UID_BRWEVT_RESETTED "EXTENSIONS_UID_BRWEVT_RESETTED" +#define UID_BRWEVT_SUBMITTED "EXTENSIONS_UID_BRWEVT_SUBMITTED" +#define UID_BRWEVT_BEFOREUPDATE "EXTENSIONS_UID_BRWEVT_BEFOREUPDATE" +#define UID_BRWEVT_AFTERUPDATE "EXTENSIONS_UID_BRWEVT_AFTERUPDATE" +#define UID_BRWEVT_LOADED "EXTENSIONS_UID_BRWEVT_LOADED" +#define UID_BRWEVT_RELOADING "EXTENSIONS_UID_BRWEVT_RELOADING" +#define UID_BRWEVT_RELOADED "EXTENSIONS_UID_BRWEVT_RELOADED" +#define UID_BRWEVT_UNLOADING "EXTENSIONS_UID_BRWEVT_UNLOADING" +#define UID_BRWEVT_UNLOADED "EXTENSIONS_UID_BRWEVT_UNLOADED" +#define UID_BRWEVT_CONFIRMDELETE "EXTENSIONS_UID_BRWEVT_CONFIRMDELETE" +#define UID_BRWEVT_APPROVEROWCHANGE "EXTENSIONS_UID_BRWEVT_APPROVEROWCHANGE" +#define UID_BRWEVT_ROWCHANGE "EXTENSIONS_UID_BRWEVT_ROWCHANGE" +#define UID_BRWEVT_POSITIONING "EXTENSIONS_UID_BRWEVT_POSITIONING" +#define UID_BRWEVT_POSITIONED "EXTENSIONS_UID_BRWEVT_POSITIONED" +#define UID_BRWEVT_APPROVEPARAMETER "EXTENSIONS_UID_BRWEVT_APPROVEPARAMETER" +#define UID_BRWEVT_ERROROCCURED "EXTENSIONS_UID_BRWEVT_ERROROCCURED" +#define UID_BRWEVT_ADJUSTMENTVALUECHANGED "EXTENSIONS_UID_BRWEVT_ADJUSTMENTVALUECHANGED" -#if HID_LAST_PROPC_ID > HID_PROPC_END - #error help id overflow (PROPC) -#endif +#define HID_PROP_INPUT_REQUIRED "EXTENSIONS_HID_PROP_INPUT_REQUIRED" +#define HID_PROP_GROUPBOX "EXTENSIONS_HID_PROP_GROUPBOX" +#define HID_PROP_CONTROLSOURCE "EXTENSIONS_HID_PROP_CONTROLSOURCE" +#define HID_PROP_NAME "EXTENSIONS_HID_PROP_NAME" +#define HID_PROP_TABINDEX "EXTENSIONS_HID_PROP_TABINDEX" +#define HID_PROP_MASTERFIELDS "EXTENSIONS_HID_PROP_MASTERFIELDS" +#define HID_PROP_SLAVEFIELDS "EXTENSIONS_HID_PROP_SLAVEFIELDS" +#define HID_PROP_DATASOURCE "EXTENSIONS_HID_PROP_DATASOURCE" +#define HID_PROP_CURSORSOURCE "EXTENSIONS_HID_PROP_CURSORSOURCE" +#define HID_PROP_CURSORSOURCETYPE "EXTENSIONS_HID_PROP_CURSORSOURCETYPE" +#define HID_PROP_CURSORTYPE "EXTENSIONS_HID_PROP_CURSORTYPE" +#define HID_PROP_READONLY "EXTENSIONS_HID_PROP_READONLY" +#define HID_PROP_DATAENTRY "EXTENSIONS_HID_PROP_DATAENTRY" +#define HID_PROP_NAVIGATION "EXTENSIONS_HID_PROP_NAVIGATION" +#define HID_PROP_CYCLE "EXTENSIONS_HID_PROP_CYCLE" +#define HID_PROP_ALLOW_ADDITIONS "EXTENSIONS_HID_PROP_ALLOW_ADDITIONS" +#define HID_PROP_ALLOW_EDITS "EXTENSIONS_HID_PROP_ALLOW_EDITS" +#define HID_PROP_ALLOW_DELETIONS "EXTENSIONS_HID_PROP_ALLOW_DELETIONS" +#define HID_PROP_DIRTY "EXTENSIONS_HID_PROP_DIRTY" +#define HID_PROP_OLDVALUE "EXTENSIONS_HID_PROP_OLDVALUE" +#define HID_PROP_VALUE "EXTENSIONS_HID_PROP_VALUE" +#define HID_PROP_LOCKED "EXTENSIONS_HID_PROP_LOCKED" +#define HID_PROP_FORMATKEY "EXTENSIONS_HID_PROP_FORMATKEY" +#define HID_PROP_REQUIRED "EXTENSIONS_HID_PROP_REQUIRED" +#define HID_PROP_WHEEL_BEHAVIOR "EXTENSIONS_HID_PROP_WHEEL_BEHAVIOR" +#define HID_PROP_UNIQUE "EXTENSIONS_HID_PROP_UNIQUE" +#define HID_PROP_CLASSID "EXTENSIONS_HID_PROP_CLASSID" +#define HID_PROP_LEFT "EXTENSIONS_HID_PROP_LEFT" +#define HID_PROP_RIGHT "EXTENSIONS_HID_PROP_RIGHT" +#define HID_PROP_HEIGHT "EXTENSIONS_HID_PROP_HEIGHT" +#define HID_PROP_WIDTH "EXTENSIONS_HID_PROP_WIDTH" +#define HID_PROP_BOUNDCOLUMN "EXTENSIONS_HID_PROP_BOUNDCOLUMN" +#define HID_PROP_LISTSOURCETYPE "EXTENSIONS_HID_PROP_LISTSOURCETYPE" +#define HID_PROP_LISTSOURCE "EXTENSIONS_HID_PROP_LISTSOURCE" +#define HID_PROP_LISTINDEX "EXTENSIONS_HID_PROP_LISTINDEX" +#define HID_PROP_TEXT "EXTENSIONS_HID_PROP_TEXT" +#define HID_PROP_LABEL "EXTENSIONS_HID_PROP_LABEL" +#define HID_PROP_STRINGITEMLIST "EXTENSIONS_HID_PROP_STRINGITEMLIST" +#define HID_PROP_SEARCHING "EXTENSIONS_HID_PROP_SEARCHING" +#define HID_PROP_FONT "EXTENSIONS_HID_PROP_FONT" +#define HID_PROP_ROWHEIGHT "EXTENSIONS_HID_PROP_ROWHEIGHT" +#define HID_PROP_BACKGROUNDCOLOR "EXTENSIONS_HID_PROP_BACKGROUNDCOLOR" +#define HID_PROP_FILLCOLOR "EXTENSIONS_HID_PROP_FILLCOLOR" +#define HID_PROP_LINECOLOR "EXTENSIONS_HID_PROP_LINECOLOR" +#define HID_PROP_BORDER "EXTENSIONS_HID_PROP_BORDER" +#define HID_PROP_ALIGN "EXTENSIONS_HID_PROP_ALIGN" +#define HID_PROP_DROPDOWN "EXTENSIONS_HID_PROP_DROPDOWN" +#define HID_PROP_MULTILINE "EXTENSIONS_HID_PROP_MULTILINE" +#define HID_PROP_HSCROLL "EXTENSIONS_HID_PROP_HSCROLL" +#define HID_PROP_VSCROLL "EXTENSIONS_HID_PROP_VSCROLL" +#define HID_PROP_TABSTOP "EXTENSIONS_HID_PROP_TABSTOP" +#define HID_PROP_REFVALUE "EXTENSIONS_HID_PROP_REFVALUE" +#define HID_PROP_BUTTONTYPE "EXTENSIONS_HID_PROP_BUTTONTYPE" +#define HID_PROP_SUBMIT_ACTION "EXTENSIONS_HID_PROP_SUBMIT_ACTION" +#define HID_PROP_SUBMIT_METHOD "EXTENSIONS_HID_PROP_SUBMIT_METHOD" +#define HID_PROP_SUBMIT_ENCODING "EXTENSIONS_HID_PROP_SUBMIT_ENCODING" +#define HID_PROP_DEFAULTVALUE "EXTENSIONS_HID_PROP_DEFAULTVALUE" +#define HID_PROP_SUBMIT_TARGET "EXTENSIONS_HID_PROP_SUBMIT_TARGET" +#define HID_PROP_DEFAULT_STATE "EXTENSIONS_HID_PROP_DEFAULT_STATE" +#define HID_PROP_IMAGE_URL "EXTENSIONS_HID_PROP_IMAGE_URL" +#define HID_PROP_DEFAULT_SELECT_SEQ "EXTENSIONS_HID_PROP_DEFAULT_SELECT_SEQ" +#define HID_PROP_MULTISELECTION "EXTENSIONS_HID_PROP_MULTISELECTION" +#define HID_PROP_DATE "EXTENSIONS_HID_PROP_DATE" +#define HID_PROP_DATEMIN "EXTENSIONS_HID_PROP_DATEMIN" +#define HID_PROP_DATEMAX "EXTENSIONS_HID_PROP_DATEMAX" +#define HID_PROP_DATEFORMAT "EXTENSIONS_HID_PROP_DATEFORMAT" +#define HID_PROP_TIME "EXTENSIONS_HID_PROP_TIME" +#define HID_PROP_TIMEMIN "EXTENSIONS_HID_PROP_TIMEMIN" +#define HID_PROP_TIMEMAX "EXTENSIONS_HID_PROP_TIMEMAX" +#define HID_PROP_TIMEFORMAT "EXTENSIONS_HID_PROP_TIMEFORMAT" +#define HID_PROP_VALUEMIN "EXTENSIONS_HID_PROP_VALUEMIN" +#define HID_PROP_VALUEMAX "EXTENSIONS_HID_PROP_VALUEMAX" +#define HID_PROP_VALUESTEP "EXTENSIONS_HID_PROP_VALUESTEP" +#define HID_PROP_CURRENCYSYMBOL "EXTENSIONS_HID_PROP_CURRENCYSYMBOL" +#define HID_PROP_EDITMASK "EXTENSIONS_HID_PROP_EDITMASK" +#define HID_PROP_LITERALMASK "EXTENSIONS_HID_PROP_LITERALMASK" +#define HID_PROP_ENABLED "EXTENSIONS_HID_PROP_ENABLED" +#define HID_PROP_AUTOCOMPLETE "EXTENSIONS_HID_PROP_AUTOCOMPLETE" +#define HID_PROP_LINECOUNT "EXTENSIONS_HID_PROP_LINECOUNT" +#define HID_PROP_MAXTEXTLEN "EXTENSIONS_HID_PROP_MAXTEXTLEN" +#define HID_PROP_SPIN "EXTENSIONS_HID_PROP_SPIN" +#define HID_PROP_STRICTFORMAT "EXTENSIONS_HID_PROP_STRICTFORMAT" +#define HID_PROP_SHOWTHOUSANDSEP "EXTENSIONS_HID_PROP_SHOWTHOUSANDSEP" +#define HID_PROP_VERTICAL_ALIGN "EXTENSIONS_HID_PROP_VERTICAL_ALIGN" +#define HID_PROP_PRINTABLE "EXTENSIONS_HID_PROP_PRINTABLE" +#define HID_PROP_TARGET_URL "EXTENSIONS_HID_PROP_TARGET_URL" +#define HID_PROP_TARGET_FRAME "EXTENSIONS_HID_PROP_TARGET_FRAME" +#define HID_PROP_TAG "EXTENSIONS_HID_PROP_TAG" +#define HID_PROP_ECHO_CHAR "EXTENSIONS_HID_PROP_ECHO_CHAR" +#define HID_PROP_EMPTY_IS_NULL "EXTENSIONS_HID_PROP_EMPTY_IS_NULL" +#define HID_PROP_DECIMAL_ACCURACY "EXTENSIONS_HID_PROP_DECIMAL_ACCURACY" +#define HID_PROP_ENABLE_VISIBLE "EXTENSIONS_HID_PROP_ENABLE_VISIBLE" +#define HID_PROP_DEFAULT_BUTTON "EXTENSIONS_HID_PROP_DEFAULT_BUTTON" +#define HID_PROP_HIDDEN_VALUE "EXTENSIONS_HID_PROP_HIDDEN_VALUE" +#define HID_PROP_TRISTATE "EXTENSIONS_HID_PROP_TRISTATE" +#define HID_PROP_NAVIGATIONBAR "EXTENSIONS_HID_PROP_NAVIGATIONBAR" +#define HID_PROP_FILTER "EXTENSIONS_HID_PROP_FILTER" +#define HID_PROP_SORT_CRITERIA "EXTENSIONS_HID_PROP_SORT_CRITERIA" +#define HID_PROP_DEFAULT_LONG_VALUE "EXTENSIONS_HID_PROP_DEFAULT_LONG_VALUE" +#define HID_PROP_DEFAULT_TIME "EXTENSIONS_HID_PROP_DEFAULT_TIME" +#define HID_PROP_DEFAULT_DATE "EXTENSIONS_HID_PROP_DEFAULT_DATE" +#define HID_PROP_HELPTEXT "EXTENSIONS_HID_PROP_HELPTEXT" +#define HID_PROP_HELPURL "EXTENSIONS_HID_PROP_HELPURL" +#define HID_PROP_RECORDMARKER "EXTENSIONS_HID_PROP_RECORDMARKER" +#define HID_PROP_FILTERPROPOSAL "EXTENSIONS_HID_PROP_FILTERPROPOSAL" +#define HID_PROP_EFFECTIVEMIN "EXTENSIONS_HID_PROP_EFFECTIVEMIN" +#define HID_PROP_EFFECTIVEMAX "EXTENSIONS_HID_PROP_EFFECTIVEMAX" +#define HID_PROP_EFFECTIVEDEFAULT "EXTENSIONS_HID_PROP_EFFECTIVEDEFAULT" +#define HID_PROP_CONTROLLABEL "EXTENSIONS_HID_PROP_CONTROLLABEL" +#define HID_PROP_CURRSYM_POSITION "EXTENSIONS_HID_PROP_CURRSYM_POSITION" +#define HID_PROP_ESCAPE_PROCESSING "EXTENSIONS_HID_PROP_ESCAPE_PROCESSING" +#define HID_PROP_TITLE "EXTENSIONS_HID_PROP_TITLE" +#define HID_PROP_STEP "EXTENSIONS_HID_PROP_STEP" +#define HID_PROP_PROGRESSVALUE "EXTENSIONS_HID_PROP_PROGRESSVALUE" +#define HID_PROP_PROGRESSVALUE_MIN "EXTENSIONS_HID_PROP_PROGRESSVALUE_MIN" +#define HID_PROP_PROGRESSVALUE_MAX "EXTENSIONS_HID_PROP_PROGRESSVALUE_MAX" +#define HID_PROP_SCROLLVALUE "EXTENSIONS_HID_PROP_SCROLLVALUE" +#define HID_PROP_SCROLLVALUE_MAX "EXTENSIONS_HID_PROP_SCROLLVALUE_MAX" +#define HID_PROP_LINEINCREMENT "EXTENSIONS_HID_PROP_LINEINCREMENT" +#define HID_PROP_BLOCKINCREMENT "EXTENSIONS_HID_PROP_BLOCKINCREMENT" +#define HID_PROP_VISIBLESIZE "EXTENSIONS_HID_PROP_VISIBLESIZE" +#define HID_PROP_ORIENTATION "EXTENSIONS_HID_PROP_ORIENTATION" +#define HID_PROP_POSITIONX "EXTENSIONS_HID_PROP_POSITIONX" +#define HID_PROP_POSITIONY "EXTENSIONS_HID_PROP_POSITIONY" +#define HID_PROP_PUSHBUTTONTYPE "EXTENSIONS_HID_PROP_PUSHBUTTONTYPE" +#define HID_PROP_STATE "EXTENSIONS_HID_PROP_STATE" +#define HID_PROP_SCALEIMAGE "EXTENSIONS_HID_PROP_SCALEIMAGE" +#define HID_PROP_BOUND_CELL "EXTENSIONS_HID_PROP_BOUND_CELL" +#define HID_PROP_LIST_CELL_RANGE "EXTENSIONS_HID_PROP_LIST_CELL_RANGE" +#define HID_PROP_CELL_EXCHANGE_TYPE "EXTENSIONS_HID_PROP_CELL_EXCHANGE_TYPE" +#define HID_PROP_SELECTEDITEMS "EXTENSIONS_HID_PROP_SELECTEDITEMS" +#define HID_PROP_SCROLLVALUE_MIN "EXTENSIONS_HID_PROP_SCROLLVALUE_MIN" +#define HID_PROP_DEFAULT_SCROLLVALUE "EXTENSIONS_HID_PROP_DEFAULT_SCROLLVALUE" +#define HID_PROP_REPEAT_DELAY "EXTENSIONS_HID_PROP_REPEAT_DELAY" +#define HID_PROP_SYMBOLCOLOR "EXTENSIONS_HID_PROP_SYMBOLCOLOR" +#define HID_PROP_SPINVALUE "EXTENSIONS_HID_PROP_SPINVALUE" +#define HID_PROP_SPINVALUE_MIN "EXTENSIONS_HID_PROP_SPINVALUE_MIN" +#define HID_PROP_SPINVALUE_MAX "EXTENSIONS_HID_PROP_SPINVALUE_MAX" +#define HID_PROP_DEFAULT_SPINVALUE "EXTENSIONS_HID_PROP_DEFAULT_SPINVALUE" +#define HID_PROP_SPININCREMENT "EXTENSIONS_HID_PROP_SPININCREMENT" +#define HID_PROP_REPEAT "EXTENSIONS_HID_PROP_REPEAT" +#define HID_PROP_WORDBREAK "EXTENSIONS_HID_PROP_WORDBREAK" +#define HID_PROP_SHOW_SCROLLBARS "EXTENSIONS_HID_PROP_SHOW_SCROLLBARS" +#define HID_PROP_TABORDER_CONTROLS "EXTENSIONS_HID_PROP_TABORDER_CONTROLS" +#define HID_FIELDLINK_DETAIL_COLUMN "EXTENSIONS_HID_FIELDLINK_DETAIL_COLUMN" +#define HID_FIELDLINK_MASTER_COLUMN "EXTENSIONS_HID_FIELDLINK_MASTER_COLUMN" +#define UID_FIELDLINK_DETAIL1 "EXTENSIONS_UID_FIELDLINK_DETAIL1" +#define UID_FIELDLINK_MASTER1 "EXTENSIONS_UID_FIELDLINK_MASTER1" +#define UID_FIELDLINK_DETAIL2 "EXTENSIONS_UID_FIELDLINK_DETAIL2" +#define UID_FIELDLINK_MASTER2 "EXTENSIONS_UID_FIELDLINK_MASTER2" +#define UID_FIELDLINK_DETAIL3 "EXTENSIONS_UID_FIELDLINK_DETAIL3" +#define UID_FIELDLINK_MASTER3 "EXTENSIONS_UID_FIELDLINK_MASTER3" +#define UID_FIELDLINK_DETAIL4 "EXTENSIONS_UID_FIELDLINK_DETAIL4" +#define UID_FIELDLINK_MASTER4 "EXTENSIONS_UID_FIELDLINK_MASTER4" +#define HID_PROP_ICONSIZE "EXTENSIONS_HID_PROP_ICONSIZE" +#define HID_PROP_SHOW_POSITION "EXTENSIONS_HID_PROP_SHOW_POSITION" +#define HID_PROP_SHOW_NAVIGATION "EXTENSIONS_HID_PROP_SHOW_NAVIGATION" +#define HID_PROP_SHOW_RECORDACTIONS "EXTENSIONS_HID_PROP_SHOW_RECORDACTIONS" +#define HID_PROP_SHOW_FILTERSORT "EXTENSIONS_HID_PROP_SHOW_FILTERSORT" +#define HID_PROP_AUTOLINEBREAK "EXTENSIONS_HID_PROP_AUTOLINEBREAK" +#define HID_PROP_TEXTTYPE "EXTENSIONS_HID_PROP_TEXTTYPE" +#define HID_PROP_LINEEND_FORMAT "EXTENSIONS_HID_PROP_LINEEND_FORMAT" +#define HID_PROP_XSD_TOTAL_DIGITS "EXTENSIONS_HID_PROP_XSD_TOTAL_DIGITS" +#define HID_PROP_XSD_FRACTION_DIGITS "EXTENSIONS_HID_PROP_XSD_FRACTION_DIGITS" +#define HID_PROP_XSD_MAX_INCLUSIVE "EXTENSIONS_HID_PROP_XSD_MAX_INCLUSIVE" +#define HID_PROP_XSD_MAX_EXCLUSIVE "EXTENSIONS_HID_PROP_XSD_MAX_EXCLUSIVE" +#define HID_PROP_XSD_MIN_INCLUSIVE "EXTENSIONS_HID_PROP_XSD_MIN_INCLUSIVE" +#define HID_PROP_XSD_MIN_EXCLUSIVE "EXTENSIONS_HID_PROP_XSD_MIN_EXCLUSIVE" +#define HID_PROP_UNCHECKEDREFVALUE "EXTENSIONS_HID_PROP_UNCHECKEDREFVALUE" +#define HID_PROP_SUBMISSION_ID "EXTENSIONS_HID_PROP_SUBMISSION_ID" +#define UID_EVT_MACRODLG "EXTENSIONS_UID_EVT_MACRODLG" +#define HID_PROP_XML_DATA_MODEL "EXTENSIONS_HID_PROP_XML_DATA_MODEL" +#define HID_PROP_BIND_EXPRESSION "EXTENSIONS_HID_PROP_BIND_EXPRESSION" +#define HID_PROP_XSD_REQUIRED "EXTENSIONS_HID_PROP_XSD_REQUIRED" +#define HID_PROP_XSD_RELEVANT "EXTENSIONS_HID_PROP_XSD_RELEVANT" +#define HID_PROP_XSD_READONLY "EXTENSIONS_HID_PROP_XSD_READONLY" +#define HID_PROP_XSD_CONSTRAINT "EXTENSIONS_HID_PROP_XSD_CONSTRAINT" +#define HID_PROP_XSD_CALCULATION "EXTENSIONS_HID_PROP_XSD_CALCULATION" +#define HID_PROP_XSD_DATA_TYPE "EXTENSIONS_HID_PROP_XSD_DATA_TYPE" +#define HID_PROP_XSD_WHITESPACES "EXTENSIONS_HID_PROP_XSD_WHITESPACES" +#define HID_PROP_XSD_PATTERN "EXTENSIONS_HID_PROP_XSD_PATTERN" +#define HID_PROP_XSD_LENGTH "EXTENSIONS_HID_PROP_XSD_LENGTH" +#define HID_PROP_XSD_MIN_LENGTH "EXTENSIONS_HID_PROP_XSD_MIN_LENGTH" +#define HID_PROP_XSD_MAX_LENGTH "EXTENSIONS_HID_PROP_XSD_MAX_LENGTH" +#define HID_PROP_LIST_BINDING "EXTENSIONS_HID_PROP_LIST_BINDING" +#define HID_PROP_BINDING_NAME "EXTENSIONS_HID_PROP_BINDING_NAME" +#define HID_PROP_SELECTION_TYPE "EXTENSIONS_HID_PROP_SELECTION_TYPE" +#define HID_PROP_ROOT_DISPLAYED "EXTENSIONS_HID_PROP_ROOT_DISPLAYED" +#define HID_PROP_SHOWS_HANDLES "EXTENSIONS_HID_PROP_SHOWS_HANDLES" +#define HID_PROP_SHOWS_ROOT_HANDLES "EXTENSIONS_HID_PROP_SHOWS_ROOT_HANDLES" +#define HID_PROP_EDITABLE "EXTENSIONS_HID_PROP_EDITABLE" +#define HID_PROP_INVOKES_STOP_NOT_EDITING "EXTENSIONS_HID_PROP_INVOKES_STOP_NOT_EDITING" +#define HID_PROP_ROW_HEIGHT "EXTENSIONS_HID_PROP_ROW_HEIGHT" +#define HID_PROP_DECORATION "EXTENSIONS_HID_PROP_DECORATION" +#define HID_EVT_ACTIONPERFORMED "EXTENSIONS_HID_EVT_ACTIONPERFORMED" +#define HID_EVT_AFTERUPDATE "EXTENSIONS_HID_EVT_AFTERUPDATE" +#define HID_EVT_BEFOREUPDATE "EXTENSIONS_HID_EVT_BEFOREUPDATE" +#define HID_EVT_CONFIRMDELETE "EXTENSIONS_HID_EVT_CONFIRMDELETE" +#define HID_EVT_ERROROCCURED "EXTENSIONS_HID_EVT_ERROROCCURED" +#define HID_EVT_FOCUSGAINED "EXTENSIONS_HID_EVT_FOCUSGAINED" +#define HID_EVT_FOCUSLOST "EXTENSIONS_HID_EVT_FOCUSLOST" +#define HID_EVT_ITEMSTATECHANGED "EXTENSIONS_HID_EVT_ITEMSTATECHANGED" +#define HID_EVT_KEYTYPED "EXTENSIONS_HID_EVT_KEYTYPED" +#define HID_EVT_LOADED "EXTENSIONS_HID_EVT_LOADED" +#define HID_EVT_MOUSEDRAGGED "EXTENSIONS_HID_EVT_MOUSEDRAGGED" +#define HID_EVT_MOUSEENTERED "EXTENSIONS_HID_EVT_MOUSEENTERED" +#define HID_EVT_MOUSEEXITED "EXTENSIONS_HID_EVT_MOUSEEXITED" +#define HID_EVT_MOUSEMOVED "EXTENSIONS_HID_EVT_MOUSEMOVED" +#define HID_EVT_MOUSEPRESSED "EXTENSIONS_HID_EVT_MOUSEPRESSED" +#define HID_EVT_MOUSERELEASED "EXTENSIONS_HID_EVT_MOUSERELEASED" +#define HID_EVT_POSITIONED "EXTENSIONS_HID_EVT_POSITIONED" +#define HID_EVT_RESETTED "EXTENSIONS_HID_EVT_RESETTED" +#define HID_EVT_SUBMITTED "EXTENSIONS_HID_EVT_SUBMITTED" +#define HID_EVT_TEXTCHANGED "EXTENSIONS_HID_EVT_TEXTCHANGED" +#define HID_EVT_UNLOADED "EXTENSIONS_HID_EVT_UNLOADED" +#define HID_EVT_CHANGED "EXTENSIONS_HID_EVT_CHANGED" +#define HID_EVT_APPROVEACTIONPERFORMED "EXTENSIONS_HID_EVT_APPROVEACTIONPERFORMED" +#define HID_EVT_APPROVERESETTED "EXTENSIONS_HID_EVT_APPROVERESETTED" +#define HID_EVT_KEYUP "EXTENSIONS_HID_EVT_KEYUP" +#define HID_EVT_APPROVEPARAMETER "EXTENSIONS_HID_EVT_APPROVEPARAMETER" +#define HID_EVT_POSITIONING "EXTENSIONS_HID_EVT_POSITIONING" +#define HID_EVT_RELOADED "EXTENSIONS_HID_EVT_RELOADED" +#define HID_EVT_APPROVEROWCHANGE "EXTENSIONS_HID_EVT_APPROVEROWCHANGE" +#define HID_EVT_ROWCHANGE "EXTENSIONS_HID_EVT_ROWCHANGE" +#define HID_EVT_RELOADING "EXTENSIONS_HID_EVT_RELOADING" +#define HID_EVT_UNLOADING "EXTENSIONS_HID_EVT_UNLOADING" +#define HID_EVT_ADJUSTMENTVALUECHANGED "EXTENSIONS_HID_EVT_ADJUSTMENTVALUECHANGED" +#define HID_PROP_TOGGLE "EXTENSIONS_HID_PROP_TOGGLE" +#define HID_PROP_FOCUSONCLICK "EXTENSIONS_HID_PROP_FOCUSONCLICK" +#define HID_PROP_HIDEINACTIVESELECTION "EXTENSIONS_HID_PROP_HIDEINACTIVESELECTION" +#define HID_PROP_VISUALEFFECT "EXTENSIONS_HID_PROP_VISUALEFFECT" +#define HID_PROP_BORDERCOLOR "EXTENSIONS_HID_PROP_BORDERCOLOR" +#define HID_PROP_IMAGEPOSITION "EXTENSIONS_HID_PROP_IMAGEPOSITION" +#define HID_PROP_NOLABEL "EXTENSIONS_HID_PROP_NOLABEL" +#define HID_PROP_WRITING_MODE "EXTENSIONS_HID_PROP_WRITING_MODE" +#define HID_PROP_ANCHOR_TYPE "EXTENSIONS_HID_PROP_ANCHOR_TYPE" +#define HID_FM_PROPDLG_TABCTR "EXTENSIONS_HID_FM_PROPDLG_TABCTR" +#define HID_FM_PROPDLG_TAB_GENERAL "EXTENSIONS_HID_FM_PROPDLG_TAB_GENERAL" +#define HID_FM_PROPDLG_TAB_DATA "EXTENSIONS_HID_FM_PROPDLG_TAB_DATA" +#define HID_FM_PROPDLG_TAB_EVT "EXTENSIONS_HID_FM_PROPDLG_TAB_EVT" #endif // EXTENSIONS_PROPCTRLR_HRC diff --git a/extensions/inc/update.hrc b/extensions/inc/update.hrc index 9dd346315..dc3d1b7f9 100644 --- a/extensions/inc/update.hrc +++ b/extensions/inc/update.hrc @@ -29,21 +29,15 @@ #include "extensio.hrc" -#define HID_CHECK_FOR_UPD_DLG ( HID_UPDATE_START + 0) -#define HID_CHECK_FOR_UPD_CLOSE ( HID_UPDATE_START + 1) -#define HID_CHECK_FOR_UPD_PAUSE ( HID_UPDATE_START + 2) -#define HID_CHECK_FOR_UPD_RESUME ( HID_UPDATE_START + 3) -#define HID_CHECK_FOR_UPD_DOWNLOAD ( HID_UPDATE_START + 4) -#define HID_CHECK_FOR_UPD_DOWNLOAD2 ( HID_UPDATE_START + 5) -#define HID_CHECK_FOR_UPD_INSTALL ( HID_UPDATE_START + 6) -#define HID_CHECK_FOR_UPD_STATUS ( HID_UPDATE_START + 7) -#define HID_CHECK_FOR_UPD_DESCRIPTION ( HID_UPDATE_START + 8) -#define HID_CHECK_FOR_UPD_CANCEL ( HID_UPDATE_START + 9) - // !! if you add new IDs, please also adjust HID_UPDATE_LAST below !! -#define HID_UPDATE_LAST HID_CHECK_FOR_UPD_CANCEL - -#if HID_UPDATE_LAST > HID_UPDATE_END - #error help id range overflow (UPDATE) -#endif +#define HID_CHECK_FOR_UPD_DLG "EXTENSIONS_HID_CHECK_FOR_UPD_DLG" +#define HID_CHECK_FOR_UPD_CLOSE "EXTENSIONS_HID_CHECK_FOR_UPD_CLOSE" +#define HID_CHECK_FOR_UPD_PAUSE "EXTENSIONS_HID_CHECK_FOR_UPD_PAUSE" +#define HID_CHECK_FOR_UPD_RESUME "EXTENSIONS_HID_CHECK_FOR_UPD_RESUME" +#define HID_CHECK_FOR_UPD_DOWNLOAD "EXTENSIONS_HID_CHECK_FOR_UPD_DOWNLOAD" +#define HID_CHECK_FOR_UPD_DOWNLOAD2 "EXTENSIONS_HID_CHECK_FOR_UPD_DOWNLOAD2" +#define HID_CHECK_FOR_UPD_INSTALL "EXTENSIONS_HID_CHECK_FOR_UPD_INSTALL" +#define HID_CHECK_FOR_UPD_STATUS "EXTENSIONS_HID_CHECK_FOR_UPD_STATUS" +#define HID_CHECK_FOR_UPD_DESCRIPTION "EXTENSIONS_HID_CHECK_FOR_UPD_DESCRIPTION" +#define HID_CHECK_FOR_UPD_CANCEL "EXTENSIONS_HID_CHECK_FOR_UPD_CANCEL" #endif // EXTENSIONS_UPDATE_HRC diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx index 135f8f01c..f18639451 100644 --- a/extensions/source/abpilot/abspilot.cxx +++ b/extensions/source/abpilot/abspilot.cxx @@ -106,16 +106,11 @@ namespace abp WZS_INVALID_STATE ); - // 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_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); m_pCancel->SetClickHdl( LINK( this, OAddessBookSourcePilot, OnCancelClicked) ); diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 52575a6f3..126134628 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -1437,8 +1437,8 @@ Reference< awt::XControlModel > BibDataManager::createGridModel(const ::rtl::OUS if (xPropInfo->hasPropertyByName(uProp)) { ::rtl::OUString sId = ::rtl::OUString::createFromAscii( "HID:" ); - sId += ::rtl::OUString::valueOf( (sal_Int32) HID_BIB_DB_GRIDCTRL ); - xPropSet->setPropertyValue( uProp, makeAny( ::rtl::OUString( sId ) ) ); + sId += ::rtl::OUString::createFromAscii( HID_BIB_DB_GRIDCTRL ); + xPropSet->setPropertyValue( uProp, makeAny( sId ) ); } } catch(Exception& e ) diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx index d95c74224..06fdc21ea 100644 --- a/extensions/source/bibliography/framectr.cxx +++ b/extensions/source/bibliography/framectr.cxx @@ -198,8 +198,7 @@ BibFrameController_Impl::BibFrameController_Impl( const uno::Reference< awt::XWi ,pBibMod(NULL) { Window* pParent = VCLUnoHelper::GetWindow( xWindow ); - // FIXME: HELPID - pParent->SetUniqueId(""/*UID_BIB_FRAME_WINDOW*/); + 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 773e83e0a..cb42a8969 100644 --- a/extensions/source/bibliography/general.cxx +++ b/extensions/source/bibliography/general.cxx @@ -245,8 +245,7 @@ BibGeneralPage::BibGeneralPage(Window* pParent, BibDataManager* pMan): pDatMan(pMan) { aControlParentWin.Show(); - // FIXME: HELPID - aControlParentWin.SetHelpId(""/*HID_BIB_CONTROL_PARENT*/); + aControlParentWin.SetHelpId(HID_BIB_CONTROL_PARENT); aStdSize = GetOutputSizePixel(); aBibTypeArr[0] = String(BibResId(ST_TYPE_ARTICLE)); @@ -464,12 +463,12 @@ void BibGeneralPage::CommitActiveControl() } //----------------------------------------------------------------------------- void BibGeneralPage::AddControlWithError( const OUString& rColumnName, const ::Point& rPos, const ::Size& rSize, - String& rErrorString, String aColumnUIName, sal_uInt16 nHelpId, sal_uInt16 nIndexInFTArray ) + String& rErrorString, String aColumnUIName, const rtl::OString& sHelpId, sal_uInt16 nIndexInFTArray ) { // adds also the XControl and creates a map entry in nFT2CtrlMap[] for mapping between control and FT INT16 nIndex = -1; - uno::Reference< awt::XControlModel > xTmp = AddXControl(rColumnName, rPos, rSize, nHelpId, nIndex ); + uno::Reference< awt::XControlModel > xTmp = AddXControl(rColumnName, rPos, rSize, sHelpId, nIndex ); if( xTmp.is() ) { DBG_ASSERT( nIndexInFTArray < FIELD_COUNT, "*BibGeneralPage::AddControlWithError(): wrong array index!" ); @@ -488,7 +487,7 @@ void BibGeneralPage::AddControlWithError( const OUString& rColumnName, const ::P //----------------------------------------------------------------------------- uno::Reference< awt::XControlModel > BibGeneralPage::AddXControl( const String& rName, - ::Point rPos, ::Size rSize, sal_uInt16 nHelpId, INT16& rIndex ) + ::Point rPos, ::Size rSize, const rtl::OString& sHelpId, INT16& rIndex ) { uno::Reference< awt::XControlModel > xCtrModel; try @@ -510,11 +509,9 @@ uno::Reference< awt::XControlModel > BibGeneralPage::AddXControl( rtl::OUString uProp(C2U("HelpURL")); if(xPropInfo->hasPropertyByName(uProp)) { - String sId(C2S("HID:")); - sId += String::CreateFromInt32(nHelpId); - rtl::OUString uId(sId) ; - uno::Any aVal; aVal <<= uId; - xPropSet->setPropertyValue(uProp, aVal); + ::rtl::OUString sId = ::rtl::OUString::createFromAscii( "HID:" ); + sId += ::rtl::OUString( sHelpId, sHelpId.getLength(), RTL_TEXTENCODING_UTF8 ); + xPropSet->setPropertyValue( uProp, makeAny( sId ) ); } if(bTypeListBox) diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx index 6e4896888..a924c047b 100644 --- a/extensions/source/bibliography/general.hxx +++ b/extensions/source/bibliography/general.hxx @@ -140,12 +140,12 @@ class BibGeneralPage: public BibGeneralPageBaseClass, public BibTabPage BibDataManager* pDatMan; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > - AddXControl( const String& rName, Point aPos, Size aSize, sal_uInt16 nHelpId, + AddXControl( const String& rName, Point aPos, Size aSize, const rtl::OString& sHelpId, sal_Int16& rIndex ); void AddControlWithError( const rtl::OUString& rColumnName, const Point& rPos, const Size& rSize, String& rErrorString, String aColumnUIName, - sal_uInt16 nHelpId, sal_uInt16 nIndexInFTArray ); + const rtl::OString& sHelpId, sal_uInt16 nIndexInFTArray ); void AdjustScrollbars(); diff --git a/extensions/source/bibliography/toolbar.src b/extensions/source/bibliography/toolbar.src index 9016a4570..35217d6b6 100644 --- a/extensions/source/bibliography/toolbar.src +++ b/extensions/source/bibliography/toolbar.src @@ -27,6 +27,7 @@ #include #include "bibliography.hrc" #include "toolbar.hrc" +#include "svx/svxcommands.h" #define MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; }; @@ -46,7 +47,6 @@ ToolBox RID_BIB_TOOLBAR ToolBoxItem { Identifier = TBC_FT_SOURCE; - //HelpID = SID_SBA_BRW_INSERT ; Text [ en-US ] = "Table"; }; ToolBoxItem @@ -63,7 +63,6 @@ ToolBox RID_BIB_TOOLBAR ToolBoxItem { Identifier = TBC_FT_QUERY; - //HelpID = SID_SBA_BRW_INSERT ; Text [ en-US ] = "Search Key"; }; ToolBoxItem @@ -90,7 +89,6 @@ ToolBox RID_BIB_TOOLBAR ToolBoxItem { Identifier = TBC_BT_FILTERCRIT ; - HelpID = SID_FM_FILTERCRIT ; // ItemBitmap = Bitmap { File = "sc10715.bmp" ; }; // Text [ de ] = "Standard Filter" ; Command = ".uno:Bib/standardFilter" ; @@ -100,7 +98,6 @@ ToolBox RID_BIB_TOOLBAR ToolBoxItem { Identifier = TBC_BT_REMOVEFILTER ; - HelpID = SID_FM_REMOVE_FILTER_SORT ; // ItemBitmap = Bitmap { File = "sc10711.bmp" ; }; Command = ".uno:Bib/removeFilter" ; Text [ en-US ] = "Remove Filter"; @@ -122,78 +119,6 @@ ToolBox RID_BIB_TOOLBAR Checkable=TRUE; Text [ en-US ] = "Data Source"; }; -/* - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - - ToolBoxItem - { - Identifier = TBC_BT_NEWCARD ; - //HelpID = SID_FM_REMOVE_FILTER_SORT ; - Command = ".uno:Bib/newEntry" ; - ItemBitmap = Bitmap { File = "newcard.bmp" ; }; - Text [ en-US ] = "New Address"; - }; - - ToolBoxItem - { - Identifier = TBC_BT_EDITCARD ; - //HelpID = SID_FM_REMOVE_FILTER_SORT ; - Command = ".uno:Bib/changeEntry" ; - ItemBitmap = Bitmap { File = "modcard.bmp" ; }; - Text [ en-US ] = "Edit Address"; - }; - - ToolBoxItem - { - Identifier = TBC_BT_REMOVECARD ; - //HelpID = SID_FM_REMOVE_FILTER_SORT ; - Command = ".uno:Bib/removeEntry" ; - ItemBitmap = Bitmap { File = "remcard.bmp" ; }; - Text [ en-US ] = "Remove Address"; - }; - - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - - ToolBoxItem - { - Identifier = TBC_BT_INSERT ; - HelpID = SID_SBA_BRW_INSERT ; - ItemBitmap = Bitmap { File = "sc12202.bmp" ; }; - Text [ en-US ] = "Data into Text"; - }; - ToolBoxItem - { - Identifier = TBC_BT_UPDATE ; - HelpID = SID_SBA_BRW_UPDATE ; - ItemBitmap = Bitmap { File = "sc12201.bmp" ; }; - Text = "Daten in Felder" ; - }; - - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - - ToolBoxItem - { - Identifier = TBC_BT_MAIL ; - //HelpID = HID_ADDRPI_AUTOMAIL ; - ItemBitmap = Bitmap { File = "sc06305.bmp" ; }; - Text [ en-US ] = "AutoMail"; - }; - ToolBoxItem - { - Identifier = TBC_BT_URL ; - //HelpID = HID_ADDRPI_AUTOBROWSE ; - ItemBitmap = Bitmap { File = "sc06304.bmp" ; }; - Text [ en-US ] = "AutoBrowse"; - };*/ }; Scroll = TRUE ; }; diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx index 1c16d15c4..90afc61d9 100644 --- a/extensions/source/dbpilots/gridwizard.cxx +++ b/extensions/source/dbpilots/gridwizard.cxx @@ -65,14 +65,10 @@ namespace dbp { initControlSettings(&m_aSettings); - // 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*/); + m_pPrevPage->SetHelpId(HID_GRIDWIZARD_PREVIOUS); + m_pNextPage->SetHelpId(HID_GRIDWIZARD_NEXT); + m_pCancel->SetHelpId(HID_GRIDWIZARD_CANCEL); + 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 46da996dc..2656ef71d 100644 --- a/extensions/source/dbpilots/groupboxwiz.cxx +++ b/extensions/source/dbpilots/groupboxwiz.cxx @@ -66,14 +66,10 @@ namespace dbp { initControlSettings(&m_aSettings); - // 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*/); + m_pPrevPage->SetHelpId(HID_GROUPWIZARD_PREVIOUS); + m_pNextPage->SetHelpId(HID_GROUPWIZARD_NEXT); + m_pCancel->SetHelpId(HID_GROUPWIZARD_CANCEL); + m_pFinish->SetHelpId(HID_GROUPWIZARD_FINISH); } //--------------------------------------------------------------------- diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx index 0e9a0e194..2c71eca4a 100644 --- a/extensions/source/dbpilots/listcombowizard.cxx +++ b/extensions/source/dbpilots/listcombowizard.cxx @@ -67,14 +67,10 @@ namespace dbp { initControlSettings(&m_aSettings); - // 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*/); + m_pPrevPage->SetHelpId(HID_LISTWIZARD_PREVIOUS); + m_pNextPage->SetHelpId(HID_LISTWIZARD_NEXT); + m_pCancel->SetHelpId(HID_LISTWIZARD_CANCEL); + 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 c4ebf2fa5..8cff913bd 100644 --- a/extensions/source/propctrlr/browserline.cxx +++ b/extensions/source/propctrlr/browserline.cxx @@ -105,27 +105,20 @@ namespace pcr } //------------------------------------------------------------------ - void OBrowserLine::SetComponentHelpIds( const rtl::OString& _rHelpId, sal_uInt32 _bPrimaryButtonId, sal_uInt32 _nSecondaryButtonId ) + void OBrowserLine::SetComponentHelpIds( const rtl::OString& _rHelpId, const rtl::OString& _sPrimaryButtonId, const rtl::OString& _sSecondaryButtonId ) { if ( m_pControlWindow ) - // FIXME: HELPID m_pControlWindow->SetHelpId( _rHelpId ); if ( m_pBrowseButton ) { - // FIXME: HELPID m_pBrowseButton->SetHelpId( _rHelpId ); - // FIXME: HELPID - m_pBrowseButton->SetUniqueId( ""/*_bPrimaryButtonId*/ ); - (void)_bPrimaryButtonId; + m_pBrowseButton->SetUniqueId( _sPrimaryButtonId ); if ( m_pAdditionalBrowseButton ) { - // FIXME: HELPID m_pAdditionalBrowseButton->SetHelpId( _rHelpId ); - // FIXME: HELPID - m_pAdditionalBrowseButton->SetUniqueId( ""/*_nSecondaryButtonId*/ ); - (void)_nSecondaryButtonId; + m_pAdditionalBrowseButton->SetUniqueId( _sSecondaryButtonId ); } } } diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx index 8883f6a8b..8439c0a8d 100644 --- a/extensions/source/propctrlr/browserline.hxx +++ b/extensions/source/propctrlr/browserline.hxx @@ -92,8 +92,7 @@ namespace pcr const ::rtl::OUString& GetEntryName() const { return m_sEntryName; } - // FIXME: HELPID - void SetComponentHelpIds( const rtl::OString& _rHelpId, sal_uInt32 _bPrimaryButtonId, sal_uInt32 _nSecondaryButtonId ); + void SetComponentHelpIds( const rtl::OString& _rHelpId, const rtl::OString& _sPrimaryButtonId, const rtl::OString& _sSecondaryButtonId ); void SetTitle(const String& rString ); void FullFillTitleString(); diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index 153c8b633..66b7f58db 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -1215,8 +1215,8 @@ namespace pcr m_aOutOfDateLines.insert( nPos ); rLine.pLine->SetComponentHelpIds( HelpIdUrl::getHelpId( _rPropertyData.HelpURL ), - _rPropertyData.PrimaryButtonId, - _rPropertyData.SecondaryButtonId + rtl::OUStringToOString( _rPropertyData.PrimaryButtonId, RTL_TEXTENCODING_UTF8 ), + rtl::OUStringToOString( _rPropertyData.SecondaryButtonId, RTL_TEXTENCODING_UTF8 ) ); if ( _rPropertyData.bReadOnly ) diff --git a/extensions/source/propctrlr/browserview.cxx b/extensions/source/propctrlr/browserview.cxx index dd39f1bae..0bf7be375 100644 --- a/extensions/source/propctrlr/browserview.cxx +++ b/extensions/source/propctrlr/browserview.cxx @@ -56,8 +56,7 @@ namespace pcr DBG_CTOR(OPropertyBrowserView,NULL); m_pPropBox = new OPropertyEditor( this ); - // FIXME: HELPID - m_pPropBox->SetHelpId(""/*HID_FM_PROPDLG_TABCTR*/); + m_pPropBox->SetHelpId(HID_FM_PROPDLG_TABCTR); m_pPropBox->setPageActivationHandler(LINK(this, OPropertyBrowserView, OnPageActivation)); m_pPropBox->Show(); diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx index 2fab07761..1971138df 100644 --- a/extensions/source/propctrlr/defaultforminspection.cxx +++ b/extensions/source/propctrlr/defaultforminspection.cxx @@ -187,7 +187,7 @@ namespace pcr { const sal_Char* programmaticName; USHORT uiNameResId; - sal_uInt32 helpId; + const sal_Char* helpId; } aCategories[] = { { "General", RID_STR_PROPPAGE_DEFAULT, HID_FM_PROPDLG_TAB_GENERAL }, { "Data", RID_STR_PROPPAGE_DATA, HID_FM_PROPDLG_TAB_DATA }, diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx index 588480a7b..f88aa3928 100644 --- a/extensions/source/propctrlr/eformspropertyhandler.cxx +++ b/extensions/source/propctrlr/eformspropertyhandler.cxx @@ -454,12 +454,12 @@ namespace pcr } break; - case PROPERTY_ID_BIND_EXPRESSION: aDescriptor.PrimaryButtonId = UID_PROP_DLG_BIND_EXPRESSION; break; - case PROPERTY_ID_XSD_REQUIRED: aDescriptor.PrimaryButtonId = UID_PROP_DLG_XSD_REQUIRED; break; - case PROPERTY_ID_XSD_RELEVANT: aDescriptor.PrimaryButtonId = UID_PROP_DLG_XSD_RELEVANT; break; - case PROPERTY_ID_XSD_READONLY: aDescriptor.PrimaryButtonId = UID_PROP_DLG_XSD_READONLY; break; - case PROPERTY_ID_XSD_CONSTRAINT: aDescriptor.PrimaryButtonId = UID_PROP_DLG_XSD_CONSTRAINT; break; - case PROPERTY_ID_XSD_CALCULATION: aDescriptor.PrimaryButtonId = UID_PROP_DLG_XSD_CALCULATION; break; + case PROPERTY_ID_BIND_EXPRESSION: aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_BIND_EXPRESSION); break; + case PROPERTY_ID_XSD_REQUIRED: aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_XSD_REQUIRED); break; + case PROPERTY_ID_XSD_RELEVANT: aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_XSD_RELEVANT); break; + case PROPERTY_ID_XSD_READONLY: aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_XSD_READONLY); break; + case PROPERTY_ID_XSD_CONSTRAINT: aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_XSD_CONSTRAINT); break; + case PROPERTY_ID_XSD_CALCULATION: aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_XSD_CALCULATION); break; default: DBG_ERROR( "EFormsPropertyHandler::describePropertyLine: cannot handle this property!" ); diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx index 5f2d7fd2d..6a1bf500c 100644 --- a/extensions/source/propctrlr/eventhandler.cxx +++ b/extensions/source/propctrlr/eventhandler.cxx @@ -151,11 +151,11 @@ namespace pcr //= EventDescription //==================================================================== EventDescription::EventDescription( EventId _nId, const sal_Char* _pListenerNamespaceAscii, const sal_Char* _pListenerClassAsciiName, - const sal_Char* _pListenerMethodAsciiName, sal_uInt16 _nDisplayNameResId, sal_Int32 _nHelpId, sal_Int32 _nUniqueBrowseId ) + const sal_Char* _pListenerMethodAsciiName, sal_uInt16 _nDisplayNameResId, const rtl::OString& _sHelpId, const rtl::OString& _sUniqueBrowseId ) :sDisplayName( String( PcrRes( _nDisplayNameResId ) ) ) ,sListenerMethodName( ::rtl::OUString::createFromAscii( _pListenerMethodAsciiName ) ) - ,nHelpId( _nHelpId ) - ,nUniqueBrowseId( _nUniqueBrowseId ) + ,sHelpId( _sHelpId ) + ,sUniqueBrowseId( _sUniqueBrowseId ) ,nId( _nId ) { ::rtl::OUStringBuffer aQualifiedListenerClass; @@ -879,8 +879,8 @@ namespace pcr const EventDescription& rEvent = impl_getEventForName_throw( _rPropertyName ); aDescriptor.DisplayName = rEvent.sDisplayName; - aDescriptor.HelpURL = HelpIdUrl::getHelpURL( rEvent.nHelpId ); - aDescriptor.PrimaryButtonId = rEvent.nUniqueBrowseId; + aDescriptor.HelpURL = HelpIdUrl::getHelpURL( rEvent.sHelpId ); + aDescriptor.PrimaryButtonId = rtl::OStringToOUString(rEvent.sUniqueBrowseId, RTL_TEXTENCODING_UTF8); aDescriptor.HasPrimaryButton = sal_True; aDescriptor.Category = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Events" ) ); return aDescriptor; @@ -1265,12 +1265,12 @@ namespace pcr switch ( m_nGridColumnType ) { case FormComponentType::COMBOBOX: - if ( UID_BRWEVT_ACTIONPERFORMED == _rEvent.nUniqueBrowseId ) + if ( UID_BRWEVT_ACTIONPERFORMED == _rEvent.sUniqueBrowseId ) return false; break; case FormComponentType::LISTBOX: - if ( ( UID_BRWEVT_CHANGED == _rEvent.nUniqueBrowseId ) - || ( UID_BRWEVT_ACTIONPERFORMED == _rEvent.nUniqueBrowseId ) + if ( ( UID_BRWEVT_CHANGED == _rEvent.sUniqueBrowseId ) + || ( UID_BRWEVT_ACTIONPERFORMED == _rEvent.sUniqueBrowseId ) ) return false; break; diff --git a/extensions/source/propctrlr/eventhandler.hxx b/extensions/source/propctrlr/eventhandler.hxx index 437ee464b..f1561d242 100644 --- a/extensions/source/propctrlr/eventhandler.hxx +++ b/extensions/source/propctrlr/eventhandler.hxx @@ -57,14 +57,12 @@ namespace pcr ::rtl::OUString sDisplayName; ::rtl::OUString sListenerClassName; ::rtl::OUString sListenerMethodName; - sal_Int32 nHelpId; - sal_Int32 nUniqueBrowseId; + ::rtl::OString sHelpId; + ::rtl::OString sUniqueBrowseId; EventId nId; - EventDescription() - :nHelpId( 0 ) - ,nUniqueBrowseId( 0 ) - ,nId( 0 ) + EventDescription() + :nId( 0 ) { } @@ -74,8 +72,8 @@ namespace pcr const sal_Char* _pListenerClassAsciiName, const sal_Char* _pListenerMethodAsciiName, sal_uInt16 _nDisplayNameResId, - sal_Int32 _nHelpId, - sal_Int32 _nUniqueBrowseId ); + const rtl::OString& _sHelpId, + const rtl::OString& _sUniqueBrowseId ); }; typedef ::std::hash_map< ::rtl::OUString, EventDescription, ::rtl::OUStringHash > EventMap; diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 97d72dad1..4d6812496 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -1023,39 +1023,39 @@ namespace pcr { case PROPERTY_ID_DEFAULT_SELECT_SEQ: case PROPERTY_ID_SELECTEDITEMS: - aDescriptor.PrimaryButtonId = UID_PROP_DLG_SELECTION; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_SELECTION); break; case PROPERTY_ID_FILTER: - aDescriptor.PrimaryButtonId = UID_PROP_DLG_FILTER; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_FILTER); break; case PROPERTY_ID_SORT: - aDescriptor.PrimaryButtonId = UID_PROP_DLG_ORDER; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_ORDER); break; case PROPERTY_ID_MASTERFIELDS: case PROPERTY_ID_DETAILFIELDS: nControlType = PropertyControlType::StringListField; - aDescriptor.PrimaryButtonId = UID_PROP_DLG_FORMLINKFIELDS; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_FORMLINKFIELDS); break; case PROPERTY_ID_COMMAND: - aDescriptor.PrimaryButtonId = UID_PROP_DLG_SQLCOMMAND; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_SQLCOMMAND); break; case PROPERTY_ID_TABINDEX: { Reference< XControlContainer > xControlContext( impl_getContextControlContainer_nothrow() ); if ( xControlContext.is() ) - aDescriptor.PrimaryButtonId = UID_PROP_DLG_TABINDEX; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_TABINDEX); nControlType = PropertyControlType::NumericField; }; break; case PROPERTY_ID_FONT: bReadOnly = sal_True; - aDescriptor.PrimaryButtonId = UID_PROP_DLG_FONT_TYPE; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_FONT_TYPE); break; case PROPERTY_ID_TARGET_URL: @@ -1063,8 +1063,8 @@ namespace pcr { aDescriptor.Control = new OFileUrlControl( impl_getDefaultDialogParent_nothrow(), WB_TABSTOP | WB_BORDER ); - aDescriptor.PrimaryButtonId = ( PROPERTY_ID_TARGET_URL == nPropId ) - ? UID_PROP_DLG_ATTR_TARGET_URL : UID_PROP_DLG_IMAGE_URL; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(( PROPERTY_ID_TARGET_URL == nPropId ) + ? UID_PROP_DLG_ATTR_TARGET_URL : UID_PROP_DLG_IMAGE_URL); } break; @@ -1081,13 +1081,13 @@ namespace pcr switch( nPropId ) { case PROPERTY_ID_BACKGROUNDCOLOR: - aDescriptor.PrimaryButtonId = UID_PROP_DLG_BACKGROUNDCOLOR; break; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_BACKGROUNDCOLOR); break; case PROPERTY_ID_FILLCOLOR: - aDescriptor.PrimaryButtonId = UID_PROP_DLG_FILLCOLOR; break; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_FILLCOLOR); break; case PROPERTY_ID_SYMBOLCOLOR: - aDescriptor.PrimaryButtonId = UID_PROP_DLG_SYMBOLCOLOR; break; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_SYMBOLCOLOR); break; case PROPERTY_ID_BORDERCOLOR: - aDescriptor.PrimaryButtonId = UID_PROP_DLG_BORDERCOLOR; break; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_BORDERCOLOR); break; } break; @@ -1111,7 +1111,7 @@ namespace pcr case PROPERTY_ID_CONTROLLABEL: bReadOnly = sal_True; - aDescriptor.PrimaryButtonId = UID_PROP_DLG_CONTROLLABEL; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_CONTROLLABEL); break; case PROPERTY_ID_FORMATKEY: @@ -1141,7 +1141,7 @@ namespace pcr aDescriptor.Control = pControl; pControl->SetFormatSupplier( pSupplier ); - aDescriptor.PrimaryButtonId = UID_PROP_DLG_NUMBER_FORMAT; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_NUMBER_FORMAT); } else { @@ -1366,7 +1366,7 @@ namespace pcr // DataSource case PROPERTY_ID_DATASOURCE: { - aDescriptor.PrimaryButtonId = UID_PROP_DLG_ATTR_DATASOURCE; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_ATTR_DATASOURCE); ::std::vector< ::rtl::OUString > aListEntries; @@ -1416,7 +1416,7 @@ namespace pcr } } - if ( aDescriptor.PrimaryButtonId ) + if ( aDescriptor.PrimaryButtonId.getLength() ) aDescriptor.HasPrimaryButton = sal_True; if ( aDescriptor.SecondaryButtonId ) aDescriptor.HasSecondaryButton = sal_True; @@ -2471,7 +2471,7 @@ namespace pcr _out_rProperty.DisplayName = m_pInfoService->getPropertyTranslation( PROPERTY_ID_COMMAND ); _out_rProperty.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( PROPERTY_ID_COMMAND ) ); - _out_rProperty.PrimaryButtonId = UID_PROP_DLG_SQLCOMMAND; + _out_rProperty.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_SQLCOMMAND); //////////////////////////////////////////////////////////// sal_Int32 nCommandType = CommandType::COMMAND; diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx index f6ab37e3f..31a1cda41 100644 --- a/extensions/source/propctrlr/formmetadata.cxx +++ b/extensions/source/propctrlr/formmetadata.cxx @@ -57,7 +57,7 @@ namespace pcr { String sName; String sTranslation; - sal_uInt32 nHelpId; + rtl::OString sHelpId; sal_Int32 nId; sal_uInt16 nPos; sal_uInt32 nUIFlags; @@ -67,16 +67,16 @@ namespace pcr sal_Int32 _nId, const String& aTranslation, sal_uInt16 nPosId, - sal_uInt32 nHelpId, + const rtl::OString&, sal_uInt32 _nUIFlags); }; //------------------------------------------------------------------------ OPropertyInfoImpl::OPropertyInfoImpl(const ::rtl::OUString& _rName, sal_Int32 _nId, - const String& aString, sal_uInt16 nP, sal_uInt32 nHid, sal_uInt32 _nUIFlags) + const String& aString, sal_uInt16 nP, const rtl::OString& sHid, sal_uInt32 _nUIFlags) :sName(_rName) ,sTranslation(aString) - ,nHelpId(nHid) + ,sHelpId(sHid) ,nId(_nId) ,nPos(nP) ,nUIFlags(_nUIFlags) @@ -399,10 +399,10 @@ namespace pcr } //------------------------------------------------------------------------ - sal_Int32 OPropertyInfoService::getPropertyHelpId(sal_Int32 _nId) const + rtl::OString OPropertyInfoService::getPropertyHelpId(sal_Int32 _nId) const { const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId); - return (pInfo) ? pInfo->nHelpId : 0; + return (pInfo) ? pInfo->sHelpId : rtl::OString(); } //------------------------------------------------------------------------ @@ -560,7 +560,7 @@ namespace pcr // intialisierung if(!s_pPropertyInfos) getPropertyInfo(); - OPropertyInfoImpl aSearch(_rName, 0L, String(), 0, 0, 0); + OPropertyInfoImpl aSearch(_rName, 0L, String(), 0, "", 0); const OPropertyInfoImpl* pInfo = ::std::lower_bound( s_pPropertyInfos, s_pPropertyInfos + s_nCount, aSearch, PropertyInfoLessByName() ); diff --git a/extensions/source/propctrlr/formmetadata.hxx b/extensions/source/propctrlr/formmetadata.hxx index e5413f297..a7ff622d1 100644 --- a/extensions/source/propctrlr/formmetadata.hxx +++ b/extensions/source/propctrlr/formmetadata.hxx @@ -59,7 +59,7 @@ namespace pcr // IPropertyInfoService virtual sal_Int32 getPropertyId(const String& _rName) const; virtual String getPropertyTranslation(sal_Int32 _nId) const; - virtual sal_Int32 getPropertyHelpId(sal_Int32 _nId) const; + virtual rtl::OString getPropertyHelpId(sal_Int32 _nId) const; virtual sal_Int16 getPropertyPos(sal_Int32 _nId) const; virtual sal_uInt32 getPropertyUIFlags(sal_Int32 _nId) const; virtual ::std::vector< ::rtl::OUString > getPropertyEnumRepresentations(sal_Int32 _nId) const; diff --git a/extensions/source/propctrlr/pcrcommon.cxx b/extensions/source/propctrlr/pcrcommon.cxx index e6c90c083..349146f98 100644 --- a/extensions/source/propctrlr/pcrcommon.cxx +++ b/extensions/source/propctrlr/pcrcommon.cxx @@ -53,23 +53,19 @@ namespace pcr //------------------------------------------------------------------------ rtl::OString HelpIdUrl::getHelpId( const ::rtl::OUString& _rHelpURL ) { - // FIXME: HELPID - #if 0 - SmartId aSmartHelpId( _rHelpURL ); + rtl::OString aHelpId( _rHelpURL, _rHelpURL.getLength(), RTL_TEXTENCODING_UTF8 ); 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 + aHelpId = aHelpId.copy( sizeof( "HID:" ) - 1 ); + return aHelpId; } //------------------------------------------------------------------------ - ::rtl::OUString HelpIdUrl::getHelpURL( sal_uInt32 _nHelpId ) + ::rtl::OUString HelpIdUrl::getHelpURL( const rtl::OString& sHelpId ) { ::rtl::OUStringBuffer aBuffer; + ::rtl::OUString aTmp( sHelpId, sHelpId.getLength(), RTL_TEXTENCODING_UTF8 ); aBuffer.appendAscii( "HID:" ); - aBuffer.append( (sal_Int32)_nHelpId ); + aBuffer.append( aTmp.getStr() ); return aBuffer.makeStringAndClear(); } //............................................................................ diff --git a/extensions/source/propctrlr/pcrcommon.hxx b/extensions/source/propctrlr/pcrcommon.hxx index 1b34cc5eb..790bf0e02 100644 --- a/extensions/source/propctrlr/pcrcommon.hxx +++ b/extensions/source/propctrlr/pcrcommon.hxx @@ -77,9 +77,8 @@ namespace pcr class HelpIdUrl { public: - // FIXME: HELPID static rtl::OString getHelpId( const ::rtl::OUString& _rHelpURL ); - static ::rtl::OUString getHelpURL( sal_uInt32 _nHelpId ); + static ::rtl::OUString getHelpURL( const rtl::OString& ); }; //==================================================================== diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index a270b3a76..4b12280f1 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -1273,7 +1273,6 @@ 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 ] = - // 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 6e9a731bc..6b815fbaa 100644 --- a/extensions/source/propctrlr/propertyeditor.cxx +++ b/extensions/source/propctrlr/propertyeditor.cxx @@ -236,7 +236,6 @@ namespace pcr pPage->getListBox().SetObserver(m_pObserver); pPage->getListBox().EnableHelpSection( m_bHasHelpSection ); pPage->getListBox().SetHelpLineLimites( m_nMinHelpLines, m_nMaxHelpLines ); - // FIXME: HELPID pPage->SetHelpId( _rHelpId ); // immediately activate the page @@ -246,20 +245,12 @@ namespace pcr return nId; } -// FIXME: HELPID -#if 0 //------------------------------------------------------------------ - void OPropertyEditor::SetHelpId( sal_uInt32 nHelpId ) + void OPropertyEditor::SetHelpId( const rtl::OString& rHelpId ) { Control::SetHelpId(""); - // FIXME: HELPID - #if 0 - m_aTabControl.SetHelpId(nHelpId); - #else - (void)nHelpId; - #endif - } -#endif + m_aTabControl.SetHelpId(rHelpId); + } //------------------------------------------------------------------ void OPropertyEditor::RemovePage(sal_uInt16 nID) diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx index 1533ae1da..a9a999be0 100644 --- a/extensions/source/propctrlr/propertyeditor.hxx +++ b/extensions/source/propctrlr/propertyeditor.hxx @@ -97,7 +97,7 @@ namespace pcr void SetHelpText( const ::rtl::OUString& _rHelpText ); void SetHelpLineLimites( sal_Int32 _nMinLines, sal_Int32 _nMaxLines ); - // FIXME: HELPID + void SetHelpId( const rtl::OString& sHelpId ); sal_uInt16 AppendPage( const String& r, const rtl::OString& _rHelpId ); void SetPage( sal_uInt16 ); void RemovePage(sal_uInt16 nID); diff --git a/extensions/source/propctrlr/propertyinfo.hxx b/extensions/source/propctrlr/propertyinfo.hxx index 7a2737a35..c2a6f8bbc 100644 --- a/extensions/source/propctrlr/propertyinfo.hxx +++ b/extensions/source/propctrlr/propertyinfo.hxx @@ -31,6 +31,7 @@ #include #include #include +#include #include //............................................................................ @@ -46,7 +47,7 @@ namespace pcr public: virtual sal_Int32 getPropertyId(const String& _rName) const = 0; virtual String getPropertyTranslation(sal_Int32 _nId) const = 0; - virtual sal_Int32 getPropertyHelpId(sal_Int32 _nId) const = 0; + virtual rtl::OString getPropertyHelpId(sal_Int32 _nId) const = 0; virtual sal_Int16 getPropertyPos(sal_Int32 _nId) const = 0; virtual sal_uInt32 getPropertyUIFlags(sal_Int32 _nId) const = 0; virtual ::std::vector< ::rtl::OUString > getPropertyEnumRepresentations(sal_Int32 _nId) const = 0; diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx index b81061222..32d410816 100644 --- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx +++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx @@ -331,8 +331,8 @@ namespace pcr implGetAvailableDataTypeNames( aListEntries ); - aDescriptor.PrimaryButtonId = UID_PROP_ADD_DATA_TYPE; - aDescriptor.SecondaryButtonId = UID_PROP_REMOVE_DATA_TYPE; + aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_ADD_DATA_TYPE); + aDescriptor.SecondaryButtonId = rtl::OUString::createFromAscii(UID_PROP_REMOVE_DATA_TYPE);; aDescriptor.HasPrimaryButton = aDescriptor.HasSecondaryButton = sal_True; aDescriptor.PrimaryButtonImageURL = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/extensions/res/buttonplus.png" ) ); aDescriptor.SecondaryButtonImageURL = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/extensions/res/buttonminus.png" ) ); diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx index f3106fce2..c2d16ffea 100644 --- a/extensions/source/update/check/updatehdl.cxx +++ b/extensions/source/update/check/updatehdl.cxx @@ -156,7 +156,7 @@ void UpdateHandler::setDownloadBtnLabel( bool bAppendDots ) aLabel += UNISTRING( "..." ); setControlProperty( msButtonIDs[DOWNLOAD_BUTTON], UNISTRING("Label"), uno::Any( aLabel ) ); - setControlProperty( msButtonIDs[DOWNLOAD_BUTTON], UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::valueOf( (sal_Int32) HID_CHECK_FOR_UPD_DOWNLOAD2 ) ) ); + setControlProperty( msButtonIDs[DOWNLOAD_BUTTON], UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_DOWNLOAD2 ) ) ); mbDownloadBtnHasDots = bAppendDots; } @@ -1071,7 +1071,7 @@ void UpdateHandler::createDialog() xPropSet->setPropertyValue( UNISTRING("PositionY"), uno::Any(sal_Int32( 100 )) ); xPropSet->setPropertyValue( UNISTRING("Width"), uno::Any(sal_Int32( DIALOG_WIDTH )) ); xPropSet->setPropertyValue( UNISTRING("Height"), uno::Any(sal_Int32( DIALOG_HEIGHT )) ); - xPropSet->setPropertyValue( UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::valueOf( (sal_Int32) HID_CHECK_FOR_UPD_DLG ) ) ); + xPropSet->setPropertyValue( UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_DLG ) ) ); } { // Label (fixed text) uno::Sequence< beans::NamedValue > aProps(1); @@ -1098,7 +1098,7 @@ void UpdateHandler::createDialog() setProperty( aProps, 3, UNISTRING("MultiLine"), uno::Any( true ) ); setProperty( aProps, 4, UNISTRING("ReadOnly"), uno::Any( true ) ); setProperty( aProps, 5, UNISTRING("AutoVScroll"), uno::Any( true ) ); - setProperty( aProps, 6, UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::valueOf( (sal_Int32) HID_CHECK_FOR_UPD_STATUS ) ) ); + setProperty( aProps, 6, UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_STATUS ) ) ); insertControlModel( xControlModel, EDIT_FIELD_MODEL, TEXT_STATUS, awt::Rectangle( DIALOG_BORDER + TEXT_OFFSET, @@ -1129,7 +1129,7 @@ void UpdateHandler::createDialog() setProperty( aProps, 1, UNISTRING("Enabled"), uno::Any( true ) ); setProperty( aProps, 2, UNISTRING("PushButtonType"), uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) ); setProperty( aProps, 3, UNISTRING("Label"), uno::Any( msPauseBtn ) ); - setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::valueOf( (sal_Int32) HID_CHECK_FOR_UPD_PAUSE ) ) ); + setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_PAUSE ) ) ); insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[PAUSE_BUTTON], awt::Rectangle( BOX1_BTN_X, BOX1_BTN_Y, BUTTON_WIDTH, BUTTON_HEIGHT ), @@ -1142,7 +1142,7 @@ void UpdateHandler::createDialog() setProperty( aProps, 1, UNISTRING("Enabled"), uno::Any( true ) ); setProperty( aProps, 2, UNISTRING("PushButtonType"), uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) ); setProperty( aProps, 3, UNISTRING("Label"), uno::Any( msResumeBtn ) ); - setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::valueOf( (sal_Int32) HID_CHECK_FOR_UPD_RESUME ) ) ); + setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_RESUME ) ) ); insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[RESUME_BUTTON], awt::Rectangle( BOX1_BTN_X, @@ -1158,7 +1158,7 @@ void UpdateHandler::createDialog() setProperty( aProps, 1, UNISTRING("Enabled"), uno::Any( true ) ); setProperty( aProps, 2, UNISTRING("PushButtonType"), uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) ); setProperty( aProps, 3, UNISTRING("Label"), uno::Any( msCancelBtn ) ); - setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::valueOf( (sal_Int32) HID_CHECK_FOR_UPD_CANCEL ) ) ); + setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_CANCEL ) ) ); insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[CANCEL_BUTTON], awt::Rectangle( BOX1_BTN_X, @@ -1192,7 +1192,7 @@ void UpdateHandler::createDialog() setProperty( aProps, 3, UNISTRING("MultiLine"), uno::Any( true ) ); setProperty( aProps, 4, UNISTRING("ReadOnly"), uno::Any( true ) ); setProperty( aProps, 5, UNISTRING("AutoVScroll"), uno::Any( true ) ); - setProperty( aProps, 6, UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::valueOf( (sal_Int32) HID_CHECK_FOR_UPD_DESCRIPTION ) ) ); + setProperty( aProps, 6, UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_DESCRIPTION ) ) ); insertControlModel( xControlModel, EDIT_FIELD_MODEL, TEXT_DESCRIPTION, awt::Rectangle( DIALOG_BORDER + TEXT_OFFSET, @@ -1222,7 +1222,7 @@ void UpdateHandler::createDialog() // setProperty( aProps, 2, UNISTRING("PushButtonType"), uno::Any( sal_Int16(awt::PushButtonType_CANCEL) ) ); // [property] string Label // only if PushButtonType_STANDARD setProperty( aProps, 3, UNISTRING("Label"), uno::Any( msClose ) ); - setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::valueOf( (sal_Int32) HID_CHECK_FOR_UPD_CLOSE ) ) ); + setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_CLOSE ) ) ); insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[ CLOSE_BUTTON ], awt::Rectangle( CLOSE_BTN_X, BUTTON_Y_POS, BUTTON_WIDTH, BUTTON_HEIGHT ), @@ -1235,7 +1235,7 @@ void UpdateHandler::createDialog() setProperty( aProps, 1, UNISTRING("Enabled"), uno::Any( true ) ); setProperty( aProps, 2, UNISTRING("PushButtonType"), uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) ); setProperty( aProps, 3, UNISTRING("Label"), uno::Any( msInstall ) ); - setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::valueOf( (sal_Int32) HID_CHECK_FOR_UPD_INSTALL ) ) ); + setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_INSTALL ) ) ); insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[INSTALL_BUTTON], awt::Rectangle( INSTALL_BTN_X, BUTTON_Y_POS, BUTTON_WIDTH, BUTTON_HEIGHT ), @@ -1248,7 +1248,7 @@ void UpdateHandler::createDialog() setProperty( aProps, 1, UNISTRING("Enabled"), uno::Any( true ) ); setProperty( aProps, 2, UNISTRING("PushButtonType"), uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) ); setProperty( aProps, 3, UNISTRING("Label"), uno::Any( msDownload ) ); - setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::valueOf( (sal_Int32) HID_CHECK_FOR_UPD_DOWNLOAD ) ) ); + setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_DOWNLOAD ) ) ); insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[DOWNLOAD_BUTTON], awt::Rectangle( DOWNLOAD_BTN_X, BUTTON_Y_POS, BUTTON_WIDTH, BUTTON_HEIGHT ), diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index b750b351b..1f6a3c170 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -210,8 +210,7 @@ DigitalSignaturesDialog::DigitalSignaturesDialog( ,m_bWarningShowSignMacro(false) { // --> PB #i48253 the tablistbox needs its own unique id - // FIXME: HELPID - maSignaturesLB.Window::SetUniqueId( ""/*HID_XMLSEC_TREE_SIGNATURESDLG*/ ); + 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 ] ); diff --git a/xmlsecurity/source/dialogs/helpids.hrc b/xmlsecurity/source/dialogs/helpids.hrc index 4b0329de3..6b6088669 100644 --- a/xmlsecurity/source/dialogs/helpids.hrc +++ b/xmlsecurity/source/dialogs/helpids.hrc @@ -34,34 +34,22 @@ // Help-Ids -------------------------------------------------------------- -#define HID_XMLSEC_TP_MACROSEC (HID_XMLSECURITY_START + 0) -#define HID_XMLSEC_TP_SECLEVEL (HID_XMLSECURITY_START + 1) -#define HID_XMLSEC_TP_TRUSTSOURCES (HID_XMLSECURITY_START + 2) -#define HID_XMLSEC_DLG_CERTVIEWER (HID_XMLSECURITY_START + 3) -#define HID_XMLSEC_TP_GENERAL (HID_XMLSECURITY_START + 4) -#define HID_XMLSEC_TP_DETAILS (HID_XMLSECURITY_START + 5) -#define HID_XMLSEC_TP_CERTPATH (HID_XMLSECURITY_START + 6) -#define HID_XMLSEC_DLG_DIGSIG (HID_XMLSECURITY_START + 7) -#define HID_XMLSEC_TP_MACROWARN (HID_XMLSECURITY_START + 8) -#define HID_XMLSEC_DLG_CERTCHOOSER (HID_XMLSECURITY_START + 9) -#define HID_XMLSEC_CTRL_TRUSTSOURCES (HID_XMLSECURITY_START + 10) -#define HID_XMLSEC_CTRL_ELEMENTS (HID_XMLSECURITY_START + 11) -#define HID_XMLSEC_CTRL_VIEWSIGNATURES (HID_XMLSECURITY_START + 12) -#define HID_XMLSEC_CTRL_SIGNATURESDLG (HID_XMLSECURITY_START + 13) -#define HID_XMLSEC_CTRL_CHOOSESIGNATURES (HID_XMLSECURITY_START + 14) -#define HID_XMLSEC_TREE_SIGNATURESDLG (HID_XMLSECURITY_START + 15) - -// pb: please update ACT_XMLSECURITY_HID_END below, thx. - -// ----------------------------------------------------------------------- -// overflow check -------------------------------------------------------- -// ----------------------------------------------------------------------- - -#define ACT_XMLSECURITY_HID_END HID_XMLSEC_TREE_SIGNATURESDLG - -#if ACT_XMLSECURITY_HID_END > HID_XMLSECURITY_END -#error helpids overflow in #line, #file -#endif +#define HID_XMLSEC_TP_MACROSEC "XMLSECURITY_HID_XMLSEC_TP_MACROSEC" +#define HID_XMLSEC_TP_SECLEVEL "XMLSECURITY_HID_XMLSEC_TP_SECLEVEL" +#define HID_XMLSEC_TP_TRUSTSOURCES "XMLSECURITY_HID_XMLSEC_TP_TRUSTSOURCES" +#define HID_XMLSEC_DLG_CERTVIEWER "XMLSECURITY_HID_XMLSEC_DLG_CERTVIEWER" +#define HID_XMLSEC_TP_GENERAL "XMLSECURITY_HID_XMLSEC_TP_GENERAL" +#define HID_XMLSEC_TP_DETAILS "XMLSECURITY_HID_XMLSEC_TP_DETAILS" +#define HID_XMLSEC_TP_CERTPATH "XMLSECURITY_HID_XMLSEC_TP_CERTPATH" +#define HID_XMLSEC_DLG_DIGSIG "XMLSECURITY_HID_XMLSEC_DLG_DIGSIG" +#define HID_XMLSEC_TP_MACROWARN "XMLSECURITY_HID_XMLSEC_TP_MACROWARN" +#define HID_XMLSEC_DLG_CERTCHOOSER "XMLSECURITY_HID_XMLSEC_DLG_CERTCHOOSER" +#define HID_XMLSEC_CTRL_TRUSTSOURCES "XMLSECURITY_HID_XMLSEC_CTRL_TRUSTSOURCES" +#define HID_XMLSEC_CTRL_ELEMENTS "XMLSECURITY_HID_XMLSEC_CTRL_ELEMENTS" +#define HID_XMLSEC_CTRL_VIEWSIGNATURES "XMLSECURITY_HID_XMLSEC_CTRL_VIEWSIGNATURES" +#define HID_XMLSEC_CTRL_SIGNATURESDLG "XMLSECURITY_HID_XMLSEC_CTRL_SIGNATURESDLG" +#define HID_XMLSEC_CTRL_CHOOSESIGNATURES "XMLSECURITY_HID_XMLSEC_CTRL_CHOOSESIGNATURES" +#define HID_XMLSEC_TREE_SIGNATURESDLG "XMLSECURITY_HID_XMLSEC_TREE_SIGNATURESDLG" #endif // #ifndef _XMLSEC_HELPIDS_HRC -- cgit v1.2.3 From 7376e4f6dd4502616a7018add5312cfe2073e35f Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 19 Jul 2010 17:13:56 +0200 Subject: CWS changehid: #i111784#: use mhids.pl to generate conversion list for HIDs --- basctl/inc/helpid.hrc | 6 ------ basctl/util/hidother.src | 1 - cui/source/inc/helpid.hrc | 1 - extensions/inc/abpilot.hrc | 2 -- extensions/inc/bibliography.hrc | 2 -- extensions/inc/dbpilots.hrc | 2 -- extensions/inc/propctrlr.hrc | 2 -- extensions/inc/update.hrc | 2 -- extensions/source/abpilot/abpresid.hrc | 3 ++- extensions/source/bibliography/bib.hrc | 2 +- extensions/source/dbpilots/dbpresid.hrc | 1 + 11 files changed, 4 insertions(+), 20 deletions(-) diff --git a/basctl/inc/helpid.hrc b/basctl/inc/helpid.hrc index 926e0deb5..64341f504 100644 --- a/basctl/inc/helpid.hrc +++ b/basctl/inc/helpid.hrc @@ -27,12 +27,6 @@ #ifndef _BASCTL_HELPID_HRC #define _BASCTL_HELPID_HRC -// include --------------------------------------------------------------- - -#include - -// Help-Ids -------------------------------------------------------------- - #define HID_BASICIDE_TOOLBOX "BASCTL_HID_BASICIDE_TOOLBOX" #define HID_BASICIDE_OBJECTS "BASCTL_HID_BASICIDE_OBJECTS" #define HID_MACRO_OPTIONS "BASCTL_HID_MACRO_OPTIONS" diff --git a/basctl/util/hidother.src b/basctl/util/hidother.src index ece6f8344..bf8e64f2d 100644 --- a/basctl/util/hidother.src +++ b/basctl/util/hidother.src @@ -25,7 +25,6 @@ * ************************************************************************/ #include "../inc/helpid.hrc" // HID_XXX -//#include "hidother.hrc" hidspecial HID_BASICIDE_PROP_BROWSER_LBOX { HelpID = HID_BASICIDE_PROP_BROWSER_LBOX; }; hidspecial HID_BASICIDE_PROP_BROWSER { HelpID = HID_BASICIDE_PROP_BROWSER; }; diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc index ad1d2180e..4c19514e1 100644 --- a/cui/source/inc/helpid.hrc +++ b/cui/source/inc/helpid.hrc @@ -28,7 +28,6 @@ #define _CUI_HELPID_HRC // include --------------------------------------------------------------- -#include #include #include diff --git a/extensions/inc/abpilot.hrc b/extensions/inc/abpilot.hrc index 3cb1e650b..88d5cc17c 100644 --- a/extensions/inc/abpilot.hrc +++ b/extensions/inc/abpilot.hrc @@ -27,8 +27,6 @@ #ifndef EXTENSIONS_ABPILOT_HRC #define EXTENSIONS_ABPILOT_HRC -#include "extensio.hrc" - #define HID_ABSPILOT_PREVIOUS "EXTENSIONS_HID_ABSPILOT_PREVIOUS" #define HID_ABSPILOT_NEXT "EXTENSIONS_HID_ABSPILOT_NEXT" #define HID_ABSPILOT_CANCEL "EXTENSIONS_HID_ABSPILOT_CANCEL" diff --git a/extensions/inc/bibliography.hrc b/extensions/inc/bibliography.hrc index dc02073a3..52a6694e9 100644 --- a/extensions/inc/bibliography.hrc +++ b/extensions/inc/bibliography.hrc @@ -27,8 +27,6 @@ #ifndef EXTENSIONS_BIBLIOGRAPHY_HRC #define EXTENSIONS_BIBLIOGRAPHY_HRC -#include "extensio.hrc" - #define HID_BIB_CHANGESOURCE "EXTENSIONS_HID_BIB_CHANGESOURCE" #define HID_BIB_MAPPINGDLG "EXTENSIONS_HID_BIB_MAPPINGDLG" #define HID_BIB_TBX_TABLE "EXTENSIONS_HID_BIB_TBX_TABLE" diff --git a/extensions/inc/dbpilots.hrc b/extensions/inc/dbpilots.hrc index 2fb9a159e..3a7f3e695 100644 --- a/extensions/inc/dbpilots.hrc +++ b/extensions/inc/dbpilots.hrc @@ -27,8 +27,6 @@ #ifndef EXTENSIONS_DBPILOT_HRC #define EXTENSIONS_DBPILOT_HRC -#include "extensio.hrc" - #define HID_GHIDWIZARD_PREVIOUS "EXTENSIONS_HID_GHIDWIZARD_PREVIOUS" #define HID_GHIDWIZARD_NEXT "EXTENSIONS_HID_GHIDWIZARD_NEXT" #define HID_GHIDWIZARD_CANCEL "EXTENSIONS_HID_GHIDWIZARD_CANCEL" diff --git a/extensions/inc/propctrlr.hrc b/extensions/inc/propctrlr.hrc index 787dc6064..b2888b982 100644 --- a/extensions/inc/propctrlr.hrc +++ b/extensions/inc/propctrlr.hrc @@ -27,8 +27,6 @@ #ifndef EXTENSIONS_PROPCTRLR_HRC #define EXTENSIONS_PROPCTRLR_HRC -#include "extensio.hrc" - #define UID_PROP_DLG_FONT_TYPE "EXTENSIONS_UID_PROP_DLG_FONT_TYPE" #define UID_PROP_DLG_IMAGE_URL "EXTENSIONS_UID_PROP_DLG_IMAGE_URL" #define UID_PROP_DLG_BACKGROUNDCOLOR "EXTENSIONS_UID_PROP_DLG_BACKGROUNDCOLOR" diff --git a/extensions/inc/update.hrc b/extensions/inc/update.hrc index dc3d1b7f9..dcdcfaaa4 100644 --- a/extensions/inc/update.hrc +++ b/extensions/inc/update.hrc @@ -27,8 +27,6 @@ #ifndef EXTENSIONS_UPDATE_HRC #define EXTENSIONS_UPDATE_HRC -#include "extensio.hrc" - #define HID_CHECK_FOR_UPD_DLG "EXTENSIONS_HID_CHECK_FOR_UPD_DLG" #define HID_CHECK_FOR_UPD_CLOSE "EXTENSIONS_HID_CHECK_FOR_UPD_CLOSE" #define HID_CHECK_FOR_UPD_PAUSE "EXTENSIONS_HID_CHECK_FOR_UPD_PAUSE" diff --git a/extensions/source/abpilot/abpresid.hrc b/extensions/source/abpilot/abpresid.hrc index 273ba6b6e..08ade5d67 100644 --- a/extensions/source/abpilot/abpresid.hrc +++ b/extensions/source/abpilot/abpresid.hrc @@ -29,7 +29,8 @@ #define EXTENSIONS_ABPRESID_HRC #include "abpilot.hrc" - +#include "extensio.hrc" + //======================================================================== // basics diff --git a/extensions/source/bibliography/bib.hrc b/extensions/source/bibliography/bib.hrc index eb6afcb44..454bda0e5 100644 --- a/extensions/source/bibliography/bib.hrc +++ b/extensions/source/bibliography/bib.hrc @@ -28,7 +28,7 @@ #define BIB_HRC #include "bibliography.hrc" - +#include #ifndef RID_BIB_START #define RID_BIB_START RID_EXTENSIONS_START #endif diff --git a/extensions/source/dbpilots/dbpresid.hrc b/extensions/source/dbpilots/dbpresid.hrc index 81f61d49c..7d766516c 100644 --- a/extensions/source/dbpilots/dbpresid.hrc +++ b/extensions/source/dbpilots/dbpresid.hrc @@ -29,6 +29,7 @@ #define _EXTENSIONS_DBP_DBPRESID_HRC_ #include "dbpilots.hrc" +#include "extensio.hrc" //======================================================================== // basics -- cgit v1.2.3 From 56d089be92a12970a349bc087b8466e2e56cf8e3 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 20 Jul 2010 14:50:49 +0200 Subject: CWS changehid: #i111784#: consolidate usage of HID schema; remove unused SetDialogHelpId methods --- cui/inc/pch/precompiled_cui.hxx | 1 - cui/source/customize/acccfg.cxx | 1 - cui/source/dialogs/cuigaldlg.cxx | 3 --- cui/source/options/optpath.cxx | 3 --- cui/source/tabpages/numpages.cxx | 1 - extensions/source/bibliography/datman.cxx | 2 +- extensions/source/bibliography/general.cxx | 4 +++- extensions/source/propctrlr/pcrcommon.cxx | 14 +++++++++----- extensions/source/update/check/updatehdl.cxx | 21 +++++++++++---------- xmlsecurity/source/dialogs/macrosecurity.cxx | 1 - 10 files changed, 24 insertions(+), 27 deletions(-) diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx index 403e6bcc1..d1b50625e 100644 --- a/cui/inc/pch/precompiled_cui.hxx +++ b/cui/inc/pch/precompiled_cui.hxx @@ -806,7 +806,6 @@ #include "svtools/parhtml.hxx" #include "svtools/parrtf.hxx" #include "unotools/pathoptions.hxx" -#include "svl/pickerhelper.hxx" #include "svl/poolitem.hxx" #include "unotools/printwarningoptions.hxx" #include "svl/ptitem.hxx" diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 50e22f9a8..7c1243ba2 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -1504,7 +1504,6 @@ void SfxAcceleratorConfigPage::StartFileDialog( WinBits nBits, const String& rTi m_pFileDlg = new sfx2::FileDialogHelper( nDialogType, 0 ); m_pFileDlg->SetTitle( rTitle ); -// m_pFileDlg->SetDialogHelpId( bSave ? HID_CONFIG_SAVE : HID_CONFIG_LOAD ); m_pFileDlg->AddFilter( aFilterAllStr, DEFINE_CONST_UNICODE( FILEDIALOG_FILTER_ALL ) ); m_pFileDlg->AddFilter( aFilterCfgStr, DEFINE_CONST_UNICODE( "*.cfg" ) ); diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 9e0792333..139f17945 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -40,7 +40,6 @@ #include #include #include "cuigaldlg.hxx" -#include #include "helpid.hrc" #include #include @@ -1035,7 +1034,6 @@ IMPL_LINK( TPGalleryThemeProperties, ClickSearchHdl, void *, EMPTYARG ) if ( xFolderPicker.is() ) { -// svt::SetDialogHelpId( xFolderPicker, HID_GALLERY_NEWTHEME_FINDFILES ); String aDlgPathName( SvtPathOptions().GetGraphicPath() ); xFolderPicker->setDisplayDirectory(aDlgPathName); @@ -1146,7 +1144,6 @@ IMPL_LINK( TPGalleryThemeProperties, ClickTakeHdl, void*, EMPTYARG ) if( !aLbxFound.GetSelectEntryCount() || !bEntriesFound ) { SvxOpenGraphicDialog aDlg(String( RTL_CONSTASCII_USTRINGPARAM( "Gallery" ) ) ); -// aDlg.SetDialogHelpId( HID_GALLERY_NEWTHEME_ADDFILES ); aDlg.EnableLink(sal_False); aDlg.AsLink(sal_False); diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 75b9c7832..0f2d4a02f 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include @@ -639,8 +638,6 @@ IMPL_LINK( SvxPathTabPage, PathHdl_Impl, PushButton *, EMPTYARG ) xFolderPicker = ::com::sun::star::uno::Reference< XFolderPicker >( xFactory->createInstance( aService ), UNO_QUERY ); -// svt::SetDialogHelpId( xFolderPicker, HID_OPTIONS_PATHS_SELECTFOLDER ); - INetURLObject aURL( sWritable, INET_PROT_FILE ); xFolderPicker->setDisplayDirectory( aURL.GetMainURL( INetURLObject::NO_DECODE ) ); diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 368859a5a..50fec58b9 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -2269,7 +2269,6 @@ IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton ) Size aSize; sal_Bool bSucc(sal_False); SvxOpenGraphicDialog aGrfDlg( CUI_RES(RID_STR_EDIT_GRAPHIC) ); -// aGrfDlg.SetDialogHelpId( HID_NUMBERINGOPT_SEL_GRF_FROM_FILE ); if(MN_GALLERY_ENTRY <= nItemId ) { diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 126134628..4f902a689 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -1436,7 +1436,7 @@ Reference< awt::XControlModel > BibDataManager::createGridModel(const ::rtl::OUS Reference< XPropertySetInfo > xPropInfo = xPropSet->getPropertySetInfo(); if (xPropInfo->hasPropertyByName(uProp)) { - ::rtl::OUString sId = ::rtl::OUString::createFromAscii( "HID:" ); + ::rtl::OUString sId = ::rtl::OUString::createFromAscii( INET_HID_SCHEME ); sId += ::rtl::OUString::createFromAscii( HID_BIB_DB_GRIDCTRL ); xPropSet->setPropertyValue( uProp, makeAny( sId ) ); } diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx index cb42a8969..d74678e44 100644 --- a/extensions/source/bibliography/general.cxx +++ b/extensions/source/bibliography/general.cxx @@ -57,6 +57,7 @@ #include #include #include +#include using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -509,7 +510,8 @@ uno::Reference< awt::XControlModel > BibGeneralPage::AddXControl( rtl::OUString uProp(C2U("HelpURL")); if(xPropInfo->hasPropertyByName(uProp)) { - ::rtl::OUString sId = ::rtl::OUString::createFromAscii( "HID:" ); + ::rtl::OUString sId = ::rtl::OUString::createFromAscii( INET_HID_SCHEME ); + DBG_ASSERT( INetURLObject( rtl::OStringToOUString( sHelpId, RTL_TEXTENCODING_UTF8 ) ).GetProtocol() == INET_PROT_NOT_VALID, "Wrong HelpId!" ); sId += ::rtl::OUString( sHelpId, sHelpId.getLength(), RTL_TEXTENCODING_UTF8 ); xPropSet->setPropertyValue( uProp, makeAny( sId ) ); } diff --git a/extensions/source/propctrlr/pcrcommon.cxx b/extensions/source/propctrlr/pcrcommon.cxx index 349146f98..5d1ac809c 100644 --- a/extensions/source/propctrlr/pcrcommon.cxx +++ b/extensions/source/propctrlr/pcrcommon.cxx @@ -39,6 +39,7 @@ #include /** === end UNO includes === **/ #include +#include //............................................................................ namespace pcr @@ -53,10 +54,11 @@ namespace pcr //------------------------------------------------------------------------ rtl::OString HelpIdUrl::getHelpId( const ::rtl::OUString& _rHelpURL ) { - rtl::OString aHelpId( _rHelpURL, _rHelpURL.getLength(), RTL_TEXTENCODING_UTF8 ); - if ( 0 == _rHelpURL.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "HID:" ) ) ) - aHelpId = aHelpId.copy( sizeof( "HID:" ) - 1 ); - return aHelpId; + INetURLObject aHID( _rHelpURL ); + if ( aHID.GetProtocol() == INET_PROT_HID ) + return rtl::OUStringToOString( aHID.GetURLPath(), RTL_TEXTENCODING_UTF8 ); + else + return rtl::OUStringToOString( _rHelpURL, RTL_TEXTENCODING_UTF8 ); } //------------------------------------------------------------------------ @@ -64,7 +66,9 @@ namespace pcr { ::rtl::OUStringBuffer aBuffer; ::rtl::OUString aTmp( sHelpId, sHelpId.getLength(), RTL_TEXTENCODING_UTF8 ); - aBuffer.appendAscii( "HID:" ); + INetURLObject aHID( aTmp ); + if ( aHID.GetProtocol() == INET_PROT_NOT_VALID ) + aBuffer.appendAscii( INET_HID_SCHEME ); aBuffer.append( aTmp.getStr() ); return aBuffer.makeStringAndClear(); } diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx index ae35afe6f..92ecd5ae4 100644 --- a/extensions/source/update/check/updatehdl.cxx +++ b/extensions/source/update/check/updatehdl.cxx @@ -69,6 +69,7 @@ #include #include "updatehdl.hrc" +#include #define UNISTRING(s) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s)) @@ -158,7 +159,7 @@ void UpdateHandler::setDownloadBtnLabel( bool bAppendDots ) aLabel += UNISTRING( "..." ); setControlProperty( msButtonIDs[DOWNLOAD_BUTTON], UNISTRING("Label"), uno::Any( aLabel ) ); - setControlProperty( msButtonIDs[DOWNLOAD_BUTTON], UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_DOWNLOAD2 ) ) ); + setControlProperty( msButtonIDs[DOWNLOAD_BUTTON], UNISTRING("HelpURL"), uno::Any( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_DOWNLOAD2 ) ) ); mbDownloadBtnHasDots = bAppendDots; } @@ -1174,7 +1175,7 @@ void UpdateHandler::createDialog() xPropSet->setPropertyValue( UNISTRING("PositionY"), uno::Any(sal_Int32( 100 )) ); xPropSet->setPropertyValue( UNISTRING("Width"), uno::Any(sal_Int32( DIALOG_WIDTH )) ); xPropSet->setPropertyValue( UNISTRING("Height"), uno::Any(sal_Int32( DIALOG_HEIGHT )) ); - xPropSet->setPropertyValue( UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_DLG ) ) ); + xPropSet->setPropertyValue( UNISTRING("HelpURL"), uno::Any( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_DLG ) ) ); } { // Label (fixed text) uno::Sequence< beans::NamedValue > aProps(1); @@ -1201,7 +1202,7 @@ void UpdateHandler::createDialog() setProperty( aProps, 3, UNISTRING("MultiLine"), uno::Any( true ) ); setProperty( aProps, 4, UNISTRING("ReadOnly"), uno::Any( true ) ); setProperty( aProps, 5, UNISTRING("AutoVScroll"), uno::Any( true ) ); - setProperty( aProps, 6, UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_STATUS ) ) ); + setProperty( aProps, 6, UNISTRING("HelpURL"), uno::Any( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_STATUS ) ) ); insertControlModel( xControlModel, EDIT_FIELD_MODEL, TEXT_STATUS, awt::Rectangle( DIALOG_BORDER + TEXT_OFFSET, @@ -1232,7 +1233,7 @@ void UpdateHandler::createDialog() setProperty( aProps, 1, UNISTRING("Enabled"), uno::Any( true ) ); setProperty( aProps, 2, UNISTRING("PushButtonType"), uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) ); setProperty( aProps, 3, UNISTRING("Label"), uno::Any( msPauseBtn ) ); - setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_PAUSE ) ) ); + setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_PAUSE ) ) ); insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[PAUSE_BUTTON], awt::Rectangle( BOX1_BTN_X, BOX1_BTN_Y, BUTTON_WIDTH, BUTTON_HEIGHT ), @@ -1245,7 +1246,7 @@ void UpdateHandler::createDialog() setProperty( aProps, 1, UNISTRING("Enabled"), uno::Any( true ) ); setProperty( aProps, 2, UNISTRING("PushButtonType"), uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) ); setProperty( aProps, 3, UNISTRING("Label"), uno::Any( msResumeBtn ) ); - setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_RESUME ) ) ); + setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_RESUME ) ) ); insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[RESUME_BUTTON], awt::Rectangle( BOX1_BTN_X, @@ -1261,7 +1262,7 @@ void UpdateHandler::createDialog() setProperty( aProps, 1, UNISTRING("Enabled"), uno::Any( true ) ); setProperty( aProps, 2, UNISTRING("PushButtonType"), uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) ); setProperty( aProps, 3, UNISTRING("Label"), uno::Any( msCancelBtn ) ); - setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_CANCEL ) ) ); + setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_CANCEL ) ) ); insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[CANCEL_BUTTON], awt::Rectangle( BOX1_BTN_X, @@ -1295,7 +1296,7 @@ void UpdateHandler::createDialog() setProperty( aProps, 3, UNISTRING("MultiLine"), uno::Any( true ) ); setProperty( aProps, 4, UNISTRING("ReadOnly"), uno::Any( true ) ); setProperty( aProps, 5, UNISTRING("AutoVScroll"), uno::Any( true ) ); - setProperty( aProps, 6, UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_DESCRIPTION ) ) ); + setProperty( aProps, 6, UNISTRING("HelpURL"), uno::Any( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_DESCRIPTION ) ) ); insertControlModel( xControlModel, EDIT_FIELD_MODEL, TEXT_DESCRIPTION, awt::Rectangle( DIALOG_BORDER + TEXT_OFFSET, @@ -1325,7 +1326,7 @@ void UpdateHandler::createDialog() // setProperty( aProps, 2, UNISTRING("PushButtonType"), uno::Any( sal_Int16(awt::PushButtonType_CANCEL) ) ); // [property] string Label // only if PushButtonType_STANDARD setProperty( aProps, 3, UNISTRING("Label"), uno::Any( msClose ) ); - setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_CLOSE ) ) ); + setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_CLOSE ) ) ); insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[ CLOSE_BUTTON ], awt::Rectangle( CLOSE_BTN_X, BUTTON_Y_POS, BUTTON_WIDTH, BUTTON_HEIGHT ), @@ -1338,7 +1339,7 @@ void UpdateHandler::createDialog() setProperty( aProps, 1, UNISTRING("Enabled"), uno::Any( true ) ); setProperty( aProps, 2, UNISTRING("PushButtonType"), uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) ); setProperty( aProps, 3, UNISTRING("Label"), uno::Any( msInstall ) ); - setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_INSTALL ) ) ); + setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_INSTALL ) ) ); insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[INSTALL_BUTTON], awt::Rectangle( INSTALL_BTN_X, BUTTON_Y_POS, BUTTON_WIDTH, BUTTON_HEIGHT ), @@ -1351,7 +1352,7 @@ void UpdateHandler::createDialog() setProperty( aProps, 1, UNISTRING("Enabled"), uno::Any( true ) ); setProperty( aProps, 2, UNISTRING("PushButtonType"), uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) ); setProperty( aProps, 3, UNISTRING("Label"), uno::Any( msDownload ) ); - setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( "HID:" ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_DOWNLOAD ) ) ); + setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_DOWNLOAD ) ) ); insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[DOWNLOAD_BUTTON], awt::Rectangle( DOWNLOAD_BTN_X, BUTTON_Y_POS, BUTTON_WIDTH, BUTTON_HEIGHT ), diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx index 9df532c69..c75a5f48e 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.cxx +++ b/xmlsecurity/source/dialogs/macrosecurity.cxx @@ -41,7 +41,6 @@ #include #include #include -#include #include #include #include -- cgit v1.2.3 From e0e4057b284c66c22721df3bccd0632430b0f09d Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Wed, 21 Jul 2010 11:47:52 +0200 Subject: CWS changehid: make hidother.src easier to handle --- wizards/util/helpids.h | 859 ++++++++++++++++++++++++++++++ wizards/util/hidother.src | 1279 +++++++++++++++++++++++---------------------- 2 files changed, 1499 insertions(+), 639 deletions(-) create mode 100644 wizards/util/helpids.h diff --git a/wizards/util/helpids.h b/wizards/util/helpids.h new file mode 100644 index 000000000..46b0c26e2 --- /dev/null +++ b/wizards/util/helpids.h @@ -0,0 +1,859 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +//two ranges available: +//34200 - 34767 +//40768 - 42767 + +/* + * web wizard : 34200 - 34319 + * report wizard : 34320 - 34399 + * others to be listed... + * + * web wizard (cont.) : 41000 - 41050 + * agenda wizard : 41051 - 41099 + */ + + +// *************** +// WEB WIZARD +// 34200 - 34319 +// 41000 - 41050 +// *************** +//webwizardgeneralcontrols + +#define HID0_WEBWIZARD "HID:34200" +#define HID0_HELP "HID:34201" +#define HID0_NEXT "HID:34202" +#define HID0_PREV "HID:34203" +#define HID0_CREATE "HID:34204" +#define HID0_CANCEL "HID:34205" +#define HID0_STATUS_DIALOG "HID:34206" + + +//step1 +#define HID1_LST_SESSIONS "HID:34207" +#define HID1_BTN_DEL_SES "HID:34209" + +//step2 +#define HID2_LST_DOCS "HID:34210" +#define HID2_BTN_ADD_DOC "HID:34211" +#define HID2_BTN_REM_DOC "HID:34212" +#define HID2_BTN_DOC_UP "HID:34213" +#define HID2_BTN_DOC_DOWN "HID:34214" +#define HID2_TXT_DOC_TITLE "HID:34215" +#define HID2_TXT_DOC_DESC "HID:34216" +#define HID2_TXT_DOC_AUTHOR "HID:34217" +#define HID2_LST_DOC_EXPORT "HID:34218" +#define HID2_STATUS_ADD_DOCS "HID:34219" + +//step3 +#define HID3_IL_LAYOUTS_IMG1 "HID:34220" +#define HID3_IL_LAYOUTS_IMG2 "HID:34221" +#define HID3_IL_LAYOUTS_IMG3 "HID:34222" +#define HID3_IL_LAYOUTS_IMG4 "HID:34223" +#define HID3_IL_LAYOUTS_IMG5 "HID:34224" +#define HID3_IL_LAYOUTS_IMG6 "HID:34225" +#define HID3_IL_LAYOUTS_IMG7 "HID:34226" +#define HID3_IL_LAYOUTS_IMG8 "HID:34227" +#define HID3_IL_LAYOUTS_IMG9 "HID:34228" +#define HID3_IL_LAYOUTS_IMG10 "HID:34229" +#define HID3_IL_LAYOUTS_IMG11 "HID:34230" +#define HID3_IL_LAYOUTS_IMG12 "HID:34231" +#define HID3_IL_LAYOUTS_IMG13 "HID:34232" +#define HID3_IL_LAYOUTS_IMG14 "HID:34233" +#define HID3_IL_LAYOUTS_IMG15 "HID:34234" + +//step4 +#define HID4_CHK_DISPLAY_FILENAME "HID:34235" +#define HID4_CHK_DISPLAY_DESCRIPTION "HID:34236" +#define HID4_CHK_DISPLAY_AUTHOR "HID:34237" +#define HID4_CHK_DISPLAY_CR_DATE "HID:34238" +#define HID4_CHK_DISPLAY_UP_DATE "HID:34239" +#define HID4_CHK_DISPLAY_FORMAT "HID:34240" +#define HID4_CHK_DISPLAY_F_ICON "HID:34241" +#define HID4_CHK_DISPLAY_PAGES "HID:34242" +#define HID4_CHK_DISPLAY_SIZE "HID:34243" + +#define HID4_GRP_OPTIMAIZE_640 "HID:34244" +#define HID4_GRP_OPTIMAIZE_800 "HID:34245" +#define HID4_GRP_OPTIMAIZE_1024 "HID:34246" + + +//step5 +#define HID5_LST_STYLES "HID:34247" +#define HID5_BTN_BACKGND "HID:34248" +#define HID5_BTN_ICONS "HID:34249" + +//step6 +#define HID6_TXT_SITE_TITLE "HID:34250" +#define HID6_TXT_SITE_DESC "HID:34253" +#define HID6_DATE_SITE_CREATED "HID:34255" +#define HID6_DATE_SITE_UPDATED "HID:34256" +#define HID6_TXT_SITE_EMAIL "HID:34258" +#define HID6_TXT_SITE_COPYRIGHT "HID:34259" + +//step7 +#define HID7_BTN_PREVIEW "HID:34260" +#define HID7_CHK_PUBLISH_LOCAL "HID:34261" +#define HID7_TXT_LOCAL "HID:34262" +#define HID7_BTN_LOCAL "HID:34263" +#define HID7_CHK_PUBLISH_ZIP "HID:34264" +#define HID7_TXT_ZIP "HID:34265" +#define HID7_BTN_ZIP "HID:34266" +#define HID7_CHK_PUBLISH_FTP "HID:34267" +#define HID7_TXT_FTP "HID:34268" +#define HID7_BTN_FTP "HID:34269" +#define HID7_CHK_SAVE "HID:34270" +#define HID7_TXT_SAVE "HID:34271" + +//web wizard backgrounds dialog +#define HID_BG "HID:34290" +#define HID_BG_BTN_OTHER "HID:34291" +#define HID_BG_BTN_NONE "HID:34292" +#define HID_BG_BTN_OK "HID:34293" +#define HID_BG_BTN_CANCEL "HID:34294" + +#define HID_BG_BTN_BACK "HID:34295" +#define HID_BG_BTN_FW "HID:34296" +#define HID_BG_BTN_IMG1 "HID:34297" +#define HID_BG_BTN_IMG2 "HID:34298" +#define HID_BG_BTN_IMG3 "HID:34299" +#define HID_BG_BTN_IMG4 "HID:34300" +#define HID_BG_BTN_IMG5 "HID:34301" +#define HID_BG_BTN_IMG6 "HID:34302" +#define HID_BG_BTN_IMG7 "HID:34303" +#define HID_BG_BTN_IMG8 "HID:34304" +#define HID_BG_BTN_IMG9 "HID:34305" +#define HID_BG_BTN_IMG10 "HID:34306" +#define HID_BG_BTN_IMG11 "HID:34307" +#define HID_BG_BTN_IMG12 "HID:34308" +#define HID_BG_BTN_IMG13 "HID:34309" +#define HID_BG_BTN_IMG14 "HID:34300" +#define HID_BG_BTN_IMG15 "HID:34311" +#define HID_BG_BTN_IMG16 "HID:34312" + +// ++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// Note: Web Wizard continues on 41000 later in this file. +// ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + + +// ************* +// REPORT WIZARD +// ************* + +#define HID_DLGREPORT_DIALOG "HID:34320" +#define HID_DLGREPORT_0_CMDPREV "HID:34322" +#define HID_DLGREPORT_0_CMDNEXT "HID:34323" +#define HID_DLGREPORT_0_CMDFINISH "HID:34324" +#define HID_DLGREPORT_0_CMDCANCEL "HID:34325" + +#define HID_DLGREPORT_1_LBTABLES "HID:34330" +#define HID_DLGREPORT_1_FIELDSAVAILABLE "HID:34331" +#define HID_DLGREPORT_1_CMDMOVESELECTED "HID:34332" +#define HID_DLGREPORT_1_CMDMOVEALL "HID:34333" +#define HID_DLGREPORT_1_CMDREMOVESELECTED "HID:34334" +#define HID_DLGREPORT_1_CMDREMOVEALL "HID:34335" +#define HID_DLGREPORT_1_FIELDSSELECTED "HID:34336" +#define HID_DLGREPORT_1_CMDMOVEUP "HID:34337" +#define HID_DLGREPORT_1_CMDMOVEDOWN "HID:34338" + + +#define HID_DLGREPORT_2_GROUPING "HID:34340" +#define HID_DLGREPORT_2_CMDGROUP "HID:34341" +#define HID_DLGREPORT_2_CMDUNGROUP "HID:34342" +#define HID_DLGREPORT_2_PREGROUPINGDEST "HID:34343" +#define HID_DLGREPORT_2_CMDMOVEUPGROUP "HID:34344" +#define HID_DLGREPORT_2_CMDMOVEDOWNGROUP "HID:34345" + + +#define HID_DLGREPORT_3_SORT1 "HID:34346" +#define HID_DLGREPORT_3_OPTASCEND1 "HID:34347" +#define HID_DLGREPORT_3_OPTDESCEND1 "HID:34348" +#define HID_DLGREPORT_3_SORT2 "HID:34349" +#define HID_DLGREPORT_3_OPTASCEND2 "HID:34350" +#define HID_DLGREPORT_3_OPTDESCEND2 "HID:34351" +#define HID_DLGREPORT_3_SORT3 "HID:34352" +#define HID_DLGREPORT_3_OPTASCEND3 "HID:34353" +#define HID_DLGREPORT_3_OPTDESCEND3 "HID:34354" +#define HID_DLGREPORT_3_SORT4 "HID:34355" +#define HID_DLGREPORT_3_OPTASCEND4 "HID:34356" +#define HID_DLGREPORT_3_OPTDESCEND4 "HID:34357" + +#define HID_DLGREPORT_4_TITLE "HID:34362" +#define HID_DLGREPORT_4_DATALAYOUT "HID:34363" +#define HID_DLGREPORT_4_PAGELAYOUT "HID:34364" +#define HID_DLGREPORT_4_LANDSCAPE "HID:34365" +#define HID_DLGREPORT_4_PORTRAIT "HID:34366" + +#define HID_DLGREPORT_5_OPTDYNTEMPLATE "HID:34370" +#define HID_DLGREPORT_5_OPTSTATDOCUMENT "HID:34371" +#define HID_DLGREPORT_5_TXTTEMPLATEPATH "HID:34372" +#define HID_DLGREPORT_5_CMDTEMPLATEPATH "HID:34373" +#define HID_DLGREPORT_5_OPTEDITTEMPLATE "HID:34374" +#define HID_DLGREPORT_5_OPTUSETEMPLATE "HID:34375" +#define HID_DLGREPORT_5_TXTDOCUMENTPATH "HID:34376" +#define HID_DLGREPORT_5_CMDDOCUMENTPATH "HID:34377" +#define HID_DLGREPORT_5_CHKLINKTODB "HID:34378" +#define HID_DLGREPORT_6_TXTTITLE_1 "HID:34381" +#define HID_DLGREPORT_6_TXTTITLE_2 "HID:34382" +#define HID_DLGREPORT_6_TXTTITLE_3 "HID:34383" +#define HID_DLGREPORT_6_TXTTITLE_4 "HID:34384" +#define HID_DLGREPORT_6_TXTTITLE_5 "HID:34385" +#define HID_DLGREPORT_6_TXTTITLE_6 "HID:34386" +#define HID_DLGREPORT_6_TXTTITLE_7 "HID:34387" + + +/* ==================================== + * FormWizard + * ==================================== + */ + + +#define HID_DLGFORM_DIALOG "HID:34400" +#define HID_DLGFORM_CMDPREV "HID:34402" +#define HID_DLGFORM_CMDNEXT "HID:34403" +#define HID_DLGFORM_CMDFINISH "HID:34404" +#define HID_DLGFORM_CMDCANCEL "HID:34405" + +#define HID_DLGFORM_MASTER_LBTABLES "HID:34411" +#define HID_DLGFORM_MASTER_FIELDSAVAILABLE "HID:34412" +#define HID_DLGFORM_MASTER_CMDMOVESELECTED "HID:34413" +#define HID_DLGFORM_MASTER_CMDMOVEALL "HID:34414" +#define HID_DLGFORM_MASTER_CMDREMOVESELECTED "HID:34415" +#define HID_DLGFORM_MASTER_CMDREMOVEALL "HID:34416" +#define HID_DLGFORM_MASTER_FIELDSSELECTED "HID:34417" +#define HID_DLGFORM_MASTER_CMDMOVEUP "HID:34418" +#define HID_DLGFORM_MASTER_CMDMOVEDOWN "HID:34419" + + +#define HID_DLGFORM_CHKCREATESUBFORM "HID:34421" +#define HID_DLGFORM_OPTONEXISTINGRELATION "HID:34422" +#define HID_DLGFORM_OPTSELECTMANUALLY "HID:34423" +#define HID_DLGFORM_lstRELATIONS "HID:34424" + + +#define HID_DLGFORM_SUB_LBTABLES "HID:34431" +#define HID_DLGFORM_SUB_FIELDSAVAILABLE "HID:34432" +#define HID_DLGFORM_SUB_CMDMOVESELECTED "HID:34433" +#define HID_DLGFORM_SUB_CMDMOVEALL "HID:34434" +#define HID_DLGFORM_SUB_CMDREMOVESELECTED "HID:34435" +#define HID_DLGFORM_SUB_CMDREMOVEALL "HID:34436" +#define HID_DLGFORM_SUB_FIELDSSELECTED "HID:34437" +#define HID_DLGFORM_SUB_CMDMOVEUP "HID:34438" +#define HID_DLGFORM_SUB_CMDMOVEDOWN "HID:34439" + + +#define HID_DLGFORM_LINKER_LSTSLAVELINK1 "HID:34441" +#define HID_DLGFORM_LINKER_LSTMASTERLINK1 "HID:34442" +#define HID_DLGFORM_LINKER_LSTSLAVELINK2 "HID:34443" +#define HID_DLGFORM_LINKER_LSTMASTERLINK2 "HID:34444" +#define HID_DLGFORM_LINKER_LSTSLAVELINK3 "HID:34445" +#define HID_DLGFORM_LINKER_LSTMASTERLINK3 "HID:34446" +#define HID_DLGFORM_LINKER_LSTSLAVELINK4 "HID:34447" +#define HID_DLGFORM_LINKER_LSTMASTERLINK4 "HID:34448" + +#define HID_DLGFORM_CMDALIGNLEFT "HID:34451" +#define HID_DLGFORM_CMDALIGNRIGHT "HID:34452" + + +#define HID_DLGFORM_CMDLEFTLABELED "HID:34453" +#define HID_DLGFORM_CMDTOPLABELED "HID:34454" +#define HID_DLGFORM_CMDTABLESTYLE "HID:34455" +#define HID_DLGFORM_CMDTOPJUSTIFIED "HID:34456" + +#define HID_DLGFORM_CMDLEFTLABELED2 "HID:34457" +#define HID_DLGFORM_CMDTOPLABELED2 "HID:34458" +#define HID_DLGFORM_CMDTABLESTYLE2 "HID:34459" +#define HID_DLGFORM_CMDTOPJUSTIFIED2 "HID:34460" + +#define HID_DLGFORM_OPTNEWDATAONLY "HID:34461" +#define HID_DLGFORM_OPTDISPLAYALLDATA "HID:34462" +#define HID_DLGFORM_CHKNOMODIFICATION "HID:34463" +#define HID_DLGFORM_CHKNODELETION "HID:34464" +#define HID_DLGFORM_CHKNOADDITION "HID:34465" + + +#define HID_DLGFORM_LSTSTYLES "HID:34471" +#define HID_DLGFORM_CMDNOBORDER "HID:34472" +#define HID_DLGFORM_CMD3DBORDER "HID:34473" +#define HID_DLGFORM_CMDSIMPLEBORDER "HID:34474" + +#define HID_DLGFORM_TXTPATH "HID:34481" +#define HID_DLGFORM_OPTWORKWITHFORM "HID:34482" +#define HID_DLGFORM_OPTMODIFYFORM "HID:34483" + + +#define HID_DLGNEWSLTR_DIALOG "HID:34500" +#define HID_DLGNEWSLTR_OPTSTANDARDLAYOUT "HID:34501" +#define HID_DLGNEWSLTR_OPTPARTYLAYOUT "HID:34502" +#define HID_DLGNEWSLTR_OPTBROCHURELAYOUT "HID:34503" +#define HID_DLGNEWSLTR_OPTSINGLESIDED "HID:34504" +#define HID_DLGNEWSLTR_OPTDOUBLESIDED "HID:34505" +#define HID_DLGNEWSLTR_CMDGOON "HID:34506" + + +#define HID_DLGDEPOT_DIALOG_SELLBUY "HID:34520" +#define HID_DLGDEPOT_0_TXTSTOCKID_SELLBUY "HID:34521" +#define HID_DLGDEPOT_0_TXTQUANTITY "HID:34522" +#define HID_DLGDEPOT_0_TXTRATE "HID:34523" +#define HID_DLGDEPOT_0_TXTDATE "HID:34524" +#define HID_DLGDEPOT_0_TXTCOMMISSION "HID:34525" +#define HID_DLGDEPOT_0_TXTFIX "HID:34526" +#define HID_DLGDEPOT_0_TXTMINIMUM "HID:34527" +#define HID_DLGDEPOT_0_CMDCANCEL_SELLBUY "HID:34528" +#define HID_DLGDEPOT_0_CMDGOON_SELLBUY "HID:34529" +#define HID_DLGDEPOT_1_LSTSELLSTOCKS "HID:34530" +#define HID_DLGDEPOT_2_LSTBUYSTOCKS "HID:34531" +#define HID_DLGDEPOT_DIALOG_SPLIT "HID:34532" +#define HID_DLGDEPOT_0_LSTSTOCKNAMES "HID:34533" +#define HID_DLGDEPOT_0_TXTSTOCKID_SPLIT "HID:34534" +#define HID_DLGDEPOT_0_CMDCANCEL_SPLIT "HID:34535" +#define HID_DLGDEPOT_0_CMDGOON_SPLIT "HID:34536" +#define HID_DLGDEPOT_1_OPTPERSHARE "HID:34537" +#define HID_DLGDEPOT_1_OPTTOTAL "HID:34538" +#define HID_DLGDEPOT_1_TXTDIVIDEND "HID:34539" +#define HID_DLGDEPOT_2_TXTOLDRATE "HID:34540" +#define HID_DLGDEPOT_2_TXTNEWRATE "HID:34541" +#define HID_DLGDEPOT_2_TXTDATE "HID:34542" +#define HID_DLGDEPOT_3_TXTSTARTDATE "HID:34543" +#define HID_DLGDEPOT_3_TXTENDDATE "HID:34544" +#define HID_DLGDEPOT_3_OPTDAILY "HID:34545" +#define HID_DLGDEPOT_3_OPTWEEKLY "HID:34546" +#define HID_DLGDEPOT_DIALOG_HISTORY "HID:34547" +#define HID_DLGDEPOT_LSTMARKETS "HID:34548" +#define HID_DLGDEPOT_0_CMDCANCEL_HISTORY "HID:34549" +#define HID_DLGDEPOT_0_CMDGOON_HISTORY "HID:34550" + +#define HID_DLGIMPORT_DIALOG "HID:34570" +#define HID_DLGIMPORT_0_CMDHELP "HID:34571" +#define HID_DLGIMPORT_0_CMDCANCEL "HID:34572" +#define HID_DLGIMPORT_0_CMDPREV "HID:34573" +#define HID_DLGIMPORT_0_CMDNEXT "HID:34574" +#define HID_DLGIMPORT_0_OPTSODOCUMENTS "HID:34575" +#define HID_DLGIMPORT_0_OPTMSDOCUMENTS "HID:34576" +#define HID_DLGIMPORT_0_CHKLOGFILE "HID:34577" +#define HID_DLGIMPORT_2_CHKWORD "HID:34578" +#define HID_DLGIMPORT_2_CHKEXCEL "HID:34579" +#define HID_DLGIMPORT_2_CHKPOWERPOINT "HID:34580" +#define HID_DLGIMPORT_2_CBTEMPLATE "HID:34581" +#define HID_DLGIMPORT_2_CBTEMPLATERECURSE "HID:34582" +#define HID_DLGIMPORT_2_LBTEMPLATEPATH "HID:34583" +#define HID_DLGIMPORT_2_EDTEMPLATEPATH "HID:34584" +#define HID_DLGIMPORT_2_CBDOCUMENT "HID:34586" +#define HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT "HID:34585" +#define HID_DLGIMPORT_2_CBDOCUMENT "HID:34586" +#define HID_DLGIMPORT_2_CBDOCUMENTRECURSE "HID:34587" +#define HID_DLGIMPORT_2_LBDOCUMENTPATH "HID:34588" +#define HID_DLGIMPORT_2_EDDOCUMENTPATH "HID:34589" +#define HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT "HID:34590" +#define HID_DLGIMPORT_2_LBEXPORTDOCUMENTPATH "HID:34591" +#define HID_DLGIMPORT_2_EDEXPORTDOCUMENTPATH "HID:34592" +#define HID_DLGIMPORT_2_CMDEXPORTPATHSELECT "HID:34593" +#define HID_DLGIMPORT_3_TBSUMMARY "HID:34595" + +#define HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT2 "HID:34600" +#define HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT2 "HID:34601" + + +#define HID_DLGIMPORT_0_CHKWRITER "HID:34596" +#define HID_DLGIMPORT_0_CHKCALC "HID:34597" +#define HID_DLGIMPORT_0_CHKIMPRESS "HID:34598" +#define HID_DLGIMPORT_0_CHKMATHGLOBAL "HID:34599" + + +#define HID_DLGCORRESPONDENCE_DIALOG "HID:34630" +#define HID_DLGCORRESPONDENCE_CANCEL "HID:34631" +#define HID_DLGCORRESPONDENCE_OPTIONAGENDA1 "HID:34632" +#define HID_DLGCORRESPONDENCE_OPTIONAGENDA2 "HID:34633" +#define HID_DLGCORRESPONDENCE_AGENDAOKAY "HID:34634" +#define HID_DLGCORRESPONDENCE_OPTIONLETTER1 "HID:34635" +#define HID_DLGCORRESPONDENCE_OPTIONLETTER2 "HID:34636" +#define HID_DLGCORRESPONDENCE_LETTEROKAY "HID:34637" + +#define HID_DLGSTYLES_DIALOG "HID:34650" +#define HID_DLGSTYLES_LISTBOX "HID:34651" +#define HID_DLGSTYLES_CANCEL "HID:34652" +#define HID_DLGSTYLES_OKAY "HID:34653" + +#define HID_DLGCONVERT_DIALOG "HID:34660" +#define HID_DLGCONVERT_CHECKBOX1 "HID:34661" +#define HID_DLGCONVERT_OPTIONBUTTON1 "HID:34662" +#define HID_DLGCONVERT_OPTIONBUTTON2 "HID:34663" +#define HID_DLGCONVERT_OPTIONBUTTON3 "HID:34664" +#define HID_DLGCONVERT_OPTIONBUTTON4 "HID:34665" +#define HID_DLGCONVERT_LISTBOX1 "HID:34666" +#define HID_DLGCONVERT_OBFILE "HID:34667" +#define HID_DLGCONVERT_OBDIR "HID:34668" +#define HID_DLGCONVERT_COMBOBOX1 "HID:34669" +#define HID_DLGCONVERT_TBSOURCE "HID:34670" +#define HID_DLGCONVERT_CHECKRECURSIVE "HID:34671" +#define HID_DLGCONVERT_TBTARGET "HID:34672" +#define HID_DLGCONVERT_CBCANCEL "HID:34673" +#define HID_DLGCONVERT_CBHELP "HID:34674" +#define HID_DLGCONVERT_CBBACK "HID:34675" +#define HID_DLGCONVERT_CBGOON "HID:34676" +#define HID_DLGCONVERT_CBSOURCEOPEN "HID:34677" +#define HID_DLGCONVERT_CBTARGETOPEN "HID:34678" +#define HID_DLGCONVERT_CHKPROTECT "HID:34679" +#define HID_DLGCONVERT_CHKTEXTDOCUMENTS "HID:34680" + +#define HID_DLGPASSWORD_CMDGOON "HID:34690" +#define HID_DLGPASSWORD_CMDCANCEL "HID:34691" +#define HID_DLGPASSWORD_CMDHELP "HID:34692" +#define HID_DLGPASSWORD_TXTPASSWORD "HID:34693" + +#define HID_DLGHOLIDAYCAL_DIALOG "HID:34700" +#define HID_DLGHOLIDAYCAL_1_PREVIEW "HID:34701" +#define HID_DLGHOLIDAYCAL_1_OPYEAR "HID:34702" +#define HID_DLGHOLIDAYCAL_1_OPMONTH "HID:34703" +#define HID_DLGHOLIDAYCAL_1_EDYEAR "HID:34704" +#define HID_DLGHOLIDAYCAL_1_EDMONTH "HID:34705" +#define HID_DLGHOLIDAYCAL_1_SPINYEAR "HID:34706" +#define HID_DLGHOLIDAYCAL_1_SPINMONTH "HID:34707" +#define HID_DLGHOLIDAYCAL_1_CMBSTATE "HID:34708" +#define HID_DLGHOLIDAYCAL_2_LBOWNDATA "HID:34709" +#define HID_DLGHOLIDAYCAL_2_CMDINSERT "HID:34710" +#define HID_DLGHOLIDAYCAL_2_CMDDELETE "HID:34711" +#define HID_DLGHOLIDAYCAL_2_EDEVENT "HID:34712" +#define HID_DLGHOLIDAYCAL_2_CHKEVENT "HID:34713" +#define HID_DLGHOLIDAYCAL_2_EDEVENTDAY "HID:34714" +#define HID_DLGHOLIDAYCAL_2_SPINEVENTDAY "HID:34715" +#define HID_DLGHOLIDAYCAL_2_EDEVENTMONTH "HID:34716" +#define HID_DLGHOLIDAYCAL_2_SPINEVENTMONTH "HID:34717" +#define HID_DLGHOLIDAYCAL_2_EDEVENTYEAR "HID:34718" +#define HID_DLGHOLIDAYCAL_2_SPINEVENTYEAR "HID:34719" +#define HID_DLGHOLIDAYCAL_0_CMDOWNDATA "HID:34720" +#define HID_DLGHOLIDAYCAL_0_CMDCANCEL "HID:34721" +#define HID_DLGHOLIDAYCAL_0_CMDOK "HID:34722" +//End at 34767 + +//Start at 40768 + +//LetterWizard--------------------------- + +#define HID_LTRWIZ_OPTBUSINESSLETTER "HID:40769" +#define HID_LTRWIZ_OPTPRIVOFFICIALLETTER "HID:40770" +#define HID_LTRWIZ_OPTPRIVATELETTER "HID:40771" +#define HID_LTRWIZ_LSTBUSINESSSTYLE "HID:40772" +#define HID_LTRWIZ_CHKBUSINESSPAPER "HID:40773" +#define HID_LTRWIZ_LSTPRIVOFFICIALSTYLE "HID:40774" +#define HID_LTRWIZ_LSTPRIVATESTYLE "HID:40775" +#define HID_LTRWIZ_CHKPAPERCOMPANYLOGO "HID:40776" +#define HID_LTRWIZ_NUMLOGOHEIGHT "HID:40777" +#define HID_LTRWIZ_NUMLOGOX "HID:40778" +#define HID_LTRWIZ_NUMLOGOWIDTH "HID:40779" +#define HID_LTRWIZ_NUMLOGOY "HID:40780" +#define HID_LTRWIZ_CHKPAPERCOMPANYADDRESS "HID:40781" +#define HID_LTRWIZ_NUMADDRESSHEIGHT "HID:40782" +#define HID_LTRWIZ_NUMADDRESSX "HID:40783" +#define HID_LTRWIZ_NUMADDRESSWIDTH "HID:40784" +#define HID_LTRWIZ_NUMADDRESSY "HID:40785" +#define HID_LTRWIZ_CHKCOMPANYRECEIVER "HID:40786" +#define HID_LTRWIZ_CHKPAPERFOOTER "HID:40787" +#define HID_LTRWIZ_NUMFOOTERHEIGHT "HID:40788" +#define HID_LTRWIZ_LSTLETTERNORM "HID:40789" +#define HID_LTRWIZ_CHKUSELOGO "HID:40790" +#define HID_LTRWIZ_CHKUSEADDRESSRECEIVER "HID:40791" +#define HID_LTRWIZ_CHKUSESIGNS "HID:40792" +#define HID_LTRWIZ_CHKUSESUBJECT "HID:40793" +#define HID_LTRWIZ_CHKUSESALUTATION "HID:40794" +#define HID_LTRWIZ_LSTSALUTATION "HID:40795" +#define HID_LTRWIZ_CHKUSEBENDMARKS "HID:40796" +#define HID_LTRWIZ_CHKUSEGREETING "HID:40797" +#define HID_LTRWIZ_LSTGREETING "HID:40798" +#define HID_LTRWIZ_CHKUSEFOOTER "HID:40799" +#define HID_LTRWIZ_OPTSENDERPLACEHOLDER "HID:40800" +#define HID_LTRWIZ_OPTSENDERDEFINE "HID:40801" +#define HID_LTRWIZ_TXTSENDERNAME "HID:40802" +#define HID_LTRWIZ_TXTSENDERSTREET "HID:40803" +#define HID_LTRWIZ_TXTSENDERPOSTCODE "HID:40804" +#define HID_LTRWIZ_TXTSENDERSTATE_TEXT "HID:40805" +#define HID_LTRWIZ_TXTSENDERCITY "HID:40806" +#define HID_LTRWIZ_OPTRECEIVERPLACEHOLDER "HID:40807" +#define HID_LTRWIZ_OPTRECEIVERDATABASE "HID:40808" +#define HID_LTRWIZ_TXTFOOTER "HID:40809" +#define HID_LTRWIZ_CHKFOOTERNEXTPAGES "HID:40810" +#define HID_LTRWIZ_CHKFOOTERPAGENUMBERS "HID:40811" +#define HID_LTRWIZ_TXTTEMPLATENAME "HID:40812" +#define HID_LTRWIZ_OPTCREATELETTER "HID:40813" +#define HID_LTRWIZ_OPTMAKECHANGES "HID:40814" +#define HID_LTRWIZ_TXTPATH "HID:40815" +#define HID_LTRWIZ_CMDPATH "HID:40816" + +#define HID_LTRWIZARD "HID:40820" +#define HID_LTRWIZARD_HELP "HID:40821" +#define HID_LTRWIZARD_BACK "HID:40822" +#define HID_LTRWIZARD_NEXT "HID:40823" +#define HID_LTRWIZARD_CREATE "HID:40824" +#define HID_LTRWIZARD_CANCEL "HID:40825" + +#define HID_QUERYWIZARD_LSTTABLES "HID:40850" +#define HID_QUERYWIZARD_LSTFIELDS "HID:40851" +#define HID_QUERYWIZARD_CMDMOVESELECTED "HID:40852" +#define HID_QUERYWIZARD_CMDMOVEALL "HID:40853" +#define HID_QUERYWIZARD_CMDREMOVESELECTED "HID:40854" +#define HID_QUERYWIZARD_CMDREMOVEALL "HID:40855" +#define HID_QUERYWIZARD_LSTSELFIELDS "HID:40856" +#define HID_QUERYWIZARD_CMDMOVEUP "HID:40857" +#define HID_QUERYWIZARD_CMDMOVEDOWN "HID:40858" + +#define HID_QUERYWIZARD_SORT1 "HID:40865" +#define HID_QUERYWIZARD_OPTASCEND1 "HID:40866" +#define HID_QUERYWIZARD_OPTDESCEND1 "HID:40867" +#define HID_QUERYWIZARD_SORT2 "HID:40868" +#define HID_QUERYWIZARD_OPTASCEND2 "HID:40869" +#define HID_QUERYWIZARD_OPTDESCEND2 "HID:40870" +#define HID_QUERYWIZARD_SORT3 "HID:40871" +#define HID_QUERYWIZARD_OPTASCEND3 "HID:40872" +#define HID_QUERYWIZARD_OPTDESCEND3 "HID:40873" +#define HID_QUERYWIZARD_SORT4 "HID:40874" +#define HID_QUERYWIZARD_OPTASCEND4 "HID:40875" +#define HID_QUERYWIZARD_OPTDESCEND4 "HID:40876" + +#define HID_QUERYWIZARD_OPTMATCHALL "HID:40878" +#define HID_QUERYWIZARD_OPTMATCHANY "HID:40879" + +#define HID_QUERYWIZARD_LSTFIELDNAME_1 "HID:40880" +#define HID_QUERYWIZARD_LSTOPERATOR_1 "HID:40881" +#define HID_QUERYWIZARD_TXTVALUE_1 "HID:40882" +#define HID_QUERYWIZARD_LSTFIELDNAME_2 "HID:40883" +#define HID_QUERYWIZARD_LSTOPERATOR_2 "HID:40884" +#define HID_QUERYWIZARD_TXTVALUE_2 "HID:40885" +#define HID_QUERYWIZARD_LSTFIELDNAME_3 "HID:40886" +#define HID_QUERYWIZARD_LSTOPERATOR_3 "HID:40887" +#define HID_QUERYWIZARD_TXTVALUE_3 "HID:40888" + +#define HID_QUERYWIZARD_OPTAGGREGATEDETAILQUERY "HID:40895" +#define HID_QUERYWIZARD_OPTAGGREGATESUMMARYQUERY "HID:40896" +#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_1 "HID:40897" +#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_1 "HID:40898" +#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_2 "HID:40899" +#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_2 "HID:40900" +#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_3 "HID:40901" +#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_3 "HID:40902" +#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_4 "HID:40903" +#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_4 "HID:40904" +#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_5 "HID:40905" +#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_5 "HID:40906" +#define HID_QUERYWIZARD_BTNAGGREGATEPLUS "HID:40907" +#define HID_QUERYWIZARD_BTNAGGREGATEMINUS "HID:40908" + +#define HID_QUERYWIZARD_LSTFILTERFIELDS "HID:40915" +#define HID_QUERYWIZARD_CMDFILTERMOVESELECTED "HID:40916" +#define HID_QUERYWIZARD_CMDFILTERREMOVESELECTED "HID:40917" +#define HID_QUERYWIZARD_LSTFILTERSELFIELDS "HID:40918" +#define HID_QUERYWIZARD_CMDFILTERMOVEUP "HID:40919" +#define HID_QUERYWIZARD_CMDFILTERMOVEDOWN "HID:40920" + +#define HID_QUERYWIZARD_OPTGROUPMATCHALL "HID:40923" +#define HID_QUERYWIZARD_OPTGROUPMATCHANY "HID:40924" + +#define HID_QUERYWIZARD_LSTFILTERFIELDNAME_1 "HID:40925" +#define HID_QUERYWIZARD_LSTFILTEROPERATOR_1 "HID:40926" +#define HID_QUERYWIZARD_TXTFILTERVALUE_1 "HID:40927" +#define HID_QUERYWIZARD_LSTFILTERFIELDNAME_2 "HID:40928" +#define HID_QUERYWIZARD_LSTFILTEROPERATOR_2 "HID:40929" +#define HID_QUERYWIZARD_TXTFILTERVALUE_2 "HID:40930" +#define HID_QUERYWIZARD_LSTFILTERFIELDNAME_3 "HID:40931" +#define HID_QUERYWIZARD_LSTFILTEROPERATOR_3 "HID:40932" +#define HID_QUERYWIZARD_TXTFILTERVALUE_3 "HID:40933" + +#define HID_QUERYWIZARD_TXTTITLE_1 "HID:40940" +#define HID_QUERYWIZARD_TXTTITLE_2 "HID:40941" +#define HID_QUERYWIZARD_TXTTITLE_3 "HID:40942" +#define HID_QUERYWIZARD_TXTTITLE_4 "HID:40943" +#define HID_QUERYWIZARD_TXTTITLE_5 "HID:40944" +#define HID_QUERYWIZARD_TXTTITLE_6 "HID:40945" +#define HID_QUERYWIZARD_TXTTITLE_7 "HID:40946" + +#define HID_QUERYWIZARD_TXTQUERYTITLE "HID:40955" +#define HID_QUERYWIZARD_OPTDISPLAYQUERY "HID:40956" +#define HID_QUERYWIZARD_OPTMODIFYQUERY "HID:40957" +#define HID_QUERYWIZARD_TXTSUMMARY "HID:40958" + +#define HID_QUERYWIZARD "HID:40970" +#define HID_QUERYWIZARD_BACK "HID:40972" +#define HID_QUERYWIZARD_NEXT "HID:40973" +#define HID_QUERYWIZARD_CREATE "HID:40974" +#define HID_QUERYWIZARD_CANCEL "HID:40975" + +// ++++++++++++++++++++++++++++++++++++++ +// +++ Web Wizard : Continued from 34312 +// ++++++++++++++++++++++++++++++++++++++ +// web wizard iconssets dialog +#define HID_IS "HID:41000" +#define HID_IS_BTN_NONE "HID:41002" +#define HID_IS_BTN_OK "HID:41003" +#define HID_IS_BTN_CANCEL "HID:41004" + +#define HID_IS_BTN_IMG1 "HID:41005" +#define HID_IS_BTN_IMG2 "HID:41006" +#define HID_IS_BTN_IMG3 "HID:41007" +#define HID_IS_BTN_IMG4 "HID:41008" +#define HID_IS_BTN_IMG5 "HID:41009" +#define HID_IS_BTN_IMG6 "HID:41010" +#define HID_IS_BTN_IMG7 "HID:41011" +#define HID_IS_BTN_IMG8 "HID:41012" +#define HID_IS_BTN_IMG9 "HID:41013" +#define HID_IS_BTN_IMG10 "HID:41014" +#define HID_IS_BTN_IMG11 "HID:41015" +#define HID_IS_BTN_IMG12 "HID:41016" +#define HID_IS_BTN_IMG13 "HID:41017" +#define HID_IS_BTN_IMG14 "HID:41018" +#define HID_IS_BTN_IMG15 "HID:41019" +#define HID_IS_BTN_IMG16 "HID:41020" +#define HID_IS_BTN_IMG17 "HID:41021" +#define HID_IS_BTN_IMG18 "HID:41022" +#define HID_IS_BTN_IMG19 "HID:41023" +#define HID_IS_BTN_IMG20 "HID:41024" +#define HID_IS_BTN_IMG21 "HID:41025" +#define HID_IS_BTN_IMG22 "HID:41026" +#define HID_IS_BTN_IMG23 "HID:41027" +#define HID_IS_BTN_IMG24 "HID:41028" +#define HID_IS_BTN_IMG25 "HID:41029" +#define HID_IS_BTN_IMG26 "HID:41030" +#define HID_IS_BTN_IMG27 "HID:41031" +#define HID_IS_BTN_IMG28 "HID:41032" +#define HID_IS_BTN_IMG29 "HID:41033" +#define HID_IS_BTN_IMG30 "HID:41034" +#define HID_IS_BTN_IMG31 "HID:41035" +#define HID_IS_BTN_IMG32 "HID:41036" + +// web wizard ftp dialog +#define HID_FTP "HID:41040" +#define HID_FTP_SERVER "HID:41041" +#define HID_FTP_USERNAME "HID:41042" +#define HID_FTP_PASS "HID:41043" +#define HID_FTP_TEST "HID:41044" +#define HID_FTP_TXT_PATH "HID:41045" +#define HID_FTP_BTN_PATH "HID:41046" +#define HID_FTP_OK "HID:41047" +#define HID_FTP_CANCEL "HID:41048" + + +/* ==================================== + * AGENDA WIZARD + * 41051 - 41099 + * ==================================== + */ + +// step 0 - navibar + +#define HID_AGWIZ "HID:41051" +#define HID_AGWIZ_HELP "HID:41052" +#define HID_AGWIZ_NEXT "HID:41053" +#define HID_AGWIZ_PREV "HID:41054" +#define HID_AGWIZ_CREATE "HID:41055" +#define HID_AGWIZ_CANCEL "HID:41056" + +//step 1 - design + +#define HID_AGWIZ_1_LIST_PAGEDESIGN "HID:41057" +#define HID_AGWIZ_1_CHK_MINUTES "HID:41058" + +// step 2 - general attributes + +#define HID_AGWIZ_2_TXT_TIME "HID:41059" +#define HID_AGWIZ_2_TXT_DATE "HID:41060" +#define HID_AGWIZ_2_TXT_TITLE "HID:41061" +#define HID_AGWIZ_2_TXT_LOCATION "HID:41062" + +// step 3 - headings + +#define HID_AGWIZ_3_CHK_MEETING_TYPE "HID:41063" +#define HID_AGWIZ_3_CHK_READ "HID:41064" +#define HID_AGWIZ_3_CHK_BRING "HID:41065" +#define HID_AGWIZ_3_CHK_NOTES "HID:41066" + +// step 4 - names + +#define HID_AGWIZ_4_CHK_CALLED_BY "HID:41067" +#define HID_AGWIZ_4_CHK_FACILITATOR "HID:41068" +#define HID_AGWIZ_4_CHK_NOTETAKER "HID:41069" +#define HID_AGWIZ_4_CHK_TIMEKEEPER "HID:41070" +#define HID_AGWIZ_4_CHK_ATTENDEES "HID:41071" +#define HID_AGWIZ_4_CHK_OBSERVERS "HID:41072" +#define HID_AGWIZ_4_CHK_RESOURCEPERSONS "HID:41073" + +// step 5 - topics + +#define HID_AGWIZ_6_TXT_TEMPLATENAME "HID:41074" +#define HID_AGWIZ_6_TXT_TEMPLATEPATH "HID:41075" +#define HID_AGWIZ_6_BTN_TEMPLATEPATH "HID:41076" + +// step 6 - file info + +#define HID_AGWIZ_6_OPT_CREATEAGENDA "HID:41077" +#define HID_AGWIZ_6_OPT_MAKECHANGES "HID:41078" + +// - again step 5 - buttons + +#define HID_AGWIZ_5_BTN_INSERT "HID:41079" +#define HID_AGWIZ_5_BTN_REMOVE "HID:41080" +#define HID_AGWIZ_5_BTN_UP "HID:41081" +#define HID_AGWIZ_5_BTN_DOWN "HID:41082" + +// again step 5 - scroll control + +#define HID_AGWIZ_5_SCROLL_BAR "HID:41083" + +#define HID_AGWIZ_5_TXT_TOPIC_1 "HID:41084" +#define HID_AGWIZ_5_TXT_RESPONSIBLE_1 "HID:41085" +#define HID_AGWIZ_5_TXT_MINUTES_1 "HID:41086" + +#define HID_AGWIZ_5_TXT_TOPIC_2 "HID:41087" +#define HID_AGWIZ_5_TXT_RESPONSIBLE_2 "HID:41088" +#define HID_AGWIZ_5_TXT_MINUTES_2 "HID:41089" + +#define HID_AGWIZ_5_TXT_TOPIC_3 "HID:41090" +#define HID_AGWIZ_5_TXT_RESPONSIBLE_3 "HID:41091" +#define HID_AGWIZ_5_TXT_MINUTES_3 "HID:41092" + +#define HID_AGWIZ_5_TXT_TOPIC_4 "HID:41093" +#define HID_AGWIZ_5_TXT_RESPONSIBLE_4 "HID:41094" +#define HID_AGWIZ_5_TXT_MINUTES_4 "HID:41095" + +#define HID_AGWIZ_5_TXT_TOPIC_5 "HID:41096" +#define HID_AGWIZ_5_TXT_RESPONSIBLE_5 "HID:41097" +#define HID_AGWIZ_5_TXT_MINUTES_5 "HID:41098" + + +//FaxWizard--------------------------- + +#define HID_FAXWIZ_OPTBUSINESSFAX "HID:41120" +#define HID_FAXWIZ_LSTBUSINESSSTYLE "HID:41121" +#define HID_FAXWIZ_OPTPRIVATEFAX "HID:41122" +#define HID_LSTPRIVATESTYLE "HID:41123" +#define HID_IMAGECONTROL3 "HID:41124" +#define HID_CHKUSELOGO "HID:41125" +#define HID_CHKUSEDATE "HID:41126" +#define HID_CHKUSECOMMUNICATIONTYPE "HID:41127" +#define HID_LSTCOMMUNICATIONTYPE "HID:41128" +#define HID_CHKUSESUBJECT "HID:41129" +#define HID_CHKUSESALUTATION "HID:41130" +#define HID_LSTSALUTATION "HID:41131" +#define HID_CHKUSEGREETING "HID:41132" +#define HID_LSTGREETING "HID:41133" +#define HID_CHKUSEFOOTER "HID:41134" +#define HID_OPTSENDERPLACEHOLDER "HID:41135" +#define HID_OPTSENDERDEFINE "HID:41136" +#define HID_TXTSENDERNAME "HID:41137" +#define HID_TXTSENDERSTREET "HID:41138" +#define HID_TXTSENDERPOSTCODE "HID:41139" +#define HID_TXTSENDERSTATE "HID:41140" +#define HID_TXTSENDERCITY "HID:41141" +#define HID_TXTSENDERFAX "HID:41142" +#define HID_OPTRECEIVERPLACEHOLDER "HID:41143" +#define HID_OPTRECEIVERDATABASE "HID:41144" +#define HID_TXTFOOTER "HID:41145" +#define HID_CHKFOOTERNEXTPAGES "HID:41146" +#define HID_CHKFOOTERPAGENUMBERS "HID:41147" +#define HID_TXTTEMPLATENAME "HID:41148" +#define HID_FILETEMPLATEPATH "HID:41149" +#define HID_OPTCREATEFAX "HID:41150" +#define HID_OPTMAKECHANGES "HID:41151" +#define HID_IMAGECONTROL2 "HID:41152" +#define HID_FAXWIZ_TXTPATH "HID:41153" +#define HID_FAXWIZ_CMDPATH "HID:41154" + +#define HID_FAXWIZARD "HID:41180" +#define HID_FAXWIZARD_HELP "HID:41181" +#define HID_FAXWIZARD_BACK "HID:41182" +#define HID_FAXWIZARD_NEXT "HID:41183" +#define HID_FAXWIZARD_CREATE "HID:41184" +#define HID_FAXWIZARD_CANCEL "HID:41185" + + + +/* ==================================== + * TableWizard + * ==================================== + */ + +#define HID_DLGTABLE_DIALOG "HID:41200" +#define HID_DLGTABLE_CMDPREV "HID:41202" +#define HID_DLGTABLE_CMDNEXT "HID:41203" +#define HID_DLGTABLE_CMDFINISH "HID:41204" +#define HID_DLGTABLE_CMDCANCEL "HID:41205" + + +#define HID_DLGTABLE_OPTBUSINESS "HID:41206" +#define HID_DLGTABLE_OPTPRIVATE "HID:41207" + + +#define HID_DLGTABLE_LBTABLES "HID:41208" +#define HID_DLGTABLE_FIELDSAVAILABLE "HID:41209" +#define HID_DLGTABLE_CMDMOVESELECTED "HID:41210" +#define HID_DLGTABLE_CMDMOVEALL "HID:41211" +#define HID_DLGTABLE_CMDREMOVESELECTED "HID:41212" +#define HID_DLGTABLE_CMDREMOVEALL "HID:41213" +#define HID_DLGTABLE_FIELDSSELECTED "HID:41214" + +#define HID_DLGTABLE_CMDMOVEUP "HID:41215" +#define HID_DLGTABLE_CMDMOVEDOWN "HID:41216" + + +#define HID_DLGTABLE_LB_SELFIELDNAMES "HID:41220" +#define HID_DLGTABLE_CMDMOVEFIELDUP "HID:41221" +#define HID_DLGTABLE_CMDMOVEFIELDDOWN "HID:41222" +#define HID_DLGTABLE_CMDMINUS "HID:41223" +#define HID_DLGTABLE_CMDPLUS "HID:41224" +#define HID_DLGTABLE_COLNAME "HID:41225" +#define HID_DLGTABLE_COLMODIFIER "HID:41226" + + +#define HID_DLGTABLE_CHK_USEPRIMEKEY "HID:41227" +#define HID_DLGTABLE_OPT_PK_AUTOMATIC "HID:41228" + +#define HID_DLGTABLE_CK_PK_AUTOVALUE_AUTOMATIC "HID:41229" + +#define HID_DLGTABLE_OPT_PK_SINGLE "HID:41230" +#define HID_DLGTABLE_LB_PK_FIELDNAME "HID:41231" +#define HID_DLGTABLE_CK_PK_AUTOVALUE "HID:41232" +#define HID_DLGTABLE_OPT_PK_SEVERAL "HID:41233" +#define HID_DLGTABLE_FIELDS_PK_AVAILABLE "HID:41234" +#define HID_DLGTABLE_CMDMOVE_PK_SELECTED "HID:41235" +#define HID_DLGTABLE_CMDREMOVE_PK_SELECTED "HID:41236" +#define HID_DLGTABLE_FIELDS_PK_SELECTED "HID:41237" + +#define HID_DLGTABLE_CMDMOVEUP_PK_SELECTED "HID:41238" +#define HID_DLGTABLE_CMDMOVEDOWN_PK_SELECTED "HID:41239" + + + + +#define HID_DLGTABLE_TXT_NAME "HID:41240" +#define HID_DLGTABLE_OPT_MODIFYTABLE "HID:41241" +#define HID_DLGTABLE_OPT_WORKWITHTABLE "HID:41242" +#define HID_DLGTABLE_OPT_STARTFORMWIZARD "HID:41243" +#define HID_DLGTABLE_LST_CATALOG "HID:41244" +#define HID_DLGTABLE_LST_SCHEMA "HID:41245" + + + + +//End at 42767 diff --git a/wizards/util/hidother.src b/wizards/util/hidother.src index 912d9d49d..bf1953e06 100644 --- a/wizards/util/hidother.src +++ b/wizards/util/hidother.src @@ -28,6 +28,7 @@ //34200 - 34767 //40768 - 42767 +#include "helpids.h" /* * web wizard : 34200 - 34319 * report wizard : 34320 - 34399 @@ -45,205 +46,205 @@ // *************** //webwizardgeneralcontrols -#define HID0_WEBWIZARD 34200 +// #define HID0_WEBWIZARD 34200 hidspecial HID { HelpID = HID0_WEBWIZARD; } ; -#define HID0_HELP 34201 +// #define HID0_HELP 34201 hidspecial HID { HelpID = HID0_HELP; } ; -#define HID0_NEXT 34202 +// #define HID0_NEXT 34202 hidspecial HID { HelpID = HID0_NEXT; } ; -#define HID0_PREV 34203 +// #define HID0_PREV 34203 hidspecial HID { HelpID = HID0_PREV; } ; -#define HID0_CREATE 34204 +// #define HID0_CREATE 34204 hidspecial HID { HelpID = HID0_CREATE; } ; -#define HID0_CANCEL 34205 +// #define HID0_CANCEL 34205 hidspecial HID { HelpID = HID0_CANCEL; } ; -#define HID0_STATUS_DIALOG 34206 +// #define HID0_STATUS_DIALOG 34206 hidspecial HID { HelpID = HID0_STATUS_DIALOG; } ; //step1 -#define HID1_LST_SESSIONS 34207 +// #define HID1_LST_SESSIONS 34207 hidspecial HID { HelpID = HID1_LST_SESSIONS; } ; -#define HID1_BTN_DEL_SES 34209 +// #define HID1_BTN_DEL_SES 34209 hidspecial HID { HelpID = HID1_BTN_DEL_SES; } ; //step2 -#define HID2_LST_DOCS 34210 +// #define HID2_LST_DOCS 34210 hidspecial HID { HelpID = HID2_LST_DOCS; } ; -#define HID2_BTN_ADD_DOC 34211 +// #define HID2_BTN_ADD_DOC 34211 hidspecial HID { HelpID = HID2_BTN_ADD_DOC; } ; -#define HID2_BTN_REM_DOC 34212 +// #define HID2_BTN_REM_DOC 34212 hidspecial HID { HelpID = HID2_BTN_REM_DOC; } ; -#define HID2_BTN_DOC_UP 34213 +// #define HID2_BTN_DOC_UP 34213 hidspecial HID { HelpID = HID2_BTN_DOC_UP; } ; -#define HID2_BTN_DOC_DOWN 34214 +// #define HID2_BTN_DOC_DOWN 34214 hidspecial HID { HelpID = HID2_BTN_DOC_DOWN; } ; -#define HID2_TXT_DOC_TITLE 34215 +// #define HID2_TXT_DOC_TITLE 34215 hidspecial HID { HelpID = HID2_TXT_DOC_TITLE; } ; -#define HID2_TXT_DOC_DESC 34216 +// #define HID2_TXT_DOC_DESC 34216 hidspecial HID { HelpID = HID2_TXT_DOC_DESC; } ; -#define HID2_TXT_DOC_AUTHOR 34217 +// #define HID2_TXT_DOC_AUTHOR 34217 hidspecial HID { HelpID = HID2_TXT_DOC_AUTHOR; } ; -#define HID2_LST_DOC_EXPORT 34218 +// #define HID2_LST_DOC_EXPORT 34218 hidspecial HID { HelpID = HID2_LST_DOC_EXPORT; } ; -#define HID2_STATUS_ADD_DOCS 34219 +// #define HID2_STATUS_ADD_DOCS 34219 hidspecial HID { HelpID = HID2_STATUS_ADD_DOCS; } ; //step3 -#define HID3_IL_LAYOUTS_IMG1 34220 +// #define HID3_IL_LAYOUTS_IMG1 34220 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG1; } ; -#define HID3_IL_LAYOUTS_IMG2 34221 +// #define HID3_IL_LAYOUTS_IMG2 34221 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG2; } ; -#define HID3_IL_LAYOUTS_IMG3 34222 +// #define HID3_IL_LAYOUTS_IMG3 34222 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG3; } ; -#define HID3_IL_LAYOUTS_IMG4 34223 +// #define HID3_IL_LAYOUTS_IMG4 34223 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG4; } ; -#define HID3_IL_LAYOUTS_IMG5 34224 +// #define HID3_IL_LAYOUTS_IMG5 34224 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG5; } ; -#define HID3_IL_LAYOUTS_IMG6 34225 +// #define HID3_IL_LAYOUTS_IMG6 34225 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG6; } ; -#define HID3_IL_LAYOUTS_IMG7 34226 +// #define HID3_IL_LAYOUTS_IMG7 34226 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG7; } ; -#define HID3_IL_LAYOUTS_IMG8 34227 +// #define HID3_IL_LAYOUTS_IMG8 34227 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG8; } ; -#define HID3_IL_LAYOUTS_IMG9 34228 +// #define HID3_IL_LAYOUTS_IMG9 34228 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG9; } ; -#define HID3_IL_LAYOUTS_IMG10 34229 +// #define HID3_IL_LAYOUTS_IMG10 34229 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG10; } ; -#define HID3_IL_LAYOUTS_IMG11 34230 +// #define HID3_IL_LAYOUTS_IMG11 34230 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG11; } ; -#define HID3_IL_LAYOUTS_IMG12 34231 +// #define HID3_IL_LAYOUTS_IMG12 34231 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG12; } ; -#define HID3_IL_LAYOUTS_IMG13 34232 +// #define HID3_IL_LAYOUTS_IMG13 34232 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG13; } ; -#define HID3_IL_LAYOUTS_IMG14 34233 +// #define HID3_IL_LAYOUTS_IMG14 34233 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG14; } ; -#define HID3_IL_LAYOUTS_IMG15 34234 +// #define HID3_IL_LAYOUTS_IMG15 34234 hidspecial HID { HelpID = HID3_IL_LAYOUTS_IMG15; } ; //step4 -#define HID4_CHK_DISPLAY_FILENAME 34235 +// #define HID4_CHK_DISPLAY_FILENAME 34235 hidspecial HID { HelpID = HID4_CHK_DISPLAY_FILENAME; } ; -#define HID4_CHK_DISPLAY_DESCRIPTION 34236 +// #define HID4_CHK_DISPLAY_DESCRIPTION 34236 hidspecial HID { HelpID = HID4_CHK_DISPLAY_DESCRIPTION; } ; -#define HID4_CHK_DISPLAY_AUTHOR 34237 +// #define HID4_CHK_DISPLAY_AUTHOR 34237 hidspecial HID { HelpID = HID4_CHK_DISPLAY_AUTHOR; } ; -#define HID4_CHK_DISPLAY_CR_DATE 34238 +// #define HID4_CHK_DISPLAY_CR_DATE 34238 hidspecial HID { HelpID = HID4_CHK_DISPLAY_CR_DATE; } ; -#define HID4_CHK_DISPLAY_UP_DATE 34239 +// #define HID4_CHK_DISPLAY_UP_DATE 34239 hidspecial HID { HelpID = HID4_CHK_DISPLAY_UP_DATE; } ; -#define HID4_CHK_DISPLAY_FORMAT 34240 +// #define HID4_CHK_DISPLAY_FORMAT 34240 hidspecial HID { HelpID = HID4_CHK_DISPLAY_FORMAT; } ; -#define HID4_CHK_DISPLAY_F_ICON 34241 +// #define HID4_CHK_DISPLAY_F_ICON 34241 hidspecial HID { HelpID = HID4_CHK_DISPLAY_F_ICON; } ; -#define HID4_CHK_DISPLAY_PAGES 34242 +// #define HID4_CHK_DISPLAY_PAGES 34242 hidspecial HID { HelpID = HID4_CHK_DISPLAY_PAGES; } ; -#define HID4_CHK_DISPLAY_SIZE 34243 +// #define HID4_CHK_DISPLAY_SIZE 34243 hidspecial HID { HelpID = HID4_CHK_DISPLAY_SIZE; } ; -#define HID4_GRP_OPTIMAIZE_640 34244 +// #define HID4_GRP_OPTIMAIZE_640 34244 hidspecial HID { HelpID = HID4_GRP_OPTIMAIZE_640; } ; -#define HID4_GRP_OPTIMAIZE_800 34245 +// #define HID4_GRP_OPTIMAIZE_800 34245 hidspecial HID { HelpID = HID4_GRP_OPTIMAIZE_800; } ; -#define HID4_GRP_OPTIMAIZE_1024 34246 +// #define HID4_GRP_OPTIMAIZE_1024 34246 hidspecial HID { HelpID = HID4_GRP_OPTIMAIZE_1024; } ; //step5 -#define HID5_LST_STYLES 34247 +// #define HID5_LST_STYLES 34247 hidspecial HID { HelpID = HID5_LST_STYLES; } ; -#define HID5_BTN_BACKGND 34248 +// #define HID5_BTN_BACKGND 34248 hidspecial HID { HelpID = HID5_BTN_BACKGND; } ; -#define HID5_BTN_ICONS 34249 +// #define HID5_BTN_ICONS 34249 hidspecial HID { HelpID = HID5_BTN_ICONS; } ; //step6 -#define HID6_TXT_SITE_TITLE 34250 +// #define HID6_TXT_SITE_TITLE 34250 hidspecial HID { HelpID = HID6_TXT_SITE_TITLE; } ; -#define HID6_TXT_SITE_DESC 34253 +// #define HID6_TXT_SITE_DESC 34253 hidspecial HID { HelpID = HID6_TXT_SITE_DESC; } ; -#define HID6_DATE_SITE_CREATED 34255 +// #define HID6_DATE_SITE_CREATED 34255 hidspecial HID { HelpID = HID6_DATE_SITE_CREATED; } ; -#define HID6_DATE_SITE_UPDATED 34256 +// #define HID6_DATE_SITE_UPDATED 34256 hidspecial HID { HelpID = HID6_DATE_SITE_UPDATED; } ; -#define HID6_TXT_SITE_EMAIL 34258 +// #define HID6_TXT_SITE_EMAIL 34258 hidspecial HID { HelpID = HID6_TXT_SITE_EMAIL; } ; -#define HID6_TXT_SITE_COPYRIGHT 34259 +// #define HID6_TXT_SITE_COPYRIGHT 34259 hidspecial HID { HelpID = HID6_TXT_SITE_COPYRIGHT; } ; //step7 -#define HID7_BTN_PREVIEW 34260 +// #define HID7_BTN_PREVIEW 34260 hidspecial HID { HelpID = HID7_BTN_PREVIEW; } ; -#define HID7_CHK_PUBLISH_LOCAL 34261 +// #define HID7_CHK_PUBLISH_LOCAL 34261 hidspecial HID { HelpID = HID7_CHK_PUBLISH_LOCAL; } ; -#define HID7_TXT_LOCAL 34262 +// #define HID7_TXT_LOCAL 34262 hidspecial HID { HelpID = HID7_TXT_LOCAL; } ; -#define HID7_BTN_LOCAL 34263 +// #define HID7_BTN_LOCAL 34263 hidspecial HID { HelpID = HID7_BTN_LOCAL; } ; -#define HID7_CHK_PUBLISH_ZIP 34264 +// #define HID7_CHK_PUBLISH_ZIP 34264 hidspecial HID { HelpID = HID7_CHK_PUBLISH_ZIP; } ; -#define HID7_TXT_ZIP 34265 +// #define HID7_TXT_ZIP 34265 hidspecial HID { HelpID = HID7_TXT_ZIP; } ; -#define HID7_BTN_ZIP 34266 +// #define HID7_BTN_ZIP 34266 hidspecial HID { HelpID = HID7_BTN_ZIP; } ; -#define HID7_CHK_PUBLISH_FTP 34267 +// #define HID7_CHK_PUBLISH_FTP 34267 hidspecial HID { HelpID = HID7_CHK_PUBLISH_FTP; } ; -#define HID7_TXT_FTP 34268 +// #define HID7_TXT_FTP 34268 hidspecial HID { HelpID = HID7_TXT_FTP; } ; -#define HID7_BTN_FTP 34269 +// #define HID7_BTN_FTP 34269 hidspecial HID { HelpID = HID7_BTN_FTP; } ; -#define HID7_CHK_SAVE 34270 +// #define HID7_CHK_SAVE 34270 hidspecial HID { HelpID = HID7_CHK_SAVE; } ; -#define HID7_TXT_SAVE 34271 +// #define HID7_TXT_SAVE 34271 hidspecial HID { HelpID = HID7_TXT_SAVE; } ; //web wizard backgrounds dialog -#define HID_BG 34290 +// #define HID_BG 34290 hidspecial HID { HelpID = HID_BG; } ; -#define HID_BG_BTN_OTHER 34291 +// #define HID_BG_BTN_OTHER 34291 hidspecial HID { HelpID = HID_BG_BTN_OTHER; } ; -#define HID_BG_BTN_NONE 34292 +// #define HID_BG_BTN_NONE 34292 hidspecial HID { HelpID = HID_BG_BTN_NONE; } ; -#define HID_BG_BTN_OK 34293 +// #define HID_BG_BTN_OK 34293 hidspecial HID { HelpID = HID_BG_BTN_OK; } ; -#define HID_BG_BTN_CANCEL 34294 +// #define HID_BG_BTN_CANCEL 34294 hidspecial HID { HelpID = HID_BG_BTN_CANCEL; } ; -#define HID_BG_BTN_BACK 34295 +// #define HID_BG_BTN_BACK 34295 hidspecial HID { HelpID = HID_BG_BTN_BACK; } ; -#define HID_BG_BTN_FW 34296 +// #define HID_BG_BTN_FW 34296 hidspecial HID { HelpID = HID_BG_BTN_FW; } ; -#define HID_BG_BTN_IMG1 34297 +// #define HID_BG_BTN_IMG1 34297 hidspecial HID { HelpID = HID_BG_BTN_IMG1; } ; -#define HID_BG_BTN_IMG2 34298 +// #define HID_BG_BTN_IMG2 34298 hidspecial HID { HelpID = HID_BG_BTN_IMG2; } ; -#define HID_BG_BTN_IMG3 34299 +// #define HID_BG_BTN_IMG3 34299 hidspecial HID { HelpID = HID_BG_BTN_IMG3; } ; -#define HID_BG_BTN_IMG4 34300 +// #define HID_BG_BTN_IMG4 34300 hidspecial HID { HelpID = HID_BG_BTN_IMG4; } ; -#define HID_BG_BTN_IMG5 34301 +// #define HID_BG_BTN_IMG5 34301 hidspecial HID { HelpID = HID_BG_BTN_IMG5; } ; -#define HID_BG_BTN_IMG6 34302 +// #define HID_BG_BTN_IMG6 34302 hidspecial HID { HelpID = HID_BG_BTN_IMG6; } ; -#define HID_BG_BTN_IMG7 34303 +// #define HID_BG_BTN_IMG7 34303 hidspecial HID { HelpID = HID_BG_BTN_IMG7; } ; -#define HID_BG_BTN_IMG8 34304 +// #define HID_BG_BTN_IMG8 34304 hidspecial HID { HelpID = HID_BG_BTN_IMG8; } ; -#define HID_BG_BTN_IMG9 34305 +// #define HID_BG_BTN_IMG9 34305 hidspecial HID { HelpID = HID_BG_BTN_IMG9; } ; -#define HID_BG_BTN_IMG10 34306 +// #define HID_BG_BTN_IMG10 34306 hidspecial HID { HelpID = HID_BG_BTN_IMG10; } ; -#define HID_BG_BTN_IMG11 34307 +// #define HID_BG_BTN_IMG11 34307 hidspecial HID { HelpID = HID_BG_BTN_IMG11; } ; -#define HID_BG_BTN_IMG12 34308 +// #define HID_BG_BTN_IMG12 34308 hidspecial HID { HelpID = HID_BG_BTN_IMG12; } ; -#define HID_BG_BTN_IMG13 34309 +// #define HID_BG_BTN_IMG13 34309 hidspecial HID { HelpID = HID_BG_BTN_IMG13; } ; -#define HID_BG_BTN_IMG14 34300 +// #define HID_BG_BTN_IMG14 34300 hidspecial HID { HelpID = HID_BG_BTN_IMG14; } ; -#define HID_BG_BTN_IMG15 34311 +// #define HID_BG_BTN_IMG15 34311 hidspecial HID { HelpID = HID_BG_BTN_IMG15; } ; -#define HID_BG_BTN_IMG16 34312 +// #define HID_BG_BTN_IMG16 34312 hidspecial HID { HelpID = HID_BG_BTN_IMG16; } ; // ++++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -255,118 +256,118 @@ hidspecial HID { HelpID = HID_BG_BTN_IMG16; } ; // REPORT WIZARD // ************* -#define HID_DLGREPORT_DIALOG 34320 +// #define HID_DLGREPORT_DIALOG 34320 hidspecial HID { HelpID = HID_DLGREPORT_DIALOG; }; -#define HID_DLGREPORT_0_CMDPREV 34322 +// #define HID_DLGREPORT_0_CMDPREV 34322 hidspecial HID { HelpID = HID_DLGREPORT_0_CMDPREV; }; -#define HID_DLGREPORT_0_CMDNEXT 34323 +// #define HID_DLGREPORT_0_CMDNEXT 34323 hidspecial HID { HelpID = HID_DLGREPORT_0_CMDNEXT; }; -#define HID_DLGREPORT_0_CMDFINISH 34324 +// #define HID_DLGREPORT_0_CMDFINISH 34324 hidspecial HID { HelpID = HID_DLGREPORT_0_CMDFINISH; }; -#define HID_DLGREPORT_0_CMDCANCEL 34325 +// #define HID_DLGREPORT_0_CMDCANCEL 34325 hidspecial HID { HelpID = HID_DLGREPORT_0_CMDCANCEL; }; -#define HID_DLGREPORT_1_LBTABLES 34330 +// #define HID_DLGREPORT_1_LBTABLES 34330 hidspecial HID { HelpID = HID_DLGREPORT_1_LBTABLES; }; -#define HID_DLGREPORT_1_FIELDSAVAILABLE 34331 +// #define HID_DLGREPORT_1_FIELDSAVAILABLE 34331 hidspecial HID { HelpID = HID_DLGREPORT_1_FIELDSAVAILABLE; }; -#define HID_DLGREPORT_1_CMDMOVESELECTED 34332 +// #define HID_DLGREPORT_1_CMDMOVESELECTED 34332 hidspecial HID { HelpID = HID_DLGREPORT_1_CMDMOVESELECTED; }; -#define HID_DLGREPORT_1_CMDMOVEALL 34333 +// #define HID_DLGREPORT_1_CMDMOVEALL 34333 hidspecial HID { HelpID = HID_DLGREPORT_1_CMDMOVEALL; }; -#define HID_DLGREPORT_1_CMDREMOVESELECTED 34334 +// #define HID_DLGREPORT_1_CMDREMOVESELECTED 34334 hidspecial HID { HelpID = HID_DLGREPORT_1_CMDREMOVESELECTED; }; -#define HID_DLGREPORT_1_CMDREMOVEALL 34335 +// #define HID_DLGREPORT_1_CMDREMOVEALL 34335 hidspecial HID { HelpID = HID_DLGREPORT_1_CMDREMOVEALL; }; -#define HID_DLGREPORT_1_FIELDSSELECTED 34336 +// #define HID_DLGREPORT_1_FIELDSSELECTED 34336 hidspecial HID { HelpID = HID_DLGREPORT_1_FIELDSSELECTED; }; -#define HID_DLGREPORT_1_CMDMOVEUP 34337 +// #define HID_DLGREPORT_1_CMDMOVEUP 34337 hidspecial HID { HelpID = HID_DLGREPORT_1_CMDMOVEUP; }; -#define HID_DLGREPORT_1_CMDMOVEDOWN 34338 +// #define HID_DLGREPORT_1_CMDMOVEDOWN 34338 hidspecial HID { HelpID = HID_DLGREPORT_1_CMDMOVEDOWN; }; -#define HID_DLGREPORT_2_GROUPING 34340 +// #define HID_DLGREPORT_2_GROUPING 34340 hidspecial HID { HelpID = HID_DLGREPORT_2_GROUPING; }; -#define HID_DLGREPORT_2_CMDGROUP 34341 +// #define HID_DLGREPORT_2_CMDGROUP 34341 hidspecial HID { HelpID = HID_DLGREPORT_2_CMDGROUP; }; -#define HID_DLGREPORT_2_CMDUNGROUP 34342 +// #define HID_DLGREPORT_2_CMDUNGROUP 34342 hidspecial HID { HelpID = HID_DLGREPORT_2_CMDUNGROUP; }; -#define HID_DLGREPORT_2_PREGROUPINGDEST 34343 +// #define HID_DLGREPORT_2_PREGROUPINGDEST 34343 hidspecial HID { HelpID = HID_DLGREPORT_2_PREGROUPINGDEST; }; -#define HID_DLGREPORT_2_CMDMOVEUPGROUP 34344 +// #define HID_DLGREPORT_2_CMDMOVEUPGROUP 34344 hidspecial HID { HelpID = HID_DLGREPORT_2_CMDMOVEUPGROUP; }; -#define HID_DLGREPORT_2_CMDMOVEDOWNGROUP 34345 +// #define HID_DLGREPORT_2_CMDMOVEDOWNGROUP 34345 hidspecial HID { HelpID = HID_DLGREPORT_2_CMDMOVEDOWNGROUP; }; -#define HID_DLGREPORT_3_SORT1 34346 +// #define HID_DLGREPORT_3_SORT1 34346 hidspecial HID { HelpID = HID_DLGREPORT_3_SORT1; }; -#define HID_DLGREPORT_3_OPTASCEND1 34347 +// #define HID_DLGREPORT_3_OPTASCEND1 34347 hidspecial HID { HelpID = HID_DLGREPORT_3_OPTASCEND1; }; -#define HID_DLGREPORT_3_OPTDESCEND1 34348 +// #define HID_DLGREPORT_3_OPTDESCEND1 34348 hidspecial HID { HelpID = HID_DLGREPORT_3_OPTDESCEND1; }; -#define HID_DLGREPORT_3_SORT2 34349 +// #define HID_DLGREPORT_3_SORT2 34349 hidspecial HID { HelpID = HID_DLGREPORT_3_SORT2; }; -#define HID_DLGREPORT_3_OPTASCEND2 34350 +// #define HID_DLGREPORT_3_OPTASCEND2 34350 hidspecial HID { HelpID = HID_DLGREPORT_3_OPTASCEND2; }; -#define HID_DLGREPORT_3_OPTDESCEND2 34351 +// #define HID_DLGREPORT_3_OPTDESCEND2 34351 hidspecial HID { HelpID = HID_DLGREPORT_3_OPTDESCEND2; }; -#define HID_DLGREPORT_3_SORT3 34352 +// #define HID_DLGREPORT_3_SORT3 34352 hidspecial HID { HelpID = HID_DLGREPORT_3_SORT3; }; -#define HID_DLGREPORT_3_OPTASCEND3 34353 +// #define HID_DLGREPORT_3_OPTASCEND3 34353 hidspecial HID { HelpID = HID_DLGREPORT_3_OPTASCEND3; }; -#define HID_DLGREPORT_3_OPTDESCEND3 34354 +// #define HID_DLGREPORT_3_OPTDESCEND3 34354 hidspecial HID { HelpID = HID_DLGREPORT_3_OPTDESCEND3; }; -#define HID_DLGREPORT_3_SORT4 34355 +// #define HID_DLGREPORT_3_SORT4 34355 hidspecial HID { HelpID = HID_DLGREPORT_3_SORT4; }; -#define HID_DLGREPORT_3_OPTASCEND4 34356 +// #define HID_DLGREPORT_3_OPTASCEND4 34356 hidspecial HID { HelpID = HID_DLGREPORT_3_OPTASCEND4; }; -#define HID_DLGREPORT_3_OPTDESCEND4 34357 +// #define HID_DLGREPORT_3_OPTDESCEND4 34357 hidspecial HID { HelpID = HID_DLGREPORT_3_OPTDESCEND4; }; -#define HID_DLGREPORT_4_TITLE 34362 +// #define HID_DLGREPORT_4_TITLE 34362 hidspecial HID { HelpID = HID_DLGREPORT_4_TITLE; }; -#define HID_DLGREPORT_4_DATALAYOUT 34363 +// #define HID_DLGREPORT_4_DATALAYOUT 34363 hidspecial HID { HelpID = HID_DLGREPORT_4_DATALAYOUT; }; -#define HID_DLGREPORT_4_PAGELAYOUT 34364 +// #define HID_DLGREPORT_4_PAGELAYOUT 34364 hidspecial HID { HelpID = HID_DLGREPORT_4_PAGELAYOUT; }; -#define HID_DLGREPORT_4_LANDSCAPE 34365 +// #define HID_DLGREPORT_4_LANDSCAPE 34365 hidspecial HID { HelpID = HID_DLGREPORT_4_LANDSCAPE; }; -#define HID_DLGREPORT_4_PORTRAIT 34366 +// #define HID_DLGREPORT_4_PORTRAIT 34366 hidspecial HID { HelpID = HID_DLGREPORT_4_PORTRAIT; }; -#define HID_DLGREPORT_5_OPTDYNTEMPLATE 34370 +// #define HID_DLGREPORT_5_OPTDYNTEMPLATE 34370 hidspecial HID { HelpID = HID_DLGREPORT_5_OPTDYNTEMPLATE; }; -#define HID_DLGREPORT_5_OPTSTATDOCUMENT 34371 +// #define HID_DLGREPORT_5_OPTSTATDOCUMENT 34371 hidspecial HID { HelpID = HID_DLGREPORT_5_OPTSTATDOCUMENT; }; -#define HID_DLGREPORT_5_TXTTEMPLATEPATH 34372 +// #define HID_DLGREPORT_5_TXTTEMPLATEPATH 34372 hidspecial HID { HelpID = HID_DLGREPORT_5_TXTTEMPLATEPATH; }; -#define HID_DLGREPORT_5_CMDTEMPLATEPATH 34373 +// #define HID_DLGREPORT_5_CMDTEMPLATEPATH 34373 hidspecial HID { HelpID = HID_DLGREPORT_5_CMDTEMPLATEPATH; }; -#define HID_DLGREPORT_5_OPTEDITTEMPLATE 34374 +// #define HID_DLGREPORT_5_OPTEDITTEMPLATE 34374 hidspecial HID { HelpID = HID_DLGREPORT_5_OPTEDITTEMPLATE; }; -#define HID_DLGREPORT_5_OPTUSETEMPLATE 34375 +// #define HID_DLGREPORT_5_OPTUSETEMPLATE 34375 hidspecial HID { HelpID = HID_DLGREPORT_5_OPTUSETEMPLATE; }; -#define HID_DLGREPORT_5_TXTDOCUMENTPATH 34376 +// #define HID_DLGREPORT_5_TXTDOCUMENTPATH 34376 hidspecial HID { HelpID = HID_DLGREPORT_5_TXTDOCUMENTPATH; }; -#define HID_DLGREPORT_5_CMDDOCUMENTPATH 34377 +// #define HID_DLGREPORT_5_CMDDOCUMENTPATH 34377 hidspecial HID { HelpID = HID_DLGREPORT_5_CMDDOCUMENTPATH; }; -#define HID_DLGREPORT_5_CHKLINKTODB 34378 +// #define HID_DLGREPORT_5_CHKLINKTODB 34378 hidspecial HID { HelpID = HID_DLGREPORT_5_CHKLINKTODB; }; -#define HID_DLGREPORT_6_TXTTITLE_1 34381 +// #define HID_DLGREPORT_6_TXTTITLE_1 34381 hidspecial HID { HelpID = HID_DLGREPORT_6_TXTTITLE_1; }; -#define HID_DLGREPORT_6_TXTTITLE_2 34382 +// #define HID_DLGREPORT_6_TXTTITLE_2 34382 hidspecial HID { HelpID = HID_DLGREPORT_6_TXTTITLE_2; }; -#define HID_DLGREPORT_6_TXTTITLE_3 34383 +// #define HID_DLGREPORT_6_TXTTITLE_3 34383 hidspecial HID { HelpID = HID_DLGREPORT_6_TXTTITLE_3; }; -#define HID_DLGREPORT_6_TXTTITLE_4 34384 +// #define HID_DLGREPORT_6_TXTTITLE_4 34384 hidspecial HID { HelpID = HID_DLGREPORT_6_TXTTITLE_4; }; -#define HID_DLGREPORT_6_TXTTITLE_5 34385 +// #define HID_DLGREPORT_6_TXTTITLE_5 34385 hidspecial HID { HelpID = HID_DLGREPORT_6_TXTTITLE_5; }; -#define HID_DLGREPORT_6_TXTTITLE_6 34386 +// #define HID_DLGREPORT_6_TXTTITLE_6 34386 hidspecial HID { HelpID = HID_DLGREPORT_6_TXTTITLE_6; }; -#define HID_DLGREPORT_6_TXTTITLE_7 34387 +// #define HID_DLGREPORT_6_TXTTITLE_7 34387 hidspecial HID { HelpID = HID_DLGREPORT_6_TXTTITLE_7; }; @@ -376,408 +377,408 @@ hidspecial HID { HelpID = HID_DLGREPORT_6_TXTTITLE_7; }; */ -#define HID_DLGFORM_DIALOG 34400 +// #define HID_DLGFORM_DIALOG 34400 hidspecial HID { HelpID = HID_DLGFORM_DIALOG; }; -#define HID_DLGFORM_CMDPREV 34402 +// #define HID_DLGFORM_CMDPREV 34402 hidspecial HID { HelpID = HID_DLGFORM_CMDPREV; }; -#define HID_DLGFORM_CMDNEXT 34403 +// #define HID_DLGFORM_CMDNEXT 34403 hidspecial HID { HelpID = HID_DLGFORM_CMDNEXT; }; -#define HID_DLGFORM_CMDFINISH 34404 +// #define HID_DLGFORM_CMDFINISH 34404 hidspecial HID { HelpID = HID_DLGFORM_CMDFINISH; }; -#define HID_DLGFORM_CMDCANCEL 34405 +// #define HID_DLGFORM_CMDCANCEL 34405 hidspecial HID { HelpID = HID_DLGFORM_CMDCANCEL; }; -#define HID_DLGFORM_MASTER_LBTABLES 34411 +// #define HID_DLGFORM_MASTER_LBTABLES 34411 hidspecial HID { HelpID = HID_DLGFORM_MASTER_LBTABLES; }; -#define HID_DLGFORM_MASTER_FIELDSAVAILABLE 34412 +// #define HID_DLGFORM_MASTER_FIELDSAVAILABLE 34412 hidspecial HID { HelpID = HID_DLGFORM_MASTER_FIELDSAVAILABLE; }; -#define HID_DLGFORM_MASTER_CMDMOVESELECTED 34413 +// #define HID_DLGFORM_MASTER_CMDMOVESELECTED 34413 hidspecial HID { HelpID = HID_DLGFORM_MASTER_CMDMOVESELECTED; }; -#define HID_DLGFORM_MASTER_CMDMOVEALL 34414 +// #define HID_DLGFORM_MASTER_CMDMOVEALL 34414 hidspecial HID { HelpID = HID_DLGFORM_MASTER_CMDMOVEALL; }; -#define HID_DLGFORM_MASTER_CMDREMOVESELECTED 34415 +// #define HID_DLGFORM_MASTER_CMDREMOVESELECTED 34415 hidspecial HID { HelpID = HID_DLGFORM_MASTER_CMDREMOVESELECTED; }; -#define HID_DLGFORM_MASTER_CMDREMOVEALL 34416 +// #define HID_DLGFORM_MASTER_CMDREMOVEALL 34416 hidspecial HID { HelpID = HID_DLGFORM_MASTER_CMDREMOVEALL; }; -#define HID_DLGFORM_MASTER_FIELDSSELECTED 34417 +// #define HID_DLGFORM_MASTER_FIELDSSELECTED 34417 hidspecial HID { HelpID = HID_DLGFORM_MASTER_FIELDSSELECTED; }; -#define HID_DLGFORM_MASTER_CMDMOVEUP 34418 +// #define HID_DLGFORM_MASTER_CMDMOVEUP 34418 hidspecial HID { HelpID = HID_DLGFORM_MASTER_CMDMOVEUP; }; -#define HID_DLGFORM_MASTER_CMDMOVEDOWN 34419 +// #define HID_DLGFORM_MASTER_CMDMOVEDOWN 34419 hidspecial HID { HelpID = HID_DLGFORM_MASTER_CMDMOVEDOWN; }; -#define HID_DLGFORM_CHKCREATESUBFORM 34421 +// #define HID_DLGFORM_CHKCREATESUBFORM 34421 hidspecial HID { HelpID = HID_DLGFORM_CHKCREATESUBFORM; }; -#define HID_DLGFORM_OPTONEXISTINGRELATION 34422 +// #define HID_DLGFORM_OPTONEXISTINGRELATION 34422 hidspecial HID { HelpID = HID_DLGFORM_OPTONEXISTINGRELATION; }; -#define HID_DLGFORM_OPTSELECTMANUALLY 34423 +// #define HID_DLGFORM_OPTSELECTMANUALLY 34423 hidspecial HID { HelpID = HID_DLGFORM_OPTSELECTMANUALLY; }; -#define HID_DLGFORM_lstRELATIONS 34424 +// #define HID_DLGFORM_lstRELATIONS 34424 hidspecial HID { HelpID = HID_DLGFORM_lstRELATIONS; }; -#define HID_DLGFORM_SUB_LBTABLES 34431 +// #define HID_DLGFORM_SUB_LBTABLES 34431 hidspecial HID { HelpID = HID_DLGFORM_SUB_LBTABLES; }; -#define HID_DLGFORM_SUB_FIELDSAVAILABLE 34432 +// #define HID_DLGFORM_SUB_FIELDSAVAILABLE 34432 hidspecial HID { HelpID = HID_DLGFORM_SUB_FIELDSAVAILABLE; }; -#define HID_DLGFORM_SUB_CMDMOVESELECTED 34433 +// #define HID_DLGFORM_SUB_CMDMOVESELECTED 34433 hidspecial HID { HelpID = HID_DLGFORM_SUB_CMDMOVESELECTED; }; -#define HID_DLGFORM_SUB_CMDMOVEALL 34434 +// #define HID_DLGFORM_SUB_CMDMOVEALL 34434 hidspecial HID { HelpID = HID_DLGFORM_SUB_CMDMOVEALL; }; -#define HID_DLGFORM_SUB_CMDREMOVESELECTED 34435 +// #define HID_DLGFORM_SUB_CMDREMOVESELECTED 34435 hidspecial HID { HelpID = HID_DLGFORM_SUB_CMDREMOVESELECTED; }; -#define HID_DLGFORM_SUB_CMDREMOVEALL 34436 +// #define HID_DLGFORM_SUB_CMDREMOVEALL 34436 hidspecial HID { HelpID = HID_DLGFORM_SUB_CMDREMOVEALL; }; -#define HID_DLGFORM_SUB_FIELDSSELECTED 34437 +// #define HID_DLGFORM_SUB_FIELDSSELECTED 34437 hidspecial HID { HelpID = HID_DLGFORM_SUB_FIELDSSELECTED; }; -#define HID_DLGFORM_SUB_CMDMOVEUP 34438 +// #define HID_DLGFORM_SUB_CMDMOVEUP 34438 hidspecial HID { HelpID = HID_DLGFORM_SUB_CMDMOVEUP; }; -#define HID_DLGFORM_SUB_CMDMOVEDOWN 34439 +// #define HID_DLGFORM_SUB_CMDMOVEDOWN 34439 hidspecial HID { HelpID = HID_DLGFORM_SUB_CMDMOVEDOWN; }; -#define HID_DLGFORM_LINKER_LSTSLAVELINK1 34441 +// #define HID_DLGFORM_LINKER_LSTSLAVELINK1 34441 hidspecial HID { HelpID = HID_DLGFORM_LINKER_LSTSLAVELINK1; }; -#define HID_DLGFORM_LINKER_LSTMASTERLINK1 34442 +// #define HID_DLGFORM_LINKER_LSTMASTERLINK1 34442 hidspecial HID { HelpID = HID_DLGFORM_LINKER_LSTMASTERLINK1; }; -#define HID_DLGFORM_LINKER_LSTSLAVELINK2 34443 +// #define HID_DLGFORM_LINKER_LSTSLAVELINK2 34443 hidspecial HID { HelpID = HID_DLGFORM_LINKER_LSTSLAVELINK2; }; -#define HID_DLGFORM_LINKER_LSTMASTERLINK2 34444 +// #define HID_DLGFORM_LINKER_LSTMASTERLINK2 34444 hidspecial HID { HelpID = HID_DLGFORM_LINKER_LSTMASTERLINK2; }; -#define HID_DLGFORM_LINKER_LSTSLAVELINK3 34445 +// #define HID_DLGFORM_LINKER_LSTSLAVELINK3 34445 hidspecial HID { HelpID = HID_DLGFORM_LINKER_LSTSLAVELINK3; }; -#define HID_DLGFORM_LINKER_LSTMASTERLINK3 34446 +// #define HID_DLGFORM_LINKER_LSTMASTERLINK3 34446 hidspecial HID { HelpID = HID_DLGFORM_LINKER_LSTMASTERLINK3; }; -#define HID_DLGFORM_LINKER_LSTSLAVELINK4 34447 +// #define HID_DLGFORM_LINKER_LSTSLAVELINK4 34447 hidspecial HID { HelpID = HID_DLGFORM_LINKER_LSTSLAVELINK4; }; -#define HID_DLGFORM_LINKER_LSTMASTERLINK4 34448 +// #define HID_DLGFORM_LINKER_LSTMASTERLINK4 34448 hidspecial HID { HelpID = HID_DLGFORM_LINKER_LSTMASTERLINK4; }; -#define HID_DLGFORM_CMDALIGNLEFT 34451 +// #define HID_DLGFORM_CMDALIGNLEFT 34451 hidspecial HID { HelpID = HID_DLGFORM_CMDALIGNLEFT; }; -#define HID_DLGFORM_CMDALIGNRIGHT 34452 +// #define HID_DLGFORM_CMDALIGNRIGHT 34452 hidspecial HID { HelpID = HID_DLGFORM_CMDALIGNRIGHT; }; -#define HID_DLGFORM_CMDLEFTLABELED 34453 +// #define HID_DLGFORM_CMDLEFTLABELED 34453 hidspecial HID { HelpID = HID_DLGFORM_CMDLEFTLABELED; }; -#define HID_DLGFORM_CMDTOPLABELED 34454 +// #define HID_DLGFORM_CMDTOPLABELED 34454 hidspecial HID { HelpID = HID_DLGFORM_CMDTOPLABELED; }; -#define HID_DLGFORM_CMDTABLESTYLE 34455 +// #define HID_DLGFORM_CMDTABLESTYLE 34455 hidspecial HID { HelpID = HID_DLGFORM_CMDTABLESTYLE; }; -#define HID_DLGFORM_CMDTOPJUSTIFIED 34456 +// #define HID_DLGFORM_CMDTOPJUSTIFIED 34456 hidspecial HID { HelpID = HID_DLGFORM_CMDTOPJUSTIFIED; }; -#define HID_DLGFORM_CMDLEFTLABELED2 34457 +// #define HID_DLGFORM_CMDLEFTLABELED2 34457 hidspecial HID { HelpID = HID_DLGFORM_CMDLEFTLABELED2; }; -#define HID_DLGFORM_CMDTOPLABELED2 34458 +// #define HID_DLGFORM_CMDTOPLABELED2 34458 hidspecial HID { HelpID = HID_DLGFORM_CMDTOPLABELED2; }; -#define HID_DLGFORM_CMDTABLESTYLE2 34459 +// #define HID_DLGFORM_CMDTABLESTYLE2 34459 hidspecial HID { HelpID = HID_DLGFORM_CMDTABLESTYLE2; }; -#define HID_DLGFORM_CMDTOPJUSTIFIED2 34460 +// #define HID_DLGFORM_CMDTOPJUSTIFIED2 34460 hidspecial HID { HelpID = HID_DLGFORM_CMDTOPJUSTIFIED2; }; -#define HID_DLGFORM_OPTNEWDATAONLY 34461 +// #define HID_DLGFORM_OPTNEWDATAONLY 34461 hidspecial HID { HelpID = HID_DLGFORM_OPTNEWDATAONLY; }; -#define HID_DLGFORM_OPTDISPLAYALLDATA 34462 +// #define HID_DLGFORM_OPTDISPLAYALLDATA 34462 hidspecial HID { HelpID = HID_DLGFORM_OPTDISPLAYALLDATA; }; -#define HID_DLGFORM_CHKNOMODIFICATION 34463 +// #define HID_DLGFORM_CHKNOMODIFICATION 34463 hidspecial HID { HelpID = HID_DLGFORM_CHKNOMODIFICATION; }; -#define HID_DLGFORM_CHKNODELETION 34464 +// #define HID_DLGFORM_CHKNODELETION 34464 hidspecial HID { HelpID = HID_DLGFORM_CHKNODELETION; }; -#define HID_DLGFORM_CHKNOADDITION 34465 +// #define HID_DLGFORM_CHKNOADDITION 34465 hidspecial HID { HelpID = HID_DLGFORM_CHKNOADDITION; }; -#define HID_DLGFORM_LSTSTYLES 34471 +// #define HID_DLGFORM_LSTSTYLES 34471 hidspecial HID { HelpID = HID_DLGFORM_LSTSTYLES; }; -#define HID_DLGFORM_CMDNOBORDER 34472 +// #define HID_DLGFORM_CMDNOBORDER 34472 hidspecial HID { HelpID = HID_DLGFORM_CMDNOBORDER; }; -#define HID_DLGFORM_CMD3DBORDER 34473 +// #define HID_DLGFORM_CMD3DBORDER 34473 hidspecial HID { HelpID = HID_DLGFORM_CMD3DBORDER; }; -#define HID_DLGFORM_CMDSIMPLEBORDER 34474 +// #define HID_DLGFORM_CMDSIMPLEBORDER 34474 hidspecial HID { HelpID = HID_DLGFORM_CMDSIMPLEBORDER; }; -#define HID_DLGFORM_TXTPATH 34481 +// #define HID_DLGFORM_TXTPATH 34481 hidspecial HID { HelpID = HID_DLGFORM_TXTPATH; }; -#define HID_DLGFORM_OPTWORKWITHFORM 34482 +// #define HID_DLGFORM_OPTWORKWITHFORM 34482 hidspecial HID { HelpID = HID_DLGFORM_OPTWORKWITHFORM; }; -#define HID_DLGFORM_OPTMODIFYFORM 34483 +// #define HID_DLGFORM_OPTMODIFYFORM 34483 hidspecial HID { HelpID = HID_DLGFORM_OPTMODIFYFORM; }; -#define HID_DLGNEWSLTR_DIALOG 34500 +// #define HID_DLGNEWSLTR_DIALOG 34500 hidspecial HID { HelpID = HID_DLGNEWSLTR_DIALOG; }; -#define HID_DLGNEWSLTR_OPTSTANDARDLAYOUT 34501 +// #define HID_DLGNEWSLTR_OPTSTANDARDLAYOUT 34501 hidspecial HID { HelpID = HID_DLGNEWSLTR_OPTSTANDARDLAYOUT; }; -#define HID_DLGNEWSLTR_OPTPARTYLAYOUT 34502 +// #define HID_DLGNEWSLTR_OPTPARTYLAYOUT 34502 hidspecial HID { HelpID = HID_DLGNEWSLTR_OPTPARTYLAYOUT; }; -#define HID_DLGNEWSLTR_OPTBROCHURELAYOUT 34503 +// #define HID_DLGNEWSLTR_OPTBROCHURELAYOUT 34503 hidspecial HID { HelpID = HID_DLGNEWSLTR_OPTBROCHURELAYOUT; }; -#define HID_DLGNEWSLTR_OPTSINGLESIDED 34504 +// #define HID_DLGNEWSLTR_OPTSINGLESIDED 34504 hidspecial HID { HelpID = HID_DLGNEWSLTR_OPTSINGLESIDED; }; -#define HID_DLGNEWSLTR_OPTDOUBLESIDED 34505 +// #define HID_DLGNEWSLTR_OPTDOUBLESIDED 34505 hidspecial HID { HelpID = HID_DLGNEWSLTR_OPTDOUBLESIDED; }; -#define HID_DLGNEWSLTR_CMDGOON 34506 +// #define HID_DLGNEWSLTR_CMDGOON 34506 hidspecial HID { HelpID = HID_DLGNEWSLTR_CMDGOON; }; -#define HID_DLGDEPOT_DIALOG_SELLBUY 34520 +// #define HID_DLGDEPOT_DIALOG_SELLBUY 34520 hidspecial HID { HelpID = HID_DLGDEPOT_DIALOG_SELLBUY ; }; -#define HID_DLGDEPOT_0_TXTSTOCKID_SELLBUY 34521 +// #define HID_DLGDEPOT_0_TXTSTOCKID_SELLBUY 34521 hidspecial HID { HelpID = HID_DLGDEPOT_0_TXTSTOCKID_SELLBUY ; }; -#define HID_DLGDEPOT_0_TXTQUANTITY 34522 +// #define HID_DLGDEPOT_0_TXTQUANTITY 34522 hidspecial HID { HelpID = HID_DLGDEPOT_0_TXTQUANTITY ; }; -#define HID_DLGDEPOT_0_TXTRATE 34523 +// #define HID_DLGDEPOT_0_TXTRATE 34523 hidspecial HID { HelpID = HID_DLGDEPOT_0_TXTRATE ; }; -#define HID_DLGDEPOT_0_TXTDATE 34524 +// #define HID_DLGDEPOT_0_TXTDATE 34524 hidspecial HID { HelpID = HID_DLGDEPOT_0_TXTDATE ; }; -#define HID_DLGDEPOT_0_TXTCOMMISSION 34525 +// #define HID_DLGDEPOT_0_TXTCOMMISSION 34525 hidspecial HID { HelpID = HID_DLGDEPOT_0_TXTCOMMISSION ; }; -#define HID_DLGDEPOT_0_TXTFIX 34526 +// #define HID_DLGDEPOT_0_TXTFIX 34526 hidspecial HID { HelpID = HID_DLGDEPOT_0_TXTFIX ; }; -#define HID_DLGDEPOT_0_TXTMINIMUM 34527 +// #define HID_DLGDEPOT_0_TXTMINIMUM 34527 hidspecial HID { HelpID = HID_DLGDEPOT_0_TXTMINIMUM ; }; -#define HID_DLGDEPOT_0_CMDCANCEL_SELLBUY 34528 +// #define HID_DLGDEPOT_0_CMDCANCEL_SELLBUY 34528 hidspecial HID { HelpID = HID_DLGDEPOT_0_CMDCANCEL_SELLBUY ; }; -#define HID_DLGDEPOT_0_CMDGOON_SELLBUY 34529 +// #define HID_DLGDEPOT_0_CMDGOON_SELLBUY 34529 hidspecial HID { HelpID = HID_DLGDEPOT_0_CMDGOON_SELLBUY ; }; -#define HID_DLGDEPOT_1_LSTSELLSTOCKS 34530 +// #define HID_DLGDEPOT_1_LSTSELLSTOCKS 34530 hidspecial HID { HelpID = HID_DLGDEPOT_1_LSTSELLSTOCKS ; }; -#define HID_DLGDEPOT_2_LSTBUYSTOCKS 34531 +// #define HID_DLGDEPOT_2_LSTBUYSTOCKS 34531 hidspecial HID { HelpID = HID_DLGDEPOT_2_LSTBUYSTOCKS ; }; -#define HID_DLGDEPOT_DIALOG_SPLIT 34532 +// #define HID_DLGDEPOT_DIALOG_SPLIT 34532 hidspecial HID { HelpID = HID_DLGDEPOT_DIALOG_SPLIT ; }; -#define HID_DLGDEPOT_0_LSTSTOCKNAMES 34533 +// #define HID_DLGDEPOT_0_LSTSTOCKNAMES 34533 hidspecial HID { HelpID = HID_DLGDEPOT_0_LSTSTOCKNAMES ; }; -#define HID_DLGDEPOT_0_TXTSTOCKID_SPLIT 34534 +// #define HID_DLGDEPOT_0_TXTSTOCKID_SPLIT 34534 hidspecial HID { HelpID = HID_DLGDEPOT_0_TXTSTOCKID_SPLIT ; }; -#define HID_DLGDEPOT_0_CMDCANCEL_SPLIT 34535 +// #define HID_DLGDEPOT_0_CMDCANCEL_SPLIT 34535 hidspecial HID { HelpID = HID_DLGDEPOT_0_CMDCANCEL_SPLIT ; }; -#define HID_DLGDEPOT_0_CMDGOON_SPLIT 34536 +// #define HID_DLGDEPOT_0_CMDGOON_SPLIT 34536 hidspecial HID { HelpID = HID_DLGDEPOT_0_CMDGOON_SPLIT ; }; -#define HID_DLGDEPOT_1_OPTPERSHARE 34537 +// #define HID_DLGDEPOT_1_OPTPERSHARE 34537 hidspecial HID { HelpID = HID_DLGDEPOT_1_OPTPERSHARE ; }; -#define HID_DLGDEPOT_1_OPTTOTAL 34538 +// #define HID_DLGDEPOT_1_OPTTOTAL 34538 hidspecial HID { HelpID = HID_DLGDEPOT_1_OPTTOTAL ; }; -#define HID_DLGDEPOT_1_TXTDIVIDEND 34539 +// #define HID_DLGDEPOT_1_TXTDIVIDEND 34539 hidspecial HID { HelpID = HID_DLGDEPOT_1_TXTDIVIDEND ; }; -#define HID_DLGDEPOT_2_TXTOLDRATE 34540 +// #define HID_DLGDEPOT_2_TXTOLDRATE 34540 hidspecial HID { HelpID = HID_DLGDEPOT_2_TXTOLDRATE ; }; -#define HID_DLGDEPOT_2_TXTNEWRATE 34541 +// #define HID_DLGDEPOT_2_TXTNEWRATE 34541 hidspecial HID { HelpID = HID_DLGDEPOT_2_TXTNEWRATE ; }; -#define HID_DLGDEPOT_2_TXTDATE 34542 +// #define HID_DLGDEPOT_2_TXTDATE 34542 hidspecial HID { HelpID = HID_DLGDEPOT_2_TXTDATE ; }; -#define HID_DLGDEPOT_3_TXTSTARTDATE 34543 +// #define HID_DLGDEPOT_3_TXTSTARTDATE 34543 hidspecial HID { HelpID = HID_DLGDEPOT_3_TXTSTARTDATE ; }; -#define HID_DLGDEPOT_3_TXTENDDATE 34544 +// #define HID_DLGDEPOT_3_TXTENDDATE 34544 hidspecial HID { HelpID = HID_DLGDEPOT_3_TXTENDDATE ; }; -#define HID_DLGDEPOT_3_OPTDAILY 34545 +// #define HID_DLGDEPOT_3_OPTDAILY 34545 hidspecial HID { HelpID = HID_DLGDEPOT_3_OPTDAILY ; }; -#define HID_DLGDEPOT_3_OPTWEEKLY 34546 +// #define HID_DLGDEPOT_3_OPTWEEKLY 34546 hidspecial HID { HelpID = HID_DLGDEPOT_3_OPTWEEKLY ; }; -#define HID_DLGDEPOT_DIALOG_HISTORY 34547 +// #define HID_DLGDEPOT_DIALOG_HISTORY 34547 hidspecial HID { HelpID = HID_DLGDEPOT_DIALOG_HISTORY ; }; -#define HID_DLGDEPOT_LSTMARKETS 34548 +// #define HID_DLGDEPOT_LSTMARKETS 34548 hidspecial HID { HelpID = HID_DLGDEPOT_LSTMARKETS ; }; -#define HID_DLGDEPOT_0_CMDCANCEL_HISTORY 34549 +// #define HID_DLGDEPOT_0_CMDCANCEL_HISTORY 34549 hidspecial HID { HelpID = HID_DLGDEPOT_0_CMDCANCEL_HISTORY ; }; -#define HID_DLGDEPOT_0_CMDGOON_HISTORY 34550 +// #define HID_DLGDEPOT_0_CMDGOON_HISTORY 34550 hidspecial HID { HelpID = HID_DLGDEPOT_0_CMDGOON_HISTORY ; }; -#define HID_DLGIMPORT_DIALOG 34570 +// #define HID_DLGIMPORT_DIALOG 34570 hidspecial HID { HelpID = HID_DLGIMPORT_DIALOG; }; -#define HID_DLGIMPORT_0_CMDHELP 34571 +// #define HID_DLGIMPORT_0_CMDHELP 34571 hidspecial HID { HelpID = HID_DLGIMPORT_0_CMDHELP; }; -#define HID_DLGIMPORT_0_CMDCANCEL 34572 +// #define HID_DLGIMPORT_0_CMDCANCEL 34572 hidspecial HID { HelpID = HID_DLGIMPORT_0_CMDCANCEL; }; -#define HID_DLGIMPORT_0_CMDPREV 34573 +// #define HID_DLGIMPORT_0_CMDPREV 34573 hidspecial HID { HelpID = HID_DLGIMPORT_0_CMDPREV; }; -#define HID_DLGIMPORT_0_CMDNEXT 34574 +// #define HID_DLGIMPORT_0_CMDNEXT 34574 hidspecial HID { HelpID = HID_DLGIMPORT_0_CMDNEXT; }; -#define HID_DLGIMPORT_0_OPTSODOCUMENTS 34575 +// #define HID_DLGIMPORT_0_OPTSODOCUMENTS 34575 hidspecial HID { HelpID = HID_DLGIMPORT_0_OPTSODOCUMENTS; }; -#define HID_DLGIMPORT_0_OPTMSDOCUMENTS 34576 +// #define HID_DLGIMPORT_0_OPTMSDOCUMENTS 34576 hidspecial HID { HelpID = HID_DLGIMPORT_0_OPTMSDOCUMENTS; }; -#define HID_DLGIMPORT_0_CHKLOGFILE 34577 +// #define HID_DLGIMPORT_0_CHKLOGFILE 34577 hidspecial HID { HelpID = HID_DLGIMPORT_0_CHKLOGFILE; }; -#define HID_DLGIMPORT_2_CHKWORD 34578 +// #define HID_DLGIMPORT_2_CHKWORD 34578 hidspecial HID { HelpID = HID_DLGIMPORT_2_CHKWORD; }; -#define HID_DLGIMPORT_2_CHKEXCEL 34579 +// #define HID_DLGIMPORT_2_CHKEXCEL 34579 hidspecial HID { HelpID = HID_DLGIMPORT_2_CHKEXCEL; }; -#define HID_DLGIMPORT_2_CHKPOWERPOINT 34580 +// #define HID_DLGIMPORT_2_CHKPOWERPOINT 34580 hidspecial HID { HelpID = HID_DLGIMPORT_2_CHKPOWERPOINT; }; -#define HID_DLGIMPORT_2_CBTEMPLATE 34581 +// #define HID_DLGIMPORT_2_CBTEMPLATE 34581 hidspecial HID { HelpID = HID_DLGIMPORT_2_CBTEMPLATE; }; -#define HID_DLGIMPORT_2_CBTEMPLATERECURSE 34582 +// #define HID_DLGIMPORT_2_CBTEMPLATERECURSE 34582 hidspecial HID { HelpID = HID_DLGIMPORT_2_CBTEMPLATERECURSE; }; -#define HID_DLGIMPORT_2_LBTEMPLATEPATH 34583 +// #define HID_DLGIMPORT_2_LBTEMPLATEPATH 34583 hidspecial HID { HelpID = HID_DLGIMPORT_2_LBTEMPLATEPATH; }; -#define HID_DLGIMPORT_2_EDTEMPLATEPATH 34584 +// #define HID_DLGIMPORT_2_EDTEMPLATEPATH 34584 hidspecial HID { HelpID = HID_DLGIMPORT_2_EDTEMPLATEPATH; }; -#define HID_DLGIMPORT_2_CBDOCUMENT 34586 +// #define HID_DLGIMPORT_2_CBDOCUMENT 34586 hidspecial HID { HelpID = HID_DLGIMPORT_2_CBDOCUMENT; }; -#define HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT 34585 +// #define HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT 34585 hidspecial HID { HelpID = HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT; }; -#define HID_DLGIMPORT_2_CBDOCUMENT 34586 +// #define HID_DLGIMPORT_2_CBDOCUMENT 34586 hidspecial HID { HelpID = HID_DLGIMPORT_2_CBDOCUMENT; }; -#define HID_DLGIMPORT_2_CBDOCUMENTRECURSE 34587 +// #define HID_DLGIMPORT_2_CBDOCUMENTRECURSE 34587 hidspecial HID { HelpID = HID_DLGIMPORT_2_CBDOCUMENTRECURSE; }; -#define HID_DLGIMPORT_2_LBDOCUMENTPATH 34588 +// #define HID_DLGIMPORT_2_LBDOCUMENTPATH 34588 hidspecial HID { HelpID = HID_DLGIMPORT_2_LBDOCUMENTPATH; }; -#define HID_DLGIMPORT_2_EDDOCUMENTPATH 34589 +// #define HID_DLGIMPORT_2_EDDOCUMENTPATH 34589 hidspecial HID { HelpID = HID_DLGIMPORT_2_EDDOCUMENTPATH; }; -#define HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT 34590 +// #define HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT 34590 hidspecial HID { HelpID = HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT; }; -#define HID_DLGIMPORT_2_LBEXPORTDOCUMENTPATH 34591 +// #define HID_DLGIMPORT_2_LBEXPORTDOCUMENTPATH 34591 hidspecial HID { HelpID = HID_DLGIMPORT_2_LBEXPORTDOCUMENTPATH; }; -#define HID_DLGIMPORT_2_EDEXPORTDOCUMENTPATH 34592 +// #define HID_DLGIMPORT_2_EDEXPORTDOCUMENTPATH 34592 hidspecial HID { HelpID = HID_DLGIMPORT_2_EDEXPORTDOCUMENTPATH; }; -#define HID_DLGIMPORT_2_CMDEXPORTPATHSELECT 34593 +// #define HID_DLGIMPORT_2_CMDEXPORTPATHSELECT 34593 hidspecial HID { HelpID = HID_DLGIMPORT_2_CMDEXPORTPATHSELECT; }; -#define HID_DLGIMPORT_3_TBSUMMARY 34595 +// #define HID_DLGIMPORT_3_TBSUMMARY 34595 hidspecial HID { HelpID = HID_DLGIMPORT_3_TBSUMMARY; }; -#define HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT2 34600 +// #define HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT2 34600 hidspecial HID { HelpID = HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT2; }; -#define HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT2 34601 +// #define HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT2 34601 hidspecial HID { HelpID = HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT2; }; -#define HID_DLGIMPORT_0_CHKWRITER 34596 +// #define HID_DLGIMPORT_0_CHKWRITER 34596 hidspecial HID { HelpID = HID_DLGIMPORT_0_CHKWRITER; }; -#define HID_DLGIMPORT_0_CHKCALC 34597 +// #define HID_DLGIMPORT_0_CHKCALC 34597 hidspecial HID { HelpID = HID_DLGIMPORT_0_CHKCALC; }; -#define HID_DLGIMPORT_0_CHKIMPRESS 34598 +// #define HID_DLGIMPORT_0_CHKIMPRESS 34598 hidspecial HID { HelpID = HID_DLGIMPORT_0_CHKIMPRESS; }; -#define HID_DLGIMPORT_0_CHKMATHGLOBAL 34599 +// #define HID_DLGIMPORT_0_CHKMATHGLOBAL 34599 hidspecial HID { HelpID = HID_DLGIMPORT_0_CHKMATHGLOBAL; }; -#define HID_DLGCORRESPONDENCE_DIALOG 34630 +// #define HID_DLGCORRESPONDENCE_DIALOG 34630 hidspecial HID { HelpID = HID_DLGCORRESPONDENCE_DIALOG; }; -#define HID_DLGCORRESPONDENCE_CANCEL 34631 +// #define HID_DLGCORRESPONDENCE_CANCEL 34631 hidspecial HID { HelpID = HID_DLGCORRESPONDENCE_CANCEL; }; -#define HID_DLGCORRESPONDENCE_OPTIONAGENDA1 34632 +// #define HID_DLGCORRESPONDENCE_OPTIONAGENDA1 34632 hidspecial HID { HelpID = HID_DLGCORRESPONDENCE_OPTIONAGENDA1; }; -#define HID_DLGCORRESPONDENCE_OPTIONAGENDA2 34633 +// #define HID_DLGCORRESPONDENCE_OPTIONAGENDA2 34633 hidspecial HID { HelpID = HID_DLGCORRESPONDENCE_OPTIONAGENDA2; }; -#define HID_DLGCORRESPONDENCE_AGENDAOKAY 34634 +// #define HID_DLGCORRESPONDENCE_AGENDAOKAY 34634 hidspecial HID { HelpID = HID_DLGCORRESPONDENCE_AGENDAOKAY; }; -#define HID_DLGCORRESPONDENCE_OPTIONLETTER1 34635 +// #define HID_DLGCORRESPONDENCE_OPTIONLETTER1 34635 hidspecial HID { HelpID = HID_DLGCORRESPONDENCE_OPTIONLETTER1; }; -#define HID_DLGCORRESPONDENCE_OPTIONLETTER2 34636 +// #define HID_DLGCORRESPONDENCE_OPTIONLETTER2 34636 hidspecial HID { HelpID = HID_DLGCORRESPONDENCE_OPTIONLETTER2; }; -#define HID_DLGCORRESPONDENCE_LETTEROKAY 34637 +// #define HID_DLGCORRESPONDENCE_LETTEROKAY 34637 hidspecial HID { HelpID = HID_DLGCORRESPONDENCE_LETTEROKAY; }; -#define HID_DLGSTYLES_DIALOG 34650 +// #define HID_DLGSTYLES_DIALOG 34650 hidspecial HID { HelpID = HID_DLGSTYLES_DIALOG; }; -#define HID_DLGSTYLES_LISTBOX 34651 +// #define HID_DLGSTYLES_LISTBOX 34651 hidspecial HID { HelpID = HID_DLGSTYLES_LISTBOX; }; -#define HID_DLGSTYLES_CANCEL 34652 +// #define HID_DLGSTYLES_CANCEL 34652 hidspecial HID { HelpID = HID_DLGSTYLES_CANCEL; }; -#define HID_DLGSTYLES_OKAY 34653 +// #define HID_DLGSTYLES_OKAY 34653 hidspecial HID { HelpID = HID_DLGSTYLES_OKAY; }; -#define HID_DLGCONVERT_DIALOG 34660 +// #define HID_DLGCONVERT_DIALOG 34660 hidspecial HID { HelpID = HID_DLGCONVERT_DIALOG; }; -#define HID_DLGCONVERT_CHECKBOX1 34661 +// #define HID_DLGCONVERT_CHECKBOX1 34661 hidspecial HID { HelpID = HID_DLGCONVERT_CHECKBOX1; }; -#define HID_DLGCONVERT_OPTIONBUTTON1 34662 +// #define HID_DLGCONVERT_OPTIONBUTTON1 34662 hidspecial HID { HelpID = HID_DLGCONVERT_OPTIONBUTTON1; }; -#define HID_DLGCONVERT_OPTIONBUTTON2 34663 +// #define HID_DLGCONVERT_OPTIONBUTTON2 34663 hidspecial HID { HelpID = HID_DLGCONVERT_OPTIONBUTTON2; }; -#define HID_DLGCONVERT_OPTIONBUTTON3 34664 +// #define HID_DLGCONVERT_OPTIONBUTTON3 34664 hidspecial HID { HelpID = HID_DLGCONVERT_OPTIONBUTTON3; }; -#define HID_DLGCONVERT_OPTIONBUTTON4 34665 +// #define HID_DLGCONVERT_OPTIONBUTTON4 34665 hidspecial HID { HelpID = HID_DLGCONVERT_OPTIONBUTTON4; }; -#define HID_DLGCONVERT_LISTBOX1 34666 +// #define HID_DLGCONVERT_LISTBOX1 34666 hidspecial HID { HelpID = HID_DLGCONVERT_LISTBOX1; }; -#define HID_DLGCONVERT_OBFILE 34667 +// #define HID_DLGCONVERT_OBFILE 34667 hidspecial HID { HelpID = HID_DLGCONVERT_OBFILE; }; -#define HID_DLGCONVERT_OBDIR 34668 +// #define HID_DLGCONVERT_OBDIR 34668 hidspecial HID { HelpID = HID_DLGCONVERT_OBDIR; }; -#define HID_DLGCONVERT_COMBOBOX1 34669 +// #define HID_DLGCONVERT_COMBOBOX1 34669 hidspecial HID { HelpID = HID_DLGCONVERT_COMBOBOX1; }; -#define HID_DLGCONVERT_TBSOURCE 34670 +// #define HID_DLGCONVERT_TBSOURCE 34670 hidspecial HID { HelpID = HID_DLGCONVERT_TBSOURCE; }; -#define HID_DLGCONVERT_CHECKRECURSIVE 34671 +// #define HID_DLGCONVERT_CHECKRECURSIVE 34671 hidspecial HID { HelpID = HID_DLGCONVERT_CHECKRECURSIVE; }; -#define HID_DLGCONVERT_TBTARGET 34672 +// #define HID_DLGCONVERT_TBTARGET 34672 hidspecial HID { HelpID = HID_DLGCONVERT_TBTARGET; }; -#define HID_DLGCONVERT_CBCANCEL 34673 +// #define HID_DLGCONVERT_CBCANCEL 34673 hidspecial HID { HelpID = HID_DLGCONVERT_CBCANCEL; }; -#define HID_DLGCONVERT_CBHELP 34674 +// #define HID_DLGCONVERT_CBHELP 34674 hidspecial HID { HelpID = HID_DLGCONVERT_CBHELP; }; -#define HID_DLGCONVERT_CBBACK 34675 +// #define HID_DLGCONVERT_CBBACK 34675 hidspecial HID { HelpID = HID_DLGCONVERT_CBBACK; }; -#define HID_DLGCONVERT_CBGOON 34676 +// #define HID_DLGCONVERT_CBGOON 34676 hidspecial HID { HelpID = HID_DLGCONVERT_CBGOON; }; -#define HID_DLGCONVERT_CBSOURCEOPEN 34677 +// #define HID_DLGCONVERT_CBSOURCEOPEN 34677 hidspecial HID { HelpID = HID_DLGCONVERT_CBSOURCEOPEN; }; -#define HID_DLGCONVERT_CBTARGETOPEN 34678 +// #define HID_DLGCONVERT_CBTARGETOPEN 34678 hidspecial HID { HelpID = HID_DLGCONVERT_CBTARGETOPEN; }; -#define HID_DLGCONVERT_CHKPROTECT 34679 +// #define HID_DLGCONVERT_CHKPROTECT 34679 hidspecial HID { HelpID = HID_DLGCONVERT_CHKPROTECT; }; -#define HID_DLGCONVERT_CHKTEXTDOCUMENTS 34680 +// #define HID_DLGCONVERT_CHKTEXTDOCUMENTS 34680 hidspecial HID { HelpID = HID_DLGCONVERT_CHKTEXTDOCUMENTS; }; -#define HID_DLGPASSWORD_CMDGOON 34690 +// #define HID_DLGPASSWORD_CMDGOON 34690 hidspecial HID { HelpID = HID_DLGPASSWORD_CMDGOON; }; -#define HID_DLGPASSWORD_CMDCANCEL 34691 +// #define HID_DLGPASSWORD_CMDCANCEL 34691 hidspecial HID { HelpID = HID_DLGPASSWORD_CMDCANCEL; }; -#define HID_DLGPASSWORD_CMDHELP 34692 +// #define HID_DLGPASSWORD_CMDHELP 34692 hidspecial HID { HelpID = HID_DLGPASSWORD_CMDHELP; }; -#define HID_DLGPASSWORD_TXTPASSWORD 34693 +// #define HID_DLGPASSWORD_TXTPASSWORD 34693 hidspecial HID { HelpID = HID_DLGPASSWORD_TXTPASSWORD; }; -#define HID_DLGHOLIDAYCAL_DIALOG 34700 +// #define HID_DLGHOLIDAYCAL_DIALOG 34700 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_DIALOG; }; -#define HID_DLGHOLIDAYCAL_1_PREVIEW 34701 +// #define HID_DLGHOLIDAYCAL_1_PREVIEW 34701 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_1_PREVIEW; }; -#define HID_DLGHOLIDAYCAL_1_OPYEAR 34702 +// #define HID_DLGHOLIDAYCAL_1_OPYEAR 34702 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_1_OPYEAR; }; -#define HID_DLGHOLIDAYCAL_1_OPMONTH 34703 +// #define HID_DLGHOLIDAYCAL_1_OPMONTH 34703 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_1_OPMONTH; }; -#define HID_DLGHOLIDAYCAL_1_EDYEAR 34704 +// #define HID_DLGHOLIDAYCAL_1_EDYEAR 34704 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_1_EDYEAR; }; -#define HID_DLGHOLIDAYCAL_1_EDMONTH 34705 +// #define HID_DLGHOLIDAYCAL_1_EDMONTH 34705 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_1_EDMONTH; }; -#define HID_DLGHOLIDAYCAL_1_SPINYEAR 34706 +// #define HID_DLGHOLIDAYCAL_1_SPINYEAR 34706 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_1_SPINYEAR; }; -#define HID_DLGHOLIDAYCAL_1_SPINMONTH 34707 +// #define HID_DLGHOLIDAYCAL_1_SPINMONTH 34707 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_1_SPINMONTH; }; -#define HID_DLGHOLIDAYCAL_1_CMBSTATE 34708 +// #define HID_DLGHOLIDAYCAL_1_CMBSTATE 34708 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_1_CMBSTATE; }; -#define HID_DLGHOLIDAYCAL_2_LBOWNDATA 34709 +// #define HID_DLGHOLIDAYCAL_2_LBOWNDATA 34709 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_LBOWNDATA; }; -#define HID_DLGHOLIDAYCAL_2_CMDINSERT 34710 +// #define HID_DLGHOLIDAYCAL_2_CMDINSERT 34710 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_CMDINSERT; }; -#define HID_DLGHOLIDAYCAL_2_CMDDELETE 34711 +// #define HID_DLGHOLIDAYCAL_2_CMDDELETE 34711 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_CMDDELETE; }; -#define HID_DLGHOLIDAYCAL_2_EDEVENT 34712 +// #define HID_DLGHOLIDAYCAL_2_EDEVENT 34712 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_EDEVENT; }; -#define HID_DLGHOLIDAYCAL_2_CHKEVENT 34713 +// #define HID_DLGHOLIDAYCAL_2_CHKEVENT 34713 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_CHKEVENT; }; -#define HID_DLGHOLIDAYCAL_2_EDEVENTDAY 34714 +// #define HID_DLGHOLIDAYCAL_2_EDEVENTDAY 34714 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_EDEVENTDAY; }; -#define HID_DLGHOLIDAYCAL_2_SPINEVENTDAY 34715 +// #define HID_DLGHOLIDAYCAL_2_SPINEVENTDAY 34715 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_SPINEVENTDAY; }; -#define HID_DLGHOLIDAYCAL_2_EDEVENTMONTH 34716 +// #define HID_DLGHOLIDAYCAL_2_EDEVENTMONTH 34716 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_EDEVENTMONTH; }; -#define HID_DLGHOLIDAYCAL_2_SPINEVENTMONTH 34717 +// #define HID_DLGHOLIDAYCAL_2_SPINEVENTMONTH 34717 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_SPINEVENTMONTH; }; -#define HID_DLGHOLIDAYCAL_2_EDEVENTYEAR 34718 +// #define HID_DLGHOLIDAYCAL_2_EDEVENTYEAR 34718 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_EDEVENTYEAR; }; -#define HID_DLGHOLIDAYCAL_2_SPINEVENTYEAR 34719 +// #define HID_DLGHOLIDAYCAL_2_SPINEVENTYEAR 34719 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_2_SPINEVENTYEAR; }; -#define HID_DLGHOLIDAYCAL_0_CMDOWNDATA 34720 +// #define HID_DLGHOLIDAYCAL_0_CMDOWNDATA 34720 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_0_CMDOWNDATA; }; -#define HID_DLGHOLIDAYCAL_0_CMDCANCEL 34721 +// #define HID_DLGHOLIDAYCAL_0_CMDCANCEL 34721 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_0_CMDCANCEL; }; -#define HID_DLGHOLIDAYCAL_0_CMDOK 34722 +// #define HID_DLGHOLIDAYCAL_0_CMDOK 34722 hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_0_CMDOK; }; //End at 34767 @@ -785,381 +786,381 @@ hidspecial HID { HelpID = HID_DLGHOLIDAYCAL_0_CMDOK; }; //LetterWizard--------------------------- -#define HID_LTRWIZ_OPTBUSINESSLETTER 40769 +// #define HID_LTRWIZ_OPTBUSINESSLETTER 40769 hidspecial HID { HelpID = HID_LTRWIZ_OPTBUSINESSLETTER; }; -#define HID_LTRWIZ_OPTPRIVOFFICIALLETTER 40770 +// #define HID_LTRWIZ_OPTPRIVOFFICIALLETTER 40770 hidspecial HID { HelpID = HID_LTRWIZ_OPTPRIVOFFICIALLETTER; }; -#define HID_LTRWIZ_OPTPRIVATELETTER 40771 +// #define HID_LTRWIZ_OPTPRIVATELETTER 40771 hidspecial HID { HelpID = HID_LTRWIZ_OPTPRIVATELETTER; }; -#define HID_LTRWIZ_LSTBUSINESSSTYLE 40772 +// #define HID_LTRWIZ_LSTBUSINESSSTYLE 40772 hidspecial HID { HelpID = HID_LTRWIZ_LSTBUSINESSSTYLE; }; -#define HID_LTRWIZ_CHKBUSINESSPAPER 40773 +// #define HID_LTRWIZ_CHKBUSINESSPAPER 40773 hidspecial HID { HelpID = HID_LTRWIZ_CHKBUSINESSPAPER; }; -#define HID_LTRWIZ_LSTPRIVOFFICIALSTYLE 40774 +// #define HID_LTRWIZ_LSTPRIVOFFICIALSTYLE 40774 hidspecial HID { HelpID = HID_LTRWIZ_LSTPRIVOFFICIALSTYLE; }; -#define HID_LTRWIZ_LSTPRIVATESTYLE 40775 +// #define HID_LTRWIZ_LSTPRIVATESTYLE 40775 hidspecial HID { HelpID = HID_LTRWIZ_LSTPRIVATESTYLE; }; -#define HID_LTRWIZ_CHKPAPERCOMPANYLOGO 40776 +// #define HID_LTRWIZ_CHKPAPERCOMPANYLOGO 40776 hidspecial HID { HelpID = HID_LTRWIZ_CHKPAPERCOMPANYLOGO; }; -#define HID_LTRWIZ_NUMLOGOHEIGHT 40777 +// #define HID_LTRWIZ_NUMLOGOHEIGHT 40777 hidspecial HID { HelpID = HID_LTRWIZ_NUMLOGOHEIGHT; }; -#define HID_LTRWIZ_NUMLOGOX 40778 +// #define HID_LTRWIZ_NUMLOGOX 40778 hidspecial HID { HelpID = HID_LTRWIZ_NUMLOGOX; }; -#define HID_LTRWIZ_NUMLOGOWIDTH 40779 +// #define HID_LTRWIZ_NUMLOGOWIDTH 40779 hidspecial HID { HelpID = HID_LTRWIZ_NUMLOGOWIDTH; }; -#define HID_LTRWIZ_NUMLOGOY 40780 +// #define HID_LTRWIZ_NUMLOGOY 40780 hidspecial HID { HelpID = HID_LTRWIZ_NUMLOGOY; }; -#define HID_LTRWIZ_CHKPAPERCOMPANYADDRESS 40781 +// #define HID_LTRWIZ_CHKPAPERCOMPANYADDRESS 40781 hidspecial HID { HelpID = HID_LTRWIZ_CHKPAPERCOMPANYADDRESS; }; -#define HID_LTRWIZ_NUMADDRESSHEIGHT 40782 +// #define HID_LTRWIZ_NUMADDRESSHEIGHT 40782 hidspecial HID { HelpID = HID_LTRWIZ_NUMADDRESSHEIGHT; }; -#define HID_LTRWIZ_NUMADDRESSX 40783 +// #define HID_LTRWIZ_NUMADDRESSX 40783 hidspecial HID { HelpID = HID_LTRWIZ_NUMADDRESSX; }; -#define HID_LTRWIZ_NUMADDRESSWIDTH 40784 +// #define HID_LTRWIZ_NUMADDRESSWIDTH 40784 hidspecial HID { HelpID = HID_LTRWIZ_NUMADDRESSWIDTH; }; -#define HID_LTRWIZ_NUMADDRESSY 40785 +// #define HID_LTRWIZ_NUMADDRESSY 40785 hidspecial HID { HelpID = HID_LTRWIZ_NUMADDRESSY; }; -#define HID_LTRWIZ_CHKCOMPANYRECEIVER 40786 +// #define HID_LTRWIZ_CHKCOMPANYRECEIVER 40786 hidspecial HID { HelpID = HID_LTRWIZ_CHKCOMPANYRECEIVER; }; -#define HID_LTRWIZ_CHKPAPERFOOTER 40787 +// #define HID_LTRWIZ_CHKPAPERFOOTER 40787 hidspecial HID { HelpID = HID_LTRWIZ_CHKPAPERFOOTER; }; -#define HID_LTRWIZ_NUMFOOTERHEIGHT 40788 +// #define HID_LTRWIZ_NUMFOOTERHEIGHT 40788 hidspecial HID { HelpID = HID_LTRWIZ_NUMFOOTERHEIGHT; }; -#define HID_LTRWIZ_LSTLETTERNORM 40789 +// #define HID_LTRWIZ_LSTLETTERNORM 40789 hidspecial HID { HelpID = HID_LTRWIZ_LSTLETTERNORM; }; -#define HID_LTRWIZ_CHKUSELOGO 40790 +// #define HID_LTRWIZ_CHKUSELOGO 40790 hidspecial HID { HelpID = HID_LTRWIZ_CHKUSELOGO; }; -#define HID_LTRWIZ_CHKUSEADDRESSRECEIVER 40791 +// #define HID_LTRWIZ_CHKUSEADDRESSRECEIVER 40791 hidspecial HID { HelpID = HID_LTRWIZ_CHKUSEADDRESSRECEIVER; }; -#define HID_LTRWIZ_CHKUSESIGNS 40792 +// #define HID_LTRWIZ_CHKUSESIGNS 40792 hidspecial HID { HelpID = HID_LTRWIZ_CHKUSESIGNS; }; -#define HID_LTRWIZ_CHKUSESUBJECT 40793 +// #define HID_LTRWIZ_CHKUSESUBJECT 40793 hidspecial HID { HelpID = HID_LTRWIZ_CHKUSESUBJECT; }; -#define HID_LTRWIZ_CHKUSESALUTATION 40794 +// #define HID_LTRWIZ_CHKUSESALUTATION 40794 hidspecial HID { HelpID = HID_LTRWIZ_CHKUSESALUTATION; }; -#define HID_LTRWIZ_LSTSALUTATION 40795 +// #define HID_LTRWIZ_LSTSALUTATION 40795 hidspecial HID { HelpID = HID_LTRWIZ_LSTSALUTATION; }; -#define HID_LTRWIZ_CHKUSEBENDMARKS 40796 +// #define HID_LTRWIZ_CHKUSEBENDMARKS 40796 hidspecial HID { HelpID = HID_LTRWIZ_CHKUSEBENDMARKS; }; -#define HID_LTRWIZ_CHKUSEGREETING 40797 +// #define HID_LTRWIZ_CHKUSEGREETING 40797 hidspecial HID { HelpID = HID_LTRWIZ_CHKUSEGREETING; }; -#define HID_LTRWIZ_LSTGREETING 40798 +// #define HID_LTRWIZ_LSTGREETING 40798 hidspecial HID { HelpID = HID_LTRWIZ_LSTGREETING; }; -#define HID_LTRWIZ_CHKUSEFOOTER 40799 +// #define HID_LTRWIZ_CHKUSEFOOTER 40799 hidspecial HID { HelpID = HID_LTRWIZ_CHKUSEFOOTER; }; -#define HID_LTRWIZ_OPTSENDERPLACEHOLDER 40800 +// #define HID_LTRWIZ_OPTSENDERPLACEHOLDER 40800 hidspecial HID { HelpID = HID_LTRWIZ_OPTSENDERPLACEHOLDER; }; -#define HID_LTRWIZ_OPTSENDERDEFINE 40801 +// #define HID_LTRWIZ_OPTSENDERDEFINE 40801 hidspecial HID { HelpID = HID_LTRWIZ_OPTSENDERDEFINE; }; -#define HID_LTRWIZ_TXTSENDERNAME 40802 +// #define HID_LTRWIZ_TXTSENDERNAME 40802 hidspecial HID { HelpID = HID_LTRWIZ_TXTSENDERNAME; }; -#define HID_LTRWIZ_TXTSENDERSTREET 40803 +// #define HID_LTRWIZ_TXTSENDERSTREET 40803 hidspecial HID { HelpID = HID_LTRWIZ_TXTSENDERSTREET; }; -#define HID_LTRWIZ_TXTSENDERPOSTCODE 40804 +// #define HID_LTRWIZ_TXTSENDERPOSTCODE 40804 hidspecial HID { HelpID = HID_LTRWIZ_TXTSENDERPOSTCODE; }; -#define HID_LTRWIZ_TXTSENDERSTATE_TEXT 40805 +// #define HID_LTRWIZ_TXTSENDERSTATE_TEXT 40805 hidspecial HID { HelpID = HID_LTRWIZ_TXTSENDERSTATE_TEXT; }; -#define HID_LTRWIZ_TXTSENDERCITY 40806 +// #define HID_LTRWIZ_TXTSENDERCITY 40806 hidspecial HID { HelpID = HID_LTRWIZ_TXTSENDERCITY; }; -#define HID_LTRWIZ_OPTRECEIVERPLACEHOLDER 40807 +// #define HID_LTRWIZ_OPTRECEIVERPLACEHOLDER 40807 hidspecial HID { HelpID = HID_LTRWIZ_OPTRECEIVERPLACEHOLDER; }; -#define HID_LTRWIZ_OPTRECEIVERDATABASE 40808 +// #define HID_LTRWIZ_OPTRECEIVERDATABASE 40808 hidspecial HID { HelpID = HID_LTRWIZ_OPTRECEIVERDATABASE; }; -#define HID_LTRWIZ_TXTFOOTER 40809 +// #define HID_LTRWIZ_TXTFOOTER 40809 hidspecial HID { HelpID = HID_LTRWIZ_TXTFOOTER; }; -#define HID_LTRWIZ_CHKFOOTERNEXTPAGES 40810 +// #define HID_LTRWIZ_CHKFOOTERNEXTPAGES 40810 hidspecial HID { HelpID = HID_LTRWIZ_CHKFOOTERNEXTPAGES; }; -#define HID_LTRWIZ_CHKFOOTERPAGENUMBERS 40811 +// #define HID_LTRWIZ_CHKFOOTERPAGENUMBERS 40811 hidspecial HID { HelpID = HID_LTRWIZ_CHKFOOTERPAGENUMBERS; }; -#define HID_LTRWIZ_TXTTEMPLATENAME 40812 +// #define HID_LTRWIZ_TXTTEMPLATENAME 40812 hidspecial HID { HelpID = HID_LTRWIZ_TXTTEMPLATENAME; }; -#define HID_LTRWIZ_OPTCREATELETTER 40813 +// #define HID_LTRWIZ_OPTCREATELETTER 40813 hidspecial HID { HelpID = HID_LTRWIZ_OPTCREATELETTER; }; -#define HID_LTRWIZ_OPTMAKECHANGES 40814 +// #define HID_LTRWIZ_OPTMAKECHANGES 40814 hidspecial HID { HelpID = HID_LTRWIZ_OPTMAKECHANGES; }; -#define HID_LTRWIZ_TXTPATH 40815 +// #define HID_LTRWIZ_TXTPATH 40815 hidspecial HID { HelpID = HID_LTRWIZ_TXTPATH; }; -#define HID_LTRWIZ_CMDPATH 40816 +// #define HID_LTRWIZ_CMDPATH 40816 hidspecial HID { HelpID = HID_LTRWIZ_CMDPATH; }; -#define HID_LTRWIZARD 40820 +// #define HID_LTRWIZARD 40820 hidspecial HID { HelpID = HID_LTRWIZARD; }; -#define HID_LTRWIZARD_HELP 40821 +// #define HID_LTRWIZARD_HELP 40821 hidspecial HID { HelpID = HID_LTRWIZARD_HELP; }; -#define HID_LTRWIZARD_BACK 40822 +// #define HID_LTRWIZARD_BACK 40822 hidspecial HID { HelpID = HID_LTRWIZARD_BACK; }; -#define HID_LTRWIZARD_NEXT 40823 +// #define HID_LTRWIZARD_NEXT 40823 hidspecial HID { HelpID = HID_LTRWIZARD_NEXT; }; -#define HID_LTRWIZARD_CREATE 40824 +// #define HID_LTRWIZARD_CREATE 40824 hidspecial HID { HelpID = HID_LTRWIZARD_CREATE; }; -#define HID_LTRWIZARD_CANCEL 40825 +// #define HID_LTRWIZARD_CANCEL 40825 hidspecial HID { HelpID = HID_LTRWIZARD_CANCEL; }; -#define HID_QUERYWIZARD_LSTTABLES 40850 +// #define HID_QUERYWIZARD_LSTTABLES 40850 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTTABLES; }; -#define HID_QUERYWIZARD_LSTFIELDS 40851 +// #define HID_QUERYWIZARD_LSTFIELDS 40851 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFIELDS; }; -#define HID_QUERYWIZARD_CMDMOVESELECTED 40852 +// #define HID_QUERYWIZARD_CMDMOVESELECTED 40852 hidspecial HID { HelpID = HID_QUERYWIZARD_CMDMOVESELECTED; }; -#define HID_QUERYWIZARD_CMDMOVEALL 40853 +// #define HID_QUERYWIZARD_CMDMOVEALL 40853 hidspecial HID { HelpID = HID_QUERYWIZARD_CMDMOVEALL; }; -#define HID_QUERYWIZARD_CMDREMOVESELECTED 40854 +// #define HID_QUERYWIZARD_CMDREMOVESELECTED 40854 hidspecial HID { HelpID = HID_QUERYWIZARD_CMDREMOVESELECTED; }; -#define HID_QUERYWIZARD_CMDREMOVEALL 40855 +// #define HID_QUERYWIZARD_CMDREMOVEALL 40855 hidspecial HID { HelpID = HID_QUERYWIZARD_CMDREMOVEALL; }; -#define HID_QUERYWIZARD_LSTSELFIELDS 40856 +// #define HID_QUERYWIZARD_LSTSELFIELDS 40856 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTSELFIELDS; }; -#define HID_QUERYWIZARD_CMDMOVEUP 40857 +// #define HID_QUERYWIZARD_CMDMOVEUP 40857 hidspecial HID { HelpID = HID_QUERYWIZARD_CMDMOVEUP; }; -#define HID_QUERYWIZARD_CMDMOVEDOWN 40858 +// #define HID_QUERYWIZARD_CMDMOVEDOWN 40858 hidspecial HID { HelpID = HID_QUERYWIZARD_CMDMOVEDOWN; }; -#define HID_QUERYWIZARD_SORT1 40865 +// #define HID_QUERYWIZARD_SORT1 40865 hidspecial HID { HelpID = HID_QUERYWIZARD_SORT1; }; -#define HID_QUERYWIZARD_OPTASCEND1 40866 +// #define HID_QUERYWIZARD_OPTASCEND1 40866 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTASCEND1; }; -#define HID_QUERYWIZARD_OPTDESCEND1 40867 +// #define HID_QUERYWIZARD_OPTDESCEND1 40867 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTDESCEND1; }; -#define HID_QUERYWIZARD_SORT2 40868 +// #define HID_QUERYWIZARD_SORT2 40868 hidspecial HID { HelpID = HID_QUERYWIZARD_SORT2; }; -#define HID_QUERYWIZARD_OPTASCEND2 40869 +// #define HID_QUERYWIZARD_OPTASCEND2 40869 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTASCEND2; }; -#define HID_QUERYWIZARD_OPTDESCEND2 40870 +// #define HID_QUERYWIZARD_OPTDESCEND2 40870 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTDESCEND2; }; -#define HID_QUERYWIZARD_SORT3 40871 +// #define HID_QUERYWIZARD_SORT3 40871 hidspecial HID { HelpID = HID_QUERYWIZARD_SORT3; }; -#define HID_QUERYWIZARD_OPTASCEND3 40872 +// #define HID_QUERYWIZARD_OPTASCEND3 40872 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTASCEND3; }; -#define HID_QUERYWIZARD_OPTDESCEND3 40873 +// #define HID_QUERYWIZARD_OPTDESCEND3 40873 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTDESCEND3; }; -#define HID_QUERYWIZARD_SORT4 40874 +// #define HID_QUERYWIZARD_SORT4 40874 hidspecial HID { HelpID = HID_QUERYWIZARD_SORT4; }; -#define HID_QUERYWIZARD_OPTASCEND4 40875 +// #define HID_QUERYWIZARD_OPTASCEND4 40875 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTASCEND4; }; -#define HID_QUERYWIZARD_OPTDESCEND4 40876 +// #define HID_QUERYWIZARD_OPTDESCEND4 40876 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTDESCEND4; }; -#define HID_QUERYWIZARD_OPTMATCHALL 40878 +// #define HID_QUERYWIZARD_OPTMATCHALL 40878 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTMATCHALL; }; -#define HID_QUERYWIZARD_OPTMATCHANY 40879 +// #define HID_QUERYWIZARD_OPTMATCHANY 40879 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTMATCHANY; }; -#define HID_QUERYWIZARD_LSTFIELDNAME_1 40880 +// #define HID_QUERYWIZARD_LSTFIELDNAME_1 40880 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFIELDNAME_1; }; -#define HID_QUERYWIZARD_LSTOPERATOR_1 40881 +// #define HID_QUERYWIZARD_LSTOPERATOR_1 40881 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTOPERATOR_1; }; -#define HID_QUERYWIZARD_TXTVALUE_1 40882 +// #define HID_QUERYWIZARD_TXTVALUE_1 40882 hidspecial HID { HelpID = HID_QUERYWIZARD_TXTVALUE_1; }; -#define HID_QUERYWIZARD_LSTFIELDNAME_2 40883 +// #define HID_QUERYWIZARD_LSTFIELDNAME_2 40883 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFIELDNAME_2; }; -#define HID_QUERYWIZARD_LSTOPERATOR_2 40884 +// #define HID_QUERYWIZARD_LSTOPERATOR_2 40884 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTOPERATOR_2; }; -#define HID_QUERYWIZARD_TXTVALUE_2 40885 +// #define HID_QUERYWIZARD_TXTVALUE_2 40885 hidspecial HID { HelpID = HID_QUERYWIZARD_TXTVALUE_2; }; -#define HID_QUERYWIZARD_LSTFIELDNAME_3 40886 +// #define HID_QUERYWIZARD_LSTFIELDNAME_3 40886 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFIELDNAME_3; }; -#define HID_QUERYWIZARD_LSTOPERATOR_3 40887 +// #define HID_QUERYWIZARD_LSTOPERATOR_3 40887 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTOPERATOR_3; }; -#define HID_QUERYWIZARD_TXTVALUE_3 40888 +// #define HID_QUERYWIZARD_TXTVALUE_3 40888 hidspecial HID { HelpID = HID_QUERYWIZARD_TXTVALUE_3; }; -#define HID_QUERYWIZARD_OPTAGGREGATEDETAILQUERY 40895 +// #define HID_QUERYWIZARD_OPTAGGREGATEDETAILQUERY 40895 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTAGGREGATEDETAILQUERY; }; -#define HID_QUERYWIZARD_OPTAGGREGATESUMMARYQUERY 40896 +// #define HID_QUERYWIZARD_OPTAGGREGATESUMMARYQUERY 40896 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTAGGREGATESUMMARYQUERY; }; -#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_1 40897 +// #define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_1 40897 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_1; }; -#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_1 40898 +// #define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_1 40898 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFIELDS_1; }; -#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_2 40899 +// #define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_2 40899 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_2; }; -#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_2 40900 +// #define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_2 40900 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFIELDS_2; }; -#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_3 40901 +// #define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_3 40901 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_3; }; -#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_3 40902 +// #define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_3 40902 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFIELDS_3; }; -#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_4 40903 +// #define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_4 40903 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_4; }; -#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_4 40904 +// #define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_4 40904 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFIELDS_4; }; -#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_5 40905 +// #define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_5 40905 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_5; }; -#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_5 40906 +// #define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_5 40906 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTAGGREGATEFIELDS_5; }; -#define HID_QUERYWIZARD_BTNAGGREGATEPLUS 40907 +// #define HID_QUERYWIZARD_BTNAGGREGATEPLUS 40907 hidspecial HID { HelpID = HID_QUERYWIZARD_BTNAGGREGATEPLUS; }; -#define HID_QUERYWIZARD_BTNAGGREGATEMINUS 40908 +// #define HID_QUERYWIZARD_BTNAGGREGATEMINUS 40908 hidspecial HID { HelpID = HID_QUERYWIZARD_BTNAGGREGATEMINUS; }; -#define HID_QUERYWIZARD_LSTFILTERFIELDS 40915 +// #define HID_QUERYWIZARD_LSTFILTERFIELDS 40915 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFILTERFIELDS; }; -#define HID_QUERYWIZARD_CMDFILTERMOVESELECTED 40916 +// #define HID_QUERYWIZARD_CMDFILTERMOVESELECTED 40916 hidspecial HID { HelpID = HID_QUERYWIZARD_CMDFILTERMOVESELECTED; }; -#define HID_QUERYWIZARD_CMDFILTERREMOVESELECTED 40917 +// #define HID_QUERYWIZARD_CMDFILTERREMOVESELECTED 40917 hidspecial HID { HelpID = HID_QUERYWIZARD_CMDFILTERREMOVESELECTED; }; -#define HID_QUERYWIZARD_LSTFILTERSELFIELDS 40918 +// #define HID_QUERYWIZARD_LSTFILTERSELFIELDS 40918 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFILTERSELFIELDS; }; -#define HID_QUERYWIZARD_CMDFILTERMOVEUP 40919 +// #define HID_QUERYWIZARD_CMDFILTERMOVEUP 40919 hidspecial HID { HelpID = HID_QUERYWIZARD_CMDFILTERMOVEUP; }; -#define HID_QUERYWIZARD_CMDFILTERMOVEDOWN 40920 +// #define HID_QUERYWIZARD_CMDFILTERMOVEDOWN 40920 hidspecial HID { HelpID = HID_QUERYWIZARD_CMDFILTERMOVEDOWN; }; -#define HID_QUERYWIZARD_OPTGROUPMATCHALL 40923 +// #define HID_QUERYWIZARD_OPTGROUPMATCHALL 40923 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTGROUPMATCHALL; }; -#define HID_QUERYWIZARD_OPTGROUPMATCHANY 40924 +// #define HID_QUERYWIZARD_OPTGROUPMATCHANY 40924 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTGROUPMATCHANY; }; -#define HID_QUERYWIZARD_LSTFILTERFIELDNAME_1 40925 +// #define HID_QUERYWIZARD_LSTFILTERFIELDNAME_1 40925 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFILTERFIELDNAME_1; }; -#define HID_QUERYWIZARD_LSTFILTEROPERATOR_1 40926 +// #define HID_QUERYWIZARD_LSTFILTEROPERATOR_1 40926 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFILTEROPERATOR_1; }; -#define HID_QUERYWIZARD_TXTFILTERVALUE_1 40927 +// #define HID_QUERYWIZARD_TXTFILTERVALUE_1 40927 hidspecial HID { HelpID = HID_QUERYWIZARD_TXTFILTERVALUE_1; }; -#define HID_QUERYWIZARD_LSTFILTERFIELDNAME_2 40928 +// #define HID_QUERYWIZARD_LSTFILTERFIELDNAME_2 40928 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFILTERFIELDNAME_2; }; -#define HID_QUERYWIZARD_LSTFILTEROPERATOR_2 40929 +// #define HID_QUERYWIZARD_LSTFILTEROPERATOR_2 40929 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFILTEROPERATOR_2; }; -#define HID_QUERYWIZARD_TXTFILTERVALUE_2 40930 +// #define HID_QUERYWIZARD_TXTFILTERVALUE_2 40930 hidspecial HID { HelpID = HID_QUERYWIZARD_TXTFILTERVALUE_2; }; -#define HID_QUERYWIZARD_LSTFILTERFIELDNAME_3 40931 +// #define HID_QUERYWIZARD_LSTFILTERFIELDNAME_3 40931 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFILTERFIELDNAME_3; }; -#define HID_QUERYWIZARD_LSTFILTEROPERATOR_3 40932 +// #define HID_QUERYWIZARD_LSTFILTEROPERATOR_3 40932 hidspecial HID { HelpID = HID_QUERYWIZARD_LSTFILTEROPERATOR_3; }; -#define HID_QUERYWIZARD_TXTFILTERVALUE_3 40933 +// #define HID_QUERYWIZARD_TXTFILTERVALUE_3 40933 hidspecial HID { HelpID = HID_QUERYWIZARD_TXTFILTERVALUE_3; }; -#define HID_QUERYWIZARD_TXTTITLE_1 40940 +// #define HID_QUERYWIZARD_TXTTITLE_1 40940 hidspecial HID { HelpID = HID_QUERYWIZARD_TXTTITLE_1; }; -#define HID_QUERYWIZARD_TXTTITLE_2 40941 +// #define HID_QUERYWIZARD_TXTTITLE_2 40941 hidspecial HID { HelpID = HID_QUERYWIZARD_TXTTITLE_2; }; -#define HID_QUERYWIZARD_TXTTITLE_3 40942 +// #define HID_QUERYWIZARD_TXTTITLE_3 40942 hidspecial HID { HelpID = HID_QUERYWIZARD_TXTTITLE_3; }; -#define HID_QUERYWIZARD_TXTTITLE_4 40943 +// #define HID_QUERYWIZARD_TXTTITLE_4 40943 hidspecial HID { HelpID = HID_QUERYWIZARD_TXTTITLE_4; }; -#define HID_QUERYWIZARD_TXTTITLE_5 40944 +// #define HID_QUERYWIZARD_TXTTITLE_5 40944 hidspecial HID { HelpID = HID_QUERYWIZARD_TXTTITLE_5; }; -#define HID_QUERYWIZARD_TXTTITLE_6 40945 +// #define HID_QUERYWIZARD_TXTTITLE_6 40945 hidspecial HID { HelpID = HID_QUERYWIZARD_TXTTITLE_6; }; -#define HID_QUERYWIZARD_TXTTITLE_7 40946 +// #define HID_QUERYWIZARD_TXTTITLE_7 40946 hidspecial HID { HelpID = HID_QUERYWIZARD_TXTTITLE_7; }; -#define HID_QUERYWIZARD_TXTQUERYTITLE 40955 +// #define HID_QUERYWIZARD_TXTQUERYTITLE 40955 hidspecial HID { HelpID = HID_QUERYWIZARD_TXTQUERYTITLE; }; -#define HID_QUERYWIZARD_OPTDISPLAYQUERY 40956 +// #define HID_QUERYWIZARD_OPTDISPLAYQUERY 40956 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTDISPLAYQUERY; }; -#define HID_QUERYWIZARD_OPTMODIFYQUERY 40957 +// #define HID_QUERYWIZARD_OPTMODIFYQUERY 40957 hidspecial HID { HelpID = HID_QUERYWIZARD_OPTMODIFYQUERY; }; -#define HID_QUERYWIZARD_TXTSUMMARY 40958 +// #define HID_QUERYWIZARD_TXTSUMMARY 40958 hidspecial HID { HelpID = HID_QUERYWIZARD_TXTSUMMARY; }; -#define HID_QUERYWIZARD 40970 +// #define HID_QUERYWIZARD 40970 hidspecial HID { HelpID = HID_QUERYWIZARD; }; -#define HID_QUERYWIZARD_BACK 40972 +// #define HID_QUERYWIZARD_BACK 40972 hidspecial HID { HelpID = HID_QUERYWIZARD_BACK; }; -#define HID_QUERYWIZARD_NEXT 40973 +// #define HID_QUERYWIZARD_NEXT 40973 hidspecial HID { HelpID = HID_QUERYWIZARD_NEXT; }; -#define HID_QUERYWIZARD_CREATE 40974 +// #define HID_QUERYWIZARD_CREATE 40974 hidspecial HID { HelpID = HID_QUERYWIZARD_CREATE; }; -#define HID_QUERYWIZARD_CANCEL 40975 +// #define HID_QUERYWIZARD_CANCEL 40975 hidspecial HID { HelpID = HID_QUERYWIZARD_CANCEL; }; // ++++++++++++++++++++++++++++++++++++++ // +++ Web Wizard : Continued from 34312 // ++++++++++++++++++++++++++++++++++++++ // web wizard iconssets dialog -#define HID_IS 41000 +// #define HID_IS 41000 hidspecial HID { HelpID = HID_IS; } ; -#define HID_IS_BTN_NONE 41002 +// #define HID_IS_BTN_NONE 41002 hidspecial HID { HelpID = HID_IS_BTN_NONE; } ; -#define HID_IS_BTN_OK 41003 +// #define HID_IS_BTN_OK 41003 hidspecial HID { HelpID = HID_IS_BTN_OK; } ; -#define HID_IS_BTN_CANCEL 41004 +// #define HID_IS_BTN_CANCEL 41004 hidspecial HID { HelpID = HID_IS_BTN_CANCEL; } ; -#define HID_IS_BTN_IMG1 41005 +// #define HID_IS_BTN_IMG1 41005 hidspecial HID { HelpID = HID_IS_BTN_IMG1; } ; -#define HID_IS_BTN_IMG2 41006 +// #define HID_IS_BTN_IMG2 41006 hidspecial HID { HelpID = HID_IS_BTN_IMG2; } ; -#define HID_IS_BTN_IMG3 41007 +// #define HID_IS_BTN_IMG3 41007 hidspecial HID { HelpID = HID_IS_BTN_IMG3; } ; -#define HID_IS_BTN_IMG4 41008 +// #define HID_IS_BTN_IMG4 41008 hidspecial HID { HelpID = HID_IS_BTN_IMG4; } ; -#define HID_IS_BTN_IMG5 41009 +// #define HID_IS_BTN_IMG5 41009 hidspecial HID { HelpID = HID_IS_BTN_IMG5; } ; -#define HID_IS_BTN_IMG6 41010 +// #define HID_IS_BTN_IMG6 41010 hidspecial HID { HelpID = HID_IS_BTN_IMG6; } ; -#define HID_IS_BTN_IMG7 41011 +// #define HID_IS_BTN_IMG7 41011 hidspecial HID { HelpID = HID_IS_BTN_IMG7; } ; -#define HID_IS_BTN_IMG8 41012 +// #define HID_IS_BTN_IMG8 41012 hidspecial HID { HelpID = HID_IS_BTN_IMG8; } ; -#define HID_IS_BTN_IMG9 41013 +// #define HID_IS_BTN_IMG9 41013 hidspecial HID { HelpID = HID_IS_BTN_IMG9; } ; -#define HID_IS_BTN_IMG10 41014 +// #define HID_IS_BTN_IMG10 41014 hidspecial HID { HelpID = HID_IS_BTN_IMG10; } ; -#define HID_IS_BTN_IMG11 41015 +// #define HID_IS_BTN_IMG11 41015 hidspecial HID { HelpID = HID_IS_BTN_IMG11; } ; -#define HID_IS_BTN_IMG12 41016 +// #define HID_IS_BTN_IMG12 41016 hidspecial HID { HelpID = HID_IS_BTN_IMG12; } ; -#define HID_IS_BTN_IMG13 41017 +// #define HID_IS_BTN_IMG13 41017 hidspecial HID { HelpID = HID_IS_BTN_IMG13; } ; -#define HID_IS_BTN_IMG14 41018 +// #define HID_IS_BTN_IMG14 41018 hidspecial HID { HelpID = HID_IS_BTN_IMG14; } ; -#define HID_IS_BTN_IMG15 41019 +// #define HID_IS_BTN_IMG15 41019 hidspecial HID { HelpID = HID_IS_BTN_IMG15; } ; -#define HID_IS_BTN_IMG16 41020 +// #define HID_IS_BTN_IMG16 41020 hidspecial HID { HelpID = HID_IS_BTN_IMG16; } ; -#define HID_IS_BTN_IMG17 41021 +// #define HID_IS_BTN_IMG17 41021 hidspecial HID { HelpID = HID_IS_BTN_IMG17; } ; -#define HID_IS_BTN_IMG18 41022 +// #define HID_IS_BTN_IMG18 41022 hidspecial HID { HelpID = HID_IS_BTN_IMG18; } ; -#define HID_IS_BTN_IMG19 41023 +// #define HID_IS_BTN_IMG19 41023 hidspecial HID { HelpID = HID_IS_BTN_IMG19; } ; -#define HID_IS_BTN_IMG20 41024 +// #define HID_IS_BTN_IMG20 41024 hidspecial HID { HelpID = HID_IS_BTN_IMG20; } ; -#define HID_IS_BTN_IMG21 41025 +// #define HID_IS_BTN_IMG21 41025 hidspecial HID { HelpID = HID_IS_BTN_IMG21; } ; -#define HID_IS_BTN_IMG22 41026 +// #define HID_IS_BTN_IMG22 41026 hidspecial HID { HelpID = HID_IS_BTN_IMG22; } ; -#define HID_IS_BTN_IMG23 41027 +// #define HID_IS_BTN_IMG23 41027 hidspecial HID { HelpID = HID_IS_BTN_IMG23; } ; -#define HID_IS_BTN_IMG24 41028 +// #define HID_IS_BTN_IMG24 41028 hidspecial HID { HelpID = HID_IS_BTN_IMG24; } ; -#define HID_IS_BTN_IMG25 41029 +// #define HID_IS_BTN_IMG25 41029 hidspecial HID { HelpID = HID_IS_BTN_IMG25; } ; -#define HID_IS_BTN_IMG26 41030 +// #define HID_IS_BTN_IMG26 41030 hidspecial HID { HelpID = HID_IS_BTN_IMG26; } ; -#define HID_IS_BTN_IMG27 41031 +// #define HID_IS_BTN_IMG27 41031 hidspecial HID { HelpID = HID_IS_BTN_IMG27; } ; -#define HID_IS_BTN_IMG28 41032 +// #define HID_IS_BTN_IMG28 41032 hidspecial HID { HelpID = HID_IS_BTN_IMG28; } ; -#define HID_IS_BTN_IMG29 41033 +// #define HID_IS_BTN_IMG29 41033 hidspecial HID { HelpID = HID_IS_BTN_IMG29; } ; -#define HID_IS_BTN_IMG30 41034 +// #define HID_IS_BTN_IMG30 41034 hidspecial HID { HelpID = HID_IS_BTN_IMG30; } ; -#define HID_IS_BTN_IMG31 41035 +// #define HID_IS_BTN_IMG31 41035 hidspecial HID { HelpID = HID_IS_BTN_IMG31; } ; -#define HID_IS_BTN_IMG32 41036 +// #define HID_IS_BTN_IMG32 41036 hidspecial HID { HelpID = HID_IS_BTN_IMG32; } ; // web wizard ftp dialog -#define HID_FTP 41040 +// #define HID_FTP 41040 hidspecial HID { HelpID = HID_FTP; } ; -#define HID_FTP_SERVER 41041 +// #define HID_FTP_SERVER 41041 hidspecial HID { HelpID = HID_FTP_SERVER; } ; -#define HID_FTP_USERNAME 41042 +// #define HID_FTP_USERNAME 41042 hidspecial HID { HelpID = HID_FTP_USERNAME; } ; -#define HID_FTP_PASS 41043 +// #define HID_FTP_PASS 41043 hidspecial HID { HelpID = HID_FTP_PASS; } ; -#define HID_FTP_TEST 41044 +// #define HID_FTP_TEST 41044 hidspecial HID { HelpID = HID_FTP_TEST; } ; -#define HID_FTP_TXT_PATH 41045 +// #define HID_FTP_TXT_PATH 41045 hidspecial HID { HelpID = HID_FTP_TXT_PATH; } ; -#define HID_FTP_BTN_PATH 41046 +// #define HID_FTP_BTN_PATH 41046 hidspecial HID { HelpID = HID_FTP_BTN_PATH; } ; -#define HID_FTP_OK 41047 +// #define HID_FTP_OK 41047 hidspecial HID { HelpID = HID_FTP_OK; } ; -#define HID_FTP_CANCEL 41048 +// #define HID_FTP_CANCEL 41048 hidspecial HID { HelpID = HID_FTP_CANCEL; } ; @@ -1171,217 +1172,217 @@ hidspecial HID { HelpID = HID_FTP_CANCEL; } ; // step 0 - navibar -#define HID_AGWIZ 41051 +// #define HID_AGWIZ 41051 hidspecial HID { HelpID = HID_AGWIZ; } ; -#define HID_AGWIZ_HELP 41052 +// #define HID_AGWIZ_HELP 41052 hidspecial HID { HelpID = HID_AGWIZ_HELP; } ; -#define HID_AGWIZ_NEXT 41053 +// #define HID_AGWIZ_NEXT 41053 hidspecial HID { HelpID = HID_AGWIZ_NEXT; } ; -#define HID_AGWIZ_PREV 41054 +// #define HID_AGWIZ_PREV 41054 hidspecial HID { HelpID = HID_AGWIZ_PREV; } ; -#define HID_AGWIZ_CREATE 41055 +// #define HID_AGWIZ_CREATE 41055 hidspecial HID { HelpID = HID_AGWIZ_CREATE; } ; -#define HID_AGWIZ_CANCEL 41056 +// #define HID_AGWIZ_CANCEL 41056 hidspecial HID { HelpID = HID_AGWIZ_CANCEL; } ; //step 1 - design -#define HID_AGWIZ_1_LIST_PAGEDESIGN 41057 +// #define HID_AGWIZ_1_LIST_PAGEDESIGN 41057 hidspecial HID { HelpID = HID_AGWIZ_1_LIST_PAGEDESIGN; } ; -#define HID_AGWIZ_1_CHK_MINUTES 41058 +// #define HID_AGWIZ_1_CHK_MINUTES 41058 hidspecial HID { HelpID = HID_AGWIZ_1_CHK_MINUTES; } ; // step 2 - general attributes -#define HID_AGWIZ_2_TXT_TIME 41059 +// #define HID_AGWIZ_2_TXT_TIME 41059 hidspecial HID { HelpID = HID_AGWIZ_2_TXT_TIME; } ; -#define HID_AGWIZ_2_TXT_DATE 41060 +// #define HID_AGWIZ_2_TXT_DATE 41060 hidspecial HID { HelpID = HID_AGWIZ_2_TXT_DATE; } ; -#define HID_AGWIZ_2_TXT_TITLE 41061 +// #define HID_AGWIZ_2_TXT_TITLE 41061 hidspecial HID { HelpID = HID_AGWIZ_2_TXT_TITLE; } ; -#define HID_AGWIZ_2_TXT_LOCATION 41062 +// #define HID_AGWIZ_2_TXT_LOCATION 41062 hidspecial HID { HelpID = HID_AGWIZ_2_TXT_LOCATION; } ; // step 3 - headings -#define HID_AGWIZ_3_CHK_MEETING_TYPE 41063 +// #define HID_AGWIZ_3_CHK_MEETING_TYPE 41063 hidspecial HID { HelpID = HID_AGWIZ_3_CHK_MEETING_TYPE; } ; -#define HID_AGWIZ_3_CHK_READ 41064 +// #define HID_AGWIZ_3_CHK_READ 41064 hidspecial HID { HelpID = HID_AGWIZ_3_CHK_READ; } ; -#define HID_AGWIZ_3_CHK_BRING 41065 +// #define HID_AGWIZ_3_CHK_BRING 41065 hidspecial HID { HelpID = HID_AGWIZ_3_CHK_BRING; } ; -#define HID_AGWIZ_3_CHK_NOTES 41066 +// #define HID_AGWIZ_3_CHK_NOTES 41066 hidspecial HID { HelpID = HID_AGWIZ_3_CHK_NOTES; } ; // step 4 - names -#define HID_AGWIZ_4_CHK_CALLED_BY 41067 +// #define HID_AGWIZ_4_CHK_CALLED_BY 41067 hidspecial HID { HelpID = HID_AGWIZ_4_CHK_CALLED_BY; } ; -#define HID_AGWIZ_4_CHK_FACILITATOR 41068 +// #define HID_AGWIZ_4_CHK_FACILITATOR 41068 hidspecial HID { HelpID = HID_AGWIZ_4_CHK_FACILITATOR; } ; -#define HID_AGWIZ_4_CHK_NOTETAKER 41069 +// #define HID_AGWIZ_4_CHK_NOTETAKER 41069 hidspecial HID { HelpID = HID_AGWIZ_4_CHK_NOTETAKER; } ; -#define HID_AGWIZ_4_CHK_TIMEKEEPER 41070 +// #define HID_AGWIZ_4_CHK_TIMEKEEPER 41070 hidspecial HID { HelpID = HID_AGWIZ_4_CHK_TIMEKEEPER; } ; -#define HID_AGWIZ_4_CHK_ATTENDEES 41071 +// #define HID_AGWIZ_4_CHK_ATTENDEES 41071 hidspecial HID { HelpID = HID_AGWIZ_4_CHK_ATTENDEES; } ; -#define HID_AGWIZ_4_CHK_OBSERVERS 41072 +// #define HID_AGWIZ_4_CHK_OBSERVERS 41072 hidspecial HID { HelpID = HID_AGWIZ_4_CHK_OBSERVERS; } ; -#define HID_AGWIZ_4_CHK_RESOURCEPERSONS 41073 +// #define HID_AGWIZ_4_CHK_RESOURCEPERSONS 41073 hidspecial HID { HelpID = HID_AGWIZ_4_CHK_RESOURCEPERSONS; } ; // step 5 - topics -#define HID_AGWIZ_6_TXT_TEMPLATENAME 41074 +// #define HID_AGWIZ_6_TXT_TEMPLATENAME 41074 hidspecial HID { HelpID = HID_AGWIZ_6_TXT_TEMPLATENAME; } ; -#define HID_AGWIZ_6_TXT_TEMPLATEPATH 41075 +// #define HID_AGWIZ_6_TXT_TEMPLATEPATH 41075 hidspecial HID { HelpID = HID_AGWIZ_6_TXT_TEMPLATEPATH; } ; -#define HID_AGWIZ_6_BTN_TEMPLATEPATH 41076 +// #define HID_AGWIZ_6_BTN_TEMPLATEPATH 41076 hidspecial HID { HelpID = HID_AGWIZ_6_BTN_TEMPLATEPATH; } ; // step 6 - file info -#define HID_AGWIZ_6_OPT_CREATEAGENDA 41077 +// #define HID_AGWIZ_6_OPT_CREATEAGENDA 41077 hidspecial HID { HelpID = HID_AGWIZ_6_OPT_CREATEAGENDA; } ; -#define HID_AGWIZ_6_OPT_MAKECHANGES 41078 +// #define HID_AGWIZ_6_OPT_MAKECHANGES 41078 hidspecial HID { HelpID = HID_AGWIZ_6_OPT_MAKECHANGES; } ; // - again step 5 - buttons -#define HID_AGWIZ_5_BTN_INSERT 41079 +// #define HID_AGWIZ_5_BTN_INSERT 41079 hidspecial HID { HelpID = HID_AGWIZ_5_BTN_INSERT; } ; -#define HID_AGWIZ_5_BTN_REMOVE 41080 +// #define HID_AGWIZ_5_BTN_REMOVE 41080 hidspecial HID { HelpID = HID_AGWIZ_5_BTN_REMOVE; } ; -#define HID_AGWIZ_5_BTN_UP 41081 +// #define HID_AGWIZ_5_BTN_UP 41081 hidspecial HID { HelpID = HID_AGWIZ_5_BTN_UP; } ; -#define HID_AGWIZ_5_BTN_DOWN 41082 +// #define HID_AGWIZ_5_BTN_DOWN 41082 hidspecial HID { HelpID = HID_AGWIZ_5_BTN_DOWN; } ; // again step 5 - scroll control -#define HID_AGWIZ_5_SCROLL_BAR 41083 +// #define HID_AGWIZ_5_SCROLL_BAR 41083 hidspecial HID { HelpID = HID_AGWIZ_5_SCROLL_BAR; } ; -#define HID_AGWIZ_5_TXT_TOPIC_1 41084 +// #define HID_AGWIZ_5_TXT_TOPIC_1 41084 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_TOPIC_1; } ; -#define HID_AGWIZ_5_TXT_RESPONSIBLE_1 41085 +// #define HID_AGWIZ_5_TXT_RESPONSIBLE_1 41085 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_RESPONSIBLE_1; } ; -#define HID_AGWIZ_5_TXT_MINUTES_1 41086 +// #define HID_AGWIZ_5_TXT_MINUTES_1 41086 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_MINUTES_1; } ; -#define HID_AGWIZ_5_TXT_TOPIC_2 41087 +// #define HID_AGWIZ_5_TXT_TOPIC_2 41087 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_TOPIC_2; } ; -#define HID_AGWIZ_5_TXT_RESPONSIBLE_2 41088 +// #define HID_AGWIZ_5_TXT_RESPONSIBLE_2 41088 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_RESPONSIBLE_2; } ; -#define HID_AGWIZ_5_TXT_MINUTES_2 41089 +// #define HID_AGWIZ_5_TXT_MINUTES_2 41089 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_MINUTES_2; } ; -#define HID_AGWIZ_5_TXT_TOPIC_3 41090 +// #define HID_AGWIZ_5_TXT_TOPIC_3 41090 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_TOPIC_3; } ; -#define HID_AGWIZ_5_TXT_RESPONSIBLE_3 41091 +// #define HID_AGWIZ_5_TXT_RESPONSIBLE_3 41091 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_RESPONSIBLE_3; } ; -#define HID_AGWIZ_5_TXT_MINUTES_3 41092 +// #define HID_AGWIZ_5_TXT_MINUTES_3 41092 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_MINUTES_3; } ; -#define HID_AGWIZ_5_TXT_TOPIC_4 41093 +// #define HID_AGWIZ_5_TXT_TOPIC_4 41093 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_TOPIC_4; } ; -#define HID_AGWIZ_5_TXT_RESPONSIBLE_4 41094 +// #define HID_AGWIZ_5_TXT_RESPONSIBLE_4 41094 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_RESPONSIBLE_4; } ; -#define HID_AGWIZ_5_TXT_MINUTES_4 41095 +// #define HID_AGWIZ_5_TXT_MINUTES_4 41095 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_MINUTES_4; } ; -#define HID_AGWIZ_5_TXT_TOPIC_5 41096 +// #define HID_AGWIZ_5_TXT_TOPIC_5 41096 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_TOPIC_5; } ; -#define HID_AGWIZ_5_TXT_RESPONSIBLE_5 41097 +// #define HID_AGWIZ_5_TXT_RESPONSIBLE_5 41097 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_RESPONSIBLE_5; } ; -#define HID_AGWIZ_5_TXT_MINUTES_5 41098 +// #define HID_AGWIZ_5_TXT_MINUTES_5 41098 hidspecial HID { HelpID = HID_AGWIZ_5_TXT_MINUTES_5; } ; //FaxWizard--------------------------- -#define HID_FAXWIZ_OPTBUSINESSFAX 41120 +// #define HID_FAXWIZ_OPTBUSINESSFAX 41120 hidspecial HID { HelpID = HID_FAXWIZ_OPTBUSINESSFAX; }; -#define HID_FAXWIZ_LSTBUSINESSSTYLE 41121 +// #define HID_FAXWIZ_LSTBUSINESSSTYLE 41121 hidspecial HID { HelpID = HID_FAXWIZ_LSTBUSINESSSTYLE; }; -#define HID_FAXWIZ_OPTPRIVATEFAX 41122 +// #define HID_FAXWIZ_OPTPRIVATEFAX 41122 hidspecial HID { HelpID = HID_FAXWIZ_OPTPRIVATEFAX; }; -#define HID_LSTPRIVATESTYLE 41123 +// #define HID_LSTPRIVATESTYLE 41123 hidspecial HID { HelpID = HID_LSTPRIVATESTYLE; }; -#define HID_IMAGECONTROL3 41124 +// #define HID_IMAGECONTROL3 41124 hidspecial HID { HelpID = HID_IMAGECONTROL3; }; -#define HID_CHKUSELOGO 41125 +// #define HID_CHKUSELOGO 41125 hidspecial HID { HelpID = HID_CHKUSELOGO; }; -#define HID_CHKUSEDATE 41126 +// #define HID_CHKUSEDATE 41126 hidspecial HID { HelpID = HID_CHKUSEDATE; }; -#define HID_CHKUSECOMMUNICATIONTYPE 41127 +// #define HID_CHKUSECOMMUNICATIONTYPE 41127 hidspecial HID { HelpID = HID_CHKUSECOMMUNICATIONTYPE; }; -#define HID_LSTCOMMUNICATIONTYPE 41128 +// #define HID_LSTCOMMUNICATIONTYPE 41128 hidspecial HID { HelpID = HID_LSTCOMMUNICATIONTYPE; }; -#define HID_CHKUSESUBJECT 41129 +// #define HID_CHKUSESUBJECT 41129 hidspecial HID { HelpID = HID_CHKUSESUBJECT; }; -#define HID_CHKUSESALUTATION 41130 +// #define HID_CHKUSESALUTATION 41130 hidspecial HID { HelpID = HID_CHKUSESALUTATION; }; -#define HID_LSTSALUTATION 41131 +// #define HID_LSTSALUTATION 41131 hidspecial HID { HelpID = HID_LSTSALUTATION; }; -#define HID_CHKUSEGREETING 41132 +// #define HID_CHKUSEGREETING 41132 hidspecial HID { HelpID = HID_CHKUSEGREETING; }; -#define HID_LSTGREETING 41133 +// #define HID_LSTGREETING 41133 hidspecial HID { HelpID = HID_LSTGREETING; }; -#define HID_CHKUSEFOOTER 41134 +// #define HID_CHKUSEFOOTER 41134 hidspecial HID { HelpID = HID_CHKUSEFOOTER; }; -#define HID_OPTSENDERPLACEHOLDER 41135 +// #define HID_OPTSENDERPLACEHOLDER 41135 hidspecial HID { HelpID = HID_OPTSENDERPLACEHOLDER; }; -#define HID_OPTSENDERDEFINE 41136 +// #define HID_OPTSENDERDEFINE 41136 hidspecial HID { HelpID = HID_OPTSENDERDEFINE; }; -#define HID_TXTSENDERNAME 41137 +// #define HID_TXTSENDERNAME 41137 hidspecial HID { HelpID = HID_TXTSENDERNAME; }; -#define HID_TXTSENDERSTREET 41138 +// #define HID_TXTSENDERSTREET 41138 hidspecial HID { HelpID = HID_TXTSENDERSTREET; }; -#define HID_TXTSENDERPOSTCODE 41139 +// #define HID_TXTSENDERPOSTCODE 41139 hidspecial HID { HelpID = HID_TXTSENDERPOSTCODE; }; -#define HID_TXTSENDERSTATE 41140 +// #define HID_TXTSENDERSTATE 41140 hidspecial HID { HelpID = HID_TXTSENDERSTATE; }; -#define HID_TXTSENDERCITY 41141 +// #define HID_TXTSENDERCITY 41141 hidspecial HID { HelpID = HID_TXTSENDERCITY; }; -#define HID_TXTSENDERFAX 41142 +// #define HID_TXTSENDERFAX 41142 hidspecial HID { HelpID = HID_TXTSENDERFAX; }; -#define HID_OPTRECEIVERPLACEHOLDER 41143 +// #define HID_OPTRECEIVERPLACEHOLDER 41143 hidspecial HID { HelpID = HID_OPTRECEIVERPLACEHOLDER; }; -#define HID_OPTRECEIVERDATABASE 41144 +// #define HID_OPTRECEIVERDATABASE 41144 hidspecial HID { HelpID = HID_OPTRECEIVERDATABASE; }; -#define HID_TXTFOOTER 41145 +// #define HID_TXTFOOTER 41145 hidspecial HID { HelpID = HID_TXTFOOTER; }; -#define HID_CHKFOOTERNEXTPAGES 41146 +// #define HID_CHKFOOTERNEXTPAGES 41146 hidspecial HID { HelpID = HID_CHKFOOTERNEXTPAGES; }; -#define HID_CHKFOOTERPAGENUMBERS 41147 +// #define HID_CHKFOOTERPAGENUMBERS 41147 hidspecial HID { HelpID = HID_CHKFOOTERPAGENUMBERS; }; -#define HID_TXTTEMPLATENAME 41148 +// #define HID_TXTTEMPLATENAME 41148 hidspecial HID { HelpID = HID_TXTTEMPLATENAME; }; -#define HID_FILETEMPLATEPATH 41149 +// #define HID_FILETEMPLATEPATH 41149 hidspecial HID { HelpID = HID_FILETEMPLATEPATH; }; -#define HID_OPTCREATEFAX 41150 +// #define HID_OPTCREATEFAX 41150 hidspecial HID { HelpID = HID_OPTCREATEFAX; }; -#define HID_OPTMAKECHANGES 41151 +// #define HID_OPTMAKECHANGES 41151 hidspecial HID { HelpID = HID_OPTMAKECHANGES; }; -#define HID_IMAGECONTROL2 41152 +// #define HID_IMAGECONTROL2 41152 hidspecial HID { HelpID = HID_IMAGECONTROL2; }; -#define HID_FAXWIZ_TXTPATH 41153 +// #define HID_FAXWIZ_TXTPATH 41153 hidspecial HID { HelpID = HID_FAXWIZ_TXTPATH; }; -#define HID_FAXWIZ_CMDPATH 41154 +// #define HID_FAXWIZ_CMDPATH 41154 hidspecial HID { HelpID = HID_FAXWIZ_CMDPATH; }; -#define HID_FAXWIZARD 41180 +// #define HID_FAXWIZARD 41180 hidspecial HID { HelpID = HID_FAXWIZARD; }; -#define HID_FAXWIZARD_HELP 41181 +// #define HID_FAXWIZARD_HELP 41181 hidspecial HID { HelpID = HID_FAXWIZARD_HELP; }; -#define HID_FAXWIZARD_BACK 41182 +// #define HID_FAXWIZARD_BACK 41182 hidspecial HID { HelpID = HID_FAXWIZARD_BACK; }; -#define HID_FAXWIZARD_NEXT 41183 +// #define HID_FAXWIZARD_NEXT 41183 hidspecial HID { HelpID = HID_FAXWIZARD_NEXT; }; -#define HID_FAXWIZARD_CREATE 41184 +// #define HID_FAXWIZARD_CREATE 41184 hidspecial HID { HelpID = HID_FAXWIZARD_CREATE; }; -#define HID_FAXWIZARD_CANCEL 41185 +// #define HID_FAXWIZARD_CANCEL 41185 hidspecial HID { HelpID = HID_FAXWIZARD_CANCEL; }; @@ -1391,105 +1392,105 @@ hidspecial HID { HelpID = HID_FAXWIZARD_CANCEL; }; * ==================================== */ -#define HID_DLGTABLE_DIALOG 41200 +// #define HID_DLGTABLE_DIALOG 41200 hidspecial HID { HelpID = HID_DLGTABLE_DIALOG; }; -#define HID_DLGTABLE_CMDPREV 41202 +// #define HID_DLGTABLE_CMDPREV 41202 hidspecial HID { HelpID = HID_DLGTABLE_CMDPREV; }; -#define HID_DLGTABLE_CMDNEXT 41203 +// #define HID_DLGTABLE_CMDNEXT 41203 hidspecial HID { HelpID = HID_DLGTABLE_CMDNEXT; }; -#define HID_DLGTABLE_CMDFINISH 41204 +// #define HID_DLGTABLE_CMDFINISH 41204 hidspecial HID { HelpID = HID_DLGTABLE_CMDFINISH; }; -#define HID_DLGTABLE_CMDCANCEL 41205 +// #define HID_DLGTABLE_CMDCANCEL 41205 hidspecial HID { HelpID = HID_DLGTABLE_CMDCANCEL; }; -#define HID_DLGTABLE_OPTBUSINESS 41206 +// #define HID_DLGTABLE_OPTBUSINESS 41206 hidspecial HID { HelpID = HID_DLGTABLE_OPTBUSINESS; }; -#define HID_DLGTABLE_OPTPRIVATE 41207 +// #define HID_DLGTABLE_OPTPRIVATE 41207 hidspecial HID { HelpID = HID_DLGTABLE_OPTPRIVATE; }; -#define HID_DLGTABLE_LBTABLES 41208 +// #define HID_DLGTABLE_LBTABLES 41208 hidspecial HID { HelpID = HID_DLGTABLE_LBTABLES; }; -#define HID_DLGTABLE_FIELDSAVAILABLE 41209 +// #define HID_DLGTABLE_FIELDSAVAILABLE 41209 hidspecial HID { HelpID = HID_DLGTABLE_FIELDSAVAILABLE; }; -#define HID_DLGTABLE_CMDMOVESELECTED 41210 +// #define HID_DLGTABLE_CMDMOVESELECTED 41210 hidspecial HID { HelpID = HID_DLGTABLE_CMDMOVESELECTED; }; -#define HID_DLGTABLE_CMDMOVEALL 41211 +// #define HID_DLGTABLE_CMDMOVEALL 41211 hidspecial HID { HelpID = HID_DLGTABLE_CMDMOVEALL; }; -#define HID_DLGTABLE_CMDREMOVESELECTED 41212 +// #define HID_DLGTABLE_CMDREMOVESELECTED 41212 hidspecial HID { HelpID = HID_DLGTABLE_CMDREMOVESELECTED; }; -#define HID_DLGTABLE_CMDREMOVEALL 41213 +// #define HID_DLGTABLE_CMDREMOVEALL 41213 hidspecial HID { HelpID = HID_DLGTABLE_CMDREMOVEALL; }; -#define HID_DLGTABLE_FIELDSSELECTED 41214 +// #define HID_DLGTABLE_FIELDSSELECTED 41214 hidspecial HID { HelpID = HID_DLGTABLE_FIELDSSELECTED; }; -#define HID_DLGTABLE_CMDMOVEUP 41215 +// #define HID_DLGTABLE_CMDMOVEUP 41215 hidspecial HID { HelpID = HID_DLGTABLE_CMDMOVEUP; }; -#define HID_DLGTABLE_CMDMOVEDOWN 41216 +// #define HID_DLGTABLE_CMDMOVEDOWN 41216 hidspecial HID { HelpID = HID_DLGTABLE_CMDMOVEDOWN; }; -#define HID_DLGTABLE_LB_SELFIELDNAMES 41220 +// #define HID_DLGTABLE_LB_SELFIELDNAMES 41220 hidspecial HID { HelpID = HID_DLGTABLE_LB_SELFIELDNAMES; }; -#define HID_DLGTABLE_CMDMOVEFIELDUP 41221 +// #define HID_DLGTABLE_CMDMOVEFIELDUP 41221 hidspecial HID { HelpID = HID_DLGTABLE_CMDMOVEFIELDUP; }; -#define HID_DLGTABLE_CMDMOVEFIELDDOWN 41222 +// #define HID_DLGTABLE_CMDMOVEFIELDDOWN 41222 hidspecial HID { HelpID = HID_DLGTABLE_CMDMOVEFIELDDOWN; }; -#define HID_DLGTABLE_CMDMINUS 41223 +// #define HID_DLGTABLE_CMDMINUS 41223 hidspecial HID { HelpID = HID_DLGTABLE_CMDMINUS; }; -#define HID_DLGTABLE_CMDPLUS 41224 +// #define HID_DLGTABLE_CMDPLUS 41224 hidspecial HID { HelpID = HID_DLGTABLE_CMDPLUS; }; -#define HID_DLGTABLE_COLNAME 41225 +// #define HID_DLGTABLE_COLNAME 41225 hidspecial HID { HelpID = HID_DLGTABLE_COLNAME; }; -#define HID_DLGTABLE_COLMODIFIER 41226 +// #define HID_DLGTABLE_COLMODIFIER 41226 hidspecial HID { HelpID = HID_DLGTABLE_COLMODIFIER; }; -#define HID_DLGTABLE_CHK_USEPRIMEKEY 41227 +// #define HID_DLGTABLE_CHK_USEPRIMEKEY 41227 hidspecial HID { HelpID = HID_DLGTABLE_CHK_USEPRIMEKEY; }; -#define HID_DLGTABLE_OPT_PK_AUTOMATIC 41228 +// #define HID_DLGTABLE_OPT_PK_AUTOMATIC 41228 hidspecial HID { HelpID = HID_DLGTABLE_OPT_PK_AUTOMATIC; }; -#define HID_DLGTABLE_CK_PK_AUTOVALUE_AUTOMATIC 41229 +// #define HID_DLGTABLE_CK_PK_AUTOVALUE_AUTOMATIC 41229 hidspecial HID { HelpID = HID_DLGTABLE_CK_PK_AUTOVALUE_AUTOMATIC; }; -#define HID_DLGTABLE_OPT_PK_SINGLE 41230 +// #define HID_DLGTABLE_OPT_PK_SINGLE 41230 hidspecial HID { HelpID = HID_DLGTABLE_OPT_PK_SINGLE; }; -#define HID_DLGTABLE_LB_PK_FIELDNAME 41231 +// #define HID_DLGTABLE_LB_PK_FIELDNAME 41231 hidspecial HID { HelpID = HID_DLGTABLE_LB_PK_FIELDNAME; }; -#define HID_DLGTABLE_CK_PK_AUTOVALUE 41232 +// #define HID_DLGTABLE_CK_PK_AUTOVALUE 41232 hidspecial HID { HelpID = HID_DLGTABLE_CK_PK_AUTOVALUE; }; -#define HID_DLGTABLE_OPT_PK_SEVERAL 41233 +// #define HID_DLGTABLE_OPT_PK_SEVERAL 41233 hidspecial HID { HelpID = HID_DLGTABLE_OPT_PK_SEVERAL; }; -#define HID_DLGTABLE_FIELDS_PK_AVAILABLE 41234 +// #define HID_DLGTABLE_FIELDS_PK_AVAILABLE 41234 hidspecial HID { HelpID = HID_DLGTABLE_FIELDS_PK_AVAILABLE; }; -#define HID_DLGTABLE_CMDMOVE_PK_SELECTED 41235 +// #define HID_DLGTABLE_CMDMOVE_PK_SELECTED 41235 hidspecial HID { HelpID = HID_DLGTABLE_CMDMOVE_PK_SELECTED; }; -#define HID_DLGTABLE_CMDREMOVE_PK_SELECTED 41236 +// #define HID_DLGTABLE_CMDREMOVE_PK_SELECTED 41236 hidspecial HID { HelpID = HID_DLGTABLE_CMDREMOVE_PK_SELECTED; }; -#define HID_DLGTABLE_FIELDS_PK_SELECTED 41237 +// #define HID_DLGTABLE_FIELDS_PK_SELECTED 41237 hidspecial HID { HelpID = HID_DLGTABLE_FIELDS_PK_SELECTED; }; -#define HID_DLGTABLE_CMDMOVEUP_PK_SELECTED 41238 +// #define HID_DLGTABLE_CMDMOVEUP_PK_SELECTED 41238 hidspecial HID { HelpID = HID_DLGTABLE_CMDMOVEUP_PK_SELECTED; }; -#define HID_DLGTABLE_CMDMOVEDOWN_PK_SELECTED 41239 +// #define HID_DLGTABLE_CMDMOVEDOWN_PK_SELECTED 41239 hidspecial HID { HelpID = HID_DLGTABLE_CMDMOVEDOWN_PK_SELECTED; }; -#define HID_DLGTABLE_TXT_NAME 41240 +// #define HID_DLGTABLE_TXT_NAME 41240 hidspecial HID { HelpID = HID_DLGTABLE_TXT_NAME; }; -#define HID_DLGTABLE_OPT_MODIFYTABLE 41241 +// #define HID_DLGTABLE_OPT_MODIFYTABLE 41241 hidspecial HID { HelpID = HID_DLGTABLE_OPT_MODIFYTABLE; }; -#define HID_DLGTABLE_OPT_WORKWITHTABLE 41242 +// #define HID_DLGTABLE_OPT_WORKWITHTABLE 41242 hidspecial HID { HelpID = HID_DLGTABLE_OPT_WORKWITHTABLE; }; -#define HID_DLGTABLE_OPT_STARTFORMWIZARD 41243 +// #define HID_DLGTABLE_OPT_STARTFORMWIZARD 41243 hidspecial HID { HelpID = HID_DLGTABLE_OPT_STARTFORMWIZARD; }; -#define HID_DLGTABLE_LST_CATALOG 41244 +// #define HID_DLGTABLE_LST_CATALOG 41244 hidspecial HID { HelpID = HID_DLGTABLE_LST_CATALOG; }; -#define HID_DLGTABLE_LST_SCHEMA 41245 +// #define HID_DLGTABLE_LST_SCHEMA 41245 hidspecial HID { HelpID = HID_DLGTABLE_LST_SCHEMA; }; -- cgit v1.2.3 From 6420519c925dfd34b5f6adb9ecddb3145dfe025d Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Wed, 21 Jul 2010 17:46:17 +0200 Subject: CWS changehid: #i111784#: convert wizards module --- .../star/wizards/agenda/AgendaWizardDialog.java | 3 +- .../wizards/agenda/AgendaWizardDialogConst.java | 56 +- .../wizards/agenda/AgendaWizardDialogImpl.java | 6 +- .../com/sun/star/wizards/agenda/TopicsControl.java | 7 +- wizards/com/sun/star/wizards/common/HelpIds.java | 1016 ++++++++++++++ .../sun/star/wizards/fax/FaxWizardDialogConst.java | 69 +- .../sun/star/wizards/fax/FaxWizardDialogImpl.java | 2 +- .../com/sun/star/wizards/form/DataEntrySetter.java | 10 +- wizards/com/sun/star/wizards/form/FieldLinker.java | 5 +- wizards/com/sun/star/wizards/form/Finalizer.java | 6 +- .../sun/star/wizards/form/FormConfiguration.java | 8 +- .../com/sun/star/wizards/form/StyleApplier.java | 8 +- .../sun/star/wizards/form/UIControlArranger.java | 6 +- .../star/wizards/letter/LetterWizardDialog.java | 94 +- .../wizards/letter/LetterWizardDialogImpl.java | 2 +- wizards/com/sun/star/wizards/makefile.mk | 1 + wizards/com/sun/star/wizards/query/Finalizer.java | 8 +- .../com/sun/star/wizards/report/Dataimport.java | 2 +- .../sun/star/wizards/report/ReportFinalizer.java | 10 +- .../sun/star/wizards/report/ReportLayouter.java | 8 +- .../com/sun/star/wizards/table/FieldFormatter.java | 14 +- wizards/com/sun/star/wizards/table/Finalizer.java | 12 +- .../sun/star/wizards/table/PrimaryKeyHandler.java | 14 +- .../sun/star/wizards/table/ScenarioSelector.java | 6 +- .../sun/star/wizards/ui/AggregateComponent.java | 13 +- wizards/com/sun/star/wizards/ui/ButtonList.java | 9 +- .../sun/star/wizards/ui/CommandFieldSelection.java | 2 +- .../com/sun/star/wizards/ui/ControlScroller.java | 3 +- .../com/sun/star/wizards/ui/FieldSelection.java | 18 +- .../com/sun/star/wizards/ui/FilterComponent.java | 34 +- wizards/com/sun/star/wizards/ui/ImageList.java | 7 +- .../com/sun/star/wizards/ui/SortingComponent.java | 6 +- .../com/sun/star/wizards/ui/TitlesComponent.java | 2 +- wizards/com/sun/star/wizards/ui/WizardDialog.java | 12 +- wizards/com/sun/star/wizards/web/FTPDialog.java | 19 +- .../com/sun/star/wizards/web/ImageListDialog.java | 11 +- wizards/com/sun/star/wizards/web/WWD_General.java | 3 +- .../com/sun/star/wizards/web/WebWizardDialog.java | 89 +- wizards/source/depot/Dialog2.xdl | 24 +- wizards/source/depot/Dialog3.xdl | 30 +- wizards/source/depot/Dialog4.xdl | 8 +- wizards/source/euro/DlgConvert.xdl | 40 +- wizards/source/euro/DlgPassword.xdl | 6 +- wizards/source/formwizard/DlgFormDB.xdl | 40 +- wizards/source/importwizard/ImportDialog.xdl | 54 +- wizards/source/schedule/DlgCalendar.xdl | 32 +- wizards/source/template/DialogStyles.xdl | 8 +- wizards/source/template/TemplateDialog.xdl | 16 +- wizards/source/webwizard/WebWzrd.xdl | 16 +- wizards/util/helpids.h | 1380 ++++++++++---------- 50 files changed, 2130 insertions(+), 1125 deletions(-) create mode 100644 wizards/com/sun/star/wizards/common/HelpIds.java diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.java b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.java index 9df6bbef9..e4452bb60 100644 --- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.java +++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.java @@ -26,6 +26,7 @@ ************************************************************************/ package com.sun.star.wizards.agenda; +import com.sun.star.wizards.common.HelpIds; import com.sun.star.awt.FontDescriptor; import com.sun.star.awt.XButton; import com.sun.star.awt.XCheckBox; @@ -381,4 +382,4 @@ public abstract class AgendaWizardDialog extends WizardDialog implements Agenda } -} \ No newline at end of file +} diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.java b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.java index 109818f88..6e06327ef 100644 --- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.java +++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.java @@ -26,6 +26,8 @@ ************************************************************************/ package com.sun.star.wizards.agenda; +import com.sun.star.wizards.common.HelpIds; + public interface AgendaWizardDialogConst { /** @@ -58,37 +60,37 @@ public interface AgendaWizardDialogConst { * "HID:(hid+5)" - the cancel button */ - final String LISTPAGEDESIGN_HID = "HID:" + (HID + 6); - final String CHKMINUTES_HID = "HID:" + (HID + 7); - final String TXTTIME_HID = "HID:" + (HID + 8); - final String TXTDATE_HID = "HID:" + (HID + 9); - final String TXTTITLE_HID = "HID:" + (HID + 10); - final String CBLOCATION_HID = "HID:" + (HID + 11); + final String LISTPAGEDESIGN_HID = HelpIds.getHelpIdString((HID + 6)); + final String CHKMINUTES_HID = HelpIds.getHelpIdString((HID + 7)); + final String TXTTIME_HID = HelpIds.getHelpIdString((HID + 8)); + final String TXTDATE_HID = HelpIds.getHelpIdString((HID + 9)); + final String TXTTITLE_HID = HelpIds.getHelpIdString((HID + 10)); + final String CBLOCATION_HID = HelpIds.getHelpIdString((HID + 11)); - final String CHKMEETINGTITLE_HID = "HID:" + (HID + 12); - final String CHKREAD_HID = "HID:" + (HID + 13); - final String CHKBRING_HID = "HID:" + (HID + 14); - final String CHKNOTES_HID = "HID:" + (HID + 15); + final String CHKMEETINGTITLE_HID = HelpIds.getHelpIdString((HID + 12)); + final String CHKREAD_HID = HelpIds.getHelpIdString((HID + 13)); + final String CHKBRING_HID = HelpIds.getHelpIdString((HID + 14)); + final String CHKNOTES_HID = HelpIds.getHelpIdString((HID + 15)); - final String CHKCONVENEDBY_HID = "HID:" + (HID + 16); - final String CHKPRESIDING_HID = "HID:" + (HID + 17); - final String CHKNOTETAKER_HID = "HID:" + (HID + 18); - final String CHKTIMEKEEPER_HID = "HID:" + (HID + 19); - final String CHKATTENDEES_HID = "HID:" + (HID + 20); - final String CHKOBSERVERS_HID = "HID:" + (HID + 21); - final String CHKRESOURCEPERSONS_HID = "HID:" + (HID + 22); + final String CHKCONVENEDBY_HID = HelpIds.getHelpIdString((HID + 16)); + final String CHKPRESIDING_HID = HelpIds.getHelpIdString((HID + 17)); + final String CHKNOTETAKER_HID = HelpIds.getHelpIdString((HID + 18)); + final String CHKTIMEKEEPER_HID = HelpIds.getHelpIdString((HID + 19)); + final String CHKATTENDEES_HID = HelpIds.getHelpIdString((HID + 20)); + final String CHKOBSERVERS_HID = HelpIds.getHelpIdString((HID + 21)); + final String CHKRESOURCEPERSONS_HID = HelpIds.getHelpIdString((HID + 22)); - final String TXTTEMPLATENAME_HID = "HID:" + (HID + 23); - final String TXTTEMPLATEPATH_HID = "HID:" + (HID + 24); - final String BTNTEMPLATEPATH_HID = "HID:" + (HID + 25); + final String TXTTEMPLATENAME_HID = HelpIds.getHelpIdString((HID + 23)); + final String TXTTEMPLATEPATH_HID = HelpIds.getHelpIdString((HID + 24)); + final String BTNTEMPLATEPATH_HID = HelpIds.getHelpIdString((HID + 25)); - final String OPTCREATEAGENDA_HID = "HID:" + (HID + 26); - final String OPTMAKECHANGES_HID = "HID:" + (HID + 27); + final String OPTCREATEAGENDA_HID = HelpIds.getHelpIdString((HID + 26)); + final String OPTMAKECHANGES_HID = HelpIds.getHelpIdString((HID + 27)); - final String BTNINSERT_HID = "HID:" + (HID + 28); - final String BTNREMOVE_HID = "HID:" + (HID + 29); - final String BTNUP_HID = "HID:" + (HID + 30); - final String BTNDOWN_HID = "HID:" + (HID + 31); + final String BTNINSERT_HID = HelpIds.getHelpIdString((HID + 28)); + final String BTNREMOVE_HID = HelpIds.getHelpIdString((HID + 29)); + final String BTNUP_HID = HelpIds.getHelpIdString((HID + 30)); + final String BTNDOWN_HID = HelpIds.getHelpIdString((HID + 31)); final int LAST_HID = HID + 32; @@ -104,4 +106,4 @@ public interface AgendaWizardDialogConst { } - \ No newline at end of file + diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java index a2969df13..963b3002a 100644 --- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java +++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java @@ -40,7 +40,6 @@ import com.sun.star.lang.EventObject; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.task.XInteractionHandler; import com.sun.star.text.XTextDocument; -//import com.sun.star.uno.Exception; import com.sun.star.uno.UnoRuntime; import com.sun.star.util.CloseVetoException; import com.sun.star.util.XCloseable; @@ -50,6 +49,7 @@ import com.sun.star.wizards.common.FileAccess; import com.sun.star.wizards.common.Helper; import com.sun.star.wizards.common.NoValidPathException; import com.sun.star.wizards.common.SystemDialog; +import com.sun.star.wizards.common.HelpIds; import com.sun.star.wizards.document.OfficeDocument; import com.sun.star.wizards.text.ViewHandler; import com.sun.star.wizards.ui.PathSelection; @@ -202,7 +202,7 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog public void insertPathSelectionControl() { myPathSelection = new PathSelection(xMSF, this, PathSelection.TransferMode.SAVE, PathSelection.DialogTypes.FILE); - myPathSelection.insert(6, 97, 70, 205, (short) 45, resources.reslblTemplatePath_value, true, "HID:" + ( HID + 24 ), "HID:" + ( HID + 25 )); + myPathSelection.insert(6, 97, 70, 205, (short) 45, resources.reslblTemplatePath_value, true, HelpIds.getHelpIdString( HID + 24 ), HelpIds.getHelpIdString( HID + 25 )); myPathSelection.sDefaultDirectory = sUserTemplatePath; myPathSelection.sDefaultName = "myAgendaTemplate.ott"; myPathSelection.sDefaultFilter = "writer8_template"; @@ -594,4 +594,4 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog } - \ No newline at end of file + diff --git a/wizards/com/sun/star/wizards/agenda/TopicsControl.java b/wizards/com/sun/star/wizards/agenda/TopicsControl.java index db39ea99d..08f03ca6a 100644 --- a/wizards/com/sun/star/wizards/agenda/TopicsControl.java +++ b/wizards/com/sun/star/wizards/agenda/TopicsControl.java @@ -27,6 +27,7 @@ package com.sun.star.wizards.agenda; import java.util.List; +import com.sun.star.wizards.common.HelpIds; import com.sun.star.awt.FocusEvent; import com.sun.star.awt.Key; @@ -1178,21 +1179,21 @@ public class TopicsControl extends ControlScroller implements XFocusListener TEXT_PROPS, new Object[] { - I_12, "HID:" + (curHelpIndex + i * 3 + 1), new Integer(x + 15), y_, IStep, new Short((short) (tabindex + 1)), new Integer(84) + I_12, HelpIds.getHelpIdString(curHelpIndex + i * 3 + 1), new Integer(x + 15), y_, IStep, new Short((short) (tabindex + 1)), new Integer(84) }); combobox = dialog.insertTextField(RESP + i, "responsibleTextChanged", this, TEXT_PROPS, new Object[] { - I_12, "HID:" + (curHelpIndex + i * 3 + 2), new Integer(x + 103), y_, IStep, new Short((short) (tabindex + 2)), new Integer(68) + I_12, HelpIds.getHelpIdString(curHelpIndex + i * 3 + 2), new Integer(x + 103), y_, IStep, new Short((short) (tabindex + 2)), new Integer(68) }); timebox = dialog.insertTextField(TIME + i, "timeTextChanged", this, TEXT_PROPS, new Object[] { - I_12, "HID:" + (curHelpIndex + i * 3 + 3), new Integer(x + 175), y_, IStep, new Short((short) (tabindex + 3)), new Integer(20) + I_12, HelpIds.getHelpIdString(curHelpIndex + i * 3 + 3), new Integer(x + 175), y_, IStep, new Short((short) (tabindex + 3)), new Integer(20) }); setEnabled(false); diff --git a/wizards/com/sun/star/wizards/common/HelpIds.java b/wizards/com/sun/star/wizards/common/HelpIds.java new file mode 100644 index 000000000..1b206d03b --- /dev/null +++ b/wizards/com/sun/star/wizards/common/HelpIds.java @@ -0,0 +1,1016 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +package com.sun.star.wizards.common; + +public class HelpIds +{ + private static String array1[] = new String[] + { + "HID:WIZARDS_HID0_WEBWIZARD", // HID:34200 + "HID:WIZARDS_HID0_HELP", // HID:34201 + "HID:WIZARDS_HID0_NEXT", // HID:34202 + "HID:WIZARDS_HID0_PREV", // HID:34203 + "HID:WIZARDS_HID0_CREATE", // HID:34204 + "HID:WIZARDS_HID0_CANCEL", // HID:34205 + "HID:WIZARDS_HID0_STATUS_DIALOG", // HID:34206 + "HID:WIZARDS_HID1_LST_SESSIONS", // HID:34207 + "", + "HID:WIZARDS_HID1_BTN_DEL_SES", // HID:34209 + "HID:WIZARDS_HID2_LST_DOCS", // HID:34210 + "HID:WIZARDS_HID2_BTN_ADD_DOC", // HID:34211 + "HID:WIZARDS_HID2_BTN_REM_DOC", // HID:34212 + "HID:WIZARDS_HID2_BTN_DOC_UP", // HID:34213 + "HID:WIZARDS_HID2_BTN_DOC_DOWN", // HID:34214 + "HID:WIZARDS_HID2_TXT_DOC_TITLE", // HID:34215 + "HID:WIZARDS_HID2_TXT_DOC_DESC", // HID:34216 + "HID:WIZARDS_HID2_TXT_DOC_AUTHOR", // HID:34217 + "HID:WIZARDS_HID2_LST_DOC_EXPORT", // HID:34218 + "HID:WIZARDS_HID2_STATUS_ADD_DOCS", // HID:34219 + "HID:WIZARDS_HID3_IL_LAYOUTS_IMG1", // HID:34220 + "HID:WIZARDS_HID3_IL_LAYOUTS_IMG2", // HID:34221 + "HID:WIZARDS_HID3_IL_LAYOUTS_IMG3", // HID:34222 + "HID:WIZARDS_HID3_IL_LAYOUTS_IMG4", // HID:34223 + "HID:WIZARDS_HID3_IL_LAYOUTS_IMG5", // HID:34224 + "HID:WIZARDS_HID3_IL_LAYOUTS_IMG6", // HID:34225 + "HID:WIZARDS_HID3_IL_LAYOUTS_IMG7", // HID:34226 + "HID:WIZARDS_HID3_IL_LAYOUTS_IMG8", // HID:34227 + "HID:WIZARDS_HID3_IL_LAYOUTS_IMG9", // HID:34228 + "HID:WIZARDS_HID3_IL_LAYOUTS_IMG10", // HID:34229 + "HID:WIZARDS_HID3_IL_LAYOUTS_IMG11", // HID:34230 + "HID:WIZARDS_HID3_IL_LAYOUTS_IMG12", // HID:34231 + "HID:WIZARDS_HID3_IL_LAYOUTS_IMG13", // HID:34232 + "HID:WIZARDS_HID3_IL_LAYOUTS_IMG14", // HID:34233 + "HID:WIZARDS_HID3_IL_LAYOUTS_IMG15", // HID:34234 + "HID:WIZARDS_HID4_CHK_DISPLAY_FILENAME", // HID:34235 + "HID:WIZARDS_HID4_CHK_DISPLAY_DESCRIPTION", // HID:34236 + "HID:WIZARDS_HID4_CHK_DISPLAY_AUTHOR", // HID:34237 + "HID:WIZARDS_HID4_CHK_DISPLAY_CR_DATE", // HID:34238 + "HID:WIZARDS_HID4_CHK_DISPLAY_UP_DATE", // HID:34239 + "HID:WIZARDS_HID4_CHK_DISPLAY_FORMAT", // HID:34240 + "HID:WIZARDS_HID4_CHK_DISPLAY_F_ICON", // HID:34241 + "HID:WIZARDS_HID4_CHK_DISPLAY_PAGES", // HID:34242 + "HID:WIZARDS_HID4_CHK_DISPLAY_SIZE", // HID:34243 + "HID:WIZARDS_HID4_GRP_OPTIMAIZE_640", // HID:34244 + "HID:WIZARDS_HID4_GRP_OPTIMAIZE_800", // HID:34245 + "HID:WIZARDS_HID4_GRP_OPTIMAIZE_1024", // HID:34246 + "HID:WIZARDS_HID5_LST_STYLES", // HID:34247 + "HID:WIZARDS_HID5_BTN_BACKGND", // HID:34248 + "HID:WIZARDS_HID5_BTN_ICONS", // HID:34249 + "HID:WIZARDS_HID6_TXT_SITE_TITLE", // HID:34250 + "", + "", + "HID:WIZARDS_HID6_TXT_SITE_DESC", // HID:34253 + "", + "HID:WIZARDS_HID6_DATE_SITE_CREATED", // HID:34255 + "HID:WIZARDS_HID6_DATE_SITE_UPDATED", // HID:34256 + "", + "HID:WIZARDS_HID6_TXT_SITE_EMAIL", // HID:34258 + "HID:WIZARDS_HID6_TXT_SITE_COPYRIGHT", // HID:34259 + "HID:WIZARDS_HID7_BTN_PREVIEW", // HID:34260 + "HID:WIZARDS_HID7_CHK_PUBLISH_LOCAL", // HID:34261 + "HID:WIZARDS_HID7_TXT_LOCAL", // HID:34262 + "HID:WIZARDS_HID7_BTN_LOCAL", // HID:34263 + "HID:WIZARDS_HID7_CHK_PUBLISH_ZIP", // HID:34264 + "HID:WIZARDS_HID7_TXT_ZIP", // HID:34265 + "HID:WIZARDS_HID7_BTN_ZIP", // HID:34266 + "HID:WIZARDS_HID7_CHK_PUBLISH_FTP", // HID:34267 + "HID:WIZARDS_HID7_TXT_FTP", // HID:34268 + "HID:WIZARDS_HID7_BTN_FTP", // HID:34269 + "HID:WIZARDS_HID7_CHK_SAVE", // HID:34270 + "HID:WIZARDS_HID7_TXT_SAVE", // HID:34271 + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_BG", // HID:34290 + "HID:WIZARDS_HID_BG_BTN_OTHER", // HID:34291 + "HID:WIZARDS_HID_BG_BTN_NONE", // HID:34292 + "HID:WIZARDS_HID_BG_BTN_OK", // HID:34293 + "HID:WIZARDS_HID_BG_BTN_CANCEL", // HID:34294 + "HID:WIZARDS_HID_BG_BTN_BACK", // HID:34295 + "HID:WIZARDS_HID_BG_BTN_FW", // HID:34296 + "HID:WIZARDS_HID_BG_BTN_IMG1", // HID:34297 + "HID:WIZARDS_HID_BG_BTN_IMG2", // HID:34298 + "HID:WIZARDS_HID_BG_BTN_IMG3", // HID:34299 + "HID:WIZARDS_HID_BG_BTN_IMG4", // HID:34300 + "HID:WIZARDS_HID_BG_BTN_IMG5", // HID:34301 + "HID:WIZARDS_HID_BG_BTN_IMG6", // HID:34302 + "HID:WIZARDS_HID_BG_BTN_IMG7", // HID:34303 + "HID:WIZARDS_HID_BG_BTN_IMG8", // HID:34304 + "HID:WIZARDS_HID_BG_BTN_IMG9", // HID:34305 + "HID:WIZARDS_HID_BG_BTN_IMG10", // HID:34306 + "HID:WIZARDS_HID_BG_BTN_IMG11", // HID:34307 + "HID:WIZARDS_HID_BG_BTN_IMG12", // HID:34308 + "HID:WIZARDS_HID_BG_BTN_IMG13", // HID:34309 + "HID:WIZARDS_HID_BG_BTN_IMG14", // HID:34300 + "HID:WIZARDS_HID_BG_BTN_IMG15", // HID:34311 + "HID:WIZARDS_HID_BG_BTN_IMG16", // HID:34312 + "", + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_DLGREPORT_DIALOG", // HID:34320 + "", + "HID:WIZARDS_HID_DLGREPORT_0_CMDPREV", // HID:34322 + "HID:WIZARDS_HID_DLGREPORT_0_CMDNEXT", // HID:34323 + "HID:WIZARDS_HID_DLGREPORT_0_CMDFINISH", // HID:34324 + "HID:WIZARDS_HID_DLGREPORT_0_CMDCANCEL", // HID:34325 + "", + "", + "", + "", + "HID:WIZARDS_HID_DLGREPORT_1_LBTABLES", // HID:34330 + "HID:WIZARDS_HID_DLGREPORT_1_FIELDSAVAILABLE", // HID:34331 + "HID:WIZARDS_HID_DLGREPORT_1_CMDMOVESELECTED", // HID:34332 + "HID:WIZARDS_HID_DLGREPORT_1_CMDMOVEALL", // HID:34333 + "HID:WIZARDS_HID_DLGREPORT_1_CMDREMOVESELECTED", // HID:34334 + "HID:WIZARDS_HID_DLGREPORT_1_CMDREMOVEALL", // HID:34335 + "HID:WIZARDS_HID_DLGREPORT_1_FIELDSSELECTED", // HID:34336 + "HID:WIZARDS_HID_DLGREPORT_1_CMDMOVEUP", // HID:34337 + "HID:WIZARDS_HID_DLGREPORT_1_CMDMOVEDOWN", // HID:34338 + "", + "HID:WIZARDS_HID_DLGREPORT_2_GROUPING", // HID:34340 + "HID:WIZARDS_HID_DLGREPORT_2_CMDGROUP", // HID:34341 + "HID:WIZARDS_HID_DLGREPORT_2_CMDUNGROUP", // HID:34342 + "HID:WIZARDS_HID_DLGREPORT_2_PREGROUPINGDEST", // HID:34343 + "HID:WIZARDS_HID_DLGREPORT_2_CMDMOVEUPGROUP", // HID:34344 + "HID:WIZARDS_HID_DLGREPORT_2_CMDMOVEDOWNGROUP", // HID:34345 + "HID:WIZARDS_HID_DLGREPORT_3_SORT1", // HID:34346 + "HID:WIZARDS_HID_DLGREPORT_3_OPTASCEND1", // HID:34347 + "HID:WIZARDS_HID_DLGREPORT_3_OPTDESCEND1", // HID:34348 + "HID:WIZARDS_HID_DLGREPORT_3_SORT2", // HID:34349 + "HID:WIZARDS_HID_DLGREPORT_3_OPTASCEND2", // HID:34350 + "HID:WIZARDS_HID_DLGREPORT_3_OPTDESCEND2", // HID:34351 + "HID:WIZARDS_HID_DLGREPORT_3_SORT3", // HID:34352 + "HID:WIZARDS_HID_DLGREPORT_3_OPTASCEND3", // HID:34353 + "HID:WIZARDS_HID_DLGREPORT_3_OPTDESCEND3", // HID:34354 + "HID:WIZARDS_HID_DLGREPORT_3_SORT4", // HID:34355 + "HID:WIZARDS_HID_DLGREPORT_3_OPTASCEND4", // HID:34356 + "HID:WIZARDS_HID_DLGREPORT_3_OPTDESCEND4", // HID:34357 + "", + "", + "", + "", + "HID:WIZARDS_HID_DLGREPORT_4_TITLE", // HID:34362 + "HID:WIZARDS_HID_DLGREPORT_4_DATALAYOUT", // HID:34363 + "HID:WIZARDS_HID_DLGREPORT_4_PAGELAYOUT", // HID:34364 + "HID:WIZARDS_HID_DLGREPORT_4_LANDSCAPE", // HID:34365 + "HID:WIZARDS_HID_DLGREPORT_4_PORTRAIT", // HID:34366 + "", + "", + "", + "HID:WIZARDS_HID_DLGREPORT_5_OPTDYNTEMPLATE", // HID:34370 + "HID:WIZARDS_HID_DLGREPORT_5_OPTSTATDOCUMENT", // HID:34371 + "HID:WIZARDS_HID_DLGREPORT_5_TXTTEMPLATEPATH", // HID:34372 + "HID:WIZARDS_HID_DLGREPORT_5_CMDTEMPLATEPATH", // HID:34373 + "HID:WIZARDS_HID_DLGREPORT_5_OPTEDITTEMPLATE", // HID:34374 + "HID:WIZARDS_HID_DLGREPORT_5_OPTUSETEMPLATE", // HID:34375 + "HID:WIZARDS_HID_DLGREPORT_5_TXTDOCUMENTPATH", // HID:34376 + "HID:WIZARDS_HID_DLGREPORT_5_CMDDOCUMENTPATH", // HID:34377 + "HID:WIZARDS_HID_DLGREPORT_5_CHKLINKTODB", // HID:34378 + "", + "", + "HID:WIZARDS_HID_DLGREPORT_6_TXTTITLE_1", // HID:34381 + "HID:WIZARDS_HID_DLGREPORT_6_TXTTITLE_2", // HID:34382 + "HID:WIZARDS_HID_DLGREPORT_6_TXTTITLE_3", // HID:34383 + "HID:WIZARDS_HID_DLGREPORT_6_TXTTITLE_4", // HID:34384 + "HID:WIZARDS_HID_DLGREPORT_6_TXTTITLE_5", // HID:34385 + "HID:WIZARDS_HID_DLGREPORT_6_TXTTITLE_6", // HID:34386 + "HID:WIZARDS_HID_DLGREPORT_6_TXTTITLE_7", // HID:34387 + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_DLGFORM_DIALOG", // HID:34400 + "", + "HID:WIZARDS_HID_DLGFORM_CMDPREV", // HID:34402 + "HID:WIZARDS_HID_DLGFORM_CMDNEXT", // HID:34403 + "HID:WIZARDS_HID_DLGFORM_CMDFINISH", // HID:34404 + "HID:WIZARDS_HID_DLGFORM_CMDCANCEL", // HID:34405 + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_DLGFORM_MASTER_LBTABLES", // HID:34411 + "HID:WIZARDS_HID_DLGFORM_MASTER_FIELDSAVAILABLE", // HID:34412 + "HID:WIZARDS_HID_DLGFORM_MASTER_CMDMOVESELECTED", // HID:34413 + "HID:WIZARDS_HID_DLGFORM_MASTER_CMDMOVEALL", // HID:34414 + "HID:WIZARDS_HID_DLGFORM_MASTER_CMDREMOVESELECTED", // HID:34415 + "HID:WIZARDS_HID_DLGFORM_MASTER_CMDREMOVEALL", // HID:34416 + "HID:WIZARDS_HID_DLGFORM_MASTER_FIELDSSELECTED", // HID:34417 + "HID:WIZARDS_HID_DLGFORM_MASTER_CMDMOVEUP", // HID:34418 + "HID:WIZARDS_HID_DLGFORM_MASTER_CMDMOVEDOWN", // HID:34419 + "", + "HID:WIZARDS_HID_DLGFORM_CHKCREATESUBFORM", // HID:34421 + "HID:WIZARDS_HID_DLGFORM_OPTONEXISTINGRELATION", // HID:34422 + "HID:WIZARDS_HID_DLGFORM_OPTSELECTMANUALLY", // HID:34423 + "HID:WIZARDS_HID_DLGFORM_lstRELATIONS", // HID:34424 + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_DLGFORM_SUB_LBTABLES", // HID:34431 + "HID:WIZARDS_HID_DLGFORM_SUB_FIELDSAVAILABLE", // HID:34432 + "HID:WIZARDS_HID_DLGFORM_SUB_CMDMOVESELECTED", // HID:34433 + "HID:WIZARDS_HID_DLGFORM_SUB_CMDMOVEALL", // HID:34434 + "HID:WIZARDS_HID_DLGFORM_SUB_CMDREMOVESELECTED", // HID:34435 + "HID:WIZARDS_HID_DLGFORM_SUB_CMDREMOVEALL", // HID:34436 + "HID:WIZARDS_HID_DLGFORM_SUB_FIELDSSELECTED", // HID:34437 + "HID:WIZARDS_HID_DLGFORM_SUB_CMDMOVEUP", // HID:34438 + "HID:WIZARDS_HID_DLGFORM_SUB_CMDMOVEDOWN", // HID:34439 + "", + "HID:WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK1", // HID:34441 + "HID:WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK1", // HID:34442 + "HID:WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK2", // HID:34443 + "HID:WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK2", // HID:34444 + "HID:WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK3", // HID:34445 + "HID:WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK3", // HID:34446 + "HID:WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK4", // HID:34447 + "HID:WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK4", // HID:34448 + "", + "", + "HID:WIZARDS_HID_DLGFORM_CMDALIGNLEFT", // HID:34451 + "HID:WIZARDS_HID_DLGFORM_CMDALIGNRIGHT", // HID:34452 + "HID:WIZARDS_HID_DLGFORM_CMDLEFTLABELED", // HID:34453 + "HID:WIZARDS_HID_DLGFORM_CMDTOPLABELED", // HID:34454 + "HID:WIZARDS_HID_DLGFORM_CMDTABLESTYLE", // HID:34455 + "HID:WIZARDS_HID_DLGFORM_CMDTOPJUSTIFIED", // HID:34456 + "HID:WIZARDS_HID_DLGFORM_CMDLEFTLABELED2", // HID:34457 + "HID:WIZARDS_HID_DLGFORM_CMDTOPLABELED2", // HID:34458 + "HID:WIZARDS_HID_DLGFORM_CMDTABLESTYLE2", // HID:34459 + "HID:WIZARDS_HID_DLGFORM_CMDTOPJUSTIFIED2", // HID:34460 + "HID:WIZARDS_HID_DLGFORM_OPTNEWDATAONLY", // HID:34461 + "HID:WIZARDS_HID_DLGFORM_OPTDISPLAYALLDATA", // HID:34462 + "HID:WIZARDS_HID_DLGFORM_CHKNOMODIFICATION", // HID:34463 + "HID:WIZARDS_HID_DLGFORM_CHKNODELETION", // HID:34464 + "HID:WIZARDS_HID_DLGFORM_CHKNOADDITION", // HID:34465 + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_DLGFORM_LSTSTYLES", // HID:34471 + "HID:WIZARDS_HID_DLGFORM_CMDNOBORDER", // HID:34472 + "HID:WIZARDS_HID_DLGFORM_CMD3DBORDER", // HID:34473 + "HID:WIZARDS_HID_DLGFORM_CMDSIMPLEBORDER", // HID:34474 + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_DLGFORM_TXTPATH", // HID:34481 + "HID:WIZARDS_HID_DLGFORM_OPTWORKWITHFORM", // HID:34482 + "HID:WIZARDS_HID_DLGFORM_OPTMODIFYFORM", // HID:34483 + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_DLGNEWSLTR_DIALOG", // HID:34500 + "HID:WIZARDS_HID_DLGNEWSLTR_OPTSTANDARDLAYOUT", // HID:34501 + "HID:WIZARDS_HID_DLGNEWSLTR_OPTPARTYLAYOUT", // HID:34502 + "HID:WIZARDS_HID_DLGNEWSLTR_OPTBROCHURELAYOUT", // HID:34503 + "HID:WIZARDS_HID_DLGNEWSLTR_OPTSINGLESIDED", // HID:34504 + "HID:WIZARDS_HID_DLGNEWSLTR_OPTDOUBLESIDED", // HID:34505 + "HID:WIZARDS_HID_DLGNEWSLTR_CMDGOON", // HID:34506 + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_DLGDEPOT_DIALOG_SELLBUY", // HID:34520 + "HID:WIZARDS_HID_DLGDEPOT_0_TXTSTOCKID_SELLBUY", // HID:34521 + "HID:WIZARDS_HID_DLGDEPOT_0_TXTQUANTITY", // HID:34522 + "HID:WIZARDS_HID_DLGDEPOT_0_TXTRATE", // HID:34523 + "HID:WIZARDS_HID_DLGDEPOT_0_TXTDATE", // HID:34524 + "HID:WIZARDS_HID_DLGDEPOT_0_TXTCOMMISSION", // HID:34525 + "HID:WIZARDS_HID_DLGDEPOT_0_TXTFIX", // HID:34526 + "HID:WIZARDS_HID_DLGDEPOT_0_TXTMINIMUM", // HID:34527 + "HID:WIZARDS_HID_DLGDEPOT_0_CMDCANCEL_SELLBUY", // HID:34528 + "HID:WIZARDS_HID_DLGDEPOT_0_CMDGOON_SELLBUY", // HID:34529 + "HID:WIZARDS_HID_DLGDEPOT_1_LSTSELLSTOCKS", // HID:34530 + "HID:WIZARDS_HID_DLGDEPOT_2_LSTBUYSTOCKS", // HID:34531 + "HID:WIZARDS_HID_DLGDEPOT_DIALOG_SPLIT", // HID:34532 + "HID:WIZARDS_HID_DLGDEPOT_0_LSTSTOCKNAMES", // HID:34533 + "HID:WIZARDS_HID_DLGDEPOT_0_TXTSTOCKID_SPLIT", // HID:34534 + "HID:WIZARDS_HID_DLGDEPOT_0_CMDCANCEL_SPLIT", // HID:34535 + "HID:WIZARDS_HID_DLGDEPOT_0_CMDGOON_SPLIT", // HID:34536 + "HID:WIZARDS_HID_DLGDEPOT_1_OPTPERSHARE", // HID:34537 + "HID:WIZARDS_HID_DLGDEPOT_1_OPTTOTAL", // HID:34538 + "HID:WIZARDS_HID_DLGDEPOT_1_TXTDIVIDEND", // HID:34539 + "HID:WIZARDS_HID_DLGDEPOT_2_TXTOLDRATE", // HID:34540 + "HID:WIZARDS_HID_DLGDEPOT_2_TXTNEWRATE", // HID:34541 + "HID:WIZARDS_HID_DLGDEPOT_2_TXTDATE", // HID:34542 + "HID:WIZARDS_HID_DLGDEPOT_3_TXTSTARTDATE", // HID:34543 + "HID:WIZARDS_HID_DLGDEPOT_3_TXTENDDATE", // HID:34544 + "HID:WIZARDS_HID_DLGDEPOT_3_OPTDAILY", // HID:34545 + "HID:WIZARDS_HID_DLGDEPOT_3_OPTWEEKLY", // HID:34546 + "HID:WIZARDS_HID_DLGDEPOT_DIALOG_HISTORY", // HID:34547 + "HID:WIZARDS_HID_DLGDEPOT_LSTMARKETS", // HID:34548 + "HID:WIZARDS_HID_DLGDEPOT_0_CMDCANCEL_HISTORY", // HID:34549 + "HID:WIZARDS_HID_DLGDEPOT_0_CMDGOON_HISTORY", // HID:34550 + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_DLGIMPORT_DIALOG", // HID:34570 + "HID:WIZARDS_HID_DLGIMPORT_0_CMDHELP", // HID:34571 + "HID:WIZARDS_HID_DLGIMPORT_0_CMDCANCEL", // HID:34572 + "HID:WIZARDS_HID_DLGIMPORT_0_CMDPREV", // HID:34573 + "HID:WIZARDS_HID_DLGIMPORT_0_CMDNEXT", // HID:34574 + "HID:WIZARDS_HID_DLGIMPORT_0_OPTSODOCUMENTS", // HID:34575 + "HID:WIZARDS_HID_DLGIMPORT_0_OPTMSDOCUMENTS", // HID:34576 + "HID:WIZARDS_HID_DLGIMPORT_0_CHKLOGFILE", // HID:34577 + "HID:WIZARDS_HID_DLGIMPORT_2_CHKWORD", // HID:34578 + "HID:WIZARDS_HID_DLGIMPORT_2_CHKEXCEL", // HID:34579 + "HID:WIZARDS_HID_DLGIMPORT_2_CHKPOWERPOINT", // HID:34580 + "HID:WIZARDS_HID_DLGIMPORT_2_CBTEMPLATE", // HID:34581 + "HID:WIZARDS_HID_DLGIMPORT_2_CBTEMPLATERECURSE", // HID:34582 + "HID:WIZARDS_HID_DLGIMPORT_2_LBTEMPLATEPATH", // HID:34583 + "HID:WIZARDS_HID_DLGIMPORT_2_EDTEMPLATEPATH", // HID:34584 + "HID:WIZARDS_HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT", // HID:34585 + "HID:WIZARDS_HID_DLGIMPORT_2_CBDOCUMENT", // HID:34586 + "HID:WIZARDS_HID_DLGIMPORT_2_CBDOCUMENTRECURSE", // HID:34587 + "HID:WIZARDS_HID_DLGIMPORT_2_LBDOCUMENTPATH", // HID:34588 + "HID:WIZARDS_HID_DLGIMPORT_2_EDDOCUMENTPATH", // HID:34589 + "HID:WIZARDS_HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT", // HID:34590 + "HID:WIZARDS_HID_DLGIMPORT_2_LBEXPORTDOCUMENTPATH", // HID:34591 + "HID:WIZARDS_HID_DLGIMPORT_2_EDEXPORTDOCUMENTPATH", // HID:34592 + "HID:WIZARDS_HID_DLGIMPORT_2_CMDEXPORTPATHSELECT", // HID:34593 + "", + "HID:WIZARDS_HID_DLGIMPORT_3_TBSUMMARY", // HID:34595 + "HID:WIZARDS_HID_DLGIMPORT_0_CHKWRITER", // HID:34596 + "HID:WIZARDS_HID_DLGIMPORT_0_CHKCALC", // HID:34597 + "HID:WIZARDS_HID_DLGIMPORT_0_CHKIMPRESS", // HID:34598 + "HID:WIZARDS_HID_DLGIMPORT_0_CHKMATHGLOBAL", // HID:34599 + "HID:WIZARDS_HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT2", // HID:34600 + "HID:WIZARDS_HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT2", // HID:34601 + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_DLGCORRESPONDENCE_DIALOG", // HID:34630 + "HID:WIZARDS_HID_DLGCORRESPONDENCE_CANCEL", // HID:34631 + "HID:WIZARDS_HID_DLGCORRESPONDENCE_OPTIONAGENDA1", // HID:34632 + "HID:WIZARDS_HID_DLGCORRESPONDENCE_OPTIONAGENDA2", // HID:34633 + "HID:WIZARDS_HID_DLGCORRESPONDENCE_AGENDAOKAY", // HID:34634 + "HID:WIZARDS_HID_DLGCORRESPONDENCE_OPTIONLETTER1", // HID:34635 + "HID:WIZARDS_HID_DLGCORRESPONDENCE_OPTIONLETTER2", // HID:34636 + "HID:WIZARDS_HID_DLGCORRESPONDENCE_LETTEROKAY", // HID:34637 + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_DLGSTYLES_DIALOG", // HID:34650 + "HID:WIZARDS_HID_DLGSTYLES_LISTBOX", // HID:34651 + "HID:WIZARDS_HID_DLGSTYLES_CANCEL", // HID:34652 + "HID:WIZARDS_HID_DLGSTYLES_OKAY", // HID:34653 + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_DLGCONVERT_DIALOG", // HID:34660 + "HID:WIZARDS_HID_DLGCONVERT_CHECKBOX1", // HID:34661 + "HID:WIZARDS_HID_DLGCONVERT_OPTIONBUTTON1", // HID:34662 + "HID:WIZARDS_HID_DLGCONVERT_OPTIONBUTTON2", // HID:34663 + "HID:WIZARDS_HID_DLGCONVERT_OPTIONBUTTON3", // HID:34664 + "HID:WIZARDS_HID_DLGCONVERT_OPTIONBUTTON4", // HID:34665 + "HID:WIZARDS_HID_DLGCONVERT_LISTBOX1", // HID:34666 + "HID:WIZARDS_HID_DLGCONVERT_OBFILE", // HID:34667 + "HID:WIZARDS_HID_DLGCONVERT_OBDIR", // HID:34668 + "HID:WIZARDS_HID_DLGCONVERT_COMBOBOX1", // HID:34669 + "HID:WIZARDS_HID_DLGCONVERT_TBSOURCE", // HID:34670 + "HID:WIZARDS_HID_DLGCONVERT_CHECKRECURSIVE", // HID:34671 + "HID:WIZARDS_HID_DLGCONVERT_TBTARGET", // HID:34672 + "HID:WIZARDS_HID_DLGCONVERT_CBCANCEL", // HID:34673 + "HID:WIZARDS_HID_DLGCONVERT_CBHELP", // HID:34674 + "HID:WIZARDS_HID_DLGCONVERT_CBBACK", // HID:34675 + "HID:WIZARDS_HID_DLGCONVERT_CBGOON", // HID:34676 + "HID:WIZARDS_HID_DLGCONVERT_CBSOURCEOPEN", // HID:34677 + "HID:WIZARDS_HID_DLGCONVERT_CBTARGETOPEN", // HID:34678 + "HID:WIZARDS_HID_DLGCONVERT_CHKPROTECT", // HID:34679 + "HID:WIZARDS_HID_DLGCONVERT_CHKTEXTDOCUMENTS", // HID:34680 + "", + "", + "", + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_DLGPASSWORD_CMDGOON", // HID:34690 + "HID:WIZARDS_HID_DLGPASSWORD_CMDCANCEL", // HID:34691 + "HID:WIZARDS_HID_DLGPASSWORD_CMDHELP", // HID:34692 + "HID:WIZARDS_HID_DLGPASSWORD_TXTPASSWORD", // HID:34693 + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_DLGHOLIDAYCAL_DIALOG", // HID:34700 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_1_PREVIEW", // HID:34701 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_1_OPYEAR", // HID:34702 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_1_OPMONTH", // HID:34703 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_1_EDYEAR", // HID:34704 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_1_EDMONTH", // HID:34705 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_1_SPINYEAR", // HID:34706 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_1_SPINMONTH", // HID:34707 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_1_CMBSTATE", // HID:34708 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_LBOWNDATA", // HID:34709 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_CMDINSERT", // HID:34710 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_CMDDELETE", // HID:34711 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENT", // HID:34712 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_CHKEVENT", // HID:34713 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENTDAY", // HID:34714 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_SPINEVENTDAY", // HID:34715 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENTMONTH", // HID:34716 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_SPINEVENTMONTH", // HID:34717 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENTYEAR", // HID:34718 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_2_SPINEVENTYEAR", // HID:34719 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_0_CMDOWNDATA", // HID:34720 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_0_CMDCANCEL", // HID:34721 + "HID:WIZARDS_HID_DLGHOLIDAYCAL_0_CMDOK" // HID:34722 + }; + + private static String array2[] = new String[] + { + "HID:WIZARDS_HID_LTRWIZ_OPTBUSINESSLETTER", // HID:40769 + "HID:WIZARDS_HID_LTRWIZ_OPTPRIVOFFICIALLETTER", // HID:40770 + "HID:WIZARDS_HID_LTRWIZ_OPTPRIVATELETTER", // HID:40771 + "HID:WIZARDS_HID_LTRWIZ_LSTBUSINESSSTYLE", // HID:40772 + "HID:WIZARDS_HID_LTRWIZ_CHKBUSINESSPAPER", // HID:40773 + "HID:WIZARDS_HID_LTRWIZ_LSTPRIVOFFICIALSTYLE", // HID:40774 + "HID:WIZARDS_HID_LTRWIZ_LSTPRIVATESTYLE", // HID:40775 + "HID:WIZARDS_HID_LTRWIZ_CHKPAPERCOMPANYLOGO", // HID:40776 + "HID:WIZARDS_HID_LTRWIZ_NUMLOGOHEIGHT", // HID:40777 + "HID:WIZARDS_HID_LTRWIZ_NUMLOGOX", // HID:40778 + "HID:WIZARDS_HID_LTRWIZ_NUMLOGOWIDTH", // HID:40779 + "HID:WIZARDS_HID_LTRWIZ_NUMLOGOY", // HID:40780 + "HID:WIZARDS_HID_LTRWIZ_CHKPAPERCOMPANYADDRESS", // HID:40781 + "HID:WIZARDS_HID_LTRWIZ_NUMADDRESSHEIGHT", // HID:40782 + "HID:WIZARDS_HID_LTRWIZ_NUMADDRESSX", // HID:40783 + "HID:WIZARDS_HID_LTRWIZ_NUMADDRESSWIDTH", // HID:40784 + "HID:WIZARDS_HID_LTRWIZ_NUMADDRESSY", // HID:40785 + "HID:WIZARDS_HID_LTRWIZ_CHKCOMPANYRECEIVER", // HID:40786 + "HID:WIZARDS_HID_LTRWIZ_CHKPAPERFOOTER", // HID:40787 + "HID:WIZARDS_HID_LTRWIZ_NUMFOOTERHEIGHT", // HID:40788 + "HID:WIZARDS_HID_LTRWIZ_LSTLETTERNORM", // HID:40789 + "HID:WIZARDS_HID_LTRWIZ_CHKUSELOGO", // HID:40790 + "HID:WIZARDS_HID_LTRWIZ_CHKUSEADDRESSRECEIVER", // HID:40791 + "HID:WIZARDS_HID_LTRWIZ_CHKUSESIGNS", // HID:40792 + "HID:WIZARDS_HID_LTRWIZ_CHKUSESUBJECT", // HID:40793 + "HID:WIZARDS_HID_LTRWIZ_CHKUSESALUTATION", // HID:40794 + "HID:WIZARDS_HID_LTRWIZ_LSTSALUTATION", // HID:40795 + "HID:WIZARDS_HID_LTRWIZ_CHKUSEBENDMARKS", // HID:40796 + "HID:WIZARDS_HID_LTRWIZ_CHKUSEGREETING", // HID:40797 + "HID:WIZARDS_HID_LTRWIZ_LSTGREETING", // HID:40798 + "HID:WIZARDS_HID_LTRWIZ_CHKUSEFOOTER", // HID:40799 + "HID:WIZARDS_HID_LTRWIZ_OPTSENDERPLACEHOLDER", // HID:40800 + "HID:WIZARDS_HID_LTRWIZ_OPTSENDERDEFINE", // HID:40801 + "HID:WIZARDS_HID_LTRWIZ_TXTSENDERNAME", // HID:40802 + "HID:WIZARDS_HID_LTRWIZ_TXTSENDERSTREET", // HID:40803 + "HID:WIZARDS_HID_LTRWIZ_TXTSENDERPOSTCODE", // HID:40804 + "HID:WIZARDS_HID_LTRWIZ_TXTSENDERSTATE_TEXT", // HID:40805 + "HID:WIZARDS_HID_LTRWIZ_TXTSENDERCITY", // HID:40806 + "HID:WIZARDS_HID_LTRWIZ_OPTRECEIVERPLACEHOLDER", // HID:40807 + "HID:WIZARDS_HID_LTRWIZ_OPTRECEIVERDATABASE", // HID:40808 + "HID:WIZARDS_HID_LTRWIZ_TXTFOOTER", // HID:40809 + "HID:WIZARDS_HID_LTRWIZ_CHKFOOTERNEXTPAGES", // HID:40810 + "HID:WIZARDS_HID_LTRWIZ_CHKFOOTERPAGENUMBERS", // HID:40811 + "HID:WIZARDS_HID_LTRWIZ_TXTTEMPLATENAME", // HID:40812 + "HID:WIZARDS_HID_LTRWIZ_OPTCREATELETTER", // HID:40813 + "HID:WIZARDS_HID_LTRWIZ_OPTMAKECHANGES", // HID:40814 + "HID:WIZARDS_HID_LTRWIZ_TXTPATH", // HID:40815 + "HID:WIZARDS_HID_LTRWIZ_CMDPATH", // HID:40816 + "", + "", + "", + "HID:WIZARDS_HID_LTRWIZARD", // HID:40820 + "HID:WIZARDS_HID_LTRWIZARD_HELP", // HID:40821 + "HID:WIZARDS_HID_LTRWIZARD_BACK", // HID:40822 + "HID:WIZARDS_HID_LTRWIZARD_NEXT", // HID:40823 + "HID:WIZARDS_HID_LTRWIZARD_CREATE", // HID:40824 + "HID:WIZARDS_HID_LTRWIZARD_CANCEL", // HID:40825 + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_QUERYWIZARD_LSTTABLES", // HID:40850 + "HID:WIZARDS_HID_QUERYWIZARD_LSTFIELDS", // HID:40851 + "HID:WIZARDS_HID_QUERYWIZARD_CMDMOVESELECTED", // HID:40852 + "HID:WIZARDS_HID_QUERYWIZARD_CMDMOVEALL", // HID:40853 + "HID:WIZARDS_HID_QUERYWIZARD_CMDREMOVESELECTED", // HID:40854 + "HID:WIZARDS_HID_QUERYWIZARD_CMDREMOVEALL", // HID:40855 + "HID:WIZARDS_HID_QUERYWIZARD_LSTSELFIELDS", // HID:40856 + "HID:WIZARDS_HID_QUERYWIZARD_CMDMOVEUP", // HID:40857 + "HID:WIZARDS_HID_QUERYWIZARD_CMDMOVEDOWN", // HID:40858 + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_QUERYWIZARD_SORT1", // HID:40865 + "HID:WIZARDS_HID_QUERYWIZARD_OPTASCEND1", // HID:40866 + "HID:WIZARDS_HID_QUERYWIZARD_OPTDESCEND1", // HID:40867 + "HID:WIZARDS_HID_QUERYWIZARD_SORT2", // HID:40868 + "HID:WIZARDS_HID_QUERYWIZARD_OPTASCEND2", // HID:40869 + "HID:WIZARDS_HID_QUERYWIZARD_OPTDESCEND2", // HID:40870 + "HID:WIZARDS_HID_QUERYWIZARD_SORT3", // HID:40871 + "HID:WIZARDS_HID_QUERYWIZARD_OPTASCEND3", // HID:40872 + "HID:WIZARDS_HID_QUERYWIZARD_OPTDESCEND3", // HID:40873 + "HID:WIZARDS_HID_QUERYWIZARD_SORT4", // HID:40874 + "HID:WIZARDS_HID_QUERYWIZARD_OPTASCEND4", // HID:40875 + "HID:WIZARDS_HID_QUERYWIZARD_OPTDESCEND4", // HID:40876 + "", + "HID:WIZARDS_HID_QUERYWIZARD_OPTMATCHALL", // HID:40878 + "HID:WIZARDS_HID_QUERYWIZARD_OPTMATCHANY", // HID:40879 + "HID:WIZARDS_HID_QUERYWIZARD_LSTFIELDNAME_1", // HID:40880 + "HID:WIZARDS_HID_QUERYWIZARD_LSTOPERATOR_1", // HID:40881 + "HID:WIZARDS_HID_QUERYWIZARD_TXTVALUE_1", // HID:40882 + "HID:WIZARDS_HID_QUERYWIZARD_LSTFIELDNAME_2", // HID:40883 + "HID:WIZARDS_HID_QUERYWIZARD_LSTOPERATOR_2", // HID:40884 + "HID:WIZARDS_HID_QUERYWIZARD_TXTVALUE_2", // HID:40885 + "HID:WIZARDS_HID_QUERYWIZARD_LSTFIELDNAME_3", // HID:40886 + "HID:WIZARDS_HID_QUERYWIZARD_LSTOPERATOR_3", // HID:40887 + "HID:WIZARDS_HID_QUERYWIZARD_TXTVALUE_3", // HID:40888 + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_QUERYWIZARD_OPTAGGREGATEDETAILQUERY", // HID:40895 + "HID:WIZARDS_HID_QUERYWIZARD_OPTAGGREGATESUMMARYQUERY", // HID:40896 + "HID:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_1", // HID:40897 + "HID:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_1", // HID:40898 + "HID:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_2", // HID:40899 + "HID:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_2", // HID:40900 + "HID:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_3", // HID:40901 + "HID:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_3", // HID:40902 + "HID:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_4", // HID:40903 + "HID:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_4", // HID:40904 + "HID:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_5", // HID:40905 + "HID:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_5", // HID:40906 + "HID:WIZARDS_HID_QUERYWIZARD_BTNAGGREGATEPLUS", // HID:40907 + "HID:WIZARDS_HID_QUERYWIZARD_BTNAGGREGATEMINUS", // HID:40908 + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_QUERYWIZARD_LSTFILTERFIELDS", // HID:40915 + "HID:WIZARDS_HID_QUERYWIZARD_CMDFILTERMOVESELECTED", // HID:40916 + "HID:WIZARDS_HID_QUERYWIZARD_CMDFILTERREMOVESELECTED", // HID:40917 + "HID:WIZARDS_HID_QUERYWIZARD_LSTFILTERSELFIELDS", // HID:40918 + "HID:WIZARDS_HID_QUERYWIZARD_CMDFILTERMOVEUP", // HID:40919 + "HID:WIZARDS_HID_QUERYWIZARD_CMDFILTERMOVEDOWN", // HID:40920 + "", + "", + "HID:WIZARDS_HID_QUERYWIZARD_OPTGROUPMATCHALL", // HID:40923 + "HID:WIZARDS_HID_QUERYWIZARD_OPTGROUPMATCHANY", // HID:40924 + "HID:WIZARDS_HID_QUERYWIZARD_LSTFILTERFIELDNAME_1", // HID:40925 + "HID:WIZARDS_HID_QUERYWIZARD_LSTFILTEROPERATOR_1", // HID:40926 + "HID:WIZARDS_HID_QUERYWIZARD_TXTFILTERVALUE_1", // HID:40927 + "HID:WIZARDS_HID_QUERYWIZARD_LSTFILTERFIELDNAME_2", // HID:40928 + "HID:WIZARDS_HID_QUERYWIZARD_LSTFILTEROPERATOR_2", // HID:40929 + "HID:WIZARDS_HID_QUERYWIZARD_TXTFILTERVALUE_2", // HID:40930 + "HID:WIZARDS_HID_QUERYWIZARD_LSTFILTERFIELDNAME_3", // HID:40931 + "HID:WIZARDS_HID_QUERYWIZARD_LSTFILTEROPERATOR_3", // HID:40932 + "HID:WIZARDS_HID_QUERYWIZARD_TXTFILTERVALUE_3", // HID:40933 + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_QUERYWIZARD_TXTTITLE_1", // HID:40940 + "HID:WIZARDS_HID_QUERYWIZARD_TXTTITLE_2", // HID:40941 + "HID:WIZARDS_HID_QUERYWIZARD_TXTTITLE_3", // HID:40942 + "HID:WIZARDS_HID_QUERYWIZARD_TXTTITLE_4", // HID:40943 + "HID:WIZARDS_HID_QUERYWIZARD_TXTTITLE_5", // HID:40944 + "HID:WIZARDS_HID_QUERYWIZARD_TXTTITLE_6", // HID:40945 + "HID:WIZARDS_HID_QUERYWIZARD_TXTTITLE_7", // HID:40946 + "", + "", + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_QUERYWIZARD_TXTQUERYTITLE", // HID:40955 + "HID:WIZARDS_HID_QUERYWIZARD_OPTDISPLAYQUERY", // HID:40956 + "HID:WIZARDS_HID_QUERYWIZARD_OPTMODIFYQUERY", // HID:40957 + "HID:WIZARDS_HID_QUERYWIZARD_TXTSUMMARY", // HID:40958 + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_QUERYWIZARD", // HID:40970 + "", + "HID:WIZARDS_HID_QUERYWIZARD_BACK", // HID:40972 + "HID:WIZARDS_HID_QUERYWIZARD_NEXT", // HID:40973 + "HID:WIZARDS_HID_QUERYWIZARD_CREATE", // HID:40974 + "HID:WIZARDS_HID_QUERYWIZARD_CANCEL", // HID:40975 + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_IS", // HID:41000 + "", + "HID:WIZARDS_HID_IS_BTN_NONE", // HID:41002 + "HID:WIZARDS_HID_IS_BTN_OK", // HID:41003 + "HID:WIZARDS_HID_IS_BTN_CANCEL", // HID:41004 + "HID:WIZARDS_HID_IS_BTN_IMG1", // HID:41005 + "HID:WIZARDS_HID_IS_BTN_IMG2", // HID:41006 + "HID:WIZARDS_HID_IS_BTN_IMG3", // HID:41007 + "HID:WIZARDS_HID_IS_BTN_IMG4", // HID:41008 + "HID:WIZARDS_HID_IS_BTN_IMG5", // HID:41009 + "HID:WIZARDS_HID_IS_BTN_IMG6", // HID:41010 + "HID:WIZARDS_HID_IS_BTN_IMG7", // HID:41011 + "HID:WIZARDS_HID_IS_BTN_IMG8", // HID:41012 + "HID:WIZARDS_HID_IS_BTN_IMG9", // HID:41013 + "HID:WIZARDS_HID_IS_BTN_IMG10", // HID:41014 + "HID:WIZARDS_HID_IS_BTN_IMG11", // HID:41015 + "HID:WIZARDS_HID_IS_BTN_IMG12", // HID:41016 + "HID:WIZARDS_HID_IS_BTN_IMG13", // HID:41017 + "HID:WIZARDS_HID_IS_BTN_IMG14", // HID:41018 + "HID:WIZARDS_HID_IS_BTN_IMG15", // HID:41019 + "HID:WIZARDS_HID_IS_BTN_IMG16", // HID:41020 + "HID:WIZARDS_HID_IS_BTN_IMG17", // HID:41021 + "HID:WIZARDS_HID_IS_BTN_IMG18", // HID:41022 + "HID:WIZARDS_HID_IS_BTN_IMG19", // HID:41023 + "HID:WIZARDS_HID_IS_BTN_IMG20", // HID:41024 + "HID:WIZARDS_HID_IS_BTN_IMG21", // HID:41025 + "HID:WIZARDS_HID_IS_BTN_IMG22", // HID:41026 + "HID:WIZARDS_HID_IS_BTN_IMG23", // HID:41027 + "HID:WIZARDS_HID_IS_BTN_IMG24", // HID:41028 + "HID:WIZARDS_HID_IS_BTN_IMG25", // HID:41029 + "HID:WIZARDS_HID_IS_BTN_IMG26", // HID:41030 + "HID:WIZARDS_HID_IS_BTN_IMG27", // HID:41031 + "HID:WIZARDS_HID_IS_BTN_IMG28", // HID:41032 + "HID:WIZARDS_HID_IS_BTN_IMG29", // HID:41033 + "HID:WIZARDS_HID_IS_BTN_IMG30", // HID:41034 + "HID:WIZARDS_HID_IS_BTN_IMG31", // HID:41035 + "HID:WIZARDS_HID_IS_BTN_IMG32", // HID:41036 + "", + "", + "", + "HID:WIZARDS_HID_FTP", // HID:41040 + "HID:WIZARDS_HID_FTP_SERVER", // HID:41041 + "HID:WIZARDS_HID_FTP_USERNAME", // HID:41042 + "HID:WIZARDS_HID_FTP_PASS", // HID:41043 + "HID:WIZARDS_HID_FTP_TEST", // HID:41044 + "HID:WIZARDS_HID_FTP_TXT_PATH", // HID:41045 + "HID:WIZARDS_HID_FTP_BTN_PATH", // HID:41046 + "HID:WIZARDS_HID_FTP_OK", // HID:41047 + "HID:WIZARDS_HID_FTP_CANCEL", // HID:41048 + "", + "", + "HID:WIZARDS_HID_AGWIZ", // HID:41051 + "HID:WIZARDS_HID_AGWIZ_HELP", // HID:41052 + "HID:WIZARDS_HID_AGWIZ_NEXT", // HID:41053 + "HID:WIZARDS_HID_AGWIZ_PREV", // HID:41054 + "HID:WIZARDS_HID_AGWIZ_CREATE", // HID:41055 + "HID:WIZARDS_HID_AGWIZ_CANCEL", // HID:41056 + "HID:WIZARDS_HID_AGWIZ_1_LIST_PAGEDESIGN", // HID:41057 + "HID:WIZARDS_HID_AGWIZ_1_CHK_MINUTES", // HID:41058 + "HID:WIZARDS_HID_AGWIZ_2_TXT_TIME", // HID:41059 + "HID:WIZARDS_HID_AGWIZ_2_TXT_DATE", // HID:41060 + "HID:WIZARDS_HID_AGWIZ_2_TXT_TITLE", // HID:41061 + "HID:WIZARDS_HID_AGWIZ_2_TXT_LOCATION", // HID:41062 + "HID:WIZARDS_HID_AGWIZ_3_CHK_MEETING_TYPE", // HID:41063 + "HID:WIZARDS_HID_AGWIZ_3_CHK_READ", // HID:41064 + "HID:WIZARDS_HID_AGWIZ_3_CHK_BRING", // HID:41065 + "HID:WIZARDS_HID_AGWIZ_3_CHK_NOTES", // HID:41066 + "HID:WIZARDS_HID_AGWIZ_4_CHK_CALLED_BY", // HID:41067 + "HID:WIZARDS_HID_AGWIZ_4_CHK_FACILITATOR", // HID:41068 + "HID:WIZARDS_HID_AGWIZ_4_CHK_NOTETAKER", // HID:41069 + "HID:WIZARDS_HID_AGWIZ_4_CHK_TIMEKEEPER", // HID:41070 + "HID:WIZARDS_HID_AGWIZ_4_CHK_ATTENDEES", // HID:41071 + "HID:WIZARDS_HID_AGWIZ_4_CHK_OBSERVERS", // HID:41072 + "HID:WIZARDS_HID_AGWIZ_4_CHK_RESOURCEPERSONS", // HID:41073 + "HID:WIZARDS_HID_AGWIZ_6_TXT_TEMPLATENAME", // HID:41074 + "HID:WIZARDS_HID_AGWIZ_6_TXT_TEMPLATEPATH", // HID:41075 + "HID:WIZARDS_HID_AGWIZ_6_BTN_TEMPLATEPATH", // HID:41076 + "HID:WIZARDS_HID_AGWIZ_6_OPT_CREATEAGENDA", // HID:41077 + "HID:WIZARDS_HID_AGWIZ_6_OPT_MAKECHANGES", // HID:41078 + "HID:WIZARDS_HID_AGWIZ_5_BTN_INSERT", // HID:41079 + "HID:WIZARDS_HID_AGWIZ_5_BTN_REMOVE", // HID:41080 + "HID:WIZARDS_HID_AGWIZ_5_BTN_UP", // HID:41081 + "HID:WIZARDS_HID_AGWIZ_5_BTN_DOWN", // HID:41082 + "HID:WIZARDS_HID_AGWIZ_5_SCROLL_BAR", // HID:41083 + "HID:WIZARDS_HID_AGWIZ_5_TXT_TOPIC_1", // HID:41084 + "HID:WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_1", // HID:41085 + "HID:WIZARDS_HID_AGWIZ_5_TXT_MINUTES_1", // HID:41086 + "HID:WIZARDS_HID_AGWIZ_5_TXT_TOPIC_2", // HID:41087 + "HID:WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_2", // HID:41088 + "HID:WIZARDS_HID_AGWIZ_5_TXT_MINUTES_2", // HID:41089 + "HID:WIZARDS_HID_AGWIZ_5_TXT_TOPIC_3", // HID:41090 + "HID:WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_3", // HID:41091 + "HID:WIZARDS_HID_AGWIZ_5_TXT_MINUTES_3", // HID:41092 + "HID:WIZARDS_HID_AGWIZ_5_TXT_TOPIC_4", // HID:41093 + "HID:WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_4", // HID:41094 + "HID:WIZARDS_HID_AGWIZ_5_TXT_MINUTES_4", // HID:41095 + "HID:WIZARDS_HID_AGWIZ_5_TXT_TOPIC_5", // HID:41096 + "HID:WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_5", // HID:41097 + "HID:WIZARDS_HID_AGWIZ_5_TXT_MINUTES_5", // HID:41098 + "", + "HID:WIZARDS_HID_FAXWIZ_OPTBUSINESSFAX", // HID:41120 + "HID:WIZARDS_HID_FAXWIZ_LSTBUSINESSSTYLE", // HID:41121 + "HID:WIZARDS_HID_FAXWIZ_OPTPRIVATEFAX", // HID:41122 + "HID:WIZARDS_HID_LSTPRIVATESTYLE", // HID:41123 + "HID:WIZARDS_HID_IMAGECONTROL3", // HID:41124 + "HID:WIZARDS_HID_CHKUSELOGO", // HID:41125 + "HID:WIZARDS_HID_CHKUSEDATE", // HID:41126 + "HID:WIZARDS_HID_CHKUSECOMMUNICATIONTYPE", // HID:41127 + "HID:WIZARDS_HID_LSTCOMMUNICATIONTYPE", // HID:41128 + "HID:WIZARDS_HID_CHKUSESUBJECT", // HID:41129 + "HID:WIZARDS_HID_CHKUSESALUTATION", // HID:41130 + "HID:WIZARDS_HID_LSTSALUTATION", // HID:41131 + "HID:WIZARDS_HID_CHKUSEGREETING", // HID:41132 + "HID:WIZARDS_HID_LSTGREETING", // HID:41133 + "HID:WIZARDS_HID_CHKUSEFOOTER", // HID:41134 + "HID:WIZARDS_HID_OPTSENDERPLACEHOLDER", // HID:41135 + "HID:WIZARDS_HID_OPTSENDERDEFINE", // HID:41136 + "HID:WIZARDS_HID_TXTSENDERNAME", // HID:41137 + "HID:WIZARDS_HID_TXTSENDERSTREET", // HID:41138 + "HID:WIZARDS_HID_TXTSENDERPOSTCODE", // HID:41139 + "HID:WIZARDS_HID_TXTSENDERSTATE", // HID:41140 + "HID:WIZARDS_HID_TXTSENDERCITY", // HID:41141 + "HID:WIZARDS_HID_TXTSENDERFAX", // HID:41142 + "HID:WIZARDS_HID_OPTRECEIVERPLACEHOLDER", // HID:41143 + "HID:WIZARDS_HID_OPTRECEIVERDATABASE", // HID:41144 + "HID:WIZARDS_HID_TXTFOOTER", // HID:41145 + "HID:WIZARDS_HID_CHKFOOTERNEXTPAGES", // HID:41146 + "HID:WIZARDS_HID_CHKFOOTERPAGENUMBERS", // HID:41147 + "HID:WIZARDS_HID_TXTTEMPLATENAME", // HID:41148 + "HID:WIZARDS_HID_FILETEMPLATEPATH", // HID:41149 + "HID:WIZARDS_HID_OPTCREATEFAX", // HID:41150 + "HID:WIZARDS_HID_OPTMAKECHANGES", // HID:41151 + "HID:WIZARDS_HID_IMAGECONTROL2", // HID:41152 + "HID:WIZARDS_HID_FAXWIZ_TXTPATH", // HID:41153 + "HID:WIZARDS_HID_FAXWIZ_CMDPATH", // HID:41154 + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_FAXWIZARD", // HID:41180 + "HID:WIZARDS_HID_FAXWIZARD_HELP", // HID:41181 + "HID:WIZARDS_HID_FAXWIZARD_BACK", // HID:41182 + "HID:WIZARDS_HID_FAXWIZARD_NEXT", // HID:41183 + "HID:WIZARDS_HID_FAXWIZARD_CREATE", // HID:41184 + "HID:WIZARDS_HID_FAXWIZARD_CANCEL", // HID:41185 + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "HID:WIZARDS_HID_DLGTABLE_DIALOG", // HID:41200 + "", + "HID:WIZARDS_HID_DLGTABLE_CMDPREV", // HID:41202 + "HID:WIZARDS_HID_DLGTABLE_CMDNEXT", // HID:41203 + "HID:WIZARDS_HID_DLGTABLE_CMDFINISH", // HID:41204 + "HID:WIZARDS_HID_DLGTABLE_CMDCANCEL", // HID:41205 + "HID:WIZARDS_HID_DLGTABLE_OPTBUSINESS", // HID:41206 + "HID:WIZARDS_HID_DLGTABLE_OPTPRIVATE", // HID:41207 + "HID:WIZARDS_HID_DLGTABLE_LBTABLES", // HID:41208 + "HID:WIZARDS_HID_DLGTABLE_FIELDSAVAILABLE", // HID:41209 + "HID:WIZARDS_HID_DLGTABLE_CMDMOVESELECTED", // HID:41210 + "HID:WIZARDS_HID_DLGTABLE_CMDMOVEALL", // HID:41211 + "HID:WIZARDS_HID_DLGTABLE_CMDREMOVESELECTED", // HID:41212 + "HID:WIZARDS_HID_DLGTABLE_CMDREMOVEALL", // HID:41213 + "HID:WIZARDS_HID_DLGTABLE_FIELDSSELECTED", // HID:41214 + "HID:WIZARDS_HID_DLGTABLE_CMDMOVEUP", // HID:41215 + "HID:WIZARDS_HID_DLGTABLE_CMDMOVEDOWN", // HID:41216 + "", + "", + "", + "HID:WIZARDS_HID_DLGTABLE_LB_SELFIELDNAMES", // HID:41220 + "HID:WIZARDS_HID_DLGTABLE_CMDMOVEFIELDUP", // HID:41221 + "HID:WIZARDS_HID_DLGTABLE_CMDMOVEFIELDDOWN", // HID:41222 + "HID:WIZARDS_HID_DLGTABLE_CMDMINUS", // HID:41223 + "HID:WIZARDS_HID_DLGTABLE_CMDPLUS", // HID:41224 + "HID:WIZARDS_HID_DLGTABLE_COLNAME", // HID:41225 + "HID:WIZARDS_HID_DLGTABLE_COLMODIFIER", // HID:41226 + "HID:WIZARDS_HID_DLGTABLE_CHK_USEPRIMEKEY", // HID:41227 + "HID:WIZARDS_HID_DLGTABLE_OPT_PK_AUTOMATIC", // HID:41228 + "HID:WIZARDS_HID_DLGTABLE_CK_PK_AUTOVALUE_AUTOMATIC", // HID:41229 + "HID:WIZARDS_HID_DLGTABLE_OPT_PK_SINGLE", // HID:41230 + "HID:WIZARDS_HID_DLGTABLE_LB_PK_FIELDNAME", // HID:41231 + "HID:WIZARDS_HID_DLGTABLE_CK_PK_AUTOVALUE", // HID:41232 + "HID:WIZARDS_HID_DLGTABLE_OPT_PK_SEVERAL", // HID:41233 + "HID:WIZARDS_HID_DLGTABLE_FIELDS_PK_AVAILABLE", // HID:41234 + "HID:WIZARDS_HID_DLGTABLE_CMDMOVE_PK_SELECTED", // HID:41235 + "HID:WIZARDS_HID_DLGTABLE_CMDREMOVE_PK_SELECTED", // HID:41236 + "HID:WIZARDS_HID_DLGTABLE_FIELDS_PK_SELECTED", // HID:41237 + "HID:WIZARDS_HID_DLGTABLE_CMDMOVEUP_PK_SELECTED", // HID:41238 + "HID:WIZARDS_HID_DLGTABLE_CMDMOVEDOWN_PK_SELECTED", // HID:41239 + "HID:WIZARDS_HID_DLGTABLE_TXT_NAME", // HID:41240 + "HID:WIZARDS_HID_DLGTABLE_OPT_MODIFYTABLE", // HID:41241 + "HID:WIZARDS_HID_DLGTABLE_OPT_WORKWITHTABLE", // HID:41242 + "HID:WIZARDS_HID_DLGTABLE_OPT_STARTFORMWIZARD", // HID:41243 + "HID:WIZARDS_HID_DLGTABLE_LST_CATALOG", // HID:41244 + "HID:WIZARDS_HID_DLGTABLE_LST_SCHEMA" // HID:41245 + }; + + public static String getHelpIdString( int nHelpId ) + { + if ( nHelpId >= 34200 && nHelpId <= 34722 ) + return array1[ nHelpId - 34200 ]; + else if ( nHelpId >= 40769 && nHelpId <= 41245 ) + return array2[ nHelpId - 40769 ]; + else + return new String(); + } +} diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.java b/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.java index af3abb57f..c82695b25 100644 --- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.java +++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.java @@ -26,6 +26,7 @@ * ************************************************************************/ package com.sun.star.wizards.fax; +import com.sun.star.wizards.common.*; public interface FaxWizardDialogConst { @@ -78,38 +79,38 @@ public interface FaxWizardDialogConst */ public final static int HID = 41119; //TODO enter first hid here public static final int HIDMAIN = 41180; - public final String OPTBUSINESSFAX_HID = "HID:" + (HID + 1); - public final String LSTBUSINESSSTYLE_HID = "HID:" + (HID + 2); - public final String OPTPRIVATEFAX_HID = "HID:" + (HID + 3); - public final String LSTPRIVATESTYLE_HID = "HID:" + (HID + 4); - public final String IMAGECONTROL3_HID = "HID:" + (HID + 5); - public final String CHKUSELOGO_HID = "HID:" + (HID + 6); - public final String CHKUSEDATE_HID = "HID:" + (HID + 7); - public final String CHKUSECOMMUNICATIONTYPE_HID = "HID:" + (HID + 8); - public final String LSTCOMMUNICATIONTYPE_HID = "HID:" + (HID + 9); - public final String CHKUSESUBJECT_HID = "HID:" + (HID + 10); - public final String CHKUSESALUTATION_HID = "HID:" + (HID + 11); - public final String LSTSALUTATION_HID = "HID:" + (HID + 12); - public final String CHKUSEGREETING_HID = "HID:" + (HID + 13); - public final String LSTGREETING_HID = "HID:" + (HID + 14); - public final String CHKUSEFOOTER_HID = "HID:" + (HID + 15); - public final String OPTSENDERPLACEHOLDER_HID = "HID:" + (HID + 16); - public final String OPTSENDERDEFINE_HID = "HID:" + (HID + 17); - public final String TXTSENDERNAME_HID = "HID:" + (HID + 18); - public final String TXTSENDERSTREET_HID = "HID:" + (HID + 19); - public final String TXTSENDERPOSTCODE_HID = "HID:" + (HID + 20); - public final String TXTSENDERSTATE_HID = "HID:" + (HID + 21); - public final String TXTSENDERCITY_HID = "HID:" + (HID + 22); - public final String TXTSENDERFAX_HID = "HID:" + (HID + 23); - public final String OPTRECEIVERPLACEHOLDER_HID = "HID:" + (HID + 24); - public final String OPTRECEIVERDATABASE_HID = "HID:" + (HID + 25); - public final String TXTFOOTER_HID = "HID:" + (HID + 26); - public final String CHKFOOTERNEXTPAGES_HID = "HID:" + (HID + 27); - public final String CHKFOOTERPAGENUMBERS_HID = "HID:" + (HID + 28); - public final String TXTTEMPLATENAME_HID = "HID:" + (HID + 29); - public final String FILETEMPLATEPATH_HID = "HID:" + (HID + 30); - public final String OPTCREATEFAX_HID = "HID:" + (HID + 31); - public final String OPTMAKECHANGES_HID = "HID:" + (HID + 32); - public final String IMAGECONTROL2_HID = "HID:" + (HID + 33); + public final String OPTBUSINESSFAX_HID = HelpIds.getHelpIdString(HID + 1); + public final String LSTBUSINESSSTYLE_HID = HelpIds.getHelpIdString(HID + 2); + public final String OPTPRIVATEFAX_HID = HelpIds.getHelpIdString(HID + 3); + public final String LSTPRIVATESTYLE_HID = HelpIds.getHelpIdString(HID + 4); + public final String IMAGECONTROL3_HID = HelpIds.getHelpIdString(HID + 5); + public final String CHKUSELOGO_HID = HelpIds.getHelpIdString(HID + 6); + public final String CHKUSEDATE_HID = HelpIds.getHelpIdString(HID + 7); + public final String CHKUSECOMMUNICATIONTYPE_HID = HelpIds.getHelpIdString(HID + 8); + public final String LSTCOMMUNICATIONTYPE_HID = HelpIds.getHelpIdString(HID + 9); + public final String CHKUSESUBJECT_HID = HelpIds.getHelpIdString(HID + 10); + public final String CHKUSESALUTATION_HID = HelpIds.getHelpIdString(HID + 11); + public final String LSTSALUTATION_HID = HelpIds.getHelpIdString(HID + 12); + public final String CHKUSEGREETING_HID = HelpIds.getHelpIdString(HID + 13); + public final String LSTGREETING_HID = HelpIds.getHelpIdString(HID + 14); + public final String CHKUSEFOOTER_HID = HelpIds.getHelpIdString(HID + 15); + public final String OPTSENDERPLACEHOLDER_HID = HelpIds.getHelpIdString(HID + 16); + public final String OPTSENDERDEFINE_HID = HelpIds.getHelpIdString(HID + 17); + public final String TXTSENDERNAME_HID = HelpIds.getHelpIdString(HID + 18); + public final String TXTSENDERSTREET_HID = HelpIds.getHelpIdString(HID + 19); + public final String TXTSENDERPOSTCODE_HID = HelpIds.getHelpIdString(HID + 20); + public final String TXTSENDERSTATE_HID = HelpIds.getHelpIdString(HID + 21); + public final String TXTSENDERCITY_HID = HelpIds.getHelpIdString(HID + 22); + public final String TXTSENDERFAX_HID = HelpIds.getHelpIdString(HID + 23); + public final String OPTRECEIVERPLACEHOLDER_HID = HelpIds.getHelpIdString(HID + 24); + public final String OPTRECEIVERDATABASE_HID = HelpIds.getHelpIdString(HID + 25); + public final String TXTFOOTER_HID = HelpIds.getHelpIdString(HID + 26); + public final String CHKFOOTERNEXTPAGES_HID = HelpIds.getHelpIdString(HID + 27); + public final String CHKFOOTERPAGENUMBERS_HID = HelpIds.getHelpIdString(HID + 28); + public final String TXTTEMPLATENAME_HID = HelpIds.getHelpIdString(HID + 29); + public final String FILETEMPLATEPATH_HID = HelpIds.getHelpIdString(HID + 30); + public final String OPTCREATEFAX_HID = HelpIds.getHelpIdString(HID + 31); + public final String OPTMAKECHANGES_HID = HelpIds.getHelpIdString(HID + 32); + public final String IMAGECONTROL2_HID = HelpIds.getHelpIdString(HID + 33); } - \ No newline at end of file + diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java index d904bc65e..4750b20a3 100644 --- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java +++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java @@ -340,7 +340,7 @@ public class FaxWizardDialogImpl extends FaxWizardDialog public void insertPathSelectionControl() { myPathSelection = new PathSelection(xMSF, this, PathSelection.TransferMode.SAVE, PathSelection.DialogTypes.FILE); - myPathSelection.insert(5, 97, 70, 205, (short) 45, resources.reslblTemplatePath_value, true, "HID:" + (HID + 34), "HID:" + (HID + 35)); + myPathSelection.insert(5, 97, 70, 205, (short) 45, resources.reslblTemplatePath_value, true, HelpIds.getHelpIdString(HID + 34), HelpIds.getHelpIdString(HID + 35)); myPathSelection.sDefaultDirectory = sUserTemplatePath; myPathSelection.sDefaultName = "myFaxTemplate.ott"; myPathSelection.sDefaultFilter = "writer8_template"; diff --git a/wizards/com/sun/star/wizards/form/DataEntrySetter.java b/wizards/com/sun/star/wizards/form/DataEntrySetter.java index 07649cacc..ee5da12de 100644 --- a/wizards/com/sun/star/wizards/form/DataEntrySetter.java +++ b/wizards/com/sun/star/wizards/form/DataEntrySetter.java @@ -65,7 +65,7 @@ public class DataEntrySetter }, new Object[] { - UIConsts.INTEGERS[8], "HID:34461", sNewDataOnly, new Integer(98), new Integer(25), IDataStep, new Short(curtabindex++), new Integer(195) + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_OPTNEWDATAONLY", sNewDataOnly, new Integer(98), new Integer(25), IDataStep, new Short(curtabindex++), new Integer(195) }); optDisplayAllData = CurUnoDialog.insertRadioButton("optDisplayAllData", "toggleCheckBoxes", this, @@ -75,7 +75,7 @@ public class DataEntrySetter }, new Object[] { - UIConsts.INTEGERS[8], "HID:34462", sDisplayAllData, new Integer(98), new Integer(50), new Short((short) 1), IDataStep, new Short(curtabindex++), new Integer(197) + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_OPTDISPLAYALLDATA", sDisplayAllData, new Integer(98), new Integer(50), new Short((short) 1), IDataStep, new Short(curtabindex++), new Integer(197) }); chknomodification = CurUnoDialog.insertCheckBox("chknomodification", null, new String[] @@ -84,7 +84,7 @@ public class DataEntrySetter }, new Object[] { - UIConsts.INTEGERS[8], "HID:34463", sNoModification, new Integer(108), new Integer(62), new Short((short) 0), IDataStep, new Short(curtabindex++), new Integer(189) + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_CHKNOMODIFICATION", sNoModification, new Integer(108), new Integer(62), new Short((short) 0), IDataStep, new Short(curtabindex++), new Integer(189) }); chknodeletion = CurUnoDialog.insertCheckBox("chknodeletion", null, new String[] @@ -93,7 +93,7 @@ public class DataEntrySetter }, new Object[] { - UIConsts.INTEGERS[8], "HID:34464", sNoDeletion, new Integer(108), new Integer(74), new Short((short) 0), IDataStep, new Short(curtabindex++), new Integer(189) + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_CHKNODELETION", sNoDeletion, new Integer(108), new Integer(74), new Short((short) 0), IDataStep, new Short(curtabindex++), new Integer(189) }); chknoaddition = CurUnoDialog.insertCheckBox("chknoaddition", null, new String[] @@ -102,7 +102,7 @@ public class DataEntrySetter }, new Object[] { - UIConsts.INTEGERS[8], "HID:34465", sNoAddition, new Integer(108), new Integer(86), new Short((short) 0), IDataStep, new Short(curtabindex++), new Integer(191) + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_CHKNOADDITION", sNoAddition, new Integer(108), new Integer(86), new Short((short) 0), IDataStep, new Short(curtabindex++), new Integer(191) }); CurUnoDialog.insertLabel("lbldontdisplayExistingData", new String[] diff --git a/wizards/com/sun/star/wizards/form/FieldLinker.java b/wizards/com/sun/star/wizards/form/FieldLinker.java index 3396f9433..b9fdfcc38 100644 --- a/wizards/com/sun/star/wizards/form/FieldLinker.java +++ b/wizards/com/sun/star/wizards/form/FieldLinker.java @@ -32,6 +32,7 @@ import com.sun.star.awt.XFixedText; import com.sun.star.awt.XListBox; import com.sun.star.uno.Exception; import com.sun.star.wizards.common.Helper; +import com.sun.star.wizards.common.HelpIds; import com.sun.star.wizards.common.JavaTools; import com.sun.star.wizards.db.RelationController; import com.sun.star.wizards.ui.UnoDialog; @@ -86,8 +87,8 @@ public class FieldLinker extends DBLimitedFieldSelection SOFIRSTLINKLST, SOSECLINKLST, SOTHIRDLINKLST, SOFOURTHLINKLST }; } - sSlaveHidString = "HID:" + Integer.toString(FirstHelpIndex + (i * 2)); - sMasterHidString = "HID:" + Integer.toString(FirstHelpIndex + (i * 2) + 1); + sSlaveHidString = HelpIds.getHelpIdString(FirstHelpIndex + (i * 2)); + sMasterHidString = HelpIds.getHelpIdString(FirstHelpIndex + (i * 2) + 1); boolean bDoEnable = (i < 2); lblSlaveFields[i] = CurUnoDialog.insertLabel("lblSlaveFieldLink" + new Integer(i + 1).toString(), new String[] diff --git a/wizards/com/sun/star/wizards/form/Finalizer.java b/wizards/com/sun/star/wizards/form/Finalizer.java index f1d4ce983..31397e5ef 100644 --- a/wizards/com/sun/star/wizards/form/Finalizer.java +++ b/wizards/com/sun/star/wizards/form/Finalizer.java @@ -72,7 +72,7 @@ public class Finalizer }, new Object[] { - UIConsts.INTEGER_12, "HID:34481", new Integer(97), new Integer(35), UIConsts.INTEGERS[8], new Short((short) 82), "", new Integer(185) + UIConsts.INTEGER_12, "HID:WIZARDS_HID_DLGFORM_TXTPATH", new Integer(97), new Integer(35), UIConsts.INTEGERS[8], new Short((short) 82), "", new Integer(185) }); CurUnoDialog.insertLabel("lblProceed", new String[] @@ -90,7 +90,7 @@ public class Finalizer }, new Object[] { - UIConsts.INTEGERS[8], "HID:34482", sWorkWithForm, new Integer(101), new Integer(77), new Short((short) 1), UIConsts.INTEGERS[8], new Short(curtabindex++), new Integer(107) + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_OPTWORKWITHFORM", sWorkWithForm, new Integer(101), new Integer(77), new Short((short) 1), UIConsts.INTEGERS[8], new Short(curtabindex++), new Integer(107) }); optModifyForm = CurUnoDialog.insertRadioButton("optModifyForm", null, new String[] @@ -99,7 +99,7 @@ public class Finalizer }, new Object[] { - UIConsts.INTEGERS[8], "HID:34483", sModifyForm, new Integer(101), new Integer(89), UIConsts.INTEGERS[8], new Short(curtabindex++), new Integer(107) + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_OPTMODIFYFORM", sModifyForm, new Integer(101), new Integer(89), UIConsts.INTEGERS[8], new Short(curtabindex++), new Integer(107) }); } diff --git a/wizards/com/sun/star/wizards/form/FormConfiguration.java b/wizards/com/sun/star/wizards/form/FormConfiguration.java index 0c293a850..328fb453b 100644 --- a/wizards/com/sun/star/wizards/form/FormConfiguration.java +++ b/wizards/com/sun/star/wizards/form/FormConfiguration.java @@ -82,7 +82,7 @@ public class FormConfiguration }, new Object[] { - UIConsts.INTEGERS[8], "HID:34421", sSelectManually, new Integer(97), new Integer(26), ISubFormStep, new Short(curtabindex++), new Integer(160) + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_CHKCREATESUBFORM", sSelectManually, new Integer(97), new Integer(26), ISubFormStep, new Short(curtabindex++), new Integer(160) }); optOnExistingRelation = CurUnoDialog.insertRadioButton("optOnExistingRelation", STOGGLESTEPS, this, new String[] @@ -91,7 +91,7 @@ public class FormConfiguration }, new Object[] { - Boolean.FALSE, UIConsts.INTEGERS[8], "HID:34422", sOnExistingRelation, new Integer(107), new Integer(43), ISubFormStep, new Short(curtabindex++), new Integer(160) + Boolean.FALSE, UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_OPTONEXISTINGRELATION", sOnExistingRelation, new Integer(107), new Integer(43), ISubFormStep, new Short(curtabindex++), new Integer(160) }); optSelectManually = CurUnoDialog.insertRadioButton("optSelectManually", STOGGLESTEPS, this, new String[] @@ -100,7 +100,7 @@ public class FormConfiguration }, new Object[] { - Boolean.FALSE, UIConsts.INTEGERS[8], "HID:34423", sOnManualRelation, new Integer(107), new Integer(99), new Short((short) 1), ISubFormStep, new Short(curtabindex++), new Integer(160) + Boolean.FALSE, UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_OPTSELECTMANUALLY", sOnManualRelation, new Integer(107), new Integer(99), new Short((short) 1), ISubFormStep, new Short(curtabindex++), new Integer(160) }); lblRelations = CurUnoDialog.insertLabel("lblSelectRelation", new String[] @@ -118,7 +118,7 @@ public class FormConfiguration }, new Object[] { - Boolean.FALSE, new Integer(37), "HID:34424", new Integer(201), new Integer(55), ISubFormStep, new Short(curtabindex++), new Integer(103) + Boolean.FALSE, new Integer(37), "HID:WIZARDS_HID_DLGFORM_lstRELATIONS", new Integer(201), new Integer(55), ISubFormStep, new Short(curtabindex++), new Integer(103) }); lblSubFormDescription = CurUnoDialog.insertLabel("lblSubFormDescription", new String[] diff --git a/wizards/com/sun/star/wizards/form/StyleApplier.java b/wizards/com/sun/star/wizards/form/StyleApplier.java index 09a9f1aad..ed2064594 100644 --- a/wizards/com/sun/star/wizards/form/StyleApplier.java +++ b/wizards/com/sun/star/wizards/form/StyleApplier.java @@ -125,7 +125,7 @@ public class StyleApplier }, new Object[] { - new Integer(143), "HID:34471", new Integer(92), new Integer(35), SelLayoutPos, IStyleStep, this.StyleNames, new Short(curtabindex++), new Integer(90) + new Integer(143), "HID:WIZARDS_HID_DLGFORM_LSTSTYLES", new Integer(92), new Integer(35), SelLayoutPos, IStyleStep, this.StyleNames, new Short(curtabindex++), new Integer(90) }); optNoBorder = CurUnoDialog.insertRadioButton("otpNoBorder", SCHANGEBORDERTYPE, this, @@ -135,7 +135,7 @@ public class StyleApplier }, new Object[] { - UIConsts.INTEGERS[10], "HID:34472", sNoBorder, new Integer(196), new Integer(39), IStyleStep, new Short(curtabindex++), "0", new Integer(93) + UIConsts.INTEGERS[10], "HID:WIZARDS_HID_DLGFORM_CMDNOBORDER", sNoBorder, new Integer(196), new Integer(39), IStyleStep, new Short(curtabindex++), "0", new Integer(93) }); opt3DLook = CurUnoDialog.insertRadioButton("otp3DLook", SCHANGEBORDERTYPE, this, @@ -145,7 +145,7 @@ public class StyleApplier }, new Object[] { - UIConsts.INTEGERS[10], "HID:34473", s3DLook, new Integer(196), new Integer(53), new Short((short) 1), IStyleStep, new Short(curtabindex++), "1", new Integer(93) + UIConsts.INTEGERS[10], "HID:WIZARDS_HID_DLGFORM_CMD3DBORDER", s3DLook, new Integer(196), new Integer(53), new Short((short) 1), IStyleStep, new Short(curtabindex++), "1", new Integer(93) }); optFlat = CurUnoDialog.insertRadioButton("otpFlat", SCHANGEBORDERTYPE, this, @@ -155,7 +155,7 @@ public class StyleApplier }, new Object[] { - UIConsts.INTEGERS[10], "HID:34474", sFlat, new Integer(196), new Integer(67), IStyleStep, new Short(curtabindex++), "2", new Integer(93) + UIConsts.INTEGERS[10], "HID:WIZARDS_HID_DLGFORM_CMDSIMPLEBORDER", sFlat, new Integer(196), new Integer(67), IStyleStep, new Short(curtabindex++), "2", new Integer(93) }); CurUnoDialog.insertFixedLine("lnFieldBorder", diff --git a/wizards/com/sun/star/wizards/form/UIControlArranger.java b/wizards/com/sun/star/wizards/form/UIControlArranger.java index 61d634a11..c90acc93c 100644 --- a/wizards/com/sun/star/wizards/form/UIControlArranger.java +++ b/wizards/com/sun/star/wizards/form/UIControlArranger.java @@ -92,7 +92,7 @@ public class UIControlArranger }, new Object[] { - UIConsts.INTEGERS[10], "HID:34451", sAlignLeft, new Integer(107), new Integer(38), new Short((short) 1), IControlStep, new Short(curtabindex++), new Integer(171) + UIConsts.INTEGERS[10], "HID:WIZARDS_HID_DLGFORM_CMDALIGNLEFT", sAlignLeft, new Integer(107), new Integer(38), new Short((short) 1), IControlStep, new Short(curtabindex++), new Integer(171) }); // Radio Button "Align Right" optAlignRight = CurUnoDialog.insertRadioButton("optAlignRight", SOALIGNMETHOD, this, @@ -102,7 +102,7 @@ public class UIControlArranger }, new Object[] { - UIConsts.INTEGERS[10], "HID:34452", sAlignRight, Boolean.TRUE, new Integer(107), new Integer(50), IControlStep, new Short(curtabindex++), new Integer(171) + UIConsts.INTEGERS[10], "HID:WIZARDS_HID_DLGFORM_CMDALIGNRIGHT", sAlignRight, Boolean.TRUE, new Integer(107), new Integer(50), IControlStep, new Short(curtabindex++), new Integer(171) }); @@ -142,7 +142,7 @@ public class UIControlArranger // { // Boolean.valueOf(bEnabled), // new Integer(14), -///* TODO: WRONG!*/ "HID:34452", +///* TODO: WRONG!*/ "HID:WIZARDS_HID_DLGFORM_CMDALIGNRIGHT", // "1", // new Integer(nXPos + nBtnWidth), // new Integer(nYPos), diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialog.java b/wizards/com/sun/star/wizards/letter/LetterWizardDialog.java index 03638d368..e0ef661e5 100644 --- a/wizards/com/sun/star/wizards/letter/LetterWizardDialog.java +++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialog.java @@ -169,7 +169,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 1), resources.resoptBusinessLetter_value, "optBusinessLetter", new Integer(97), new Integer(28), INTEGERS[1], new Short((short) 1), new Integer(184) + INTEGERS[8], HelpIds.getHelpIdString(HID + 1), resources.resoptBusinessLetter_value, "optBusinessLetter", new Integer(97), new Integer(28), INTEGERS[1], new Short((short) 1), new Integer(184) }); optPrivOfficialLetter = insertRadioButton("optPrivOfficialLetter", OPTPRIVOFFICIALLETTER_ITEM_CHANGED, new String[] @@ -178,7 +178,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 2), resources.resoptPrivOfficialLetter_value, "optPrivOfficialLetter", new Integer(97), new Integer(74), INTEGERS[1], new Short((short) 2), new Integer(184) + INTEGERS[8], HelpIds.getHelpIdString(HID + 2), resources.resoptPrivOfficialLetter_value, "optPrivOfficialLetter", new Integer(97), new Integer(74), INTEGERS[1], new Short((short) 2), new Integer(184) }); optPrivateLetter = insertRadioButton("optPrivateLetter", OPTPRIVATELETTER_ITEM_CHANGED, new String[] @@ -187,7 +187,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 3), resources.resoptPrivateLetter_value, "optPrivateLetter", new Integer(97), new Integer(106), INTEGERS[1], new Short((short) 3), new Integer(184) + INTEGERS[8], HelpIds.getHelpIdString(HID + 3), resources.resoptPrivateLetter_value, "optPrivateLetter", new Integer(97), new Integer(106), INTEGERS[1], new Short((short) 3), new Integer(184) }); lstBusinessStyle = insertListBox("lstBusinessStyle", LSTBUSINESSSTYLE_ACTION_PERFORMED, LSTBUSINESSSTYLE_ITEM_CHANGED, new String[] @@ -196,7 +196,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - Boolean.TRUE, INTEGER_12, "HID:" + (HID + 4), "lstBusinessStyle", new Integer(180), INTEGER_40, INTEGERS[1], new Short((short) 4), new Integer(74) + Boolean.TRUE, INTEGER_12, HelpIds.getHelpIdString(HID + 4), "lstBusinessStyle", new Integer(180), INTEGER_40, INTEGERS[1], new Short((short) 4), new Integer(74) }); chkBusinessPaper = insertCheckBox("chkBusinessPaper", CHKBUSINESSPAPER_ITEM_CHANGED, new String[] @@ -205,7 +205,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 5), resources.reschkBusinessPaper_value, "chkBusinessPaper", new Integer(110), new Integer(56), new Short((short) 0), INTEGERS[1], new Short((short) 5), new Integer(168) + INTEGERS[8], HelpIds.getHelpIdString(HID + 5), resources.reschkBusinessPaper_value, "chkBusinessPaper", new Integer(110), new Integer(56), new Short((short) 0), INTEGERS[1], new Short((short) 5), new Integer(168) }); lstPrivOfficialStyle = insertListBox("lstPrivOfficialStyle", LSTPRIVOFFICIALSTYLE_ACTION_PERFORMED, LSTPRIVOFFICIALSTYLE_ITEM_CHANGED, new String[] @@ -214,7 +214,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - Boolean.TRUE, INTEGER_12, "HID:" + (HID + 6), "lstPrivOfficialStyle", new Integer(180), new Integer(86), INTEGERS[1], new Short((short) 6), new Integer(74) + Boolean.TRUE, INTEGER_12, HelpIds.getHelpIdString(HID + 6), "lstPrivOfficialStyle", new Integer(180), new Integer(86), INTEGERS[1], new Short((short) 6), new Integer(74) }); lstPrivateStyle = insertListBox("lstPrivateStyle", LSTPRIVATESTYLE_ACTION_PERFORMED, LSTPRIVATESTYLE_ITEM_CHANGED, new String[] @@ -223,7 +223,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - Boolean.TRUE, INTEGER_12, "HID:" + (HID + 7), "lstPrivateStyle", new Integer(180), new Integer(118), INTEGERS[1], new Short((short) 7), new Integer(74) + Boolean.TRUE, INTEGER_12, HelpIds.getHelpIdString(HID + 7), "lstPrivateStyle", new Integer(180), new Integer(118), INTEGERS[1], new Short((short) 7), new Integer(74) }); lblBusinessStyle = insertLabel("lblBusinessStyle", new String[] @@ -287,7 +287,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 8), resources.reschkPaperCompanyLogo_value, "chkPaperCompanyLogo", new Integer(97), new Integer(28), new Short((short) 0), INTEGERS[2], new Short((short) 8), new Integer(68) + INTEGERS[8], HelpIds.getHelpIdString(HID + 8), resources.reschkPaperCompanyLogo_value, "chkPaperCompanyLogo", new Integer(97), new Integer(28), new Short((short) 0), INTEGERS[2], new Short((short) 8), new Integer(68) }); numLogoHeight = insertNumericField("numLogoHeight", NUMLOGOHEIGHT_TEXT_CHANGED, new String[] @@ -296,7 +296,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGER_12, "HID:" + (HID + 9), "numLogoHeight", new Integer(138), INTEGER_40, Boolean.TRUE, INTEGERS[2], Boolean.TRUE, new Short((short) 9), INTEGERS[3], new Integer(30) + INTEGER_12, HelpIds.getHelpIdString(HID + 9), "numLogoHeight", new Integer(138), INTEGER_40, Boolean.TRUE, INTEGERS[2], Boolean.TRUE, new Short((short) 9), INTEGERS[3], new Integer(30) }); numLogoX = insertNumericField("numLogoX", NUMLOGOX_TEXT_CHANGED, new String[] @@ -305,7 +305,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGER_12, "HID:" + (HID + 10), "numLogoX", new Integer(266), INTEGER_40, Boolean.TRUE, INTEGERS[2], new Short((short) 10), INTEGERS[0], new Integer(30) + INTEGER_12, HelpIds.getHelpIdString(HID + 10), "numLogoX", new Integer(266), INTEGER_40, Boolean.TRUE, INTEGERS[2], new Short((short) 10), INTEGERS[0], new Integer(30) }); numLogoWidth = insertNumericField("numLogoWidth", NUMLOGOWIDTH_TEXT_CHANGED, new String[] @@ -314,7 +314,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGER_12, "HID:" + (HID + 11), "numLogoWidth", new Integer(138), new Integer(56), Boolean.TRUE, INTEGERS[2], new Short((short) 11), new Double(3.8), new Integer(30) + INTEGER_12, HelpIds.getHelpIdString(HID + 11), "numLogoWidth", new Integer(138), new Integer(56), Boolean.TRUE, INTEGERS[2], new Short((short) 11), new Double(3.8), new Integer(30) }); numLogoY = insertNumericField("numLogoY", NUMLOGOY_TEXT_CHANGED, new String[] @@ -323,7 +323,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGER_12, "HID:" + (HID + 12), "numLogoY", new Integer(266), new Integer(56), Boolean.TRUE, INTEGERS[2], new Short((short) 12), new Double(-3.4), new Integer(30) + INTEGER_12, HelpIds.getHelpIdString(HID + 12), "numLogoY", new Integer(266), new Integer(56), Boolean.TRUE, INTEGERS[2], new Short((short) 12), new Double(-3.4), new Integer(30) }); chkPaperCompanyAddress = insertCheckBox("chkPaperCompanyAddress", CHKPAPERCOMPANYADDRESS_ITEM_CHANGED, new String[] @@ -332,7 +332,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 13), resources.reschkPaperCompanyAddress_value, "chkPaperCompanyAddress", new Integer(98), new Integer(84), new Short((short) 0), INTEGERS[2], new Short((short) 13), new Integer(68) + INTEGERS[8], HelpIds.getHelpIdString(HID + 13), resources.reschkPaperCompanyAddress_value, "chkPaperCompanyAddress", new Integer(98), new Integer(84), new Short((short) 0), INTEGERS[2], new Short((short) 13), new Integer(68) }); numAddressHeight = insertNumericField("numAddressHeight", NUMADDRESSHEIGHT_TEXT_CHANGED, new String[] @@ -341,7 +341,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGER_12, "HID:" + (HID + 14), "numAddressHeight", new Integer(138), new Integer(96), Boolean.TRUE, INTEGERS[2], Boolean.TRUE, new Short((short) 14), INTEGERS[3], new Integer(30) + INTEGER_12, HelpIds.getHelpIdString(HID + 14), "numAddressHeight", new Integer(138), new Integer(96), Boolean.TRUE, INTEGERS[2], Boolean.TRUE, new Short((short) 14), INTEGERS[3], new Integer(30) }); numAddressX = insertNumericField("numAddressX", NUMADDRESSX_TEXT_CHANGED, new String[] @@ -350,7 +350,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGER_12, "HID:" + (HID + 15), "numAddressX", new Integer(266), new Integer(96), Boolean.TRUE, INTEGERS[2], new Short((short) 15), new Double(3.8), new Integer(30) + INTEGER_12, HelpIds.getHelpIdString(HID + 15), "numAddressX", new Integer(266), new Integer(96), Boolean.TRUE, INTEGERS[2], new Short((short) 15), new Double(3.8), new Integer(30) }); numAddressWidth = insertNumericField("numAddressWidth", NUMADDRESSWIDTH_TEXT_CHANGED, new String[] @@ -359,7 +359,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGER_12, "HID:" + (HID + 16), "numAddressWidth", new Integer(138), new Integer(112), Boolean.TRUE, INTEGERS[2], new Short((short) 16), new Double(13.8), new Integer(30) + INTEGER_12, HelpIds.getHelpIdString(HID + 16), "numAddressWidth", new Integer(138), new Integer(112), Boolean.TRUE, INTEGERS[2], new Short((short) 16), new Double(13.8), new Integer(30) }); numAddressY = insertNumericField("numAddressY", NUMADDRESSY_TEXT_CHANGED, new String[] @@ -368,7 +368,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGER_12, "HID:" + (HID + 17), "numAddressY", new Integer(266), new Integer(112), Boolean.TRUE, INTEGERS[2], new Short((short) 17), new Double(-3.4), new Integer(30) + INTEGER_12, HelpIds.getHelpIdString(HID + 17), "numAddressY", new Integer(266), new Integer(112), Boolean.TRUE, INTEGERS[2], new Short((short) 17), new Double(-3.4), new Integer(30) }); chkCompanyReceiver = insertCheckBox("chkCompanyReceiver", CHKCOMPANYRECEIVER_ITEM_CHANGED, new String[] @@ -377,7 +377,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 18), resources.reschkCompanyReceiver_value, "chkCompanyReceiver", new Integer(103), new Integer(131), new Short((short) 0), INTEGERS[2], new Short((short) 18), new Integer(185) + INTEGERS[8], HelpIds.getHelpIdString(HID + 18), resources.reschkCompanyReceiver_value, "chkCompanyReceiver", new Integer(103), new Integer(131), new Short((short) 0), INTEGERS[2], new Short((short) 18), new Integer(185) }); chkPaperFooter = insertCheckBox("chkPaperFooter", CHKPAPERFOOTER_ITEM_CHANGED, new String[] @@ -386,7 +386,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 19), resources.reschkPaperFooter_value, "chkPaperFooter", new Integer(97), new Integer(158), new Short((short) 0), INTEGERS[2], new Short((short) 19), new Integer(68) + INTEGERS[8], HelpIds.getHelpIdString(HID + 19), resources.reschkPaperFooter_value, "chkPaperFooter", new Integer(97), new Integer(158), new Short((short) 0), INTEGERS[2], new Short((short) 19), new Integer(68) }); numFooterHeight = insertNumericField("numFooterHeight", NUMFOOTERHEIGHT_TEXT_CHANGED, new String[] @@ -395,7 +395,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGER_12, "HID:" + (HID + 20), "numFooterHeight", new Integer(236), new Integer(156), Boolean.TRUE, INTEGERS[2], new Short((short) 20), INTEGERS[5], new Integer(30) + INTEGER_12, HelpIds.getHelpIdString(HID + 20), "numFooterHeight", new Integer(236), new Integer(156), Boolean.TRUE, INTEGERS[2], new Short((short) 20), INTEGERS[5], new Integer(30) }); lblLogoHeight = insertLabel("lblLogoHeight", new String[] @@ -516,7 +516,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - Boolean.TRUE, INTEGER_12, "HID:" + (HID + 21), "lstLetterNorm", new Integer(210), new Integer(34), INTEGERS[3], new Short((short) 21), new Integer(74) + Boolean.TRUE, INTEGER_12, HelpIds.getHelpIdString(HID + 21), "lstLetterNorm", new Integer(210), new Integer(34), INTEGERS[3], new Short((short) 21), new Integer(74) }); chkUseLogo = insertCheckBox("chkUseLogo", CHKUSELOGO_ITEM_CHANGED, new String[] @@ -525,7 +525,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 22), resources.reschkUseLogo_value, "chkUseLogo", new Integer(97), new Integer(54), new Short((short) 0), INTEGERS[3], new Short((short) 22), new Integer(212) + INTEGERS[8], HelpIds.getHelpIdString(HID + 22), resources.reschkUseLogo_value, "chkUseLogo", new Integer(97), new Integer(54), new Short((short) 0), INTEGERS[3], new Short((short) 22), new Integer(212) }); chkUseAddressReceiver = insertCheckBox("chkUseAddressReceiver", CHKUSEADDRESSRECEIVER_ITEM_CHANGED, new String[] @@ -534,7 +534,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 23), resources.reschkUseAddressReceiver_value, "chkUseAddressReceiver", new Integer(97), new Integer(69), new Short((short) 0), INTEGERS[3], new Short((short) 23), new Integer(212) + INTEGERS[8], HelpIds.getHelpIdString(HID + 23), resources.reschkUseAddressReceiver_value, "chkUseAddressReceiver", new Integer(97), new Integer(69), new Short((short) 0), INTEGERS[3], new Short((short) 23), new Integer(212) }); chkUseSigns = insertCheckBox("chkUseSigns", CHKUSESIGNS_ITEM_CHANGED, new String[] @@ -543,7 +543,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 24), resources.reschkUseSigns_value, "chkUseSigns", new Integer(97), new Integer(82), new Short((short) 0), INTEGERS[3], new Short((short) 24), new Integer(212) + INTEGERS[8], HelpIds.getHelpIdString(HID + 24), resources.reschkUseSigns_value, "chkUseSigns", new Integer(97), new Integer(82), new Short((short) 0), INTEGERS[3], new Short((short) 24), new Integer(212) }); chkUseSubject = insertCheckBox("chkUseSubject", CHKUSESUBJECT_ITEM_CHANGED, new String[] @@ -552,7 +552,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 25), resources.reschkUseSubject_value, "chkUseSubject", new Integer(97), new Integer(98), new Short((short) 0), INTEGERS[3], new Short((short) 25), new Integer(212) + INTEGERS[8], HelpIds.getHelpIdString(HID + 25), resources.reschkUseSubject_value, "chkUseSubject", new Integer(97), new Integer(98), new Short((short) 0), INTEGERS[3], new Short((short) 25), new Integer(212) }); chkUseSalutation = insertCheckBox("chkUseSalutation", CHKUSESALUTATION_ITEM_CHANGED, new String[] @@ -561,7 +561,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 26), resources.reschkUseSalutation_value, "chkUseSalutation", new Integer(97), new Integer(113), new Short((short) 0), INTEGERS[3], new Short((short) 26), new Integer(66) + INTEGERS[8], HelpIds.getHelpIdString(HID + 26), resources.reschkUseSalutation_value, "chkUseSalutation", new Integer(97), new Integer(113), new Short((short) 0), INTEGERS[3], new Short((short) 26), new Integer(66) }); lstSalutation = insertComboBox("lstSalutation", LSTSALUTATION_ACTION_PERFORMED, LSTSALUTATION_ITEM_CHANGED, LSTSALUTATION_TEXT_CHANGED, new String[] @@ -570,7 +570,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - Boolean.TRUE, INTEGER_12, "HID:" + (HID + 27), "lstSalutation", new Integer(210), new Integer(110), INTEGERS[3], new Short((short) 27), new Integer(74) + Boolean.TRUE, INTEGER_12, HelpIds.getHelpIdString(HID + 27), "lstSalutation", new Integer(210), new Integer(110), INTEGERS[3], new Short((short) 27), new Integer(74) }); chkUseBendMarks = insertCheckBox("chkUseBendMarks", CHKUSEBENDMARKS_ITEM_CHANGED, new String[] @@ -579,7 +579,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 28), resources.reschkUseBendMarks_value, "chkUseBendMarks", new Integer(97), new Integer(127), new Short((short) 0), INTEGERS[3], new Short((short) 28), new Integer(212) + INTEGERS[8], HelpIds.getHelpIdString(HID + 28), resources.reschkUseBendMarks_value, "chkUseBendMarks", new Integer(97), new Integer(127), new Short((short) 0), INTEGERS[3], new Short((short) 28), new Integer(212) }); chkUseGreeting = insertCheckBox("chkUseGreeting", CHKUSEGREETING_ITEM_CHANGED, new String[] @@ -588,7 +588,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 29), resources.reschkUseGreeting_value, "chkUseGreeting", new Integer(97), new Integer(142), new Short((short) 0), INTEGERS[3], new Short((short) 29), new Integer(66) + INTEGERS[8], HelpIds.getHelpIdString(HID + 29), resources.reschkUseGreeting_value, "chkUseGreeting", new Integer(97), new Integer(142), new Short((short) 0), INTEGERS[3], new Short((short) 29), new Integer(66) }); lstGreeting = insertComboBox("lstGreeting", LSTGREETING_ACTION_PERFORMED, LSTGREETING_ITEM_CHANGED, LSTGREETING_TEXT_CHANGED, new String[] @@ -597,7 +597,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - Boolean.TRUE, INTEGER_12, "HID:" + (HID + 30), "lstGreeting", new Integer(210), new Integer(141), INTEGERS[3], new Short((short) 30), new Integer(74) + Boolean.TRUE, INTEGER_12, HelpIds.getHelpIdString(HID + 30), "lstGreeting", new Integer(210), new Integer(141), INTEGERS[3], new Short((short) 30), new Integer(74) }); chkUseFooter = insertCheckBox("chkUseFooter", CHKUSEFOOTER_ITEM_CHANGED, new String[] @@ -606,7 +606,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 31), resources.reschkUseFooter_value, "chkUseFooter", new Integer(97), new Integer(158), new Short((short) 0), INTEGERS[3], new Short((short) 31), new Integer(212) + INTEGERS[8], HelpIds.getHelpIdString(HID + 31), resources.reschkUseFooter_value, "chkUseFooter", new Integer(97), new Integer(158), new Short((short) 0), INTEGERS[3], new Short((short) 31), new Integer(212) }); lblLetterNorm = insertLabel("lblLetterNorm", new String[] @@ -637,7 +637,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 32), resources.resoptSenderPlaceholder_value, "optSenderPlaceholder", new Integer(104), new Integer(42), INTEGERS[4], new Short((short) 32), new Integer(149) + INTEGERS[8], HelpIds.getHelpIdString(HID + 32), resources.resoptSenderPlaceholder_value, "optSenderPlaceholder", new Integer(104), new Integer(42), INTEGERS[4], new Short((short) 32), new Integer(149) }); optSenderDefine = insertRadioButton("optSenderDefine", OPTSENDERDEFINE_ITEM_CHANGED, new String[] @@ -646,7 +646,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 33), resources.resoptSenderDefine_value, "optSenderDefine", new Integer(104), new Integer(54), INTEGERS[4], new Short((short) 33), new Integer(149) + INTEGERS[8], HelpIds.getHelpIdString(HID + 33), resources.resoptSenderDefine_value, "optSenderDefine", new Integer(104), new Integer(54), INTEGERS[4], new Short((short) 33), new Integer(149) }); txtSenderName = insertTextField("txtSenderName", TXTSENDERNAME_TEXT_CHANGED, new String[] @@ -655,7 +655,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGER_12, "HID:" + (HID + 34), "txtSenderName", new Integer(182), new Integer(67), INTEGERS[4], new Short((short) 34), new Integer(119) + INTEGER_12, HelpIds.getHelpIdString(HID + 34), "txtSenderName", new Integer(182), new Integer(67), INTEGERS[4], new Short((short) 34), new Integer(119) }); txtSenderStreet = insertTextField("txtSenderStreet", TXTSENDERSTREET_TEXT_CHANGED, new String[] @@ -664,7 +664,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGER_12, "HID:" + (HID + 35), "txtSenderStreet", new Integer(182), new Integer(81), INTEGERS[4], new Short((short) 35), new Integer(119) + INTEGER_12, HelpIds.getHelpIdString(HID + 35), "txtSenderStreet", new Integer(182), new Integer(81), INTEGERS[4], new Short((short) 35), new Integer(119) }); txtSenderPostCode = insertTextField("txtSenderPostCode", TXTSENDERPOSTCODE_TEXT_CHANGED, new String[] @@ -673,7 +673,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGER_12, "HID:" + (HID + 36), "txtSenderPostCode", new Integer(182), new Integer(95), INTEGERS[4], new Short((short) 36), new Integer(25) + INTEGER_12, HelpIds.getHelpIdString(HID + 36), "txtSenderPostCode", new Integer(182), new Integer(95), INTEGERS[4], new Short((short) 36), new Integer(25) }); txtSenderState = insertTextField("txtSenderState", TXTSENDERSTATE_TEXT_CHANGED, new String[] @@ -682,7 +682,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGER_12, "HID:" + (HID + 37), "txtSenderState", new Integer(211), new Integer(95), INTEGERS[4], new Short((short) 37), new Integer(21) + INTEGER_12, HelpIds.getHelpIdString(HID + 37), "txtSenderState", new Integer(211), new Integer(95), INTEGERS[4], new Short((short) 37), new Integer(21) }); txtSenderCity = insertTextField("txtSenderCity", TXTSENDERCITY_TEXT_CHANGED, new String[] @@ -691,7 +691,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGER_12, "HID:" + (HID + 38), "txtSenderCity", new Integer(236), new Integer(95), INTEGERS[4], new Short((short) 38), new Integer(65) + INTEGER_12, HelpIds.getHelpIdString(HID + 38), "txtSenderCity", new Integer(236), new Integer(95), INTEGERS[4], new Short((short) 38), new Integer(65) }); optReceiverPlaceholder = insertRadioButton("optReceiverPlaceholder", OPTRECEIVERPLACEHOLDER_ITEM_CHANGED, new String[] @@ -700,7 +700,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 39), resources.resoptReceiverPlaceholder_value, "optReceiverPlaceholder", new Integer(104), new Integer(145), INTEGERS[4], new Short((short) 39), new Integer(200) + INTEGERS[8], HelpIds.getHelpIdString(HID + 39), resources.resoptReceiverPlaceholder_value, "optReceiverPlaceholder", new Integer(104), new Integer(145), INTEGERS[4], new Short((short) 39), new Integer(200) }); optReceiverDatabase = insertRadioButton("optReceiverDatabase", OPTRECEIVERDATABASE_ITEM_CHANGED, new String[] @@ -709,7 +709,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 40), resources.resoptReceiverDatabase_value, "optReceiverDatabase", new Integer(104), new Integer(157), INTEGERS[4], new Short((short) 40), new Integer(200) + INTEGERS[8], HelpIds.getHelpIdString(HID + 40), resources.resoptReceiverDatabase_value, "optReceiverDatabase", new Integer(104), new Integer(157), INTEGERS[4], new Short((short) 40), new Integer(200) }); lblSenderAddress = insertLabel("lblSenderAddress", new String[] @@ -785,7 +785,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - new Integer(47), "HID:" + (HID + 41), Boolean.TRUE, "txtFooter", new Integer(97), INTEGER_40, INTEGERS[5], new Short((short) 41), new Integer(203) + new Integer(47), HelpIds.getHelpIdString(HID + 41), Boolean.TRUE, "txtFooter", new Integer(97), INTEGER_40, INTEGERS[5], new Short((short) 41), new Integer(203) }); chkFooterNextPages = insertCheckBox("chkFooterNextPages", CHKFOOTERNEXTPAGES_ITEM_CHANGED, new String[] @@ -794,7 +794,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 42), resources.reschkFooterNextPages_value, "chkFooterNextPages", new Integer(97), new Integer(92), new Short((short) 0), INTEGERS[5], new Short((short) 42), new Integer(202) + INTEGERS[8], HelpIds.getHelpIdString(HID + 42), resources.reschkFooterNextPages_value, "chkFooterNextPages", new Integer(97), new Integer(92), new Short((short) 0), INTEGERS[5], new Short((short) 42), new Integer(202) }); chkFooterPageNumbers = insertCheckBox("chkFooterPageNumbers", CHKFOOTERPAGENUMBERS_ITEM_CHANGED, new String[] @@ -803,7 +803,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 43), resources.reschkFooterPageNumbers_value, "chkFooterPageNumbers", new Integer(97), new Integer(106), new Short((short) 0), INTEGERS[5], new Short((short) 43), new Integer(201) + INTEGERS[8], HelpIds.getHelpIdString(HID + 43), resources.reschkFooterPageNumbers_value, "chkFooterPageNumbers", new Integer(97), new Integer(106), new Short((short) 0), INTEGERS[5], new Short((short) 43), new Integer(201) }); lblFooter = insertLabel("lblFooter", new String[] @@ -834,7 +834,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGER_12, "HID:" + (HID + 44), "txtTemplateName", new Integer(202), new Integer(56), INTEGERS[6], new Short((short) 44), resources.restxtTemplateName_value, new Integer(100) + INTEGER_12, HelpIds.getHelpIdString(HID + 44), "txtTemplateName", new Integer(202), new Integer(56), INTEGERS[6], new Short((short) 44), resources.restxtTemplateName_value, new Integer(100) }); optCreateLetter = insertRadioButton("optCreateLetter", OPTCREATELETTER_ITEM_CHANGED, new String[] @@ -843,7 +843,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 45), resources.resoptCreateLetter_value, "optCreateLetter", new Integer(104), new Integer(111), INTEGERS[6], new Short((short) 50), new Integer(198) + INTEGERS[8], HelpIds.getHelpIdString(HID + 45), resources.resoptCreateLetter_value, "optCreateLetter", new Integer(104), new Integer(111), INTEGERS[6], new Short((short) 50), new Integer(198) }); optMakeChanges = insertRadioButton("optMakeChanges", OPTMAKECHANGES_ITEM_CHANGED, new String[] @@ -852,7 +852,7 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }, new Object[] { - INTEGERS[8], "HID:" + (HID + 46), resources.resoptMakeChanges_value, "optMakeChanges", new Integer(104), new Integer(123), INTEGERS[6], new Short((short) 51), new Integer(198) + INTEGERS[8], HelpIds.getHelpIdString(HID + 46), resources.resoptMakeChanges_value, "optMakeChanges", new Integer(104), new Integer(123), INTEGERS[6], new Short((short) 51), new Integer(198) }); lblFinalExplanation1 = insertLabel("lblFinalExplanation1", new String[] @@ -910,4 +910,4 @@ public abstract class LetterWizardDialog extends WizardDialog implements LetterW }); } -} \ No newline at end of file +} diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java index e11d33eaa..9a0d47acb 100644 --- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java +++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java @@ -1435,7 +1435,7 @@ public class LetterWizardDialogImpl extends LetterWizardDialog public void insertPathSelectionControl() { myPathSelection = new PathSelection(xMSF, this, PathSelection.TransferMode.SAVE, PathSelection.DialogTypes.FILE); - myPathSelection.insert(6, 97, 70, 205, (short) 45, resources.reslblTemplatePath_value, true, "HID:" + (HID + 47), "HID:" + (HID + 48)); + myPathSelection.insert(6, 97, 70, 205, (short) 45, resources.reslblTemplatePath_value, true, HelpIds.getHelpIdString(HID + 47), HelpIds.getHelpIdString(HID + 48)); myPathSelection.sDefaultDirectory = sUserTemplatePath; myPathSelection.sDefaultName = "myLetterTemplate.ott"; myPathSelection.sDefaultFilter = "writer8_template"; diff --git a/wizards/com/sun/star/wizards/makefile.mk b/wizards/com/sun/star/wizards/makefile.mk index fb9c3e185..a9ec3e2d5 100644 --- a/wizards/com/sun/star/wizards/makefile.mk +++ b/wizards/com/sun/star/wizards/makefile.mk @@ -55,6 +55,7 @@ JARTARGET = commonwizards.jar # --- Files -------------------------------------------------------- JAVAFILES= \ + common$/HelpIds.java \ common$/Desktop.java \ common$/NumberFormatter.java \ common$/FileAccess.java \ diff --git a/wizards/com/sun/star/wizards/query/Finalizer.java b/wizards/com/sun/star/wizards/query/Finalizer.java index 592c3e64a..ece267433 100644 --- a/wizards/com/sun/star/wizards/query/Finalizer.java +++ b/wizards/com/sun/star/wizards/query/Finalizer.java @@ -78,7 +78,7 @@ public class Finalizer }, new Object[] { - new Integer(12), "HID:" + curHelpIndex++, new Integer(95), new Integer(37), new Integer(QueryWizard.SOSUMMARY_PAGE), new Short(curtabindex++), new Integer(90) + new Integer(12), HelpIds.getHelpIdString(curHelpIndex++), new Integer(95), new Integer(37), new Integer(QueryWizard.SOSUMMARY_PAGE), new Short(curtabindex++), new Integer(90) }); m_queryWizard.insertLabel("lblHowGoOn", new String[] { @@ -95,7 +95,7 @@ public class Finalizer }, new Object[] { - new Integer(9), "HID:" + curHelpIndex++, resoptDisplayQuery, new Integer(192), new Integer(46), new Short((short) 1), new Integer(QueryWizard.SOSUMMARY_PAGE), new Short(curtabindex++), new Integer(118) + new Integer(9), HelpIds.getHelpIdString(curHelpIndex++), resoptDisplayQuery, new Integer(192), new Integer(46), new Short((short) 1), new Integer(QueryWizard.SOSUMMARY_PAGE), new Short(curtabindex++), new Integer(118) }); m_queryWizard.insertRadioButton("optModifyQuery", @@ -105,7 +105,7 @@ public class Finalizer }, new Object[] { - new Integer(10), "HID:" + curHelpIndex++, resoptModifyQuery, new Integer(192), new Integer(56), new Integer(QueryWizard.SOSUMMARY_PAGE), new Short(curtabindex++), new Integer(118) + new Integer(10), HelpIds.getHelpIdString(curHelpIndex++), resoptModifyQuery, new Integer(192), new Integer(56), new Integer(QueryWizard.SOSUMMARY_PAGE), new Short(curtabindex++), new Integer(118) }); m_queryWizard.insertFixedLine("flnSummary", new String[] { @@ -121,7 +121,7 @@ public class Finalizer }, new Object[] { - new Integer(96), "HID:" + curHelpIndex++, Boolean.TRUE, new Integer(95), new Integer(80), Boolean.TRUE, new Integer(8), Boolean.TRUE, new Integer(209) + new Integer(96), HelpIds.getHelpIdString(curHelpIndex++), Boolean.TRUE, new Integer(95), new Integer(80), Boolean.TRUE, new Integer(8), Boolean.TRUE, new Integer(209) }); } diff --git a/wizards/com/sun/star/wizards/report/Dataimport.java b/wizards/com/sun/star/wizards/report/Dataimport.java index 9b1d993c8..e8c533cb8 100644 --- a/wizards/com/sun/star/wizards/report/Dataimport.java +++ b/wizards/com/sun/star/wizards/report/Dataimport.java @@ -178,7 +178,7 @@ public class Dataimport extends UnoDialog2 implements com.sun.star.awt.XActionLi }, new Object[] { - new Integer(14), "HID:34321", new Integer(74), new Integer(58), new Integer(0), new Short((short) 1), new Integer(40), sStop + new Integer(14), HelpIds.getHelpIdString(34321), new Integer(74), new Integer(58), new Integer(0), new Short((short) 1), new Integer(40), sStop }); createWindowPeer(CurReportDocument.getWizardParent()); calculateDialogPosition(CurReportDocument.getFrame().getComponentWindow().getPosSize()); diff --git a/wizards/com/sun/star/wizards/report/ReportFinalizer.java b/wizards/com/sun/star/wizards/report/ReportFinalizer.java index 05253f45d..5573fe0c2 100644 --- a/wizards/com/sun/star/wizards/report/ReportFinalizer.java +++ b/wizards/com/sun/star/wizards/report/ReportFinalizer.java @@ -104,7 +104,7 @@ public class ReportFinalizer }, new Object[] { - new Integer(12), "HID:34362", new Integer(95), new Integer(37), new Integer(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), new Integer(209) + new Integer(12), "HID:WIZARDS_HID_DLGREPORT_4_TITLE", new Integer(95), new Integer(37), new Integer(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), new Integer(209) }); CurUnoDialog.insertControlModel("com.sun.star.awt.UnoControlFixedTextModel", "lblChooseReportKind", @@ -124,7 +124,7 @@ public class ReportFinalizer }, new Object[] { - new Integer(10), "HID:34371", sSaveAsDocument, new Integer(95), new Integer(69), new Short((short) 0), new Integer(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), new Integer(138) + new Integer(10), "HID:WIZARDS_HID_DLGREPORT_5_OPTSTATDOCUMENT", sSaveAsDocument, new Integer(95), new Integer(69), new Short((short) 0), new Integer(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), new Integer(138) }); CurUnoDialog.insertRadioButton("optCreateReportTemplate", TOGGLESUBTEMPLATECONTROLS_FUNCNAME, this, @@ -134,7 +134,7 @@ public class ReportFinalizer }, new Object[] { - new Integer(8), "HID:34370", sSaveAsTemplate, new Integer(95), new Integer(81), new Short((short) 1), new Integer(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), new Integer(209) + new Integer(8), "HID:WIZARDS_HID_DLGREPORT_5_OPTDYNTEMPLATE", sSaveAsTemplate, new Integer(95), new Integer(81), new Short((short) 1), new Integer(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), new Integer(209) }); @@ -156,7 +156,7 @@ public class ReportFinalizer }, new Object[] { - new Integer(10), "HID:34374", sEditTemplate, new Integer(111), new Integer(105), new Integer(6), new Short(curtabindex++), new Integer(138) + new Integer(10), "HID:WIZARDS_HID_DLGREPORT_5_OPTEDITTEMPLATE", sEditTemplate, new Integer(111), new Integer(105), new Integer(6), new Short(curtabindex++), new Integer(138) }); CurUnoDialog.insertRadioButton("optUseTemplate", TOGGLESUBTEMPLATECONTROLS_FUNCNAME, this, @@ -166,7 +166,7 @@ public class ReportFinalizer }, new Object[] { - new Integer(10), "HID:34375", sUseTemplate, new Integer(111), new Integer(115), new Short((short) 1), new Integer(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), new Integer(138) + new Integer(10), "HID:WIZARDS_HID_DLGREPORT_5_OPTUSETEMPLATE", sUseTemplate, new Integer(111), new Integer(115), new Short((short) 1), new Integer(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), new Integer(138) }); } diff --git a/wizards/com/sun/star/wizards/report/ReportLayouter.java b/wizards/com/sun/star/wizards/report/ReportLayouter.java index d05bc2cf4..9b4b9b777 100644 --- a/wizards/com/sun/star/wizards/report/ReportLayouter.java +++ b/wizards/com/sun/star/wizards/report/ReportLayouter.java @@ -115,7 +115,7 @@ public class ReportLayouter }, new Object[] { - new Integer(108), "HID:34363", new Integer(95), new Integer(37), new short[] + new Integer(108), "HID:WIZARDS_HID_DLGREPORT_4_DATALAYOUT", new Integer(95), new Integer(37), new short[] { iSelPos }, new Integer(ReportWizard.SOTEMPLATEPAGE), ContentFiles[0], new Short(curtabindex++), new Integer(99) @@ -150,7 +150,7 @@ public class ReportLayouter }, new Object[] { - new Integer(108), "HID:34364", new Integer(205), new Integer(37), new short[] + new Integer(108), "HID:WIZARDS_HID_DLGREPORT_4_PAGELAYOUT", new Integer(205), new Integer(37), new short[] { iSelLayoutPos }, new Integer(ReportWizard.SOTEMPLATEPAGE), LayoutFiles[0], new Short(curtabindex++), new Integer(99) @@ -174,7 +174,7 @@ public class ReportLayouter }, new Object[] { - new Integer(10), "HID:34365", sOrientHorizontal, new Integer(101), new Integer(158), new Short(m_nLandscapeState), new Integer(ReportWizard.SOTEMPLATEPAGE), new Short(curtabindex++), new Integer(60) + new Integer(10), "HID:WIZARDS_HID_DLGREPORT_4_LANDSCAPE", sOrientHorizontal, new Integer(101), new Integer(158), new Short(m_nLandscapeState), new Integer(ReportWizard.SOTEMPLATEPAGE), new Short(curtabindex++), new Integer(60) }); short m_nPortraitState = CurReportDocument.getDefaultPageOrientation() == SOOPTPORTRAIT ? (short) 1 : (short) 0; @@ -185,7 +185,7 @@ public class ReportLayouter }, new Object[] { - new Integer(10), "HID:34366", sOrientVertical, new Integer(101), new Integer(171), new Short(m_nPortraitState), new Integer(ReportWizard.SOTEMPLATEPAGE), new Short(curtabindex++), new Integer(60) + new Integer(10), "HID:WIZARDS_HID_DLGREPORT_4_PORTRAIT", sOrientVertical, new Integer(101), new Integer(171), new Short(m_nPortraitState), new Integer(ReportWizard.SOTEMPLATEPAGE), new Short(curtabindex++), new Integer(60) }); aOrientationImage = CurUnoDialog.insertControlModel("com.sun.star.awt.UnoControlImageControlModel", "imgOrientation", diff --git a/wizards/com/sun/star/wizards/table/FieldFormatter.java b/wizards/com/sun/star/wizards/table/FieldFormatter.java index 3c9a8997e..3547712f0 100644 --- a/wizards/com/sun/star/wizards/table/FieldFormatter.java +++ b/wizards/com/sun/star/wizards/table/FieldFormatter.java @@ -95,7 +95,7 @@ public class FieldFormatter implements XItemListener }, new Object[] { - new Integer(133), "HID:41220", new Integer(92), new Integer(37), IFieldFormatStep, new Short(curtabindex++), new Integer(62) + new Integer(133), "HID:WIZARDS_HID_DLGTABLE_LB_SELFIELDNAMES", new Integer(92), new Integer(37), IFieldFormatStep, new Short(curtabindex++), new Integer(62) }); } catch (Exception e) @@ -113,7 +113,7 @@ public class FieldFormatter implements XItemListener }, new Object[] { - Boolean.FALSE, oFontDesc, new Integer(14), "HID:41221", String.valueOf((char) 8743), new Integer(158), new Integer(139), IFieldFormatStep, new Short(curtabindex++), new Integer(14) + Boolean.FALSE, oFontDesc, new Integer(14), "HID:WIZARDS_HID_DLGTABLE_CMDMOVEFIELDUP", String.valueOf((char) 8743), new Integer(158), new Integer(139), IFieldFormatStep, new Short(curtabindex++), new Integer(14) }); btnShiftDown = CurUnoDialog.insertButton("btnShiftDown", "shiftFieldNameDown", this, @@ -123,7 +123,7 @@ public class FieldFormatter implements XItemListener }, new Object[] { - Boolean.FALSE, oFontDesc, new Integer(14), "HID:41222", String.valueOf((char) 8744), new Integer(158), new Integer(156), IFieldFormatStep, new Short(curtabindex++), new Integer(14) + Boolean.FALSE, oFontDesc, new Integer(14), "HID:WIZARDS_HID_DLGTABLE_CMDMOVEFIELDDOWN", String.valueOf((char) 8744), new Integer(158), new Integer(156), IFieldFormatStep, new Short(curtabindex++), new Integer(14) }); oFontDesc = new FontDescriptor(); oFontDesc.Weight = com.sun.star.awt.FontWeight.BOLD; @@ -135,7 +135,7 @@ public class FieldFormatter implements XItemListener }, new Object[] { - oFontDesc, new Integer(14), "HID:41223", "-", new Integer(118), new Integer(175), IFieldFormatStep, new Short(curtabindex++), new Integer(14) + oFontDesc, new Integer(14), "HID:WIZARDS_HID_DLGTABLE_CMDMINUS", "-", new Integer(118), new Integer(175), IFieldFormatStep, new Short(curtabindex++), new Integer(14) }); btnplus = CurUnoDialog.insertButton("btnplus", "addFieldName", this, @@ -145,7 +145,7 @@ public class FieldFormatter implements XItemListener }, new Object[] { - oFontDesc, new Integer(14), "HID:41224", "+", new Integer(137), new Integer(175), IFieldFormatStep, new Short(curtabindex++), new Integer(14) + oFontDesc, new Integer(14), "HID:WIZARDS_HID_DLGTABLE_CMDPLUS", "+", new Integer(137), new Integer(175), IFieldFormatStep, new Short(curtabindex++), new Integer(14) }); CurUnoDialog.insertControlModel("com.sun.star.awt.UnoControlFixedLineModel", "ColDescriptorHeader", @@ -176,7 +176,7 @@ public class FieldFormatter implements XItemListener }, new Object[] { - UIConsts.INTEGER_12, "HID:41225", new Integer(274), new Integer(37), IFieldFormatStep, new Short(curtabindex++), "", new Integer(50) + UIConsts.INTEGER_12, "HID:WIZARDS_HID_DLGTABLE_COLNAME", new Integer(274), new Integer(37), IFieldFormatStep, new Short(curtabindex++), "", new Integer(50) }); txtfieldname.addTextListener(CurUnoDialog); CurUnoDialog.getPeerConfiguration().setAccessibleName(btnplus, sbtnplushelptext); @@ -195,7 +195,7 @@ public class FieldFormatter implements XItemListener new Object[] { new Integer(85), new Integer(158), new Integer(49), IFieldFormatStep, new Short(curtabindex++), new Integer(166), new Integer(50) - }); //, "HID:41226" + }); //, "HID:WIZARDS_HID_DLGTABLE_COLMODIFIER" curTableDescriptor = _curTableDescriptor; Helper.setUnoPropertyValue(oColumnDescriptorModel, "ActiveConnection", _curTableDescriptor.DBConnection); txtfieldname.setMaxTextLen((short) this.curTableDescriptor.getMaxColumnNameLength()); diff --git a/wizards/com/sun/star/wizards/table/Finalizer.java b/wizards/com/sun/star/wizards/table/Finalizer.java index 94636532e..b86e2a698 100644 --- a/wizards/com/sun/star/wizards/table/Finalizer.java +++ b/wizards/com/sun/star/wizards/table/Finalizer.java @@ -91,7 +91,7 @@ public class Finalizer }, new Object[] { - UIConsts.INTEGER_12, "HID:41240", new Integer(97), new Integer(35), IFINALSTEP, new Short(curtabindex++), "", new Integer(223) + UIConsts.INTEGER_12, "HID:WIZARDS_HID_DLGTABLE_TXT_NAME", new Integer(97), new Integer(35), IFINALSTEP, new Short(curtabindex++), "", new Integer(223) }); txtTableName.addTextListener(CurUnoDialog); txtTableName.setMaxTextLen((short) this.curtabledescriptor.getMaxTableNameLength()); @@ -130,7 +130,7 @@ public class Finalizer }, new Object[] { - Boolean.TRUE, new Integer(12), "HID:41244", new Short(UnoDialog.getListBoxLineCount()), new Integer(nListBoxPosX), new Integer(62), IFINALSTEP, sCatalogNames, new Short(curtabindex++), new Integer(80) + Boolean.TRUE, new Integer(12), "HID:WIZARDS_HID_DLGTABLE_LST_CATALOG", new Short(UnoDialog.getListBoxLineCount()), new Integer(nListBoxPosX), new Integer(62), IFINALSTEP, sCatalogNames, new Short(curtabindex++), new Integer(80) }); int isel = JavaTools.FieldInList(sCatalogNames, sCatalog); if (isel < 0) @@ -185,7 +185,7 @@ public class Finalizer }, new Object[] { - Boolean.TRUE, new Integer(12), "HID:41245", new Short(UnoDialog.getListBoxLineCount()), new Integer(nListBoxPosX), new Integer(62), IFINALSTEP, sSchemaNames, new Short(curtabindex++), new Integer(80) + Boolean.TRUE, new Integer(12), "HID:WIZARDS_HID_DLGTABLE_LST_SCHEMA", new Short(UnoDialog.getListBoxLineCount()), new Integer(nListBoxPosX), new Integer(62), IFINALSTEP, sSchemaNames, new Short(curtabindex++), new Integer(80) }); int isel = JavaTools.FieldInList(sSchemaNames, sSchema); if (isel < 0) @@ -236,7 +236,7 @@ public class Finalizer }, new Object[] { - UIConsts.INTEGERS[8], "HID:41242", sWorkWithTable, new Integer(101), new Integer(97 + ndiffPosY), new Short((short) 1), IFINALSTEP, new Short(curtabindex++), new Integer(177) + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPT_WORKWITHTABLE", sWorkWithTable, new Integer(101), new Integer(97 + ndiffPosY), new Short((short) 1), IFINALSTEP, new Short(curtabindex++), new Integer(177) }); optModifyTable = CurUnoDialog.insertRadioButton("optModifyTable", null, new String[] @@ -245,7 +245,7 @@ public class Finalizer }, new Object[] { - UIConsts.INTEGERS[8], "HID:41241", sModifyTable, new Integer(101), new Integer(109 + ndiffPosY), IFINALSTEP, new Short(curtabindex++), new Integer(177) + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPT_MODIFYTABLE", sModifyTable, new Integer(101), new Integer(109 + ndiffPosY), IFINALSTEP, new Short(curtabindex++), new Integer(177) }); optStartFormWizard = CurUnoDialog.insertRadioButton("optStartFormWizard", null, new String[] @@ -254,7 +254,7 @@ public class Finalizer }, new Object[] { - UIConsts.INTEGERS[8], "HID:41243", sStartFormWizard, new Integer(101), new Integer(121 + ndiffPosY), IFINALSTEP, new Short(curtabindex++), new Integer(177) + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPT_STARTFORMWIZARD", sStartFormWizard, new Integer(101), new Integer(121 + ndiffPosY), IFINALSTEP, new Short(curtabindex++), new Integer(177) }); } catch (SQLException e) diff --git a/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java b/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java index 6f7ecb289..4880c8735 100644 --- a/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java +++ b/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java @@ -99,7 +99,7 @@ public class PrimaryKeyHandler implements XFieldSelectionListener }, new Object[] { - UIConsts.INTEGERS[8], "HID:41227", screatePrimaryKey, new Integer(97), new Integer(70), new Short((short) 1), IPRIMEKEYSTEP, new Short(curtabindex++), new Integer(160) + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_CHK_USEPRIMEKEY", screatePrimaryKey, new Integer(97), new Integer(70), new Short((short) 1), IPRIMEKEYSTEP, new Short(curtabindex++), new Integer(160) }); optAddAutomatically = CurUnoDialog.insertRadioButton("optAddAutomatically", SPRIMEKEYMODE, this, @@ -109,7 +109,7 @@ public class PrimaryKeyHandler implements XFieldSelectionListener }, new Object[] { - UIConsts.INTEGERS[8], "HID:41228", sAddAutomatically, new Integer(106), new Integer(82), new Short((short) 1), IPRIMEKEYSTEP, new Short(curtabindex++), new Integer(200) + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPT_PK_AUTOMATIC", sAddAutomatically, new Integer(106), new Integer(82), new Short((short) 1), IPRIMEKEYSTEP, new Short(curtabindex++), new Integer(200) }); optUseExisting = CurUnoDialog.insertRadioButton("optUseExisting", SPRIMEKEYMODE, this, @@ -119,7 +119,7 @@ public class PrimaryKeyHandler implements XFieldSelectionListener }, //94 new Object[] { - UIConsts.INTEGERS[8], "HID:41230", sUseExisting, new Integer(106), new Integer(104), IPRIMEKEYSTEP, new Short(curtabindex++), new Integer(200) + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPT_PK_SINGLE", sUseExisting, new Integer(106), new Integer(104), IPRIMEKEYSTEP, new Short(curtabindex++), new Integer(200) }); optUseSeveral = CurUnoDialog.insertRadioButton("optUseSeveral", SPRIMEKEYMODE, this, @@ -129,7 +129,7 @@ public class PrimaryKeyHandler implements XFieldSelectionListener }, new Object[] { - UIConsts.INTEGERS[8], "HID:41233", sUseSeveral, new Integer(106), new Integer(132), IPRIMEKEYSTEP, new Short(curtabindex++), new Integer(200) + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPT_PK_SEVERAL", sUseSeveral, new Integer(106), new Integer(132), IPRIMEKEYSTEP, new Short(curtabindex++), new Integer(200) }); chkApplyAutoValueAutomatic = CurUnoDialog.insertCheckBox("chkApplyAutoValueAutomatic", SPRIMEKEYMODE, this, @@ -139,7 +139,7 @@ public class PrimaryKeyHandler implements XFieldSelectionListener }, //107 new Object[] { - UIConsts.INTEGERS[8], "HID:41229", sApplyAutoValue, new Integer(116), new Integer(92), IPRIMEKEYSTEP, new Short(curtabindex++), new Integer(68) + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_CK_PK_AUTOVALUE_AUTOMATIC", sApplyAutoValue, new Integer(116), new Integer(92), IPRIMEKEYSTEP, new Short(curtabindex++), new Integer(68) }); lblPrimeFieldName = CurUnoDialog.insertLabel("lblPrimeFieldName", @@ -171,7 +171,7 @@ public class PrimaryKeyHandler implements XFieldSelectionListener Boolean.TRUE, Boolean.FALSE, new Integer(12), - "HID:41231", + "HID:WIZARDS_HID_DLGTABLE_LB_PK_FIELDNAME", Short.valueOf(UnoDialog.getListBoxLineCount()), new Integer(162), new Integer(115), @@ -187,7 +187,7 @@ public class PrimaryKeyHandler implements XFieldSelectionListener }, //107 new Object[] { - UIConsts.INTEGERS[8], "HID:41232", sApplyAutoValue, new Integer(248), new Integer(117), IPRIMEKEYSTEP, new Short(curtabindex++), new Integer(66) + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_CK_PK_AUTOVALUE", sApplyAutoValue, new Integer(248), new Integer(117), IPRIMEKEYSTEP, new Short(curtabindex++), new Integer(66) }); curPrimaryKeySelection = new FieldSelection(CurUnoDialog, IPRIMEKEYSTEP.intValue(), 116, 142, 208, 47, slblAvailableFields, slblSelPrimaryFields, 41234, false); curPrimaryKeySelection.addFieldSelectionListener(this); diff --git a/wizards/com/sun/star/wizards/table/ScenarioSelector.java b/wizards/com/sun/star/wizards/table/ScenarioSelector.java index 6f6ae92fc..23a48772a 100644 --- a/wizards/com/sun/star/wizards/table/ScenarioSelector.java +++ b/wizards/com/sun/star/wizards/table/ScenarioSelector.java @@ -123,7 +123,7 @@ public class ScenarioSelector extends FieldSelection implements XItemListener, X }, new Object[] { - UIConsts.INTEGERS[8], "HID:41206", sBusiness, new Integer(98), new Integer(70), new Short((short) 1), IMAINSTEP, new Short(pretabindex++), new Integer(78) + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPTBUSINESS", sBusiness, new Integer(98), new Integer(70), new Short((short) 1), IMAINSTEP, new Short(pretabindex++), new Integer(78) }); optPrivate = CurTableWizardUnoDialog.insertRadioButton("optPrivate", SELECTCATEGORY, this, @@ -133,7 +133,7 @@ public class ScenarioSelector extends FieldSelection implements XItemListener, X }, new Object[] { - UIConsts.INTEGERS[8], "HID:41207", sPrivate, new Integer(182), new Integer(70), IMAINSTEP, new Short(pretabindex++), new Integer(90) + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPTPRIVATE", sPrivate, new Integer(182), new Integer(70), IMAINSTEP, new Short(pretabindex++), new Integer(90) }); CurUnoDialog.insertLabel("lblTableNames", @@ -155,7 +155,7 @@ public class ScenarioSelector extends FieldSelection implements XItemListener, X }, new Object[] { - Boolean.TRUE, new Integer(12), "HID:41208", new Short(UnoDialog.getListBoxLineCount()), new Integer(91), new Integer(92), IMAINSTEP, new Short(pretabindex++), getListboxWidth() + Boolean.TRUE, new Integer(12), "HID:WIZARDS_HID_DLGTABLE_LBTABLES", new Short(UnoDialog.getListBoxLineCount()), new Integer(91), new Integer(92), IMAINSTEP, new Short(pretabindex++), getListboxWidth() }); } catch (Exception e) diff --git a/wizards/com/sun/star/wizards/ui/AggregateComponent.java b/wizards/com/sun/star/wizards/ui/AggregateComponent.java index 55ae22803..7272896fd 100644 --- a/wizards/com/sun/star/wizards/ui/AggregateComponent.java +++ b/wizards/com/sun/star/wizards/ui/AggregateComponent.java @@ -30,7 +30,6 @@ import java.util.Vector; import com.sun.star.wizards.common.*; import com.sun.star.wizards.db.*; import com.sun.star.lang.EventObject; -//import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.beans.*; import com.sun.star.sdbc.SQLException; import com.sun.star.uno.AnyConverter; @@ -89,7 +88,7 @@ public class AggregateComponent extends ControlScroller }, new Object[] { - new Integer(8), "HID:" + curHelpID, soptDetailQuery, new Integer(_iPosX), new Integer(iCompPosY - 42), new Short((short) 1), IStep, new Short(curtabindex++), new Integer(iCompWidth) + new Integer(8), HelpIds.getHelpIdString(curHelpID), soptDetailQuery, new Integer(_iPosX), new Integer(iCompPosY - 42), new Short((short) 1), IStep, new Short(curtabindex++), new Integer(iCompWidth) }); optSummaryQuery = CurUnoDialog.insertRadioButton("optSummaryQuery", 0, new ActionListenerImpl(), @@ -99,7 +98,7 @@ public class AggregateComponent extends ControlScroller }, new Object[] { - new Integer(16), "HID:" + (curHelpID + 1), soptSummaryQuery, Boolean.TRUE, new Integer(_iPosX), new Integer(iCompPosY - 32), IStep, new Short(curtabindex++), new Integer(iCompWidth) + new Integer(16), HelpIds.getHelpIdString(curHelpID + 1), soptSummaryQuery, Boolean.TRUE, new Integer(_iPosX), new Integer(iCompPosY - 32), IStep, new Short(curtabindex++), new Integer(iCompWidth) }); CurUnoDialog.insertLabel("lblAggregate", new String[] @@ -132,7 +131,7 @@ public class AggregateComponent extends ControlScroller }, new Object[] { - oFontDescriptor, new Integer(14), "HID:" + (lastHelpIndex + 1), "+", new Integer(_iPosX + iCompWidth - 36), new Integer(iButtonPosY), IStep, new Short((curtabindex++)), new Integer(16) + oFontDescriptor, new Integer(14), HelpIds.getHelpIdString(lastHelpIndex + 1), "+", new Integer(_iPosX + iCompWidth - 36), new Integer(iButtonPosY), IStep, new Short((curtabindex++)), new Integer(16) }); CurUnoDialog.insertButton("btnminus", SOREMOVEROW, new ActionListenerImpl(), new String[] @@ -141,7 +140,7 @@ public class AggregateComponent extends ControlScroller }, new Object[] { - oFontDescriptor, new Integer(14), "HID:" + (lastHelpIndex + 2), "-", new Integer(_iPosX + iCompWidth - 16), new Integer(iButtonPosY), IStep, new Short(curtabindex++), new Integer(16) + oFontDescriptor, new Integer(14), HelpIds.getHelpIdString(lastHelpIndex + 2), "-", new Integer(_iPosX + iCompWidth - 16), new Integer(iButtonPosY), IStep, new Short(curtabindex++), new Integer(16) }); CurDBMetaData.Type = getQueryType(); } @@ -533,7 +532,7 @@ public class AggregateComponent extends ControlScroller }, new Object[] { - Boolean.TRUE, new Integer(12), "HID:" + _curHelpID++, new Integer(iCompPosX + 4), new Integer(ypos), UIConsts.INVISIBLESTEP, sFunctions, new Short(curtabindex++), new Integer(88) + Boolean.TRUE, new Integer(12), HelpIds.getHelpIdString(_curHelpID++), new Integer(iCompPosX + 4), new Integer(ypos), UIConsts.INVISIBLESTEP, sFunctions, new Short(curtabindex++), new Integer(88) }); xFieldListBox = CurUnoDialog.insertListBox(getFieldsControlName(index), 1, null, new ItemListenerImpl(), @@ -543,7 +542,7 @@ public class AggregateComponent extends ControlScroller }, new Object[] { - Boolean.TRUE, new Integer(12), "HID:" + _curHelpID++, new Integer(iCompPosX + 98), new Integer(ypos), UIConsts.INVISIBLESTEP, new Short(curtabindex++), new Integer(86) + Boolean.TRUE, new Integer(12), HelpIds.getHelpIdString(_curHelpID++), new Integer(iCompPosX + 98), new Integer(ypos), UIConsts.INVISIBLESTEP, new Short(curtabindex++), new Integer(86) }); lastHelpIndex = _curHelpID - 1; } diff --git a/wizards/com/sun/star/wizards/ui/ButtonList.java b/wizards/com/sun/star/wizards/ui/ButtonList.java index e14a06b4e..aacae9848 100644 --- a/wizards/com/sun/star/wizards/ui/ButtonList.java +++ b/wizards/com/sun/star/wizards/ui/ButtonList.java @@ -34,16 +34,15 @@ import com.sun.star.awt.XControlModel; import com.sun.star.awt.XFixedText; import com.sun.star.awt.XItemEventBroadcaster; import com.sun.star.awt.XItemListener; -// import com.sun.star.awt.XView; import com.sun.star.awt.XWindow; import com.sun.star.lang.EventObject; import com.sun.star.uno.UnoRuntime; import com.sun.star.wizards.common.Helper; import com.sun.star.wizards.common.IRenderer; import com.sun.star.wizards.common.PropertySetHelper; -// import com.sun.star.wizards.ui.event.*; import javax.swing.ListModel; import javax.swing.event.ListDataEvent; +import com.sun.star.wizards.common.HelpIds; /** * @@ -165,7 +164,7 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener btnBack = dialog.insertButton(m_aControlName + "_btnBack", "prevPage", this, pNames1, new Object[] { btnSize, - "HID:" + helpURL++, + HelpIds.getHelpIdString(helpURL++), Integer.valueOf(pos.Width), Integer.valueOf(pos.Height + (m_aButtonSize.Height + gap.Height) * rows + gap.Height + imageTextHeight + 1), step, @@ -177,7 +176,7 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener btnNext = dialog.insertButton(m_aControlName + "_btnNext", "nextPage", this, pNames1, new Object[] { btnSize, - "HID:" + helpURL++, + HelpIds.getHelpIdString(helpURL++), Integer.valueOf(pos.Width + (m_aButtonSize.Width + gap.Width) * cols + gap.Width - btnSize.intValue() + 1), Integer.valueOf(pos.Height + (m_aButtonSize.Height + gap.Height) * rows + gap.Height + imageTextHeight + 1), step, @@ -256,7 +255,7 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener /* Short.valueOf((short) 1), */ /* NO_BORDER, */ /* BACKGROUND_COLOR, */ m_aButtonHeight, - "HID:" + helpURL++, + HelpIds.getHelpIdString(helpURL++), /* "Test", */ Integer.valueOf(nButtonX), Integer.valueOf(nButtonY), diff --git a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java index 5bb10f184..16e6fd900 100644 --- a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java +++ b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java @@ -152,7 +152,7 @@ public class CommandFieldSelection extends FieldSelection implements Comparator }, new Object[] { - Boolean.TRUE, Boolean.FALSE, new Integer(12), "HID:" + (super.FirstHelpIndex - 1), new Short(UnoDialog.getListBoxLineCount()), new Integer(95), new Integer(37), IStep, new Short((short) 4), getListboxWidth() + Boolean.TRUE, Boolean.FALSE, new Integer(12), HelpIds.getHelpIdString(super.FirstHelpIndex - 1), new Short(UnoDialog.getListBoxLineCount()), new Integer(95), new Integer(37), IStep, new Short((short) 4), getListboxWidth() }); // XWindow xTableListBoxWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, xTableListBox); fillupCommandListBox(); diff --git a/wizards/com/sun/star/wizards/ui/ControlScroller.java b/wizards/com/sun/star/wizards/ui/ControlScroller.java index 037ad93ff..ae1e2269f 100644 --- a/wizards/com/sun/star/wizards/ui/ControlScroller.java +++ b/wizards/com/sun/star/wizards/ui/ControlScroller.java @@ -32,6 +32,7 @@ import com.sun.star.beans.*; import com.sun.star.awt.*; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.wizards.common.*; +import com.sun.star.wizards.common.HelpIds; import java.util.*; @@ -133,7 +134,7 @@ public abstract class ControlScroller }, new Object[] { - new Short((short) 0), new Boolean(true), new Integer(ScrollHeight), "HID:" + curHelpIndex, new Integer(ScrollBarOrientation.VERTICAL), new Integer(iCompPosX + iCompWidth - iScrollBarWidth - 1), new Integer(iCompPosY + 1), IStep, new Integer(iScrollBarWidth) + new Short((short) 0), new Boolean(true), new Integer(ScrollHeight), HelpIds.getHelpIdString(curHelpIndex), new Integer(ScrollBarOrientation.VERTICAL), new Integer(iCompPosX + iCompWidth - iScrollBarWidth - 1), new Integer(iCompPosY + 1), IStep, new Integer(iScrollBarWidth) }); scrollfields = new Vector(); int ypos = iStartPosY + SORELFIRSTPOSY; diff --git a/wizards/com/sun/star/wizards/ui/FieldSelection.java b/wizards/com/sun/star/wizards/ui/FieldSelection.java index 021526622..75c97c685 100644 --- a/wizards/com/sun/star/wizards/ui/FieldSelection.java +++ b/wizards/com/sun/star/wizards/ui/FieldSelection.java @@ -28,7 +28,7 @@ package com.sun.star.wizards.ui; import com.sun.star.awt.FontDescriptor; import com.sun.star.awt.XListBox; -// import com.sun.star.wizards.common.*; +import com.sun.star.wizards.common.*; import com.sun.star.wizards.common.JavaTools; import java.util.*; @@ -241,7 +241,7 @@ public class FieldSelection }, new Object[] { - ListBoxHeight, "HID:" + Integer.toString(_FirstHelpIndex), Boolean.TRUE, new Integer(CompPosX), ListBoxPosY, IStep, new Short((curtabindex++)), ListBoxWidth + ListBoxHeight, HelpIds.getHelpIdString(_FirstHelpIndex), Boolean.TRUE, new Integer(CompPosX), ListBoxPosY, IStep, new Short((curtabindex++)), ListBoxWidth }); Object btnmoveselected = CurUnoDialog.insertButton("cmdMoveSelected" + sIncSuffix, SOCMDMOVESEL, new ActionListenerImpl(), @@ -251,7 +251,7 @@ public class FieldSelection }, new Object[] { - Boolean.FALSE, new Integer(14), "HID:" + Integer.toString(_FirstHelpIndex + 1), ">", cmdShiftButtonPosX, ShiftButtonPosY[a++], IStep, new Short(curtabindex++), CmdButtonWidth + Boolean.FALSE, new Integer(14), HelpIds.getHelpIdString(_FirstHelpIndex + 1), ">", cmdShiftButtonPosX, ShiftButtonPosY[a++], IStep, new Short(curtabindex++), CmdButtonWidth }); if (bshowFourButtons == true) @@ -263,7 +263,7 @@ public class FieldSelection }, new Object[] { - new Integer(14), "HID:" + Integer.toString(_FirstHelpIndex + 2), ">>", cmdShiftButtonPosX, ShiftButtonPosY[a++], IStep, new Short(curtabindex++), CmdButtonWidth + new Integer(14), HelpIds.getHelpIdString(_FirstHelpIndex + 2), ">>", cmdShiftButtonPosX, ShiftButtonPosY[a++], IStep, new Short(curtabindex++), CmdButtonWidth }); } Object btnremoveselected = CurUnoDialog.insertButton("cmdRemoveSelected" + sIncSuffix, SOCMDREMOVESEL, new ActionListenerImpl(), @@ -273,7 +273,7 @@ public class FieldSelection }, new Object[] { - Boolean.FALSE, new Integer(14), "HID:" + Integer.toString(_FirstHelpIndex + 3), "<", cmdShiftButtonPosX, ShiftButtonPosY[a++], IStep, new Short(curtabindex++), CmdButtonWidth + Boolean.FALSE, new Integer(14), HelpIds.getHelpIdString(_FirstHelpIndex + 3), "<", cmdShiftButtonPosX, ShiftButtonPosY[a++], IStep, new Short(curtabindex++), CmdButtonWidth }); if (bshowFourButtons == true) @@ -285,7 +285,7 @@ public class FieldSelection }, new Object[] { - new Integer(14), "HID:" + Integer.toString(_FirstHelpIndex + 4), "<<", cmdShiftButtonPosX, ShiftButtonPosY[a++], IStep, new Short(curtabindex++), CmdButtonWidth + new Integer(14), HelpIds.getHelpIdString(_FirstHelpIndex + 4), "<<", cmdShiftButtonPosX, ShiftButtonPosY[a++], IStep, new Short(curtabindex++), CmdButtonWidth }); } @@ -311,7 +311,7 @@ public class FieldSelection }, new Object[] { - ListBoxHeight, "HID:" + Integer.toString(_FirstHelpIndex + 5), Boolean.TRUE, SelListBoxPosX, ListBoxPosY, IStep, new Short(curtabindex++), ListBoxWidth + ListBoxHeight, HelpIds.getHelpIdString(_FirstHelpIndex + 5), Boolean.TRUE, SelListBoxPosX, ListBoxPosY, IStep, new Short(curtabindex++), ListBoxWidth }); Object btnmoveup = CurUnoDialog.insertButton("cmdMoveUp" + sIncSuffix, SOCMDMOVEUP, new ActionListenerImpl(), @@ -321,7 +321,7 @@ public class FieldSelection }, new Object[] { - Boolean.FALSE, oFontDesc, new Integer(14), "HID:" + Integer.toString(_FirstHelpIndex + 6), String.valueOf((char) 8743), cmdMoveButtonPosX, MoveButtonPosY[0], IStep, new Short(curtabindex++), CmdButtonWidth + Boolean.FALSE, oFontDesc, new Integer(14), HelpIds.getHelpIdString(_FirstHelpIndex + 6), String.valueOf((char) 8743), cmdMoveButtonPosX, MoveButtonPosY[0], IStep, new Short(curtabindex++), CmdButtonWidth }); Object btnmovedown = CurUnoDialog.insertButton("cmdMoveDown" + sIncSuffix, SOCMDMOVEDOWN, new ActionListenerImpl(), @@ -331,7 +331,7 @@ public class FieldSelection }, new Object[] { - Boolean.FALSE, oFontDesc, new Integer(14), "HID:" + Integer.toString(_FirstHelpIndex + 7), String.valueOf((char) 8744), cmdMoveButtonPosX, MoveButtonPosY[1], IStep, new Short(curtabindex++), CmdButtonWidth + Boolean.FALSE, oFontDesc, new Integer(14), HelpIds.getHelpIdString(_FirstHelpIndex + 7), String.valueOf((char) 8744), cmdMoveButtonPosX, MoveButtonPosY[1], IStep, new Short(curtabindex++), CmdButtonWidth }); CurUnoDialog.getPeerConfiguration().setAccessibleName(btnmoveselected, AccessTextMoveSelected); diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java index 25c0f8dc2..a3ad3b0f4 100644 --- a/wizards/com/sun/star/wizards/ui/FilterComponent.java +++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java @@ -50,6 +50,7 @@ import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XInterface; import com.sun.star.wizards.common.NumberFormatter; import com.sun.star.wizards.common.Helper; +import com.sun.star.wizards.common.HelpIds; import com.sun.star.wizards.common.JavaTools; import com.sun.star.wizards.common.Properties; import com.sun.star.wizards.db.FieldColumn; @@ -488,7 +489,7 @@ public class FilterComponent new Object[] { Integer.valueOf(9), - "HID:" + curHelpID++, + HelpIds.getHelpIdString(curHelpID++), soptMatchAll, Integer.valueOf(iPosX), Integer.valueOf(iPosY), @@ -512,7 +513,7 @@ public class FilterComponent new Object[] { Integer.valueOf(9), - "HID:" + curHelpID++, + HelpIds.getHelpIdString(curHelpID++), soptMatchAny, Integer.valueOf(iPosX), Integer.valueOf(iPosY + 12), @@ -713,7 +714,7 @@ public class FilterComponent Boolean.valueOf(isEnabled()), Boolean.TRUE, Integer.valueOf(13), - "HID:" + _firstRowHelpID++, + HelpIds.getHelpIdString(_firstRowHelpID++), Short.valueOf(UnoDialog.getListBoxLineCount() /* 7 */), Integer.valueOf(nPosX1), Integer.valueOf(iCompPosY + 23), @@ -743,7 +744,7 @@ public class FilterComponent Boolean.valueOf(isEnabled()), Boolean.TRUE, Integer.valueOf(13), - "HID:" + _firstRowHelpID++, + HelpIds.getHelpIdString(_firstRowHelpID++), Short.valueOf((short) sLogicOperators.length /* 7 */), Integer.valueOf(nPosX2), Integer.valueOf(iCompPosY + 23), @@ -768,7 +769,7 @@ public class FilterComponent { Boolean.valueOf(isEnabled()), Integer.valueOf(13), - "HID:" + _firstRowHelpID++, + HelpIds.getHelpIdString(_firstRowHelpID++), Integer.valueOf(nPosX3), Integer.valueOf(iCompPosY + 23), IStep, @@ -776,29 +777,6 @@ public class FilterComponent Integer.valueOf(nValueWidth) }); -// ControlElements[6] = CurUnoDialog.insertListBox((new StringBuilder()).append("lstBoolean").append(sCompSuffix).toString(), SO_BOOLEANLIST[Index], null, new ItemListenerImpl(), new String[] { -// "Enabled", -// "Dropdown", -// "Height", -// "HelpURL", -// "LineCount", -// "PositionX", "PositionY", -// "Step", -// "StringItemList", -// "TabIndex", -// "Width" -// }, new Object[] { -// new Boolean(bEnabled), -// Boolean.TRUE, -// new Integer(13), -// "HID:" + _firstRowHelpID++, -// new Short((short) 2), -// new Integer(nPosX3 + 44), new Integer(iCompPosY + 23), -// IStep, -// FilterComponent.sBooleanValues, -// new Short(curtabindex++), -// new Integer(nValueWidth) -// }); } catch (Exception exception) { diff --git a/wizards/com/sun/star/wizards/ui/ImageList.java b/wizards/com/sun/star/wizards/ui/ImageList.java index 0fb4a4e93..2e1db6a7c 100644 --- a/wizards/com/sun/star/wizards/ui/ImageList.java +++ b/wizards/com/sun/star/wizards/ui/ImageList.java @@ -43,6 +43,7 @@ import com.sun.star.awt.XWindow; import com.sun.star.lang.EventObject; import com.sun.star.uno.UnoRuntime; import com.sun.star.wizards.common.Helper; +import com.sun.star.wizards.common.HelpIds; import com.sun.star.wizards.common.IRenderer; import com.sun.star.wizards.ui.event.*; @@ -255,7 +256,7 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener btnBack = dialog.insertButton(name + "_btnBack", "prevPage", this, pNames1, new Object[] { btnSize, - "HID:" + helpURL++, + HelpIds.getHelpIdString(helpURL++), new Integer(pos.Width), new Integer(pos.Height + (imageSize.Height + gap.Height) * rows + gap.Height + imageTextHeight + 1), step, @@ -267,7 +268,7 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener btnNext = dialog.insertButton(name + "_btnNext", "nextPage", this, pNames1, new Object[] { btnSize, - "HID:" + helpURL++, + HelpIds.getHelpIdString(helpURL++), new Integer(pos.Width + (imageSize.Width + gap.Width) * cols + gap.Width - btnSize.intValue() + 1), new Integer(pos.Height + (imageSize.Height + gap.Height) * rows + gap.Height + imageTextHeight + 1), step, @@ -354,7 +355,7 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener NO_BORDER, BACKGROUND_COLOR, m_imageHeight, - "HID:" + helpURL++, + HelpIds.getHelpIdString(helpURL++), new Integer(getImagePosX(_col)), new Integer(getImagePosY(_row)), scaleImages, diff --git a/wizards/com/sun/star/wizards/ui/SortingComponent.java b/wizards/com/sun/star/wizards/ui/SortingComponent.java index 3e4b45c2c..4334974e9 100644 --- a/wizards/com/sun/star/wizards/ui/SortingComponent.java +++ b/wizards/com/sun/star/wizards/ui/SortingComponent.java @@ -105,7 +105,7 @@ public class SortingComponent new Boolean(bDoEnable), new Integer(8), sSortHeader[i], new Integer(0), ICompPosX, new Integer(iCurPosY), IStep, new Short(curtabindex++), ICompWidth }); - HIDString = "HID:" + Integer.toString(FirstHelpIndex); + HIDString = HelpIds.getHelpIdString(FirstHelpIndex); xSortListBox[i] = CurUnoDialog.insertListBox("lstSort" + new Integer(i + 1).toString(), SOSORTLST[i], null, new ItemListenerImpl(), new String[] { "Dropdown", "Enabled", "Height", "HelpURL", "LineCount", "Name", "PositionX", "PositionY", "Step", "TabIndex", "Width" @@ -114,7 +114,7 @@ public class SortingComponent new Boolean(true), new Boolean(bDoEnable), new Integer(12), HIDString, new Short(UnoDialog.getListBoxLineCount()), "lstSort" + new Integer(i + 1), IListBoxPosX, new Integer(iCurPosY + 14), IStep, new Short(curtabindex++), IListBoxWidth }); //new Short((short) (17+i*4)) - HIDString = "HID:" + Integer.toString(FirstHelpIndex + 1); + HIDString = HelpIds.getHelpIdString(FirstHelpIndex + 1); XRadioButton xRadioButtonAsc = CurUnoDialog.insertRadioButton("optAscend" + Integer.toString(i + 1), 0, new String[] { "Enabled", "Height", "HelpURL", "Label", "PositionX", "PositionY", "State", "Step", "TabIndex", "Tag", "Width" @@ -123,7 +123,7 @@ public class SortingComponent new Boolean(bDoEnable), new Integer(10), HIDString, sSortAscend[i], IOptButtonPosX, new Integer(iCurPosY + 10), new Short((short) 1), IStep, new Short(curtabindex++), new String("ASC"), IOptButtonWidth }); //, new Short((short) (18+i*4)) - HIDString = "HID:" + Integer.toString(FirstHelpIndex + 2); + HIDString = HelpIds.getHelpIdString(FirstHelpIndex + 2); XRadioButton xRadioButtonDesc = CurUnoDialog.insertRadioButton("optDescend" + Integer.toString(i + 1), 0, new String[] { "Enabled", "Height", "HelpURL", "Label", "PositionX", "PositionY", "State", "Step", "TabIndex", "Tag", "Width" diff --git a/wizards/com/sun/star/wizards/ui/TitlesComponent.java b/wizards/com/sun/star/wizards/ui/TitlesComponent.java index f42dac35a..bc6d1d4ac 100644 --- a/wizards/com/sun/star/wizards/ui/TitlesComponent.java +++ b/wizards/com/sun/star/wizards/ui/TitlesComponent.java @@ -121,7 +121,7 @@ public class TitlesComponent extends ControlScroller }, new Object[] { - new Integer(12), "HID:" + curHelpIndex++, new Integer(iLabelPosX + 30), new Integer(_iCompPosY), UIConsts.INVISIBLESTEP, new Short(curtabindex++), new Integer(iCompWidth - 90 - 20) + new Integer(12), HelpIds.getHelpIdString(curHelpIndex++), new Integer(iLabelPosX + 30), new Integer(_iCompPosY), UIConsts.INVISIBLESTEP, new Short(curtabindex++), new Integer(iCompWidth - 90 - 20) }); } } diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.java b/wizards/com/sun/star/wizards/ui/WizardDialog.java index 5a8434148..b7f7d98ba 100644 --- a/wizards/com/sun/star/wizards/ui/WizardDialog.java +++ b/wizards/com/sun/star/wizards/ui/WizardDialog.java @@ -32,7 +32,6 @@ import com.sun.star.wizards.ui.event.CommonListener; import com.sun.star.wizards.ui.event.EventNames; import com.sun.star.wizards.ui.event.MethodInvocation; import com.sun.star.uno.UnoRuntime; -// import com.sun.star.awt.XItemEventBroadcaster; import com.sun.star.awt.*; import com.sun.star.uno.AnyConverter; import com.sun.star.uno.XInterface; @@ -47,6 +46,7 @@ import com.sun.star.frame.XTerminateListener; import com.sun.star.frame.TerminationVetoException; import com.sun.star.lang.IllegalArgumentException; import com.sun.star.beans.*; +import com.sun.star.wizards.common.HelpIds; public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeListener, XTerminateListener, XCompletion { @@ -488,7 +488,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL "Enabled", "Height", "HelpURL", "Label", "PositionX", "PositionY", "PushButtonType", "Step", "TabIndex", "Width" }; - Helper.setUnoPropertyValue(super.xDialogModel, "HelpURL", "HID:" + hid); + Helper.setUnoPropertyValue(super.xDialogModel, "HelpURL", HelpIds.getHelpIdString(hid)); insertButton("btnWizardHelp", HELP_ACTION_PERFORMED, new String[] { "Enabled", "Height", "Label", "PositionX", "PositionY", "PushButtonType", "Step", "TabIndex", "Width" @@ -500,25 +500,25 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL insertButton("btnWizardBack", BACK_ACTION_PERFORMED, propNames, new Object[] { - new Boolean(false), IButtonHeight, "HID:" + (hid + 2), oWizardResource.getResText(UIConsts.RID_COMMON + 13), new Integer(iBackPosX), new Integer(iBtnPosY), new Short((short) PushButtonType.STANDARD_value), ICurStep, new Short(curtabindex++), IButtonWidth + new Boolean(false), IButtonHeight, HelpIds.getHelpIdString(hid + 2), oWizardResource.getResText(UIConsts.RID_COMMON + 13), new Integer(iBackPosX), new Integer(iBtnPosY), new Short((short) PushButtonType.STANDARD_value), ICurStep, new Short(curtabindex++), IButtonWidth }); insertButton("btnWizardNext", NEXT_ACTION_PERFORMED, propNames, new Object[] { - new Boolean(true), IButtonHeight, "HID:" + (hid + 3), oWizardResource.getResText(UIConsts.RID_COMMON + 14), new Integer(iNextPosX), new Integer(iBtnPosY), new Short((short) PushButtonType.STANDARD_value), ICurStep, new Short(curtabindex++), IButtonWidth + new Boolean(true), IButtonHeight, HelpIds.getHelpIdString(hid + 3), oWizardResource.getResText(UIConsts.RID_COMMON + 14), new Integer(iNextPosX), new Integer(iBtnPosY), new Short((short) PushButtonType.STANDARD_value), ICurStep, new Short(curtabindex++), IButtonWidth }); insertButton("btnWizardFinish", FINISH_ACTION_PERFORMED, propNames, new Object[] { - new Boolean(true), IButtonHeight, "HID:" + (hid + 4), oWizardResource.getResText(UIConsts.RID_COMMON + 12), new Integer(iFinishPosX), new Integer(iBtnPosY), new Short((short) PushButtonType.STANDARD_value), ICurStep, new Short(curtabindex++), IButtonWidth + new Boolean(true), IButtonHeight, HelpIds.getHelpIdString(hid + 4), oWizardResource.getResText(UIConsts.RID_COMMON + 12), new Integer(iFinishPosX), new Integer(iBtnPosY), new Short((short) PushButtonType.STANDARD_value), ICurStep, new Short(curtabindex++), IButtonWidth }); insertButton("btnWizardCancel", CANCEL_ACTION_PERFORMED, propNames, new Object[] { - new Boolean(true), IButtonHeight, "HID:" + (hid + 5), oWizardResource.getResText(UIConsts.RID_COMMON + 11), new Integer(iCancelPosX), new Integer(iBtnPosY), new Short((short) PushButtonType.STANDARD_value), ICurStep, new Short(curtabindex++), IButtonWidth + new Boolean(true), IButtonHeight, HelpIds.getHelpIdString(hid + 5), oWizardResource.getResText(UIConsts.RID_COMMON + 11), new Integer(iCancelPosX), new Integer(iBtnPosY), new Short((short) PushButtonType.STANDARD_value), ICurStep, new Short(curtabindex++), IButtonWidth }); setControlProperty("btnWizardNext", "DefaultButton", Boolean.TRUE); diff --git a/wizards/com/sun/star/wizards/web/FTPDialog.java b/wizards/com/sun/star/wizards/web/FTPDialog.java index fc11e1779..4d7d6571e 100644 --- a/wizards/com/sun/star/wizards/web/FTPDialog.java +++ b/wizards/com/sun/star/wizards/web/FTPDialog.java @@ -53,6 +53,7 @@ import com.sun.star.wizards.ui.event.DataAware; import com.sun.star.wizards.ui.event.UnoDataAware; import com.sun.star.wizards.web.data.CGPublish; import com.sun.star.wizards.web.data.CGSettings; +import com.sun.star.wizards.common.HelpIds; /** * This is the FTP Dialog.
@@ -200,7 +201,7 @@ public class FTPDialog extends UnoDialog2 implements UIConsts, WWHID }, new Object[] { - Boolean.TRUE, new Integer(160), "HID:" + HID_FTP, Boolean.TRUE, "FTPDialog", new Integer(167), new Integer(82), resources.resFTPDialog_title, new Integer(222) + Boolean.TRUE, new Integer(160), HelpIds.getHelpIdString(HID_FTP), Boolean.TRUE, "FTPDialog", new Integer(167), new Integer(82), resources.resFTPDialog_title, new Integer(222) }); //add controls to dialog @@ -248,7 +249,7 @@ public class FTPDialog extends UnoDialog2 implements UIConsts, WWHID }, new Object[] { - INTEGER_12, "HID:" + HID_FTP_SERVER, "txtIP", new Integer(110), new Integer(18), new Short((short) 2), new Integer(106) + INTEGER_12, HelpIds.getHelpIdString(HID_FTP_SERVER), "txtIP", new Integer(110), new Integer(18), new Short((short) 2), new Integer(106) }); lblUsername = insertLabel("lblUsername", PROPNAMES_LABEL, @@ -263,7 +264,7 @@ public class FTPDialog extends UnoDialog2 implements UIConsts, WWHID }, new Object[] { - INTEGER_12, "HID:" + HID_FTP_USERNAME, "txtUsername", new Integer(110), new Integer(34), new Short((short) 4), new Integer(106) + INTEGER_12, HelpIds.getHelpIdString(HID_FTP_USERNAME), "txtUsername", new Integer(110), new Integer(34), new Short((short) 4), new Integer(106) }); lblPassword = insertLabel("lblPassword", PROPNAMES_LABEL, @@ -278,7 +279,7 @@ public class FTPDialog extends UnoDialog2 implements UIConsts, WWHID }, new Object[] { - new Short((short) 42), INTEGER_12, "HID:" + HID_FTP_PASS, "txtPassword", new Integer(110), new Integer(50), new Short((short) 6), new Integer(106) + new Short((short) 42), INTEGER_12, HelpIds.getHelpIdString(HID_FTP_PASS), "txtPassword", new Integer(110), new Integer(50), new Short((short) 6), new Integer(106) }); ln2 = insertFixedLine("ln2", PROPNAMES_LABEL, @@ -290,7 +291,7 @@ public class FTPDialog extends UnoDialog2 implements UIConsts, WWHID PROPNAMES_BUTTON, new Object[] { - INTEGER_14, "HID:" + HID_FTP_TEST, resources.resbtnConnect_value, "btnConnect", INTEGER_12, new Integer(80), new Short((short) 8), INTEGER_50 + INTEGER_14, HelpIds.getHelpIdString(HID_FTP_TEST), resources.resbtnConnect_value, "btnConnect", INTEGER_12, new Integer(80), new Short((short) 8), INTEGER_50 }); imgStatus = insertImage("imgStatus", @@ -324,27 +325,27 @@ public class FTPDialog extends UnoDialog2 implements UIConsts, WWHID }, new Object[] { - new Boolean(false), INTEGER_12, "HID:" + HID_FTP_TXT_PATH, "txtDir", INTEGER_12, new Integer(113), new Short((short) 11), resources.restxtDir_value, new Integer(184) + new Boolean(false), INTEGER_12, HelpIds.getHelpIdString(HID_FTP_TXT_PATH), "txtDir", INTEGER_12, new Integer(113), new Short((short) 11), resources.restxtDir_value, new Integer(184) }); btnDir = insertButton("btnDir", "chooseDirectory", PROPNAMES_BUTTON, new Object[] { - INTEGER_14, "HID:" + HID_FTP_BTN_PATH, resources.resbtnDir_value, "btnDir", new Integer(199), new Integer(112), new Short((short) 12), INTEGER_16 + INTEGER_14, HelpIds.getHelpIdString(HID_FTP_BTN_PATH), resources.resbtnDir_value, "btnDir", new Integer(199), new Integer(112), new Short((short) 12), INTEGER_16 }); btnOK = insertButton("btnOK", null, PROPNAMES_BUTTON2, new Object[] { - INTEGER_14, "HID:" + HID_FTP_OK, resources.resbtnOK_value, "btnOK", new Integer(165), new Integer(142), new Short((short) PushButtonType.OK_value), new Short((short) 13), INTEGER_50 + INTEGER_14, HelpIds.getHelpIdString(HID_FTP_OK), resources.resbtnOK_value, "btnOK", new Integer(165), new Integer(142), new Short((short) PushButtonType.OK_value), new Short((short) 13), INTEGER_50 }); btnCancel = insertButton("btnCancel", null, PROPNAMES_BUTTON2, new Object[] { - INTEGER_14, "HID:" + HID_FTP_CANCEL, resources.resbtnCancel_value, "btnCancel", new Integer(113), new Integer(142), new Short((short) PushButtonType.CANCEL_value), new Short((short) 14), INTEGER_50 + INTEGER_14, HelpIds.getHelpIdString(HID_FTP_CANCEL), resources.resbtnCancel_value, "btnCancel", new Integer(113), new Integer(142), new Short((short) PushButtonType.CANCEL_value), new Short((short) 14), INTEGER_50 }); btnHelp = insertButton("btnHelp", null, diff --git a/wizards/com/sun/star/wizards/web/ImageListDialog.java b/wizards/com/sun/star/wizards/web/ImageListDialog.java index a31f8ed73..89fb46e4b 100644 --- a/wizards/com/sun/star/wizards/web/ImageListDialog.java +++ b/wizards/com/sun/star/wizards/web/ImageListDialog.java @@ -32,6 +32,7 @@ import com.sun.star.awt.XButton; import com.sun.star.awt.XFixedText; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.wizards.common.Helper; +import com.sun.star.wizards.common.HelpIds; import com.sun.star.wizards.common.JavaTools; import com.sun.star.wizards.common.IRenderer; import com.sun.star.wizards.ui.ImageList; @@ -135,7 +136,7 @@ public abstract class ImageListDialog extends UnoDialog2 implements UIConsts }, new Object[] { - Boolean.TRUE, new Integer(dialogHeight), "HID:" + hid, Boolean.TRUE, "imgDialog", new Integer(59), new Integer(24), INTEGERS[1], resources[RES_TITLE], new Integer(dialogWidth) + Boolean.TRUE, new Integer(dialogHeight), HelpIds.getHelpIdString(hid), Boolean.TRUE, "imgDialog", new Integer(59), new Integer(24), INTEGERS[1], resources[RES_TITLE], new Integer(dialogWidth) }); //Set member- FontDescriptors... fontDescriptor1.Weight = 150; @@ -151,13 +152,13 @@ public abstract class ImageListDialog extends UnoDialog2 implements UIConsts PROPNAMES, new Object[] { - Boolean.TRUE, INTEGER_14, "HID:" + (hid + 3), resources[RES_OK], "btnOK", iButtonsX, new Integer(22), new Short((short) com.sun.star.awt.PushButtonType.OK_value), new Short((short) 7), INTEGER_50 + Boolean.TRUE, INTEGER_14, HelpIds.getHelpIdString(hid + 3), resources[RES_OK], "btnOK", iButtonsX, new Integer(22), new Short((short) com.sun.star.awt.PushButtonType.OK_value), new Short((short) 7), INTEGER_50 }); btnCancel = insertButton("btnCancel", null, PROPNAMES, new Object[] { - Boolean.FALSE, INTEGER_14, "HID:" + (hid + 4), resources[RES_CANCEL], "btnCancel", iButtonsX, new Integer(41), new Short((short) com.sun.star.awt.PushButtonType.CANCEL_value), new Short((short) 8), INTEGER_50 + Boolean.FALSE, INTEGER_14, HelpIds.getHelpIdString(hid + 4), resources[RES_CANCEL], "btnCancel", iButtonsX, new Integer(41), new Short((short) com.sun.star.awt.PushButtonType.CANCEL_value), new Short((short) 8), INTEGER_50 }); btnHelp = insertButton("btnHelp", null, PROPNAMES, @@ -175,7 +176,7 @@ public abstract class ImageListDialog extends UnoDialog2 implements UIConsts PROPNAMES, new Object[] { - Boolean.FALSE, INTEGER_14, "HID:" + (hid + 1), resources[RES_OTHER], "btnOther", iButtonsX, new Integer(otherY), new Short((short) com.sun.star.awt.PushButtonType.STANDARD_value), new Short((short) 5), INTEGER_50 + Boolean.FALSE, INTEGER_14, HelpIds.getHelpIdString(hid + 1), resources[RES_OTHER], "btnOther", iButtonsX, new Integer(otherY), new Short((short) com.sun.star.awt.PushButtonType.STANDARD_value), new Short((short) 5), INTEGER_50 }); } @@ -188,7 +189,7 @@ public abstract class ImageListDialog extends UnoDialog2 implements UIConsts PROPNAMES, new Object[] { - Boolean.FALSE, INTEGER_14, "HID:" + (hid + 2), resources[RES_DESELECT], "btnNoImage", iButtonsX, new Integer(deselectY), new Short((short) com.sun.star.awt.PushButtonType.STANDARD_value), new Short((short) 4), INTEGER_50 + Boolean.FALSE, INTEGER_14, HelpIds.getHelpIdString(hid + 2), resources[RES_DESELECT], "btnNoImage", iButtonsX, new Integer(deselectY), new Short((short) com.sun.star.awt.PushButtonType.STANDARD_value), new Short((short) 4), INTEGER_50 }); } diff --git a/wizards/com/sun/star/wizards/web/WWD_General.java b/wizards/com/sun/star/wizards/web/WWD_General.java index 4617a10ba..c9b060772 100644 --- a/wizards/com/sun/star/wizards/web/WWD_General.java +++ b/wizards/com/sun/star/wizards/web/WWD_General.java @@ -31,6 +31,7 @@ import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.util.XStringSubstitution; import com.sun.star.wizards.common.FileAccess; import com.sun.star.wizards.common.Helper; +import com.sun.star.wizards.common.HelpIds; import com.sun.star.wizards.common.JavaTools; import com.sun.star.wizards.common.SystemDialog; import com.sun.star.wizards.ui.event.ListModelBinder; @@ -63,7 +64,7 @@ public abstract class WWD_General extends WebWizardDialog StatusDialog statusDialog = new StatusDialog(xMSF, StatusDialog.STANDARD_WIDTH, resources.resLoadingSession, false, new String[] { resources.prodName, "", "", "", "", "" - }, "HID:" + HID0_STATUS_DIALOG); + }, HelpIds.getHelpIdString(HID0_STATUS_DIALOG)); try { statusDialog.createWindowPeer(xControl.getPeer()); diff --git a/wizards/com/sun/star/wizards/web/WebWizardDialog.java b/wizards/com/sun/star/wizards/web/WebWizardDialog.java index a65132714..e32778cfa 100644 --- a/wizards/com/sun/star/wizards/web/WebWizardDialog.java +++ b/wizards/com/sun/star/wizards/web/WebWizardDialog.java @@ -39,6 +39,7 @@ import com.sun.star.awt.XRadioButton; import com.sun.star.awt.XTextComponent; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.wizards.common.Helper; +import com.sun.star.wizards.common.HelpIds; import com.sun.star.wizards.ui.ImageList; import com.sun.star.wizards.ui.UIConsts; import com.sun.star.wizards.ui.WizardDialog; @@ -221,7 +222,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC }, new Object[] { - Boolean.TRUE, new Integer(210), "HID:" + HID0_WEBWIZARD, Boolean.TRUE, "WebWizardDialog", new Integer(102), new Integer(52), INTEGERS[1], new Short((short) 6), resources.resWebWizardDialog_title, new Integer(330) + Boolean.TRUE, new Integer(210), HelpIds.getHelpIdString(HID0_WEBWIZARD), Boolean.TRUE, "WebWizardDialog", new Integer(102), new Integer(52), INTEGERS[1], new Short((short) 6), resources.resWebWizardDialog_title, new Integer(330) }); //Set member- FontDescriptors... @@ -286,7 +287,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC }, new Object[] { - Boolean.TRUE, INTEGER_12, "HID:" + HID1_LST_SESSIONS, new Short((short) 14), "lstLoadSettings", new Integer(97), new Integer(165), INTEGERS[1], new Short(tabIndex++), new Integer(173) + Boolean.TRUE, INTEGER_12, HelpIds.getHelpIdString(HID1_LST_SESSIONS), new Short((short) 14), "lstLoadSettings", new Integer(97), new Integer(165), INTEGERS[1], new Short(tabIndex++), new Integer(173) }); btnDelSession = insertButton("btnDelSession", BTNDELSESSION_ACTION_PERFORMED, new String[] @@ -295,7 +296,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC }, new Object[] { - Boolean.FALSE, INTEGER_14, "HID:" + HID1_BTN_DEL_SES, new Short(com.sun.star.awt.ImageAlign.LEFT), resources.resbtnDelSession_value, "btnDelSession", new Integer(274), new Integer(164), INTEGERS[1], new Short(tabIndex++), INTEGER_50 + Boolean.FALSE, INTEGER_14, HelpIds.getHelpIdString(HID1_BTN_DEL_SES), new Short(com.sun.star.awt.ImageAlign.LEFT), resources.resbtnDelSession_value, "btnDelSession", new Integer(274), new Integer(164), INTEGERS[1], new Short(tabIndex++), INTEGER_50 }); } @@ -322,19 +323,19 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC }, new Object[] { - new Integer(123), "HID:" + HID2_LST_DOCS, new Short((short) 9), "lstDocuments", new Integer(97), new Integer(38), INTEGERS[2], new Short(tabIndex++), new Integer(103) + new Integer(123), HelpIds.getHelpIdString(HID2_LST_DOCS), new Short((short) 9), "lstDocuments", new Integer(97), new Integer(38), INTEGERS[2], new Short(tabIndex++), new Integer(103) }); btnAddDoc = insertButton("btnAddDoc", BTNADDDOC_ACTION_PERFORMED, PROPNAMES_BUTTON, new Object[] { - INTEGER_14, "HID:" + HID2_BTN_ADD_DOC, resources.resbtnAddDoc_value, "btnAddDoc", new Integer(97), new Integer(165), INTEGERS[2], new Short(tabIndex++), INTEGER_50 + INTEGER_14, HelpIds.getHelpIdString(HID2_BTN_ADD_DOC), resources.resbtnAddDoc_value, "btnAddDoc", new Integer(97), new Integer(165), INTEGERS[2], new Short(tabIndex++), INTEGER_50 }); btnRemoveDoc = insertButton("btnRemoveDoc", BTNREMOVEDOC_ACTION_PERFORMED, PROPNAMES_BUTTON, new Object[] { - INTEGER_14, "HID:" + HID2_BTN_REM_DOC, resources.resbtnRemoveDoc_value, "btnRemoveDoc", new Integer(150), new Integer(165), INTEGERS[2], new Short(tabIndex++), INTEGER_50 + INTEGER_14, HelpIds.getHelpIdString(HID2_BTN_REM_DOC), resources.resbtnRemoveDoc_value, "btnRemoveDoc", new Integer(150), new Integer(165), INTEGERS[2], new Short(tabIndex++), INTEGER_50 }); btnDocUp = insertButton("btnDocUp", BTNDOCUP_ACTION_PERFORMED, new String[] @@ -343,7 +344,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC }, new Object[] { - fontDescriptor7, INTEGER_14, "HID:" + HID2_BTN_DOC_UP, resources.resbtnDocUp_value, "btnDocUp", new Integer(205), new Integer(87), INTEGERS[2], new Short(tabIndex++), new Integer(18) + fontDescriptor7, INTEGER_14, HelpIds.getHelpIdString(HID2_BTN_DOC_UP), resources.resbtnDocUp_value, "btnDocUp", new Integer(205), new Integer(87), INTEGERS[2], new Short(tabIndex++), new Integer(18) }); btnDocDown = insertButton("btnDocDown", BTNDOCDOWN_ACTION_PERFORMED, new String[] @@ -352,7 +353,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC }, new Object[] { - fontDescriptor7, INTEGER_14, "HID:" + HID2_BTN_DOC_DOWN, resources.resbtnDocDown_value, "btnDocDown", new Integer(205), new Integer(105), INTEGERS[2], new Short(tabIndex++), new Integer(18) + fontDescriptor7, INTEGER_14, HelpIds.getHelpIdString(HID2_BTN_DOC_DOWN), resources.resbtnDocDown_value, "btnDocDown", new Integer(205), new Integer(105), INTEGERS[2], new Short(tabIndex++), new Integer(18) }); lblDocExportFormat = insertLabel("lblDocExportFormat", @@ -368,7 +369,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC }, new Object[] { - Boolean.TRUE, INTEGER_12, "HID:" + HID2_LST_DOC_EXPORT, new Short((short) 14), "lstDocTargetType", new Integer(235), new Integer(38), INTEGERS[2], new Short(tabIndex++), new Integer(89) + Boolean.TRUE, INTEGER_12, HelpIds.getHelpIdString(HID2_LST_DOC_EXPORT), new Short((short) 14), "lstDocTargetType", new Integer(235), new Integer(38), INTEGERS[2], new Short(tabIndex++), new Integer(89) }); @@ -390,7 +391,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC PROPNAMES_TXT, new Object[] { - INTEGER_12, "HID:" + HID2_TXT_DOC_TITLE, "txtDocTitle", new Integer(235), new Integer(88), INTEGERS[2], new Short(tabIndex++), new Integer(89) + INTEGER_12, HelpIds.getHelpIdString(HID2_TXT_DOC_TITLE), "txtDocTitle", new Integer(235), new Integer(88), INTEGERS[2], new Short(tabIndex++), new Integer(89) }); lblDocInfo = insertLabel("lblDocInfo", PROPNAMES_LBL, @@ -405,7 +406,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC }, new Object[] { - INTEGER_40, "HID:" + HID2_TXT_DOC_DESC, Boolean.TRUE, "txtDocInfo", new Integer(235), new Integer(113), INTEGERS[2], new Short(tabIndex++), new Integer(89) + INTEGER_40, HelpIds.getHelpIdString(HID2_TXT_DOC_DESC), Boolean.TRUE, "txtDocInfo", new Integer(235), new Integer(113), INTEGERS[2], new Short(tabIndex++), new Integer(89) }); lblDocAuthor = insertLabel("lblDocAuthor", PROPNAMES_LBL, @@ -417,7 +418,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC PROPNAMES_TXT, new Object[] { - INTEGER_12, "HID:" + HID2_TXT_DOC_AUTHOR, "txtDocAuthor", new Integer(235), new Integer(165), INTEGERS[2], new Short(tabIndex++), new Integer(89) + INTEGER_12, HelpIds.getHelpIdString(HID2_TXT_DOC_AUTHOR), "txtDocAuthor", new Integer(235), new Integer(165), INTEGERS[2], new Short(tabIndex++), new Integer(89) }); } @@ -459,56 +460,56 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC PROPNAMES_CHKBOX, new Object[] { - INTEGERS[8], "HID:" + HID4_CHK_DISPLAY_FILENAME, resources.reschkDocFilename_value, "chkDocFilename", new Integer(103), new Integer(50), new Short((short) 0), INTEGERS[4], new Short((short) 35), new Integer(99) + INTEGERS[8], HelpIds.getHelpIdString(HID4_CHK_DISPLAY_FILENAME), resources.reschkDocFilename_value, "chkDocFilename", new Integer(103), new Integer(50), new Short((short) 0), INTEGERS[4], new Short((short) 35), new Integer(99) }); chbDocDesc = insertCheckBox("chbDocDesc", null, PROPNAMES_CHKBOX, new Object[] { - INTEGERS[8], "HID:" + HID4_CHK_DISPLAY_DESCRIPTION, resources.reschbDocDesc_value, "chbDocDesc", new Integer(103), new Integer(60), new Short((short) 0), INTEGERS[4], new Short((short) 36), new Integer(99) + INTEGERS[8], HelpIds.getHelpIdString(HID4_CHK_DISPLAY_DESCRIPTION), resources.reschbDocDesc_value, "chbDocDesc", new Integer(103), new Integer(60), new Short((short) 0), INTEGERS[4], new Short((short) 36), new Integer(99) }); chbDocAuthor = insertCheckBox("chbDocAuthor", null, PROPNAMES_CHKBOX, new Object[] { - INTEGERS[8], "HID:" + HID4_CHK_DISPLAY_AUTHOR, resources.reschbDocAuthor_value, "chbDocAuthor", new Integer(103), new Integer(70), new Short((short) 0), INTEGERS[4], new Short((short) 37), new Integer(99) + INTEGERS[8], HelpIds.getHelpIdString(HID4_CHK_DISPLAY_AUTHOR), resources.reschbDocAuthor_value, "chbDocAuthor", new Integer(103), new Integer(70), new Short((short) 0), INTEGERS[4], new Short((short) 37), new Integer(99) }); chkDocCreated = insertCheckBox("chkDocCreated", null, PROPNAMES_CHKBOX, new Object[] { - INTEGERS[8], "HID:" + HID4_CHK_DISPLAY_CR_DATE, resources.reschkDocCreated_value, "chkDocCreated", new Integer(103), new Integer(80), new Short((short) 0), INTEGERS[4], new Short((short) 38), new Integer(99) + INTEGERS[8], HelpIds.getHelpIdString(HID4_CHK_DISPLAY_CR_DATE), resources.reschkDocCreated_value, "chkDocCreated", new Integer(103), new Integer(80), new Short((short) 0), INTEGERS[4], new Short((short) 38), new Integer(99) }); chkDocChanged = insertCheckBox("chkDocChanged", null, PROPNAMES_CHKBOX, new Object[] { - INTEGERS[8], "HID:" + HID4_CHK_DISPLAY_UP_DATE, resources.reschkDocChanged_value, "chkDocChanged", new Integer(103), new Integer(90), new Short((short) 0), INTEGERS[4], new Short((short) 39), new Integer(99) + INTEGERS[8], HelpIds.getHelpIdString(HID4_CHK_DISPLAY_UP_DATE), resources.reschkDocChanged_value, "chkDocChanged", new Integer(103), new Integer(90), new Short((short) 0), INTEGERS[4], new Short((short) 39), new Integer(99) }); chkDocFormat = insertCheckBox("chkDocFormat", null, PROPNAMES_CHKBOX, new Object[] { - INTEGERS[8], "HID:" + HID4_CHK_DISPLAY_FORMAT, resources.reschkDocFormat_value, "chkDocFormat", new Integer(200), new Integer(50), new Short((short) 0), INTEGERS[4], new Short((short) 40), new Integer(110) + INTEGERS[8], HelpIds.getHelpIdString(HID4_CHK_DISPLAY_FORMAT), resources.reschkDocFormat_value, "chkDocFormat", new Integer(200), new Integer(50), new Short((short) 0), INTEGERS[4], new Short((short) 40), new Integer(110) }); chkDocFormatIcon = insertCheckBox("chkDocFormatIcon", null, PROPNAMES_CHKBOX, new Object[] { - INTEGERS[8], "HID:" + HID4_CHK_DISPLAY_F_ICON, resources.reschkDocFormatIcon_value, "chkDocFormatIcon", new Integer(200), new Integer(60), new Short((short) 0), INTEGERS[4], new Short((short) 41), new Integer(110) + INTEGERS[8], HelpIds.getHelpIdString(HID4_CHK_DISPLAY_F_ICON), resources.reschkDocFormatIcon_value, "chkDocFormatIcon", new Integer(200), new Integer(60), new Short((short) 0), INTEGERS[4], new Short((short) 41), new Integer(110) }); chkDocPages = insertCheckBox("chkDocPages", null, PROPNAMES_CHKBOX, new Object[] { - INTEGERS[8], "HID:" + HID4_CHK_DISPLAY_PAGES, resources.reschkDocPages_value, "chkDocPages", new Integer(200), new Integer(70), new Short((short) 0), INTEGERS[4], new Short((short) 42), new Integer(110) + INTEGERS[8], HelpIds.getHelpIdString(HID4_CHK_DISPLAY_PAGES), resources.reschkDocPages_value, "chkDocPages", new Integer(200), new Integer(70), new Short((short) 0), INTEGERS[4], new Short((short) 42), new Integer(110) }); chkDocSize = insertCheckBox("chkDocSize", null, PROPNAMES_CHKBOX, new Object[] { - INTEGERS[8], "HID:" + HID4_CHK_DISPLAY_SIZE, resources.reschkDocSize_value, "chkDocSize", new Integer(200), new Integer(80), new Short((short) 0), INTEGERS[4], new Short((short) 43), new Integer(110) + INTEGERS[8], HelpIds.getHelpIdString(HID4_CHK_DISPLAY_SIZE), resources.reschkDocSize_value, "chkDocSize", new Integer(200), new Integer(80), new Short((short) 0), INTEGERS[4], new Short((short) 43), new Integer(110) }); lblOptimizeFor = insertLabel("lblOptimizeFor", PROPNAMES_LBL, @@ -520,19 +521,19 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC PROPNAMES_BUTTON, new Object[] { - INTEGERS[10], "HID:" + HID4_GRP_OPTIMAIZE_640, resources.resoptOptimize640x480_value, "optOptimize640x480", new Integer(103), new Integer(133), INTEGERS[4], new Short((short) 45), new Integer(44) + INTEGERS[10], HelpIds.getHelpIdString(HID4_GRP_OPTIMAIZE_640), resources.resoptOptimize640x480_value, "optOptimize640x480", new Integer(103), new Integer(133), INTEGERS[4], new Short((short) 45), new Integer(44) }); optOptimize800x600 = insertRadioButton("optOptimize800x600", null, PROPNAMES_BUTTON, new Object[] { - INTEGERS[10], "HID:" + HID4_GRP_OPTIMAIZE_800, resources.resoptOptimize800x600_value, "optOptimize800x600", new Integer(103), new Integer(146), INTEGERS[4], new Short((short) 46), new Integer(44) + INTEGERS[10], HelpIds.getHelpIdString(HID4_GRP_OPTIMAIZE_800), resources.resoptOptimize800x600_value, "optOptimize800x600", new Integer(103), new Integer(146), INTEGERS[4], new Short((short) 46), new Integer(44) }); optOptimize1024x768 = insertRadioButton("optOptimize1024x768", null, PROPNAMES_BUTTON, new Object[] { - INTEGERS[10], "HID:" + HID4_GRP_OPTIMAIZE_1024, resources.resoptOptimize1024x768_value, "optOptimize1024x768", new Integer(103), new Integer(158), INTEGERS[4], new Short((short) 47), new Integer(44) + INTEGERS[10], HelpIds.getHelpIdString(HID4_GRP_OPTIMAIZE_1024), resources.resoptOptimize1024x768_value, "optOptimize1024x768", new Integer(103), new Integer(158), INTEGERS[4], new Short((short) 47), new Integer(44) }); } @@ -557,7 +558,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC }, new Object[] { - Boolean.TRUE, INTEGER_12, "HID:" + HID5_LST_STYLES, new Short((short) 14), "lstStyles", new Integer(179), new Integer(26), INTEGERS[5], new Short((short) 52), new Integer(145) + Boolean.TRUE, INTEGER_12, HelpIds.getHelpIdString(HID5_LST_STYLES), new Short((short) 14), "lstStyles", new Integer(179), new Integer(26), INTEGERS[5], new Short((short) 52), new Integer(145) }); insertLabel("lblBackground", PROPNAMES_LBL, @@ -577,7 +578,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC btnBackgrounds = insertButton("btnBackgrounds", BTNBACKGROUNDS_ACTION_PERFORMED, PROPNAMES_BUTTON, new Object[] { - INTEGER_14, "HID:" + HID5_BTN_BACKGND, resources.resBtnChooseBackground, "btnBackgrounds", new Integer(274), new Integer(43), INTEGERS[5], new Short((short) 53), INTEGER_50 + INTEGER_14, HelpIds.getHelpIdString(HID5_BTN_BACKGND), resources.resBtnChooseBackground, "btnBackgrounds", new Integer(274), new Integer(43), INTEGERS[5], new Short((short) 53), INTEGER_50 }); insertLabel("lblIconset", PROPNAMES_LBL, @@ -598,7 +599,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC PROPNAMES_BUTTON, new Object[] { - INTEGER_14, "HID:" + HID5_BTN_ICONS, resources.resBtnChooseIconset, "btnIconSets", new Integer(274), new Integer(61), INTEGERS[5], new Short((short) 54), INTEGER_50 + INTEGER_14, HelpIds.getHelpIdString(HID5_BTN_ICONS), resources.resBtnChooseIconset, "btnIconSets", new Integer(274), new Integer(61), INTEGERS[5], new Short((short) 54), INTEGER_50 }); insertLabel("lblIconsetInfo", new String[] @@ -642,7 +643,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC PROPNAMES_TXT, new Object[] { - INTEGER_12, "HID:" + HID6_TXT_SITE_TITLE, "txtSiteTitle", new Integer(179), new Integer(26), INTEGERS[6], new Short(tabIndex++), new Integer(145) + INTEGER_12, HelpIds.getHelpIdString(HID6_TXT_SITE_TITLE), "txtSiteTitle", new Integer(179), new Integer(26), INTEGERS[6], new Short(tabIndex++), new Integer(145) }); @@ -664,7 +665,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC PROPNAMES_TXT, new Object[] { - INTEGER_12, "HID:" + HID6_TXT_SITE_DESC, "txtSiteDesc", new Integer(179), new Integer(70), INTEGERS[6], new Short(tabIndex++), new Integer(145) + INTEGER_12, HelpIds.getHelpIdString(HID6_TXT_SITE_DESC), "txtSiteDesc", new Integer(179), new Integer(70), INTEGERS[6], new Short(tabIndex++), new Integer(145) }); lblEmail = insertLabel("lblEmail", PROPNAMES_LBL, @@ -675,7 +676,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC txtEmail = insertTextField("txtEmail", null, PROPNAMES_TXT, new Object[] { - INTEGER_12, "HID:" + HID6_TXT_SITE_EMAIL, "txtEmail", new Integer(179), new Integer(87), INTEGERS[6], new Short(tabIndex++), new Integer(145) + INTEGER_12, HelpIds.getHelpIdString(HID6_TXT_SITE_EMAIL), "txtEmail", new Integer(179), new Integer(87), INTEGERS[6], new Short(tabIndex++), new Integer(145) }); lblCopyright = insertLabel("lblCopyright", PROPNAMES_LBL, @@ -686,7 +687,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC txtCopyright = insertTextField("txtCopyright", null, PROPNAMES_TXT, new Object[] { - INTEGER_12, "HID:" + HID6_TXT_SITE_COPYRIGHT, "txtCopyright", new Integer(179), new Integer(106), INTEGERS[6], new Short(tabIndex++), new Integer(145) + INTEGER_12, HelpIds.getHelpIdString(HID6_TXT_SITE_COPYRIGHT), "txtCopyright", new Integer(179), new Integer(106), INTEGERS[6], new Short(tabIndex++), new Integer(145) }); @@ -703,7 +704,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC }, new Object[] { - Boolean.TRUE, INTEGER_12, "HID:" + HID6_DATE_SITE_CREATED, "dateSiteCreated", new Integer(179), new Integer(124), INTEGERS[6], new Short(tabIndex++), new Integer(49) + Boolean.TRUE, INTEGER_12, HelpIds.getHelpIdString(HID6_DATE_SITE_CREATED), "dateSiteCreated", new Integer(179), new Integer(124), INTEGERS[6], new Short(tabIndex++), new Integer(49) }); lblSiteUpdated = insertLabel("lblSiteUpdated", PROPNAMES_LBL, @@ -719,7 +720,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC }, new Object[] { - Boolean.TRUE, INTEGER_12, "HID:" + HID6_DATE_SITE_UPDATED, "dateSiteUpdate", new Integer(179), new Integer(142), INTEGERS[6], new Short(tabIndex++), new Integer(49) + Boolean.TRUE, INTEGER_12, HelpIds.getHelpIdString(HID6_DATE_SITE_UPDATED), "dateSiteUpdate", new Integer(179), new Integer(142), INTEGERS[6], new Short(tabIndex++), new Integer(49) }); @@ -748,7 +749,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC PROPNAMES_BUTTON, new Object[] { - INTEGER_14, "HID:" + HID7_BTN_PREVIEW, resources.resbtnPreview_value, "btnPreview", new Integer(103), new Integer(40), INTEGERS[7], new Short(tabIndex++), INTEGER_50 + INTEGER_14, HelpIds.getHelpIdString(HID7_BTN_PREVIEW), resources.resbtnPreview_value, "btnPreview", new Integer(103), new Integer(40), INTEGERS[7], new Short(tabIndex++), INTEGER_50 }); lblCreateSite = insertFixedLine("lblCreateSite", @@ -762,45 +763,45 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC PROPNAMES_CHKBOX, new Object[] { - INTEGERS[8], "HID:" + HID7_CHK_PUBLISH_LOCAL, resources.reschkLocalDir_value, "chkLocalDir", new Integer(103), new Integer(68), new Short((short) 0), INTEGERS[7], new Short(tabIndex++), new Integer(215) + INTEGERS[8], HelpIds.getHelpIdString(HID7_CHK_PUBLISH_LOCAL), resources.reschkLocalDir_value, "chkLocalDir", new Integer(103), new Integer(68), new Short((short) 0), INTEGERS[7], new Short(tabIndex++), new Integer(215) }); txtLocalDir = insertTextField("txtLocalDir", null, PROPNAMES_TXT, new Object[] { - INTEGER_12, "HID:" + HID7_TXT_LOCAL, "txtLocalDir", new Integer(113), new Integer(78), INTEGERS[7], new Short(tabIndex++), new Integer(190) + INTEGER_12, HelpIds.getHelpIdString(HID7_TXT_LOCAL), "txtLocalDir", new Integer(113), new Integer(78), INTEGERS[7], new Short(tabIndex++), new Integer(190) }); btnLocalDir = insertButton("btnLocalDir", BTNLOCALDIR_ACTION_PERFORMED, PROPNAMES_BUTTON, new Object[] { - INTEGER_14, "HID:" + HID7_BTN_LOCAL, resources.resbtnLocalDir_value, "btnLocalDir", new Integer(308), new Integer(77), INTEGERS[7], new Short(tabIndex++), INTEGER_16 + INTEGER_14, HelpIds.getHelpIdString(HID7_BTN_LOCAL), resources.resbtnLocalDir_value, "btnLocalDir", new Integer(308), new Integer(77), INTEGERS[7], new Short(tabIndex++), INTEGER_16 }); chkZip = insertCheckBox("chkZip", null, PROPNAMES_CHKBOX, new Object[] { - INTEGERS[9], "HID:" + HID7_CHK_PUBLISH_ZIP, resources.reschkZip_value, "chkZip", new Integer(103), new Integer(96), new Short((short) 0), INTEGERS[7], new Short(tabIndex++), new Integer(215) + INTEGERS[9], HelpIds.getHelpIdString(HID7_CHK_PUBLISH_ZIP), resources.reschkZip_value, "chkZip", new Integer(103), new Integer(96), new Short((short) 0), INTEGERS[7], new Short(tabIndex++), new Integer(215) }); txtZip = insertTextField("txtZip", null, PROPNAMES_TXT, new Object[] { - INTEGER_12, "HID:" + HID7_TXT_ZIP, "txtZip", new Integer(113), new Integer(108), INTEGERS[7], new Short(tabIndex++), new Integer(190) + INTEGER_12, HelpIds.getHelpIdString(HID7_TXT_ZIP), "txtZip", new Integer(113), new Integer(108), INTEGERS[7], new Short(tabIndex++), new Integer(190) }); btnZip = insertButton("btnZip", BTNZIP_ACTION_PERFORMED, PROPNAMES_BUTTON, new Object[] { - INTEGER_14, "HID:" + HID7_BTN_ZIP, resources.resbtnZip_value, "btnZip", new Integer(308), new Integer(107), INTEGERS[7], new Short(tabIndex++), INTEGER_16 + INTEGER_14, HelpIds.getHelpIdString(HID7_BTN_ZIP), resources.resbtnZip_value, "btnZip", new Integer(308), new Integer(107), INTEGERS[7], new Short(tabIndex++), INTEGER_16 }); chkFTP = insertCheckBox("chkFTP", null, PROPNAMES_CHKBOX, new Object[] { - INTEGERS[8], "HID:" + HID7_CHK_PUBLISH_FTP, resources.reschkFTP_value, "chkFTP", new Integer(103), new Integer(124), new Short((short) 0), INTEGERS[7], new Short(tabIndex++), new Integer(215) + INTEGERS[8], HelpIds.getHelpIdString(HID7_CHK_PUBLISH_FTP), resources.reschkFTP_value, "chkFTP", new Integer(103), new Integer(124), new Short((short) 0), INTEGERS[7], new Short(tabIndex++), new Integer(215) }); Integer FTP_STEP = disableFTP ? new Integer(99) : INTEGERS[7]; @@ -819,7 +820,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC PROPNAMES_BUTTON, new Object[] { - INTEGER_14, "HID:" + HID7_BTN_FTP, resources.resbtnFTP_value, "btnFTP", new Integer(274), new Integer(133), FTP_STEP, new Short(tabIndex++), INTEGER_50 + INTEGER_14, HelpIds.getHelpIdString(HID7_BTN_FTP), resources.resbtnFTP_value, "btnFTP", new Integer(274), new Integer(133), FTP_STEP, new Short(tabIndex++), INTEGER_50 }); if (disableFTP) @@ -857,7 +858,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC PROPNAMES_CHKBOX, new Object[] { - INTEGERS[9], "HID:" + HID7_CHK_SAVE, resources.reschkSaveSettings_value, "chkSaveSettings", new Integer(97), new Integer(157), new Short((short) 1), INTEGERS[7], new Short(tabIndex++), new Integer(215) + INTEGERS[9], HelpIds.getHelpIdString(HID7_CHK_SAVE), resources.reschkSaveSettings_value, "chkSaveSettings", new Integer(97), new Integer(157), new Short((short) 1), INTEGERS[7], new Short(tabIndex++), new Integer(215) }); lblSaveSettings = insertLabel("lblSaveSettings", PROPNAMES_LBL, @@ -872,7 +873,7 @@ public abstract class WebWizardDialog extends WizardDialog implements WebWizardC }, new Object[] { - Boolean.TRUE, Boolean.TRUE, INTEGER_12, "HID:" + HID7_TXT_SAVE, new Short((short) 14), "txtSaveSettings", new Integer(179), new Integer(167), INTEGERS[7], new Short(tabIndex++), new Integer(145) + Boolean.TRUE, Boolean.TRUE, INTEGER_12, HelpIds.getHelpIdString(HID7_TXT_SAVE), new Short((short) 14), "txtSaveSettings", new Integer(179), new Integer(167), INTEGERS[7], new Short(tabIndex++), new Integer(145) }); } diff --git a/wizards/source/depot/Dialog2.xdl b/wizards/source/depot/Dialog2.xdl index a46fe9f5b..652acaa19 100644 --- a/wizards/source/depot/Dialog2.xdl +++ b/wizards/source/depot/Dialog2.xdl @@ -1,34 +1,34 @@ - + - + - + - + - - - + + + - + - - + + - + - + diff --git a/wizards/source/depot/Dialog3.xdl b/wizards/source/depot/Dialog3.xdl index 4c6cabd20..87bda0197 100644 --- a/wizards/source/depot/Dialog3.xdl +++ b/wizards/source/depot/Dialog3.xdl @@ -1,34 +1,34 @@ - + - + - - + + - + - - + + - + - - + + - - + + - + @@ -39,7 +39,7 @@ - - + + \ No newline at end of file diff --git a/wizards/source/depot/Dialog4.xdl b/wizards/source/depot/Dialog4.xdl index 4f71be0da..f5c86ce47 100644 --- a/wizards/source/depot/Dialog4.xdl +++ b/wizards/source/depot/Dialog4.xdl @@ -1,16 +1,16 @@ - + - + - + - + diff --git a/wizards/source/euro/DlgConvert.xdl b/wizards/source/euro/DlgConvert.xdl index 43bfeea34..18f3caef0 100644 --- a/wizards/source/euro/DlgConvert.xdl +++ b/wizards/source/euro/DlgConvert.xdl @@ -1,52 +1,52 @@ - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + @@ -63,14 +63,14 @@ - + - + - + diff --git a/wizards/source/euro/DlgPassword.xdl b/wizards/source/euro/DlgPassword.xdl index def861d97..976891a48 100644 --- a/wizards/source/euro/DlgPassword.xdl +++ b/wizards/source/euro/DlgPassword.xdl @@ -2,14 +2,14 @@ - + - + - + \ No newline at end of file diff --git a/wizards/source/formwizard/DlgFormDB.xdl b/wizards/source/formwizard/DlgFormDB.xdl index ade138e06..269b7e618 100644 --- a/wizards/source/formwizard/DlgFormDB.xdl +++ b/wizards/source/formwizard/DlgFormDB.xdl @@ -1,30 +1,30 @@ - + - + - + - + - + - + - + @@ -42,34 +42,34 @@ - + - + - + - + - + - + - + - + - + @@ -78,10 +78,10 @@ - + - + @@ -90,10 +90,10 @@ - + - + diff --git a/wizards/source/importwizard/ImportDialog.xdl b/wizards/source/importwizard/ImportDialog.xdl index 082c06bc8..f28bc1192 100644 --- a/wizards/source/importwizard/ImportDialog.xdl +++ b/wizards/source/importwizard/ImportDialog.xdl @@ -1,90 +1,90 @@ - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/wizards/source/schedule/DlgCalendar.xdl b/wizards/source/schedule/DlgCalendar.xdl index 7f1b68d89..2936a5ebe 100644 --- a/wizards/source/schedule/DlgCalendar.xdl +++ b/wizards/source/schedule/DlgCalendar.xdl @@ -1,64 +1,64 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + \ No newline at end of file diff --git a/wizards/source/template/DialogStyles.xdl b/wizards/source/template/DialogStyles.xdl index a28beb14c..35042849c 100644 --- a/wizards/source/template/DialogStyles.xdl +++ b/wizards/source/template/DialogStyles.xdl @@ -1,14 +1,14 @@ - + - + - + - + diff --git a/wizards/source/template/TemplateDialog.xdl b/wizards/source/template/TemplateDialog.xdl index eb4cc6969..4b8633f23 100644 --- a/wizards/source/template/TemplateDialog.xdl +++ b/wizards/source/template/TemplateDialog.xdl @@ -1,26 +1,26 @@ - + - + - + - + - - + + - + - + diff --git a/wizards/source/webwizard/WebWzrd.xdl b/wizards/source/webwizard/WebWzrd.xdl index be1bec77e..ac826e242 100644 --- a/wizards/source/webwizard/WebWzrd.xdl +++ b/wizards/source/webwizard/WebWzrd.xdl @@ -1,25 +1,25 @@ - + - - - + + + - + - + - + - + diff --git a/wizards/util/helpids.h b/wizards/util/helpids.h index 46b0c26e2..c0376f962 100644 --- a/wizards/util/helpids.h +++ b/wizards/util/helpids.h @@ -45,116 +45,116 @@ // *************** //webwizardgeneralcontrols -#define HID0_WEBWIZARD "HID:34200" -#define HID0_HELP "HID:34201" -#define HID0_NEXT "HID:34202" -#define HID0_PREV "HID:34203" -#define HID0_CREATE "HID:34204" -#define HID0_CANCEL "HID:34205" -#define HID0_STATUS_DIALOG "HID:34206" +#define HID0_WEBWIZARD "WIZARDS_HID0_WEBWIZARD" +#define HID0_HELP "WIZARDS_HID0_HELP" +#define HID0_NEXT "WIZARDS_HID0_NEXT" +#define HID0_PREV "WIZARDS_HID0_PREV" +#define HID0_CREATE "WIZARDS_HID0_CREATE" +#define HID0_CANCEL "WIZARDS_HID0_CANCEL" +#define HID0_STATUS_DIALOG "WIZARDS_HID0_STATUS_DIALOG" //step1 -#define HID1_LST_SESSIONS "HID:34207" -#define HID1_BTN_DEL_SES "HID:34209" +#define HID1_LST_SESSIONS "WIZARDS_HID1_LST_SESSIONS" +#define HID1_BTN_DEL_SES "WIZARDS_HID1_BTN_DEL_SES" //step2 -#define HID2_LST_DOCS "HID:34210" -#define HID2_BTN_ADD_DOC "HID:34211" -#define HID2_BTN_REM_DOC "HID:34212" -#define HID2_BTN_DOC_UP "HID:34213" -#define HID2_BTN_DOC_DOWN "HID:34214" -#define HID2_TXT_DOC_TITLE "HID:34215" -#define HID2_TXT_DOC_DESC "HID:34216" -#define HID2_TXT_DOC_AUTHOR "HID:34217" -#define HID2_LST_DOC_EXPORT "HID:34218" -#define HID2_STATUS_ADD_DOCS "HID:34219" +#define HID2_LST_DOCS "WIZARDS_HID2_LST_DOCS" +#define HID2_BTN_ADD_DOC "WIZARDS_HID2_BTN_ADD_DOC" +#define HID2_BTN_REM_DOC "WIZARDS_HID2_BTN_REM_DOC" +#define HID2_BTN_DOC_UP "WIZARDS_HID2_BTN_DOC_UP" +#define HID2_BTN_DOC_DOWN "WIZARDS_HID2_BTN_DOC_DOWN" +#define HID2_TXT_DOC_TITLE "WIZARDS_HID2_TXT_DOC_TITLE" +#define HID2_TXT_DOC_DESC "WIZARDS_HID2_TXT_DOC_DESC" +#define HID2_TXT_DOC_AUTHOR "WIZARDS_HID2_TXT_DOC_AUTHOR" +#define HID2_LST_DOC_EXPORT "WIZARDS_HID2_LST_DOC_EXPORT" +#define HID2_STATUS_ADD_DOCS "WIZARDS_HID2_STATUS_ADD_DOCS" //step3 -#define HID3_IL_LAYOUTS_IMG1 "HID:34220" -#define HID3_IL_LAYOUTS_IMG2 "HID:34221" -#define HID3_IL_LAYOUTS_IMG3 "HID:34222" -#define HID3_IL_LAYOUTS_IMG4 "HID:34223" -#define HID3_IL_LAYOUTS_IMG5 "HID:34224" -#define HID3_IL_LAYOUTS_IMG6 "HID:34225" -#define HID3_IL_LAYOUTS_IMG7 "HID:34226" -#define HID3_IL_LAYOUTS_IMG8 "HID:34227" -#define HID3_IL_LAYOUTS_IMG9 "HID:34228" -#define HID3_IL_LAYOUTS_IMG10 "HID:34229" -#define HID3_IL_LAYOUTS_IMG11 "HID:34230" -#define HID3_IL_LAYOUTS_IMG12 "HID:34231" -#define HID3_IL_LAYOUTS_IMG13 "HID:34232" -#define HID3_IL_LAYOUTS_IMG14 "HID:34233" -#define HID3_IL_LAYOUTS_IMG15 "HID:34234" +#define HID3_IL_LAYOUTS_IMG1 "WIZARDS_HID3_IL_LAYOUTS_IMG1" +#define HID3_IL_LAYOUTS_IMG2 "WIZARDS_HID3_IL_LAYOUTS_IMG2" +#define HID3_IL_LAYOUTS_IMG3 "WIZARDS_HID3_IL_LAYOUTS_IMG3" +#define HID3_IL_LAYOUTS_IMG4 "WIZARDS_HID3_IL_LAYOUTS_IMG4" +#define HID3_IL_LAYOUTS_IMG5 "WIZARDS_HID3_IL_LAYOUTS_IMG5" +#define HID3_IL_LAYOUTS_IMG6 "WIZARDS_HID3_IL_LAYOUTS_IMG6" +#define HID3_IL_LAYOUTS_IMG7 "WIZARDS_HID3_IL_LAYOUTS_IMG7" +#define HID3_IL_LAYOUTS_IMG8 "WIZARDS_HID3_IL_LAYOUTS_IMG8" +#define HID3_IL_LAYOUTS_IMG9 "WIZARDS_HID3_IL_LAYOUTS_IMG9" +#define HID3_IL_LAYOUTS_IMG10 "WIZARDS_HID3_IL_LAYOUTS_IMG10" +#define HID3_IL_LAYOUTS_IMG11 "WIZARDS_HID3_IL_LAYOUTS_IMG11" +#define HID3_IL_LAYOUTS_IMG12 "WIZARDS_HID3_IL_LAYOUTS_IMG12" +#define HID3_IL_LAYOUTS_IMG13 "WIZARDS_HID3_IL_LAYOUTS_IMG13" +#define HID3_IL_LAYOUTS_IMG14 "WIZARDS_HID3_IL_LAYOUTS_IMG14" +#define HID3_IL_LAYOUTS_IMG15 "WIZARDS_HID3_IL_LAYOUTS_IMG15" //step4 -#define HID4_CHK_DISPLAY_FILENAME "HID:34235" -#define HID4_CHK_DISPLAY_DESCRIPTION "HID:34236" -#define HID4_CHK_DISPLAY_AUTHOR "HID:34237" -#define HID4_CHK_DISPLAY_CR_DATE "HID:34238" -#define HID4_CHK_DISPLAY_UP_DATE "HID:34239" -#define HID4_CHK_DISPLAY_FORMAT "HID:34240" -#define HID4_CHK_DISPLAY_F_ICON "HID:34241" -#define HID4_CHK_DISPLAY_PAGES "HID:34242" -#define HID4_CHK_DISPLAY_SIZE "HID:34243" +#define HID4_CHK_DISPLAY_FILENAME "WIZARDS_HID4_CHK_DISPLAY_FILENAME" +#define HID4_CHK_DISPLAY_DESCRIPTION "WIZARDS_HID4_CHK_DISPLAY_DESCRIPTION" +#define HID4_CHK_DISPLAY_AUTHOR "WIZARDS_HID4_CHK_DISPLAY_AUTHOR" +#define HID4_CHK_DISPLAY_CR_DATE "WIZARDS_HID4_CHK_DISPLAY_CR_DATE" +#define HID4_CHK_DISPLAY_UP_DATE "WIZARDS_HID4_CHK_DISPLAY_UP_DATE" +#define HID4_CHK_DISPLAY_FORMAT "WIZARDS_HID4_CHK_DISPLAY_FORMAT" +#define HID4_CHK_DISPLAY_F_ICON "WIZARDS_HID4_CHK_DISPLAY_F_ICON" +#define HID4_CHK_DISPLAY_PAGES "WIZARDS_HID4_CHK_DISPLAY_PAGES" +#define HID4_CHK_DISPLAY_SIZE "WIZARDS_HID4_CHK_DISPLAY_SIZE" -#define HID4_GRP_OPTIMAIZE_640 "HID:34244" -#define HID4_GRP_OPTIMAIZE_800 "HID:34245" -#define HID4_GRP_OPTIMAIZE_1024 "HID:34246" +#define HID4_GRP_OPTIMAIZE_640 "WIZARDS_HID4_GRP_OPTIMAIZE_640" +#define HID4_GRP_OPTIMAIZE_800 "WIZARDS_HID4_GRP_OPTIMAIZE_800" +#define HID4_GRP_OPTIMAIZE_1024 "WIZARDS_HID4_GRP_OPTIMAIZE_1024" //step5 -#define HID5_LST_STYLES "HID:34247" -#define HID5_BTN_BACKGND "HID:34248" -#define HID5_BTN_ICONS "HID:34249" +#define HID5_LST_STYLES "WIZARDS_HID5_LST_STYLES" +#define HID5_BTN_BACKGND "WIZARDS_HID5_BTN_BACKGND" +#define HID5_BTN_ICONS "WIZARDS_HID5_BTN_ICONS" //step6 -#define HID6_TXT_SITE_TITLE "HID:34250" -#define HID6_TXT_SITE_DESC "HID:34253" -#define HID6_DATE_SITE_CREATED "HID:34255" -#define HID6_DATE_SITE_UPDATED "HID:34256" -#define HID6_TXT_SITE_EMAIL "HID:34258" -#define HID6_TXT_SITE_COPYRIGHT "HID:34259" +#define HID6_TXT_SITE_TITLE "WIZARDS_HID6_TXT_SITE_TITLE" +#define HID6_TXT_SITE_DESC "WIZARDS_HID6_TXT_SITE_DESC" +#define HID6_DATE_SITE_CREATED "WIZARDS_HID6_DATE_SITE_CREATED" +#define HID6_DATE_SITE_UPDATED "WIZARDS_HID6_DATE_SITE_UPDATED" +#define HID6_TXT_SITE_EMAIL "WIZARDS_HID6_TXT_SITE_EMAIL" +#define HID6_TXT_SITE_COPYRIGHT "WIZARDS_HID6_TXT_SITE_COPYRIGHT" //step7 -#define HID7_BTN_PREVIEW "HID:34260" -#define HID7_CHK_PUBLISH_LOCAL "HID:34261" -#define HID7_TXT_LOCAL "HID:34262" -#define HID7_BTN_LOCAL "HID:34263" -#define HID7_CHK_PUBLISH_ZIP "HID:34264" -#define HID7_TXT_ZIP "HID:34265" -#define HID7_BTN_ZIP "HID:34266" -#define HID7_CHK_PUBLISH_FTP "HID:34267" -#define HID7_TXT_FTP "HID:34268" -#define HID7_BTN_FTP "HID:34269" -#define HID7_CHK_SAVE "HID:34270" -#define HID7_TXT_SAVE "HID:34271" +#define HID7_BTN_PREVIEW "WIZARDS_HID7_BTN_PREVIEW" +#define HID7_CHK_PUBLISH_LOCAL "WIZARDS_HID7_CHK_PUBLISH_LOCAL" +#define HID7_TXT_LOCAL "WIZARDS_HID7_TXT_LOCAL" +#define HID7_BTN_LOCAL "WIZARDS_HID7_BTN_LOCAL" +#define HID7_CHK_PUBLISH_ZIP "WIZARDS_HID7_CHK_PUBLISH_ZIP" +#define HID7_TXT_ZIP "WIZARDS_HID7_TXT_ZIP" +#define HID7_BTN_ZIP "WIZARDS_HID7_BTN_ZIP" +#define HID7_CHK_PUBLISH_FTP "WIZARDS_HID7_CHK_PUBLISH_FTP" +#define HID7_TXT_FTP "WIZARDS_HID7_TXT_FTP" +#define HID7_BTN_FTP "WIZARDS_HID7_BTN_FTP" +#define HID7_CHK_SAVE "WIZARDS_HID7_CHK_SAVE" +#define HID7_TXT_SAVE "WIZARDS_HID7_TXT_SAVE" //web wizard backgrounds dialog -#define HID_BG "HID:34290" -#define HID_BG_BTN_OTHER "HID:34291" -#define HID_BG_BTN_NONE "HID:34292" -#define HID_BG_BTN_OK "HID:34293" -#define HID_BG_BTN_CANCEL "HID:34294" - -#define HID_BG_BTN_BACK "HID:34295" -#define HID_BG_BTN_FW "HID:34296" -#define HID_BG_BTN_IMG1 "HID:34297" -#define HID_BG_BTN_IMG2 "HID:34298" -#define HID_BG_BTN_IMG3 "HID:34299" -#define HID_BG_BTN_IMG4 "HID:34300" -#define HID_BG_BTN_IMG5 "HID:34301" -#define HID_BG_BTN_IMG6 "HID:34302" -#define HID_BG_BTN_IMG7 "HID:34303" -#define HID_BG_BTN_IMG8 "HID:34304" -#define HID_BG_BTN_IMG9 "HID:34305" -#define HID_BG_BTN_IMG10 "HID:34306" -#define HID_BG_BTN_IMG11 "HID:34307" -#define HID_BG_BTN_IMG12 "HID:34308" -#define HID_BG_BTN_IMG13 "HID:34309" -#define HID_BG_BTN_IMG14 "HID:34300" -#define HID_BG_BTN_IMG15 "HID:34311" -#define HID_BG_BTN_IMG16 "HID:34312" +#define HID_BG "WIZARDS_HID_BG" +#define HID_BG_BTN_OTHER "WIZARDS_HID_BG_BTN_OTHER" +#define HID_BG_BTN_NONE "WIZARDS_HID_BG_BTN_NONE" +#define HID_BG_BTN_OK "WIZARDS_HID_BG_BTN_OK" +#define HID_BG_BTN_CANCEL "WIZARDS_HID_BG_BTN_CANCEL" + +#define HID_BG_BTN_BACK "WIZARDS_HID_BG_BTN_BACK" +#define HID_BG_BTN_FW "WIZARDS_HID_BG_BTN_FW" +#define HID_BG_BTN_IMG1 "WIZARDS_HID_BG_BTN_IMG1" +#define HID_BG_BTN_IMG2 "WIZARDS_HID_BG_BTN_IMG2" +#define HID_BG_BTN_IMG3 "WIZARDS_HID_BG_BTN_IMG3" +#define HID_BG_BTN_IMG4 "WIZARDS_HID_BG_BTN_IMG4" +#define HID_BG_BTN_IMG5 "WIZARDS_HID_BG_BTN_IMG5" +#define HID_BG_BTN_IMG6 "WIZARDS_HID_BG_BTN_IMG6" +#define HID_BG_BTN_IMG7 "WIZARDS_HID_BG_BTN_IMG7" +#define HID_BG_BTN_IMG8 "WIZARDS_HID_BG_BTN_IMG8" +#define HID_BG_BTN_IMG9 "WIZARDS_HID_BG_BTN_IMG9" +#define HID_BG_BTN_IMG10 "WIZARDS_HID_BG_BTN_IMG10" +#define HID_BG_BTN_IMG11 "WIZARDS_HID_BG_BTN_IMG11" +#define HID_BG_BTN_IMG12 "WIZARDS_HID_BG_BTN_IMG12" +#define HID_BG_BTN_IMG13 "WIZARDS_HID_BG_BTN_IMG13" +#define HID_BG_BTN_IMG14 "WIZARDS_HID_BG_BTN_IMG14" +#define HID_BG_BTN_IMG15 "WIZARDS_HID_BG_BTN_IMG15" +#define HID_BG_BTN_IMG16 "WIZARDS_HID_BG_BTN_IMG16" // ++++++++++++++++++++++++++++++++++++++++++++++++++++++ // Note: Web Wizard continues on 41000 later in this file. @@ -165,66 +165,66 @@ // REPORT WIZARD // ************* -#define HID_DLGREPORT_DIALOG "HID:34320" -#define HID_DLGREPORT_0_CMDPREV "HID:34322" -#define HID_DLGREPORT_0_CMDNEXT "HID:34323" -#define HID_DLGREPORT_0_CMDFINISH "HID:34324" -#define HID_DLGREPORT_0_CMDCANCEL "HID:34325" - -#define HID_DLGREPORT_1_LBTABLES "HID:34330" -#define HID_DLGREPORT_1_FIELDSAVAILABLE "HID:34331" -#define HID_DLGREPORT_1_CMDMOVESELECTED "HID:34332" -#define HID_DLGREPORT_1_CMDMOVEALL "HID:34333" -#define HID_DLGREPORT_1_CMDREMOVESELECTED "HID:34334" -#define HID_DLGREPORT_1_CMDREMOVEALL "HID:34335" -#define HID_DLGREPORT_1_FIELDSSELECTED "HID:34336" -#define HID_DLGREPORT_1_CMDMOVEUP "HID:34337" -#define HID_DLGREPORT_1_CMDMOVEDOWN "HID:34338" - - -#define HID_DLGREPORT_2_GROUPING "HID:34340" -#define HID_DLGREPORT_2_CMDGROUP "HID:34341" -#define HID_DLGREPORT_2_CMDUNGROUP "HID:34342" -#define HID_DLGREPORT_2_PREGROUPINGDEST "HID:34343" -#define HID_DLGREPORT_2_CMDMOVEUPGROUP "HID:34344" -#define HID_DLGREPORT_2_CMDMOVEDOWNGROUP "HID:34345" - - -#define HID_DLGREPORT_3_SORT1 "HID:34346" -#define HID_DLGREPORT_3_OPTASCEND1 "HID:34347" -#define HID_DLGREPORT_3_OPTDESCEND1 "HID:34348" -#define HID_DLGREPORT_3_SORT2 "HID:34349" -#define HID_DLGREPORT_3_OPTASCEND2 "HID:34350" -#define HID_DLGREPORT_3_OPTDESCEND2 "HID:34351" -#define HID_DLGREPORT_3_SORT3 "HID:34352" -#define HID_DLGREPORT_3_OPTASCEND3 "HID:34353" -#define HID_DLGREPORT_3_OPTDESCEND3 "HID:34354" -#define HID_DLGREPORT_3_SORT4 "HID:34355" -#define HID_DLGREPORT_3_OPTASCEND4 "HID:34356" -#define HID_DLGREPORT_3_OPTDESCEND4 "HID:34357" - -#define HID_DLGREPORT_4_TITLE "HID:34362" -#define HID_DLGREPORT_4_DATALAYOUT "HID:34363" -#define HID_DLGREPORT_4_PAGELAYOUT "HID:34364" -#define HID_DLGREPORT_4_LANDSCAPE "HID:34365" -#define HID_DLGREPORT_4_PORTRAIT "HID:34366" - -#define HID_DLGREPORT_5_OPTDYNTEMPLATE "HID:34370" -#define HID_DLGREPORT_5_OPTSTATDOCUMENT "HID:34371" -#define HID_DLGREPORT_5_TXTTEMPLATEPATH "HID:34372" -#define HID_DLGREPORT_5_CMDTEMPLATEPATH "HID:34373" -#define HID_DLGREPORT_5_OPTEDITTEMPLATE "HID:34374" -#define HID_DLGREPORT_5_OPTUSETEMPLATE "HID:34375" -#define HID_DLGREPORT_5_TXTDOCUMENTPATH "HID:34376" -#define HID_DLGREPORT_5_CMDDOCUMENTPATH "HID:34377" -#define HID_DLGREPORT_5_CHKLINKTODB "HID:34378" -#define HID_DLGREPORT_6_TXTTITLE_1 "HID:34381" -#define HID_DLGREPORT_6_TXTTITLE_2 "HID:34382" -#define HID_DLGREPORT_6_TXTTITLE_3 "HID:34383" -#define HID_DLGREPORT_6_TXTTITLE_4 "HID:34384" -#define HID_DLGREPORT_6_TXTTITLE_5 "HID:34385" -#define HID_DLGREPORT_6_TXTTITLE_6 "HID:34386" -#define HID_DLGREPORT_6_TXTTITLE_7 "HID:34387" +#define HID_DLGREPORT_DIALOG "WIZARDS_HID_DLGREPORT_DIALOG" +#define HID_DLGREPORT_0_CMDPREV "WIZARDS_HID_DLGREPORT_0_CMDPREV" +#define HID_DLGREPORT_0_CMDNEXT "WIZARDS_HID_DLGREPORT_0_CMDNEXT" +#define HID_DLGREPORT_0_CMDFINISH "WIZARDS_HID_DLGREPORT_0_CMDFINISH" +#define HID_DLGREPORT_0_CMDCANCEL "WIZARDS_HID_DLGREPORT_0_CMDCANCEL" + +#define HID_DLGREPORT_1_LBTABLES "WIZARDS_HID_DLGREPORT_1_LBTABLES" +#define HID_DLGREPORT_1_FIELDSAVAILABLE "WIZARDS_HID_DLGREPORT_1_FIELDSAVAILABLE" +#define HID_DLGREPORT_1_CMDMOVESELECTED "WIZARDS_HID_DLGREPORT_1_CMDMOVESELECTED" +#define HID_DLGREPORT_1_CMDMOVEALL "WIZARDS_HID_DLGREPORT_1_CMDMOVEALL" +#define HID_DLGREPORT_1_CMDREMOVESELECTED "WIZARDS_HID_DLGREPORT_1_CMDREMOVESELECTED" +#define HID_DLGREPORT_1_CMDREMOVEALL "WIZARDS_HID_DLGREPORT_1_CMDREMOVEALL" +#define HID_DLGREPORT_1_FIELDSSELECTED "WIZARDS_HID_DLGREPORT_1_FIELDSSELECTED" +#define HID_DLGREPORT_1_CMDMOVEUP "WIZARDS_HID_DLGREPORT_1_CMDMOVEUP" +#define HID_DLGREPORT_1_CMDMOVEDOWN "WIZARDS_HID_DLGREPORT_1_CMDMOVEDOWN" + + +#define HID_DLGREPORT_2_GROUPING "WIZARDS_HID_DLGREPORT_2_GROUPING" +#define HID_DLGREPORT_2_CMDGROUP "WIZARDS_HID_DLGREPORT_2_CMDGROUP" +#define HID_DLGREPORT_2_CMDUNGROUP "WIZARDS_HID_DLGREPORT_2_CMDUNGROUP" +#define HID_DLGREPORT_2_PREGROUPINGDEST "WIZARDS_HID_DLGREPORT_2_PREGROUPINGDEST" +#define HID_DLGREPORT_2_CMDMOVEUPGROUP "WIZARDS_HID_DLGREPORT_2_CMDMOVEUPGROUP" +#define HID_DLGREPORT_2_CMDMOVEDOWNGROUP "WIZARDS_HID_DLGREPORT_2_CMDMOVEDOWNGROUP" + + +#define HID_DLGREPORT_3_SORT1 "WIZARDS_HID_DLGREPORT_3_SORT1" +#define HID_DLGREPORT_3_OPTASCEND1 "WIZARDS_HID_DLGREPORT_3_OPTASCEND1" +#define HID_DLGREPORT_3_OPTDESCEND1 "WIZARDS_HID_DLGREPORT_3_OPTDESCEND1" +#define HID_DLGREPORT_3_SORT2 "WIZARDS_HID_DLGREPORT_3_SORT2" +#define HID_DLGREPORT_3_OPTASCEND2 "WIZARDS_HID_DLGREPORT_3_OPTASCEND2" +#define HID_DLGREPORT_3_OPTDESCEND2 "WIZARDS_HID_DLGREPORT_3_OPTDESCEND2" +#define HID_DLGREPORT_3_SORT3 "WIZARDS_HID_DLGREPORT_3_SORT3" +#define HID_DLGREPORT_3_OPTASCEND3 "WIZARDS_HID_DLGREPORT_3_OPTASCEND3" +#define HID_DLGREPORT_3_OPTDESCEND3 "WIZARDS_HID_DLGREPORT_3_OPTDESCEND3" +#define HID_DLGREPORT_3_SORT4 "WIZARDS_HID_DLGREPORT_3_SORT4" +#define HID_DLGREPORT_3_OPTASCEND4 "WIZARDS_HID_DLGREPORT_3_OPTASCEND4" +#define HID_DLGREPORT_3_OPTDESCEND4 "WIZARDS_HID_DLGREPORT_3_OPTDESCEND4" + +#define HID_DLGREPORT_4_TITLE "WIZARDS_HID_DLGREPORT_4_TITLE" +#define HID_DLGREPORT_4_DATALAYOUT "WIZARDS_HID_DLGREPORT_4_DATALAYOUT" +#define HID_DLGREPORT_4_PAGELAYOUT "WIZARDS_HID_DLGREPORT_4_PAGELAYOUT" +#define HID_DLGREPORT_4_LANDSCAPE "WIZARDS_HID_DLGREPORT_4_LANDSCAPE" +#define HID_DLGREPORT_4_PORTRAIT "WIZARDS_HID_DLGREPORT_4_PORTRAIT" + +#define HID_DLGREPORT_5_OPTDYNTEMPLATE "WIZARDS_HID_DLGREPORT_5_OPTDYNTEMPLATE" +#define HID_DLGREPORT_5_OPTSTATDOCUMENT "WIZARDS_HID_DLGREPORT_5_OPTSTATDOCUMENT" +#define HID_DLGREPORT_5_TXTTEMPLATEPATH "WIZARDS_HID_DLGREPORT_5_TXTTEMPLATEPATH" +#define HID_DLGREPORT_5_CMDTEMPLATEPATH "WIZARDS_HID_DLGREPORT_5_CMDTEMPLATEPATH" +#define HID_DLGREPORT_5_OPTEDITTEMPLATE "WIZARDS_HID_DLGREPORT_5_OPTEDITTEMPLATE" +#define HID_DLGREPORT_5_OPTUSETEMPLATE "WIZARDS_HID_DLGREPORT_5_OPTUSETEMPLATE" +#define HID_DLGREPORT_5_TXTDOCUMENTPATH "WIZARDS_HID_DLGREPORT_5_TXTDOCUMENTPATH" +#define HID_DLGREPORT_5_CMDDOCUMENTPATH "WIZARDS_HID_DLGREPORT_5_CMDDOCUMENTPATH" +#define HID_DLGREPORT_5_CHKLINKTODB "WIZARDS_HID_DLGREPORT_5_CHKLINKTODB" +#define HID_DLGREPORT_6_TXTTITLE_1 "WIZARDS_HID_DLGREPORT_6_TXTTITLE_1" +#define HID_DLGREPORT_6_TXTTITLE_2 "WIZARDS_HID_DLGREPORT_6_TXTTITLE_2" +#define HID_DLGREPORT_6_TXTTITLE_3 "WIZARDS_HID_DLGREPORT_6_TXTTITLE_3" +#define HID_DLGREPORT_6_TXTTITLE_4 "WIZARDS_HID_DLGREPORT_6_TXTTITLE_4" +#define HID_DLGREPORT_6_TXTTITLE_5 "WIZARDS_HID_DLGREPORT_6_TXTTITLE_5" +#define HID_DLGREPORT_6_TXTTITLE_6 "WIZARDS_HID_DLGREPORT_6_TXTTITLE_6" +#define HID_DLGREPORT_6_TXTTITLE_7 "WIZARDS_HID_DLGREPORT_6_TXTTITLE_7" /* ==================================== @@ -233,426 +233,426 @@ */ -#define HID_DLGFORM_DIALOG "HID:34400" -#define HID_DLGFORM_CMDPREV "HID:34402" -#define HID_DLGFORM_CMDNEXT "HID:34403" -#define HID_DLGFORM_CMDFINISH "HID:34404" -#define HID_DLGFORM_CMDCANCEL "HID:34405" - -#define HID_DLGFORM_MASTER_LBTABLES "HID:34411" -#define HID_DLGFORM_MASTER_FIELDSAVAILABLE "HID:34412" -#define HID_DLGFORM_MASTER_CMDMOVESELECTED "HID:34413" -#define HID_DLGFORM_MASTER_CMDMOVEALL "HID:34414" -#define HID_DLGFORM_MASTER_CMDREMOVESELECTED "HID:34415" -#define HID_DLGFORM_MASTER_CMDREMOVEALL "HID:34416" -#define HID_DLGFORM_MASTER_FIELDSSELECTED "HID:34417" -#define HID_DLGFORM_MASTER_CMDMOVEUP "HID:34418" -#define HID_DLGFORM_MASTER_CMDMOVEDOWN "HID:34419" - - -#define HID_DLGFORM_CHKCREATESUBFORM "HID:34421" -#define HID_DLGFORM_OPTONEXISTINGRELATION "HID:34422" -#define HID_DLGFORM_OPTSELECTMANUALLY "HID:34423" -#define HID_DLGFORM_lstRELATIONS "HID:34424" - - -#define HID_DLGFORM_SUB_LBTABLES "HID:34431" -#define HID_DLGFORM_SUB_FIELDSAVAILABLE "HID:34432" -#define HID_DLGFORM_SUB_CMDMOVESELECTED "HID:34433" -#define HID_DLGFORM_SUB_CMDMOVEALL "HID:34434" -#define HID_DLGFORM_SUB_CMDREMOVESELECTED "HID:34435" -#define HID_DLGFORM_SUB_CMDREMOVEALL "HID:34436" -#define HID_DLGFORM_SUB_FIELDSSELECTED "HID:34437" -#define HID_DLGFORM_SUB_CMDMOVEUP "HID:34438" -#define HID_DLGFORM_SUB_CMDMOVEDOWN "HID:34439" - - -#define HID_DLGFORM_LINKER_LSTSLAVELINK1 "HID:34441" -#define HID_DLGFORM_LINKER_LSTMASTERLINK1 "HID:34442" -#define HID_DLGFORM_LINKER_LSTSLAVELINK2 "HID:34443" -#define HID_DLGFORM_LINKER_LSTMASTERLINK2 "HID:34444" -#define HID_DLGFORM_LINKER_LSTSLAVELINK3 "HID:34445" -#define HID_DLGFORM_LINKER_LSTMASTERLINK3 "HID:34446" -#define HID_DLGFORM_LINKER_LSTSLAVELINK4 "HID:34447" -#define HID_DLGFORM_LINKER_LSTMASTERLINK4 "HID:34448" - -#define HID_DLGFORM_CMDALIGNLEFT "HID:34451" -#define HID_DLGFORM_CMDALIGNRIGHT "HID:34452" - - -#define HID_DLGFORM_CMDLEFTLABELED "HID:34453" -#define HID_DLGFORM_CMDTOPLABELED "HID:34454" -#define HID_DLGFORM_CMDTABLESTYLE "HID:34455" -#define HID_DLGFORM_CMDTOPJUSTIFIED "HID:34456" - -#define HID_DLGFORM_CMDLEFTLABELED2 "HID:34457" -#define HID_DLGFORM_CMDTOPLABELED2 "HID:34458" -#define HID_DLGFORM_CMDTABLESTYLE2 "HID:34459" -#define HID_DLGFORM_CMDTOPJUSTIFIED2 "HID:34460" - -#define HID_DLGFORM_OPTNEWDATAONLY "HID:34461" -#define HID_DLGFORM_OPTDISPLAYALLDATA "HID:34462" -#define HID_DLGFORM_CHKNOMODIFICATION "HID:34463" -#define HID_DLGFORM_CHKNODELETION "HID:34464" -#define HID_DLGFORM_CHKNOADDITION "HID:34465" - - -#define HID_DLGFORM_LSTSTYLES "HID:34471" -#define HID_DLGFORM_CMDNOBORDER "HID:34472" -#define HID_DLGFORM_CMD3DBORDER "HID:34473" -#define HID_DLGFORM_CMDSIMPLEBORDER "HID:34474" - -#define HID_DLGFORM_TXTPATH "HID:34481" -#define HID_DLGFORM_OPTWORKWITHFORM "HID:34482" -#define HID_DLGFORM_OPTMODIFYFORM "HID:34483" - - -#define HID_DLGNEWSLTR_DIALOG "HID:34500" -#define HID_DLGNEWSLTR_OPTSTANDARDLAYOUT "HID:34501" -#define HID_DLGNEWSLTR_OPTPARTYLAYOUT "HID:34502" -#define HID_DLGNEWSLTR_OPTBROCHURELAYOUT "HID:34503" -#define HID_DLGNEWSLTR_OPTSINGLESIDED "HID:34504" -#define HID_DLGNEWSLTR_OPTDOUBLESIDED "HID:34505" -#define HID_DLGNEWSLTR_CMDGOON "HID:34506" - - -#define HID_DLGDEPOT_DIALOG_SELLBUY "HID:34520" -#define HID_DLGDEPOT_0_TXTSTOCKID_SELLBUY "HID:34521" -#define HID_DLGDEPOT_0_TXTQUANTITY "HID:34522" -#define HID_DLGDEPOT_0_TXTRATE "HID:34523" -#define HID_DLGDEPOT_0_TXTDATE "HID:34524" -#define HID_DLGDEPOT_0_TXTCOMMISSION "HID:34525" -#define HID_DLGDEPOT_0_TXTFIX "HID:34526" -#define HID_DLGDEPOT_0_TXTMINIMUM "HID:34527" -#define HID_DLGDEPOT_0_CMDCANCEL_SELLBUY "HID:34528" -#define HID_DLGDEPOT_0_CMDGOON_SELLBUY "HID:34529" -#define HID_DLGDEPOT_1_LSTSELLSTOCKS "HID:34530" -#define HID_DLGDEPOT_2_LSTBUYSTOCKS "HID:34531" -#define HID_DLGDEPOT_DIALOG_SPLIT "HID:34532" -#define HID_DLGDEPOT_0_LSTSTOCKNAMES "HID:34533" -#define HID_DLGDEPOT_0_TXTSTOCKID_SPLIT "HID:34534" -#define HID_DLGDEPOT_0_CMDCANCEL_SPLIT "HID:34535" -#define HID_DLGDEPOT_0_CMDGOON_SPLIT "HID:34536" -#define HID_DLGDEPOT_1_OPTPERSHARE "HID:34537" -#define HID_DLGDEPOT_1_OPTTOTAL "HID:34538" -#define HID_DLGDEPOT_1_TXTDIVIDEND "HID:34539" -#define HID_DLGDEPOT_2_TXTOLDRATE "HID:34540" -#define HID_DLGDEPOT_2_TXTNEWRATE "HID:34541" -#define HID_DLGDEPOT_2_TXTDATE "HID:34542" -#define HID_DLGDEPOT_3_TXTSTARTDATE "HID:34543" -#define HID_DLGDEPOT_3_TXTENDDATE "HID:34544" -#define HID_DLGDEPOT_3_OPTDAILY "HID:34545" -#define HID_DLGDEPOT_3_OPTWEEKLY "HID:34546" -#define HID_DLGDEPOT_DIALOG_HISTORY "HID:34547" -#define HID_DLGDEPOT_LSTMARKETS "HID:34548" -#define HID_DLGDEPOT_0_CMDCANCEL_HISTORY "HID:34549" -#define HID_DLGDEPOT_0_CMDGOON_HISTORY "HID:34550" - -#define HID_DLGIMPORT_DIALOG "HID:34570" -#define HID_DLGIMPORT_0_CMDHELP "HID:34571" -#define HID_DLGIMPORT_0_CMDCANCEL "HID:34572" -#define HID_DLGIMPORT_0_CMDPREV "HID:34573" -#define HID_DLGIMPORT_0_CMDNEXT "HID:34574" -#define HID_DLGIMPORT_0_OPTSODOCUMENTS "HID:34575" -#define HID_DLGIMPORT_0_OPTMSDOCUMENTS "HID:34576" -#define HID_DLGIMPORT_0_CHKLOGFILE "HID:34577" -#define HID_DLGIMPORT_2_CHKWORD "HID:34578" -#define HID_DLGIMPORT_2_CHKEXCEL "HID:34579" -#define HID_DLGIMPORT_2_CHKPOWERPOINT "HID:34580" -#define HID_DLGIMPORT_2_CBTEMPLATE "HID:34581" -#define HID_DLGIMPORT_2_CBTEMPLATERECURSE "HID:34582" -#define HID_DLGIMPORT_2_LBTEMPLATEPATH "HID:34583" -#define HID_DLGIMPORT_2_EDTEMPLATEPATH "HID:34584" -#define HID_DLGIMPORT_2_CBDOCUMENT "HID:34586" -#define HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT "HID:34585" -#define HID_DLGIMPORT_2_CBDOCUMENT "HID:34586" -#define HID_DLGIMPORT_2_CBDOCUMENTRECURSE "HID:34587" -#define HID_DLGIMPORT_2_LBDOCUMENTPATH "HID:34588" -#define HID_DLGIMPORT_2_EDDOCUMENTPATH "HID:34589" -#define HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT "HID:34590" -#define HID_DLGIMPORT_2_LBEXPORTDOCUMENTPATH "HID:34591" -#define HID_DLGIMPORT_2_EDEXPORTDOCUMENTPATH "HID:34592" -#define HID_DLGIMPORT_2_CMDEXPORTPATHSELECT "HID:34593" -#define HID_DLGIMPORT_3_TBSUMMARY "HID:34595" - -#define HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT2 "HID:34600" -#define HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT2 "HID:34601" - - -#define HID_DLGIMPORT_0_CHKWRITER "HID:34596" -#define HID_DLGIMPORT_0_CHKCALC "HID:34597" -#define HID_DLGIMPORT_0_CHKIMPRESS "HID:34598" -#define HID_DLGIMPORT_0_CHKMATHGLOBAL "HID:34599" - - -#define HID_DLGCORRESPONDENCE_DIALOG "HID:34630" -#define HID_DLGCORRESPONDENCE_CANCEL "HID:34631" -#define HID_DLGCORRESPONDENCE_OPTIONAGENDA1 "HID:34632" -#define HID_DLGCORRESPONDENCE_OPTIONAGENDA2 "HID:34633" -#define HID_DLGCORRESPONDENCE_AGENDAOKAY "HID:34634" -#define HID_DLGCORRESPONDENCE_OPTIONLETTER1 "HID:34635" -#define HID_DLGCORRESPONDENCE_OPTIONLETTER2 "HID:34636" -#define HID_DLGCORRESPONDENCE_LETTEROKAY "HID:34637" - -#define HID_DLGSTYLES_DIALOG "HID:34650" -#define HID_DLGSTYLES_LISTBOX "HID:34651" -#define HID_DLGSTYLES_CANCEL "HID:34652" -#define HID_DLGSTYLES_OKAY "HID:34653" - -#define HID_DLGCONVERT_DIALOG "HID:34660" -#define HID_DLGCONVERT_CHECKBOX1 "HID:34661" -#define HID_DLGCONVERT_OPTIONBUTTON1 "HID:34662" -#define HID_DLGCONVERT_OPTIONBUTTON2 "HID:34663" -#define HID_DLGCONVERT_OPTIONBUTTON3 "HID:34664" -#define HID_DLGCONVERT_OPTIONBUTTON4 "HID:34665" -#define HID_DLGCONVERT_LISTBOX1 "HID:34666" -#define HID_DLGCONVERT_OBFILE "HID:34667" -#define HID_DLGCONVERT_OBDIR "HID:34668" -#define HID_DLGCONVERT_COMBOBOX1 "HID:34669" -#define HID_DLGCONVERT_TBSOURCE "HID:34670" -#define HID_DLGCONVERT_CHECKRECURSIVE "HID:34671" -#define HID_DLGCONVERT_TBTARGET "HID:34672" -#define HID_DLGCONVERT_CBCANCEL "HID:34673" -#define HID_DLGCONVERT_CBHELP "HID:34674" -#define HID_DLGCONVERT_CBBACK "HID:34675" -#define HID_DLGCONVERT_CBGOON "HID:34676" -#define HID_DLGCONVERT_CBSOURCEOPEN "HID:34677" -#define HID_DLGCONVERT_CBTARGETOPEN "HID:34678" -#define HID_DLGCONVERT_CHKPROTECT "HID:34679" -#define HID_DLGCONVERT_CHKTEXTDOCUMENTS "HID:34680" - -#define HID_DLGPASSWORD_CMDGOON "HID:34690" -#define HID_DLGPASSWORD_CMDCANCEL "HID:34691" -#define HID_DLGPASSWORD_CMDHELP "HID:34692" -#define HID_DLGPASSWORD_TXTPASSWORD "HID:34693" - -#define HID_DLGHOLIDAYCAL_DIALOG "HID:34700" -#define HID_DLGHOLIDAYCAL_1_PREVIEW "HID:34701" -#define HID_DLGHOLIDAYCAL_1_OPYEAR "HID:34702" -#define HID_DLGHOLIDAYCAL_1_OPMONTH "HID:34703" -#define HID_DLGHOLIDAYCAL_1_EDYEAR "HID:34704" -#define HID_DLGHOLIDAYCAL_1_EDMONTH "HID:34705" -#define HID_DLGHOLIDAYCAL_1_SPINYEAR "HID:34706" -#define HID_DLGHOLIDAYCAL_1_SPINMONTH "HID:34707" -#define HID_DLGHOLIDAYCAL_1_CMBSTATE "HID:34708" -#define HID_DLGHOLIDAYCAL_2_LBOWNDATA "HID:34709" -#define HID_DLGHOLIDAYCAL_2_CMDINSERT "HID:34710" -#define HID_DLGHOLIDAYCAL_2_CMDDELETE "HID:34711" -#define HID_DLGHOLIDAYCAL_2_EDEVENT "HID:34712" -#define HID_DLGHOLIDAYCAL_2_CHKEVENT "HID:34713" -#define HID_DLGHOLIDAYCAL_2_EDEVENTDAY "HID:34714" -#define HID_DLGHOLIDAYCAL_2_SPINEVENTDAY "HID:34715" -#define HID_DLGHOLIDAYCAL_2_EDEVENTMONTH "HID:34716" -#define HID_DLGHOLIDAYCAL_2_SPINEVENTMONTH "HID:34717" -#define HID_DLGHOLIDAYCAL_2_EDEVENTYEAR "HID:34718" -#define HID_DLGHOLIDAYCAL_2_SPINEVENTYEAR "HID:34719" -#define HID_DLGHOLIDAYCAL_0_CMDOWNDATA "HID:34720" -#define HID_DLGHOLIDAYCAL_0_CMDCANCEL "HID:34721" -#define HID_DLGHOLIDAYCAL_0_CMDOK "HID:34722" +#define HID_DLGFORM_DIALOG "WIZARDS_HID_DLGFORM_DIALOG" +#define HID_DLGFORM_CMDPREV "WIZARDS_HID_DLGFORM_CMDPREV" +#define HID_DLGFORM_CMDNEXT "WIZARDS_HID_DLGFORM_CMDNEXT" +#define HID_DLGFORM_CMDFINISH "WIZARDS_HID_DLGFORM_CMDFINISH" +#define HID_DLGFORM_CMDCANCEL "WIZARDS_HID_DLGFORM_CMDCANCEL" + +#define HID_DLGFORM_MASTER_LBTABLES "WIZARDS_HID_DLGFORM_MASTER_LBTABLES" +#define HID_DLGFORM_MASTER_FIELDSAVAILABLE "WIZARDS_HID_DLGFORM_MASTER_FIELDSAVAILABLE" +#define HID_DLGFORM_MASTER_CMDMOVESELECTED "WIZARDS_HID_DLGFORM_MASTER_CMDMOVESELECTED" +#define HID_DLGFORM_MASTER_CMDMOVEALL "WIZARDS_HID_DLGFORM_MASTER_CMDMOVEALL" +#define HID_DLGFORM_MASTER_CMDREMOVESELECTED "WIZARDS_HID_DLGFORM_MASTER_CMDREMOVESELECTED" +#define HID_DLGFORM_MASTER_CMDREMOVEALL "WIZARDS_HID_DLGFORM_MASTER_CMDREMOVEALL" +#define HID_DLGFORM_MASTER_FIELDSSELECTED "WIZARDS_HID_DLGFORM_MASTER_FIELDSSELECTED" +#define HID_DLGFORM_MASTER_CMDMOVEUP "WIZARDS_HID_DLGFORM_MASTER_CMDMOVEUP" +#define HID_DLGFORM_MASTER_CMDMOVEDOWN "WIZARDS_HID_DLGFORM_MASTER_CMDMOVEDOWN" + + +#define HID_DLGFORM_CHKCREATESUBFORM "WIZARDS_HID_DLGFORM_CHKCREATESUBFORM" +#define HID_DLGFORM_OPTONEXISTINGRELATION "WIZARDS_HID_DLGFORM_OPTONEXISTINGRELATION" +#define HID_DLGFORM_OPTSELECTMANUALLY "WIZARDS_HID_DLGFORM_OPTSELECTMANUALLY" +#define HID_DLGFORM_lstRELATIONS "WIZARDS_HID_DLGFORM_lstRELATIONS" + + +#define HID_DLGFORM_SUB_LBTABLES "WIZARDS_HID_DLGFORM_SUB_LBTABLES" +#define HID_DLGFORM_SUB_FIELDSAVAILABLE "WIZARDS_HID_DLGFORM_SUB_FIELDSAVAILABLE" +#define HID_DLGFORM_SUB_CMDMOVESELECTED "WIZARDS_HID_DLGFORM_SUB_CMDMOVESELECTED" +#define HID_DLGFORM_SUB_CMDMOVEALL "WIZARDS_HID_DLGFORM_SUB_CMDMOVEALL" +#define HID_DLGFORM_SUB_CMDREMOVESELECTED "WIZARDS_HID_DLGFORM_SUB_CMDREMOVESELECTED" +#define HID_DLGFORM_SUB_CMDREMOVEALL "WIZARDS_HID_DLGFORM_SUB_CMDREMOVEALL" +#define HID_DLGFORM_SUB_FIELDSSELECTED "WIZARDS_HID_DLGFORM_SUB_FIELDSSELECTED" +#define HID_DLGFORM_SUB_CMDMOVEUP "WIZARDS_HID_DLGFORM_SUB_CMDMOVEUP" +#define HID_DLGFORM_SUB_CMDMOVEDOWN "WIZARDS_HID_DLGFORM_SUB_CMDMOVEDOWN" + + +#define HID_DLGFORM_LINKER_LSTSLAVELINK1 "WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK1" +#define HID_DLGFORM_LINKER_LSTMASTERLINK1 "WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK1" +#define HID_DLGFORM_LINKER_LSTSLAVELINK2 "WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK2" +#define HID_DLGFORM_LINKER_LSTMASTERLINK2 "WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK2" +#define HID_DLGFORM_LINKER_LSTSLAVELINK3 "WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK3" +#define HID_DLGFORM_LINKER_LSTMASTERLINK3 "WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK3" +#define HID_DLGFORM_LINKER_LSTSLAVELINK4 "WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK4" +#define HID_DLGFORM_LINKER_LSTMASTERLINK4 "WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK4" + +#define HID_DLGFORM_CMDALIGNLEFT "WIZARDS_HID_DLGFORM_CMDALIGNLEFT" +#define HID_DLGFORM_CMDALIGNRIGHT "WIZARDS_HID_DLGFORM_CMDALIGNRIGHT" + + +#define HID_DLGFORM_CMDLEFTLABELED "WIZARDS_HID_DLGFORM_CMDLEFTLABELED" +#define HID_DLGFORM_CMDTOPLABELED "WIZARDS_HID_DLGFORM_CMDTOPLABELED" +#define HID_DLGFORM_CMDTABLESTYLE "WIZARDS_HID_DLGFORM_CMDTABLESTYLE" +#define HID_DLGFORM_CMDTOPJUSTIFIED "WIZARDS_HID_DLGFORM_CMDTOPJUSTIFIED" + +#define HID_DLGFORM_CMDLEFTLABELED2 "WIZARDS_HID_DLGFORM_CMDLEFTLABELED2" +#define HID_DLGFORM_CMDTOPLABELED2 "WIZARDS_HID_DLGFORM_CMDTOPLABELED2" +#define HID_DLGFORM_CMDTABLESTYLE2 "WIZARDS_HID_DLGFORM_CMDTABLESTYLE2" +#define HID_DLGFORM_CMDTOPJUSTIFIED2 "WIZARDS_HID_DLGFORM_CMDTOPJUSTIFIED2" + +#define HID_DLGFORM_OPTNEWDATAONLY "WIZARDS_HID_DLGFORM_OPTNEWDATAONLY" +#define HID_DLGFORM_OPTDISPLAYALLDATA "WIZARDS_HID_DLGFORM_OPTDISPLAYALLDATA" +#define HID_DLGFORM_CHKNOMODIFICATION "WIZARDS_HID_DLGFORM_CHKNOMODIFICATION" +#define HID_DLGFORM_CHKNODELETION "WIZARDS_HID_DLGFORM_CHKNODELETION" +#define HID_DLGFORM_CHKNOADDITION "WIZARDS_HID_DLGFORM_CHKNOADDITION" + + +#define HID_DLGFORM_LSTSTYLES "WIZARDS_HID_DLGFORM_LSTSTYLES" +#define HID_DLGFORM_CMDNOBORDER "WIZARDS_HID_DLGFORM_CMDNOBORDER" +#define HID_DLGFORM_CMD3DBORDER "WIZARDS_HID_DLGFORM_CMD3DBORDER" +#define HID_DLGFORM_CMDSIMPLEBORDER "WIZARDS_HID_DLGFORM_CMDSIMPLEBORDER" + +#define HID_DLGFORM_TXTPATH "WIZARDS_HID_DLGFORM_TXTPATH" +#define HID_DLGFORM_OPTWORKWITHFORM "WIZARDS_HID_DLGFORM_OPTWORKWITHFORM" +#define HID_DLGFORM_OPTMODIFYFORM "WIZARDS_HID_DLGFORM_OPTMODIFYFORM" + + +#define HID_DLGNEWSLTR_DIALOG "WIZARDS_HID_DLGNEWSLTR_DIALOG" +#define HID_DLGNEWSLTR_OPTSTANDARDLAYOUT "WIZARDS_HID_DLGNEWSLTR_OPTSTANDARDLAYOUT" +#define HID_DLGNEWSLTR_OPTPARTYLAYOUT "WIZARDS_HID_DLGNEWSLTR_OPTPARTYLAYOUT" +#define HID_DLGNEWSLTR_OPTBROCHURELAYOUT "WIZARDS_HID_DLGNEWSLTR_OPTBROCHURELAYOUT" +#define HID_DLGNEWSLTR_OPTSINGLESIDED "WIZARDS_HID_DLGNEWSLTR_OPTSINGLESIDED" +#define HID_DLGNEWSLTR_OPTDOUBLESIDED "WIZARDS_HID_DLGNEWSLTR_OPTDOUBLESIDED" +#define HID_DLGNEWSLTR_CMDGOON "WIZARDS_HID_DLGNEWSLTR_CMDGOON" + + +#define HID_DLGDEPOT_DIALOG_SELLBUY "WIZARDS_HID_DLGDEPOT_DIALOG_SELLBUY" +#define HID_DLGDEPOT_0_TXTSTOCKID_SELLBUY "WIZARDS_HID_DLGDEPOT_0_TXTSTOCKID_SELLBUY" +#define HID_DLGDEPOT_0_TXTQUANTITY "WIZARDS_HID_DLGDEPOT_0_TXTQUANTITY" +#define HID_DLGDEPOT_0_TXTRATE "WIZARDS_HID_DLGDEPOT_0_TXTRATE" +#define HID_DLGDEPOT_0_TXTDATE "WIZARDS_HID_DLGDEPOT_0_TXTDATE" +#define HID_DLGDEPOT_0_TXTCOMMISSION "WIZARDS_HID_DLGDEPOT_0_TXTCOMMISSION" +#define HID_DLGDEPOT_0_TXTFIX "WIZARDS_HID_DLGDEPOT_0_TXTFIX" +#define HID_DLGDEPOT_0_TXTMINIMUM "WIZARDS_HID_DLGDEPOT_0_TXTMINIMUM" +#define HID_DLGDEPOT_0_CMDCANCEL_SELLBUY "WIZARDS_HID_DLGDEPOT_0_CMDCANCEL_SELLBUY" +#define HID_DLGDEPOT_0_CMDGOON_SELLBUY "WIZARDS_HID_DLGDEPOT_0_CMDGOON_SELLBUY" +#define HID_DLGDEPOT_1_LSTSELLSTOCKS "WIZARDS_HID_DLGDEPOT_1_LSTSELLSTOCKS" +#define HID_DLGDEPOT_2_LSTBUYSTOCKS "WIZARDS_HID_DLGDEPOT_2_LSTBUYSTOCKS" +#define HID_DLGDEPOT_DIALOG_SPLIT "WIZARDS_HID_DLGDEPOT_DIALOG_SPLIT" +#define HID_DLGDEPOT_0_LSTSTOCKNAMES "WIZARDS_HID_DLGDEPOT_0_LSTSTOCKNAMES" +#define HID_DLGDEPOT_0_TXTSTOCKID_SPLIT "WIZARDS_HID_DLGDEPOT_0_TXTSTOCKID_SPLIT" +#define HID_DLGDEPOT_0_CMDCANCEL_SPLIT "WIZARDS_HID_DLGDEPOT_0_CMDCANCEL_SPLIT" +#define HID_DLGDEPOT_0_CMDGOON_SPLIT "WIZARDS_HID_DLGDEPOT_0_CMDGOON_SPLIT" +#define HID_DLGDEPOT_1_OPTPERSHARE "WIZARDS_HID_DLGDEPOT_1_OPTPERSHARE" +#define HID_DLGDEPOT_1_OPTTOTAL "WIZARDS_HID_DLGDEPOT_1_OPTTOTAL" +#define HID_DLGDEPOT_1_TXTDIVIDEND "WIZARDS_HID_DLGDEPOT_1_TXTDIVIDEND" +#define HID_DLGDEPOT_2_TXTOLDRATE "WIZARDS_HID_DLGDEPOT_2_TXTOLDRATE" +#define HID_DLGDEPOT_2_TXTNEWRATE "WIZARDS_HID_DLGDEPOT_2_TXTNEWRATE" +#define HID_DLGDEPOT_2_TXTDATE "WIZARDS_HID_DLGDEPOT_2_TXTDATE" +#define HID_DLGDEPOT_3_TXTSTARTDATE "WIZARDS_HID_DLGDEPOT_3_TXTSTARTDATE" +#define HID_DLGDEPOT_3_TXTENDDATE "WIZARDS_HID_DLGDEPOT_3_TXTENDDATE" +#define HID_DLGDEPOT_3_OPTDAILY "WIZARDS_HID_DLGDEPOT_3_OPTDAILY" +#define HID_DLGDEPOT_3_OPTWEEKLY "WIZARDS_HID_DLGDEPOT_3_OPTWEEKLY" +#define HID_DLGDEPOT_DIALOG_HISTORY "WIZARDS_HID_DLGDEPOT_DIALOG_HISTORY" +#define HID_DLGDEPOT_LSTMARKETS "WIZARDS_HID_DLGDEPOT_LSTMARKETS" +#define HID_DLGDEPOT_0_CMDCANCEL_HISTORY "WIZARDS_HID_DLGDEPOT_0_CMDCANCEL_HISTORY" +#define HID_DLGDEPOT_0_CMDGOON_HISTORY "WIZARDS_HID_DLGDEPOT_0_CMDGOON_HISTORY" + +#define HID_DLGIMPORT_DIALOG "WIZARDS_HID_DLGIMPORT_DIALOG" +#define HID_DLGIMPORT_0_CMDHELP "WIZARDS_HID_DLGIMPORT_0_CMDHELP" +#define HID_DLGIMPORT_0_CMDCANCEL "WIZARDS_HID_DLGIMPORT_0_CMDCANCEL" +#define HID_DLGIMPORT_0_CMDPREV "WIZARDS_HID_DLGIMPORT_0_CMDPREV" +#define HID_DLGIMPORT_0_CMDNEXT "WIZARDS_HID_DLGIMPORT_0_CMDNEXT" +#define HID_DLGIMPORT_0_OPTSODOCUMENTS "WIZARDS_HID_DLGIMPORT_0_OPTSODOCUMENTS" +#define HID_DLGIMPORT_0_OPTMSDOCUMENTS "WIZARDS_HID_DLGIMPORT_0_OPTMSDOCUMENTS" +#define HID_DLGIMPORT_0_CHKLOGFILE "WIZARDS_HID_DLGIMPORT_0_CHKLOGFILE" +#define HID_DLGIMPORT_2_CHKWORD "WIZARDS_HID_DLGIMPORT_2_CHKWORD" +#define HID_DLGIMPORT_2_CHKEXCEL "WIZARDS_HID_DLGIMPORT_2_CHKEXCEL" +#define HID_DLGIMPORT_2_CHKPOWERPOINT "WIZARDS_HID_DLGIMPORT_2_CHKPOWERPOINT" +#define HID_DLGIMPORT_2_CBTEMPLATE "WIZARDS_HID_DLGIMPORT_2_CBTEMPLATE" +#define HID_DLGIMPORT_2_CBTEMPLATERECURSE "WIZARDS_HID_DLGIMPORT_2_CBTEMPLATERECURSE" +#define HID_DLGIMPORT_2_LBTEMPLATEPATH "WIZARDS_HID_DLGIMPORT_2_LBTEMPLATEPATH" +#define HID_DLGIMPORT_2_EDTEMPLATEPATH "WIZARDS_HID_DLGIMPORT_2_EDTEMPLATEPATH" +#define HID_DLGIMPORT_2_CBDOCUMENT "WIZARDS_HID_DLGIMPORT_2_CBDOCUMENT" +#define HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT "WIZARDS_HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT" +#define HID_DLGIMPORT_2_CBDOCUMENT "WIZARDS_HID_DLGIMPORT_2_CBDOCUMENT" +#define HID_DLGIMPORT_2_CBDOCUMENTRECURSE "WIZARDS_HID_DLGIMPORT_2_CBDOCUMENTRECURSE" +#define HID_DLGIMPORT_2_LBDOCUMENTPATH "WIZARDS_HID_DLGIMPORT_2_LBDOCUMENTPATH" +#define HID_DLGIMPORT_2_EDDOCUMENTPATH "WIZARDS_HID_DLGIMPORT_2_EDDOCUMENTPATH" +#define HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT "WIZARDS_HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT" +#define HID_DLGIMPORT_2_LBEXPORTDOCUMENTPATH "WIZARDS_HID_DLGIMPORT_2_LBEXPORTDOCUMENTPATH" +#define HID_DLGIMPORT_2_EDEXPORTDOCUMENTPATH "WIZARDS_HID_DLGIMPORT_2_EDEXPORTDOCUMENTPATH" +#define HID_DLGIMPORT_2_CMDEXPORTPATHSELECT "WIZARDS_HID_DLGIMPORT_2_CMDEXPORTPATHSELECT" +#define HID_DLGIMPORT_3_TBSUMMARY "WIZARDS_HID_DLGIMPORT_3_TBSUMMARY" + +#define HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT2 "WIZARDS_HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT2" +#define HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT2 "WIZARDS_HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT2" + + +#define HID_DLGIMPORT_0_CHKWRITER "WIZARDS_HID_DLGIMPORT_0_CHKWRITER" +#define HID_DLGIMPORT_0_CHKCALC "WIZARDS_HID_DLGIMPORT_0_CHKCALC" +#define HID_DLGIMPORT_0_CHKIMPRESS "WIZARDS_HID_DLGIMPORT_0_CHKIMPRESS" +#define HID_DLGIMPORT_0_CHKMATHGLOBAL "WIZARDS_HID_DLGIMPORT_0_CHKMATHGLOBAL" + + +#define HID_DLGCORRESPONDENCE_DIALOG "WIZARDS_HID_DLGCORRESPONDENCE_DIALOG" +#define HID_DLGCORRESPONDENCE_CANCEL "WIZARDS_HID_DLGCORRESPONDENCE_CANCEL" +#define HID_DLGCORRESPONDENCE_OPTIONAGENDA1 "WIZARDS_HID_DLGCORRESPONDENCE_OPTIONAGENDA1" +#define HID_DLGCORRESPONDENCE_OPTIONAGENDA2 "WIZARDS_HID_DLGCORRESPONDENCE_OPTIONAGENDA2" +#define HID_DLGCORRESPONDENCE_AGENDAOKAY "WIZARDS_HID_DLGCORRESPONDENCE_AGENDAOKAY" +#define HID_DLGCORRESPONDENCE_OPTIONLETTER1 "WIZARDS_HID_DLGCORRESPONDENCE_OPTIONLETTER1" +#define HID_DLGCORRESPONDENCE_OPTIONLETTER2 "WIZARDS_HID_DLGCORRESPONDENCE_OPTIONLETTER2" +#define HID_DLGCORRESPONDENCE_LETTEROKAY "WIZARDS_HID_DLGCORRESPONDENCE_LETTEROKAY" + +#define HID_DLGSTYLES_DIALOG "WIZARDS_HID_DLGSTYLES_DIALOG" +#define HID_DLGSTYLES_LISTBOX "WIZARDS_HID_DLGSTYLES_LISTBOX" +#define HID_DLGSTYLES_CANCEL "WIZARDS_HID_DLGSTYLES_CANCEL" +#define HID_DLGSTYLES_OKAY "WIZARDS_HID_DLGSTYLES_OKAY" + +#define HID_DLGCONVERT_DIALOG "WIZARDS_HID_DLGCONVERT_DIALOG" +#define HID_DLGCONVERT_CHECKBOX1 "WIZARDS_HID_DLGCONVERT_CHECKBOX1" +#define HID_DLGCONVERT_OPTIONBUTTON1 "WIZARDS_HID_DLGCONVERT_OPTIONBUTTON1" +#define HID_DLGCONVERT_OPTIONBUTTON2 "WIZARDS_HID_DLGCONVERT_OPTIONBUTTON2" +#define HID_DLGCONVERT_OPTIONBUTTON3 "WIZARDS_HID_DLGCONVERT_OPTIONBUTTON3" +#define HID_DLGCONVERT_OPTIONBUTTON4 "WIZARDS_HID_DLGCONVERT_OPTIONBUTTON4" +#define HID_DLGCONVERT_LISTBOX1 "WIZARDS_HID_DLGCONVERT_LISTBOX1" +#define HID_DLGCONVERT_OBFILE "WIZARDS_HID_DLGCONVERT_OBFILE" +#define HID_DLGCONVERT_OBDIR "WIZARDS_HID_DLGCONVERT_OBDIR" +#define HID_DLGCONVERT_COMBOBOX1 "WIZARDS_HID_DLGCONVERT_COMBOBOX1" +#define HID_DLGCONVERT_TBSOURCE "WIZARDS_HID_DLGCONVERT_TBSOURCE" +#define HID_DLGCONVERT_CHECKRECURSIVE "WIZARDS_HID_DLGCONVERT_CHECKRECURSIVE" +#define HID_DLGCONVERT_TBTARGET "WIZARDS_HID_DLGCONVERT_TBTARGET" +#define HID_DLGCONVERT_CBCANCEL "WIZARDS_HID_DLGCONVERT_CBCANCEL" +#define HID_DLGCONVERT_CBHELP "WIZARDS_HID_DLGCONVERT_CBHELP" +#define HID_DLGCONVERT_CBBACK "WIZARDS_HID_DLGCONVERT_CBBACK" +#define HID_DLGCONVERT_CBGOON "WIZARDS_HID_DLGCONVERT_CBGOON" +#define HID_DLGCONVERT_CBSOURCEOPEN "WIZARDS_HID_DLGCONVERT_CBSOURCEOPEN" +#define HID_DLGCONVERT_CBTARGETOPEN "WIZARDS_HID_DLGCONVERT_CBTARGETOPEN" +#define HID_DLGCONVERT_CHKPROTECT "WIZARDS_HID_DLGCONVERT_CHKPROTECT" +#define HID_DLGCONVERT_CHKTEXTDOCUMENTS "WIZARDS_HID_DLGCONVERT_CHKTEXTDOCUMENTS" + +#define HID_DLGPASSWORD_CMDGOON "WIZARDS_HID_DLGPASSWORD_CMDGOON" +#define HID_DLGPASSWORD_CMDCANCEL "WIZARDS_HID_DLGPASSWORD_CMDCANCEL" +#define HID_DLGPASSWORD_CMDHELP "WIZARDS_HID_DLGPASSWORD_CMDHELP" +#define HID_DLGPASSWORD_TXTPASSWORD "WIZARDS_HID_DLGPASSWORD_TXTPASSWORD" + +#define HID_DLGHOLIDAYCAL_DIALOG "WIZARDS_HID_DLGHOLIDAYCAL_DIALOG" +#define HID_DLGHOLIDAYCAL_1_PREVIEW "WIZARDS_HID_DLGHOLIDAYCAL_1_PREVIEW" +#define HID_DLGHOLIDAYCAL_1_OPYEAR "WIZARDS_HID_DLGHOLIDAYCAL_1_OPYEAR" +#define HID_DLGHOLIDAYCAL_1_OPMONTH "WIZARDS_HID_DLGHOLIDAYCAL_1_OPMONTH" +#define HID_DLGHOLIDAYCAL_1_EDYEAR "WIZARDS_HID_DLGHOLIDAYCAL_1_EDYEAR" +#define HID_DLGHOLIDAYCAL_1_EDMONTH "WIZARDS_HID_DLGHOLIDAYCAL_1_EDMONTH" +#define HID_DLGHOLIDAYCAL_1_SPINYEAR "WIZARDS_HID_DLGHOLIDAYCAL_1_SPINYEAR" +#define HID_DLGHOLIDAYCAL_1_SPINMONTH "WIZARDS_HID_DLGHOLIDAYCAL_1_SPINMONTH" +#define HID_DLGHOLIDAYCAL_1_CMBSTATE "WIZARDS_HID_DLGHOLIDAYCAL_1_CMBSTATE" +#define HID_DLGHOLIDAYCAL_2_LBOWNDATA "WIZARDS_HID_DLGHOLIDAYCAL_2_LBOWNDATA" +#define HID_DLGHOLIDAYCAL_2_CMDINSERT "WIZARDS_HID_DLGHOLIDAYCAL_2_CMDINSERT" +#define HID_DLGHOLIDAYCAL_2_CMDDELETE "WIZARDS_HID_DLGHOLIDAYCAL_2_CMDDELETE" +#define HID_DLGHOLIDAYCAL_2_EDEVENT "WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENT" +#define HID_DLGHOLIDAYCAL_2_CHKEVENT "WIZARDS_HID_DLGHOLIDAYCAL_2_CHKEVENT" +#define HID_DLGHOLIDAYCAL_2_EDEVENTDAY "WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENTDAY" +#define HID_DLGHOLIDAYCAL_2_SPINEVENTDAY "WIZARDS_HID_DLGHOLIDAYCAL_2_SPINEVENTDAY" +#define HID_DLGHOLIDAYCAL_2_EDEVENTMONTH "WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENTMONTH" +#define HID_DLGHOLIDAYCAL_2_SPINEVENTMONTH "WIZARDS_HID_DLGHOLIDAYCAL_2_SPINEVENTMONTH" +#define HID_DLGHOLIDAYCAL_2_EDEVENTYEAR "WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENTYEAR" +#define HID_DLGHOLIDAYCAL_2_SPINEVENTYEAR "WIZARDS_HID_DLGHOLIDAYCAL_2_SPINEVENTYEAR" +#define HID_DLGHOLIDAYCAL_0_CMDOWNDATA "WIZARDS_HID_DLGHOLIDAYCAL_0_CMDOWNDATA" +#define HID_DLGHOLIDAYCAL_0_CMDCANCEL "WIZARDS_HID_DLGHOLIDAYCAL_0_CMDCANCEL" +#define HID_DLGHOLIDAYCAL_0_CMDOK "WIZARDS_HID_DLGHOLIDAYCAL_0_CMDOK" //End at 34767 //Start at 40768 //LetterWizard--------------------------- -#define HID_LTRWIZ_OPTBUSINESSLETTER "HID:40769" -#define HID_LTRWIZ_OPTPRIVOFFICIALLETTER "HID:40770" -#define HID_LTRWIZ_OPTPRIVATELETTER "HID:40771" -#define HID_LTRWIZ_LSTBUSINESSSTYLE "HID:40772" -#define HID_LTRWIZ_CHKBUSINESSPAPER "HID:40773" -#define HID_LTRWIZ_LSTPRIVOFFICIALSTYLE "HID:40774" -#define HID_LTRWIZ_LSTPRIVATESTYLE "HID:40775" -#define HID_LTRWIZ_CHKPAPERCOMPANYLOGO "HID:40776" -#define HID_LTRWIZ_NUMLOGOHEIGHT "HID:40777" -#define HID_LTRWIZ_NUMLOGOX "HID:40778" -#define HID_LTRWIZ_NUMLOGOWIDTH "HID:40779" -#define HID_LTRWIZ_NUMLOGOY "HID:40780" -#define HID_LTRWIZ_CHKPAPERCOMPANYADDRESS "HID:40781" -#define HID_LTRWIZ_NUMADDRESSHEIGHT "HID:40782" -#define HID_LTRWIZ_NUMADDRESSX "HID:40783" -#define HID_LTRWIZ_NUMADDRESSWIDTH "HID:40784" -#define HID_LTRWIZ_NUMADDRESSY "HID:40785" -#define HID_LTRWIZ_CHKCOMPANYRECEIVER "HID:40786" -#define HID_LTRWIZ_CHKPAPERFOOTER "HID:40787" -#define HID_LTRWIZ_NUMFOOTERHEIGHT "HID:40788" -#define HID_LTRWIZ_LSTLETTERNORM "HID:40789" -#define HID_LTRWIZ_CHKUSELOGO "HID:40790" -#define HID_LTRWIZ_CHKUSEADDRESSRECEIVER "HID:40791" -#define HID_LTRWIZ_CHKUSESIGNS "HID:40792" -#define HID_LTRWIZ_CHKUSESUBJECT "HID:40793" -#define HID_LTRWIZ_CHKUSESALUTATION "HID:40794" -#define HID_LTRWIZ_LSTSALUTATION "HID:40795" -#define HID_LTRWIZ_CHKUSEBENDMARKS "HID:40796" -#define HID_LTRWIZ_CHKUSEGREETING "HID:40797" -#define HID_LTRWIZ_LSTGREETING "HID:40798" -#define HID_LTRWIZ_CHKUSEFOOTER "HID:40799" -#define HID_LTRWIZ_OPTSENDERPLACEHOLDER "HID:40800" -#define HID_LTRWIZ_OPTSENDERDEFINE "HID:40801" -#define HID_LTRWIZ_TXTSENDERNAME "HID:40802" -#define HID_LTRWIZ_TXTSENDERSTREET "HID:40803" -#define HID_LTRWIZ_TXTSENDERPOSTCODE "HID:40804" -#define HID_LTRWIZ_TXTSENDERSTATE_TEXT "HID:40805" -#define HID_LTRWIZ_TXTSENDERCITY "HID:40806" -#define HID_LTRWIZ_OPTRECEIVERPLACEHOLDER "HID:40807" -#define HID_LTRWIZ_OPTRECEIVERDATABASE "HID:40808" -#define HID_LTRWIZ_TXTFOOTER "HID:40809" -#define HID_LTRWIZ_CHKFOOTERNEXTPAGES "HID:40810" -#define HID_LTRWIZ_CHKFOOTERPAGENUMBERS "HID:40811" -#define HID_LTRWIZ_TXTTEMPLATENAME "HID:40812" -#define HID_LTRWIZ_OPTCREATELETTER "HID:40813" -#define HID_LTRWIZ_OPTMAKECHANGES "HID:40814" -#define HID_LTRWIZ_TXTPATH "HID:40815" -#define HID_LTRWIZ_CMDPATH "HID:40816" - -#define HID_LTRWIZARD "HID:40820" -#define HID_LTRWIZARD_HELP "HID:40821" -#define HID_LTRWIZARD_BACK "HID:40822" -#define HID_LTRWIZARD_NEXT "HID:40823" -#define HID_LTRWIZARD_CREATE "HID:40824" -#define HID_LTRWIZARD_CANCEL "HID:40825" - -#define HID_QUERYWIZARD_LSTTABLES "HID:40850" -#define HID_QUERYWIZARD_LSTFIELDS "HID:40851" -#define HID_QUERYWIZARD_CMDMOVESELECTED "HID:40852" -#define HID_QUERYWIZARD_CMDMOVEALL "HID:40853" -#define HID_QUERYWIZARD_CMDREMOVESELECTED "HID:40854" -#define HID_QUERYWIZARD_CMDREMOVEALL "HID:40855" -#define HID_QUERYWIZARD_LSTSELFIELDS "HID:40856" -#define HID_QUERYWIZARD_CMDMOVEUP "HID:40857" -#define HID_QUERYWIZARD_CMDMOVEDOWN "HID:40858" - -#define HID_QUERYWIZARD_SORT1 "HID:40865" -#define HID_QUERYWIZARD_OPTASCEND1 "HID:40866" -#define HID_QUERYWIZARD_OPTDESCEND1 "HID:40867" -#define HID_QUERYWIZARD_SORT2 "HID:40868" -#define HID_QUERYWIZARD_OPTASCEND2 "HID:40869" -#define HID_QUERYWIZARD_OPTDESCEND2 "HID:40870" -#define HID_QUERYWIZARD_SORT3 "HID:40871" -#define HID_QUERYWIZARD_OPTASCEND3 "HID:40872" -#define HID_QUERYWIZARD_OPTDESCEND3 "HID:40873" -#define HID_QUERYWIZARD_SORT4 "HID:40874" -#define HID_QUERYWIZARD_OPTASCEND4 "HID:40875" -#define HID_QUERYWIZARD_OPTDESCEND4 "HID:40876" - -#define HID_QUERYWIZARD_OPTMATCHALL "HID:40878" -#define HID_QUERYWIZARD_OPTMATCHANY "HID:40879" - -#define HID_QUERYWIZARD_LSTFIELDNAME_1 "HID:40880" -#define HID_QUERYWIZARD_LSTOPERATOR_1 "HID:40881" -#define HID_QUERYWIZARD_TXTVALUE_1 "HID:40882" -#define HID_QUERYWIZARD_LSTFIELDNAME_2 "HID:40883" -#define HID_QUERYWIZARD_LSTOPERATOR_2 "HID:40884" -#define HID_QUERYWIZARD_TXTVALUE_2 "HID:40885" -#define HID_QUERYWIZARD_LSTFIELDNAME_3 "HID:40886" -#define HID_QUERYWIZARD_LSTOPERATOR_3 "HID:40887" -#define HID_QUERYWIZARD_TXTVALUE_3 "HID:40888" - -#define HID_QUERYWIZARD_OPTAGGREGATEDETAILQUERY "HID:40895" -#define HID_QUERYWIZARD_OPTAGGREGATESUMMARYQUERY "HID:40896" -#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_1 "HID:40897" -#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_1 "HID:40898" -#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_2 "HID:40899" -#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_2 "HID:40900" -#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_3 "HID:40901" -#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_3 "HID:40902" -#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_4 "HID:40903" -#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_4 "HID:40904" -#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_5 "HID:40905" -#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_5 "HID:40906" -#define HID_QUERYWIZARD_BTNAGGREGATEPLUS "HID:40907" -#define HID_QUERYWIZARD_BTNAGGREGATEMINUS "HID:40908" - -#define HID_QUERYWIZARD_LSTFILTERFIELDS "HID:40915" -#define HID_QUERYWIZARD_CMDFILTERMOVESELECTED "HID:40916" -#define HID_QUERYWIZARD_CMDFILTERREMOVESELECTED "HID:40917" -#define HID_QUERYWIZARD_LSTFILTERSELFIELDS "HID:40918" -#define HID_QUERYWIZARD_CMDFILTERMOVEUP "HID:40919" -#define HID_QUERYWIZARD_CMDFILTERMOVEDOWN "HID:40920" - -#define HID_QUERYWIZARD_OPTGROUPMATCHALL "HID:40923" -#define HID_QUERYWIZARD_OPTGROUPMATCHANY "HID:40924" - -#define HID_QUERYWIZARD_LSTFILTERFIELDNAME_1 "HID:40925" -#define HID_QUERYWIZARD_LSTFILTEROPERATOR_1 "HID:40926" -#define HID_QUERYWIZARD_TXTFILTERVALUE_1 "HID:40927" -#define HID_QUERYWIZARD_LSTFILTERFIELDNAME_2 "HID:40928" -#define HID_QUERYWIZARD_LSTFILTEROPERATOR_2 "HID:40929" -#define HID_QUERYWIZARD_TXTFILTERVALUE_2 "HID:40930" -#define HID_QUERYWIZARD_LSTFILTERFIELDNAME_3 "HID:40931" -#define HID_QUERYWIZARD_LSTFILTEROPERATOR_3 "HID:40932" -#define HID_QUERYWIZARD_TXTFILTERVALUE_3 "HID:40933" - -#define HID_QUERYWIZARD_TXTTITLE_1 "HID:40940" -#define HID_QUERYWIZARD_TXTTITLE_2 "HID:40941" -#define HID_QUERYWIZARD_TXTTITLE_3 "HID:40942" -#define HID_QUERYWIZARD_TXTTITLE_4 "HID:40943" -#define HID_QUERYWIZARD_TXTTITLE_5 "HID:40944" -#define HID_QUERYWIZARD_TXTTITLE_6 "HID:40945" -#define HID_QUERYWIZARD_TXTTITLE_7 "HID:40946" - -#define HID_QUERYWIZARD_TXTQUERYTITLE "HID:40955" -#define HID_QUERYWIZARD_OPTDISPLAYQUERY "HID:40956" -#define HID_QUERYWIZARD_OPTMODIFYQUERY "HID:40957" -#define HID_QUERYWIZARD_TXTSUMMARY "HID:40958" - -#define HID_QUERYWIZARD "HID:40970" -#define HID_QUERYWIZARD_BACK "HID:40972" -#define HID_QUERYWIZARD_NEXT "HID:40973" -#define HID_QUERYWIZARD_CREATE "HID:40974" -#define HID_QUERYWIZARD_CANCEL "HID:40975" +#define HID_LTRWIZ_OPTBUSINESSLETTER "WIZARDS_HID_LTRWIZ_OPTBUSINESSLETTER" +#define HID_LTRWIZ_OPTPRIVOFFICIALLETTER "WIZARDS_HID_LTRWIZ_OPTPRIVOFFICIALLETTER" +#define HID_LTRWIZ_OPTPRIVATELETTER "WIZARDS_HID_LTRWIZ_OPTPRIVATELETTER" +#define HID_LTRWIZ_LSTBUSINESSSTYLE "WIZARDS_HID_LTRWIZ_LSTBUSINESSSTYLE" +#define HID_LTRWIZ_CHKBUSINESSPAPER "WIZARDS_HID_LTRWIZ_CHKBUSINESSPAPER" +#define HID_LTRWIZ_LSTPRIVOFFICIALSTYLE "WIZARDS_HID_LTRWIZ_LSTPRIVOFFICIALSTYLE" +#define HID_LTRWIZ_LSTPRIVATESTYLE "WIZARDS_HID_LTRWIZ_LSTPRIVATESTYLE" +#define HID_LTRWIZ_CHKPAPERCOMPANYLOGO "WIZARDS_HID_LTRWIZ_CHKPAPERCOMPANYLOGO" +#define HID_LTRWIZ_NUMLOGOHEIGHT "WIZARDS_HID_LTRWIZ_NUMLOGOHEIGHT" +#define HID_LTRWIZ_NUMLOGOX "WIZARDS_HID_LTRWIZ_NUMLOGOX" +#define HID_LTRWIZ_NUMLOGOWIDTH "WIZARDS_HID_LTRWIZ_NUMLOGOWIDTH" +#define HID_LTRWIZ_NUMLOGOY "WIZARDS_HID_LTRWIZ_NUMLOGOY" +#define HID_LTRWIZ_CHKPAPERCOMPANYADDRESS "WIZARDS_HID_LTRWIZ_CHKPAPERCOMPANYADDRESS" +#define HID_LTRWIZ_NUMADDRESSHEIGHT "WIZARDS_HID_LTRWIZ_NUMADDRESSHEIGHT" +#define HID_LTRWIZ_NUMADDRESSX "WIZARDS_HID_LTRWIZ_NUMADDRESSX" +#define HID_LTRWIZ_NUMADDRESSWIDTH "WIZARDS_HID_LTRWIZ_NUMADDRESSWIDTH" +#define HID_LTRWIZ_NUMADDRESSY "WIZARDS_HID_LTRWIZ_NUMADDRESSY" +#define HID_LTRWIZ_CHKCOMPANYRECEIVER "WIZARDS_HID_LTRWIZ_CHKCOMPANYRECEIVER" +#define HID_LTRWIZ_CHKPAPERFOOTER "WIZARDS_HID_LTRWIZ_CHKPAPERFOOTER" +#define HID_LTRWIZ_NUMFOOTERHEIGHT "WIZARDS_HID_LTRWIZ_NUMFOOTERHEIGHT" +#define HID_LTRWIZ_LSTLETTERNORM "WIZARDS_HID_LTRWIZ_LSTLETTERNORM" +#define HID_LTRWIZ_CHKUSELOGO "WIZARDS_HID_LTRWIZ_CHKUSELOGO" +#define HID_LTRWIZ_CHKUSEADDRESSRECEIVER "WIZARDS_HID_LTRWIZ_CHKUSEADDRESSRECEIVER" +#define HID_LTRWIZ_CHKUSESIGNS "WIZARDS_HID_LTRWIZ_CHKUSESIGNS" +#define HID_LTRWIZ_CHKUSESUBJECT "WIZARDS_HID_LTRWIZ_CHKUSESUBJECT" +#define HID_LTRWIZ_CHKUSESALUTATION "WIZARDS_HID_LTRWIZ_CHKUSESALUTATION" +#define HID_LTRWIZ_LSTSALUTATION "WIZARDS_HID_LTRWIZ_LSTSALUTATION" +#define HID_LTRWIZ_CHKUSEBENDMARKS "WIZARDS_HID_LTRWIZ_CHKUSEBENDMARKS" +#define HID_LTRWIZ_CHKUSEGREETING "WIZARDS_HID_LTRWIZ_CHKUSEGREETING" +#define HID_LTRWIZ_LSTGREETING "WIZARDS_HID_LTRWIZ_LSTGREETING" +#define HID_LTRWIZ_CHKUSEFOOTER "WIZARDS_HID_LTRWIZ_CHKUSEFOOTER" +#define HID_LTRWIZ_OPTSENDERPLACEHOLDER "WIZARDS_HID_LTRWIZ_OPTSENDERPLACEHOLDER" +#define HID_LTRWIZ_OPTSENDERDEFINE "WIZARDS_HID_LTRWIZ_OPTSENDERDEFINE" +#define HID_LTRWIZ_TXTSENDERNAME "WIZARDS_HID_LTRWIZ_TXTSENDERNAME" +#define HID_LTRWIZ_TXTSENDERSTREET "WIZARDS_HID_LTRWIZ_TXTSENDERSTREET" +#define HID_LTRWIZ_TXTSENDERPOSTCODE "WIZARDS_HID_LTRWIZ_TXTSENDERPOSTCODE" +#define HID_LTRWIZ_TXTSENDERSTATE_TEXT "WIZARDS_HID_LTRWIZ_TXTSENDERSTATE_TEXT" +#define HID_LTRWIZ_TXTSENDERCITY "WIZARDS_HID_LTRWIZ_TXTSENDERCITY" +#define HID_LTRWIZ_OPTRECEIVERPLACEHOLDER "WIZARDS_HID_LTRWIZ_OPTRECEIVERPLACEHOLDER" +#define HID_LTRWIZ_OPTRECEIVERDATABASE "WIZARDS_HID_LTRWIZ_OPTRECEIVERDATABASE" +#define HID_LTRWIZ_TXTFOOTER "WIZARDS_HID_LTRWIZ_TXTFOOTER" +#define HID_LTRWIZ_CHKFOOTERNEXTPAGES "WIZARDS_HID_LTRWIZ_CHKFOOTERNEXTPAGES" +#define HID_LTRWIZ_CHKFOOTERPAGENUMBERS "WIZARDS_HID_LTRWIZ_CHKFOOTERPAGENUMBERS" +#define HID_LTRWIZ_TXTTEMPLATENAME "WIZARDS_HID_LTRWIZ_TXTTEMPLATENAME" +#define HID_LTRWIZ_OPTCREATELETTER "WIZARDS_HID_LTRWIZ_OPTCREATELETTER" +#define HID_LTRWIZ_OPTMAKECHANGES "WIZARDS_HID_LTRWIZ_OPTMAKECHANGES" +#define HID_LTRWIZ_TXTPATH "WIZARDS_HID_LTRWIZ_TXTPATH" +#define HID_LTRWIZ_CMDPATH "WIZARDS_HID_LTRWIZ_CMDPATH" + +#define HID_LTRWIZARD "WIZARDS_HID_LTRWIZARD" +#define HID_LTRWIZARD_HELP "WIZARDS_HID_LTRWIZARD_HELP" +#define HID_LTRWIZARD_BACK "WIZARDS_HID_LTRWIZARD_BACK" +#define HID_LTRWIZARD_NEXT "WIZARDS_HID_LTRWIZARD_NEXT" +#define HID_LTRWIZARD_CREATE "WIZARDS_HID_LTRWIZARD_CREATE" +#define HID_LTRWIZARD_CANCEL "WIZARDS_HID_LTRWIZARD_CANCEL" + +#define HID_QUERYWIZARD_LSTTABLES "WIZARDS_HID_QUERYWIZARD_LSTTABLES" +#define HID_QUERYWIZARD_LSTFIELDS "WIZARDS_HID_QUERYWIZARD_LSTFIELDS" +#define HID_QUERYWIZARD_CMDMOVESELECTED "WIZARDS_HID_QUERYWIZARD_CMDMOVESELECTED" +#define HID_QUERYWIZARD_CMDMOVEALL "WIZARDS_HID_QUERYWIZARD_CMDMOVEALL" +#define HID_QUERYWIZARD_CMDREMOVESELECTED "WIZARDS_HID_QUERYWIZARD_CMDREMOVESELECTED" +#define HID_QUERYWIZARD_CMDREMOVEALL "WIZARDS_HID_QUERYWIZARD_CMDREMOVEALL" +#define HID_QUERYWIZARD_LSTSELFIELDS "WIZARDS_HID_QUERYWIZARD_LSTSELFIELDS" +#define HID_QUERYWIZARD_CMDMOVEUP "WIZARDS_HID_QUERYWIZARD_CMDMOVEUP" +#define HID_QUERYWIZARD_CMDMOVEDOWN "WIZARDS_HID_QUERYWIZARD_CMDMOVEDOWN" + +#define HID_QUERYWIZARD_SORT1 "WIZARDS_HID_QUERYWIZARD_SORT1" +#define HID_QUERYWIZARD_OPTASCEND1 "WIZARDS_HID_QUERYWIZARD_OPTASCEND1" +#define HID_QUERYWIZARD_OPTDESCEND1 "WIZARDS_HID_QUERYWIZARD_OPTDESCEND1" +#define HID_QUERYWIZARD_SORT2 "WIZARDS_HID_QUERYWIZARD_SORT2" +#define HID_QUERYWIZARD_OPTASCEND2 "WIZARDS_HID_QUERYWIZARD_OPTASCEND2" +#define HID_QUERYWIZARD_OPTDESCEND2 "WIZARDS_HID_QUERYWIZARD_OPTDESCEND2" +#define HID_QUERYWIZARD_SORT3 "WIZARDS_HID_QUERYWIZARD_SORT3" +#define HID_QUERYWIZARD_OPTASCEND3 "WIZARDS_HID_QUERYWIZARD_OPTASCEND3" +#define HID_QUERYWIZARD_OPTDESCEND3 "WIZARDS_HID_QUERYWIZARD_OPTDESCEND3" +#define HID_QUERYWIZARD_SORT4 "WIZARDS_HID_QUERYWIZARD_SORT4" +#define HID_QUERYWIZARD_OPTASCEND4 "WIZARDS_HID_QUERYWIZARD_OPTASCEND4" +#define HID_QUERYWIZARD_OPTDESCEND4 "WIZARDS_HID_QUERYWIZARD_OPTDESCEND4" + +#define HID_QUERYWIZARD_OPTMATCHALL "WIZARDS_HID_QUERYWIZARD_OPTMATCHALL" +#define HID_QUERYWIZARD_OPTMATCHANY "WIZARDS_HID_QUERYWIZARD_OPTMATCHANY" + +#define HID_QUERYWIZARD_LSTFIELDNAME_1 "WIZARDS_HID_QUERYWIZARD_LSTFIELDNAME_1" +#define HID_QUERYWIZARD_LSTOPERATOR_1 "WIZARDS_HID_QUERYWIZARD_LSTOPERATOR_1" +#define HID_QUERYWIZARD_TXTVALUE_1 "WIZARDS_HID_QUERYWIZARD_TXTVALUE_1" +#define HID_QUERYWIZARD_LSTFIELDNAME_2 "WIZARDS_HID_QUERYWIZARD_LSTFIELDNAME_2" +#define HID_QUERYWIZARD_LSTOPERATOR_2 "WIZARDS_HID_QUERYWIZARD_LSTOPERATOR_2" +#define HID_QUERYWIZARD_TXTVALUE_2 "WIZARDS_HID_QUERYWIZARD_TXTVALUE_2" +#define HID_QUERYWIZARD_LSTFIELDNAME_3 "WIZARDS_HID_QUERYWIZARD_LSTFIELDNAME_3" +#define HID_QUERYWIZARD_LSTOPERATOR_3 "WIZARDS_HID_QUERYWIZARD_LSTOPERATOR_3" +#define HID_QUERYWIZARD_TXTVALUE_3 "WIZARDS_HID_QUERYWIZARD_TXTVALUE_3" + +#define HID_QUERYWIZARD_OPTAGGREGATEDETAILQUERY "WIZARDS_HID_QUERYWIZARD_OPTAGGREGATEDETAILQUERY" +#define HID_QUERYWIZARD_OPTAGGREGATESUMMARYQUERY "WIZARDS_HID_QUERYWIZARD_OPTAGGREGATESUMMARYQUERY" +#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_1 "WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_1" +#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_1 "WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_1" +#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_2 "WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_2" +#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_2 "WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_2" +#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_3 "WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_3" +#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_3 "WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_3" +#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_4 "WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_4" +#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_4 "WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_4" +#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_5 "WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_5" +#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_5 "WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_5" +#define HID_QUERYWIZARD_BTNAGGREGATEPLUS "WIZARDS_HID_QUERYWIZARD_BTNAGGREGATEPLUS" +#define HID_QUERYWIZARD_BTNAGGREGATEMINUS "WIZARDS_HID_QUERYWIZARD_BTNAGGREGATEMINUS" + +#define HID_QUERYWIZARD_LSTFILTERFIELDS "WIZARDS_HID_QUERYWIZARD_LSTFILTERFIELDS" +#define HID_QUERYWIZARD_CMDFILTERMOVESELECTED "WIZARDS_HID_QUERYWIZARD_CMDFILTERMOVESELECTED" +#define HID_QUERYWIZARD_CMDFILTERREMOVESELECTED "WIZARDS_HID_QUERYWIZARD_CMDFILTERREMOVESELECTED" +#define HID_QUERYWIZARD_LSTFILTERSELFIELDS "WIZARDS_HID_QUERYWIZARD_LSTFILTERSELFIELDS" +#define HID_QUERYWIZARD_CMDFILTERMOVEUP "WIZARDS_HID_QUERYWIZARD_CMDFILTERMOVEUP" +#define HID_QUERYWIZARD_CMDFILTERMOVEDOWN "WIZARDS_HID_QUERYWIZARD_CMDFILTERMOVEDOWN" + +#define HID_QUERYWIZARD_OPTGROUPMATCHALL "WIZARDS_HID_QUERYWIZARD_OPTGROUPMATCHALL" +#define HID_QUERYWIZARD_OPTGROUPMATCHANY "WIZARDS_HID_QUERYWIZARD_OPTGROUPMATCHANY" + +#define HID_QUERYWIZARD_LSTFILTERFIELDNAME_1 "WIZARDS_HID_QUERYWIZARD_LSTFILTERFIELDNAME_1" +#define HID_QUERYWIZARD_LSTFILTEROPERATOR_1 "WIZARDS_HID_QUERYWIZARD_LSTFILTEROPERATOR_1" +#define HID_QUERYWIZARD_TXTFILTERVALUE_1 "WIZARDS_HID_QUERYWIZARD_TXTFILTERVALUE_1" +#define HID_QUERYWIZARD_LSTFILTERFIELDNAME_2 "WIZARDS_HID_QUERYWIZARD_LSTFILTERFIELDNAME_2" +#define HID_QUERYWIZARD_LSTFILTEROPERATOR_2 "WIZARDS_HID_QUERYWIZARD_LSTFILTEROPERATOR_2" +#define HID_QUERYWIZARD_TXTFILTERVALUE_2 "WIZARDS_HID_QUERYWIZARD_TXTFILTERVALUE_2" +#define HID_QUERYWIZARD_LSTFILTERFIELDNAME_3 "WIZARDS_HID_QUERYWIZARD_LSTFILTERFIELDNAME_3" +#define HID_QUERYWIZARD_LSTFILTEROPERATOR_3 "WIZARDS_HID_QUERYWIZARD_LSTFILTEROPERATOR_3" +#define HID_QUERYWIZARD_TXTFILTERVALUE_3 "WIZARDS_HID_QUERYWIZARD_TXTFILTERVALUE_3" + +#define HID_QUERYWIZARD_TXTTITLE_1 "WIZARDS_HID_QUERYWIZARD_TXTTITLE_1" +#define HID_QUERYWIZARD_TXTTITLE_2 "WIZARDS_HID_QUERYWIZARD_TXTTITLE_2" +#define HID_QUERYWIZARD_TXTTITLE_3 "WIZARDS_HID_QUERYWIZARD_TXTTITLE_3" +#define HID_QUERYWIZARD_TXTTITLE_4 "WIZARDS_HID_QUERYWIZARD_TXTTITLE_4" +#define HID_QUERYWIZARD_TXTTITLE_5 "WIZARDS_HID_QUERYWIZARD_TXTTITLE_5" +#define HID_QUERYWIZARD_TXTTITLE_6 "WIZARDS_HID_QUERYWIZARD_TXTTITLE_6" +#define HID_QUERYWIZARD_TXTTITLE_7 "WIZARDS_HID_QUERYWIZARD_TXTTITLE_7" + +#define HID_QUERYWIZARD_TXTQUERYTITLE "WIZARDS_HID_QUERYWIZARD_TXTQUERYTITLE" +#define HID_QUERYWIZARD_OPTDISPLAYQUERY "WIZARDS_HID_QUERYWIZARD_OPTDISPLAYQUERY" +#define HID_QUERYWIZARD_OPTMODIFYQUERY "WIZARDS_HID_QUERYWIZARD_OPTMODIFYQUERY" +#define HID_QUERYWIZARD_TXTSUMMARY "WIZARDS_HID_QUERYWIZARD_TXTSUMMARY" + +#define HID_QUERYWIZARD "WIZARDS_HID_QUERYWIZARD" +#define HID_QUERYWIZARD_BACK "WIZARDS_HID_QUERYWIZARD_BACK" +#define HID_QUERYWIZARD_NEXT "WIZARDS_HID_QUERYWIZARD_NEXT" +#define HID_QUERYWIZARD_CREATE "WIZARDS_HID_QUERYWIZARD_CREATE" +#define HID_QUERYWIZARD_CANCEL "WIZARDS_HID_QUERYWIZARD_CANCEL" // ++++++++++++++++++++++++++++++++++++++ // +++ Web Wizard : Continued from 34312 // ++++++++++++++++++++++++++++++++++++++ // web wizard iconssets dialog -#define HID_IS "HID:41000" -#define HID_IS_BTN_NONE "HID:41002" -#define HID_IS_BTN_OK "HID:41003" -#define HID_IS_BTN_CANCEL "HID:41004" - -#define HID_IS_BTN_IMG1 "HID:41005" -#define HID_IS_BTN_IMG2 "HID:41006" -#define HID_IS_BTN_IMG3 "HID:41007" -#define HID_IS_BTN_IMG4 "HID:41008" -#define HID_IS_BTN_IMG5 "HID:41009" -#define HID_IS_BTN_IMG6 "HID:41010" -#define HID_IS_BTN_IMG7 "HID:41011" -#define HID_IS_BTN_IMG8 "HID:41012" -#define HID_IS_BTN_IMG9 "HID:41013" -#define HID_IS_BTN_IMG10 "HID:41014" -#define HID_IS_BTN_IMG11 "HID:41015" -#define HID_IS_BTN_IMG12 "HID:41016" -#define HID_IS_BTN_IMG13 "HID:41017" -#define HID_IS_BTN_IMG14 "HID:41018" -#define HID_IS_BTN_IMG15 "HID:41019" -#define HID_IS_BTN_IMG16 "HID:41020" -#define HID_IS_BTN_IMG17 "HID:41021" -#define HID_IS_BTN_IMG18 "HID:41022" -#define HID_IS_BTN_IMG19 "HID:41023" -#define HID_IS_BTN_IMG20 "HID:41024" -#define HID_IS_BTN_IMG21 "HID:41025" -#define HID_IS_BTN_IMG22 "HID:41026" -#define HID_IS_BTN_IMG23 "HID:41027" -#define HID_IS_BTN_IMG24 "HID:41028" -#define HID_IS_BTN_IMG25 "HID:41029" -#define HID_IS_BTN_IMG26 "HID:41030" -#define HID_IS_BTN_IMG27 "HID:41031" -#define HID_IS_BTN_IMG28 "HID:41032" -#define HID_IS_BTN_IMG29 "HID:41033" -#define HID_IS_BTN_IMG30 "HID:41034" -#define HID_IS_BTN_IMG31 "HID:41035" -#define HID_IS_BTN_IMG32 "HID:41036" +#define HID_IS "WIZARDS_HID_IS" +#define HID_IS_BTN_NONE "WIZARDS_HID_IS_BTN_NONE" +#define HID_IS_BTN_OK "WIZARDS_HID_IS_BTN_OK" +#define HID_IS_BTN_CANCEL "WIZARDS_HID_IS_BTN_CANCEL" + +#define HID_IS_BTN_IMG1 "WIZARDS_HID_IS_BTN_IMG1" +#define HID_IS_BTN_IMG2 "WIZARDS_HID_IS_BTN_IMG2" +#define HID_IS_BTN_IMG3 "WIZARDS_HID_IS_BTN_IMG3" +#define HID_IS_BTN_IMG4 "WIZARDS_HID_IS_BTN_IMG4" +#define HID_IS_BTN_IMG5 "WIZARDS_HID_IS_BTN_IMG5" +#define HID_IS_BTN_IMG6 "WIZARDS_HID_IS_BTN_IMG6" +#define HID_IS_BTN_IMG7 "WIZARDS_HID_IS_BTN_IMG7" +#define HID_IS_BTN_IMG8 "WIZARDS_HID_IS_BTN_IMG8" +#define HID_IS_BTN_IMG9 "WIZARDS_HID_IS_BTN_IMG9" +#define HID_IS_BTN_IMG10 "WIZARDS_HID_IS_BTN_IMG10" +#define HID_IS_BTN_IMG11 "WIZARDS_HID_IS_BTN_IMG11" +#define HID_IS_BTN_IMG12 "WIZARDS_HID_IS_BTN_IMG12" +#define HID_IS_BTN_IMG13 "WIZARDS_HID_IS_BTN_IMG13" +#define HID_IS_BTN_IMG14 "WIZARDS_HID_IS_BTN_IMG14" +#define HID_IS_BTN_IMG15 "WIZARDS_HID_IS_BTN_IMG15" +#define HID_IS_BTN_IMG16 "WIZARDS_HID_IS_BTN_IMG16" +#define HID_IS_BTN_IMG17 "WIZARDS_HID_IS_BTN_IMG17" +#define HID_IS_BTN_IMG18 "WIZARDS_HID_IS_BTN_IMG18" +#define HID_IS_BTN_IMG19 "WIZARDS_HID_IS_BTN_IMG19" +#define HID_IS_BTN_IMG20 "WIZARDS_HID_IS_BTN_IMG20" +#define HID_IS_BTN_IMG21 "WIZARDS_HID_IS_BTN_IMG21" +#define HID_IS_BTN_IMG22 "WIZARDS_HID_IS_BTN_IMG22" +#define HID_IS_BTN_IMG23 "WIZARDS_HID_IS_BTN_IMG23" +#define HID_IS_BTN_IMG24 "WIZARDS_HID_IS_BTN_IMG24" +#define HID_IS_BTN_IMG25 "WIZARDS_HID_IS_BTN_IMG25" +#define HID_IS_BTN_IMG26 "WIZARDS_HID_IS_BTN_IMG26" +#define HID_IS_BTN_IMG27 "WIZARDS_HID_IS_BTN_IMG27" +#define HID_IS_BTN_IMG28 "WIZARDS_HID_IS_BTN_IMG28" +#define HID_IS_BTN_IMG29 "WIZARDS_HID_IS_BTN_IMG29" +#define HID_IS_BTN_IMG30 "WIZARDS_HID_IS_BTN_IMG30" +#define HID_IS_BTN_IMG31 "WIZARDS_HID_IS_BTN_IMG31" +#define HID_IS_BTN_IMG32 "WIZARDS_HID_IS_BTN_IMG32" // web wizard ftp dialog -#define HID_FTP "HID:41040" -#define HID_FTP_SERVER "HID:41041" -#define HID_FTP_USERNAME "HID:41042" -#define HID_FTP_PASS "HID:41043" -#define HID_FTP_TEST "HID:41044" -#define HID_FTP_TXT_PATH "HID:41045" -#define HID_FTP_BTN_PATH "HID:41046" -#define HID_FTP_OK "HID:41047" -#define HID_FTP_CANCEL "HID:41048" +#define HID_FTP "WIZARDS_HID_FTP" +#define HID_FTP_SERVER "WIZARDS_HID_FTP_SERVER" +#define HID_FTP_USERNAME "WIZARDS_HID_FTP_USERNAME" +#define HID_FTP_PASS "WIZARDS_HID_FTP_PASS" +#define HID_FTP_TEST "WIZARDS_HID_FTP_TEST" +#define HID_FTP_TXT_PATH "WIZARDS_HID_FTP_TXT_PATH" +#define HID_FTP_BTN_PATH "WIZARDS_HID_FTP_BTN_PATH" +#define HID_FTP_OK "WIZARDS_HID_FTP_OK" +#define HID_FTP_CANCEL "WIZARDS_HID_FTP_CANCEL" /* ==================================== @@ -663,129 +663,129 @@ // step 0 - navibar -#define HID_AGWIZ "HID:41051" -#define HID_AGWIZ_HELP "HID:41052" -#define HID_AGWIZ_NEXT "HID:41053" -#define HID_AGWIZ_PREV "HID:41054" -#define HID_AGWIZ_CREATE "HID:41055" -#define HID_AGWIZ_CANCEL "HID:41056" +#define HID_AGWIZ "WIZARDS_HID_AGWIZ" +#define HID_AGWIZ_HELP "WIZARDS_HID_AGWIZ_HELP" +#define HID_AGWIZ_NEXT "WIZARDS_HID_AGWIZ_NEXT" +#define HID_AGWIZ_PREV "WIZARDS_HID_AGWIZ_PREV" +#define HID_AGWIZ_CREATE "WIZARDS_HID_AGWIZ_CREATE" +#define HID_AGWIZ_CANCEL "WIZARDS_HID_AGWIZ_CANCEL" //step 1 - design -#define HID_AGWIZ_1_LIST_PAGEDESIGN "HID:41057" -#define HID_AGWIZ_1_CHK_MINUTES "HID:41058" +#define HID_AGWIZ_1_LIST_PAGEDESIGN "WIZARDS_HID_AGWIZ_1_LIST_PAGEDESIGN" +#define HID_AGWIZ_1_CHK_MINUTES "WIZARDS_HID_AGWIZ_1_CHK_MINUTES" // step 2 - general attributes -#define HID_AGWIZ_2_TXT_TIME "HID:41059" -#define HID_AGWIZ_2_TXT_DATE "HID:41060" -#define HID_AGWIZ_2_TXT_TITLE "HID:41061" -#define HID_AGWIZ_2_TXT_LOCATION "HID:41062" +#define HID_AGWIZ_2_TXT_TIME "WIZARDS_HID_AGWIZ_2_TXT_TIME" +#define HID_AGWIZ_2_TXT_DATE "WIZARDS_HID_AGWIZ_2_TXT_DATE" +#define HID_AGWIZ_2_TXT_TITLE "WIZARDS_HID_AGWIZ_2_TXT_TITLE" +#define HID_AGWIZ_2_TXT_LOCATION "WIZARDS_HID_AGWIZ_2_TXT_LOCATION" // step 3 - headings -#define HID_AGWIZ_3_CHK_MEETING_TYPE "HID:41063" -#define HID_AGWIZ_3_CHK_READ "HID:41064" -#define HID_AGWIZ_3_CHK_BRING "HID:41065" -#define HID_AGWIZ_3_CHK_NOTES "HID:41066" +#define HID_AGWIZ_3_CHK_MEETING_TYPE "WIZARDS_HID_AGWIZ_3_CHK_MEETING_TYPE" +#define HID_AGWIZ_3_CHK_READ "WIZARDS_HID_AGWIZ_3_CHK_READ" +#define HID_AGWIZ_3_CHK_BRING "WIZARDS_HID_AGWIZ_3_CHK_BRING" +#define HID_AGWIZ_3_CHK_NOTES "WIZARDS_HID_AGWIZ_3_CHK_NOTES" // step 4 - names -#define HID_AGWIZ_4_CHK_CALLED_BY "HID:41067" -#define HID_AGWIZ_4_CHK_FACILITATOR "HID:41068" -#define HID_AGWIZ_4_CHK_NOTETAKER "HID:41069" -#define HID_AGWIZ_4_CHK_TIMEKEEPER "HID:41070" -#define HID_AGWIZ_4_CHK_ATTENDEES "HID:41071" -#define HID_AGWIZ_4_CHK_OBSERVERS "HID:41072" -#define HID_AGWIZ_4_CHK_RESOURCEPERSONS "HID:41073" +#define HID_AGWIZ_4_CHK_CALLED_BY "WIZARDS_HID_AGWIZ_4_CHK_CALLED_BY" +#define HID_AGWIZ_4_CHK_FACILITATOR "WIZARDS_HID_AGWIZ_4_CHK_FACILITATOR" +#define HID_AGWIZ_4_CHK_NOTETAKER "WIZARDS_HID_AGWIZ_4_CHK_NOTETAKER" +#define HID_AGWIZ_4_CHK_TIMEKEEPER "WIZARDS_HID_AGWIZ_4_CHK_TIMEKEEPER" +#define HID_AGWIZ_4_CHK_ATTENDEES "WIZARDS_HID_AGWIZ_4_CHK_ATTENDEES" +#define HID_AGWIZ_4_CHK_OBSERVERS "WIZARDS_HID_AGWIZ_4_CHK_OBSERVERS" +#define HID_AGWIZ_4_CHK_RESOURCEPERSONS "WIZARDS_HID_AGWIZ_4_CHK_RESOURCEPERSONS" // step 5 - topics -#define HID_AGWIZ_6_TXT_TEMPLATENAME "HID:41074" -#define HID_AGWIZ_6_TXT_TEMPLATEPATH "HID:41075" -#define HID_AGWIZ_6_BTN_TEMPLATEPATH "HID:41076" +#define HID_AGWIZ_6_TXT_TEMPLATENAME "WIZARDS_HID_AGWIZ_6_TXT_TEMPLATENAME" +#define HID_AGWIZ_6_TXT_TEMPLATEPATH "WIZARDS_HID_AGWIZ_6_TXT_TEMPLATEPATH" +#define HID_AGWIZ_6_BTN_TEMPLATEPATH "WIZARDS_HID_AGWIZ_6_BTN_TEMPLATEPATH" // step 6 - file info -#define HID_AGWIZ_6_OPT_CREATEAGENDA "HID:41077" -#define HID_AGWIZ_6_OPT_MAKECHANGES "HID:41078" +#define HID_AGWIZ_6_OPT_CREATEAGENDA "WIZARDS_HID_AGWIZ_6_OPT_CREATEAGENDA" +#define HID_AGWIZ_6_OPT_MAKECHANGES "WIZARDS_HID_AGWIZ_6_OPT_MAKECHANGES" // - again step 5 - buttons -#define HID_AGWIZ_5_BTN_INSERT "HID:41079" -#define HID_AGWIZ_5_BTN_REMOVE "HID:41080" -#define HID_AGWIZ_5_BTN_UP "HID:41081" -#define HID_AGWIZ_5_BTN_DOWN "HID:41082" +#define HID_AGWIZ_5_BTN_INSERT "WIZARDS_HID_AGWIZ_5_BTN_INSERT" +#define HID_AGWIZ_5_BTN_REMOVE "WIZARDS_HID_AGWIZ_5_BTN_REMOVE" +#define HID_AGWIZ_5_BTN_UP "WIZARDS_HID_AGWIZ_5_BTN_UP" +#define HID_AGWIZ_5_BTN_DOWN "WIZARDS_HID_AGWIZ_5_BTN_DOWN" // again step 5 - scroll control -#define HID_AGWIZ_5_SCROLL_BAR "HID:41083" +#define HID_AGWIZ_5_SCROLL_BAR "WIZARDS_HID_AGWIZ_5_SCROLL_BAR" -#define HID_AGWIZ_5_TXT_TOPIC_1 "HID:41084" -#define HID_AGWIZ_5_TXT_RESPONSIBLE_1 "HID:41085" -#define HID_AGWIZ_5_TXT_MINUTES_1 "HID:41086" +#define HID_AGWIZ_5_TXT_TOPIC_1 "WIZARDS_HID_AGWIZ_5_TXT_TOPIC_1" +#define HID_AGWIZ_5_TXT_RESPONSIBLE_1 "WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_1" +#define HID_AGWIZ_5_TXT_MINUTES_1 "WIZARDS_HID_AGWIZ_5_TXT_MINUTES_1" -#define HID_AGWIZ_5_TXT_TOPIC_2 "HID:41087" -#define HID_AGWIZ_5_TXT_RESPONSIBLE_2 "HID:41088" -#define HID_AGWIZ_5_TXT_MINUTES_2 "HID:41089" +#define HID_AGWIZ_5_TXT_TOPIC_2 "WIZARDS_HID_AGWIZ_5_TXT_TOPIC_2" +#define HID_AGWIZ_5_TXT_RESPONSIBLE_2 "WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_2" +#define HID_AGWIZ_5_TXT_MINUTES_2 "WIZARDS_HID_AGWIZ_5_TXT_MINUTES_2" -#define HID_AGWIZ_5_TXT_TOPIC_3 "HID:41090" -#define HID_AGWIZ_5_TXT_RESPONSIBLE_3 "HID:41091" -#define HID_AGWIZ_5_TXT_MINUTES_3 "HID:41092" +#define HID_AGWIZ_5_TXT_TOPIC_3 "WIZARDS_HID_AGWIZ_5_TXT_TOPIC_3" +#define HID_AGWIZ_5_TXT_RESPONSIBLE_3 "WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_3" +#define HID_AGWIZ_5_TXT_MINUTES_3 "WIZARDS_HID_AGWIZ_5_TXT_MINUTES_3" -#define HID_AGWIZ_5_TXT_TOPIC_4 "HID:41093" -#define HID_AGWIZ_5_TXT_RESPONSIBLE_4 "HID:41094" -#define HID_AGWIZ_5_TXT_MINUTES_4 "HID:41095" +#define HID_AGWIZ_5_TXT_TOPIC_4 "WIZARDS_HID_AGWIZ_5_TXT_TOPIC_4" +#define HID_AGWIZ_5_TXT_RESPONSIBLE_4 "WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_4" +#define HID_AGWIZ_5_TXT_MINUTES_4 "WIZARDS_HID_AGWIZ_5_TXT_MINUTES_4" -#define HID_AGWIZ_5_TXT_TOPIC_5 "HID:41096" -#define HID_AGWIZ_5_TXT_RESPONSIBLE_5 "HID:41097" -#define HID_AGWIZ_5_TXT_MINUTES_5 "HID:41098" +#define HID_AGWIZ_5_TXT_TOPIC_5 "WIZARDS_HID_AGWIZ_5_TXT_TOPIC_5" +#define HID_AGWIZ_5_TXT_RESPONSIBLE_5 "WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_5" +#define HID_AGWIZ_5_TXT_MINUTES_5 "WIZARDS_HID_AGWIZ_5_TXT_MINUTES_5" //FaxWizard--------------------------- -#define HID_FAXWIZ_OPTBUSINESSFAX "HID:41120" -#define HID_FAXWIZ_LSTBUSINESSSTYLE "HID:41121" -#define HID_FAXWIZ_OPTPRIVATEFAX "HID:41122" -#define HID_LSTPRIVATESTYLE "HID:41123" -#define HID_IMAGECONTROL3 "HID:41124" -#define HID_CHKUSELOGO "HID:41125" -#define HID_CHKUSEDATE "HID:41126" -#define HID_CHKUSECOMMUNICATIONTYPE "HID:41127" -#define HID_LSTCOMMUNICATIONTYPE "HID:41128" -#define HID_CHKUSESUBJECT "HID:41129" -#define HID_CHKUSESALUTATION "HID:41130" -#define HID_LSTSALUTATION "HID:41131" -#define HID_CHKUSEGREETING "HID:41132" -#define HID_LSTGREETING "HID:41133" -#define HID_CHKUSEFOOTER "HID:41134" -#define HID_OPTSENDERPLACEHOLDER "HID:41135" -#define HID_OPTSENDERDEFINE "HID:41136" -#define HID_TXTSENDERNAME "HID:41137" -#define HID_TXTSENDERSTREET "HID:41138" -#define HID_TXTSENDERPOSTCODE "HID:41139" -#define HID_TXTSENDERSTATE "HID:41140" -#define HID_TXTSENDERCITY "HID:41141" -#define HID_TXTSENDERFAX "HID:41142" -#define HID_OPTRECEIVERPLACEHOLDER "HID:41143" -#define HID_OPTRECEIVERDATABASE "HID:41144" -#define HID_TXTFOOTER "HID:41145" -#define HID_CHKFOOTERNEXTPAGES "HID:41146" -#define HID_CHKFOOTERPAGENUMBERS "HID:41147" -#define HID_TXTTEMPLATENAME "HID:41148" -#define HID_FILETEMPLATEPATH "HID:41149" -#define HID_OPTCREATEFAX "HID:41150" -#define HID_OPTMAKECHANGES "HID:41151" -#define HID_IMAGECONTROL2 "HID:41152" -#define HID_FAXWIZ_TXTPATH "HID:41153" -#define HID_FAXWIZ_CMDPATH "HID:41154" - -#define HID_FAXWIZARD "HID:41180" -#define HID_FAXWIZARD_HELP "HID:41181" -#define HID_FAXWIZARD_BACK "HID:41182" -#define HID_FAXWIZARD_NEXT "HID:41183" -#define HID_FAXWIZARD_CREATE "HID:41184" -#define HID_FAXWIZARD_CANCEL "HID:41185" +#define HID_FAXWIZ_OPTBUSINESSFAX "WIZARDS_HID_FAXWIZ_OPTBUSINESSFAX" +#define HID_FAXWIZ_LSTBUSINESSSTYLE "WIZARDS_HID_FAXWIZ_LSTBUSINESSSTYLE" +#define HID_FAXWIZ_OPTPRIVATEFAX "WIZARDS_HID_FAXWIZ_OPTPRIVATEFAX" +#define HID_LSTPRIVATESTYLE "WIZARDS_HID_LSTPRIVATESTYLE" +#define HID_IMAGECONTROL3 "WIZARDS_HID_IMAGECONTROL3" +#define HID_CHKUSELOGO "WIZARDS_HID_CHKUSELOGO" +#define HID_CHKUSEDATE "WIZARDS_HID_CHKUSEDATE" +#define HID_CHKUSECOMMUNICATIONTYPE "WIZARDS_HID_CHKUSECOMMUNICATIONTYPE" +#define HID_LSTCOMMUNICATIONTYPE "WIZARDS_HID_LSTCOMMUNICATIONTYPE" +#define HID_CHKUSESUBJECT "WIZARDS_HID_CHKUSESUBJECT" +#define HID_CHKUSESALUTATION "WIZARDS_HID_CHKUSESALUTATION" +#define HID_LSTSALUTATION "WIZARDS_HID_LSTSALUTATION" +#define HID_CHKUSEGREETING "WIZARDS_HID_CHKUSEGREETING" +#define HID_LSTGREETING "WIZARDS_HID_LSTGREETING" +#define HID_CHKUSEFOOTER "WIZARDS_HID_CHKUSEFOOTER" +#define HID_OPTSENDERPLACEHOLDER "WIZARDS_HID_OPTSENDERPLACEHOLDER" +#define HID_OPTSENDERDEFINE "WIZARDS_HID_OPTSENDERDEFINE" +#define HID_TXTSENDERNAME "WIZARDS_HID_TXTSENDERNAME" +#define HID_TXTSENDERSTREET "WIZARDS_HID_TXTSENDERSTREET" +#define HID_TXTSENDERPOSTCODE "WIZARDS_HID_TXTSENDERPOSTCODE" +#define HID_TXTSENDERSTATE "WIZARDS_HID_TXTSENDERSTATE" +#define HID_TXTSENDERCITY "WIZARDS_HID_TXTSENDERCITY" +#define HID_TXTSENDERFAX "WIZARDS_HID_TXTSENDERFAX" +#define HID_OPTRECEIVERPLACEHOLDER "WIZARDS_HID_OPTRECEIVERPLACEHOLDER" +#define HID_OPTRECEIVERDATABASE "WIZARDS_HID_OPTRECEIVERDATABASE" +#define HID_TXTFOOTER "WIZARDS_HID_TXTFOOTER" +#define HID_CHKFOOTERNEXTPAGES "WIZARDS_HID_CHKFOOTERNEXTPAGES" +#define HID_CHKFOOTERPAGENUMBERS "WIZARDS_HID_CHKFOOTERPAGENUMBERS" +#define HID_TXTTEMPLATENAME "WIZARDS_HID_TXTTEMPLATENAME" +#define HID_FILETEMPLATEPATH "WIZARDS_HID_FILETEMPLATEPATH" +#define HID_OPTCREATEFAX "WIZARDS_HID_OPTCREATEFAX" +#define HID_OPTMAKECHANGES "WIZARDS_HID_OPTMAKECHANGES" +#define HID_IMAGECONTROL2 "WIZARDS_HID_IMAGECONTROL2" +#define HID_FAXWIZ_TXTPATH "WIZARDS_HID_FAXWIZ_TXTPATH" +#define HID_FAXWIZ_CMDPATH "WIZARDS_HID_FAXWIZ_CMDPATH" + +#define HID_FAXWIZARD "WIZARDS_HID_FAXWIZARD" +#define HID_FAXWIZARD_HELP "WIZARDS_HID_FAXWIZARD_HELP" +#define HID_FAXWIZARD_BACK "WIZARDS_HID_FAXWIZARD_BACK" +#define HID_FAXWIZARD_NEXT "WIZARDS_HID_FAXWIZARD_NEXT" +#define HID_FAXWIZARD_CREATE "WIZARDS_HID_FAXWIZARD_CREATE" +#define HID_FAXWIZARD_CANCEL "WIZARDS_HID_FAXWIZARD_CANCEL" @@ -794,64 +794,64 @@ * ==================================== */ -#define HID_DLGTABLE_DIALOG "HID:41200" -#define HID_DLGTABLE_CMDPREV "HID:41202" -#define HID_DLGTABLE_CMDNEXT "HID:41203" -#define HID_DLGTABLE_CMDFINISH "HID:41204" -#define HID_DLGTABLE_CMDCANCEL "HID:41205" +#define HID_DLGTABLE_DIALOG "WIZARDS_HID_DLGTABLE_DIALOG" +#define HID_DLGTABLE_CMDPREV "WIZARDS_HID_DLGTABLE_CMDPREV" +#define HID_DLGTABLE_CMDNEXT "WIZARDS_HID_DLGTABLE_CMDNEXT" +#define HID_DLGTABLE_CMDFINISH "WIZARDS_HID_DLGTABLE_CMDFINISH" +#define HID_DLGTABLE_CMDCANCEL "WIZARDS_HID_DLGTABLE_CMDCANCEL" -#define HID_DLGTABLE_OPTBUSINESS "HID:41206" -#define HID_DLGTABLE_OPTPRIVATE "HID:41207" +#define HID_DLGTABLE_OPTBUSINESS "WIZARDS_HID_DLGTABLE_OPTBUSINESS" +#define HID_DLGTABLE_OPTPRIVATE "WIZARDS_HID_DLGTABLE_OPTPRIVATE" -#define HID_DLGTABLE_LBTABLES "HID:41208" -#define HID_DLGTABLE_FIELDSAVAILABLE "HID:41209" -#define HID_DLGTABLE_CMDMOVESELECTED "HID:41210" -#define HID_DLGTABLE_CMDMOVEALL "HID:41211" -#define HID_DLGTABLE_CMDREMOVESELECTED "HID:41212" -#define HID_DLGTABLE_CMDREMOVEALL "HID:41213" -#define HID_DLGTABLE_FIELDSSELECTED "HID:41214" +#define HID_DLGTABLE_LBTABLES "WIZARDS_HID_DLGTABLE_LBTABLES" +#define HID_DLGTABLE_FIELDSAVAILABLE "WIZARDS_HID_DLGTABLE_FIELDSAVAILABLE" +#define HID_DLGTABLE_CMDMOVESELECTED "WIZARDS_HID_DLGTABLE_CMDMOVESELECTED" +#define HID_DLGTABLE_CMDMOVEALL "WIZARDS_HID_DLGTABLE_CMDMOVEALL" +#define HID_DLGTABLE_CMDREMOVESELECTED "WIZARDS_HID_DLGTABLE_CMDREMOVESELECTED" +#define HID_DLGTABLE_CMDREMOVEALL "WIZARDS_HID_DLGTABLE_CMDREMOVEALL" +#define HID_DLGTABLE_FIELDSSELECTED "WIZARDS_HID_DLGTABLE_FIELDSSELECTED" -#define HID_DLGTABLE_CMDMOVEUP "HID:41215" -#define HID_DLGTABLE_CMDMOVEDOWN "HID:41216" +#define HID_DLGTABLE_CMDMOVEUP "WIZARDS_HID_DLGTABLE_CMDMOVEUP" +#define HID_DLGTABLE_CMDMOVEDOWN "WIZARDS_HID_DLGTABLE_CMDMOVEDOWN" -#define HID_DLGTABLE_LB_SELFIELDNAMES "HID:41220" -#define HID_DLGTABLE_CMDMOVEFIELDUP "HID:41221" -#define HID_DLGTABLE_CMDMOVEFIELDDOWN "HID:41222" -#define HID_DLGTABLE_CMDMINUS "HID:41223" -#define HID_DLGTABLE_CMDPLUS "HID:41224" -#define HID_DLGTABLE_COLNAME "HID:41225" -#define HID_DLGTABLE_COLMODIFIER "HID:41226" +#define HID_DLGTABLE_LB_SELFIELDNAMES "WIZARDS_HID_DLGTABLE_LB_SELFIELDNAMES" +#define HID_DLGTABLE_CMDMOVEFIELDUP "WIZARDS_HID_DLGTABLE_CMDMOVEFIELDUP" +#define HID_DLGTABLE_CMDMOVEFIELDDOWN "WIZARDS_HID_DLGTABLE_CMDMOVEFIELDDOWN" +#define HID_DLGTABLE_CMDMINUS "WIZARDS_HID_DLGTABLE_CMDMINUS" +#define HID_DLGTABLE_CMDPLUS "WIZARDS_HID_DLGTABLE_CMDPLUS" +#define HID_DLGTABLE_COLNAME "WIZARDS_HID_DLGTABLE_COLNAME" +#define HID_DLGTABLE_COLMODIFIER "WIZARDS_HID_DLGTABLE_COLMODIFIER" -#define HID_DLGTABLE_CHK_USEPRIMEKEY "HID:41227" -#define HID_DLGTABLE_OPT_PK_AUTOMATIC "HID:41228" +#define HID_DLGTABLE_CHK_USEPRIMEKEY "WIZARDS_HID_DLGTABLE_CHK_USEPRIMEKEY" +#define HID_DLGTABLE_OPT_PK_AUTOMATIC "WIZARDS_HID_DLGTABLE_OPT_PK_AUTOMATIC" -#define HID_DLGTABLE_CK_PK_AUTOVALUE_AUTOMATIC "HID:41229" +#define HID_DLGTABLE_CK_PK_AUTOVALUE_AUTOMATIC "WIZARDS_HID_DLGTABLE_CK_PK_AUTOVALUE_AUTOMATIC" -#define HID_DLGTABLE_OPT_PK_SINGLE "HID:41230" -#define HID_DLGTABLE_LB_PK_FIELDNAME "HID:41231" -#define HID_DLGTABLE_CK_PK_AUTOVALUE "HID:41232" -#define HID_DLGTABLE_OPT_PK_SEVERAL "HID:41233" -#define HID_DLGTABLE_FIELDS_PK_AVAILABLE "HID:41234" -#define HID_DLGTABLE_CMDMOVE_PK_SELECTED "HID:41235" -#define HID_DLGTABLE_CMDREMOVE_PK_SELECTED "HID:41236" -#define HID_DLGTABLE_FIELDS_PK_SELECTED "HID:41237" +#define HID_DLGTABLE_OPT_PK_SINGLE "WIZARDS_HID_DLGTABLE_OPT_PK_SINGLE" +#define HID_DLGTABLE_LB_PK_FIELDNAME "WIZARDS_HID_DLGTABLE_LB_PK_FIELDNAME" +#define HID_DLGTABLE_CK_PK_AUTOVALUE "WIZARDS_HID_DLGTABLE_CK_PK_AUTOVALUE" +#define HID_DLGTABLE_OPT_PK_SEVERAL "WIZARDS_HID_DLGTABLE_OPT_PK_SEVERAL" +#define HID_DLGTABLE_FIELDS_PK_AVAILABLE "WIZARDS_HID_DLGTABLE_FIELDS_PK_AVAILABLE" +#define HID_DLGTABLE_CMDMOVE_PK_SELECTED "WIZARDS_HID_DLGTABLE_CMDMOVE_PK_SELECTED" +#define HID_DLGTABLE_CMDREMOVE_PK_SELECTED "WIZARDS_HID_DLGTABLE_CMDREMOVE_PK_SELECTED" +#define HID_DLGTABLE_FIELDS_PK_SELECTED "WIZARDS_HID_DLGTABLE_FIELDS_PK_SELECTED" -#define HID_DLGTABLE_CMDMOVEUP_PK_SELECTED "HID:41238" -#define HID_DLGTABLE_CMDMOVEDOWN_PK_SELECTED "HID:41239" +#define HID_DLGTABLE_CMDMOVEUP_PK_SELECTED "WIZARDS_HID_DLGTABLE_CMDMOVEUP_PK_SELECTED" +#define HID_DLGTABLE_CMDMOVEDOWN_PK_SELECTED "WIZARDS_HID_DLGTABLE_CMDMOVEDOWN_PK_SELECTED" -#define HID_DLGTABLE_TXT_NAME "HID:41240" -#define HID_DLGTABLE_OPT_MODIFYTABLE "HID:41241" -#define HID_DLGTABLE_OPT_WORKWITHTABLE "HID:41242" -#define HID_DLGTABLE_OPT_STARTFORMWIZARD "HID:41243" -#define HID_DLGTABLE_LST_CATALOG "HID:41244" -#define HID_DLGTABLE_LST_SCHEMA "HID:41245" +#define HID_DLGTABLE_TXT_NAME "WIZARDS_HID_DLGTABLE_TXT_NAME" +#define HID_DLGTABLE_OPT_MODIFYTABLE "WIZARDS_HID_DLGTABLE_OPT_MODIFYTABLE" +#define HID_DLGTABLE_OPT_WORKWITHTABLE "WIZARDS_HID_DLGTABLE_OPT_WORKWITHTABLE" +#define HID_DLGTABLE_OPT_STARTFORMWIZARD "WIZARDS_HID_DLGTABLE_OPT_STARTFORMWIZARD" +#define HID_DLGTABLE_LST_CATALOG "WIZARDS_HID_DLGTABLE_LST_CATALOG" +#define HID_DLGTABLE_LST_SCHEMA "WIZARDS_HID_DLGTABLE_LST_SCHEMA" -- cgit v1.2.3 From 2a17a3f2f7f52eb97871d054505d9d22060d7a73 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Wed, 21 Jul 2010 17:46:37 +0200 Subject: CWS changehid: #i111784#: rework keyword search --- basctl/source/basicide/baside2b.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 027ce45b6..3e0bcaab1 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -258,7 +258,7 @@ void __EXPORT EditorWindow::RequestHelp( const HelpEvent& rHEvt ) if ( rHEvt.GetMode() & HELPMODE_CONTEXT ) { String aKeyword = GetWordAtCursor(); - Application::GetHelp()->Start( aKeyword, this ); + Application::GetHelp()->SearchKeyword( aKeyword ); bDone = TRUE; } else if ( rHEvt.GetMode() & HELPMODE_QUICK ) -- cgit v1.2.3 From a30007c4b49f47d0a5730b432d89f9917982a835 Mon Sep 17 00:00:00 2001 From: Gregor Hartmann Date: Fri, 27 Aug 2010 14:05:36 +0200 Subject: testtool: fix libsts to work with old testtool --- automation/inc/automation/commtypes.hxx | 2 +- automation/source/inc/cmdbasestream.hxx | 8 +- automation/source/inc/rcontrol.hxx | 4 +- automation/source/miniapp/servres.hrc | 6 +- automation/source/miniapp/servres.src | 4 + automation/source/server/XMLParser.cxx | 42 +-- automation/source/server/cmdbasestream.cxx | 37 ++ automation/source/server/recorder.cxx | 79 +---- automation/source/server/retstrm.cxx | 44 +-- automation/source/server/retstrm.hxx | 13 +- automation/source/server/server.cxx | 6 + automation/source/server/sta_list.cxx | 37 +- automation/source/server/statemnt.cxx | 524 +++++++++++------------------ automation/source/server/statemnt.hxx | 7 +- automation/source/testtool/objtest.cxx | 9 +- automation/util/manually_added_ids.hid | 0 16 files changed, 335 insertions(+), 487 deletions(-) mode change 100755 => 100644 automation/util/manually_added_ids.hid diff --git a/automation/inc/automation/commtypes.hxx b/automation/inc/automation/commtypes.hxx index e7ac39e37..3cb1ac16c 100644 --- a/automation/inc/automation/commtypes.hxx +++ b/automation/inc/automation/commtypes.hxx @@ -31,7 +31,7 @@ * This file is intended to supply the types and defines for Environment independent * building of the packethandler * Only adaption of this file should be necessary. Else it is a bug! - * Eather including apropriate files or defining the types when not available in the environment + * Ether including apropriate files or defining the types when not available in the environment * ************************************************************************/ diff --git a/automation/source/inc/cmdbasestream.hxx b/automation/source/inc/cmdbasestream.hxx index 8eca54de2..c598cafa1 100644 --- a/automation/source/inc/cmdbasestream.hxx +++ b/automation/source/inc/cmdbasestream.hxx @@ -38,7 +38,6 @@ #include #include "icommstream.hxx" -#include "rtl/string.hxx" class CmdBaseStream { @@ -57,8 +56,13 @@ public: 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 ); + void GenReturn( comm_USHORT nRet, comm_USHORT nMethod, comm_ULONG nNr ); + void GenReturn( comm_USHORT nRet, comm_USHORT nMethod, comm_String *pString ); + void GenReturn( comm_USHORT nRet, comm_USHORT nMethod, comm_BOOL bBool ); + void GenReturn( comm_USHORT nRet, comm_USHORT nMethod, comm_USHORT nNr ); + // MacroRecorder - void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod ); + void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod ); // also used outside MacroRecorder 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 ); diff --git a/automation/source/inc/rcontrol.hxx b/automation/source/inc/rcontrol.hxx index 32b5fdd3c..2f02c66d9 100644 --- a/automation/source/inc/rcontrol.hxx +++ b/automation/source/inc/rcontrol.hxx @@ -37,13 +37,13 @@ #define _RCONTROL_HXX -#define UID_ACTIVE 0 +#define UID_ACTIVE "UID_ACTIVE" #define SI_IPCCommandBlock 1 #define SI_SocketCommandBlock SI_IPCCommandBlock // Zumindest erstmal #define SI_DirectCommandBlock 2 -#define SIControl 3 +#define SIControl 3 // remove after numeric HelpIDs are completely removed and no legacy testtool is used anymore #define SISlot 4 #define SIFlow 5 #define SICommand 6 diff --git a/automation/source/miniapp/servres.hrc b/automation/source/miniapp/servres.hrc index 506b2ecb3..508258df4 100644 --- a/automation/source/miniapp/servres.hrc +++ b/automation/source/miniapp/servres.hrc @@ -29,9 +29,9 @@ #define IDM_FILE 1 #define IDM_FILE_OPEN_TEST 2 #define IDM_FILE_EXIT 3 -#define IDM_FILE_EXIT_HELP 4 -#define IDM_FILE_OPEN_TEST_HELP 1 -#define IDM_FILE_HELP 3 +#define IDM_FILE_EXIT_HELP "AUTOMATION_IDM_FILE_EXIT_HELP" +#define IDM_FILE_OPEN_TEST_HELP "AUTOMATION_IDM_FILE_OPEN_TEST_HELP" +#define IDM_FILE_HELP "AUTOMATION_IDM_FILE_HELP" #define GROSSER_TEST_DLG 256 #define IDM_TEST 5 #define IDM_TEST_GROSS 6 diff --git a/automation/source/miniapp/servres.src b/automation/source/miniapp/servres.src index cf553c394..f6f7b7e65 100644 --- a/automation/source/miniapp/servres.src +++ b/automation/source/miniapp/servres.src @@ -54,6 +54,7 @@ ModalDialog GROSSER_TEST_DLG }; OKButton 1 { + HelpID = "hid1" ; Pos = MAP_APPFONT ( 132 , 92 ) ; Size = MAP_APPFONT ( 64 , 12 ) ; TabStop = TRUE ; @@ -175,6 +176,7 @@ Menu MENU_CLIENT MenuItem { Identifier = IDM_FILE ; + HelpID = IDM_FILE_HELP ; Text = "~File" ; SubMenu = Menu { @@ -183,6 +185,7 @@ Menu MENU_CLIENT MenuItem { Identifier = IDM_FILE_OPEN_TEST ; + HelpID = IDM_FILE_OPEN_TEST_HELP ; Text = "~Open Test Window" ; }; MenuItem @@ -193,6 +196,7 @@ Menu MENU_CLIENT MenuItem { Identifier = IDM_FILE_EXIT ; + HelpID = IDM_FILE_EXIT_HELP ; Text = "~Beenden" ; AccelKey = KeyCode { diff --git a/automation/source/server/XMLParser.cxx b/automation/source/server/XMLParser.cxx index 38408558f..1d977e6ae 100644 --- a/automation/source/server/XMLParser.cxx +++ b/automation/source/server/XMLParser.cxx @@ -458,7 +458,7 @@ void StatementCommand::HandleSAXParser() { if ( !pSAXParser->Parse( PARSE_ONLY ) ) ReportError( GEN_RES_STR1( S_NO_SAX_PARSER, RcString( nMethodId ) ) ); - pRet->GenReturn ( RET_Value, aSmartMethodId, pSAXParser->GetErrors() ); + pRet->GenReturn ( RET_Value, nMethodId, pSAXParser->GetErrors() ); } xParserKeepaliveReference.clear(); @@ -488,7 +488,7 @@ void StatementCommand::HandleSAXParser() if ( !pSAXParser->Parse( aAction ) ) ReportError( GEN_RES_STR1( S_NO_SAX_PARSER, RcString( nMethodId ) ) ); - pRet->GenReturn ( RET_Value, aSmartMethodId, pSAXParser->GetErrors() ); + pRet->GenReturn ( RET_Value, nMethodId, pSAXParser->GetErrors() ); } } else @@ -497,7 +497,7 @@ void StatementCommand::HandleSAXParser() break; case RC_SAXGetNodeType: { - pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_ULONG)pSAXParser->GetCurrentNode()->GetNodeType() ); + pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)pSAXParser->GetCurrentNode()->GetNodeType() ); } break; case RC_SAXGetAttributeCount: @@ -512,23 +512,23 @@ void StatementCommand::HandleSAXParser() switch ( nMethodId ) { case RC_SAXGetElementName: - pRet->GenReturn ( RET_Value, aSmartMethodId, pElementNode->GetNodeName() ); + pRet->GenReturn ( RET_Value, nMethodId, pElementNode->GetNodeName() ); break; case RC_SAXGetChildCount: - pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_ULONG)pElementNode->GetChildCount() ); + pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)pElementNode->GetChildCount() ); break; case RC_SAXGetAttributeCount: if ( xAttributeList.is() ) - pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_ULONG)xAttributeList->getLength() ); + pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)xAttributeList->getLength() ); else - pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_ULONG)0 ); + pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)0 ); break; case RC_SAXGetAttributeName: { - if( (nParams & PARAM_USHORT_1) && ValueOK( aSmartMethodId, RcString( nMethodId ), nNr1, xAttributeList.is()?xAttributeList->getLength():0 ) ) + if( (nParams & PARAM_USHORT_1) && ValueOK( rtl::OString(), RcString( nMethodId ), nNr1, xAttributeList.is()?xAttributeList->getLength():0 ) ) { String aRet( xAttributeList->getNameByIndex( nNr1-1 ) ); - pRet->GenReturn ( RET_Value, aSmartMethodId, aRet ); + pRet->GenReturn ( RET_Value, nMethodId, aRet ); } else ReportError( GEN_RES_STR0( S_INVALID_PARAMETERS ) ); @@ -537,15 +537,15 @@ void StatementCommand::HandleSAXParser() case RC_SAXGetAttributeValue: // Number or String { - if( (nParams & PARAM_USHORT_1) && ValueOK( aSmartMethodId, RcString( nMethodId ), nNr1, xAttributeList.is()?xAttributeList->getLength():0 ) ) + if( (nParams & PARAM_USHORT_1) && ValueOK( rtl::OString(), RcString( nMethodId ), nNr1, xAttributeList.is()?xAttributeList->getLength():0 ) ) { String aRet( xAttributeList->getValueByIndex( nNr1-1 ) ); - pRet->GenReturn ( RET_Value, aSmartMethodId, aRet ); + pRet->GenReturn ( RET_Value, nMethodId, aRet ); } else if( (nParams & PARAM_STR_1) && xAttributeList.is() ) { String aRet( xAttributeList->getValueByName( aString1 ) ); - pRet->GenReturn ( RET_Value, aSmartMethodId, aRet ); + pRet->GenReturn ( RET_Value, nMethodId, aRet ); } else ReportError( GEN_RES_STR0( S_INVALID_PARAMETERS ) ); @@ -566,7 +566,7 @@ void StatementCommand::HandleSAXParser() { NodeRef xNode=pSAXParser->GetCurrentNode(); CharacterNode* aCharacterNode = (CharacterNode*)(&xNode); - pRet->GenReturn ( RET_Value, aSmartMethodId, aCharacterNode->GetCharacters() ); + pRet->GenReturn ( RET_Value, nMethodId, aCharacterNode->GetCharacters() ); } else ReportError( GEN_RES_STR0( S_INVALID_PARAMETERS ) ); @@ -584,15 +584,15 @@ void StatementCommand::HandleSAXParser() if ( nNr1 == 0 ) { if ( bCheckOnly ) - pRet->GenReturn ( RET_Value, aSmartMethodId, pSAXParser->GetCurrentNode()->GetParent().Is() ); + pRet->GenReturn ( RET_Value, nMethodId, pSAXParser->GetCurrentNode()->GetParent().Is() ); else if ( pSAXParser->GetCurrentNode()->GetParent().Is() ) pSAXParser->SetCurrentNode( pSAXParser->GetCurrentNode()->GetParent() ); } else if ( !pElementNode ) ReportError( GEN_RES_STR0( S_INVALID_PARAMETERS ) ); else if ( bCheckOnly ) - pRet->GenReturn ( RET_Value, aSmartMethodId, ValueOK( aSmartMethodId, String(), nNr1, pElementNode->GetChildCount() ) ); - else if ( ValueOK( aSmartMethodId, RcString( nMethodId ), nNr1, pElementNode->GetChildCount() ) ) + pRet->GenReturn ( RET_Value, nMethodId, ValueOK( rtl::OString(), RcString( nMethodId ), nNr1, pElementNode->GetChildCount() ) ); + else if ( ValueOK( rtl::OString(), RcString( nMethodId ), nNr1, pElementNode->GetChildCount() ) ) pSAXParser->SetCurrentNode( pElementNode->GetChild( nNr1-1 ) ); } else if( (nParams & PARAM_STR_1) ) @@ -600,7 +600,7 @@ void StatementCommand::HandleSAXParser() if ( aString1.EqualsAscii( "/" ) ) { if ( bCheckOnly ) - pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_BOOL)TRUE ); + pRet->GenReturn ( RET_Value, nMethodId, (comm_BOOL)TRUE ); else pSAXParser->SetCurrentNode( pSAXParser->GetRootNode() ); } @@ -609,7 +609,7 @@ void StatementCommand::HandleSAXParser() ULONG nTimestamp = (ULONG)aString1.GetToken( 1, ':' ).ToInt64(); ULONG nPointer = (ULONG)aString1.GetToken( 2, ':' ).ToInt64(); if ( bCheckOnly ) - pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_BOOL)(pSAXParser->GetTimestamp() == nTimestamp) ); + pRet->GenReturn ( RET_Value, nMethodId, (comm_BOOL)(pSAXParser->GetTimestamp() == nTimestamp) ); else if ( pSAXParser->GetTimestamp() == nTimestamp ) { @@ -652,7 +652,7 @@ void StatementCommand::HandleSAXParser() xNew.Clear(); } if ( bCheckOnly ) - pRet->GenReturn ( RET_Value, aSmartMethodId, xNew.Is() ); + pRet->GenReturn ( RET_Value, nMethodId, xNew.Is() ); else if ( xNew.Is() ) pSAXParser->SetCurrentNode( xNew ); @@ -661,7 +661,7 @@ void StatementCommand::HandleSAXParser() } else if ( bCheckOnly ) - pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_BOOL)FALSE ); + pRet->GenReturn ( RET_Value, nMethodId, (comm_BOOL)FALSE ); else ReportError( GEN_RES_STR0( S_INVALID_PARAMETERS ) ); } @@ -679,7 +679,7 @@ void StatementCommand::HandleSAXParser() NodeRef xNode=pSAXParser->GetCurrentNode(); Node* pNode = (Node*)(&xNode); aPath.Append( String::CreateFromInt64( (ULONG)pNode ) ); - pRet->GenReturn ( RET_Value, aSmartMethodId, aPath ); + pRet->GenReturn ( RET_Value, nMethodId, aPath ); } break; diff --git a/automation/source/server/cmdbasestream.cxx b/automation/source/server/cmdbasestream.cxx index afd305577..c864af512 100644 --- a/automation/source/server/cmdbasestream.cxx +++ b/automation/source/server/cmdbasestream.cxx @@ -102,6 +102,43 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, rtl::OString *pUId, comm_ULONG Write(bBool); } +void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_USHORT nMethod, comm_ULONG nNr ) +{ + Write(comm_USHORT(SIReturn)); + Write(nRet); + Write(nMethod); + Write(comm_USHORT(PARAM_ULONG_1)); // Typ der folgenden Parameter + Write(nNr); +} + +void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_USHORT nMethod, comm_String *pString ) +{ + Write(comm_USHORT(SIReturn)); + Write(nRet); + Write(nMethod); + Write(comm_USHORT(PARAM_STR_1)); // Typ der folgenden Parameter + Write(pString); +} + +void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_USHORT nMethod, comm_BOOL bBool ) +{ + Write(comm_USHORT(SIReturn)); + Write(nRet); + Write(nMethod); + Write(comm_USHORT(PARAM_BOOL_1)); // Typ der folgenden Parameter + Write(bBool); +} + +void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_USHORT nMethod, comm_USHORT nNr ) +{ + Write(comm_USHORT(SIReturn)); + Write(nRet); + Write(nMethod); + Write(comm_USHORT(PARAM_USHORT_1)); // Typ der folgenden Parameter + Write(nNr); +} + + // MacroRecorder void CmdBaseStream::GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod ) { diff --git a/automation/source/server/recorder.cxx b/automation/source/server/recorder.cxx index 549a073b4..8ee70a2d9 100644 --- a/automation/source/server/recorder.cxx +++ b/automation/source/server/recorder.cxx @@ -107,20 +107,17 @@ IMPL_LINK( MacroRecorder, HookRefreshHdl, void*, EMPTYARG ) void MacroRecorder::LogVCL( rtl::OString aParentID, USHORT nVCLWindowType, rtl::OString aID, String aMethod, USHORT nParam ) { - // FIXME: HELPID - ::comphelper::UiEventsLogger::logVcl( rtl::OStringToOUString( aParentID, RTL_TEXTENCODING_UTF8 ), nVCLWindowType, rtl::OStringToOUString( aID, RTL_TEXTENCODING_UTF8 ), aMethod, nParam ); + ::comphelper::UiEventsLogger::logVcl( Id2Str( aParentID ), nVCLWindowType, Id2Str( aID ), aMethod, nParam ); } void MacroRecorder::LogVCL( rtl::OString aParentID, USHORT nVCLWindowType, rtl::OString aID, String aMethod ) { - // FIXME: HELPID - ::comphelper::UiEventsLogger::logVcl( rtl::OStringToOUString( aParentID, RTL_TEXTENCODING_UTF8 ), nVCLWindowType, rtl::OStringToOUString( aID, RTL_TEXTENCODING_UTF8 ), aMethod ); + ::comphelper::UiEventsLogger::logVcl( Id2Str( aParentID ), nVCLWindowType, Id2Str( aID ), aMethod ); } Window* MacroRecorder::GetParentWithID( Window* pThis ) { Window *pOverlap = pThis->GetWindow( WINDOW_OVERLAP ); - // FIXME: HELPID while ( pOverlap != pThis && !pThis->GetUniqueOrHelpId().getLength() && pThis->GET_REAL_PARENT() ) pThis = pThis->GET_REAL_PARENT(); return pThis; @@ -128,7 +125,6 @@ Window* MacroRecorder::GetParentWithID( Window* pThis ) rtl::OString MacroRecorder::GetParentID( Window* pThis ) { - // FIXME: HELPID if ( pThis->GetParent() ) return pThis->GetParent()->GetUniqueOrHelpId(); else @@ -197,15 +193,11 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) case VCLEVENT_WINDOW_ACTIVATE: if ( m_bRecord ) { - // FIXME: HELPID - #if 0 - StatementList::pRet->GenReturn( RET_MacroRecorder, rtl::OString(), (comm_USHORT)(M_SetPage|M_RET_NUM_CONTROL), static_cast(pWin->GetUniqueOrHelpId().GetNum()) ); //GetNum() ULONG != comm_ULONG on 64bit - #endif + StatementList::pRet->GenReturn( RET_MacroRecorder, rtl::OString(), (comm_USHORT)(M_SetPage|M_RET_NUM_CONTROL), Id2Str( pWin->GetUniqueOrHelpId() ) ); bSendData = TRUE; } if ( m_bLog ) { - // FIXME: HELPID LogVCL( rtl::OString(), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("SetPage") ); } break; @@ -221,15 +213,11 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) { if ( m_bRecord ) { - // FIXME: HELPID - #if 0 StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Check ); - #endif bSendData = TRUE; } if ( m_bLog ) { - // FIXME: HELPID LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Check") ); } } @@ -255,15 +243,11 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) } if ( m_bRecord ) { - // FIXME: HELPID - #if 0 - StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), nMethod ); - #endif + StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), nMethod ); bSendData = TRUE; } if ( m_bLog ) { - // FIXME: HELPID LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), aMethod ); } } @@ -293,15 +277,11 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) case VCLEVENT_LISTBOX_SELECT: if ( m_bRecord ) { - // 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 ) { - // FIXME: HELPID LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Select"), ((ListBox*)pWin)->GetSelectEntryPos() ); } break; @@ -332,16 +312,12 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) Sound::Beep(); else { - // 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 ) { - // FIXME: HELPID LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Select"), nPos ); } } @@ -358,7 +334,6 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) case VCLEVENT_BUTTON_CLICK: Window* pParent = pWin->GetParent(); BOOL bDone = FALSE; - // FIXME: HELPID if ( pParent->IsDialog() && !pWin->GetUniqueOrHelpId().getLength() ) { switch ( pParent->GetType() ) @@ -398,22 +373,17 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) } if ( m_bRecord ) { - // FIXME: HELPID - #if 0 if ( nMethod != M_Click ) - StatementList::pRet->GenReturn( RET_MacroRecorder, rtl::OString( 0 ), nMethod ); + StatementList::pRet->GenReturn( RET_MacroRecorder, UID_ACTIVE, nMethod ); else - StatementList::pRet->GenReturn( RET_MacroRecorder, rtl::OString( 0 ), nMethod, (comm_ULONG)nCurrentButtonId ); - #endif + StatementList::pRet->GenReturn( RET_MacroRecorder, UID_ACTIVE, nMethod, (comm_ULONG)nCurrentButtonId ); bSendData = TRUE; } if ( m_bLog ) { if ( nMethod != M_Click ) - // FIXME: HELPID LogVCL( rtl::OString(), pWin->GetType(), pWin->GetUniqueOrHelpId(), aMethod ); else - // FIXME: HELPID LogVCL( rtl::OString(), pWin->GetType(), pWin->GetUniqueOrHelpId(), aMethod, nCurrentButtonId ); bDone = TRUE; } @@ -433,15 +403,11 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) } if ( m_bRecord ) { - // FIXME: HELPID - #if 0 - StatementList::pRet->GenReturn( RET_MacroRecorder, pParent->GetSmartUniqueOrHelpId(), nMethod ); - #endif + StatementList::pRet->GenReturn( RET_MacroRecorder, pParent->GetUniqueOrHelpId(), nMethod ); bSendData = TRUE; } if ( m_bLog ) { - // FIXME: HELPID LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), aMethod ); bDone = TRUE; } @@ -451,20 +417,15 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) } if ( m_bRecord ) { - // FIXME: HELPID if ( !bSendData && pWin->GetUniqueOrHelpId().getLength() ) { - // FIXME: HELPID - #if 0 - StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), (comm_USHORT)M_Click ); - #endif + StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Click ); bSendData = TRUE; } } if ( m_bLog ) { if ( !bDone ) - // FIXME: HELPID LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Click") ); } } @@ -519,15 +480,11 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) } if ( m_bRecord ) { - // FIXME: HELPID - #if 0 StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), nMethod ); - #endif bSendData = TRUE; } if ( m_bLog ) { - // FIXME: HELPID LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), aMethod ); } } @@ -545,15 +502,11 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) case VCLEVENT_BUTTON_CLICK: if ( m_bRecord ) { - // FIXME: HELPID - #if 0 StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Click ); - #endif bSendData = TRUE; } if ( m_bLog ) { - // FIXME: HELPID LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Click") ); } break; @@ -587,15 +540,12 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) // compare to 1 for floating ToolBoxes if ( m_bRecord ) { - // FIXME: HELPID - #if 0 - if ( !pWin->GetUniqueOrHelpId().getLength() || pWin->GetUniqueOrHelpId().Matches( 1 ) ) + if ( !pWin->GetUniqueOrHelpId().getLength() /* || pWin->GetUniqueOrHelpId().Matches( 1 ) */ ) // generate direct Button access - StatementList::pRet->GenReturn( RET_MacroRecorder, rtl::OString( pTB->GetItemCommand( pTB->GetCurItemId() ) ), (comm_USHORT)(M_Click) ); + StatementList::pRet->GenReturn( RET_MacroRecorder, Str2Id( pTB->GetItemCommand( pTB->GetCurItemId() ) ), (comm_USHORT)(M_Click) ); else // access via Toolbox - StatementList::pRet->GenReturn( RET_MacroRecorder, pTB->GetUniqueOrHelpId(), (comm_USHORT)(M_Click|M_RET_NUM_CONTROL), static_cast(pTB->GetHelpId( pTB->GetCurItemId() )) ); // GetHelpId() ULONG != comm_ULONG on 64bit - #endif + StatementList::pRet->GenReturn( RET_MacroRecorder, pTB->GetUniqueOrHelpId(), (comm_USHORT)(M_Click|M_RET_NUM_CONTROL), Id2Str( pTB->GetHelpId( pTB->GetCurItemId() ) ) ); bSendData = TRUE; } /* not needed if ( m_bLog ) @@ -624,7 +574,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) // } // if ( m_bLog ) // { -// LogVCL( pActionParent->GetSmartUniqueOrHelpId(), pWin->GetType(), rtl::OString( pActionParent->GetHelpId( pActionParent->GetCurItemId() ) ), CUniString("TearOff") ); +// LogVCL( pActionParent->GetSmartUniqueOrHelpId(), pWin->GetType(), pActionParent->GetHelpId( pActionParent->GetCurItemId() ), CUniString("TearOff") ); // } // } // pActionParent = NULL; @@ -726,7 +676,6 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) Window *pIdWin = GetParentWithID( pWin ); if ( pIdWin != pWin ) bKeyFollowFocus = TRUE; - // FIXME: HELPID aKeyUniqueID = pIdWin->GetUniqueOrHelpId(); if ( m_bLog ) { @@ -1075,15 +1024,11 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) { if ( m_bRecord ) { - // FIXME: HELPID - #if 0 StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), M_SetText, aEditModifyString ); - #endif bSendData = TRUE; } if ( m_bLog ) { - // FIXME: HELPID LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Modify") ); } pEditModify = NULL; diff --git a/automation/source/server/retstrm.cxx b/automation/source/server/retstrm.cxx index 7091cc386..b9205d90d 100644 --- a/automation/source/server/retstrm.cxx +++ b/automation/source/server/retstrm.cxx @@ -28,6 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_automation.hxx" #include +#include #include "retstrm.hxx" #include "rcontrol.hxx" @@ -57,20 +58,12 @@ void RetStream::GenReturn ( USHORT nRet, rtl::OString aUId, String aString ) CmdBaseStream::GenReturn ( nRet, &aUId, &aString ); } -void RetStream::GenReturn ( USHORT nRet, rtl::OString aUId, SbxValue &aValue ) -{ - Write(USHORT(SIReturn)); - Write(nRet); - Write(&aUId); - Write(USHORT(PARAM_SBXVALUE_1)); // Typ der folgenden Parameter - Write(aValue); -} - void RetStream::GenReturn ( USHORT nRet, rtl::OString aUId, comm_ULONG nNr, String aString, BOOL bBool ) { CmdBaseStream::GenReturn ( nRet, &aUId, nNr, &aString, bBool ); } +// MacroRecorder void RetStream::GenReturn( USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, String aString ) { CmdBaseStream::GenReturn ( nRet, &aUId, nMethod, &aString ); @@ -82,6 +75,23 @@ void RetStream::GenReturn( USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, } +void RetStream::GenReturn ( USHORT nRet, USHORT nMethod, SbxValue &aValue ) +{ + Write(USHORT(SIReturn)); + Write(nRet); + Write((ULONG)nMethod); //HELPID BACKWARD (no ULONG needed) + Write(USHORT(PARAM_SBXVALUE_1)); // Typ der folgenden Parameter + Write(aValue); +} + +void RetStream::GenReturn( USHORT nRet, USHORT nMethod, String aString ) +{ + CmdBaseStream::GenReturn ( nRet, nMethod, &aString ); +} + + + + void RetStream::Write( String *pString ) { CmdBaseStream::Write( pString->GetBuffer(), pString->Len() ); @@ -95,19 +105,9 @@ void RetStream::Write( SbxValue &aValue ) void RetStream::Write( rtl::OString* pId ) { - // 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() ); - Write( &aTmp ); - } - else - Write( static_cast(pId->GetNum()) ); ////GetNum() ULONG != comm_ULONG on 64bit - #else - (void)pId; - #endif + //HELPID BACKWARD (should use ByteString or OString) + String aTmp( Id2Str( *pId ) ); + Write( &aTmp ); } diff --git a/automation/source/server/retstrm.hxx b/automation/source/server/retstrm.hxx index cf909119d..e58d97f59 100644 --- a/automation/source/server/retstrm.hxx +++ b/automation/source/server/retstrm.hxx @@ -48,15 +48,24 @@ public: void GenReturn( comm_USHORT nRet, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, nNr );} 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 );} + +// needed for RemoteCommand and Profiling + void GenReturn( comm_USHORT nRet, comm_USHORT nMethod, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, nMethod, nNr );} + void GenReturn( comm_USHORT nRet, comm_USHORT nMethod, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, nMethod, bBool );} + // MacroRecorder - 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 ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod );} // also used outside MacroRecorder 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, 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 ); + + void GenReturn( USHORT nRet, USHORT nMethod, SbxValue &aValue ); +// and Profiling + void GenReturn( USHORT nRet, USHORT nMethod, String aString ); + // MacroRecorder 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 ); diff --git a/automation/source/server/server.cxx b/automation/source/server/server.cxx index d9c3fea3f..27b543d91 100644 --- a/automation/source/server/server.cxx +++ b/automation/source/server/server.cxx @@ -857,6 +857,9 @@ ImplRemoteControl::ImplRemoteControl() m_pDbgWin = new EditWindow( NULL, CUniString("Debug Window"), WB_VSCROLL ); m_pDbgWin->bQuiet = TRUE; m_pDbgWin->Hide(); + m_pDbgWin->bQuiet = FALSE; + m_pDbgWin->Show(); + StatementList::m_pDbgWin = m_pDbgWin; } #endif @@ -869,6 +872,7 @@ ImplRemoteControl::ImplRemoteControl() #else pServiceMgr = new RemoteControlCommunicationManager(); #endif + fprintf(stderr, "%s\n", "Start RemoteControlCommunicationManager"); pServiceMgr->SetDataReceivedHdl( LINK( this, ImplRemoteControl, QueCommandsEvent ) ); pServiceMgr->StartCommunication(); @@ -882,6 +886,7 @@ ImplRemoteControl::ImplRemoteControl() } if ( RemoteControlCommunicationManager::nComm ) new ExtraIdle( this ); // Setzt die Bearbeitung wieder auf + fprintf(stderr, "%s\n", "end of ImplRemoteControl::ImplRemoteControl()"); } ImplRemoteControl::~ImplRemoteControl() @@ -951,6 +956,7 @@ static ::osl::Mutex aMutex; static RemoteControl* pRemoteControl = 0; extern "C" void CreateRemoteControl() { + fprintf(stderr, "%s\n", "CreateRemoteControl"); if ( !pRemoteControl ) { ::osl::MutexGuard aGuard( aMutex ); diff --git a/automation/source/server/sta_list.cxx b/automation/source/server/sta_list.cxx index d530f31ed..d956f5fcc 100644 --- a/automation/source/server/sta_list.cxx +++ b/automation/source/server/sta_list.cxx @@ -84,9 +84,9 @@ rtl::OString StatementList::aWindowWaitOldHelpId = rtl::OString(); rtl::OString StatementList::aWindowWaitOldUniqueId = rtl::OString(); USHORT StatementList::nUseBindings = 0; -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# +USHORT StatementList::aSubMenuId1 = 0; // Untermenüs bei PopupMenus +USHORT StatementList::aSubMenuId2 = 0; // erstmal 2-Stufig +USHORT StatementList::aSubMenuId3 = 0; // and now even 3 levels #i31512# SystemWindow *StatementList::pMenuWindow = NULL; TTProperties *StatementList::pTTProperties = NULL; @@ -131,7 +131,7 @@ TTSettings* GetTTSettings() // FIXME: HELPID -#define IS_WINP_CLOSING(pWin) (pWin->GetHelpId().equals( "4321" ) && pWin->GetUniqueId().equals( "1234" )) +#define IS_WINP_CLOSING(pWin) (pWin->GetHelpId().equals( "TT_Win_is_closing_HID" ) && pWin->GetUniqueId().equals( "TT_Win_is_closing_UID" )) /* UniString GEN_RES_STR0( ULONG nResId ) { return ResString( nResId ); } @@ -156,7 +156,7 @@ void StatementList::InitProfile() #if OSL_DEBUG_LEVEL > 1 if ( pCurrentProfileStatement != NULL && pCurrentProfileStatement != this ) - pRet->GenReturn( RET_ProfileInfo, rtl::OString(), CUniString("InitProfile von anderem Statement gerufen ohne SendProfile\n") ); + pRet->GenReturn( RET_ProfileInfo, 0, CUniString("InitProfile von anderem Statement gerufen ohne SendProfile\n") ); #endif pCurrentProfileStatement = this; } @@ -172,19 +172,19 @@ void StatementList::SendProfile( String aText ) pProfiler->EndProfileInterval(); if ( pProfiler->IsProfilingPerCommand() ) - pRet->GenReturn( RET_ProfileInfo, rtl::OString(), pProfiler->GetProfileLine( aText ) ); + pRet->GenReturn( RET_ProfileInfo, 0, pProfiler->GetProfileLine( aText ) ); if ( pProfiler->IsPartitioning() ) // FIXME: HELPID - pRet->GenReturn( RET_ProfileInfo, rtl::OString( /*S_ProfileTime*/ ), static_cast(pProfiler->GetPartitioningTime()) ); // GetPartitioningTime() ULONG != comm_ULONG on 64bit + pRet->GenReturn( RET_ProfileInfo, S_ProfileTime, static_cast(pProfiler->GetPartitioningTime()) ); // GetPartitioningTime() ULONG != comm_ULONG on 64bit } if ( pProfiler->IsAutoProfiling() ) - pRet->GenReturn( RET_ProfileInfo, rtl::OString(), pProfiler->GetAutoProfiling() ); + pRet->GenReturn( RET_ProfileInfo, 0, pProfiler->GetAutoProfiling() ); #if OSL_DEBUG_LEVEL > 1 if ( pCurrentProfileStatement == NULL ) - pRet->GenReturn( RET_ProfileInfo, rtl::OString(), CUniString("SendProfile ohne InitProfile\n") ); + pRet->GenReturn( RET_ProfileInfo, 0, CUniString("SendProfile ohne InitProfile\n") ); #endif pCurrentProfileStatement = NULL; } @@ -392,9 +392,7 @@ Window* StatementList::SearchClientWin( Window *pBase, Search &aSearch, BOOL May BOOL SearchUID::IsWinOK( Window *pWin ) { - // FIXME: HELPID - #if 0 - if ( aUId.Matches( pWin->GetUniqueOrHelpId() ) ) + if ( aUId.equals( pWin->GetUniqueOrHelpId() ) ) { if ( ( pWin->IsEnabled() || HasSearchFlag( SEARCH_FIND_DISABLED ) ) && pWin->IsVisible() ) return TRUE; @@ -411,7 +409,7 @@ BOOL SearchUID::IsWinOK( Window *pWin ) USHORT i; for ( i = 0; i < pTB->GetItemCount() ; i++ ) { - if ( aUId.Matches( pTB->GetItemCommand(pTB->GetItemId( i )) ) || aUId.Matches( pTB->GetHelpId(pTB->GetItemId( i )) ) ) + if ( aUId.equals( Str2Id( pTB->GetItemCommand(pTB->GetItemId( i )) ) ) || aUId.equals( pTB->GetHelpId(pTB->GetItemId( i )) ) ) { // ID matches. Window *pItemWin; pItemWin = pTB->GetItemWindow( pTB->GetItemId( i ) ); @@ -456,9 +454,6 @@ BOOL SearchUID::IsWinOK( Window *pWin ) return FALSE; } else - #else - (void)pWin; - #endif return FALSE; } @@ -981,8 +976,7 @@ String StatementList::ClientTree(Window *pBase, int Indent) WRITE(sIndent); WRITEc("UId : "); - // FIXME: HELPID - WRITE(String(rtl::OStringToOUString(pBase->GetUniqueOrHelpId(), RTL_TEXTENCODING_UTF8))); + WRITE(Id2Str(pBase->GetUniqueOrHelpId())); WRITEc(":0x"); WRITE( String::CreateFromInt64( @@ -1039,7 +1033,7 @@ BOOL StatementList::CheckWindowWait() if ( WinPtrValid(pWindowWaitPointer) && IS_WINP_CLOSING(pWindowWaitPointer) ) { #if OSL_DEBUG_LEVEL > 1 - m_pDbgWin->AddText( aWindowWaitUId.GetText().AppendAscii(" Still Open. RType=") ); + m_pDbgWin->AddText( Id2Str(aWindowWaitUId).AppendAscii(" Still Open. RType=") ); m_pDbgWin->AddText( String::CreateFromInt32( pWindowWaitPointer->GetType() ).AppendAscii("\n") ); #endif @@ -1049,7 +1043,6 @@ BOOL StatementList::CheckWindowWait() #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( "Close timed out. Going on!! " ); #endif - // FIXME: HELPID pWindowWaitPointer->SetHelpId(aWindowWaitOldHelpId); pWindowWaitPointer->SetUniqueId(aWindowWaitOldUniqueId); @@ -1090,9 +1083,7 @@ void StatementList::ReportError(String aMessage, ULONG nWhatever) void StatementList::DirectLog( ULONG nType, String aMessage ) { if ( pRet ) - // FIXME: HELPID - pRet->GenReturn( RET_DirectLoging, rtl::OString(/*nType*/), aMessage ); - (void) nType; + pRet->GenReturn( RET_DirectLoging, nType, aMessage ); } diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx index 2b2e7dab5..dba50e429 100644 --- a/automation/source/server/statemnt.cxx +++ b/automation/source/server/statemnt.cxx @@ -155,14 +155,13 @@ 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->GetUniqueOrHelpId(); \ aWindowWaitOldHelpId = pWin->GetHelpId(); \ aWindowWaitOldUniqueId = pWin->GetUniqueId(); \ - pWin->SetHelpId( rtl::OString("4321") ); \ - pWin->SetUniqueId( rtl::OString("1234") ); + pWin->SetHelpId( rtl::OString("TT_Win_is_closing_HID") ); \ + pWin->SetUniqueId( rtl::OString("TT_Win_is_closing_UID") ); // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= @@ -303,39 +302,9 @@ BOOL StatementFlow::Execute() // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= // neue Hilfsfunktion, die stetig erweitert werden muss -static short ImpGetRType( Window *pWin, rtl::OString aUId ) +static short ImpGetRType( Window *pWin ) { - // 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" ); - short nRT; - if( (nUId & 0xE0000000) == 0 ) // keine auto ID - nRT = C_NoType; - else { -// if( (nUId & 0x1F) == 0 ) // globale Resource - if( (nUId & 0x1FF) == 0 ) // globale Resource GH: soweit ich das verstanden habe 1FF - nRT = (short)(C_TabPage - 1 + (nUId >> 29)); - else - nRT = (short)((nUId & 0x00003E00) >> 9); - if ( nRT == C_TabPage ) // wegen TabDialog.UId = TabPage.UId - nRT = C_NoType; - else - { -#ifndef DBG_UTIL - return nRT; -#endif - } - } - #else - short nRT = 0; - (void)aUId; - #endif - -#ifdef DBG_UTIL - short n = nRT; -#endif + short nRT = C_NoType; WindowType eRT = pWin->GetType(); switch( eRT ) { case WINDOW_WINDOW: nRT = C_Window ; break; @@ -401,15 +370,6 @@ static short ImpGetRType( Window *pWin, rtl::OString aUId ) case WINDOW_DIALOG: nRT = C_Dialog; break; } -#ifdef DBG_UTIL - // Die Werte n sind bei den WindowTypen nicht mehr vergeben, werden aber in der AutoID noch verwendet - // Sie werden jetzt durch den Typ nRT implementiert. - DBG_ASSERT( n == C_NoType || n == nRT - || ( n == C_ImageButton && nRT == C_PushButton ) - || ( n == C_TriStateBox && nRT == C_CheckBox ) - || ( n == C_ImageRadioButton && nRT == C_RadioButton ) - , "error in algorithm" ); -#endif return nRT; } @@ -598,9 +558,9 @@ BOOL StatementSlot::Execute() if ( !bMenuClosed ) { pPopup->EndExecute(0); - aSubMenuId1 = rtl::OString(); - aSubMenuId2 = rtl::OString(); - aSubMenuId3 = rtl::OString(); + aSubMenuId1 = 0; + aSubMenuId2 = 0; + aSubMenuId3 = 0; pMenuWindow = NULL; bMenuClosed = TRUE; #if OSL_DEBUG_LEVEL > 1 @@ -722,12 +682,12 @@ BOOL StatementSlot::Execute() { case TT_PR_ERR_NODISPATCHER: { - ReportError( rtl::OString(nFunctionId), GEN_RES_STR0( S_SID_EXECUTE_FAILED_NO_DISPATCHER ) ); + ReportError( rtl::OString::valueOf((sal_Int32)nFunctionId), GEN_RES_STR0( S_SID_EXECUTE_FAILED_NO_DISPATCHER ) ); } break; case TT_PR_ERR_NOEXECUTE: { - ReportError(rtl::OString(nFunctionId), GEN_RES_STR0( S_SID_EXECUTE_FAILED ) ); + ReportError( rtl::OString::valueOf((sal_Int32)nFunctionId), GEN_RES_STR0( S_SID_EXECUTE_FAILED ) ); } break; } @@ -766,7 +726,6 @@ StatementUnoSlot::StatementUnoSlot(SCmdStream *pIn) StatementCommand::StatementCommand( StatementList *pAfterThis, USHORT MethodId, USHORT Params, USHORT Nr1 ) : nMethodId( MethodId ) -, aSmartMethodId() , nParams(Params) , nNr1(Nr1) , nNr2(0) @@ -779,12 +738,11 @@ StatementCommand::StatementCommand( StatementList *pAfterThis, USHORT MethodId, , bBool2(FALSE) { QueStatement( pAfterThis ); - aSmartMethodId = rtl::OString( nMethodId ); #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( "Directly adding Conmmand:" ); m_pDbgWin->AddText( " Methode: " ); - m_pDbgWin->AddText( aSmartMethodId.GetText() ); + m_pDbgWin->AddText( String::CreateFromInt32( nMethodId ) ); m_pDbgWin->AddText( " Params:" ); if( nParams & PARAM_USHORT_1 ) {m_pDbgWin->AddText( " n1:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr1 ) );} if( nParams & PARAM_USHORT_2 ) {m_pDbgWin->AddText( " n2:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr2 ) );} @@ -802,7 +760,6 @@ StatementCommand::StatementCommand( StatementList *pAfterThis, USHORT MethodId, StatementCommand::StatementCommand( SCmdStream *pCmdIn ) : nMethodId(0) -, aSmartMethodId() , nParams(0) , nNr1(0) , nNr2(0) @@ -816,7 +773,6 @@ StatementCommand::StatementCommand( SCmdStream *pCmdIn ) { QueStatement( NULL ); pCmdIn->Read( nMethodId ); - aSmartMethodId = rtl::OString( nMethodId ); pCmdIn->Read( nParams ); if( nParams & PARAM_USHORT_1 ) pCmdIn->Read( nNr1 ); @@ -832,7 +788,7 @@ StatementCommand::StatementCommand( SCmdStream *pCmdIn ) #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( "Reading Conmmand:" ); m_pDbgWin->AddText( " Methode: " ); - m_pDbgWin->AddText( aSmartMethodId.GetText() ); + m_pDbgWin->AddText( String::CreateFromInt32( nMethodId ) ); m_pDbgWin->AddText( " Params:" ); if( nParams & PARAM_USHORT_1 ) {m_pDbgWin->AddText( " n1:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr1 ) );} if( nParams & PARAM_USHORT_2 ) {m_pDbgWin->AddText( " n2:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr2 ) );} @@ -950,11 +906,8 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst break; default: - // FIXME: HELPID - #if 0 - if ( pBase->GetSmartUniqueOrHelpId().Equals( rtl::OString() ) && !( nConf & DH_MODE_ALLWIN ) ) + if ( ( pBase->GetUniqueOrHelpId().getLength() == 0 ) && !( nConf & DH_MODE_ALLWIN ) ) bSkip = TRUE; - #endif break; } @@ -985,16 +938,9 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst aTypeSuffix.AppendAscii( "/Unknown", 8 ); } - // FIXME: HELPID rtl::OString aId = pBase->GetUniqueOrHelpId(); - #if 0 - if ( aId.HasString() || ( nConf & DH_MODE_ALLWIN ) ) - 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, rtl::OString( aId.GetNum() ), (comm_ULONG)pBase->GetType(), - TypeString(pBase->GetType()).Append(aTypeSuffix).AppendAscii(": ").Append(aName), FALSE ); - #endif + pRet->GenReturn ( RET_WinInfo, aId, (comm_ULONG)pBase->GetType(), + TypeString(pBase->GetType()).Append(aTypeSuffix).AppendAscii(": ").Append(aName), FALSE ); if ( pBase->GetType() == WINDOW_TOOLBOX ) // Buttons und Controls auf Toolboxen. @@ -1015,32 +961,26 @@ 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, rtl::OString( pTB->GetItemCommand(pTB->GetItemId( i )) ), (comm_ULONG)WINDOW_BUTTON, + pRet->GenReturn ( RET_WinInfo, Str2Id(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, rtl::OString( pTB->GetHelpId(pTB->GetItemId( i )) ), (comm_ULONG)WINDOW_BUTTON, + pRet->GenReturn ( RET_WinInfo, 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, rtl::OString( pTB->GetItemCommand(pTB->GetItemId( i )) ), (comm_ULONG)pItemWin->GetType(), + pRet->GenReturn ( RET_WinInfo, Str2Id(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, rtl::OString( pTB->GetHelpId(pTB->GetItemId( i )) ), (comm_ULONG)pItemWin->GetType(), + pRet->GenReturn ( RET_WinInfo, 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 { @@ -1067,15 +1007,12 @@ 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, rtl::OString( pTB->GetItemCommand(pTB->GetItemId( i )) ), (comm_ULONG)WINDOW_BASE, + pRet->GenReturn ( RET_WinInfo, Str2Id( 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, rtl::OString( pTB->GetHelpId(pTB->GetItemId( i )) ), (comm_ULONG)WINDOW_BASE, + pRet->GenReturn ( RET_WinInfo, pTB->GetHelpId(pTB->GetItemId( i )), (comm_ULONG)WINDOW_BASE, aToolBoxItemType.AppendAscii(": ").Append(aName), FALSE ); - #endif } } } @@ -1099,38 +1036,35 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst aName = String(); if ( aName.Len() == 0 ) aName = pBD->GetPushButton( pBD->GetButtonId(i) )->GetText(); - String aID; + ByteString aID; switch ( pBD->GetButtonId(i) ) { case BUTTONID_OK: - aID.AssignAscii("Ok"); + aID.Assign("Ok"); break; case BUTTONID_CANCEL: - aID.AssignAscii("Cancel"); + aID.Assign("Cancel"); break; case BUTTONID_YES: - aID.AssignAscii("Yes"); + aID.Assign("Yes"); break; case BUTTONID_NO: - aID.AssignAscii("No"); + aID.Assign("No"); break; case BUTTONID_RETRY: - aID.AssignAscii("Retry"); + aID.Assign("Retry"); break; case BUTTONID_HELP: - aID.AssignAscii("Help"); + aID.Assign("Help"); break; default: - aID = UniString::CreateFromInt32( pBD->GetButtonId(i) ); + aID = ByteString::CreateFromInt32( pBD->GetButtonId(i) ); break; } - // 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! + pRet->GenReturn ( RET_WinInfo, 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 + .AppendAscii(" ButtonId = ").AppendAscii( aID.GetBuffer() ), FALSE ); } return; // ButtonDialog ist hier schon komplett abgehandelt. @@ -1176,15 +1110,12 @@ 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, rtl::OString( pMenu->GetItemCommand(nID) ), (comm_ULONG)0, + pRet->GenReturn ( RET_WinInfo, Str2Id( pMenu->GetItemCommand(nID) ), (comm_ULONG)0, aMenuItemType.AppendAscii(": ").Append(aName), FALSE ); if ( !pMenu->GetItemCommand(nID).Len() || ( nConf & DH_MODE_ALLWIN ) ) - pRet->GenReturn ( RET_WinInfo, rtl::OString( nID ), (comm_ULONG)0, + pRet->GenReturn ( RET_WinInfo, rtl::OString::valueOf( (sal_Int32)nID ), (comm_ULONG)0, aMenuItemType.AppendAscii(": ").Append(aName), FALSE ); - #endif } } @@ -1600,15 +1531,12 @@ BOOL StatementCommand::DisplayHID() if ( GetTTSettings()->Act ) { SET_WIN(GetTTSettings()->Act); - // FIXME: HELPID - #if 0 - GetTTSettings()->pDisplayHidWin->SetDisplayText(GetTTSettings()->Act->GetSmartUniqueOrHelpId().GetText().AppendAscii(" WinType: ") + GetTTSettings()->pDisplayHidWin->SetDisplayText( Id2Str(GetTTSettings()->Act->GetUniqueOrHelpId()).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())); + if ( GetTTSettings()->Act && !GetTTSettings()->Act->GetUniqueId().equals( GetTTSettings()->Act->GetHelpId() ) ) + GetTTSettings()->pDisplayHidWin->SetText(UniString( TTProperties::GetSvtResId( TT_ALTERNATE_CAPTION ) ).AppendAscii(GetTTSettings()->Act->GetHelpId().getStr())); else GetTTSettings()->pDisplayHidWin->SetText( GetTTSettings()->aOriginalCaption ); - #endif } else GetTTSettings()->pDisplayHidWin->SetDisplayText(CUniString("Kein Window/Control gefunden")); @@ -1616,13 +1544,11 @@ BOOL StatementCommand::DisplayHID() else if ( GetTTSettings()->Act ) { // SET_WIN(GetTTSettings()->Act); - if ( GetTTSettings()->pDisplayHidWin->IsDisplayTextModified() && GetTTSettings()->pDisplayHidWin->GetDisplayText().Len() > 0 ) + // allow setting a HelpID manually (just enter the ID in the displayHID Window and terminate it by | + if ( GetTTSettings()->pDisplayHidWin->IsDisplayTextModified() && GetTTSettings()->pDisplayHidWin->GetDisplayText().GetTokenCount( '|' ) > 1 ) { - // FIXME: HELPID - #if 0 - GetTTSettings()->Act->SetSmartUniqueId( rtl::OString( GetTTSettings()->pDisplayHidWin->GetDisplayText().ToInt32() ) ); + GetTTSettings()->Act->SetUniqueId( Str2Id( GetTTSettings()->pDisplayHidWin->GetDisplayText().GetToken( '|' ) ) ); GetTTSettings()->pDisplayHidWin->ClearDisplayTextModified(); - #endif } } /* if ( Application::GetLastInputInterval() > 5000 ) // 5 Sekunden lang nix geschehen @@ -2157,16 +2083,16 @@ void TranslateWin::EnableTranslation() void StatementCommand::Translate() { // Es wurde eine initale UniqueId mitgegeben. Dann nur die dopelten Shortcuts liefern - if( (nParams & PARAM_ULONG_1) && nLNr1 ) + if( (nParams & PARAM_STR_1) && nLNr1 ) { String aDouble; - Window *pWin = SearchTree( rtl::OString( nLNr1 ) ,FALSE ); + Window *pWin = SearchTree( Str2Id( aString1 ) ,FALSE ); if ( pWin ) { pWin = pWin->GetWindow( WINDOW_OVERLAP ); aDouble = TranslateWin::MarkShortcutErrors( pWin, TRUE ); } - pRet->GenReturn ( RET_Value, aSmartMethodId, aDouble ); + pRet->GenReturn ( RET_Value, nMethodId, aDouble ); return; } @@ -2199,7 +2125,6 @@ void StatementCommand::Translate() { Window* pNew = pTranslationWindow->GetWindow( WINDOW_CLIENT ); // Bei Dockingwindoes das kanze Geraffel von Docking Floating überspringen - // FIXME: HELPID while ( IsDialog( pNew ) && !pNew->GetUniqueOrHelpId().getLength() && pNew->GetChildCount() == 1 ) pNew = pNew->GetChild( 0 ); pTranslationWindow = pNew; @@ -2207,8 +2132,7 @@ void StatementCommand::Translate() aTranslation = CUniString("0;"); - // FIXME: HELPID - aTranslation += String(rtl::OStringToOUString( pTranslationWindow->GetUniqueOrHelpId(), RTL_TEXTENCODING_UTF8 )); + aTranslation += Id2Str( pTranslationWindow->GetUniqueOrHelpId() ); aTranslation += ';'; aTranslation += TypeString( pTranslationWindow->GetType() ); @@ -2222,8 +2146,7 @@ void StatementCommand::Translate() if ( pParentDialog ) { - // FIXME: HELPID - aTranslation += String(rtl::OStringToOUString(pParentDialog->GetUniqueOrHelpId(), RTL_TEXTENCODING_UTF8)); + aTranslation += Id2Str(pParentDialog->GetUniqueOrHelpId()); aTranslation += ';'; aTranslation += TypeString( pParentDialog->GetType() ); } @@ -2252,13 +2175,13 @@ void StatementCommand::Translate() // alle TABSs quoten () aTranslation.SearchAndReplaceAll( CUniString("\t"), CUniString("\\t") ); - pRet->GenReturn ( RET_Value, aSmartMethodId, aTranslation ); + pRet->GenReturn ( RET_Value, nMethodId, aTranslation ); GetTTSettings()->pTranslateWin->EnableTranslation(); GetTTSettings()->bToTop = TRUE; } else { - pRet->GenReturn ( RET_Value, aSmartMethodId, String() ); + pRet->GenReturn ( RET_Value, nMethodId, String() ); GetTTSettings()->pTranslateWin->EnableTranslation(); ErrorBox err( GetTTSettings()->pTranslateWin, TTProperties::GetSvtResId( TT_NO_CONTROL )); err.Execute(); @@ -2268,7 +2191,7 @@ void StatementCommand::Translate() } else if ( GetTTSettings()->pTranslateWin->IsNextDialog() ) { - pRet->GenReturn ( RET_Value, aSmartMethodId, CUniString("1") ); + pRet->GenReturn ( RET_Value, nMethodId, CUniString("1") ); GetTTSettings()->pTranslateWin->ResetNextDialog(); GetTTSettings()->pTranslateWin->LoseFocus(); GetTTSettings()->bToTop = TRUE; @@ -2276,7 +2199,7 @@ void StatementCommand::Translate() else { GetTTSettings()->pTranslateWin->EnableTranslation(); - pRet->GenReturn ( RET_Value, aSmartMethodId, String() ); + pRet->GenReturn ( RET_Value, nMethodId, String() ); } } @@ -2364,7 +2287,7 @@ BOOL StatementCommand::Execute() { #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( "Skipping Command: " ); - m_pDbgWin->AddText( aSmartMethodId.GetText() ); + m_pDbgWin->AddText( String::CreateFromInt32( nMethodId ) ); m_pDbgWin->AddText( "\n" ); #endif @@ -2376,7 +2299,7 @@ BOOL StatementCommand::Execute() InitProfile(); #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( "Executing Command: " ); - m_pDbgWin->AddText( aSmartMethodId.GetText() ); + m_pDbgWin->AddText( String::CreateFromInt32( nMethodId ) ); m_pDbgWin->AddText( "\n" ); #endif @@ -2384,11 +2307,10 @@ 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( rtl::OStringToOUString( pControl->GetUniqueOrHelpId(), RTL_TEXTENCODING_UTF8) ) ); + m_pDbgWin->AddText( aInfo.AppendAscii(" \"").Append( pControl->GetText() ).AppendAscii("\" geschlossen, RType = ").Append( TypeString(pControl->GetType()) ).AppendAscii(", UId = ").Append( UIdString( pControl->GetUniqueOrHelpId() ) ) ); #else #define REPORT_WIN_CLOSED(pControl, aInfo) _REPORT_WIN_CLOSED(pControl, aInfo) #endif @@ -2396,7 +2318,6 @@ 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'; \ @@ -2406,7 +2327,7 @@ BOOL StatementCommand::Execute() aString1.AppendAscii("\" geschlossen, RType = ");\ aString1 += TypeString(pControl->GetType()); \ aString1.AppendAscii(", UId = "); \ - aString1 += String(rtl::OStringToOUString(pControl->GetUniqueOrHelpId(), RTL_TEXTENCODING_UTF8)); + aString1 += UIdString(pControl->GetUniqueOrHelpId()); switch ( nMethodId ) @@ -2439,9 +2360,9 @@ BOOL StatementCommand::Execute() bCatchGPF = TRUE; bUsePostEvents = TRUE; - aSubMenuId1 = rtl::OString(); - aSubMenuId2 = rtl::OString(); - aSubMenuId3 = rtl::OString(); + aSubMenuId1 = 0; + aSubMenuId2 = 0; + aSubMenuId3 = 0; pMenuWindow = NULL; } if ( !nRetryCount ) @@ -2462,14 +2383,12 @@ BOOL StatementCommand::Execute() && pControl->GetType() != WINDOW_BORDERWINDOW && nRetryCount-- ) { - // FIXME: HELPID - short nRT = ImpGetRType( pControl, pControl->GetUniqueOrHelpId() ); + short nRT = ImpGetRType( pControl ); 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(); - // FIXME: HELPID - nRT = ImpGetRType( pControl, pControl->GetUniqueOrHelpId() ); + nRT = ImpGetRType( pControl ); } switch( nRT ) @@ -2637,7 +2556,7 @@ BOOL StatementCommand::Execute() if ( Time().GetTime() < long(nLNr1) ) // Aktuelle Zeit kleiner Endzeit return FALSE; else - pRet->GenReturn ( RET_Value, aSmartMethodId, aString1); + pRet->GenReturn ( RET_Value, nMethodId, aString1); } break; case RC_WaitSlot: @@ -2651,12 +2570,12 @@ BOOL StatementCommand::Execute() } if ( !bIsSlotInExecute ) - pRet->GenReturn ( RET_Value, aSmartMethodId, comm_USHORT(CONST_WSFinished) ); + pRet->GenReturn ( RET_Value, nMethodId, comm_USHORT(CONST_WSFinished) ); else { if ( Time().GetTime() < long(nLNr1) ) // Aktuelle Zeit kleiner Endzeit return FALSE; - pRet->GenReturn ( RET_Value, aSmartMethodId, comm_USHORT(CONST_WSTimeout) ); + pRet->GenReturn ( RET_Value, nMethodId, comm_USHORT(CONST_WSTimeout) ); } } break; @@ -2708,21 +2627,21 @@ BOOL StatementCommand::Execute() ReportError( GEN_RES_STR0( S_NO_ACTIVE_WINDOW ) ); // if ( Application::GetAppWindow() ) // bWait = Application::GetAppWindow()->IsWait(); - pRet->GenReturn ( RET_Value, aSmartMethodId, bWait ); + pRet->GenReturn ( RET_Value, nMethodId, bWait ); break; } case RC_GetClipboard: { ::rtl::OUString aTemp; ::svt::OStringTransfer::PasteString( aTemp, GetFirstDocFrame() ); - pRet->GenReturn ( RET_Value, aSmartMethodId, String( aTemp ) ); + pRet->GenReturn ( RET_Value, nMethodId, String( aTemp ) ); } break; case RC_SetClipboard: ::svt::OStringTransfer::CopyString(aString1,GetFirstDocFrame()); break; case RC_WinTree: - pRet->GenReturn ( RET_Value, aSmartMethodId, Tree( NULL, 0)); + pRet->GenReturn ( RET_Value, nMethodId, Tree( NULL, 0)); break; #if OSL_DEBUG_LEVEL > 1 case RC_NoDebug: @@ -2747,10 +2666,7 @@ BOOL StatementCommand::Execute() ReportError( GEN_RES_STR0( S_NO_DIALOG_IN_GETACTIVE ) ); else { - // FIXME: HELPID - #if 0 - pRet->GenReturn( RET_Value, aSmartMethodId, static_cast(pWin->GetUniqueOrHelpId().GetNum())); //GetNum() ULONG != comm_ULONG on 64bit - #endif + pRet->GenReturn( RET_Value, nMethodId, Id2Str(pWin->GetUniqueOrHelpId()) ); } } break; @@ -2784,7 +2700,7 @@ BOOL StatementCommand::Execute() pProfiler->StartAutoProfiling( nNr1 ); // Der Header ist abhängig vom Modus - pRet->GenReturn( RET_ProfileInfo, rtl::OString(), pProfiler->GetProfileHeader() ); + pRet->GenReturn( RET_ProfileInfo, 0, pProfiler->GetProfileHeader() ); } else if ( nParams & PARAM_USHORT_1 ) { // Partitioning initialisieren: Profile true [,nNr][,nNr][,nNr][,nNr] @@ -2797,32 +2713,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, rtl::OString( S_ProfileReset ), nAnzahl ); + pRet->GenReturn( RET_ProfileInfo, S_ProfileReset, nAnzahl ); // Und die einzelnen Grenzen - 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 ); }; + if ( nParams & PARAM_USHORT_1 ) { pRet->GenReturn( RET_ProfileInfo, S_ProfileBorder1, (comm_ULONG)nNr1 ); }; + if ( nParams & PARAM_USHORT_2 ) { pRet->GenReturn( RET_ProfileInfo, S_ProfileBorder2, (comm_ULONG)nNr2 ); }; + if ( nParams & PARAM_USHORT_3 ) { pRet->GenReturn( RET_ProfileInfo, S_ProfileBorder3, (comm_ULONG)nNr3 ); }; + if ( nParams & PARAM_USHORT_4 ) { pRet->GenReturn( RET_ProfileInfo, 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, rtl::OString(), aString1 ); + pRet->GenReturn( RET_ProfileInfo, 0, aString1 ); } else { // Normales Profiling je Kommando: profile if ( pProfiler->IsAutoProfiling() ) { - pRet->GenReturn( RET_ProfileInfo, rtl::OString(), pProfiler->GetAutoProfiling() ); + pRet->GenReturn( RET_ProfileInfo, 0, pProfiler->GetAutoProfiling() ); pProfiler->StopAutoProfiling(); } pProfiler->StartProfilingPerCommand(); // Der Header ist abhängig vom Modus - pRet->GenReturn( RET_ProfileInfo, rtl::OString(), pProfiler->GetProfileHeader() ); + pRet->GenReturn( RET_ProfileInfo, 0, pProfiler->GetProfileHeader() ); } } else // Profiling wieder ausschalten: Profile false @@ -2833,13 +2749,13 @@ BOOL StatementCommand::Execute() if ( pProfiler->IsAutoProfiling() ) { - pRet->GenReturn( RET_ProfileInfo, rtl::OString(), pProfiler->GetAutoProfiling() ); + pRet->GenReturn( RET_ProfileInfo, 0, pProfiler->GetAutoProfiling() ); pProfiler->StopAutoProfiling(); } if ( pProfiler->IsPartitioning() ) { - pRet->GenReturn( RET_ProfileInfo, rtl::OString( S_ProfileDump ), (comm_ULONG)0 ); + pRet->GenReturn( RET_ProfileInfo, S_ProfileDump, (comm_ULONG)0 ); pProfiler->StopPartitioning(); } @@ -2937,13 +2853,13 @@ BOOL StatementCommand::Execute() { case RC_MenuGetItemCount: { - pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_ULONG)nItemCount ); + pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)nItemCount ); } break; case RC_MenuGetItemId: { - if ( ValueOK(aSmartMethodId, RcString( nMethodId ),nNr1,nItemCount) ) - pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_ULONG)pMenu->GetItemId(nPhysicalIndex-1) ); + if ( ValueOK( rtl::OString(), RcString( nMethodId ),nNr1,nItemCount) ) + pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)pMenu->GetItemId(nPhysicalIndex-1) ); } break; case RC_MenuGetItemPos: @@ -2965,53 +2881,50 @@ BOOL StatementCommand::Execute() } } } - pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_ULONG)(nLogicalPos+1) ); + pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)(nLogicalPos+1) ); } break; case RC_MenuIsSeperator: { - if ( ValueOK(aSmartMethodId, RcString( nMethodId ),nNr1,nItemCount) ) - pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_BOOL)(pMenu->GetItemType(nPhysicalIndex-1) == MENUITEM_SEPARATOR) ); + if ( ValueOK( rtl::OString(), RcString( nMethodId ),nNr1,nItemCount) ) + pRet->GenReturn ( RET_Value, nMethodId, (comm_BOOL)(pMenu->GetItemType(nPhysicalIndex-1) == MENUITEM_SEPARATOR) ); } break; case RC_MenuIsItemChecked: { - pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_BOOL)pMenu->IsItemChecked(nNr1) ); + pRet->GenReturn ( RET_Value, nMethodId, (comm_BOOL)pMenu->IsItemChecked(nNr1) ); } break; case RC_MenuIsItemEnabled: { - pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_BOOL)pMenu->IsItemEnabled(nNr1) ); + pRet->GenReturn ( RET_Value, nMethodId, (comm_BOOL)pMenu->IsItemEnabled(nNr1) ); } break; case RC_MenuGetItemText: { - pRet->GenReturn ( RET_Value, aSmartMethodId, (String)pMenu->GetItemText(nNr1) ); + pRet->GenReturn ( RET_Value, nMethodId, (String)pMenu->GetItemText(nNr1) ); } break; case RC_MenuGetItemCommand: { - pRet->GenReturn ( RET_Value, aSmartMethodId, (String)pMenu->GetItemCommand(nNr1) ); + pRet->GenReturn ( RET_Value, nMethodId, (String)pMenu->GetItemCommand(nNr1) ); } break; case RC_MenuHasSubMenu: { - pRet->GenReturn ( RET_Value, aSmartMethodId, (BOOL)(pMenu->GetPopupMenu(nNr1) != NULL) ); + pRet->GenReturn ( RET_Value, nMethodId, (BOOL)(pMenu->GetPopupMenu(nNr1) != NULL) ); } break; case RC_MenuSelect: { if ( pMenu->GetPopupMenu(nNr1) ) { - // FIXME: HELPID - #if 0 - if ( !aSubMenuId1.GetNum() ) - aSubMenuId1 = rtl::OString(nNr1); - else if ( !aSubMenuId2.GetNum() ) - aSubMenuId2 = rtl::OString(nNr1); - else if ( !aSubMenuId3.GetNum() ) - aSubMenuId3 = rtl::OString(nNr1); - #endif + if ( !aSubMenuId1 ) + aSubMenuId1 = nNr1; + else if ( !aSubMenuId2 ) + aSubMenuId2 = nNr1; + else if ( !aSubMenuId3 ) + aSubMenuId3 = nNr1; if ( pPopup ) pPopup->SelectEntry(nNr1); @@ -3023,17 +2936,17 @@ BOOL StatementCommand::Execute() if ( pPopup ) { pPopup->EndExecute(nNr1); - aSubMenuId1 = rtl::OString(); - aSubMenuId2 = rtl::OString(); - aSubMenuId3 = rtl::OString(); + aSubMenuId1 = 0; + aSubMenuId2 = 0; + aSubMenuId3 = 0; pMenuWindow = NULL; } else { pMenuBar->SelectEntry(nNr1); - aSubMenuId1 = rtl::OString(); - aSubMenuId2 = rtl::OString(); - aSubMenuId3 = rtl::OString(); + aSubMenuId1 = 0; + aSubMenuId2 = 0; + aSubMenuId3 = 0; pMenuWindow = NULL; } } @@ -3200,7 +3113,7 @@ BOOL StatementCommand::Execute() } if ( !nErrorcode ) { - pRet->GenReturn ( RET_Value, aSmartMethodId, aPath ); + pRet->GenReturn ( RET_Value, nMethodId, aPath ); } @@ -3232,9 +3145,9 @@ BOOL StatementCommand::Execute() if ( !aFS.IsKind( FSYS_KIND_WILD ) && !aFS.IsKind( FSYS_KIND_DIR ) && aEntry.Exists() ) { // Sonderbehandlung für genau einen Eintrag if ( !aFS.IsKind( FSYS_KIND_DIR ) && ( aDirEntryKind == FSYS_KIND_DIR ) ) - pRet->GenReturn ( RET_Value, aSmartMethodId, String() ); + pRet->GenReturn ( RET_Value, nMethodId, String() ); else - pRet->GenReturn ( RET_Value, aSmartMethodId, (String)(aEntry.GetName()) ); + pRet->GenReturn ( RET_Value, nMethodId, (String)(aEntry.GetName()) ); break; } @@ -3249,12 +3162,12 @@ BOOL StatementCommand::Execute() if ( !pDir ) pDir = new Dir; - if ( !nErrorcode && ValueOK( aSmartMethodId, GEN_RES_STR0( S_NO_MORE_FILES ), nDirPos+1, pDir->Count()+1 ) ) + if ( !nErrorcode && ValueOK( nMethodId, GEN_RES_STR0( S_NO_MORE_FILES ), nDirPos+1, pDir->Count()+1 ) ) { if ( nDirPos == pDir->Count() ) - pRet->GenReturn ( RET_Value, aSmartMethodId, String() ); + pRet->GenReturn ( RET_Value, nMethodId, String() ); else - pRet->GenReturn ( RET_Value, aSmartMethodId, (String)((*pDir)[ nDirPos ].GetName()) ); + pRet->GenReturn ( RET_Value, nMethodId, (String)((*pDir)[ nDirPos ].GetName()) ); nDirPos++; }*/ } @@ -3266,7 +3179,7 @@ BOOL StatementCommand::Execute() if ( FSYS_ERR_OK == nErrorcode ) { FileStat aFS( aFile ); - pRet->GenReturn ( RET_Value, aSmartMethodId, static_cast(aFS.GetSize()) ); //GetSize() ULONG != comm_ULONG on 64bit + pRet->GenReturn ( RET_Value, nMethodId, static_cast(aFS.GetSize()) ); //GetSize() ULONG != comm_ULONG on 64bit nErrorcode = aFS.GetError(); } } @@ -3293,7 +3206,7 @@ BOOL StatementCommand::Execute() SbxValueRef xValue = new SbxValue( SbxDATE ); xValue->PutDate( fSerial ); - pRet->GenReturn ( RET_Value, aSmartMethodId, *xValue ); + pRet->GenReturn ( RET_Value, nMethodId, *xValue ); } } break; @@ -3409,7 +3322,7 @@ BOOL StatementCommand::Execute() aPointer = Pointer( POINTER_NULL ); } } - pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_ULONG)aPointer.GetStyle() ); + pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)aPointer.GetStyle() ); } break; case RC_UnpackStorage: @@ -3478,7 +3391,7 @@ BOOL StatementCommand::Execute() break; case RC_ExistsSysDialog: { - pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_BOOL)xPicker.is() ); + pRet->GenReturn ( RET_Value, nMethodId, (comm_BOOL)xPicker.is() ); } break; default: @@ -3519,14 +3432,14 @@ BOOL StatementCommand::Execute() break; case RC_GetDocumentCount : { - pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_USHORT)GetDocWinCount() ); + pRet->GenReturn ( RET_Value, nMethodId, (comm_USHORT)GetDocWinCount() ); } break; case RC_ActivateDocument : { if( nParams & PARAM_USHORT_1 ) { - if ( ValueOK(aSmartMethodId, RcString( nMethodId ), nNr1, GetDocWinCount() ) ) + if ( ValueOK( rtl::OString(), RcString( nMethodId ), nNr1, GetDocWinCount() ) ) { Window* pWin = GetDocWin( nNr1-1 ); if ( pWin ) @@ -3542,7 +3455,7 @@ BOOL StatementCommand::Execute() break; case RC_GetSystemLanguage : { - pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_USHORT)Application::GetSettings().GetLanguage() ); + pRet->GenReturn ( RET_Value, nMethodId, (comm_USHORT)Application::GetSettings().GetLanguage() ); } break; case RC_CatchGPF : @@ -3561,7 +3474,7 @@ BOOL StatementCommand::Execute() #else bIsProduct = TRUE; #endif - pRet->GenReturn ( RET_Value, aSmartMethodId, (BOOL)bIsProduct ); + pRet->GenReturn ( RET_Value, nMethodId, (BOOL)bIsProduct ); } break; case RC_UsePostEvents : @@ -3640,18 +3553,22 @@ StatementControl::StatementControl( SCmdStream *pCmdIn, USHORT nControlIdType ) , bBool2(FALSE) { QueStatement( NULL ); + //HELPID BACKWARD (SIControl is no longer needed) if ( nControlIdType == SIControl ) { comm_ULONG nId; pCmdIn->Read( nId ); aUId = rtl::OString( nId ); + if ( nId == 0 ) + aUId = UID_ACTIVE; + else + ReportError( aUId, GEN_RES_STR1c( S_INTERNAL_ERROR, "using numeric HelpID from old Testtool" ) ); } else if ( nControlIdType == SIStringControl ) { String aId; pCmdIn->Read( aId ); - // FIXME: HELPID - aUId = rtl::OUStringToOString( aId, RTL_TEXTENCODING_UTF8 ); + aUId = Str2Id( aId ); } else { @@ -3673,7 +3590,7 @@ StatementControl::StatementControl( SCmdStream *pCmdIn, USHORT nControlIdType ) #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( "Reading Control: UId: " ); - m_pDbgWin->AddText( aUId.GetText() ); + m_pDbgWin->AddText( Id2Str( aUId ) ); m_pDbgWin->AddText( " Methode: " ); m_pDbgWin->AddText( String::CreateFromInt32( nMethodId ) ); m_pDbgWin->AddText( " Params:" ); @@ -3760,14 +3677,11 @@ 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 ) ) ) + aUId.equals( UID_ACTIVE ) ) ) return TRUE; else - #endif { UniString aBezeichnung( cBezeichnung, RTL_TEXTENCODING_ASCII_US ); if ( aBezeichnung.Len() > 0 ) @@ -3822,29 +3736,23 @@ USHORT StatementList::GetCurrentMenues( PopupMenu *&pPopup, MenuBar *&pMenuBar, if ( !pMenu ) return 1; - // FIXME: HELPID - #if 0 - if ( aSubMenuId1.GetNum() ) + if ( aSubMenuId1 ) { - pPopup = pMenu->GetPopupMenu( - sal::static_int_cast< USHORT >(aSubMenuId1.GetNum())); + pPopup = pMenu->GetPopupMenu( aSubMenuId1 ); pMenu = pPopup; } - if ( pMenu && aSubMenuId2.GetNum() ) + if ( pMenu && aSubMenuId2 ) { - pPopup = pMenu->GetPopupMenu( - sal::static_int_cast< USHORT >(aSubMenuId2.GetNum())); + pPopup = pMenu->GetPopupMenu( aSubMenuId2 ); pMenu = pPopup; } - if ( pMenu && aSubMenuId3.GetNum() ) + if ( pMenu && aSubMenuId3 ) { - pPopup = pMenu->GetPopupMenu( - sal::static_int_cast< USHORT >(aSubMenuId3.GetNum())); + pPopup = pMenu->GetPopupMenu( aSubMenuId3 ); pMenu = pPopup; } - #endif return 0; } @@ -4085,10 +3993,7 @@ BOOL StatementControl::HandleVisibleControls( Window *pControl ) default: return FALSE; } - // FIXME: HELPID - #if 0 SendProfile( UIdString( aUId ).Append('.').Append( MethodString( nMethodId ) ) ); - #endif return TRUE; } return FALSE; @@ -4373,9 +4278,9 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) break; case M_OpenContextMenu: { - aSubMenuId1 = rtl::OString(); - aSubMenuId2 = rtl::OString(); - aSubMenuId3 = rtl::OString(); + aSubMenuId1 = 0; + aSubMenuId2 = 0; + aSubMenuId3 = 0; pMenuWindow = NULL; Point aPos; ToolBox* pTB = (ToolBox*)pControl; @@ -4409,9 +4314,9 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) break; case M_UseMenu: { - aSubMenuId1 = rtl::OString(); - aSubMenuId2 = rtl::OString(); - aSubMenuId3 = rtl::OString(); + aSubMenuId1 = 0; + aSubMenuId2 = 0; + aSubMenuId3 = 0; pMenuWindow = NULL; while ( pControl && !( ( pControl->GetType() == WINDOW_SYSWINDOW || pControl->GetType() == WINDOW_WORKWINDOW ) && ControlOK( pControl, "" ) ) ) @@ -4502,10 +4407,7 @@ 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: @@ -4640,7 +4542,7 @@ BOOL StatementControl::Execute() { #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( "Skipping Window: " ); - m_pDbgWin->AddText( aUId.GetText() ); + m_pDbgWin->AddText( Id2Str( aUId ) ); m_pDbgWin->AddText( " Method: " ); m_pDbgWin->AddText( String::CreateFromInt32( nMethodId ) ); m_pDbgWin->AddText( "\n" ); @@ -4653,19 +4555,16 @@ BOOL StatementControl::Execute() InitProfile(); #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( "Executing Window: " ); - m_pDbgWin->AddText( aUId.GetText() ); + m_pDbgWin->AddText( Id2Str( aUId ) ); m_pDbgWin->AddText( " Method: " ); m_pDbgWin->AddText( String::CreateFromInt32( nMethodId ) ); m_pDbgWin->AddText( "\n" ); #endif - // FIXME: HELPID - #if 0 - if ( aUId.Matches( UID_ACTIVE ) ) + if ( aUId.equals( 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); @@ -4684,9 +4583,7 @@ BOOL StatementControl::Execute() if ( pControl && pControl->GetType() == WINDOW_TOOLBOX ) { - // FIXME: HELPID - #if 0 - if ( !aUId.Matches( pControl->GetSmartUniqueOrHelpId() ) ) + if ( !aUId.equals( pControl->GetUniqueOrHelpId() ) ) { // Also wenn wir irgendwas auf einer Toolbox gefunden haben switch ( nMethodId ) { @@ -4702,7 +4599,6 @@ BOOL StatementControl::Execute() pControl = NULL; } } - #endif } @@ -4746,7 +4642,7 @@ BOOL StatementControl::Execute() if( pControl ) // Das Fenster Existiert irgendwo, kann aber auch hidden sein! { - nRT = ImpGetRType( pControl, aUId ); // If not Numeric pControl is used + nRT = ImpGetRType( pControl ); #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( "Type is: " ); m_pDbgWin->AddText( String::CreateFromInt32( nRT ) ); @@ -4889,47 +4785,44 @@ 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 + pRet->GenReturn ( RET_Value, aUId, Id2Str( ((TabControl*)pControl)->GetTabPage(((TabControl*)pControl)->GetCurPageId())->GetUniqueOrHelpId() ) ); break; case M_SetPage : { // Wegen lokaler Variablen - // FIXME: HELPID - #if 0 TabControl *pTControl = ((TabControl*)pControl); USHORT nActive = pTControl->GetCurPageId(); USHORT i,anz; rtl::OString aID; rtl::OString aWantedID; + //HELPID BACKWARD (No numbers please (remove PARAM_ULONG_1 part) if ( (nParams & PARAM_ULONG_1) ) { - aWantedID = rtl::OString( nLNr1 ); + //aWantedID = rtl::OString( nLNr1 ); + ReportError( aUId, GEN_RES_STR1c( S_INTERNAL_ERROR, "using numeric HelpID from old Testtool" ) ); } else if ( (nParams & PARAM_STR_1) ) { - aWantedID = rtl::OString( aString1 ); + aWantedID = Str2Id( aString1 ); } else ReportError( aUId, GEN_RES_STR1( S_INTERNAL_ERROR, MethodString( nMethodId ) ) ); i = pTControl->GetPagePos( pTControl->GetCurPageId() ); - for ( anz=0 ; anz < pTControl->GetPageCount() && !aID.Matches( aWantedID ) ; anz++ ) + for ( anz=0 ; anz < pTControl->GetPageCount() && !aID.equals( aWantedID ) ; anz++ ) { pTControl->SelectTabPage( pTControl->GetPageId(i) ); /*if (pTControl->GetCurPageId()) pTControl->DeactivatePage(); pTControl->SetCurPageId( pTControl->GetPageId(i) ); pTControl->ActivatePage();*/ - aID = pTControl->GetTabPage(pTControl->GetCurPageId())->GetSmartUniqueOrHelpId(); + aID = pTControl->GetTabPage(pTControl->GetCurPageId())->GetUniqueOrHelpId(); i++; if ( i >= pTControl->GetPageCount() ) i = 0; if ( !MaybeDoTypeKeysDelay( pTControl ) || !MaybeDoTypeKeysDelay( pTControl ) || !MaybeDoTypeKeysDelay( pTControl ) ) // 3 Mal aufrufen break; } - if ( !aID.Matches( aWantedID ) ) + if ( !aID.equals( aWantedID ) ) { pTControl->SelectTabPage( nActive ); /*if (pTControl->GetCurPageId()) @@ -4938,7 +4831,6 @@ BOOL StatementControl::Execute() pTControl->ActivatePage();*/ ReportError( aWantedID, GEN_RES_STR1( S_TABPAGE_NOT_FOUND, MethodString( nMethodId ) ) ); } - #endif } break; default: @@ -5366,9 +5258,9 @@ BOOL StatementControl::Execute() ImplMouseButtonUp ( pControl, aMEvnt, FORCE_DIRECT_CALL ); - aSubMenuId1 = rtl::OString(); - aSubMenuId2 = rtl::OString(); - aSubMenuId3 = rtl::OString(); + aSubMenuId1 = 0; + aSubMenuId2 = 0; + aSubMenuId3 = 0; pMenuWindow = NULL; } break; @@ -5377,46 +5269,32 @@ BOOL StatementControl::Execute() break; } break; -#if 0 case C_ToolBox: { ToolBox *pTB = ((ToolBox*)pControl); - // FIXME: HELPID - #if 0 - if ( !aUId.Matches( pTB->GetUniqueOrHelpId() ) ) // Also Button auf der ToolBox gefunden + if ( !aUId.equals( pTB->GetUniqueOrHelpId() ) ) // So we found a Button on the ToolBox { if ( (nParams == PARAM_NONE) || (nParams == PARAM_USHORT_1) ) { // Wir fälschen einen Parameter - if ( aUId.HasNumeric() ) - { - nParams |= PARAM_ULONG_1; - nLNr1 = USHORT( aUId.GetNum() ); - DBG_ASSERT( nLNr1 <= 0xFFFF, "ID on ToolBox > 0xFFFF" ); - } - else - { - nParams |= PARAM_STR_1; - aString1 = aUId.GetStr(); - } + nParams |= PARAM_STR_1; + aString1 = Id2Str( aUId ); } else ReportError( aUId, GEN_RES_STR1( S_INTERNAL_ERROR, MethodString( nMethodId ) ) ); } - #endif -// FIXME: HELPID #define FIND_ITEM\ USHORT nItemPos = 0;\ BOOL bItemFound = FALSE;\ {\ rtl::OString aButtonId;\ if( nParams & PARAM_STR_1 )\ - aButtonId = rtlOUStringToOString( 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 = Str2Id( aString1 );\ + else\ + ReportError( aUId, GEN_RES_STR1( S_INTERNAL_ERROR, MethodString( nMethodId ) ) );\ + for ( nItemPos = 0; nItemPos < pTB->GetItemCount() && !aButtonId.equals(Str2Id( pTB->GetItemCommand(pTB->GetItemId(nItemPos)) )) &&\ + !aButtonId.equals(pTB->GetHelpId(pTB->GetItemId(nItemPos))) ; nItemPos++ ) {}\ + bItemFound = aButtonId.equals(Str2Id( pTB->GetItemCommand(pTB->GetItemId(nItemPos)) )) || aButtonId.equals(pTB->GetHelpId(pTB->GetItemId(nItemPos)));\ if ( !bItemFound )\ ReportError( aUId, GEN_RES_STR1( S_HELPID_ON_TOOLBOX_NOT_FOUND, MethodString( nMethodId ) ) );\ else\ @@ -5458,7 +5336,8 @@ BOOL StatementControl::Execute() }\ }\ }\ - }\ + } + switch( nMethodId ) { case M_AnimateMouse : @@ -5477,9 +5356,9 @@ BOOL StatementControl::Execute() MouseEvent aMEvnt(aRect.Center(),1,MOUSE_SIMPLECLICK,MOUSE_LEFT); ImplMouseButtonDown( pTB, aMEvnt );*/ - aSubMenuId1 = rtl::OString(); - aSubMenuId2 = rtl::OString(); - aSubMenuId3 = rtl::OString(); + aSubMenuId1 = 0; + aSubMenuId2 = 0; + aSubMenuId3 = 0; pMenuWindow = NULL; new StatementCommand( this, RC_MenuSelect, PARAM_USHORT_1, pTB->GetItemId(nItemPos) + TOOLBOX_MENUITEM_START ); @@ -5542,9 +5421,9 @@ BOOL StatementControl::Execute() ImplMouseButtonUp( pTB, aMEvnt); // Das Fenster ist offen. - aSubMenuId1 = rtl::OString(); - aSubMenuId2 = rtl::OString(); - aSubMenuId3 = rtl::OString(); + aSubMenuId1 = 0; + aSubMenuId2 = 0; + aSubMenuId3 = 0; pMenuWindow = NULL; } } @@ -5563,27 +5442,26 @@ BOOL StatementControl::Execute() FIND_ITEM; if ( bItemFound ) // FIND_ITEM Erfolgreich { - 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)); - break; - case 2: - pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pTB->GetItemState(pTB->GetItemId(nItemPos))); - break; - case 3: - pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pTB->GetItemId(nItemPos)); - break; - default: - pRet->GenReturn ( RET_Value, aUId, comm_ULONG(0)); - break; - } + if ( ValueOK( aUId, CUniString("GetState"), nNr1, 4 ) ) + switch (nNr1) + { + case 0: + pRet->GenReturn ( RET_Value, aUId, Id2Str( pTB->GetHelpId(pTB->GetItemId(nItemPos)) ) ); + break; + case 1: + pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pTB->GetItemType(nItemPos)); + break; + case 2: + pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pTB->GetItemState(pTB->GetItemId(nItemPos))); + break; + case 3: + pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pTB->GetItemId(nItemPos)); + break; + default: + ReportError( aUId, GEN_RES_STR1( S_INTERNAL_ERROR, MethodString( nMethodId ) ) ); + pRet->GenReturn ( RET_Value, aUId, comm_ULONG(0)); + break; + } } } break; @@ -5899,7 +5777,6 @@ BOOL StatementControl::Execute() break; } break; -#endif case C_Control: { USHORT nRealControlType = 0; @@ -6459,10 +6336,7 @@ protected: break; case M_Close: //aWindowWaitUId = aUId; - // FIXME: HELPID - #if 0 - DBG_ASSERT( aUId.Matches( pControl->GetUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); - #endif + DBG_ASSERT( aUId.equals( pControl->GetUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); SET_WINP_CLOSING(pControl); ((DockingWindow*)pControl)->Close(); break; @@ -6538,10 +6412,7 @@ protected: break; } case M_Close: - // FIXME_ HELPID - #if 0 - DBG_ASSERT( aUId.Matches( pControl->GetUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); - #endif + DBG_ASSERT( aUId.equals( pControl->GetUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); SET_WINP_CLOSING(pControl); ((FloatingWindow*)pControl)->Close(); break; @@ -6564,10 +6435,7 @@ protected: AnimateMouse( pControl, MitteOben); break; case M_Close: - // FIXME: HELPID - #if 0 - DBG_ASSERT( aUId.Matches( pControl->GetSmartUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); - #endif + DBG_ASSERT( aUId.equals( pControl->GetUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); SET_WINP_CLOSING(pControl); ((SystemWindow*)pControl)->Close(); break; @@ -6576,10 +6444,7 @@ 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 + DBG_ASSERT( aUId.equals( pControl->GetUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); SET_WINP_CLOSING(pControl); ((Button*)pChild)->Click(); } @@ -6590,10 +6455,7 @@ 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 + DBG_ASSERT( aUId.equals( pControl->GetUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); SET_WINP_CLOSING(pControl); ((Button*)pChild)->Click(); } @@ -6630,10 +6492,7 @@ protected: AnimateMouse( pControl, MitteOben); break; case M_Close: - // FIXME: HELPID - #if 0 - DBG_ASSERT( aUId.Matches( pControl->GetSmartUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); - #endif + DBG_ASSERT( aUId.equals( pControl->GetUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); SET_WINP_CLOSING(pControl); ((WorkWindow*)pControl)->Close(); break; @@ -6858,10 +6717,7 @@ 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 93992d979..b0d2f6c4b 100644 --- a/automation/source/server/statemnt.hxx +++ b/automation/source/server/statemnt.hxx @@ -293,9 +293,9 @@ public: 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 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 USHORT aSubMenuId1; // Untermenüs bei PopupMenus + static USHORT aSubMenuId2; // erstmal 2-Stufig + static USHORT 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 @@ -349,7 +349,6 @@ class StatementCommand : public StatementList // Befehl ausf friend class ImplRemoteControl; protected: USHORT nMethodId; - rtl::OString aSmartMethodId; USHORT nParams; comm_USHORT nNr1,nNr2,nNr3,nNr4; comm_ULONG nLNr1; diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx index 880741ea2..21b9bac7e 100644 --- a/automation/source/testtool/objtest.cxx +++ b/automation/source/testtool/objtest.cxx @@ -3469,11 +3469,9 @@ 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 ( aNextReturnId.equals( aUId ) ) { - if( nParams & PARAM_ULONG_1 ) + if( nParams & PARAM_ULONG_1 ) // FIXME this is to allow negative numbers, hoping that no large numbers are interpreted wrong. should have new PARAM_LONG_1 instead { if ( nLNr1 > 0x7fffffff ) pImpl->pNextReturn->PutLong( long(nLNr1 - 0xffffffff) -1 ); @@ -3483,7 +3481,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) if( nParams & PARAM_USHORT_1 ) pImpl->pNextReturn->PutUShort( nNr1 ); if( nParams & PARAM_STR_1 ) pImpl->pNextReturn->PutString( aString1 ); if( nParams & PARAM_BOOL_1 ) pImpl->pNextReturn->PutBool( bBool1 ); - if( nParams & PARAM_SBXVALUE_1 ) + if( nParams & PARAM_SBXVALUE_1 ) // FIXME: allow generic datatype { SbxValues aValues( SbxDATE ); xValue1->Get( aValues ); @@ -3494,7 +3492,6 @@ 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; } diff --git a/automation/util/manually_added_ids.hid b/automation/util/manually_added_ids.hid old mode 100755 new mode 100644 -- cgit v1.2.3 From abadb34fbbef1e6f2578a939f0fc7b300e22ab0a Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 16 Apr 2010 23:02:51 +0200 Subject: CWS gnumake2: move delivered header files from sfx2/inc to sfx2/inc/sfx2; removed unused code; avoid delivering sfx.srs to solver --- basctl/source/basicide/basidesh.cxx | 2 +- basctl/util/makefile.mk | 2 -- cui/source/customize/acccfg.cxx | 4 +++- cui/source/customize/acccfg.src | 4 ---- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index 3216c5043..2e29bb137 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -90,7 +90,7 @@ using ::rtl::OUString; TYPEINIT1( BasicIDEShell, SfxViewShell ); -SFX_IMPL_VIEWFACTORY( BasicIDEShell, IDEResId( SVX_INTERFACE_BASIDE_VIEWSH ) ) +SFX_IMPL_VIEWFACTORY( BasicIDEShell ) { SFX_VIEW_REGISTRATION( BasicDocShell ); } diff --git a/basctl/util/makefile.mk b/basctl/util/makefile.mk index 0f2a919ff..70043bd96 100644 --- a/basctl/util/makefile.mk +++ b/basctl/util/makefile.mk @@ -94,8 +94,6 @@ SRSFILELIST=\ $(SRS)$/basicide.srs \ $(SRS)$/dlged.srs -SRSFILELIST+= $(SOLARCOMMONRESDIR)$/sfx.srs - RESLIB1NAME=basctl RESLIB1IMAGES =$(PRJ)$/res RESLIB1SRSFILES= $(SRSFILELIST) diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 38c7f3cb5..3a3f5e0df 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -43,6 +43,7 @@ #include #include #include +#include #include #include "cuires.hrc" @@ -724,7 +725,6 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( Window* pParent, const SfxIt , aResetButton (this , CUI_RES(BTN_RESET )) , aLoadAccelConfigStr ( CUI_RES( STR_LOADACCELCONFIG ) ) , aSaveAccelConfigStr ( CUI_RES( STR_SAVEACCELCONFIG ) ) - , aFilterAllStr ( CUI_RES( STR_SFX_FILTERNAME_ALL ) ) , aFilterCfgStr ( CUI_RES( STR_FILTERNAME_CFG ) ) , m_bStylesInfoInitialized(sal_False) , m_xGlobal () @@ -733,6 +733,8 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( Window* pParent, const SfxIt { FreeResource(); + aFilterAllStr = String( SfxResId( STR_SFX_FILTERNAME_ALL ) ); + // install handler functions aChangeButton.SetClickHdl( LINK( this, SfxAcceleratorConfigPage, ChangeHdl )); aRemoveButton.SetClickHdl( LINK( this, SfxAcceleratorConfigPage, RemoveHdl )); diff --git a/cui/source/customize/acccfg.src b/cui/source/customize/acccfg.src index 1b50e5f73..29ada245d 100644 --- a/cui/source/customize/acccfg.src +++ b/cui/source/customize/acccfg.src @@ -195,10 +195,6 @@ TabPage RID_SVXPAGE_KEYBOARD { Text [ en-US ] = "Save Keyboard Configuration" ; }; - String STR_SFX_FILTERNAME_ALL - { - Text [ en-US ] = "All files (*.*)" ; - }; String STR_FILTERNAME_CFG { Text [ en-US ] = "Configuration" ; -- cgit v1.2.3 From 87215b2023a20d77de14568241e0db77a4f6bddb Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 19 Apr 2010 17:54:47 +0200 Subject: CWS gnumake2: removed files in svl; typo in svtools makefile; missing include in sfx2 makefile --- cui/inc/pch/precompiled_cui.hxx | 1 - 1 file changed, 1 deletion(-) diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx index 403e6bcc1..d6a8eb99c 100644 --- a/cui/inc/pch/precompiled_cui.hxx +++ b/cui/inc/pch/precompiled_cui.hxx @@ -754,7 +754,6 @@ #include "svtools/apearcfg.hxx" #include "svl/brdcst.hxx" #include "unotools/cacheoptions.hxx" -#include "svl/cancel.hxx" #include "svl/cjkoptions.hxx" #include "unotools/cmdoptions.hxx" #include "svl/cntwall.hxx" -- cgit v1.2.3 From 0a824b9eeac6c1c98c765f85a0069c655ee472c2 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 19 Apr 2010 18:27:03 +0200 Subject: CWS gnumake2: remove duplicate header in solver: vcl/imagebtn.hxx is just a copy of vcl/button.hxx --- cui/source/inc/align.hxx | 2 +- cui/source/inc/postdlg.hxx | 2 +- cui/source/inc/splitcelldlg.hxx | 2 +- extensions/source/update/ui/updatecheckui.cxx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx index 84c3cd6c3..d5377a7c3 100644 --- a/cui/source/inc/align.hxx +++ b/cui/source/inc/align.hxx @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include #include diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx index fdb996680..af4afaef1 100644 --- a/cui/source/inc/postdlg.hxx +++ b/cui/source/inc/postdlg.hxx @@ -33,7 +33,7 @@ #include #endif #ifndef _IMAGEBTN_HXX //autogen -#include +#include #endif #ifndef _EDIT_HXX //autogen #include diff --git a/cui/source/inc/splitcelldlg.hxx b/cui/source/inc/splitcelldlg.hxx index ec1ea23fd..4d51b43cd 100644 --- a/cui/source/inc/splitcelldlg.hxx +++ b/cui/source/inc/splitcelldlg.hxx @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index 2fd478af3..55aebaff8 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -52,7 +52,7 @@ #include #include #include -#include +#include #include #include #include -- cgit v1.2.3 From 9537976cd8180bc3c74026c90cb4ee1303eb6763 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 20 Apr 2010 15:55:51 +0200 Subject: CWS gnumake2: move all delivered headers in svx to inc/svx; remove unused or useless headers --- extensions/source/bibliography/menu.src | 6 ------ 1 file changed, 6 deletions(-) diff --git a/extensions/source/bibliography/menu.src b/extensions/source/bibliography/menu.src index 6b8adc355..45ebcda37 100644 --- a/extensions/source/bibliography/menu.src +++ b/extensions/source/bibliography/menu.src @@ -27,14 +27,8 @@ #include #include -#ifndef _GLOBLMN_HRC #include -#endif -#ifndef _GLOBALACC_SRC -#include -#endif #include "bibliography.hrc" - #include "bib.hrc" /* -- cgit v1.2.3 From 48a80601bf811df2cb55bf362e2f30b7744ae290 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 20 Apr 2010 22:38:57 +0200 Subject: CWS gnumake2: remove some unnecessary resource magic --- extensions/source/bibliography/makefile.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/extensions/source/bibliography/makefile.mk b/extensions/source/bibliography/makefile.mk index efc1fbe22..5ea578e85 100644 --- a/extensions/source/bibliography/makefile.mk +++ b/extensions/source/bibliography/makefile.mk @@ -54,7 +54,6 @@ SRS1NAME=$(TARGET) SRC1FILES= bib.src \ datman.src \ sections.src \ - menu.src \ toolbar.src RESLIB1NAME=bib -- cgit v1.2.3 From 0a110a3635ad792edb21346ba2cf5938c6f02d40 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Sat, 24 Apr 2010 00:08:18 +0200 Subject: CWS gnumake2: wrong include --- extensions/source/propctrlr/standardcontrol.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index 291bfab33..5a3f39b8b 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -47,7 +47,7 @@ #include #endif #include -#include +#include //================================================================== #include #include -- cgit v1.2.3 From 89c55d4496c7fd5b8b61626d40769e9485697825 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Thu, 6 May 2010 15:13:08 +0200 Subject: CWS gnumake2: don't create static libs in tools --- cui/inc/pch/precompiled_cui.hxx | 1 - cui/source/inc/cuigaldlg.hxx | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx index d6a8eb99c..4e0a71afb 100644 --- a/cui/inc/pch/precompiled_cui.hxx +++ b/cui/inc/pch/precompiled_cui.hxx @@ -55,7 +55,6 @@ #include "boost/scoped_ptr.hpp" #include "boost/shared_ptr.hpp" #include "boost/spirit/core.hpp" -#include "bootstrp/sstring.hxx" #include "com/sun/star/accessibility/AccessibleEventId.hpp" #include "com/sun/star/accessibility/AccessibleEventObject.hpp" #include "com/sun/star/accessibility/AccessibleRelationType.hpp" diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index 6895ad7e3..9f5e5fdbb 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -46,7 +46,8 @@ #include #include #include -#include + +DECLARE_LIST( StringList, String* ) // ------------ // - Forwards - -- cgit v1.2.3 From e0f8d37bf34d9376f5fcb6e9bd6517abcb48aec7 Mon Sep 17 00:00:00 2001 From: Lars Langhans Date: Mon, 7 Jun 2010 13:14:09 +0200 Subject: sb123:#i111449# cleanups in extensions qa/complex tests --- extensions/prj/build.lst | 3 + .../complex/extensions/OfficeResourceLoader.java | 84 +++++++++++++++------- extensions/qa/complex/extensions/makefile.mk | 59 ++++++++------- 3 files changed, 91 insertions(+), 55 deletions(-) diff --git a/extensions/prj/build.lst b/extensions/prj/build.lst index 1489e2a4e..e6a4e02a8 100644 --- a/extensions/prj/build.lst +++ b/extensions/prj/build.lst @@ -34,3 +34,6 @@ ex extensions\source\update\feed nmake - all ex_updchkfeed ex ex extensions\source\update\check nmake - all ex_updchk ex_inc NULL ex extensions\source\update\ui nmake - all ex_updchkui ex_inc NULL ex extensions\util nmake - all ex_util ex_preload ex_abpilot ex_dbpilots ex_logging ex_ldap ex_propctrlr ex_bib ex_plutil ex_oooimprovecore NULL + +# Fails at the moment +# ex extensions\qa\complex\extensions nmake - all ex_complex ex_util NULL diff --git a/extensions/qa/complex/extensions/OfficeResourceLoader.java b/extensions/qa/complex/extensions/OfficeResourceLoader.java index 16bc967cc..6d5df80f8 100644 --- a/extensions/qa/complex/extensions/OfficeResourceLoader.java +++ b/extensions/qa/complex/extensions/OfficeResourceLoader.java @@ -26,6 +26,7 @@ ************************************************************************/ package complex.extensions; +import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.uno.UnoRuntime; import com.sun.star.resource.XResourceBundle; @@ -34,7 +35,15 @@ import com.sun.star.beans.XPropertySet; import com.sun.star.uno.XComponentContext; import com.sun.star.lang.Locale; -public class OfficeResourceLoader extends complexlib.ComplexTestCase +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; + +public class OfficeResourceLoader { XResourceBundleLoader m_loader; XResourceBundle m_bundle; @@ -45,37 +54,36 @@ public class OfficeResourceLoader extends complexlib.ComplexTestCase } /* ------------------------------------------------------------------ */ - public String[] getTestMethodNames() - { - return new String[] { - "checkSimpleStringAccess", - "checkLocales" - }; - } +// public String[] getTestMethodNames() +// { +// return new String[] { +// "checkSimpleStringAccess", +// "checkLocales" +// }; +// } /* ------------------------------------------------------------------ */ - public String getTestObjectName() - { - return "Extensions - OfficeResourceLoader"; - } +// public String getTestObjectName() +// { +// return "Extensions - OfficeResourceLoader"; +// } /* ------------------------------------------------------------------ */ - public void before() throws com.sun.star.uno.Exception, java.lang.Exception + @Before public void before() throws com.sun.star.uno.Exception, java.lang.Exception { - XPropertySet orb = (XPropertySet)UnoRuntime.queryInterface( XPropertySet.class, param.getMSF() ); - XComponentContext context = (XComponentContext)UnoRuntime.queryInterface( XComponentContext.class, - orb.getPropertyValue( "DefaultContext" ) ); + XPropertySet orb = UnoRuntime.queryInterface(XPropertySet.class, getMSF()); + XComponentContext context = UnoRuntime.queryInterface(XComponentContext.class, orb.getPropertyValue("DefaultContext")); m_loader = com.sun.star.resource.OfficeResourceLoader.get( context ); } /* ------------------------------------------------------------------ */ - public void after() throws com.sun.star.uno.Exception, java.lang.Exception + @After public void after() throws com.sun.star.uno.Exception, java.lang.Exception { } /* ------------------------------------------------------------------ */ - public void checkSimpleStringAccess() throws com.sun.star.uno.Exception, java.lang.Exception + @Test public void checkSimpleStringAccess() throws com.sun.star.uno.Exception, java.lang.Exception { // default bundle (UI locale) m_bundle = m_loader.loadBundle_Default( "orl" ); @@ -88,34 +96,62 @@ public class OfficeResourceLoader extends complexlib.ComplexTestCase && resourceLocale.Country.equals( "US" ) && resourceLocale.Variant.equals( "" ) ) - assure( "invalid 'en-US' string", testString.equals( "Dummy String" ) ); + { + assertTrue( "invalid 'en-US' string", testString.equals( "Dummy String" ) ); + } if ( resourceLocale.Language.equals( "de" ) && resourceLocale.Country.equals( "" ) && resourceLocale.Variant.equals( "" ) ) - assure( "invalid 'de' string", testString.equals( "Attrappen-Zeichenkette" ) ); + { + assertTrue( "invalid 'de' string", testString.equals( "Attrappen-Zeichenkette" ) ); + } if ( resourceLocale.Language.equals( "" ) && resourceLocale.Country.equals( "" ) && resourceLocale.Variant.equals( "" ) ) - assure( "invalid unlocalized string", testString.equals( "unlocalized string" ) ); + { + assertTrue( "invalid unlocalized string", testString.equals( "unlocalized string" ) ); + } } /* ------------------------------------------------------------------ */ - public void checkLocales() throws com.sun.star.uno.Exception, java.lang.Exception + @Test public void checkLocales() throws com.sun.star.uno.Exception, java.lang.Exception { // en-US bundle (should always be built and thus present and thus found) m_bundle = m_loader.loadBundle( "orl", new Locale( "en", "US", "" ) ); Locale resourceLocale = m_bundle.getLocale(); - assure( "'en-US' could not be loaded", + assertTrue( "'en-US' could not be loaded", resourceLocale.Language.equals( "en" ) && resourceLocale.Country.equals( "US" ) && resourceLocale.Variant.equals( "" ) ); // some (invalid) locale which is usually no built, and should thus fallback to en-US m_bundle = m_loader.loadBundle( "orl", new Locale( "inv", "al", "id" ) ); resourceLocale = m_bundle.getLocale(); - assure( "non-existing locale request does not fallback to en-US", + assertTrue( "non-existing locale request does not fallback to en-US", resourceLocale.Language.equals( "en" ) && resourceLocale.Country.equals( "US" ) && resourceLocale.Variant.equals( "" ) ); } + + + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); + return xMSF1; + } + + // setup and close connections + @BeforeClass public static void setUpConnection() throws Exception { + System.out.println("setUpConnection()"); + connection.setUp(); + } + + @AfterClass public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println("tearDownConnection()"); + connection.tearDown(); + } + + private static final OfficeConnection connection = new OfficeConnection(); } diff --git a/extensions/qa/complex/extensions/makefile.mk b/extensions/qa/complex/extensions/makefile.mk index 96c2afb40..281960b32 100644 --- a/extensions/qa/complex/extensions/makefile.mk +++ b/extensions/qa/complex/extensions/makefile.mk @@ -25,12 +25,26 @@ # #************************************************************************* -PRJ = ..$/..$/.. -TARGET = ExtensionsComplexTests +.IF "$(OOO_SUBSEQUENT_TESTS)" == "" +nothing .PHONY: +.ELSE + +PRJ = ../../.. PRJNAME = extensions -PACKAGE = complex$/$(PRJNAME) +TARGET = qa_complex_extensions + +.IF "$(OOO_JUNIT_JAR)" != "" +PACKAGE = complex/extensions +JAVATESTFILES = \ + OfficeResourceLoader.java + +JAVAFILES = $(JAVATESTFILES) + +JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar jurt.jar ConnectivityTools.jar +EXTRAJARFILES = $(OOO_JUNIT_JAR) +.END + -RES_TARGET = orl .IF "$(GUI)"=="WNT" command_seperator=&& @@ -38,11 +52,11 @@ command_seperator=&& command_seperator=; .ENDIF -# --- Settings ----------------------------------------------------- -.INCLUDE : settings.mk +.INCLUDE: settings.mk #----- resource files for the OfficeResourceLoader test ------------ +RES_TARGET = orl SRS1NAME=$(RES_TARGET)_A_ SRC1FILES= \ @@ -66,36 +80,19 @@ RES2FILELIST=\ RESLIB2NAME=$(RES_TARGET)_B_ RESLIB2SRSFILES=$(RES2FILELIST) +.INCLUDE: target.mk +.INCLUDE: installationtest.mk -#----- compile .java files ----------------------------------------- -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar ConnectivityTools.jar -JAVAFILES = $(shell @$(FIND) .$/*.java) -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) - -#----- make a jar from compiled files ------------------------------ - -MAXLINELENGTH = 100000 - -JARCLASSDIRS = $(PACKAGE) -JARTARGET = $(TARGET).jar -JARCOMPRESS = TRUE - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk +#----- resource files for the OfficeResourceLoader test ------------ -RUNNER_CLASSPATH = -cp $(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/OOoRunner.jar$(PATH_SEPERATOR)$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/ConnectivityTools.jar -RUNNER_ARGS = org.openoffice.Runner -TestBase java_complex -run:copy_resources - +java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -sce extensions_all.sce +ALLTAR : copy_resources javatest -run_%:copy_resources - +java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -o complex.$(PRJNAME).$(@:s/run_//) +copy_resources: $(RESLIB1TARGETN) $(RESLIB2TARGETN) + $(foreach,i,$(RESLIB1TARGETN) $(COPY) $i $(i:s/de/invalid/:s/_A_//) $(command_seperator)) echo + $(foreach,i,$(RESLIB2TARGETN) $(COPY) $i $(i:s/en-US/invalid/:s/_B_//) $(command_seperator)) echo -copy_resources: $(RESLIB1TARGETN) $(RESLIB2TARGETN) - @$(foreach,i,$(RESLIB1TARGETN) $(COPY) $i $(i:s/de/invalid/:s/_A_//) $(command_seperator)) echo. - @$(foreach,i,$(RESLIB2TARGETN) $(COPY) $i $(i:s/en-US/invalid/:s/_B_//) $(command_seperator)) echo. +.END -- cgit v1.2.3 From d3320362bc7d5a6c0326876192ed1c7fae8b036b Mon Sep 17 00:00:00 2001 From: Lars Langhans Date: Wed, 16 Jun 2010 11:34:04 +0200 Subject: sb123:#i111449# cleanups in beans qa/complex tests --- .../sun/star/comp/beans/LocalOfficeConnection.java | 13 +- bean/com/sun/star/comp/beans/OOoBean.java | 11 +- bean/prj/build.lst | 4 + bean/qa/complex/OOoBeanTest.java | 656 ------------------ bean/qa/complex/ScreenComparer.java | 233 ------- bean/qa/complex/WriterFrame.java | 209 ------ bean/qa/complex/bean/OOoBeanTest.java | 737 +++++++++++++++++++++ bean/qa/complex/bean/ScreenComparer.java | 249 +++++++ bean/qa/complex/bean/WriterFrame.java | 210 ++++++ bean/qa/complex/bean/makefile.mk | 138 ++++ bean/qa/complex/makefile.mk | 95 --- 11 files changed, 1359 insertions(+), 1196 deletions(-) delete mode 100644 bean/qa/complex/OOoBeanTest.java delete mode 100644 bean/qa/complex/ScreenComparer.java delete mode 100644 bean/qa/complex/WriterFrame.java create mode 100644 bean/qa/complex/bean/OOoBeanTest.java create mode 100644 bean/qa/complex/bean/ScreenComparer.java create mode 100644 bean/qa/complex/bean/WriterFrame.java create mode 100644 bean/qa/complex/bean/makefile.mk delete mode 100644 bean/qa/complex/makefile.mk diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java index c645de536..d398cf7c2 100644 --- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java +++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java @@ -153,7 +153,18 @@ public class LocalOfficeConnection {} } - /** + /** + * protected Constructor + * Initialise a LocalOfficeConnection with an already running office. + * This C'Tor is only used in complex tests at the moment. + * @param xContext + */ + protected LocalOfficeConnection(com.sun.star.uno.XComponentContext xContext) + { + this.mContext = xContext; + } + + /** * Sets a connection URL. * This implementation accepts a UNO URL with following format:
* 
diff --git a/bean/com/sun/star/comp/beans/OOoBean.java b/bean/com/sun/star/comp/beans/OOoBean.java
index 8727ac8cc..a9f79228b 100644
--- a/bean/com/sun/star/comp/beans/OOoBean.java
+++ b/bean/com/sun/star/comp/beans/OOoBean.java
@@ -601,8 +601,15 @@ public class OOoBean
                     xURLTransformer	= (com.sun.star.util.XURLTransformer) UnoRuntime.queryInterface(
                         com.sun.star.util.XURLTransformer.class, 
                         xServiceFactory.createInstance( "com.sun.star.util.URLTransformer") );
-                    xDispatcher = (com.sun.star.frame.XDispatchProvider)UnoRuntime.queryInterface(
-                        com.sun.star.frame.XDispatchProvider.class, aFrame );
+
+                                        try
+                                        {
+                                            xDispatcher = UnoRuntime.queryInterface(com.sun.star.frame.XDispatchProvider.class, aFrame);
+                                        }
+                                        catch (Exception e)
+                                        {
+                                            /*ignore!*/
+                                        }
 
                     // get XComponentLoader from frame
                     com.sun.star.frame.XComponentLoader xLoader = (com.sun.star.frame.XComponentLoader)
diff --git a/bean/prj/build.lst b/bean/prj/build.lst
index 3767e8fff..91d443344 100644
--- a/bean/prj/build.lst
+++ b/bean/prj/build.lst
@@ -4,3 +4,7 @@ ob	bean\com\sun\star\beans			nmake	-	all	ob_legacybeanjava ob_beanjava NULL
 ob	bean\native\win32				nmake	-	n	ob_beanwin32 NULL
 ob	bean\native\unix				nmake	-	u	ob_beanunix NULL
 ob  bean\util              			nmake   -   all	ob_util ob_beanjava ob_legacybeanjava ob_beanwin32.n ob_beanunix.u NULL
+
+# complex tests compileable but fail at runtime
+# ob      bean\qa\complex\bean                    nmake   -   all ob_qa_complex ob_util NULL
+
diff --git a/bean/qa/complex/OOoBeanTest.java b/bean/qa/complex/OOoBeanTest.java
deleted file mode 100644
index 791c3abaa..000000000
--- a/bean/qa/complex/OOoBeanTest.java
+++ /dev/null
@@ -1,656 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-package complex;
-
-
-import complexlib.ComplexTestCase;
-import java.io.*;
-import java.awt.Rectangle;
-import java.awt.Insets;
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.image.BufferedImage;
-import java.awt.image.PixelGrabber;
-import java.awt.GridBagLayout;
-import java.awt.GridBagConstraints;
-import java.awt.event.*;
-import java.awt.Frame;
-import java.awt.Toolkit;
-import java.awt.Robot;
-import java.awt.event.KeyEvent;
-import java.awt.Button;
-import javax.imageio.ImageIO;
-import javax.imageio.stream.FileImageOutputStream;
-import com.sun.star.comp.beans.OOoBean;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.text.XTextDocument;
-
-import java.awt.*;
-
-public class OOoBeanTest extends ComplexTestCase
-{
-    
-    public String[] getTestMethodNames()
-    {
-        // TODO think about trigger of sub-tests from outside
-        return new String[]
-        {
-              "test1",
-              "test2",
-              "test3",
-              "test4",
-              "test5",
-              "test6",
-              "test6a",
-              "test7",
-              "test8"
-        };
-    }
-
-    /** For X-Windows we need to prolong the time between painting windows. Because
-        it takes longer than on Windows.
-    */
-    int getSleepTime(int time)
-    {
-        int ret = time;
-        if (isWindows() == false)
-            return time * 5;
-        return time;
-    }
-
-    /** If it cannot be determined if we run on Windows then we assume
-        that we do not.
-    */
-    boolean isWindows()
-    {
-        boolean ret = false;
-        String os = System.getProperty("os.name");
-        if (os != null) 
-        {
-            os = os.trim();
-            if (os.indexOf("Win") == 0)
-                ret = true;
-        }
-        return ret;
-    }
-
-    public String getText(OOoBean bean) throws Exception
-    {
-        com.sun.star.frame.XModel model = (com.sun.star.frame.XModel)bean.getDocument();
-        com.sun.star.text.XTextDocument myDoc =
-            (XTextDocument) UnoRuntime.queryInterface(com.sun.star.text.XTextDocument.class,
-                                                      model);
-        com.sun.star.text.XText xText = myDoc.getText();
-        return xText.getString();
-    }
-
-    /** 1.Create a Java frame
-     *  2.Add OOoBean (no document loaded yet)
-     *  3.Show frame
-     *  4.Load document
-     */
-    public void test1() throws Exception
-    {
-        WriterFrame f = null;
-        try
-        {
-            f = new WriterFrame(100 ,100, 500 ,400, false);
-            f.setText("OOoBean test.");
-            Thread.sleep(1000);
-        }
-        finally
-        {
-            if (f != null)
-                f.dispose();
-        }
-    }
-
-    /** Sizing, painting
-     */
-    public void test2() throws Exception 
-    {
-        WriterFrame f = null;
-        ScreenComparer capturer = null;
-        try
-        {
-            f = new WriterFrame(100, 100, 500,500, false);
-            if (f.checkUnoFramePosition() == false)
-                failed("Sizing error: Client are of Java frame does not match the UNO window.", true);
-            capturer = new ScreenComparer(100, 100, 500, 500);
-
-            //Minimize Window and back
-            f.goToStart();
-            f.pageDown();
-            Thread.sleep(1000);
-            for (int i = 0; i < 3; i++)
-            {
-                capturer.reset();
-                capturer.grabOne(f.getClientArea());
-                f.setExtendedState(Frame.ICONIFIED);
-                Thread.sleep(getSleepTime(200));
-                if (f.checkUnoFramePosition() == false)
-                    failed("Sizing error: Frame was iconified.", true);
-                f.setExtendedState(Frame.NORMAL);
-                Thread.sleep(getSleepTime(200));
-                if (f.checkUnoFramePosition() == false)
-                    failed("Sizing error: Frame size set back to normal after it was iconified.", true);
-                capturer.grabTwo(f.getClientArea());
-                if (capturer.compare() == false)
-                {
-                    failed("Painting error: Minimize (iconify) frame and back to normal size.", true);
-                    capturer.writeImages();
-                }
-            }
-
-            //Maximize Window and back to normal
-            for (int i = 0; i < 3; i++)
-            {
-                capturer.reset();
-                capturer.grabOne(f.getClientArea());
-                f.setExtendedState(Frame.MAXIMIZED_BOTH);
-                Thread.sleep(getSleepTime(200));
-                if (f.checkUnoFramePosition() == false)
-                    failed("Sizing error: Frame maximized.", true);
-                f.setExtendedState(Frame.NORMAL);
-                Thread.sleep(getSleepTime(200));
-                if (f.checkUnoFramePosition() == false)
-                    failed("Sizing error: Frame set from maximized to normal.", true);                
-                capturer.grabTwo(f.getClientArea());
-                if (capturer.compare() == false)
-                {
-                    failed("Painting error: Maximize frame and back to normal size", true);
-                    capturer.writeImages();
-                }
-            }
-
-            //move Window top left
-            capturer.reset();
-            capturer.grabOne(f.getClientArea());
-            Rectangle oldPosition = f.getBounds();
-            f.setBounds(0, 0, oldPosition.width, oldPosition.height);
-            Thread.sleep(getSleepTime(200));
-            if (f.checkUnoFramePosition() == false)
-                failed("Sizing error: Frame moved.", true);
-                            
-            capturer.grabTwo(f.getClientArea());
-            if (capturer.compare() == false)
-            {
-                failed("Painting error: Move frame to a different position.", true);
-                capturer.writeImages();
-            }
-            
-            //move Window down
-            Dimension dim = Toolkit.getDefaultToolkit().getScreenSize();
-            int maxY = dim.height - f.getBounds().height;
-
-            int curY = 0;
-            while (curY < maxY)
-            {
-                capturer.reset();
-                capturer.grabOne(f.getClientArea());
-                oldPosition = f.getBounds();
-                f.setBounds(0, curY, oldPosition.width, oldPosition.height);
-                capturer.grabTwo(f.getClientArea());
-                if (capturer.compare() == false)
-                {
-                    failed("Painting error: Move frame to a different position.", true);
-                    capturer.writeImages();
-                }
-                curY+= 50;
-                Thread.sleep(getSleepTime(200));
-            }
-
-            //obscure the window and make it visible again
-            
-            oldPosition = f.getBounds();
-
-            Rectangle pos = new Rectangle(oldPosition.x - 50, oldPosition.y - 50,
-                                          oldPosition.width, oldPosition.height);
-            Frame coverFrame = new Frame();
-            coverFrame.setBounds(pos);
-            capturer.reset();
-            capturer.grabOne(f.getClientArea());
-
-            for (int i = 0; i < 3; i++)
-            {
-                coverFrame.setVisible(true);
-                Thread.sleep(getSleepTime(200));
-                f.toFront();
-                Thread.sleep(getSleepTime(200));
-                if (f.checkUnoFramePosition() == false)
-                    failed("Sizing error: Frame moved from back to front.", true);
-
-                capturer.grabTwo(f.getClientArea());
-                if (capturer.compare() == false)
-                {
-                    failed("Painting error: Move frame to back and to front.", true);
-                    capturer.writeImages();
-                }
-            }
-
-            coverFrame.dispose();
-        }
-        finally
-        {
-            if (f != null)
-                f.dispose();
-        }
-    }
-
-    /**
-       1. Create a OOoBean
-       2. Load a document
-       3. Create Frame (do not show yet)
-       4. Add OOoBean to Frame
-       5. Show Frame
-    */
-    public void test3() throws Exception
-    {
-        WriterFrame f = null;
-        try
-        {
-            f = new WriterFrame(100, 100, 500, 300, true);
-            if (f.checkUnoFramePosition() == false)
-                failed("Sizing error.", true);
-            
-        }
-        finally
-        {
-            if (f != null)
-                f.dispose();
-        }
-    }
-
-    /** Test repeated OOoBean.aquireSystemWindow and OOoBean.releaseSystemWindow
-     * calls.
-     */
-    public void test4() throws Exception
-    {
-        WriterFrame f = null;
-        try
-        {
-            f = new WriterFrame(100, 100, 500, 300, false);
-            OOoBean b = f.getBean();
-            for (int i = 0; i < 100; i++)
-            {
-                b.releaseSystemWindow();
-                b.aquireSystemWindow();
-            }
-            if (f.checkUnoFramePosition() == false)
-                failed("Sizing error.", true);
-        }
-        finally
-        {
-            if (f != null)
-                f.dispose();
-            if (isWindows() == false)
-                Thread.sleep(10000);
-        }
-    }
-
-    /** Adding and removing the bean to a Java frame multiple times.
-     * Test painting and sizing.
-     */
-    public void test5() throws Exception
-    {
-        WriterFrame f = null;
-        try
-        {
-            f = new WriterFrame(100, 100, 500, 400, false);
-            f.goToStart();
-            f.pageDown();
-            Thread.sleep(1000);
-
-            ScreenComparer capturer = new ScreenComparer(100,100,500,400);
-            capturer.grabOne();
-            for (int i = 0; i < 100; i++)
-            {
-                f.removeOOoBean();
-                f.addOOoBean();
-            }
-            
-            f.goToStart();
-            f.pageDown();
-            Thread.sleep(getSleepTime(200));
-            capturer.grabTwo();
-
-            if (capturer.compare() == false)
-            {
-                failed("Painting error: adding and removing OOoBean " +
-                       "repeatedly to java.lang.Frame.", true);
-                capturer.writeImages();
-            }
-            
-            if (f.checkUnoFramePosition() == false)
-                failed("Sizing error.", true);
-
-        }
-        finally
-        {
-            if (f != null)
-                f.dispose();
-            if (isWindows() == false)
-                Thread.sleep(10000);
-        }
-    }
-
-
-    /** Test focus 	(i49454). After repeatedly adding and removing the bean to a window
-     * it should still be possible to enter text in the window. This does not
-     * work all the time on Windows. This is probably a timing problem. When using
-     * Thread.sleep (position #1) then it should work.
-     */
-    public void test6() throws Exception
-    {
-        for (int j = 0; j < 10; j++)
-        {
-            final OOoBean bean = new OOoBean();
-            java.awt.Frame frame = null;
-            bean.setOOoCallTimeOut(10000);
-            try {
-                frame = new java.awt.Frame("OpenOffice.org Demo");
-                frame.add(bean, BorderLayout.CENTER);
-                frame.pack();
-                frame.setSize(600,300);
-                frame.show();
-                bean.loadFromURL("private:factory/swriter", null);
-                // #1
-                Thread.sleep(1000);
-                
-                StringBuffer buf = new StringBuffer(1000);
-                for (int i = 0; i < 1; i++)
-                {
-//                    Thread.sleep(1000);
-                    bean.releaseSystemWindow();
-                    frame.remove(bean);
-//                    frame.validate();
-//                    Thread.sleep(1000);
-                    frame.add(bean, BorderLayout.CENTER);
-                    bean.aquireSystemWindow();
-//                    frame.validate();
-                }
-                
-                if (isWindows() == false)
-                    Thread.sleep(5000);
-
-                Robot roby = new Robot();
-                roby.keyPress(KeyEvent.VK_H);
-                roby.keyRelease(KeyEvent.VK_H);
-                buf.append("h");
-                
-                String s = getText(bean);
-                if ( ! s.equals(buf.toString()))
-                {
-                    failed("Focus error: After removing and adding the bean, the" +
-                           "office window does not receive keyboard input.\n" +
-                           "Try typing in the window, you've got 30s!!! This " +
-                           "test may not work with Linux/Solaris", true);
-                    Thread.sleep(30000);
-                    break;
-                }
-                else
-                {
-                    Thread.sleep(2000);
-                }
-            
-            } finally {
-                bean.stopOOoConnection();
-                frame.dispose();
-            }
-        }   
-    }
-
-    /** Tests focus problem just like test6, but the implementation is a little
-     * different. The bean is added and removed from withing the event dispatch
-     * thread. Using Thread.sleep at various points (#1, #2, #3) seems to workaround
-     * the problem.
-     */
-    public void test6a() throws Exception
-    {
-        for (int j = 0; j < 50; j++)
-        {
-            final OOoBean bean = new OOoBean();
-            final java.awt.Frame frame = new Frame("Openoffice.org");
-            bean.setOOoCallTimeOut(10000);
-
-            try {
-                frame.add(bean, BorderLayout.CENTER);
-                frame.pack();
-                frame.setSize(600,400);
-                frame.show();
-                bean.loadFromURL("private:factory/swriter", null);
-                frame.validate();
-                // #1
-                Thread.sleep(1000);
-                StringBuffer buf = new StringBuffer(1000);
-                int i = 0;
-                
-                for (; i < 1; i++)
-                {
-                EventQueue q = Toolkit.getDefaultToolkit().getSystemEventQueue();
-                q.invokeAndWait( new Runnable() {
-                        public void run() {
-                            try {
-
-                            bean.releaseSystemWindow(); 
-                            frame.remove(bean);
-                            frame.validate();
-
-                            } catch (Exception e) {
-                                e.printStackTrace();
-                            }
-                            
-                            }
-                        });
-                // #2
-                Thread.sleep(1000);
-                q.invokeAndWait( new Runnable() {
-                        public void run() {
-                            try {
-
-                            frame.add(bean, BorderLayout.CENTER);
-                            bean.aquireSystemWindow();
-                            frame.validate();
-                            } catch (Exception e) {
-                                e.printStackTrace();
-                            }
-                            }
-                        });
-                    
-                // #3
-                Thread.sleep(1000);
-                }
-                
-                if (isWindows() == false)
-                    Thread.sleep(5000);
-
-                Robot roby = new Robot();
-                roby.mouseMove(300, 200);
-                roby.waitForIdle();
-                roby.mousePress(InputEvent.BUTTON1_MASK);
-                roby.waitForIdle();
-                roby.mouseRelease(InputEvent.BUTTON1_MASK);
-                roby.waitForIdle();
-                roby.keyPress(KeyEvent.VK_H);
-                roby.waitForIdle();
-                roby.keyRelease(KeyEvent.VK_H);
-                roby.waitForIdle();
-
-                buf.append("h");
-                Thread.sleep(1000);                
-                String s = getText(bean);
-                System.out.println(" getText: " + s);
-                if ( ! s.equals(buf.toString()))
-                {
-                    roby.mousePress(InputEvent.BUTTON1_MASK);
-                    roby.waitForIdle();
-                    roby.mouseRelease(InputEvent.BUTTON1_MASK);
-                    roby.waitForIdle();
-                    roby.keyPress(KeyEvent.VK_H);
-                    roby.waitForIdle();
-                    roby.keyRelease(KeyEvent.VK_H);
-                    roby.waitForIdle();
-
-                    String sH = "h";
-                    Thread.sleep(1000);                
-                    String s2 = getText(bean);
-
-                    if ( ! sH.equals(s2))
-                    {
-                        failed("Focus error: After removing and adding the bean, the" +
-                               "office window does not receive keyboard input.\n" +
-                               "Try typing in the window, you've got 30s!!! This " +
-                               "test may not work with Linux/Solaris", true);
-                        System.out.println("j: " + j + "   i: " + i);
-                        Thread.sleep(30000);
-                        break;
-                    }
-                }
-                else
-                {
-                    //                   Thread.sleep(2000);
-                }
-            
-            } finally {
-                bean.stopOOoConnection();
-                frame.dispose();
-            }
-        }
-    }
-
-    /** Repeatedly loading a document in one and the same OOoBean instance.
-     */
-    public void test7() throws Exception
-    {
-        WriterFrame f = null;
-        try
-        {
-            f = new WriterFrame(100 ,100, 500 ,400, false);
-            String text = "OOoBean test.";
-
-            for (int i = 0; i < 10; i++)
-            {
-                f.getBean().clear();
-                f.getBean().loadFromURL("private:factory/swriter", null);
-                f.setText(text);
-                f.goToStart();
-                f.validate();
-
-                if (text.equals(f.getText()) == false)
-                    failed("Repeated loading of a document failed.");
-                Thread.sleep(1000);
-            }
-        }
-        finally
-        {
-            if (f != null)
-                f.dispose();
-        }
-    }
-
-    /** Using multiple instances of OOoBean at the same time
-     */
-    public void test8() throws Exception
-    {
-        OOoBean bean1 = new OOoBean();
-        BeanPanel bp1 = new BeanPanel(bean1);
-        OOoBean bean2 = new OOoBean();
-        BeanPanel bp2 = new BeanPanel(bean2);
-        OOoBean bean3 = new OOoBean();
-        BeanPanel bp3 = new BeanPanel(bean3);
-        OOoBean bean4 = new OOoBean();
-        BeanPanel bp4 = new BeanPanel(bean4);
-
-        try
-        {
-            Frame f = new Frame("OOoBean example with several instances");
-            f.setLayout(new GridBagLayout());
-            GridBagConstraints c = new GridBagConstraints();
-            c.fill = GridBagConstraints.HORIZONTAL;
-            c.weightx = 0.5;
-
-            c.insets = new Insets(0, 0, 0, 10);
-            c.gridx = 0;
-            c.gridy = 0;
-            f.add(bp1, c);
-            
-            c.gridx = 1;
-            c.insets = new Insets(0, 0, 0, 0);
-            f.add(bp2, c);
-
-            c.gridx = 0;
-            c.gridy = 1;
-            c.insets = new Insets(10, 0, 0, 10);
-            f.add(bp3, c);
-
-            c.gridx = 1;
-            c.gridy = 1;
-            c.insets = new Insets(10, 0, 0, 0);
-            f.add(bp4, c);
-
-            f.pack();
-            f.setBounds(0, 0, 1000, 600);
-            f.setVisible(true);
-            try {
-            bean1.loadFromURL("private:factory/swriter", null);
-            bean2.loadFromURL("private:factory/swriter", null);
-            bean3.loadFromURL("private:factory/swriter", null);
-            bean4.loadFromURL("private:factory/swriter", null);
-            } catch( Exception e)
-            {
-                e.printStackTrace();
-            }
-            f.validate();
-
-            Thread.sleep(10000);
-        }
-        finally
-        {
-            bean1.stopOOoConnection();
-            bean2.stopOOoConnection();
-            bean3.stopOOoConnection();
-            bean4.stopOOoConnection();
-        }
-    }
-
-    class BeanPanel extends Panel
-    {
-        public BeanPanel(OOoBean b)
-        {
-            setLayout(new BorderLayout());
-            add(b, BorderLayout.CENTER);
-        }
-        public Dimension getPreferredSize()
-        {
-            Container c = getParent();
-            return new Dimension(200, 200);
-        }
-    }
-
-}
-
-
diff --git a/bean/qa/complex/ScreenComparer.java b/bean/qa/complex/ScreenComparer.java
deleted file mode 100644
index c169c45f4..000000000
--- a/bean/qa/complex/ScreenComparer.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-package complex;
-
-
-import complexlib.ComplexTestCase;
-import java.io.File;
-import java.awt.Rectangle;
-import java.awt.BorderLayout;
-import java.awt.image.BufferedImage;
-import java.awt.image.PixelGrabber;
-import java.awt.event.*;
-import java.awt.Frame;
-import javax.imageio.ImageIO;
-import javax.imageio.stream.FileImageOutputStream;
-
-
-
-class ScreenComparer
-{
-    Rectangle m_rect;
-    BufferedImage m_img1;
-    BufferedImage m_img2;
-    BufferedImage m_imgDiff;
-
-    int m_diffColor;
-    public ScreenComparer(int x, int y, int width, int height)
-    {
-        this(new Rectangle(x, y, width, height));
-    }
-
-    public ScreenComparer(Rectangle location)
-    {
-        m_rect = location;
-        int red = 0xff;
-        int alpha = 0xff;
-        m_diffColor = (alpha << 24);
-        m_diffColor = m_diffColor | (red << 16);
-    }
-
-    public ScreenComparer()
-    {
-        this(new Rectangle(0, 0, 0, 0));
-    }
-
-    public void reset()
-    {
-        m_rect = null;
-        m_img1 = null;
-        m_img2 = null;
-        m_imgDiff = null;
-    }
-
-    public Rectangle getLocation()
-    {
-        return m_rect;
-    }
-    public void grabOne() throws Exception
-    {
-        grabOne(m_rect);
-    }
-    
-    public void grabOne(Rectangle r) throws Exception
-    {
-        java.awt.Robot robot = new java.awt.Robot();
-        m_img1 = robot.createScreenCapture(r);
-    }
-
-    public void grabTwo() throws Exception
-    {
-        grabTwo(m_rect);
-    }
-    
-    public void grabTwo(Rectangle r) throws Exception
-    {
-        java.awt.Robot robot = new java.awt.Robot();
-        m_img2 = robot.createScreenCapture(r);
-    }
-
-    public boolean compare() throws Exception
-    {
-        if (m_img1 == null || m_img2 == null)
-            throw new Exception("Only one image captured!");
-        boolean ret = true;
-        int w1 = m_img1.getWidth();
-        int h1 = m_img1.getHeight();
-        int w2 = m_img2.getWidth();
-        int h2 = m_img2.getHeight();
-
-        if (w1 != w2 || h1 != h2)
-        {
-            System.out.println("### 1\n");
-            //Different size. Create an image that holds both images.
-            int w = w1 > w2 ? w1 : w2;
-            int h = h1 > h2 ? h1 : h2;
-            m_imgDiff = new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB);
-            for (int y = 0; y < h; y ++)
-            {
-                for (int x = 0; x < w; x++)
-                {
-                    boolean bOutOfRange = false;
-                    int pixel1 = 0;
-                    int pixel2 = 0;
-                    //get the pixel for m_img1
-                    if (x < w1 && y < h1)
-                        pixel1 = m_img1.getRGB(x, y);
-                    else
-                        bOutOfRange = true;
-                    
-                    if (x < w2 && y < h2)
-                        pixel2 = m_img2.getRGB(x, y);
-                    else
-                        bOutOfRange = true;
-
-                    if (bOutOfRange || pixel1 != pixel2)
-                        m_imgDiff.setRGB(x, y, m_diffColor);
-                    else
-                        m_imgDiff.setRGB(x, y, pixel1);
-                    
-                }
-            }
-            return false;
-        }
-
-        //Images have same dimension
-        int[] pixels1 = new int[w1 * h1];
-        PixelGrabber pg = new PixelGrabber(
-            m_img1.getSource(), 0, 0, w1, h1, pixels1, 0, w1);
-        pg.grabPixels();
-
-        int[] pixels2 = new int[w2 * h2];
-        PixelGrabber pg2 = new PixelGrabber(
-            m_img2.getSource(), 0, 0, w2, h2, pixels2, 0, w2);
-        pg2.grabPixels();
-
-        m_imgDiff = new BufferedImage(w1, h1, BufferedImage.TYPE_INT_ARGB);
-
-        //First check if the the images differ.
-        int lenAr = pixels1.length;
-        int index = 0;
-        for (index = 0; index < lenAr; index++)
-        {
-            if (pixels1[index] != pixels2[index])
-                break;
-        }
-
-        //If the images are different, then create the diff image
-        if (index < lenAr)
-        {
-            for (int y = 0; y < h1; y++)
-            {
-                for (int x = 0; x < w1; x++)
-                {
-                    int offset = y * w1 + x;
-                    if (pixels1[offset] != pixels2[offset])
-                    {
-                        ret = ret && false;
-                        m_imgDiff.setRGB(x, y, m_diffColor); 
-                    }
-                    else
-                    {
-                        m_imgDiff.setRGB(x, y, pixels1[offset]);
-                    }
-                }
-            }
-        }
-        return ret;
-    }
-
-    /** Writes Images to a location. The
-     *  directory is determined by the java property OOoBean.Images
-     * 
-     */
-    public void writeImages() throws Exception
-    {
-        String imgLocation = System.getProperty("OOoBean.Images", "");
-        File file_tmp = File.createTempFile("OOoBean", "", new File(imgLocation));
-        File file1 = new File(file_tmp.getPath()+".png");
-        file_tmp.delete();
-        if (m_img1 != null)
-        {
-            ImageIO.write(m_img1, "png", file1);
-            System.out.println("\nCompared images:");
-            System.out.println("1. " + file1.getPath());
-        }
-        file1= null;
-        file_tmp= null;
-        file_tmp = File.createTempFile("OOoBean", "", new File(imgLocation));
-        file1 = new File(file_tmp.getPath()+".png");
-        file_tmp.delete();
-        if (m_img2 != null)
-        {
-            ImageIO.write(m_img2, "png", file1);
-            System.out.println("2. " + file1.getPath());
-        }
-        file1= null;
-        file_tmp= null;
-        file_tmp = File.createTempFile("OOoBean", "_diff", new File(imgLocation));
-        file1 = new File(file_tmp.getPath()+".png");
-        file_tmp.delete();
-        if (m_imgDiff != null)
-        {
-            ImageIO.write(m_imgDiff, "png", file1);
-            System.out.println("Diff image: " + file1.getPath() + "\n");
-        }
-    }
-    
-}
-
diff --git a/bean/qa/complex/WriterFrame.java b/bean/qa/complex/WriterFrame.java
deleted file mode 100644
index 370662929..000000000
--- a/bean/qa/complex/WriterFrame.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-package complex;
-
-
-import complexlib.ComplexTestCase;
-import java.awt.Rectangle;
-import java.awt.Insets;
-import java.awt.BorderLayout;
-import java.awt.event.*;
-import java.awt.Frame;
-import java.awt.Dimension;
-import com.sun.star.comp.beans.OOoBean;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.text.XTextDocument;
-
-
-class WriterFrame extends java.awt.Frame
-{
-    com.sun.star.comp.beans.OOoBean m_bean;
-    String m_sDocURL = "private:factory/swriter";
-
-    /**
-      @param loadBeforeVisible
-          the OOoBean is added to the frame before it is displayable. Then the Java Frame does
-          not have a native window peer yet.
-     */
-    public WriterFrame(int x, int y, int width, int height, boolean loadBeforeVisible) throws Exception
-    {
-
-        if (loadBeforeVisible == false)
-        {
-            m_bean = new com.sun.star.comp.beans.OOoBean();
-            add(m_bean, BorderLayout.CENTER);
-            pack();
-            setBounds(x, y, width, height);
-            setVisible(true);
-            m_bean.loadFromURL(m_sDocURL, null);
-            validate();
-        }
-        else
-        {
-            m_bean = new com.sun.star.comp.beans.OOoBean();
-            m_bean.loadFromURL(m_sDocURL, null);
-            add(m_bean, BorderLayout.CENTER);
-            pack();
-            setBounds(x, y, width, height);
-            setVisible(true);
-            m_bean.aquireSystemWindow();
-        }
-    }
-    
-    public WriterFrame() throws Exception
-    {
-        this(0, 0, 800, 400, false);
-    }
-
-    public void setText(String s) throws Exception
-    {
-        com.sun.star.frame.XModel model = (com.sun.star.frame.XModel)m_bean.getDocument();
-        com.sun.star.text.XTextDocument myDoc =
-            (XTextDocument) UnoRuntime.queryInterface(com.sun.star.text.XTextDocument.class,
-                                                      model);
-        com.sun.star.text.XText xText = myDoc.getText();
-        com.sun.star.text.XTextCursor xTCursor = xText.createTextCursor();
-        //inserting some Text
-        xText.insertString( xTCursor, s, false );  
-    }
-
-    public String getText() throws Exception
-    {
-        com.sun.star.frame.XModel model = (com.sun.star.frame.XModel)m_bean.getDocument();
-        com.sun.star.text.XTextDocument myDoc =
-            (XTextDocument) UnoRuntime.queryInterface(com.sun.star.text.XTextDocument.class,
-                                                      model);
-        com.sun.star.text.XText xText = myDoc.getText();
-        return xText.getString();
-    }
-
-    public void dispose() {
-        m_bean.stopOOoConnection();
-        setVisible(false);
-        super.dispose();
-    }
-
-    OOoBean getBean()
-    {
-        return m_bean;
-    }
-
-    /** Makes sure the document is displayed at the beginning.
-     * This is important for comparing screenshots.
-     */
-    public void goToStart() throws Exception
-    {
-        com.sun.star.frame.XModel xModel = (com.sun.star.frame.XModel)m_bean.getDocument();
-        com.sun.star.frame.XController xController = xModel.getCurrentController();
-
-        com.sun.star.text.XTextViewCursorSupplier xVCSupplier =
-            (com.sun.star.text.XTextViewCursorSupplier) UnoRuntime.queryInterface (
-               com.sun.star.text.XTextViewCursorSupplier.class, xController );
-
-        com.sun.star.text.XTextViewCursor xTViewCursor = xVCSupplier.getViewCursor ( );
-        xTViewCursor.gotoStart(false);
-    }
-
-    
-    public void pageDown() throws Exception
-    {
-        com.sun.star.frame.XModel xModel = (com.sun.star.frame.XModel)m_bean.getDocument();
-        com.sun.star.frame.XController xController = xModel.getCurrentController();
-
-        com.sun.star.text.XTextViewCursorSupplier xVCSupplier =
-            (com.sun.star.text.XTextViewCursorSupplier) UnoRuntime.queryInterface (
-               com.sun.star.text.XTextViewCursorSupplier.class, xController );
-        com.sun.star.text.XTextViewCursor xTViewCursor = xVCSupplier.getViewCursor ( );
-        com.sun.star.view.XScreenCursor xScreenCursor =
-            (com.sun.star.view.XScreenCursor) UnoRuntime.queryInterface (
-               com.sun.star.view.XScreenCursor.class, xTViewCursor );
-        xScreenCursor.screenDown();
-    }
-
-    public Rectangle getClientArea()
-    {
-        
-        Insets i = getInsets();
-        Rectangle r = getBounds();
-        Rectangle rc = new Rectangle(r.x + i.left, r.y + i.top,
-                                     r.width - i.left - i.right,
-                                     r.height - i.top - i.bottom);
-        return rc;
-    }
-
-    public Rectangle getUnoFramePosition() throws Exception
-    {
-        com.sun.star.awt.XWindow win = m_bean.getFrame().getContainerWindow();
-        com.sun.star.awt.Rectangle rect = win.getPosSize();
-        return new Rectangle(rect.X, rect.Y, rect.Width, rect.Height);
-    }
-
-    /** After resizing the Java frame, the UNO window shall be resized
-     * as well, which is checked by this method.
-     */
-    public boolean checkUnoFramePosition() throws Exception
-    {
-        Rectangle client = getClientArea();
-        Rectangle unoWin = getUnoFramePosition();
-
-        if (client.x != unoWin.x
-            || client.y != unoWin.y
-            || client.width != unoWin.width
-            || client.height != unoWin.height)
-        {
-            System.out.println("\nPosition of client are of Java frame does not match the postion" +
-                               "of the UNO window. These are the values of Java frame, followed by" +
-                               "the UNO window: ");
-            System.out.println(client);
-            System.out.println(unoWin);
-            System.out.println("");
-            return false;
-        }
-
-        return true;
-    }
-
-    public void removeOOoBean() throws Exception
-    {
-        //OOoBean.releaseSystemWindow need not be called because
-        //LocalOfficeWindow overrides removeNotify.
-        //However because of bt4745222 which was fixed in 1.4.2_04,
-        //this is very very slow. The workaround is use releaseSystemWindow
-        //beforehand.
-        m_bean.releaseSystemWindow();
-        remove(m_bean);
-    }
-
-    public void addOOoBean() throws Exception
-    {
-        add(m_bean, BorderLayout.CENTER);
-        m_bean.aquireSystemWindow();
-        validate();
-    }
-    
-}
-
diff --git a/bean/qa/complex/bean/OOoBeanTest.java b/bean/qa/complex/bean/OOoBeanTest.java
new file mode 100644
index 000000000..1a4b81cbd
--- /dev/null
+++ b/bean/qa/complex/bean/OOoBeanTest.java
@@ -0,0 +1,737 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * 
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+package complex.bean;
+
+
+// import complexlib.ComplexTestCase;
+import com.sun.star.lang.XMultiServiceFactory;
+import java.awt.event.*;
+import java.awt.event.KeyEvent;
+import com.sun.star.comp.beans.OOoBean;
+import com.sun.star.uno.UnoRuntime;
+
+import java.awt.*;
+
+// import org.junit.After;
+import org.junit.AfterClass;
+// import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openoffice.test.OfficeConnection;
+import static org.junit.Assert.*;
+
+class PrivateLocalOfficeConnection extends com.sun.star.comp.beans.LocalOfficeConnection
+{
+    public PrivateLocalOfficeConnection(com.sun.star.uno.XComponentContext xContext)
+    {
+        super(xContext);
+    }
+}
+
+public class OOoBeanTest
+{
+    
+//    public String[] getTestMethodNames()
+//    {
+//        // TODO think about trigger of sub-tests from outside
+//        return new String[]
+//        {
+//              "test1",
+//              "test2",
+//              "test3",
+//              "test4",
+//              "test5",
+//              "test6",
+//              "test6a",
+//              "test7",
+//              "test8"
+//        };
+//    }
+
+    /** For X-Windows we need to prolong the time between painting windows. Because
+        it takes longer than on Windows.
+    */
+    private int getSleepTime(int time)
+    {
+        int ret = time;
+        if (isWindows() == false)
+        {
+            return time * 5;
+        }
+        return time;
+    }
+
+    /** If it cannot be determined if we run on Windows then we assume
+        that we do not.
+    */
+    private boolean isWindows()
+    {
+        boolean ret = false;
+        String os = System.getProperty("os.name");
+        if (os != null) 
+        {
+            os = os.trim();
+            if (os.toLowerCase().indexOf("win") == 0)
+            {
+                ret = true;
+            }
+        }
+        return ret;
+    }
+
+    private String getText(OOoBean bean) throws Exception
+    {
+        com.sun.star.frame.XModel model = (com.sun.star.frame.XModel)bean.getDocument();
+        com.sun.star.text.XTextDocument myDoc =
+            UnoRuntime.queryInterface(com.sun.star.text.XTextDocument.class, model);
+        com.sun.star.text.XText xText = myDoc.getText();
+        return xText.getString();
+    }
+
+    /** 1.Create a Java frame
+     *  2.Add OOoBean (no document loaded yet)
+     *  3.Show frame
+     *  4.Load document
+     * @throws Exception
+     */
+    @Test public void test1() throws Exception
+    {
+        WriterFrame f = null;
+        try
+        {
+            f = new WriterFrame(100 ,100, 500 ,400, false, connection.getComponentContext());
+            f.setText("OOoBean test.");
+            Thread.sleep(1000);
+        }
+        finally
+        {
+            if (f != null)
+            {
+                f.dispose();
+            }
+        }
+    }
+
+    /** Sizing, painting
+     * @throws Exception
+     */
+    @Test public void test2() throws Exception
+    {
+        WriterFrame f = null;
+        ScreenComparer capturer = null;
+        try
+        {
+            f = new WriterFrame(100, 100, 500,500, false, connection.getComponentContext());
+            if (f.checkUnoFramePosition() == false)
+            {
+                fail("Sizing error: Client are of Java frame does not match the UNO window.");
+            }
+            capturer = new ScreenComparer(100, 100, 500, 500);
+
+            //Minimize Window and back
+            f.goToStart();
+            f.pageDown();
+            Thread.sleep(1000);
+            for (int i = 0; i < 3; i++)
+            {
+                capturer.reset();
+                capturer.grabOne(f.getClientArea());
+                f.setExtendedState(Frame.ICONIFIED);
+                Thread.sleep(getSleepTime(200));
+                if (f.checkUnoFramePosition() == false)
+                {
+                    fail("Sizing error: Frame was iconified.");
+                }
+                f.setExtendedState(Frame.NORMAL);
+                Thread.sleep(getSleepTime(200));
+                if (f.checkUnoFramePosition() == false)
+                {
+                    fail("Sizing error: Frame size set back to normal after it was iconified.");
+                }
+                capturer.grabTwo(f.getClientArea());
+                if (capturer.compare() == false)
+                {
+                    fail("Painting error: Minimize (iconify) frame and back to normal size.");
+                    capturer.writeImages();
+                }
+            }
+
+            //Maximize Window and back to normal
+            for (int i = 0; i < 3; i++)
+            {
+                capturer.reset();
+                capturer.grabOne(f.getClientArea());
+                f.setExtendedState(Frame.MAXIMIZED_BOTH);
+                Thread.sleep(getSleepTime(200));
+                if (f.checkUnoFramePosition() == false)
+                {
+                    fail("Sizing error: Frame maximized.");
+                }
+                f.setExtendedState(Frame.NORMAL);
+                Thread.sleep(getSleepTime(200));
+                if (f.checkUnoFramePosition() == false)
+                {
+                    fail("Sizing error: Frame set from maximized to normal.");
+                }
+                capturer.grabTwo(f.getClientArea());
+                if (capturer.compare() == false)
+                {
+                    fail("Painting error: Maximize frame and back to normal size");
+                    capturer.writeImages();
+                }
+            }
+
+            //move Window top left
+            capturer.reset();
+            capturer.grabOne(f.getClientArea());
+            Rectangle oldPosition = f.getBounds();
+            f.setBounds(0, 0, oldPosition.width, oldPosition.height);
+            Thread.sleep(getSleepTime(200));
+            if (f.checkUnoFramePosition() == false)
+            {
+                fail("Sizing error: Frame moved.");
+            }
+                            
+            capturer.grabTwo(f.getClientArea());
+            if (capturer.compare() == false)
+            {
+                fail("Painting error: Move frame to a different position.");
+                capturer.writeImages();
+            }
+            
+            //move Window down
+            Dimension dim = Toolkit.getDefaultToolkit().getScreenSize();
+            int maxY = dim.height - f.getBounds().height;
+
+            int curY = 0;
+            while (curY < maxY)
+            {
+                capturer.reset();
+                capturer.grabOne(f.getClientArea());
+                oldPosition = f.getBounds();
+                f.setBounds(0, curY, oldPosition.width, oldPosition.height);
+                capturer.grabTwo(f.getClientArea());
+                if (capturer.compare() == false)
+                {
+                    fail("Painting error: Move frame to a different position.");
+                    capturer.writeImages();
+                }
+                curY+= 50;
+                Thread.sleep(getSleepTime(200));
+            }
+
+            //obscure the window and make it visible again
+            
+            oldPosition = f.getBounds();
+
+            Rectangle pos = new Rectangle(oldPosition.x - 50, oldPosition.y - 50,
+                                          oldPosition.width, oldPosition.height);
+            Frame coverFrame = new Frame();
+            coverFrame.setBounds(pos);
+            capturer.reset();
+            capturer.grabOne(f.getClientArea());
+
+            for (int i = 0; i < 3; i++)
+            {
+                coverFrame.setVisible(true);
+                Thread.sleep(getSleepTime(200));
+                f.toFront();
+                Thread.sleep(getSleepTime(200));
+                if (f.checkUnoFramePosition() == false)
+                {
+                    fail("Sizing error: Frame moved from back to front.");
+                }
+
+                capturer.grabTwo(f.getClientArea());
+                if (capturer.compare() == false)
+                {
+                    fail("Painting error: Move frame to back and to front.");
+                    capturer.writeImages();
+                }
+            }
+
+            coverFrame.dispose();
+        }
+        finally
+        {
+            if (f != null)
+            {
+                f.dispose();
+            }
+        }
+    }
+
+    /**
+       1. Create a OOoBean
+       2. Load a document
+       3. Create Frame (do not show yet)
+       4. Add OOoBean to Frame
+       5. Show Frame
+     * @throws Exception
+     */
+    @Test public void test3() throws Exception
+    {
+        WriterFrame f = null;
+        try
+        {
+            f = new WriterFrame(100, 100, 500, 300, true, connection.getComponentContext());
+            if (f.checkUnoFramePosition() == false)
+            {
+                fail("Sizing error.");
+            }
+            
+        }
+        finally
+        {
+            if (f != null)
+            {
+                f.dispose();
+            }
+        }
+    }
+
+    /** Test repeated OOoBean.aquireSystemWindow and OOoBean.releaseSystemWindow
+     * calls.
+     * @throws Exception
+     */
+    @Test public void test4() throws Exception
+    {
+        WriterFrame f = null;
+        try
+        {
+            f = new WriterFrame(100, 100, 500, 300, false, connection.getComponentContext());
+            OOoBean b = f.getBean();
+            for (int i = 0; i < 100; i++)
+            {
+                b.releaseSystemWindow();
+                b.aquireSystemWindow();
+            }
+            if (f.checkUnoFramePosition() == false)
+            {
+                fail("Sizing error.");
+            }
+        }
+        finally
+        {
+            if (f != null)
+            {
+                f.dispose();
+            }
+            if (isWindows() == false)
+            {
+                Thread.sleep(10000);
+            }
+        }
+    }
+
+    /** Adding and removing the bean to a Java frame multiple times.
+     * Test painting and sizing.
+     * @throws Exception
+     */
+    @Test public void test5() throws Exception
+    {
+        WriterFrame f = null;
+        try
+        {
+            f = new WriterFrame(100, 100, 500, 400, false, connection.getComponentContext());
+            f.goToStart();
+            f.pageDown();
+            Thread.sleep(1000);
+
+            ScreenComparer capturer = new ScreenComparer(100,100,500,400);
+            capturer.grabOne();
+            for (int i = 0; i < 100; i++)
+            {
+                f.removeOOoBean();
+                f.addOOoBean();
+            }
+            
+            f.goToStart();
+            f.pageDown();
+            Thread.sleep(getSleepTime(200));
+            capturer.grabTwo();
+
+            if (capturer.compare() == false)
+            {
+                fail("Painting error: adding and removing OOoBean " +
+                       "repeatedly to java.lang.Frame.");
+                capturer.writeImages();
+            }
+            
+            if (f.checkUnoFramePosition() == false)
+            {
+                fail("Sizing error.");
+            }
+
+        }
+        finally
+        {
+            if (f != null)
+            {
+                f.dispose();
+            }
+            if (isWindows() == false)
+            {
+                Thread.sleep(10000);
+            }
+        }
+    }
+
+
+    /** Test focus 	(i49454). After repeatedly adding and removing the bean to a window
+     * it should still be possible to enter text in the window. This does not
+     * work all the time on Windows. This is probably a timing problem. When using
+     * Thread.sleep (position #1) then it should work.
+     * @throws Exception
+     */
+    @Test public void test6() throws Exception
+    {
+        for (int j = 0; j < 10; j++)
+        {
+            final OOoBean bean = new OOoBean(new PrivateLocalOfficeConnection(connection.getComponentContext()));
+            java.awt.Frame frame = null;
+            bean.setOOoCallTimeOut(10000);
+            try {
+                frame = new java.awt.Frame("OpenOffice.org Demo");
+                frame.add(bean, BorderLayout.CENTER);
+                frame.pack();
+                frame.setSize(600,300);
+                frame.show();
+                bean.loadFromURL("private:factory/swriter", null);
+                // #1
+                Thread.sleep(1000);
+                
+                StringBuffer buf = new StringBuffer(1000);
+                for (int i = 0; i < 1; i++)
+                {
+//                    Thread.sleep(1000);
+                    bean.releaseSystemWindow();
+                    frame.remove(bean);
+//                    frame.validate();
+//                    Thread.sleep(1000);
+                    frame.add(bean, BorderLayout.CENTER);
+                    bean.aquireSystemWindow();
+//                    frame.validate();
+                }
+                
+                if (isWindows() == false)
+                {
+                    Thread.sleep(5000);
+                }
+
+                Robot roby = new Robot();
+                roby.keyPress(KeyEvent.VK_H);
+                roby.keyRelease(KeyEvent.VK_H);
+                buf.append("h");
+                
+                String s = getText(bean);
+                if ( ! s.equals(buf.toString()))
+                {
+                    fail("Focus error: After removing and adding the bean, the" +
+                           "office window does not receive keyboard input.\n" +
+                           "Try typing in the window, you've got 30s!!! This " +
+                           "test may not work with Linux/Solaris");
+                    Thread.sleep(30000);
+                    break;
+                }
+                else
+                {
+                    Thread.sleep(2000);
+                }
+            
+            } finally {
+                bean.stopOOoConnection();
+                frame.dispose();
+            }
+        }   
+    }
+
+    /** Tests focus problem just like test6, but the implementation is a little
+     * different. The bean is added and removed from withing the event dispatch
+     * thread. Using Thread.sleep at various points (#1, #2, #3) seems to workaround
+     * the problem.
+     * @throws Exception
+     */
+    @Test public void test6a() throws Exception
+    {
+        for (int j = 0; j < 50; j++)
+        {
+            final OOoBean bean = new OOoBean(new PrivateLocalOfficeConnection(connection.getComponentContext()));
+            final java.awt.Frame frame = new Frame("Openoffice.org");
+            bean.setOOoCallTimeOut(10000);
+
+            try {
+                frame.add(bean, BorderLayout.CENTER);
+                frame.pack();
+                frame.setSize(600,400);
+                frame.show();
+                bean.loadFromURL("private:factory/swriter", null);
+                frame.validate();
+                // #1
+                Thread.sleep(1000);
+                StringBuffer buf = new StringBuffer(1000);
+                int i = 0;
+                
+                for (; i < 1; i++)
+                {
+                EventQueue q = Toolkit.getDefaultToolkit().getSystemEventQueue();
+                q.invokeAndWait( new Runnable() {
+                        public void run() {
+                            try {
+
+                            bean.releaseSystemWindow(); 
+                            frame.remove(bean);
+                            frame.validate();
+
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                            }
+                            
+                            }
+                        });
+                // #2
+                Thread.sleep(1000);
+                q.invokeAndWait( new Runnable() {
+                        public void run() {
+                            try {
+
+                            frame.add(bean, BorderLayout.CENTER);
+                            bean.aquireSystemWindow();
+                            frame.validate();
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                            }
+                            }
+                        });
+                    
+                // #3
+                Thread.sleep(1000);
+                }
+                
+                if (isWindows() == false)
+                {
+                    Thread.sleep(5000);
+                }
+
+                Robot roby = new Robot();
+                roby.mouseMove(300, 200);
+                roby.waitForIdle();
+                roby.mousePress(InputEvent.BUTTON1_MASK);
+                roby.waitForIdle();
+                roby.mouseRelease(InputEvent.BUTTON1_MASK);
+                roby.waitForIdle();
+                roby.keyPress(KeyEvent.VK_H);
+                roby.waitForIdle();
+                roby.keyRelease(KeyEvent.VK_H);
+                roby.waitForIdle();
+
+                buf.append("h");
+                Thread.sleep(1000);                
+                String s = getText(bean);
+                System.out.println(" getText: " + s);
+                if ( ! s.equals(buf.toString()))
+                {
+                    roby.mousePress(InputEvent.BUTTON1_MASK);
+                    roby.waitForIdle();
+                    roby.mouseRelease(InputEvent.BUTTON1_MASK);
+                    roby.waitForIdle();
+                    roby.keyPress(KeyEvent.VK_H);
+                    roby.waitForIdle();
+                    roby.keyRelease(KeyEvent.VK_H);
+                    roby.waitForIdle();
+
+                    String sH = "h";
+                    Thread.sleep(1000);                
+                    String s2 = getText(bean);
+
+                    if ( ! sH.equals(s2))
+                    {
+                        fail("Focus error: After removing and adding the bean, the" +
+                               "office window does not receive keyboard input.\n" +
+                               "Try typing in the window, you've got 30s!!! This " +
+                               "test may not work with Linux/Solaris");
+                        System.out.println("j: " + j + "   i: " + i);
+                        Thread.sleep(30000);
+                        break;
+                    }
+                }
+                else
+                {
+                    //                   Thread.sleep(2000);
+                }
+            
+            } finally {
+                bean.stopOOoConnection();
+                frame.dispose();
+            }
+        }
+    }
+
+    /** Repeatedly loading a document in one and the same OOoBean instance.
+     * @throws Exception
+     */
+    @Test public void test7() throws Exception
+    {
+        WriterFrame f = null;
+        try
+        {
+            f = new WriterFrame(100 ,100, 500 ,400, false, connection.getComponentContext());
+            String text = "OOoBean test.";
+
+            for (int i = 0; i < 10; i++)
+            {
+                f.getBean().clear();
+                f.getBean().loadFromURL("private:factory/swriter", null);
+                f.setText(text);
+                f.goToStart();
+                f.validate();
+
+                if (text.equals(f.getText()) == false)
+                {
+                    fail("Repeated loading of a document failed.");
+                }
+                Thread.sleep(1000);
+            }
+        }
+        finally
+        {
+            if (f != null)
+            {
+                f.dispose();
+            }
+        }
+    }
+
+    /** Using multiple instances of OOoBean at the same time
+     * @throws Exception
+     */
+
+    @Test public void test8() throws Exception
+    {
+        OOoBean bean1 = new OOoBean(new PrivateLocalOfficeConnection(connection.getComponentContext()));
+        BeanPanel bp1 = new BeanPanel(bean1);
+        OOoBean bean2 = new OOoBean(new PrivateLocalOfficeConnection(connection.getComponentContext()));
+        BeanPanel bp2 = new BeanPanel(bean2);
+        OOoBean bean3 = new OOoBean(new PrivateLocalOfficeConnection(connection.getComponentContext()));
+        BeanPanel bp3 = new BeanPanel(bean3);
+        OOoBean bean4 = new OOoBean(new PrivateLocalOfficeConnection(connection.getComponentContext()));
+        BeanPanel bp4 = new BeanPanel(bean4);
+
+        try
+        {
+            Frame f = new Frame("OOoBean example with several instances");
+            f.setLayout(new GridBagLayout());
+            GridBagConstraints c = new GridBagConstraints();
+            c.fill = GridBagConstraints.HORIZONTAL;
+            c.weightx = 0.5;
+
+            c.insets = new Insets(0, 0, 0, 10);
+            c.gridx = 0;
+            c.gridy = 0;
+            f.add(bp1, c);
+            
+            c.gridx = 1;
+            c.insets = new Insets(0, 0, 0, 0);
+            f.add(bp2, c);
+
+            c.gridx = 0;
+            c.gridy = 1;
+            c.insets = new Insets(10, 0, 0, 10);
+            f.add(bp3, c);
+
+            c.gridx = 1;
+            c.gridy = 1;
+            c.insets = new Insets(10, 0, 0, 0);
+            f.add(bp4, c);
+
+            f.pack();
+            f.setBounds(0, 0, 1000, 600);
+            f.setVisible(true);
+            try {
+            bean1.loadFromURL("private:factory/swriter", null);
+            bean2.loadFromURL("private:factory/swriter", null);
+            bean3.loadFromURL("private:factory/swriter", null);
+            bean4.loadFromURL("private:factory/swriter", null);
+            } catch( Exception e)
+            {
+                e.printStackTrace();
+            }
+            f.validate();
+
+            Thread.sleep(10000);
+        }
+        finally
+        {
+            bean1.stopOOoConnection();
+            bean2.stopOOoConnection();
+            bean3.stopOOoConnection();
+            bean4.stopOOoConnection();
+        }
+    }
+
+    class BeanPanel extends Panel
+    {
+        public BeanPanel(OOoBean b)
+        {
+            setLayout(new BorderLayout());
+            add(b, BorderLayout.CENTER);
+        }
+        public Dimension getPreferredSize()
+        {
+            Container c = getParent();
+            return new Dimension(200, 200);
+        }
+    }
+
+
+
+
+    private XMultiServiceFactory getMSF()
+    {
+        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
+        return xMSF1;
+    }
+
+    // setup and close connections
+    @BeforeClass public static void setUpConnection() throws Exception {
+        System.out.println("setUpConnection()");
+        connection.setUp();
+    }
+
+    @AfterClass public static void tearDownConnection()
+        throws InterruptedException, com.sun.star.uno.Exception
+    {
+        System.out.println("tearDownConnection()");
+        connection.tearDown();
+    }
+
+    private static final OfficeConnection connection = new OfficeConnection();
+
+
+}
+
+
diff --git a/bean/qa/complex/bean/ScreenComparer.java b/bean/qa/complex/bean/ScreenComparer.java
new file mode 100644
index 000000000..d4796b964
--- /dev/null
+++ b/bean/qa/complex/bean/ScreenComparer.java
@@ -0,0 +1,249 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * 
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+package complex.bean;
+
+
+// import complexlib.ComplexTestCase;
+import java.io.File;
+import java.awt.Rectangle;
+// import java.awt.BorderLayout;
+import java.awt.image.BufferedImage;
+import java.awt.image.PixelGrabber;
+// import java.awt.event.*;
+// import java.awt.Frame;
+import javax.imageio.ImageIO;
+// import javax.imageio.stream.FileImageOutputStream;
+
+
+
+class ScreenComparer
+{
+    Rectangle m_rect;
+    BufferedImage m_img1;
+    BufferedImage m_img2;
+    BufferedImage m_imgDiff;
+
+    int m_diffColor;
+    public ScreenComparer(int x, int y, int width, int height)
+    {
+        this(new Rectangle(x, y, width, height));
+    }
+
+    public ScreenComparer(Rectangle location)
+    {
+        m_rect = location;
+        int red = 0xff;
+        int alpha = 0xff;
+        m_diffColor = (alpha << 24);
+        m_diffColor = m_diffColor | (red << 16);
+    }
+
+    public ScreenComparer()
+    {
+        this(new Rectangle(0, 0, 0, 0));
+    }
+
+    public void reset()
+    {
+        m_rect = null;
+        m_img1 = null;
+        m_img2 = null;
+        m_imgDiff = null;
+    }
+
+    public Rectangle getLocation()
+    {
+        return m_rect;
+    }
+    public void grabOne() throws Exception
+    {
+        grabOne(m_rect);
+    }
+    
+    public void grabOne(Rectangle r) throws Exception
+    {
+        java.awt.Robot robot = new java.awt.Robot();
+        m_img1 = robot.createScreenCapture(r);
+    }
+
+    public void grabTwo() throws Exception
+    {
+        grabTwo(m_rect);
+    }
+    
+    public void grabTwo(Rectangle r) throws Exception
+    {
+        java.awt.Robot robot = new java.awt.Robot();
+        m_img2 = robot.createScreenCapture(r);
+    }
+
+    public boolean compare() throws Exception
+    {
+        if (m_img1 == null || m_img2 == null)
+        {
+            throw new Exception("Only one image captured!");
+        }
+        boolean ret = true;
+        int w1 = m_img1.getWidth();
+        int h1 = m_img1.getHeight();
+        int w2 = m_img2.getWidth();
+        int h2 = m_img2.getHeight();
+
+        if (w1 != w2 || h1 != h2)
+        {
+            System.out.println("### 1\n");
+            //Different size. Create an image that holds both images.
+            int w = w1 > w2 ? w1 : w2;
+            int h = h1 > h2 ? h1 : h2;
+            m_imgDiff = new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB);
+            for (int y = 0; y < h; y ++)
+            {
+                for (int x = 0; x < w; x++)
+                {
+                    boolean bOutOfRange = false;
+                    int pixel1 = 0;
+                    int pixel2 = 0;
+                    //get the pixel for m_img1
+                    if (x < w1 && y < h1)
+                    {
+                        pixel1 = m_img1.getRGB(x, y);
+                    }
+                    else
+                    {
+                        bOutOfRange = true;
+                    }
+                    
+                    if (x < w2 && y < h2)
+                    {
+                        pixel2 = m_img2.getRGB(x, y);
+                    }
+                    else
+                    {
+                        bOutOfRange = true;
+                    }
+
+                    if (bOutOfRange || pixel1 != pixel2)
+                    {
+                        m_imgDiff.setRGB(x, y, m_diffColor);
+                    }
+                    else
+                    {
+                        m_imgDiff.setRGB(x, y, pixel1);
+                    }
+                    
+                }
+            }
+            return false;
+        }
+
+        //Images have same dimension
+        int[] pixels1 = new int[w1 * h1];
+        PixelGrabber pg = new PixelGrabber(
+            m_img1.getSource(), 0, 0, w1, h1, pixels1, 0, w1);
+        pg.grabPixels();
+
+        int[] pixels2 = new int[w2 * h2];
+        PixelGrabber pg2 = new PixelGrabber(
+            m_img2.getSource(), 0, 0, w2, h2, pixels2, 0, w2);
+        pg2.grabPixels();
+
+        m_imgDiff = new BufferedImage(w1, h1, BufferedImage.TYPE_INT_ARGB);
+
+        //First check if the the images differ.
+        int lenAr = pixels1.length;
+        int index = 0;
+        for (index = 0; index < lenAr; index++)
+        {
+            if (pixels1[index] != pixels2[index])
+            {
+                break;
+            }
+        }
+
+        //If the images are different, then create the diff image
+        if (index < lenAr)
+        {
+            for (int y = 0; y < h1; y++)
+            {
+                for (int x = 0; x < w1; x++)
+                {
+                    int offset = y * w1 + x;
+                    if (pixels1[offset] != pixels2[offset])
+                    {
+                        ret = ret && false;
+                        m_imgDiff.setRGB(x, y, m_diffColor); 
+                    }
+                    else
+                    {
+                        m_imgDiff.setRGB(x, y, pixels1[offset]);
+                    }
+                }
+            }
+        }
+        return ret;
+    }
+
+    /** Writes Images to a location. The
+     *  directory is determined by the java property OOoBean.Images
+     * 
+     */
+    public void writeImages() throws Exception
+    {
+        String imgLocation = System.getProperty("OOoBean.Images", "");
+        File file_tmp = File.createTempFile("OOoBean", "", new File(imgLocation));
+        File file1 = new File(file_tmp.getPath()+".png");
+        file_tmp.delete();
+        if (m_img1 != null)
+        {
+            ImageIO.write(m_img1, "png", file1);
+            System.out.println("\nCompared images:");
+            System.out.println("1. " + file1.getPath());
+        }
+        file1= null;
+        file_tmp= null;
+        file_tmp = File.createTempFile("OOoBean", "", new File(imgLocation));
+        file1 = new File(file_tmp.getPath()+".png");
+        file_tmp.delete();
+        if (m_img2 != null)
+        {
+            ImageIO.write(m_img2, "png", file1);
+            System.out.println("2. " + file1.getPath());
+        }
+        file1= null;
+        file_tmp= null;
+        file_tmp = File.createTempFile("OOoBean", "_diff", new File(imgLocation));
+        file1 = new File(file_tmp.getPath()+".png");
+        file_tmp.delete();
+        if (m_imgDiff != null)
+        {
+            ImageIO.write(m_imgDiff, "png", file1);
+            System.out.println("Diff image: " + file1.getPath() + "\n");
+        }
+    }
+    
+}
+
diff --git a/bean/qa/complex/bean/WriterFrame.java b/bean/qa/complex/bean/WriterFrame.java
new file mode 100644
index 000000000..711e74bf0
--- /dev/null
+++ b/bean/qa/complex/bean/WriterFrame.java
@@ -0,0 +1,210 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * 
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+package complex.bean;
+
+
+// import com.sun.star.comp.beans.LocalOfficeConnection;
+import com.sun.star.uno.XComponentContext;
+import java.awt.Rectangle;
+import java.awt.Insets;
+import java.awt.BorderLayout;
+import com.sun.star.comp.beans.OOoBean;
+import com.sun.star.uno.UnoRuntime;
+
+
+
+class WriterFrame extends java.awt.Frame
+{
+    com.sun.star.comp.beans.OOoBean m_bean;
+    final static String m_sDocURL = "private:factory/swriter";
+
+    /**
+      @param loadBeforeVisible
+          the OOoBean is added to the frame before it is displayable. Then the Java Frame does
+          not have a native window peer yet.
+     */
+    public WriterFrame(int x, int y, int width, int height, boolean loadBeforeVisible, XComponentContext _xConn) throws Exception
+    {
+
+        try
+        {
+            if (loadBeforeVisible == false)
+            {
+                m_bean = new com.sun.star.comp.beans.OOoBean(new PrivateLocalOfficeConnection(_xConn));
+                add(m_bean, BorderLayout.CENTER);
+                pack();
+                setBounds(x, y, width, height);
+                setVisible(true);
+                m_bean.loadFromURL(m_sDocURL, null);
+                validate();
+            }
+            else
+            {
+                m_bean = new com.sun.star.comp.beans.OOoBean(new PrivateLocalOfficeConnection(_xConn));
+                m_bean.loadFromURL(m_sDocURL, null);
+                add(m_bean, BorderLayout.CENTER);
+                pack();
+                setBounds(x, y, width, height);
+                setVisible(true);
+                m_bean.aquireSystemWindow();
+            }
+        }
+        catch (Exception e)
+        {
+            System.out.println("Exception caught: " + e.getMessage());
+        }
+    }
+    
+    public WriterFrame() throws Exception
+    {
+        this(0, 0, 800, 400, false, null);
+    }
+
+    public void setText(String s) throws Exception
+    {
+        com.sun.star.frame.XModel model = (com.sun.star.frame.XModel)m_bean.getDocument();
+        com.sun.star.text.XTextDocument myDoc =
+            UnoRuntime.queryInterface(com.sun.star.text.XTextDocument.class, model);
+        com.sun.star.text.XText xText = myDoc.getText();
+        com.sun.star.text.XTextCursor xTCursor = xText.createTextCursor();
+        //inserting some Text
+        xText.insertString( xTCursor, s, false );  
+    }
+
+    public String getText() throws Exception
+    {
+        com.sun.star.frame.XModel model = (com.sun.star.frame.XModel)m_bean.getDocument();
+        com.sun.star.text.XTextDocument myDoc =
+            UnoRuntime.queryInterface(com.sun.star.text.XTextDocument.class, model);
+        com.sun.star.text.XText xText = myDoc.getText();
+        return xText.getString();
+    }
+
+    @Override
+    public void dispose() {
+        m_bean.stopOOoConnection();
+        setVisible(false);
+        super.dispose();
+    }
+
+    OOoBean getBean()
+    {
+        return m_bean;
+    }
+
+    /** Makes sure the document is displayed at the beginning.
+     * This is important for comparing screenshots.
+     */
+    public void goToStart() throws Exception
+    {
+        com.sun.star.frame.XModel xModel = (com.sun.star.frame.XModel)m_bean.getDocument();
+        com.sun.star.frame.XController xController = xModel.getCurrentController();
+
+        com.sun.star.text.XTextViewCursorSupplier xVCSupplier =
+            UnoRuntime.queryInterface(com.sun.star.text.XTextViewCursorSupplier.class, xController);
+
+        com.sun.star.text.XTextViewCursor xTViewCursor = xVCSupplier.getViewCursor ( );
+        xTViewCursor.gotoStart(false);
+    }
+
+    
+    public void pageDown() throws Exception
+    {
+        com.sun.star.frame.XModel xModel = (com.sun.star.frame.XModel)m_bean.getDocument();
+        com.sun.star.frame.XController xController = xModel.getCurrentController();
+
+        com.sun.star.text.XTextViewCursorSupplier xVCSupplier =
+            UnoRuntime.queryInterface(com.sun.star.text.XTextViewCursorSupplier.class, xController);
+        com.sun.star.text.XTextViewCursor xTViewCursor = xVCSupplier.getViewCursor ( );
+        com.sun.star.view.XScreenCursor xScreenCursor =
+            UnoRuntime.queryInterface(com.sun.star.view.XScreenCursor.class, xTViewCursor);
+        xScreenCursor.screenDown();
+    }
+
+    public Rectangle getClientArea()
+    {
+        
+        Insets i = getInsets();
+        Rectangle r = getBounds();
+        Rectangle rc = new Rectangle(r.x + i.left, r.y + i.top,
+                                     r.width - i.left - i.right,
+                                     r.height - i.top - i.bottom);
+        return rc;
+    }
+
+    public Rectangle getUnoFramePosition() throws Exception
+    {
+        com.sun.star.awt.XWindow win = m_bean.getFrame().getContainerWindow();
+        com.sun.star.awt.Rectangle rect = win.getPosSize();
+        return new Rectangle(rect.X, rect.Y, rect.Width, rect.Height);
+    }
+
+    /** After resizing the Java frame, the UNO window shall be resized
+     * as well, which is checked by this method.
+     */
+    public boolean checkUnoFramePosition() throws Exception
+    {
+        Rectangle client = getClientArea();
+        Rectangle unoWin = getUnoFramePosition();
+
+        if (client.x != unoWin.x
+            || client.y != unoWin.y
+            || client.width != unoWin.width
+            || client.height != unoWin.height)
+        {
+            System.out.println("\nPosition of client are of Java frame does not match the postion" +
+                               "of the UNO window. These are the values of Java frame, followed by" +
+                               "the UNO window: ");
+            System.out.println(client);
+            System.out.println(unoWin);
+            System.out.println("");
+            return false;
+        }
+
+        return true;
+    }
+
+    public void removeOOoBean() throws Exception
+    {
+        //OOoBean.releaseSystemWindow need not be called because
+        //LocalOfficeWindow overrides removeNotify.
+        //However because of bt4745222 which was fixed in 1.4.2_04,
+        //this is very very slow. The workaround is use releaseSystemWindow
+        //beforehand.
+        m_bean.releaseSystemWindow();
+        remove(m_bean);
+    }
+
+    public void addOOoBean() throws Exception
+    {
+        add(m_bean, BorderLayout.CENTER);
+        m_bean.aquireSystemWindow();
+        validate();
+    }
+    
+}
+
diff --git a/bean/qa/complex/bean/makefile.mk b/bean/qa/complex/bean/makefile.mk
new file mode 100644
index 000000000..257dd6df4
--- /dev/null
+++ b/bean/qa/complex/bean/makefile.mk
@@ -0,0 +1,138 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# 
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+nothing .PHONY:
+    @echo "OOO_SUBSEQUENT_TESTS not set, do nothing."
+.ELSE
+
+PRJ = ../../..
+PRJNAME = bean
+TARGET = qa_complex_bean
+
+.IF "$(OOO_JUNIT_JAR)" != ""
+PACKAGE = complex/bean
+
+# here store only Files which contain a @Test
+JAVATESTFILES = \
+    OOoBeanTest.java
+
+# put here all other files
+JAVAFILES = $(JAVATESTFILES) \
+     ScreenComparer.java \
+     WriterFrame.java
+
+JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar officebean.jar
+EXTRAJARFILES = $(OOO_JUNIT_JAR)
+
+# subdirectories
+# SUBDIRS         = helper
+
+# Sample how to debug
+# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
+
+.END
+
+.INCLUDE: settings.mk
+.INCLUDE: target.mk
+.INCLUDE: installationtest.mk
+
+ALLTAR : javatest
+
+.END
+
+# 
+# 
+# 
+# 
+# PRJ := ..$/..
+# PRJNAME := bean
+# TARGET := test_bean
+# PACKAGE = complex
+# 
+# .INCLUDE: settings.mk
+# 
+# #----- compile .java files -----------------------------------------
+# 
+# JARFILES = officebean.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
+# JAVAFILES       = OOoBeanTest.java ScreenComparer.java WriterFrame.java
+# JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
+# 
+# #----- make a jar from compiled files ------------------------------
+# 
+# MAXLINELENGTH = 100000
+# 
+# JARCLASSDIRS    = $(PACKAGE)
+# JARTARGET       = $(TARGET).jar
+# JARCOMPRESS 	= TRUE
+# 
+# # --- Parameters for the test --------------------------------------
+# 
+# # test base is java complex
+# CT_TESTBASE = -TestBase java_complex
+# 
+# # test looks something like the.full.package.TestName
+# CT_TEST     = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b)
+# 
+# # start the runner application
+# CT_APP      = org.openoffice.Runner
+# 
+# CT_NOOFFICE = -NoOffice
+# 
+# 
+# OFFICE_CLASSPATH_TMP:=$(foreach,i,$(JARFILES) $(office)$/program$/classes$/$(i)$(PATH_SEPERATOR))
+# 
+# OFFICE_CLASSPATH=$(OFFICE_CLASSPATH_TMP:t"")$(SOLARBINDIR)$/OOoRunner.jar$(PATH_SEPERATOR)$(CLASSDIR)
+# 
+# OOOBEAN_OPTIONS=-Dcom.sun.star.officebean.Options=-norestore -DOOoBean.Images=$(MISC)
+# 
+# 
+# .INCLUDE: target.mk
+# 
+# ALLTAR : RUNINSTRUCTIONS
+# 
+# # --- Targets ------------------------------------------------------
+# 
+# #The OOoBean uses the classpath to find the office installation.
+# #Therefore we must use the jar files from the office.
+# RUN:
+#     java -cp $(OFFICE_CLASSPATH) $(OOOBEAN_OPTIONS) $(CT_APP) $(CT_NOOFFICE) $(CT_TESTBASE) $(CT_TEST)
+# run: RUN
+# 
+# rund:
+#     java -Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=8100 -cp $(OFFICE_CLASSPATH) $(OOOBEAN_OPTIONS) $(CT_APP) $(CT_NOOFFICE) $(CT_TESTBASE) $(CT_TEST)
+# 
+# 
+# 
+# RUNINSTRUCTIONS : 
+#     @echo .
+#     @echo ###########################   N O T E  ######################################
+#     @echo . 
+#     @echo "To run the test you have to provide the office location."
+#     @echo Example:
+#     @echo dmake run office="d:/myOffice"
+#     @echo .
+#   
diff --git a/bean/qa/complex/makefile.mk b/bean/qa/complex/makefile.mk
deleted file mode 100644
index e7b88ce34..000000000
--- a/bean/qa/complex/makefile.mk
+++ /dev/null
@@ -1,95 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ := ..$/..
-PRJNAME := bean
-TARGET := test_bean
-PACKAGE = complex
-
-.INCLUDE: settings.mk
-
-#----- compile .java files -----------------------------------------
-
-JARFILES = officebean.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-JAVAFILES       = OOoBeanTest.java ScreenComparer.java WriterFrame.java
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-#----- make a jar from compiled files ------------------------------
-
-MAXLINELENGTH = 100000
-
-JARCLASSDIRS    = $(PACKAGE)
-JARTARGET       = $(TARGET).jar
-JARCOMPRESS 	= TRUE
-
-# --- Parameters for the test --------------------------------------
-
-# test base is java complex
-CT_TESTBASE = -TestBase java_complex
-
-# test looks something like the.full.package.TestName
-CT_TEST     = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b)
-
-# start the runner application
-CT_APP      = org.openoffice.Runner
-
-CT_NOOFFICE = -NoOffice
-
-
-OFFICE_CLASSPATH_TMP:=$(foreach,i,$(JARFILES) $(office)$/program$/classes$/$(i)$(PATH_SEPERATOR))
-
-OFFICE_CLASSPATH=$(OFFICE_CLASSPATH_TMP:t"")$(SOLARBINDIR)$/OOoRunner.jar$(PATH_SEPERATOR)$(CLASSDIR)
-
-OOOBEAN_OPTIONS=-Dcom.sun.star.officebean.Options=-norestore -DOOoBean.Images=$(MISC)
-
-
-.INCLUDE: target.mk
-
-ALLTAR : RUNINSTRUCTIONS
-
-# --- Targets ------------------------------------------------------
-
-#The OOoBean uses the classpath to find the office installation.
-#Therefore we must use the jar files from the office.
-RUN:
-    java -cp $(OFFICE_CLASSPATH) $(OOOBEAN_OPTIONS) $(CT_APP) $(CT_NOOFFICE) $(CT_TESTBASE) $(CT_TEST)
-run: RUN
-
-rund:
-    java -Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=8100 -cp $(OFFICE_CLASSPATH) $(OOOBEAN_OPTIONS) $(CT_APP) $(CT_NOOFFICE) $(CT_TESTBASE) $(CT_TEST)
-
-
-
-RUNINSTRUCTIONS : 
-    @echo .
-    @echo ###########################   N O T E  ######################################
-    @echo . 
-    @echo "To run the test you have to provide the office location."
-    @echo Example:
-    @echo dmake run office="d:/myOffice"
-    @echo .
-  
-- 
cgit v1.2.3


From 7d38af7e0d81025fb01db069e4d04f20d007dfe4 Mon Sep 17 00:00:00 2001
From: Lars Langhans 
Date: Thu, 17 Jun 2010 12:39:47 +0200
Subject: sb123:#i111449# cleanups in forms qa/complex tests

---
 forms/prj/build.lst                             |   1 +
 forms/qa/complex/forms/CheckOGroupBoxModel.java | 203 ++++++++++++++++--------
 forms/qa/complex/forms/makefile.mk              | 117 +++++++++-----
 3 files changed, 220 insertions(+), 101 deletions(-)

diff --git a/forms/prj/build.lst b/forms/prj/build.lst
index cc71868b7..2d7c5f49c 100644
--- a/forms/prj/build.lst
+++ b/forms/prj/build.lst
@@ -16,3 +16,4 @@ fm  forms\source\runtime                    nmake   -   all frm_runtime NULL
 fm  forms\util                              nmake   -   all fm_util fm_component fm_solar_component fm_solar_control fm_helper fm_misc fm_resource fm_richtext frm_runtime fm_xforms NULL
 fm  forms\qa                                nmake   -   all fm_qa NULL
 fm forms\qa\unoapi nmake - all fm_qa_unoapi NULL
+fm forms\qa\complex\forms nmake - all fm_qa_complex NULL
diff --git a/forms/qa/complex/forms/CheckOGroupBoxModel.java b/forms/qa/complex/forms/CheckOGroupBoxModel.java
index b1d42ba60..175349a29 100755
--- a/forms/qa/complex/forms/CheckOGroupBoxModel.java
+++ b/forms/qa/complex/forms/CheckOGroupBoxModel.java
@@ -24,7 +24,6 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
 package complex.forms;
 
 import com.sun.star.beans.Property;
@@ -37,88 +36,127 @@ import com.sun.star.drawing.XControlShape;
 import com.sun.star.lang.XComponent;
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
-import complexlib.ComplexTestCase;
-import java.io.PrintWriter;
+// import complexlib.ComplexTestCase;
+import com.sun.star.util.CloseVetoException;
+import com.sun.star.util.XCloseable;
 import java.util.Vector;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import util.FormTools;
 import util.SOfficeFactory;
 import util.ValueChanger;
 
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openoffice.test.OfficeConnection;
+import static org.junit.Assert.*;
+
 /**
  */
-public class CheckOGroupBoxModel extends ComplexTestCase {
-
-    private XMultiPropertySet xPropSet = null;
-
-    public String[] getTestMethodNames() {
-        return new String[] {"setPropertyValues"};
-    }
-
-    public void before() {
-        XComponent xDrawDoc = null;
-        SOfficeFactory SOF = SOfficeFactory.getFactory(((XMultiServiceFactory) param.getMSF()));
-
-        try {
-            log.println("creating a draw document");
-            xDrawDoc = SOF.createDrawDoc(null);
-        } catch (com.sun.star.uno.Exception e) {
-            e.printStackTrace((PrintWriter)log);
-            failed("Couldn't create document.");
+public class CheckOGroupBoxModel
+{
+
+    private XMultiPropertySet m_xPropSet;
+    private XComponent m_xDrawDoc;
+
+//    public String[] getTestMethodNames() {
+//        return new String[] {"setPropertyValues"};
+//    }
+    @Before public void before()
+    {
+        // XComponent xDrawDoc = null;
+        SOfficeFactory SOF = SOfficeFactory.getFactory(getMSF());
+
+        try
+        {
+            System.out.println("creating a draw document");
+            m_xDrawDoc = SOF.createDrawDoc(null);
+        }
+        catch (com.sun.star.uno.Exception e)
+        {
+            fail("Couldn't create document.");
         }
 
         String objName = "GroupBox";
-        XControlShape shape = FormTools.insertControlShape(xDrawDoc, 5000, 7000, 2000, 2000, objName);
-        xPropSet = (XMultiPropertySet)UnoRuntime.queryInterface(XMultiPropertySet.class, shape.getControl());
+        XControlShape shape = FormTools.insertControlShape(m_xDrawDoc, 5000, 7000, 2000, 2000, objName);
+        m_xPropSet = UnoRuntime.queryInterface(XMultiPropertySet.class, shape.getControl());
     }
 
-
-    public void setPropertyValues() {
+    @After public void after()
+    {
+        XCloseable xClose = UnoRuntime.queryInterface(XCloseable.class, m_xDrawDoc);
+        if (xClose != null)
+        {
+            try
+            {
+                xClose.close(true);
+            }
+            catch (CloseVetoException ex)
+            {
+                fail("Can't close document. Exception caught: " + ex.getMessage());
+                /* ignore! */
+            }
+        }
+    }
+    @Test public void setPropertyValues()
+    {
         String[] boundPropsToTest = getBoundPropsToTest();
 
         MyChangeListener ml = new MyChangeListener();
-        xPropSet.addPropertiesChangeListener(boundPropsToTest, ml);
+        m_xPropSet.addPropertiesChangeListener(boundPropsToTest, ml);
 
-        Object[] gValues = xPropSet.getPropertyValues(boundPropsToTest);
+        Object[] gValues = m_xPropSet.getPropertyValues(boundPropsToTest);
         Object[] newValue = new Object[gValues.length];
-        log.println("Trying to change all properties.");
-        for (int i=0; i tNames = new Vector();
 
-        for (int i = 0; i < properties.length; i++) {
+        for (int i = 0; i < properties.length; i++)
+        {
 
             Property property = properties[i];
             String name = property.Name;
-            boolean isWritable = ((property.Attributes &
-                PropertyAttribute.READONLY) == 0);
-            boolean isNotNull = ((property.Attributes &
-                PropertyAttribute.MAYBEVOID) == 0);
-            boolean isBound = ((property.Attributes &
-                PropertyAttribute.BOUND) != 0);
-
-            if ( isWritable && isNotNull && isBound) {
+            boolean isWritable = ((property.Attributes
+                    & PropertyAttribute.READONLY) == 0);
+            boolean isNotNull = ((property.Attributes
+                    & PropertyAttribute.MAYBEVOID) == 0);
+            boolean isBound = ((property.Attributes
+                    & PropertyAttribute.BOUND) != 0);
+
+            if (isWritable && isNotNull && isBound)
+            {
                 tNames.add(name);
             }
 
@@ -126,22 +164,59 @@ public class CheckOGroupBoxModel extends ComplexTestCase {
 
         //get a array of bound properties
         testPropsNames = new String[tNames.size()];
-        testPropsNames = (String[])tNames.toArray(testPropsNames);
+        testPropsNames = tNames.toArray(testPropsNames);
         return testPropsNames;
     }
 
     /**
-    * Listener implementation which sets a flag when
-    * listener was called.
-    */
-    public class MyChangeListener implements XPropertiesChangeListener {
+     * Listener implementation which sets a flag when
+     * listener was called.
+     */
+    public class MyChangeListener implements XPropertiesChangeListener
+    {
+
         boolean propertiesChanged = false;
-        public void propertiesChange(PropertyChangeEvent[] e) {
-             propertiesChanged = true;
+
+        public void propertiesChange(PropertyChangeEvent[] e)
+        {
+            propertiesChanged = true;
+        }
+
+        public void disposing(EventObject obj)
+        {
+        }
+
+        public boolean wasListenerCalled()
+        {
+            return propertiesChanged;
+        }
+
+        public void reset()
+        {
+            propertiesChanged = false;
         }
-        public void disposing (EventObject obj) {}
-        public boolean wasListenerCalled() { return propertiesChanged; }
-        public void reset() { propertiesChanged = false; }
     };
 
+    private XMultiServiceFactory getMSF()
+    {
+        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
+        return xMSF1;
+    }
+
+    // setup and close connections
+    @BeforeClass
+    public static void setUpConnection() throws Exception
+    {
+        System.out.println("setUpConnection()");
+        connection.setUp();
+    }
+
+    @AfterClass
+    public static void tearDownConnection()
+            throws InterruptedException, com.sun.star.uno.Exception
+    {
+        System.out.println("tearDownConnection()");
+        connection.tearDown();
+    }
+    private static final OfficeConnection connection = new OfficeConnection();
 }
diff --git a/forms/qa/complex/forms/makefile.mk b/forms/qa/complex/forms/makefile.mk
index 6caf244cd..c1c6ee0db 100755
--- a/forms/qa/complex/forms/makefile.mk
+++ b/forms/qa/complex/forms/makefile.mk
@@ -25,54 +25,97 @@
 #
 #*************************************************************************
 
-PRJ = ..$/..$/..
-TARGET  = CheckOGroupBoxModel
-PRJNAME = $(TARGET)
-PACKAGE = complex$/forms
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
+.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+nothing .PHONY:
+    @echo "OOO_SUBSEQUENT_TESTS not set, do nothing."
+.ELSE
 
+PRJ = ../../..
+PRJNAME = forms
+TARGET = qa_complex_forms
 
-#----- compile .java files -----------------------------------------
+.IF "$(OOO_JUNIT_JAR)" != ""
+PACKAGE = complex/forms
 
-JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar mysql.jar
-JAVAFILES       = CheckOGroupBoxModel.java
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
+# here store only Files which contain a @Test
+JAVATESTFILES = \
+    CheckOGroupBoxModel.java
 
-#----- make a jar from compiled files ------------------------------
+# put here all other files
+JAVAFILES = $(JAVATESTFILES) 
 
-MAXLINELENGTH = 100000
 
-JARCLASSDIRS    = $(PACKAGE)
+JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
+EXTRAJARFILES = $(OOO_JUNIT_JAR)
 
-# --- Parameters for the test --------------------------------------
+# subdirectories
+# SUBDIRS         = helper
 
-# start an office if the parameter is set for the makefile
-.IF "$(OFFICE)" == ""
-CT_APPEXECCOMMAND =
-.ELSE
-CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;"
-.ENDIF
+# Sample how to debug
+# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
 
-# test base is java complex
-CT_TESTBASE = -TestBase java_complex
+.END
 
-# build up package name with "." instead of $/
-CT_PACKAGE     = -o $(PACKAGE:s\$/\.\)
-
-# start the runner application
-CT_APP      = org.openoffice.Runner
+.INCLUDE: settings.mk
+.INCLUDE: target.mk
+.INCLUDE: installationtest.mk
 
-# --- Targets ------------------------------------------------------
+ALLTAR : javatest
 
-.IF "$(depend)" == ""
-run : ALLTAR
-.ELSE
-run : ALLDEP
-.ENDIF
+.END
 
-.INCLUDE :  target.mk
 
-run:
-    +java -cp $(CLASSPATH) $(CT_APP) $(CT_APPEXECCOMMAND) $(CT_TESTBASE) $(CT_PACKAGE).$(JAVAFILES:b)
+# 
+# 
+# 
+# PRJ = ..$/..$/..
+# TARGET  = CheckOGroupBoxModel
+# PRJNAME = $(TARGET)
+# PACKAGE = complex$/forms
+# 
+# # --- Settings -----------------------------------------------------
+# .INCLUDE: settings.mk
+# 
+# 
+# #----- compile .java files -----------------------------------------
+# 
+# JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar mysql.jar
+# JAVAFILES       = CheckOGroupBoxModel.java
+# JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
+# 
+# #----- make a jar from compiled files ------------------------------
+# 
+# MAXLINELENGTH = 100000
+# 
+# JARCLASSDIRS    = $(PACKAGE)
+# 
+# # --- Parameters for the test --------------------------------------
+# 
+# # start an office if the parameter is set for the makefile
+# .IF "$(OFFICE)" == ""
+# CT_APPEXECCOMMAND =
+# .ELSE
+# CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;"
+# .ENDIF
+# 
+# # test base is java complex
+# CT_TESTBASE = -TestBase java_complex
+# 
+# # build up package name with "." instead of $/
+# CT_PACKAGE     = -o $(PACKAGE:s\$/\.\)
+# 
+# # start the runner application
+# CT_APP      = org.openoffice.Runner
+# 
+# # --- Targets ------------------------------------------------------
+# 
+# .IF "$(depend)" == ""
+# run : ALLTAR
+# .ELSE
+# run : ALLDEP
+# .ENDIF
+# 
+# .INCLUDE :  target.mk
+# 
+# run:
+#     +java -cp $(CLASSPATH) $(CT_APP) $(CT_APPEXECCOMMAND) $(CT_TESTBASE) $(CT_PACKAGE).$(JAVAFILES:b)
-- 
cgit v1.2.3


From e6c50e9bc95d91814f57cc619c6b1f988d9491a3 Mon Sep 17 00:00:00 2001
From: Lars Langhans 
Date: Tue, 29 Jun 2010 13:43:23 +0200
Subject: sb123:#i111449# makefile cleanups for qa/complex tests

---
 bean/qa/complex/bean/makefile.mk   | 1 -
 forms/qa/complex/forms/makefile.mk | 1 -
 2 files changed, 2 deletions(-)

diff --git a/bean/qa/complex/bean/makefile.mk b/bean/qa/complex/bean/makefile.mk
index 257dd6df4..f0bec2633 100644
--- a/bean/qa/complex/bean/makefile.mk
+++ b/bean/qa/complex/bean/makefile.mk
@@ -26,7 +26,6 @@
 #*************************************************************************
 .IF "$(OOO_SUBSEQUENT_TESTS)" == ""
 nothing .PHONY:
-    @echo "OOO_SUBSEQUENT_TESTS not set, do nothing."
 .ELSE
 
 PRJ = ../../..
diff --git a/forms/qa/complex/forms/makefile.mk b/forms/qa/complex/forms/makefile.mk
index c1c6ee0db..8fbbab84f 100755
--- a/forms/qa/complex/forms/makefile.mk
+++ b/forms/qa/complex/forms/makefile.mk
@@ -27,7 +27,6 @@
 
 .IF "$(OOO_SUBSEQUENT_TESTS)" == ""
 nothing .PHONY:
-    @echo "OOO_SUBSEQUENT_TESTS not set, do nothing."
 .ELSE
 
 PRJ = ../../..
-- 
cgit v1.2.3


From 65a4f466e3450a113194f6a47e82b7a8f2d84852 Mon Sep 17 00:00:00 2001
From: sb 
Date: Fri, 2 Jul 2010 11:44:44 +0200
Subject: sb126: #i112871# missing parentheses around || within &&

---
 crashrep/source/unx/main.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crashrep/source/unx/main.cxx b/crashrep/source/unx/main.cxx
index 2467735c4..7c6faf4f3 100755
--- a/crashrep/source/unx/main.cxx
+++ b/crashrep/source/unx/main.cxx
@@ -129,12 +129,12 @@ static string trim_string( const string& rString )
 {
     string temp = rString;
     
-    while ( temp.length() && temp[0] == ' ' || temp[0] == '\t' )
+    while ( temp.length() && (temp[0] == ' ' || temp[0] == '\t') )
         temp.erase( 0, 1 );
         
     string::size_type	len = temp.length();
     
-    while ( len && temp[len-1] == ' ' || temp[len-1] == '\t' )
+    while ( len && (temp[len-1] == ' ' || temp[len-1] == '\t') )
     {
         temp.erase( len - 1, 1 );
         len = temp.length();
-- 
cgit v1.2.3


From 31c67ba5f3b9a15bcb82feb15b3f21e392b8f76f Mon Sep 17 00:00:00 2001
From: Lars Langhans 
Date: Mon, 23 Aug 2010 10:38:44 +0200
Subject: sb123:#i111449# remove all subdirs in complex tests

---
 bean/qa/complex/bean/makefile.mk   | 3 ---
 forms/qa/complex/forms/makefile.mk | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/bean/qa/complex/bean/makefile.mk b/bean/qa/complex/bean/makefile.mk
index f0bec2633..9a21e52ac 100644
--- a/bean/qa/complex/bean/makefile.mk
+++ b/bean/qa/complex/bean/makefile.mk
@@ -47,9 +47,6 @@ JAVAFILES = $(JAVATESTFILES) \
 JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar officebean.jar
 EXTRAJARFILES = $(OOO_JUNIT_JAR)
 
-# subdirectories
-# SUBDIRS         = helper
-
 # Sample how to debug
 # JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
 
diff --git a/forms/qa/complex/forms/makefile.mk b/forms/qa/complex/forms/makefile.mk
index 8fbbab84f..c5895b708 100755
--- a/forms/qa/complex/forms/makefile.mk
+++ b/forms/qa/complex/forms/makefile.mk
@@ -47,9 +47,6 @@ JAVAFILES = $(JAVATESTFILES)
 JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
 EXTRAJARFILES = $(OOO_JUNIT_JAR)
 
-# subdirectories
-# SUBDIRS         = helper
-
 # Sample how to debug
 # JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
 
-- 
cgit v1.2.3


From 5a8da2ba1540e192257feb4cfb8278ce4169d50f Mon Sep 17 00:00:00 2001
From: sb 
Date: Fri, 16 Jul 2010 16:57:09 +0200
Subject: sb123: #i113201# disabled
 forms.OEditModel::com::sun::star::form::validation::XValidatableFormComponent
 for now

---
 forms/qa/unoapi/knownissues.xcl | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/forms/qa/unoapi/knownissues.xcl b/forms/qa/unoapi/knownissues.xcl
index 2e10a269c..09c1dee86 100644
--- a/forms/qa/unoapi/knownissues.xcl
+++ b/forms/qa/unoapi/knownissues.xcl
@@ -125,5 +125,8 @@ forms.OFileControlModel::com::sun::star::form::FormControlModel
 forms.OImageControlModel::com::sun::star::beans::XMultiPropertySet
 forms.OImageControlModel::com::sun::star::beans::XPropertySet
 
+### i113201 ###
+forms.OEditModel::com::sun::star::form::validation::XValidatableFormComponent
+
 ### i111333 ###
 forms.OImageControlControl::com::sun::star::awt::XControl
-- 
cgit v1.2.3


From 43dcbb404f55eb03fffcdc1ac7b7f48583ff006c Mon Sep 17 00:00:00 2001
From: "Thomas Lange [tl]" 
Date: Wed, 21 Jul 2010 16:29:56 +0200
Subject: cws tl82: #i113293# unify encoding detection for linguistic
 components

---
 .../hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx   | 841 +++++++++++----------
 .../hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx   |  94 +--
 lingucomponent/source/lingutil/lingutil.cxx        |  21 +
 lingucomponent/source/lingutil/lingutil.hxx        |   8 +
 .../source/spellcheck/macosxspell/macspellimp.hxx  |  93 +--
 .../source/spellcheck/spell/sspellimp.cxx          | 298 ++++----
 .../source/spellcheck/spell/sspellimp.hxx          |  90 +--
 .../source/thesaurus/libnth/nthesdta.hxx           |  22 +-
 .../source/thesaurus/libnth/nthesimp.cxx           | 456 +++++------
 .../source/thesaurus/libnth/nthesimp.hxx           |  53 +-
 10 files changed, 931 insertions(+), 1045 deletions(-)
 mode change 100644 => 100755 lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx
 mode change 100644 => 100755 lingucomponent/source/lingutil/lingutil.cxx
 mode change 100644 => 100755 lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
 mode change 100644 => 100755 lingucomponent/source/spellcheck/spell/sspellimp.cxx
 mode change 100644 => 100755 lingucomponent/source/spellcheck/spell/sspellimp.hxx
 mode change 100644 => 100755 lingucomponent/source/thesaurus/libnth/nthesdta.hxx
 mode change 100644 => 100755 lingucomponent/source/thesaurus/libnth/nthesimp.cxx
 mode change 100644 => 100755 lingucomponent/source/thesaurus/libnth/nthesimp.hxx

diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
index 2cdd99740..d12172c3a 100755
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
@@ -32,7 +32,6 @@
 #include 
 #include 
 
-//#include 
 #include 	// helper for factories
 #include 
 #include 
@@ -43,10 +42,7 @@
 #include 
 
 #include 
-
-#ifndef _HYPHENIMP_HXX
 #include 
-#endif
 
 #include 
 #include 
@@ -97,9 +93,8 @@ Hyphenator::Hyphenator() :
 {
     bDisposing = FALSE;
     pPropHelper = NULL;
-        aDicts = NULL;
-        numdict = 0;
-
+    aDicts = NULL;
+    numdict = 0;
 }
 
 
@@ -108,21 +103,22 @@ Hyphenator::~Hyphenator()
     if (pPropHelper)
         pPropHelper->RemoveAsPropListener();
 
-        if ((numdict) && (aDicts)) {
-      for (int i=0; i < numdict; i++) {
+    if ((numdict) && (aDicts)) 
+    {
+        for (int i=0; i < numdict; i++) 
+        {
             if (aDicts[i].apCC) delete aDicts[i].apCC;
             aDicts[i].apCC = NULL;
-      }
+        }
     }
-        if (aDicts) delete[] aDicts;
+    if (aDicts) delete[] aDicts;
     aDicts = NULL;
-        numdict = 0;
+    numdict = 0;
 }
 
 
 PropertyHelper_Hyphen & Hyphenator::GetPropHelper_Impl()
 {
-
     if (!pPropHelper)
     {
         Reference< XPropertySet	>	xPropSet( GetLinguProperties(), UNO_QUERY );
@@ -212,12 +208,7 @@ Sequence< Locale > SAL_CALL Hyphenator::getLocales()
 
             // add dictionary information
             aDicts = new HDInfo[numdict];
-/*
-            aTEncs  = new rtl_TextEncoding [numdict];
-            aTLocs  = new Locale [numdict];
-            aTNames = new OUString [numdict];
-            aCharSetInfo = new CharClass* [numdict];
-*/
+            
             k = 0;
             for (aDictIt = aDics.begin();  aDictIt != aDics.end();  ++aDictIt)
             {
@@ -233,7 +224,7 @@ Sequence< Locale > SAL_CALL Hyphenator::getLocales()
                     for (sal_Int32 i = 0;  i < nLocales;  ++i)
                     {
                         aDicts[k].aPtr = NULL;
-                        aDicts[k].aEnc = 0;
+                        aDicts[k].eEnc = RTL_TEXTENCODING_DONTKNOW;
                         aDicts[k].aLoc = MsLangId::convertLanguageToLocale(
                                         MsLangId::convertIsoStringToLanguage( aDictIt->aLocaleNames[i] ));
                         aDicts[k].apCC = new CharClass( aDicts[k].aLoc );
@@ -288,240 +279,268 @@ sal_Bool SAL_CALL Hyphenator::hasLocale(const Locale& rLocale)
 }
 
 
-Reference< XHyphenatedWord > SAL_CALL
-Hyphenator::hyphenate( const ::rtl::OUString& aWord,
-               const ::com::sun::star::lang::Locale& aLocale,
-               sal_Int16 nMaxLeading,
-               const ::com::sun::star::beans::PropertyValues& aProperties )
-               throw (com::sun::star::uno::RuntimeException,
-               com::sun::star::lang::IllegalArgumentException)
+Reference< XHyphenatedWord > SAL_CALL Hyphenator::hyphenate( const ::rtl::OUString& aWord,
+       const ::com::sun::star::lang::Locale& aLocale,
+       sal_Int16 nMaxLeading,
+       const ::com::sun::star::beans::PropertyValues& aProperties )
+       throw (com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException)
 {
     int nHyphenationPos = -1;
-        int nHyphenationPosAlt = -1;
-        int nHyphenationPosAltHyph = -1;
+    int nHyphenationPosAlt = -1;
+    int nHyphenationPosAltHyph = -1;
     int wordlen;
     char *hyphens;
-        char *lcword;
-        int k = 0;
+    char *lcword;
+    int k = 0;
 
-        PropertyHelper_Hyphen & rHelper = GetPropHelper();
-        rHelper.SetTmpPropVals(aProperties);
+    PropertyHelper_Hyphen & rHelper = GetPropHelper();
+    rHelper.SetTmpPropVals(aProperties);
     sal_Int16 minTrail = rHelper.GetMinTrailing();
     sal_Int16 minLead = rHelper.GetMinLeading();
     sal_Int16 minLen = rHelper.GetMinWordLength();
 
     HyphenDict *dict = NULL;
-        rtl_TextEncoding aEnc = 0;
-        CharClass * pCC = NULL;
+    rtl_TextEncoding eEnc = RTL_TEXTENCODING_DONTKNOW;
+    CharClass * pCC = NULL;
 
     Reference< XHyphenatedWord > xRes;
 
-        k = -1;
-        for (int j = 0; j < numdict; j++)
-          if (aLocale == aDicts[j].aLoc) k = j;
-
-
-        // if we have a hyphenation dictionary matching this locale
-        if (k != -1) {
+    k = -1;
+    for (int j = 0; j < numdict; j++)
+    {
+        if (aLocale == aDicts[j].aLoc) 
+            k = j;
+    }
 
+    // if we have a hyphenation dictionary matching this locale
+    if (k != -1) 
+    {
         // if this dictinary has not been loaded yet do that
-        if (!aDicts[k].aPtr) {
-
-           OUString DictFN = aDicts[k].aName + A2OU(".dic");
-           OUString dictpath;
+        if (!aDicts[k].aPtr) 
+        {
+            OUString DictFN = aDicts[k].aName + A2OU(".dic");
+            OUString dictpath;
 
-           osl::FileBase::getSystemPathFromFileURL( DictFN, dictpath );
-           OString sTmp( OU2ENC( dictpath, osl_getThreadTextEncoding() ) );
+            osl::FileBase::getSystemPathFromFileURL( DictFN, dictpath );
+            OString sTmp( OU2ENC( dictpath, osl_getThreadTextEncoding() ) );
 
 #if defined(WNT)
-        // workaround for Windows specifc problem that the
-        // path length in calls to 'fopen' is limted to somewhat
-        // about 120+ characters which will usually be exceed when
-        // using dictionaries as extensions.
-        sTmp = Win_GetShortPathName( dictpath );
+            // workaround for Windows specifc problem that the
+            // path length in calls to 'fopen' is limted to somewhat
+            // about 120+ characters which will usually be exceed when
+            // using dictionaries as extensions.
+            sTmp = Win_GetShortPathName( dictpath );
 #endif
 
-          if ( ( dict = hnj_hyphen_load ( sTmp.getStr()) ) == NULL )
-          {
-             fprintf(stderr, "Couldn't find file %s\n", OU2ENC(dictpath, osl_getThreadTextEncoding()) );
-             return NULL;
-          }
-           aDicts[k].aPtr = dict;
-               aDicts[k].aEnc = rtl_getTextEncodingFromUnixCharset(dict->cset);
-               if (aDicts[k].aEnc == RTL_TEXTENCODING_DONTKNOW) {
-                  if (strcmp("ISCII-DEVANAGARI", dict->cset) == 0) {
-                     aDicts[k].aEnc = RTL_TEXTENCODING_ISCII_DEVANAGARI;
-                  } else if (strcmp("UTF-8", dict->cset) == 0) {
-                     aDicts[k].aEnc = RTL_TEXTENCODING_UTF8;
-                  }
-               }
+            if ( ( dict = hnj_hyphen_load ( sTmp.getStr()) ) == NULL )
+            {
+               fprintf(stderr, "Couldn't find file %s\n", OU2ENC(dictpath, osl_getThreadTextEncoding()) );
+               return NULL;
+            }
+            aDicts[k].aPtr = dict;
+            aDicts[k].eEnc = getTextEncodingFromCharset(dict->cset);
         }
 
-            // other wise hyphenate the word with that dictionary
-            dict = aDicts[k].aPtr;
-            aEnc = aDicts[k].aEnc;
-            pCC =  aDicts[k].apCC;
+        // other wise hyphenate the word with that dictionary
+        dict = aDicts[k].aPtr;
+        eEnc = aDicts[k].eEnc;
+        pCC =  aDicts[k].apCC;
 
-            sal_uInt16 ct = CAPTYPE_UNKNOWN;
-            ct = capitalType(aWord, pCC);
+        // we don't want to work with a default text encoding since following incorrect
+        // results may occur only for specific text and thus may be hard to notice.
+        // Thus better always make a clean exit here if the text encoding is in question.
+        // Hopefully something not working at all will raise proper attention quickly. ;-)
+        DBG_ASSERT( eEnc != RTL_TEXTENCODING_DONTKNOW, "failed to get text encoding! (maybe incorrect encoding string in file)" );
+        if (eEnc == RTL_TEXTENCODING_DONTKNOW)
+            return NULL;
 
-            // first convert any smart quotes or apostrophes to normal ones
+        sal_uInt16 ct = CAPTYPE_UNKNOWN;
+        ct = capitalType(aWord, pCC);
+
+        // first convert any smart quotes or apostrophes to normal ones
         OUStringBuffer rBuf(aWord);
-            sal_Int32 nc = rBuf.getLength();
-            sal_Unicode ch;
-        for (sal_Int32 ix=0; ix < nc; ix++) {
+        sal_Int32 nc = rBuf.getLength();
+        sal_Unicode ch;
+        for (sal_Int32 ix=0; ix < nc; ix++) 
+        {
             ch = rBuf.charAt(ix);
-                if ((ch == 0x201C) || (ch == 0x201D)) rBuf.setCharAt(ix,(sal_Unicode)0x0022);
-                if ((ch == 0x2018) || (ch == 0x2019)) rBuf.setCharAt(ix,(sal_Unicode)0x0027);
-            }
-            OUString nWord(rBuf.makeStringAndClear());
+            if ((ch == 0x201C) || (ch == 0x201D)) 
+                rBuf.setCharAt(ix,(sal_Unicode)0x0022);
+            if ((ch == 0x2018) || (ch == 0x2019)) 
+                rBuf.setCharAt(ix,(sal_Unicode)0x0027);
+        }
+        OUString nWord(rBuf.makeStringAndClear());
 
-            // now convert word to all lowercase for pattern recognition
-            OUString nTerm(makeLowerCase(nWord, pCC));
+        // now convert word to all lowercase for pattern recognition
+        OUString nTerm(makeLowerCase(nWord, pCC));
 
-            // now convert word to needed encoding
-            OString encWord(OU2ENC(nTerm,aEnc));
+        // now convert word to needed encoding
+        OString encWord(OU2ENC(nTerm,eEnc));
 
         wordlen = encWord.getLength();
-            lcword = new char[wordlen + 1];
+        lcword = new char[wordlen + 1];
         hyphens = new char[wordlen + 5];
 
-            char ** rep = NULL; // replacements of discretionary hyphenation
-            int * pos = NULL; // array of [hyphenation point] minus [deletion position]
-            int * cut = NULL; // length of deletions in original word
-
-            // copy converted word into simple char buffer
-            strcpy(lcword,encWord.getStr());
-
-            // now strip off any ending periods
-            int n = wordlen-1;
-        while((n >=0) && (lcword[n] == '.')) n--;
-            n++;
-            if (n > 0) {
-           if (hnj_hyphen_hyphenate3(dict, lcword, n, hyphens, NULL, &rep, &pos, &cut,
-            minLead, minTrail, Max(dict->clhmin, Max(dict->clhmin, 2) + Max(0, minLead - Max(dict->lhmin, 2))),
-            Max(dict->crhmin, Max(dict->crhmin, 2) + Max(0, minTrail - Max(dict->rhmin, 2)))))
-           {
-              //whoops something did not work
-              delete[] hyphens;
-                  delete[] lcword;
-                  if (rep) {
-                    for(int j = 0; j < n; j++) {
+        char ** rep = NULL; // replacements of discretionary hyphenation
+        int * pos = NULL; // array of [hyphenation point] minus [deletion position]
+        int * cut = NULL; // length of deletions in original word
+
+        // copy converted word into simple char buffer
+        strcpy(lcword,encWord.getStr());
+
+        // now strip off any ending periods
+        int n = wordlen-1;
+        while((n >=0) && (lcword[n] == '.')) 
+            n--;
+        n++;
+        if (n > 0) 
+        {
+            const bool bFailed = 0 != hnj_hyphen_hyphenate3( dict, lcword, n, hyphens, NULL, 
+                    &rep, &pos, &cut, minLead, minTrail, 
+                    Max(dict->clhmin, Max(dict->clhmin, 2) + Max(0, minLead  - Max(dict->lhmin, 2))),
+                    Max(dict->crhmin, Max(dict->crhmin, 2) + Max(0, minTrail - Max(dict->rhmin, 2))) );
+            if (bFailed)
+            {
+                //whoops something did not work
+                delete[] hyphens;
+                delete[] lcword;
+                if (rep) 
+                {
+                    for(int j = 0; j < n; j++) 
+                    {
                         if (rep[j]) free(rep[j]);
                     }
                     free(rep);
-                  }
-                  if (pos) free(pos);
-                  if (cut) free(cut);
-              return NULL;
-           }
+                }
+                if (pos) free(pos);
+                if (cut) free(cut);
+                return NULL;
             }
+        }
 
-            // now backfill hyphens[] for any removed trailing periods
-            for (int c = n; c < wordlen; c++) hyphens[c] = '0';
-            hyphens[wordlen] = '\0';
+        // now backfill hyphens[] for any removed trailing periods
+        for (int c = n; c < wordlen; c++) hyphens[c] = '0';
+        hyphens[wordlen] = '\0';
 
         INT32 Leading =  GetPosInWordToCheck( aWord, nMaxLeading );
 
         for (INT32 i = 0; i < n; i++)
         {
-                int leftrep = 0;
-                BOOL hit = (n >= minLen);
-                if (!rep || !rep[i] || (i >= n)) {
-                    hit = hit && (hyphens[i]&1) && (i < Leading);
-                    hit = hit && (i >= (minLead-1) );
-                    hit = hit && ((n - i - 1) >= minTrail);
-                } else {
-                    // calculate change character length before hyphenation point signed with '='
-                    for (char * c = rep[i]; *c && (*c != '='); c++) {
-                        if (aEnc == RTL_TEXTENCODING_UTF8) {
-                            if (((unsigned char) *c) >> 6 != 2) leftrep++;
-                        } else leftrep++;
-                    }
-                    hit = hit && (hyphens[i]&1) && ((i + leftrep - pos[i]) < Leading);
-                    hit = hit && ((i + leftrep - pos[i]) >= (minLead-1) );
-                    hit = hit && ((n - i - 1 + sal::static_int_cast< sal_sSize >(strlen(rep[i])) - leftrep - 1) >= minTrail);
+            int leftrep = 0;
+            BOOL hit = (n >= minLen);
+            if (!rep || !rep[i] || (i >= n)) 
+            {
+                hit = hit && (hyphens[i]&1) && (i < Leading);
+                hit = hit && (i >= (minLead-1) );
+                hit = hit && ((n - i - 1) >= minTrail);
+            } 
+            else 
+            {
+                // calculate change character length before hyphenation point signed with '='
+                for (char * c = rep[i]; *c && (*c != '='); c++) 
+                {
+                    if (eEnc == RTL_TEXTENCODING_UTF8) 
+                    {
+                        if (((unsigned char) *c) >> 6 != 2) 
+                            leftrep++;
+                    } 
+                    else 
+                        leftrep++;
                 }
-            if (hit) {
-            nHyphenationPos = i;
-                    if (rep && (i < n) && rep[i]) {
-                        nHyphenationPosAlt = i - pos[i];
-                        nHyphenationPosAltHyph = i + leftrep - pos[i];
-                    }
+                hit = hit && (hyphens[i]&1) && ((i + leftrep - pos[i]) < Leading);
+                hit = hit && ((i + leftrep - pos[i]) >= (minLead-1) );
+                hit = hit && ((n - i - 1 + sal::static_int_cast< sal_sSize >(strlen(rep[i])) - leftrep - 1) >= minTrail);
+            }
+            if (hit) 
+            {
+                nHyphenationPos = i;
+                if (rep && (i < n) && rep[i]) 
+                {
+                    nHyphenationPosAlt = i - pos[i];
+                    nHyphenationPosAltHyph = i + leftrep - pos[i];
                 }
-         }
-
-         if (nHyphenationPos  == -1) {
-             xRes = NULL;
-             } else {
-                if (rep && rep[nHyphenationPos]) {
-                    // remove equal sign
-                    char * s = rep[nHyphenationPos];
-                    int eq = 0;
-                    for (; *s; s++) {
-                        if (*s == '=') eq = 1;
-                        if (eq) *s = *(s + 1);
-                    }
-                    OUString repHyphlow(rep[nHyphenationPos], strlen(rep[nHyphenationPos]), aEnc);
-                    OUString repHyph;
-                    switch (ct) {
-                       case CAPTYPE_ALLCAP:
-                     {
-                               repHyph = makeUpperCase(repHyphlow, pCC);
-                               break;
-                             }
-                       case CAPTYPE_INITCAP:
-                     {
-                               if (nHyphenationPosAlt == 0) {
-                                    repHyph = makeInitCap(repHyphlow, pCC);
-                               } else {
-                                    repHyph = repHyphlow;
-                               }
-                               break;
-                             }
-                           default:
-                     {
-                               repHyph = repHyphlow;
-                               break;
-                             }
             }
+        }
 
-                    // handle shortening
-                    INT16 nPos = (INT16) ((nHyphenationPosAltHyph < nHyphenationPos) ?
-                        nHyphenationPosAltHyph : nHyphenationPos);
-                    // dicretionary hyphenation
+        if (nHyphenationPos  == -1) 
+        {
+            xRes = NULL;
+        } 
+        else 
+        {
+            if (rep && rep[nHyphenationPos]) 
+            {
+                // remove equal sign
+                char * s = rep[nHyphenationPos];
+                int eq = 0;
+                for (; *s; s++) 
+                {
+                    if (*s == '=') eq = 1;
+                    if (eq) *s = *(s + 1);
+                }
+                OUString repHyphlow(rep[nHyphenationPos], strlen(rep[nHyphenationPos]), eEnc);
+                OUString repHyph;
+                switch (ct) 
+                {
+                    case CAPTYPE_ALLCAP:
+                    {
+                        repHyph = makeUpperCase(repHyphlow, pCC);
+                        break;
+                    }
+                    case CAPTYPE_INITCAP:
+                    {
+                        if (nHyphenationPosAlt == 0) 
+                            repHyph = makeInitCap(repHyphlow, pCC);
+                        else 
+                             repHyph = repHyphlow;
+                        break;
+                    }
+                    default:
+                    {
+                        repHyph = repHyphlow;
+                        break;
+                    }
+                }
+
+                // handle shortening
+                INT16 nPos = (INT16) ((nHyphenationPosAltHyph < nHyphenationPos) ?
+                nHyphenationPosAltHyph : nHyphenationPos);
+                // dicretionary hyphenation
                 xRes = new HyphenatedWord( aWord, LocaleToLanguage( aLocale ), nPos,
-                aWord.replaceAt(nHyphenationPosAlt + 1, cut[nHyphenationPos], repHyph),
-                        (INT16) nHyphenationPosAltHyph);
-                } else {
+                    aWord.replaceAt(nHyphenationPosAlt + 1, cut[nHyphenationPos], repHyph),
+                    (INT16) nHyphenationPosAltHyph);
+            }
+            else 
+            {
                 xRes = new HyphenatedWord( aWord, LocaleToLanguage( aLocale ),
-                        (INT16)nHyphenationPos, aWord, (INT16) nHyphenationPos);
-                }
+                    (INT16)nHyphenationPos, aWord, (INT16) nHyphenationPos);
+            }
         }
 
-            delete[] lcword;
+        delete[] lcword;
         delete[] hyphens;
-            if (rep) {
-                for(int j = 0; j < n; j++) {
-                    if (rep[j]) free(rep[j]);
-                }
-                free(rep);
+        if (rep) 
+        {
+            for(int j = 0; j < n; j++) 
+            {
+                if (rep[j]) free(rep[j]);
             }
-            if (pos) free(pos);
-            if (cut) free(cut);
+            free(rep);
+        }
+        if (pos) free(pos);
+        if (cut) free(cut);
         return xRes;
     }
-        return NULL;
+    return NULL;
 }
 
 
-Reference < XHyphenatedWord > SAL_CALL
-    Hyphenator::queryAlternativeSpelling( const ::rtl::OUString& /*aWord*/,
-                  const ::com::sun::star::lang::Locale& /*aLocale*/,
-                  sal_Int16 /*nIndex*/,
-                  const ::com::sun::star::beans::PropertyValues& /*aProperties*/ )
-        throw(::com::sun::star::lang::IllegalArgumentException,
-              ::com::sun::star::uno::RuntimeException)
+Reference < XHyphenatedWord > SAL_CALL Hyphenator::queryAlternativeSpelling( 
+        const ::rtl::OUString& /*aWord*/,
+        const ::com::sun::star::lang::Locale& /*aLocale*/,
+        sal_Int16 /*nIndex*/,
+        const ::com::sun::star::beans::PropertyValues& /*aProperties*/ )
+        throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
 {
   /* alternative spelling isn't supported by tex dictionaries */
   /* XXX: OOo's extended libhjn algorithm can support alternative spellings with extended TeX dic. */
@@ -529,251 +548,262 @@ Reference < XHyphenatedWord > SAL_CALL
   return NULL;
 }
 
-Reference< XPossibleHyphens > SAL_CALL
-    Hyphenator::createPossibleHyphens( const ::rtl::OUString& aWord,
-                   const ::com::sun::star::lang::Locale& aLocale,
-                   const ::com::sun::star::beans::PropertyValues& aProperties )
-        throw(::com::sun::star::lang::IllegalArgumentException,
-              ::com::sun::star::uno::RuntimeException)
-
+Reference< XPossibleHyphens > SAL_CALL Hyphenator::createPossibleHyphens( const ::rtl::OUString& aWord,
+        const ::com::sun::star::lang::Locale& aLocale,
+        const ::com::sun::star::beans::PropertyValues& aProperties )
+        throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
 {
-  int wordlen;
-  char *hyphens;
-  char *lcword;
-  int k;
+    int wordlen;
+    char *hyphens;
+    char *lcword;
+    int k;
 
-  PropertyHelper_Hyphen & rHelper = GetPropHelper();
-  rHelper.SetTmpPropVals(aProperties);
-  sal_Int16 minTrail = rHelper.GetMinTrailing();
-  sal_Int16 minLead = rHelper.GetMinLeading();
+    PropertyHelper_Hyphen & rHelper = GetPropHelper();
+    rHelper.SetTmpPropVals(aProperties);
+    sal_Int16 minTrail = rHelper.GetMinTrailing();
+    sal_Int16 minLead = rHelper.GetMinLeading();
 
-  HyphenDict *dict = NULL;
-  rtl_TextEncoding aEnc = 0;
-  CharClass* pCC = NULL;
+    HyphenDict *dict = NULL;
+    rtl_TextEncoding eEnc = RTL_TEXTENCODING_DONTKNOW;
+    CharClass* pCC = NULL;
 
-  Reference< XPossibleHyphens > xRes;
+    Reference< XPossibleHyphens > xRes;
 
-  k = -1;
-  for (int j = 0; j < numdict; j++)
-     if (aLocale == aDicts[j].aLoc) k = j;
+    k = -1;
+    for (int j = 0; j < numdict; j++)
+    {
+        if (aLocale == aDicts[j].aLoc) k = j;
+    }
 
+    // if we have a hyphenation dictionary matching this locale
+    if (k != -1) 
+    {
+        // if this dictioanry has not been loaded yet do that
+        if (!aDicts[k].aPtr) 
+        {
+            OUString DictFN = aDicts[k].aName + A2OU(".dic");
+            OUString dictpath;
 
-  // if we have a hyphenation dictionary matching this locale
-  if (k != -1) {
+            osl::FileBase::getSystemPathFromFileURL( DictFN, dictpath );
+            OString sTmp( OU2ENC( dictpath, osl_getThreadTextEncoding() ) );
 
-      // if this dictioanry has not been loaded yet do that
-      if (!aDicts[k].aPtr) {
+#if defined(WNT)
+            // workaround for Windows specifc problem that the
+            // path length in calls to 'fopen' is limted to somewhat
+            // about 120+ characters which will usually be exceed when
+            // using dictionaries as extensions.
+            sTmp = Win_GetShortPathName( dictpath );
+#endif
 
-         OUString DictFN = aDicts[k].aName + A2OU(".dic");
-         OUString dictpath;
+            if ( ( dict = hnj_hyphen_load ( sTmp.getStr()) ) == NULL )
+            {
+               fprintf(stderr, "Couldn't find file %s and %s\n", sTmp.getStr(), OU2ENC(dictpath, osl_getThreadTextEncoding()) );
+               return NULL;
+            }
+            aDicts[k].aPtr = dict;
+            aDicts[k].eEnc = getTextEncodingFromCharset(dict->cset);
+        }
 
-         osl::FileBase::getSystemPathFromFileURL( DictFN, dictpath );
-         OString sTmp( OU2ENC( dictpath, osl_getThreadTextEncoding() ) );
+        // other wise hyphenate the word with that dictionary
+        dict = aDicts[k].aPtr;
+        eEnc = aDicts[k].eEnc;
+        pCC  = aDicts[k].apCC;
 
-#if defined(WNT)
-        // workaround for Windows specifc problem that the
-        // path length in calls to 'fopen' is limted to somewhat
-        // about 120+ characters which will usually be exceed when
-        // using dictionaries as extensions.
-        sTmp = Win_GetShortPathName( dictpath );
-#endif
+        // we don't want to work with a default text encoding since following incorrect
+        // results may occur only for specific text and thus may be hard to notice.
+        // Thus better always make a clean exit here if the text encoding is in question.
+        // Hopefully something not working at all will raise proper attention quickly. ;-)
+        DBG_ASSERT( eEnc != RTL_TEXTENCODING_DONTKNOW, "failed to get text encoding! (maybe incorrect encoding string in file)" );
+        if (eEnc == RTL_TEXTENCODING_DONTKNOW)
+            return NULL;
 
-        if ( ( dict = hnj_hyphen_load ( sTmp.getStr()) ) == NULL )
+        // first handle smart quotes both single and double
+        OUStringBuffer rBuf(aWord);
+        sal_Int32 nc = rBuf.getLength();
+        sal_Unicode ch;
+        for (sal_Int32 ix=0; ix < nc; ix++) 
         {
-           fprintf(stderr, "Couldn't find file %s and %s\n", sTmp.getStr(), OU2ENC(dictpath, osl_getThreadTextEncoding()) );
-           return NULL;
+            ch = rBuf.charAt(ix);
+            if ((ch == 0x201C) || (ch == 0x201D)) 
+                rBuf.setCharAt(ix,(sal_Unicode)0x0022);
+            if ((ch == 0x2018) || (ch == 0x2019)) 
+                rBuf.setCharAt(ix,(sal_Unicode)0x0027);
         }
-        aDicts[k].aPtr = dict;
-         aDicts[k].aEnc = rtl_getTextEncodingFromUnixCharset(dict->cset);
-         if (aDicts[k].aEnc == RTL_TEXTENCODING_DONTKNOW) {
-            if (strcmp("ISCII-DEVANAGARI", dict->cset) == 0) {
-               aDicts[k].aEnc = RTL_TEXTENCODING_ISCII_DEVANAGARI;
-            } else if (strcmp("UTF-8", dict->cset) == 0) {
-               aDicts[k].aEnc = RTL_TEXTENCODING_UTF8;
+        OUString nWord(rBuf.makeStringAndClear());
+
+        // now convert word to all lowercase for pattern recognition
+        OUString nTerm(makeLowerCase(nWord, pCC));
+
+        // now convert word to needed encoding
+        OString encWord(OU2ENC(nTerm,eEnc));
+
+        wordlen = encWord.getLength();
+        lcword = new char[wordlen+1];
+        hyphens = new char[wordlen+5];
+        char ** rep = NULL; // replacements of discretionary hyphenation
+        int * pos = NULL; // array of [hyphenation point] minus [deletion position] 
+        int * cut = NULL; // length of deletions in original word
+
+        // copy converted word into simple char buffer
+        strcpy(lcword,encWord.getStr());
+
+        // first remove any trailing periods
+        int n = wordlen-1;
+        while((n >=0) && (lcword[n] == '.')) 
+            n--;
+        n++;
+        // fprintf(stderr,"hyphenate... %s\n",lcword); fflush(stderr);
+        if (n > 0) 
+        {
+            const bool bFailed = 0 != hnj_hyphen_hyphenate3(dict, lcword, n, hyphens, NULL, 
+                    &rep, &pos, &cut, minLead, minTrail, 
+                    Max(dict->clhmin, Max(dict->clhmin, 2) + Max(0, minLead - Max(dict->lhmin, 2))),
+                    Max(dict->crhmin, Max(dict->crhmin, 2) + Max(0, minTrail - Max(dict->rhmin, 2))) );
+            if (bFailed)
+            {
+                delete[] hyphens;
+                delete[] lcword;
+
+                if (rep) 
+                {
+                    for(int j = 0; j < n; j++) 
+                    {
+                        if (rep[j]) free(rep[j]);
+                    }
+                    free(rep);
+                }
+                if (pos) free(pos);
+                if (cut) free(cut);
+
+                return NULL;
             }
-         }
-      }
-
-      // other wise hyphenate the word with that dictionary
-      dict = aDicts[k].aPtr;
-      aEnc = aDicts[k].aEnc;
-      pCC  = aDicts[k].apCC;
-
-      // first handle smart quotes both single and double
-      OUStringBuffer rBuf(aWord);
-      sal_Int32 nc = rBuf.getLength();
-      sal_Unicode ch;
-      for (sal_Int32 ix=0; ix < nc; ix++) {
-      ch = rBuf.charAt(ix);
-          if ((ch == 0x201C) || (ch == 0x201D)) rBuf.setCharAt(ix,(sal_Unicode)0x0022);
-          if ((ch == 0x2018) || (ch == 0x2019)) rBuf.setCharAt(ix,(sal_Unicode)0x0027);
-      }
-      OUString nWord(rBuf.makeStringAndClear());
-
-      // now convert word to all lowercase for pattern recognition
-      OUString nTerm(makeLowerCase(nWord, pCC));
-
-      // now convert word to needed encoding
-      OString encWord(OU2ENC(nTerm,aEnc));
-
-      wordlen = encWord.getLength();
-      lcword = new char[wordlen+1];
-      hyphens = new char[wordlen+5];
-      char ** rep = NULL; // replacements of discretionary hyphenation
-      int * pos = NULL; // array of [hyphenation point] minus [deletion position] 
-      int * cut = NULL; // length of deletions in original word
-
-      // copy converted word into simple char buffer
-      strcpy(lcword,encWord.getStr());
-
-      // first remove any trailing periods
-      int n = wordlen-1;
-      while((n >=0) && (lcword[n] == '.')) n--;
-      n++;
-      // fprintf(stderr,"hyphenate... %s\n",lcword); fflush(stderr);
-      if (n > 0) {
-         if (hnj_hyphen_hyphenate3(dict, lcword, n, hyphens, NULL, &rep, &pos, &cut,
-            minLead, minTrail, Max(dict->clhmin, Max(dict->clhmin, 2) + Max(0, minLead - Max(dict->lhmin, 2))),
-            Max(dict->crhmin, Max(dict->crhmin, 2) + Max(0, minTrail - Max(dict->rhmin, 2)))))
-         {
-             delete[] hyphens;
-             delete[] lcword;
-
-             if (rep) {
-                 for(int j = 0; j < n; j++) {
-                     if (rep[j]) free(rep[j]);
-                 }
-                 free(rep);
-             }
-             if (pos) free(pos);
-             if (cut) free(cut);
-
-             return NULL;
-         }
-      }
-      // now backfill hyphens[] for any removed periods
-      for (int c = n; c < wordlen; c++) hyphens[c] = '0';
-      hyphens[wordlen] = '\0';
-      // fprintf(stderr,"... %s\n",hyphens); fflush(stderr);
-
-      INT16 nHyphCount = 0;
-      INT16 i;
-
-      for ( i = 0; i < encWord.getLength(); i++)
-        if (hyphens[i]&1 && (!rep || !rep[i]))
-          nHyphCount++;
-
-      Sequence< INT16 > aHyphPos(nHyphCount);
-      INT16 *pPos = aHyphPos.getArray();
-      OUStringBuffer hyphenatedWordBuffer;
-      OUString hyphenatedWord;
-      nHyphCount = 0;
-
-      for (i = 0; i < nWord.getLength(); i++) {
-          hyphenatedWordBuffer.append(aWord[i]);
-          // hyphenation position (not alternative)
-          if (hyphens[i]&1 && (!rep || !rep[i])) {
-              pPos[nHyphCount] = i;
-              hyphenatedWordBuffer.append(sal_Unicode('='));
-              nHyphCount++;
-          }
-      }
-
-      hyphenatedWord = hyphenatedWordBuffer.makeStringAndClear();
-      //fprintf(stderr,"result is %s\n",OU2A(hyphenatedWord));
-      //fflush(stderr);
-
-      xRes = new PossibleHyphens( aWord, LocaleToLanguage( aLocale ),
-                hyphenatedWord, aHyphPos );
-
-      delete[] hyphens;
-      delete[] lcword;
-
-      if (rep) {
-          for(int j = 0; j < n; j++) {
-              if (rep[j]) free(rep[j]);
-          }
-          free(rep);
-      }
-      if (pos) free(pos);
-      if (cut) free(cut);
-
-      return xRes;
-  }
+        }
+        // now backfill hyphens[] for any removed periods
+        for (int c = n; c < wordlen; c++) 
+            hyphens[c] = '0';
+        hyphens[wordlen] = '\0';
+        // fprintf(stderr,"... %s\n",hyphens); fflush(stderr);
 
-  return NULL;
+        INT16 nHyphCount = 0;
+        INT16 i;
 
+        for ( i = 0; i < encWord.getLength(); i++)
+        {
+            if (hyphens[i]&1 && (!rep || !rep[i]))
+                nHyphCount++;
+        }
+
+        Sequence< INT16 > aHyphPos(nHyphCount);
+        INT16 *pPos = aHyphPos.getArray();
+        OUStringBuffer hyphenatedWordBuffer;
+        OUString hyphenatedWord;
+        nHyphCount = 0;
+
+        for (i = 0; i < nWord.getLength(); i++) 
+        {
+            hyphenatedWordBuffer.append(aWord[i]);
+            // hyphenation position (not alternative)
+            if (hyphens[i]&1 && (!rep || !rep[i])) 
+            {
+                pPos[nHyphCount] = i;
+                hyphenatedWordBuffer.append(sal_Unicode('='));
+                nHyphCount++;
+            }
+        }
+
+        hyphenatedWord = hyphenatedWordBuffer.makeStringAndClear();
+        //fprintf(stderr,"result is %s\n",OU2A(hyphenatedWord));
+        //fflush(stderr);
+
+        xRes = new PossibleHyphens( aWord, LocaleToLanguage( aLocale ),
+                  hyphenatedWord, aHyphPos );
+
+        delete[] hyphens;
+        delete[] lcword;
+
+        if (rep) 
+        {
+            for(int j = 0; j < n; j++) 
+            {
+                if (rep[j]) free(rep[j]);
+            }
+            free(rep);
+        }
+        if (pos) free(pos);
+        if (cut) free(cut);
+
+        return xRes;
+    }
+
+    return NULL;
 }
 
 sal_uInt16 SAL_CALL Hyphenator::capitalType(const OUString& aTerm, CharClass * pCC)
 {
-        sal_Int32 tlen = aTerm.getLength();
-        if ((pCC) && (tlen)) {
-              String aStr(aTerm);
-              sal_Int32 nc = 0;
-              for (xub_StrLen tindex = 0; tindex < tlen;  tindex++) {
-               if (pCC->getCharacterType(aStr,tindex) &
-                       ::com::sun::star::i18n::KCharacterType::UPPER) nc++;
-          }
-
-              if (nc == 0) return (sal_uInt16) CAPTYPE_NOCAP;
-
-              if (nc == tlen) return (sal_uInt16) CAPTYPE_ALLCAP;
+    sal_Int32 tlen = aTerm.getLength();
+    if ((pCC) && (tlen)) 
+    {
+        String aStr(aTerm);
+        sal_Int32 nc = 0;
+        for (xub_StrLen tindex = 0; tindex < tlen;  tindex++) 
+        {
+            if (pCC->getCharacterType(aStr,tindex) & ::com::sun::star::i18n::KCharacterType::UPPER) 
+                nc++;
+        }
 
-              if ((nc == 1) && (pCC->getCharacterType(aStr,0) &
-                      ::com::sun::star::i18n::KCharacterType::UPPER))
-                   return (sal_uInt16) CAPTYPE_INITCAP;
+        if (nc == 0) 
+            return (sal_uInt16) CAPTYPE_NOCAP;
+        if (nc == tlen) 
+            return (sal_uInt16) CAPTYPE_ALLCAP;
+        if ((nc == 1) && (pCC->getCharacterType(aStr,0) & ::com::sun::star::i18n::KCharacterType::UPPER))
+            return (sal_uInt16) CAPTYPE_INITCAP;
 
-              return (sal_uInt16) CAPTYPE_MIXED;
+        return (sal_uInt16) CAPTYPE_MIXED;
     }
-        return (sal_uInt16) CAPTYPE_UNKNOWN;
+    return (sal_uInt16) CAPTYPE_UNKNOWN;
 }
 
 OUString SAL_CALL Hyphenator::makeLowerCase(const OUString& aTerm, CharClass * pCC)
 {
-        if (pCC)
-      return pCC->toLower_rtl(aTerm, 0, aTerm.getLength());
-        return aTerm;
+    if (pCC)
+        return pCC->toLower_rtl(aTerm, 0, aTerm.getLength());
+    return aTerm;
 }
 
 OUString SAL_CALL Hyphenator::makeUpperCase(const OUString& aTerm, CharClass * pCC)
 {
-        if (pCC)
-              return pCC->toUpper_rtl(aTerm, 0, aTerm.getLength());
-        return aTerm;
+    if (pCC)
+        return pCC->toUpper_rtl(aTerm, 0, aTerm.getLength());
+    return aTerm;
 }
 
 
 OUString SAL_CALL Hyphenator::makeInitCap(const OUString& aTerm, CharClass * pCC)
 {
-        sal_Int32 tlen = aTerm.getLength();
-        if ((pCC) && (tlen)) {
-              OUString bTemp = aTerm.copy(0,1);
-              if (tlen > 1)
-                   return ( pCC->toUpper_rtl(bTemp, 0, 1)
-                             + pCC->toLower_rtl(aTerm,1,(tlen-1)) );
-
-          return pCC->toUpper_rtl(bTemp, 0, 1);
+    sal_Int32 tlen = aTerm.getLength();
+    if ((pCC) && (tlen)) 
+    {
+        OUString bTemp = aTerm.copy(0,1);
+        if (tlen > 1)
+            return ( pCC->toUpper_rtl(bTemp, 0, 1) + pCC->toLower_rtl(aTerm,1,(tlen-1)) );
+
+        return pCC->toUpper_rtl(bTemp, 0, 1);
     }
-        return aTerm;
+    return aTerm;
 }
 
 
-
-
 Reference< XInterface > SAL_CALL Hyphenator_CreateInstance(
-            const Reference< XMultiServiceFactory > & /*rSMgr*/ )
+        const Reference< XMultiServiceFactory > & /*rSMgr*/ )
         throw(Exception)
 {
-
     Reference< XInterface > xService = (cppu::OWeakObject*) new Hyphenator;
     return xService;
 }
 
 
-sal_Bool SAL_CALL
-    Hyphenator::addLinguServiceEventListener(
-            const Reference< XLinguServiceEventListener >& rxLstnr )
+sal_Bool SAL_CALL Hyphenator::addLinguServiceEventListener(
+        const Reference< XLinguServiceEventListener >& rxLstnr )
         throw(RuntimeException)
 {
     MutexGuard	aGuard( GetLinguMutex() );
@@ -787,9 +817,8 @@ sal_Bool SAL_CALL
 }
 
 
-sal_Bool SAL_CALL
-    Hyphenator::removeLinguServiceEventListener(
-            const Reference< XLinguServiceEventListener >& rxLstnr )
+sal_Bool SAL_CALL Hyphenator::removeLinguServiceEventListener(
+        const Reference< XLinguServiceEventListener >& rxLstnr )
         throw(RuntimeException)
 {
     MutexGuard	aGuard( GetLinguMutex() );
@@ -804,8 +833,7 @@ sal_Bool SAL_CALL
 }
 
 
-OUString SAL_CALL
-    Hyphenator::getServiceDisplayName( const Locale& /*rLocale*/ )
+OUString SAL_CALL Hyphenator::getServiceDisplayName( const Locale& /*rLocale*/ )
         throw(RuntimeException)
 {
     MutexGuard	aGuard( GetLinguMutex() );
@@ -813,8 +841,7 @@ OUString SAL_CALL
 }
 
 
-void SAL_CALL
-    Hyphenator::initialize( const Sequence< Any >& rArguments )
+void SAL_CALL Hyphenator::initialize( const Sequence< Any >& rArguments )
         throw(Exception, RuntimeException)
 {
     MutexGuard	aGuard( GetLinguMutex() );
@@ -836,16 +863,15 @@ void SAL_CALL
             xPropHelper = pPropHelper;
             pPropHelper->AddAsPropListener();	//! after a reference is established
         }
-        else {
+        else 
+        {
             DBG_ERROR( "wrong number of arguments in sequence" );
         }
-
     }
 }
 
 
-void SAL_CALL
-    Hyphenator::dispose()
+void SAL_CALL Hyphenator::dispose()
         throw(RuntimeException)
 {
     MutexGuard	aGuard( GetLinguMutex() );
@@ -859,8 +885,7 @@ void SAL_CALL
 }
 
 
-void SAL_CALL
-    Hyphenator::addEventListener( const Reference< XEventListener >& rxListener )
+void SAL_CALL Hyphenator::addEventListener( const Reference< XEventListener >& rxListener )
         throw(RuntimeException)
 {
     MutexGuard	aGuard( GetLinguMutex() );
@@ -870,8 +895,7 @@ void SAL_CALL
 }
 
 
-void SAL_CALL
-    Hyphenator::removeEventListener( const Reference< XEventListener >& rxListener )
+void SAL_CALL Hyphenator::removeEventListener( const Reference< XEventListener >& rxListener )
         throw(RuntimeException)
 {
     MutexGuard	aGuard( GetLinguMutex() );
@@ -931,7 +955,6 @@ Sequence< OUString > Hyphenator::getSupportedServiceNames_Static()
 sal_Bool SAL_CALL Hyphenator_writeInfo(
             void * /*pServiceManager*/, registry::XRegistryKey * pRegistryKey )
 {
-
     try
     {
         String aImpl( '/' );
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx
old mode 100644
new mode 100755
index 00977732f..86508918e
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.hxx
@@ -65,7 +65,7 @@ struct HDInfo {
   HyphenDict *     aPtr;
   OUString         aName;
   Locale           aLoc;
-  rtl_TextEncoding aEnc;
+  rtl_TextEncoding eEnc;
   CharClass *      apCC;
 };
 
@@ -83,12 +83,12 @@ class Hyphenator :
     >
 {
     Sequence< Locale >						aSuppLocales;
-        HDInfo * aDicts;
-        sal_Int32 numdict;	
+    HDInfo * aDicts;
+    sal_Int32 numdict;  
 
     ::cppu::OInterfaceContainerHelper		aEvtListeners;
     Reference< XPropertyChangeListener >	xPropHelper;
-    Reference< XMultiServiceFactory > rSMgr;
+    Reference< XMultiServiceFactory >       rSMgr;
     linguistic::PropertyHelper_Hyphen *     pPropHelper;
     BOOL									bDisposing;
 
@@ -108,88 +108,38 @@ public:
     virtual ~Hyphenator();
 
     // XSupportedLocales (for XHyphenator)
-    virtual Sequence< Locale > SAL_CALL getLocales() 
-        throw(RuntimeException);
-    virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) 
-        throw(RuntimeException);
+    virtual Sequence< Locale > SAL_CALL getLocales() throw(RuntimeException);
+    virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) throw(RuntimeException);
     
     // XHyphenator
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > SAL_CALL
-    hyphenate( const ::rtl::OUString& aWord,
-           const ::com::sun::star::lang::Locale& aLocale,
-           sal_Int16 nMaxLeading,                                                                       
-           const ::com::sun::star::beans::PropertyValues& aProperties )
-        throw(::com::sun::star::lang::IllegalArgumentException,
-              ::com::sun::star::uno::RuntimeException);
-                  
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > SAL_CALL
-    queryAlternativeSpelling( const ::rtl::OUString& aWord,
-                  const ::com::sun::star::lang::Locale& aLocale,
-                  sal_Int16 nIndex,
-                  const ::com::sun::star::beans::PropertyValues& aProperties )
-        throw(::com::sun::star::lang::IllegalArgumentException,
-              ::com::sun::star::uno::RuntimeException);
-                         
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XPossibleHyphens > SAL_CALL
-    createPossibleHyphens( const ::rtl::OUString& aWord,
-                   const ::com::sun::star::lang::Locale& aLocale,
-                   const ::com::sun::star::beans::PropertyValues& aProperties )
-        throw(::com::sun::star::lang::IllegalArgumentException,
-              ::com::sun::star::uno::RuntimeException);                                                                  
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > SAL_CALL hyphenate( const ::rtl::OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nMaxLeading, const ::com::sun::star::beans::PropertyValues& aProperties ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > SAL_CALL queryAlternativeSpelling( const ::rtl::OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nIndex, const ::com::sun::star::beans::PropertyValues& aProperties ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XPossibleHyphens > SAL_CALL createPossibleHyphens( const ::rtl::OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, const ::com::sun::star::beans::PropertyValues& aProperties ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);                                                                  
 
     // XLinguServiceEventBroadcaster
-    virtual sal_Bool SAL_CALL 
-        addLinguServiceEventListener( 
-            const Reference< XLinguServiceEventListener >& rxLstnr ) 
-            throw(RuntimeException);
-    virtual sal_Bool SAL_CALL 
-        removeLinguServiceEventListener( 
-            const Reference< XLinguServiceEventListener >& rxLstnr ) 
-            throw(RuntimeException);
+    virtual sal_Bool SAL_CALL addLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException);
+    virtual sal_Bool SAL_CALL removeLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException);
     
     // XServiceDisplayName
-    virtual OUString SAL_CALL 
-        getServiceDisplayName( const Locale& rLocale ) 
-            throw(RuntimeException);
+    virtual OUString SAL_CALL getServiceDisplayName( const Locale& rLocale ) throw(RuntimeException);
 
     // XInitialization
-    virtual void SAL_CALL 
-        initialize( const Sequence< Any >& rArguments ) 
-            throw(Exception, RuntimeException);
+    virtual void SAL_CALL initialize( const Sequence< Any >& rArguments ) throw(Exception, RuntimeException);
 
     // XComponent
-    virtual void SAL_CALL 
-        dispose() 
-            throw(RuntimeException);
-    virtual void SAL_CALL 
-        addEventListener( const Reference< XEventListener >& rxListener ) 
-            throw(RuntimeException);
-    virtual void SAL_CALL 
-        removeEventListener( const Reference< XEventListener >& rxListener ) 
-            throw(RuntimeException);
-
-    ////////////////////////////////////////////////////////////
-    // Service specific part
-    //
+    virtual void SAL_CALL dispose() throw(RuntimeException);
+    virtual void SAL_CALL addEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException);
+    virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException);
 
     // XServiceInfo
-    virtual OUString SAL_CALL 
-        getImplementationName() 
-            throw(RuntimeException);
-    virtual sal_Bool SAL_CALL 
-        supportsService( const OUString& rServiceName ) 
-            throw(RuntimeException);
-    virtual Sequence< OUString > SAL_CALL 
-        getSupportedServiceNames() 
-            throw(RuntimeException);
-
-
-    static inline OUString	
-        getImplementationName_Static() throw();
-    static Sequence< OUString >	
-        getSupportedServiceNames_Static() throw();
+    virtual OUString SAL_CALL getImplementationName() throw(RuntimeException);
+    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw(RuntimeException);
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException);
 
 
+    static inline OUString  getImplementationName_Static() throw();
+    static Sequence< OUString > getSupportedServiceNames_Static() throw();
+
 
 private:
         sal_uInt16 SAL_CALL capitalType(const OUString&, CharClass *);
diff --git a/lingucomponent/source/lingutil/lingutil.cxx b/lingucomponent/source/lingutil/lingutil.cxx
old mode 100644
new mode 100755
index 142fc4f7b..15c019a14
--- a/lingucomponent/source/lingutil/lingutil.cxx
+++ b/lingucomponent/source/lingutil/lingutil.cxx
@@ -50,6 +50,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -268,5 +269,25 @@ void MergeNewStyleDicsAndOldStyleDics(
     }
 }
 
+
+rtl_TextEncoding getTextEncodingFromCharset(const sal_Char* pCharset)
+{
+    // default result: used to indicate that we failed to get the proper encoding
+    rtl_TextEncoding eRet = RTL_TEXTENCODING_DONTKNOW;
+
+    if (pCharset)
+    {
+        eRet = rtl_getTextEncodingFromMimeCharset(pCharset);
+        if (eRet == RTL_TEXTENCODING_DONTKNOW)
+            eRet = rtl_getTextEncodingFromUnixCharset(pCharset);
+        if (eRet == RTL_TEXTENCODING_DONTKNOW)
+        {
+            if (strcmp("ISCII-DEVANAGARI", pCharset) == 0)
+                eRet = RTL_TEXTENCODING_ISCII_DEVANAGARI;
+        }
+    }
+    return eRet;
+}
+
 //////////////////////////////////////////////////////////////////////
 
diff --git a/lingucomponent/source/lingutil/lingutil.hxx b/lingucomponent/source/lingutil/lingutil.hxx
index 4edc469cf..18be81561 100644
--- a/lingucomponent/source/lingutil/lingutil.hxx
+++ b/lingucomponent/source/lingutil/lingutil.hxx
@@ -101,5 +101,13 @@ void MergeNewStyleDicsAndOldStyleDics( std::list< SvtLinguConfigDictionaryEntry
 
 ///////////////////////////////////////////////////////////////////////////
 
+
+//Find an encoding from a charset string, using
+//rtl_getTextEncodingFromMimeCharset and falling back to
+//rtl_getTextEncodingFromUnixCharset with the addition of
+//ISCII-DEVANAGARI. On failure will return final fallback of
+//RTL_TEXTENCODING_ISO_8859_1
+rtl_TextEncoding getTextEncodingFromCharset(const sal_Char* pCharset);
+
 #endif
 
diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
old mode 100644
new mode 100755
index e681f9a3b..5fb9fbdd3
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
@@ -75,14 +75,14 @@ class MacSpellChecker :
         XServiceDisplayName
     >
 {
-    Sequence< Locale >                 aSuppLocales;
+    Sequence< Locale >      aSuppLocales;
 //        Hunspell **                         aDicts;
-        rtl_TextEncoding *                 aDEncs;
-        Locale *                           aDLocs;
-        OUString *                         aDNames;
-        sal_Int32                          numdict;
-        NSSpellChecker *					macSpell;
-        int 								macTag;   //unique tag for this doc
+    rtl_TextEncoding *      aDEncs;
+    Locale *                aDLocs;
+    OUString *              aDNames;
+    sal_Int32               numdict;
+    NSSpellChecker *        macSpell;
+    int                     macTag;   //unique tag for this doc
 
     ::cppu::OInterfaceContainerHelper		aEvtListeners;
     Reference< XPropertyChangeListener >	xPropHelper;
@@ -100,84 +100,43 @@ class MacSpellChecker :
     }
 
     INT16	GetSpellFailure( const OUString &rWord, const Locale &rLocale );
-    Reference< XSpellAlternatives >
-            GetProposals( const OUString &rWord, const Locale &rLocale );
+    Reference< XSpellAlternatives > GetProposals( const OUString &rWord, const Locale &rLocale );
 
 public:
     MacSpellChecker();
     virtual ~MacSpellChecker();
 
     // XSupportedLocales (for XSpellChecker)
-    virtual Sequence< Locale > SAL_CALL 
-        getLocales() 
-            throw(RuntimeException);
-    virtual sal_Bool SAL_CALL 
-        hasLocale( const Locale& rLocale ) 
-            throw(RuntimeException);
+    virtual Sequence< Locale > SAL_CALL getLocales() throw(RuntimeException);
+    virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) throw(RuntimeException);
 
     // XSpellChecker
-    virtual sal_Bool SAL_CALL 
-        isValid( const OUString& rWord, const Locale& rLocale, 
-                const PropertyValues& rProperties ) 
-            throw(IllegalArgumentException, 
-                  RuntimeException);
-    virtual Reference< XSpellAlternatives > SAL_CALL 
-        spell( const OUString& rWord, const Locale& rLocale, 
-                const PropertyValues& rProperties ) 
-            throw(IllegalArgumentException, 
-                  RuntimeException);
+    virtual sal_Bool SAL_CALL isValid( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) throw(IllegalArgumentException, RuntimeException);
+    virtual Reference< XSpellAlternatives > SAL_CALL spell( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) throw(IllegalArgumentException, RuntimeException);
 
     // XLinguServiceEventBroadcaster
-    virtual sal_Bool SAL_CALL 
-        addLinguServiceEventListener( 
-            const Reference< XLinguServiceEventListener >& rxLstnr ) 
-            throw(RuntimeException);
-    virtual sal_Bool SAL_CALL 
-        removeLinguServiceEventListener( 
-            const Reference< XLinguServiceEventListener >& rxLstnr ) 
-            throw(RuntimeException);
+    virtual sal_Bool SAL_CALL addLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException);
+    virtual sal_Bool SAL_CALL removeLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException);
     
     // XServiceDisplayName
-    virtual OUString SAL_CALL 
-        getServiceDisplayName( const Locale& rLocale ) 
-            throw(RuntimeException);
+    virtual OUString SAL_CALL getServiceDisplayName( const Locale& rLocale ) throw(RuntimeException);
 
     // XInitialization
-    virtual void SAL_CALL 
-        initialize( const Sequence< Any >& rArguments ) 
-            throw(Exception, RuntimeException);
+    virtual void SAL_CALL initialize( const Sequence< Any >& rArguments ) throw(Exception, RuntimeException);
 
     // XComponent
-    virtual void SAL_CALL 
-        dispose() 
-            throw(RuntimeException);
-    virtual void SAL_CALL 
-        addEventListener( const Reference< XEventListener >& rxListener ) 
-            throw(RuntimeException);
-    virtual void SAL_CALL 
-        removeEventListener( const Reference< XEventListener >& rxListener ) 
-            throw(RuntimeException);
-
-    ////////////////////////////////////////////////////////////
-    // Service specific part
-    //
+    virtual void SAL_CALL dispose() throw(RuntimeException);
+    virtual void SAL_CALL addEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException);
+    virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException);
 
     // XServiceInfo
-    virtual OUString SAL_CALL 
-        getImplementationName() 
-            throw(RuntimeException);
-    virtual sal_Bool SAL_CALL 
-        supportsService( const OUString& rServiceName ) 
-            throw(RuntimeException);
-    virtual Sequence< OUString > SAL_CALL 
-        getSupportedServiceNames() 
-            throw(RuntimeException);
-
-
-    static inline OUString	
-        getImplementationName_Static() throw();
-    static Sequence< OUString >	
-        getSupportedServiceNames_Static() throw();
+    virtual OUString SAL_CALL getImplementationName() throw(RuntimeException);
+    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw(RuntimeException);
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException);
+
+
+    static inline OUString  getImplementationName_Static() throw();
+    static Sequence< OUString > getSupportedServiceNames_Static() throw();
 };
 
 inline OUString MacSpellChecker::getImplementationName_Static() throw()
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
old mode 100644
new mode 100755
index c0429b4e5..62e570131
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -27,6 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_lingucomponent.hxx"
+
 #include 
 #include 
 
@@ -37,12 +38,10 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
-
-#ifndef _SPELLIMP_HXX
 #include 
-#endif
 
 #include 
 #include 
@@ -53,8 +52,6 @@
 #include 
 #include 
 
-#include 
-
 #include 
 #include 
 #include 
@@ -77,35 +74,37 @@ using namespace linguistic;
 SpellChecker::SpellChecker() :
     aEvtListeners	( GetLinguMutex() )
 {
-        aDicts = NULL;
+    aDicts = NULL;
     aDEncs = NULL;
     aDLocs = NULL;
     aDNames = NULL;
     bDisposing = FALSE;
     pPropHelper = NULL;
-        numdict = 0;
+    numdict = 0;
 }
 
 
 SpellChecker::~SpellChecker()
 {
-  if (aDicts) {
-     for (int i = 0; i < numdict; i++) {
+    if (aDicts) 
+    {
+       for (int i = 0; i < numdict; i++) 
+       {
             if (aDicts[i]) delete aDicts[i];
             aDicts[i] = NULL;
-     }
-     delete[] aDicts;
-  }
-  aDicts = NULL;
-  numdict = 0;
-  if (aDEncs) delete[] aDEncs;
-  aDEncs = NULL;
-  if (aDLocs) delete[] aDLocs;
-  aDLocs = NULL;
-  if (aDNames) delete[] aDNames;
-  aDNames = NULL;
-  if (pPropHelper)
-     pPropHelper->RemoveAsPropListener();
+       }
+       delete[] aDicts;
+    }
+    aDicts = NULL;
+    numdict = 0;
+    if (aDEncs) delete[] aDEncs;
+    aDEncs = NULL;
+    if (aDLocs) delete[] aDLocs;
+    aDLocs = NULL;
+    if (aDNames) delete[] aDNames;
+    aDNames = NULL;
+    if (pPropHelper)
+        pPropHelper->RemoveAsPropListener();
 }
 
 
@@ -217,7 +216,7 @@ Sequence< Locale > SAL_CALL SpellChecker::getLocales()
                     for (sal_Int32 i = 0;  i < nLocales;  ++i)
                     {
                         aDicts[k]  = NULL;
-                        aDEncs[k]  = 0;
+                        aDEncs[k]  = RTL_TEXTENCODING_DONTKNOW;
                         aDLocs[k]  = MsLangId::convertLanguageToLocale(
                                         MsLangId::convertIsoStringToLanguage( aLocaleNames[i] ));
                         // also both files have to be in the same directory and the
@@ -272,84 +271,86 @@ sal_Bool SAL_CALL SpellChecker::hasLocale(const Locale& rLocale)
     return bRes;
 }
 
+
 INT16 SpellChecker::GetSpellFailure( const OUString &rWord, const Locale &rLocale )
 {
-        Hunspell * pMS;
-        rtl_TextEncoding aEnc;
+    Hunspell * pMS = NULL;
+    rtl_TextEncoding eEnc = RTL_TEXTENCODING_DONTKNOW;
 
     // initialize a myspell object for each dictionary once
-        // (note: mutex is held higher up in isValid)
-
+    // (note: mutex is held higher up in isValid)
 
     INT16 nRes = -1;
 
-        // first handle smart quotes both single and double
+    // first handle smart quotes both single and double
     OUStringBuffer rBuf(rWord);
-        sal_Int32 n = rBuf.getLength();
-        sal_Unicode c;
-    for (sal_Int32 ix=0; ix < n; ix++) {
+    sal_Int32 n = rBuf.getLength();
+    sal_Unicode c;
+    for (sal_Int32 ix=0; ix < n; ix++) 
+    {
         c = rBuf.charAt(ix);
-            if ((c == 0x201C) || (c == 0x201D)) rBuf.setCharAt(ix,(sal_Unicode)0x0022);
-            if ((c == 0x2018) || (c == 0x2019)) rBuf.setCharAt(ix,(sal_Unicode)0x0027);
-        }
-        OUString nWord(rBuf.makeStringAndClear());
+        if ((c == 0x201C) || (c == 0x201D)) 
+            rBuf.setCharAt(ix,(sal_Unicode)0x0022);
+        if ((c == 0x2018) || (c == 0x2019)) 
+            rBuf.setCharAt(ix,(sal_Unicode)0x0027);
+    }
+    OUString nWord(rBuf.makeStringAndClear());
 
     if (n)
     {
-            for (sal_Int32 i = 0; i < numdict; ++i) {
+        for (sal_Int32 i = 0; i < numdict; ++i) 
+        {
             pMS = NULL;
-                aEnc = 0;
+            eEnc = RTL_TEXTENCODING_DONTKNOW;
 
             if (rLocale == aDLocs[i])
             {
-                   if (!aDicts[i])
-                   {
-                      OUString dicpath = aDNames[i] + A2OU(".dic");
-                      OUString affpath = aDNames[i] + A2OU(".aff");
-                      OUString dict;
-                      OUString aff;
-                  osl::FileBase::getSystemPathFromFileURL(dicpath,dict);
-                   osl::FileBase::getSystemPathFromFileURL(affpath,aff);
-                      OString aTmpaff(OU2ENC(aff,osl_getThreadTextEncoding()));
-                      OString aTmpdict(OU2ENC(dict,osl_getThreadTextEncoding()));
+                if (!aDicts[i])
+                {
+                    OUString dicpath = aDNames[i] + A2OU(".dic");
+                    OUString affpath = aDNames[i] + A2OU(".aff");
+                    OUString dict;
+                    OUString aff;
+                    osl::FileBase::getSystemPathFromFileURL(dicpath,dict);
+                    osl::FileBase::getSystemPathFromFileURL(affpath,aff);
+                    OString aTmpaff(OU2ENC(aff,osl_getThreadTextEncoding()));
+                    OString aTmpdict(OU2ENC(dict,osl_getThreadTextEncoding()));
 
 #if defined(WNT)
-                      // workaround for Windows specifc problem that the
-                      // path length in calls to 'fopen' is limted to somewhat
-                      // about 120+ characters which will usually be exceed when
-                      // using dictionaries as extensions.
-                      aTmpaff = Win_GetShortPathName( aff );
-                      aTmpdict = Win_GetShortPathName( dict );
+                    // workaround for Windows specifc problem that the
+                    // path length in calls to 'fopen' is limted to somewhat
+                    // about 120+ characters which will usually be exceed when
+                    // using dictionaries as extensions.
+                    aTmpaff = Win_GetShortPathName( aff );
+                    aTmpdict = Win_GetShortPathName( dict );
 #endif
 
-                      aDicts[i] = new Hunspell(aTmpaff.getStr(),aTmpdict.getStr());
-                      aDEncs[i] = 0;
-                      if (aDicts[i]) {
-                        char * dic_encoding = aDicts[i]->get_dic_encoding();
-            aDEncs[i] = rtl_getTextEncodingFromUnixCharset(aDicts[i]->get_dic_encoding());
-                        if (aDEncs[i] == RTL_TEXTENCODING_DONTKNOW) {
-              if (strcmp("ISCII-DEVANAGARI", dic_encoding) == 0) {
-                aDEncs[i] = RTL_TEXTENCODING_ISCII_DEVANAGARI;
-                          } else if (strcmp("UTF-8", dic_encoding) == 0) {
-                aDEncs[i] = RTL_TEXTENCODING_UTF8;
-                          }
-                        }
-                      }
-               }
-               pMS = aDicts[i];
-                   aEnc = aDEncs[i];
-        }
+                    aDicts[i] = new Hunspell(aTmpaff.getStr(),aTmpdict.getStr());
+                    aDEncs[i] = RTL_TEXTENCODING_DONTKNOW;
+                    if (aDicts[i]) 
+                        aDEncs[i] = getTextEncodingFromCharset(aDicts[i]->get_dic_encoding());
+                }
+                pMS = aDicts[i];
+                eEnc = aDEncs[i];
+            }
+        
+            // we don't want to work with a default text encoding since following incorrect
+            // results may occur only for specific text and thus may be hard to notice.
+            // Thus better always make a clean exit here if the text encoding is in question.
+            // Hopefully something not working at all will raise proper attention quickly. ;-)
+            DBG_ASSERT( eEnc != RTL_TEXTENCODING_DONTKNOW, "failed to get text encoding! (maybe incorrect encoding string in file)" );
+            if (eEnc == RTL_TEXTENCODING_DONTKNOW)
+                return -1;
+
             if (pMS)
-                {
-            OString aWrd(OU2ENC(nWord,aEnc));
+            {
+                OString aWrd(OU2ENC(nWord,eEnc));
                 int rVal = pMS->spell((char*)aWrd.getStr());
-                 if (rVal != 1)
-                    {
-                        nRes = SpellFailure::SPELLING_ERROR;
-                    } else {
-                        return -1;
-                    }
-                    pMS = NULL;
+                if (rVal != 1)
+                    nRes = SpellFailure::SPELLING_ERROR;
+                else 
+                    return -1;
+                pMS = NULL;
             }
         }
     }
@@ -358,8 +359,7 @@ INT16 SpellChecker::GetSpellFailure( const OUString &rWord, const Locale &rLocal
 }
 
 
-sal_Bool SAL_CALL
-    SpellChecker::isValid( const OUString& rWord, const Locale& rLocale,
+sal_Bool SAL_CALL SpellChecker::isValid( const OUString& rWord, const Locale& rLocale,
             const PropertyValues& rProperties )
         throw(IllegalArgumentException, RuntimeException)
 {
@@ -390,11 +390,11 @@ sal_Bool SAL_CALL
     {
         INT16 nLang = LocaleToLanguage( rLocale );
         // postprocess result for errors that should be ignored
-        if (   (!rHelper.IsSpellUpperCase()  && IsUpper( rWord, nLang ))
-            || (!rHelper.IsSpellWithDigits() && HasDigits( rWord ))
-            || (!rHelper.IsSpellCapitalization()
-                &&  nFailure == SpellFailure::CAPTION_ERROR)
-        )
+        const bool bIgnoreError = 
+                (!rHelper.IsSpellUpperCase()  && IsUpper( rWord, nLang )) ||
+                (!rHelper.IsSpellWithDigits() && HasDigits( rWord )) ||
+                (!rHelper.IsSpellCapitalization()  &&  nFailure == SpellFailure::CAPTION_ERROR);
+        if (bIgnoreError)
             nFailure = -1;
     }
 
@@ -410,23 +410,26 @@ Reference< XSpellAlternatives >
     // Especially it may give a list of suggested (correct) words:
 
     Reference< XSpellAlternatives > xRes;
-        // note: mutex is held by higher up by spell which covers both
+    // note: mutex is held by higher up by spell which covers both
 
-        Hunspell* pMS;
-        rtl_TextEncoding aEnc;
-    int count;
-        int numsug = 0;
+    Hunspell* pMS = NULL;
+    rtl_TextEncoding eEnc = RTL_TEXTENCODING_DONTKNOW;
+    int count = 0;
+    int numsug = 0;
 
-        // first handle smart quotes (single and double)
+    // first handle smart quotes (single and double)
     OUStringBuffer rBuf(rWord);
-        sal_Int32 n = rBuf.getLength();
-        sal_Unicode c;
-    for (sal_Int32 ix=0; ix < n; ix++) {
-         c = rBuf.charAt(ix);
-             if ((c == 0x201C) || (c == 0x201D)) rBuf.setCharAt(ix,(sal_Unicode)0x0022);
-             if ((c == 0x2018) || (c == 0x2019)) rBuf.setCharAt(ix,(sal_Unicode)0x0027);
-        }
-        OUString nWord(rBuf.makeStringAndClear());
+    sal_Int32 n = rBuf.getLength();
+    sal_Unicode c;
+    for (sal_Int32 ix=0; ix < n; ix++) 
+    {
+        c = rBuf.charAt(ix);
+        if ((c == 0x201C) || (c == 0x201D)) 
+            rBuf.setCharAt(ix,(sal_Unicode)0x0022);
+        if ((c == 0x2018) || (c == 0x2019)) 
+            rBuf.setCharAt(ix,(sal_Unicode)0x0027);
+    }
+    OUString nWord(rBuf.makeStringAndClear());
 
     if (n)
     {
@@ -434,59 +437,57 @@ Reference< XSpellAlternatives >
 
         Sequence< OUString > aStr( 0 );
 
-            for (int i =0; i < numdict; i++) {
+        for (int i =0; i < numdict; i++) 
+        {
             pMS = NULL;
-                aEnc = 0;
-                count = 0;
+            eEnc = RTL_TEXTENCODING_DONTKNOW;
+            count = 0;
 
             if (rLocale == aDLocs[i])
             {
-                    pMS = aDicts[i];
-                    aEnc = aDEncs[i];
-                }
+                pMS = aDicts[i];
+                eEnc = aDEncs[i];
+            }
 
             if (pMS)
             {
                 char ** suglst = NULL;
-            OString aWrd(OU2ENC(nWord,aEnc));
-                    count = pMS->suggest(&suglst, (const char *) aWrd.getStr());
-
-                    if (count) {
-
-                   aStr.realloc( numsug + count );
-                   OUString *pStr = aStr.getArray();
-                       for (int ii=0; ii < count; ii++)
-                       {
-                          // if needed add: if (suglst[ii] == NULL) continue;
-                          OUString cvtwrd(suglst[ii],strlen(suglst[ii]),aEnc);
-                          pStr[numsug + ii] = cvtwrd;
-                          free(suglst[ii]);
-                       }
-                       free(suglst);
-                       numsug += count;
+                OString aWrd(OU2ENC(nWord,eEnc));
+                count = pMS->suggest(&suglst, (const char *) aWrd.getStr());
+
+                if (count) 
+                {
+                    aStr.realloc( numsug + count );
+                    OUString *pStr = aStr.getArray();
+                    for (int ii=0; ii < count; ii++)
+                    {
+                       // if needed add: if (suglst[ii] == NULL) continue;
+                       OUString cvtwrd(suglst[ii],strlen(suglst[ii]),eEnc);
+                       pStr[numsug + ii] = cvtwrd;
+                       free(suglst[ii]);
                     }
-        }
+                    free(suglst);
+                    numsug += count;
+                }
+            }
         }
 
-            // now return an empty alternative for no suggestions or the list of alternatives if some found
+        // now return an empty alternative for no suggestions or the list of alternatives if some found
         SpellAlternatives *pAlt = new SpellAlternatives;
-            String aTmp(rWord);
+        String aTmp(rWord);
         pAlt->SetWordLanguage( aTmp, nLang );
         pAlt->SetFailureType( SpellFailure::SPELLING_ERROR );
         pAlt->SetAlternatives( aStr );
         xRes = pAlt;
-            return xRes;
-
-    }
         return xRes;
+    }
+    return xRes;
 }
 
 
-
-
-Reference< XSpellAlternatives > SAL_CALL
-    SpellChecker::spell( const OUString& rWord, const Locale& rLocale,
-            const PropertyValues& rProperties )
+Reference< XSpellAlternatives > SAL_CALL SpellChecker::spell( 
+        const OUString& rWord, const Locale& rLocale,
+        const PropertyValues& rProperties )
         throw(IllegalArgumentException, RuntimeException)
 {
     MutexGuard	aGuard( GetLinguMutex() );
@@ -511,7 +512,7 @@ Reference< XSpellAlternatives > SAL_CALL
 
 
 Reference< XInterface > SAL_CALL SpellChecker_CreateInstance(
-            const Reference< XMultiServiceFactory > & /*rSMgr*/ )
+        const Reference< XMultiServiceFactory > & /*rSMgr*/ )
         throw(Exception)
 {
 
@@ -520,9 +521,8 @@ Reference< XInterface > SAL_CALL SpellChecker_CreateInstance(
 }
 
 
-sal_Bool SAL_CALL
-    SpellChecker::addLinguServiceEventListener(
-            const Reference< XLinguServiceEventListener >& rxLstnr )
+sal_Bool SAL_CALL SpellChecker::addLinguServiceEventListener(
+        const Reference< XLinguServiceEventListener >& rxLstnr )
         throw(RuntimeException)
 {
     MutexGuard	aGuard( GetLinguMutex() );
@@ -536,9 +536,8 @@ sal_Bool SAL_CALL
 }
 
 
-sal_Bool SAL_CALL
-    SpellChecker::removeLinguServiceEventListener(
-            const Reference< XLinguServiceEventListener >& rxLstnr )
+sal_Bool SAL_CALL SpellChecker::removeLinguServiceEventListener(
+        const Reference< XLinguServiceEventListener >& rxLstnr )
         throw(RuntimeException)
 {
     MutexGuard	aGuard( GetLinguMutex() );
@@ -553,8 +552,7 @@ sal_Bool SAL_CALL
 }
 
 
-OUString SAL_CALL
-    SpellChecker::getServiceDisplayName( const Locale& /*rLocale*/ )
+OUString SAL_CALL SpellChecker::getServiceDisplayName( const Locale& /*rLocale*/ )
         throw(RuntimeException)
 {
     MutexGuard	aGuard( GetLinguMutex() );
@@ -562,8 +560,7 @@ OUString SAL_CALL
 }
 
 
-void SAL_CALL
-    SpellChecker::initialize( const Sequence< Any >& rArguments )
+void SAL_CALL SpellChecker::initialize( const Sequence< Any >& rArguments )
         throw(Exception, RuntimeException)
 {
     MutexGuard	aGuard( GetLinguMutex() );
@@ -585,16 +582,15 @@ void SAL_CALL
             xPropHelper = pPropHelper;
             pPropHelper->AddAsPropListener();	//! after a reference is established
         }
-        else {
+        else 
+        {
             DBG_ERROR( "wrong number of arguments in sequence" );
         }
-
     }
 }
 
 
-void SAL_CALL
-    SpellChecker::dispose()
+void SAL_CALL SpellChecker::dispose()
         throw(RuntimeException)
 {
     MutexGuard	aGuard( GetLinguMutex() );
@@ -608,8 +604,7 @@ void SAL_CALL
 }
 
 
-void SAL_CALL
-    SpellChecker::addEventListener( const Reference< XEventListener >& rxListener )
+void SAL_CALL SpellChecker::addEventListener( const Reference< XEventListener >& rxListener )
         throw(RuntimeException)
 {
     MutexGuard	aGuard( GetLinguMutex() );
@@ -619,8 +614,7 @@ void SAL_CALL
 }
 
 
-void SAL_CALL
-    SpellChecker::removeEventListener( const Reference< XEventListener >& rxListener )
+void SAL_CALL SpellChecker::removeEventListener( const Reference< XEventListener >& rxListener )
         throw(RuntimeException)
 {
     MutexGuard	aGuard( GetLinguMutex() );
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.hxx b/lingucomponent/source/spellcheck/spell/sspellimp.hxx
old mode 100644
new mode 100755
index b87416a3d..adc8ca953
--- a/lingucomponent/source/spellcheck/spell/sspellimp.hxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.hxx
@@ -69,11 +69,11 @@ class SpellChecker :
     >
 {
     Sequence< Locale >                 aSuppLocales;
-        Hunspell **                         aDicts;
-        rtl_TextEncoding *                 aDEncs;
-        Locale *                           aDLocs;
-        OUString *                         aDNames;
-        sal_Int32                          numdict;
+    Hunspell **                        aDicts;
+    rtl_TextEncoding *                 aDEncs;
+    Locale *                           aDLocs;
+    OUString *                         aDNames;
+    sal_Int32                          numdict;
 
     ::cppu::OInterfaceContainerHelper		aEvtListeners;
     Reference< XPropertyChangeListener >	xPropHelper;
@@ -91,84 +91,43 @@ class SpellChecker :
     }
 
     INT16	GetSpellFailure( const OUString &rWord, const Locale &rLocale );
-    Reference< XSpellAlternatives >
-            GetProposals( const OUString &rWord, const Locale &rLocale );
+    Reference< XSpellAlternatives > GetProposals( const OUString &rWord, const Locale &rLocale );
 
 public:
     SpellChecker();
     virtual ~SpellChecker();
 
     // XSupportedLocales (for XSpellChecker)
-    virtual Sequence< Locale > SAL_CALL 
-        getLocales() 
-            throw(RuntimeException);
-    virtual sal_Bool SAL_CALL 
-        hasLocale( const Locale& rLocale ) 
-            throw(RuntimeException);
+    virtual Sequence< Locale > SAL_CALL getLocales() throw(RuntimeException);
+    virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) throw(RuntimeException);
 
     // XSpellChecker
-    virtual sal_Bool SAL_CALL 
-        isValid( const OUString& rWord, const Locale& rLocale, 
-                const PropertyValues& rProperties ) 
-            throw(IllegalArgumentException, 
-                  RuntimeException);
-    virtual Reference< XSpellAlternatives > SAL_CALL 
-        spell( const OUString& rWord, const Locale& rLocale, 
-                const PropertyValues& rProperties ) 
-            throw(IllegalArgumentException, 
-                  RuntimeException);
+    virtual sal_Bool SAL_CALL isValid( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) throw(IllegalArgumentException, RuntimeException);
+    virtual Reference< XSpellAlternatives > SAL_CALL spell( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) throw(IllegalArgumentException, RuntimeException);
 
     // XLinguServiceEventBroadcaster
-    virtual sal_Bool SAL_CALL 
-        addLinguServiceEventListener( 
-            const Reference< XLinguServiceEventListener >& rxLstnr ) 
-            throw(RuntimeException);
-    virtual sal_Bool SAL_CALL 
-        removeLinguServiceEventListener( 
-            const Reference< XLinguServiceEventListener >& rxLstnr ) 
-            throw(RuntimeException);
+    virtual sal_Bool SAL_CALL addLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException);
+    virtual sal_Bool SAL_CALL removeLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException);
     
     // XServiceDisplayName
-    virtual OUString SAL_CALL 
-        getServiceDisplayName( const Locale& rLocale ) 
-            throw(RuntimeException);
+    virtual OUString SAL_CALL getServiceDisplayName( const Locale& rLocale ) throw(RuntimeException);
 
     // XInitialization
-    virtual void SAL_CALL 
-        initialize( const Sequence< Any >& rArguments ) 
-            throw(Exception, RuntimeException);
+    virtual void SAL_CALL initialize( const Sequence< Any >& rArguments ) throw(Exception, RuntimeException);
 
     // XComponent
-    virtual void SAL_CALL 
-        dispose() 
-            throw(RuntimeException);
-    virtual void SAL_CALL 
-        addEventListener( const Reference< XEventListener >& rxListener ) 
-            throw(RuntimeException);
-    virtual void SAL_CALL 
-        removeEventListener( const Reference< XEventListener >& rxListener ) 
-            throw(RuntimeException);
-
-    ////////////////////////////////////////////////////////////
-    // Service specific part
-    //
+    virtual void SAL_CALL dispose() throw(RuntimeException);
+    virtual void SAL_CALL addEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException);
+    virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException);
 
     // XServiceInfo
-    virtual OUString SAL_CALL 
-        getImplementationName() 
-            throw(RuntimeException);
-    virtual sal_Bool SAL_CALL 
-        supportsService( const OUString& rServiceName ) 
-            throw(RuntimeException);
-    virtual Sequence< OUString > SAL_CALL 
-        getSupportedServiceNames() 
-            throw(RuntimeException);
-
-
-    static inline OUString	
-        getImplementationName_Static() throw();
-    static Sequence< OUString >	
-        getSupportedServiceNames_Static() throw();
+    virtual OUString SAL_CALL getImplementationName() throw(RuntimeException);
+    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw(RuntimeException);
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException);
+
+
+    static inline OUString  getImplementationName_Static() throw();
+    static Sequence< OUString > getSupportedServiceNames_Static() throw();
 };
 
 inline OUString SpellChecker::getImplementationName_Static() throw()
@@ -177,7 +136,6 @@ inline OUString SpellChecker::getImplementationName_Static() throw()
 }
 
 
-
 ///////////////////////////////////////////////////////////////////////////
 
 #endif
diff --git a/lingucomponent/source/thesaurus/libnth/nthesdta.hxx b/lingucomponent/source/thesaurus/libnth/nthesdta.hxx
old mode 100644
new mode 100755
index c8bfd3c5e..12253528f
--- a/lingucomponent/source/thesaurus/libnth/nthesdta.hxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesdta.hxx
@@ -48,11 +48,11 @@ class Meaning :
 {
     ::com::sun::star::uno::Sequence< ::rtl::OUString >	aSyn;	// list of synonyms, may be empty.
     ::rtl::OUString			aTerm;
-    INT16				nLanguage;
+    INT16                   nLanguage;
 
 #if 0
         // this is for future use by a German thesaurus
-        BOOL                            bIsGermanPreReform; 
+        BOOL                bIsGermanPreReform; 
 #endif
 
     // disallow copy-constructor and assignment-operator for now
@@ -68,22 +68,12 @@ public:
     virtual ~Meaning();
 
     // XMeaning
-    virtual ::rtl::OUString SAL_CALL
-        getMeaning()
-            throw(::com::sun::star::uno::RuntimeException);
-
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
-        querySynonyms()
-            throw(::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getMeaning() throw(::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL querySynonyms() throw(::com::sun::star::uno::RuntimeException);
 
     // non-interface specific functions
-        void    SetSynonyms(
-                    const ::com::sun::star::uno::Sequence< ::rtl::OUString > 
-                    &rSyn );
-
-        void    SetMeaning(const ::rtl::OUString  &rTerm );
-
-
+    void    SetSynonyms( const ::com::sun::star::uno::Sequence< ::rtl::OUString > &rSyn );
+    void    SetMeaning( const ::rtl::OUString  &rTerm );
 };
 
 
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
old mode 100644
new mode 100755
index dd1685056..eadadceb4
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
@@ -28,9 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_lingucomponent.hxx"
 
-// include 
 #include 
-
 #include 	// helper for factories
 #include 
 #include 
@@ -100,23 +98,27 @@ Thesaurus::Thesaurus() :
     aTEncs = NULL;
     aTLocs = NULL;
     aTNames = NULL;
-        numthes = 0;
+    numthes = 0;
 }
 
 
 Thesaurus::~Thesaurus()
 {
 
-    if (aThes) {
-        for (int i = 0; i < numthes; i++) {
+    if (aThes) 
+    {
+        for (int i = 0; i < numthes; i++) 
+        {
             if (aThes[i]) delete aThes[i];
             aThes[i] = NULL;
         }
         delete[] aThes;
     }
     aThes = NULL;
-    if (aCharSetInfo) {
-        for (int i = 0; i < numthes; i++) {
+    if (aCharSetInfo) 
+    {
+        for (int i = 0; i < numthes; i++) 
+        {
             if (aCharSetInfo[i]) delete aCharSetInfo[i];
             aCharSetInfo[i] = NULL;
         }
@@ -244,7 +246,7 @@ Sequence< Locale > SAL_CALL Thesaurus::getLocales()
                     for (sal_Int32 i = 0;  i < nLocales;  ++i)
                     {
                         aThes[k]  = NULL;
-                        aTEncs[k]  = 0;
+                        aTEncs[k]  = RTL_TEXTENCODING_DONTKNOW;
                         aTLocs[k]  = MsLangId::convertLanguageToLocale(
                                         MsLangId::convertIsoStringToLanguage( aDictIt->aLocaleNames[i] ));
                         aCharSetInfo[k] = new CharClass( aTLocs[k] );
@@ -302,28 +304,28 @@ sal_Bool SAL_CALL Thesaurus::hasLocale(const Locale& rLocale)
 }
 
 
-Sequence < Reference < ::com::sun::star::linguistic2::XMeaning > > SAL_CALL
-        Thesaurus::queryMeanings( const OUString& qTerm, const Locale& rLocale,
-                                  const PropertyValues& rProperties)
-                                  throw(IllegalArgumentException, RuntimeException)
+Sequence < Reference < ::com::sun::star::linguistic2::XMeaning > > SAL_CALL Thesaurus::queryMeanings( 
+    const OUString& qTerm, const Locale& rLocale,
+    const PropertyValues& rProperties)
+    throw(IllegalArgumentException, RuntimeException)
 {
-        MutexGuard      aGuard( GetLinguMutex() );
+    MutexGuard      aGuard( GetLinguMutex() );
 
-        uno::Sequence< Reference< XMeaning > > aMeanings( 1 );
-        uno::Sequence< Reference< XMeaning > > noMeanings( 0 );
-        uno::Reference< XLinguServiceManager > xLngSvcMgr( GetLngSvcMgr_Impl() );
-        uno::Reference< XSpellChecker1 > xSpell;
+    uno::Sequence< Reference< XMeaning > > aMeanings( 1 );
+    uno::Sequence< Reference< XMeaning > > noMeanings( 0 );
+    uno::Reference< XLinguServiceManager > xLngSvcMgr( GetLngSvcMgr_Impl() );
+    uno::Reference< XSpellChecker1 > xSpell;
 
-        OUString rTerm(qTerm);
-        OUString pTerm(qTerm);
-        sal_uInt16 ct = CAPTYPE_UNKNOWN;
-        sal_Int32 stem = 0;
-        sal_Int32 stem2 = 0;
+    OUString rTerm(qTerm);
+    OUString pTerm(qTerm);
+    sal_uInt16 ct = CAPTYPE_UNKNOWN;
+    sal_Int32 stem = 0;
+    sal_Int32 stem2 = 0;
 
-        INT16 nLanguage = LocaleToLanguage( rLocale );
+    INT16 nLanguage = LocaleToLanguage( rLocale );
 
-        if (nLanguage == LANGUAGE_NONE  || !rTerm.getLength())
-                return noMeanings;
+    if (nLanguage == LANGUAGE_NONE || !rTerm.getLength())
+        return noMeanings;
 
     if (!hasLocale( rLocale ))
 #ifdef LINGU_EXCEPTIONS
@@ -332,195 +334,202 @@ Sequence < Reference < ::com::sun::star::linguistic2::XMeaning > > SAL_CALL
         return noMeanings;
 #endif
 
-        if (prevTerm == qTerm && prevLocale == nLanguage) return prevMeanings;
+    if (prevTerm == qTerm && prevLocale == nLanguage)
+        return prevMeanings;
 
-        mentry * pmean = NULL;
+    mentry * pmean = NULL;
     sal_Int32 nmean = 0;
 
-        PropertyHelper_Thes &rHelper = GetPropHelper();
-        rHelper.SetTmpPropVals( rProperties );
+    PropertyHelper_Thes &rHelper = GetPropHelper();
+    rHelper.SetTmpPropVals( rProperties );
 
-        MyThes * pTH = NULL;
-        rtl_TextEncoding aEnc = 0;
-        CharClass * pCC = NULL;
+    MyThes * pTH = NULL;
+    rtl_TextEncoding eEnc = RTL_TEXTENCODING_DONTKNOW;
+    CharClass * pCC = NULL;
 
-        // find the first thesaurus that matches the locale
-        for (int i =0; i < numthes; i++) {
-            if (rLocale == aTLocs[i])
+    // find the first thesaurus that matches the locale
+    for (int i =0; i < numthes; i++)
+    {
+        if (rLocale == aTLocs[i])
+        {
+            // open up and intialize this thesaurus if need be
+            if (!aThes[i])
             {
-           // open up and intialize this thesaurus if need be
-                   if (!aThes[i])
-                   {
-                      OUString datpath = aTNames[i] + A2OU(".dat");
-                      OUString idxpath = aTNames[i] + A2OU(".idx");
-                      OUString ndat;
-                      OUString nidx;
-                      osl::FileBase::getSystemPathFromFileURL(datpath,ndat);
-                      osl::FileBase::getSystemPathFromFileURL(idxpath,nidx);
-                      OString aTmpidx(OU2ENC(nidx,osl_getThreadTextEncoding()));
-                      OString aTmpdat(OU2ENC(ndat,osl_getThreadTextEncoding()));
+                OUString datpath = aTNames[i] + A2OU(".dat");
+                OUString idxpath = aTNames[i] + A2OU(".idx");
+                OUString ndat;
+                OUString nidx;
+                osl::FileBase::getSystemPathFromFileURL(datpath,ndat);
+                osl::FileBase::getSystemPathFromFileURL(idxpath,nidx);
+                OString aTmpidx(OU2ENC(nidx,osl_getThreadTextEncoding()));
+                OString aTmpdat(OU2ENC(ndat,osl_getThreadTextEncoding()));
 
 #if defined(WNT)
-                      // workaround for Windows specifc problem that the
-                      // path length in calls to 'fopen' is limted to somewhat
-                      // about 120+ characters which will usually be exceed when
-                      // using dictionaries as extensions.
-                      aTmpidx = Win_GetShortPathName( nidx );
-                      aTmpdat = Win_GetShortPathName( ndat );
+                // workaround for Windows specifc problem that the
+                // path length in calls to 'fopen' is limted to somewhat
+                // about 120+ characters which will usually be exceed when
+                // using dictionaries as extensions.
+                aTmpidx = Win_GetShortPathName( nidx );
+                aTmpdat = Win_GetShortPathName( ndat );
 #endif
 
-                      aThes[i] = new MyThes(aTmpidx.getStr(),aTmpdat.getStr());
-                      if (aThes[i]) {
-                        const char * enc_string = aThes[i]->get_th_encoding();
-                        if (!enc_string) {
-                          aTEncs[i] = rtl_getTextEncodingFromUnixCharset("ISO8859-1");
-                        } else {
-                          aTEncs[i] = rtl_getTextEncodingFromUnixCharset(enc_string);
-                          if (aTEncs[i] == RTL_TEXTENCODING_DONTKNOW) {
-                            if (strcmp("ISCII-DEVANAGARI", enc_string) == 0) {
-                              aTEncs[i] = RTL_TEXTENCODING_ISCII_DEVANAGARI;
-                            } else if (strcmp("UTF-8", enc_string) == 0) {
-                              aTEncs[i] = RTL_TEXTENCODING_UTF8;
-                            }
-                          }
-                      }
-                   }
-               }
-               pTH = aThes[i];
-                   aEnc = aTEncs[i];
-                   pCC = aCharSetInfo[i];
-
-               if (pTH)
-                   break;
+                aThes[i] = new MyThes(aTmpidx.getStr(),aTmpdat.getStr());
+                if (aThes[i])
+                    aTEncs[i] = getTextEncodingFromCharset(aThes[i]->get_th_encoding());
+            }
+            pTH = aThes[i];
+            eEnc = aTEncs[i];
+            pCC = aCharSetInfo[i];
+
+            if (pTH)
+                break;
         }
     }
 
-        while (pTH) {
-         // convert word to all lower case for searching
-             if (!stem) ct = capitalType(rTerm, pCC);
-             OUString nTerm(makeLowerCase(rTerm, pCC));
-             OString aTmp( OU2ENC(nTerm, aEnc) );
-             nmean = pTH->Lookup(aTmp.getStr(),aTmp.getLength(),&pmean);
+    // we don't want to work with a default text encoding since following incorrect
+    // results may occur only for specific text and thus may be hard to notice.
+    // Thus better always make a clean exit here if the text encoding is in question.
+    // Hopefully something not working at all will raise proper attention quickly. ;-)
+    DBG_ASSERT( eEnc != RTL_TEXTENCODING_DONTKNOW, "failed to get text encoding! (maybe incorrect encoding string in file)" );
+    if (eEnc == RTL_TEXTENCODING_DONTKNOW)
+        return noMeanings;
+    
+    while (pTH)
+    {
+        // convert word to all lower case for searching
+        if (!stem)
+            ct = capitalType(rTerm, pCC);
+        OUString nTerm(makeLowerCase(rTerm, pCC));
+        OString aTmp( OU2ENC(nTerm, eEnc) );
+        nmean = pTH->Lookup(aTmp.getStr(),aTmp.getLength(),&pmean);
 
-             if (nmean) aMeanings.realloc( nmean );
+        if (nmean)
+            aMeanings.realloc( nmean );
 
-             mentry * pe = pmean;
-             OUString codeTerm = qTerm;
-         Reference< XSpellAlternatives > xTmpRes2;
+        mentry * pe = pmean;
+        OUString codeTerm = qTerm;
+        Reference< XSpellAlternatives > xTmpRes2;
 
-         if (stem) {
-               xTmpRes2 = xSpell->spell( A2OU("") +
+        if (stem)
+        {
+            xTmpRes2 = xSpell->spell( A2OU("") +
             pTerm + A2OU(""), nLanguage, rProperties );
-               if (xTmpRes2.is()) {
-                 Sequenceseq = xTmpRes2->getAlternatives();
-                 if (seq.getLength() > 0) {
+            if (xTmpRes2.is())
+            {
+                Sequenceseq = xTmpRes2->getAlternatives();
+                if (seq.getLength() > 0)
+                {
                     codeTerm = seq[0];
                     stem2 = 1;
-                 }
+                }
 #if 0
-                 OString o = OUStringToOString(codeTerm, rtl_getTextEncodingFromUnixCharset("UTF-8"));
-                 fprintf(stderr, "CODETERM: %s\n", o.pData->buffer);
+                OString o = OUStringToOString(codeTerm, RTL_TEXTENCODING_UTF8);
+                fprintf(stderr, "CODETERM: %s\n", o.pData->buffer);
 #endif
-               }
-             }
-
-         for (int j = 0; j < nmean; j++) {
-             int count = pe->count;
-                 if (count) {
-                     Sequence< OUString > aStr( count );
-                     OUString *pStr = aStr.getArray();
-
-                     for (int i=0; i < count; i++) {
-                       OUString sTerm(pe->psyns[i],strlen(pe->psyns[i]),aEnc );
-                       sal_Int32 catpos = sTerm.indexOf('(');
-                       sal_Int32 catpos2 = 0;
-                       OUString catst;
-                       OUString catst2;
-                       if (catpos > 2) {
-                         // remove category name for affixation and casing
-                         catst = A2OU(" ") + sTerm.copy(catpos);
-                         sTerm = sTerm.copy(0, catpos);
-                         sTerm = sTerm.trim();
-                       }
-                       // generate synonyms with affixes
-                       if (stem && stem2) {
-                 Reference< XSpellAlternatives > xTmpRes;
-                 xTmpRes = xSpell->spell( A2OU("") +
-                 sTerm + A2OU("") + codeTerm + A2OU(""), nLanguage, rProperties );
-                 if (xTmpRes.is()) {
-                   Sequenceseq = xTmpRes->getAlternatives();
-                   for (int k = 0; k < seq.getLength(); k++) {
-                     OString o = OUStringToOString(seq[k], rtl_getTextEncodingFromUnixCharset("UTF-8"));
-                   }
-                   if (seq.getLength() > 0) sTerm = seq[0];
-                 }
-               }
-               if (catpos2) sTerm = catst2 + sTerm;
-
-                       sal_uInt16 ct1 = capitalType(sTerm, pCC);
-                       if (CAPTYPE_MIXED == ct1)
-                            ct = ct1;
-                       OUString cTerm;
-                       switch (ct) {
-                       case CAPTYPE_ALLCAP:
-                     {
-                               cTerm = makeUpperCase(sTerm, pCC);
-                               break;
-                             }
-                       case CAPTYPE_INITCAP:
-                     {
-                               cTerm = makeInitCap(sTerm, pCC);
-                               break;
-                             }
-                           default:
-                     {
-                               cTerm = sTerm;
-                               break;
-                             }
-               }
-                       OUString aAlt( cTerm + catst);
-                       pStr[i] = aAlt;
-             }
+            }
+        }
+
+        for (int j = 0; j < nmean; j++)
+        {
+            int count = pe->count;
+            if (count)
+            {
+                Sequence< OUString > aStr( count );
+                OUString *pStr = aStr.getArray();
+
+                for (int i=0; i < count; i++)
+                {
+                    OUString sTerm(pe->psyns[i],strlen(pe->psyns[i]),eEnc );
+                    sal_Int32 catpos = sTerm.indexOf('(');
+                    sal_Int32 catpos2 = 0;
+                    OUString catst;
+                    OUString catst2;
+                    if (catpos > 2)
+                    {
+                        // remove category name for affixation and casing
+                        catst = A2OU(" ") + sTerm.copy(catpos);
+                        sTerm = sTerm.copy(0, catpos);
+                        sTerm = sTerm.trim();
+                    }
+                    // generate synonyms with affixes
+                    if (stem && stem2)
+                    {
+                        Reference< XSpellAlternatives > xTmpRes;
+                        xTmpRes = xSpell->spell( A2OU("") +
+                        sTerm + A2OU("") + codeTerm + A2OU(""), nLanguage, rProperties );
+                        if (xTmpRes.is())
+                        {
+                            Sequenceseq = xTmpRes->getAlternatives();
+                            if (seq.getLength() > 0)
+                                sTerm = seq[0];
+                        }
+                    }
+                    if (catpos2)
+                        sTerm = catst2 + sTerm;
+ 
+                    sal_uInt16 ct1 = capitalType(sTerm, pCC);
+                    if (CAPTYPE_MIXED == ct1)
+                        ct = ct1;
+                    OUString cTerm;
+                    switch (ct)
+                    {
+                        case CAPTYPE_ALLCAP:
+                            cTerm = makeUpperCase(sTerm, pCC);
+                            break;
+                        case CAPTYPE_INITCAP:
+                            cTerm = makeInitCap(sTerm, pCC);
+                            break;
+                        default:
+                            cTerm = sTerm;
+                            break;
+                    }
+                    OUString aAlt( cTerm + catst);
+                    pStr[i] = aAlt;
+                }
 #if 0
-                     Meaning * pMn = new Meaning(rTerm,nLanguage,rHelper);
+                Meaning * pMn = new Meaning(rTerm,nLanguage,rHelper);
 #endif
-                     Meaning * pMn = new Meaning(rTerm,nLanguage);
-                     OUString dTerm(pe->defn,strlen(pe->defn),aEnc );
-                     pMn->SetMeaning(dTerm);
-                     pMn->SetSynonyms(aStr);
-                     Reference* pMeaning = aMeanings.getArray();
-                     pMeaning[j] = pMn;
-         }
-                 pe++;
-         }
-             pTH->CleanUpAfterLookup(&pmean,nmean);
-
-        if (nmean) {
+                Meaning * pMn = new Meaning(rTerm,nLanguage);
+                OUString dTerm(pe->defn,strlen(pe->defn),eEnc );
+                pMn->SetMeaning(dTerm);
+                pMn->SetSynonyms(aStr);
+                Reference* pMeaning = aMeanings.getArray();
+                pMeaning[j] = pMn;
+            }
+            pe++;
+        }
+        pTH->CleanUpAfterLookup(&pmean,nmean);
+
+        if (nmean)
+        {
             prevTerm = qTerm;
             prevMeanings = aMeanings;
             prevLocale = nLanguage;
             return aMeanings;
-    }
+        }
 
-        if (stem || !xLngSvcMgr.is()) return noMeanings;
+        if (stem || !xLngSvcMgr.is())
+            return noMeanings;
         stem = 1;
 
         xSpell = uno::Reference< XSpellChecker1 >( xLngSvcMgr->getSpellChecker(), UNO_QUERY );
-        if (!xSpell.is() || !xSpell->isValid( A2OU(SPELLML_SUPPORT), nLanguage, rProperties )) {
+        if (!xSpell.is() || !xSpell->isValid( A2OU(SPELLML_SUPPORT), nLanguage, rProperties ))
             return noMeanings;
-        }
         Reference< XSpellAlternatives > xTmpRes;
         xTmpRes = xSpell->spell( A2OU("") +
             rTerm + A2OU(""), nLanguage, rProperties );
-        if (xTmpRes.is()) {
+        if (xTmpRes.is())
+        {
             Sequenceseq = xTmpRes->getAlternatives();
 #if 0
-            for (int i = 0; i < seq.getLength(); i++) {
-                OString o = OUStringToOString(seq[i], rtl_getTextEncodingFromUnixCharset("UTF-8"));
+            for (int i = 0; i < seq.getLength(); i++)
+            {
+                OString o = OUStringToOString(seq[i], RTL_TEXTENCODING_UTF8);
                 fprintf(stderr, "%d: %s\n", i + 1, o.pData->buffer);
             }
 #endif
-            if (seq.getLength() > 0) {
+            if (seq.getLength() > 0)
+            {
                 rTerm = seq[0];  // XXX Use only the first stem
                 continue;
             }
@@ -529,17 +538,21 @@ Sequence < Reference < ::com::sun::star::linguistic2::XMeaning > > SAL_CALL
         // stem the last word of the synonym (for categories after affixation)
         rTerm = rTerm.trim();
         sal_Int32 pos = rTerm.lastIndexOf(' ');
-        if (!pos) return noMeanings;
+        if (!pos)
+            return noMeanings;
         xTmpRes = xSpell->spell( A2OU("") +
             rTerm.copy(pos + 1) + A2OU(""), nLanguage, rProperties );
-        if (xTmpRes.is()) {
+        if (xTmpRes.is())
+        {
             Sequenceseq = xTmpRes->getAlternatives();
-            if (seq.getLength() > 0) {
+            if (seq.getLength() > 0)
+            {
                 pTerm = rTerm.copy(pos + 1);
                 rTerm = rTerm.copy(0, pos + 1) + seq[0];
-#if 0
-                for (int i = 0; i < seq.getLength(); i++) {
-                    OString o = OUStringToOString(seq[i], rtl_getTextEncodingFromUnixCharset("UTF-8"));
+#if  0
+                for (int i = 0; i < seq.getLength(); i++)
+                {
+                    OString o = OUStringToOString(seq[i], RTL_TEXTENCODING_UTF8);
                     fprintf(stderr, "%d: %s\n", i + 1, o.pData->buffer);
                 }
 #endif
@@ -547,12 +560,11 @@ Sequence < Reference < ::com::sun::star::linguistic2::XMeaning > > SAL_CALL
             }
         }
         break;
-        }
+    }
     return noMeanings;
 }
 
 
-
 Reference< XInterface > SAL_CALL Thesaurus_CreateInstance(
             const Reference< XMultiServiceFactory > & /*rSMgr*/ )
         throw(Exception)
@@ -562,8 +574,7 @@ Reference< XInterface > SAL_CALL Thesaurus_CreateInstance(
 }
 
 
-OUString SAL_CALL
-    Thesaurus::getServiceDisplayName( const Locale& /*rLocale*/ )
+OUString SAL_CALL Thesaurus::getServiceDisplayName( const Locale& /*rLocale*/ )
         throw(RuntimeException)
 {
     MutexGuard	aGuard( GetLinguMutex() );
@@ -571,8 +582,7 @@ OUString SAL_CALL
 }
 
 
-void SAL_CALL
-    Thesaurus::initialize( const Sequence< Any >& rArguments )
+void SAL_CALL Thesaurus::initialize( const Sequence< Any >& rArguments )
         throw(Exception, RuntimeException)
 {
     MutexGuard	aGuard( GetLinguMutex() );
@@ -603,24 +613,26 @@ void SAL_CALL
 sal_uInt16 SAL_CALL Thesaurus::capitalType(const OUString& aTerm, CharClass * pCC)
 {
         sal_Int32 tlen = aTerm.getLength();
-        if ((pCC) && (tlen)) {
-              String aStr(aTerm);
-              sal_Int32 nc = 0;
-              for (USHORT tindex = 0; tindex < tlen;  tindex++) {
-               if (pCC->getCharacterType(aStr,tindex) &
-                       ::com::sun::star::i18n::KCharacterType::UPPER) nc++;
-          }
-
-              if (nc == 0) return (sal_uInt16) CAPTYPE_NOCAP;
-
-              if (nc == tlen) return (sal_uInt16) CAPTYPE_ALLCAP;
+        if ((pCC) && (tlen)) 
+        {
+            String aStr(aTerm);
+            sal_Int32 nc = 0;
+            for (USHORT tindex = 0; tindex < tlen;  tindex++) 
+            {
+                if (pCC->getCharacterType(aStr,tindex) &
+                   ::com::sun::star::i18n::KCharacterType::UPPER) nc++;
+            }
 
-              if ((nc == 1) && (pCC->getCharacterType(aStr,0) &
-                      ::com::sun::star::i18n::KCharacterType::UPPER))
-                   return (sal_uInt16) CAPTYPE_INITCAP;
+            if (nc == 0) 
+                return (sal_uInt16) CAPTYPE_NOCAP;
+            if (nc == tlen) 
+                return (sal_uInt16) CAPTYPE_ALLCAP;
+            if ((nc == 1) && (pCC->getCharacterType(aStr,0) &
+                  ::com::sun::star::i18n::KCharacterType::UPPER))
+                return (sal_uInt16) CAPTYPE_INITCAP;
 
-              return (sal_uInt16) CAPTYPE_MIXED;
-    }
+            return (sal_uInt16) CAPTYPE_MIXED;
+        }
         return (sal_uInt16) CAPTYPE_UNKNOWN;
 }
 
@@ -628,38 +640,40 @@ sal_uInt16 SAL_CALL Thesaurus::capitalType(const OUString& aTerm, CharClass * pC
 
 OUString SAL_CALL Thesaurus::makeLowerCase(const OUString& aTerm, CharClass * pCC)
 {
-        if (pCC)
-      return pCC->toLower_rtl(aTerm, 0, aTerm.getLength());
-        return aTerm;
+    if (pCC)
+        return pCC->toLower_rtl(aTerm, 0, aTerm.getLength());
+    return aTerm;
 }
 
 
 OUString SAL_CALL Thesaurus::makeUpperCase(const OUString& aTerm, CharClass * pCC)
 {
-        if (pCC)
-              return pCC->toUpper_rtl(aTerm, 0, aTerm.getLength());
-        return aTerm;
+    if (pCC)
+        return pCC->toUpper_rtl(aTerm, 0, aTerm.getLength());
+    return aTerm;
 }
 
 
 OUString SAL_CALL Thesaurus::makeInitCap(const OUString& aTerm, CharClass * pCC)
 {
-        sal_Int32 tlen = aTerm.getLength();
-        if ((pCC) && (tlen)) {
-              OUString bTemp = aTerm.copy(0,1);
-              if (tlen > 1)
-                   return ( pCC->toUpper_rtl(bTemp, 0, 1)
-                             + pCC->toLower_rtl(aTerm,1,(tlen-1)) );
+    sal_Int32 tlen = aTerm.getLength();
+    if ((pCC) && (tlen))
+    {
+        OUString bTemp = aTerm.copy(0,1);
+        if (tlen > 1)
+        {
+            return ( pCC->toUpper_rtl(bTemp, 0, 1)
+                     + pCC->toLower_rtl(aTerm,1,(tlen-1)) );
+        }
 
-          return pCC->toUpper_rtl(bTemp, 0, 1);
+        return pCC->toUpper_rtl(bTemp, 0, 1);
     }
-        return aTerm;
+    return aTerm;
 }
 
 
 
-void SAL_CALL
-    Thesaurus::dispose()
+void SAL_CALL Thesaurus::dispose()
         throw(RuntimeException)
 {
     MutexGuard	aGuard( GetLinguMutex() );
@@ -673,8 +687,7 @@ void SAL_CALL
 }
 
 
-void SAL_CALL
-    Thesaurus::addEventListener( const Reference< XEventListener >& rxListener )
+void SAL_CALL Thesaurus::addEventListener( const Reference< XEventListener >& rxListener )
         throw(RuntimeException)
 {
     MutexGuard	aGuard( GetLinguMutex() );
@@ -684,8 +697,7 @@ void SAL_CALL
 }
 
 
-void SAL_CALL
-    Thesaurus::removeEventListener( const Reference< XEventListener >& rxListener )
+void SAL_CALL Thesaurus::removeEventListener( const Reference< XEventListener >& rxListener )
         throw(RuntimeException)
 {
     MutexGuard	aGuard( GetLinguMutex() );
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
old mode 100644
new mode 100755
index f0dde77ba..c717587bb
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
@@ -116,55 +116,27 @@ public:
     virtual ~Thesaurus();
 
     // XSupportedLocales (for XThesaurus)
-    virtual Sequence< Locale > SAL_CALL 
-        getLocales() 
-            throw(RuntimeException);
-    virtual sal_Bool SAL_CALL 
-        hasLocale( const Locale& rLocale ) 
-            throw(RuntimeException);
+    virtual Sequence< Locale > SAL_CALL getLocales() throw(RuntimeException);
+    virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) throw(RuntimeException);
 
     // XThesaurus
-  virtual Sequence< Reference < ::com::sun::star::linguistic2::XMeaning > > SAL_CALL 
-        queryMeanings( const OUString& rTerm, const Locale& rLocale, 
-                const PropertyValues& rProperties ) 
-            throw(IllegalArgumentException, 
-                  RuntimeException);
+    virtual Sequence< Reference < ::com::sun::star::linguistic2::XMeaning > > SAL_CALL queryMeanings( const OUString& rTerm, const Locale& rLocale, const PropertyValues& rProperties ) throw(IllegalArgumentException, RuntimeException);
 
     // XServiceDisplayName
-    virtual OUString SAL_CALL 
-        getServiceDisplayName( const Locale& rLocale ) 
-            throw(RuntimeException);
+    virtual OUString SAL_CALL getServiceDisplayName( const Locale& rLocale ) throw(RuntimeException);
 
     // XInitialization
-    virtual void SAL_CALL 
-        initialize( const Sequence< Any >& rArguments ) 
-            throw(Exception, RuntimeException);
+    virtual void SAL_CALL initialize( const Sequence< Any >& rArguments ) throw(Exception, RuntimeException);
 
     // XComponent
-    virtual void SAL_CALL 
-        dispose() 
-            throw(RuntimeException);
-    virtual void SAL_CALL 
-        addEventListener( const Reference< XEventListener >& rxListener ) 
-            throw(RuntimeException);
-    virtual void SAL_CALL 
-        removeEventListener( const Reference< XEventListener >& rxListener ) 
-            throw(RuntimeException);
-
-    ////////////////////////////////////////////////////////////
-    // Service specific part
-    //
+    virtual void SAL_CALL dispose() throw(RuntimeException);
+    virtual void SAL_CALL addEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException);
+    virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException);
 
     // XServiceInfo
-    virtual OUString SAL_CALL 
-        getImplementationName() 
-            throw(RuntimeException);
-    virtual sal_Bool SAL_CALL 
-        supportsService( const OUString& rServiceName ) 
-            throw(RuntimeException);
-    virtual Sequence< OUString > SAL_CALL 
-        getSupportedServiceNames() 
-            throw(RuntimeException);
+    virtual OUString SAL_CALL getImplementationName() throw(RuntimeException);
+    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw(RuntimeException);
+    virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException);
 
 
     static inline OUString	
@@ -183,8 +155,7 @@ private:
     static ::com::sun::star::uno::Reference<
         ::com::sun::star::linguistic2::XSpellChecker1 > xSpell;
 */
-    static ::com::sun::star::uno::Reference<
-        ::com::sun::star::linguistic2::XLinguServiceManager > GetLngSvcMgr();
+    static ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLinguServiceManager > GetLngSvcMgr();
 
 };
 
-- 
cgit v1.2.3


From 9d634b78cf894995af0b8705632cdcd0f68d2eea Mon Sep 17 00:00:00 2001
From: "Thomas Lange [tl]" 
Date: Mon, 26 Jul 2010 13:11:26 +0200
Subject: cws tl82: #i106993# thesaurus code clean-up

---
 cui/source/dialogs/thesdlg.cxx | 37 ++++---------------------------------
 1 file changed, 4 insertions(+), 33 deletions(-)

diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 752a84dac..28d6eae14 100755
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -57,6 +57,7 @@
 #include 
 #include 
 #include 
+#include 
 
 
 #include 
@@ -73,36 +74,6 @@ using ::rtl::OUString;
 #define A2S(x)          String::CreateFromAscii( x )
 
 
-
-// GetReplaceEditString -------------------------------
-
-static void GetReplaceEditString( String &rText )
-{
-    // The strings returned by the thesaurus saometimes have some
-    // explanation text put in between '(' and ')' or a trailing '*'.
-    // These parts should not be put in the ReplaceEdit Text that may get
-    // inserted into the document. Thus we strip them from the text.
-
-    xub_StrLen nPos = rText.Search( sal_Unicode('(') );
-    while (STRING_NOTFOUND != nPos)
-    {
-        xub_StrLen nEnd = rText.Search( sal_Unicode(')'), nPos );
-        if (STRING_NOTFOUND != nEnd)
-            rText.Erase( nPos, nEnd-nPos+1 );
-        else
-            break;
-        nPos = rText.Search( sal_Unicode('(') );
-    }
-
-    nPos = rText.Search( sal_Unicode('*') );
-    if (STRING_NOTFOUND != nPos)
-        rText.Erase( nPos );
-
-    // remove any possible remaining ' ' that may confuse the thesaurus
-    // when it gets called with the text
-    rText.EraseLeadingAndTrailingChars( sal_Unicode(' ') );
-}
-
 // class LookUpComboBox_Impl --------------------------------------------------
     
 LookUpComboBox_Impl::LookUpComboBox_Impl( 
@@ -454,7 +425,7 @@ IMPL_LINK( SvxThesaurusDialog_Impl, WordSelectHdl_Impl, ComboBox *, pBox )
     {
         USHORT nPos = pBox->GetSelectEntryPos();
         String aStr( pBox->GetEntry( nPos ) );
-        GetReplaceEditString( aStr );
+        aStr = linguistic::GetThesaurusReplaceText( aStr );
         aWordCB.SetText( aStr );
         LookUp_Impl();
     }
@@ -473,7 +444,7 @@ IMPL_LINK( SvxThesaurusDialog_Impl, AlternativesSelectHdl_Impl, SvxCheckListBox
         if (!pData->IsHeader())
         {
             aStr = pData->GetText(); 
-            GetReplaceEditString( aStr );
+            aStr = linguistic::GetThesaurusReplaceText( aStr );
         }
         aReplaceEdit.SetText( aStr );
     }
@@ -491,7 +462,7 @@ IMPL_LINK( SvxThesaurusDialog_Impl, AlternativesDoubleClickHdl_Impl, SvxCheckLis
         if (!pData->IsHeader())
         {
             aStr = pData->GetText(); 
-            GetReplaceEditString( aStr );
+            aStr = linguistic::GetThesaurusReplaceText( aStr );
         }
         
         aWordCB.SetText( aStr );
-- 
cgit v1.2.3


From 56e06935697af36247e189f8dcfd17a8b9cf443f Mon Sep 17 00:00:00 2001
From: "Thomas Lange [tl]" 
Date: Fri, 6 Aug 2010 09:51:22 +0200
Subject: cws tl82: type fixed

---
 lingucomponent/source/spellcheck/spell/sspellimp.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index 115f241b5..6eff2b4b8 100755
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -461,7 +461,7 @@ Reference< XSpellAlternatives >
                     OUString *pStr = aStr.getArray();
                     for (int ii=0; ii < count; ++ii)
                     {
-                        OUString cvtwrd(suglst[ii],strlen(suglst[ii]),aEnc);
+                        OUString cvtwrd(suglst[ii],strlen(suglst[ii]),eEnc);
                         pStr[numsug + ii] = cvtwrd;
                     }
                     pMS->free_list(&suglst, count);
-- 
cgit v1.2.3


From ac96bce1aaaeb06740272c259716fbcc71f0efc9 Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen 
Date: Sat, 7 Aug 2010 18:06:20 +0200
Subject: gnumake2: fixed linking against pathutils in extensions

---
 extensions/source/nsplugin/source/makefile.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/source/nsplugin/source/makefile.mk b/extensions/source/nsplugin/source/makefile.mk
index 4f9be7434..5a0870b47 100644
--- a/extensions/source/nsplugin/source/makefile.mk
+++ b/extensions/source/nsplugin/source/makefile.mk
@@ -77,7 +77,7 @@ SHL1STDLIBS+=$(SOLARLIBDIR)$/npunix.o
 #.ENDIF #FREEBSD
 .ENDIF #UNX
 .IF "$(GUI)"=="WNT"
-SHL1OBJS+=$(SOLARLIBDIR)$/pathutils-slo.obj
+SHL1OBJS+=$(SOLARLIBDIR)$/pathutils-obj.obj
 STDLIBS+=$(SOLARLIBDIR)$/npwin.obj
 SHL1STDLIBS+= $(SHELL32LIB) $(SOLARLIBDIR)$/npwin.obj
 
-- 
cgit v1.2.3


From bd36a75d13678b0efba9cb1da954d88a7e1a5cda Mon Sep 17 00:00:00 2001
From: "Thomas Lange [tl]" 
Date: Mon, 9 Aug 2010 11:35:18 +0200
Subject: cws tl82: #i113293# sspellimp.cxx fixed

---
 .../source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx |  2 +-
 lingucomponent/source/spellcheck/spell/sspellimp.cxx    | 17 +++++++++--------
 lingucomponent/source/thesaurus/libnth/nthesimp.cxx     |  2 ++
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
index d12172c3a..167255dba 100755
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
@@ -46,8 +46,8 @@
 
 #include 
 #include 
-
 #include 
+#include 
 
 #include 
 #include 
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index 6eff2b4b8..28d534740 100755
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -51,6 +51,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -334,16 +335,16 @@ INT16 SpellChecker::GetSpellFailure( const OUString &rWord, const Locale &rLocal
                 eEnc = aDEncs[i];
             }
         
-            // we don't want to work with a default text encoding since following incorrect
-            // results may occur only for specific text and thus may be hard to notice.
-            // Thus better always make a clean exit here if the text encoding is in question.
-            // Hopefully something not working at all will raise proper attention quickly. ;-)
-            DBG_ASSERT( eEnc != RTL_TEXTENCODING_DONTKNOW, "failed to get text encoding! (maybe incorrect encoding string in file)" );
-            if (eEnc == RTL_TEXTENCODING_DONTKNOW)
-                return -1;
-
             if (pMS)
             {
+                // we don't want to work with a default text encoding since following incorrect
+                // results may occur only for specific text and thus may be hard to notice.
+                // Thus better always make a clean exit here if the text encoding is in question.
+                // Hopefully something not working at all will raise proper attention quickly. ;-)
+                DBG_ASSERT( eEnc != RTL_TEXTENCODING_DONTKNOW, "failed to get text encoding! (maybe incorrect encoding string in file)" );
+                if (eEnc == RTL_TEXTENCODING_DONTKNOW)
+                    return -1;
+
                 OString aWrd(OU2ENC(nWord,eEnc));
                 int rVal = pMS->spell((char*)aWrd.getStr());
                 if (rVal != 1)
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
index eadadceb4..21f8761a2 100755
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
@@ -41,6 +41,8 @@
 
 #include 
 #include 
+#include 
+
 #include "nthesimp.hxx"
 #include 
 #include 
-- 
cgit v1.2.3


From 1a1dbf7b3f3f0283966f74ff89d5bde0f6638584 Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" 
Date: Fri, 27 Aug 2010 16:51:16 +0200
Subject: dba34a: fail the test on caught exceptions

---
 forms/qa/integration/forms/ListSelection.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/forms/qa/integration/forms/ListSelection.java b/forms/qa/integration/forms/ListSelection.java
index e26acd69c..fb5831a34 100644
--- a/forms/qa/integration/forms/ListSelection.java
+++ b/forms/qa/integration/forms/ListSelection.java
@@ -136,8 +136,8 @@ public class ListSelection extends integration.forms.TestCase
         }
         catch( com.sun.star.uno.Exception e )
         {
-            System.err.println( e );
             e.printStackTrace( System.err );
+            failed( "caught an exception: " + e.toString() );
         }
     }
 
@@ -183,6 +183,7 @@ public class ListSelection extends integration.forms.TestCase
         catch( com.sun.star.uno.Exception e )
         {
             e.printStackTrace( System.err );
+            failed( "caught an exception: " + e.toString() );
         }
     }
 
@@ -217,6 +218,7 @@ public class ListSelection extends integration.forms.TestCase
         catch( com.sun.star.uno.Exception e )
         {
             e.printStackTrace( System.err );
+            failed( "caught an exception: " + e.toString() );
         }
     }
 
@@ -275,6 +277,7 @@ public class ListSelection extends integration.forms.TestCase
         catch( java.lang.Throwable e )
         {
             e.printStackTrace();
+            failed( "caught an exception: " + e.toString() );
         }
     }
 
-- 
cgit v1.2.3


From cf1afaac58847ddb8bfef567faba795804f8ab4a Mon Sep 17 00:00:00 2001
From: sb 
Date: Mon, 30 Aug 2010 16:22:08 +0200
Subject: sb123: #i114209# disabled
 forms.OGridControlModel::com::sun::star::view::XSelectionSupplier for now

---
 forms/qa/unoapi/knownissues.xcl | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/forms/qa/unoapi/knownissues.xcl b/forms/qa/unoapi/knownissues.xcl
index 09c1dee86..eb8efe91b 100644
--- a/forms/qa/unoapi/knownissues.xcl
+++ b/forms/qa/unoapi/knownissues.xcl
@@ -128,5 +128,8 @@ forms.OImageControlModel::com::sun::star::beans::XPropertySet
 ### i113201 ###
 forms.OEditModel::com::sun::star::form::validation::XValidatableFormComponent
 
+### i114209 ###
+forms.OGridControlModel::com::sun::star::view::XSelectionSupplier
+
 ### i111333 ###
 forms.OImageControlControl::com::sun::star::awt::XControl
-- 
cgit v1.2.3


From b3973555fb79db31471511611f9036edb40b5dc5 Mon Sep 17 00:00:00 2001
From: "Thomas Lange [tl]" 
Date: Wed, 1 Sep 2010 13:19:13 +0200
Subject: cws tl82: #i114233# add to dictionary fixed in spell check dialog

---
 cui/source/dialogs/SpellDialog.cxx | 103 ++++++++++++++++++++-----------------
 1 file changed, 55 insertions(+), 48 deletions(-)

diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 22ea4611a..a6c628885 100755
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -76,6 +76,8 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::linguistic2;
 
+using ::rtl::OUString;
+
 #define C2U(cChar) 					::rtl::OUString::createFromAscii(cChar)
 // struct SpellDialog_Impl ---------------------------------------------
 
@@ -930,7 +932,7 @@ void SpellDialog::SetTitle_Impl(LanguageType nLang)
   -----------------------------------------------------------------------*/
 void SpellDialog::InitUserDicts()
 {
-    sal_uInt16 nLang = aLanguageLB.GetSelectLanguage();
+    const LanguageType nLang = aLanguageLB.GetSelectLanguage();
 
     const Reference< XDictionary >  *pDic = 0;
 
@@ -948,51 +950,50 @@ void SpellDialog::InitUserDicts()
         pImpl->aDics = xDicList->getDictionaries();
     }
 
-    // Benutzerbuecher anzeigen
+    SvtLinguConfig aCfg;
+    const bool bHC = Application::GetSettings().GetStyleSettings().GetHighContrastMode();
+
+    // list suitable dictionaries
+    bool bEnable = false;
     const sal_Int32 nSize = pImpl->aDics.getLength();
     pDic = pImpl->aDics.getConstArray();
-    sal_Int32 i;
     delete aAddToDictMB.GetPopupMenu();
     PopupMenu* pMenu = new PopupMenu;
-    for (i = 0; i < nSize; ++i )
+    pMenu->SetMenuFlags(MENU_FLAG_NOAUTOMNEMONICS);
+    USHORT nItemId = 1;     // menu items should be enumerated from 1 and not 0
+    for (sal_Int32 i = 0; i < nSize; ++i)
     {
-        Reference< XDictionary >  xDic( pDic[i], UNO_QUERY );
-        if (!xDic.is() || SvxGetIgnoreAllList() == xDic)
+        uno::Reference< linguistic2::XDictionary >  xDicTmp( pDic[i], uno::UNO_QUERY );
+        if (!xDicTmp.is() || SvxGetIgnoreAllList() == xDicTmp)
             continue;
 
-        // add only active and not read-only dictionaries to list
-        // from which to choose from
-        Reference< frame::XStorable > xStor( xDic, UNO_QUERY );
-        if ( xDic->isActive()  &&  (!xStor.is() || !xStor->isReadonly()) )
+        uno::Reference< frame::XStorable > xStor( xDicTmp, uno::UNO_QUERY );
+        LanguageType nActLanguage = SvxLocaleToLanguage( xDicTmp->getLocale() );
+        if( xDicTmp->isActive()
+            &&  xDicTmp->getDictionaryType() != linguistic2::DictionaryType_NEGATIVE
+            && (nLang == nActLanguage || LANGUAGE_NONE == nActLanguage )
+            && (!xStor.is() || !xStor->isReadonly()) )
         {
-            sal_Bool bNegativ = xDic->getDictionaryType() == DictionaryType_NEGATIVE;
-            pMenu->InsertItem( (USHORT)i + 1, ::GetDicInfoStr( xDic->getName(),
-                                SvxLocaleToLanguage( xDic->getLocale() ), bNegativ ) );
-        }
-    }
-    aAddToDictMB.SetPopupMenu(pMenu);
-
-    aAddToDictMB.Disable();
+            pMenu->InsertItem( nItemId, xDicTmp->getName() );
+            bEnable = sal_True;
 
-    sal_uInt16 k;
-    for ( k = 0; k < pMenu->GetItemCount(); ++k )
-    {
-        sal_uInt16 nId = pMenu->GetItemId(k) - 1;
-        sal_Bool bFound = sal_False;
-
-        const sal_uInt16 nDicLang  = SvxLocaleToLanguage( pDic[nId]->getLocale() );
-        const sal_Bool bDicNegativ =
-            pDic[nId]->getDictionaryType() == DictionaryType_NEGATIVE;
-        // Stimmt die Sprache "uberein, dann enable
-        if ((nDicLang == nLang || nDicLang == LANGUAGE_NONE) && !bDicNegativ)
-            bFound = sal_True;
+            uno::Reference< lang::XServiceInfo > xSvcInfo( xDicTmp, uno::UNO_QUERY );
+            if (xSvcInfo.is())
+            {
+                OUString aDictionaryImageUrl( aCfg.GetSpellAndGrammarContextDictionaryImage(
+                        xSvcInfo->getImplementationName(), bHC) );
+                if (aDictionaryImageUrl.getLength() > 0)
+                {
+                    Image aImage( lcl_GetImageFromPngUrl( aDictionaryImageUrl ) );
+                    pMenu->SetItemImage( nItemId, aImage );
+                }
+            }
 
-        if (bFound)
-        {
-            aAddToDictMB.Enable();
-            break;
+            ++nItemId;
         }
     }
+    aAddToDictMB.SetPopupMenu(pMenu);
+    aAddToDictMB.Enable( bEnable );
 }
 /*-- 20.10.2003 15:31:06---------------------------------------------------
 
@@ -1000,31 +1001,39 @@ void SpellDialog::InitUserDicts()
 IMPL_LINK(SpellDialog, AddToDictionaryHdl, MenuButton*, pButton )
 {
     aSentenceED.UndoActionStart( SPELLUNDO_CHANGE_GROUP );
-    USHORT nItem = pButton->GetCurItemId();
 
     //GetErrorText() returns the current error even if the text is already
     //manually changed
-    String sNewWord= aSentenceED.GetErrorText();
+    const String aNewWord= aSentenceED.GetErrorText();
+
+    USHORT nItemId = pButton->GetCurItemId();
+    PopupMenu *pMenu = pButton->GetPopupMenu();
+    String aDicName ( pMenu->GetItemText( nItemId ) );
+
+    uno::Reference< linguistic2::XDictionary >      xDic;
+    uno::Reference< linguistic2::XDictionaryList >  xDicList( SvxGetDictionaryList() );
+    if (xDicList.is())
+        xDic = xDicList->getDictionaryByName( aDicName );
 
-    Reference< XDictionary >  xDic( pImpl->aDics.getConstArray()[ nItem - 1 ], UNO_QUERY );
     sal_Int16 nAddRes = DIC_ERR_UNKNOWN;
     if (xDic.is())
     {
-        String sTmpTxt( sNewWord );
-        sal_Bool bNegEntry = xDic->getDictionaryType() == DictionaryType_NEGATIVE;
-        nAddRes = linguistic::AddEntryToDic( xDic, sTmpTxt, bNegEntry,
-                ::rtl::OUString(), LANGUAGE_NONE );
+        nAddRes = linguistic::AddEntryToDic( xDic, aNewWord, FALSE, OUString(), LANGUAGE_NONE );
+        // save modified user-dictionary if it is persistent
+        uno::Reference< frame::XStorable >  xSavDic( xDic, uno::UNO_QUERY );
+        if (xSavDic.is())
+            xSavDic->store();
 
-        if(nAddRes == DIC_ERR_NONE)
+        if (nAddRes == DIC_ERR_NONE)
         {
             SpellUndoAction_Impl* pAction = new SpellUndoAction_Impl(
                             SPELLUNDO_CHANGE_ADD_TO_DICTIONARY, aDialogUndoLink);
-            pAction->SetDictionary(xDic);
-            pAction->SetAddedWord(sTmpTxt);
-            aSentenceED.AddUndoAction(pAction);
+            pAction->SetDictionary( xDic );
+            pAction->SetAddedWord( aNewWord );
+            aSentenceED.AddUndoAction( pAction );
         }
         // failed because there is already an entry?
-        if (DIC_ERR_NONE != nAddRes && xDic->getEntry( sTmpTxt ).is())
+        if (DIC_ERR_NONE != nAddRes && xDic->getEntry( aNewWord ).is())
             nAddRes = DIC_ERR_NONE;
     }
     if (DIC_ERR_NONE != nAddRes)
@@ -1032,8 +1041,6 @@ IMPL_LINK(SpellDialog, AddToDictionaryHdl, MenuButton*, pButton )
         SvxDicError( this, nAddRes );
         return 0;   // Nicht weitermachen
     }
-    // nach dem Aufnehmen ggf. '='-Zeichen entfernen
-    sNewWord.EraseAllChars( sal_Unicode( '=' ) );
 
     // go on
     SpellContinue_Impl();
-- 
cgit v1.2.3


From 2f5027e32f564c973514a5d542008082119bdd2a Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" 
Date: Fri, 3 Sep 2010 19:37:30 +0200
Subject: dba34a: i113188# don't call into XWindow implementations with own
 mutex locked

---
 forms/source/helper/windowstateguard.cxx | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/forms/source/helper/windowstateguard.cxx b/forms/source/helper/windowstateguard.cxx
index f3425b09b..11e3d0568 100644
--- a/forms/source/helper/windowstateguard.cxx
+++ b/forms/source/helper/windowstateguard.cxx
@@ -98,7 +98,7 @@ namespace frm
             @precond
                 our mutex is locked
         */
-        void    impl_ensureEnabledState_nothrow() const;
+        void    impl_ensureEnabledState_nothrow_nolck();
     };
 
     //--------------------------------------------------------------------
@@ -129,16 +129,24 @@ namespace frm
     }
 
     //--------------------------------------------------------------------
-    void WindowStateGuard_Impl::impl_ensureEnabledState_nothrow() const
+    void WindowStateGuard_Impl::impl_ensureEnabledState_nothrow_nolck()
     {
         try
         {
-            sal_Bool bEnabled = m_xWindow->isEnabled();
+            Reference< XWindow2 > xWindow;
+            sal_Bool bEnabled = sal_False;
             sal_Bool bShouldBeEnabled = sal_False;
-            OSL_VERIFY( m_xModelProps->getPropertyValue( PROPERTY_ENABLED ) >>= bShouldBeEnabled );
-
-            if ( !bShouldBeEnabled && bEnabled )
-                m_xWindow->setEnable( sal_False );
+            {
+                ::osl::MutexGuard aGuard( m_aMutex );
+                if ( !m_xWindow.is() || !m_xModelProps.is() )
+                    return;
+                xWindow = m_xWindow;
+                bEnabled = xWindow->isEnabled();
+                OSL_VERIFY( m_xModelProps->getPropertyValue( PROPERTY_ENABLED ) >>= bShouldBeEnabled );
+            }
+
+            if ( !bShouldBeEnabled && bEnabled && xWindow.is() )
+                xWindow->setEnable( sal_False );
         }
         catch( const Exception& )
         {
@@ -149,15 +157,13 @@ namespace frm
     //--------------------------------------------------------------------
     void SAL_CALL WindowStateGuard_Impl::windowEnabled( const EventObject& /*e*/ ) throw (RuntimeException)
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
-        impl_ensureEnabledState_nothrow();
+        impl_ensureEnabledState_nothrow_nolck();
     }
     
     //--------------------------------------------------------------------
     void SAL_CALL WindowStateGuard_Impl::windowDisabled( const EventObject& /*e*/ ) throw (RuntimeException)
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
-        impl_ensureEnabledState_nothrow();
+        impl_ensureEnabledState_nothrow_nolck();
     }
     
     //--------------------------------------------------------------------
-- 
cgit v1.2.3


From 6169141a42017548b1d77d438659236b0ebeba45 Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" 
Date: Fri, 3 Sep 2010 17:53:47 +0200
Subject: dba34a: removed SvLBox'es (and friends) Set/GetWindowBits. They were
 used in parallel to Window's Set/GetStyle, with WB_* values which overlapped
 with existing (generic) WB_* bits. Since this overlapping has been removed,
 there's no need to have both Style and WindowBits at those classes. Should
 remove some source of confusion and error (and, well, perhaps introduce some
 new errors :) ).

---
 basctl/source/basicide/macrodlg.cxx               |  7 ++++---
 basctl/source/basicide/moduldl2.cxx               |  2 +-
 basctl/source/basicide/moduldlg.cxx               |  7 ++++---
 basctl/source/basicide/objdlg.cxx                 |  7 ++++---
 cui/source/customize/acccfg.cxx                   |  4 ++--
 cui/source/customize/cfg.cxx                      |  2 +-
 cui/source/customize/cfgutil.cxx                  |  4 ++--
 cui/source/customize/selector.cxx                 |  4 ++--
 cui/source/dialogs/hangulhanjadlg.cxx             |  2 +-
 cui/source/dialogs/hlmarkwn.cxx                   |  4 ++--
 cui/source/dialogs/scriptdlg.cxx                  |  2 +-
 cui/source/dialogs/srchxtra.cxx                   |  2 +-
 cui/source/dialogs/thesdlg.cxx                    |  2 +-
 cui/source/options/dbregister.cxx                 |  2 +-
 cui/source/options/fontsubs.cxx                   |  2 +-
 cui/source/options/optdict.cxx                    |  2 +-
 cui/source/options/optfltr.cxx                    |  2 +-
 cui/source/options/optlingu.cxx                   |  8 ++++----
 cui/source/options/optpath.cxx                    |  1 -
 cui/source/options/treeopt.cxx                    |  2 +-
 cui/source/options/webconninfo.cxx                |  2 +-
 cui/source/tabpages/autocdlg.cxx                  |  8 ++++----
 extensions/source/bibliography/datman.cxx         |  2 +-
 extensions/source/propctrlr/selectlabeldialog.cxx |  2 +-
 extensions/source/scanner/sanedlg.cxx             | 13 +++++++------
 25 files changed, 49 insertions(+), 46 deletions(-)

diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index 8073b48d1..bf65eca12 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -121,9 +121,10 @@ MacroChooser::MacroChooser( Window* pParnt, BOOL bCreateEntries ) :
     aMacroBox.SetSelectHdl( LINK( this, MacroChooser, MacroSelectHdl ) );
 
     aBasicBox.SetMode( BROWSEMODE_MODULES );
-    aBasicBox.SetWindowBits( WB_HASLINES | WB_HASLINESATROOT | 
-                             WB_HASBUTTONS | WB_HASBUTTONSATROOT |
-                             WB_HSCROLL );
+    aBasicBox.SetStyle( WB_TABSTOP | WB_BORDER |
+                        WB_HASLINES | WB_HASLINESATROOT | 
+                        WB_HASBUTTONS | WB_HASBUTTONSATROOT |
+                        WB_HSCROLL );
 
     BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
     SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 312dee4c2..ad755374f 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -521,7 +521,7 @@ LibPage::LibPage( Window * pParent )
 
     aLibBox.SetMode( LIBMODE_MANAGER );
     aLibBox.EnableInplaceEditing( TRUE );
-    aLibBox.SetWindowBits( WB_HSCROLL );
+    aLibBox.SetStyle( WB_HSCROLL | WB_BORDER | WB_TABSTOP );
     aCloseButton.GrabFocus();
 
     long aTabs[] = { 2, 30, 120 };
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index e2a2377e5..857adaf56 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -596,9 +596,10 @@ ObjectPage::ObjectPage( Window * pParent, const ResId& rResId, USHORT nMode ) :
     aBasicBox.SetDragDropMode( SV_DRAGDROP_CTRL_MOVE | SV_DRAGDROP_CTRL_COPY );
     aBasicBox.EnableInplaceEditing( TRUE );
     aBasicBox.SetMode( nMode );
-    aBasicBox.SetWindowBits( WB_HASLINES | WB_HASLINESATROOT | 
-                             WB_HASBUTTONS | WB_HASBUTTONSATROOT |
-                             WB_HSCROLL );
+    aBasicBox.SetStyle( WB_BORDER | WB_TABSTOP |
+                        WB_HASLINES | WB_HASLINESATROOT | 
+                        WB_HASBUTTONS | WB_HASBUTTONSATROOT |
+                        WB_HSCROLL );
     aBasicBox.ScanAllEntries();
 
     aEditButton.GrabFocus();
diff --git a/basctl/source/basicide/objdlg.cxx b/basctl/source/basicide/objdlg.cxx
index 21e50384e..9c1d74879 100644
--- a/basctl/source/basicide/objdlg.cxx
+++ b/basctl/source/basicide/objdlg.cxx
@@ -102,9 +102,10 @@ ObjectCatalog::ObjectCatalog( Window * pParent )
     aToolBox.SetSizePixel( aToolBox.CalcWindowSizePixel() );
     aToolBox.SetSelectHdl( LINK( this, ObjectCatalog, ToolBoxHdl ) );
 
-    aMacroTreeList.SetWindowBits( WB_HASLINES | WB_HASLINESATROOT | 
-                                  WB_HASBUTTONS | WB_HASBUTTONSATROOT |
-                                  WB_HSCROLL );
+    aMacroTreeList.SetStyle( WB_BORDER | WB_TABSTOP |
+                             WB_HASLINES | WB_HASLINESATROOT | 
+                             WB_HASBUTTONS | WB_HASBUTTONSATROOT |
+                             WB_HSCROLL );
 
     aMacroTreeList.SetSelectHdl( LINK( this, ObjectCatalog, TreeListHighlightHdl ) );
 
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index f96adaf6d..a73718782 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -744,7 +744,7 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( Window* pParent, const SfxIt
     aModuleButton.SetClickHdl( LINK( this, SfxAcceleratorConfigPage, RadioHdl  ));
 
     // initialize Entriesbox
-    aEntriesBox.SetWindowBits(WB_HSCROLL|WB_CLIPCHILDREN);
+    aEntriesBox.SetStyle(aEntriesBox.GetStyle()|WB_HSCROLL|WB_CLIPCHILDREN);
     aEntriesBox.SetSelectionMode(SINGLE_SELECTION);
     aEntriesBox.SetTabs(&AccCfgTabs[0], MAP_APPFONT);
     aEntriesBox.Resize(); // OS: Hack for right selection
@@ -768,7 +768,7 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( Window* pParent, const SfxIt
     pGroupLBox->SetFunctionListBox(pFunctionBox);
 
     // initialize KeyBox
-    aKeyBox.SetWindowBits(WB_CLIPCHILDREN|WB_HSCROLL|WB_SORT);
+    aKeyBox.SetStyle(aKeyBox.GetStyle()|WB_CLIPCHILDREN|WB_HSCROLL|WB_SORT);
 }
 
 //-----------------------------------------------
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index db5f94e89..288b9702b 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1487,7 +1487,7 @@ SvxMenuEntriesListBox::SvxMenuEntriesListBox(
     , pPage( (SvxMenuConfigPage*) pParent )
     , m_bIsInternalDrag( FALSE )
 {
-    SetWindowBits(
+    SetStyle(
         GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_HIDESELECTION );
 
     SetSpaceBetweenEntries( 3 );
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 10b3f7a8b..42f074206 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -287,7 +287,7 @@ SfxConfigFunctionListBox_Impl::SfxConfigFunctionListBox_Impl( Window* pParent, c
     , pCurEntry( 0 )
     , pStylesInfo( 0 )
 {
-    SetWindowBits( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_SORT );
+    SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_SORT );
     GetModel()->SetSortMode( SortAscending );
 
     // Timer f"ur die BallonHelp
@@ -488,7 +488,7 @@ SfxConfigGroupListBox_Impl::SfxConfigGroupListBox_Impl(
         : SvTreeListBox( pParent, rResId )
         , pImp(new SvxConfigGroupBoxResource_Impl()), pFunctionListBox(0), nMode( nConfigMode ), bShowSF( FALSE ), bShowBasic( TRUE ), pStylesInfo(0)
 {
-    SetWindowBits( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT );
+    SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT );
     SetNodeBitmaps( pImp->m_collapsedImage, pImp->m_expandedImage, BMP_COLOR_NORMAL );
     SetNodeBitmaps( pImp->m_collapsedImage_hc, pImp->m_expandedImage_hc, BMP_COLOR_HIGHCONTRAST );
 
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index 3b80d8062..70278761c 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -90,7 +90,7 @@ SvxConfigFunctionListBox_Impl::SvxConfigFunctionListBox_Impl( Window* pParent, c
     , pCurEntry( 0 )
     , m_pDraggingEntry( 0 )
 {
-    SetWindowBits( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_SORT );
+    SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_SORT );
     GetModel()->SetSortMode( SortAscending );
 
     // Timer f"ur die BallonHelp
@@ -226,7 +226,7 @@ SvxConfigGroupListBox_Impl::SvxConfigGroupListBox_Impl(
         m_xFrame.set( xFrame );
     }
 
-    SetWindowBits( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT );
+    SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT );
 
     ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) );
 
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 73a303a63..3b5e2bd79 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -1158,7 +1158,7 @@ namespace svx
         ,m_pCheckButtonData		( NULL )
         ,m_xConversionDictionaryList( NULL )
     {
-        m_aDictsLB.SetWindowBits( WB_CLIPCHILDREN | WB_HSCROLL | WB_FORCE_MAKEVISIBLE );
+        m_aDictsLB.SetStyle( m_aDictsLB.GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_FORCE_MAKEVISIBLE );
         m_aDictsLB.SetSelectionMode( SINGLE_SELECTION );
         m_aDictsLB.SetHighlightRange();
 //		m_aDictsLB.SetHelpId( xxx );
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index 42a33e455..95adfa4ad 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -145,9 +145,9 @@ SvxHlinkDlgMarkWnd::SvxHlinkDlgMarkWnd( SvxHyperlinkTabPageBase *pParent )
     maLbTree.SetDoubleClickHdl	( LINK ( this, SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl ) );
 
     // Tree-ListBox mit Linien versehen
-    maLbTree.SetWindowBits( WinBits( WB_TABSTOP | WB_BORDER | WB_HASLINES |
+    maLbTree.SetStyle( maLbTree.GetStyle() | WB_TABSTOP | WB_BORDER | WB_HASLINES |
                             WB_HASBUTTONS |  //WB_HASLINESATROOT |
-                            WB_HSCROLL | WB_HASBUTTONSATROOT ) );
+                            WB_HSCROLL | WB_HASBUTTONSATROOT );
 }
 
 SvxHlinkDlgMarkWnd::~SvxHlinkDlgMarkWnd()
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index efef9c7f0..0febc175a 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -99,7 +99,7 @@ SFTreeListBox::SFTreeListBox( Window* pParent, const ResId& rResId ) :
     FreeResource();
     SetSelectionMode( SINGLE_SELECTION );
     
-    SetWindowBits( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL |
+    SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL |
                    WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HIDESELECTION |
                    WB_HASLINES | WB_HASLINESATROOT );
     SetNodeDefaultImages();
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index e789ec95c..50bf596ce 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -151,7 +151,7 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog( Window* pParent,
 {
     FreeResource();
 
-    aAttrLB.SetWindowBits( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_SORT );
+    aAttrLB.SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_SORT );
     aAttrLB.GetModel()->SetSortMode( SortAscending );
 
     aOKBtn.SetClickHdl( LINK( this, SvxSearchAttributeDialog, OKHdl ) );
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index c069e973d..6f7f4264e 100755
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -209,7 +209,7 @@ ThesaurusAlternativesCtrl_Impl::ThesaurusAlternativesCtrl_Impl(
     SvxCheckListBox( pParent, CUI_RES( CT_THES_ALTERNATIVES ) ),
     m_rDialogImpl( rImpl )
 {
-    SetWindowBits( WB_CLIPCHILDREN | WB_HSCROLL | WB_FORCE_MAKEVISIBLE );
+    SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_FORCE_MAKEVISIBLE );
     SetHighlightRange();
 }
 
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index 51d941b44..987055f93 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -159,7 +159,7 @@ DbRegistrationOptionsPage::DbRegistrationOptionsPage( Window* pParent, const Sfx
     Size aHeadSize = pHeaderBar->GetSizePixel();
 
     aPathCtrl.SetFocusControl( pPathBox );
-    pPathBox->SetWindowBits( nBits );
+    pPathBox->SetStyle( pPathBox->GetStyle()|nBits );
     pPathBox->SetDoubleClickHdl( LINK( this, DbRegistrationOptionsPage, EditHdl ) );
     pPathBox->SetSelectHdl( LINK( this, DbRegistrationOptionsPage, PathSelect_Impl ) );
     pPathBox->SetSelectionMode( SINGLE_SELECTION );
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index e214a5e73..c8cf56bc6 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -98,7 +98,7 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( Window* pParent,
     aNewDelTBX.SetPosPixel( aNewPnt );
 
     aCheckLB.SetHelpId(HID_OFA_FONT_SUBST_CLB);
-    aCheckLB.SetWindowBits(aCheckLB.GetStyle()|WB_HSCROLL|WB_VSCROLL);
+    aCheckLB.SetStyle(aCheckLB.GetStyle()|WB_HSCROLL|WB_VSCROLL);
     aCheckLB.SetSelectionMode(MULTIPLE_SELECTION);
     aCheckLB.SortByCol(2);
 
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index f18439b3d..2cc72f7af 100755
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -256,7 +256,7 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog(
     aWordsLB.SetTabs(nStaticTabs);
 
     //! we use an algorithm of our own to insert elements sorted
-    aWordsLB.SetWindowBits(/*WB_SORT|*/WB_HSCROLL|WB_CLIPCHILDREN);
+    aWordsLB.SetStyle(aWordsLB.GetStyle()|/*WB_SORT|*/WB_HSCROLL|WB_CLIPCHILDREN);
 
 
     nWidth=aWordED.GetSizePixel().Width();
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 51034c944..530d6005f 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -165,7 +165,7 @@ OfaMSFilterTabPage2::OfaMSFilterTabPage2( Window* pParent,
                     HIB_CENTER | HIB_VCENTER | HIB_FIXEDPOS | HIB_FIXED );
 
     aCheckLB.SetHelpId( HID_OFAPAGE_MSFLTR2_CLB );
-    aCheckLB.SetWindowBits( WB_HSCROLL| WB_VSCROLL );
+    aCheckLB.SetStyle( aCheckLB.GetStyle()|WB_HSCROLL| WB_VSCROLL );
 }
 
 OfaMSFilterTabPage2::~OfaMSFilterTabPage2()
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 132344e37..c37e6c9fa 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1140,7 +1140,7 @@ SvxLinguTabPage::SvxLinguTabPage( Window* pParent,
 {
     pCheckButtonData = NULL;
 
-    aLinguModulesCLB.SetWindowBits( WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE );
+    aLinguModulesCLB.SetStyle( aLinguModulesCLB.GetStyle()|WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE );
     aLinguModulesCLB.SetHelpId(HID_CLB_LINGU_MODULES );
     aLinguModulesCLB.SetHighlightRange();
     aLinguModulesCLB.SetSelectHdl( LINK( this, SvxLinguTabPage, SelectHdl_Impl ));
@@ -1150,7 +1150,7 @@ SvxLinguTabPage::SvxLinguTabPage( Window* pParent,
     aLinguModulesEditPB.SetClickHdl( LINK( this, SvxLinguTabPage, ClickHdl_Impl ));
     aLinguOptionsEditPB.SetClickHdl( LINK( this, SvxLinguTabPage, ClickHdl_Impl ));
 
-    aLinguDicsCLB.SetWindowBits( WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE );
+    aLinguDicsCLB.SetStyle( aLinguDicsCLB.GetStyle()|WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE );
     aLinguDicsCLB.SetHelpId(HID_CLB_EDIT_MODULES_DICS );
     aLinguDicsCLB.SetHighlightRange();
     aLinguDicsCLB.SetSelectHdl( LINK( this, SvxLinguTabPage, SelectHdl_Impl ));
@@ -1160,7 +1160,7 @@ SvxLinguTabPage::SvxLinguTabPage( Window* pParent,
     aLinguDicsEditPB.SetClickHdl( LINK( this, SvxLinguTabPage, ClickHdl_Impl ));
     aLinguDicsDelPB.SetClickHdl( LINK( this, SvxLinguTabPage, ClickHdl_Impl ));
 
-    aLinguOptionsCLB.SetWindowBits( WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE );
+    aLinguOptionsCLB.SetStyle( aLinguOptionsCLB.GetStyle()|WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE );
     aLinguOptionsCLB.SetHelpId(HID_CLB_LINGU_OPTIONS );
     aLinguOptionsCLB.SetHighlightRange();
     aLinguOptionsCLB.SetSelectHdl( LINK( this, SvxLinguTabPage, SelectHdl_Impl ));
@@ -2050,7 +2050,7 @@ SvxEditModulesDlg::SvxEditModulesDlg(Window* pParent, SvxLinguData_Impl& rData)
 
     pDefaultLinguData = new SvxLinguData_Impl( rLinguData );
 
-    aModulesCLB.SetWindowBits( WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE );
+    aModulesCLB.SetStyle( aModulesCLB.GetStyle()|WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE );
     aModulesCLB.SetHighlightRange();
     aModulesCLB.SetHelpId(HID_CLB_EDIT_MODULES_MODULES );
     aModulesCLB.SetSelectHdl( LINK( this, SvxEditModulesDlg, SelectHdl_Impl ));
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 75b9c7832..6ea3e1b21 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -254,7 +254,6 @@ SvxPathTabPage::SvxPathTabPage( Window* pParent, const SfxItemSet& rSet ) :
     WinBits nBits = WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP;
     pPathBox = new svx::OptHeaderTabListBox( &aPathCtrl, nBits );
     aPathCtrl.SetFocusControl( pPathBox );
-    pPathBox->SetWindowBits( nBits );
     pPathBox->SetDoubleClickHdl( aLink );
     pPathBox->SetSelectHdl( LINK( this, SvxPathTabPage, PathSelect_Impl ) );
     pPathBox->SetSelectionMode( MULTIPLE_SELECTION );
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index fa11d7bcd..94d8badf0 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -891,7 +891,7 @@ void OfaTreeOptionsDialog::InitTreeAndHandler()
     delete pIsoRes;
 
     aTreeLB.SetHelpId( HID_OFADLG_TREELISTBOX );
-    aTreeLB.SetWindowBits( WB_HASBUTTONS | WB_HASBUTTONSATROOT |
+    aTreeLB.SetStyle( aTreeLB.GetStyle()|WB_HASBUTTONS | WB_HASBUTTONSATROOT |
                            WB_HASLINES | WB_HASLINESATROOT |
                            WB_CLIPCHILDREN | WB_HSCROLL | WB_FORCE_MAKEVISIBLE );
     aTreeLB.SetSpaceBetweenEntries( 0 );
diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx
index 2eeec105f..b90162c8b 100644
--- a/cui/source/options/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -52,7 +52,7 @@ namespace svx
 PasswordTable::PasswordTable( Window* pParent, const ResId& rResId ) :
     SvxSimpleTable( pParent, rResId )
 {
-    SetWindowBits( GetStyle() | WB_NOINITIALSELECTION );
+    SetStyle( GetStyle() | WB_NOINITIALSELECTION );
 }
 
 void PasswordTable::InsertHeaderItem( USHORT nColumn, const String& rText, HeaderBarItemBits nBits )
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index d274cb016..ab26f94f9 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -493,7 +493,7 @@ OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( Window* pParent,
     SvtSysLocale aSysLcl;
 
     aCheckLB.SetHelpId(HID_OFAPAGE_AUTOFORMAT_CLB);
-    aCheckLB.SetWindowBits(WB_HSCROLL| WB_VSCROLL);
+    aCheckLB.SetStyle(aCheckLB.GetStyle()|WB_HSCROLL| WB_VSCROLL);
 
     aCheckLB.SetSelectHdl(LINK(this, OfaSwAutoFmtOptionsPage, SelectHdl));
     aCheckLB.SetDoubleClickHdl(LINK(this, OfaSwAutoFmtOptionsPage, EditHdl));
@@ -1022,7 +1022,7 @@ OfaAutocorrReplacePage::OfaAutocorrReplacePage( Window* pParent,
     static long nTabs[] = { 2 /* Tab-Count */, 1, 61 };
     aReplaceTLB.SetTabs( &nTabs[0], MAP_APPFONT );
 
-    aReplaceTLB.SetWindowBits(WB_HSCROLL|WB_CLIPCHILDREN);
+    aReplaceTLB.SetStyle(aReplaceTLB.GetStyle()|WB_HSCROLL|WB_CLIPCHILDREN);
     aReplaceTLB.SetSelectHdl(LINK(this, OfaAutocorrReplacePage, SelectHdl));
     aNewReplacePB.SetClickHdl( LINK(this, OfaAutocorrReplacePage, NewDelHdl));
     aDeleteReplacePB.SetClickHdl(LINK(this, OfaAutocorrReplacePage, NewDelHdl));
@@ -2076,7 +2076,7 @@ OfaQuoteTabPage::OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ) :
             3, 0, 20, 40
         };
     
-        aSwCheckLB.SetWindowBits(WB_HSCROLL| WB_VSCROLL);
+        aSwCheckLB.SetStyle(aSwCheckLB.GetStyle() | WB_HSCROLL| WB_VSCROLL);
 
         aSwCheckLB.SvxSimpleTable::SetTabs(aStaticTabs);
         String sHeader( sHeader1 );
@@ -2647,7 +2647,7 @@ OfaSmartTagOptionsTabPage::OfaSmartTagOptionsTabPage( Window* pParent,
     FreeResource();
 
     // some options for the list box:
-    m_aSmartTagTypesLB.SetWindowBits( m_aSmartTagTypesLB.GetStyle() | WB_HSCROLL | WB_HIDESELECTION );
+    m_aSmartTagTypesLB.SetStyle( m_aSmartTagTypesLB.GetStyle() | WB_HSCROLL | WB_HIDESELECTION );
     m_aSmartTagTypesLB.SetHighlightRange();
 
     // set the handlers:
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 52575a6f3..75520691a 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -646,7 +646,7 @@ DBChangeDialog_Impl::DBChangeDialog_Impl(Window* pParent, BibDataManager* pMan )
         aSelectionHB.Show();
 
         aSelectionLB.SetTabs( &nTabs[0], MAP_PIXEL );
-        aSelectionLB.SetWindowBits(WB_CLIPCHILDREN|WB_SORT);
+        aSelectionLB.SetStyle(aSelectionLB.GetStyle()|WB_CLIPCHILDREN|WB_SORT);
         aSelectionLB.GetModel()->SetSortMode(SortAscending);
 
         ::rtl::OUString sActiveSource = pDatMan->getActiveDataSource();
diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx
index c81e59f0b..c5b920363 100644
--- a/extensions/source/propctrlr/selectlabeldialog.cxx
+++ b/extensions/source/propctrlr/selectlabeldialog.cxx
@@ -79,7 +79,7 @@ namespace pcr
         m_aControlTree.SetSelectionMode( SINGLE_SELECTION );
         m_aControlTree.SetDragDropMode( 0 );
         m_aControlTree.EnableInplaceEditing( sal_False );
-        m_aControlTree.SetWindowBits(WB_BORDER | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HSCROLL);
+        m_aControlTree.SetStyle(m_aControlTree.GetStyle() | WB_BORDER | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HSCROLL);
 
         m_aControlTree.SetNodeBitmaps( m_aModelImages.GetImage( RID_SVXIMG_COLLAPSEDNODE ), m_aModelImages.GetImage( RID_SVXIMG_EXPANDEDNODE ) );
         m_aControlTree.SetSelectHdl(LINK(this, OSelectLabelDialog, OnEntrySelected));
diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx
index 44562a7ec..385470a40 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -120,12 +120,13 @@ SaneDlg::SaneDlg( Window* pParent, Sane& rSane ) :
         Bitmap( SaneResId( RID_SCAN_BITMAP_PLUS ) ),
         Bitmap( SaneResId( RID_SCAN_BITMAP_MINUS ) )
         );
-    maOptionBox.SetWindowBits( WB_HASLINES				|
-                               WB_HASBUTTONS			|
-                               WB_NOINITIALSELECTION	|
-                               WB_HASBUTTONSATROOT		|
-                               WB_HASLINESATROOT
-                               );
+    maOptionBox.SetStyle( maOptionBox.GetStyle()|
+                          WB_HASLINES           |
+                          WB_HASBUTTONS         |
+                          WB_NOINITIALSELECTION |
+                          WB_HASBUTTONSATROOT   |
+                          WB_HASLINESATROOT
+                        );
     FreeResource();
 }
 
-- 
cgit v1.2.3


From f79ba95473002e9da9118eba39e2375c5e8fb993 Mon Sep 17 00:00:00 2001
From: "Thomas Lange [tl]" 
Date: Mon, 6 Sep 2010 10:02:33 +0200
Subject: cws tl82: #i114160# SimplePasswordRequest and respective dialog

---
 cui/source/options/webconninfo.cxx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 cui/source/options/webconninfo.cxx

diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx
old mode 100644
new mode 100755
index 2eeec105f..8f55c6f51
--- a/cui/source/options/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -311,10 +311,8 @@ IMPL_LINK( WebConnectionInfoDialog, ChangePasswordHdl, PushButton*, EMPTYARG )
             ::rtl::OUString aURL = m_aPasswordsLB.GetEntryText( pEntry, 0 );
             ::rtl::OUString aUserName = m_aPasswordsLB.GetEntryText( pEntry, 1 );
 
-            ::comphelper::DocPasswordRequest* pPasswordRequest 
-                  = new ::comphelper::DocPasswordRequest(
-                      ::comphelper::DocPasswordRequestType_STANDARD, 
-                      task::PasswordRequestMode_PASSWORD_CREATE, aURL );
+            ::comphelper::SimplePasswordRequest* pPasswordRequest 
+                  = new ::comphelper::SimplePasswordRequest( task::PasswordRequestMode_PASSWORD_CREATE );
             uno::Reference< task::XInteractionRequest > rRequest( pPasswordRequest );
 
             uno::Reference< task::XInteractionHandler > xInteractionHandler(
-- 
cgit v1.2.3


From 84b073ca6f791aae5e6dbfb7c34cd59965052320 Mon Sep 17 00:00:00 2001
From: sb 
Date: Fri, 10 Sep 2010 13:10:07 +0200
Subject: sb129: #i113189# change UNO components to use passive registration

---
 UnoControls/prj/d.lst                              |   1 +
 UnoControls/source/base/registercontrols.cxx       | 100 --------
 UnoControls/util/ctl.component                     |  43 ++++
 UnoControls/util/makefile.mk                       |   8 +
 .../org/openoffice/accessibility/AccessBridge.java |   5 -
 .../accessibility/java_uno_accessbridge.component  |  34 +++
 .../org/openoffice/accessibility/makefile.mk       |   7 +
 accessibility/prj/d.lst                            |   2 +-
 basctl/prj/d.lst                                   |   1 +
 basctl/source/basicide/register.cxx                |  22 --
 basctl/util/basctl.component                       |  34 +++
 basctl/util/basctl.map                             |   1 -
 basctl/util/makefile.mk                            |   8 +
 embedserv/prj/d.lst                                |   1 +
 embedserv/source/embed/register.cxx                |  30 +--
 embedserv/util/emser.component                     |  34 +++
 embedserv/util/exports.dxp                         |   1 -
 embedserv/util/makefile.mk                         |   8 +
 extensions/prj/d.lst                               |  17 ++
 extensions/source/abpilot/abp.component            |  34 +++
 extensions/source/abpilot/abpservices.cxx          |  21 --
 extensions/source/abpilot/exports.dxp              |   1 -
 extensions/source/abpilot/makefile.mk              |   8 +
 extensions/source/bibliography/bib.component       |  35 +++
 extensions/source/bibliography/bibload.cxx         |  30 ---
 extensions/source/bibliography/makefile.mk         |   8 +
 extensions/source/config/ldap/componentdef.cxx     |   7 -
 extensions/source/config/ldap/exports.dxp          |   1 -
 extensions/source/config/ldap/ldapbe2.component    |  34 +++
 extensions/source/config/ldap/makefile.mk          |   8 +
 extensions/source/dbpilots/dbp.component           |  40 ++++
 extensions/source/dbpilots/dbpservices.cxx         |  21 --
 extensions/source/dbpilots/makefile.mk             |   8 +
 extensions/source/inc/componentmodule.cxx          |  48 ----
 extensions/source/inc/componentmodule.hxx          |  15 --
 extensions/source/logging/log.component            |  47 ++++
 extensions/source/logging/makefile.mk              |   8 +
 extensions/source/ole/makefile.mk                  |   7 +
 extensions/source/ole/oleautobridge.component      |  46 ++++
 extensions/source/ole/oleautobridge.uno.dxp        |   1 -
 extensions/source/ole/servreg.cxx                  |  41 ----
 extensions/source/oooimprovecore/makefile.mk       |   8 +
 .../source/oooimprovecore/oooimprovecore.component |  34 +++
 extensions/source/oooimprovement/makefile.mk       |   8 +
 .../source/oooimprovement/oooimprovement.component |  40 ++++
 .../oooimprovement/oooimprovement_exports.cxx      |  22 --
 extensions/source/plugin/base/service.cxx          |  27 ---
 extensions/source/plugin/util/makefile.mk          |   8 +
 extensions/source/plugin/util/pl.component         |  37 +++
 extensions/source/preload/makefile.mk              |   8 +
 extensions/source/preload/preload.component        |  34 +++
 extensions/source/preload/services.cxx             |  21 --
 extensions/source/propctrlr/makefile.mk            |   8 +
 extensions/source/propctrlr/pcr.component          |  91 ++++++++
 extensions/source/propctrlr/pcrservices.cxx        |  21 --
 extensions/source/resource/exports.dxp             |   1 -
 extensions/source/resource/makefile.mk             |   8 +
 extensions/source/resource/res.component           |  38 +++
 extensions/source/resource/res_services.cxx        |  42 ----
 extensions/source/scanner/exports.dxp              |   1 -
 extensions/source/scanner/makefile.mk              |   8 +
 extensions/source/scanner/scn.component            |  34 +++
 extensions/source/scanner/scnserv.cxx              |  31 ---
 extensions/source/svg/svguno.cxx                   |  30 ---
 extensions/source/update/check/makefile.mk         |   8 +
 extensions/source/update/check/updatecheckjob.cxx  |  12 -
 .../source/update/check/updchk.uno.component       |  37 +++
 extensions/source/update/feed/makefile.mk          |   8 +
 extensions/source/update/feed/updatefeed.component |  34 +++
 extensions/source/update/feed/updatefeed.cxx       |  12 -
 extensions/source/update/ui/makefile.mk            |   8 +
 extensions/source/update/ui/updatecheckui.cxx      |  12 -
 extensions/source/update/ui/updchk.component       |  34 +++
 extensions/source/xmlextract/makefile.mk           |   8 +
 extensions/source/xmlextract/xmx.component         |  34 +++
 extensions/source/xmlextract/xmxuno.cxx            |  21 --
 forms/prj/d.lst                                    |   1 +
 forms/source/inc/forms_module.hxx                  |  15 --
 forms/source/inc/forms_module_impl.hxx             |  48 ----
 forms/source/misc/services.cxx                     |  67 ------
 forms/util/frm.component                           | 259 +++++++++++++++++++++
 forms/util/frm.dxp                                 |   1 -
 forms/util/makefile.mk                             |   8 +
 lingucomponent/prj/d.lst                           |   5 +
 .../hyphenator/altlinuxhyph/hyphen/exports.dxp     |   1 -
 .../source/hyphenator/altlinuxhyph/hyphen/hreg.cxx |   9 -
 .../altlinuxhyph/hyphen/hyphen.component           |  34 +++
 .../hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx   |  26 ---
 .../hyphenator/altlinuxhyph/hyphen/makefile.mk     |   8 +
 .../source/languageguessing/guesslang.component    |  34 +++
 .../source/languageguessing/guesslang.cxx          |   7 -
 lingucomponent/source/languageguessing/makefile.mk |   8 +
 .../spellcheck/macosxspell/MacOSXSpell.component   |  34 +++
 .../source/spellcheck/macosxspell/macreg.cxx       |   9 -
 .../source/spellcheck/macosxspell/macspellimp.cxx  |  26 ---
 .../source/spellcheck/macosxspell/makefile.mk      |   8 +
 lingucomponent/source/spellcheck/spell/exports.dxp |   1 -
 lingucomponent/source/spellcheck/spell/makefile.mk |   8 +
 .../source/spellcheck/spell/spell.component        |  34 +++
 lingucomponent/source/spellcheck/spell/sreg.cxx    |   9 -
 .../source/spellcheck/spell/sspellimp.cxx          |  26 ---
 lingucomponent/source/thesaurus/libnth/exports.dxp |   1 -
 .../source/thesaurus/libnth/lnth.component         |  34 +++
 lingucomponent/source/thesaurus/libnth/makefile.mk |   8 +
 .../source/thesaurus/libnth/nthesimp.cxx           |  25 --
 lingucomponent/source/thesaurus/libnth/ntreg.cxx   |   9 -
 package/prj/d.lst                                  |   2 +
 package/source/manifest/UnoRegister.cxx            |  63 -----
 package/source/xstor/makefile.mk                   |   8 +
 package/source/xstor/register.cxx                  |  28 ---
 package/source/xstor/xstor.component               |  35 +++
 package/source/xstor/xstor.dxp                     |   1 -
 package/util/exports.dxp                           |   1 -
 package/util/makefile.mk                           |   8 +
 package/util/package2.component                    |  44 ++++
 .../com/sun/star/wizards/agenda/CallWizard.java    |  18 +-
 .../com/sun/star/wizards/agenda/agenda.component   |  35 +++
 wizards/com/sun/star/wizards/agenda/makefile.mk    |   8 +
 wizards/com/sun/star/wizards/fax/CallWizard.java   |  19 +-
 wizards/com/sun/star/wizards/fax/fax.component     |  35 +++
 wizards/com/sun/star/wizards/fax/makefile.mk       |   8 +
 .../com/sun/star/wizards/form/CallFormWizard.java  |  17 +-
 wizards/com/sun/star/wizards/form/form.component   |  35 +++
 wizards/com/sun/star/wizards/form/makefile.mk      |   8 +
 .../com/sun/star/wizards/letter/CallWizard.java    |  19 +-
 .../com/sun/star/wizards/letter/letter.component   |  35 +++
 wizards/com/sun/star/wizards/letter/makefile.mk    |   8 +
 .../sun/star/wizards/query/CallQueryWizard.java    |  17 +-
 wizards/com/sun/star/wizards/query/makefile.mk     |   8 +
 wizards/com/sun/star/wizards/query/query.component |  35 +++
 .../sun/star/wizards/report/CallReportWizard.java  |  20 +-
 wizards/com/sun/star/wizards/report/makefile.mk    |   8 +
 .../com/sun/star/wizards/report/report.component   |  35 +++
 .../sun/star/wizards/table/CallTableWizard.java    |  17 +-
 wizards/com/sun/star/wizards/table/makefile.mk     |   8 +
 wizards/com/sun/star/wizards/table/table.component |  35 +++
 wizards/com/sun/star/wizards/web/CallWizard.java   |  19 +-
 wizards/com/sun/star/wizards/web/makefile.mk       |   8 +
 wizards/com/sun/star/wizards/web/web.component     |  35 +++
 wizards/prj/d.lst                                  |   8 +
 xmlsecurity/prj/d.lst                              |   3 +
 xmlsecurity/source/component/registerservices.cxx  |  42 ----
 xmlsecurity/source/framework/xsec_framework.cxx    |  77 ------
 xmlsecurity/source/xmlsec/xsec_xmlsec.cxx          |  71 ------
 xmlsecurity/util/exports_xsmscrypt.dxp             |   1 -
 xmlsecurity/util/exports_xsnss.dxp                 |   1 -
 xmlsecurity/util/makefile.mk                       |  27 +++
 xmlsecurity/util/xmlsecurity.component             |  37 +++
 xmlsecurity/util/xsec_fw.component                 |  56 +++++
 xmlsecurity/util/xsec_fw.dxp                       |   1 -
 xmlsecurity/util/xsec_xmlsec.component             |  55 +++++
 xmlsecurity/util/xsec_xmlsec.windows.component     |  55 +++++
 152 files changed, 2189 insertions(+), 1302 deletions(-)
 create mode 100644 UnoControls/util/ctl.component
 create mode 100644 accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge.component
 create mode 100644 basctl/util/basctl.component
 create mode 100644 embedserv/util/emser.component
 create mode 100644 extensions/source/abpilot/abp.component
 create mode 100644 extensions/source/bibliography/bib.component
 create mode 100644 extensions/source/config/ldap/ldapbe2.component
 create mode 100644 extensions/source/dbpilots/dbp.component
 create mode 100644 extensions/source/logging/log.component
 create mode 100644 extensions/source/ole/oleautobridge.component
 create mode 100644 extensions/source/oooimprovecore/oooimprovecore.component
 create mode 100644 extensions/source/oooimprovement/oooimprovement.component
 create mode 100644 extensions/source/plugin/util/pl.component
 create mode 100644 extensions/source/preload/preload.component
 create mode 100644 extensions/source/propctrlr/pcr.component
 create mode 100644 extensions/source/resource/res.component
 create mode 100644 extensions/source/scanner/scn.component
 create mode 100644 extensions/source/update/check/updchk.uno.component
 create mode 100644 extensions/source/update/feed/updatefeed.component
 create mode 100644 extensions/source/update/ui/updchk.component
 create mode 100644 extensions/source/xmlextract/xmx.component
 create mode 100644 forms/util/frm.component
 create mode 100644 lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphen.component
 create mode 100644 lingucomponent/source/languageguessing/guesslang.component
 create mode 100644 lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component
 create mode 100644 lingucomponent/source/spellcheck/spell/spell.component
 create mode 100644 lingucomponent/source/thesaurus/libnth/lnth.component
 create mode 100644 package/source/xstor/xstor.component
 create mode 100644 package/util/package2.component
 create mode 100644 wizards/com/sun/star/wizards/agenda/agenda.component
 create mode 100644 wizards/com/sun/star/wizards/fax/fax.component
 create mode 100644 wizards/com/sun/star/wizards/form/form.component
 create mode 100644 wizards/com/sun/star/wizards/letter/letter.component
 create mode 100644 wizards/com/sun/star/wizards/query/query.component
 create mode 100644 wizards/com/sun/star/wizards/report/report.component
 create mode 100644 wizards/com/sun/star/wizards/table/table.component
 create mode 100644 wizards/com/sun/star/wizards/web/web.component
 create mode 100644 xmlsecurity/util/xmlsecurity.component
 create mode 100644 xmlsecurity/util/xsec_fw.component
 create mode 100644 xmlsecurity/util/xsec_xmlsec.component
 create mode 100644 xmlsecurity/util/xsec_xmlsec.windows.component

diff --git a/UnoControls/prj/d.lst b/UnoControls/prj/d.lst
index 5f65d3c80..370fc0c9f 100644
--- a/UnoControls/prj/d.lst
+++ b/UnoControls/prj/d.lst
@@ -3,3 +3,4 @@
 ..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl
 ..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
 ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
+..\%__SRC%\misc\ctl.component %_DEST%\xml%_EXT%\ctl.component
diff --git a/UnoControls/source/base/registercontrols.cxx b/UnoControls/source/base/registercontrols.cxx
index 50ce3eb87..3eaf3a7d9 100644
--- a/UnoControls/source/base/registercontrols.cxx
+++ b/UnoControls/source/base/registercontrols.cxx
@@ -92,59 +92,6 @@ using namespace ::com::sun::star::registry						;
         return Reference< XInterface >( *(OWeakObject*)(new CLASS( rServiceManager )) );													\
     }
 
-//******************************************************************************************************************************
-#define	COMPONENT_INFO(CLASS)																							\
-                                                                                                                        \
-    AS_DBG_OUT ( "\tCOMPONENT_INFO():\t[start]\n" )																		\
-    try																													\
-    {                                                                                               					\
-        /* Set default result of follow operations !!! */																\
-        bReturn = sal_False ;                                                                       					\
-                                                                                                                        \
-        /* Do the follow only, if given key is valid ! */																\
-        if ( xKey.is () )                                                                         						\
-        {                                                                                           					\
-            AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\txkey is valid ...\n" )													\
-            /* Build new keyname */																						\
-            sKeyName	 =	OUString::createFromAscii( "/" )			;		                   						\
-            sKeyName	+=	CLASS::impl_getStaticImplementationName()	;   	                						\
-            sKeyName	+=	OUString::createFromAscii( "/UNO/SERVICES" );       	            						\
-                                                                                                                        \
-            /* Create new key with new name. */																			\
-             xNewKey = xKey->createKey( sKeyName );                                              						\
-                                                                                                                        \
-            /* If this new key valid ... */																				\
-            if ( xNewKey.is () )                                                                    					\
-            {                                                                                       					\
-                AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\txNewkey is valid ...\n" )											\
-                /* Get information about supported services. */															\
-                seqServiceNames	=	CLASS::impl_getStaticSupportedServiceNames()	;           						\
-                pArray			=	seqServiceNames.getArray()						;           						\
-                nLength			=	seqServiceNames.getLength()						;           						\
-                nCounter		=	0												;           						\
-                                                                                                                        \
-                AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\tloop ..." )														\
-                /* Then set this information on this key. */															\
-                for ( nCounter = 0; nCounter < nLength; ++nCounter )                                					\
-                {                                                                                   					\
-                    xNewKey->createKey( pArray [nCounter] );                                      						\
-                }                                                                                   					\
-                AS_DBG_OUT ( " OK\n" )																					\
-                                                                                                                        \
-                /* Result of this operations = OK. */																	\
-                bReturn = sal_True ;                                                                					\
-            }                                                                                       					\
-            AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\t... leave xNewKey\n" )													\
-        }                                                                                           					\
-        AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\t... leave xKey\n" )														\
-    }                                                                                               					\
-    catch( InvalidRegistryException& )                                                             						\
-    {                                                                                               					\
-        AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\tInvalidRegistryException detected!!!\n" )									\
-        bReturn = sal_False ;                                                                       					\
-    }																													\
-    AS_DBG_OUT ( "\tCOMPONENT_INFO():\t[end]\n" )
-
 //******************************************************************************************************************************
 #define	CREATEFACTORY_ONEINSTANCE(CLASS)																				\
                                                                                                                         \
@@ -217,53 +164,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(	const	sal_Char*
     *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
 }
 
-//______________________________________________________________________________________________________________
-//	write component info to registry
-//______________________________________________________________________________________________________________
-
-extern "C" sal_Bool SAL_CALL component_writeInfo(	void*	/*pServiceManager*/	,
-                                                    void*	pRegistryKey	)
-{
-    AS_DBG_OUT ( "component_writeInfo():\t[start]\n" )
-
-    // Set default return value for this operation - if it failed.
-    sal_Bool bReturn = sal_False ;
-
-    if ( pRegistryKey != NULL )
-    {
-        AS_DBG_OUT ( "component_writeInfo():\t\tpRegistryKey is valid ... enter scope\n" )
-
-        // Define variables for following macros!
-        // bReturn is set automaticly.
-        Reference< XRegistryKey >		xKey( reinterpret_cast< XRegistryKey* >( pRegistryKey ) )	;
-        Reference< XRegistryKey >		xNewKey														;
-        Sequence< OUString >			seqServiceNames												;
-        const OUString*					pArray														;
-        sal_Int32						nLength														;
-        sal_Int32						nCounter													;
-        OUString						sKeyName													;
-
-        //=============================================================================
-        //  Add new macro line to register new services.
-        //
-        //	!!! ATTENTION !!!
-        //		Write no ";" at end of line! (see macro)
-        //=============================================================================
-        COMPONENT_INFO	( FrameControl		)
-        COMPONENT_INFO	( ProgressBar		)
-        COMPONENT_INFO	( ProgressMonitor	)
-        COMPONENT_INFO	( StatusIndicator	)
-        //=============================================================================
-
-        AS_DBG_OUT ( "component_writeInfo():\t\t... leave pRegistryKey scope\n" )
-    }
-
-    AS_DBG_OUT ( "component_writeInfo():\t[end]\n" )
-
-    // Return with result of this operation.
-    return bReturn ;
-}
-
 //______________________________________________________________________________________________________________
 //	create right component factory
 //______________________________________________________________________________________________________________
diff --git a/UnoControls/util/ctl.component b/UnoControls/util/ctl.component
new file mode 100644
index 000000000..32901f529
--- /dev/null
+++ b/UnoControls/util/ctl.component
@@ -0,0 +1,43 @@
+
+
+
+
+  
+    
+  
+  
+    
+  
+  
+    
+  
+  
+    
+  
+
diff --git a/UnoControls/util/makefile.mk b/UnoControls/util/makefile.mk
index aacddb23c..73617d244 100644
--- a/UnoControls/util/makefile.mk
+++ b/UnoControls/util/makefile.mk
@@ -59,3 +59,11 @@ SHL1LIBS=		$(LIB1TARGET)
 
 # --- Targets ------------------------------------------------------
 .INCLUDE :	target.mk
+
+ALLTAR : $(MISC)/ctl.component
+
+$(MISC)/ctl.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        ctl.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt ctl.component
diff --git a/accessibility/bridge/org/openoffice/accessibility/AccessBridge.java b/accessibility/bridge/org/openoffice/accessibility/AccessBridge.java
index a5b230cd7..e881dffce 100755
--- a/accessibility/bridge/org/openoffice/accessibility/AccessBridge.java
+++ b/accessibility/bridge/org/openoffice/accessibility/AccessBridge.java
@@ -142,11 +142,6 @@ public class AccessBridge {
         return xSingleServiceFactory;
     }
 
-    public static boolean __writeRegistryServiceInfo(XRegistryKey regKey) {
-        return FactoryHelper.writeRegistryServiceInfo(AccessBridge.class.getName(),
-            _AccessBridge._serviceName, regKey);
-    }
-
     static public class _AccessBridge implements XTopWindowListener,
         XInitialization, XComponent {
         static final String _serviceName = "com.sun.star.accessibility.AccessBridge";
diff --git a/accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge.component b/accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge.component
new file mode 100644
index 000000000..5fc897f2d
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge.component
@@ -0,0 +1,34 @@
+
+
+
+
+  
+    
+  
+
diff --git a/accessibility/bridge/org/openoffice/accessibility/makefile.mk b/accessibility/bridge/org/openoffice/accessibility/makefile.mk
index 9510a3156..1fa29f5bf 100755
--- a/accessibility/bridge/org/openoffice/accessibility/makefile.mk
+++ b/accessibility/bridge/org/openoffice/accessibility/makefile.mk
@@ -53,3 +53,10 @@ CUSTOMMANIFESTFILE      = manifest
 
 .INCLUDE :  target.mk
 
+ALLTAR : $(MISC)/java_uno_accessbridge.component
+
+$(MISC)/java_uno_accessbridge.component .ERRREMOVE : \
+        $(SOLARENV)/bin/createcomponent.xslt java_uno_accessbridge.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_JAVA)$(JARTARGET)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt java_uno_accessbridge.component
diff --git a/accessibility/prj/d.lst b/accessibility/prj/d.lst
index f61319551..662373c7c 100644
--- a/accessibility/prj/d.lst
+++ b/accessibility/prj/d.lst
@@ -5,4 +5,4 @@
 ..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
 ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
 ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-
+..\%__SRC%\misc\java_uno_accessbridge.component %_DEST%\xml\java_uno_accessbridge.component
diff --git a/basctl/prj/d.lst b/basctl/prj/d.lst
index d05ff35bd..b3ded50b6 100644
--- a/basctl/prj/d.lst
+++ b/basctl/prj/d.lst
@@ -21,3 +21,4 @@ mkdir: %_DEST%\inc%_EXT%\basctl
 ..\uiconfig\basicide\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\BasicIDE\menubar\*.xml
 ..\uiconfig\basicide\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\BasicIDE\toolbar\*.xml
 ..\uiconfig\basicide\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\BasicIDE\statusbar\*.xml
+..\%__SRC%\misc\basctl.component %_DEST%\xml%_EXT%\basctl.component
diff --git a/basctl/source/basicide/register.cxx b/basctl/source/basicide/register.cxx
index 6b46ae398..dd885a15c 100644
--- a/basctl/source/basicide/register.cxx
+++ b/basctl/source/basicide/register.cxx
@@ -52,28 +52,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
 }
 
-SAL_DLLPUBLIC_EXPORT
-sal_Bool SAL_CALL component_writeInfo(	void*	pServiceManager	,
-                                        void*	pRegistryKey	)
-{
-    (void)pServiceManager;
-
-    Reference< ::registry::XRegistryKey >
-            xKey( reinterpret_cast< ::registry::XRegistryKey* >( pRegistryKey ) ) ;
-
-    OUString aDelimiter( RTL_CONSTASCII_USTRINGPARAM("/") );
-    OUString aUnoServices( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") );
-
-    sal_Int32 i;
-    Reference< ::registry::XRegistryKey >  xNewKey;
-    xNewKey = xKey->createKey( aDelimiter + SIDEModel::getImplementationName_Static() + aUnoServices );
-    Sequence< OUString > aServices = SIDEModel::getSupportedServiceNames_Static();
-    for(i = 0; i < aServices.getLength(); i++ )
-        xNewKey->createKey( aServices.getConstArray()[i] );
-
-    return sal_True;
-}
-
 SAL_DLLPUBLIC_EXPORT
 void* SAL_CALL component_getFactory( const sal_Char* pImplementationName,
                                      void* pServiceManager,
diff --git a/basctl/util/basctl.component b/basctl/util/basctl.component
new file mode 100644
index 000000000..f101deaf2
--- /dev/null
+++ b/basctl/util/basctl.component
@@ -0,0 +1,34 @@
+
+
+
+
+  
+    
+  
+
diff --git a/basctl/util/basctl.map b/basctl/util/basctl.map
index 80359606c..83193fe17 100755
--- a/basctl/util/basctl.map
+++ b/basctl/util/basctl.map
@@ -4,7 +4,6 @@ UDK_3_0_0 {
         basicide_macro_organizer;
         basicide_handle_basic_error;
         component_getImplementationEnvironment;
-        component_writeInfo;
         component_getFactory;
     local:
     *;
diff --git a/basctl/util/makefile.mk b/basctl/util/makefile.mk
index 47de65cc5..b33fa3f1d 100644
--- a/basctl/util/makefile.mk
+++ b/basctl/util/makefile.mk
@@ -103,3 +103,11 @@ RESLIB1SRSFILES= $(SRSFILELIST)
 
 .ENDIF # "$(header)" == ""
 
+
+ALLTAR : $(MISC)/basctl.component
+
+$(MISC)/basctl.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        basctl.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt basctl.component
diff --git a/embedserv/prj/d.lst b/embedserv/prj/d.lst
index 3765f7d97..e01fbabf8 100755
--- a/embedserv/prj/d.lst
+++ b/embedserv/prj/d.lst
@@ -1 +1,2 @@
 ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
+..\%__SRC%\misc\emser.component %_DEST%\xml%_EXT%\emser.component
diff --git a/embedserv/source/embed/register.cxx b/embedserv/source/embed/register.cxx
index d0cacf2e9..6045c40fa 100755
--- a/embedserv/source/embed/register.cxx
+++ b/embedserv/source/embed/register.cxx
@@ -95,34 +95,6 @@ void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServic
     return pRet;
 }
 
-sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, void * pRegistryKey )
-{
-    if (pRegistryKey)
-    {
-        try
-        {
-            uno::Reference< registry::XRegistryKey > xKey( reinterpret_cast< registry::XRegistryKey* >( pRegistryKey ) );
-
-            uno::Reference< registry::XRegistryKey >  xNewKey;
-
-            xNewKey = xKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
-                                        EmbedServer_getImplementationName() +
-                                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") )  );
-
-            uno::Sequence< ::rtl::OUString > rServices = EmbedServer_getSupportedServiceNames();
-            for( sal_Int32 ind = 0; ind < rServices.getLength(); ind++ )
-                xNewKey->createKey( rServices.getConstArray()[ind] );
-
-            return sal_True;
-        }
-        catch (registry::InvalidRegistryException &)
-                {
-                    OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
-                }
-        }
-        return sal_False;
-}
-
 } // extern "C"
 
 // Fix strange warnings about some
@@ -130,4 +102,4 @@ sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, void * pRegis
 // warning C4505: 'xxx' : unreferenced local function has been removed
 #if defined(_MSC_VER)
 #pragma warning(disable: 4505)
-#endif
\ No newline at end of file
+#endif
diff --git a/embedserv/util/emser.component b/embedserv/util/emser.component
new file mode 100644
index 000000000..682ad1c31
--- /dev/null
+++ b/embedserv/util/emser.component
@@ -0,0 +1,34 @@
+
+
+
+
+  
+    
+  
+
diff --git a/embedserv/util/exports.dxp b/embedserv/util/exports.dxp
index 9630d7e06..f0e1c6993 100755
--- a/embedserv/util/exports.dxp
+++ b/embedserv/util/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/embedserv/util/makefile.mk b/embedserv/util/makefile.mk
index 45e3e4698..5af210d96 100755
--- a/embedserv/util/makefile.mk
+++ b/embedserv/util/makefile.mk
@@ -94,3 +94,11 @@ DEF1EXPORTFILE=	exports.dxp
 .INCLUDE :  target.mk
 
 
+
+ALLTAR : $(MISC)/emser.component
+
+$(MISC)/emser.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        emser.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt emser.component
diff --git a/extensions/prj/d.lst b/extensions/prj/d.lst
index ecfe0ef9a..5b974816c 100644
--- a/extensions/prj/d.lst
+++ b/extensions/prj/d.lst
@@ -22,6 +22,7 @@ mkdir: %_DEST%\bin%_EXT%\so
 ..\%__SRC%\bin\npsoplugin_so.dll %_DEST%\bin%_EXT%\so\npsoplugin.dll
 ..\%__SRC%\bin\x64\so_activex.dll %_DEST%\bin%_EXT%\so_activex_x64.dll
 ..\%__SRC%\bin\mdibundle.zip %_DEST%\bin%_EXT%\mdibundle.zip
+..\%__SRC%\misc\oleautobridge.component %_DEST%\xml%_EXT%\oleautobridge.component
 
 ..\source\bibliography\uiconfig\sbibliography\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sbibliography\menubar\*.xml
 
@@ -39,3 +40,19 @@ mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\Logging
 ..\%__SRC%\misc\registry\spool\org\openoffice\Office\Logging\*.xcu %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\Logging
 
 ..\%__SRC%\bin\*.oxt %_DEST%\pck%_EXT%\*
+..\%__SRC%\misc\abp.component %_DEST%\xml%_EXT%\abp.component
+..\%__SRC%\misc\bib.component %_DEST%\xml%_EXT%\bib.component
+..\%__SRC%\misc\dbp.component %_DEST%\xml%_EXT%\dbp.component
+..\%__SRC%\misc\ldapbe2.component %_DEST%\xml%_EXT%\ldapbe2.component
+..\%__SRC%\misc\log.component %_DEST%\xml%_EXT%\log.component
+..\%__SRC%\misc\oooimprovecore.component %_DEST%\xml%_EXT%\oooimprovecore.component
+..\%__SRC%\misc\oooimprovement.component %_DEST%\xml%_EXT%\oooimprovement.component
+..\%__SRC%\misc\pcr.component %_DEST%\xml%_EXT%\pcr.component
+..\%__SRC%\misc\pl.component %_DEST%\xml%_EXT%\pl.component
+..\%__SRC%\misc\preload.component %_DEST%\xml%_EXT%\preload.component
+..\%__SRC%\misc\res.component %_DEST%\xml%_EXT%\res.component
+..\%__SRC%\misc\scn.component %_DEST%\xml%_EXT%\scn.component
+..\%__SRC%\misc\updatefeed.component %_DEST%\xml%_EXT%\updatefeed.component
+..\%__SRC%\misc\updchk.component %_DEST%\xml%_EXT%\updchk.component
+..\%__SRC%\misc\updchk.uno.component %_DEST%\xml%_EXT%\updchk.uno.component
+..\%__SRC%\misc\xmx.component %_DEST%\xml%_EXT%\xmx.component
diff --git a/extensions/source/abpilot/abp.component b/extensions/source/abpilot/abp.component
new file mode 100644
index 000000000..a07cef986
--- /dev/null
+++ b/extensions/source/abpilot/abp.component
@@ -0,0 +1,34 @@
+
+
+
+
+  
+    
+  
+
diff --git a/extensions/source/abpilot/abpservices.cxx b/extensions/source/abpilot/abpservices.cxx
index f4131c8ba..f589ac0db 100644
--- a/extensions/source/abpilot/abpservices.cxx
+++ b/extensions/source/abpilot/abpservices.cxx
@@ -65,27 +65,6 @@ component_getImplementationEnvironment(
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-                void* pServiceManager,
-                void* pRegistryKey
-            )
-{
-    if (pRegistryKey) 
-    try 
-    {
-        return ::abp::OModule::writeComponentInfos(
-            static_cast(pServiceManager),
-            static_cast(pRegistryKey));
-    }
-    catch (InvalidRegistryException& )
-    {
-        OSL_ASSERT("abp::component_writeInfo: could not create a registry key (InvalidRegistryException) !");
-    }
-
-    return sal_False;
-}
-
 //---------------------------------------------------------------------------------------
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
diff --git a/extensions/source/abpilot/exports.dxp b/extensions/source/abpilot/exports.dxp
index 9630d7e06..f0e1c6993 100644
--- a/extensions/source/abpilot/exports.dxp
+++ b/extensions/source/abpilot/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/extensions/source/abpilot/makefile.mk b/extensions/source/abpilot/makefile.mk
index 19477e1b6..86bc5c68a 100644
--- a/extensions/source/abpilot/makefile.mk
+++ b/extensions/source/abpilot/makefile.mk
@@ -104,3 +104,11 @@ DEF1EXPORTFILE=	exports.dxp
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :	target.mk
+
+ALLTAR : $(MISC)/abp.component
+
+$(MISC)/abp.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        abp.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt abp.component
diff --git a/extensions/source/bibliography/bib.component b/extensions/source/bibliography/bib.component
new file mode 100644
index 000000000..98627854d
--- /dev/null
+++ b/extensions/source/bibliography/bib.component
@@ -0,0 +1,35 @@
+
+
+
+
+  
+    
+    
+  
+
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index 0b57c4bd4..9d361aff8 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -225,36 +225,6 @@ extern "C"
         *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
     }
 
-    sal_Bool SAL_CALL component_writeInfo( void * //pServiceManager
-                                        , registry::XRegistryKey * pRegistryKey )
-    {
-        try
-        {
-            rtl::OUString sKey = rtl::OUString::createFromAscii("/");
-            sKey += BibliographyLoader::getImplementationName_Static();
-            //creates the impl key:  /com.sun.star.extensions.Bibliography
-            Reference< registry::XRegistryKey > xImplKey = pRegistryKey->createKey(sKey);
-
-
-            //sKey += rtl::OUString::createFromAscii("/UNO/SERVICES");
-            Reference< registry::XRegistryKey > xNewKey = xImplKey->createKey(	C2U("/UNO/SERVICES") );
-            Sequence< rtl::OUString > aServices = BibliographyLoader::getSupportedServiceNames_Static();
-            for( INT32 i = 0; i < aServices.getLength(); i++ )
-                xNewKey->createKey( aServices.getConstArray()[i]);
-            xNewKey = xImplKey->createKey(	C2U("/UNO/Loader"));
-
-            Reference< registry::XRegistryKey >  xPatternKey = xImplKey->createKey( C2U("/Loader/Pattern" ));
-            xPatternKey->setAsciiValue( C2U( ".component:Bibliography/*" ) );
-
-            return sal_True;
-        }
-        catch (Exception &)
-        {
-            return sal_False;
-        }
-    }
-
-
     void * SAL_CALL component_getFactory(
         const sal_Char * pImplName, XMultiServiceFactory * pServiceManager, void * /*pRegistryKey*/ )
     {
diff --git a/extensions/source/bibliography/makefile.mk b/extensions/source/bibliography/makefile.mk
index f25dce110..e24c32237 100644
--- a/extensions/source/bibliography/makefile.mk
+++ b/extensions/source/bibliography/makefile.mk
@@ -89,3 +89,11 @@ DEF1NAME=		$(SHL1TARGET)
 
 .INCLUDE :	target.mk
 
+
+ALLTAR : $(MISC)/bib.component
+
+$(MISC)/bib.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        bib.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt bib.component
diff --git a/extensions/source/config/ldap/componentdef.cxx b/extensions/source/config/ldap/componentdef.cxx
index abeb75bb0..bf946c112 100644
--- a/extensions/source/config/ldap/componentdef.cxx
+++ b/extensions/source/config/ldap/componentdef.cxx
@@ -62,13 +62,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
 }
 //------------------------------------------------------------------------------
 
-extern "C" sal_Bool SAL_CALL component_writeInfo(void *aServiceManager,
-                                                 void *aRegistryKey) {
-    return cppu::component_writeInfoHelper(
-        aServiceManager, aRegistryKey, kImplementations_entries);
-}
-//------------------------------------------------------------------------------
-
 extern "C" void *component_getFactory(const sal_Char *aImplementationName,
                                       void *aServiceManager,
                                       void *aRegistryKey) {
diff --git a/extensions/source/config/ldap/exports.dxp b/extensions/source/config/ldap/exports.dxp
index 9630d7e06..f0e1c6993 100644
--- a/extensions/source/config/ldap/exports.dxp
+++ b/extensions/source/config/ldap/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/extensions/source/config/ldap/ldapbe2.component b/extensions/source/config/ldap/ldapbe2.component
new file mode 100644
index 000000000..071064d1c
--- /dev/null
+++ b/extensions/source/config/ldap/ldapbe2.component
@@ -0,0 +1,34 @@
+
+
+
+
+  
+    
+  
+
diff --git a/extensions/source/config/ldap/makefile.mk b/extensions/source/config/ldap/makefile.mk
index a27cb39b6..d35e2428c 100644
--- a/extensions/source/config/ldap/makefile.mk
+++ b/extensions/source/config/ldap/makefile.mk
@@ -95,3 +95,11 @@ DEF1DES=Configuration: LDAP User Profile Backend
 .INCLUDE : target.mk
 .INCLUDE :  $(PRJ)$/util$/target.pmk
 
+
+ALLTAR : $(MISC)/ldapbe2.component
+
+$(MISC)/ldapbe2.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        ldapbe2.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt ldapbe2.component
diff --git a/extensions/source/dbpilots/dbp.component b/extensions/source/dbpilots/dbp.component
new file mode 100644
index 000000000..84ec98713
--- /dev/null
+++ b/extensions/source/dbpilots/dbp.component
@@ -0,0 +1,40 @@
+
+
+
+
+  
+    
+  
+  
+    
+  
+  
+    
+  
+
diff --git a/extensions/source/dbpilots/dbpservices.cxx b/extensions/source/dbpilots/dbpservices.cxx
index b7e63c663..726049977 100644
--- a/extensions/source/dbpilots/dbpservices.cxx
+++ b/extensions/source/dbpilots/dbpservices.cxx
@@ -69,27 +69,6 @@ component_getImplementationEnvironment(
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-                void* pServiceManager,
-                void* pRegistryKey
-            )
-{
-    if (pRegistryKey) 
-    try 
-    {
-        return ::dbp::OModule::writeComponentInfos(
-            static_cast(pServiceManager),
-            static_cast(pRegistryKey));
-    }
-    catch (InvalidRegistryException& )
-    {
-        OSL_ASSERT("dbp::component_writeInfo: could not create a registry key (InvalidRegistryException) !");
-    }
-
-    return sal_False;
-}
-
 //---------------------------------------------------------------------------------------
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
diff --git a/extensions/source/dbpilots/makefile.mk b/extensions/source/dbpilots/makefile.mk
index b5831e5fd..e37ab0a54 100644
--- a/extensions/source/dbpilots/makefile.mk
+++ b/extensions/source/dbpilots/makefile.mk
@@ -101,3 +101,11 @@ DEF1NAME=		$(SHL1TARGET)
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :	target.mk
+
+ALLTAR : $(MISC)/dbp.component
+
+$(MISC)/dbp.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        dbp.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt dbp.component
diff --git a/extensions/source/inc/componentmodule.cxx b/extensions/source/inc/componentmodule.cxx
index cbcb0cec1..0a9f4bb76 100644
--- a/extensions/source/inc/componentmodule.cxx
+++ b/extensions/source/inc/componentmodule.cxx
@@ -237,54 +237,6 @@ namespace COMPMOD_NAMESPACE
         }
     }
 
-    //--------------------------------------------------------------------------
-    sal_Bool OModule::writeComponentInfos(
-            const Reference< XMultiServiceFactory >& /*_rxServiceManager*/,
-            const Reference< XRegistryKey >& _rxRootKey)
-    {
-        OSL_ENSURE(_rxRootKey.is(), "OModule::writeComponentInfos : invalid argument !");
-
-        if (!s_pImplementationNames)
-        {
-            OSL_ASSERT("OModule::writeComponentInfos : have no class infos ! Are you sure called this method at the right time ?");
-            return sal_True;
-        }
-        OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
-            "OModule::writeComponentInfos : inconsistent state (the pointers) !");
-        OSL_ENSURE(	(s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
-                    &&	(s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
-                    &&	(s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
-            "OModule::writeComponentInfos : inconsistent state !");
-
-        sal_Int32 nLen = s_pImplementationNames->getLength();
-        const ::rtl::OUString* pImplName = s_pImplementationNames->getConstArray();
-        const Sequence< ::rtl::OUString >* pServices = s_pSupportedServices->getConstArray();
-
-        ::rtl::OUString sRootKey("/", 1, RTL_TEXTENCODING_ASCII_US);
-        for (sal_Int32 i=0; i  xNewKey( _rxRootKey->createKey(aMainKeyName) );
-
-                const ::rtl::OUString* pService = pServices->getConstArray();
-                for (sal_Int32 j=0; jgetLength(); ++j, ++pService)
-                    xNewKey->createKey(*pService);
-            }
-            catch(Exception&)
-            {
-                OSL_ASSERT("OModule::writeComponentInfos : something went wrong while creating the keys !");
-                return sal_False;
-            }
-        }
-
-        return sal_True;
-    }
-
     //--------------------------------------------------------------------------
     Reference< XInterface > OModule::getComponentFactory(
         const ::rtl::OUString& _rImplementationName,
diff --git a/extensions/source/inc/componentmodule.hxx b/extensions/source/inc/componentmodule.hxx
index 741903e50..268aa9ce0 100644
--- a/extensions/source/inc/componentmodule.hxx
+++ b/extensions/source/inc/componentmodule.hxx
@@ -121,21 +121,6 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
         static void revokeComponent(
             const ::rtl::OUString& _rImplementationName);
 
-        /** write the registration information of all known components
-            
writes the registration information of all components which are currently registered into the
-            specified registry.

-            
Usually used from within component_writeInfo.

-            @param	_rxServiceManager
-                        the service manager
-            @param	_rRootKey
-                        the registry key under which the information will be stored
-            @return
-                        sal_True if the registration of all implementations was successfull, sal_False otherwise
-        */
-        static sal_Bool writeComponentInfos(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxServiceManager,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey >& _rRootKey);
-
         /** creates a Factory for the component with the given implementation name.
             
Usually used from within component_getFactory.

             @param	_rxServiceManager
diff --git a/extensions/source/logging/log.component b/extensions/source/logging/log.component
new file mode 100644
index 000000000..4dd2db56c
--- /dev/null
+++ b/extensions/source/logging/log.component
@@ -0,0 +1,47 @@
+
+
+
+
+  
+    
+  
+  
+    
+  
+  
+    
+  
+  
+    
+    
+  
+  
+    
+  
+
diff --git a/extensions/source/logging/makefile.mk b/extensions/source/logging/makefile.mk
index 4a1fa9813..1436576e8 100644
--- a/extensions/source/logging/makefile.mk
+++ b/extensions/source/logging/makefile.mk
@@ -74,3 +74,11 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 .INCLUDE : target.mk
 
+
+ALLTAR : $(MISC)/log.component
+
+$(MISC)/log.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        log.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt log.component
diff --git a/extensions/source/ole/makefile.mk b/extensions/source/ole/makefile.mk
index ad4ecee72..806cd027e 100644
--- a/extensions/source/ole/makefile.mk
+++ b/extensions/source/ole/makefile.mk
@@ -129,3 +129,10 @@ DEF2EXPORTFILE=$(TARGET).dxp
 
 .INCLUDE :  target.mk
 
+ALLTAR : $(MISC)/oleautobridge.component
+
+$(MISC)/oleautobridge.component .ERRREMOVE : \
+        $(SOLARENV)/bin/createcomponent.xslt oleautobridge.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt oleautobridge.component
diff --git a/extensions/source/ole/oleautobridge.component b/extensions/source/ole/oleautobridge.component
new file mode 100644
index 000000000..6f5309e42
--- /dev/null
+++ b/extensions/source/ole/oleautobridge.component
@@ -0,0 +1,46 @@
+
+
+
+
+  
+    
+    
+  
+  
+    
+    
+  
+  
+    
+  
+  
+    
+    
+  
+
diff --git a/extensions/source/ole/oleautobridge.uno.dxp b/extensions/source/ole/oleautobridge.uno.dxp
index e7947188a..1f26fd019 100644
--- a/extensions/source/ole/oleautobridge.uno.dxp
+++ b/extensions/source/ole/oleautobridge.uno.dxp
@@ -1,4 +1,3 @@
-component_writeInfo @100 
 component_getFactory @101
 component_getImplementationEnvironment @102
 component_canUnload @103
diff --git a/extensions/source/ole/servreg.cxx b/extensions/source/ole/servreg.cxx
index a0bd98e33..f43b4f6bf 100644
--- a/extensions/source/ole/servreg.cxx
+++ b/extensions/source/ole/servreg.cxx
@@ -119,47 +119,6 @@ extern "C" void * SAL_CALL component_getFactory(
 }
 
 
-extern "C" sal_Bool SAL_CALL component_writeInfo(	void * /*pServiceManager*/, void * pRegistryKey )
-{
-    if (pRegistryKey)
-    {
-        try
-        {
-            //deprecated
-            Reference xNewKey =
-                reinterpret_cast( pRegistryKey)->createKey(reinterpret_cast(L"/com.sun.star.comp.ole.OleConverter2/UNO/SERVICES"));
-            xNewKey->createKey(reinterpret_cast(L"com.sun.star.bridge.OleBridgeSupplier2"));
-
-            xNewKey->createKey(reinterpret_cast(L"com.sun.star.bridge.oleautomation.BridgeSupplier"));
-
-            //deprecated
-            xNewKey =
-                reinterpret_cast( pRegistryKey)->createKey(reinterpret_cast(L"/com.sun.star.comp.ole.OleConverterVar1/UNO/SERVICES"));
-            xNewKey->createKey(reinterpret_cast(L"com.sun.star.bridge.OleBridgeSupplierVar1"));
-
-            //deprecated
-            xNewKey =
-                reinterpret_cast( pRegistryKey)->createKey(reinterpret_cast(L"/com.sun.star.comp.ole.OleClient/UNO/SERVICES"));
-            xNewKey->createKey(reinterpret_cast(L"com.sun.star.bridge.OleObjectFactory"));
-
-            xNewKey->createKey(reinterpret_cast(L"com.sun.star.bridge.oleautomation.Factory"));
-            //deprecated
-            xNewKey =
-                reinterpret_cast( pRegistryKey)->createKey(reinterpret_cast(L"/com.sun.star.comp.ole.OleServer/UNO/SERVICES"));
-            xNewKey->createKey(reinterpret_cast(L"com.sun.star.bridge.OleApplicationRegistration"));
-
-            xNewKey->createKey(reinterpret_cast(L"com.sun.star.bridge.oleautomation.ApplicationRegistration"));
-                
-            return sal_True;
-        }
-        catch (InvalidRegistryException &)
-        {
-            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
-        }
-    }
-    return sal_False;
-}
-
 extern "C" void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
 {
diff --git a/extensions/source/oooimprovecore/makefile.mk b/extensions/source/oooimprovecore/makefile.mk
index 97e130c3a..f92804dbf 100644
--- a/extensions/source/oooimprovecore/makefile.mk
+++ b/extensions/source/oooimprovecore/makefile.mk
@@ -75,3 +75,11 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 .INCLUDE : target.mk
 
+
+ALLTAR : $(MISC)/oooimprovecore.component
+
+$(MISC)/oooimprovecore.component .ERRREMOVE : \
+        $(SOLARENV)/bin/createcomponent.xslt oooimprovecore.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt oooimprovecore.component
diff --git a/extensions/source/oooimprovecore/oooimprovecore.component b/extensions/source/oooimprovecore/oooimprovecore.component
new file mode 100644
index 000000000..58bdaf37c
--- /dev/null
+++ b/extensions/source/oooimprovecore/oooimprovecore.component
@@ -0,0 +1,34 @@
+
+
+
+
+  
+    
+  
+
diff --git a/extensions/source/oooimprovement/makefile.mk b/extensions/source/oooimprovement/makefile.mk
index 6e5d7ab0d..16e3f12f1 100644
--- a/extensions/source/oooimprovement/makefile.mk
+++ b/extensions/source/oooimprovement/makefile.mk
@@ -102,3 +102,11 @@ $(SPOOLDIR)$/$(PACKAGEDIR)$/Jobs$/Jobs-oooimprovement.xcu : $(XCU_SOURCEDIR)$/Jo
 $(SPOOLDIR)$/$(PACKAGEDIR)$/Logging$/Logging-oooimprovement.xcu : $(XCU_SOURCEDIR)$/Logging.xcu
     @-$(MKDIRHIER) $(@:d)
     @$(COPY) $< $@
+
+ALLTAR : $(MISC)/oooimprovement.component
+
+$(MISC)/oooimprovement.component .ERRREMOVE : \
+        $(SOLARENV)/bin/createcomponent.xslt oooimprovement.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt oooimprovement.component
diff --git a/extensions/source/oooimprovement/oooimprovement.component b/extensions/source/oooimprovement/oooimprovement.component
new file mode 100644
index 000000000..ac4d6cca1
--- /dev/null
+++ b/extensions/source/oooimprovement/oooimprovement.component
@@ -0,0 +1,40 @@
+
+
+
+
+  
+    
+  
+  
+    
+  
+  
+    
+  
+
diff --git a/extensions/source/oooimprovement/oooimprovement_exports.cxx b/extensions/source/oooimprovement/oooimprovement_exports.cxx
index e073088a5..13eb763e1 100644
--- a/extensions/source/oooimprovement/oooimprovement_exports.cxx
+++ b/extensions/source/oooimprovement/oooimprovement_exports.cxx
@@ -65,28 +65,6 @@ extern "C"
     void SAL_CALL component_getImplementationEnvironment(const sal_Char** env_type_name, uno_Environment**)
     { *env_type_name = CPPU_CURRENT_LANGUAGE_BINDING_NAME; }
 
-    sal_Bool SAL_CALL component_writeInfo(void*, void* p_reg_key)
-    {
-        if (!p_reg_key) return sal_False;
-        try
-        {
-            Reference reg_key(reinterpret_cast(p_reg_key), UNO_QUERY);
-            writeInfo(reg_key,
-                CoreController::getImplementationName_static(),
-                CoreController::getSupportedServiceNames_static()[0]);
-            writeInfo(reg_key,
-                OnLogRotateJob::getImplementationName_static(),
-                OnLogRotateJob::getSupportedServiceNames_static()[0]);
-            writeInfo(reg_key,
-                InviteJob::getImplementationName_static(),
-                InviteJob::getSupportedServiceNames_static()[0]);
-            return sal_True;
-        }
-        catch(const InvalidRegistryException&)
-            { OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); }
-        return sal_False;
-    }
-
     void* SAL_CALL component_getFactory(const sal_Char* pImplName, void* pServiceManager, void*)
     {
         if ( !pServiceManager || !pImplName ) return 0;
diff --git a/extensions/source/plugin/base/service.cxx b/extensions/source/plugin/base/service.cxx
index 3a4b8b78e..eabefd4c4 100644
--- a/extensions/source/plugin/base/service.cxx
+++ b/extensions/source/plugin/base/service.cxx
@@ -54,33 +54,6 @@ extern "C" {
         *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
     }
 
-    sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pXUnoKey )
-    {
-        if( pXUnoKey )
-        {
-            try
-            {
-                Reference< ::com::sun::star::registry::XRegistryKey > xKey( reinterpret_cast< ::com::sun::star::registry::XRegistryKey* >( pXUnoKey ) );
-                
-                ::rtl::OUString aImplName = ::rtl::OUString::createFromAscii( "/" );
-                aImplName += XPluginManager_Impl::getImplementationName_Static();
-                aImplName += ::rtl::OUString::createFromAscii( "/UNO/SERVICES/com.sun.star.plugin.PluginManager" );
-                xKey->createKey( aImplName );
-                
-                aImplName = ::rtl::OUString::createFromAscii( "/" );
-                aImplName += PluginModel::getImplementationName_Static();
-                aImplName += ::rtl::OUString::createFromAscii( "/UNO/SERVICES/com.sun.star.plugin.PluginModel" );
-                xKey->createKey( aImplName );
-                
-                return sal_True;
-            }
-            catch( ::com::sun::star::registry::InvalidRegistryException& )
-            {
-            }
-        }
-        return sal_False;
-    }
-
     void* SAL_CALL component_getFactory(
         const sal_Char* pImplementationName,
         void* pXUnoSMgr,
diff --git a/extensions/source/plugin/util/makefile.mk b/extensions/source/plugin/util/makefile.mk
index 7a8c46c01..765941689 100644
--- a/extensions/source/plugin/util/makefile.mk
+++ b/extensions/source/plugin/util/makefile.mk
@@ -107,3 +107,11 @@ SHL1STDLIBS+=$(SHL1OWNLIBS)
 
 
 
+
+ALLTAR : $(MISC)/pl.component
+
+$(MISC)/pl.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        pl.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt pl.component
diff --git a/extensions/source/plugin/util/pl.component b/extensions/source/plugin/util/pl.component
new file mode 100644
index 000000000..4a9d98f7d
--- /dev/null
+++ b/extensions/source/plugin/util/pl.component
@@ -0,0 +1,37 @@
+
+
+
+
+  
+    
+  
+  
+    
+  
+
diff --git a/extensions/source/preload/makefile.mk b/extensions/source/preload/makefile.mk
index fb11a2bfd..8bd622661 100644
--- a/extensions/source/preload/makefile.mk
+++ b/extensions/source/preload/makefile.mk
@@ -83,3 +83,11 @@ DEF1NAME=		$(SHL1TARGET)
 
 .INCLUDE :	target.mk
 
+
+ALLTAR : $(MISC)/preload.component
+
+$(MISC)/preload.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        preload.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt preload.component
diff --git a/extensions/source/preload/preload.component b/extensions/source/preload/preload.component
new file mode 100644
index 000000000..56a8a0d7a
--- /dev/null
+++ b/extensions/source/preload/preload.component
@@ -0,0 +1,34 @@
+
+
+
+
+  
+    
+  
+
diff --git a/extensions/source/preload/services.cxx b/extensions/source/preload/services.cxx
index b5ef9ceeb..d35c3d1ed 100644
--- a/extensions/source/preload/services.cxx
+++ b/extensions/source/preload/services.cxx
@@ -65,27 +65,6 @@ component_getImplementationEnvironment(
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-                void* pServiceManager,
-                void* pRegistryKey
-            )
-{
-    if (pRegistryKey)
-    try
-    {
-        return ::preload::OModule::writeComponentInfos(
-            static_cast(pServiceManager),
-            static_cast(pRegistryKey));
-    }
-    catch (InvalidRegistryException& )
-    {
-        OSL_ASSERT("preload::component_writeInfo: could not create a registry key (InvalidRegistryException) !");
-    }
-
-    return sal_False;
-}
-
 //---------------------------------------------------------------------------------------
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
diff --git a/extensions/source/propctrlr/makefile.mk b/extensions/source/propctrlr/makefile.mk
index c69f47bce..ebb629ae3 100644
--- a/extensions/source/propctrlr/makefile.mk
+++ b/extensions/source/propctrlr/makefile.mk
@@ -144,3 +144,11 @@ DEF1NAME=		$(SHL1TARGET)
 
 .INCLUDE :	target.mk
 
+
+ALLTAR : $(MISC)/pcr.component
+
+$(MISC)/pcr.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        pcr.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt pcr.component
diff --git a/extensions/source/propctrlr/pcr.component b/extensions/source/propctrlr/pcr.component
new file mode 100644
index 000000000..2b606cc01
--- /dev/null
+++ b/extensions/source/propctrlr/pcr.component
@@ -0,0 +1,91 @@
+
+
+
+
+  
+    
+  
+  
+    
+  
+  
+    
+  
+  
+    
+  
+  
+    
+  
+  
+    
+  
+  
+    
+  
+  
+    
+  
+  
+    
+  
+  
+    
+  
+  
+    
+  
+  
+    
+  
+  
+    
+  
+  
+    
+  
+  
+    
+  
+  
+    
+  
+  
+    
+  
+  
+    
+  
+  
+    
+  
+  
+    
+  
+
diff --git a/extensions/source/propctrlr/pcrservices.cxx b/extensions/source/propctrlr/pcrservices.cxx
index 51d6cc9b8..6a34e9567 100644
--- a/extensions/source/propctrlr/pcrservices.cxx
+++ b/extensions/source/propctrlr/pcrservices.cxx
@@ -103,27 +103,6 @@ component_getImplementationEnvironment(
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-                void* pServiceManager,
-                void* pRegistryKey
-            )
-{
-    if (pRegistryKey) 
-    try 
-    {
-        return ::pcr::PcrModule::getInstance().writeComponentInfos(
-            static_cast(pServiceManager),
-            static_cast(pRegistryKey));
-    }
-    catch (InvalidRegistryException& )
-    {
-        OSL_ASSERT("pcr::component_writeInfo: could not create a registry key (InvalidRegistryException) !");
-    }
-
-    return sal_False;
-}
-
 //---------------------------------------------------------------------------------------
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
diff --git a/extensions/source/resource/exports.dxp b/extensions/source/resource/exports.dxp
index 9e59e9403..f0e1c6993 100644
--- a/extensions/source/resource/exports.dxp
+++ b/extensions/source/resource/exports.dxp
@@ -1,3 +1,2 @@
-component_writeInfo
 component_getImplementationEnvironment
 component_getFactory
diff --git a/extensions/source/resource/makefile.mk b/extensions/source/resource/makefile.mk
index a89d690b7..adeec5fd0 100644
--- a/extensions/source/resource/makefile.mk
+++ b/extensions/source/resource/makefile.mk
@@ -74,3 +74,11 @@ DEF1EXPORTFILE=	exports.dxp
 .INCLUDE :	target.mk
 .INCLUDE :	$(PRJ)$/util$/target.pmk
 
+
+ALLTAR : $(MISC)/res.component
+
+$(MISC)/res.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        res.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt res.component
diff --git a/extensions/source/resource/res.component b/extensions/source/resource/res.component
new file mode 100644
index 000000000..57f96609d
--- /dev/null
+++ b/extensions/source/resource/res.component
@@ -0,0 +1,38 @@
+
+
+
+
+  
+    
+  
+  
+    
+    
+  
+
diff --git a/extensions/source/resource/res_services.cxx b/extensions/source/resource/res_services.cxx
index 73a979c22..dea7cf675 100644
--- a/extensions/source/resource/res_services.cxx
+++ b/extensions/source/resource/res_services.cxx
@@ -29,12 +29,7 @@
 #include "precompiled_extensions.hxx"
 #include "res_services.hxx"
 
-/** === begin UNO includes === **/
-#include 
-/** === end UNO includes === **/
-
 /** === begin UNO using === **/
-using ::com::sun::star::registry::XRegistryKey;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Exception;
@@ -64,43 +59,6 @@ void SAL_CALL component_getImplementationEnvironment(
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, XRegistryKey * pRegistryKey )
-{
-    try
-    {
-        ::std::vector< ::res::ComponentInfo > aComponentInfos( ::res::getComponentInfos() );
-        for (   ::std::vector< ::res::ComponentInfo >::const_iterator loop = aComponentInfos.begin();
-                loop != aComponentInfos.end();
-                ++loop
-            )
-        {
-            Reference< XRegistryKey > xNewKey =
-                pRegistryKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") )
-                    + loop->sImplementationName + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ) ) );
-    
-            for( sal_Int32 i = 0; i < loop->aSupportedServices.getLength(); ++i )
-                xNewKey->createKey( loop->aSupportedServices.getConstArray()[i]);
-
-            if ( loop->sSingletonName.getLength() )
-            {
-                OSL_ENSURE( loop->aSupportedServices.getLength() == 1, "singletons must support exactly one service!" );
-                xNewKey = pRegistryKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") )
-                    + loop->sImplementationName + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SINGLETONS/" ) )
-                    + loop->sSingletonName );
-                xNewKey->setStringValue( loop->aSupportedServices[ 0 ] );
-            }
-        }
-        
-        return sal_True;
-    }
-    catch (Exception &)
-    {
-        // not allowed to throw an exception over the c function.
-        //OSL_ENSURE( sal_False, "Exception cannot register component!" );
-        return sal_False;
-    }
-}
-
 void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, XMultiServiceFactory * /*pServiceManager*/, void * /*pRegistryKey*/ )
 {
diff --git a/extensions/source/scanner/exports.dxp b/extensions/source/scanner/exports.dxp
index 9630d7e06..f0e1c6993 100644
--- a/extensions/source/scanner/exports.dxp
+++ b/extensions/source/scanner/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/extensions/source/scanner/makefile.mk b/extensions/source/scanner/makefile.mk
index ff42864e0..519be1ff8 100644
--- a/extensions/source/scanner/makefile.mk
+++ b/extensions/source/scanner/makefile.mk
@@ -98,3 +98,11 @@ DEF1EXPORTFILE=exports.dxp
 
 .INCLUDE :  target.mk
 
+
+ALLTAR : $(MISC)/scn.component
+
+$(MISC)/scn.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        scn.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt scn.component
diff --git a/extensions/source/scanner/scn.component b/extensions/source/scanner/scn.component
new file mode 100644
index 000000000..d7daf3ae3
--- /dev/null
+++ b/extensions/source/scanner/scn.component
@@ -0,0 +1,34 @@
+
+
+
+
+  
+    
+  
+
diff --git a/extensions/source/scanner/scnserv.cxx b/extensions/source/scanner/scnserv.cxx
index 1ac61483d..93fe9dbdc 100644
--- a/extensions/source/scanner/scnserv.cxx
+++ b/extensions/source/scanner/scnserv.cxx
@@ -45,37 +45,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char*
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-// -----------------------
-// - component_writeInfo -
-// -----------------------
-
-extern "C" sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey )
-{
-    sal_Bool bRet = sal_False;
-
-    if( pRegistryKey )
-    {
-        try
-        {
-            ::rtl::OUString aImplName( '/' );
-            
-            aImplName += ScannerManager::getImplementationName_Static();
-            aImplName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES/" ) );
-            aImplName += ScannerManager::getImplementationName_Static();
-
-            REF( XRegistryKey ) xNewKey1( static_cast< XRegistryKey* >( pRegistryKey )->createKey( aImplName ) );
-            
-            bRet = sal_True;
-        }
-        catch( InvalidRegistryException& )
-        {
-            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
-        }
-    }
-
-    return bRet;
-}
-
 // ------------------------
 // - component_getFactory -
 // ------------------------
diff --git a/extensions/source/svg/svguno.cxx b/extensions/source/svg/svguno.cxx
index ba1a5824d..38cf50eab 100644
--- a/extensions/source/svg/svguno.cxx
+++ b/extensions/source/svg/svguno.cxx
@@ -60,36 +60,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-// -----------------------
-// - component_writeInfo -
-// -----------------------
-
-extern "C" sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey )
-{
-    sal_Bool bRet = sal_False;
-
-    if( pRegistryKey )
-    {
-        try
-        {
-            REF( NMSP_REGISTRY::XRegistryKey ) xNewKey1(
-                static_cast< NMSP_REGISTRY::XRegistryKey* >( pRegistryKey )->createKey(
-                B2UCONST( "/com.sun.star.comp.extensions.SVGWriter/UNO/SERVICES/com.sun.star.svg.SVGWriter" ) ) );
-            REF( NMSP_REGISTRY::XRegistryKey ) xNewKey2(
-                static_cast< NMSP_REGISTRY::XRegistryKey* >( pRegistryKey )->createKey(
-                B2UCONST( "/com.sun.star.comp.extensions.SVGPrinter/UNO/SERVICES/com.sun.star.svg.SVGPrinter" ) ) );
-
-            bRet = sal_True;
-        }
-        catch( NMSP_REGISTRY::InvalidRegistryException& )
-        {
-            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
-        }
-    }
-
-    return bRet;
-}
-
 // ------------------------
 // - component_getFactory -
 // ------------------------
diff --git a/extensions/source/update/check/makefile.mk b/extensions/source/update/check/makefile.mk
index 9f5f54410..47da869ea 100644
--- a/extensions/source/update/check/makefile.mk
+++ b/extensions/source/update/check/makefile.mk
@@ -132,3 +132,11 @@ $(SPOOLDIR)$/$(PACKAGEDIR)$/Jobs$/Jobs-onlineupdate.xcu : $(XCU_SOURCEDIR)$/Jobs
     @$(COPY) $< $@
 #	@$(PERL) transform.pl < $< > $@
 
+
+ALLTAR : $(MISC)/updchk.uno.component
+
+$(MISC)/updchk.uno.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        updchk.uno.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt updchk.uno.component
diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx
index c75530388..d8d95540a 100755
--- a/extensions/source/update/check/updatecheckjob.cxx
+++ b/extensions/source/update/check/updatecheckjob.cxx
@@ -388,18 +388,6 @@ component_getImplementationEnvironment( const sal_Char **aEnvTypeName, uno_Envir
 
 //------------------------------------------------------------------------------
 
-extern "C" sal_Bool SAL_CALL 
-component_writeInfo(void *pServiceManager, void *pRegistryKey) 
-{
-    return cppu::component_writeInfoHelper(
-        pServiceManager,
-        pRegistryKey,
-        kImplementations_entries
-    );
-}
-
-//------------------------------------------------------------------------------
-
 extern "C" void *
 component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey) 
 {
diff --git a/extensions/source/update/check/updchk.uno.component b/extensions/source/update/check/updchk.uno.component
new file mode 100644
index 000000000..b1eb32917
--- /dev/null
+++ b/extensions/source/update/check/updchk.uno.component
@@ -0,0 +1,37 @@
+
+
+
+
+  
+    
+  
+  
+    
+  
+
diff --git a/extensions/source/update/feed/makefile.mk b/extensions/source/update/feed/makefile.mk
index 7e12970dd..6361f20bd 100644
--- a/extensions/source/update/feed/makefile.mk
+++ b/extensions/source/update/feed/makefile.mk
@@ -62,3 +62,11 @@ DEF1NAME=$(SHL1TARGET)
 
 .INCLUDE : target.mk
 
+
+ALLTAR : $(MISC)/updatefeed.component
+
+$(MISC)/updatefeed.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        updatefeed.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt updatefeed.component
diff --git a/extensions/source/update/feed/updatefeed.component b/extensions/source/update/feed/updatefeed.component
new file mode 100644
index 000000000..2d53ff5f9
--- /dev/null
+++ b/extensions/source/update/feed/updatefeed.component
@@ -0,0 +1,34 @@
+
+
+
+
+  
+    
+  
+
diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx
index 9053c4456..b0db10d1c 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -851,18 +851,6 @@ component_getImplementationEnvironment( const sal_Char **aEnvTypeName, uno_Envir
 
 //------------------------------------------------------------------------------
 
-extern "C" sal_Bool SAL_CALL
-component_writeInfo(void *pServiceManager, void *pRegistryKey)
-{
-    return cppu::component_writeInfoHelper(
-        pServiceManager,
-        pRegistryKey,
-        kImplementations_entries
-    );
-}
-
-//------------------------------------------------------------------------------
-
 extern "C" void *
 component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey)
 {
diff --git a/extensions/source/update/ui/makefile.mk b/extensions/source/update/ui/makefile.mk
index c4826efba..5ea6994d3 100644
--- a/extensions/source/update/ui/makefile.mk
+++ b/extensions/source/update/ui/makefile.mk
@@ -72,3 +72,11 @@ DEF1NAME=$(SHL1TARGET)
 
 .INCLUDE : target.mk
 
+
+ALLTAR : $(MISC)/updchk.component
+
+$(MISC)/updchk.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        updchk.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt updchk.component
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index 2fd478af3..df2632ba9 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -1059,18 +1059,6 @@ component_getImplementationEnvironment( const sal_Char **aEnvTypeName, uno_Envir
 
 //------------------------------------------------------------------------------
 
-extern "C" sal_Bool SAL_CALL
-component_writeInfo(void *pServiceManager, void *pRegistryKey)
-{
-    return cppu::component_writeInfoHelper(
-        pServiceManager,
-        pRegistryKey,
-        kImplementations_entries
-    );
-}
-
-//------------------------------------------------------------------------------
-
 extern "C" void *
 component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey)
 {
diff --git a/extensions/source/update/ui/updchk.component b/extensions/source/update/ui/updchk.component
new file mode 100644
index 000000000..bd533e30d
--- /dev/null
+++ b/extensions/source/update/ui/updchk.component
@@ -0,0 +1,34 @@
+
+
+
+
+  
+    
+  
+
diff --git a/extensions/source/xmlextract/makefile.mk b/extensions/source/xmlextract/makefile.mk
index 0a021027f..fa54df738 100644
--- a/extensions/source/xmlextract/makefile.mk
+++ b/extensions/source/xmlextract/makefile.mk
@@ -63,3 +63,11 @@ SHL1LIBS=	$(SLB)$/$(TARGET).lib
 # --- Targets ----------------------------------
 
 .INCLUDE : target.mk
+
+ALLTAR : $(MISC)/xmx.component
+
+$(MISC)/xmx.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        xmx.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt xmx.component
diff --git a/extensions/source/xmlextract/xmx.component b/extensions/source/xmlextract/xmx.component
new file mode 100644
index 000000000..456ff33b6
--- /dev/null
+++ b/extensions/source/xmlextract/xmx.component
@@ -0,0 +1,34 @@
+
+
+
+
+  
+    
+  
+
diff --git a/extensions/source/xmlextract/xmxuno.cxx b/extensions/source/xmlextract/xmxuno.cxx
index 2d4dfd7f8..5af30267e 100644
--- a/extensions/source/xmlextract/xmxuno.cxx
+++ b/extensions/source/xmlextract/xmxuno.cxx
@@ -52,27 +52,6 @@ void SAL_CALL component_getImplementationEnvironment(
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 //==================================================================================================
-sal_Bool SAL_CALL component_writeInfo(
-    void * /*pServiceManager*/, void * pRegistryKey )
-{
-    if (pRegistryKey)
-    {
-        try
-        {
-            REF( NMSP_REGISTRY::XRegistryKey ) xNewKey(
-                reinterpret_cast< NMSP_REGISTRY::XRegistryKey * >( pRegistryKey )->createKey(
-                    NMSP_RTL::OUString( RTL_CONSTASCII_USTRINGPARAM("/com.sun.star.comp.io.XMLExtractor/UNO/SERVICES/com.sun.star.io.XMLExtractor") ) ) );
-            
-            return sal_True;
-        }
-        catch (NMSP_REGISTRY::InvalidRegistryException &)
-        {
-            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
-        }
-    }
-    return sal_False;
-}
-//==================================================================================================
 void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
diff --git a/forms/prj/d.lst b/forms/prj/d.lst
index de1655d7d..a708dd3e3 100644
--- a/forms/prj/d.lst
+++ b/forms/prj/d.lst
@@ -5,3 +5,4 @@
 ..\%__SRC%\bin\*.bin %_DEST%\bin%_EXT%\*.bin
 ..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
 ..\util\*.xml %_DEST%\xml%_EXT%\*.xml
+..\%__SRC%\misc\frm.component %_DEST%\xml%_EXT%\frm.component
diff --git a/forms/source/inc/forms_module.hxx b/forms/source/inc/forms_module.hxx
index 4dac07f1b..0bf225c54 100644
--- a/forms/source/inc/forms_module.hxx
+++ b/forms/source/inc/forms_module.hxx
@@ -101,21 +101,6 @@ namespace FORMS_MODULE_NAMESPACE
         static void revokeComponent(
             const ::rtl::OUString& _rImplementationName);
 
-        /** write the registration information of all known components
-            
writes the registration information of all components which are currently registered into the
-            specified registry.

-            
Usually used from within component_writeInfo.

-            @param	_rxServiceManager
-                        the service manager
-            @param	_rRootKey
-                        the registry key under which the information will be stored
-            @return
-                        sal_True if the registration of all implementations was successfull, sal_False otherwise
-        */
-        static sal_Bool writeComponentInfos(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxServiceManager,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey >& _rRootKey);
-
         /** creates a Factory for the component with the given implementation name.
             
Usually used from within component_getFactory.

             @param	_rxServiceManager
diff --git a/forms/source/inc/forms_module_impl.hxx b/forms/source/inc/forms_module_impl.hxx
index a360384c2..5e481c4b5 100644
--- a/forms/source/inc/forms_module_impl.hxx
+++ b/forms/source/inc/forms_module_impl.hxx
@@ -106,54 +106,6 @@ namespace FORMS_MODULE_NAMESPACE
         }
     }
 
-    //--------------------------------------------------------------------------
-    sal_Bool OFormsModule::writeComponentInfos(
-            const Reference< XMultiServiceFactory >& /*_rxServiceManager*/,
-            const Reference< XRegistryKey >& _rxRootKey)
-    {
-        OSL_ENSURE(_rxRootKey.is(), "OFormsModule::writeComponentInfos : invalid argument !");
-
-        if (!s_pImplementationNames)
-        {
-            OSL_ASSERT("OFormsModule::writeComponentInfos : have no class infos ! Are you sure called this method at the right time ?");
-            return sal_True;
-        }
-        OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
-            "OFormsModule::writeComponentInfos : inconsistent state (the pointers) !");
-        OSL_ENSURE(	(s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
-                    &&	(s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
-                    &&	(s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
-            "OFormsModule::writeComponentInfos : inconsistent state !");
-
-        sal_Int32 nLen = s_pImplementationNames->getLength();
-        const ::rtl::OUString* pImplName = s_pImplementationNames->getConstArray();
-        const Sequence< ::rtl::OUString >* pServices = s_pSupportedServices->getConstArray();
-
-        ::rtl::OUString sRootKey("/", 1, RTL_TEXTENCODING_ASCII_US);
-        for (sal_Int32 i=0; i  xNewKey( _rxRootKey->createKey(aMainKeyName) );
-
-                const ::rtl::OUString* pService = pServices->getConstArray();
-                for (sal_Int32 j=0; jgetLength(); ++j, ++pService)
-                    xNewKey->createKey(*pService);
-            }
-            catch(Exception&)
-            {
-                OSL_ASSERT("OFormsModule::writeComponentInfos : something went wrong while creating the keys !");
-                return sal_False;
-            }
-        }
-
-        return sal_True;
-    }
-
     //--------------------------------------------------------------------------
     Reference< XInterface > OFormsModule::getComponentFactory(
         const ::rtl::OUString& _rImplementationName,
diff --git a/forms/source/misc/services.cxx b/forms/source/misc/services.cxx
index 3cfa7efce..423276dc3 100644
--- a/forms/source/misc/services.cxx
+++ b/forms/source/misc/services.cxx
@@ -283,22 +283,6 @@ void ensureClassInfos()
 
 }
 
-//---------------------------------------------------------------------------------------
-void registerServiceProvider(const ::rtl::OUString& _rServiceImplName, const Sequence< ::rtl::OUString >& _rServices, XRegistryKey* _pKey)
-{
-    ::rtl::OUString sMainKeyName = ::rtl::OUString::createFromAscii("/");
-    sMainKeyName += _rServiceImplName;
-    sMainKeyName += ::rtl::OUString::createFromAscii("/UNO/SERVICES");
-    Reference< XRegistryKey > xNewKey = _pKey->createKey(sMainKeyName);
-    OSL_ENSURE(xNewKey.is(), "forms::registerProvider : could not create a registry key !");
-    if (!xNewKey.is())
-        return;
-
-    const ::rtl::OUString* pSupportedServices = _rServices.getConstArray();
-    for (sal_Int32 i=0; i<_rServices.getLength(); ++i, ++pSupportedServices)
-        xNewKey->createKey(*pSupportedServices);
-}
-
 //=======================================================================================
 extern "C"
 {
@@ -341,57 +325,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const
     *_ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-//---------------------------------------------------------------------------------------
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void* _pServiceManager, XRegistryKey* _pRegistryKey)
-{
-    if (_pRegistryKey)
-    {
-        try
-        {
-            // ========================================================================
-            // the real way - use the OModule
-            createRegistryInfo_FORMS();
-            if ( !::frm::OFormsModule::writeComponentInfos(
-                    static_cast( _pServiceManager ),
-                    static_cast( _pRegistryKey ) )
-                )
-                return sal_False;
-
-            // ========================================================================
-            // a lot of stuff which is implemented "manually" here in this file
-
-            // collect the class infos
-            ensureClassInfos();
-
-            // both our static sequences should have the same length ...
-            sal_Int32 nClasses = s_aClassImplementationNames.getLength();
-            OSL_ENSURE(s_aClassServiceNames.getLength() == nClasses,
-                "forms::component_writeInfo : invalid class infos !");
-
-            // loop through the sequences and register the service providers
-            const ::rtl::OUString* pClasses = s_aClassImplementationNames.getConstArray();
-            const Sequence< ::rtl::OUString >* pServices = s_aClassServiceNames.getConstArray();
-
-            for (sal_Int32 i=0; i
+
+
+
+  
+    
+    
+  
+  
+    
+    
+    
+    
+  
+  
+    
+    
+    
+  
+  
+    
+  
+  
+    
+    
+    
+    
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+    
+    
+  
+  
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  
+  
+    
+    
+    
+    
+  
+  
+    
+    
+    
+    
+  
+  
+    
+  
+  
+    
+  
+  
+    
+  
+  
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+    
+  
+  
+    
+    
+    
+  
+  
+    
+    
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+  
+  
+    
+  
+  
+    
+  
+  
+    
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+    
+  
+  
+    
+  
+
diff --git a/forms/util/frm.dxp b/forms/util/frm.dxp
index 9e59e9403..f0e1c6993 100644
--- a/forms/util/frm.dxp
+++ b/forms/util/frm.dxp
@@ -1,3 +1,2 @@
-component_writeInfo
 component_getImplementationEnvironment
 component_getFactory
diff --git a/forms/util/makefile.mk b/forms/util/makefile.mk
index 00d7a81d5..5ce7dd256 100644
--- a/forms/util/makefile.mk
+++ b/forms/util/makefile.mk
@@ -112,3 +112,11 @@ $(MISC)$/$(SHL1TARGET).flt: makefile.mk
     @echo NavigationToolBar     >>$@
     @echo ONavigationBar        >>$@
 
+
+ALLTAR : $(MISC)/frm.component
+
+$(MISC)/frm.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        frm.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt frm.component
diff --git a/lingucomponent/prj/d.lst b/lingucomponent/prj/d.lst
index 666ee38d5..4760a299c 100644
--- a/lingucomponent/prj/d.lst
+++ b/lingucomponent/prj/d.lst
@@ -46,3 +46,8 @@ mkdir: %_DEST%\xml%_EXT%\registry\data\org\openoffice
 mkdir: %_DEST%\xml%_EXT%\registry\data\org\openoffice\Office
 ..\config\*.xcu %_DEST%\xml%_EXT%\registry\data\org\openoffice\Office\*.xcu
 
+..\%__SRC%\misc\MacOSXSpell.component %_DEST%\xml%_EXT%\MacOSXSpell.component
+..\%__SRC%\misc\guesslang.component %_DEST%\xml%_EXT%\guesslang.component
+..\%__SRC%\misc\hyphen.component %_DEST%\xml%_EXT%\hyphen.component
+..\%__SRC%\misc\lnth.component %_DEST%\xml%_EXT%\lnth.component
+..\%__SRC%\misc\spell.component %_DEST%\xml%_EXT%\spell.component
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/exports.dxp b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/exports.dxp
index b0f85bf7b..a9861e3ff 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/exports.dxp
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/exports.dxp
@@ -1,3 +1,2 @@
 component_getFactory
 component_getImplementationEnvironment
-component_writeInfo
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hreg.cxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hreg.cxx
index defbec837..8ccf152d7 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hreg.cxx
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hreg.cxx
@@ -42,9 +42,6 @@ using namespace com::sun::star::registry;
 // declaration of external RegEntry-functions defined by the service objects
 //
 
-extern sal_Bool SAL_CALL Hyphenator_writeInfo(
-    void * /*pServiceManager*/, XRegistryKey * pRegistryKey );
-
 extern void * SAL_CALL Hyphenator_getFactory(
     const sal_Char * pImplName,
     XMultiServiceFactory * pServiceManager,
@@ -57,12 +54,6 @@ extern void * SAL_CALL Hyphenator_getFactory(
 extern "C"
 {
 
-sal_Bool SAL_CALL component_writeInfo(
-    void * pServiceManager, XRegistryKey * pRegistryKey )
-{
-    return Hyphenator_writeInfo( pServiceManager, pRegistryKey );
-}
-
 void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
 {
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphen.component b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphen.component
new file mode 100644
index 000000000..aeae4c577
--- /dev/null
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphen.component
@@ -0,0 +1,34 @@
+
+
+
+
+  
+    
+  
+
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
index 2cdd99740..ab7e03485 100755
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
@@ -927,32 +927,6 @@ Sequence< OUString > Hyphenator::getSupportedServiceNames_Static()
     return aSNS;
 }
 
-
-sal_Bool SAL_CALL Hyphenator_writeInfo(
-            void * /*pServiceManager*/, registry::XRegistryKey * pRegistryKey )
-{
-
-    try
-    {
-        String aImpl( '/' );
-        aImpl += Hyphenator::getImplementationName_Static().getStr();
-        aImpl.AppendAscii( "/UNO/SERVICES" );
-        Reference< registry::XRegistryKey > xNewKey =
-                pRegistryKey->createKey( aImpl );
-        Sequence< OUString > aServices =
-                Hyphenator::getSupportedServiceNames_Static();
-        for( INT32 i = 0; i < aServices.getLength(); i++ )
-            xNewKey->createKey( aServices.getConstArray()[i] );
-
-        return sal_True;
-    }
-    catch(Exception &)
-    {
-        return sal_False;
-    }
-}
-
-
 void * SAL_CALL Hyphenator_getFactory( const sal_Char * pImplName,
             XMultiServiceFactory * pServiceManager, void *  )
 {
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk
index f3626c703..6f767d8bf 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk
@@ -91,3 +91,11 @@ DEF1EXPORTFILE=	exports.dxp
 
 .INCLUDE : target.mk
 
+
+ALLTAR : $(MISC)/hyphen.component
+
+$(MISC)/hyphen.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        hyphen.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt hyphen.component
diff --git a/lingucomponent/source/languageguessing/guesslang.component b/lingucomponent/source/languageguessing/guesslang.component
new file mode 100644
index 000000000..633a489c3
--- /dev/null
+++ b/lingucomponent/source/languageguessing/guesslang.component
@@ -0,0 +1,34 @@
+
+
+
+
+  
+    
+  
+
diff --git a/lingucomponent/source/languageguessing/guesslang.cxx b/lingucomponent/source/languageguessing/guesslang.cxx
index 8b864b3c0..0314f1757 100644
--- a/lingucomponent/source/languageguessing/guesslang.cxx
+++ b/lingucomponent/source/languageguessing/guesslang.cxx
@@ -465,13 +465,6 @@ void SAL_CALL component_getImplementationEnvironment(
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-sal_Bool SAL_CALL component_writeInfo(
-    XMultiServiceFactory * xMgr, registry::XRegistryKey * xRegistry )
-{
-    return ::cppu::component_writeInfoHelper(
-        xMgr, xRegistry, s_component_entries );
-}
-
 void * SAL_CALL component_getFactory(
     sal_Char const * implName, lang::XMultiServiceFactory * xMgr,
     registry::XRegistryKey * xRegistry )
diff --git a/lingucomponent/source/languageguessing/makefile.mk b/lingucomponent/source/languageguessing/makefile.mk
index ebad4076b..624ccba3c 100644
--- a/lingucomponent/source/languageguessing/makefile.mk
+++ b/lingucomponent/source/languageguessing/makefile.mk
@@ -78,3 +78,11 @@ DEF1NAME    =$(SHL1TARGET)
 
 .INCLUDE : target.mk
 
+
+ALLTAR : $(MISC)/guesslang.component
+
+$(MISC)/guesslang.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        guesslang.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt guesslang.component
diff --git a/lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component b/lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component
new file mode 100644
index 000000000..2f2f9e102
--- /dev/null
+++ b/lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component
@@ -0,0 +1,34 @@
+
+
+
+
+  
+    
+  
+
diff --git a/lingucomponent/source/spellcheck/macosxspell/macreg.cxx b/lingucomponent/source/spellcheck/macosxspell/macreg.cxx
index bf84b274c..8c431d4be 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macreg.cxx
+++ b/lingucomponent/source/spellcheck/macosxspell/macreg.cxx
@@ -42,9 +42,6 @@ using namespace com::sun::star::registry;
 // declaration of external RegEntry-functions defined by the service objects
 //
 
-extern sal_Bool SAL_CALL MacSpellChecker_writeInfo(
-    void * /*pServiceManager*/, XRegistryKey * pRegistryKey );
-
 extern void * SAL_CALL MacSpellChecker_getFactory(
     const sal_Char * pImplName,
     XMultiServiceFactory * pServiceManager,
@@ -57,12 +54,6 @@ extern void * SAL_CALL MacSpellChecker_getFactory(
 extern "C"
 {
 
-sal_Bool SAL_CALL component_writeInfo(
-    void * pServiceManager, XRegistryKey * pRegistryKey )
-{
-    return MacSpellChecker_writeInfo( pServiceManager, pRegistryKey );
-}
-
 void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
 {
diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx b/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
index f19802066..61e2e77c6 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
@@ -644,32 +644,6 @@ Sequence< OUString > MacSpellChecker::getSupportedServiceNames_Static()
     return aSNS;
 }
 
-
-sal_Bool SAL_CALL MacSpellChecker_writeInfo(
-            void * /*pServiceManager*/, registry::XRegistryKey * pRegistryKey )
-{
-
-    try
-    {
-        String aImpl( '/' );
-        aImpl += MacSpellChecker::getImplementationName_Static().getStr();
-        aImpl.AppendAscii( "/UNO/SERVICES" );
-        Reference< registry::XRegistryKey > xNewKey =
-                pRegistryKey->createKey( aImpl );
-        Sequence< OUString > aServices =
-                MacSpellChecker::getSupportedServiceNames_Static();
-        for( INT32 i = 0; i < aServices.getLength(); i++ )
-            xNewKey->createKey( aServices.getConstArray()[i] );
-
-        return sal_True;
-    }
-    catch(Exception &)
-    {
-        return sal_False;
-    }
-}
-
-
 void * SAL_CALL MacSpellChecker_getFactory( const sal_Char * pImplName,
             XMultiServiceFactory * pServiceManager, void *  )
 {
diff --git a/lingucomponent/source/spellcheck/macosxspell/makefile.mk b/lingucomponent/source/spellcheck/macosxspell/makefile.mk
index 6414560e0..4e88b808d 100644
--- a/lingucomponent/source/spellcheck/macosxspell/makefile.mk
+++ b/lingucomponent/source/spellcheck/macosxspell/makefile.mk
@@ -91,3 +91,11 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 dummy:
     @echo " Nothing to build for GUIBASE=$(GUIBASE)"
 .ENDIF
+
+ALLTAR : $(MISC)/MacOSXSpell.component
+
+$(MISC)/MacOSXSpell.component .ERRREMOVE : \
+        $(SOLARENV)/bin/createcomponent.xslt MacOSXSpell.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt MacOSXSpell.component
diff --git a/lingucomponent/source/spellcheck/spell/exports.dxp b/lingucomponent/source/spellcheck/spell/exports.dxp
index b0f85bf7b..a9861e3ff 100644
--- a/lingucomponent/source/spellcheck/spell/exports.dxp
+++ b/lingucomponent/source/spellcheck/spell/exports.dxp
@@ -1,3 +1,2 @@
 component_getFactory
 component_getImplementationEnvironment
-component_writeInfo
diff --git a/lingucomponent/source/spellcheck/spell/makefile.mk b/lingucomponent/source/spellcheck/spell/makefile.mk
index 4173d4dba..56dd79939 100644
--- a/lingucomponent/source/spellcheck/spell/makefile.mk
+++ b/lingucomponent/source/spellcheck/spell/makefile.mk
@@ -85,3 +85,11 @@ DEF1EXPORTFILE=	exports.dxp
 
 .INCLUDE : target.mk
 
+
+ALLTAR : $(MISC)/spell.component
+
+$(MISC)/spell.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        spell.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt spell.component
diff --git a/lingucomponent/source/spellcheck/spell/spell.component b/lingucomponent/source/spellcheck/spell/spell.component
new file mode 100644
index 000000000..9f951a8a8
--- /dev/null
+++ b/lingucomponent/source/spellcheck/spell/spell.component
@@ -0,0 +1,34 @@
+
+
+
+
+  
+    
+  
+
diff --git a/lingucomponent/source/spellcheck/spell/sreg.cxx b/lingucomponent/source/spellcheck/spell/sreg.cxx
index 84373bd2c..fa2c67840 100644
--- a/lingucomponent/source/spellcheck/spell/sreg.cxx
+++ b/lingucomponent/source/spellcheck/spell/sreg.cxx
@@ -42,9 +42,6 @@ using namespace com::sun::star::registry;
 // declaration of external RegEntry-functions defined by the service objects
 //
 
-extern sal_Bool SAL_CALL SpellChecker_writeInfo(
-    void * /*pServiceManager*/, XRegistryKey * pRegistryKey );
-
 extern void * SAL_CALL SpellChecker_getFactory(
     const sal_Char * pImplName,
     XMultiServiceFactory * pServiceManager,
@@ -56,12 +53,6 @@ extern void * SAL_CALL SpellChecker_getFactory(
 extern "C"
 {
 
-sal_Bool SAL_CALL component_writeInfo(
-    void * pServiceManager, XRegistryKey * pRegistryKey )
-{
-    return SpellChecker_writeInfo( pServiceManager, pRegistryKey );
-}
-
 void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
 {
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index 894f9fd33..678036d47 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -673,32 +673,6 @@ Sequence< OUString > SpellChecker::getSupportedServiceNames_Static()
     return aSNS;
 }
 
-
-sal_Bool SAL_CALL SpellChecker_writeInfo(
-            void * /*pServiceManager*/, registry::XRegistryKey * pRegistryKey )
-{
-
-    try
-    {
-        String aImpl( '/' );
-        aImpl += SpellChecker::getImplementationName_Static().getStr();
-        aImpl.AppendAscii( "/UNO/SERVICES" );
-        Reference< registry::XRegistryKey > xNewKey =
-                pRegistryKey->createKey( aImpl );
-        Sequence< OUString > aServices =
-                SpellChecker::getSupportedServiceNames_Static();
-        for( INT32 i = 0; i < aServices.getLength(); i++ )
-            xNewKey->createKey( aServices.getConstArray()[i] );
-
-        return sal_True;
-    }
-    catch(Exception &)
-    {
-        return sal_False;
-    }
-}
-
-
 void * SAL_CALL SpellChecker_getFactory( const sal_Char * pImplName,
             XMultiServiceFactory * pServiceManager, void *  )
 {
diff --git a/lingucomponent/source/thesaurus/libnth/exports.dxp b/lingucomponent/source/thesaurus/libnth/exports.dxp
index b0f85bf7b..a9861e3ff 100644
--- a/lingucomponent/source/thesaurus/libnth/exports.dxp
+++ b/lingucomponent/source/thesaurus/libnth/exports.dxp
@@ -1,3 +1,2 @@
 component_getFactory
 component_getImplementationEnvironment
-component_writeInfo
diff --git a/lingucomponent/source/thesaurus/libnth/lnth.component b/lingucomponent/source/thesaurus/libnth/lnth.component
new file mode 100644
index 000000000..bea91b94c
--- /dev/null
+++ b/lingucomponent/source/thesaurus/libnth/lnth.component
@@ -0,0 +1,34 @@
+
+
+
+
+  
+    
+  
+
diff --git a/lingucomponent/source/thesaurus/libnth/makefile.mk b/lingucomponent/source/thesaurus/libnth/makefile.mk
index 58e4d97e5..91d39d2d3 100644
--- a/lingucomponent/source/thesaurus/libnth/makefile.mk
+++ b/lingucomponent/source/thesaurus/libnth/makefile.mk
@@ -105,3 +105,11 @@ DEF1EXPORTFILE=	exports.dxp
 
 .INCLUDE : target.mk
 
+
+ALLTAR : $(MISC)/lnth.component
+
+$(MISC)/lnth.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        lnth.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt lnth.component
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
index dd1685056..80c99b328 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
@@ -739,31 +739,6 @@ Sequence< OUString > Thesaurus::getSupportedServiceNames_Static()
     return aSNS;
 }
 
-
-sal_Bool SAL_CALL Thesaurus_writeInfo(
-            void * /*pServiceManager*/, registry::XRegistryKey * pRegistryKey )
-{
-    try
-    {
-        String aImpl( '/' );
-        aImpl += Thesaurus::getImplementationName_Static().getStr();
-        aImpl.AppendAscii( "/UNO/SERVICES" );
-        Reference< registry::XRegistryKey > xNewKey =
-                pRegistryKey->createKey( aImpl );
-        Sequence< OUString > aServices =
-                Thesaurus::getSupportedServiceNames_Static();
-        for( INT32 i = 0; i < aServices.getLength(); i++ )
-            xNewKey->createKey( aServices.getConstArray()[i] );
-
-        return sal_True;
-    }
-    catch(Exception &)
-    {
-        return sal_False;
-    }
-}
-
-
 void * SAL_CALL Thesaurus_getFactory( const sal_Char * pImplName,
             XMultiServiceFactory * pServiceManager, void *  )
 {
diff --git a/lingucomponent/source/thesaurus/libnth/ntreg.cxx b/lingucomponent/source/thesaurus/libnth/ntreg.cxx
index ffdca7377..71dbe7d08 100644
--- a/lingucomponent/source/thesaurus/libnth/ntreg.cxx
+++ b/lingucomponent/source/thesaurus/libnth/ntreg.cxx
@@ -41,9 +41,6 @@ using namespace com::sun::star::registry;
 // declaration of external RegEntry-functions defined by the service objects
 //
 
-extern sal_Bool SAL_CALL Thesaurus_writeInfo(
-    void * /*pServiceManager*/, XRegistryKey * pRegistryKey );
-
 extern void * SAL_CALL Thesaurus_getFactory(
     const sal_Char * pImplName,
     XMultiServiceFactory * pServiceManager,
@@ -56,12 +53,6 @@ extern void * SAL_CALL Thesaurus_getFactory(
 extern "C"
 {
 
-sal_Bool SAL_CALL component_writeInfo(
-    void * pServiceManager, XRegistryKey * pRegistryKey )
-{
-    return Thesaurus_writeInfo( pServiceManager, pRegistryKey );
-}
-
 void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
 {
diff --git a/package/prj/d.lst b/package/prj/d.lst
index 23966d0cf..919a1719a 100644
--- a/package/prj/d.lst
+++ b/package/prj/d.lst
@@ -3,3 +3,5 @@
 ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
 ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
 ..\dtd\*.dtd %_DEST%\bin%_EXT%\*.*
+..\%__SRC%\misc\package2.component %_DEST%\xml%_EXT%\package2.component
+..\%__SRC%\misc\xstor.component %_DEST%\xml%_EXT%\xstor.component
diff --git a/package/source/manifest/UnoRegister.cxx b/package/source/manifest/UnoRegister.cxx
index 5c393ec08..eeedeb7e5 100644
--- a/package/source/manifest/UnoRegister.cxx
+++ b/package/source/manifest/UnoRegister.cxx
@@ -46,43 +46,6 @@ using namespace ::com::sun::star::registry;
 using namespace ::com::sun::star::packages;
 using namespace ::com::sun::star::packages::manifest;
 
-static sal_Bool writeInfo( void * pRegistryKey,
-                           const OUString & rImplementationName,
-                              Sequence< OUString > const & rServiceNames )
-{
-    OUString aKeyName( OUString::createFromAscii( "/" ) );
-    aKeyName += rImplementationName;
-    aKeyName += OUString::createFromAscii( "/UNO/SERVICES" );
-
-    Reference< XRegistryKey > xKey;
-    try
-    {
-        xKey = static_cast< XRegistryKey * >(
-                                    pRegistryKey )->createKey( aKeyName );
-    }
-    catch ( InvalidRegistryException const & )
-    {
-    }
-
-    if ( !xKey.is() )
-        return sal_False;
-
-    sal_Bool bSuccess = sal_True;
-
-    for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n )
-    {
-        try
-        {
-            xKey->createKey( rServiceNames[ n ] );
-        }
-        catch ( InvalidRegistryException const & )
-        {
-            bSuccess = sal_False;
-            break;
-        }
-    }
-    return bSuccess;
-}
 // C functions to implement this as a component
 
 extern "C" void SAL_CALL component_getImplementationEnvironment(
@@ -90,32 +53,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
- 
-/**
- * This function creates an implementation section in the registry and another subkey
- * for each supported service.
- * @param pServiceManager generic uno interface providing a service manager
- * @param pRegistryKey generic uno interface providing registry key to write
- */
-extern "C" sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey )
-{
-    return pRegistryKey &&
-    writeInfo (pRegistryKey, 
-               ManifestReader::static_getImplementationName(),
-               ManifestReader::static_getSupportedServiceNames() ) &&
-    writeInfo (pRegistryKey, 
-               ManifestWriter::static_getImplementationName(),
-               ManifestWriter::static_getSupportedServiceNames() ) &&
-    writeInfo (pRegistryKey, 
-               ZipPackage::static_getImplementationName(),
-               ZipPackage::static_getSupportedServiceNames() ) &&
-
-    writeInfo (pRegistryKey, 
-               OZipFileAccess::impl_staticGetImplementationName(),
-               OZipFileAccess::impl_staticGetSupportedServiceNames() ); 
-
-} 
-
 
 /**
  * This function is called to get service factories for an implementation.
diff --git a/package/source/xstor/makefile.mk b/package/source/xstor/makefile.mk
index 76494cb7d..5c381ba4c 100644
--- a/package/source/xstor/makefile.mk
+++ b/package/source/xstor/makefile.mk
@@ -73,3 +73,11 @@ DEF1EXPORTFILE=$(SHL1TARGET).dxp
 
 .INCLUDE :  target.mk
 
+
+ALLTAR : $(MISC)/xstor.component
+
+$(MISC)/xstor.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        xstor.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt xstor.component
diff --git a/package/source/xstor/register.cxx b/package/source/xstor/register.cxx
index b0235f063..8eb4d7816 100644
--- a/package/source/xstor/register.cxx
+++ b/package/source/xstor/register.cxx
@@ -69,33 +69,5 @@ void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServic
     return pRet;
 }
 
-sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, void * pRegistryKey )
-{
-    if (pRegistryKey)
-    {
-        try
-        {
-            uno::Reference< registry::XRegistryKey > xKey( reinterpret_cast< registry::XRegistryKey* >( pRegistryKey ) );
-
-            uno::Reference< registry::XRegistryKey >  xNewKey;
-
-            xNewKey = xKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + 
-                                        OStorageFactory::impl_staticGetImplementationName() +
-                                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") )  );
-
-            const uno::Sequence< ::rtl::OUString > aServices = OStorageFactory::impl_staticGetSupportedServiceNames();
-            for( sal_Int32 ind = 0; ind < aServices.getLength(); ind++ )
-                xNewKey->createKey( aServices.getConstArray()[ind] );
-
-            return sal_True;
-        }
-        catch (registry::InvalidRegistryException &)
-        {
-            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
-        }
-    }
-    return sal_False;
-}
-
 } // extern "C"
 
diff --git a/package/source/xstor/xstor.component b/package/source/xstor/xstor.component
new file mode 100644
index 000000000..f338d6a54
--- /dev/null
+++ b/package/source/xstor/xstor.component
@@ -0,0 +1,35 @@
+
+
+
+
+  
+    
+    
+  
+
diff --git a/package/source/xstor/xstor.dxp b/package/source/xstor/xstor.dxp
index 9630d7e06..f0e1c6993 100644
--- a/package/source/xstor/xstor.dxp
+++ b/package/source/xstor/xstor.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/package/util/exports.dxp b/package/util/exports.dxp
index 9630d7e06..f0e1c6993 100644
--- a/package/util/exports.dxp
+++ b/package/util/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/package/util/makefile.mk b/package/util/makefile.mk
index 20732c102..344b2cf13 100644
--- a/package/util/makefile.mk
+++ b/package/util/makefile.mk
@@ -75,3 +75,11 @@ DEF1NAME=$(SHL1TARGET)
 
 .INCLUDE :  target.mk
 
+
+ALLTAR : $(MISC)/package2.component
+
+$(MISC)/package2.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        package2.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt package2.component
diff --git a/package/util/package2.component b/package/util/package2.component
new file mode 100644
index 000000000..cdfa842d0
--- /dev/null
+++ b/package/util/package2.component
@@ -0,0 +1,44 @@
+
+
+
+
+  
+    
+    
+  
+  
+    
+  
+  
+    
+  
+  
+    
+  
+
diff --git a/wizards/com/sun/star/wizards/agenda/CallWizard.java b/wizards/com/sun/star/wizards/agenda/CallWizard.java
index de5a16106..bcaf82726 100644
--- a/wizards/com/sun/star/wizards/agenda/CallWizard.java
+++ b/wizards/com/sun/star/wizards/agenda/CallWizard.java
@@ -40,8 +40,7 @@ import com.sun.star.uno.Type;
 
 /**
  * This class capsulates the class, that implements the minimal component, a factory for
- * creating the service (__getServiceFactory) and a method, that writes the
- * information into the given registry key (__writeRegistryServiceInfo).
+ * creating the service (__getServiceFactory).
  *
  * @author $author$
  * @version $Revision: 1.5.52.1 $
@@ -73,21 +72,6 @@ public class CallWizard {
         return xsingleservicefactory;
     }
 
-    /**
-     * Writes the service information into the given registry key. This method is called
-     * by the JavaLoader.
-     *
-     * @param xregistrykey Makes structural information (except regarding tree
-     *        structures) of a single registry key accessible.
-     *
-     * @return returns true if the operation succeeded
-     *
-     * @see com.sun.star.comp.loader.JavaLoader#
-     */
-    public static boolean __writeRegistryServiceInfo(XRegistryKey xregistrykey) {
-        return FactoryHelper.writeRegistryServiceInfo(WizardImplementation.class.getName(), WizardImplementation.__serviceName, xregistrykey);
-    }
-
     /**
      * This class implements the component. At least the interfaces XServiceInfo,
      * XTypeProvider, and XInitialization should be provided by the service.
diff --git a/wizards/com/sun/star/wizards/agenda/agenda.component b/wizards/com/sun/star/wizards/agenda/agenda.component
new file mode 100644
index 000000000..e35087d94
--- /dev/null
+++ b/wizards/com/sun/star/wizards/agenda/agenda.component
@@ -0,0 +1,35 @@
+
+
+
+
+  
+    
+  
+
diff --git a/wizards/com/sun/star/wizards/agenda/makefile.mk b/wizards/com/sun/star/wizards/agenda/makefile.mk
index 314dcf3b7..1f07e9adf 100644
--- a/wizards/com/sun/star/wizards/agenda/makefile.mk
+++ b/wizards/com/sun/star/wizards/agenda/makefile.mk
@@ -69,3 +69,11 @@ JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
+
+ALLTAR : $(MISC)/agenda.component
+
+$(MISC)/agenda.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        agenda.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_JAVA)$(JARTARGET)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt agenda.component
diff --git a/wizards/com/sun/star/wizards/fax/CallWizard.java b/wizards/com/sun/star/wizards/fax/CallWizard.java
index 0d04b0b94..d177a2100 100644
--- a/wizards/com/sun/star/wizards/fax/CallWizard.java
+++ b/wizards/com/sun/star/wizards/fax/CallWizard.java
@@ -41,8 +41,7 @@ import com.sun.star.uno.Type;
 
 /**
  * This class capsulates the class, that implements the minimal component, a factory for
- * creating the service (__getServiceFactory) and a method, that writes the
- * information into the given registry key (__writeRegistryServiceInfo).
+ * creating the service (__getServiceFactory).
  *
  * @author $author$
  * @version $Revision: 1.3.192.1 $
@@ -77,22 +76,6 @@ public class CallWizard
         return xsingleservicefactory;
     }
 
-    /**
-     * Writes the service information into the given registry key. This method is called
-     * by the JavaLoader.
-     *
-     * @param xregistrykey Makes structural information (except regarding tree
-     *        structures) of a single registry key accessible.
-     *
-     * @return returns true if the operation succeeded
-     *
-     * @see com.sun.star.comp.loader.JavaLoader#
-     */
-    public static boolean __writeRegistryServiceInfo(XRegistryKey xregistrykey)
-    {
-        return FactoryHelper.writeRegistryServiceInfo(WizardImplementation.class.getName(), WizardImplementation.__serviceName, xregistrykey);
-    }
-
     /**
      * This class implements the component. At least the interfaces XServiceInfo,
      * XTypeProvider, and XInitialization should be provided by the service.
diff --git a/wizards/com/sun/star/wizards/fax/fax.component b/wizards/com/sun/star/wizards/fax/fax.component
new file mode 100644
index 000000000..462fe2901
--- /dev/null
+++ b/wizards/com/sun/star/wizards/fax/fax.component
@@ -0,0 +1,35 @@
+
+
+
+
+  
+    
+  
+
diff --git a/wizards/com/sun/star/wizards/fax/makefile.mk b/wizards/com/sun/star/wizards/fax/makefile.mk
index 247aaf063..5cf089392 100644
--- a/wizards/com/sun/star/wizards/fax/makefile.mk
+++ b/wizards/com/sun/star/wizards/fax/makefile.mk
@@ -60,3 +60,11 @@ JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
+
+ALLTAR : $(MISC)/fax.component
+
+$(MISC)/fax.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        fax.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_JAVA)$(JARTARGET)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt fax.component
diff --git a/wizards/com/sun/star/wizards/form/CallFormWizard.java b/wizards/com/sun/star/wizards/form/CallFormWizard.java
index 4d730225d..d0994cf11 100644
--- a/wizards/com/sun/star/wizards/form/CallFormWizard.java
+++ b/wizards/com/sun/star/wizards/form/CallFormWizard.java
@@ -31,9 +31,7 @@ import com.sun.star.uno.Type;
 import com.sun.star.wizards.common.Properties;
 
 /** This class capsulates the class, that implements the minimal component, a
- * factory for creating the service (__getServiceFactory) and a
- * method, that writes the information into the given registry key
- * (__writeRegistryServiceInfo).
+ * factory for creating the service (__getServiceFactory).
  * @author Bertram Nolte
  */
 public class CallFormWizard
@@ -62,19 +60,6 @@ public class CallFormWizard
         return xsingleservicefactory;
     }
 
-    /** Writes the service information into the given registry key.
-     * This method is called by the JavaLoader.
-     * @return returns true if the operation succeeded
-     * @see com.sun.star.comp.loader.JavaLoader#
-     * @param xregistrykey Makes structural information (except regarding tree
-     * structures) of a single
-     * registry key accessible.
-     */
-    public static boolean __writeRegistryServiceInfo(com.sun.star.registry.XRegistryKey xregistrykey)
-    {
-        return com.sun.star.comp.loader.FactoryHelper.writeRegistryServiceInfo(FormWizardImplementation.class.getName(), FormWizardImplementation.__serviceName, xregistrykey);
-    }
-
     /** This class implements the component. At least the interfaces XServiceInfo,
      * XTypeProvider, and XInitialization should be provided by the service.
      */
diff --git a/wizards/com/sun/star/wizards/form/form.component b/wizards/com/sun/star/wizards/form/form.component
new file mode 100644
index 000000000..3f010d8bc
--- /dev/null
+++ b/wizards/com/sun/star/wizards/form/form.component
@@ -0,0 +1,35 @@
+
+
+
+
+  
+    
+  
+
diff --git a/wizards/com/sun/star/wizards/form/makefile.mk b/wizards/com/sun/star/wizards/form/makefile.mk
index 092135289..b63666073 100644
--- a/wizards/com/sun/star/wizards/form/makefile.mk
+++ b/wizards/com/sun/star/wizards/form/makefile.mk
@@ -65,3 +65,11 @@ JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
+
+ALLTAR : $(MISC)/form.component
+
+$(MISC)/form.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        form.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_JAVA)$(JARTARGET)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt form.component
diff --git a/wizards/com/sun/star/wizards/letter/CallWizard.java b/wizards/com/sun/star/wizards/letter/CallWizard.java
index d203856d6..5488ffcc4 100644
--- a/wizards/com/sun/star/wizards/letter/CallWizard.java
+++ b/wizards/com/sun/star/wizards/letter/CallWizard.java
@@ -41,8 +41,7 @@ import com.sun.star.uno.Type;
 
 /**
  * This class capsulates the class, that implements the minimal component, a factory for
- * creating the service (__getServiceFactory) and a method, that writes the
- * information into the given registry key (__writeRegistryServiceInfo).
+ * creating the service (__getServiceFactory).
  *
  * @author $author$
  * @version $Revision: 1.3.192.1 $
@@ -77,22 +76,6 @@ public class CallWizard
         return xsingleservicefactory;
     }
 
-    /**
-     * Writes the service information into the given registry key. This method is called
-     * by the JavaLoader.
-     *
-     * @param xregistrykey Makes structural information (except regarding tree
-     *        structures) of a single registry key accessible.
-     *
-     * @return returns true if the operation succeeded
-     *
-     * @see com.sun.star.comp.loader.JavaLoader#
-     */
-    public static boolean __writeRegistryServiceInfo(XRegistryKey xregistrykey)
-    {
-        return FactoryHelper.writeRegistryServiceInfo(WizardImplementation.class.getName(), WizardImplementation.__serviceName, xregistrykey);
-    }
-
     /**
      * This class implements the component. At least the interfaces XServiceInfo,
      * XTypeProvider, and XInitialization should be provided by the service.
diff --git a/wizards/com/sun/star/wizards/letter/letter.component b/wizards/com/sun/star/wizards/letter/letter.component
new file mode 100644
index 000000000..277aae81e
--- /dev/null
+++ b/wizards/com/sun/star/wizards/letter/letter.component
@@ -0,0 +1,35 @@
+
+
+
+
+  
+    
+  
+
diff --git a/wizards/com/sun/star/wizards/letter/makefile.mk b/wizards/com/sun/star/wizards/letter/makefile.mk
index 700d0b72d..ca6c750ba 100644
--- a/wizards/com/sun/star/wizards/letter/makefile.mk
+++ b/wizards/com/sun/star/wizards/letter/makefile.mk
@@ -63,3 +63,11 @@ JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
+
+ALLTAR : $(MISC)/letter.component
+
+$(MISC)/letter.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        letter.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_JAVA)$(JARTARGET)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt letter.component
diff --git a/wizards/com/sun/star/wizards/query/CallQueryWizard.java b/wizards/com/sun/star/wizards/query/CallQueryWizard.java
index f108bc365..99952e19c 100644
--- a/wizards/com/sun/star/wizards/query/CallQueryWizard.java
+++ b/wizards/com/sun/star/wizards/query/CallQueryWizard.java
@@ -34,9 +34,7 @@ import com.sun.star.uno.Type;
 import com.sun.star.wizards.common.Properties;
 
 /** This class capsulates the class, that implements the minimal component, a
- * factory for creating the service (__getServiceFactory) and a
- * method, that writes the information into the given registry key
- * (__writeRegistryServiceInfo).
+ * factory for creating the service (__getServiceFactory).
  * @author Bertram Nolte
  */
 public class CallQueryWizard
@@ -65,19 +63,6 @@ public class CallQueryWizard
         return xsingleservicefactory;
     }
 
-    /** Writes the service information into the given registry key.
-     * This method is called by the JavaLoader.
-     * @return returns true if the operation succeeded
-     * @see com.sun.star.comp.loader.JavaLoader#
-     * @param xregistrykey Makes structural information (except regarding tree
-     * structures) of a single
-     * registry key accessible.
-     */
-    public static boolean __writeRegistryServiceInfo(com.sun.star.registry.XRegistryKey xregistrykey)
-    {
-        return com.sun.star.comp.loader.FactoryHelper.writeRegistryServiceInfo(QueryWizardImplementation.class.getName(), QueryWizardImplementation.__serviceName, xregistrykey);
-    }
-
     /** This class implements the component. At least the interfaces XServiceInfo,
      * XTypeProvider, and XInitialization should be provided by the service.
      */
diff --git a/wizards/com/sun/star/wizards/query/makefile.mk b/wizards/com/sun/star/wizards/query/makefile.mk
index af5056ba5..080076668 100644
--- a/wizards/com/sun/star/wizards/query/makefile.mk
+++ b/wizards/com/sun/star/wizards/query/makefile.mk
@@ -59,3 +59,11 @@ JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
+
+ALLTAR : $(MISC)/query.component
+
+$(MISC)/query.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        query.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_JAVA)$(JARTARGET)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt query.component
diff --git a/wizards/com/sun/star/wizards/query/query.component b/wizards/com/sun/star/wizards/query/query.component
new file mode 100644
index 000000000..d1d708c6b
--- /dev/null
+++ b/wizards/com/sun/star/wizards/query/query.component
@@ -0,0 +1,35 @@
+
+
+
+
+  
+    
+  
+
diff --git a/wizards/com/sun/star/wizards/report/CallReportWizard.java b/wizards/com/sun/star/wizards/report/CallReportWizard.java
index 78b67263e..47d846183 100644
--- a/wizards/com/sun/star/wizards/report/CallReportWizard.java
+++ b/wizards/com/sun/star/wizards/report/CallReportWizard.java
@@ -35,9 +35,7 @@ import com.sun.star.sdb.application.XDatabaseDocumentUI;
 import com.sun.star.wizards.common.NamedValueCollection;
 
 /** This class capsulates the class, that implements the minimal component, a
- * factory for creating the service (__getServiceFactory) and a
- * method, that writes the information into the given registry key
- * (__writeRegistryServiceInfo).
+ * factory for creating the service (__getServiceFactory).
  * @author Bertram Nolte
  */
 public class CallReportWizard
@@ -94,22 +92,6 @@ public class CallReportWizard
         return xsingleservicefactory;
     }
 
-    /** Writes the service information into the given registry key.
-     * This method is called by the JavaLoader.
-     * @return returns true if the operation succeeded
-     * @see com.sun.star.comp.loader.JavaLoader#
-     * @param xregistrykey Makes structural information (except regarding tree
-     * structures) of a single
-     * registry key accessible.
-     */
-    public static boolean __writeRegistryServiceInfo(com.sun.star.registry.XRegistryKey xregistrykey)
-    {
-        return com.sun.star.comp.loader.FactoryHelper.writeRegistryServiceInfo(
-                ReportWizardImplementation.class.getName(),
-                ReportWizardImplementation.__serviceName,
-                xregistrykey);
-    }
-
     /** This class implements the component. At least the interfaces XServiceInfo,
      * XTypeProvider, and XInitialization should be provided by the service.
      */
diff --git a/wizards/com/sun/star/wizards/report/makefile.mk b/wizards/com/sun/star/wizards/report/makefile.mk
index b31639d21..62b948674 100644
--- a/wizards/com/sun/star/wizards/report/makefile.mk
+++ b/wizards/com/sun/star/wizards/report/makefile.mk
@@ -66,3 +66,11 @@ JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
+
+ALLTAR : $(MISC)/report.component
+
+$(MISC)/report.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        report.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_JAVA)$(JARTARGET)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt report.component
diff --git a/wizards/com/sun/star/wizards/report/report.component b/wizards/com/sun/star/wizards/report/report.component
new file mode 100644
index 000000000..67efca927
--- /dev/null
+++ b/wizards/com/sun/star/wizards/report/report.component
@@ -0,0 +1,35 @@
+
+
+
+
+  
+    
+  
+
diff --git a/wizards/com/sun/star/wizards/table/CallTableWizard.java b/wizards/com/sun/star/wizards/table/CallTableWizard.java
index 4b992a5ea..cac3a18a0 100644
--- a/wizards/com/sun/star/wizards/table/CallTableWizard.java
+++ b/wizards/com/sun/star/wizards/table/CallTableWizard.java
@@ -32,9 +32,7 @@ import com.sun.star.uno.Type;
 import com.sun.star.wizards.common.Properties;
 
 /** This class capsulates the class, that implements the minimal component, a
- * factory for creating the service (__getServiceFactory) and a
- * method, that writes the information into the given registry key
- * (__writeRegistryServiceInfo).
+ * factory for creating the service (__getServiceFactory).
  * @author Bertram Nolte
  */
 public class CallTableWizard
@@ -63,19 +61,6 @@ public class CallTableWizard
         return xsingleservicefactory;
     }
 
-    /** Writes the service information into the given registry key.
-     * This method is called by the JavaLoader.
-     * @return returns true if the operation succeeded
-     * @see com.sun.star.comp.loader.JavaLoader#
-     * @param xregistrykey Makes structural information (except regarding tree
-     * structures) of a single
-     * registry key accessible.
-     */
-    public static boolean __writeRegistryServiceInfo(com.sun.star.registry.XRegistryKey xregistrykey)
-    {
-        return com.sun.star.comp.loader.FactoryHelper.writeRegistryServiceInfo(TableWizardImplementation.class.getName(), TableWizardImplementation.__serviceName, xregistrykey);
-    }
-
     /** This class implements the component. At least the interfaces XServiceInfo,
      * XTypeProvider, and XInitialization should be provided by the service.
      */
diff --git a/wizards/com/sun/star/wizards/table/makefile.mk b/wizards/com/sun/star/wizards/table/makefile.mk
index c0d62baa7..4343af99d 100644
--- a/wizards/com/sun/star/wizards/table/makefile.mk
+++ b/wizards/com/sun/star/wizards/table/makefile.mk
@@ -63,3 +63,11 @@ JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
+
+ALLTAR : $(MISC)/table.component
+
+$(MISC)/table.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        table.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_JAVA)$(JARTARGET)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt table.component
diff --git a/wizards/com/sun/star/wizards/table/table.component b/wizards/com/sun/star/wizards/table/table.component
new file mode 100644
index 000000000..24cacd225
--- /dev/null
+++ b/wizards/com/sun/star/wizards/table/table.component
@@ -0,0 +1,35 @@
+
+
+
+
+  
+    
+  
+
diff --git a/wizards/com/sun/star/wizards/web/CallWizard.java b/wizards/com/sun/star/wizards/web/CallWizard.java
index 4b9d7a368..1d18149e9 100644
--- a/wizards/com/sun/star/wizards/web/CallWizard.java
+++ b/wizards/com/sun/star/wizards/web/CallWizard.java
@@ -42,8 +42,7 @@ import com.sun.star.wizards.common.Resource;
 
 /**
  * This class capsulates the class, that implements the minimal component, a factory for
- * creating the service (__getServiceFactory) and a method, that writes the
- * information into the given registry key (__writeRegistryServiceInfo).
+ * creating the service (__getServiceFactory).
  *
  * @author rpiterman
  * @version $Revision: 1.10.52.1 $
@@ -78,22 +77,6 @@ public class CallWizard
         return xsingleservicefactory;
     }
 
-    /**
-     * Writes the service information into the given registry key. This method is called
-     * by the JavaLoader.
-     *
-     * @param xregistrykey Makes structural information (except regarding tree
-     *        structures) of a single registry key accessible.
-     *
-     * @return returns true if the operation succeeded
-     *
-     * @see com.sun.star.comp.loader.JavaLoader#
-     */
-    public static boolean __writeRegistryServiceInfo(XRegistryKey xregistrykey)
-    {
-        return FactoryHelper.writeRegistryServiceInfo(WizardImplementation.class.getName(), WizardImplementation.__serviceName, xregistrykey);
-    }
-
     /**
      * This class implements the component. At least the interfaces XServiceInfo,
      * XTypeProvider, and XInitialization should be provided by the service.
diff --git a/wizards/com/sun/star/wizards/web/makefile.mk b/wizards/com/sun/star/wizards/web/makefile.mk
index 9cc97e1b8..2e0394d29 100644
--- a/wizards/com/sun/star/wizards/web/makefile.mk
+++ b/wizards/com/sun/star/wizards/web/makefile.mk
@@ -83,3 +83,11 @@ JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
+
+ALLTAR : $(MISC)/web.component
+
+$(MISC)/web.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        web.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_JAVA)$(JARTARGET)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt web.component
diff --git a/wizards/com/sun/star/wizards/web/web.component b/wizards/com/sun/star/wizards/web/web.component
new file mode 100644
index 000000000..763438f96
--- /dev/null
+++ b/wizards/com/sun/star/wizards/web/web.component
@@ -0,0 +1,35 @@
+
+
+
+
+  
+    
+  
+
diff --git a/wizards/prj/d.lst b/wizards/prj/d.lst
index 4d1ad83d1..f8ab876ba 100644
--- a/wizards/prj/d.lst
+++ b/wizards/prj/d.lst
@@ -13,3 +13,11 @@ mkdir: %_DEST%\pck%_EXT%
 REM ..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
 
 ..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar
+..\%__SRC%\misc\agenda.component %_DEST%\xml%_EXT%\agenda.component
+..\%__SRC%\misc\fax.component %_DEST%\xml%_EXT%\fax.component
+..\%__SRC%\misc\form.component %_DEST%\xml%_EXT%\form.component
+..\%__SRC%\misc\letter.component %_DEST%\xml%_EXT%\letter.component
+..\%__SRC%\misc\query.component %_DEST%\xml%_EXT%\query.component
+..\%__SRC%\misc\report.component %_DEST%\xml%_EXT%\report.component
+..\%__SRC%\misc\table.component %_DEST%\xml%_EXT%\table.component
+..\%__SRC%\misc\web.component %_DEST%\xml%_EXT%\web.component
diff --git a/xmlsecurity/prj/d.lst b/xmlsecurity/prj/d.lst
index 270415164..94967c20a 100644
--- a/xmlsecurity/prj/d.lst
+++ b/xmlsecurity/prj/d.lst
@@ -8,3 +8,6 @@ mkdir: %COMMON_DEST%\bin%_EXT%\hid
 ..\%__SRC%\lib\libxmlsecurity.so %_DEST%\lib%_EXT%\libxmlsecurity.so
 ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*
 ..\%__SRC%\bin\xmlsec*.res %_DEST%\bin%_EXT%\xmlsec*.res
+..\%__SRC%\misc\xmlsecurity.component %_DEST%\xml%_EXT%\xmlsecurity.component
+..\%__SRC%\misc\xsec_fw.component %_DEST%\xml%_EXT%\xsec_fw.component
+..\%__SRC%\misc\xsec_xmlsec.component %_DEST%\xml%_EXT%\xsec_xmlsec.component
diff --git a/xmlsecurity/source/component/registerservices.cxx b/xmlsecurity/source/component/registerservices.cxx
index 080d95a1e..3ea6eee3d 100644
--- a/xmlsecurity/source/component/registerservices.cxx
+++ b/xmlsecurity/source/component/registerservices.cxx
@@ -46,48 +46,6 @@ void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTyp
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey )
-{
-    if (pRegistryKey)
-    {
-        try
-        {
-                    sal_Int32 nPos = 0;
-                    // SERVICE DocumentDigitalSignatures
-                    nPos = 0;
-                    uno::Reference< registry::XRegistryKey > xNewKey(
-                    reinterpret_cast< registry::XRegistryKey* >( pRegistryKey )->createKey( DocumentDigitalSignatures::GetImplementationName() ) ); 
-                    
-                    xNewKey = xNewKey->createKey( rtl::OUString::createFromAscii( "/UNO/SERVICES" ) );
-            
-                    const uno::Sequence< rtl::OUString >& rSNL = DocumentDigitalSignatures::GetSupportedServiceNames();
-                    const rtl::OUString* pArray = rSNL.getConstArray();
-                    for ( nPos = rSNL.getLength(); nPos--; )
-                        xNewKey->createKey( pArray[nPos] );
-
-                    // SERVICE CertificateContainer
-                    nPos = 0;
-                    uno::Reference< registry::XRegistryKey > xNewKeyCertificateContainer(
-                    reinterpret_cast< registry::XRegistryKey* >( pRegistryKey )->createKey( CertificateContainer::impl_getStaticImplementationName() ) ); 
-                    xNewKeyCertificateContainer = xNewKeyCertificateContainer->createKey( rtl::OUString::createFromAscii( "/UNO/SERVICES" ) );
-            
-                    const uno::Sequence< rtl::OUString >& rSNLCertificateContainer = CertificateContainer::impl_getStaticSupportedServiceNames();
-                    const rtl::OUString* pArrayCertificateContainer = rSNLCertificateContainer.getConstArray();
-                    for ( nPos = rSNLCertificateContainer.getLength(); nPos--; )
-                        xNewKeyCertificateContainer->createKey( pArrayCertificateContainer[nPos] );    
-            
-                    //-----------------------------
-                    
-                    return sal_True;
-        }
-        catch (registry::InvalidRegistryException &)
-        {
-            DBG_ERROR( "InvalidRegistryException!" );
-        }
-    }
-    return sal_False;
-}
-
 void* SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
     void* pRet = 0;
diff --git a/xmlsecurity/source/framework/xsec_framework.cxx b/xmlsecurity/source/framework/xsec_framework.cxx
index 01829ebf2..d4a96e047 100644
--- a/xmlsecurity/source/framework/xsec_framework.cxx
+++ b/xmlsecurity/source/framework/xsec_framework.cxx
@@ -58,83 +58,6 @@ void SAL_CALL component_getImplementationEnvironment(
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-//==================================================================================================
-sal_Bool SAL_CALL component_writeInfo(
-    void * /*pServiceManager*/, void * pRegistryKey )
-{
-    if (pRegistryKey)
-    {
-        try
-        {
-            //Decryptor
-            sal_Int32 nPos = 0;
-            Reference< XRegistryKey > xNewKey(
-                reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( DecryptorImpl_getImplementationName() ) ); 
-            xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
-            
-            const Sequence< OUString > & rSNL = DecryptorImpl_getSupportedServiceNames();
-            const OUString * pArray = rSNL.getConstArray();
-            for ( nPos = rSNL.getLength(); nPos--; )
-                xNewKey->createKey( pArray[nPos] );
-                
-            //Encryptor
-            xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( EncryptorImpl_getImplementationName() ); 
-            xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
-            const Sequence< OUString > & rSNL2 = EncryptorImpl_getSupportedServiceNames();
-            pArray = rSNL2.getConstArray();
-            for ( nPos = rSNL2.getLength(); nPos--; )
-                xNewKey->createKey( pArray[nPos] );
-
-            //SignatureCreator
-            xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( SignatureCreatorImpl_getImplementationName() ); 
-            xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
-            const Sequence< OUString > & rSNL3 = SignatureCreatorImpl_getSupportedServiceNames();
-            pArray = rSNL3.getConstArray();
-            for ( nPos = rSNL3.getLength(); nPos--; )
-                xNewKey->createKey( pArray[nPos] );
-
-            //SignatureVerifier
-            xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( SignatureVerifierImpl_getImplementationName() ); 
-            xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
-            const Sequence< OUString > & rSNL4 = SignatureVerifierImpl_getSupportedServiceNames();
-            pArray = rSNL4.getConstArray();
-            for ( nPos = rSNL4.getLength(); nPos--; )
-                xNewKey->createKey( pArray[nPos] );
-
-            //SAXEventKeeper
-            xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( SAXEventKeeperImpl_getImplementationName() ); 
-            xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
-            const Sequence< OUString > & rSNL5 = SAXEventKeeperImpl_getSupportedServiceNames();
-            pArray = rSNL5.getConstArray();
-            for ( nPos = rSNL5.getLength(); nPos--; )
-                xNewKey->createKey( pArray[nPos] );
-
-            //XMLSignatureTemplateImpl
-            xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( XMLSignatureTemplateImpl::impl_getImplementationName() ); 
-            xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
-            const Sequence< OUString > & rSNL6 = XMLSignatureTemplateImpl::impl_getSupportedServiceNames();
-            pArray = rSNL6.getConstArray();
-            for ( nPos = rSNL6.getLength(); nPos--; )
-                xNewKey->createKey( pArray[nPos] );
-
-            // XMLEncryptionTemplateImpl
-            xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( XMLEncryptionTemplateImpl::impl_getImplementationName() ); 
-            xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
-            const Sequence< OUString > & rSNL7 = XMLEncryptionTemplateImpl::impl_getSupportedServiceNames();
-            pArray = rSNL7.getConstArray();
-            for ( nPos = rSNL7.getLength(); nPos--; )
-                xNewKey->createKey( pArray[nPos] );
-                
-            return sal_True;
-        }
-        catch (InvalidRegistryException &)
-        {
-            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
-        }
-    }
-    return sal_False;
-}
-
 //==================================================================================================
 void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
diff --git a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
index 410c1a644..765c45f28 100644
--- a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
+++ b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
@@ -94,12 +94,10 @@ extern "C"
 {
 
 #if defined( XMLSEC_CRYPTO_NSS )
-extern sal_Bool nss_component_writeInfo( void*, void* );
 extern void* nss_component_getFactory( const sal_Char*, void*, void* );
 #endif
 
 #if defined( XMLSEC_CRYPTO_MSCRYPTO )
-extern sal_Bool mscrypt_component_writeInfo( void*, void* );
 extern void* mscrypt_component_getFactory( const sal_Char*, void*, void* );
 #endif
 
@@ -109,75 +107,6 @@ void SAL_CALL component_getImplementationEnvironment(
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-
-sal_Bool SAL_CALL component_writeInfo( void* pServiceManager , void* pRegistryKey )
-{
-    sal_Bool result = sal_False;
-    sal_Int32 i ;
-    OUString sKeyName ;
-    Reference< XRegistryKey > xNewKey ;
-    Sequence< OUString > seqServices ;
-    Reference< XRegistryKey > xKey( reinterpret_cast< XRegistryKey* >( pRegistryKey ) ) ;
-
-    if( xKey.is() ) {
-        //	try {
-        // XMLElementWrapper_XmlSecImpl
-        sKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) ;
-        sKeyName += XMLElementWrapper_XmlSecImpl_getImplementationName() ;
-        sKeyName += OUString::createFromAscii( "/UNO/SERVICES" ) ;
-
-        xNewKey = xKey->createKey( sKeyName ) ;
-        if( xNewKey.is() ) {
-            seqServices = XMLElementWrapper_XmlSecImpl_getSupportedServiceNames() ;
-            for( i = seqServices.getLength() ; i -- ;  )
-                xNewKey->createKey( seqServices.getConstArray()[i] ) ;
-        }
-
-        // XMLDocumentWrapper_XmlSecImpl
-        sKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) ;
-        sKeyName += XMLDocumentWrapper_XmlSecImpl_getImplementationName() ;
-        sKeyName += OUString::createFromAscii( "/UNO/SERVICES" ) ;
-
-        xNewKey = xKey->createKey( sKeyName ) ;
-        if( xNewKey.is() ) {
-            seqServices = XMLDocumentWrapper_XmlSecImpl_getSupportedServiceNames() ;
-            for( i = seqServices.getLength() ; i -- ;  )
-                xNewKey->createKey( seqServices.getConstArray()[i] ) ;
-        }
-
-        // SerialNumberAdapterImpl
-        sKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) ;
-        sKeyName += SerialNumberAdapterImpl_getImplementationName() ;
-        sKeyName += OUString::createFromAscii( "/UNO/SERVICES" ) ;
-
-        xNewKey = xKey->createKey( sKeyName ) ;
-        if( xNewKey.is() ) {
-            seqServices = SerialNumberAdapterImpl_getSupportedServiceNames() ;
-            for( i = seqServices.getLength() ; i -- ;  )
-                xNewKey->createKey( seqServices.getConstArray()[i] ) ;
-        }
-
-#if defined( XMLSEC_CRYPTO_NSS )
-        result = nss_component_writeInfo( pServiceManager, pRegistryKey ) ;
-        if( !result )
-            return sal_False ;
-#endif
-        
-#if defined( XMLSEC_CRYPTO_MSCRYPTO )
-        result = mscrypt_component_writeInfo( pServiceManager, pRegistryKey ) ;
-        if( !result )
-            return sal_False ;
-#endif
-
-        //} catch( InvalidRegistryException & ) {
-        //	//we should not ignore exceptions
-        //	return sal_False ;
-        //}
-    }
-
-    return result;
-}
-
 void* SAL_CALL component_getFactory( const sal_Char* pImplName , void* pServiceManager , void* pRegistryKey )
 {
     void* pRet = 0;
diff --git a/xmlsecurity/util/exports_xsmscrypt.dxp b/xmlsecurity/util/exports_xsmscrypt.dxp
index 9630d7e06..f0e1c6993 100644
--- a/xmlsecurity/util/exports_xsmscrypt.dxp
+++ b/xmlsecurity/util/exports_xsmscrypt.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/xmlsecurity/util/exports_xsnss.dxp b/xmlsecurity/util/exports_xsnss.dxp
index 9630d7e06..f0e1c6993 100644
--- a/xmlsecurity/util/exports_xsnss.dxp
+++ b/xmlsecurity/util/exports_xsnss.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/xmlsecurity/util/makefile.mk b/xmlsecurity/util/makefile.mk
index 6ef221c7e..75ef30c7c 100644
--- a/xmlsecurity/util/makefile.mk
+++ b/xmlsecurity/util/makefile.mk
@@ -172,3 +172,30 @@ DEF4NAME=$(SHL4TARGET)
 
 $(MISC)$/$(SHL3TARGET).flt: makefile.mk
     $(TYPE) $(SHL3TARGET).flt > $@
+
+ALLTAR : \
+    $(MISC)/xmlsecurity.component \
+    $(MISC)/xsec_fw.component \
+    $(MISC)/xsec_xmlsec.component
+
+.IF "$(OS)" == "WNT"
+my_platform = .windows
+.END
+
+$(MISC)/xmlsecurity.component .ERRREMOVE : \
+        $(SOLARENV)/bin/createcomponent.xslt xmlsecurity.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL4TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt xmlsecurity.component
+
+$(MISC)/xsec_fw.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        xsec_fw.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt xsec_fw.component
+
+$(MISC)/xsec_xmlsec.component .ERRREMOVE : \
+        $(SOLARENV)/bin/createcomponent.xslt xsec_xmlsec.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt xsec_xmlsec$(my_platform).component
diff --git a/xmlsecurity/util/xmlsecurity.component b/xmlsecurity/util/xmlsecurity.component
new file mode 100644
index 000000000..b0759e937
--- /dev/null
+++ b/xmlsecurity/util/xmlsecurity.component
@@ -0,0 +1,37 @@
+
+
+
+
+  
+    
+  
+  
+    
+  
+
diff --git a/xmlsecurity/util/xsec_fw.component b/xmlsecurity/util/xsec_fw.component
new file mode 100644
index 000000000..eb9e3962a
--- /dev/null
+++ b/xmlsecurity/util/xsec_fw.component
@@ -0,0 +1,56 @@
+
+
+
+
+  
+    
+  
+  
+    
+  
+  
+    
+  
+  
+    
+  
+  
+    
+  
+  
+    
+  
+  
+    
+  
+
diff --git a/xmlsecurity/util/xsec_fw.dxp b/xmlsecurity/util/xsec_fw.dxp
index 9630d7e06..f0e1c6993 100644
--- a/xmlsecurity/util/xsec_fw.dxp
+++ b/xmlsecurity/util/xsec_fw.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/xmlsecurity/util/xsec_xmlsec.component b/xmlsecurity/util/xsec_xmlsec.component
new file mode 100644
index 000000000..de991899f
--- /dev/null
+++ b/xmlsecurity/util/xsec_xmlsec.component
@@ -0,0 +1,55 @@
+
+
+
+
+  
+    
+  
+  
+    
+  
+  
+    
+  
+  
+    
+  
+  
+    
+  
+  
+    
+  
+  
+    
+  
+  
+    
+  
+
diff --git a/xmlsecurity/util/xsec_xmlsec.windows.component b/xmlsecurity/util/xsec_xmlsec.windows.component
new file mode 100644
index 000000000..fb11cc6e9
--- /dev/null
+++ b/xmlsecurity/util/xsec_xmlsec.windows.component
@@ -0,0 +1,55 @@
+
+
+
+
+  
+    
+  
+  
+    
+  
+  
+    
+  
+  
+    
+  
+  
+    
+  
+  
+    
+  
+  
+    
+  
+  
+    
+  
+
-- 
cgit v1.2.3


From ecc0ff500c59ed93edc192410a2993e65ea56d09 Mon Sep 17 00:00:00 2001
From: Ingo Schmidt 
Date: Mon, 13 Sep 2010 17:33:53 +0200
Subject: native330 #163564# fixing installation on Cent OS

---
 .../org/openoffice/setup/InstallData.java          |   9 +
 .../openoffice/setup/Installer/LinuxInstaller.java | 265 ++++++++-------------
 .../setup/InstallerHelper/LinuxHelper.java         |  37 ++-
 3 files changed, 129 insertions(+), 182 deletions(-)

diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallData.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallData.java
index d3ba4abc5..e472d2b72 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallData.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallData.java
@@ -76,6 +76,7 @@ public class InstallData
     static private boolean useRtl = false;
     static private boolean installedProductMinorSet = false;
     static private boolean isDebianSystem = false;
+    static private boolean useForceDebian = false;
     static private boolean debianInvestigated = false;
     static private String installType;            /* custom or typical installation */
     static private String osType;                 /* Linux, SunOS, ...              */
@@ -667,6 +668,14 @@ public class InstallData
         isDebianSystem = value;
     }
 
+    public boolean useForceDebian() {
+        return useForceDebian;
+    }
+
+    public void setUseForceDebian(boolean value) {
+        useForceDebian = value;
+    }
+
     public boolean databaseQueried() {
         return databaseQueried;
     }
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.java
index c66c84a56..2906f7a05 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.java
@@ -202,12 +202,13 @@ public class LinuxInstaller extends Installer {
                 }
                 
                 if ( data.isDebianSystem() ) {
-                    forceDebianString = "--force-debian";
                     nodepsString = "--nodeps";
+                    
+                    if ( data.useForceDebian() ) {
+                        forceDebianString = "--force-debian";
+                    }
                 }
                 
-                String rpmCommand = "";
-                String[] rpmCommandArray;
                 String databasePath = null;
                 String databaseString = "";
                 boolean useLocalDatabase = false;
@@ -225,130 +226,57 @@ public class LinuxInstaller extends Installer {
                     useLocalDatabase = true;
                 }
                 
-                if (useForce) {
-                    if (useLocalDatabase) {
-                        if ( relocations != null ) {
-                            rpmCommand = "rpm --upgrade --ignoresize --force " + forceDebianString + " " + nodepsString + " -vh " +
-                                    "--relocate " + relocations + " " + databaseString +
-                                    " " + databasePath + " " + packageName;
-                            rpmCommandArray = new String[12];
-                            rpmCommandArray[0] = "rpm";
-                            rpmCommandArray[1] = "--upgrade";
-                            rpmCommandArray[2] = "--ignoresize";
-                            rpmCommandArray[3] = "--force";
-                            rpmCommandArray[4] = forceDebianString;
-                            rpmCommandArray[5] = nodepsString;
-                            rpmCommandArray[6] = "-vh";
-                            rpmCommandArray[7] = "--relocate";
-                            rpmCommandArray[8] = relocations;
-                            rpmCommandArray[9] = databaseString;
-                            rpmCommandArray[10] = databasePath;
-                            rpmCommandArray[11] = packageName;                    
-                        } else {
-                            rpmCommand = "rpm --upgrade --ignoresize --force " + forceDebianString + " " + nodepsString + " -vh " + 
-                                    databaseString + " " + databasePath + " " + packageName;
-                            rpmCommandArray = new String[10];
-                            rpmCommandArray[0] = "rpm";
-                            rpmCommandArray[1] = "--upgrade";
-                            rpmCommandArray[2] = "--ignoresize";
-                            rpmCommandArray[3] = "--force";
-                            rpmCommandArray[4] = forceDebianString;
-                            rpmCommandArray[5] = nodepsString;
-                            rpmCommandArray[6] = "-vh";
-                            rpmCommandArray[7] = databaseString;
-                            rpmCommandArray[8] = databasePath;
-                            rpmCommandArray[9] = packageName;
-                        }
-                    } else {
-                        if ( relocations != null )
-                        {
-                            rpmCommand = "rpm --upgrade --ignoresize --force " + forceDebianString + " " + nodepsString + " -vh " +
-                                    "--relocate " + relocations + " " + packageName;
-                            rpmCommandArray = new String[10];
-                            rpmCommandArray[0] = "rpm";
-                            rpmCommandArray[1] = "--upgrade";
-                            rpmCommandArray[2] = "--ignoresize";
-                            rpmCommandArray[3] = "--force";
-                            rpmCommandArray[4] = forceDebianString;
-                            rpmCommandArray[5] = nodepsString;
-                            rpmCommandArray[6] = "-vh";
-                            rpmCommandArray[7] = "--relocate";
-                            rpmCommandArray[8] = relocations;
-                            rpmCommandArray[9] = packageName;
-                        } else {
-                            rpmCommand = "rpm --upgrade --ignoresize --force " + forceDebianString + " " + nodepsString + " -vh " + packageName;
-                            rpmCommandArray = new String[8];
-                            rpmCommandArray[0] = "rpm";
-                            rpmCommandArray[1] = "--upgrade";
-                            rpmCommandArray[2] = "--ignoresize";
-                            rpmCommandArray[3] = "--force";
-                            rpmCommandArray[4] = forceDebianString;
-                            rpmCommandArray[5] = nodepsString;
-                            rpmCommandArray[6] = "-vh";
-                            rpmCommandArray[7] = packageName;
-                        }
-                    }                
-                } else {
-                    if (useLocalDatabase) {
-                        if ( relocations != null ) {
-                            rpmCommand = "rpm --upgrade --ignoresize " + forceDebianString + " " + nodepsString + " -vh " +
-                                    "--relocate " + relocations + " " + databaseString +
-                                    " " + databasePath + " " + packageName;
-                            rpmCommandArray = new String[11];
-                            rpmCommandArray[0] = "rpm";
-                            rpmCommandArray[1] = "--upgrade";
-                            rpmCommandArray[2] = "--ignoresize";
-                            rpmCommandArray[3] = forceDebianString;
-                            rpmCommandArray[4] = nodepsString;
-                            rpmCommandArray[5] = "-vh";
-                            rpmCommandArray[6] = "--relocate";
-                            rpmCommandArray[7] = relocations;
-                            rpmCommandArray[8] = databaseString;
-                            rpmCommandArray[9] = databasePath;
-                            rpmCommandArray[10] = packageName;                    
-                        } else {
-                            rpmCommand = "rpm --upgrade --ignoresize " + forceDebianString + " " + nodepsString + " -vh " +
-                                    databaseString + " " + databasePath + " " + packageName;
-                            rpmCommandArray = new String[9];
-                            rpmCommandArray[0] = "rpm";
-                            rpmCommandArray[1] = "--upgrade";
-                            rpmCommandArray[2] = "--ignoresize";
-                            rpmCommandArray[3] = forceDebianString;
-                            rpmCommandArray[4] = nodepsString;
-                            rpmCommandArray[5] = "-vh";
-                            rpmCommandArray[6] = databaseString;
-                            rpmCommandArray[7] = databasePath;
-                            rpmCommandArray[8] = packageName;
-                        }
-                    } else {
-                        if ( relocations != null )
-                        {
-                            rpmCommand = "rpm --upgrade --ignoresize " + forceDebianString + " " + nodepsString + " -vh " +
-                                    "--relocate " + relocations + " " + packageName;
-                            rpmCommandArray = new String[9];
-                            rpmCommandArray[0] = "rpm";
-                            rpmCommandArray[1] = "--upgrade";
-                            rpmCommandArray[2] = "--ignoresize";
-                            rpmCommandArray[3] = forceDebianString;
-                            rpmCommandArray[4] = nodepsString;
-                            rpmCommandArray[5] = "-vh";
-                            rpmCommandArray[6] = "--relocate";
-                            rpmCommandArray[7] = relocations;
-                            rpmCommandArray[8] = packageName;
-                        } else {
-                            rpmCommand = "rpm --upgrade --ignoresize " + forceDebianString + " " + nodepsString + " -vh " + packageName;
-                            rpmCommandArray = new String[7];
-                            rpmCommandArray[0] = "rpm";
-                            rpmCommandArray[1] = "--upgrade";
-                            rpmCommandArray[2] = "--ignoresize";
-                            rpmCommandArray[3] = forceDebianString;
-                            rpmCommandArray[4] = nodepsString;
-                            rpmCommandArray[5] = "-vh";
-                            rpmCommandArray[6] = packageName;
-                        }
-                    }
+                // Defining a Vector that contains the full rpm command. Then the string array can be 
+                // created dynamically.
+                
+                Vector rpmVector = new Vector();
+                
+                rpmVector.add("rpm");
+                rpmVector.add("--upgrade");
+                rpmVector.add("--ignoresize");
+                
+                if ( useForce ) {
+                    rpmVector.add("--force");
                 }
-
+                
+                if ( ! forceDebianString.equals("") ) {
+                    rpmVector.add(forceDebianString);
+                }
+                
+                if ( ! nodepsString.equals("") ) {
+                    rpmVector.add(nodepsString);
+                }
+                
+                rpmVector.add("-vh");
+                
+                if ( relocations != null ) {
+                    rpmVector.add("--relocate");
+                    rpmVector.add(relocations);
+                }
+                
+                if ( useLocalDatabase ) {
+                    rpmVector.add(databaseString);
+                    rpmVector.add(databasePath);
+                }
+                
+                rpmVector.add(packageName);
+                
+                // Creating String and StringArray for rpm command
+                
+                int capacity = rpmVector.size();
+                
+                String rpmCommand = "";
+                String[] rpmCommandArray = new String[capacity];
+                                
+                for (int i = 0; i < rpmVector.size(); i++) {
+                    rpmCommandArray[i] = (String)rpmVector.get(i);
+                    rpmCommand = rpmCommand + " " + (String)rpmVector.get(i);
+                }
+                
+                rpmCommand = rpmCommand.trim();
+                
+                // Staring rpm process
+                
                 Vector returnVector = new Vector();
                 Vector returnErrorVector = new Vector();
                 // int returnValue = SystemManager.executeProcessReturnVector(rpmCommand, returnVector, returnErrorVector);
@@ -407,8 +335,6 @@ public class LinuxInstaller extends Installer {
             String databasePath = data.getDatabasePath();
             String databaseString = "";
             boolean useLocalDatabase = false;
-            String rpmCommand;
-            String[] rpmCommandArray;
         
             if (( databasePath != null ) && (! databasePath.equalsIgnoreCase("null"))) {
                 databaseString = "--dbpath";
@@ -427,51 +353,52 @@ public class LinuxInstaller extends Installer {
             }
                 
             if ( data.isDebianSystem() ) {
-                forceDebianString = "--force-debian";
                 nodepsString = "--nodeps";
+                    
+                if ( data.useForceDebian() ) {
+                    forceDebianString = "--force-debian";
+                }
             }
-          
-            // Code duplication for isDebianSystem is necessary, because there is no valid position 
-            // for forceDebianString, if it is empty. This is no problem in installPackage.
 
-            if ( data.isDebianSystem() ) {
-            
-                if (useLocalDatabase) {
-                    rpmCommand = "rpm " + forceDebianString + " " + nodepsString + " -ev" + " " + databaseString + " " + databasePath + " " + packageName;
-                    rpmCommandArray = new String[7];
-                    rpmCommandArray[0] = "rpm";
-                    rpmCommandArray[1] = forceDebianString;
-                    rpmCommandArray[2] = nodepsString;
-                    rpmCommandArray[3] = "-ev";
-                    rpmCommandArray[4] = databaseString;
-                    rpmCommandArray[5] = databasePath;
-                    rpmCommandArray[6] = packageName;                
-                } else {
-                    rpmCommand = "rpm " + forceDebianString + " " + nodepsString + " -ev" + " " + packageName;
-                    rpmCommandArray = new String[5];
-                    rpmCommandArray[0] = "rpm";
-                    rpmCommandArray[1] = forceDebianString;
-                    rpmCommandArray[2] = nodepsString;
-                    rpmCommandArray[3] = "-ev";
-                    rpmCommandArray[4] = packageName;
-                }
-            } else {
-                if (useLocalDatabase) {
-                    rpmCommand = "rpm -ev" + " " + databaseString + " " + databasePath + " " + packageName;
-                    rpmCommandArray = new String[5];
-                    rpmCommandArray[0] = "rpm";
-                    rpmCommandArray[1] = "-ev";
-                    rpmCommandArray[2] = databaseString;
-                    rpmCommandArray[3] = databasePath;
-                    rpmCommandArray[4] = packageName;                
-                } else {
-                    rpmCommand = "rpm -ev" + " " + packageName;
-                    rpmCommandArray = new String[3];
-                    rpmCommandArray[0] = "rpm";
-                    rpmCommandArray[1] = "-ev";
-                    rpmCommandArray[2] = packageName;
-                }            	
+            // Defining a Vector that contains the full rpm command. Then the string array can be 
+            // created dynamically.
+                
+            Vector rpmVector = new Vector();
+                
+            rpmVector.add("rpm");
+                
+            if ( ! forceDebianString.equals("") ) {
+                rpmVector.add(forceDebianString);
             }
+                
+            if ( ! nodepsString.equals("") ) {
+                rpmVector.add(nodepsString);
+            }
+                
+            rpmVector.add("-ev");
+                
+            if ( useLocalDatabase ) {
+                rpmVector.add(databaseString);
+                rpmVector.add(databasePath);
+            }
+                
+            rpmVector.add(packageName);
+                
+            // Creating String and StringArray for rpm command
+                
+            int capacity = rpmVector.size();
+                
+            String rpmCommand = "";
+            String[] rpmCommandArray = new String[capacity];
+                                
+            for (int i = 0; i < rpmVector.size(); i++) {
+                rpmCommandArray[i] = (String)rpmVector.get(i);
+                rpmCommand = rpmCommand + " " + (String)rpmVector.get(i);
+            }
+            
+            rpmCommand = rpmCommand.trim();
+
+            // Starting rpm process
 
             Vector returnVector = new Vector();
             Vector returnErrorVector = new Vector();
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/LinuxHelper.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/LinuxHelper.java
index 9ce41daf2..b21123cb2 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/LinuxHelper.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/LinuxHelper.java
@@ -383,21 +383,32 @@ import java.util.Vector;public class LinuxHelper {
   
     public void investigateDebian(InstallData data) {
         
-        // String rpmQuery = "rpm --help;
-        String[] rpmQueryArray = new String[2];
-        rpmQueryArray[0] = "rpm";
-        rpmQueryArray[1] = "--help";
-
-        Vector returnVector = new Vector();
-        Vector returnErrorVector = new Vector();
-        int returnValue = ExecuteProcess.executeProcessReturnVector(rpmQueryArray, returnVector, returnErrorVector);
+        // First check: Is this a Debian system?
         
-        // Checking if the return vector contains the string "force-debian"
+        String dpkgFile = "/usr/bin/dpkg";
+        
+        if ( new File(dpkgFile).exists() ) {
+            
+            data.setIsDebianSystem(true);
+        
+            // Second check: If this is a Debian system, is "--force-debian" required?
+        
+            // String rpmQuery = "rpm --help;
+            String[] rpmQueryArray = new String[2];
+            rpmQueryArray[0] = "rpm";
+            rpmQueryArray[1] = "--help";
+
+            Vector returnVector = new Vector();
+            Vector returnErrorVector = new Vector();
+            int returnValue = ExecuteProcess.executeProcessReturnVector(rpmQueryArray, returnVector, returnErrorVector);
+        
+            // Checking if the return vector contains the string "force-debian"
        
-        for (int i = 0; i < returnVector.size(); i++) {
-            String line = (String) returnVector.get(i);
-            if ( line.indexOf("force-debian") > -1 ) {
-                data.setIsDebianSystem(true);
+            for (int i = 0; i < returnVector.size(); i++) {
+                String line = (String) returnVector.get(i);
+                if ( line.indexOf("force-debian") > -1 ) {
+                    data.setUseForceDebian(true);
+                }
             }
         }
     } 
-- 
cgit v1.2.3


From 09021b3862997e147f15a75404a86e83006d9040 Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" 
Date: Mon, 13 Sep 2010 18:59:52 +0200
Subject: dba34a: during #i114403#: allow list boxes to have a bound column of
 '0'

---
 .../source/propctrlr/formcomponenthandler.cxx      |  2 +-
 forms/source/component/ListBox.cxx                 | 24 ++++++++++++++--------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 97d72dad1..4e4db5396 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -1342,7 +1342,7 @@ namespace pcr
 
                 if ( nPropId == PROPERTY_ID_MAXTEXTLEN )
                     aMinValue.Value = -1;
-                else if ( ( nPropId == PROPERTY_ID_BOUNDCOLUMN ) || ( nPropId == PROPERTY_ID_VISIBLESIZE ) )
+                else if ( nPropId == PROPERTY_ID_VISIBLESIZE )
                     aMinValue.Value = 1;
                 else
                     aMinValue.Value = 0;
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index fe24fc24c..30911ee54 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -64,6 +64,8 @@
 #include 
 #include 
 
+#include 
+
 #include 
 #include 
 
@@ -675,9 +677,13 @@ namespace frm
             return;
         }
 
-        sal_Int16 nBoundColumn = 0;
-        if (m_aBoundColumn.getValueType().getTypeClass() == TypeClass_SHORT)
+        ::boost::optional< sal_Int16 > aBoundColumn;
+        if ( m_aBoundColumn.getValueType().getTypeClass() == TypeClass_SHORT )
+        {
+            sal_Int16 nBoundColumn( 0 );
             m_aBoundColumn >>= nBoundColumn;
+            aBoundColumn.reset( nBoundColumn );
+        }
 
         ::utl::SharedUNOComponent< XResultSet > xListCursor;
         try
@@ -701,14 +707,14 @@ namespace frm
                     ::rtl::OUString aFieldName;
                     ::rtl::OUString aBoundFieldName;
 
-                    if ((nBoundColumn > 0) && xFieldsByIndex.is())
+                    if ( !!aBoundColumn && ( *aBoundColumn >= 0 ) && xFieldsByIndex.is() )
                     {
-                        if (xFieldsByIndex->getCount() <= nBoundColumn)
+                        if ( *aBoundColumn >= xFieldsByIndex->getCount() )
                             break;
 
-                        Reference xFieldAsSet(xFieldsByIndex->getByIndex(nBoundColumn),UNO_QUERY);
+                        Reference xFieldAsSet(xFieldsByIndex->getByIndex( *aBoundColumn ),UNO_QUERY);
                         xFieldAsSet->getPropertyValue(PROPERTY_NAME) >>= aBoundFieldName;
-                        nBoundColumn = 1;
+                        aBoundColumn.reset( 1 );
 
                         xFieldAsSet.set(xFieldsByIndex->getByIndex(0),UNO_QUERY);
                         xFieldAsSet->getPropertyValue(PROPERTY_NAME) >>= aFieldName;
@@ -836,11 +842,11 @@ namespace frm
 
                     // Feld der BoundColumn des ResultSets holen
                     m_nBoundColumnType = DataType::SQLNULL;
-                    if ( ( nBoundColumn > 0 ) && m_xColumn.is() )
+                    if ( !!aBoundColumn && ( *aBoundColumn >= 0 ) && m_xColumn.is() )
                     {   // don't look for a bound column if we're not connected to a field
                         try
                         {
-                            Reference< XPropertySet > xBoundField( xColumns->getByIndex( nBoundColumn ), UNO_QUERY_THROW );
+                            Reference< XPropertySet > xBoundField( xColumns->getByIndex( *aBoundColumn ), UNO_QUERY_THROW );
                             OSL_VERIFY( xBoundField->getPropertyValue( ::rtl::OUString::createFromAscii( "Type" ) ) >>= m_nBoundColumnType );
                         }
                         catch( const Exception& )
@@ -864,7 +870,7 @@ namespace frm
 
                         if ( impl_hasBoundComponent() )
                         {
-                            aBoundValue.fill( nBoundColumn + 1, m_nBoundColumnType, xCursorRow );
+                            aBoundValue.fill( *aBoundColumn + 1, m_nBoundColumnType, xCursorRow );
                             aValueList.push_back( aBoundValue );
                         }
 
-- 
cgit v1.2.3


From 86926688c0eec3b796dc411da882a6ad41d9d396 Mon Sep 17 00:00:00 2001
From: Ingo Schmidt 
Date: Tue, 14 Sep 2010 12:00:24 +0200
Subject: native330 #i114487# fixing installation on Cent OS

---
 javainstaller2/src/JavaSetup/org/openoffice/setup/InstallData.java    | 2 +-
 .../src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.java  | 4 ++--
 .../JavaSetup/org/openoffice/setup/InstallerHelper/LinuxHelper.java   | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallData.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallData.java
index e472d2b72..30a222d3b 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallData.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallData.java
@@ -76,7 +76,7 @@ public class InstallData
     static private boolean useRtl = false;
     static private boolean installedProductMinorSet = false;
     static private boolean isDebianSystem = false;
-    static private boolean useForceDebian = false;
+    static private boolean useForceDebian = false;  /* --force-debian */
     static private boolean debianInvestigated = false;
     static private String installType;            /* custom or typical installation */
     static private String osType;                 /* Linux, SunOS, ...              */
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.java
index 2906f7a05..204c9e18e 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.java
@@ -227,7 +227,7 @@ public class LinuxInstaller extends Installer {
                 }
                 
                 // Defining a Vector that contains the full rpm command. Then the string array can be 
-                // created dynamically.
+                // created dynamically. Otherwise there would be too many different scenarios.
                 
                 Vector rpmVector = new Vector();
                 
@@ -361,7 +361,7 @@ public class LinuxInstaller extends Installer {
             }
 
             // Defining a Vector that contains the full rpm command. Then the string array can be 
-            // created dynamically.
+            // created dynamically. Otherwise there would be too many different scenarios.
                 
             Vector rpmVector = new Vector();
                 
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/LinuxHelper.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/LinuxHelper.java
index b21123cb2..fb8bfa96a 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/LinuxHelper.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/LinuxHelper.java
@@ -391,7 +391,8 @@ import java.util.Vector;public class LinuxHelper {
             
             data.setIsDebianSystem(true);
         
-            // Second check: If this is a Debian system, is "--force-debian" required?
+            // Second check: If this is a Debian system, is "--force-debian" required? Older
+            // versions do not support "--force-debian".
         
             // String rpmQuery = "rpm --help;
             String[] rpmQueryArray = new String[2];
-- 
cgit v1.2.3


From 413347af171c109fb115b03746b907dbe25694de Mon Sep 17 00:00:00 2001
From: sb 
Date: Tue, 14 Sep 2010 15:14:56 +0200
Subject: sb129: #i113189# removed obviously unnecessary service registrations;
 allow empty 

---
 extensions/source/oooimprovement/invite_job.cxx           |  2 +-
 extensions/source/oooimprovement/onlogrotate_job.cxx      |  2 +-
 extensions/source/oooimprovement/oooimprovement.component | 12 +++++-------
 forms/util/frm.component                                  |  4 ----
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/extensions/source/oooimprovement/invite_job.cxx b/extensions/source/oooimprovement/invite_job.cxx
index 77cef48ce..74204cdb2 100644
--- a/extensions/source/oooimprovement/invite_job.cxx
+++ b/extensions/source/oooimprovement/invite_job.cxx
@@ -121,7 +121,7 @@ namespace oooimprovement
     Sequence SAL_CALL InviteJob::getSupportedServiceNames_static()
     {
         Sequence aServiceNames(1);
-        aServiceNames[0] = OUString::createFromAscii("com.sun.star.task.XAsyncJob");
+        aServiceNames[0] = OUString::createFromAscii("com.sun.star.task.AsyncJob");
         return aServiceNames;
     }
 
diff --git a/extensions/source/oooimprovement/onlogrotate_job.cxx b/extensions/source/oooimprovement/onlogrotate_job.cxx
index 9ee771aa9..03a5bdfd2 100644
--- a/extensions/source/oooimprovement/onlogrotate_job.cxx
+++ b/extensions/source/oooimprovement/onlogrotate_job.cxx
@@ -190,7 +190,7 @@ namespace oooimprovement
     Sequence SAL_CALL OnLogRotateJob::getSupportedServiceNames_static()
     {
         Sequence aServiceNames(1);
-        aServiceNames[0] = OUString::createFromAscii("com.sun.star.task.XAsyncJob");
+        aServiceNames[0] = OUString::createFromAscii("com.sun.star.task.AsyncJob");
         return aServiceNames;
     }
 
diff --git a/extensions/source/oooimprovement/oooimprovement.component b/extensions/source/oooimprovement/oooimprovement.component
index ac4d6cca1..e133f932c 100644
--- a/extensions/source/oooimprovement/oooimprovement.component
+++ b/extensions/source/oooimprovement/oooimprovement.component
@@ -28,13 +28,11 @@
 
 
-  
+  
     
   
-  
-    
-  
-  
-    
-  
+  
+  
 
diff --git a/forms/util/frm.component b/forms/util/frm.component
index 0305d03ed..c727e8059 100644
--- a/forms/util/frm.component
+++ b/forms/util/frm.component
@@ -29,18 +29,14 @@
 
   
-    
     
   
   
-    
     
     
     
   
   
-    
-    
     
   
   
-- 
cgit v1.2.3


From b71d8cfe8b793147b80eb80eb9d7ccfb30d6eae8 Mon Sep 17 00:00:00 2001
From: Andreas Bregas 
Date: Wed, 15 Sep 2010 15:07:53 +0200
Subject: mib19: #163639# IDE call stack: Don't try to display objects as
 string

---
 basctl/source/basicide/baside2b.cxx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 027ce45b6..b65402026 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1636,9 +1636,10 @@ void __EXPORT StackWindow::UpdateCalls()
                             aEntry += pParam->aName;
                     }
                     aEntry += '=';
-                    if( pVar->GetType() & SbxARRAY )
+                    SbxDataType eType = pVar->GetType();
+                    if( eType & SbxARRAY )
                         aEntry += String( RTL_CONSTASCII_USTRINGPARAM( "..." ) );
-                    else
+                    else if( eType != SbxOBJECT )
                         aEntry += pVar->GetString();
                     if ( nParam < ( pParams->Count() - 1 ) )
                         aEntry += String( RTL_CONSTASCII_USTRINGPARAM( ", " ) );
-- 
cgit v1.2.3


From ac227640fb43c99b0fef28ae37f56168c9d8478b Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" 
Date: Fri, 17 Sep 2010 08:38:54 +0200
Subject: dba34a: #i114403# fixed the form-based filter for list boxes

---
 forms/source/component/Filter.cxx | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx
index 12ea4e5a0..eff4ef144 100644
--- a/forms/source/component/Filter.cxx
+++ b/forms/source/component/Filter.cxx
@@ -57,6 +57,7 @@
 #include 
 #include 
 #include 
+#include 
 /** === end UNO includes === **/
 
 #include 
@@ -342,11 +343,16 @@ namespace frm
 
             case FormComponentType::LISTBOX:
             {
-                Sequence< ::rtl::OUString> aValueSelection;
-                Reference< XPropertySet > aPropertyPointer(getModel(), UNO_QUERY);
-                aPropertyPointer->getPropertyValue(PROPERTY_VALUE_SEQ) >>= aValueSelection;
-                if (rEvent.Selected <= aValueSelection.getLength())
-                    aText.append( aValueSelection[ rEvent.Selected ] );
+                try
+                {
+                    const Reference< XItemList > xItemList( getModel(), UNO_QUERY_THROW );
+                    const ::rtl::OUString sItemText( xItemList->getItemText( rEvent.Selected ) );
+                    aText.append( sItemText );
+                }
+                catch( const Exception& )
+                {
+                    DBG_UNHANDLED_EXCEPTION();
+                }
             }
             break;
 
-- 
cgit v1.2.3


From 136265aa42be6d14be3675ed73d1b313cff2b6df Mon Sep 17 00:00:00 2001
From: Mikhail Voytenko 
Date: Fri, 17 Sep 2010 09:40:01 +0200
Subject: mib19: #163559# allow to call IDispatch methods/properties that are
 not available through ITypeInfo

---
 extensions/source/ole/oleobjw.cxx | 275 +++++++++++++++++++++++++++++++++++++-
 extensions/source/ole/oleobjw.hxx |  15 ++-
 2 files changed, 284 insertions(+), 6 deletions(-)

diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx
index 7a73ed7e6..ab6ff10b9 100755
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -74,6 +74,7 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::bridge;
 using namespace com::sun::star::bridge::oleautomation;
 using namespace com::sun::star::bridge::ModelDependent;
+using namespace ::com::sun::star;
 
 #define JSCRIPT_ID_PROPERTY L"_environment"
 #define JSCRIPT_ID			L"jscript"
@@ -155,8 +156,8 @@ Any IUnknownWrapper_Impl::queryInterface(const Type& t)
     if (t == getCppuType(static_cast*>( 0)) && !m_spDispatch)
         return Any();
 
-    return WeakImplHelper6::queryInterface(t);
+    return WeakImplHelper7::queryInterface(t);
 }
 
 Reference SAL_CALL IUnknownWrapper_Impl::getIntrospection(void)
@@ -1174,7 +1175,7 @@ Any  IUnknownWrapper_Impl::invokeWithDispIdUnoTlb(const OUString& sFunctionName,
 
 
 
-    // --------------------------
+// --------------------------
 // XInitialization
 void SAL_CALL IUnknownWrapper_Impl::initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException)
 {
@@ -1257,6 +1258,274 @@ void SAL_CALL IUnknownWrapper_Impl::initialize( const Sequence< Any >& aArgument
     }
 }
 
+// --------------------------
+// XDirectInvocation
+uno::Any SAL_CALL IUnknownWrapper_Impl::directInvoke( const ::rtl::OUString& aName, const uno::Sequence< uno::Any >& aParams )
+    throw (lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException)
+{
+    Any aResult;
+
+    if ( !m_spDispatch )
+    {
+        throw RuntimeException(
+            OUSTR("[automation bridge] The object does not have an IDispatch interface"),
+            Reference());
+    }
+
+    o2u_attachCurrentThread();
+    DISPID dispid;
+    if ( !getDispid( aName, &dispid ) )
+        throw IllegalArgumentException(
+            OUSTR( "[automation bridge] The object does not have a function or property " )
+            + aName, Reference(), 0);
+
+    CComVariant		varResult;
+    ExcepInfo 		excepinfo;
+    unsigned int 	uArgErr = 0;
+    INVOKEKIND pInvkinds[2];
+    pInvkinds[0] = INVOKE_FUNC;
+    pInvkinds[1] = aParams.getLength() ? INVOKE_PROPERTYPUT : INVOKE_PROPERTYGET;
+    HRESULT hInvRes = E_FAIL;
+
+    // try Invoke first, if it does not work, try put/get property
+    for ( sal_Int32 nStep = 0; FAILED( hInvRes ) && nStep < 2; nStep++ )
+    {
+        DISPPARAMS 		dispparams = {NULL, NULL, 0, 0};
+
+        DISPID idPropertyPut = DISPID_PROPERTYPUT;
+        scoped_array arDispidNamedArgs;
+        scoped_array ptrArgs;
+        scoped_array ptrRefArgs; // referenced arguments
+        CComVariant * arArgs = NULL;
+        CComVariant * arRefArgs = NULL;
+        bool bVarargParam = false;
+
+        dispparams.cArgs = aParams.getLength();
+
+        // Determine the number of named arguments
+        for ( sal_Int32 nInd = 0; nInd < aParams.getLength(); nInd++ )
+            if ( aParams[nInd].getValueType() == getCppuType((NamedArgument*) 0) )
+                dispparams.cNamedArgs ++;
+        
+        // fill the named arguments
+        if ( dispparams.cNamedArgs > 0
+          && !( dispparams.cNamedArgs == 1 && pInvkinds[nStep] == INVOKE_PROPERTYPUT ) )
+        {
+            int nSizeAr = dispparams.cNamedArgs + 1;
+            if ( pInvkinds[nStep] == INVOKE_PROPERTYPUT )
+                nSizeAr = dispparams.cNamedArgs; 
+        
+            scoped_array saNames(new OLECHAR*[nSizeAr]);
+            OLECHAR ** pNames = saNames.get();
+            pNames[0] = const_cast(reinterpret_cast(aName.getStr()));
+
+            int cNamedArg = 0;
+            for ( size_t nInd = 0; nInd < dispparams.cArgs; nInd++ )
+            {
+                if ( aParams[nInd].getValueType() == getCppuType((NamedArgument*) 0))
+                {
+                    const NamedArgument& arg = *(NamedArgument const*)aParams[nInd].getValue();
+
+                    //We put the parameter names in reverse order into the array,
+                    //so we can use the DISPID array for DISPPARAMS::rgdispidNamedArgs
+                    //The first name in the array is the method name
+                    pNames[nSizeAr - 1 - cNamedArg++] = const_cast(reinterpret_cast(arg.Name.getStr()));
+                }
+            }
+
+            arDispidNamedArgs.reset( new DISPID[nSizeAr] );   
+            HRESULT hr = getTypeInfo()->GetIDsOfNames( pNames, nSizeAr, arDispidNamedArgs.get() ); 
+            if ( hr == E_NOTIMPL )
+                hr = m_spDispatch->GetIDsOfNames(IID_NULL, pNames, nSizeAr, LOCALE_USER_DEFAULT, arDispidNamedArgs.get() );
+
+            if ( SUCCEEDED( hr ) )
+            {
+                if ( pInvkinds[nStep] == DISPATCH_PROPERTYPUT )
+                {
+                    DISPID*  arIDs = arDispidNamedArgs.get();
+                    arIDs[0] = DISPID_PROPERTYPUT;
+                    dispparams.rgdispidNamedArgs = arIDs;
+                }
+                else
+                {
+                    DISPID*  arIDs = arDispidNamedArgs.get();
+                    dispparams.rgdispidNamedArgs = & arIDs[1];
+                }
+            }
+            else if (hr == DISP_E_UNKNOWNNAME)
+            {
+                 throw IllegalArgumentException(
+                     OUSTR("[automation bridge]One of the named arguments is wrong!"),
+                     Reference(), 0);
+            }
+            else
+            {
+                throw InvocationTargetException(
+                    OUSTR("[automation bridge] ITypeInfo::GetIDsOfNames returned error ")
+                    + OUString::valueOf((sal_Int32) hr, 16), Reference(), Any());
+            }
+        }
+
+        //Convert arguments
+        ptrArgs.reset(new CComVariant[dispparams.cArgs]);
+        ptrRefArgs.reset(new CComVariant[dispparams.cArgs]);
+        arArgs = ptrArgs.get();
+        arRefArgs = ptrRefArgs.get();
+
+        size_t nInd = 0;
+        try
+        {
+            sal_Int32 revIndex = 0;
+            for ( nInd = 0; nInd < dispparams.cArgs; nInd++)
+            {
+                revIndex = dispparams.cArgs - nInd - 1;
+                arRefArgs[revIndex].byref = 0;
+                Any  anyArg;
+                if ( nInd < aParams.getLength() )
+                    anyArg = aParams.getConstArray()[nInd];
+            
+                // Property Put arguments
+                if ( anyArg.getValueType() == getCppuType((PropertyPutArgument*)0) )
+                {
+                    PropertyPutArgument arg;
+                    anyArg >>= arg;
+                    anyArg <<= arg.Value;
+                }
+                // named argument
+                if (anyArg.getValueType() == getCppuType((NamedArgument*) 0))
+                {
+                    NamedArgument aNamedArgument;
+                    anyArg >>= aNamedArgument;
+                    anyArg <<= aNamedArgument.Value;
+                }
+
+                if ( nInd < aParams.getLength() && anyArg.getValueTypeClass() != TypeClass_VOID )
+                {
+                    anyToVariant( &arArgs[revIndex], anyArg, VT_VARIANT );
+                }
+                else
+                {
+                    arArgs[revIndex].vt = VT_ERROR;
+                    arArgs[revIndex].scode = DISP_E_PARAMNOTFOUND;
+                }
+            }
+        }	
+        catch (IllegalArgumentException & e)
+        {
+            e.ArgumentPosition = ::sal::static_int_cast< sal_Int16, sal_Int32 >( nInd );
+            throw;
+        }
+        catch (CannotConvertException & e)
+        {
+            e.ArgumentIndex = nInd;
+            throw;
+        }
+
+        dispparams.rgvarg = arArgs;
+        // invoking OLE method
+        DWORD localeId = LOCALE_USER_DEFAULT;
+        hInvRes = m_spDispatch->Invoke( dispid,
+                                        IID_NULL,
+                                        localeId, 
+                                        ::sal::static_int_cast< WORD, INVOKEKIND >( pInvkinds[nStep] ),
+                                        &dispparams, 
+                                        &varResult, 
+                                        &excepinfo,
+                                        &uArgErr);
+    }
+
+    // converting return value and out parameter back to UNO
+    if ( SUCCEEDED( hInvRes ) )
+        variantToAny( &varResult, aResult, sal_False );
+    else
+    {
+        // map error codes to exceptions
+        OUString message;
+        switch ( hInvRes )
+        {
+            case S_OK:
+                break;
+            case DISP_E_BADPARAMCOUNT:
+                throw IllegalArgumentException(OUSTR("[automation bridge] Wrong "
+                      "number of arguments. Object returned DISP_E_BADPARAMCOUNT."),
+                      0, 0);
+                break;
+            case DISP_E_BADVARTYPE:
+                throw RuntimeException(OUSTR("[automation bridge] One or more "
+                      "arguments have the wrong type. Object returned "
+                      "DISP_E_BADVARTYPE."), 0);
+                break;
+            case DISP_E_EXCEPTION:
+                    message = OUSTR("[automation bridge]: ");
+                    message += OUString(reinterpret_cast(excepinfo.bstrDescription), 
+                        ::SysStringLen(excepinfo.bstrDescription));
+                    throw InvocationTargetException(message, Reference(), Any());
+                    break;
+            case DISP_E_MEMBERNOTFOUND:
+                message = OUSTR("[automation bridge]: A function with the name \"")
+                    + aName + OUSTR("\" is not supported. Object returned "
+                    "DISP_E_MEMBERNOTFOUND.");                            
+                throw IllegalArgumentException(message, 0, 0);
+                break;
+            case DISP_E_NONAMEDARGS:           
+                throw IllegalArgumentException(OUSTR("[automation bridge] Object "
+                      "returned DISP_E_NONAMEDARGS"),0, ::sal::static_int_cast< sal_Int16, unsigned int >( uArgErr ));
+                break;
+            case DISP_E_OVERFLOW:
+                throw CannotConvertException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[automation bridge] Call failed.")),
+                                             static_cast(
+                    static_cast(this)), TypeClass_UNKNOWN, FailReason::OUT_OF_RANGE, uArgErr);
+                break;
+            case DISP_E_PARAMNOTFOUND:
+                throw IllegalArgumentException(OUSTR("[automation bridge]Call failed."
+                                                     "Object returned DISP_E_PARAMNOTFOUND."),
+                                               0, ::sal::static_int_cast< sal_Int16, unsigned int >( uArgErr )); 
+                break;
+            case DISP_E_TYPEMISMATCH:
+                throw CannotConvertException(OUSTR("[automation bridge] Call  failed. "
+                                             "Object returned DISP_E_TYPEMISMATCH"),
+                    static_cast(
+                    static_cast(this)) , TypeClass_UNKNOWN, FailReason::UNKNOWN, uArgErr);
+                break;
+            case DISP_E_UNKNOWNINTERFACE:
+                throw RuntimeException(OUSTR("[automation bridge] Call failed. "
+                                           "Object returned DISP_E_UNKNOWNINTERFACE."),0);
+                break;
+            case DISP_E_UNKNOWNLCID:
+                throw RuntimeException(OUSTR("[automation bridge] Call failed. "
+                                           "Object returned DISP_E_UNKNOWNLCID."),0);
+                break;
+            case DISP_E_PARAMNOTOPTIONAL:
+                throw CannotConvertException(OUSTR("[automation bridge] Call failed."
+                      "Object returned DISP_E_PARAMNOTOPTIONAL"),
+                            static_cast(static_cast(this)),
+                                  TypeClass_UNKNOWN, FailReason::NO_DEFAULT_AVAILABLE, uArgErr);
+                break;
+            default:
+                throw RuntimeException();
+                break;
+        }		
+    }
+
+    return aResult;
+}
+
+::sal_Bool SAL_CALL IUnknownWrapper_Impl::hasMember( const ::rtl::OUString& aName )
+    throw (uno::RuntimeException)
+{
+    if ( ! m_spDispatch )
+    {
+        throw RuntimeException(
+            OUSTR("[automation bridge] The object does not have an IDispatch interface"),
+            Reference());
+    }
+
+    o2u_attachCurrentThread();
+    DISPID dispid;
+    return getDispid( aName, &dispid );
+}
+
+
 // UnoConversionUtilities --------------------------------------------------------------------------------
 Reference< XInterface > IUnknownWrapper_Impl::createUnoWrapperInstance()
 {
diff --git a/extensions/source/ole/oleobjw.hxx b/extensions/source/ole/oleobjw.hxx
index 334fb18e5..8635a9d12 100644
--- a/extensions/source/ole/oleobjw.hxx
+++ b/extensions/source/ole/oleobjw.hxx
@@ -50,7 +50,7 @@
 #endif
 #include 
 #include 
-#include 
+#include 
 
 #include 
 #include 
@@ -58,6 +58,7 @@
 
 #include 
 #include 
+#include 
 
 #include 
 #include "unoconversionutilities.hxx"
@@ -81,7 +82,7 @@ typedef hash_multimap,
+class IUnknownWrapper_Impl : public WeakImplHelper7< XInvocation, XBridgeSupplier2, XInitialization, XAutomationObject, XDefaultProperty, XDefaultMethod, XDirectInvocation >,
 
                              public UnoConversionUtilities
 
@@ -130,10 +131,18 @@ public:
     // XInitialization
     virtual void SAL_CALL initialize( const Sequence< Any >& aArguments )
         throw(Exception, RuntimeException);
+
+    // XDefaultProperty
     virtual ::rtl::OUString SAL_CALL getDefaultPropertyName(  ) throw (::com::sun::star::uno::RuntimeException) { return m_sDefaultMember; }
-protected:
+
+    // XDefaultMethod
     virtual ::rtl::OUString SAL_CALL getDefaultMethodName(  ) throw (::com::sun::star::uno::RuntimeException) { return m_sDefaultMember; }
 
+    // XDirectInvocation
+    virtual ::com::sun::star::uno::Any SAL_CALL directInvoke( const ::rtl::OUString& aName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::script::CannotConvertException, ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual ::sal_Bool SAL_CALL hasMember( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
+
+protected:
     // ----------------------------------------------------------------------------
     virtual Any invokeWithDispIdUnoTlb(const OUString& sFunctionName,
                                        const Sequence< Any >& Params,
-- 
cgit v1.2.3


From 8656251ed495e76f0a718a027d5701322ea9bf65 Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" 
Date: Fri, 17 Sep 2010 12:46:27 +0200
Subject: dba33j: #i114273#

---
 wizards/com/sun/star/wizards/db/DBMetaData.java    |  32 +--
 .../com/sun/star/wizards/query/QueryWizard.java    | 256 +++++++++++++--------
 .../com/sun/star/wizards/ui/FilterComponent.java   | 171 ++------------
 3 files changed, 175 insertions(+), 284 deletions(-)

diff --git a/wizards/com/sun/star/wizards/db/DBMetaData.java b/wizards/com/sun/star/wizards/db/DBMetaData.java
index cff3736b9..2fceae708 100644
--- a/wizards/com/sun/star/wizards/db/DBMetaData.java
+++ b/wizards/com/sun/star/wizards/db/DBMetaData.java
@@ -38,12 +38,10 @@ import com.sun.star.awt.XWindowPeer;
 import com.sun.star.beans.PropertyValue;
 import com.sun.star.beans.UnknownPropertyException;
 import com.sun.star.beans.XPropertySet;
-import com.sun.star.container.XChild;
 import com.sun.star.container.XHierarchicalNameAccess;
 import com.sun.star.container.XHierarchicalNameContainer;
 import com.sun.star.container.XNameAccess;
 import com.sun.star.container.XNameContainer;
-import com.sun.star.frame.XComponentLoader;
 import com.sun.star.frame.XModel;
 import com.sun.star.frame.XStorable;
 import com.sun.star.lang.XComponent;
@@ -91,7 +89,6 @@ import java.util.logging.Logger;
 
 public class DBMetaData
 {
-
     private XNameAccess xQueryNames;
     public XDatabaseMetaData xDBMetaData;
     private XDataSource m_dataSource;
@@ -109,12 +106,8 @@ public class DBMetaData
     public com.sun.star.lang.XMultiServiceFactory xMSF;
     public XComponent xConnectionComponent;
 
-    private XNameAccess m_xTableNames;
-    private XInteractionHandler oInteractionHandler;
     private XNameAccess xNameAccess;
     private XInterface xDatabaseContext;
-    private XCompletedConnection xCompleted;
-    // private int[] nDataTypes = null;
     private XWindowPeer xWindowPeer;
     private String[] TableNames = new String[] {};
     private String[] QueryNames = new String[] {};
@@ -212,15 +205,13 @@ public class DBMetaData
         return lDateCorrection;
     }
 
-    void getInterfaces(XMultiServiceFactory xMSF)
+    private void getInterfaces(XMultiServiceFactory xMSF)
     {
         try
         {
             this.xMSF = xMSF;
             xDatabaseContext = (XInterface) xMSF.createInstance("com.sun.star.sdb.DatabaseContext");
             xNameAccess = UnoRuntime.queryInterface( XNameAccess.class, xDatabaseContext );
-            XInterface xInteractionHandler = (XInterface) xMSF.createInstance("com.sun.star.task.InteractionHandler");
-            oInteractionHandler = UnoRuntime.queryInterface( XInteractionHandler.class, xInteractionHandler );
             DataSourceNames = xNameAccess.getElementNames();
         }
         catch (Exception exception)
@@ -257,7 +248,6 @@ public class DBMetaData
 
     public boolean hasTableByName(String _stablename)
     {
-        // getTableNames();
         return getTableNamesAsNameAccess().hasByName(_stablename);
     }
 
@@ -371,11 +361,6 @@ public class DBMetaData
         return bHasEscapeProcessing;
     }
 
-    // public void initCommandNames()
-    // {
-        // getTableNames();
-    // }
-
     public XNameAccess getQueryNamesAsNameAccess()
     {
         XQueriesSupplier xDBQueries = UnoRuntime.queryInterface( XQueriesSupplier.class, DBConnection );
@@ -416,7 +401,7 @@ public class DBMetaData
         return TableNames;
     }
 
-    void InitializeWidthList()
+    private void InitializeWidthList()
     {
         WidthList = new int[17][2];
         WidthList[0][0] = DataType.BIT; // ==  -7;
@@ -581,7 +566,7 @@ public class DBMetaData
         return m_dataSource;
     }
 
-    private void setDataSourceByName(String _DataSourceName, boolean bgetInterfaces)
+    private void setDataSourceByName(String _DataSourceName)
     {
         try
         {
@@ -601,7 +586,6 @@ public class DBMetaData
 
     public void getDataSourceInterfaces() throws Exception
     {
-        xCompleted = UnoRuntime.queryInterface( XCompletedConnection.class, getDataSource() );
         xDataSourcePropertySet = UnoRuntime.queryInterface( XPropertySet.class, getDataSource() );
         bPasswordIsRequired = ((Boolean) xDataSourcePropertySet.getPropertyValue("IsPasswordRequired")).booleanValue();
     }
@@ -684,8 +668,8 @@ public class DBMetaData
 
     private boolean getConnection(String _DataSourceName)
     {
-        setDataSourceByName(_DataSourceName, true);
-        return getConnection( getDataSource() );
+        setDataSourceByName(_DataSourceName);
+         return getConnection( getDataSource() );
     }
 
     private boolean getConnection(com.sun.star.sdbc.XConnection _DBConnection)
@@ -955,7 +939,7 @@ public class DBMetaData
             NamedValueCollection creationArgs = new NamedValueCollection();
             creationArgs.put( "Name", basename );
             creationArgs.put( "URL", documentURL );
-            creationArgs.put( "AsTemplate", new Boolean( i_createTemplate ) );
+            creationArgs.put( "AsTemplate", i_createTemplate );
             XMultiServiceFactory xDocMSF = UnoRuntime.queryInterface( XMultiServiceFactory.class, _xDocNameAccess );
             Object oDBDocument = xDocMSF.createInstanceWithArguments( "com.sun.star.sdb.DocumentDefinition", creationArgs.getPropertyValues() );
             XHierarchicalNameContainer xHier = UnoRuntime.queryInterface( XHierarchicalNameContainer.class, _xDocNameAccess );
@@ -967,7 +951,7 @@ public class DBMetaData
         }
         catch (Exception e)
         {
-            e.printStackTrace(System.out);
+            e.printStackTrace();
         }
     }
 
@@ -1103,13 +1087,11 @@ public class DBMetaData
     public void finish()
     {
         xQueryNames = null;
-        oInteractionHandler = null;
         xNameAccess = null;
         xDatabaseContext = null;
         xDBMetaData = null;
         m_dataSource = null;
         xModel = null;
-        xCompleted = null;
         xDataSourcePropertySet = null;
         xWindowPeer = null;
         DBConnection = null;
diff --git a/wizards/com/sun/star/wizards/query/QueryWizard.java b/wizards/com/sun/star/wizards/query/QueryWizard.java
index 1ede9b0dd..8184c13c1 100644
--- a/wizards/com/sun/star/wizards/query/QueryWizard.java
+++ b/wizards/com/sun/star/wizards/query/QueryWizard.java
@@ -36,8 +36,10 @@ import com.sun.star.sdbc.SQLException;
 import com.sun.star.uno.AnyConverter;
 import com.sun.star.wizards.ui.UIConsts;
 import com.sun.star.uno.UnoRuntime;
+import com.sun.star.wizards.common.Desktop;
 import com.sun.star.wizards.common.Helper;
 import com.sun.star.wizards.common.JavaTools;
+import com.sun.star.wizards.common.Properties;
 import com.sun.star.wizards.common.Resource;
 import com.sun.star.wizards.db.DatabaseObjectWizard;
 import com.sun.star.wizards.db.QueryMetaData;
@@ -59,15 +61,15 @@ public class QueryWizard extends DatabaseObjectWizard
     private static final int SOGROUPFILTER_PAGE = 6;
     private static final int SOTITLES_PAGE = 7;
     protected static final int SOSUMMARY_PAGE = 8;
-    private CommandFieldSelection CurDBCommandFieldSelection;
-    private SortingComponent CurSortingComponent;
-    private FieldSelection CurGroupFieldSelection;
-    private TitlesComponent CurTitlesComponent;
-    private FilterComponent CurFilterComponent;
-    private FilterComponent CurGroupFilterComponent;
-    private AggregateComponent CurAggregateComponent;
-    private Finalizer CurFinalizer;
-    private QuerySummary CurDBMetaData;
+    private CommandFieldSelection m_DBCommandFieldSelectio;
+    private SortingComponent m_sortingComponent;
+    private FieldSelection m_groupFieldSelection;
+    private TitlesComponent m_titlesComponent;
+    private FilterComponent m_filterComponent;
+    private FilterComponent m_groupFilterComponent;
+    private AggregateComponent m_aggregateComponent;
+    private Finalizer m_finalizer;
+    private QuerySummary m_DBMetaData;
     private String reslblFieldHeader;
     private String reslblAliasHeader;
     private String reslblFields;
@@ -82,30 +84,85 @@ public class QueryWizard extends DatabaseObjectWizard
     {
         super( xMSF, 40970, i_wizardContext );
         addResourceHandler("QueryWizard", "dbw");
-        CurDBMetaData = new QuerySummary(xMSF, m_oResource);
+        m_DBMetaData = new QuerySummary(xMSF, m_oResource);
     }
 
-/*    public static void main(String args[])
+    public static void main(String i_args[])
     {
-        String ConnectStr = "uno:pipe,name=foo;urp;StarOffice.ServiceManager";
+        final String settings[] = new String[] { null, null, null };
+        final int IDX_PIPE_NAME = 0;
+        final int IDX_LOCATION = 1;
+        final int IDX_DSN = 2;
+
+        // some simple parsing
+        boolean failure = false;
+        int settingsIndex = -1;
+        for ( int i=0; i= 0 )
+            {
+                settings[ settingsIndex ] = i_args[i];
+                settingsIndex = -1;
+                continue;
+            }
+
+            if ( i_args[i].equals( "--pipe-name" ) )
+            {
+                settingsIndex = IDX_PIPE_NAME;
+                continue;
+            }
+
+            if ( i_args[i].equals( "--database-location" ) )
+            {
+                settingsIndex = IDX_LOCATION;
+                continue;
+            }
+
+            if ( i_args[i].equals( "--data-source-name" ) )
+            {
+                settingsIndex = IDX_DSN;
+                continue;
+            }
+
+            failure = true;
+        }
+
+        if ( settings[ IDX_PIPE_NAME ] == null )
+            failure = true;
+
+        if ( ( settings[ IDX_DSN ] == null ) && ( settings[ IDX_LOCATION ] == null ) )
+            failure = true;
+
+        if ( failure )
+        {
+            System.err.println( "supported arguments: " );
+            System.err.println( "  --pipe-name            : specifies the name of the pipe to connect to the running OOo instance" );
+            System.err.println( "  --database-location     : specifies the URL of the database document to work with" );
+            System.err.println( "  --data-source-name     : specifies the name of the data source to work with" );
+            return;
+        }
+
+        final String ConnectStr = "uno:pipe,name=" + settings[IDX_PIPE_NAME] + ";urp;StarOffice.ServiceManager";
         try
         {
-            XMultiServiceFactory xLocMSF = Desktop.connect(ConnectStr);
-            if (xLocMSF != null)
+            final XMultiServiceFactory serviceFactory = Desktop.connect(ConnectStr);
+            if (serviceFactory != null)
             {
                 PropertyValue[] curproperties = new PropertyValue[1];
-                curproperties[0] = Properties.createProperty("DatabaseLocation", "file:///G:/temp/abc.odb");
-//              curproperties[0] = Properties.createProperty("DataSourceName", "TESTDB");
+                if ( settings[ IDX_LOCATION ] != null )
+                    curproperties[0] = Properties.createProperty( "DatabaseLocation", settings[ IDX_LOCATION ] );
+                else
+                    curproperties[0] = Properties.createProperty( "DataSourceName", settings[ IDX_DSN ] );
  
-                QueryWizard CurQueryWizard = new QueryWizard(xLocMSF);
-                CurQueryWizard.startQueryWizard(xLocMSF, curproperties);
+                QueryWizard CurQueryWizard = new QueryWizard( serviceFactory, curproperties );
+                CurQueryWizard.startQueryWizard();
             }
         }
         catch (java.lang.Exception jexception)
         {
             jexception.printStackTrace(System.out);
         }
-    }*/
+    }
 
     public final XFrame getFrame()
     {
@@ -116,7 +173,7 @@ public class QueryWizard extends DatabaseObjectWizard
     {
         try
         {
-            if ( CurDBMetaData.getConnection( m_wizardContext ) )
+            if ( m_DBMetaData.getConnection( m_wizardContext ) )
             {
                 reslblFields = m_oResource.getResText(UIConsts.RID_QUERY + 4);
                 reslblFieldHeader = m_oResource.getResText(UIConsts.RID_QUERY + 19); //Fielnames in  AliasComponent
@@ -138,11 +195,11 @@ public class QueryWizard extends DatabaseObjectWizard
                 setRightPaneHeaders(m_oResource, UIConsts.RID_QUERY + 70, 8);
                 this.setMaxStep(8);
                 buildSteps();
-                this.CurDBCommandFieldSelection.preselectCommand( m_wizardContext, false );
+                this.m_DBCommandFieldSelectio.preselectCommand( m_wizardContext, false );
 
                 XWindowPeer windowPeer = UnoRuntime.queryInterface( XWindowPeer.class, m_frame.getContainerWindow() );
                 createWindowPeer(windowPeer);
-                CurDBMetaData.setWindowPeer(this.xControl.getPeer());
+                m_DBMetaData.setWindowPeer(this.xControl.getPeer());
                 insertQueryRelatedSteps();
                 executeDialog( m_frame.getContainerWindow().getPosSize() );
             }
@@ -151,14 +208,14 @@ public class QueryWizard extends DatabaseObjectWizard
         {
             jexception.printStackTrace(System.out);
         }
-        CurGroupFilterComponent = null;
-        CurTitlesComponent = null;
-        CurAggregateComponent = null;
-        CurDBCommandFieldSelection = null;
+        m_groupFilterComponent = null;
+        m_titlesComponent = null;
+        m_aggregateComponent = null;
+        m_DBCommandFieldSelectio = null;
         xWindowPeer = null;
-        CurFinalizer = null;
-        CurDBMetaData.finish();
-        CurDBMetaData = null;
+        m_finalizer = null;
+        m_DBMetaData.finish();
+        m_DBMetaData = null;
         System.gc();
 
         return m_createdQuery;
@@ -181,17 +238,17 @@ public class QueryWizard extends DatabaseObjectWizard
                     case SOAGGREGATE_PAGE:
                         if (_bEnabled == true)
                         {
-                            bEnabled = ((CurDBMetaData.hasNumericalFields()) && (CurDBMetaData.xDBMetaData.supportsCoreSQLGrammar()));
+                            bEnabled = ((m_DBMetaData.hasNumericalFields()) && (m_DBMetaData.xDBMetaData.supportsCoreSQLGrammar()));
                         }
                         break;
                     case SOGROUPSELECTION_PAGE:
-                        bEnabled = CurDBMetaData.Type == QueryMetaData.QueryType.SOSUMMARYQUERY;
+                        bEnabled = m_DBMetaData.Type == QueryMetaData.QueryType.SOSUMMARYQUERY;
                         break;
                     case SOGROUPFILTER_PAGE:
                         bEnabled = false;
                         if (_bEnabled == true)
                         {
-                            bEnabled = (CurDBMetaData.GroupByFilterConditions.length > 0);
+                            bEnabled = (m_DBMetaData.GroupByFilterConditions.length > 0);
                         }
 
                         break;
@@ -225,11 +282,11 @@ public class QueryWizard extends DatabaseObjectWizard
             i = insertRoadmapItem(0, true, SOFIELDSELECTION_PAGE - 1, SOFIELDSELECTION_PAGE);
             i = insertRoadmapItem(i, false, SOSORTING_PAGE - 1, SOSORTING_PAGE); // Orderby is always supported
             i = insertRoadmapItem(i, false, SOFILTER_PAGE - 1, SOFILTER_PAGE);
-            if (CurDBMetaData.xDBMetaData.supportsCoreSQLGrammar())
+            if (m_DBMetaData.xDBMetaData.supportsCoreSQLGrammar())
             {
-                i = insertRoadmapItem(i, CurDBMetaData.hasNumericalFields(), SOAGGREGATE_PAGE - 1, SOAGGREGATE_PAGE);
+                i = insertRoadmapItem(i, m_DBMetaData.hasNumericalFields(), SOAGGREGATE_PAGE - 1, SOAGGREGATE_PAGE);
             }
-            if (CurDBMetaData.xDBMetaData.supportsGroupBy())
+            if (m_DBMetaData.xDBMetaData.supportsGroupBy())
             {
                 i = insertRoadmapItem(i, false, SOGROUPSELECTION_PAGE - 1, SOGROUPSELECTION_PAGE);
                 i = insertRoadmapItem(i, false, SOGROUPFILTER_PAGE - 1, SOGROUPFILTER_PAGE);
@@ -251,28 +308,25 @@ public class QueryWizard extends DatabaseObjectWizard
     {
         try
         {
-//            curDBCommandFieldSelection = new CommandFieldSelection(this, curFormDocument.oMainFormDBMetaData, 92, slblFields, slblSelFields,  slblTables, true, 34411);
-//            curDBCommandFieldSelection.addFieldSelectionListener(new FieldSelectionListener());
-
-            CurDBCommandFieldSelection = new CommandFieldSelection(this, CurDBMetaData, 120, reslblFields, reslblSelFields, reslblTables, true, 40850);
-            CurDBCommandFieldSelection.setAppendMode(true);
-            CurDBCommandFieldSelection.addFieldSelectionListener(new FieldSelectionListener());
-            CurSortingComponent = new SortingComponent(this, SOSORTING_PAGE, 95, 27, 210, 40865);
-            CurFilterComponent = new FilterComponent(this, xMSF, SOFILTER_PAGE, 97, 27, 209, 3, CurDBMetaData, 40878);
-            CurFilterComponent.addNumberFormats();
+            m_DBCommandFieldSelectio = new CommandFieldSelection(this, m_DBMetaData, 120, reslblFields, reslblSelFields, reslblTables, true, 40850);
+            m_DBCommandFieldSelectio.setAppendMode(true);
+            m_DBCommandFieldSelectio.addFieldSelectionListener(new FieldSelectionListener());
+            m_sortingComponent = new SortingComponent(this, SOSORTING_PAGE, 95, 27, 210, 40865);
+            m_filterComponent = new FilterComponent(this, xMSF, SOFILTER_PAGE, 97, 27, 209, 3, m_DBMetaData, 40878);
+            m_filterComponent.addNumberFormats();
 
-            if (CurDBMetaData.xDBMetaData.supportsCoreSQLGrammar())
+            if (m_DBMetaData.xDBMetaData.supportsCoreSQLGrammar())
             {
-                CurAggregateComponent = new AggregateComponent(this, CurDBMetaData, SOAGGREGATE_PAGE, 97, 69, 209, 5, 40895);
+                m_aggregateComponent = new AggregateComponent(this, m_DBMetaData, SOAGGREGATE_PAGE, 97, 69, 209, 5, 40895);
             }
-            if (CurDBMetaData.xDBMetaData.supportsGroupBy())
+            if (m_DBMetaData.xDBMetaData.supportsGroupBy())
             {
-                CurGroupFieldSelection = new FieldSelection(this, SOGROUPSELECTION_PAGE, 95, 27, 210, 150, reslblFields, this.reslblGroupBy, 40915, false);
-                CurGroupFieldSelection.addFieldSelectionListener(new FieldSelectionListener());
-                CurGroupFilterComponent = new FilterComponent(this, xMSF, SOGROUPFILTER_PAGE, 97, 27, 209, 3, CurDBMetaData, 40923);
+                m_groupFieldSelection = new FieldSelection(this, SOGROUPSELECTION_PAGE, 95, 27, 210, 150, reslblFields, this.reslblGroupBy, 40915, false);
+                m_groupFieldSelection.addFieldSelectionListener(new FieldSelectionListener());
+                m_groupFilterComponent = new FilterComponent(this, xMSF, SOGROUPFILTER_PAGE, 97, 27, 209, 3, m_DBMetaData, 40923);
             }
-            CurTitlesComponent = new TitlesComponent(this, SOTITLES_PAGE, 97, 37, 207, 7, reslblFieldHeader, reslblAliasHeader, 40940);
-            CurFinalizer = new Finalizer(this, CurDBMetaData);
+            m_titlesComponent = new TitlesComponent(this, SOTITLES_PAGE, 97, 37, 207, 7, reslblFieldHeader, reslblAliasHeader, 40940);
+            m_finalizer = new Finalizer(this, m_DBMetaData);
             enableNavigationButtons(false, false, false);
         }
         catch (com.sun.star.uno.Exception exception)
@@ -288,10 +342,10 @@ public class QueryWizard extends DatabaseObjectWizard
             ||	( switchToStep( ncurStep, SOSUMMARY_PAGE ) )
             )
         {
-            m_createdQuery = CurFinalizer.finish();
+            m_createdQuery = m_finalizer.finish();
             if ( m_createdQuery.length() > 0 )
             {
-                loadSubComponent( CommandType.QUERY, m_createdQuery, CurFinalizer.displayQueryDesign() );
+                loadSubComponent( CommandType.QUERY, m_createdQuery, m_finalizer.displayQueryDesign() );
                 xDialog.endExecute();
                 return true;
             }
@@ -305,11 +359,11 @@ public class QueryWizard extends DatabaseObjectWizard
         {
             if (nOldStep <= SOGROUPSELECTION_PAGE && nNewStep > SOGROUPSELECTION_PAGE)
             {
-                if (CurDBMetaData.xDBMetaData.supportsGroupBy())
+                if (m_DBMetaData.xDBMetaData.supportsGroupBy())
                 {
-                    CurDBMetaData.setGroupFieldNames(CurGroupFieldSelection.getSelectedFieldNames());
-                    CurDBMetaData.GroupFieldNames = JavaTools.removeOutdatedFields(CurDBMetaData.GroupFieldNames, CurDBMetaData.NonAggregateFieldNames);
-                    CurDBMetaData.GroupByFilterConditions = JavaTools.removeOutdatedFields(CurDBMetaData.GroupByFilterConditions, CurDBMetaData.GroupFieldNames);
+                    m_DBMetaData.setGroupFieldNames(m_groupFieldSelection.getSelectedFieldNames());
+                    m_DBMetaData.GroupFieldNames = JavaTools.removeOutdatedFields(m_DBMetaData.GroupFieldNames, m_DBMetaData.NonAggregateFieldNames);
+                    m_DBMetaData.GroupByFilterConditions = JavaTools.removeOutdatedFields(m_DBMetaData.GroupByFilterConditions, m_DBMetaData.GroupFieldNames);
                 }
             }
             switch (nNewStep)
@@ -317,24 +371,24 @@ public class QueryWizard extends DatabaseObjectWizard
                 case SOFIELDSELECTION_PAGE:
                     break;
                 case SOSORTING_PAGE:
-                    CurSortingComponent.initialize(CurDBMetaData.getDisplayFieldNames(), CurDBMetaData.getSortFieldNames());
+                    m_sortingComponent.initialize(m_DBMetaData.getDisplayFieldNames(), m_DBMetaData.getSortFieldNames());
                     break;
                 case SOFILTER_PAGE:
-                    CurFilterComponent.initialize(CurDBMetaData.getFilterConditions(), CurDBMetaData.getDisplayFieldNames());
+                    m_filterComponent.initialize(m_DBMetaData.getFilterConditions(), m_DBMetaData.getDisplayFieldNames());
                     break;
                 case SOAGGREGATE_PAGE:
-                    CurAggregateComponent.initialize();
+                    m_aggregateComponent.initialize();
                     break;
                 case SOGROUPSELECTION_PAGE:
                     break;
                 case SOGROUPFILTER_PAGE:
-                    CurGroupFilterComponent.initialize(CurDBMetaData.GroupByFilterConditions, CurDBMetaData.getGroupFieldNames());
+                    m_groupFilterComponent.initialize(m_DBMetaData.GroupByFilterConditions, m_DBMetaData.getGroupFieldNames());
                     break;
                 case SOTITLES_PAGE:
-                    CurTitlesComponent.initialize(CurDBMetaData.getDisplayFieldNames(), CurDBMetaData.FieldTitleSet);
+                    m_titlesComponent.initialize(m_DBMetaData.getDisplayFieldNames(), m_DBMetaData.FieldTitleSet);
                     break;
                 case SOSUMMARY_PAGE:
-                    CurFinalizer.initialize();
+                    m_finalizer.initialize();
                     break;
                 default:
                     break;
@@ -351,27 +405,27 @@ public class QueryWizard extends DatabaseObjectWizard
         switch (nOldStep)
         {
             case SOFIELDSELECTION_PAGE:
-                CurDBMetaData.reorderFieldColumns(CurDBCommandFieldSelection.getSelectedFieldNames());
-                CurDBMetaData.initializeFieldTitleSet(true);
-                CurDBMetaData.setNumericFields();
+                m_DBMetaData.reorderFieldColumns(m_DBCommandFieldSelectio.getSelectedFieldNames());
+                m_DBMetaData.initializeFieldTitleSet(true);
+                m_DBMetaData.setNumericFields();
                 searchForOutdatedFields();
                 break;
             case SOSORTING_PAGE:
-                CurDBMetaData.setSortFieldNames(CurSortingComponent.getSortFieldNames());
+                m_DBMetaData.setSortFieldNames(m_sortingComponent.getSortFieldNames());
                 break;
             case SOFILTER_PAGE:
-                CurDBMetaData.setFilterConditions(CurFilterComponent.getFilterConditions());
+                m_DBMetaData.setFilterConditions(m_filterComponent.getFilterConditions());
                 break;
             case SOAGGREGATE_PAGE:
-                CurDBMetaData.AggregateFieldNames = CurAggregateComponent.getAggregateFieldNames();
+                m_DBMetaData.AggregateFieldNames = m_aggregateComponent.getAggregateFieldNames();
                 break;
             case SOGROUPSELECTION_PAGE:
                 break;
             case SOGROUPFILTER_PAGE:
-                CurDBMetaData.setGroupByFilterConditions(this.CurGroupFilterComponent.getFilterConditions());
+                m_DBMetaData.setGroupByFilterConditions(this.m_groupFilterComponent.getFilterConditions());
                 break;
             case SOTITLES_PAGE:
-                CurDBMetaData.setFieldTitles(CurTitlesComponent.getFieldTitles());
+                m_DBMetaData.setFieldTitles(m_titlesComponent.getFieldTitles());
                 break;
             case SOSUMMARY_PAGE:
                 break;
@@ -382,15 +436,15 @@ public class QueryWizard extends DatabaseObjectWizard
         {
             try
             {
-                if (CurDBMetaData.Type == QueryMetaData.QueryType.SOSUMMARYQUERY)
+                if (m_DBMetaData.Type == QueryMetaData.QueryType.SOSUMMARYQUERY)
                 {
-                    if (CurDBMetaData.xDBMetaData.supportsGroupBy())
+                    if (m_DBMetaData.xDBMetaData.supportsGroupBy())
                     {
-                        CurDBMetaData.setNonAggregateFieldNames();
-                        CurGroupFieldSelection.initialize(CurDBMetaData.getUniqueAggregateFieldNames(), false, CurDBMetaData.xDBMetaData.getMaxColumnsInGroupBy());
-                        CurGroupFieldSelection.intializeSelectedFields(CurDBMetaData.NonAggregateFieldNames);
-                        CurGroupFieldSelection.setMultipleMode(false);
-                        setStepEnabled(SOGROUPFILTER_PAGE, CurAggregateComponent.isGroupingpossible() && CurDBMetaData.NonAggregateFieldNames.length > 0);
+                        m_DBMetaData.setNonAggregateFieldNames();
+                        m_groupFieldSelection.initialize(m_DBMetaData.getUniqueAggregateFieldNames(), false, m_DBMetaData.xDBMetaData.getMaxColumnsInGroupBy());
+                        m_groupFieldSelection.intializeSelectedFields(m_DBMetaData.NonAggregateFieldNames);
+                        m_groupFieldSelection.setMultipleMode(false);
+                        setStepEnabled(SOGROUPFILTER_PAGE, m_aggregateComponent.isGroupingpossible() && m_DBMetaData.NonAggregateFieldNames.length > 0);
                     }
                 }
             }
@@ -403,18 +457,18 @@ public class QueryWizard extends DatabaseObjectWizard
 
     private void searchForOutdatedFields()
     {
-        String[] sFieldNames = CurDBMetaData.getFieldNames();
-        String[][] sRemovedFields = JavaTools.removeOutdatedFields(CurDBMetaData.getSortFieldNames(), sFieldNames);
-        CurDBMetaData.setSortFieldNames(sRemovedFields);
-        CurDBMetaData.setFilterConditions(JavaTools.removeOutdatedFields(CurDBMetaData.getFilterConditions(), sFieldNames));
-        CurDBMetaData.AggregateFieldNames = JavaTools.removeOutdatedFields(CurDBMetaData.AggregateFieldNames, sFieldNames);
+        String[] sFieldNames = m_DBMetaData.getFieldNames();
+        String[][] sRemovedFields = JavaTools.removeOutdatedFields(m_DBMetaData.getSortFieldNames(), sFieldNames);
+        m_DBMetaData.setSortFieldNames(sRemovedFields);
+        m_DBMetaData.setFilterConditions(JavaTools.removeOutdatedFields(m_DBMetaData.getFilterConditions(), sFieldNames));
+        m_DBMetaData.AggregateFieldNames = JavaTools.removeOutdatedFields(m_DBMetaData.AggregateFieldNames, sFieldNames);
     }
 
     private void enableWizardSteps(String[] NewItems)
     {
         boolean bEnabled = NewItems.length > 0;
-        setControlProperty("btnWizardNext", "Enabled", new Boolean(bEnabled));
-        setControlProperty("btnWizardFinish", "Enabled", new Boolean(bEnabled));
+        setControlProperty("btnWizardNext", "Enabled", bEnabled);
+        setControlProperty("btnWizardFinish", "Enabled", bEnabled);
         enableRoadmapItems(NewItems, bEnabled); // Note: Performancewise this could be improved
     }
 
@@ -446,15 +500,15 @@ public class QueryWizard extends DatabaseObjectWizard
         {
             if (ID == 1)
             {
-                CurDBMetaData.addSeveralFieldColumns(SelItems, CurDBCommandFieldSelection.getSelectedCommandName());
+                m_DBMetaData.addSeveralFieldColumns(SelItems, m_DBCommandFieldSelectio.getSelectedCommandName());
                 enableWizardSteps(NewItems);
-                CurDBCommandFieldSelection.changeSelectedFieldNames(CurDBMetaData.getDisplayFieldNames());
-                CurDBCommandFieldSelection.toggleCommandListBox(NewItems);
+                m_DBCommandFieldSelectio.changeSelectedFieldNames(m_DBMetaData.getDisplayFieldNames());
+                m_DBCommandFieldSelectio.toggleCommandListBox(NewItems);
             }
             else
             {
-                boolean bEnabled = (CurGroupFieldSelection.getSelectedFieldNames().length > 0);
-                Helper.setUnoPropertyValue(getRoadmapItemByID(SOGROUPFILTER_PAGE), "Enabled", new Boolean(bEnabled));
+                boolean bEnabled = (m_groupFieldSelection.getSelectedFieldNames().length > 0);
+                Helper.setUnoPropertyValue(getRoadmapItemByID(SOGROUPFILTER_PAGE), "Enabled", bEnabled);
             }
         }
 
@@ -464,30 +518,30 @@ public class QueryWizard extends DatabaseObjectWizard
             if (ID == 1)
             {
                 enableWizardSteps(NewItems);
-                String[] sSelfieldNames = CurDBMetaData.getFieldNames(SelItems, CurDBCommandFieldSelection.getSelectedCommandName());
-                CurDBCommandFieldSelection.addItemsToFieldsListbox(sSelfieldNames);
-                CurDBMetaData.removeSeveralFieldColumnsByDisplayFieldName(SelItems);
-                CurDBCommandFieldSelection.toggleCommandListBox(NewItems);
+                String[] sSelfieldNames = m_DBMetaData.getFieldNames(SelItems, m_DBCommandFieldSelectio.getSelectedCommandName());
+                m_DBCommandFieldSelectio.addItemsToFieldsListbox(sSelfieldNames);
+                m_DBMetaData.removeSeveralFieldColumnsByDisplayFieldName(SelItems);
+                m_DBCommandFieldSelectio.toggleCommandListBox(NewItems);
 
             }
             else
             {
-                boolean bEnabled = (CurGroupFieldSelection.getSelectedFieldNames().length > 0);
+                boolean bEnabled = (m_groupFieldSelection.getSelectedFieldNames().length > 0);
                 String CurDisplayFieldName = SelItems[0];
-                if (JavaTools.FieldInList(CurDBMetaData.NonAggregateFieldNames, CurDisplayFieldName) > -1)
+                if (JavaTools.FieldInList(m_DBMetaData.NonAggregateFieldNames, CurDisplayFieldName) > -1)
                 {
                     showMessageBox("ErrorBox", VclWindowPeerAttribute.OK, resmsgNonNumericAsGroupBy);
-                    CurGroupFieldSelection.xSelectedFieldsListBox.addItems(SelItems, CurGroupFieldSelection.xSelectedFieldsListBox.getItemCount());
-                    String FieldList[] = CurGroupFieldSelection.xFieldsListBox.getItems();
+                    m_groupFieldSelection.xSelectedFieldsListBox.addItems(SelItems, m_groupFieldSelection.xSelectedFieldsListBox.getItemCount());
+                    String FieldList[] = m_groupFieldSelection.xFieldsListBox.getItems();
                     int index = JavaTools.FieldInList(FieldList, CurDisplayFieldName);
                     if (index > -1)
                     {
-                        CurGroupFieldSelection.xFieldsListBox.removeItems((short) index, (short) 1);
+                        m_groupFieldSelection.xFieldsListBox.removeItems((short) index, (short) 1);
                     }
                 }
                 else
                 {
-                    Helper.setUnoPropertyValue(getRoadmapItemByID(SOGROUPFILTER_PAGE), "Enabled", new Boolean(bEnabled));
+                    Helper.setUnoPropertyValue(getRoadmapItemByID(SOGROUPFILTER_PAGE), "Enabled", bEnabled);
                 }
             }
         }
diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java
index 25c0f8dc2..e539ee5d7 100644
--- a/wizards/com/sun/star/wizards/ui/FilterComponent.java
+++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java
@@ -40,18 +40,17 @@ import com.sun.star.beans.XPropertySet;
 import com.sun.star.lang.EventObject;
 import com.sun.star.lang.IllegalArgumentException;
 import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.lib.uno.helper.PropertySet;
 import com.sun.star.sdbc.DataType;
 import com.sun.star.uno.Any;
 import com.sun.star.uno.AnyConverter;
 import com.sun.star.uno.Exception;
 import com.sun.star.uno.Type;
+import com.sun.star.uno.TypeClass;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 import com.sun.star.wizards.common.NumberFormatter;
 import com.sun.star.wizards.common.Helper;
 import com.sun.star.wizards.common.JavaTools;
-import com.sun.star.wizards.common.Properties;
 import com.sun.star.wizards.db.FieldColumn;
 import com.sun.star.wizards.db.QueryMetaData;
 import java.util.logging.Level;
@@ -61,19 +60,9 @@ public class FilterComponent
 {
 
     private Integer IStep;
-    // private int iStartPosX;
-    // private int iStartPosY;
-    // int Count;
     private int RowCount;
-    // private int FilterCount;
     private static String[] sLogicOperators;
-    private static String[] sBooleanValues;
-    // private /* public */ String[] FieldNames;
-    private XRadioButton optMatchAll;
     private XRadioButton optMatchAny;
-    // private String soptMatchAll;
-    // private String soptMatchAny;
-    // private String[] sHeadLines;
     private String slblFieldNames;
     private String slblOperators;
     private String slblValue;
@@ -81,7 +70,6 @@ public class FilterComponent
     private int BaseID = 2300;
     private String sIncSuffix;
     private ControlRow[] oControlRows;
-    // private Vector FilterNames;
     private String sDuplicateCondition;
     final int SOOPTORMODE = 100;
     final int SOOPTANDMODE = 101;
@@ -127,7 +115,6 @@ public class FilterComponent
     final int SO_OPTQUERYMODE = 5;
     int SOI_MATCHALL = 0;
     int SOI_MATCHANY = 1;
-    // int ifilterstate = SOI_MATCHALL;
     int curHelpID;
 
     class ItemListenerImpl implements com.sun.star.awt.XItemListener
@@ -139,8 +126,6 @@ public class FilterComponent
             String sControlName = "";
             switch (iKey)
             {
-                //              case SOOPTQUERYMODE:
-                //                  getfilterstate();
                 case SO_FIRSTFIELDNAME:
                 case SO_SECONDFIELDNAME:
                 case SO_THIRDFIELDNAME:
@@ -152,24 +137,11 @@ public class FilterComponent
                     FieldColumn CurFieldColumn = new FieldColumn(oQueryMetaData, CurDisplayFieldName);
 
                     String sControlNameTextValue = "txtValue" + sControlNameSuffix;
-//                        String sControlNameBooleanList = "lstBoolean" + sControlNameSuffix;
-//                        if (aFieldColumn.FieldType == DataType.BOOLEAN)
-//                        {
-//                            // scheint aufgrund eines Fehlers in Toolkit nicht zu funktionieren
-//                            CurUnoDialog.setControlVisible(sControlNameTextValue, false);
-//                            CurUnoDialog.setControlVisible(sControlNameBooleanList, true);
-//                        }
-//                        else
-//                        {
-//                            CurUnoDialog.setControlVisible(sControlNameTextValue, true);
-//                            CurUnoDialog.setControlVisible(sControlNameBooleanList, false);
-
                     XControl xValueControl = CurUnoDialog.xDlgContainer.getControl(sControlNameTextValue);
                     XInterface xValueModel = (XInterface) UnoDialog.getModel(xValueControl);
                     Helper.setUnoPropertyValue(xValueModel, "TreatAsNumber", Boolean.valueOf(CurFieldColumn.isNumberFormat()));
                     final NumberFormatter aNumberFormatter = oQueryMetaData.getNumberFormatter();
                     aNumberFormatter.setNumberFormat(xValueModel, CurFieldColumn.getDBFormatKey(), aNumberFormatter);
-//                         }
 
                     break;
                 case SO_FIRSTCONDITION:
@@ -180,7 +152,6 @@ public class FilterComponent
                     break;
                 case SOOPTORMODE:
                 case SOOPTANDMODE:
-                    // getfilterstate();
                     return;
 
                 case SO_FIRSTBOOLFIELDNAME:
@@ -210,24 +181,6 @@ public class FilterComponent
             togglefollowingControlRow(sName);
         }
 
-        public void disposing(EventObject EventObject)
-        {
-        }
-    }
-
-    public void fieldconditionchanged(ItemEvent EventObject)
-    {
-        String sName = getControlName(EventObject.Source);
-        togglefollowingControlRow(sName);
-    }
-
-    public void disposing(com.sun.star.lang.EventObject eventObject)
-    {
-    }
-
-    class ActionListenerImpl implements com.sun.star.awt.XActionListener
-    {
-
         public void disposing(EventObject eventObject)
         {
         }
@@ -291,18 +244,19 @@ public class FilterComponent
                 
                 column.addProperty("Type", PropertyAttribute.BOUND, DataType.VARCHAR);
                 column.addProperty("Name", PropertyAttribute.BOUND, "");
+                column.addProperty("Value", (short)( PropertyAttribute.MAYBEVOID | PropertyAttribute.REMOVABLE ), null );
                 final XPropertySet columnSet = UnoRuntime.queryInterface(XPropertySet.class, column);
 
                 if ( oQueryMetaData.getSQLQueryComposer().getQuery().length() == 0)
                 {
                     final String fromClause = oQueryMetaData.getSQLQueryComposer().getFromClause();
-                    StringBuffer sql = new StringBuffer();
+                    StringBuilder sql = new StringBuilder();
                     sql.append(oQueryMetaData.getSQLQueryComposer().getSelectClause(true));
                     sql.append(' ');
                     sql.append(fromClause);
                     oQueryMetaData.getSQLQueryComposer().getQueryComposer().setElementaryQuery(sql.toString());
                 }
-                int a = 0;
+                oQueryMetaData.getSQLQueryComposer().getQueryComposer().setStructuredFilter( new PropertyValue[][] {} );
                 for (int i = 0; i < RowCount; i++)
                 {
                     ControlRow CurControlRow = oControlRows[i];
@@ -323,12 +277,14 @@ public class FilterComponent
                                     value = ((Double)value) - oQueryMetaData.getNullDateCorrection();
                                     break;
                             }
-                            column.addProperty("Value", PropertyAttribute.MAYBEVOID, value);
+                            column.removeProperty( "Value" );
+                            column.addProperty("Value", (short)( PropertyAttribute.MAYBEVOID | PropertyAttribute.REMOVABLE ), value );
                             columnSet.setPropertyValue("Value", value);
                             oQueryMetaData.getSQLQueryComposer().getQueryComposer().appendFilterByColumn(columnSet, getfilterstate() == this.SOI_MATCHALL,nOperator);
                         }
                     }
                 }
+                final String test = oQueryMetaData.getSQLQueryComposer().getQueryComposer().getQuery();
                 filterconditions = oQueryMetaData.getSQLQueryComposer().getQueryComposer().getStructuredFilter();
                 int[] iduplicate = JavaTools.getDuplicateFieldIndex(filterconditions);
                 if (iduplicate[0] != -1)
@@ -337,9 +293,7 @@ public class FilterComponent
                     String smsgDuplicateCondition = getDisplayCondition(sDuplicateCondition, aduplicatecondition, null);
                     CurUnoDialog.showMessageBox("WarningBox", VclWindowPeerAttribute.OK, smsgDuplicateCondition);
                     CurUnoDialog.vetoableChange(new java.beans.PropertyChangeEvent(CurUnoDialog, "Steps", Integer.valueOf(1), Integer.valueOf(2)));
-                    return new PropertyValue[][]
-                            {
-                            };
+                    return new PropertyValue[][]{};
                 }
             }
             catch (Exception ex)
@@ -402,22 +356,6 @@ public class FilterComponent
         return ifilterstate;
     }
 
-    private void addfiltercondition(int _index, String _curFieldName, Object _curValue, int _curOperator)
-    {
-        String ValString = String.valueOf(_curValue);
-        PropertyValue oPropertyValue = Properties.createProperty(_curFieldName, ValString, _curOperator);
-        getfilterstate();
-        if (getfilterstate() == this.SOI_MATCHALL)
-        {
-            if (_index == 0)
-            {
-                filterconditions[0] = new PropertyValue[getFilterCount()];
-            }
-            filterconditions[0][_index] = new PropertyValue();
-            filterconditions[0][_index] = oPropertyValue;
-        }
-    }
-
     private int getFilterCount()
     {
         int a = 0;
@@ -429,8 +367,6 @@ public class FilterComponent
             }
         }
         return a;
-        // FilterCount = a;
-        // return FilterCount;
     }
 
     /** Creates a new instance of FilterComponent
@@ -456,8 +392,6 @@ public class FilterComponent
         this.oQueryMetaData = _oQueryMetaData;
         boolean bEnabled;
         sIncSuffix = com.sun.star.wizards.common.Desktop.getIncrementSuffix(CurUnoDialog.getDlgNameAccess(), "optMatchAll");
-        // iStartPosX = iPosX;
-        // iStartPosY = iPosY;
 
         String soptMatchAll = CurUnoDialog.m_oResource.getResText(BaseID + 9);
         String soptMatchAny = CurUnoDialog.m_oResource.getResText(BaseID + 10);
@@ -465,14 +399,13 @@ public class FilterComponent
         slblOperators = CurUnoDialog.m_oResource.getResText(BaseID + 24);
         slblValue = CurUnoDialog.m_oResource.getResText(BaseID + 25);
         sLogicOperators = CurUnoDialog.m_oResource.getResArray(BaseID + 26, 10 /* 7 */); // =, <>, <, >, <=, >=, like, !like, is null, !is null
-        sBooleanValues = CurUnoDialog.m_oResource.getResArray(BaseID + 36, 2); // true, false
 
         sDuplicateCondition = CurUnoDialog.m_oResource.getResText(BaseID + 89);
 
         // create Radiobuttons
         // * match all
         // * match one
-        optMatchAll = CurUnoDialog.insertRadioButton("optMatchAll" + sIncSuffix, SOOPTANDMODE, new ItemListenerImpl(),
+        CurUnoDialog.insertRadioButton("optMatchAll" + sIncSuffix, SOOPTANDMODE, new ItemListenerImpl(),
                 new String[]
                 {
                     "Height",
@@ -533,13 +466,6 @@ public class FilterComponent
 
     public void initialize(PropertyValue[][] _filterconditions, String[] _fieldnames)
     {
-        // String aFieldNamesWithAdditionalEmpty[] = new String[_fieldnames.length + 1];
-        // for (int i = 0; i < _fieldnames.length; i++)
-        // {
-        //     aFieldNamesWithAdditionalEmpty[i] = _fieldnames[i];
-        // }
-        // aFieldNamesWithAdditionalEmpty[_fieldnames.length] = "";
-
         int i;
         for (i = 0; i < RowCount; i++)
         {
@@ -592,7 +518,7 @@ public class FilterComponent
     // 
     // 
     // -------------------------------------------------------------------------
-    class ControlRow
+    final class ControlRow
     {
 
         private final static int SOLSTFIELDNAME = 3;
@@ -775,30 +701,6 @@ public class FilterComponent
                             Short.valueOf(curtabindex++),
                             Integer.valueOf(nValueWidth)
                         });
-
-//                ControlElements[6] = CurUnoDialog.insertListBox((new StringBuilder()).append("lstBoolean").append(sCompSuffix).toString(), SO_BOOLEANLIST[Index], null, new ItemListenerImpl(), new String[] {
-//                    "Enabled",
-//                    "Dropdown",
-//                    "Height",
-//                    "HelpURL",
-//                    "LineCount",
-//                    "PositionX", "PositionY",
-//                    "Step",
-//                    "StringItemList",
-//                    "TabIndex",
-//                    "Width"
-//                }, new Object[] {
-//                    new Boolean(bEnabled),
-//                    Boolean.TRUE,
-//                    new Integer(13),
-//                    "HID:" + _firstRowHelpID++,
-//                    new Short((short) 2),
-//                    new Integer(nPosX3 + 44), new Integer(iCompPosY + 23),
-//                    IStep,
-//                    FilterComponent.sBooleanValues,
-//                    new Short(curtabindex++),
-//                    new Integer(nValueWidth)
-//                });
             }
             catch (Exception exception)
             {
@@ -843,13 +745,6 @@ public class FilterComponent
                             String sValue = (String.valueOf(oValue));
                             return (!sValue.equals(""));
                         }
-//                        String sBoolValue="";
-//                        short aSelectedBoolValue[] = (short[])Helper.getUnoPropertyValue(UnoDialog.getModel(ControlElements[6]), "SelectedItems");
-//                        if (aSelectedBoolValue.length > 0)
-//                        {
-//                            sBoolValue = String.valueOf(aSelectedBoolValue[0] == 1);
-//                            return !sBoolValue.equals("");
-//                        }
                     }
                 }
                 return false;
@@ -861,16 +756,10 @@ public class FilterComponent
             }
         }
 
-        private void fieldnamechanged(ItemEvent EventObject)
-        {
-            int i = 0;
-        }
-
         protected void setCondition(PropertyValue _filtercondition)
         {
             try
             {
-                int ikey;
                 XListBox xFieldsListBox = (XListBox) UnoRuntime.queryInterface(XListBox.class, ControlElements[SOLSTFIELDNAME]);
                 xFieldsListBox.selectItem(_filtercondition.Name, true);
                 XListBox xOperatorListBox = (XListBox) UnoRuntime.queryInterface(XListBox.class, ControlElements[SOLSTOPERATOR]);
@@ -940,8 +829,8 @@ public class FilterComponent
 
         private void settovoid()
         {
-            CurUnoDialog.deselectListBox(ControlElements[SOLSTFIELDNAME]);
-            CurUnoDialog.deselectListBox(ControlElements[SOLSTOPERATOR]);
+            WizardDialog.deselectListBox(ControlElements[SOLSTFIELDNAME]);
+            WizardDialog.deselectListBox(ControlElements[SOLSTOPERATOR]);
             Helper.setUnoPropertyValue(UnoDialog.getModel(ControlElements[SOTXTVALUE]), "EffectiveValue", com.sun.star.uno.Any.VOID);
         }
 
@@ -976,7 +865,7 @@ public class FilterComponent
             }
             else if (!isConditionComplete())
             {
-                CurUnoDialog.deselectListBox(ControlElements[SOLSTOPERATOR]);
+                WizardDialog.deselectListBox(ControlElements[SOLSTOPERATOR]);
             }
         }
 
@@ -1053,37 +942,3 @@ public class FilterComponent
         }
     }
 }
-//  com.sun.star.sdb.SQLFilterOperator.EQUAL
-//  com.sun.star.sdb.SQLFilterOperator.NOT_EQUAL
-//  com.sun.star.sdb.SQLFilterOperator.LESS
-//  com.sun.star.sdb.SQLFilterOperator.GREATER
-//  com.sun.star.sdb.SQLFilterOperator.LESS_EQUAL
-//  com.sun.star.sdb.SQLFilterOperator.GREATER_EQUAL
-//  com.sun.star.sdb.SQLFilterOperator.LIKE
-//  com.sun.star.sdb.SQLFilterOperator.NOT_LIKE
-//  com.sun.star.sdb.SQLFilterOperator.SQLNULL
-//  com.sun.star.sdb.SQLFilterOperator.NOT_SQLNULL
-
-/*  constants SQLFilterOperator
-{
-/// equal to
-const long EQUAL            = 1;
-/// not equal to
-const long NOT_EQUAL        = 2;
-/// less than
-const long LESS             = 3;
-/// greater than
-const long GREATER          = 4;
-/// less or eqal than
-const long LESS_EQUAL       = 5;
-/// greater or eqal than
-const long GREATER_EQUAL    = 6;
-/// like
-const long LIKE             = 7;
-/// not like
-const long NOT_LIKE         = 8;
-/// is null
-const long SQLNULL          = 9;
-/// is not null
-const long NOT_SQLNULL      = 10;
-}; */
-- 
cgit v1.2.3


From a5933012249cea51d0a7ecfbf69ebd38ae34edbf Mon Sep 17 00:00:00 2001
From: Mathias Bauer 
Date: Fri, 17 Sep 2010 14:28:41 +0200
Subject: CWS changehid: doesn't compile on 64bit

---
 automation/source/server/retstrm.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/automation/source/server/retstrm.cxx b/automation/source/server/retstrm.cxx
index b9205d90d..053203516 100644
--- a/automation/source/server/retstrm.cxx
+++ b/automation/source/server/retstrm.cxx
@@ -79,7 +79,7 @@ void RetStream::GenReturn ( USHORT nRet, USHORT nMethod, SbxValue &aValue )
 {
     Write(USHORT(SIReturn));
     Write(nRet);
-    Write((ULONG)nMethod); //HELPID BACKWARD (no ULONG needed)
+    Write((comm_ULONG)nMethod); //HELPID BACKWARD (no ULONG needed)
     Write(USHORT(PARAM_SBXVALUE_1));		// Typ der folgenden Parameter
     Write(aValue);
 }
-- 
cgit v1.2.3


From 8b669b21267cf8b9a7b5ae5961bdc7beba6f17d3 Mon Sep 17 00:00:00 2001
From: Mathias Bauer 
Date: Fri, 17 Sep 2010 14:29:02 +0200
Subject: CWS changehid: debug statements removed

---
 automation/source/server/server.cxx | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/automation/source/server/server.cxx b/automation/source/server/server.cxx
index 27b543d91..83d25c6ca 100644
--- a/automation/source/server/server.cxx
+++ b/automation/source/server/server.cxx
@@ -872,7 +872,6 @@ ImplRemoteControl::ImplRemoteControl()
 #else
         pServiceMgr = new RemoteControlCommunicationManager();
 #endif
-            fprintf(stderr, "%s\n", "Start RemoteControlCommunicationManager");
         pServiceMgr->SetDataReceivedHdl( LINK( this, ImplRemoteControl, QueCommandsEvent ) );
         pServiceMgr->StartCommunication();
 
@@ -886,7 +885,6 @@ ImplRemoteControl::ImplRemoteControl()
     }
     if ( RemoteControlCommunicationManager::nComm )
         new ExtraIdle( this );		// Setzt die Bearbeitung wieder auf
-    fprintf(stderr, "%s\n", "end of ImplRemoteControl::ImplRemoteControl()");
 }
 
 ImplRemoteControl::~ImplRemoteControl()
@@ -956,7 +954,6 @@ static ::osl::Mutex aMutex;
 static RemoteControl* pRemoteControl = 0;
 extern "C" void CreateRemoteControl()
 {
-    fprintf(stderr, "%s\n", "CreateRemoteControl");
     if ( !pRemoteControl )
     {
         ::osl::MutexGuard aGuard( aMutex );
-- 
cgit v1.2.3


From bf1d670d7eacb230d29b644330b452e9d63605d7 Mon Sep 17 00:00:00 2001
From: Ingo Schmidt 
Date: Fri, 17 Sep 2010 14:48:05 +0200
Subject: native330 #i113835# fix

---
 setup_native/scripts/admin.pl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setup_native/scripts/admin.pl b/setup_native/scripts/admin.pl
index 466182b24..d90c76650 100644
--- a/setup_native/scripts/admin.pl
+++ b/setup_native/scripts/admin.pl
@@ -66,7 +66,6 @@ sub usage
 {
     print <
Date: Fri, 17 Sep 2010 15:02:32 +0200
Subject: mib19: #163585# allow to use Any(void) as parameter

---
 extensions/source/ole/oleobjw.cxx | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx
index ab6ff10b9..7b76880dd 100755
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -1860,22 +1860,6 @@ Any  IUnknownWrapper_Impl::invokeWithDispIdComTlb(const OUString& sFuncName,
                 throw IllegalArgumentException( buf.makeStringAndClear(),
                                                 Reference(), (sal_Int16) i);
             }
-            //make sure we get no void any for an in parameter. In StarBasic 
-            //this may be caused by
-            // Dim arg
-            // obj.func(arg)
-            //A void any is allowed if the parameter is optional
-            if ( ! (aFuncDesc->lprgelemdescParam[i].paramdesc.wParamFlags & PARAMFLAG_FOPT)
-                && (i < nUnoArgs) && (paramFlags & PARAMFLAG_FIN) &&
-                Params.getConstArray()[i].getValueTypeClass() == TypeClass_VOID)
-            {
-                OUStringBuffer buf(256);	
-                buf.appendAscii("ole automation bridge: The argument at position: ");
-                buf.append(OUString::valueOf((sal_Int32) i));
-                buf.appendAscii(" (index starts with 0) is uninitialized.");
-                throw IllegalArgumentException( buf.makeStringAndClear(),
-                                                Reference(), (sal_Int16) i);
-            }
 
             // Property Put arguments
             if (anyArg.getValueType() == getCppuType((PropertyPutArgument*)0))
@@ -1988,12 +1972,16 @@ Any  IUnknownWrapper_Impl::invokeWithDispIdComTlb(const OUString& sFuncName,
                         & aFuncDesc->lprgelemdescParam[i].paramdesc.
                             pparamdescex->varDefaultValue);
                 }
-                else
+                else if (paramFlags & PARAMFLAG_FOPT)
                 {
-                    OSL_ASSERT(paramFlags & PARAMFLAG_FOPT);
                     arArgs[revIndex].vt = VT_ERROR;
                     arArgs[revIndex].scode = DISP_E_PARAMNOTFOUND;
                 }
+                else
+                {
+                    arArgs[revIndex].vt = VT_EMPTY;
+                    arArgs[revIndex].lVal = 0;
+                }
             }
         }
     }	
-- 
cgit v1.2.3


From b8bb6fd6d68c0d79c9d74a6612251ceb8796a9f6 Mon Sep 17 00:00:00 2001
From: Bartosz Kosiorek 
Date: Fri, 17 Sep 2010 19:06:31 +0200
Subject: svarray

---
 basctl/source/basicide/baside2b.cxx |  7 +++----
 basctl/source/basicide/bastype3.cxx | 21 ++++++++++-----------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 027ce45b6..15373377e 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -28,8 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_basctl.hxx"
 
-
-#include 
+#include 
 #define _BASIC_TEXTPORTIONS
 #include 
 #include 
@@ -773,8 +772,8 @@ void EditorWindow::ImpDoHighlight( ULONG nLine )
         pEditEngine->RemoveAttribs( nLine, TRUE );
         HighlightPortions aPortions;
         aHighlighter.getHighlightPortions( nLine, aLine, aPortions );
-        USHORT nCount = aPortions.Count();
-        for ( USHORT i = 0; i < nCount; i++ )
+
+        for ( size_t i = 0; i < aPortions.size(); i++ )
         {
             HighlightPortion& r = aPortions[i];
             const Color& rColor = ((ModulWindowLayout*)pModulWindow->GetLayoutWindow())->getSyntaxColor(r.tokenType);
diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx
index 4c2bc3061..38b2ac61b 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -42,14 +42,13 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star;
 
 
-SV_DECL_VARARR( EntryArray, SvLBoxEntry*, 4, 4 )
-
-SV_IMPL_VARARR( EntryArray, SvLBoxEntry*);
+typedef std::deque< SvLBoxEntry* > EntryArray;
 
 
 void __EXPORT BasicTreeListBox::RequestingChilds( SvLBoxEntry* pEntry )
@@ -196,7 +195,7 @@ SbxVariable* BasicTreeListBox::FindVariable( SvLBoxEntry* pEntry )
             case 2:
             case 1: 
             {
-                aEntries.C40_INSERT( SvLBoxEntry, pEntry, 0 );
+                aEntries.push_front( pEntry );
             }
             break;
             case 0: 
@@ -210,14 +209,14 @@ SbxVariable* BasicTreeListBox::FindVariable( SvLBoxEntry* pEntry )
 
     SbxVariable* pVar = 0;
     bool bDocumentObjects = false;
-    if ( aEntries.Count() )
+    if ( !aEntries.empty() )
     {
-        for ( USHORT n = 0; n < aEntries.Count(); n++ )
+        for ( size_t n = 0; n < aEntries.size(); n++ )
         {
             SvLBoxEntry* pLE = aEntries[n];
-            DBG_ASSERT( pLE, "Entrie im Array nicht gefunden" );
+            DBG_ASSERT( pLE, "Can not find entry in array" );
             BasicEntry* pBE = (BasicEntry*)pLE->GetUserData();
-            DBG_ASSERT( pBE, "Keine Daten im Eintrag gefunden!" );
+            DBG_ASSERT( pBE, "The data in the entry not found!" );
             String aName( GetEntryText( pLE ) );
 
             switch ( pBE->GetType() )
@@ -301,7 +300,7 @@ BasicEntryDescriptor BasicTreeListBox::GetEntryDescriptor( SvLBoxEntry* pEntry )
             case 2:
             case 1: 
             {
-                aEntries.C40_INSERT( SvLBoxEntry, pEntry, 0 );
+                aEntries.push_front( pEntry );
             }
             break;
             case 0: 
@@ -319,9 +318,9 @@ BasicEntryDescriptor BasicTreeListBox::GetEntryDescriptor( SvLBoxEntry* pEntry )
         pEntry = GetParent( pEntry );
     }
 
-    if ( aEntries.Count() )
+    if ( !aEntries.empty() )
     {
-        for ( USHORT n = 0; n < aEntries.Count(); n++ )
+        for ( size_t n = 0; n < aEntries.size(); n++ )
         {
             SvLBoxEntry* pLE = aEntries[n];
             DBG_ASSERT( pLE, "Entrie im Array nicht gefunden" );
-- 
cgit v1.2.3


From 2896451bbace0feea3a3c700b1bcc18527b57e80 Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" 
Date: Mon, 20 Sep 2010 11:36:45 +0200
Subject: dba34a: #i111148# re-enabled the tests

---
 forms/qa/unoapi/knownissues.xcl | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/forms/qa/unoapi/knownissues.xcl b/forms/qa/unoapi/knownissues.xcl
index 2e10a269c..6d4b49deb 100644
--- a/forms/qa/unoapi/knownissues.xcl
+++ b/forms/qa/unoapi/knownissues.xcl
@@ -121,9 +121,5 @@ forms.OComboBoxModel::com::sun::star::form::XUpdateBroadcaster
 forms.OFileControlModel::com::sun::star::beans::XFastPropertySet
 forms.OFileControlModel::com::sun::star::form::FormControlModel
 
-### i111148 ###
-forms.OImageControlModel::com::sun::star::beans::XMultiPropertySet
-forms.OImageControlModel::com::sun::star::beans::XPropertySet
-
 ### i111333 ###
 forms.OImageControlControl::com::sun::star::awt::XControl
-- 
cgit v1.2.3


From a8d648029975be500a9759c4d3e4f2cffef1e47d Mon Sep 17 00:00:00 2001
From: "Philipp Lohmann [pl]" 
Date: Mon, 20 Sep 2010 13:13:18 +0200
Subject: vcl115: #i114425# fix a possible dangling reference (thanks dtardon!)

---
 forms/source/component/Currency.cxx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx
index b80b4b4a4..2f4cf4bfa 100644
--- a/forms/source/component/Currency.cxx
+++ b/forms/source/component/Currency.cxx
@@ -104,7 +104,8 @@ void OCurrencyModel::implConstruct()
         try
         {
             // get the system international informations
-            const LocaleDataWrapper& aLocaleInfo = SvtSysLocale().GetLocaleData();
+            const SvtSysLocale aSysLocale;
+            const LocaleDataWrapper& aLocaleInfo = aSysLocale.GetLocaleData();
 
             ::rtl::OUString sCurrencySymbol;
             sal_Bool bPrependCurrencySymbol;
-- 
cgit v1.2.3


From 1253c4f6e5afedabb585c88646646d5a7efec7d6 Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" 
Date: Mon, 20 Sep 2010 14:22:44 +0200
Subject: dba33j: #i114566# +getNormalizedStructuredFilter

---
 .../sun/star/wizards/db/DatabaseObjectWizard.java  |  3 +-
 .../com/sun/star/wizards/db/SQLQueryComposer.java  | 82 ++++++++++++++++++----
 .../com/sun/star/wizards/ui/FilterComponent.java   | 51 ++++++++------
 3 files changed, 101 insertions(+), 35 deletions(-)

diff --git a/wizards/com/sun/star/wizards/db/DatabaseObjectWizard.java b/wizards/com/sun/star/wizards/db/DatabaseObjectWizard.java
index 5c65d7379..e03323c6e 100644
--- a/wizards/com/sun/star/wizards/db/DatabaseObjectWizard.java
+++ b/wizards/com/sun/star/wizards/db/DatabaseObjectWizard.java
@@ -57,7 +57,8 @@ public abstract class DatabaseObjectWizard extends WizardDialog
     {
         try
         {
-            m_docUI.loadComponent( i_type, i_name, i_forEditing );
+            if ( m_docUI != null )
+                m_docUI.loadComponent( i_type, i_name, i_forEditing );
         }
         catch ( IllegalArgumentException ex )
         {
diff --git a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
index a80623e27..b474c6a5b 100644
--- a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
+++ b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
@@ -47,6 +47,7 @@ import com.sun.star.uno.UnoRuntime;
 import com.sun.star.sdbc.SQLException;
 import com.sun.star.lang.XInitialization;
 import com.sun.star.awt.XWindow;
+import com.sun.star.sdb.SQLFilterOperator;
 
 import com.sun.star.wizards.common.*;
 
@@ -60,7 +61,7 @@ public class SQLQueryComposer
     // String m_sFromClause;
     public XSingleSelectQueryAnalyzer m_xQueryAnalyzer;
     Vector composedCommandNames = new Vector(1);
-    private XSingleSelectQueryComposer m_xQueryComposer;
+    private XSingleSelectQueryComposer m_queryComposer;
     XMultiServiceFactory xMSF;
     boolean bincludeGrouping = true;
 
@@ -72,7 +73,7 @@ public class SQLQueryComposer
             xMSF = (XMultiServiceFactory) UnoRuntime.queryInterface(XMultiServiceFactory.class, CurDBMetaData.DBConnection);
             final Object oQueryComposer = xMSF.createInstance("com.sun.star.sdb.SingleSelectQueryComposer");
             m_xQueryAnalyzer = (XSingleSelectQueryAnalyzer) UnoRuntime.queryInterface(XSingleSelectQueryAnalyzer.class, oQueryComposer);
-            m_xQueryComposer = (XSingleSelectQueryComposer) UnoRuntime.queryInterface(XSingleSelectQueryComposer.class, m_xQueryAnalyzer);
+            m_queryComposer = (XSingleSelectQueryComposer) UnoRuntime.queryInterface(XSingleSelectQueryComposer.class, m_xQueryAnalyzer);
             XSQLQueryComposerFactory xSQLComposerFactory;
             xSQLComposerFactory = (XSQLQueryComposerFactory) UnoRuntime.queryInterface(XSQLQueryComposerFactory.class, CurDBMetaData.DBConnection);
         // /* XSQLQueryComposer */ xSQLQueryComposer = xSQLComposerFactory.createQueryComposer();
@@ -160,7 +161,7 @@ public class SQLQueryComposer
         {
             for (int i = 0; i < CurDBMetaData.getFilterConditions().length; i++)
             {
-                m_xQueryComposer.setStructuredFilter(CurDBMetaData.getFilterConditions());
+                m_queryComposer.setStructuredFilter(CurDBMetaData.getFilterConditions());
             }
         }
         catch (Exception exception)
@@ -172,7 +173,7 @@ public class SQLQueryComposer
     public void prependSortingCriteria() throws SQLException
     {
         XIndexAccess xColumnIndexAccess = m_xQueryAnalyzer.getOrderColumns();
-        m_xQueryComposer.setOrder("");
+        m_queryComposer.setOrder("");
         for (int i = 0; i < CurDBMetaData.getSortFieldNames().length; i++)
         {
             appendSortingCriterion(i, false);
@@ -186,7 +187,7 @@ public class SQLQueryComposer
                 if (JavaTools.FieldInTable(CurDBMetaData.getSortFieldNames(), sName) == -1)
                 {
                     boolean bascend = AnyConverter.toBoolean(xColumnPropertySet.getPropertyValue("IsAscending"));
-                    m_xQueryComposer.appendOrderByColumn(xColumnPropertySet, bascend);
+                    m_queryComposer.appendOrderByColumn(xColumnPropertySet, bascend);
                 }
             }
             catch (Exception e)
@@ -203,13 +204,13 @@ public class SQLQueryComposer
 
         String sSort = CurDBMetaData.getSortFieldNames()[_SortIndex][1];
         boolean bascend = (sSort.equals("ASC"));
-        m_xQueryComposer.appendOrderByColumn(xColumn, bascend);
+        m_queryComposer.appendOrderByColumn(xColumn, bascend);
     }
 
     public void appendSortingcriteria(boolean _baddAliasFieldNames) throws SQLException
     {
         String sOrder = "";
-        m_xQueryComposer.setOrder("");
+        m_queryComposer.setOrder("");
         for (int i = 0; i < CurDBMetaData.getSortFieldNames().length; i++)
         {
             String sSortValue = CurDBMetaData.getSortFieldNames()[i][0];
@@ -223,7 +224,7 @@ public class SQLQueryComposer
                 }
                 sOrder += CurDBMetaData.AggregateFieldNames[iAggregate][1] + "(" + CurDBMetaData.AggregateFieldNames[iAggregate][0] + ")";
                 sOrder += " " + CurDBMetaData.getSortFieldNames()[i][1];
-                m_xQueryComposer.setOrder(sOrder);
+                m_queryComposer.setOrder(sOrder);
             }
             else
             {
@@ -232,7 +233,7 @@ public class SQLQueryComposer
             sOrder = m_xQueryAnalyzer.getOrder();
         }
         // just for debug!
-        sOrder = m_xQueryComposer.getOrder();
+        sOrder = m_queryComposer.getOrder();
         int dummy = 0;
     }
 
@@ -241,7 +242,7 @@ public class SQLQueryComposer
         for (int i = 0; i < CurDBMetaData.GroupFieldNames.length; i++)
         {
             XPropertySet xColumn = CurDBMetaData.getColumnObjectByFieldName(CurDBMetaData.GroupFieldNames[i], _baddAliasFieldNames);
-            m_xQueryComposer.appendGroupByColumn(xColumn);
+            m_queryComposer.appendGroupByColumn(xColumn);
         }
         String s = m_xQueryAnalyzer.getQuery();
     }
@@ -309,7 +310,7 @@ public class SQLQueryComposer
                     if (CurDBMetaData.getFilterConditions().length > 0)
                     {
                         CurDBMetaData.setFilterConditions(replaceConditionsByAlias(CurDBMetaData.getFilterConditions()));
-                        m_xQueryComposer.setStructuredFilter(CurDBMetaData.getFilterConditions());
+                        m_queryComposer.setStructuredFilter(CurDBMetaData.getFilterConditions());
                     }
                 }
             }
@@ -319,7 +320,7 @@ public class SQLQueryComposer
                 appendGroupByColumns(_baddAliasFieldNames);
                 if (CurDBMetaData.GroupByFilterConditions.length > 0)
                 {
-                    m_xQueryComposer.setStructuredHavingClause(CurDBMetaData.GroupByFilterConditions);
+                    m_queryComposer.setStructuredHavingClause(CurDBMetaData.GroupByFilterConditions);
                 }
             }
             appendSortingcriteria(_baddAliasFieldNames);
@@ -426,8 +427,63 @@ public class SQLQueryComposer
             typeexception.printStackTrace(System.out);
         }
     }
+
+    /**
+     * retrieves a normalized structured filter
+     *
+     * 
XSingleSelectQueryComposer.getStructuredFilter has a strange habit of returning the predicate (equal, not equal, etc)
+     * effectively twice: Once as SQLFilterOperator, and once in the value. That is, if you have a term "column <> 3", then
+     * you'll get an SQLFilterOperator.NOT_EQUAL (which is fine), and the textual value of the condition
+     * will read "<> 3". The latter is strange enough, but even more strange is that this behavior is not even consistent:
+     * for SQLFilterOperator.EQUAL, the "=" sign is not include in the textual value.

+     *
+     * 
To abstract from this weirdness, use this function here, which strips the unwanted tokens from the textual value
+     * representation.

+     */
+    public PropertyValue[][] getNormalizedStructuredFilter()
+    {
+        final PropertyValue[][] structuredFilter = m_queryComposer.getStructuredFilter();
+        for ( int i=0; i 0)
         {
+            final SQLQueryComposer composer = oQueryMetaData.getSQLQueryComposer();
             try
             {
                 final String serviceName = "com.sun.star.beans.PropertyBag";
@@ -247,29 +248,29 @@ public class FilterComponent
                 column.addProperty("Value", (short)( PropertyAttribute.MAYBEVOID | PropertyAttribute.REMOVABLE ), null );
                 final XPropertySet columnSet = UnoRuntime.queryInterface(XPropertySet.class, column);
 
-                if ( oQueryMetaData.getSQLQueryComposer().getQuery().length() == 0)
+                if ( composer.getQuery().length() == 0)
                 {
-                    final String fromClause = oQueryMetaData.getSQLQueryComposer().getFromClause();
+                    final String fromClause = composer.getFromClause();
                     StringBuilder sql = new StringBuilder();
-                    sql.append(oQueryMetaData.getSQLQueryComposer().getSelectClause(true));
+                    sql.append(composer.getSelectClause(true));
                     sql.append(' ');
                     sql.append(fromClause);
-                    oQueryMetaData.getSQLQueryComposer().getQueryComposer().setElementaryQuery(sql.toString());
+                    composer.getQueryComposer().setElementaryQuery(sql.toString());
                 }
-                oQueryMetaData.getSQLQueryComposer().getQueryComposer().setStructuredFilter( new PropertyValue[][] {} );
+                composer.getQueryComposer().setStructuredFilter( new PropertyValue[][] {} );
                 for (int i = 0; i < RowCount; i++)
                 {
-                    ControlRow CurControlRow = oControlRows[i];
-                    if (CurControlRow.isEnabled())
+                    ControlRow currentControlRow = oControlRows[i];
+                    if (currentControlRow.isEnabled())
                     {
-                        if (CurControlRow.isConditionComplete())
+                        if (currentControlRow.isConditionComplete())
                         {
-                            String sFieldName = CurControlRow.getSelectedFieldName();
-                            int nOperator = (int) CurControlRow.getSelectedOperator();
+                            String sFieldName = currentControlRow.getSelectedFieldName();
+                            int nOperator = (int) currentControlRow.getSelectedOperator();
                             FieldColumn aFieldColumn = oQueryMetaData.getFieldColumnByDisplayName(sFieldName);
                             columnSet.setPropertyValue("Name", aFieldColumn.getFieldName());
                             columnSet.setPropertyValue("Type", aFieldColumn.getXColumnPropertySet().getPropertyValue("Type"));
-                            Object value = CurControlRow.getValue();
+                            Object value = currentControlRow.getValue();
                             switch(aFieldColumn.getFieldType())
                             {
                                 case DataType.TIMESTAMP:
@@ -278,14 +279,23 @@ public class FilterComponent
                                     break;
                             }
                             column.removeProperty( "Value" );
-                            column.addProperty("Value", (short)( PropertyAttribute.MAYBEVOID | PropertyAttribute.REMOVABLE ), value );
+                            final short operator = currentControlRow.getSelectedOperator();
+                            if  (   ( operator == SQLFilterOperator.SQLNULL )
+                                ||  ( operator == SQLFilterOperator.NOT_SQLNULL )
+                                ||  AnyConverter.isVoid( value )
+                                )
+                            {
+                                column.addProperty("Value", (short)( PropertyAttribute.MAYBEVOID | PropertyAttribute.REMOVABLE ), new String() );
+                                value = new Any( new Type( TypeClass.VOID ), null );
+                            }
+                            else
+                                column.addProperty("Value", (short)( PropertyAttribute.MAYBEVOID | PropertyAttribute.REMOVABLE ), value );
                             columnSet.setPropertyValue("Value", value);
-                            oQueryMetaData.getSQLQueryComposer().getQueryComposer().appendFilterByColumn(columnSet, getfilterstate() == this.SOI_MATCHALL,nOperator);
+                            composer.getQueryComposer().appendFilterByColumn(columnSet, getfilterstate() == this.SOI_MATCHALL,nOperator);
                         }
                     }
                 }
-                final String test = oQueryMetaData.getSQLQueryComposer().getQueryComposer().getQuery();
-                filterconditions = oQueryMetaData.getSQLQueryComposer().getQueryComposer().getStructuredFilter();
+                filterconditions = composer.getNormalizedStructuredFilter();
                 int[] iduplicate = JavaTools.getDuplicateFieldIndex(filterconditions);
                 if (iduplicate[0] != -1)
                 {
@@ -520,7 +530,6 @@ public class FilterComponent
     // -------------------------------------------------------------------------
     final class ControlRow
     {
-
         private final static int SOLSTFIELDNAME = 3;
         private final static int SOLSTOPERATOR = 4;
         private final static int SOTXTVALUE = 5;
@@ -936,9 +945,9 @@ public class FilterComponent
 
         protected String getDateTimeString(boolean bgetDate)
         {
-                double dblValue = ((Double) getValue()).doubleValue();
-                NumberFormatter oNumberFormatter = oQueryMetaData.getNumberFormatter();
-                return oNumberFormatter.convertNumberToString(iDateTimeFormat, dblValue);
+            double dblValue = ((Double) getValue()).doubleValue();
+            NumberFormatter oNumberFormatter = oQueryMetaData.getNumberFormatter();
+            return oNumberFormatter.convertNumberToString(iDateTimeFormat, dblValue);
         }
     }
 }
-- 
cgit v1.2.3


From 409fa6b14f152a2d5dde184f9c6351df69618243 Mon Sep 17 00:00:00 2001
From: Christian Lippka 
Date: Mon, 20 Sep 2010 15:59:26 +0200
Subject: impress201: #i111302# applied patch to leave more room for strings

---
 cui/source/options/optimprove.src | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cui/source/options/optimprove.src b/cui/source/options/optimprove.src
index 42c800905..f648e919a 100644
--- a/cui/source/options/optimprove.src
+++ b/cui/source/options/optimprove.src
@@ -84,23 +84,23 @@ TabPage RID_SVXPAGE_IMPROVEMENT
     FixedText FT_NR_REPORTS
     {
         Pos = MAP_APPFONT ( 12 , 132 ) ;
-        Size = MAP_APPFONT ( 80 , 8 ) ;
+        Size = MAP_APPFONT ( 96 , 8 ) ;
         Text [ en-US ] = "Number of reports sent:" ;
     };
     FixedText FT_NR_REPORTS_VALUE
     {
-        Pos = MAP_APPFONT ( 95 , 132 ) ;
+        Pos = MAP_APPFONT ( 111 , 132 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
     };
     FixedText FT_NR_ACTIONS
     {
         Pos = MAP_APPFONT ( 12 , 145 ) ;
-        Size = MAP_APPFONT ( 80 , 8 ) ;
+        Size = MAP_APPFONT ( 96 , 8 ) ;
         Text [ en-US ] = "Number of tracked actions:" ;
     };
     FixedText FT_NR_ACTIONS_VALUE
     {
-        Pos = MAP_APPFONT ( 95 , 145 ) ;
+        Pos = MAP_APPFONT ( 111 , 145 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
     };
     PushButton PB_SHOWDATA
-- 
cgit v1.2.3


From 9ae459aa1fe05b6f63beca42052a19920c144dbc Mon Sep 17 00:00:00 2001
From: Christian Lippka 
Date: Tue, 21 Sep 2010 11:36:27 +0200
Subject: dba33j: #i111302# fixed truncated strings

---
 cui/source/options/optimprove.src | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/cui/source/options/optimprove.src b/cui/source/options/optimprove.src
index 42c800905..2746b9212 100644
--- a/cui/source/options/optimprove.src
+++ b/cui/source/options/optimprove.src
@@ -84,29 +84,29 @@ TabPage RID_SVXPAGE_IMPROVEMENT
     FixedText FT_NR_REPORTS
     {
         Pos = MAP_APPFONT ( 12 , 132 ) ;
-        Size = MAP_APPFONT ( 80 , 8 ) ;
+        Size = MAP_APPFONT ( 96 , 8 ) ;
         Text [ en-US ] = "Number of reports sent:" ;
     };
     FixedText FT_NR_REPORTS_VALUE
     {
-        Pos = MAP_APPFONT ( 95 , 132 ) ;
+        Pos = MAP_APPFONT ( 111 , 132 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
     };
     FixedText FT_NR_ACTIONS
     {
         Pos = MAP_APPFONT ( 12 , 145 ) ;
-        Size = MAP_APPFONT ( 80 , 8 ) ;
+        Size = MAP_APPFONT ( 96 , 8 ) ;
         Text [ en-US ] = "Number of tracked actions:" ;
     };
     FixedText FT_NR_ACTIONS_VALUE
     {
         Pos = MAP_APPFONT ( 95 , 145 ) ;
-        Size = MAP_APPFONT ( 100 , 10 ) ;
+        Size = MAP_APPFONT ( 111 , 10 ) ;
     };
     PushButton PB_SHOWDATA
     {
         Pos = MAP_APPFONT ( 12 , 161 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
+        Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "~Show Data" ;
     };
     String STR_INFO
-- 
cgit v1.2.3


From 2148e0276708d51b5cca53d73257a7ca46e8c8c1 Mon Sep 17 00:00:00 2001
From: Christian Lippka 
Date: Tue, 21 Sep 2010 12:31:14 +0200
Subject: impress201: #i112587# add display properties to control shapes

---
 cui/source/options/optimprove.src | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cui/source/options/optimprove.src b/cui/source/options/optimprove.src
index f648e919a..5012f55cc 100644
--- a/cui/source/options/optimprove.src
+++ b/cui/source/options/optimprove.src
@@ -106,7 +106,7 @@ TabPage RID_SVXPAGE_IMPROVEMENT
     PushButton PB_SHOWDATA
     {
         Pos = MAP_APPFONT ( 12 , 161 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
+        Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "~Show Data" ;
     };
     String STR_INFO
-- 
cgit v1.2.3


From 9171d7a946a812452d0533c7113a4960ba7055fd Mon Sep 17 00:00:00 2001
From: sb 
Date: Wed, 22 Sep 2010 13:00:22 +0200
Subject: sb123: #i114669# disabled forms.OListBoxControl for now

---
 forms/qa/unoapi/forms.sce | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forms/qa/unoapi/forms.sce b/forms/qa/unoapi/forms.sce
index 073472f03..8ac840e7c 100644
--- a/forms/qa/unoapi/forms.sce
+++ b/forms/qa/unoapi/forms.sce
@@ -24,7 +24,7 @@
 -o forms.OImageButtonModel
 -o forms.OImageControlControl
 -o forms.OImageControlModel
--o forms.OListBoxControl
+#i114669 -o forms.OListBoxControl
 -o forms.OListBoxModel
 -o forms.ONavigationBarControl
 -o forms.ONavigationBarModel
-- 
cgit v1.2.3


From 38a794452fa950e4e154fff949dd841a447b1d54 Mon Sep 17 00:00:00 2001
From: Christian Lippka 
Date: Thu, 23 Sep 2010 11:21:26 +0200
Subject: dba33j: #i111302# fixed truncated strings

---
 cui/source/options/optimprove.src | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cui/source/options/optimprove.src b/cui/source/options/optimprove.src
index 2746b9212..5012f55cc 100644
--- a/cui/source/options/optimprove.src
+++ b/cui/source/options/optimprove.src
@@ -100,8 +100,8 @@ TabPage RID_SVXPAGE_IMPROVEMENT
     };
     FixedText FT_NR_ACTIONS_VALUE
     {
-        Pos = MAP_APPFONT ( 95 , 145 ) ;
-        Size = MAP_APPFONT ( 111 , 10 ) ;
+        Pos = MAP_APPFONT ( 111 , 145 ) ;
+        Size = MAP_APPFONT ( 100 , 10 ) ;
     };
     PushButton PB_SHOWDATA
     {
-- 
cgit v1.2.3


From 77d0ad63f4990ecc41381bf885ac9ca123b88101 Mon Sep 17 00:00:00 2001
From: sb 
Date: Thu, 23 Sep 2010 16:30:04 +0200
Subject: sb132: #i114422# adapted install_solaris.sh

---
 setup_native/scripts/install_solaris.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup_native/scripts/install_solaris.sh b/setup_native/scripts/install_solaris.sh
index 7c4cc7540..46969dae8 100644
--- a/setup_native/scripts/install_solaris.sh
+++ b/setup_native/scripts/install_solaris.sh
@@ -244,7 +244,7 @@ else
   CMD=/tmp/userinstall.$$; echo "" > $CMD
 fi
 
-sed -e 's|"/|"${PKG_INSTALL_ROOT}/|g' > $CMD
+sed -e 's|/opt/|${PKG_INSTALL_ROOT}/opt/|g' > $CMD
 /bin/sh -e $CMD
 rm -f $CMD
 EOF
-- 
cgit v1.2.3


From 960baeabd2d07c54a0765b11c5016374be712bb1 Mon Sep 17 00:00:00 2001
From: sb 
Date: Thu, 23 Sep 2010 16:42:50 +0200
Subject: sb132: #i113570# correctly pass char* to %s (patch by tono)

---
 crashrep/source/win32/soreport.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crashrep/source/win32/soreport.cpp b/crashrep/source/win32/soreport.cpp
index 68437ded6..87a7a6dd2 100755
--- a/crashrep/source/win32/soreport.cpp
+++ b/crashrep/source/win32/soreport.cpp
@@ -1847,7 +1847,7 @@ bool WriteChecksumFile( FILE *fchksum, const hash_map< string, string >& rLibrar
                 for ( int i = 0; i < sizeof(checksum); fprintf( fchksum, "%02X", checksum[i++] ) );
                 fprintf( fchksum, "\" bytes=\"%d\" file=\"%s\"/>\n", 
                     nBytesProcessed, 
-                    GetFileName( iter->first ) );
+                    GetFileName( iter->first ).c_str() );
             }
         }
 
-- 
cgit v1.2.3


From c93aa4578d3789419d97843b34290c1ec5100494 Mon Sep 17 00:00:00 2001
From: Mathias Bauer 
Date: Fri, 24 Sep 2010 19:54:00 +0200
Subject: CWS changehid: several fixes to work with old testtool

---
 automation/source/server/cmdbasestream.cxx | 28 ++++++++++++++++++++--------
 automation/source/server/retstrm.hxx       |  7 +------
 automation/source/server/sta_list.cxx      |  2 +-
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/automation/source/server/cmdbasestream.cxx b/automation/source/server/cmdbasestream.cxx
index c864af512..9217c7abc 100644
--- a/automation/source/server/cmdbasestream.cxx
+++ b/automation/source/server/cmdbasestream.cxx
@@ -68,7 +68,10 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, rtl::OString *pUId, comm_ULONG
 {
     Write(comm_USHORT(SIReturn));
     Write(nRet);
-    Write(pUId);
+    if ( pUId->equals( rtl::OString( "UID_ACTIVE" ) ) )
+        Write(comm_ULONG(0));
+    else
+        Write(pUId);
     Write(comm_USHORT(PARAM_ULONG_1));			// Typ der folgenden Parameter
     Write(nNr);
 }
@@ -77,7 +80,10 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, rtl::OString *pUId, comm_String
 {
     Write(comm_USHORT(SIReturn));
     Write(nRet);
-    Write(pUId);
+    if ( pUId->equals( rtl::OString( "UID_ACTIVE" ) ) )
+        Write(comm_ULONG(0));
+    else
+        Write(pUId);
     Write(comm_USHORT(PARAM_STR_1));				// Typ der folgenden Parameter
     Write(pString);
 }
@@ -86,7 +92,10 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, rtl::OString *pUId, comm_BOOL b
 {
     Write(comm_USHORT(SIReturn));
     Write(nRet);
-    Write(pUId);
+    if ( pUId->equals( rtl::OString( "UID_ACTIVE" ) ) )
+        Write(comm_ULONG(0));
+    else
+        Write(pUId);
     Write(comm_USHORT(PARAM_BOOL_1));			// Typ der folgenden Parameter
     Write(bBool);
 }
@@ -95,7 +104,10 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, rtl::OString *pUId, comm_ULONG
 {
     Write(comm_USHORT(SIReturn));
     Write(nRet);
-    Write(pUId);
+    if ( pUId->equals( rtl::OString( "UID_ACTIVE" ) ) )
+        Write(comm_ULONG(0));
+    else
+        Write(pUId);
     Write(comm_USHORT(PARAM_ULONG_1|PARAM_STR_1|PARAM_BOOL_1));		// Typ der folgenden Parameter
     Write(nNr);
     Write(pString);
@@ -106,7 +118,7 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_USHORT nMethod, comm_ULONG
 {
     Write(comm_USHORT(SIReturn));
     Write(nRet);
-    Write(nMethod);
+    Write((comm_ULONG)nMethod); //HELPID BACKWARD (no ULONG needed)
     Write(comm_USHORT(PARAM_ULONG_1));			// Typ der folgenden Parameter
     Write(nNr);
 }
@@ -115,7 +127,7 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_USHORT nMethod, comm_Strin
 {
     Write(comm_USHORT(SIReturn));
     Write(nRet);
-    Write(nMethod);
+    Write((comm_ULONG)nMethod); //HELPID BACKWARD (no ULONG needed)
     Write(comm_USHORT(PARAM_STR_1));				// Typ der folgenden Parameter
     Write(pString);
 }
@@ -124,7 +136,7 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_USHORT nMethod, comm_BOOL
 {
     Write(comm_USHORT(SIReturn));
     Write(nRet);
-    Write(nMethod);
+    Write((comm_ULONG)nMethod); //HELPID BACKWARD (no ULONG needed)
     Write(comm_USHORT(PARAM_BOOL_1));			// Typ der folgenden Parameter
     Write(bBool);
 }
@@ -133,7 +145,7 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_USHORT nMethod, comm_USHOR
 {
     Write(comm_USHORT(SIReturn));
     Write(nRet);
-    Write(nMethod);
+    Write((comm_ULONG)nMethod); //HELPID BACKWARD (no ULONG needed)
     Write(comm_USHORT(PARAM_USHORT_1));			// Typ der folgenden Parameter
     Write(nNr);
 }
diff --git a/automation/source/server/retstrm.hxx b/automation/source/server/retstrm.hxx
index e58d97f59..198f4a3b9 100644
--- a/automation/source/server/retstrm.hxx
+++ b/automation/source/server/retstrm.hxx
@@ -40,7 +40,6 @@ public:
     ~RetStream();
 
     using CmdBaseStream::GenError;
-//    void GenError( comm_ULONG nError, const comm_UniChar* aString, comm_USHORT nLenInChars ){CmdBaseStream::GenError( nError, aString, nLenInChars );}
 //  new
     void GenError( rtl::OString aUId, String aString );
 
@@ -49,10 +48,6 @@ public:
     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 );}
 
-// needed for RemoteCommand and Profiling
-    void GenReturn( comm_USHORT nRet, comm_USHORT nMethod, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, nMethod, nNr );}
-    void GenReturn( comm_USHORT nRet, comm_USHORT nMethod, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, nMethod, bBool );}
-
 // MacroRecorder
     void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_USHORT nMethod ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod );} // also used outside MacroRecorder
     void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, bBool );}
@@ -62,8 +57,8 @@ public:
     void GenReturn( USHORT nRet, rtl::OString aUId, String aString );
     void GenReturn( USHORT nRet, rtl::OString aUId, comm_ULONG nNr, String aString, BOOL bBool );
 
+// needed for RemoteCommand and Profiling
     void GenReturn( USHORT nRet, USHORT nMethod, SbxValue &aValue );
-// and Profiling
     void GenReturn( USHORT nRet, USHORT nMethod, String aString );
 
 // MacroRecorder
diff --git a/automation/source/server/sta_list.cxx b/automation/source/server/sta_list.cxx
index d956f5fcc..1e72204bd 100644
--- a/automation/source/server/sta_list.cxx
+++ b/automation/source/server/sta_list.cxx
@@ -1083,7 +1083,7 @@ void StatementList::ReportError(String aMessage, ULONG nWhatever)
 void StatementList::DirectLog( ULONG nType, String aMessage )
 {
     if ( pRet )
-        pRet->GenReturn( RET_DirectLoging, nType, aMessage );
+        pRet->GenReturn( RET_DirectLoging, (USHORT) nType, aMessage );
 }
 
 
-- 
cgit v1.2.3


From 0c0ae4c690dd3c1e672752ba12e88843ad247f87 Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" 
Date: Mon, 27 Sep 2010 23:21:07 +0200
Subject: dba34a: #i31275# allow 'select as you type' aka 'quick selection' for
 tree list boxes (SvLBox derivees, to be precise), and enable this for Base
 main window, and the stylist

---
 cui/source/options/treeopt.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 94d8badf0..7f08872b4 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -893,7 +893,7 @@ void OfaTreeOptionsDialog::InitTreeAndHandler()
     aTreeLB.SetHelpId( HID_OFADLG_TREELISTBOX );
     aTreeLB.SetStyle( aTreeLB.GetStyle()|WB_HASBUTTONS | WB_HASBUTTONSATROOT |
                            WB_HASLINES | WB_HASLINESATROOT |
-                           WB_CLIPCHILDREN | WB_HSCROLL | WB_FORCE_MAKEVISIBLE );
+                           WB_CLIPCHILDREN | WB_HSCROLL | WB_FORCE_MAKEVISIBLE | WB_QUICK_SEARCH );
     aTreeLB.SetSpaceBetweenEntries( 0 );
     aTreeLB.SetSelectionMode( SINGLE_SELECTION );
     aTreeLB.SetSublistOpenWithLeftRight( TRUE );
-- 
cgit v1.2.3


From 2050bb03b17e163c4c27df69874c165961549222 Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" 
Date: Tue, 28 Sep 2010 09:42:32 +0200
Subject: dba34a: #i114752# allow setting an empty reference, not only an empty
 Any, as ControlLabel

---
 forms/source/component/FormComponent.cxx | 54 ++++++++++++++------------------
 1 file changed, 24 insertions(+), 30 deletions(-)

diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index 902f853c9..8c6a33d94 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -296,11 +296,11 @@ Sequence< ::rtl::OUString > SAL_CALL OControl::getSupportedServiceNames_Static()
 //------------------------------------------------------------------------------
 void SAL_CALL OControl::disposing(const com::sun::star::lang::EventObject& _rEvent) throw (RuntimeException)
 {
-    InterfaceRef xAggAsIface;
+    Reference< XInterface > xAggAsIface;
     query_aggregation(m_xAggregate, xAggAsIface);
 
     // does the disposing come from the aggregate ?
-    if (xAggAsIface != InterfaceRef(_rEvent.Source, UNO_QUERY))
+    if (xAggAsIface != Reference< XInterface >(_rEvent.Source, UNO_QUERY))
     {	// no -> forward it
                 Reference xListener;
         if (query_aggregation(m_xAggregate, xListener))
@@ -310,16 +310,16 @@ void SAL_CALL OControl::disposing(const com::sun::star::lang::EventObject& _rEve
 
 // XControl
 //------------------------------------------------------------------------------
-void SAL_CALL OControl::setContext(const InterfaceRef& Context) throw (RuntimeException)
+void SAL_CALL OControl::setContext(const Reference< XInterface >& Context) throw (RuntimeException)
 {
     if (m_xControl.is())
         m_xControl->setContext(Context);
 }
 
 //------------------------------------------------------------------------------
-InterfaceRef SAL_CALL OControl::getContext() throw (RuntimeException)
+Reference< XInterface > SAL_CALL OControl::getContext() throw (RuntimeException)
 {
-    return m_xControl.is() ? m_xControl->getContext() : InterfaceRef();
+    return m_xControl.is() ? m_xControl->getContext() : Reference< XInterface >();
 }
 
 //------------------------------------------------------------------------------
@@ -711,13 +711,13 @@ void OControlModel::doSetDelegator()
 
 // XChild
 //------------------------------------------------------------------------------
-InterfaceRef SAL_CALL OControlModel::getParent() throw(RuntimeException)
+Reference< XInterface > SAL_CALL OControlModel::getParent() throw(RuntimeException)
 {
     return m_xParent;
 }
 
 //------------------------------------------------------------------------------
-void SAL_CALL OControlModel::setParent(const InterfaceRef& _rxParent) throw(com::sun::star::lang::NoSupportException, RuntimeException)
+void SAL_CALL OControlModel::setParent(const Reference< XInterface >& _rxParent) throw(com::sun::star::lang::NoSupportException, RuntimeException)
 {
     osl::MutexGuard aGuard(m_aMutex);
 
@@ -1867,30 +1867,24 @@ void OBoundControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, co
             throw com::sun::star::lang::IllegalArgumentException();
         case PROPERTY_ID_CONTROLLABEL:
         {
-            DBG_ASSERT(!rValue.hasValue() || (rValue.getValueType().getTypeClass() == TypeClass_INTERFACE),
-                "OBoundControlModel::setFastPropertyValue_NoBroadcast : invalid argument !");
-            if (!rValue.hasValue())
+            if ( rValue.hasValue() && ( rValue.getValueTypeClass() != TypeClass_INTERFACE ) )
+                throw com::sun::star::lang::IllegalArgumentException();
+
+            Reference< XInterface > xNewValue( rValue, UNO_QUERY );
+            if ( !xNewValue.is() )
             {	// set property to "void"
-                Reference xComp(m_xLabelControl, UNO_QUERY);
-                if (xComp.is())
-                    xComp->removeEventListener(static_cast(static_cast(this)));
+                Reference< XComponent > xComp( m_xLabelControl, UNO_QUERY );
+                if ( xComp.is() )
+                    xComp->removeEventListener( static_cast< XPropertyChangeListener* >( this ) );
                 m_xLabelControl = NULL;
                 break;
             }
 
-            InterfaceRef xNewValue;
-            rValue >>= xNewValue;
-
-            Reference xAsModel(xNewValue, UNO_QUERY);
-            Reference xAsServiceInfo(xNewValue, UNO_QUERY);
-            Reference xAsPropSet(xNewValue, UNO_QUERY);
-            Reference xAsChild(xNewValue, UNO_QUERY);
-            if (!xAsModel.is() || !xAsServiceInfo.is() || !xAsPropSet.is() || !xAsChild.is())
-            {
-                throw com::sun::star::lang::IllegalArgumentException();
-            }
-
-            if (!xAsServiceInfo->supportsService(m_aLabelServiceName))
+            Reference< XControlModel >  xAsModel        ( xNewValue,        UNO_QUERY );
+            Reference< XServiceInfo >   xAsServiceInfo  ( xAsModel,         UNO_QUERY );
+            Reference< XPropertySet >   xAsPropSet      ( xAsServiceInfo,   UNO_QUERY );
+            Reference< XChild >         xAsChild        ( xAsPropSet,       UNO_QUERY );
+            if ( !xAsChild.is() || !xAsServiceInfo->supportsService( m_aLabelServiceName ) )
             {
                 throw com::sun::star::lang::IllegalArgumentException();
             }
@@ -1898,7 +1892,7 @@ void OBoundControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, co
             // check if weself and the given model have a common anchestor (up to the forms collection)
             Reference xCont;
             query_interface(static_cast(this), xCont);
-            InterfaceRef xMyTopLevel = xCont->getParent();
+            Reference< XInterface > xMyTopLevel = xCont->getParent();
             while (xMyTopLevel.is())
             {
                 Reference xAsForm(xMyTopLevel, UNO_QUERY);
@@ -1907,9 +1901,9 @@ void OBoundControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, co
                     break;
 
                 Reference xLoopAsChild(xMyTopLevel, UNO_QUERY);
-                xMyTopLevel = xLoopAsChild.is() ? xLoopAsChild->getParent() : InterfaceRef();
+                xMyTopLevel = xLoopAsChild.is() ? xLoopAsChild->getParent() : Reference< XInterface >();
             }
-            InterfaceRef xNewTopLevel = xAsChild->getParent();
+            Reference< XInterface > xNewTopLevel = xAsChild->getParent();
             while (xNewTopLevel.is())
             {
                 Reference xAsForm(xNewTopLevel, UNO_QUERY);
@@ -1917,7 +1911,7 @@ void OBoundControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, co
                     break;
 
                 Reference xLoopAsChild(xNewTopLevel, UNO_QUERY);
-                xNewTopLevel = xLoopAsChild.is() ? xLoopAsChild->getParent() : InterfaceRef();
+                xNewTopLevel = xLoopAsChild.is() ? xLoopAsChild->getParent() : Reference< XInterface >();
             }
             if (xNewTopLevel != xMyTopLevel)
             {
-- 
cgit v1.2.3


From 893562f8425619731bc243071da520a9f20e7519 Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" 
Date: Tue, 28 Sep 2010 11:45:50 +0200
Subject: dba33j: #i113631# loadData: restore m_nNULLPos/m_nBoundColumnType
 when old list data is still cached

---
 forms/source/component/ListBox.cxx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index fe24fc24c..d15125dac 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -647,6 +647,8 @@ namespace frm
         DBG_ASSERT( m_eListSourceType != ListSourceType_VALUELIST, "OListBoxModel::loadData: cannot load value list from DB!" );
         DBG_ASSERT( !hasExternalListSource(), "OListBoxModel::loadData: cannot load from DB when I have an external list source!" );
 
+        const sal_Int16 nNULLPosBackup( m_nNULLPos );
+        const sal_Int32 nBoundColumnTypeBackup( m_nBoundColumnType );
         m_nNULLPos = -1;
         m_nBoundColumnType = DataType::SQLNULL;
 
@@ -782,6 +784,8 @@ namespace frm
                     // if none of the settings of the row set changed, compared to the last
                     // invocation of loadData, then don't re-fill the list. Instead, assume
                     // the list entries are the same.
+                    m_nNULLPos = nNULLPosBackup;
+                    m_nBoundColumnType = nBoundColumnTypeBackup;
                     return;
                 }
                 xListCursor.reset( m_aListRowSet.execute() );
-- 
cgit v1.2.3


From eb45e8ff1b8b5a01213ae216286f05a43738b5c0 Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" 
Date: Tue, 28 Sep 2010 11:45:50 +0200
Subject: dba34a: #i114792# restore m_nNULLPos/m_nBoundColumnType when old list
 data is still cached

---
 forms/source/component/ListBox.cxx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index 30911ee54..0a10b8769 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -649,6 +649,8 @@ namespace frm
         DBG_ASSERT( m_eListSourceType != ListSourceType_VALUELIST, "OListBoxModel::loadData: cannot load value list from DB!" );
         DBG_ASSERT( !hasExternalListSource(), "OListBoxModel::loadData: cannot load from DB when I have an external list source!" );
 
+        const sal_Int16 nNULLPosBackup( m_nNULLPos );
+        const sal_Int32 nBoundColumnTypeBackup( m_nBoundColumnType );
         m_nNULLPos = -1;
         m_nBoundColumnType = DataType::SQLNULL;
 
@@ -788,6 +790,8 @@ namespace frm
                     // if none of the settings of the row set changed, compared to the last
                     // invocation of loadData, then don't re-fill the list. Instead, assume
                     // the list entries are the same.
+                    m_nNULLPos = nNULLPosBackup;
+                    m_nBoundColumnType = nBoundColumnTypeBackup;
                     return;
                 }
                 xListCursor.reset( m_aListRowSet.execute() );
-- 
cgit v1.2.3


From ea6621c5bae7a52e4be74e9dd28be4af5dd05028 Mon Sep 17 00:00:00 2001
From: Mikhail Voytenko 
Date: Tue, 28 Sep 2010 14:51:09 +0200
Subject: fwk149: #i112602# integrate the patch

---
 package/inc/ZipPackageFolder.hxx               |  7 +------
 package/source/xstor/owriteablestream.cxx      | 20 +++++---------------
 package/source/xstor/xstorage.cxx              | 20 +++++---------------
 package/source/zippackage/ZipPackage.cxx       | 16 +++++-----------
 package/source/zippackage/ZipPackageFolder.cxx | 15 ++++++++++-----
 package/source/zippackage/ZipPackageStream.cxx | 15 ++++++++++-----
 package/source/zippackage/ZipPackageStream.hxx |  6 +-----
 7 files changed, 37 insertions(+), 62 deletions(-)

diff --git a/package/inc/ZipPackageFolder.hxx b/package/inc/ZipPackageFolder.hxx
index e8b814f3e..d2963f8e5 100644
--- a/package/inc/ZipPackageFolder.hxx
+++ b/package/inc/ZipPackageFolder.hxx
@@ -53,8 +53,6 @@ class ZipPackageFolder : public cppu::ImplInheritanceHelper2
     ::com::sun::star::container::XEnumerationAccess
 >
 {
-    static com::sun::star::uno::Sequence < sal_Int8 > aImplementationId;
-
 protected:
     ContentHash maContents;
     const ::com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > m_xFactory;
@@ -82,10 +80,7 @@ public:
         throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     static void copyZipEntry( ZipEntry &rDest, const ZipEntry &rSource);
-    static ::com::sun::star::uno::Sequence < sal_Int8 > static_getImplementationId()
-    {
-        return aImplementationId;
-    }
+    static const ::com::sun::star::uno::Sequence < sal_Int8 >& static_getImplementationId();
 
     void setPackageFormat_Impl( sal_Int32 nFormat ) { m_nFormat = nFormat; }
     void setRemoveOnInsertMode_Impl( sal_Bool bRemove ) { this->mbAllowRemoveOnInsert = bRemove; }
diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx
index e17ffeeac..69eb7f093 100644
--- a/package/source/xstor/owriteablestream.cxx
+++ b/package/source/xstor/owriteablestream.cxx
@@ -54,6 +54,7 @@
 
 #include 
 #include 
+#include 
 
 // since the copying uses 32000 blocks usually, it makes sense to have a smaller size
 #define MAX_STORCACHE_SIZE 30000
@@ -2173,25 +2174,14 @@ uno::Sequence< uno::Type > SAL_CALL OWriteStream::getTypes()
     return m_pData->m_pTypeCollection->getTypes() ;
 }
 
+namespace { struct lcl_ImplId : public rtl::Static< ::cppu::OImplementationId, lcl_ImplId > {}; }
+
 //-----------------------------------------------
 uno::Sequence< sal_Int8 > SAL_CALL OWriteStream::getImplementationId()
         throw( uno::RuntimeException )
 {
-    static ::cppu::OImplementationId* pID = NULL ;
-
-    if ( pID == NULL )
-    {
-        ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ) ;
-
-        if ( pID == NULL )
-        {
-            static ::cppu::OImplementationId aID( sal_False ) ;
-            pID = &aID ;
-        }
-    }
-
-    return pID->getImplementationId() ;
-
+    ::cppu::OImplementationId &rId = lcl_ImplId::get();
+    return rId.getImplementationId();
 }
 
 //-----------------------------------------------
diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx
index c6cc37f6f..40f493d28 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -49,6 +49,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -2368,25 +2369,14 @@ uno::Sequence< uno::Type > SAL_CALL OStorage::getTypes()
     return m_pData->m_pTypeCollection->getTypes() ;
 }
 
+namespace { struct lcl_ImplId : public rtl::Static< ::cppu::OImplementationId, lcl_ImplId > {}; }
+
 //-----------------------------------------------
 uno::Sequence< sal_Int8 > SAL_CALL OStorage::getImplementationId()
         throw( uno::RuntimeException )
 {
-    static ::cppu::OImplementationId* pID = NULL ;
-
-    if ( pID == NULL )
-    {
-        ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ) ;
-
-        if ( pID == NULL )
-        {
-            static ::cppu::OImplementationId aID( sal_False ) ;
-            pID = &aID ;
-        }
-    }
-
-    return pID->getImplementationId() ;
-
+    ::cppu::OImplementationId &rID = lcl_ImplId::get();
+    return rID.getImplementationId();
 }
 
 //____________________________________________________________________________________________________
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx
index cb2224ba5..150345a4a 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -69,6 +69,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include "com/sun/star/io/XAsyncOutputMonitor.hpp"
@@ -1607,21 +1608,14 @@ uno::Reference < XSingleServiceFactory > ZipPackage::createServiceFactory( uno::
                                            static_getSupportedServiceNames());
 }
 
+namespace { struct lcl_ImplId : public rtl::Static< ::cppu::OImplementationId, lcl_ImplId > {}; }
+
 // XUnoTunnel
 Sequence< sal_Int8 > ZipPackage::getUnoTunnelImplementationId( void ) 
     throw (RuntimeException)
 {
-    static ::cppu::OImplementationId * pId = 0;
-    if (! pId)
-    {
-        ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-        if (! pId)
-        {
-            static ::cppu::OImplementationId aId;
-            pId = &aId;
-        }
-    }
-    return pId->getImplementationId();
+    ::cppu::OImplementationId &rId = lcl_ImplId::get();
+    return rId.getImplementationId();
 }
 
 sal_Int64 SAL_CALL ZipPackage::getSomething( const Sequence< sal_Int8 >& aIdentifier ) 
diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/zippackage/ZipPackageFolder.cxx
index b353504e4..d2c81b993 100644
--- a/package/source/zippackage/ZipPackageFolder.cxx
+++ b/package/source/zippackage/ZipPackageFolder.cxx
@@ -43,6 +43,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 using namespace com::sun::star::packages::zip::ZipConstants;
@@ -59,7 +60,7 @@ using namespace std;
 using namespace ::com::sun::star;
 using vos::ORef;
 
-Sequence < sal_Int8 > ZipPackageFolder::aImplementationId = Sequence < sal_Int8 > ();
+namespace { struct lcl_CachedImplId : public rtl::Static< Sequence < sal_Int8 >, lcl_CachedImplId > {}; }
 
 ZipPackageFolder::ZipPackageFolder ( const Reference< XMultiServiceFactory >& xFactory,
                                      sal_Int32 nFormat,
@@ -80,10 +81,9 @@ ZipPackageFolder::ZipPackageFolder ( const Reference< XMultiServiceFactory >& xF
     aEntry.nCompressedSize	= 0;
     aEntry.nSize		= 0;
     aEntry.nOffset		= -1;
-    if ( !aImplementationId.getLength() )
-        {
-        aImplementationId = getImplementationId();
-        }
+    Sequence < sal_Int8 > &rCachedImplId = lcl_CachedImplId::get();
+    if ( !rCachedImplId.getLength() )
+        rCachedImplId = getImplementationId();
 }
 
 
@@ -187,6 +187,11 @@ void ZipPackageFolder::copyZipEntry( ZipEntry &rDest, const ZipEntry &rSource)
     rDest.nExtraLen			= rSource.nExtraLen;
 }
 
+const ::com::sun::star::uno::Sequence < sal_Int8 >& ZipPackageFolder::static_getImplementationId()
+{
+    return lcl_CachedImplId::get();
+}
+
     // XNameContainer
 void SAL_CALL ZipPackageFolder::insertByName( const OUString& aName, const Any& aElement ) 
         throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException)
diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx
index ce97ba507..39a4fb8d0 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -46,6 +46,8 @@
 #include 
 #include 
 
+#include 
+
 #include 
 
 using namespace com::sun::star::packages::zip::ZipConstants;
@@ -56,8 +58,12 @@ using namespace com::sun::star;
 using namespace cppu;
 using namespace rtl;
 
-Sequence < sal_Int8 > ZipPackageStream::aImplementationId = Sequence < sal_Int8 > ();
+namespace { struct lcl_CachedImplId : public rtl::Static< Sequence < sal_Int8 >, lcl_CachedImplId > {}; }
 
+const ::com::sun::star::uno::Sequence < sal_Int8 >& ZipPackageStream::static_getImplementationId()
+{
+    return lcl_CachedImplId::get();
+}
 
 ZipPackageStream::ZipPackageStream ( ZipPackage & rNewPackage,
                                     const Reference< XMultiServiceFactory >& xFactory,
@@ -92,10 +98,9 @@ ZipPackageStream::ZipPackageStream ( ZipPackage & rNewPackage,
     aEntry.nPathLen		= -1;
     aEntry.nExtraLen	= -1;
 
-    if ( !aImplementationId.getLength() )
-        {
-            aImplementationId = getImplementationId();
-        }
+    Sequence < sal_Int8 > &rCachedImplId = lcl_CachedImplId::get();
+    if ( !rCachedImplId.getLength() )
+        rCachedImplId = getImplementationId();
 }
 
 ZipPackageStream::~ZipPackageStream( void )
diff --git a/package/source/zippackage/ZipPackageStream.hxx b/package/source/zippackage/ZipPackageStream.hxx
index e6d3494cf..f83829782 100644
--- a/package/source/zippackage/ZipPackageStream.hxx
+++ b/package/source/zippackage/ZipPackageStream.hxx
@@ -55,7 +55,6 @@ class ZipPackageStream : public cppu::ImplInheritanceHelper2
     ::com::sun::star::packages::XDataSinkEncrSupport
 >
 {
-    static com::sun::star::uno::Sequence < sal_Int8 > aImplementationId;
 protected:
     com::sun::star::uno::Reference < com::sun::star::io::XInputStream > xStream;
     const ::com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > m_xFactory;
@@ -146,10 +145,7 @@ public:
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getRawData()
         throw(::com::sun::star::uno::RuntimeException);
     
-    static ::com::sun::star::uno::Sequence < sal_Int8 >& static_getImplementationId()
-    {
-        return aImplementationId;
-    }
+    static const ::com::sun::star::uno::Sequence < sal_Int8 >& static_getImplementationId();
 
     // XActiveDataSink
     virtual void SAL_CALL setInputStream( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& aStream ) 
-- 
cgit v1.2.3


From 6894be3fe3c5232a911343b197c3dffad26808cb Mon Sep 17 00:00:00 2001
From: "Thomas Lange [tl]" 
Date: Wed, 29 Sep 2010 10:23:10 +0200
Subject: cws dict33a: #i114774 thesaurus patch applied

---
 lingucomponent/source/spellcheck/spell/sspellimp.cxx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index 894f9fd33..4b9ec517f 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -375,6 +375,9 @@ sal_Bool SAL_CALL
         return TRUE;
 #endif
 
+    // return FALSE to process SPELLML requests (they are longer than the header)
+    if (rWord.match(A2OU(SPELLML_HEADER), 0) && (rWord.getLength() > 10)) return FALSE;
+
     // Get property values to be used.
     // These are be the default values set in the SN_LINGU_PROPERTIES
     // PropertySet which are overridden by the supplied ones from the
-- 
cgit v1.2.3


From b90a1451eac7536ec2b33b9f76358419cd405f05 Mon Sep 17 00:00:00 2001
From: Mathias Bauer 
Date: Thu, 7 Oct 2010 16:23:00 +0200
Subject: CWS changehid: some missing empty strings caused wrong offsets

---
 wizards/com/sun/star/wizards/common/HelpIds.java | 33 +++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/wizards/com/sun/star/wizards/common/HelpIds.java b/wizards/com/sun/star/wizards/common/HelpIds.java
index 1b206d03b..05c80fcad 100644
--- a/wizards/com/sun/star/wizards/common/HelpIds.java
+++ b/wizards/com/sun/star/wizards/common/HelpIds.java
@@ -118,6 +118,8 @@ public class HelpIds
         "",
         "",
         "",
+        "",
+        "",
         "HID:WIZARDS_HID_BG",    // HID:34290
         "HID:WIZARDS_HID_BG_BTN_OTHER",    // HID:34291
         "HID:WIZARDS_HID_BG_BTN_NONE",    // HID:34292
@@ -552,7 +554,6 @@ public class HelpIds
         "HID:WIZARDS_HID_DLGHOLIDAYCAL_0_CMDCANCEL",    // HID:34721
         "HID:WIZARDS_HID_DLGHOLIDAYCAL_0_CMDOK"    // HID:34722
     };
-
     private static String array2[] = new String[]
     {
         "HID:WIZARDS_HID_LTRWIZ_OPTBUSINESSLETTER",    // HID:40769
@@ -776,6 +777,16 @@ public class HelpIds
         "",
         "",
         "",
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
         "HID:WIZARDS_HID_IS",    // HID:41000
         "",
         "HID:WIZARDS_HID_IS_BTN_NONE",    // HID:41002
@@ -876,6 +887,26 @@ public class HelpIds
         "HID:WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_5",    // HID:41097
         "HID:WIZARDS_HID_AGWIZ_5_TXT_MINUTES_5",    // HID:41098
         "",
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
         "HID:WIZARDS_HID_FAXWIZ_OPTBUSINESSFAX",    // HID:41120
         "HID:WIZARDS_HID_FAXWIZ_LSTBUSINESSSTYLE",    // HID:41121
         "HID:WIZARDS_HID_FAXWIZ_OPTPRIVATEFAX",    // HID:41122
-- 
cgit v1.2.3


From 178de5eb78ca7ce63d5199da9f6830e9764af416 Mon Sep 17 00:00:00 2001
From: Mathias Bauer 
Date: Mon, 11 Oct 2010 17:56:12 +0200
Subject: CWS changehid: generate former auto hids into src files

---
 basctl/source/basicide/brkdlg.src                  |  5 ++
 basctl/source/basicide/macrodlg.src                |  9 +++
 basctl/source/basicide/moduldlg.src                | 23 ++++++
 basctl/source/basicide/moptions.src                |  3 +
 basctl/source/basicide/objdlg.src                  |  1 +
 basctl/source/dlged/managelang.src                 |  5 ++
 cui/source/customize/acccfg.src                    |  7 ++
 cui/source/customize/cfg.src                       | 19 +++++
 cui/source/customize/eventdlg.src                  |  3 +
 cui/source/customize/macropg.src                   |  5 ++
 cui/source/dialogs/SpellDialog.src                 | 15 ++++
 cui/source/dialogs/charmap.src                     |  3 +
 cui/source/dialogs/cuiimapdlg.src                  |  6 ++
 cui/source/dialogs/dlgname.src                     |  6 ++
 cui/source/dialogs/fmsearch.src                    |  8 +++
 cui/source/dialogs/gallery.src                     | 11 +++
 cui/source/dialogs/grfflt.src                      |  8 +++
 cui/source/dialogs/hangulhanjadlg.src              | 26 +++++++
 cui/source/dialogs/hyperdlg.src                    | 40 +++++++++++
 cui/source/dialogs/hyphen.src                      |  6 ++
 cui/source/dialogs/insrc.src                       |  4 ++
 cui/source/dialogs/multipat.src                    |  3 +
 cui/source/dialogs/newtabledlg.src                 |  3 +
 cui/source/dialogs/postdlg.src                     |  4 ++
 cui/source/dialogs/scriptdlg.src                   |  7 ++
 cui/source/dialogs/showcols.src                    |  2 +
 cui/source/dialogs/splitcelldlg.src                |  5 ++
 cui/source/dialogs/srchxtra.src                    |  4 ++
 cui/source/dialogs/svuidlg.src                     | 44 ++++++++++++
 cui/source/dialogs/tbxform.src                     |  2 +
 cui/source/dialogs/thesdlg.src                     |  4 ++
 cui/source/dialogs/zoom.src                        | 11 +++
 cui/source/options/connpooloptions.src             |  4 ++
 cui/source/options/dbregister.src                  |  3 +
 cui/source/options/doclinkdialog.src               |  4 ++
 cui/source/options/fontsubs.src                    |  6 ++
 cui/source/options/internationaloptions.src        |  5 ++
 cui/source/options/optaccessibility.src            |  9 +++
 cui/source/options/optasian.src                    |  9 +++
 cui/source/options/optchart.src                    |  2 +
 cui/source/options/optcolor.src                    | 11 +++
 cui/source/options/optctl.src                      |  6 ++
 cui/source/options/optdict.src                     |  9 +++
 cui/source/options/optfltr.src                     |  9 +++
 cui/source/options/optgdlg.src                     | 34 +++++++++
 cui/source/options/optgenrl.src                    | 20 ++++++
 cui/source/options/opthtml.src                     | 17 +++++
 cui/source/options/optimprove.src                  |  3 +
 cui/source/options/optinet2.src                    | 39 ++++++++++
 cui/source/options/optjava.src                     | 12 ++++
 cui/source/options/optjsearch.src                  | 19 +++++
 cui/source/options/optlingu.src                    | 10 +++
 cui/source/options/optmemory.src                   |  6 ++
 cui/source/options/optpath.src                     |  2 +
 cui/source/options/optsave.src                     | 13 ++++
 cui/source/options/optspell.src                    |  5 ++
 cui/source/options/optupdt.src                     |  7 ++
 cui/source/options/securityoptions.src             |  7 ++
 cui/source/options/treeopt.src                     |  1 +
 cui/source/options/webconninfo.src                 |  3 +
 cui/source/tabpages/align.src                      | 10 +++
 cui/source/tabpages/autocdlg.src                   | 36 ++++++++++
 cui/source/tabpages/backgrnd.src                   | 11 +++
 cui/source/tabpages/border.src                     | 11 +++
 cui/source/tabpages/chardlg.src                    | 49 +++++++++++++
 cui/source/tabpages/connect.src                    |  8 +++
 cui/source/tabpages/dstribut.src                   | 10 +++
 cui/source/tabpages/grfpage.src                    | 11 +++
 cui/source/tabpages/labdlg.src                     |  7 ++
 cui/source/tabpages/macroass.src                   |  4 ++
 cui/source/tabpages/measure.src                    | 12 ++++
 cui/source/tabpages/numfmt.src                     | 10 +++
 cui/source/tabpages/numpages.src                   | 30 ++++++++
 cui/source/tabpages/page.src                       | 18 +++++
 cui/source/tabpages/paragrph.src                   | 38 ++++++++++
 cui/source/tabpages/swpossizetabpage.src           | 18 +++++
 cui/source/tabpages/tabarea.src                    | 82 ++++++++++++++++++++++
 cui/source/tabpages/tabline.src                    | 37 ++++++++++
 cui/source/tabpages/tabstpge.src                   | 15 ++++
 cui/source/tabpages/textanim.src                   | 14 ++++
 cui/source/tabpages/textattr.src                   | 11 +++
 cui/source/tabpages/transfrm.src                   | 16 +++++
 extensions/source/abpilot/abspilot.src             | 23 ++++++
 extensions/source/bibliography/datman.src          | 31 ++++++++
 extensions/source/dbpilots/commonpagesdbp.src      |  9 +++
 extensions/source/dbpilots/dbpilots.src            |  3 +
 extensions/source/dbpilots/gridpages.src           |  7 ++
 extensions/source/dbpilots/groupboxpages.src       | 14 ++++
 extensions/source/dbpilots/listcombopages.src      |  8 +++
 extensions/source/preload/preload.src              |  8 +++
 extensions/source/propctrlr/formlinkdialog.src     |  2 +
 extensions/source/propctrlr/listselectiondlg.src   |  2 +
 extensions/source/propctrlr/newdatatype.src        |  2 +
 extensions/source/propctrlr/selectlabeldialog.src  |  2 +
 extensions/source/propctrlr/taborder.src           |  4 ++
 extensions/source/scanner/grid.src                 |  3 +
 extensions/source/scanner/sanedlg.src              | 17 +++++
 xmlsecurity/source/dialogs/certificatechooser.src  |  1 +
 xmlsecurity/source/dialogs/certificateviewer.src   |  3 +
 .../source/dialogs/digitalsignaturesdialog.src     |  3 +
 xmlsecurity/source/dialogs/macrosecurity.src       | 10 +++
 xmlsecurity/source/dialogs/warnings.src            |  3 +
 102 files changed, 1190 insertions(+)
 mode change 100755 => 100644 cui/source/dialogs/thesdlg.src
 mode change 100755 => 100644 cui/source/options/optinet2.src

diff --git a/basctl/source/basicide/brkdlg.src b/basctl/source/basicide/brkdlg.src
index cbb7e72f2..7029ff39c 100644
--- a/basctl/source/basicide/brkdlg.src
+++ b/basctl/source/basicide/brkdlg.src
@@ -37,6 +37,7 @@ ModalDialog RID_BASICIDE_BREAKPOINTDLG
      //	Closeable = TRUE;
     ComboBox RID_CB_BRKPOINTS
     {
+        HelpID = "basctl:ComboBox:RID_BASICIDE_BREAKPOINTDLG:RID_CB_BRKPOINTS";
         Pos = MAP_APPFONT ( 6 , 14 ) ;
         Size = MAP_APPFONT ( 110 , 70 ) ;
         TabStop = TRUE ;
@@ -55,6 +56,7 @@ ModalDialog RID_BASICIDE_BREAKPOINTDLG
     };
     PushButton RID_PB_NEW
     {
+        HelpID = "basctl:PushButton:RID_BASICIDE_BREAKPOINTDLG:RID_PB_NEW";
         Pos = MAP_APPFONT ( 122 , 57 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -62,6 +64,7 @@ ModalDialog RID_BASICIDE_BREAKPOINTDLG
     };
     PushButton RID_PB_DEL
     {
+        HelpID = "basctl:PushButton:RID_BASICIDE_BREAKPOINTDLG:RID_PB_DEL";
         Pos = MAP_APPFONT ( 122 , 74 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? Löschen : L÷schen */
@@ -70,6 +73,7 @@ ModalDialog RID_BASICIDE_BREAKPOINTDLG
     };
     CheckBox RID_CHKB_ACTIVE
     {
+        HelpID = "basctl:CheckBox:RID_BASICIDE_BREAKPOINTDLG:RID_CHKB_ACTIVE";
         Pos = MAP_APPFONT ( 6 , 87 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         TabStop = TRUE ;
@@ -89,6 +93,7 @@ ModalDialog RID_BASICIDE_BREAKPOINTDLG
     };
     NumericField RID_FLD_PASS
     {
+        HelpID = "basctl:NumericField:RID_BASICIDE_BREAKPOINTDLG:RID_FLD_PASS";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 81 , 100 ) ;
         Size = MAP_APPFONT ( 35 , 12 ) ;
diff --git a/basctl/source/basicide/macrodlg.src b/basctl/source/basicide/macrodlg.src
index b4ef8b027..32705d55e 100644
--- a/basctl/source/basicide/macrodlg.src
+++ b/basctl/source/basicide/macrodlg.src
@@ -70,6 +70,7 @@ ModalDialog RID_MACROCHOOSER
     };
     Edit RID_ED_MACRONAME
     {
+        HelpID = "basctl:Edit:RID_MACROCHOOSER:RID_ED_MACRONAME";
         Border = TRUE ;
         SVLook = TRUE ;
         Pos = MAP_APPFONT ( 6 , 14 ) ;
@@ -97,6 +98,7 @@ ModalDialog RID_MACROCHOOSER
     };
     PushButton RID_PB_RUN
     {
+        HelpID = "basctl:PushButton:RID_MACROCHOOSER:RID_PB_RUN";
         Pos = MAP_APPFONT ( 231 , 6 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         DefButton = TRUE;
@@ -114,6 +116,7 @@ ModalDialog RID_MACROCHOOSER
 
     PushButton RID_PB_ASSIGN
     {
+        HelpID = "basctl:PushButton:RID_MACROCHOOSER:RID_PB_ASSIGN";
         Pos = MAP_APPFONT ( 231 , 60 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Assign..." ;
@@ -121,6 +124,7 @@ ModalDialog RID_MACROCHOOSER
     };
     PushButton RID_PB_EDIT
     {
+        HelpID = "basctl:PushButton:RID_MACROCHOOSER:RID_PB_EDIT";
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Pos = MAP_APPFONT ( 231 , 77 ) ;
         Text [ en-US ] = "~Edit" ;
@@ -128,18 +132,21 @@ ModalDialog RID_MACROCHOOSER
     };
     PushButton RID_PB_NEWLIB
     {
+        HelpID = "basctl:PushButton:RID_MACROCHOOSER:RID_PB_NEWLIB";
         Pos = MAP_APPFONT ( 231 , 60 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "New ~Library";
     };
     PushButton RID_PB_NEWMOD
     {
+        HelpID = "basctl:PushButton:RID_MACROCHOOSER:RID_PB_NEWMOD";
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Pos = MAP_APPFONT ( 231 , 77 ) ;
         Text [ en-US ] = "New M~odule";
     };
     PushButton RID_PB_DEL
     {
+        HelpID = "basctl:PushButton:RID_MACROCHOOSER:RID_PB_DEL";
         Pos = MAP_APPFONT ( 231 , 94 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? ~Löschen... : ~L÷schen... */
@@ -148,6 +155,7 @@ ModalDialog RID_MACROCHOOSER
     };
     PushButton RID_PB_ORG
     {
+        HelpID = "basctl:PushButton:RID_MACROCHOOSER:RID_PB_ORG";
         Pos = MAP_APPFONT ( 231 , 114 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Organizer..." ;
@@ -160,6 +168,7 @@ ModalDialog RID_MACROCHOOSER
     };
     MultiLineEdit RID_ML_DESCRIPTION
     {
+        HelpID = "basctl:MultiLineEdit:RID_MACROCHOOSER:RID_ML_DESCRIPTION";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 131 ) ;
         Size = MAP_APPFONT ( 216 , 28 ) ;
diff --git a/basctl/source/basicide/moduldlg.src b/basctl/source/basicide/moduldlg.src
index 78ebad8b2..3223bee2c 100644
--- a/basctl/source/basicide/moduldlg.src
+++ b/basctl/source/basicide/moduldlg.src
@@ -84,6 +84,7 @@ TabPage RID_TP_MODULS
     };
     PushButton RID_PB_EDIT
     {
+        HelpID = "basctl:PushButton:RID_TP_MODULS:RID_PB_EDIT";
         Text [ en-US ] = "~Edit";
         Pos = MAP_APPFONT ( 144 , 6 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
@@ -99,6 +100,7 @@ TabPage RID_TP_MODULS
     };
     PushButton RID_PB_NEWMOD
     {
+        HelpID = "basctl:PushButton:RID_TP_MODULS:RID_PB_NEWMOD";
         Pos = MAP_APPFONT ( 144 , 103 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "~New..." ;
@@ -106,6 +108,7 @@ TabPage RID_TP_MODULS
     };
     PushButton RID_PB_NEWDLG
     {
+        HelpID = "basctl:PushButton:RID_TP_MODULS:RID_PB_NEWDLG";
         Pos = MAP_APPFONT ( 144 , 103 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "~New..." ;
@@ -113,6 +116,7 @@ TabPage RID_TP_MODULS
     };
     PushButton RID_PB_DELETE
     {
+        HelpID = "basctl:PushButton:RID_TP_MODULS:RID_PB_DELETE";
         Pos = MAP_APPFONT ( 144 , 120 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? ~Löschen... : ~L÷schen... */
@@ -122,6 +126,7 @@ TabPage RID_TP_MODULS
 };
 TabPage RID_TP_DLGS
 {
+    HelpID = "basctl:TabPage:RID_TP_DLGS";
     Hide = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 210 , 140 ) ;
@@ -141,6 +146,7 @@ TabPage RID_TP_DLGS
     };
     PushButton RID_PB_EDIT
     {
+        HelpID = "basctl:PushButton:RID_TP_DLGS:RID_PB_EDIT";
         Text [ en-US ] = "~Edit";
         Pos = MAP_APPFONT ( 144 , 6 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
@@ -156,6 +162,7 @@ TabPage RID_TP_DLGS
     };
     PushButton RID_PB_NEWMOD
     {
+        HelpID = "basctl:PushButton:RID_TP_DLGS:RID_PB_NEWMOD";
         Pos = MAP_APPFONT ( 144 , 103 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "~New..." ;
@@ -163,6 +170,7 @@ TabPage RID_TP_DLGS
     };
     PushButton RID_PB_NEWDLG
     {
+        HelpID = "basctl:PushButton:RID_TP_DLGS:RID_PB_NEWDLG";
         Pos = MAP_APPFONT ( 144 , 103 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "~New..." ;
@@ -170,6 +178,7 @@ TabPage RID_TP_DLGS
     };
     PushButton RID_PB_DELETE
     {
+        HelpID = "basctl:PushButton:RID_TP_DLGS:RID_PB_DELETE";
         Pos = MAP_APPFONT ( 144 , 120 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? ~Löschen... : ~L÷schen... */
@@ -191,6 +200,7 @@ TabPage RID_TP_LIBS
     };
     ListBox RID_LB_BASICS
     {
+        HelpID = "basctl:ListBox:RID_TP_LIBS:RID_LB_BASICS";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 17 ) ;
         Size = MAP_APPFONT ( 130 , 80 ) ;
@@ -214,6 +224,7 @@ TabPage RID_TP_LIBS
     
     PushButton RID_PB_EDIT
     {
+        HelpID = "basctl:PushButton:RID_TP_LIBS:RID_PB_EDIT";
         Text [ en-US ] = "~Edit";
         Pos = MAP_APPFONT ( 144 , 6 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
@@ -230,6 +241,7 @@ TabPage RID_TP_LIBS
     };
     PushButton RID_PB_PASSWORD
     {
+        HelpID = "basctl:PushButton:RID_TP_LIBS:RID_PB_PASSWORD";
         Pos = MAP_APPFONT ( 144 , 43 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "~Password..." ;
@@ -238,6 +250,7 @@ TabPage RID_TP_LIBS
     
     PushButton RID_PB_NEWLIB
     {
+        HelpID = "basctl:PushButton:RID_TP_LIBS:RID_PB_NEWLIB";
         Pos = MAP_APPFONT ( 144 , 69 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "~New..." ;
@@ -245,6 +258,7 @@ TabPage RID_TP_LIBS
     };
     PushButton RID_PB_APPEND
     {
+        HelpID = "basctl:PushButton:RID_TP_LIBS:RID_PB_APPEND";
         Pos = MAP_APPFONT ( 144 , 86 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? Hin~zufügen... : Hin~zuf³gen... */
@@ -252,6 +266,7 @@ TabPage RID_TP_LIBS
     };
     PushButton RID_PB_EXPORT
     {
+        HelpID = "basctl:PushButton:RID_TP_LIBS:RID_PB_EXPORT";
         Pos = MAP_APPFONT ( 144 , 103 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "E~xport..." ;
@@ -259,6 +274,7 @@ TabPage RID_TP_LIBS
     };
     PushButton RID_PB_DELETE
     {
+        HelpID = "basctl:PushButton:RID_TP_LIBS:RID_PB_DELETE";
         Pos = MAP_APPFONT ( 144 , 120 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? ~Löschen... : ~L÷schen... */
@@ -308,6 +324,7 @@ ModalDialog RID_DLG_LIBS
     };
     CheckBox RID_CB_REF
     {
+        HelpID = "basctl:CheckBox:RID_DLG_LIBS:RID_CB_REF";
         Pos = MAP_APPFONT ( 12 , 100 ) ;
         Size = MAP_APPFONT ( 146 , 10 ) ;
         TabStop = TRUE ;
@@ -315,6 +332,7 @@ ModalDialog RID_DLG_LIBS
     };
     CheckBox RID_CB_REPL
     {
+        HelpID = "basctl:CheckBox:RID_DLG_LIBS:RID_CB_REPL";
         Pos = MAP_APPFONT ( 12 , 113 ) ;
         Size = MAP_APPFONT ( 146 , 10 ) ;
         Text [ en-US ] = "Replace existing libraries" ;
@@ -322,6 +340,7 @@ ModalDialog RID_DLG_LIBS
 };
 ModalDialog RID_DLG_NEWLIB
 {
+    HelpID = "basctl:ModalDialog:RID_DLG_NEWLIB";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 160 , 55 ) ;
@@ -348,6 +367,7 @@ ModalDialog RID_DLG_NEWLIB
     };
     Edit RID_ED_LIBNAME
     {
+        HelpID = "basctl:Edit:RID_DLG_NEWLIB:RID_ED_LIBNAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 19 ) ;
         Size = MAP_APPFONT ( 92 , 12 ) ;
@@ -357,6 +377,7 @@ ModalDialog RID_DLG_NEWLIB
 
 ModalDialog RID_DLG_EXPORT
 {
+    HelpID = "basctl:ModalDialog:RID_DLG_EXPORT";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 115 , 55 ) ;
@@ -379,6 +400,7 @@ ModalDialog RID_DLG_EXPORT
     
     RadioButton RB_EXPORTASPACKAGE
     {
+        HelpID = "basctl:RadioButton:RID_DLG_EXPORT:RB_EXPORTASPACKAGE";
         Pos = MAP_APPFONT( 6, 6 );
         Size = MAP_APPFONT( 103, 10 );
         Group = TRUE;
@@ -387,6 +409,7 @@ ModalDialog RID_DLG_EXPORT
     }; 	
     RadioButton RB_EXPORTASBASIC
     {
+        HelpID = "basctl:RadioButton:RID_DLG_EXPORT:RB_EXPORTASBASIC";
         Pos = MAP_APPFONT( 6, 19 );
         Size = MAP_APPFONT( 103, 10 );
         //Group = TRUE;
diff --git a/basctl/source/basicide/moptions.src b/basctl/source/basicide/moptions.src
index 32cb236a0..22dfa7ce0 100644
--- a/basctl/source/basicide/moptions.src
+++ b/basctl/source/basicide/moptions.src
@@ -70,6 +70,7 @@ ModalDialog RID_MACROOPTIONS
     };
     MultiLineEdit RID_ME_DESCR
     {
+        HelpID = "basctl:MultiLineEdit:RID_MACROOPTIONS:RID_ME_DESCR";
         Border = TRUE ;
         SVLook = TRUE ;
         Pos = MAP_APPFONT ( 6 , 32 ) ;
@@ -93,6 +94,7 @@ ModalDialog RID_MACROOPTIONS
     };
     NumericField RID_NF_HELPID
     {
+        HelpID = "basctl:NumericField:RID_MACROOPTIONS:RID_NF_HELPID";
         Border = TRUE ;
         SVLook = TRUE ;
         Pos = MAP_APPFONT ( 95 , 83 ) ;
@@ -110,6 +112,7 @@ ModalDialog RID_MACROOPTIONS
     };
     Edit RID_ED_HELPNAME
     {
+        HelpID = "basctl:Edit:RID_MACROOPTIONS:RID_ED_HELPNAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 95 , 99 ) ;
         Size = MAP_APPFONT ( 120 , 12 ) ;
diff --git a/basctl/source/basicide/objdlg.src b/basctl/source/basicide/objdlg.src
index b66b68a2d..6f379ed4c 100644
--- a/basctl/source/basicide/objdlg.src
+++ b/basctl/source/basicide/objdlg.src
@@ -32,6 +32,7 @@
 
 FloatingWindow RID_BASICIDE_OBJCAT
 {
+    HelpID = "basctl:FloatingWindow:RID_BASICIDE_OBJCAT";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 191 , 179 ) ;
diff --git a/basctl/source/dlged/managelang.src b/basctl/source/dlged/managelang.src
index 6b54abcb1..822502ff9 100644
--- a/basctl/source/dlged/managelang.src
+++ b/basctl/source/dlged/managelang.src
@@ -45,6 +45,7 @@ ModalDialog RID_DLG_MANAGE_LANGUAGE
     };
     ListBox LB_LANGUAGE
     {
+        HelpID = "basctl:ListBox:RID_DLG_MANAGE_LANGUAGE:LB_LANGUAGE";
         Pos = MAP_APPFONT ( MANAGE_COL1 , MANAGE_ROW2 ) ;
         Size = MAP_APPFONT ( MANAGE_LB_WIDTH , MANAGE_LB_HEIGHT ) ;
         Border = TRUE;
@@ -52,6 +53,7 @@ ModalDialog RID_DLG_MANAGE_LANGUAGE
     };
     PushButton PB_ADD_LANG
     {
+        HelpID = "basctl:PushButton:RID_DLG_MANAGE_LANGUAGE:PB_ADD_LANG";
         Pos = MAP_APPFONT ( MANAGE_COL3 , MANAGE_ROW2 ) ;
         Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
         TabStop = TRUE ;
@@ -59,6 +61,7 @@ ModalDialog RID_DLG_MANAGE_LANGUAGE
     };
     PushButton PB_DEL_LANG
     {
+        HelpID = "basctl:PushButton:RID_DLG_MANAGE_LANGUAGE:PB_DEL_LANG";
         Pos = MAP_APPFONT ( MANAGE_COL3 , MANAGE_ROW3 ) ;
         Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
         TabStop = TRUE ;
@@ -66,6 +69,7 @@ ModalDialog RID_DLG_MANAGE_LANGUAGE
     };
     PushButton PB_MAKE_DEFAULT
     {
+        HelpID = "basctl:PushButton:RID_DLG_MANAGE_LANGUAGE:PB_MAKE_DEFAULT";
         Pos = MAP_APPFONT ( MANAGE_COL3 , MANAGE_ROW4 ) ;
         Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
         TabStop = TRUE ;
@@ -135,6 +139,7 @@ ModalDialog RID_DLG_SETDEF_LANGUAGE
     };
     ListBox LB_DEF_LANGUAGE
     {
+        HelpID = "basctl:ListBox:RID_DLG_SETDEF_LANGUAGE:LB_DEF_LANGUAGE";
         Pos = MAP_APPFONT ( SETDEF_COL1 , SETDEF_ROW2 ) ;
         Size = MAP_APPFONT ( SETDEF_LB_WIDTH , SETDEF_LB_HEIGHT ) ;
         Border = TRUE;
diff --git a/cui/source/customize/acccfg.src b/cui/source/customize/acccfg.src
index abbe08d84..1f4e9a8e0 100644
--- a/cui/source/customize/acccfg.src
+++ b/cui/source/customize/acccfg.src
@@ -67,18 +67,21 @@ TabPage RID_SVXPAGE_KEYBOARD
     Size = MAP_APPFONT ( 273 , 258 ) ;
     RadioButton RB_OFFICE
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_KEYBOARD:RB_OFFICE";
         Pos = MAP_APPFONT ( 192 , 6 ) ;
         Size = MAP_APPFONT ( 75 , 10 ) ;
         Text = "%PRODUCTNAME" ;
     };
     RadioButton RB_MODULE
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_KEYBOARD:RB_MODULE";
         Pos = MAP_APPFONT ( 192 , 19 ) ;
         Size = MAP_APPFONT ( 75 , 10 ) ;
         Text = "$(MODULE)" ;
     };
     PushButton BTN_ACC_CHANGE
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_CHANGE";
         Pos = MAP_APPFONT ( 192 , 35 ) ;
         Size = MAP_APPFONT ( 75 , 14 ) ;
         TabStop = TRUE ;
@@ -86,6 +89,7 @@ TabPage RID_SVXPAGE_KEYBOARD
     };
     PushButton BTN_ACC_REMOVE
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_REMOVE";
         Pos = MAP_APPFONT ( 192 , 52 ) ;
         Size = MAP_APPFONT ( 75 , 14 ) ;
         TabStop = TRUE ;
@@ -162,6 +166,7 @@ TabPage RID_SVXPAGE_KEYBOARD
     };
     PushButton BTN_LOAD
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_LOAD";
         Pos = MAP_APPFONT ( 192 , 86 ) ;
         Size = MAP_APPFONT ( 75 , 14 ) ;
         TabStop = TRUE ;
@@ -170,6 +175,7 @@ TabPage RID_SVXPAGE_KEYBOARD
     };
     PushButton BTN_SAVE
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_SAVE";
         Pos = MAP_APPFONT ( 192 , 103 ) ;
         Size = MAP_APPFONT ( 75 , 14 ) ;
         TabStop = TRUE ;
@@ -178,6 +184,7 @@ TabPage RID_SVXPAGE_KEYBOARD
     };
     PushButton BTN_RESET
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_RESET";
         Pos = MAP_APPFONT ( 192 , 120 ) ;
         Size = MAP_APPFONT ( 75 , 14 ) ;
         TabStop = TRUE ;
diff --git a/cui/source/customize/cfg.src b/cui/source/customize/cfg.src
index c6d7f7ab1..7302a0f89 100644
--- a/cui/source/customize/cfg.src
+++ b/cui/source/customize/cfg.src
@@ -136,6 +136,7 @@ TabPage RID_SVXPAGE_MENUS
     };
     ListBox LB_MENUS
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_MENUS:LB_MENUS";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 64 , 22 ) ;
         Size = MAP_APPFONT ( 108 , 108 ) ;
@@ -143,6 +144,7 @@ TabPage RID_SVXPAGE_MENUS
     };
     PushButton BTN_NEW
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_MENUS:BTN_NEW";
         Pos = MAP_APPFONT ( 192 , 22 ) ;
         Size = MAP_APPFONT ( 75 , 14 ) ;
         TabStop = TRUE ;
@@ -151,6 +153,7 @@ TabPage RID_SVXPAGE_MENUS
     };
     MenuButton BTN_CHANGE
     {
+        HelpID = "cui:MenuButton:RID_SVXPAGE_MENUS:BTN_CHANGE";
         Pos = MAP_APPFONT ( 192 , 39 ) ;
         Size = MAP_APPFONT ( 75 , 14 ) ;
         TabStop = TRUE ;
@@ -181,6 +184,7 @@ TabPage RID_SVXPAGE_MENUS
     };
     PushButton BTN_ADD_COMMANDS
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_MENUS:BTN_ADD_COMMANDS";
         Pos = MAP_APPFONT ( 192 , 67 ) ;
         Size = MAP_APPFONT ( 75 , 14 ) ;
         TabStop = TRUE ;
@@ -189,6 +193,7 @@ TabPage RID_SVXPAGE_MENUS
     };
     MenuButton BTN_CHANGE_ENTRY
     {
+        HelpID = "cui:MenuButton:RID_SVXPAGE_MENUS:BTN_CHANGE_ENTRY";
         Pos = MAP_APPFONT ( 192 , 84 ) ;
         Size = MAP_APPFONT ( 75 , 14 ) ;
         TabStop = TRUE ;
@@ -197,6 +202,7 @@ TabPage RID_SVXPAGE_MENUS
     };
     ImageButton BTN_UP
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_MENUS:BTN_UP";
         Pos = MAP_APPFONT ( 175 , 102 ) ;
         Size = MAP_APPFONT ( 14 , 14 ) ;
         TabStop = TRUE ;
@@ -205,6 +211,7 @@ TabPage RID_SVXPAGE_MENUS
     };
     ImageButton BTN_DOWN
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_MENUS:BTN_DOWN";
         Pos = MAP_APPFONT ( 175 , 119 ) ;
         Size = MAP_APPFONT ( 14 , 14 ) ;
         TabStop = TRUE ;
@@ -220,6 +227,7 @@ TabPage RID_SVXPAGE_MENUS
     };
     ListBox LB_SAVEIN
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_MENUS:LB_SAVEIN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 64 , 188 ) ;
         Size = MAP_APPFONT ( 108 , 53 ) ;
@@ -234,6 +242,7 @@ TabPage RID_SVXPAGE_MENUS
     };
     MultiLineEdit ED_DESCRIPTION
     {
+        HelpID = "cui:MultiLineEdit:RID_SVXPAGE_MENUS:ED_DESCRIPTION";
         Pos = MAP_APPFONT ( 6 , 216 ) ;
         Size = MAP_APPFONT ( 261 , 36 ) ;
         Border = TRUE;
@@ -493,6 +502,7 @@ ModalDialog MD_MENU_ORGANISER
     };
     Edit EDIT_MENU_NAME
     {
+        HelpID = "cui:Edit:MD_MENU_ORGANISER:EDIT_MENU_NAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 19 ) ;
         Size = MAP_APPFONT ( 93 , 12 ) ;
@@ -517,6 +527,7 @@ ModalDialog MD_MENU_ORGANISER
     };
     ImageButton BTN_MENU_UP
     {
+        HelpID = "cui:ImageButton:MD_MENU_ORGANISER:BTN_MENU_UP";
         Pos = MAP_APPFONT ( 102 , 80 ) ;
         Size = MAP_APPFONT ( 14 , 14 ) ;
         TabStop = TRUE ;
@@ -524,6 +535,7 @@ ModalDialog MD_MENU_ORGANISER
     };
     ImageButton BTN_MENU_DOWN
     {
+        HelpID = "cui:ImageButton:MD_MENU_ORGANISER:BTN_MENU_DOWN";
         Pos = MAP_APPFONT ( 102 , 97 ) ;
         Size = MAP_APPFONT ( 14 , 14 ) ;
         TabStop = TRUE ;
@@ -550,6 +562,7 @@ ModalDialog MD_MENU_ORGANISER
 // MD_NEW_TOOLBAR -------------------------------------------------
 ModalDialog MD_NEW_TOOLBAR
 {
+    HelpID = "cui:ModalDialog:MD_NEW_TOOLBAR";
     OutputSize = TRUE ;
     SvLook = TRUE ;
     Size = MAP_APPFONT ( 165 , 63 ) ;
@@ -565,6 +578,7 @@ ModalDialog MD_NEW_TOOLBAR
     };
     Edit EDT_STRING
     {
+        HelpID = "cui:Edit:MD_NEW_TOOLBAR:EDT_STRING";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 17 ) ;
         Size = MAP_APPFONT ( 97 , 12 ) ;
@@ -579,6 +593,7 @@ ModalDialog MD_NEW_TOOLBAR
     };
     ListBox LB_SAVEIN
     {
+        HelpID = "cui:ListBox:MD_NEW_TOOLBAR:LB_SAVEIN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 43 ) ;
         Size = MAP_APPFONT ( 97 , 53 ) ;
@@ -654,6 +669,7 @@ ModalDialog MD_ICONSELECTOR
     };
     PushButton BTN_IMPORT
     {
+        HelpID = "cui:PushButton:MD_ICONSELECTOR:BTN_IMPORT";
         Pos = MAP_APPFONT ( 184 , 7 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -662,6 +678,7 @@ ModalDialog MD_ICONSELECTOR
     };
     PushButton BTN_DELETE
     {
+        HelpID = "cui:PushButton:MD_ICONSELECTOR:BTN_DELETE";
         Pos = MAP_APPFONT ( 184 , 24 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -691,6 +708,7 @@ ModalDialog MD_ICONSELECTOR
 //added for issue83555
 ModalDialog MD_ICONCHANGE
 {
+    HelpID = "cui:ModalDialog:MD_ICONCHANGE";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 200 , 150 ) ;
@@ -714,6 +732,7 @@ ModalDialog MD_ICONCHANGE
     
     MultiLineEdit EDT_ADDR
     {
+        HelpID = "cui:MultiLineEdit:MD_ICONCHANGE:EDT_ADDR";
         Pos = MAP_APPFONT ( 30 , 38) ;
         Size = MAP_APPFONT ( 140 , 83 ) ;
         Border = TRUE;
diff --git a/cui/source/customize/eventdlg.src b/cui/source/customize/eventdlg.src
index 9bb68d694..cb1428cac 100644
--- a/cui/source/customize/eventdlg.src
+++ b/cui/source/customize/eventdlg.src
@@ -63,6 +63,7 @@ TabPage RID_SVXPAGE_EVENTS
     };
     ListBox LB_SAVEIN
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_EVENTS:LB_SAVEIN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 54 , 238 ) ;
         Size = MAP_APPFONT ( 132 , 53 ) ;
@@ -76,6 +77,7 @@ TabPage RID_SVXPAGE_EVENTS
     }; 	
     PushButton PB_ASSIGN
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_EVENTS:PB_ASSIGN";
         Pos = MAP_APPFONT ( 217 , ROW0A ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Disable = TRUE ;
@@ -83,6 +85,7 @@ TabPage RID_SVXPAGE_EVENTS
     };
     PushButton PB_DELETE
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_EVENTS:PB_DELETE";
         Pos = MAP_APPFONT ( 217 , ROW0A+RSC_CD_PUSHBUTTON_HEIGHT+12 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Disable = TRUE ;
diff --git a/cui/source/customize/macropg.src b/cui/source/customize/macropg.src
index 6402587dc..2baa834bf 100644
--- a/cui/source/customize/macropg.src
+++ b/cui/source/customize/macropg.src
@@ -66,6 +66,7 @@ TabPage RID_SVXPAGE_MACROASSIGN
     };
     PushButton PB_ASSIGN
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_MACROASSIGN:PB_ASSIGN";
         Pos = MAP_APPFONT ( COL4 , ROW0A  ) ;
         Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
         Text [ en-US ] = "M~acro..." ;
@@ -74,6 +75,7 @@ TabPage RID_SVXPAGE_MACROASSIGN
     };
     PushButton PB_ASSIGN_COMPONENT
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_MACROASSIGN:PB_ASSIGN_COMPONENT";
         Pos = MAP_APPFONT ( COL4 , ROW2  ) ;
         Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
         Disable = TRUE ;
@@ -82,6 +84,7 @@ TabPage RID_SVXPAGE_MACROASSIGN
     };
     PushButton PB_DELETE
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_MACROASSIGN:PB_DELETE";
         Pos = MAP_APPFONT ( COL4 , ROW5_REMOVE  ) ;
         Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
         Text [ en-US ] = "~Remove" ;
@@ -112,6 +115,7 @@ TabPage RID_SVXPAGE_MACROASSIGN
 
 ModalDialog RID_SVXDLG_ASSIGNCOMPONENT
 {
+    HelpID = "cui:ModalDialog:RID_SVXDLG_ASSIGNCOMPONENT";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( COMP_WIDTH , COMP_HEIGHT ) ;
@@ -144,6 +148,7 @@ ModalDialog RID_SVXDLG_ASSIGNCOMPONENT
     };
     Edit EDIT_METHOD
     {
+        HelpID = "cui:Edit:RID_SVXDLG_ASSIGNCOMPONENT:EDIT_METHOD";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COMP_COL0 , COMP_ROWEDIT ) ;
         Size = MAP_APPFONT ( COMP_EDIT_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ;
diff --git a/cui/source/dialogs/SpellDialog.src b/cui/source/dialogs/SpellDialog.src
index b91bea098..d1bb22989 100644
--- a/cui/source/dialogs/SpellDialog.src
+++ b/cui/source/dialogs/SpellDialog.src
@@ -61,6 +61,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK
     };
     ListBox LB_LANGUAGE
     {
+        HelpID = "cui:ListBox:RID_SVXDLG_SPELLCHECK:LB_LANGUAGE";
         Pos = MAP_APPFONT( 110, 6 );
         Size = MAP_APPFONT( 93, 55 );
         Border = TRUE;
@@ -76,6 +77,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK
 
     MultiLineEdit ED_NEWWORD
     {
+        HelpID = "cui:MultiLineEdit:RID_SVXDLG_SPELLCHECK:ED_NEWWORD";
         Pos = MAP_APPFONT( 6, 37 );
         Size = MAP_APPFONT( 197, 48 );
         Border = TRUE;
@@ -91,6 +93,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK
     };
     ListBox LB_SUGGESTION
     {
+        HelpID = "cui:ListBox:RID_SVXDLG_SPELLCHECK:LB_SUGGESTION";
         Pos = MAP_APPFONT( 6, 99 );
         Size = MAP_APPFONT( 197, 48 );
         Border = TRUE;
@@ -98,6 +101,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK
 
     CheckBox CB_CHECK_GRAMMAR
     {
+        HelpID = "cui:CheckBox:RID_SVXDLG_SPELLCHECK:CB_CHECK_GRAMMAR";
         Pos = MAP_APPFONT(  6, 153 );
         Size = MAP_APPFONT( 100, 10 );
         Text [ en-US ] = "Check ~grammar" ;
@@ -106,6 +110,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK
 
     PushButton PB_IGNORE
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_IGNORE";
         Pos = MAP_APPFONT( 209, 37 );
         Size = MAP_APPFONT( 55, 14 );
         Text [ en-US ] = "~Ignore Once" ;
@@ -113,12 +118,14 @@ ModelessDialog RID_SVXDLG_SPELLCHECK
 
     PushButton PB_IGNOREALL
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_IGNOREALL";
         Pos = MAP_APPFONT( 209, 54 );
         Size = MAP_APPFONT( 55, 14 );
         Text [ en-US ] = "I~gnore All" ;
     };
     PushButton PB_IGNORERULE
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_IGNORERULE";
         Pos = MAP_APPFONT( 209, 54 );
         Size = MAP_APPFONT( 55, 14 );
         Text [ en-US ] = "I~gnore Rule" ;
@@ -126,6 +133,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK
     };
     MenuButton MB_ADDTODICT
     {
+        HelpID = "cui:MenuButton:RID_SVXDLG_SPELLCHECK:MB_ADDTODICT";
         Pos = MAP_APPFONT( 209, 71 );
         Size = MAP_APPFONT( 55, 14 );
         Text [ en-US ] = "~Add" ;
@@ -133,6 +141,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK
 
     PushButton PB_CHANGE
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_CHANGE";
         Pos = MAP_APPFONT( 209, 99 );
         Size = MAP_APPFONT( 55, 14 );
         Text [ en-US ] = "~Change" ;
@@ -141,12 +150,14 @@ ModelessDialog RID_SVXDLG_SPELLCHECK
 
     PushButton PB_CHANGEALL
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_CHANGEALL";
         Pos = MAP_APPFONT( 209, 117 );
         Size = MAP_APPFONT( 55, 14 );
         Text [ en-US ] = "Change A~ll" ;
     };
     PushButton PB_EXPLAIN
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_EXPLAIN";
         Pos = MAP_APPFONT( 209, 117 );
         Size = MAP_APPFONT( 55, 14 );
         Hide = TRUE;
@@ -154,6 +165,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK
     };
     PushButton PB_AUTOCORR
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_AUTOCORR";
         Pos = MAP_APPFONT( 209, 134 );
         Size = MAP_APPFONT( 55, 14 );
         Text [ en-US ] = "AutoCor~rect" ;
@@ -172,12 +184,14 @@ ModelessDialog RID_SVXDLG_SPELLCHECK
     };
     PushButton PB_OPTIONS
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_OPTIONS";
         Pos = MAP_APPFONT( 87, 170 );
         Size = MAP_APPFONT( 55, 14 );
         Text [ en-US ] = "O~ptions..." ;
     };
     PushButton PB_UNDO
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_UNDO";
         Pos = MAP_APPFONT( 148, 170 );
         Size = MAP_APPFONT( 55, 14 );
         Text [ en-US ] = "~Undo" ;
@@ -185,6 +199,7 @@ ModelessDialog RID_SVXDLG_SPELLCHECK
 
     PushButton PB_CLOSE
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_CLOSE";
         Pos = MAP_APPFONT ( 209 , 170 ) ;
         Size = MAP_APPFONT ( 55 , 14 ) ;
         TabStop = TRUE ;
diff --git a/cui/source/dialogs/charmap.src b/cui/source/dialogs/charmap.src
index 2eed0827e..c59c7381a 100644
--- a/cui/source/dialogs/charmap.src
+++ b/cui/source/dialogs/charmap.src
@@ -60,6 +60,7 @@ ModalDialog RID_SVXDLG_CHARMAP
     };
     ListBox LB_FONT
     {
+        HelpID = "cui:ListBox:RID_SVXDLG_CHARMAP:LB_FONT";
         Pos = MAP_APPFONT ( 42 , 6 ) ;
         Size = MAP_APPFONT ( 70 , 58 ) ;
         Sort = TRUE ;
@@ -74,6 +75,7 @@ ModalDialog RID_SVXDLG_CHARMAP
     };
     ListBox LB_SUBSET
     {
+        HelpID = "cui:ListBox:RID_SVXDLG_CHARMAP:LB_SUBSET";
         Pos = MAP_APPFONT ( 161 , 6 ) ;
         Size = MAP_APPFONT ( 63 , 68 ) ;
         Sort = FALSE ;
@@ -128,6 +130,7 @@ ModalDialog RID_SVXDLG_CHARMAP
     };
     PushButton BTN_DELETE
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_CHARMAP:BTN_DELETE";
         Pos = MAP_APPFONT ( 242 , 63 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Delete";
diff --git a/cui/source/dialogs/cuiimapdlg.src b/cui/source/dialogs/cuiimapdlg.src
index a7550bcf1..95ed0f483 100644
--- a/cui/source/dialogs/cuiimapdlg.src
+++ b/cui/source/dialogs/cuiimapdlg.src
@@ -31,6 +31,7 @@
 
 ModalDialog RID_SVXDLG_IMAPURL
 {
+    HelpID = "cui:ModalDialog:RID_SVXDLG_IMAPURL";
     SVLook = TRUE ;
     OutputSize = TRUE ;
     Closeable = TRUE ;
@@ -46,6 +47,7 @@ ModalDialog RID_SVXDLG_IMAPURL
     };
     Edit EDT_URL
     {
+        HelpID = "cui:Edit:RID_SVXDLG_IMAPURL:EDT_URL";
         Border = TRUE ;
         TabStop = TRUE ;
         Left = TRUE ;
@@ -61,6 +63,7 @@ ModalDialog RID_SVXDLG_IMAPURL
     };
     ComboBox CBB_TARGETS
     {
+        HelpID = "cui:ComboBox:RID_SVXDLG_IMAPURL:CBB_TARGETS";
         Border = TRUE ;
         Sort = TRUE ;
         Pos = MAP_APPFONT ( 6 , 43 ) ;
@@ -78,6 +81,7 @@ ModalDialog RID_SVXDLG_IMAPURL
     };
     Edit EDT_NAME
     {
+        HelpID = "cui:Edit:RID_SVXDLG_IMAPURL:EDT_NAME";
         Border = TRUE ;
         TabStop = TRUE ;
         Left = TRUE ;
@@ -94,6 +98,7 @@ ModalDialog RID_SVXDLG_IMAPURL
 
     Edit EDT_URLDESCRIPTION
     {
+        HelpID = "cui:Edit:RID_SVXDLG_IMAPURL:EDT_URLDESCRIPTION";
         Border = TRUE ;
         TabStop = TRUE ;
         Left = TRUE ;
@@ -109,6 +114,7 @@ ModalDialog RID_SVXDLG_IMAPURL
 
     MultiLineEdit EDT_DESCRIPTION
     {
+        HelpID = "cui:MultiLineEdit:RID_SVXDLG_IMAPURL:EDT_DESCRIPTION";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 122 ) ;
         Size = MAP_APPFONT ( 202 , 34 ) ;
diff --git a/cui/source/dialogs/dlgname.src b/cui/source/dialogs/dlgname.src
index ee29629dc..a7f377ba5 100644
--- a/cui/source/dialogs/dlgname.src
+++ b/cui/source/dialogs/dlgname.src
@@ -49,6 +49,7 @@ ModalDialog RID_SVXDLG_NAME
     };
     Edit EDT_STRING
     {
+        HelpID = "cui:Edit:RID_SVXDLG_NAME:EDT_STRING";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 17 ) ;
         Size = MAP_APPFONT ( 112 , 12 ) ;
@@ -96,6 +97,7 @@ ModalDialog RID_SVXDLG_OBJECT_NAME
     };
     Edit NTD_EDT_NAME
     {
+        HelpID = "cui:Edit:RID_SVXDLG_OBJECT_NAME:NTD_EDT_NAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 14 ) ;
         Size = MAP_APPFONT ( 168 , 12 ) ;
@@ -153,6 +155,7 @@ ModalDialog RID_SVXDLG_OBJECT_TITLE_DESC
     };
     Edit NTD_EDT_TITLE
     {
+        HelpID = "cui:Edit:RID_SVXDLG_OBJECT_TITLE_DESC:NTD_EDT_TITLE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 14 ) ;
         Size = MAP_APPFONT ( 168 , 12 ) ;
@@ -169,6 +172,7 @@ ModalDialog RID_SVXDLG_OBJECT_TITLE_DESC
     };
     MultiLineEdit NTD_EDT_DESC
     {
+        HelpID = "cui:MultiLineEdit:RID_SVXDLG_OBJECT_TITLE_DESC:NTD_EDT_DESC";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 41 ) ;
         Size = MAP_APPFONT ( 168 , (12 * 3) - 2 ) ;
@@ -218,12 +222,14 @@ ModalDialog RID_SVXDLG_MESSBOX
     Moveable = TRUE ;
     PushButton BTN_1
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_MESSBOX:BTN_1";
         Pos = MAP_APPFONT ( 25 , 44 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
     };
     PushButton BTN_2
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_MESSBOX:BTN_2";
         Pos = MAP_APPFONT ( 78 , 44 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
diff --git a/cui/source/dialogs/fmsearch.src b/cui/source/dialogs/fmsearch.src
index 1b56c1634..62bae4533 100644
--- a/cui/source/dialogs/fmsearch.src
+++ b/cui/source/dialogs/fmsearch.src
@@ -45,6 +45,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM
     };
     RadioButton RB_SEARCHFORTEXT
     {
+        HelpID = "cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORTEXT";
         Pos = MAP_APPFONT( 12, 23 );
         Size = MAP_APPFONT( 50, 10 );
         Group = TRUE;
@@ -52,12 +53,14 @@ ModalDialog RID_SVXDLG_SEARCHFORM
     };
     RadioButton RB_SEARCHFORNULL
     {
+        HelpID = "cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORNULL";
         Pos = MAP_APPFONT( 12, 36 );
         Size = MAP_APPFONT( 207, 10 );
         Text [ en-US ] = "Field content is ~NULL";
     };
     RadioButton RB_SEARCHFORNOTNULL
     {
+        HelpID = "cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORNOTNULL";
         Pos = MAP_APPFONT( 12, 49 );
         Size = MAP_APPFONT( 207, 10 );
         Text [ en-US ] = "Field content is not NU~LL";
@@ -86,6 +89,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM
     };
     ListBox LB_FORM
     {
+        HelpID = "cui:ListBox:RID_SVXDLG_SEARCHFORM:LB_FORM";
         Border = TRUE;
         Pos = MAP_APPFONT( 110, 76 );
         Size = MAP_APPFONT( 109, 60 );
@@ -102,6 +106,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM
     };
     RadioButton RB_SINGLEFIELD
     {
+        HelpID = "cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SINGLEFIELD";
         Pos = MAP_APPFONT( 24, 106 );
         Size = MAP_APPFONT( 75, 10 );
         Text [ en-US ] = "Single field";
@@ -204,6 +209,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM
     };
     CheckBox CB_HALFFULLFORMS
     {
+        HelpID = "cui:CheckBox:RID_SVXDLG_SEARCHFORM:CB_HALFFULLFORMS";
         Pos = MAP_APPFONT( 105, 209 );
         Size = MAP_APPFONT( 85, 10 );
         TabStop = TRUE ;
@@ -211,6 +217,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM
     };
     CheckBox CB_SOUNDSLIKECJK
     {
+        HelpID = "cui:CheckBox:RID_SVXDLG_SEARCHFORM:CB_SOUNDSLIKECJK";
         Pos = MAP_APPFONT( 190, 209 );
         Size = MAP_APPFONT( 84, 10 );
         TabStop = TRUE ;
@@ -218,6 +225,7 @@ ModalDialog RID_SVXDLG_SEARCHFORM
     };
     PushButton PB_SOUNDSLIKESETTINGS
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_SEARCHFORM:PB_SOUNDSLIKESETTINGS";
         Pos = MAP_APPFONT( 275, 207 );
         Size = MAP_APPFONT( 14, 14 );
         TabStop = TRUE ;
diff --git a/cui/source/dialogs/gallery.src b/cui/source/dialogs/gallery.src
index 0b7601d53..9679d15b1 100644
--- a/cui/source/dialogs/gallery.src
+++ b/cui/source/dialogs/gallery.src
@@ -94,6 +94,7 @@ TabPage RID_SVXTABPAGE_GALLERY_GENERAL
     };
     Edit EDT_MS_NAME
     {
+        HelpID = "cui:Edit:RID_SVXTABPAGE_GALLERY_GENERAL:EDT_MS_NAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 10 ) ;
         Size = MAP_APPFONT ( 194 , 12 ) ;
@@ -174,6 +175,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES
     };
     ComboBox CBB_FILETYPE
     {
+        HelpID = "cui:ComboBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:CBB_FILETYPE";
         Pos = MAP_APPFONT ( 57 , 6 ) ;
         Size = MAP_APPFONT ( 121 , 69 ) ;
         TabStop = TRUE ;
@@ -183,6 +185,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES
     };
     MultiListBox LBX_FOUND
     {
+        HelpID = "cui:MultiListBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:LBX_FOUND";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 23  ) ;
         Size = MAP_APPFONT ( 172 , 156 ) ;
@@ -191,6 +194,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES
     };
     PushButton BTN_SEARCH
     {
+        HelpID = "cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_SEARCH";
         Pos = MAP_APPFONT ( 184 , 6  ) ;
         Size = MAP_APPFONT ( 70 , 14 ) ;
         TabStop = TRUE ;
@@ -198,6 +202,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES
     };
     PushButton BTN_TAKE
     {
+        HelpID = "cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_TAKE";
         Pos = MAP_APPFONT ( 184 , 24  ) ;
         Size = MAP_APPFONT ( 70 , 14 ) ;
         TabStop = TRUE ;
@@ -205,6 +210,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES
     };
     PushButton BTN_TAKEALL
     {
+        HelpID = "cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_TAKEALL";
         Pos = MAP_APPFONT ( 184 , 42 ) ;
         Size = MAP_APPFONT ( 70 , 14 ) ;
         TabStop = TRUE ;
@@ -212,6 +218,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES
     };
     CheckBox CBX_PREVIEW
     {
+        HelpID = "cui:CheckBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:CBX_PREVIEW";
         Pos = MAP_APPFONT ( 184 , 76  ) ;
         Size = MAP_APPFONT ( 70 , 12 ) ;
         Text [ en-US ] = "Pr~eview" ;
@@ -224,6 +231,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES
     };
     PushButton BTN_MADDIN1
     {
+        HelpID = "cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_MADDIN1";
         Pos = MAP_APPFONT ( 220 , 63 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -231,6 +239,7 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES
     };
     PushButton BTN_MADDIN2
     {
+        HelpID = "cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_MADDIN2";
         Pos = MAP_APPFONT ( 220 , 80 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -388,6 +397,7 @@ ModalDialog RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS
 
 ModalDialog RID_SVXDLG_GALLERY_THEMEID
 {
+    HelpID = "cui:ModalDialog:RID_SVXDLG_GALLERY_THEMEID";
     OutputSize = TRUE ;
     Border = TRUE ;
     SVLook = TRUE ;
@@ -415,6 +425,7 @@ ModalDialog RID_SVXDLG_GALLERY_THEMEID
     };
     ListBox LB_RESNAME
     {
+        HelpID = "cui:ListBox:RID_SVXDLG_GALLERY_THEMEID:LB_RESNAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 100 , 60 ) ;
diff --git a/cui/source/dialogs/grfflt.src b/cui/source/dialogs/grfflt.src
index 2f81522ed..146928a77 100644
--- a/cui/source/dialogs/grfflt.src
+++ b/cui/source/dialogs/grfflt.src
@@ -66,6 +66,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC
 #define MA_Y1	MA_Y0 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y
     MetricField DLG_FILTERMOSAIC_MTR_WIDTH
     {
+        HelpID = "cui:MetricField:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_MTR_WIDTH";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , MA_Y1 ) ;
         Size = MAP_APPFONT ( 35 , 12 ) ;
@@ -91,6 +92,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC
 #define MA_Y3	MA_Y2 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y
     MetricField DLG_FILTERMOSAIC_MTR_HEIGHT
     {
+        HelpID = "cui:MetricField:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_MTR_HEIGHT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12, MA_Y3 ) ;
         Size = MAP_APPFONT ( 35, 12 ) ;
@@ -109,6 +111,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC
 #define MA_Y4	MA_Y3 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_Y
     CheckBox DLG_FILTERMOSAIC_CBX_EDGES
     {	
+        HelpID = "cui:CheckBox:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_CBX_EDGES";
         Pos = MAP_APPFONT ( 12, MA_Y4 ) ; 
         Size = MAP_APPFONT ( 91, 12 ) ; 
         TabStop = TRUE ; 
@@ -170,6 +173,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SOLARIZE
 #define MA_Y6	MA_Y5 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y
     MetricField DLG_FILTERSOLARIZE_MTR_THRESHOLD
     {
+        HelpID = "cui:MetricField:RID_SVX_GRFFILTER_DLG_SOLARIZE:DLG_FILTERSOLARIZE_MTR_THRESHOLD";
         Border = TRUE ; 
         Pos = MAP_APPFONT ( 12 , MA_Y6 ) ;
         Size = MAP_APPFONT ( 35 , 12 ) ;
@@ -186,6 +190,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SOLARIZE
 #define MA_Y7	MA_Y6 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y
     CheckBox DLG_FILTERSOLARIZE_CBX_INVERT
     {	
+        HelpID = "cui:CheckBox:RID_SVX_GRFFILTER_DLG_SOLARIZE:DLG_FILTERSOLARIZE_CBX_INVERT";
         Pos = MAP_APPFONT ( 12, 46 ) ; 
         Size = MAP_APPFONT ( 77, 12 ) ; 
         TabStop = TRUE ; 
@@ -247,6 +252,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SEPIA
 #define MA_Y9	MA_Y8 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y
     MetricField DLG_FILTERSEPIA_MTR_SEPIA
     {
+        HelpID = "cui:MetricField:RID_SVX_GRFFILTER_DLG_SEPIA:DLG_FILTERSEPIA_MTR_SEPIA";
         Border = TRUE ; 
         Pos = MAP_APPFONT ( 12 , MA_Y9 ) ;
         Size = MAP_APPFONT ( 35 , 12 ) ;
@@ -319,6 +325,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_POSTER
 #define MA_Y11	MA_Y10 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y
     NumericField DLG_FILTERPOSTER_NUM_POSTER
     {
+        HelpID = "cui:NumericField:RID_SVX_GRFFILTER_DLG_POSTER:DLG_FILTERPOSTER_NUM_POSTER";
         Border = TRUE ; 
         Pos = MAP_APPFONT ( 12 , MA_Y11 ) ;
         Size = MAP_APPFONT ( 35 , 12 ) ;
@@ -359,6 +366,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_POSTER
 
 TabPage RID_SVX_GRFFILTER_DLG_EMBOSS_TAB
 {
+    HelpID = "cui:TabPage:RID_SVX_GRFFILTER_DLG_EMBOSS_TAB";
     Pos = MAP_APPFONT ( 0, 0 ) ; 
     Size = MAP_APPFONT ( 0, 0 ) ; 
 };
diff --git a/cui/source/dialogs/hangulhanjadlg.src b/cui/source/dialogs/hangulhanjadlg.src
index 46f52601f..c7c7172de 100644
--- a/cui/source/dialogs/hangulhanjadlg.src
+++ b/cui/source/dialogs/hangulhanjadlg.src
@@ -44,6 +44,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
 
     PushButton PB_FIND
     {
+        HelpID = "cui:PushButton:RID_SVX_MDLG_HANGULHANJA:PB_FIND";
         Pos = MAP_APPFONT( 207, 23 );
         Size = MAP_APPFONT( 30, 14 );
 
@@ -67,6 +68,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
 
     RadioButton RB_SIMPLE_CONVERSION
     {
+        HelpID = "cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_SIMPLE_CONVERSION";
         Pos = MAP_APPFONT( 51, 81 );
         Size = MAP_APPFONT( 60, 8 );
 
@@ -77,6 +79,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
 
     RadioButton RB_HANJA_HANGUL_BRACKETED
     {
+        HelpID = "cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_BRACKETED";
         Pos = MAP_APPFONT( 114, 81 );
         Size = MAP_APPFONT( 60, 8 );
 
@@ -85,6 +88,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
 
     RadioButton RB_HANGUL_HANJA_BRACKETED
     {
+        HelpID = "cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_BRACKETED";
         Pos = MAP_APPFONT( 177, 81 );
         Size = MAP_APPFONT( 60, 8 );
 
@@ -93,6 +97,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
 
     RadioButton RB_HANGUL_HANJA_ABOVE
     {
+        HelpID = "cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_ABOVE";
         Pos = MAP_APPFONT( 51, 95 );
         Size = MAP_APPFONT( 60, 16 );
 
@@ -102,6 +107,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
 
     RadioButton RB_HANGUL_HANJA_BELOW
     {
+        HelpID = "cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_BELOW";
         Pos = MAP_APPFONT( 114, 95 );
         Size = MAP_APPFONT( 60, 16 );
 
@@ -111,6 +117,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
 
     RadioButton RB_HANJA_HANGUL_ABOVE
     {
+        HelpID = "cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_ABOVE";
         Pos = MAP_APPFONT( 56, 114 );
         Size = MAP_APPFONT( 60, 16 );
 
@@ -120,6 +127,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
 
     RadioButton RB_HANJA_HANGUL_BELOW
     {
+        HelpID = "cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_BELOW";
         Pos = MAP_APPFONT( 114, 114 );
         Size = MAP_APPFONT( 60, 16 );
 
@@ -137,6 +145,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
 
     CheckBox CB_HANGUL_ONLY
     {
+        HelpID = "cui:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_HANGUL_ONLY";
         Pos = MAP_APPFONT( 51, 134 );
         Size = MAP_APPFONT( 60, 8 );
 
@@ -145,6 +154,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
 
     CheckBox CB_HANJA_ONLY
     {
+        HelpID = "cui:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_HANJA_ONLY";
         Pos = MAP_APPFONT( 114, 134 );
         Size = MAP_APPFONT( 55, 8 );
 
@@ -159,6 +169,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA
 
     CheckBox CB_REPLACE_BY_CHARACTER
     {
+        HelpID = "cui:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_REPLACE_BY_CHARACTER";
         Pos = MAP_APPFONT( 241, 81 );
         Size = MAP_APPFONT( 55, 24 );
 
@@ -212,36 +223,42 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_OPT
     };
     CheckBox CB_IGNOREPOST
     {
+        HelpID = "cui:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_IGNOREPOST";
         Pos = MAP_APPFONT ( HHO_COL_1a, HHO_ROW_9 ) ;
         Size = MAP_APPFONT ( HHO_COL_6 - HHO_COL_1a , 12 ) ;
         Text[ en-US ] = "Ignore post-positional word";
     };
     CheckBox CB_SHOWRECENTLYFIRST
     {
+        HelpID = "cui:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_SHOWRECENTLYFIRST";
         Pos = MAP_APPFONT ( HHO_COL_1a, HHO_ROW_11 ) ;
         Size = MAP_APPFONT ( HHO_COL_6 - HHO_COL_1a , 12 ) ;
         Text [ en-US ] = "Show recently used entries first";
     };
     CheckBox CB_AUTOREPLACEUNIQUE
     {
+        HelpID = "cui:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_AUTOREPLACEUNIQUE";
         Pos = MAP_APPFONT ( HHO_COL_1a, HHO_ROW_12 ) ;
         Size = MAP_APPFONT ( HHO_COL_6 - HHO_COL_1a , 12 ) ;
         Text [ en-US ] = "Replace all unique entries automatically";
     };
     PushButton PB_HHO_NEW
     {
+        HelpID = "cui:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_NEW";
         Pos = MAP_APPFONT ( HHO_COL_3 , HHO_ROW_2 ) ;
         Size = MAP_APPFONT ( HHO_COL_4 - HHO_COL_3 , 14 ) ;
         Text [ en-US ] = "New...";
     };
     PushButton PB_HHO_EDIT
     {
+        HelpID = "cui:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_EDIT";
         Pos = MAP_APPFONT ( HHO_COL_3 , HHO_ROW_4 ) ;
         Size = MAP_APPFONT ( HHO_COL_4 - HHO_COL_3 , 14 ) ;
         Text [ en-US ] = "Edit...";
     };
     PushButton PB_HHO_DELETE
     {
+        HelpID = "cui:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_DELETE";
         Pos = MAP_APPFONT ( HHO_COL_3 , HHO_ROW_6 ) ;
         Size = MAP_APPFONT ( HHO_COL_4 - HHO_COL_3 , 14 ) ;
         Text [ en-US ] = "Delete";
@@ -291,6 +308,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_NEWDICT
     };
     Edit ED_DICTNAME
     {
+        HelpID = "cui:Edit:RID_SVX_MDLG_HANGULHANJA_NEWDICT:ED_DICTNAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 55 , 14 ) ;
         Size = MAP_APPFONT ( 90 , 12 ) ;
@@ -340,6 +358,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_EDIT
     };
     ListBox LB_BOOK
     {
+        HelpID = "cui:ListBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_BOOK";
         Pos = MAP_APPFONT ( HHE_COL_3 , HHE_ROW_1 ) ;
         Size = MAP_APPFONT ( HHE_COL_4 - HHE_COL_3 , 60 ) ;
         DropDown = TRUE;
@@ -353,6 +372,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_EDIT
     };
     ComboBox LB_ORIGINAL
     {
+        HelpID = "cui:ComboBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_ORIGINAL";
         Pos = MAP_APPFONT ( HHE_COL_1 , HHE_ROW_5 ) ;
         Size = MAP_APPFONT ( HHE_COL_4 - HHE_COL_1 , 60 ) ;
         DropDown = TRUE;
@@ -366,6 +386,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_EDIT
     };
     Edit ED_1
     {
+        HelpID = "cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_1";
         Pos = MAP_APPFONT ( HHE_COL_1 , HHE_ROW_11 ) ;
         Size = MAP_APPFONT ( HHE_COL_3_1 - HHE_COL_1 , 12 ) ;
         Hide = False;
@@ -373,6 +394,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_EDIT
     };
     Edit ED_2
     {
+        HelpID = "cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_2";
         Pos = MAP_APPFONT ( HHE_COL_1 , HHE_ROW_11 + 12 ) ;
         Size = MAP_APPFONT ( HHE_COL_3_1 - HHE_COL_1 , 12 ) ;
         Hide = False;
@@ -380,6 +402,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_EDIT
     };
     Edit ED_3
     {
+        HelpID = "cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_3";
         Pos = MAP_APPFONT ( HHE_COL_1 , HHE_ROW_11 + 24 ) ;
         Size = MAP_APPFONT ( HHE_COL_3_1 - HHE_COL_1 , 12 ) ;
         Hide = False;
@@ -387,6 +410,7 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_EDIT
     };
     Edit ED_4
     {
+        HelpID = "cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_4";
         Pos = MAP_APPFONT ( HHE_COL_1 , HHE_ROW_11 + 36 ) ;
         Size = MAP_APPFONT ( HHE_COL_3_1 - HHE_COL_1 , 12 ) ;
         Hide = False;
@@ -401,12 +425,14 @@ ModalDialog RID_SVX_MDLG_HANGULHANJA_EDIT
     };
     PushButton PB_HHE_NEW
     {
+        HelpID = "cui:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_NEW";
         Pos = MAP_APPFONT ( HHE_COL_5 , HHE_ROW_a1 ) ;
         Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
         Text [ en-US ] = "New";
     };
     PushButton PB_HHE_DELETE
     {
+        HelpID = "cui:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_DELETE";
         Pos = MAP_APPFONT ( HHE_COL_5 , HHE_ROW_a3 ) ;
         Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
         Text [ en-US ] = "Delete";
diff --git a/cui/source/dialogs/hyperdlg.src b/cui/source/dialogs/hyperdlg.src
index 505291753..85dc8111c 100644
--- a/cui/source/dialogs/hyperdlg.src
+++ b/cui/source/dialogs/hyperdlg.src
@@ -56,18 +56,21 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET
     };
     RadioButton RB_LINKTYP_INTERNET
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_INTERNET";
         Pos = MAP_APPFONT( COL_2, 13 );
         Size = MAP_APPFONT( 57, 10 );
         Text [ en-US ] = "~Web";
     };
     RadioButton RB_LINKTYP_FTP
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_FTP";
         Pos = MAP_APPFONT( 114 + COL_DIFF, 13 );
         Size = MAP_APPFONT( 56 - COL_DIFF, 10 );
         Text [ en-US ] = "~FTP";
     };
     RadioButton RB_LINKTYP_TELNET
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_TELNET";
         Pos = MAP_APPFONT( 173, 13 );
         Size = MAP_APPFONT( 56, 10 );
         Text [ en-US ] = "~Telnet";
@@ -86,6 +89,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET
     };
     Edit ED_LOGIN
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_LOGIN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COL_2 , 42 ) ;
         Size = MAP_APPFONT ( 80 - COL_DIFF , 12 ) ;
@@ -98,6 +102,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET
     };
     Edit ED_PASSWD
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_PASSWD";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COL_2 , 59 ) ;
         Size = MAP_APPFONT ( 80 - COL_DIFF , 12 ) ;
@@ -105,6 +110,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET
     };
     CheckBox CBX_ANONYMOUS
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_HYPERLINK_INTERNET:CBX_ANONYMOUS";
         Pos = MAP_APPFONT ( COL_2 , 75 ) ;
         Size = MAP_APPFONT ( 89 - COL_DIFF , 10 ) ;
         TabStop = TRUE ;
@@ -112,6 +118,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET
     };
     ImageButton BTN_BROWSE
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_BROWSE";
         Pos = MAP_APPFONT ( 235, 24 ) ;
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT );
         TabStop = TRUE ;
@@ -131,6 +138,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET
     };
     ImageButton BTN_TARGET
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_TARGET";
         Pos = MAP_APPFONT ( 235, 40+2 ) ;
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT );
         TabStop = TRUE ;
@@ -162,6 +170,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET
     };
     ComboBox CB_FRAME
     {
+        HelpID = "cui:ComboBox:RID_SVXPAGE_HYPERLINK_INTERNET:CB_FRAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COL_2 , 104 ) ;
         Size = MAP_APPFONT ( 66 - COL_DIFF , 60 ) ;
@@ -177,6 +186,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET
     };
     ListBox LB_FORM
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_HYPERLINK_INTERNET:LB_FORM";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 160 , 104 ) ;
         Size = MAP_APPFONT ( 70 , 60 ) ;
@@ -198,6 +208,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET
     };
     Edit ED_INDICATION
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_INDICATION";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COL_2 , 122 ) ;
         Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ;
@@ -210,12 +221,14 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET
     };
     Edit ED_TEXT
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_TEXT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COL_2 , 139 ) ;
         Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ;
     };
     ImageButton BTN_SCRIPT
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_SCRIPT";
         Pos = MAP_APPFONT ( 235, 103-1 ) ;
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT );
         TabStop = TRUE ;
@@ -258,12 +271,14 @@ TabPage RID_SVXPAGE_HYPERLINK_MAIL
     };
     RadioButton RB_LINKTYP_MAIL
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_HYPERLINK_MAIL:RB_LINKTYP_MAIL";
         Pos = MAP_APPFONT( COL_2, 13 );
         Size = MAP_APPFONT( 56 - COL_DIFF, 10 );
         Text [ en-US ] = "~E-mail";
     };
     RadioButton RB_LINKTYP_NEWS
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_HYPERLINK_MAIL:RB_LINKTYP_NEWS";
         Pos = MAP_APPFONT( 113, 13 );
         Size = MAP_APPFONT( 56, 10 );
         Text [ en-US ] = "~News";
@@ -282,12 +297,14 @@ TabPage RID_SVXPAGE_HYPERLINK_MAIL
     };
     Edit ED_SUBJECT
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_SUBJECT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COL_2 , 42 ) ;
         Size = MAP_APPFONT ( 176 - COL_DIFF , 12 ) ;
     };
     ImageButton BTN_ADRESSBOOK
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_MAIL:BTN_ADRESSBOOK";
         Pos = MAP_APPFONT ( 235, 24 ) ;
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT );
         TabStop = TRUE ;
@@ -321,6 +338,7 @@ TabPage RID_SVXPAGE_HYPERLINK_MAIL
     };
     ComboBox CB_FRAME
     {
+        HelpID = "cui:ComboBox:RID_SVXPAGE_HYPERLINK_MAIL:CB_FRAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COL_2 , 104 ) ;
         Size = MAP_APPFONT ( 66 - COL_DIFF , 60 ) ;
@@ -336,6 +354,7 @@ TabPage RID_SVXPAGE_HYPERLINK_MAIL
     };
     ListBox LB_FORM
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_HYPERLINK_MAIL:LB_FORM";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 160 , 104 ) ;
         Size = MAP_APPFONT ( 70 , 60 ) ;
@@ -357,6 +376,7 @@ TabPage RID_SVXPAGE_HYPERLINK_MAIL
     };
     Edit ED_INDICATION
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_INDICATION";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COL_2 , 122 ) ;
         Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ;
@@ -369,12 +389,14 @@ TabPage RID_SVXPAGE_HYPERLINK_MAIL
     };
     Edit ED_TEXT
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_TEXT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COL_2 , 139 ) ;
         Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ;
     };
     ImageButton BTN_SCRIPT
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_MAIL:BTN_SCRIPT";
         Pos = MAP_APPFONT ( 235, 103-1 ) ;
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT );
         TabStop = TRUE ;
@@ -422,6 +444,7 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT
     };
     ImageButton BTN_FILEOPEN
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_FILEOPEN";
         Pos = MAP_APPFONT ( 235, 14 ) ;
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT );
         TabStop = TRUE ;
@@ -453,6 +476,7 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT
     };
     Edit ED_TARGET_DOC
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_TARGET_DOC";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COL_2 , 52 ) ;
         Size = MAP_APPFONT ( 176 - COL_DIFF , 12 ) ;
@@ -471,6 +495,7 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT
     };
     ImageButton BTN_BROWSE
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_BROWSE";
         Pos = MAP_APPFONT ( 235, 51 ) ;
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT );
         TabStop = TRUE ;
@@ -502,6 +527,7 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT
     };
     ComboBox CB_FRAME
     {
+        HelpID = "cui:ComboBox:RID_SVXPAGE_HYPERLINK_DOCUMENT:CB_FRAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COL_2 , 104 ) ;
         Size = MAP_APPFONT ( 66 - COL_DIFF , 60 ) ;
@@ -517,6 +543,7 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT
     };
     ListBox LB_FORM
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_HYPERLINK_DOCUMENT:LB_FORM";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 160 , 104 ) ;
         Size = MAP_APPFONT ( 70 , 60 ) ;
@@ -538,6 +565,7 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT
     };
     Edit ED_INDICATION
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_INDICATION";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COL_2 , 122 ) ;
         Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ;
@@ -550,12 +578,14 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT
     };
     Edit ED_TEXT
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_TEXT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COL_2 , 139 ) ;
         Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ;
     };
     ImageButton BTN_SCRIPT
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_SCRIPT";
         Pos = MAP_APPFONT ( 235, 103-1 ) ;
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT );
         TabStop = TRUE ;
@@ -597,12 +627,14 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT
     };
     RadioButton RB_EDITNOW
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:RB_EDITNOW";
         Pos = MAP_APPFONT( COL_2, 13 );
         Size = MAP_APPFONT( 85 - COL_DIFF, 10 );
         Text [ en-US ] = "Edit ~now";
     };
     RadioButton RB_EDITLATER
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:RB_EDITLATER";
         Pos = MAP_APPFONT( 142, 13 );
         Size = MAP_APPFONT( 84, 10 );
         Text [ en-US ] = "Edit ~later";
@@ -615,6 +647,7 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT
     };
     Edit ED_PATH_NEWDOC
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_PATH_NEWDOC";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COL_2 , 25 ) ;
         Size = MAP_APPFONT ( 176 - COL_DIFF , 12 ) ;
@@ -627,6 +660,7 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT
     };
     ListBox LB_DOCUMENT_TYPES
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:LB_DOCUMENT_TYPES";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COL_2 , 42 ) ;
         Size = MAP_APPFONT ( 176 - COL_DIFF , 40 ) ;
@@ -635,6 +669,7 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT
     };
     ImageButton BTN_CREATE
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:BTN_CREATE";
         Pos = MAP_APPFONT ( 235, 24 ) ;
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT );
         TabStop = TRUE ;
@@ -667,6 +702,7 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT
     };
     ComboBox CB_FRAME
     {
+        HelpID = "cui:ComboBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:CB_FRAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COL_2 , 104 ) ;
         Size = MAP_APPFONT ( 66 - COL_DIFF , 60 ) ;
@@ -682,6 +718,7 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT
     };
     ListBox LB_FORM
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:LB_FORM";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 160 , 104 ) ;
         Size = MAP_APPFONT ( 70 , 60 ) ;
@@ -703,6 +740,7 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT
     };
     Edit ED_INDICATION
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_INDICATION";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COL_2 , 122 ) ;
         Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ;
@@ -715,12 +753,14 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT
     };
     Edit ED_TEXT
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_TEXT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( COL_2 , 139 ) ;
         Size = MAP_APPFONT ( 194 - COL_DIFF , 12 ) ;
     };
     ImageButton BTN_SCRIPT
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:BTN_SCRIPT";
         Pos = MAP_APPFONT ( 235, 103-1 ) ;
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_HEIGHT, HYPERDLG_IMGBUTTON_HEIGHT );
         TabStop = TRUE ;
diff --git a/cui/source/dialogs/hyphen.src b/cui/source/dialogs/hyphen.src
index f90048a61..0ad582520 100644
--- a/cui/source/dialogs/hyphen.src
+++ b/cui/source/dialogs/hyphen.src
@@ -54,6 +54,7 @@ ModalDialog RID_SVXDLG_HYPHENATE
     };
     Edit ED_WORD
     {
+        HelpID = "cui:Edit:RID_SVXDLG_HYPHENATE:ED_WORD";
         BORDER = TRUE ;
         Pos = MAP_APPFONT ( 5 , 17 ) ;
         Size = MAP_APPFONT ( 132 , 12 ) ;
@@ -62,6 +63,7 @@ ModalDialog RID_SVXDLG_HYPHENATE
     };
     ImageButton BTN_LEFT
     {
+        HelpID = "cui:ImageButton:RID_SVXDLG_HYPHENATE:BTN_LEFT";
         Pos = MAP_APPFONT ( 56 , 33 ) ;
         Size = MAP_APPFONT ( 14 , 14 ) ;
         TABSTOP = TRUE ;
@@ -69,6 +71,7 @@ ModalDialog RID_SVXDLG_HYPHENATE
     };
     ImageButton BTN_RIGHT
     {
+        HelpID = "cui:ImageButton:RID_SVXDLG_HYPHENATE:BTN_RIGHT";
         Pos = MAP_APPFONT ( 75 , 33 ) ;
         Size = MAP_APPFONT ( 14 , 14 ) ;
         TABSTOP = TRUE ;
@@ -84,6 +87,7 @@ ModalDialog RID_SVXDLG_HYPHENATE
     };
     PushButton BTN_HYPH_CONTINUE
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_CONTINUE";
         Pos = MAP_APPFONT ( 144 , 35 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Skip" ;
@@ -91,6 +95,7 @@ ModalDialog RID_SVXDLG_HYPHENATE
     };
     PushButton BTN_HYPH_DELETE
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_DELETE";
         Pos = MAP_APPFONT ( 144 , 52 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Remove" ;
@@ -109,6 +114,7 @@ ModalDialog RID_SVXDLG_HYPHENATE
     };
     PushButton BTN_HYPH_ALL
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_ALL";
         Pos = MAP_APPFONT ( 63 , 93 ) ;
         Size = MAP_APPFONT ( 74 , 14 ) ;
         Text [ en-US ] = "Hyphenate ~All" ;
diff --git a/cui/source/dialogs/insrc.src b/cui/source/dialogs/insrc.src
index 6139dcd37..4ba5ebf1e 100644
--- a/cui/source/dialogs/insrc.src
+++ b/cui/source/dialogs/insrc.src
@@ -31,6 +31,7 @@
 
 ModalDialog DLG_INS_ROW_COL
 {
+    HelpID = "cui:ModalDialog:DLG_INS_ROW_COL";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 136 , 84 ) ;
@@ -57,6 +58,7 @@ ModalDialog DLG_INS_ROW_COL
     };
     RadioButton CB_POS_BEFORE
     {
+        HelpID = "cui:RadioButton:DLG_INS_ROW_COL:CB_POS_BEFORE";
         Pos = MAP_APPFONT ( 12 , 49 ) ;
         Size = MAP_APPFONT ( 56 , 10 ) ;
         Text [ en-US ] = "~Before" ;
@@ -64,6 +66,7 @@ ModalDialog DLG_INS_ROW_COL
     };
     RadioButton CB_POS_AFTER
     {
+        HelpID = "cui:RadioButton:DLG_INS_ROW_COL:CB_POS_AFTER";
         Pos = MAP_APPFONT ( 12 , 62 ) ;
         Size = MAP_APPFONT ( 56 , 10 ) ;
         Text [ en-US ] = "A~fter" ;
@@ -72,6 +75,7 @@ ModalDialog DLG_INS_ROW_COL
     };
     NumericField ED_COUNT
     {
+        HelpID = "cui:NumericField:DLG_INS_ROW_COL:ED_COUNT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 44 , 14 ) ;
         Size = MAP_APPFONT ( 24 , 12 ) ;
diff --git a/cui/source/dialogs/multipat.src b/cui/source/dialogs/multipat.src
index 45695d850..a7b56d501 100644
--- a/cui/source/dialogs/multipat.src
+++ b/cui/source/dialogs/multipat.src
@@ -47,6 +47,7 @@ ModalDialog RID_SVXDLG_MULTIPATH
     };
     ListBox LB_MULTIPATH
     {
+        HelpID = "cui:ListBox:RID_SVXDLG_MULTIPATH:LB_MULTIPATH";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 189 , 80 ) ;
@@ -70,12 +71,14 @@ ModalDialog RID_SVXDLG_MULTIPATH
     };
     PushButton BTN_ADD_MULTIPATH
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_MULTIPATH:BTN_ADD_MULTIPATH";
         Pos = MAP_APPFONT ( 204 , 14 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Add..." ;
     };
     PushButton BTN_DEL_MULTIPATH
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_MULTIPATH:BTN_DEL_MULTIPATH";
         Pos = MAP_APPFONT ( 204 , 31 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Delete" ;
diff --git a/cui/source/dialogs/newtabledlg.src b/cui/source/dialogs/newtabledlg.src
index 67e64254c..4ac627599 100644
--- a/cui/source/dialogs/newtabledlg.src
+++ b/cui/source/dialogs/newtabledlg.src
@@ -30,6 +30,7 @@
 
 ModalDialog RID_SVX_NEWTABLE_DLG
 {
+    HelpID = "cui:ModalDialog:RID_SVX_NEWTABLE_DLG";
     OutputSize = TRUE;
     SVLook = TRUE ;
     Moveable = TRUE ;
@@ -44,6 +45,7 @@ ModalDialog RID_SVX_NEWTABLE_DLG
     };
     NumericField NF_COLUMNS
     {
+        HelpID = "cui:NumericField:RID_SVX_NEWTABLE_DLG:NF_COLUMNS";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 80 , 6 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -63,6 +65,7 @@ ModalDialog RID_SVX_NEWTABLE_DLG
     };
     NumericField NF_ROWS
     {
+        HelpID = "cui:NumericField:RID_SVX_NEWTABLE_DLG:NF_ROWS";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 80 , 6+15 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
diff --git a/cui/source/dialogs/postdlg.src b/cui/source/dialogs/postdlg.src
index 6b55eb877..2542956da 100644
--- a/cui/source/dialogs/postdlg.src
+++ b/cui/source/dialogs/postdlg.src
@@ -61,6 +61,7 @@ ModalDialog RID_SVXDLG_POSTIT
     };
     MultiLineEdit ED_EDIT
     {
+        HelpID = "cui:MultiLineEdit:RID_SVXDLG_POSTIT:ED_EDIT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 38 ) ;
         Size = MAP_APPFONT ( 123 , 72 ) ;
@@ -93,12 +94,14 @@ ModalDialog RID_SVXDLG_POSTIT
     };
     ImageButton BTN_PREV
     {
+        HelpID = "cui:ImageButton:RID_SVXDLG_POSTIT:BTN_PREV";
         Pos = MAP_APPFONT ( 141 , 60 ) ;
         Size = MAP_APPFONT ( 24 , 14 ) ;
         Symbol = IMAGEBUTTON_ARROW_LEFT ;
     };
     ImageButton BTN_NEXT
     {
+        HelpID = "cui:ImageButton:RID_SVXDLG_POSTIT:BTN_NEXT";
         Pos = MAP_APPFONT ( 167 , 60 ) ;
         Size = MAP_APPFONT ( 24 , 14 ) ;
         Symbol = IMAGEBUTTON_ARROW_RIGHT ;
@@ -111,6 +114,7 @@ ModalDialog RID_SVXDLG_POSTIT
     };
     PushButton BTN_AUTHOR
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_POSTIT:BTN_AUTHOR";
         Pos = MAP_APPFONT ( 75 , 114 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "Author" ;
diff --git a/cui/source/dialogs/scriptdlg.src b/cui/source/dialogs/scriptdlg.src
index 292c862fe..a157a28a3 100644
--- a/cui/source/dialogs/scriptdlg.src
+++ b/cui/source/dialogs/scriptdlg.src
@@ -106,6 +106,7 @@ ModalDialog RID_DLG_SCRIPTORGANIZER
 
     PushButton SF_PB_RUN
     {
+        HelpID = "cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RUN";
         Pos = MAP_APPFONT ( 144 , 6 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         DefButton = TRUE;
@@ -121,6 +122,7 @@ ModalDialog RID_DLG_SCRIPTORGANIZER
 
     PushButton SF_PB_CREATE
     {
+        HelpID = "cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_CREATE";
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Pos = MAP_APPFONT ( 144 , 60 ) ;
         Text [ en-US ] = "~Create..." ;
@@ -128,6 +130,7 @@ ModalDialog RID_DLG_SCRIPTORGANIZER
     };
     PushButton SF_PB_EDIT
     {
+        HelpID = "cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_EDIT";
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Pos = MAP_APPFONT ( 144 , 77 ) ;
         Text [ en-US ] = "~Edit" ;
@@ -135,12 +138,14 @@ ModalDialog RID_DLG_SCRIPTORGANIZER
     };
     PushButton SF_PB_RENAME
     {
+        HelpID = "cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RENAME";
         Pos = MAP_APPFONT ( 144 , 94 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "Rename..." ;
     };
     PushButton SF_PB_DEL
     {
+        HelpID = "cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_DEL";
         Pos = MAP_APPFONT ( 144 , 114 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "~Delete..." ;
@@ -156,6 +161,7 @@ ModalDialog RID_DLG_SCRIPTORGANIZER
 };
 ModalDialog RID_DLG_NEWLIB
 {
+    HelpID = "cui:ModalDialog:RID_DLG_NEWLIB";
     Text [ en-US ] = "Create Library" ;
     Size = MAP_APPFONT ( 160 , 50 ) ;
     Moveable = TRUE ;
@@ -182,6 +188,7 @@ ModalDialog RID_DLG_NEWLIB
     };
     Edit ED_LIBNAME
     {
+        HelpID = "cui:Edit:RID_DLG_NEWLIB:ED_LIBNAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 59 ) ;
         Size = MAP_APPFONT ( 92 , 12 ) ;
diff --git a/cui/source/dialogs/showcols.src b/cui/source/dialogs/showcols.src
index f4d124d17..556aa85d6 100644
--- a/cui/source/dialogs/showcols.src
+++ b/cui/source/dialogs/showcols.src
@@ -29,6 +29,7 @@
 
 ModalDialog RID_SVX_DLG_SHOWGRIDCOLUMNS
 {
+    HelpID = "cui:ModalDialog:RID_SVX_DLG_SHOWGRIDCOLUMNS";
     OutputSize = TRUE;
     SVLook = TRUE ;
     Size = MAP_APPFONT( 200, 117 );
@@ -45,6 +46,7 @@ ModalDialog RID_SVX_DLG_SHOWGRIDCOLUMNS
 
     ListBox 1
     {
+        HelpID = "cui:ListBox:RID_SVX_DLG_SHOWGRIDCOLUMNS:1";
         Border = TRUE;
         Pos = MAP_APPFONT( 6, 39 );
         Size = MAP_APPFONT( 188, 55 );
diff --git a/cui/source/dialogs/splitcelldlg.src b/cui/source/dialogs/splitcelldlg.src
index ea5cbc7d1..62ea4613e 100644
--- a/cui/source/dialogs/splitcelldlg.src
+++ b/cui/source/dialogs/splitcelldlg.src
@@ -30,6 +30,7 @@
 
 ModalDialog RID_SVX_SPLITCELLDLG
 {
+    HelpID = "cui:ModalDialog:RID_SVX_SPLITCELLDLG";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 169 , 108 ) ;
@@ -64,6 +65,7 @@ ModalDialog RID_SVX_SPLITCELLDLG
     };
     NumericField ED_COUNT
     {
+        HelpID = "cui:NumericField:RID_SVX_SPLITCELLDLG:ED_COUNT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 82 , 14 ) ;
         Size = MAP_APPFONT ( 21 , 12 ) ;
@@ -85,6 +87,7 @@ ModalDialog RID_SVX_SPLITCELLDLG
     };
     ImageRadioButton RB_HORZ
     {
+        HelpID = "cui:ImageRadioButton:RID_SVX_SPLITCELLDLG:RB_HORZ";
         Pos = MAP_APPFONT ( 12 , 47 ) ;
         Size = MAP_APPFONT ( 90 , 18 ) ;
         Group = TRUE;
@@ -98,6 +101,7 @@ ModalDialog RID_SVX_SPLITCELLDLG
     };
     CheckBox CB_PROP
     {
+        HelpID = "cui:CheckBox:RID_SVX_SPLITCELLDLG:CB_PROP";
         Pos = MAP_APPFONT ( 18 , 68 ) ;
         Size = MAP_APPFONT ( 91 , 12 ) ;
         Text [ en-US ] = "~Into equal proportions";
@@ -112,6 +116,7 @@ ModalDialog RID_SVX_SPLITCELLDLG
         };
     ImageRadioButton RB_VERT
     {
+        HelpID = "cui:ImageRadioButton:RID_SVX_SPLITCELLDLG:RB_VERT";
         Pos = MAP_APPFONT ( 12 , 84 ) ;
         Size = MAP_APPFONT ( 90 , 18 ) ;
         Text [ en-US ] = "~Vertically" ;
diff --git a/cui/source/dialogs/srchxtra.src b/cui/source/dialogs/srchxtra.src
index d18c3c4cf..15d9ac703 100644
--- a/cui/source/dialogs/srchxtra.src
+++ b/cui/source/dialogs/srchxtra.src
@@ -148,6 +148,7 @@ ModalDialog RID_SVXDLG_SEARCHSIMILARITY
     };
     NumericField NF_OTHER
     {
+        HelpID = "cui:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_OTHER";
         Pos = MAP_APPFONT ( 86 , 14 ) ;
         Size = MAP_APPFONT ( 24 , 12 ) ;
         Border = TRUE ;
@@ -169,6 +170,7 @@ ModalDialog RID_SVXDLG_SEARCHSIMILARITY
     };
     NumericField NF_LONGER
     {
+        HelpID = "cui:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_LONGER";
         Pos = MAP_APPFONT ( 86 , 28 ) ;
         Size = MAP_APPFONT ( 24 , 12 ) ;
         Border = TRUE ;
@@ -190,6 +192,7 @@ ModalDialog RID_SVXDLG_SEARCHSIMILARITY
     };
     NumericField NF_SHORTER
     {
+        HelpID = "cui:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_SHORTER";
         Pos = MAP_APPFONT ( 86 , 44 ) ;
         Size = MAP_APPFONT ( 24 , 12 ) ;
         Border = TRUE ;
@@ -205,6 +208,7 @@ ModalDialog RID_SVXDLG_SEARCHSIMILARITY
     };
     CheckBox CB_RELAX
     {
+        HelpID = "cui:CheckBox:RID_SVXDLG_SEARCHSIMILARITY:CB_RELAX";
         Pos = MAP_APPFONT ( 12 , 60 ) ;
         Size = MAP_APPFONT ( 98 , 10 ) ;
         Text [ en-US ] = "~Combine" ;
diff --git a/cui/source/dialogs/svuidlg.src b/cui/source/dialogs/svuidlg.src
index 5cb13c897..78c276f36 100644
--- a/cui/source/dialogs/svuidlg.src
+++ b/cui/source/dialogs/svuidlg.src
@@ -30,6 +30,7 @@
 
 ModalDialog MD_PASTE_OBJECT
 {
+    HelpID = "cui:ModalDialog:MD_PASTE_OBJECT";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Moveable = TRUE ;
@@ -49,6 +50,7 @@ ModalDialog MD_PASTE_OBJECT
     };
     RadioButton RB_PASTE
     {
+        HelpID = "cui:RadioButton:MD_PASTE_OBJECT:RB_PASTE";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 12 , 48 ) ;
         Size = MAP_APPFONT ( 63 , 10 ) ;
@@ -57,6 +59,7 @@ ModalDialog MD_PASTE_OBJECT
     };
     RadioButton RB_PASTE_LINK
     {
+        HelpID = "cui:RadioButton:MD_PASTE_OBJECT:RB_PASTE_LINK";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 78 , 48 ) ;
         Size = MAP_APPFONT ( 63 , 10 ) ;
@@ -64,12 +67,14 @@ ModalDialog MD_PASTE_OBJECT
     };
     ListBox LB_INSERT_LIST
     {
+        HelpID = "cui:ListBox:MD_PASTE_OBJECT:LB_INSERT_LIST";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 49 ) ;
         Size = MAP_APPFONT ( 202 , 74 ) ;
     };
     CheckBox CB_DISPLAY_AS_ICON
     {
+        HelpID = "cui:CheckBox:MD_PASTE_OBJECT:CB_DISPLAY_AS_ICON";
         Hide = TRUE ;
         Disable = TRUE ;
         Pos = MAP_APPFONT ( 150 , 62 ) ;
@@ -87,6 +92,7 @@ ModalDialog MD_PASTE_OBJECT
 */
     PushButton PB_CHANGE_ICON
     {
+        HelpID = "cui:PushButton:MD_PASTE_OBJECT:PB_CHANGE_ICON";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 150 , 111 ) ;
         Size = MAP_APPFONT ( 64 , 14 ) ;
@@ -121,6 +127,7 @@ ModalDialog MD_PASTE_OBJECT
 };
 ModalDialog MD_UPDATE_BASELINKS
 {
+    HelpID = "cui:ModalDialog:MD_UPDATE_BASELINKS";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 337 , 166 ) ;
@@ -164,24 +171,28 @@ ModalDialog MD_UPDATE_BASELINKS
     };
     PushButton PB_UPDATE_NOW
     {
+        HelpID = "cui:PushButton:MD_UPDATE_BASELINKS:PB_UPDATE_NOW";
         Pos = MAP_APPFONT ( 270 , 43 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "~Update" ;
     };
     PushButton PB_OPEN_SOURCE
     {
+        HelpID = "cui:PushButton:MD_UPDATE_BASELINKS:PB_OPEN_SOURCE";
         Pos = MAP_APPFONT ( 270 , 60 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "~Open" ;
     };
     PushButton PB_CHANGE_SOURCE
     {
+        HelpID = "cui:PushButton:MD_UPDATE_BASELINKS:PB_CHANGE_SOURCE";
         Pos = MAP_APPFONT ( 270 , 77 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "~Modify..." ;
     };
     PushButton PB_BREAK_LINK
     {
+        HelpID = "cui:PushButton:MD_UPDATE_BASELINKS:PB_BREAK_LINK";
         Pos = MAP_APPFONT ( 270 , 94 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "~Break Link" ;
@@ -212,12 +223,14 @@ ModalDialog MD_UPDATE_BASELINKS
     };
     RadioButton RB_AUTOMATIC
     {
+        HelpID = "cui:RadioButton:MD_UPDATE_BASELINKS:RB_AUTOMATIC";
         Pos = MAP_APPFONT ( 70 , 150 ) ;
         Size = MAP_APPFONT ( 60 , 10 ) ;
         Text [ en-US ] = "~Automatic" ;
     };
     RadioButton RB_MANUAL
     {
+        HelpID = "cui:RadioButton:MD_UPDATE_BASELINKS:RB_MANUAL";
         Pos = MAP_APPFONT ( 133 , 150 ) ;
         Size = MAP_APPFONT ( 60 , 10 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? ~Manuell : Ma~nuell */
@@ -273,6 +286,7 @@ ModalDialog MD_UPDATE_BASELINKS
 };
 ModalDialog MD_LINKEDIT
 {
+    HelpID = "cui:ModalDialog:MD_LINKEDIT";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 222 , 58 ) ;
@@ -304,6 +318,7 @@ ModalDialog MD_LINKEDIT
     };
     Edit ED_FULL_SOURCE_NAME
     {
+        HelpID = "cui:Edit:MD_LINKEDIT:ED_FULL_SOURCE_NAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 5 , 35 ) ;
         Size = MAP_APPFONT ( 155 , 12 ) ;
@@ -312,42 +327,49 @@ ModalDialog MD_LINKEDIT
 };
 ModalDialog MD_INSERT_OLEOBJECT
 {
+    HelpID = "cui:ModalDialog:MD_INSERT_OLEOBJECT";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 284 , 105 ) ;
     Moveable = TRUE ;
     RadioButton RB_NEW_OBJECT
     {
+        HelpID = "cui:RadioButton:MD_INSERT_OLEOBJECT:RB_NEW_OBJECT";
         Pos = MAP_APPFONT ( 6 , 6 ) ;
         Size = MAP_APPFONT ( 81 , 10 ) ;
         Text [ en-US ] = "~Create new" ;
     };
     RadioButton RB_OBJECT_FROMFILE
     {
+        HelpID = "cui:RadioButton:MD_INSERT_OLEOBJECT:RB_OBJECT_FROMFILE";
         Pos = MAP_APPFONT ( 90 , 6 ) ;
         Size = MAP_APPFONT ( 81 , 10 ) ;
         Text [ en-US ] = "Create from ~file" ;
     };
     ListBox LB_OBJECTTYPE
     {
+        HelpID = "cui:ListBox:MD_INSERT_OLEOBJECT:LB_OBJECTTYPE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 33 ) ;
         Size = MAP_APPFONT ( 204 , 60 ) ;
     };
     Edit ED_FILEPATH
     {
+        HelpID = "cui:Edit:MD_INSERT_OLEOBJECT:ED_FILEPATH";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 33 ) ;
         Size = MAP_APPFONT ( 204 , 12 ) ;
     };
     PushButton BTN_FILEPATH
     {
+        HelpID = "cui:PushButton:MD_INSERT_OLEOBJECT:BTN_FILEPATH";
         Pos = MAP_APPFONT ( 166 , 48 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Search..." ;
     };
     CheckBox CB_FILELINK
     {
+        HelpID = "cui:CheckBox:MD_INSERT_OLEOBJECT:CB_FILELINK";
         Pos = MAP_APPFONT ( 12 , 48 ) ;
         Size = MAP_APPFONT ( 138 , 10 ) ;
         Text [ en-US ] = "~Link to file" ;
@@ -385,18 +407,21 @@ ModalDialog MD_INSERT_OLEOBJECT
 };
 ModalDialog MD_INSERT_OBJECT_PLUGIN
 {
+    HelpID = "cui:ModalDialog:MD_INSERT_OBJECT_PLUGIN";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 284 , 123 ) ;
     Moveable = TRUE ;
     Edit ED_FILEURL
     {
+        HelpID = "cui:Edit:MD_INSERT_OBJECT_PLUGIN:ED_FILEURL";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 204 , 12 ) ;
     };
     PushButton BTN_FILEURL
     {
+        HelpID = "cui:PushButton:MD_INSERT_OBJECT_PLUGIN:BTN_FILEURL";
         Pos = MAP_APPFONT ( 166 , 29 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Browse..." ;
@@ -409,6 +434,7 @@ ModalDialog MD_INSERT_OBJECT_PLUGIN
     };
     MultiLineEdit ED_PLUGINS_OPTIONS
     {
+        HelpID = "cui:MultiLineEdit:MD_INSERT_OBJECT_PLUGIN:ED_PLUGINS_OPTIONS";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 66 ) ;
         Size = MAP_APPFONT ( 204 , 45 ) ;
@@ -441,6 +467,7 @@ ModalDialog MD_INSERT_OBJECT_PLUGIN
 };
 ModalDialog MD_INSERT_OBJECT_APPLET
 {
+    HelpID = "cui:ModalDialog:MD_INSERT_OBJECT_APPLET";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 284 , 164 ) ;
@@ -453,6 +480,7 @@ ModalDialog MD_INSERT_OBJECT_APPLET
     };
     Edit ED_CLASSFILE
     {
+        HelpID = "cui:Edit:MD_INSERT_OBJECT_APPLET:ED_CLASSFILE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 27 ) ;
         Size = MAP_APPFONT ( 204 , 12 ) ;
@@ -465,12 +493,14 @@ ModalDialog MD_INSERT_OBJECT_APPLET
     };
     Edit ED_CLASSLOCATION
     {
+        HelpID = "cui:Edit:MD_INSERT_OBJECT_APPLET:ED_CLASSLOCATION";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 55 ) ;
         Size = MAP_APPFONT ( 204 , 12 ) ;
     };
     PushButton BTN_CLASS
     {
+        HelpID = "cui:PushButton:MD_INSERT_OBJECT_APPLET:BTN_CLASS";
         Pos = MAP_APPFONT ( 166 , 70 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Search..." ;
@@ -483,6 +513,7 @@ ModalDialog MD_INSERT_OBJECT_APPLET
     };
     MultiLineEdit ED_APPLET_OPTIONS
     {
+        HelpID = "cui:MultiLineEdit:MD_INSERT_OBJECT_APPLET:ED_APPLET_OPTIONS";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 107 ) ;
         Size = MAP_APPFONT ( 204 , 45 ) ;
@@ -524,6 +555,7 @@ Control TB_LINKS
 
 ModalDialog MD_INSERT_OBJECT_IFRAME
 {
+    HelpID = "cui:ModalDialog:MD_INSERT_OBJECT_IFRAME";
     Size = MAP_APPFONT ( 302 , 98 ) ;
     Hide = TRUE ;
     Moveable = TRUE ;
@@ -554,6 +586,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME
     };
     Edit ED_FRAMENAME
     {
+        HelpID = "cui:Edit:MD_INSERT_OBJECT_IFRAME:ED_FRAMENAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 45 , 6 ) ;
         Size = MAP_APPFONT ( 178 , 12 ) ;
@@ -567,6 +600,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME
     };
     Edit ED_URL
     {
+        HelpID = "cui:Edit:MD_INSERT_OBJECT_IFRAME:ED_URL";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 45 , 24 ) ;
         Size = MAP_APPFONT ( 178 , 12 ) ;
@@ -574,6 +608,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME
     };
     PushButton BT_FILEOPEN
     {
+        HelpID = "cui:PushButton:MD_INSERT_OBJECT_IFRAME:BT_FILEOPEN";
         Pos = MAP_APPFONT ( 226 , 24 ) ;
         Size = MAP_APPFONT ( 14 , 14 ) ;
         Text = "~..." ;
@@ -581,6 +616,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME
     };
     RadioButton RB_SCROLLINGON
     {
+        HelpID = "cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGON";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 12 , 53 ) ;
         Size = MAP_APPFONT ( 54 , 10 ) ;
@@ -588,6 +624,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME
     };
     RadioButton RB_SCROLLINGOFF
     {
+        HelpID = "cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGOFF";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 12 , 66 ) ;
         Size = MAP_APPFONT ( 54 , 10 ) ;
@@ -595,6 +632,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME
     };
     RadioButton RB_SCROLLINGAUTO
     {
+        HelpID = "cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGAUTO";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 12 , 79 ) ;
         Size = MAP_APPFONT ( 54 , 10 ) ;
@@ -608,6 +646,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME
     };
     RadioButton RB_FRMBORDER_ON
     {
+        HelpID = "cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_FRMBORDER_ON";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 81 , 53 ) ;
         Size = MAP_APPFONT ( 42 , 10 ) ;
@@ -615,6 +654,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME
     };
     RadioButton RB_FRMBORDER_OFF
     {
+        HelpID = "cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_FRMBORDER_OFF";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 81 , 66 ) ;
         Size = MAP_APPFONT ( 42 , 10 ) ;
@@ -639,6 +679,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME
     };
     NumericField NM_MARGINWIDTH
     {
+        HelpID = "cui:NumericField:MD_INSERT_OBJECT_IFRAME:NM_MARGINWIDTH";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 167 , 54 ) ;
         Size = MAP_APPFONT ( 20 , 12 ) ;
@@ -652,6 +693,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME
     };
     CheckBox CB_MARGINWIDTHDEFAULT
     {
+        HelpID = "cui:CheckBox:MD_INSERT_OBJECT_IFRAME:CB_MARGINWIDTHDEFAULT";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 190 , 56 ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
@@ -665,6 +707,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME
     };
     NumericField NM_MARGINHEIGHT
     {
+        HelpID = "cui:NumericField:MD_INSERT_OBJECT_IFRAME:NM_MARGINHEIGHT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 167 , 72 ) ;
         Size = MAP_APPFONT ( 20 , 12 ) ;
@@ -678,6 +721,7 @@ ModalDialog MD_INSERT_OBJECT_IFRAME
     };
     CheckBox CB_MARGINHEIGHTDEFAULT
     {
+        HelpID = "cui:CheckBox:MD_INSERT_OBJECT_IFRAME:CB_MARGINHEIGHTDEFAULT";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 190 , 74 ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
diff --git a/cui/source/dialogs/tbxform.src b/cui/source/dialogs/tbxform.src
index a5f43aae6..8af5e3b0b 100644
--- a/cui/source/dialogs/tbxform.src
+++ b/cui/source/dialogs/tbxform.src
@@ -28,6 +28,7 @@
 
 ModalDialog RID_SVX_DLG_INPUTRECORDNO
 {
+    HelpID = "cui:ModalDialog:RID_SVX_DLG_INPUTRECORDNO";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 130 , 45 ) ;
@@ -43,6 +44,7 @@ ModalDialog RID_SVX_DLG_INPUTRECORDNO
     };
     NumericField 1
     {
+        HelpID = "cui:NumericField:RID_SVX_DLG_INPUTRECORDNO:1";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 79 , 6 ) ;
         Size = MAP_APPFONT ( 45 , 12 ) ;
diff --git a/cui/source/dialogs/thesdlg.src b/cui/source/dialogs/thesdlg.src
old mode 100755
new mode 100644
index 815e61490..5ccf36317
--- a/cui/source/dialogs/thesdlg.src
+++ b/cui/source/dialogs/thesdlg.src
@@ -50,6 +50,7 @@ ModalDialog RID_SVXDLG_THESAURUS
     
     ImageButton BTN_LEFT
     {
+        HelpID = "cui:ImageButton:RID_SVXDLG_THESAURUS:BTN_LEFT";
         Pos = MAP_APPFONT ( 5 , 15 ) ;
         Size = MAP_APPFONT ( 14 , 14 ) ;
         TABSTOP = TRUE ;
@@ -64,12 +65,14 @@ ModalDialog RID_SVXDLG_THESAURUS
     };
     ComboBox CB_WORD
     {
+        HelpID = "cui:ComboBox:RID_SVXDLG_THESAURUS:CB_WORD";
         DropDown = TRUE ;
         Pos = MAP_APPFONT ( 24 , 16 ) ;
         Size = MAP_APPFONT ( 141 , 60 ) ;   // have drop down space for several lines 
     };
     MenuButton MB_LANGUAGE
     {
+        HelpID = "cui:MenuButton:RID_SVXDLG_THESAURUS:MB_LANGUAGE";
         Pos = MAP_APPFONT ( 170 , 16 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "~Language" ;
@@ -100,6 +103,7 @@ ModalDialog RID_SVXDLG_THESAURUS
     };
     Edit ED_REPL
     {
+        HelpID = "cui:Edit:RID_SVXDLG_THESAURUS:ED_REPL";
         BORDER = TRUE ;
         Pos = MAP_APPFONT ( 5 , 184 ) ;
         Size = MAP_APPFONT ( 225 , 12 ) ;
diff --git a/cui/source/dialogs/zoom.src b/cui/source/dialogs/zoom.src
index 341d33144..9224f87fe 100644
--- a/cui/source/dialogs/zoom.src
+++ b/cui/source/dialogs/zoom.src
@@ -47,36 +47,42 @@ ModalDialog RID_SVXDLG_ZOOM
     };
     RadioButton BTN_OPTIMAL
     {
+        HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_OPTIMAL";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 105 , 10 ) ;
         Text [ en-US ] = "~Optimal" ;
     };
     RadioButton BTN_WHOLE_PAGE
     {
+        HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_WHOLE_PAGE";
         Pos = MAP_APPFONT ( 12 , 27 ) ;
         Size = MAP_APPFONT ( 105 , 10 ) ;
         Text [ en-US ] = "~Fit width and height" ;
     };
     RadioButton BTN_PAGE_WIDTH
     {
+        HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_PAGE_WIDTH";
         Pos = MAP_APPFONT ( 12 , 40 ) ;
         Size = MAP_APPFONT ( 105, 10 ) ;
         Text [ en-US ] = "Fit ~width" ;
     };
     RadioButton BTN_100
     {
+        HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_100";
         Pos = MAP_APPFONT ( 12 , 53 ) ;
         Size = MAP_APPFONT ( 105, 10 ) ;
         Text = "~100 %" ;
     };
     RadioButton BTN_USER
     {
+        HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_USER";
         Pos = MAP_APPFONT ( 12 , 67 ) ;
         Size = MAP_APPFONT ( 72 , 10 ) ;
         Text [ en-US ] = "~Variable" ;
     };
     MetricField ED_USER
     {
+        HelpID = "cui:MetricField:RID_SVXDLG_ZOOM:ED_USER";
         Pos = MAP_APPFONT ( 86 , 66 ) ;
         Size = MAP_APPFONT ( 32 , 12 ) ;
         Border = TRUE ;
@@ -96,24 +102,28 @@ ModalDialog RID_SVXDLG_ZOOM
     };
     RadioButton BTN_AUTOMATIC
     {
+        HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_AUTOMATIC";
         Pos = MAP_APPFONT ( 130 , 14 ) ;
         Size = MAP_APPFONT ( 106 , 10 ) ;
         Text [ en-US ] = "~Automatic" ;
     };
     RadioButton BTN_SINGLE
     {
+        HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_SINGLE";
         Pos = MAP_APPFONT ( 130, 27 ) ;
         Size = MAP_APPFONT ( 106, 10 ) ;
         Text [ en-US ] = "~Single page" ;
     };
     RadioButton BTN_COLUMNS
     {
+        HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_COLUMNS";
         Pos = MAP_APPFONT ( 130, 41 ) ;
         Size = MAP_APPFONT ( 75 , 10 ) ;
         Text [ en-US ] = "~Columns" ;
     };
     MetricField ED_COLUMNS
     {
+        HelpID = "cui:MetricField:RID_SVXDLG_ZOOM:ED_COLUMNS";
         Pos = MAP_APPFONT ( 209 , 40 ) ;
         Size = MAP_APPFONT ( 24 , 12 ) ;
         Border = TRUE ;
@@ -127,6 +137,7 @@ ModalDialog RID_SVXDLG_ZOOM
     };
     CheckBox CHK_BOOK
     {
+        HelpID = "cui:CheckBox:RID_SVXDLG_ZOOM:CHK_BOOK";
         Pos = MAP_APPFONT ( 136 , 55 ) ;
         Size = MAP_APPFONT ( 85 , 10 ) ;
         Text [ en-US ] = "~Book mode" ;
diff --git a/cui/source/options/connpooloptions.src b/cui/source/options/connpooloptions.src
index cd4cad5f1..406ec76b8 100644
--- a/cui/source/options/connpooloptions.src
+++ b/cui/source/options/connpooloptions.src
@@ -35,6 +35,7 @@
 
 TabPage RID_OFAPAGE_CONNPOOLOPTIONS
 {
+    HelpID = "cui:TabPage:RID_OFAPAGE_CONNPOOLOPTIONS";
      //	HelpId = ;
     OutputSize = TRUE ;
     Size = MAP_APPFONT ( PAGE_SIZE_X, PAGE_SIZE_Y ) ;
@@ -49,6 +50,7 @@ TabPage RID_OFAPAGE_CONNPOOLOPTIONS
     };
     CheckBox CB_POOL_CONNS
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_CONNPOOLOPTIONS:CB_POOL_CONNS";
         Pos = MAP_APPFONT( 7, 15 );
         Size = MAP_APPFONT( PAGE_SIZE_X - 14, 10 );
         Text [ en-US ] = "Connection pooling enabled";
@@ -80,6 +82,7 @@ TabPage RID_OFAPAGE_CONNPOOLOPTIONS
     };
     CheckBox CB_DRIVERPOOLING
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_CONNPOOLOPTIONS:CB_DRIVERPOOLING";
         Pos = MAP_APPFONT( 17, 39 + LIST_SIZE_Y + 4 + 8 + 3 );
         Size = MAP_APPFONT( PAGE_SIZE_X - 23, 10 );
         Text [ en-US ] = "Enable pooling for this driver";
@@ -92,6 +95,7 @@ TabPage RID_OFAPAGE_CONNPOOLOPTIONS
     };
     NumericField NF_TIMEOUT
     {
+        HelpID = "cui:NumericField:RID_OFAPAGE_CONNPOOLOPTIONS:NF_TIMEOUT";
         Pos = MAP_APPFONT( 27 + 100 + 3, 39 + LIST_SIZE_Y + 4 + 8 + 3 + 10 + 3 );
         Size = MAP_APPFONT( 40, 12 );
         SvLook = TRUE;
diff --git a/cui/source/options/dbregister.src b/cui/source/options/dbregister.src
index 7da53884d..234bd245a 100644
--- a/cui/source/options/dbregister.src
+++ b/cui/source/options/dbregister.src
@@ -64,18 +64,21 @@ TabPage RID_SFXPAGE_DBREGISTER
     };
     PushButton BTN_NEW
     {
+        HelpID = "cui:PushButton:RID_SFXPAGE_DBREGISTER:BTN_NEW";
         Pos = MAP_APPFONT ( 47 , 165 ) ;
         Size = MAP_APPFONT ( 65 , 14 ) ;
         Text [ en-US ] = "~New..." ;
     };
     PushButton BTN_EDIT
     {
+        HelpID = "cui:PushButton:RID_SFXPAGE_DBREGISTER:BTN_EDIT";
         Pos = MAP_APPFONT ( 183 , 165 ) ;
         Size = MAP_APPFONT ( 65 , 14 ) ;
         Text [ en-US ] = "~Edit..." ;
     };
     PushButton BTN_DELETE
     {
+        HelpID = "cui:PushButton:RID_SFXPAGE_DBREGISTER:BTN_DELETE";
         Pos = MAP_APPFONT ( 115 , 165 ) ;
         Size = MAP_APPFONT ( 65 , 14 ) ;
         Text [ en-US ] = "~Delete" ;
diff --git a/cui/source/options/doclinkdialog.src b/cui/source/options/doclinkdialog.src
index eb3dadcde..e0bd02390 100644
--- a/cui/source/options/doclinkdialog.src
+++ b/cui/source/options/doclinkdialog.src
@@ -46,6 +46,7 @@
 
 ModalDialog DLG_DOCUMENTLINK
 {
+    HelpID = "cui:ModalDialog:DLG_DOCUMENTLINK";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( DIALOG_SIZE_X , DIALOG_SIZE_Y ) ;
@@ -64,6 +65,7 @@ ModalDialog DLG_DOCUMENTLINK
     };
     ComboBox CMB_URL
     {
+        HelpID = "cui:ComboBox:DLG_DOCUMENTLINK:CMB_URL";
         Pos = MAP_APPFONT ( 6 , LINE_1_Y + OFFSET_Y + HEIGHT_LABEL - 3) ;
         Size = MAP_APPFONT ( DIALOG_SIZE_X - 3*LINE_1_Y - BUTTON_SIZE_X , HEIGHT_EDIT ) ;
 
@@ -75,6 +77,7 @@ ModalDialog DLG_DOCUMENTLINK
     };
     PushButton PB_BROWSEFILE
     {
+        HelpID = "cui:PushButton:DLG_DOCUMENTLINK:PB_BROWSEFILE";
         Pos = MAP_APPFONT ( DIALOG_SIZE_X - BUTTON_SIZE_X - 6 , LINE_1_Y + OFFSET_Y + HEIGHT_LABEL - 4) ;
         Size = MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y );
         Text [ en-US ] = "~Browse...";
@@ -90,6 +93,7 @@ ModalDialog DLG_DOCUMENTLINK
     };
     Edit ET_NAME
     {
+        HelpID = "cui:Edit:DLG_DOCUMENTLINK:ET_NAME";
         Pos = MAP_APPFONT ( 6, LINE_1_Y + 3*OFFSET_Y + 2*HEIGHT_LABEL + BUTTON_SIZE_Y - 6) ;
         Size = MAP_APPFONT ( DIALOG_SIZE_X - 3*LINE_1_Y - BUTTON_SIZE_X , HEIGHT_EDIT ) ;
         TabStop = TRUE ;
diff --git a/cui/source/options/fontsubs.src b/cui/source/options/fontsubs.src
index 0d4bce1c9..7d223a87a 100644
--- a/cui/source/options/fontsubs.src
+++ b/cui/source/options/fontsubs.src
@@ -49,6 +49,7 @@ TabPage RID_SVX_FONT_SUBSTITUTION
     Size = MAP_APPFONT ( 260 , 185 ) ;
     CheckBox CB_USETABLE
     {
+        HelpID = "cui:CheckBox:RID_SVX_FONT_SUBSTITUTION:CB_USETABLE";
         Pos = MAP_APPFONT ( 6 , 6 ) ;
         Size = MAP_APPFONT ( 248 , 10 ) ;
         TabStop = TRUE ;
@@ -63,6 +64,7 @@ TabPage RID_SVX_FONT_SUBSTITUTION
     };
     ComboBox CB_FONT1
     {
+        HelpID = "cui:ComboBox:RID_SVX_FONT_SUBSTITUTION:CB_FONT1";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 33 ) ;
         Size = MAP_APPFONT ( 100 , 100 ) ;
@@ -82,6 +84,7 @@ TabPage RID_SVX_FONT_SUBSTITUTION
     };
     ComboBox CB_FONT2
     {
+        HelpID = "cui:ComboBox:RID_SVX_FONT_SUBSTITUTION:CB_FONT2";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 110 , 33 ) ;
         Size = MAP_APPFONT ( 100 , 100 ) ;
@@ -145,6 +148,7 @@ TabPage RID_SVX_FONT_SUBSTITUTION
     };
     ListBox LB_FONTNAME
     {
+        HelpID = "cui:ListBox:RID_SVX_FONT_SUBSTITUTION:LB_FONTNAME";
         Pos = MAP_APPFONT ( 65 , 140 ) ;
         Size = MAP_APPFONT ( 100 , 68 ) ;
         Border = TRUE ;
@@ -153,6 +157,7 @@ TabPage RID_SVX_FONT_SUBSTITUTION
     };
     CheckBox  CB_NONPROP
     {
+        HelpID = "cui:CheckBox:RID_SVX_FONT_SUBSTITUTION:CB_NONPROP";
         Pos = MAP_APPFONT ( 65 , 155 ) ;
         Size = MAP_APPFONT ( 180 , 10 ) ;
         TabStop = TRUE ;
@@ -166,6 +171,7 @@ TabPage RID_SVX_FONT_SUBSTITUTION
     };
     ListBox LB_FONTHEIGHT
     {
+        HelpID = "cui:ListBox:RID_SVX_FONT_SUBSTITUTION:LB_FONTHEIGHT";
         Pos = MAP_APPFONT ( 65 , 169 ) ;
         Size = MAP_APPFONT ( 30 , 68 ) ;
         Border = TRUE ;
diff --git a/cui/source/options/internationaloptions.src b/cui/source/options/internationaloptions.src
index 9e804b34e..39892a794 100644
--- a/cui/source/options/internationaloptions.src
+++ b/cui/source/options/internationaloptions.src
@@ -32,6 +32,7 @@
 
 TabPage RID_OFA_TP_INTERNATIONAL
 {
+    HelpID = "cui:TabPage:RID_OFA_TP_INTERNATIONAL";
     OutputSize = TRUE ;
     Size = MAP_APPFONT ( PAGE_SIZE_X, PAGE_SIZE_Y ) ;
     SVLook = TRUE ;
@@ -46,6 +47,7 @@ TabPage RID_OFA_TP_INTERNATIONAL
 
     RadioButton RB_TXTDIR_LEFT2RIGHT
     {
+        HelpID = "cui:RadioButton:RID_OFA_TP_INTERNATIONAL:RB_TXTDIR_LEFT2RIGHT";
         Pos = MAP_APPFONT( COL_1, ROW_1 );
         Size = MAP_APPFONT( WIDTH2END( COL_1 ), HEIGHT_RB );
         Group = TRUE;
@@ -54,6 +56,7 @@ TabPage RID_OFA_TP_INTERNATIONAL
 
     RadioButton RB_TXTDIR_RIGHT2LEFT
     {
+        HelpID = "cui:RadioButton:RID_OFA_TP_INTERNATIONAL:RB_TXTDIR_RIGHT2LEFT";
         Pos = MAP_APPFONT( COL_1, ROW_2 );
         Size = MAP_APPFONT( WIDTH2END( COL_1 ), HEIGHT_RB );
         Text [ en-US ] = "~Right-to-left";
@@ -68,6 +71,7 @@ TabPage RID_OFA_TP_INTERNATIONAL
 
     CheckBox CB_SHTVW_RIGHT2LEFT
     {
+        HelpID = "cui:CheckBox:RID_OFA_TP_INTERNATIONAL:CB_SHTVW_RIGHT2LEFT";
         Pos = MAP_APPFONT( COL_1, ROW_4 );
         Size = MAP_APPFONT( WIDTH2END( COL_1 ), HEIGHT_CB );
         Text [ en-US ] = "Right-~to-left";
@@ -75,6 +79,7 @@ TabPage RID_OFA_TP_INTERNATIONAL
 
     CheckBox CB_SHTVW_CURRENTDOCONLY
     {
+        HelpID = "cui:CheckBox:RID_OFA_TP_INTERNATIONAL:CB_SHTVW_CURRENTDOCONLY";
         Pos = MAP_APPFONT( COL_2, ROW_5 );
         Size = MAP_APPFONT( WIDTH2END( COL_2 ), HEIGHT_CB );
         Text [ en-US ] = "~Current document only";
diff --git a/cui/source/options/optaccessibility.src b/cui/source/options/optaccessibility.src
index 36a4cad63..0008987a3 100644
--- a/cui/source/options/optaccessibility.src
+++ b/cui/source/options/optaccessibility.src
@@ -44,6 +44,7 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG
     };
     CheckBox CB_ACCESSIBILITY_TOOL
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ACCESSIBILITY_TOOL";
         TabStop = TRUE ;
         Pos = MAP_APPFONT( COL1, ROWA_1 );
         Size = MAP_APPFONT( CB_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
@@ -52,6 +53,7 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG
     };
     CheckBox CB_TEXTSELECTION
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_TEXTSELECTION";
         TabStop = TRUE ;
         Pos = MAP_APPFONT( COL1, ROWA_2 );
         Size = MAP_APPFONT( CB_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
@@ -59,6 +61,7 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG
     };
     CheckBox CB_ANIMATED_GRAPHICS
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ANIMATED_GRAPHICS";
         TabStop = TRUE ;
         Pos = MAP_APPFONT( COL1, ROWA_3 );
         Size = MAP_APPFONT( CB_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
@@ -66,6 +69,7 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG
     };
     CheckBox CB_ANIMATED_TEXTS
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ANIMATED_TEXTS";
         TabStop = TRUE ;
         Pos = MAP_APPFONT( COL1, ROWA_4 );
         Size = MAP_APPFONT( CB_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
@@ -73,6 +77,7 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG
     };
     CheckBox CB_TIPHELP
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_TIPHELP";
         TabStop = TRUE ;
         Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT( ROWA_5 ) );
         Size = MAP_APPFONT( DIFF(COL2,COL3), RSC_CD_CHECKBOX_HEIGHT );
@@ -80,6 +85,7 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG
     };
     NumericField NF_TIPHELP
     {
+        HelpID = "cui:NumericField:RID_SVXPAGE_ACCESSIBILITYCONFIG:NF_TIPHELP";
         TabStop = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT( COL3, ROWA_5 );
@@ -105,6 +111,7 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG
     };
     CheckBox CB_AUTO_DETECT_HC
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_AUTO_DETECT_HC";
         TabStop = TRUE ;
         Pos = MAP_APPFONT( COL1, ROWB_1 );
         Size = MAP_APPFONT( CB_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
@@ -112,6 +119,7 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG
     };
     CheckBox CB_AUTOMATIC_FONT_COLOR
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_AUTOMATIC_FONT_COLOR";
         TabStop = TRUE ;
         Pos = MAP_APPFONT( COL1, ROWB_2 );
         Size = MAP_APPFONT( CB_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
@@ -119,6 +127,7 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG
     };
     CheckBox CB_PAGE_PREVIEWS
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_PAGE_PREVIEWS";
         TabStop = TRUE ;
         Pos = MAP_APPFONT( COL1, ROWB_3 );
         Size = MAP_APPFONT( CB_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
diff --git a/cui/source/options/optasian.src b/cui/source/options/optasian.src
index ee735f906..fa5ebcfc1 100644
--- a/cui/source/options/optasian.src
+++ b/cui/source/options/optasian.src
@@ -45,12 +45,14 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT
     };
     RadioButton RB_CHAR_KERNING
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_CHAR_KERNING";
         Pos = MAP_APPFONT ( 12, 14 ) ;
         Size = MAP_APPFONT ( 200 , 10 ) ;
         Text [ en-US ] = "~Western characters only";
     };
     RadioButton RB_CHAR_PUNCT
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_CHAR_PUNCT";
         Pos = MAP_APPFONT ( 12, 27 ) ;
         Size = MAP_APPFONT ( 200 , 10 ) ;
         Text [ en-US ] = "Western ~text and Asian punctuation";
@@ -63,18 +65,21 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT
     };
     RadioButton RB_NO_COMP
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_NO_COMP";
         Pos = MAP_APPFONT ( 12, 54 ) ;
         Size = MAP_APPFONT ( 200 , 10 ) ;
         Text [ en-US ] = "~No compression";
     };
     RadioButton RB_PUNCT_COMP
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_PUNCT_COMP";
         Pos = MAP_APPFONT ( 12, 67) ;
         Size = MAP_APPFONT ( 200 , 10 ) ;
         Text [ en-US ] = "~Compress punctuation only";
     };
     RadioButton RB_PUNCT_KANA_COMP
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_PUNCT_KANA_COMP";
         Pos = MAP_APPFONT ( 12, 80 ) ;
         Size = MAP_APPFONT ( 200 , 10 ) ;
         Text [ en-US ] = "Compress ~punctuation and Japanese Kana";
@@ -93,6 +98,7 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT
     };
     ListBox LB_LANGUAGE
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_ASIAN_LAYOUT:LB_LANGUAGE";
         Pos = MAP_APPFONT ( 95 , 107 ) ;
         Size = MAP_APPFONT ( 80 , 48 ) ;
         Border = TRUE ;
@@ -100,6 +106,7 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT
     };
     CheckBox CB_STANDARD
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_ASIAN_LAYOUT:CB_STANDARD";
         Pos = MAP_APPFONT ( 180, 109 ) ;
         Size = MAP_APPFONT ( 74 , 10 ) ;
         Text [ en-US ] = "~Default";
@@ -112,6 +119,7 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT
     };
     Edit ED_START
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_ASIAN_LAYOUT:ED_START";
         Pos = MAP_APPFONT ( 95 , 123 ) ;
         Size = MAP_APPFONT ( 159 , 12 ) ;
         Border = TRUE ;
@@ -124,6 +132,7 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT
     };
     Edit ED_END
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_ASIAN_LAYOUT:ED_END";
         Pos = MAP_APPFONT ( 95 , 139 ) ;
         Size = MAP_APPFONT ( 159 , 12 ) ;
         Border = TRUE ;
diff --git a/cui/source/options/optchart.src b/cui/source/options/optchart.src
index 32a7aaa7b..f9ea2c6c6 100644
--- a/cui/source/options/optchart.src
+++ b/cui/source/options/optchart.src
@@ -46,6 +46,7 @@ TabPage RID_OPTPAGE_CHART_DEFCOLORS
     };
     ListBox LB_CHART_COLOR_LIST
     {
+        HelpID = "cui:ListBox:RID_OPTPAGE_CHART_DEFCOLORS:LB_CHART_COLOR_LIST";
         Border		= TRUE;
         Pos			= MAP_APPFONT ( 12 , 15  );
         Size		= MAP_APPFONT ( 68 , 152 );
@@ -68,6 +69,7 @@ TabPage RID_OPTPAGE_CHART_DEFCOLORS
     };
     PushButton PB_RESET_TO_DEFAULT
     {
+        HelpID = "cui:PushButton:RID_OPTPAGE_CHART_DEFCOLORS:PB_RESET_TO_DEFAULT";
         Pos = MAP_APPFONT ( 204 , 165 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Default";
diff --git a/cui/source/options/optcolor.src b/cui/source/options/optcolor.src
index b2e9c1513..93dd25c6d 100644
--- a/cui/source/options/optcolor.src
+++ b/cui/source/options/optcolor.src
@@ -52,6 +52,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
     };
     ListBox LB_COLORSCHEME
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_COLORCONFIG:LB_COLORSCHEME";
         Pos = MAP_APPFONT ( 65 , 14 ) ;
         Size = MAP_APPFONT ( 77 , 58 ) ;
         Border = TRUE;
@@ -60,12 +61,14 @@ TabPage RID_SVXPAGE_COLORCONFIG
     };
     PushButton PB_SAVESCHEME
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_COLORCONFIG:PB_SAVESCHEME";
         Pos = MAP_APPFONT ( 145, 13 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "Save...";
     };
     PushButton PB_DELETESCHEME
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_COLORCONFIG:PB_DELETESCHEME";
         Pos = MAP_APPFONT ( 198 , 13 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "Delete";
@@ -150,6 +153,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
 
             CheckBox CB_DOCBOUND
             {
+                HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_DOCBOUND";
                 CB_POS_SIZE( 2 );
                 Text [ en-US ] = "Text boundaries";
             };
@@ -164,6 +168,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
 
             CheckBox CB_OBJECTBOUNDARIES
             {
+                HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_OBJECTBOUNDARIES";
                 CB_POS_SIZE( 4 );
                 Text [ en-US ] = "Object boundaries";
             };
@@ -171,6 +176,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
 
             CheckBox CB_TABLEBOUNDARIES
             {
+                HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_TABLEBOUNDARIES";
                 CB_POS_SIZE( 5 );
                 Text [ en-US ] = "Table boundaries";
             };
@@ -185,6 +191,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
 
             CheckBox CB_LINKS
             {
+                HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_LINKS";
                 CB_POS_SIZE( 7 );
                 Text [ en-US ] = "Unvisited links";
             };
@@ -192,6 +199,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
 
             CheckBox CB_LINKSVISITED
             {
+                HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_LINKSVISITED";
                 CB_POS_SIZE( 8 );
                 Text [ en-US ] = "Visited links";
             };
@@ -226,6 +234,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
 
             CheckBox CB_WRITERFIELDSHADINGS
             {
+                HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_WRITERFIELDSHADINGS";
                 CB_POS_SIZE( 13 );
                 Text [ en-US ] = "Field shadings";
             };
@@ -233,6 +242,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
 
             CheckBox CB_WRITERIDXSHADINGS
             {
+                HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_WRITERIDXSHADINGS";
                 CB_POS_SIZE( 14 );
                 Text [ en-US ] = "Index and table shadings";
             };
@@ -248,6 +258,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
 
             CheckBox CB_WRITERSECTIONBOUNDARIES
             {
+                HelpID = "cui:CheckBox:RID_SVXPAGE_COLORCONFIG:CB_WRITERSECTIONBOUNDARIES";
                 CB_POS_SIZE( 16 );
                 Text [ en-US ] = "Section boundaries";
             };
diff --git a/cui/source/options/optctl.src b/cui/source/options/optctl.src
index 2da8925a5..52f265c19 100644
--- a/cui/source/options/optctl.src
+++ b/cui/source/options/optctl.src
@@ -47,18 +47,21 @@ TabPage RID_SVXPAGE_OPTIONS_CTL
     };
     CheckBox CB_SEQUENCECHECKING
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_SEQUENCECHECKING";
         Pos = MAP_APPFONT ( 12, ROW_1 ) ;
         Size = MAP_APPFONT ( 236 , RSC_CD_CHECKBOX_HEIGHT ) ;
         Text [ en-US ] = "Use se~quence checking";
     };
     CheckBox CB_RESTRICTED
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_RESTRICTED";
         Pos = MAP_APPFONT ( 18, ROW_2 );
         Size = MAP_APPFONT ( 236, RSC_CD_CHECKBOX_HEIGHT );
         Text[ en-US ] = "Restricted";
     };
     CheckBox CB_TYPE_REPLACE
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_TYPE_REPLACE";
         Pos = MAP_APPFONT ( 18, ROW_2+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y );
         Size = MAP_APPFONT ( 236, RSC_CD_CHECKBOX_HEIGHT );
         Text[ en-US ] = "~Type and replace";
@@ -77,12 +80,14 @@ TabPage RID_SVXPAGE_OPTIONS_CTL
     };
     RadioButton RB_MOVEMENT_LOGICAL
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_OPTIONS_CTL:RB_MOVEMENT_LOGICAL";
         Pos = MAP_APPFONT ( 105, ROW_4 ) ;
         Size = MAP_APPFONT ( 69 , RSC_CD_RADIOBUTTON_HEIGHT ) ;
         Text [ en-US ] = "Lo~gical";
     };
     RadioButton RB_MOVEMENT_VISUAL
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_OPTIONS_CTL:RB_MOVEMENT_VISUAL";
         Pos = MAP_APPFONT ( 177, ROW_4 ) ;
         Size = MAP_APPFONT ( 69 , RSC_CD_RADIOBUTTON_HEIGHT ) ;
         Text [ en-US ] = "~Visual";
@@ -101,6 +106,7 @@ TabPage RID_SVXPAGE_OPTIONS_CTL
     };
     ListBox LB_NUMERALS
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_OPTIONS_CTL:LB_NUMERALS";
         Pos = MAP_APPFONT ( 105, ROW_7 ) ;
         Size = MAP_APPFONT ( 69 , 3*RSC_CD_DROPDOWN_HEIGHT ) ;
         DropDown = TRUE ;
diff --git a/cui/source/options/optdict.src b/cui/source/options/optdict.src
index 11d33db17..218b7afb9 100644
--- a/cui/source/options/optdict.src
+++ b/cui/source/options/optdict.src
@@ -51,6 +51,7 @@ ModalDialog RID_SFXDLG_NEWDICT
     };
     Edit ED_DICTNAME
     {
+        HelpID = "cui:Edit:RID_SFXDLG_NEWDICT:ED_DICTNAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 55 , 14 ) ;
         Size = MAP_APPFONT ( 90 , 12 ) ;
@@ -65,6 +66,7 @@ ModalDialog RID_SFXDLG_NEWDICT
     };
     ListBox LB_DICTLANG
     {
+        HelpID = "cui:ListBox:RID_SFXDLG_NEWDICT:LB_DICTLANG";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 55 , 30 ) ;
         Size = MAP_APPFONT ( 90 , 66 ) ;
@@ -72,6 +74,7 @@ ModalDialog RID_SFXDLG_NEWDICT
     };
     CheckBox BTN_EXCEPT
     {
+        HelpID = "cui:CheckBox:RID_SFXDLG_NEWDICT:BTN_EXCEPT";
         Pos = MAP_APPFONT ( 12 , 44 ) ;
         Size = MAP_APPFONT ( 57 , 10 ) ;
         Text [ en-US ] = "~Exception (-)" ;
@@ -124,6 +127,7 @@ ModalDialog RID_SFXDLG_EDITDICT
     };
     ListBox LB_ALLDICTS
     {
+        HelpID = "cui:ListBox:RID_SFXDLG_EDITDICT:LB_ALLDICTS";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 82 , 9 ) ;
         Size = MAP_APPFONT ( 121 , 62 ) ;
@@ -137,6 +141,7 @@ ModalDialog RID_SFXDLG_EDITDICT
     };
     ListBox LB_DICTLANG
     {
+        HelpID = "cui:ListBox:RID_SFXDLG_EDITDICT:LB_DICTLANG";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 82 , 25 ) ;
         Size = MAP_APPFONT ( 121 , 66 ) ;
@@ -158,6 +163,7 @@ ModalDialog RID_SFXDLG_EDITDICT
     };
     Edit ED_WORD
     {
+        HelpID = "cui:Edit:RID_SFXDLG_EDITDICT:ED_WORD";
         Pos = MAP_APPFONT ( 12 , 56 ) ;
         Size = MAP_APPFONT ( 71 , 12 ) ;
         Border = TRUE ;
@@ -172,6 +178,7 @@ ModalDialog RID_SFXDLG_EDITDICT
 
     Edit ED_REPLACE
     {
+        HelpID = "cui:Edit:RID_SFXDLG_EDITDICT:ED_REPLACE";
         Pos = MAP_APPFONT ( 83 , 56 ) ;
         Size = MAP_APPFONT ( 120 , 12 ) ;
         Border = TRUE ;
@@ -180,6 +187,7 @@ ModalDialog RID_SFXDLG_EDITDICT
 
     PushButton PB_NEW_REPLACE
     {
+        HelpID = "cui:PushButton:RID_SFXDLG_EDITDICT:PB_NEW_REPLACE";
         Pos = MAP_APPFONT ( 209 , 56 ) ;
         Size = MAP_APPFONT ( 55 , 12 ) ;
         TabStop = TRUE ;
@@ -187,6 +195,7 @@ ModalDialog RID_SFXDLG_EDITDICT
     };
     PushButton PB_DELETE_REPLACE
     {
+        HelpID = "cui:PushButton:RID_SFXDLG_EDITDICT:PB_DELETE_REPLACE";
         Pos = MAP_APPFONT ( 209 , 71 ) ;
         Size = MAP_APPFONT ( 55 , 12 ) ;
         TabStop = TRUE ;
diff --git a/cui/source/options/optfltr.src b/cui/source/options/optfltr.src
index e24da54e6..7826ed01c 100644
--- a/cui/source/options/optfltr.src
+++ b/cui/source/options/optfltr.src
@@ -32,6 +32,7 @@
 // RID_OFAPAGE_MSFILTEROPT -----------------------------------------------------
 TabPage RID_OFAPAGE_MSFILTEROPT
 {
+    HelpID = "cui:TabPage:RID_OFAPAGE_MSFILTEROPT";
      //	HelpId = ;
     OutputSize = TRUE ;
     Size = MAP_APPFONT ( 260 , 185 ) ;
@@ -46,6 +47,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT
     };
     CheckBox CB_WBAS_CODE
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_CODE";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         TabStop = TRUE ;
@@ -53,6 +55,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT
     };
     CheckBox CB_WBAS_STG
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_STG";
         Pos = MAP_APPFONT ( 12 , 28 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         TabStop = TRUE ;
@@ -67,6 +70,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT
     };
     CheckBox CB_EBAS_CODE
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_CODE";
         Pos = MAP_APPFONT ( 12 , 55 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         TabStop = TRUE ;
@@ -74,6 +78,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT
     };
     CheckBox CB_EBAS_EXECTBL
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_EXECTBL";
         Pos = MAP_APPFONT ( 22 , 69 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         TabStop = TRUE ;
@@ -81,6 +86,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT
     };
     CheckBox CB_EBAS_STG
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_STG";
         Pos = MAP_APPFONT ( 12 , 83 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         TabStop = TRUE ;
@@ -95,6 +101,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT
     };
     CheckBox CB_PBAS_CODE
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_PBAS_CODE";
         Pos = MAP_APPFONT ( 12 , 110 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         TabStop = TRUE ;
@@ -102,6 +109,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT
     };
     CheckBox CB_PBAS_STG
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_PBAS_STG";
         Pos = MAP_APPFONT ( 12 , 124 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         TabStop = TRUE ;
@@ -112,6 +120,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT
 // RID_OFAPAGE_MSFILTEROPT2 -----------------------------------------------------
 TabPage RID_OFAPAGE_MSFILTEROPT2
 {
+    HelpID = "cui:TabPage:RID_OFAPAGE_MSFILTEROPT2";
      //	HelpId = ;
     OutputSize = TRUE ;
     Size = MAP_APPFONT ( 260 , 185 ) ;
diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src
index 527f76d1f..c158c2e47 100644
--- a/cui/source/options/optgdlg.src
+++ b/cui/source/options/optgdlg.src
@@ -50,24 +50,28 @@ TabPage OFA_TP_MISC
     };
     CheckBox CB_TOOLTIP
     {
+        HelpID = "cui:CheckBox:OFA_TP_MISC:CB_TOOLTIP";
         Pos = MAP_APPFONT( COL1, ROW1 );
         Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
         Text [ en-US ] = "~Tips";
     };
     CheckBox CB_EXTHELP
     {
+        HelpID = "cui:CheckBox:OFA_TP_MISC:CB_EXTHELP";
         Pos = MAP_APPFONT( COL2, ROW2 );
         Size = MAP_APPFONT( WHOLE_WIDTH - COL2, RSC_CD_CHECKBOX_HEIGHT );
         Text [ en-US ] = "~Extended tips";
     };
     CheckBox CB_HELPAGENT
     {
+        HelpID = "cui:CheckBox:OFA_TP_MISC:CB_HELPAGENT";
         Pos = MAP_APPFONT( COL1, ROW3 );
         Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
         Text [ en-US ] = "~Help Agent";
     };
     PushButton PB_HELPAGENT_RESET
     {
+        HelpID = "cui:PushButton:OFA_TP_MISC:PB_HELPAGENT_RESET";
         Pos = MAP_APPFONT( COL2, ROW4 );
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
         Text [ en-US ] = "~Reset Help Agent";
@@ -80,6 +84,7 @@ TabPage OFA_TP_MISC
     };
     ListBox LB_HELPFORMAT
     {
+        HelpID = "cui:ListBox:OFA_TP_MISC:LB_HELPFORMAT";
         Pos = MAP_APPFONT( COL4, ROW5 );
         Size = MAP_APPFONT( WHOLE_WIDTH - COL4, 50 );
         DropDown = TRUE ;
@@ -108,6 +113,7 @@ TabPage OFA_TP_MISC
     };
     CheckBox CB_FILEDLG
     {
+        HelpID = "cui:CheckBox:OFA_TP_MISC:CB_FILEDLG";
         Pos = MAP_APPFONT( COL1, ROW7 );
         Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
         Text [ en-US ] = "~Use %PRODUCTNAME dialogs";
@@ -120,6 +126,7 @@ TabPage OFA_TP_MISC
     };
     CheckBox CB_DOCSTATUS
     {
+        HelpID = "cui:CheckBox:OFA_TP_MISC:CB_DOCSTATUS";
         Pos = MAP_APPFONT( COL1, ROW9 );
         Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
         Text [ en-US ] = "~Printing sets \"document modified\" status";
@@ -138,6 +145,7 @@ TabPage OFA_TP_MISC
     };
     NumericField NF_YEARVALUE
     {
+        HelpID = "cui:NumericField:OFA_TP_MISC:NF_YEARVALUE";
         Border = TRUE ;
         Pos = MAP_APPFONT( COL4, ROW11 );
         Size = MAP_APPFONT( EDIT_WIDTH, RSC_CD_TEXTBOX_HEIGHT );
@@ -160,6 +168,7 @@ TabPage OFA_TP_MISC
     };
     CheckBox CB_PRINTDLG
     {
+        HelpID = "cui:CheckBox:OFA_TP_MISC:CB_PRINTDLG";
         Pos = MAP_APPFONT( COL1, ROW9 );
         Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
         Text [ en-US ] = "Use %PRODUCTNAME ~dialogs";
@@ -192,6 +201,7 @@ TabPage OFA_TP_VIEW
     };
     MetricField MF_WINDOWSIZE
     {
+        HelpID = "cui:MetricField:OFA_TP_VIEW:MF_WINDOWSIZE";
         Pos = MAP_APPFONT ( 95 , ROW_MF_SCALING ) ;
         Size = MAP_APPFONT ( 31 , 12 ) ;
         Border = TRUE ;
@@ -220,6 +230,7 @@ TabPage OFA_TP_VIEW
     };
     ListBox LB_ICONSIZE
     {
+        HelpID = "cui:ListBox:OFA_TP_VIEW:LB_ICONSIZE";
         Pos = MAP_APPFONT ( 12 , ROW_LB_ICONSIZESTYLE ) ;
         Size = MAP_APPFONT ( 45 , 60 ) ;
         DropDown = TRUE ;
@@ -234,6 +245,7 @@ TabPage OFA_TP_VIEW
     };
     ListBox LB_ICONSTYLE
     {
+        HelpID = "cui:ListBox:OFA_TP_VIEW:LB_ICONSTYLE";
         Pos = MAP_APPFONT ( 61 , ROW_LB_ICONSIZESTYLE ) ;
         Size = MAP_APPFONT ( 65 , 70 ) ;
         DropDown = TRUE ;
@@ -253,6 +265,7 @@ TabPage OFA_TP_VIEW
     };
     CheckBox CB_SYSTEM_FONT
     {
+        HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_SYSTEM_FONT";
         TabStop = TRUE ;
         Pos = MAP_APPFONT( 12, ROW_CB_SYSTEM_FONT );
         Size = MAP_APPFONT( 114, 16 );
@@ -262,6 +275,7 @@ TabPage OFA_TP_VIEW
 
     CheckBox CB_FONTANTIALIASING
     {
+        HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_FONTANTIALIASING";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 12 , ROW_CB_FONTANTIALIASING ) ;
         Size = MAP_APPFONT ( 110 , RSC_CD_CHECKBOX_HEIGHT ) ;
@@ -275,6 +289,7 @@ TabPage OFA_TP_VIEW
     };
     NumericField NF_AA_POINTLIMIT
     {
+        HelpID = "cui:NumericField:OFA_TP_VIEW:NF_AA_POINTLIMIT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 46, ROW_NF_AA_POINTLIMIT ) ;
         Size = MAP_APPFONT ( 30 , 12 ) ;
@@ -304,6 +319,7 @@ TabPage OFA_TP_VIEW
     };
     ListBox LB_MENU_ICONS
     {
+        HelpID = "cui:ListBox:OFA_TP_VIEW:LB_MENU_ICONS";
         Pos = MAP_APPFONT ( 12 , ROW_LB_MENU_ICONS ) ;
         Size = MAP_APPFONT ( 114 , 60 ) ;
         DropDown = TRUE ;
@@ -324,12 +340,14 @@ TabPage OFA_TP_VIEW
     };
     CheckBox CB_FONT_SHOW
     {
+        HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_FONT_SHOW";
         Pos = MAP_APPFONT ( 12, ROW_CB_FONT_SHOW ) ;
         Size = MAP_APPFONT ( 118 , RSC_CD_CHECKBOX_HEIGHT ) ;
         Text [ en-US ] = "Show p~review of fonts" ;
     };
     CheckBox CB_FONT_HISTORY
     {
+        HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_FONT_HISTORY";
         Pos = MAP_APPFONT ( 12, ROW_CB_FONT_HISTORY ) ;
         Size = MAP_APPFONT ( 118 , RSC_CD_CHECKBOX_HEIGHT ) ;
         Text [ en-US ] = "Show font h~istory" ;
@@ -343,6 +361,7 @@ TabPage OFA_TP_VIEW
 
     CheckBox CB_USE_HARDACCELL
     {
+        HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_USE_HARDACCELL";
         Pos = MAP_APPFONT ( 139, ROW_CB_USE_HARDACCELL ) ;
         Size = MAP_APPFONT ( 118 , RSC_CD_CHECKBOX_HEIGHT ) ;
         Text [ en-US ] = "Use hardware acceleration" ;
@@ -350,6 +369,7 @@ TabPage OFA_TP_VIEW
 
     CheckBox CB_USE_ANTIALIASE
     {
+        HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_USE_ANTIALIASE";
         Pos = MAP_APPFONT ( 139, ROW_CB_USE_ANTIALIASE ) ;
         Size = MAP_APPFONT ( 118 , RSC_CD_CHECKBOX_HEIGHT ) ;
         Text [ en-US ] = "Use Anti-Aliasing" ;
@@ -369,6 +389,7 @@ TabPage OFA_TP_VIEW
     };
     ListBox LB_MOUSEPOS
     {
+        HelpID = "cui:ListBox:OFA_TP_VIEW:LB_MOUSEPOS";
         Pos = MAP_APPFONT ( 139, ROW_LB_MOUSEPOS ) ;
         Size = MAP_APPFONT ( 114 , 60 ) ;
         DropDown = TRUE ;
@@ -389,6 +410,7 @@ TabPage OFA_TP_VIEW
     };
     ListBox LB_MOUSEMIDDLE
     {
+        HelpID = "cui:ListBox:OFA_TP_VIEW:LB_MOUSEMIDDLE";
         Pos = MAP_APPFONT ( 139, ROW_LB_MOUSEMIDDLE ) ;
         Size = MAP_APPFONT ( 114 , 60 ) ;
         DropDown = TRUE ;
@@ -412,6 +434,7 @@ TabPage OFA_TP_VIEW
 
     CheckBox CB_SELECTION
     {
+        HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_SELECTION";
         Pos = MAP_APPFONT ( 139, ROW_CB_SELECTION + (((12 - RSC_CD_CHECKBOX_HEIGHT) / 2) + 1)) ;
         Size = MAP_APPFONT ( 118 - 34 , RSC_CD_CHECKBOX_HEIGHT ) ;
         Text [ en-US ] = "Transparency" ;
@@ -419,6 +442,7 @@ TabPage OFA_TP_VIEW
 
     MetricField MF_SELECTION
     {
+        HelpID = "cui:MetricField:OFA_TP_VIEW:MF_SELECTION";
         Pos = MAP_APPFONT ( 139 + (95 - 12), ROW_CB_SELECTION ) ;
         Size = MAP_APPFONT ( 31 , 12 ) ;
         Border = TRUE ;
@@ -463,6 +487,7 @@ TabPage OFA_TP_LANGUAGES
     };
     ListBox LB_USERINTERFACE
     {
+        HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_USERINTERFACE";
         Pos = MAP_APPFONT ( 123 , 14 ) ;
         Size = MAP_APPFONT ( 125 , 60 ) ;
         DropDown = TRUE ;
@@ -484,6 +509,7 @@ TabPage OFA_TP_LANGUAGES
     };
     ListBox LB_LOCALESETTING
     {
+        HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_LOCALESETTING";
         Pos = MAP_APPFONT ( 123 , 30 ) ;
         Size = MAP_APPFONT ( 125 , 60 ) ;
         DropDown = TRUE ;
@@ -499,6 +525,7 @@ TabPage OFA_TP_LANGUAGES
     };
     CheckBox CB_DECIMALSEPARATOR
     {
+        HelpID = "cui:CheckBox:OFA_TP_LANGUAGES:CB_DECIMALSEPARATOR";
         Pos = MAP_APPFONT ( 123 , 46) ;
         Size = MAP_APPFONT ( 125 , RSC_CD_CHECKBOX_HEIGHT ) ;
         Text [ en-US ] = "~Same as locale setting ( %1 )";
@@ -517,6 +544,7 @@ TabPage OFA_TP_LANGUAGES
     };
     ListBox LB_CURRENCY
     {
+        HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_CURRENCY";
         Pos = MAP_APPFONT ( 123 , 59 ) ;
         Size = MAP_APPFONT ( 125 , 60 ) ;
         DropDown = TRUE ;
@@ -545,6 +573,7 @@ TabPage OFA_TP_LANGUAGES
 
     ListBox LB_WEST_LANG
     {
+        HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_WEST_LANG";
         Pos = MAP_APPFONT ( 123 ,  88 ) ;
         Size = MAP_APPFONT ( 125 , 60 ) ;
         DropDown = TRUE ;
@@ -566,6 +595,7 @@ TabPage OFA_TP_LANGUAGES
     };
     ListBox LB_ASIAN_LANG
     {
+        HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_ASIAN_LANG";
         Pos = MAP_APPFONT ( 123 , 104 ) ;
         Size = MAP_APPFONT ( 125 , 60 ) ;
         DropDown = TRUE ;
@@ -587,6 +617,7 @@ TabPage OFA_TP_LANGUAGES
     };
     ListBox LB_COMPLEX_LANG
     {
+        HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_COMPLEX_LANG";
         Pos = MAP_APPFONT ( 123 , 120 ) ;
         Size = MAP_APPFONT ( 125 , 60 ) ;
         DropDown = TRUE ;
@@ -596,6 +627,7 @@ TabPage OFA_TP_LANGUAGES
     };
     CheckBox CB_CURRENT_DOC
     {
+        HelpID = "cui:CheckBox:OFA_TP_LANGUAGES:CB_CURRENT_DOC";
         Pos = MAP_APPFONT ( 123 , 135 ) ;
         Size = MAP_APPFONT ( 125 , RSC_CD_CHECKBOX_HEIGHT ) ;
         Text [ en-US ] = "For the current document only";
@@ -614,6 +646,7 @@ TabPage OFA_TP_LANGUAGES
     };
     CheckBox CB_ASIANSUPPORT
     {
+        HelpID = "cui:CheckBox:OFA_TP_LANGUAGES:CB_ASIANSUPPORT";
         Pos = MAP_APPFONT ( 12 , 158 ) ;
         Size = MAP_APPFONT ( 236 ,RSC_CD_CHECKBOX_HEIGHT ) ;
         Text [ en-US ] = "E~nabled for Asian languages";
@@ -626,6 +659,7 @@ TabPage OFA_TP_LANGUAGES
     };
     CheckBox CB_CTLSUPPORT
     {
+        HelpID = "cui:CheckBox:OFA_TP_LANGUAGES:CB_CTLSUPPORT";
         Pos = MAP_APPFONT ( 12 , 173 ) ;
         Size = MAP_APPFONT ( 236 , RSC_CD_CHECKBOX_HEIGHT ) ;
         Text [ en-US ] = "Ena~bled for complex text layout (CTL)";
diff --git a/cui/source/options/optgenrl.src b/cui/source/options/optgenrl.src
index fd4a0176a..aae667ff7 100644
--- a/cui/source/options/optgenrl.src
+++ b/cui/source/options/optgenrl.src
@@ -52,6 +52,7 @@ TabPage RID_SFXPAGE_GENERAL
     };
     Edit ED_COMPANY
     {
+        HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_COMPANY";
         Border = TRUE ;
         Pos = MAP_APPFONT ( MID , LINE ( 0 ) ) ;
         Size = MAP_APPFONT ( RIGHT-MID , LINEH ) ;
@@ -81,6 +82,7 @@ TabPage RID_SFXPAGE_GENERAL
     };
     Edit ED_FATHERNAME
     {
+        HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_FATHERNAME";
         Border = TRUE ;
         Hide = TRUE;
         Pos = MAP_APPFONT ( MID , LINE ( 1 ) ) ;
@@ -88,18 +90,21 @@ TabPage RID_SFXPAGE_GENERAL
     };
     Edit ED_FIRSTNAME
     {
+        HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_FIRSTNAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( MID , LINE ( 1 ) ) ;
         Size = MAP_APPFONT ( NAMELEN-8 , LINEH ) ;
     };
     Edit ED_NAME
     {
+        HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_NAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( MID+NAMELEN-8+HSPACE , LINE ( 1 ) ) ;
         Size = MAP_APPFONT ( NAMELEN-8 , LINEH ) ;
     };
     Edit ED_SHORTNAME
     {
+        HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_SHORTNAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( MID+2* ( NAMELEN-8+HSPACE ) , LINE ( 1 ) ) ;
         Size = MAP_APPFONT ( RIGHT- ( MID+2* ( NAMELEN-8+HSPACE ) ) , LINEH ) ;
@@ -121,12 +126,14 @@ TabPage RID_SFXPAGE_GENERAL
     };
     Edit ED_STREET
     {
+        HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_STREET";
         Border = TRUE ;
         Pos = MAP_APPFONT ( MID , LINE ( 2 ) ) ;
         Size = MAP_APPFONT ( RIGHT-MID , LINEH ) ;
     };
     Edit ED_APARTMENTNR
     {
+        HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_APARTMENTNR";
         Border = TRUE ;
         Hide = TRUE;
         Pos = MAP_APPFONT ( MID , LINE ( 2 ) ) ;
@@ -141,30 +148,35 @@ TabPage RID_SFXPAGE_GENERAL
     };
     Edit ED_PLZ
     {
+        HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_PLZ";
         Border = TRUE ;
         Pos = MAP_APPFONT ( MID , LINE ( 3 ) ) ;
         Size = MAP_APPFONT ( 24 , LINEH ) ;
     };
     Edit ED_CITY
     {
+        HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_CITY";
         Border = TRUE ;
         Pos = MAP_APPFONT ( MID + 24 + HSPACE , LINE ( 3 ) ) ;
         Size = MAP_APPFONT ( RIGHT - ( MID + 24 + HSPACE ) , LINEH ) ;
     };
     Edit ED_US_CITY
     {
+        HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_US_CITY";
         Border = TRUE ;
         Pos = MAP_APPFONT ( MID , LINE ( 3 ) ) ;
         Size = MAP_APPFONT ( 90 , LINEH ) ;
     };
     Edit ED_US_STATE
     {
+        HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_US_STATE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( MID + 90 + HSPACE, LINE ( 3 ) ) ;
         Size = MAP_APPFONT ( 30 , LINEH ) ;
     };
     Edit ED_US_ZIPCODE
     {
+        HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_US_ZIPCODE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( MID + 90 + HSPACE + 30 + HSPACE, LINE ( 3 ) ) ;
         Size = MAP_APPFONT ( RIGHT - ( MID + 90 + HSPACE + 30 + HSPACE ) , LINEH ) ;
@@ -178,6 +190,7 @@ TabPage RID_SFXPAGE_GENERAL
     };
     Edit ED_COUNTRY
     {
+        HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_COUNTRY";
         Border = TRUE ;
         Pos = MAP_APPFONT ( MID , LINE ( 4 ) ) ;
         Size = MAP_APPFONT ( RIGHT - MID , LINEH ) ;
@@ -191,12 +204,14 @@ TabPage RID_SFXPAGE_GENERAL
     };
     Edit ED_TITLE
     {
+        HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_TITLE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( MID , LINE ( 5 ) ) ;
         Size = MAP_APPFONT ( NAMELEN-1 , LINEH ) ;
     };
     Edit ED_POSITION
     {
+        HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_POSITION";
         Border = TRUE ;
         Pos = MAP_APPFONT ( MID+NAMELEN-1+HSPACE , LINE ( 5 ) ) ;
         Size = MAP_APPFONT ( RIGHT- ( MID+NAMELEN-1+HSPACE ) , LINEH ) ;
@@ -210,12 +225,14 @@ TabPage RID_SFXPAGE_GENERAL
     };
     Edit ED_TELPRIVAT
     {
+        HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_TELPRIVAT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( MID , LINE ( 6 ) ) ;
         Size = MAP_APPFONT ( NAMELEN-1 , LINEH ) ;
     };
     Edit ED_TELCOMPANY
     {
+        HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_TELCOMPANY";
         Border = TRUE ;
         Pos = MAP_APPFONT ( MID+NAMELEN-1+HSPACE , LINE ( 6 ) ) ;
         Size = MAP_APPFONT ( RIGHT- ( MID+NAMELEN-1+HSPACE ) , LINEH ) ;
@@ -229,12 +246,14 @@ TabPage RID_SFXPAGE_GENERAL
     };
     Edit ED_FAX
     {
+        HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_FAX";
         Border = TRUE ;
         Pos = MAP_APPFONT ( MID , LINE ( 7 ) ) ;
         Size = MAP_APPFONT ( NAMELEN-1 , LINEH ) ;
     };
     Edit ED_EMAIL
     {
+        HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_EMAIL";
         Border = TRUE ;
         Pos = MAP_APPFONT ( MID+NAMELEN-1+HSPACE , LINE ( 7 ) ) ;
         Size = MAP_APPFONT ( RIGHT- ( MID+NAMELEN-1+HSPACE ) , LINEH ) ;
@@ -247,6 +266,7 @@ TabPage RID_SFXPAGE_GENERAL
     };
     CheckBox CB_USEDATA
     {
+        HelpID = "cui:CheckBox:RID_SFXPAGE_GENERAL:CB_USEDATA";
         Pos = MAP_APPFONT ( 6 , 122 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         Hide = TRUE;
diff --git a/cui/source/options/opthtml.src b/cui/source/options/opthtml.src
index 715be82d2..de629f6a7 100644
--- a/cui/source/options/opthtml.src
+++ b/cui/source/options/opthtml.src
@@ -32,6 +32,7 @@
  // RID_OFAPAGE_HTMLOPT -----------------------------------------------------
 TabPage RID_OFAPAGE_HTMLOPT
 {
+    HelpID = "cui:TabPage:RID_OFAPAGE_HTMLOPT";
      //	HelpId = ;
     OutputSize = TRUE ;
     Size = MAP_APPFONT ( 260 , 185 ) ;
@@ -45,6 +46,7 @@ TabPage RID_OFAPAGE_HTMLOPT
     };
     NumericField NF_SIZE1
     {
+        HelpID = "cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE1";
         Pos = MAP_APPFONT ( 45 , 14 ) ;
         Size = MAP_APPFONT ( 30 , 12 ) ;
         Border = TRUE ;
@@ -67,6 +69,7 @@ TabPage RID_OFAPAGE_HTMLOPT
     };
     NumericField NF_SIZE2
     {
+        HelpID = "cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE2";
         Pos = MAP_APPFONT ( 45 , 30 ) ;
         Size = MAP_APPFONT ( 30 , 12 ) ;
         Border = TRUE ;
@@ -89,6 +92,7 @@ TabPage RID_OFAPAGE_HTMLOPT
     };
     NumericField NF_SIZE3
     {
+        HelpID = "cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE3";
         Pos = MAP_APPFONT ( 45 , 46 ) ;
         Size = MAP_APPFONT ( 30 , 12 ) ;
         Border = TRUE ;
@@ -111,6 +115,7 @@ TabPage RID_OFAPAGE_HTMLOPT
     };
     NumericField NF_SIZE4
     {
+        HelpID = "cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE4";
         Pos = MAP_APPFONT ( 45 , 62 ) ;
         Size = MAP_APPFONT ( 30 , 12 ) ;
         Border = TRUE ;
@@ -133,6 +138,7 @@ TabPage RID_OFAPAGE_HTMLOPT
     };
     NumericField NF_SIZE5
     {
+        HelpID = "cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE5";
         Pos = MAP_APPFONT ( 45 , 78 ) ;
         Size = MAP_APPFONT ( 30 , 12 ) ;
         Border = TRUE ;
@@ -155,6 +161,7 @@ TabPage RID_OFAPAGE_HTMLOPT
     };
     NumericField NF_SIZE6
     {
+        HelpID = "cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE6";
         Pos = MAP_APPFONT ( 45 , 94 ) ;
         Size = MAP_APPFONT ( 30 , 12 ) ;
         Border = TRUE ;
@@ -177,6 +184,7 @@ TabPage RID_OFAPAGE_HTMLOPT
     };
     NumericField NF_SIZE7
     {
+        HelpID = "cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE7";
         Pos = MAP_APPFONT ( 45 , 110 ) ;
         Size = MAP_APPFONT ( 30 , 12 ) ;
         Border = TRUE ;
@@ -205,6 +213,7 @@ TabPage RID_OFAPAGE_HTMLOPT
     };
     CheckBox CB_NUMBERS_ENGLISH_US
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_NUMBERS_ENGLISH_US";
         Pos = MAP_APPFONT ( 93 , 14 ) ;
         Size = MAP_APPFONT ( 161 , 10 ) ;
         TabStop = TRUE ;
@@ -212,6 +221,7 @@ TabPage RID_OFAPAGE_HTMLOPT
     };
     CheckBox CB_UNKNOWN_TAGS
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_UNKNOWN_TAGS";
         Pos = MAP_APPFONT ( 93 , 28 ) ;
         Size = MAP_APPFONT ( 155 , 10 ) ;
         TabStop = TRUE ;
@@ -219,6 +229,7 @@ TabPage RID_OFAPAGE_HTMLOPT
     };
     CheckBox CB_IGNORE_FONTNAMES
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_IGNORE_FONTNAMES";
         Pos = MAP_APPFONT ( 93 , 42 ) ;
         Size = MAP_APPFONT ( 155 , 10 ) ;
         TabStop = TRUE ;
@@ -232,6 +243,7 @@ TabPage RID_OFAPAGE_HTMLOPT
     };
     ListBox LB_EXPORT
     {
+        HelpID = "cui:ListBox:RID_OFAPAGE_HTMLOPT:LB_EXPORT";
         Pos = MAP_APPFONT ( 93 , 69 ) ;
         Size = MAP_APPFONT ( 155 , 50 ) ;
         Border = TRUE ;
@@ -246,24 +258,28 @@ TabPage RID_OFAPAGE_HTMLOPT
     };
     CheckBox CB_STARBASIC
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_STARBASIC";
         Pos = MAP_APPFONT ( 93 , 88 ) ;
         Size = MAP_APPFONT ( 155 , 10 ) ;
         Text = "%PRODUCTNAME ~Basic" ;
     };
     CheckBox CB_STARBASIC_WARNING
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_STARBASIC_WARNING";
         Pos = MAP_APPFONT ( 99 , 102 ) ;
         Size = MAP_APPFONT ( 149 , 10 ) ;
         Text [ en-US ] = "Display ~warning";
     };
     CheckBox CB_PRINT_EXTENSION
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_PRINT_EXTENSION";
         Pos = MAP_APPFONT ( 93 , 116 ) ;
         Size = MAP_APPFONT ( 155 , 10 ) ;
         Text [ en-US ] = "~Print layout" ;
     };
     CheckBox CB_LOCAL_GRF
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_LOCAL_GRF";
         Pos = MAP_APPFONT ( 93 , 130 ) ;
         Size = MAP_APPFONT ( 155 , 10 ) ;
         Text [ en-US ] = "~Copy local graphics to Internet" ;
@@ -277,6 +293,7 @@ TabPage RID_OFAPAGE_HTMLOPT
     };
     ListBox LB_CHARSET
     {
+        HelpID = "cui:ListBox:RID_OFAPAGE_HTMLOPT:LB_CHARSET";
         Pos = MAP_APPFONT ( 162 , 143 ) ;
         Size = MAP_APPFONT ( 86 , 61 ) ;
         TabStop = TRUE ;
diff --git a/cui/source/options/optimprove.src b/cui/source/options/optimprove.src
index 42c800905..145cafab4 100644
--- a/cui/source/options/optimprove.src
+++ b/cui/source/options/optimprove.src
@@ -55,6 +55,7 @@ TabPage RID_SVXPAGE_IMPROVEMENT
     };
     RadioButton RB_YES
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_IMPROVEMENT:RB_YES";
         Pos = MAP_APPFONT ( 12 , 92 ) ;
         Size = MAP_APPFONT ( 215 , 10 ) ;
         Check = TRUE ;
@@ -62,6 +63,7 @@ TabPage RID_SVXPAGE_IMPROVEMENT
     };
     RadioButton RB_NO
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_IMPROVEMENT:RB_NO";
         Pos = MAP_APPFONT ( 12 , 105 ) ;
         Size = MAP_APPFONT ( 215 , 10 ) ;
         Text [ en-US ] = "~No, I do not wish to participate" ;
@@ -105,6 +107,7 @@ TabPage RID_SVXPAGE_IMPROVEMENT
     };
     PushButton PB_SHOWDATA
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_IMPROVEMENT:PB_SHOWDATA";
         Pos = MAP_APPFONT ( 12 , 161 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Show Data" ;
diff --git a/cui/source/options/optinet2.src b/cui/source/options/optinet2.src
old mode 100755
new mode 100644
index 848cdc278..15b40051c
--- a/cui/source/options/optinet2.src
+++ b/cui/source/options/optinet2.src
@@ -41,6 +41,7 @@
 
 TabPage RID_SVXPAGE_INET_MOZPLUGIN
 {
+    HelpID = "cui:TabPage:RID_SVXPAGE_INET_MOZPLUGIN";
     OutputSize = TRUE ;
     Size = MAP_APPFONT ( 260 , 185 ) ;
     SVLook = TRUE ;
@@ -54,6 +55,7 @@ TabPage RID_SVXPAGE_INET_MOZPLUGIN
     };
     CheckBox CB_MOZPLUGIN_CODE
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_INET_MOZPLUGIN:CB_MOZPLUGIN_CODE";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT (  236 , 10  ) ;
         TabStop = TRUE ;
@@ -87,6 +89,7 @@ TabPage RID_SVXPAGE_INET_PROXY
     };
     ListBox LB_PROXYMODE
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_INET_PROXY:LB_PROXYMODE";
         Pos = MAP_APPFONT ( 65 , GB_TYPES_TOP + 11 ) ;
         Size = MAP_APPFONT ( 49 , 48 ) ;
         Border = TRUE ;
@@ -110,6 +113,7 @@ TabPage RID_SVXPAGE_INET_PROXY
     };
     Edit ED_HTTP_PROXY
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTP_PROXY";
         Pos = MAP_APPFONT ( 65 , GB_TYPES_TOP + 27 ) ;
         Size = MAP_APPFONT ( 123 , 12 ) ;
         Border = TRUE ;
@@ -128,6 +132,7 @@ TabPage RID_SVXPAGE_INET_PROXY
     };
     Edit ED_HTTP_PORT
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTP_PORT";
         Pos = MAP_APPFONT ( ED_PORT_COL , GB_TYPES_TOP + 27 ) ;
         Size = MAP_APPFONT ( ED_PORT_WIDTH , 12 ) ;
         Border = TRUE ;
@@ -141,6 +146,7 @@ TabPage RID_SVXPAGE_INET_PROXY
     };
     Edit ED_HTTPS_PROXY
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTPS_PROXY";
         Pos = MAP_APPFONT ( 65 , GB_TYPES_TOP + 43 ) ;
         Size = MAP_APPFONT ( 123 , 12 ) ;
         Border = TRUE ;
@@ -154,6 +160,7 @@ TabPage RID_SVXPAGE_INET_PROXY
     };
     Edit ED_HTTPS_PORT
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTPS_PORT";
         Pos = MAP_APPFONT ( ED_PORT_COL , GB_TYPES_TOP + 43 ) ;
         Size = MAP_APPFONT ( ED_PORT_WIDTH , 12 ) ;
         Border = TRUE ;
@@ -167,6 +174,7 @@ TabPage RID_SVXPAGE_INET_PROXY
     };
     Edit ED_FTP_PROXY
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_FTP_PROXY";
         Pos = MAP_APPFONT ( 65 , GB_TYPES_TOP + 59 ) ;
         Size = MAP_APPFONT ( 123 , 12 ) ;
         Border = TRUE ;
@@ -180,6 +188,7 @@ TabPage RID_SVXPAGE_INET_PROXY
     };
     Edit ED_FTP_PORT
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_FTP_PORT";
         Pos = MAP_APPFONT ( ED_PORT_COL , GB_TYPES_TOP + 59 ) ;
         Size = MAP_APPFONT ( ED_PORT_WIDTH , 12 ) ;
         Border = TRUE ;
@@ -192,6 +201,7 @@ TabPage RID_SVXPAGE_INET_PROXY
     };
     Edit ED_SOCKS_PROXY
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_SOCKS_PROXY";
         Pos = MAP_APPFONT ( 65 , GB_TYPES_TOP + 75 ) ;
         Size = MAP_APPFONT ( 123 , 12 ) ;
         Border = TRUE ;
@@ -205,6 +215,7 @@ TabPage RID_SVXPAGE_INET_PROXY
     };
     Edit ED_SOCKS_PORT
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_SOCKS_PORT";
         Pos = MAP_APPFONT ( ED_PORT_COL , GB_TYPES_TOP + 75 ) ;
         Size = MAP_APPFONT ( ED_PORT_WIDTH , 12 ) ;
         Border = TRUE ;
@@ -217,6 +228,7 @@ TabPage RID_SVXPAGE_INET_PROXY
     };
     Edit ED_NOPROXYFOR
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_INET_PROXY:ED_NOPROXYFOR";
         Pos = MAP_APPFONT ( 65 , GB_TYPES_TOP + 91 ) ;
         Size = MAP_APPFONT ( 123 , 12 ) ;
         Border = TRUE ;
@@ -235,18 +247,21 @@ TabPage RID_SVXPAGE_INET_PROXY
     };
     RadioButton RB_DNS_AUTO
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_INET_PROXY:RB_DNS_AUTO";
         Pos = MAP_APPFONT( 12, 111 );
         Size = MAP_APPFONT( 236, 10 );
         Text [ en-US ] = "~Automatic" ;
     };
     RadioButton RB_DNS_MANUAL
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_INET_PROXY:RB_DNS_MANUAL";
         Pos = MAP_APPFONT( 12, 124 );
         Size = MAP_APPFONT( 75, 10 );
         Text [ en-US ] = "~Manual" ;
     };
     PatternField ED_DNS
     {
+        HelpID = "cui:PatternField:RID_SVXPAGE_INET_PROXY:ED_DNS";
         Pos = MAP_APPFONT( 90, 126 );
         Size = MAP_APPFONT( 66, 12 );
         Border = TRUE ;
@@ -287,6 +302,7 @@ TabPage RID_SVXPAGE_INET_SEARCH
     };
     ListBox LB_SEARCH
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_INET_SEARCH:LB_SEARCH";
         Pos = MAP_APPFONT ( 12 , GB_SEARCH_TOP + 11 ) ;
         Size = MAP_APPFONT ( 39 , 120 ) ;
         Border = TRUE ;
@@ -303,6 +319,7 @@ TabPage RID_SVXPAGE_INET_SEARCH
     };
     Edit ED_SEARCH_NAME
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_SEARCH_NAME";
         Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 11 ) ;
         Size = MAP_APPFONT ( 125 , 12 ) ;
         Border = TRUE ;
@@ -315,6 +332,7 @@ TabPage RID_SVXPAGE_INET_SEARCH
     };
     RadioButton RB_AND
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_AND";
         Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 26 ) ;
         Size = MAP_APPFONT ( 125 , 10 ) ;
         Check = TRUE ;
@@ -322,12 +340,14 @@ TabPage RID_SVXPAGE_INET_SEARCH
     };
     RadioButton RB_OR
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_OR";
         Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 39 ) ;
         Size = MAP_APPFONT ( 125 , 10 ) ;
         Text [ en-US ] = "~Or" ;
     };
     RadioButton RB_EXACT
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_EXACT";
         Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 52 ) ;
         Size = MAP_APPFONT ( 125 , 10 ) ;
         Text [ en-US ] = "E~xact" ;
@@ -340,6 +360,7 @@ TabPage RID_SVXPAGE_INET_SEARCH
     };
     Edit ED_URL
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_URL";
         Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 65 ) ;
         Size = MAP_APPFONT ( 125 , 12 ) ;
         Border = TRUE ;
@@ -352,6 +373,7 @@ TabPage RID_SVXPAGE_INET_SEARCH
     };
     Edit ED_POSTFIX
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_POSTFIX";
         Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 80 ) ;
         Size = MAP_APPFONT ( 125 , 12 ) ;
         Border = TRUE ;
@@ -364,6 +386,7 @@ TabPage RID_SVXPAGE_INET_SEARCH
     };
     Edit ED_SEPARATOR
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_SEPARATOR";
         Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 95 ) ;
         Size = MAP_APPFONT ( 42 , 12 ) ;
         Border = TRUE ;
@@ -376,6 +399,7 @@ TabPage RID_SVXPAGE_INET_SEARCH
     };
     ListBox ED_CASE
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_INET_SEARCH:ED_CASE";
         Pos = MAP_APPFONT ( EDIT_START_XPOS, GB_SEARCH_TOP + 110 ) ;
         Size = MAP_APPFONT ( 42 , 48 ) ;
         Border = TRUE ;
@@ -389,24 +413,28 @@ TabPage RID_SVXPAGE_INET_SEARCH
     };
     PushButton PB_NEW
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_NEW";
         Pos = MAP_APPFONT ( 39 , GB_SEARCH_TOP + 131 + 6 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "N~ew";
     };
     PushButton PB_ADD
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_ADD";
         Pos = MAP_APPFONT ( 92 , GB_SEARCH_TOP + 131 + 6 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Add" ;
     };
     PushButton PB_CHANGE
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_CHANGE";
         Pos = MAP_APPFONT ( 145 , GB_SEARCH_TOP + 131 + 6 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Modify" ;
     };
     PushButton PB_DELETE
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_DELETE";
         Pos = MAP_APPFONT ( 198 , GB_SEARCH_TOP + 131 + 6 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Delete" ;
@@ -426,6 +454,7 @@ TabPage RID_SVXPAGE_INET_SEARCH
 
 TabPage RID_SVXPAGE_INET_SECURITY
 {
+    HelpID = "cui:TabPage:RID_SVXPAGE_INET_SECURITY";
     OutputSize = TRUE ;
     Size = MAP_APPFONT( TP_WIDTH , TP_HEIGHT );
     SVLook = TRUE;
@@ -446,6 +475,7 @@ TabPage RID_SVXPAGE_INET_SECURITY
     };
     PushButton PB_SEC_SECURITYOPTIONS
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_SECURITYOPTIONS";
         Pos = MAP_APPFONT( COL_3, ROW_2a );
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
         Text [ en-US ] = "Options...";
@@ -458,6 +488,7 @@ TabPage RID_SVXPAGE_INET_SECURITY
     };
     CheckBox CB_SEC_SAVEPASSWORDS
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_INET_SECURITY:CB_SEC_SAVEPASSWORDS";
         Pos = MAP_APPFONT( COL_1, ROW_3 - 4 );
         Size = MAP_APPFONT( COL_2-COL_1, 16 );
         Wordbreak = TRUE;
@@ -465,12 +496,14 @@ TabPage RID_SVXPAGE_INET_SECURITY
     };
     PushButton PB_SEC_CONNECTIONS
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_CONNECTIONS";
         Pos = MAP_APPFONT( COL_3, ROW_3-1 );
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
         Text [ en-US ] = "Connections...";
     };
     CheckBox CB_SEC_MASTERPASSWORD
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_INET_SECURITY:CB_SEC_MASTERPASSWORD";
         Pos = MAP_APPFONT( COL_1a, ROW_4 );
         Size = MAP_APPFONT( COL_2-COL_1a, RSC_CD_CHECKBOX_HEIGHT );
         Text [ en-US ] = "Protected by a master password (recommended)";
@@ -484,6 +517,7 @@ TabPage RID_SVXPAGE_INET_SECURITY
     };
     PushButton PB_SEC_MASTERPASSWORD
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_MASTERPASSWORD";
         Pos = MAP_APPFONT( COL_3, ROW_4a );
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
         Text [ en-US ] = "Master Password...";
@@ -503,6 +537,7 @@ TabPage RID_SVXPAGE_INET_SECURITY
     };
     PushButton PB_SEC_MACROSEC
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_MACROSEC";
         Pos = MAP_APPFONT( COL_3, ROW_6-2 );
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
         Text [ en-US ] = "Macro Security...";
@@ -523,6 +558,7 @@ ErrorBox RID_SVXERR_OPT_PROXYPORTS
 
 ModalDialog RID_SVXDLG_OPT_JAVASCRIPT_DISABLE
 {
+    HelpID = "cui:ModalDialog:RID_SVXDLG_OPT_JAVASCRIPT_DISABLE";
     OutputSize = TRUE;
     Size = MAP_APPFONT( 150, 81 );
     Moveable = TRUE;
@@ -541,6 +577,7 @@ ModalDialog RID_SVXDLG_OPT_JAVASCRIPT_DISABLE
     };
     CheckBox CB_JSCPT_DISABLE
     {
+        HelpID = "cui:CheckBox:RID_SVXDLG_OPT_JAVASCRIPT_DISABLE:CB_JSCPT_DISABLE";
         Pos = MAP_APPFONT( 39, 45 );
         Size = MAP_APPFONT( 195, 12 );
         Hide = TRUE;
@@ -591,6 +628,7 @@ TabPage RID_SVXPAGE_INET_MAIL
 
     Edit ED_MAILERURL
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_INET_MAIL:ED_MAILERURL";
         Pos = MAP_APPFONT ( 60 , 18 ) ;
         Size = MAP_APPFONT ( 171 , 12 ) ;
         Border = TRUE;
@@ -598,6 +636,7 @@ TabPage RID_SVXPAGE_INET_MAIL
 
     PushButton PB_MAILERURL
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_INET_MAIL:PB_MAILERURL";
         Pos = MAP_APPFONT ( 234 , 17 ) ;
         Size = MAP_APPFONT ( 14 , 14 ) ;
         Text = "..." ;
diff --git a/cui/source/options/optjava.src b/cui/source/options/optjava.src
index c8306b7b8..e92291d36 100644
--- a/cui/source/options/optjava.src
+++ b/cui/source/options/optjava.src
@@ -50,6 +50,7 @@ TabPage RID_SVXPAGE_OPTIONS_JAVA
     };
     CheckBox CB_JAVA_ENABLE
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_OPTIONS_JAVA:CB_JAVA_ENABLE";
         Pos = MAP_APPFONT ( 12, 14 ) ;
         Size = MAP_APPFONT ( 242 , 10 ) ;
         Text [ en-US ] = "~Use a Java runtime environment" ;
@@ -75,18 +76,21 @@ TabPage RID_SVXPAGE_OPTIONS_JAVA
     };
     PushButton PB_ADD
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_ADD";
         Pos = MAP_APPFONT ( 204 , 38 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Add..." ;
     };
     PushButton PB_PARAMETER
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_PARAMETER";
         Pos = MAP_APPFONT ( 204 , 55 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Parameters..." ;
     };
     PushButton PB_CLASSPATH
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_CLASSPATH";
         Pos = MAP_APPFONT ( 204 , 72 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Class Path..." ;
@@ -135,12 +139,14 @@ ModalDialog RID_SVXDLG_JAVA_PARAMETER
     };
     Edit ED_PARAMETER
     {
+        HelpID = "cui:Edit:RID_SVXDLG_JAVA_PARAMETER:ED_PARAMETER";
         Pos = MAP_APPFONT ( 6 , 15 ) ;
         Size = MAP_APPFONT ( 202 , 12 ) ;
         Border = TRUE ;
     };
     PushButton PB_ASSIGN
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_JAVA_PARAMETER:PB_ASSIGN";
         Pos = MAP_APPFONT ( 214 , 14 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Assign" ;
@@ -153,6 +159,7 @@ ModalDialog RID_SVXDLG_JAVA_PARAMETER
     };
     ListBox LB_ASSIGNED
     {
+        HelpID = "cui:ListBox:RID_SVXDLG_JAVA_PARAMETER:LB_ASSIGNED";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 42 ) ;
         Size = MAP_APPFONT ( 202 , 53 ) ;
@@ -166,6 +173,7 @@ ModalDialog RID_SVXDLG_JAVA_PARAMETER
     };
     PushButton PB_REMOVE
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_JAVA_PARAMETER:PB_REMOVE";
         Pos = MAP_APPFONT ( 214 , 42 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Remove" ;
@@ -211,6 +219,7 @@ ModalDialog RID_SVXDLG_JAVA_CLASSPATH
     };
     ListBox LB_PATH
     {
+        HelpID = "cui:ListBox:RID_SVXDLG_JAVA_CLASSPATH:LB_PATH";
         Pos = MAP_APPFONT ( 6 , 14 ) ;
         Size = MAP_APPFONT ( 172 , 72 ) ;
         Border = TRUE ;
@@ -218,18 +227,21 @@ ModalDialog RID_SVXDLG_JAVA_CLASSPATH
     };
     PushButton PB_ADDARCHIVE
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_ADDARCHIVE";
         Pos = MAP_APPFONT ( 184 , 14 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Add Archive..." ;
     };
     PushButton PB_ADDPATH
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_ADDPATH";
         Pos = MAP_APPFONT ( 184 , 31 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "Add ~Folder" ;
     };
     PushButton PB_REMOVE_PATH
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_REMOVE_PATH";
         Pos = MAP_APPFONT ( 184 , 48 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Remove" ;
diff --git a/cui/source/options/optjsearch.src b/cui/source/options/optjsearch.src
index 074f3a6b1..f058d13f4 100644
--- a/cui/source/options/optjsearch.src
+++ b/cui/source/options/optjsearch.src
@@ -45,96 +45,112 @@ TabPage RID_SVXPAGE_JSEARCH_OPTIONS
     };
     CheckBox CB_MATCH_CASE
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_CASE";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "~uppercase/lowercase";
     };
     CheckBox CB_MATCH_FULL_HALF_WIDTH
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_FULL_HALF_WIDTH";
         Pos = MAP_APPFONT ( 12 , 28 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "~full-width/half-width forms";
     };
     CheckBox CB_MATCH_HIRAGANA_KATAKANA
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_HIRAGANA_KATAKANA";
         Pos = MAP_APPFONT ( 12 , 42 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "~hiragana/katakana";
     };
     CheckBox CB_MATCH_CONTRACTIONS
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_CONTRACTIONS";
         Pos = MAP_APPFONT ( 12 , 56 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "~contractions (yo-on, sokuon)";
     };
     CheckBox CB_MATCH_MINUS_DASH_CHOON
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_MINUS_DASH_CHOON";
         Pos = MAP_APPFONT ( 12 , 70 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "~minus/dash/cho-on";
     };
     CheckBox CB_MATCH_REPEAT_CHAR_MARKS
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_REPEAT_CHAR_MARKS";
         Pos = MAP_APPFONT ( 12 , 84 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "'re~peat character' marks";
     };
     CheckBox CB_MATCH_VARIANT_FORM_KANJI
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_VARIANT_FORM_KANJI";
         Pos = MAP_APPFONT ( 12 , 98 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "~variant-form kanji (itaiji)";
     };
     CheckBox CB_MATCH_OLD_KANA_FORMS
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_OLD_KANA_FORMS";
         Pos = MAP_APPFONT ( 12 , 112) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "~old Kana forms";
     };
     CheckBox CB_MATCH_DIZI_DUZU
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_DIZI_DUZU";
         Pos = MAP_APPFONT ( 136 , 14 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "~di/zi, du/zu";
     };
     CheckBox CB_MATCH_BAVA_HAFA
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_BAVA_HAFA";
         Pos = MAP_APPFONT ( 136 , 28 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "~ba/va, ha/fa";
     };
     CheckBox CB_MATCH_TSITHICHI_DHIZI
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_TSITHICHI_DHIZI";
         Pos = MAP_APPFONT ( 136 , 42 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "~tsi/thi/chi, dhi/zi";
     };
     CheckBox CB_MATCH_HYUFYU_BYUVYU
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_HYUFYU_BYUVYU";
         Pos = MAP_APPFONT ( 136 , 56 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "h~yu/fyu, byu/vyu";
     };
     CheckBox CB_MATCH_SESHE_ZEJE
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_SESHE_ZEJE";
         Pos = MAP_APPFONT ( 136 , 70 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "~se/she, ze/je";
     };
     CheckBox CB_MATCH_IAIYA
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_IAIYA";
         Pos = MAP_APPFONT ( 136 , 84 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "~ia/iya (piano/piyano)";
     };
     CheckBox CB_MATCH_KIKU
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_KIKU";
         Pos = MAP_APPFONT ( 136 , 98 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "~ki/ku (tekisuto/tekusuto)";
     };
     CheckBox CB_MATCH_PROLONGED_SOUNDMARK
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_PROLONGED_SOUNDMARK";
         Pos = MAP_APPFONT ( 136 , 112 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "Prolon~ged vowels (ka-/kaa)";
@@ -147,18 +163,21 @@ TabPage RID_SVXPAGE_JSEARCH_OPTIONS
     };
     CheckBox CB_IGNORE_PUNCTUATION
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_PUNCTUATION";
         Pos = MAP_APPFONT ( 12 , 139 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "Pu~nctuation characters";
     };
     CheckBox CB_IGNORE_WHITESPACES
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_WHITESPACES";
         Pos = MAP_APPFONT ( 12 , 153 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "~Whitespace characters";
     };
     CheckBox CB_IGNORE_MIDDLE_DOT
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_MIDDLE_DOT";
         Pos = MAP_APPFONT ( 136 , 139 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "Midd~le dots";
diff --git a/cui/source/options/optlingu.src b/cui/source/options/optlingu.src
index 3b94571b0..31e187a21 100644
--- a/cui/source/options/optlingu.src
+++ b/cui/source/options/optlingu.src
@@ -59,6 +59,7 @@ ModalDialog RID_SVXDLG_EDIT_MODULES
     };
     ListBox LB_EDIT_MODULES_LANGUAGE
     {
+        HelpID = "cui:ListBox:RID_SVXDLG_EDIT_MODULES:LB_EDIT_MODULES_LANGUAGE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 83 , 14 ) ;
         Size = MAP_APPFONT ( 95 , 80 ) ;
@@ -74,6 +75,7 @@ ModalDialog RID_SVXDLG_EDIT_MODULES
     };
     PushButton PB_EDIT_MODULES_PRIO_UP
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_UP";
         Pos = MAP_APPFONT ( 184 , 32 ) ;
         Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
         TabStop = TRUE ;
@@ -81,6 +83,7 @@ ModalDialog RID_SVXDLG_EDIT_MODULES
     };
     PushButton PB_EDIT_MODULES_PRIO_DOWN
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_DOWN";
         Pos = MAP_APPFONT ( 184 , 49 ) ;
         Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
         TabStop = TRUE ;
@@ -88,6 +91,7 @@ ModalDialog RID_SVXDLG_EDIT_MODULES
     };
     PushButton PB_EDIT_MODULES_PRIO_BACK
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_BACK";
         Pos = MAP_APPFONT ( 184 , 66 ) ;
         Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
         TabStop = TRUE ;
@@ -164,6 +168,7 @@ ModalDialog RID_SVXDLG_LNG_ED_NUM_PREBREAK
     };
     NumericField ED_PREBREAK
     {
+        HelpID = "cui:NumericField:RID_SVXDLG_LNG_ED_NUM_PREBREAK:ED_PREBREAK";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 56 , 14 ) ;
         Size = MAP_APPFONT ( 31 , 12 ) ;
@@ -220,6 +225,7 @@ TabPage RID_SFXPAGE_LINGU
     };
     PushButton PB_LINGU_MODULES_EDIT
     {
+        HelpID = "cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_MODULES_EDIT";
         Pos = MAP_APPFONT ( 198 , 25 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -241,6 +247,7 @@ TabPage RID_SFXPAGE_LINGU
     };
     PushButton PB_LINGU_DICS_NEW_DIC
     {
+        HelpID = "cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_DICS_NEW_DIC";
         Pos = MAP_APPFONT ( 198 , 70 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -248,6 +255,7 @@ TabPage RID_SFXPAGE_LINGU
     };
     PushButton PB_LINGU_DICS_EDIT_DIC
     {
+        HelpID = "cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_DICS_EDIT_DIC";
         Pos = MAP_APPFONT ( 198 , 87 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -255,6 +263,7 @@ TabPage RID_SFXPAGE_LINGU
     };
     PushButton PB_LINGU_DICS_DEL_DIC
     {
+        HelpID = "cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_DICS_DEL_DIC";
         Pos = MAP_APPFONT ( 198 , 104 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -276,6 +285,7 @@ TabPage RID_SFXPAGE_LINGU
     };
     PushButton PB_LINGU_OPTIONS_EDIT
     {
+        HelpID = "cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_OPTIONS_EDIT";
         Pos = MAP_APPFONT ( 198 , 133 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
diff --git a/cui/source/options/optmemory.src b/cui/source/options/optmemory.src
index 37f4563e6..f7e66cea9 100644
--- a/cui/source/options/optmemory.src
+++ b/cui/source/options/optmemory.src
@@ -51,6 +51,7 @@ TabPage OFA_TP_MEMORY
     };
     NumericField ED_UNDO
     {
+        HelpID = "cui:NumericField:OFA_TP_MEMORY:ED_UNDO";
         Border = TRUE ;
         Pos = MAP_APPFONT( COL3, ROW1 );
         Size = MAP_APPFONT( WIDTH2, RSC_CD_TEXTBOX_HEIGHT );
@@ -80,6 +81,7 @@ TabPage OFA_TP_MEMORY
     };
     NumericField NF_GRAPHICCACHE
     {
+        HelpID = "cui:NumericField:OFA_TP_MEMORY:NF_GRAPHICCACHE";
         Border = TRUE ;
         Pos = MAP_APPFONT( COL3, ROW3 );
         Size = MAP_APPFONT( WIDTH2, RSC_CD_TEXTBOX_HEIGHT );
@@ -103,6 +105,7 @@ TabPage OFA_TP_MEMORY
     };
     NumericField NF_GRAPHICOBJECTCACHE
     {
+        HelpID = "cui:NumericField:OFA_TP_MEMORY:NF_GRAPHICOBJECTCACHE";
         Border = TRUE ;
         Pos = MAP_APPFONT( COL3, ROW4 );
         Size = MAP_APPFONT( WIDTH2, RSC_CD_TEXTBOX_HEIGHT );
@@ -127,6 +130,7 @@ TabPage OFA_TP_MEMORY
     };
     TimeField TF_GRAPHICOBJECTTIME
     {
+        HelpID = "cui:TimeField:OFA_TP_MEMORY:TF_GRAPHICOBJECTTIME";
         Border = TRUE ;
         Pos = MAP_APPFONT( COL3, ROW5 );
         Size = MAP_APPFONT( WIDTH2, RSC_CD_TEXTBOX_HEIGHT );
@@ -179,6 +183,7 @@ TabPage OFA_TP_MEMORY
     };
     NumericField NF_OLECACHE
     {
+        HelpID = "cui:NumericField:OFA_TP_MEMORY:NF_OLECACHE";
         Border = TRUE ;
         Pos = MAP_APPFONT( COL3, ROW7 );
         Size = MAP_APPFONT( WIDTH2, RSC_CD_TEXTBOX_HEIGHT );
@@ -195,6 +200,7 @@ TabPage OFA_TP_MEMORY
     };
     CheckBox CB_QUICKLAUNCH
     {
+        HelpID = "cui:CheckBox:OFA_TP_MEMORY:CB_QUICKLAUNCH";
         Pos = MAP_APPFONT( COL1, ROW9 );
         Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
         Text [ en-US ] = "Load %PRODUCTNAME during system start-up";
diff --git a/cui/source/options/optpath.src b/cui/source/options/optpath.src
index 22e455720..1ac721286 100644
--- a/cui/source/options/optpath.src
+++ b/cui/source/options/optpath.src
@@ -65,12 +65,14 @@ TabPage RID_SFXPAGE_PATH
     };
     PushButton BTN_PATH
     {
+        HelpID = "cui:PushButton:RID_SFXPAGE_PATH:BTN_PATH";
         Pos = MAP_APPFONT ( 183 , 165 ) ;
         Size = MAP_APPFONT ( 65 , 14 ) ;
         Text [ en-US ] = "~Edit..." ;
     };
     PushButton BTN_STANDARD
     {
+        HelpID = "cui:PushButton:RID_SFXPAGE_PATH:BTN_STANDARD";
         Pos = MAP_APPFONT ( 115 , 165 ) ;
         Size = MAP_APPFONT ( 65 , 14 ) ;
         Text [ en-US ] = "~Default" ; 
diff --git a/cui/source/options/optsave.src b/cui/source/options/optsave.src
index 1a44118d6..93b42ec2a 100644
--- a/cui/source/options/optsave.src
+++ b/cui/source/options/optsave.src
@@ -51,12 +51,14 @@ TabPage RID_SFXPAGE_SAVE
     };
     CheckBox CB_LOAD_SETTINGS
     {
+        HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:CB_LOAD_SETTINGS";
         Pos = MAP_APPFONT ( 12 , 11 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         Text [ en-US ] = "Load user-specific settings with the document";
     };
     CheckBox CB_LOAD_DOCPRINTER
     {
+        HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:CB_LOAD_DOCPRINTER";
         Pos = MAP_APPFONT ( 12 , 22 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         Text [ en-US ] = "Load printer settings with the document";
@@ -69,6 +71,7 @@ TabPage RID_SFXPAGE_SAVE
     };
     CheckBox BTN_DOCINFO
     {
+        HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_DOCINFO";
         Pos = MAP_APPFONT ( 12 , 41 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         Text [ en-US ] = "~Edit document properties before saving" ;
@@ -82,18 +85,21 @@ TabPage RID_SFXPAGE_SAVE
     };
     CheckBox BTN_BACKUP
     {
+        HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_BACKUP";
         Pos = MAP_APPFONT ( 12 , 52 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         Text [ en-US ] = "Al~ways create backup copy" ;
     };
     CheckBox BTN_AUTOSAVE
     {
+        HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_AUTOSAVE";
         Pos = MAP_APPFONT ( 12 , 63 ) ;
         Size = MAP_APPFONT ( 150 , 10 ) ;
         Text [ en-US ] = "Save ~AutoRecovery information every" ;
     };
     NumericField ED_AUTOSAVE
     {
+        HelpID = "cui:NumericField:RID_SFXPAGE_SAVE:ED_AUTOSAVE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 180 , 62 ) ;
         Size = MAP_APPFONT ( 21 , 12 ) ;
@@ -116,12 +122,14 @@ TabPage RID_SFXPAGE_SAVE
     };
     CheckBox BTN_RELATIVE_FSYS
     {
+        HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_RELATIVE_FSYS";
         Pos = MAP_APPFONT ( 12 , 74 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         Text [ en-US ] = "Save URLs relative to file system" ;
     };
     CheckBox BTN_RELATIVE_INET
     {
+        HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_RELATIVE_INET";
         Pos = MAP_APPFONT ( 12 , 85 ) ;
         Size = MAP_APPFONT ( 248 , 10 ) ;
         Text [ en-US ] = "Save URLs relative to internet" ;
@@ -140,6 +148,7 @@ TabPage RID_SFXPAGE_SAVE
     };
     ListBox LB_ODF_VERSION
     {
+        HelpID = "cui:ListBox:RID_SFXPAGE_SAVE:LB_ODF_VERSION";
         Pos = MAP_APPFONT ( 136 , 105 ) ;
         Size = MAP_APPFONT ( 108 , 58 ) ;
         Border = TRUE;
@@ -153,12 +162,14 @@ TabPage RID_SFXPAGE_SAVE
     };
     CheckBox BTN_NOPRETTYPRINTING
     {
+        HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_NOPRETTYPRINTING";
         Pos = MAP_APPFONT ( 12 , 120 ) ;
         Size = MAP_APPFONT ( 248 , 10 ) ;
         Text [ en-US ] = "Size optimization for ODF format" ;
     };
     CheckBox BTN_WARNALIENFORMAT
     {
+        HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_WARNALIENFORMAT";
         Pos = MAP_APPFONT ( 12 , 131 ) ;
         Size = MAP_APPFONT ( 248 , 10 ) ;
         Text [ en-US ] = "Warn when not saving in ODF or default format" ;
@@ -177,6 +188,7 @@ TabPage RID_SFXPAGE_SAVE
     };
     ListBox LB_APP
     {
+        HelpID = "cui:ListBox:RID_SFXPAGE_SAVE:LB_APP";
         Pos = MAP_APPFONT ( 12 , 153 ) ;
         Size = MAP_APPFONT ( 108 , 58 ) ;
         Border = TRUE;
@@ -200,6 +212,7 @@ TabPage RID_SFXPAGE_SAVE
     };
     ListBox LB_FILTER
     {
+        HelpID = "cui:ListBox:RID_SFXPAGE_SAVE:LB_FILTER";
         Pos = MAP_APPFONT ( 136 , 153 ) ;
         Size = MAP_APPFONT ( 108 , 58 ) ;
         Border = TRUE;
diff --git a/cui/source/options/optspell.src b/cui/source/options/optspell.src
index bd242a87d..9b46258ee 100644
--- a/cui/source/options/optspell.src
+++ b/cui/source/options/optspell.src
@@ -39,6 +39,7 @@ TabPage RID_SFXPAGE_SPELL
     Text [ en-US ] = "Spellcheck" ;
     PushButton BTN_BOOK
     {
+        HelpID = "cui:PushButton:RID_SFXPAGE_SPELL:BTN_BOOK";
         Pos = MAP_APPFONT ( 128 , 6 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Edit..." ;
@@ -46,6 +47,7 @@ TabPage RID_SFXPAGE_SPELL
     };
     MultiListBox LB_BOOK
     {
+        HelpID = "cui:MultiListBox:RID_SFXPAGE_SPELL:LB_BOOK";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 103 , 47 ) ;
@@ -62,6 +64,7 @@ TabPage RID_SFXPAGE_SPELL
     };
     CheckBox BTN_CAPS
     {
+        HelpID = "cui:CheckBox:RID_SFXPAGE_SPELL:BTN_CAPS";
         Pos = MAP_APPFONT ( 12 , 82 ) ;
         Size = MAP_APPFONT ( 103 , 10 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? ~Großgeschriebene Wörter : ~Gro˜geschriebene W÷rter */
@@ -71,6 +74,7 @@ TabPage RID_SFXPAGE_SPELL
     };
     CheckBox BTN_NUMS
     {
+        HelpID = "cui:CheckBox:RID_SFXPAGE_SPELL:BTN_NUMS";
         Pos = MAP_APPFONT ( 12 , 95 ) ;
         Size = MAP_APPFONT ( 103 , 10 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? ~Wörter mit Ziffern  : ~W÷rter mit Ziffern  */
@@ -80,6 +84,7 @@ TabPage RID_SFXPAGE_SPELL
     };
     CheckBox BTN_UPLOW
     {
+        HelpID = "cui:CheckBox:RID_SFXPAGE_SPELL:BTN_UPLOW";
         Pos = MAP_APPFONT ( 12 , 108 ) ;
         Size = MAP_APPFONT ( 103 , 10 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? Groß- u. ~Kleinschreibung  : Gro˜- u. ~Kleinschreibung  */
diff --git a/cui/source/options/optupdt.src b/cui/source/options/optupdt.src
index f71273c5a..ad1202739 100644
--- a/cui/source/options/optupdt.src
+++ b/cui/source/options/optupdt.src
@@ -47,24 +47,28 @@ TabPage RID_SVXPAGE_ONLINEUPDATE
     };
     CheckBox CB_AUTOCHECK
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_ONLINEUPDATE:CB_AUTOCHECK";
         Pos = MAP_APPFONT ( 12, 14 ) ;
         Size = MAP_APPFONT ( 210, 10 ) ;
         Text [ en-US ] = "~Check for updates automatically" ;
     };
     RadioButton RB_EVERYDAY
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYDAY";
         Pos = MAP_APPFONT ( 18, 27 ) ;
         Size = MAP_APPFONT ( 160, 10 ) ;        
         Text [ en-US ] = "Every Da~y" ;
     };
     RadioButton RB_EVERYWEEK
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYWEEK";
         Pos = MAP_APPFONT ( 18, 40 ) ;
         Size = MAP_APPFONT ( 160, 10 ) ;        
         Text [ en-US ] = "Every ~Week" ;
     };
     RadioButton RB_EVERYMONTH
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYMONTH";
         Pos = MAP_APPFONT ( 18, 53 ) ;
         Size = MAP_APPFONT ( 160, 10 ) ;        
         Text [ en-US ] = "Every ~Month" ;
@@ -77,12 +81,14 @@ TabPage RID_SVXPAGE_ONLINEUPDATE
     };
     PushButton PB_CHECKNOW
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_ONLINEUPDATE:PB_CHECKNOW";
         Pos = MAP_APPFONT ( 12, 82 ) ;
         Size = MAP_APPFONT ( 50, 14 ) ;
         Text [ en-US ] = "Check ~now" ;
     };
     CheckBox CB_AUTODOWNLOAD
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_ONLINEUPDATE:CB_AUTODOWNLOAD";
         Pos = MAP_APPFONT ( 12, 130 ) ;
         Size = MAP_APPFONT ( 160, 10 ) ;
         Text [ en-US ] = "~Download updates automatically" ;
@@ -100,6 +106,7 @@ TabPage RID_SVXPAGE_ONLINEUPDATE
     };
     PushButton PB_CHANGEPATH
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_ONLINEUPDATE:PB_CHANGEPATH";
         Pos = MAP_APPFONT ( 162, 151 ) ;
         Size = MAP_APPFONT ( 50, 14 ) ;
         Text [ en-US ] = "Ch~ange..." ;
diff --git a/cui/source/options/securityoptions.src b/cui/source/options/securityoptions.src
index cff58746c..632f28794 100644
--- a/cui/source/options/securityoptions.src
+++ b/cui/source/options/securityoptions.src
@@ -61,6 +61,7 @@ ModalDialog RID_SVXDLG_SECURITY_OPTIONS
     };
     CheckBox CB_SAVESENDDOCS
     {
+        HelpID = "cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_SAVESENDDOCS";
         Pos = MAP_APPFONT( COL_2, ROW_2 );
         Size = MAP_APPFONT( CHECKBOX_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
         Text [ en-US ] = "When saving or sending";
@@ -72,6 +73,7 @@ ModalDialog RID_SVXDLG_SECURITY_OPTIONS
     };
     CheckBox CB_SIGNDOCS
     {
+        HelpID = "cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_SIGNDOCS";
         Pos = MAP_APPFONT( COL_2 + CHECKBOX_WIDTH + RSC_SP_CTRL_X, ROW_2 );
         Size = MAP_APPFONT( CHECKBOX_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
         Text [ en-US ] = "When signing";
@@ -83,6 +85,7 @@ ModalDialog RID_SVXDLG_SECURITY_OPTIONS
     };
     CheckBox CB_PRINTDOCS
     {
+        HelpID = "cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_PRINTDOCS";
         Pos = MAP_APPFONT( COL_2, ROW_3 );
         Size = MAP_APPFONT( CHECKBOX_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
         Text [ en-US ] = "When printing";
@@ -94,6 +97,7 @@ ModalDialog RID_SVXDLG_SECURITY_OPTIONS
     };
     CheckBox CB_CREATEPDF
     {
+        HelpID = "cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_CREATEPDF";
         Pos = MAP_APPFONT( COL_2 + CHECKBOX_WIDTH + RSC_SP_CTRL_X, ROW_3 );
         Size = MAP_APPFONT( CHECKBOX_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
         Text [ en-US ] = "When creating PDF files";
@@ -111,6 +115,7 @@ ModalDialog RID_SVXDLG_SECURITY_OPTIONS
     };
     CheckBox CB_REMOVEINFO
     {
+        HelpID = "cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_REMOVEINFO";
         Pos = MAP_APPFONT( COL_1, ROW_5 );
         Size = MAP_APPFONT( COL_3-COL_1, RSC_CD_CHECKBOX_HEIGHT );
         Text [ en-US ] = "Remove personal information on saving";
@@ -122,6 +127,7 @@ ModalDialog RID_SVXDLG_SECURITY_OPTIONS
     };
     CheckBox CB_RECOMMENDPWD
     {
+        HelpID = "cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_RECOMMENDPWD";
         Pos = MAP_APPFONT( COL_1, ROW_6 );
         Size = MAP_APPFONT( COL_3-COL_1, RSC_CD_CHECKBOX_HEIGHT );
         Text [ en-US ] = "Recommend password protection on saving";
@@ -133,6 +139,7 @@ ModalDialog RID_SVXDLG_SECURITY_OPTIONS
     };
     CheckBox CB_CTRLHYPERLINK
     {
+        HelpID = "cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_CTRLHYPERLINK";
         Pos = MAP_APPFONT( COL_1, ROW_7 );
         Size = MAP_APPFONT( COL_3-COL_1, RSC_CD_CHECKBOX_HEIGHT );
         Text [ en-US ] = "Ctrl-click required to follow hyperlinks";
diff --git a/cui/source/options/treeopt.src b/cui/source/options/treeopt.src
index 45c81241e..4c41df2d2 100644
--- a/cui/source/options/treeopt.src
+++ b/cui/source/options/treeopt.src
@@ -63,6 +63,7 @@ ModalDialog RID_OFADLG_OPTIONS_TREE
     };
     PushButton PB_BACK
     {
+        HelpID = "cui:PushButton:RID_OFADLG_OPTIONS_TREE:PB_BACK";
         Pos = MAP_APPFONT ( COL_10, ROW_3 ) ;
         Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
         TabStop = TRUE ;
diff --git a/cui/source/options/webconninfo.src b/cui/source/options/webconninfo.src
index 17494aa98..45ab62167 100644
--- a/cui/source/options/webconninfo.src
+++ b/cui/source/options/webconninfo.src
@@ -56,18 +56,21 @@ ModalDialog RID_SVXDLG_WEBCONNECTION_INFO
     };
     PushButton PB_REMOVE
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_REMOVE";
         Pos = MAP_APPFONT ( COL_0 , ROW_3 ) ;
         Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
         Text [ en-US ] = "Remove";
     };
     PushButton PB_REMOVEALL
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_REMOVEALL";
         Pos = MAP_APPFONT ( COL_1 , ROW_3 ) ;
         Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
         Text [ en-US ] = "Remove All";
     };
     PushButton PB_CHANGE
     {
+        HelpID = "cui:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_CHANGE";
         Pos = MAP_APPFONT ( COL_C , ROW_3 ) ;
         Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
         Text [ en-US ] = "Change Password...";
diff --git a/cui/source/tabpages/align.src b/cui/source/tabpages/align.src
index 50cc9dc48..ba52e3b28 100644
--- a/cui/source/tabpages/align.src
+++ b/cui/source/tabpages/align.src
@@ -57,6 +57,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
     };
     ListBox LB_HORALIGN
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_ALIGNMENT:LB_HORALIGN";
         Border = TRUE;
         Pos = MAP_APPFONT ( 12 , 25  );
         Size = MAP_APPFONT ( 100 , 60 );
@@ -80,6 +81,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
     };
     MetricField ED_INDENT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_ALIGNMENT:ED_INDENT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 118 , 25 ) ;
         Size = MAP_APPFONT ( 36 , 12 ) ;
@@ -98,6 +100,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
     };
     ListBox LB_VERALIGN
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_ALIGNMENT:LB_VERALIGN";
         Border = TRUE;
         Pos = MAP_APPFONT ( 160 , 25  );
         Size = MAP_APPFONT ( 88 , 60 );
@@ -119,6 +122,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
     };
     TriStateBox BTN_TXTSTACKED
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_TXTSTACKED";
         Pos = MAP_APPFONT ( 133 , 54 ) ;
         Size = MAP_APPFONT ( 115 , 10 ) ;
         TabStop = TRUE ;
@@ -139,6 +143,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
     };
     NumericField NF_DEGREES
     {
+        HelpID = "cui:NumericField:RID_SVXPAGE_ALIGNMENT:NF_DEGREES";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 72 , 65 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -165,6 +170,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
     };
     TriStateBox BTN_ASIAN_VERTICAL
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_ASIAN_VERTICAL";
         Pos = MAP_APPFONT ( 143 , 68 ) ;
         Size = MAP_APPFONT ( 105 , 10 ) ;
         TabStop = TRUE ;
@@ -178,18 +184,21 @@ TabPage RID_SVXPAGE_ALIGNMENT
     };
     TriStateBox BTN_WRAP
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_WRAP";
         Pos = MAP_APPFONT ( 12 , 126 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         Text [ en-US ] = "~Wrap text automatically" ;
     };
     TriStateBox BTN_HYPH
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_HYPH";
         Pos = MAP_APPFONT ( 22 , 139 ) ;
         Size = MAP_APPFONT ( 226 , 10 ) ;
         Text [ en-US ] = "Hyphenation ~active";
     };
     TriStateBox BTN_SHRINK
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_SHRINK";
         Pos = MAP_APPFONT( 12, 152 );
         Size = MAP_APPFONT( 236, 10 );
         Text [ en-US ] = "~Shrink to fit cell size";
@@ -202,6 +211,7 @@ TabPage RID_SVXPAGE_ALIGNMENT
     };
     ListBox LB_FRAMEDIR
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_ALIGNMENT:LB_FRAMEDIR";
         Pos = MAP_APPFONT( 78 , 168 );
         Size = MAP_APPFONT( 170 , 50 );
         Border = TRUE;
diff --git a/cui/source/tabpages/autocdlg.src b/cui/source/tabpages/autocdlg.src
index 2a07cea17..e0b288257 100644
--- a/cui/source/tabpages/autocdlg.src
+++ b/cui/source/tabpages/autocdlg.src
@@ -173,6 +173,7 @@ TabPage RID_OFAPAGE_AUTOFMT_APPLY
     };
     PushButton PB_EDIT
     {
+        HelpID = "cui:PushButton:RID_OFAPAGE_AUTOFMT_APPLY:PB_EDIT";
         Pos = MAP_APPFONT ( 6 , 162 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Edit..." ;
@@ -273,6 +274,7 @@ ModalDialog RID_OFADLG_PRCNT_SET
     };
     MetricField ED_RIGHT_MARGIN
     {
+        HelpID = "cui:MetricField:RID_OFADLG_PRCNT_SET:ED_RIGHT_MARGIN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 7 , 14 ) ;
         Size = MAP_APPFONT ( 31 , 12 ) ;
@@ -312,6 +314,7 @@ TabPage RID_OFAPAGE_AUTOCORR_REPLACE
     };
     Edit ED_SHORT
     {
+        HelpID = "cui:Edit:RID_OFAPAGE_AUTOCORR_REPLACE:ED_SHORT";
         Pos = MAP_APPFONT ( 7 , 13 ) ;
         Size = MAP_APPFONT ( 60 , 12 ) ;
         Border = TRUE ;
@@ -326,6 +329,7 @@ TabPage RID_OFAPAGE_AUTOCORR_REPLACE
     };
     Edit ED_REPLACE
     {
+        HelpID = "cui:Edit:RID_OFAPAGE_AUTOCORR_REPLACE:ED_REPLACE";
         Pos = MAP_APPFONT ( 71 , 13 ) ;
         Size = MAP_APPFONT ( 123 , 12 ) ;
         Border = TRUE ;
@@ -333,6 +337,7 @@ TabPage RID_OFAPAGE_AUTOCORR_REPLACE
     };
     CheckBox CB_TEXT_ONLY
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_AUTOCORR_REPLACE:CB_TEXT_ONLY";
         Pos = MAP_APPFONT ( 140 , 3 ) ;
         Size = MAP_APPFONT ( 108 , 10 ) ;
         TabStop = TRUE ;
@@ -340,6 +345,7 @@ TabPage RID_OFAPAGE_AUTOCORR_REPLACE
     };
     PushButton PB_NEW_REPLACE
     {
+        HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_REPLACE:PB_NEW_REPLACE";
         Pos = MAP_APPFONT ( 198 , 14 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -347,6 +353,7 @@ TabPage RID_OFAPAGE_AUTOCORR_REPLACE
     };
     PushButton PB_DELETE_REPLACE
     {
+        HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_REPLACE:PB_DELETE_REPLACE";
         Pos = MAP_APPFONT ( 198 , 32 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -385,6 +392,7 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT
     };
     Edit ED_ABBREV
     {
+        HelpID = "cui:Edit:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_ABBREV";
         Pos = MAP_APPFONT ( 7 , 14 ) ;
         Size = MAP_APPFONT ( 123 , 12 ) ;
         TabStop = TRUE ;
@@ -392,6 +400,7 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT
     };
     ListBox LB_ABBREV
     {
+        HelpID = "cui:ListBox:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_ABBREV";
         Pos = MAP_APPFONT ( 7 , 30 ) ;
         Size = MAP_APPFONT ( 123 , 58 ) ;
         TabStop = TRUE ;
@@ -401,6 +410,7 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT
     };
     PushButton PB_NEWABBREV
     {
+        HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_NEWABBREV";
         Pos = MAP_APPFONT ( 198 , 14 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -409,6 +419,7 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT
     };
     PushButton PB_DELABBREV
     {
+        HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELABBREV";
         Pos = MAP_APPFONT ( 198 , 31 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -417,6 +428,7 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT
     };
     CheckBox CB_AUTOABBREV
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOABBREV";
         Pos = MAP_APPFONT ( 137 , 78 ) ;
         Size = MAP_APPFONT ( 111 , 10 ) ;
         Text [ en-US ] = "~AutoInclude";
@@ -431,6 +443,7 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT
     };
     Edit ED_DOUBLE_CAPS
     {
+        HelpID = "cui:Edit:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_DOUBLE_CAPS";
         Pos = MAP_APPFONT ( 7 , 105 ) ;
         Size = MAP_APPFONT ( 123 , 12 ) ;
         TabStop = TRUE ;
@@ -438,6 +451,7 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT
     };
     ListBox LB_DOUBLE_CAPS
     {
+        HelpID = "cui:ListBox:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_DOUBLE_CAPS";
         Pos = MAP_APPFONT ( 7 , 120 ) ;
         Size = MAP_APPFONT ( 123 , 59 ) ;
         TabStop = TRUE ;
@@ -447,6 +461,7 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT
     };
     PushButton PB_NEWDOUBLECAPS
     {
+        HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_NEWDOUBLECAPS";
         Pos = MAP_APPFONT ( 198 , 105 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Disable = TRUE ;
@@ -454,6 +469,7 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT
     };
     PushButton PB_DELDOUBLECAPS
     {
+        HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELDOUBLECAPS";
         Pos = MAP_APPFONT ( 198 , 122 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Disable = TRUE ;
@@ -461,6 +477,7 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT
     };
     CheckBox CB_AUTOCAPS
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOCAPS";
         Pos = MAP_APPFONT ( 137 , 169 ) ;
         Size = MAP_APPFONT ( 111 , 10 ) ;
         Text [ en-US ] = "A~utoInclude";
@@ -523,6 +540,7 @@ TabPage RID_OFAPAGE_AUTOCORR_QUOTE
     };
     PushButton PB_SGL_STARTQUOTE
     {
+        HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STARTQUOTE";
         Pos = MAP_APPFONT ( 10 , 125 ) ;
         Size = MAP_APPFONT ( 12 , 12 ) ;
         Text = "\'" ;
@@ -541,6 +559,7 @@ TabPage RID_OFAPAGE_AUTOCORR_QUOTE
     };
     PushButton PB_SGL_ENDQUOTE
     {
+        HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_ENDQUOTE";
         Pos = MAP_APPFONT ( 10 , 151 ) ;
         Size = MAP_APPFONT ( 12 , 12 ) ;
         Text = "\'" ;
@@ -553,6 +572,7 @@ TabPage RID_OFAPAGE_AUTOCORR_QUOTE
     };
     PushButton PB_SGL_STD
     {
+        HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STD";
         Pos = MAP_APPFONT ( 7 , 167 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -566,6 +586,7 @@ TabPage RID_OFAPAGE_AUTOCORR_QUOTE
     };
     CheckBox CB_TYPO
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_AUTOCORR_QUOTE:CB_TYPO";
         Pos = MAP_APPFONT ( 137 , 101 ) ;
         Size = MAP_APPFONT ( 86 , 10 ) ;
         TabStop = TRUE ;
@@ -579,6 +600,7 @@ TabPage RID_OFAPAGE_AUTOCORR_QUOTE
     };
     PushButton PB_STARTQUOTE
     {
+        HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_STARTQUOTE";
         Pos = MAP_APPFONT ( 140 , 125 ) ;
         Size = MAP_APPFONT ( 12 , 12 ) ;
         Text = "\"" ;
@@ -597,6 +619,7 @@ TabPage RID_OFAPAGE_AUTOCORR_QUOTE
     };
     PushButton PB_ENDQUOTE
     {
+        HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_ENDQUOTE";
         Pos = MAP_APPFONT ( 140 , 151 ) ;
         Size = MAP_APPFONT ( 12 , 12 ) ;
         Text = "\"" ;
@@ -609,6 +632,7 @@ TabPage RID_OFAPAGE_AUTOCORR_QUOTE
     };
     PushButton PB_DBL_STD
     {
+        HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_DBL_STD";
         Pos = MAP_APPFONT ( 137 , 167 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -642,30 +666,35 @@ TabPage RID_OFAPAGE_AUTOCOMPLETE_OPTIONS
     Hide = TRUE ;
     CheckBox CB_ACTIV
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_ACTIV";
         Pos = MAP_APPFONT( 4, 3 );
         Size = MAP_APPFONT( 116, 10 );
         Text [ en-US ] = "Enable word ~completion";
     };
     CheckBox CB_APPEND_SPACE
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_APPEND_SPACE";
         Pos = MAP_APPFONT( 10, 17 );
         Size = MAP_APPFONT( 110, 10 );
         Text [ en-US ] = "~Append space";
     };
     CheckBox CB_AS_TIP
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_AS_TIP";
         Pos = MAP_APPFONT( 10, 31 );
         Size = MAP_APPFONT( 110, 10 );
         Text [ en-US ] = "~Show as tip";
     };
     CheckBox CB_COLLECT
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_COLLECT";
         Pos = MAP_APPFONT( 4, 45 );
         Size = MAP_APPFONT( 116, 10 );
         Text [ en-US ] = "C~ollect words";
     };
     CheckBox CB_REMOVE_LIST
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_REMOVE_LIST";
         Pos = MAP_APPFONT( 10, 59 );
         Size = MAP_APPFONT( 110, 40 );
         WordBreak = TRUE;
@@ -679,6 +708,7 @@ TabPage RID_OFAPAGE_AUTOCOMPLETE_OPTIONS
     };
     ListBox DCB_EXPAND_KEY
     {
+        HelpID = "cui:ListBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:DCB_EXPAND_KEY";
         Pos = MAP_APPFONT( 4, 113 );
         Size = MAP_APPFONT( 116, 60 );
         TabStop = TRUE;
@@ -694,6 +724,7 @@ TabPage RID_OFAPAGE_AUTOCOMPLETE_OPTIONS
     };
     NumericField NF_MIN_WORDLEN
     {
+        HelpID = "cui:NumericField:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MIN_WORDLEN";
         Border = TRUE;
         Pos = MAP_APPFONT( 4, 140 );
         Size = MAP_APPFONT( 30, 12 );
@@ -716,6 +747,7 @@ TabPage RID_OFAPAGE_AUTOCOMPLETE_OPTIONS
     };
     NumericField NF_MAX_ENTRIES
     {
+        HelpID = "cui:NumericField:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MAX_ENTRIES";
         Border = TRUE;
         Pos = MAP_APPFONT( 4, 167 );
         Size = MAP_APPFONT( 30, 12 );
@@ -732,6 +764,7 @@ TabPage RID_OFAPAGE_AUTOCOMPLETE_OPTIONS
     };
     MultiListBox LB_ENTRIES
     {
+        HelpID = "cui:MultiListBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:LB_ENTRIES";
         Pos = MAP_APPFONT( 127, 3 );
         Size = MAP_APPFONT( 121, 158 );
         TabStop = TRUE;
@@ -742,6 +775,7 @@ TabPage RID_OFAPAGE_AUTOCOMPLETE_OPTIONS
     };
     PushButton PB_ENTRIES
     {
+        HelpID = "cui:PushButton:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:PB_ENTRIES";
         Pos = MAP_APPFONT( 127, 165 );
         Size = MAP_APPFONT( 121, 14 );
         TabStop = TRUE ;
@@ -767,6 +801,7 @@ TabPage RID_OFAPAGE_SMARTTAG_OPTIONS
     
     CheckBox CB_SMARTTAGS
     {
+        HelpID = "cui:CheckBox:RID_OFAPAGE_SMARTTAG_OPTIONS:CB_SMARTTAGS";
         Pos = MAP_APPFONT( 4, 3 );
         Size = MAP_APPFONT( 116, 10 );
         Text [ en-US ] = "Label text with smart tags";
@@ -789,6 +824,7 @@ TabPage RID_OFAPAGE_SMARTTAG_OPTIONS
     
     PushButton PB_SMARTTAGS
     {
+        HelpID = "cui:PushButton:RID_OFAPAGE_SMARTTAG_OPTIONS:PB_SMARTTAGS";
         Pos = MAP_APPFONT ( 188 , 25 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "Properties...";
diff --git a/cui/source/tabpages/backgrnd.src b/cui/source/tabpages/backgrnd.src
index 21b87099d..66b0de288 100644
--- a/cui/source/tabpages/backgrnd.src
+++ b/cui/source/tabpages/backgrnd.src
@@ -54,6 +54,7 @@ TabPage RID_SVXPAGE_BACKGROUND
     };
     ListBox LB_SELECTOR
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_BACKGROUND:LB_SELECTOR";
         Hide = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 33 , 3 ) ;
@@ -76,6 +77,7 @@ TabPage RID_SVXPAGE_BACKGROUND
     };
     ListBox LB_TBL_BOX
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_BACKGROUND:LB_TBL_BOX";
         Hide = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 172 , 3 ) ;
@@ -90,6 +92,7 @@ TabPage RID_SVXPAGE_BACKGROUND
     };
     ListBox LB_PARA_BOX
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_BACKGROUND:LB_PARA_BOX";
         Hide = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 172 , 3 ) ;
@@ -140,6 +143,7 @@ TabPage RID_SVXPAGE_BACKGROUND
     };
     MetricField MF_COL_TRANS
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_BACKGROUND:MF_COL_TRANS";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 218 , 74 + RSC_SP_CTRL_Y ) ;
         Size = MAP_APPFONT ( 30 , 12) ;
@@ -165,6 +169,7 @@ TabPage RID_SVXPAGE_BACKGROUND
     };
     PushButton BTN_BROWSE
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_BACKGROUND:BTN_BROWSE";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 6 + RSC_SP_FLGR_INNERBORDER_LEFT , 23 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
@@ -172,6 +177,7 @@ TabPage RID_SVXPAGE_BACKGROUND
     };
     CheckBox BTN_LINK
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_BACKGROUND:BTN_LINK";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 6 + RSC_SP_FLGR_INNERBORDER_LEFT + 60 + 2*RSC_SP_CTRL_X, 23 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP + 3 ) ;
         Size = MAP_APPFONT ( 78 , 10 ) ;
@@ -193,6 +199,7 @@ TabPage RID_SVXPAGE_BACKGROUND
     };
     RadioButton BTN_POSITION
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_POSITION";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 12 , 89 ) ;
         Size = MAP_APPFONT ( 49 , 10 ) ;
@@ -200,6 +207,7 @@ TabPage RID_SVXPAGE_BACKGROUND
     };
     RadioButton BTN_AREA
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_AREA";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 12 , 103 ) ;
         Size = MAP_APPFONT ( 49 , 10 ) ;
@@ -208,6 +216,7 @@ TabPage RID_SVXPAGE_BACKGROUND
     };
     RadioButton BTN_TILE
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_TILE";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 12 , 117 ) ;
         Size = MAP_APPFONT ( 49 , 10 ) ;
@@ -231,6 +240,7 @@ TabPage RID_SVXPAGE_BACKGROUND
     };
     MetricField MF_GRAPH_TRANS
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_BACKGROUND:MF_GRAPH_TRANS";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 12 , 168 ) ;
         Size = MAP_APPFONT ( 30 , 12) ;
@@ -254,6 +264,7 @@ TabPage RID_SVXPAGE_BACKGROUND
     };
     CheckBox BTN_PREVIEW
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_BACKGROUND:BTN_PREVIEW";
         Pos = MAP_APPFONT ( 170 , 23 + 4 + 139 + RSC_SP_CTRL_GROUP_Y ) ;
         Size = MAP_APPFONT ( 141 , 10 ) ;
         Text [ en-US ] = "Pre~view" ;
diff --git a/cui/source/tabpages/border.src b/cui/source/tabpages/border.src
index a2ad4d617..f96ac55c5 100644
--- a/cui/source/tabpages/border.src
+++ b/cui/source/tabpages/border.src
@@ -93,6 +93,7 @@ TabPage RID_SVXPAGE_BORDER
     };
     ListBox LB_LINESTYLE
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_BORDER:LB_LINESTYLE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 88 , 25 ) ;
         Size = MAP_APPFONT ( 74 , 66 ) ;
@@ -105,6 +106,7 @@ TabPage RID_SVXPAGE_BORDER
     };
     ListBox LB_LINECOLOR
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_BORDER:LB_LINECOLOR";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 88 , 106 ) ;
         Size = MAP_APPFONT ( 74 , 68 ) ;
@@ -125,6 +127,7 @@ TabPage RID_SVXPAGE_BORDER
     };
     MetricField MF_LEFT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_BORDER:MF_LEFT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 213 , 14 ) ;
         Size = MAP_APPFONT ( 38 , 12 ) ;
@@ -146,6 +149,7 @@ TabPage RID_SVXPAGE_BORDER
     };
     MetricField MF_RIGHT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_BORDER:MF_RIGHT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 213 , 30 ) ;
         Size = MAP_APPFONT ( 38 , 12 ) ;
@@ -167,6 +171,7 @@ TabPage RID_SVXPAGE_BORDER
     };
     MetricField MF_TOP
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_BORDER:MF_TOP";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 213 , 46 ) ;
         Size = MAP_APPFONT ( 38 , 12 ) ;
@@ -188,6 +193,7 @@ TabPage RID_SVXPAGE_BORDER
     };
     MetricField MF_BOTTOM
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_BORDER:MF_BOTTOM";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 213 , 62 ) ;
         Size = MAP_APPFONT ( 38 , 12 ) ;
@@ -203,6 +209,7 @@ TabPage RID_SVXPAGE_BORDER
     };
     CheckBox CB_SYNC
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_BORDER:CB_SYNC";
         Pos = MAP_APPFONT ( 177 , 78 ) ;
         Size = MAP_APPFONT ( 74 , 10 ) ;
         Text [ en-US ] = "Synchronize";
@@ -236,6 +243,7 @@ TabPage RID_SVXPAGE_BORDER
     };
     MetricField ED_SHADOWSIZE
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_BORDER:ED_SHADOWSIZE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 88 , 144 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -257,6 +265,7 @@ TabPage RID_SVXPAGE_BORDER
     };
     ListBox LB_SHADOWCOLOR
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_BORDER:LB_SHADOWCOLOR";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 177 , 144 ) ;
         Size = MAP_APPFONT ( 74 , 68 ) ;
@@ -278,6 +287,7 @@ TabPage RID_SVXPAGE_BORDER
     };
     CheckBox  CB_MERGEWITHNEXT
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_BORDER:CB_MERGEWITHNEXT";
         Pos = MAP_APPFONT ( 12 , 173 ) ;
         Size = MAP_APPFONT ( 242 , 10 ) ;
         Hide = TRUE;
@@ -285,6 +295,7 @@ TabPage RID_SVXPAGE_BORDER
     };
     CheckBox  CB_MERGEADJACENTBORDERS
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_BORDER:CB_MERGEADJACENTBORDERS";
         Pos = MAP_APPFONT ( 12 , 173 ) ;
         Size = MAP_APPFONT ( 242 , 10 ) ;
         Hide = TRUE;
diff --git a/cui/source/tabpages/chardlg.src b/cui/source/tabpages/chardlg.src
index 532a1bf89..9f268b9b1 100644
--- a/cui/source/tabpages/chardlg.src
+++ b/cui/source/tabpages/chardlg.src
@@ -58,6 +58,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
     };
     ComboBox LB_WEST_NAME
     {
+        HelpID = "cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_NAME";
         Border = TRUE;
         Pos = MAP_APPFONT ( 12 , 25 );
         Size = MAP_APPFONT ( 80 , 72 );
@@ -66,6 +67,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
     };
     ComboBox LB_WEST_NAME_NOCJK
     {
+        HelpID = "cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_NAME_NOCJK";
         Border = TRUE;
         Pos = MAP_APPFONT ( 12 , 17 );
         Size = MAP_APPFONT ( 112 , 71 );
@@ -86,6 +88,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
     };
     ComboBox LB_WEST_STYLE
     {
+        HelpID = "cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_STYLE";
         Border = TRUE;
         Pos = MAP_APPFONT ( 96 , 25 );
         Size = MAP_APPFONT ( 40 , 48 );
@@ -101,6 +104,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
     };
     ComboBox LB_WEST_STYLE_NOCJK
     {
+        HelpID = "cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_STYLE_NOCJK";
         Border = TRUE;
         Pos = MAP_APPFONT ( 130 , 17 );
         Size = MAP_APPFONT ( 72 , 71 );
@@ -128,6 +132,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
     };
     MetricBox LB_WEST_SIZE
     {
+        HelpID = "cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_SIZE";
         Border = TRUE;
         Pos = MAP_APPFONT ( 140 , 25 );
         Size = MAP_APPFONT ( 38 , 72 );
@@ -136,6 +141,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
     };
     MetricBox LB_WEST_SIZE_NOCJK
     {
+        HelpID = "cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_SIZE_NOCJK";
         Border = TRUE;
         Pos = MAP_APPFONT ( 208 , 17 );
         Size = MAP_APPFONT ( 40 , 71 );
@@ -156,6 +162,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
     };
     ListBox LB_WEST_LANG
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_LANG";
         Border = TRUE;
         Pos = MAP_APPFONT ( 182 , 25 );
         Size = MAP_APPFONT ( 66 , 72 );
@@ -165,6 +172,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
     };
     ListBox LB_WEST_LANG_NOCJK
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_LANG_NOCJK";
         Border = TRUE;
         Pos = MAP_APPFONT ( 130 , 105 );
         Size = MAP_APPFONT ( 72 , 72 );
@@ -186,6 +194,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
     };
     ComboBox LB_EAST_NAME
     {
+        HelpID = "cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_NAME";
         Border = TRUE;
         Pos = MAP_APPFONT ( 12 , 65 );
         Size = MAP_APPFONT ( 80 , 72 );
@@ -200,6 +209,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
     };
     ComboBox LB_EAST_STYLE
     {
+        HelpID = "cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_STYLE";
         Border = TRUE;
         Pos = MAP_APPFONT ( 96 , 65 );
         Size = MAP_APPFONT ( 40 , 48 );
@@ -221,6 +231,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
     };
     MetricBox LB_EAST_SIZE
     {
+        HelpID = "cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_SIZE";
         Border = TRUE;
         Pos = MAP_APPFONT ( 140 , 65 );
         Size = MAP_APPFONT ( 38 , 72 );
@@ -235,6 +246,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
     };
     ListBox LB_EAST_LANG
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_LANG";
         Border = TRUE;
         Pos = MAP_APPFONT ( 182 , 65 );
         Size = MAP_APPFONT ( 66 , 72 );
@@ -256,6 +268,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
     };
     ComboBox LB_CTL_NAME
     {
+        HelpID = "cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_NAME";
         Border = TRUE;
         Pos = MAP_APPFONT ( 12 , 105 );
         Size = MAP_APPFONT ( 80 , 72 );
@@ -270,6 +283,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
     };
     ComboBox LB_CTL_STYLE
     {
+        HelpID = "cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_STYLE";
         Border = TRUE;
         Pos = MAP_APPFONT ( 96 , 105 );
         Size = MAP_APPFONT ( 40 , 48 );
@@ -291,6 +305,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
     };
     MetricBox LB_CTL_SIZE
     {
+        HelpID = "cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_SIZE";
         Border = TRUE;
         Pos = MAP_APPFONT ( 140 , 105 );
         Size = MAP_APPFONT ( 38 , 72 );
@@ -305,6 +320,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
     };
     ListBox LB_CTL_LANG
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_LANG";
         Border = TRUE;
         Pos = MAP_APPFONT ( 182 , 105 );
         Size = MAP_APPFONT ( 66 , 72 );
@@ -339,6 +355,7 @@ TabPage RID_SVXPAGE_CHAR_NAME
     };
     ListBox LB_COLOR2
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_COLOR2";
         Border = TRUE;
         Pos = MAP_APPFONT ( 12 , 105 );
         Size = MAP_APPFONT ( 58 , 100 );
@@ -370,6 +387,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
     };
     ListBox LB_FONTCOLOR
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_FONTCOLOR";
         Border = TRUE;
         Pos = MAP_APPFONT ( 10 , 15 );
         Size = MAP_APPFONT ( 82 , 72 );
@@ -384,6 +402,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
     };
     ListBox LB_EFFECTS2
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_EFFECTS2";
         Pos = MAP_APPFONT ( 10 , 44 ) ;
         Size = MAP_APPFONT ( 82 , 56 ) ;
         DropDown = TRUE;
@@ -404,6 +423,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
     };
     ListBox LB_RELIEF
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_RELIEF";
         Pos = MAP_APPFONT ( 10 , 73 ) ;
         Size = MAP_APPFONT ( 82 , 56 ) ;
         DropDown = TRUE;
@@ -416,18 +436,21 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
     };
     TriStateBox CB_OUTLINE
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_OUTLINE";
         Pos = MAP_APPFONT ( 10 , 93 ) ;
         Size = MAP_APPFONT ( 82 , 10 ) ;
         Text [ en-US ] = "Out~line" ;
     };
     TriStateBox CB_SHADOW
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_SHADOW";
         Pos = MAP_APPFONT ( 10 , 107 ) ;
         Size = MAP_APPFONT ( 82 , 10 ) ;
         Text [ en-US ] = "Sha~dow" ;
     };
     TriStateBox CB_BLINKING
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_BLINKING";
         Pos = MAP_APPFONT ( 10 , 121 ) ;
         Size = MAP_APPFONT ( 82 , 10 ) ;
         Hide = TRUE;
@@ -435,6 +458,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
     };
     TriStateBox CB_CHARHIDDEN
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_CHARHIDDEN";
         Pos = MAP_APPFONT ( 10 , 135 ) ;
         Size = MAP_APPFONT ( 82 , 10 ) ;
         Text [ en-US ] = "H~idden" ;
@@ -453,6 +477,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
     };
     ListBox LB_OVERLINE
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_OVERLINE";
         Border = TRUE;
         Pos = MAP_APPFONT ( 110 , 15 );
         Size = MAP_APPFONT ( 68 , 72 );
@@ -487,6 +512,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
     };
     ListBox LB_OVERLINE_COLOR
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_OVERLINE_COLOR";
         Border = TRUE;
         Pos = MAP_APPFONT ( 184 , 15 );
         Size = MAP_APPFONT ( 68 , 100 );
@@ -501,6 +527,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
     };
     ListBox LB_STRIKEOUT
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_STRIKEOUT";
         Border = TRUE;
         Pos = MAP_APPFONT ( 110 , 44 );
         Size = MAP_APPFONT ( 68 , 72 );
@@ -524,6 +551,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
     };
     ListBox LB_UNDERLINE
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_UNDERLINE";
         Border = TRUE;
         Pos = MAP_APPFONT ( 110 , 73 );
         Size = MAP_APPFONT ( 68 , 72 );
@@ -558,6 +586,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
     };
     ListBox LB_UNDERLINE_COLOR
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_UNDERLINE_COLOR";
         Border = TRUE;
         Pos = MAP_APPFONT ( 184 , 73 );
         Size = MAP_APPFONT ( 68 , 100 );
@@ -566,6 +595,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
     };
     CheckBox CB_INDIVIDUALWORDS
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_CHAR_EFFECTS:CB_INDIVIDUALWORDS";
         Pos = MAP_APPFONT ( 110 , 93 );
         Size = MAP_APPFONT ( 68 , 10 );
         TabStop = TRUE;
@@ -584,6 +614,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
     };
     ListBox LB_EMPHASIS
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_EMPHASIS";
         Border = TRUE;
         Pos = MAP_APPFONT ( 110 , 128 );
         Size = MAP_APPFONT ( 68 , 72 );
@@ -606,6 +637,7 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS
     };
     ListBox LB_POSITION
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_POSITION";
         Border = TRUE;
         Pos = MAP_APPFONT ( 184 , 128 );
         Size = MAP_APPFONT ( 68 , 48 );
@@ -680,6 +712,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
     };
     RadioButton RB_HIGHPOS
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_HIGHPOS";
         Pos = MAP_APPFONT ( 12 , 16 );
         Size = MAP_APPFONT ( 58 , 10 );
         Text [ en-US ] = "Superscript" ;
@@ -687,6 +720,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
     };
     RadioButton RB_NORMALPOS
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_NORMALPOS";
         Pos = MAP_APPFONT ( 12 , 30 );
         Size = MAP_APPFONT ( 58 , 10 );
         Text [ en-US ] = "Normal" ;
@@ -694,6 +728,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
     };
     RadioButton RB_LOWPOS
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_LOWPOS";
         Pos = MAP_APPFONT ( 12 , 44 );
         Size = MAP_APPFONT ( 58 , 10 );
         Text [ en-US ] = "Subscript" ;
@@ -707,6 +742,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
     };
     MetricField ED_HIGHLOW
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_CHAR_POSITION:ED_HIGHLOW";
         Border = TRUE;
         Pos = MAP_APPFONT ( 136 , 14 );
         Size = MAP_APPFONT ( 30 , 12 );
@@ -723,6 +759,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
     };
     CheckBox CB_HIGHLOW
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_CHAR_POSITION:CB_HIGHLOW";
         Pos = MAP_APPFONT ( 172 , 16 );
         Size = MAP_APPFONT ( 76 , 10 );
         Text [ en-US ] = "A~utomatic" ;
@@ -736,6 +773,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
     };
     MetricField ED_FONTSIZE
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_CHAR_POSITION:ED_FONTSIZE";
         Border = TRUE;
         Pos = MAP_APPFONT ( 136 , 30 );
         Size = MAP_APPFONT ( 30 , 12 );
@@ -764,6 +802,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
     };
     RadioButton RB_0_DEG
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_0_DEG";
         Pos = MAP_APPFONT ( 12 , 70 );
         Size = MAP_APPFONT ( 46 , 10 );
         TabStop = TRUE;
@@ -771,6 +810,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
     };
     RadioButton RB_90_DEG
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_90_DEG";
         Pos = MAP_APPFONT ( 62 , 70 );
         Size = MAP_APPFONT ( 46 , 10 );
         TabStop = TRUE;
@@ -778,6 +818,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
     };
     RadioButton RB_270_DEG
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_270_DEG";
         Pos = MAP_APPFONT ( 112 , 70 );
         Size = MAP_APPFONT ( 46 , 10 );
         TabStop = TRUE;
@@ -785,6 +826,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
     };
     CheckBox CB_FIT_TO_LINE
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_CHAR_POSITION:CB_FIT_TO_LINE";
         Pos = MAP_APPFONT ( 162 , 70 );
         Size = MAP_APPFONT ( 86 , 10 );
         TabStop = TRUE;
@@ -798,6 +840,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
     };
     MetricField MF_SCALE_WIDTH
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_CHAR_POSITION:MF_SCALE_WIDTH";
         Border = TRUE;
         Pos = MAP_APPFONT ( 94 , 84 );
         Size = MAP_APPFONT ( 30 , 12 );
@@ -820,6 +863,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
     };
     ListBox LB_KERNING2
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_POSITION:LB_KERNING2";
         Border = TRUE;
         Pos = MAP_APPFONT ( 12 , 111 );
         Size = MAP_APPFONT ( 72 , 48 ) ;
@@ -840,6 +884,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
     };
     MetricField ED_KERNING2
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_CHAR_POSITION:ED_KERNING2";
         Border = TRUE;
         Pos = MAP_APPFONT ( 112 , 111 );
         Size = MAP_APPFONT ( 40 , 12 );
@@ -853,6 +898,7 @@ TabPage RID_SVXPAGE_CHAR_POSITION
     };
     CheckBox CB_PAIRKERNING
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_CHAR_POSITION:CB_PAIRKERNING";
         Pos = MAP_APPFONT ( 156 , 113 );
         Size = MAP_APPFONT ( 92 , 10 );
         Text [ en-US ] = "~Pair kerning" ;
@@ -887,6 +933,7 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES
     };
     CheckBox CB_TWOLINES
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_CHAR_TWOLINES:CB_TWOLINES";
         Pos = MAP_APPFONT ( 12 , 14 );
         Size = MAP_APPFONT ( 236 , 10 );
         Text [ en-US ] = "~Write in double lines" ;
@@ -906,6 +953,7 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES
     };
     ListBox ED_STARTBRACKET
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_TWOLINES:ED_STARTBRACKET";
         Pos = MAP_APPFONT ( 12 , 52 );
         Size = MAP_APPFONT ( 90 , 72 );
         TabStop = TRUE;
@@ -928,6 +976,7 @@ TabPage RID_SVXPAGE_CHAR_TWOLINES
     };
     ListBox ED_ENDBRACKET
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CHAR_TWOLINES:ED_ENDBRACKET";
         Pos = MAP_APPFONT ( 108 , 52 );
         Size = MAP_APPFONT ( 90 , 72 );
         TabStop = TRUE;
diff --git a/cui/source/tabpages/connect.src b/cui/source/tabpages/connect.src
index a52e893e6..3031be2c5 100644
--- a/cui/source/tabpages/connect.src
+++ b/cui/source/tabpages/connect.src
@@ -49,6 +49,7 @@ TabPage RID_SVXPAGE_CONNECTION
     };
     ListBox LB_TYPE
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CONNECTION:LB_TYPE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 37 , 6 ) ;
         Size = MAP_APPFONT ( 83 , 54 ) ;
@@ -69,6 +70,7 @@ TabPage RID_SVXPAGE_CONNECTION
     };
     MetricField MTR_FLD_LINE_1
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_1";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 79 , 35  ) ;
         Size = MAP_APPFONT ( 41 , 12 ) ;
@@ -91,6 +93,7 @@ TabPage RID_SVXPAGE_CONNECTION
     };
     MetricField MTR_FLD_LINE_2
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_2";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 79 , 51 ) ;
         Size = MAP_APPFONT ( 41 , 12 ) ;
@@ -113,6 +116,7 @@ TabPage RID_SVXPAGE_CONNECTION
     };
     MetricField MTR_FLD_LINE_3
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_3";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 79 , 67 ) ;
         Size = MAP_APPFONT ( 41 , 12 ) ;
@@ -141,6 +145,7 @@ TabPage RID_SVXPAGE_CONNECTION
     };
     MetricField MTR_FLD_HORZ_1
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_1";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 79 , 96 ) ;
         Size = MAP_APPFONT ( 41 , 12 ) ;
@@ -163,6 +168,7 @@ TabPage RID_SVXPAGE_CONNECTION
     };
     MetricField MTR_FLD_HORZ_2
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_2";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 79 , 128 ) ;
         Size = MAP_APPFONT ( 41 , 12 ) ;
@@ -185,6 +191,7 @@ TabPage RID_SVXPAGE_CONNECTION
     };
     MetricField MTR_FLD_VERT_1
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_1";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 79 , 112 ) ;
         Size = MAP_APPFONT ( 41 , 12 ) ;
@@ -207,6 +214,7 @@ TabPage RID_SVXPAGE_CONNECTION
     };
     MetricField MTR_FLD_VERT_2
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_2";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 79 , 144 ) ;
         Size = MAP_APPFONT ( 41 , 12 ) ;
diff --git a/cui/source/tabpages/dstribut.src b/cui/source/tabpages/dstribut.src
index 667d12ab8..96448491d 100644
--- a/cui/source/tabpages/dstribut.src
+++ b/cui/source/tabpages/dstribut.src
@@ -49,6 +49,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
 
     RadioButton BTN_HOR_NONE
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_NONE";
         Pos = MAP_APPFONT ( 12 , 14  ) ;
         Size = MAP_APPFONT ( 48 , 10 ) ;
         Text [ en-US ] = "~None" ;
@@ -56,6 +57,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
 
     RadioButton BTN_HOR_LEFT
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_LEFT";
         Pos = MAP_APPFONT ( 56 , 26  ) ;
         Size = MAP_APPFONT ( 45 , 10 ) ;
         Text [ en-US ] = "~Left" ;
@@ -63,6 +65,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
 
     RadioButton BTN_HOR_CENTER
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_CENTER";
         Pos = MAP_APPFONT ( 105 , 26  ) ;
         Size = MAP_APPFONT ( 45 , 10 ) ;
         Text [ en-US ] = "~Center" ;
@@ -70,6 +73,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
 
     RadioButton BTN_HOR_DISTANCE
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_DISTANCE";
         Pos = MAP_APPFONT ( 154 , 26  ) ;
         Size = MAP_APPFONT ( 45 , 10 ) ;
         Text [ en-US ] = "~Spacing" ;
@@ -77,6 +81,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
 
     RadioButton BTN_HOR_RIGHT
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_RIGHT";
         Pos = MAP_APPFONT ( 203 , 26  ) ;
         Size = MAP_APPFONT ( 45 , 10 ) ;
         Text [ en-US ] = "~Right" ;
@@ -131,6 +136,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
 
     RadioButton BTN_VER_NONE
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_NONE";
         Pos = MAP_APPFONT ( 12 , 53  ) ;
         Size = MAP_APPFONT ( 46 , 10 ) ;
         Text [ en-US ] = "N~one" ;
@@ -138,6 +144,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
 
     RadioButton BTN_VER_TOP
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_TOP";
         Pos = MAP_APPFONT ( 56 , 65  ) ;
         Size = MAP_APPFONT ( 45 , 10 ) ;
         Text [ en-US ] = "~Top" ;
@@ -145,6 +152,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
 
     RadioButton BTN_VER_CENTER
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_CENTER";
         Pos = MAP_APPFONT ( 105 , 65  ) ;
         Size = MAP_APPFONT ( 45 , 10 ) ;
         Text [ en-US ] = "C~enter" ;
@@ -152,6 +160,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
 
     RadioButton BTN_VER_DISTANCE
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_DISTANCE";
         Pos = MAP_APPFONT ( 154 , 65  ) ;
         Size = MAP_APPFONT ( 45 , 10 ) ;
         Text [ en-US ] = "S~pacing" ;
@@ -159,6 +168,7 @@ TabPage RID_SVXPAGE_DISTRIBUTE
 
     RadioButton BTN_VER_BOTTOM
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_BOTTOM";
         Pos = MAP_APPFONT ( 203 , 65  ) ;
         Size = MAP_APPFONT ( 45 , 10 ) ;
         Text [ en-US ] = "~Bottom" ;
diff --git a/cui/source/tabpages/grfpage.src b/cui/source/tabpages/grfpage.src
index 863f8787d..a6733903f 100644
--- a/cui/source/tabpages/grfpage.src
+++ b/cui/source/tabpages/grfpage.src
@@ -58,6 +58,7 @@ TabPage RID_SVXPAGE_GRFCROP
     };
     MetricField MF_LEFT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_GRFCROP:MF_LEFT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 42 , 42 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -83,6 +84,7 @@ TabPage RID_SVXPAGE_GRFCROP
     };
     MetricField MF_RIGHT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_GRFCROP:MF_RIGHT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 42 , 58 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -106,6 +108,7 @@ TabPage RID_SVXPAGE_GRFCROP
     };
     MetricField MF_TOP
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_GRFCROP:MF_TOP";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 124 , 42 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -131,6 +134,7 @@ TabPage RID_SVXPAGE_GRFCROP
     };
     MetricField MF_BOTTOM
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_GRFCROP:MF_BOTTOM";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 124 , 58 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -148,12 +152,14 @@ TabPage RID_SVXPAGE_GRFCROP
     };
     RadioButton RB_SIZECONST
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_GRFCROP:RB_SIZECONST";
         Pos = MAP_APPFONT ( 12 , 28 ) ;
         Size = MAP_APPFONT ( 152 , 10 ) ;
         Text [ en-US ] = "Keep image si~ze" ;
     };
     RadioButton RB_ZOOMCONST
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_GRFCROP:RB_ZOOMCONST";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 152 , 10 ) ;
         Check = TRUE ;
@@ -180,6 +186,7 @@ TabPage RID_SVXPAGE_GRFCROP
     };
     MetricField MF_WIDTHZOOM
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_GRFCROP:MF_WIDTHZOOM";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 42 , 87 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -207,6 +214,7 @@ TabPage RID_SVXPAGE_GRFCROP
     };
     MetricField MF_HEIGHTZOOM
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_GRFCROP:MF_HEIGHTZOOM";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 42 , 103 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -239,6 +247,7 @@ TabPage RID_SVXPAGE_GRFCROP
     };
     MetricField MF_WIDTH
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_GRFCROP:MF_WIDTH";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 42 , 132 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -264,6 +273,7 @@ TabPage RID_SVXPAGE_GRFCROP
     };
     MetricField MF_HEIGHT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_GRFCROP:MF_HEIGHT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 42 , 148 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -286,6 +296,7 @@ TabPage RID_SVXPAGE_GRFCROP
     };
     PushButton PB_ORGSIZE
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_GRFCROP:PB_ORGSIZE";
         Pos = MAP_APPFONT ( 176 , 143 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
diff --git a/cui/source/tabpages/labdlg.src b/cui/source/tabpages/labdlg.src
index 45e8aa370..0df6d968b 100644
--- a/cui/source/tabpages/labdlg.src
+++ b/cui/source/tabpages/labdlg.src
@@ -53,6 +53,7 @@ TabPage RID_SVXPAGE_CAPTION
     };
     MetricField MF_ABSTAND
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_CAPTION:MF_ABSTAND";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 50 , 51  ) ;
         Size = MAP_APPFONT ( 50 , 12 ) ;
@@ -73,6 +74,7 @@ TabPage RID_SVXPAGE_CAPTION
     };
     ListBox LB_WINKEL
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CAPTION:LB_WINKEL";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 143 , 51  ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
@@ -96,6 +98,7 @@ TabPage RID_SVXPAGE_CAPTION
     };
     ListBox LB_ANSATZ
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CAPTION:LB_ANSATZ";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 50 , 67  ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
@@ -119,6 +122,7 @@ TabPage RID_SVXPAGE_CAPTION
     };
     MetricField MF_ANSATZ
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_CAPTION:MF_ANSATZ";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 143 , 67  ) ;
         Size = MAP_APPFONT ( 50 , 12 ) ;
@@ -139,6 +143,7 @@ TabPage RID_SVXPAGE_CAPTION
     };
     ListBox LB_ANSATZ_REL
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_CAPTION:LB_ANSATZ_REL";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 143 , 67  ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
@@ -155,6 +160,7 @@ TabPage RID_SVXPAGE_CAPTION
     };
     MetricField MF_LAENGE
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_CAPTION:MF_LAENGE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 50 , 83  ) ;
         Size = MAP_APPFONT ( 50 , 12 ) ;
@@ -169,6 +175,7 @@ TabPage RID_SVXPAGE_CAPTION
     };
     CheckBox CB_LAENGE
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_CAPTION:CB_LAENGE";
         Pos = MAP_APPFONT ( 106 , 84  ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
         TabStop = TRUE ;
diff --git a/cui/source/tabpages/macroass.src b/cui/source/tabpages/macroass.src
index c64aac6c1..d97aa813d 100644
--- a/cui/source/tabpages/macroass.src
+++ b/cui/source/tabpages/macroass.src
@@ -32,6 +32,7 @@
 
 TabPage RID_SVXPAGE_EVENTASSIGN
 {
+    HelpID = "cui:TabPage:RID_SVXPAGE_EVENTASSIGN";
     Hide = TRUE ;
     SVLook = TRUE ;
     DialogControl = TRUE ;
@@ -89,6 +90,7 @@ TabPage RID_SVXPAGE_EVENTASSIGN
     };
     PushButton PB_ASSIGN
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_EVENTASSIGN:PB_ASSIGN";
         Pos = MAP_APPFONT ( COL4 , ROW0  ) ;
         Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
          // ### ACHTUNG: Neuer Text in Resource? Z~uweisen : Zuweisen
@@ -98,6 +100,7 @@ TabPage RID_SVXPAGE_EVENTASSIGN
     };
     PushButton PB_DELETE
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_EVENTASSIGN:PB_DELETE";
         Pos = MAP_APPFONT ( COL4 , ROW2  ) ;
         Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
         Disable = TRUE ;
@@ -106,6 +109,7 @@ TabPage RID_SVXPAGE_EVENTASSIGN
     };
     ListBox LB_SCRIPTTYPE
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_EVENTASSIGN:LB_SCRIPTTYPE";
         Pos = MAP_APPFONT ( COL4 , ROW4  ) ;
         Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , 60 ) ;
         // en-US was missing
diff --git a/cui/source/tabpages/measure.src b/cui/source/tabpages/measure.src
index bec495036..52bf76a58 100644
--- a/cui/source/tabpages/measure.src
+++ b/cui/source/tabpages/measure.src
@@ -55,6 +55,7 @@ TabPage RID_SVXPAGE_MEASURE
     };
     MetricField MTR_LINE_DIST
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_MEASURE:MTR_LINE_DIST";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 78 , 14  ) ;
         Size = MAP_APPFONT ( 42 , 12 ) ;
@@ -77,6 +78,7 @@ TabPage RID_SVXPAGE_MEASURE
     };
     MetricField MTR_FLD_HELPLINE_OVERHANG
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_OVERHANG";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 78 , 30  ) ;
         Size = MAP_APPFONT ( 42 , 12 ) ;
@@ -99,6 +101,7 @@ TabPage RID_SVXPAGE_MEASURE
     };
     MetricField MTR_FLD_HELPLINE_DIST
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_DIST";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 78 , 46  ) ;
         Size = MAP_APPFONT ( 42 , 12 ) ;
@@ -121,6 +124,7 @@ TabPage RID_SVXPAGE_MEASURE
     };
     MetricField MTR_FLD_HELPLINE1_LEN
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE1_LEN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 78 , 62 ) ;
         Size = MAP_APPFONT ( 42 , 12 ) ;
@@ -143,6 +147,7 @@ TabPage RID_SVXPAGE_MEASURE
     };
     MetricField MTR_FLD_HELPLINE2_LEN
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE2_LEN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 78 , 78 ) ;
         Size = MAP_APPFONT ( 42 , 12 ) ;
@@ -159,6 +164,7 @@ TabPage RID_SVXPAGE_MEASURE
     };
     TriStateBox TSB_BELOW_REF_EDGE
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_BELOW_REF_EDGE";
         Pos = MAP_APPFONT ( 12 , 96  ) ;
         Size = MAP_APPFONT ( 108 , 10 ) ;
         TabStop = TRUE ;
@@ -173,6 +179,7 @@ TabPage RID_SVXPAGE_MEASURE
     };
     MetricField MTR_FLD_DECIMALPLACES
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_DECIMALPLACES";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 78 , 110 ) ;
         Size = MAP_APPFONT ( 42 , 12 ) ;
@@ -213,6 +220,7 @@ TabPage RID_SVXPAGE_MEASURE
     };
     TriStateBox TSB_AUTOPOSV
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_AUTOPOSV";
         Pos = MAP_APPFONT ( 154 , 54 ) ;
         Size = MAP_APPFONT ( 101 , 10 ) ;
         TabStop = TRUE ;
@@ -220,6 +228,7 @@ TabPage RID_SVXPAGE_MEASURE
     };
     TriStateBox TSB_AUTOPOSH
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_AUTOPOSH";
         Pos = MAP_APPFONT ( 154 , 68  ) ;
         Size = MAP_APPFONT ( 101 , 10 ) ;
         TabStop = TRUE ;
@@ -227,6 +236,7 @@ TabPage RID_SVXPAGE_MEASURE
     };
     TriStateBox TSB_PARALLEL
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_PARALLEL";
         Pos = MAP_APPFONT ( 138 , 82 ) ;
         Size = MAP_APPFONT ( 110 , 10 ) ;
         TabStop = TRUE ;
@@ -234,6 +244,7 @@ TabPage RID_SVXPAGE_MEASURE
     };
     TriStateBox TSB_SHOW_UNIT
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_SHOW_UNIT";
         Pos = MAP_APPFONT ( 138 , 96  ) ;
         Size = MAP_APPFONT ( 64+40 , 10 ) ;
         TabStop = TRUE ;
@@ -241,6 +252,7 @@ TabPage RID_SVXPAGE_MEASURE
     };
     ListBox LB_UNIT
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_MEASURE:LB_UNIT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 154 , 110 ) ;
         Size = MAP_APPFONT ( 60 , 80+35 ) ;
diff --git a/cui/source/tabpages/numfmt.src b/cui/source/tabpages/numfmt.src
index 78074755e..4441159d0 100644
--- a/cui/source/tabpages/numfmt.src
+++ b/cui/source/tabpages/numfmt.src
@@ -45,6 +45,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
     };
     ListBox LB_CATEGORY
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CATEGORY";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 14 ) ;
         Size = MAP_APPFONT ( 70 , 71 ) ;
@@ -72,6 +73,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
     };
     Edit ED_FORMAT
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_FORMAT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 147 ) ;
         Size = MAP_APPFONT ( 200 , 12 ) ;
@@ -85,6 +87,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
     };
     Edit ED_COMMENT
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_COMMENT";
         Hide = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 163 ) ;
@@ -99,6 +102,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
 
     ListBox LB_CURRENCY
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CURRENCY";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 82 , 14 ) ;
         Size = MAP_APPFONT ( 90 , 71 ) ;
@@ -127,6 +131,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
     };
     NumericField ED_DECIMALS
     {
+        HelpID = "cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_DECIMALS";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 84 , 102 ) ;
         Size = MAP_APPFONT ( 24 , 12 ) ;
@@ -147,6 +152,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
     };
     NumericField ED_LEADZEROES
     {
+        HelpID = "cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_LEADZEROES";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 84 , 118 ) ;
         Size = MAP_APPFONT ( 24 , 12 ) ;
@@ -160,12 +166,14 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
     };
     CheckBox BTN_NEGRED
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_NEGRED";
         Pos = MAP_APPFONT ( 133 , 104 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
         Text [ en-US ] = "~Negative numbers red" ;
     };
     CheckBox BTN_THOUSAND
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_THOUSAND";
         Pos = MAP_APPFONT ( 133 , 120 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
         Text [ en-US ] = "~Thousands separator" ;
@@ -184,6 +192,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
     };
     ListBox LB_LANGUAGE
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_LANGUAGE";
         Border = TRUE ;
         Sort = TRUE ;
         Pos = MAP_APPFONT ( 178 , 14 ) ;
@@ -192,6 +201,7 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
     };
     CheckBox CB_SOURCEFORMAT
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:CB_SOURCEFORMAT";
         Pos = MAP_APPFONT ( 178 , 42 ) ;
         Size = MAP_APPFONT ( 76 , 10 ) ;
         Text [ en-US ] = "So~urce format" ;
diff --git a/cui/source/tabpages/numpages.src b/cui/source/tabpages/numpages.src
index 761377142..3e2576e4c 100644
--- a/cui/source/tabpages/numpages.src
+++ b/cui/source/tabpages/numpages.src
@@ -128,6 +128,7 @@ TabPage RID_SVXPAGE_PICK_BMP
     };
     CheckBox CB_LINKED
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_PICK_BMP:CB_LINKED";
         Pos = MAP_APPFONT ( 9 , 169 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
         TabStop = TRUE ;
@@ -161,6 +162,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
     };
     MultiListBox LB_LEVEL
     {
+        HelpID = "cui:MultiListBox:RID_SVXPAGE_NUM_OPTIONS:LB_LEVEL";
         Pos = MAP_APPFONT ( 12 , 25 ) ;
         Size = MAP_APPFONT ( 26 , 154 ) ;
         TabStop = TRUE ;
@@ -182,6 +184,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
     };
     ListBox LB_FMT
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_NUM_OPTIONS:LB_FMT";
         Pos = MAP_APPFONT ( 103 , 25 ) ;
         Size = MAP_APPFONT ( 67 , 72 ) ;
         TabStop = TRUE ;
@@ -225,6 +228,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
     };
     Edit ED_PREFIX
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_NUM_OPTIONS:ED_PREFIX";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 103 , 41 ) ;
         Size = MAP_APPFONT ( 67 , 12 ) ;
@@ -241,6 +245,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
     };
     Edit ED_SUFFIX
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_NUM_OPTIONS:ED_SUFFIX";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 103 , 57 ) ;
         Size = MAP_APPFONT ( 67 , 12 ) ;
@@ -256,6 +261,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
     };
     ListBox LB_CHARFMT
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_NUM_OPTIONS:LB_CHARFMT";
         TabStop = TRUE ;
         DropDown = TRUE ;
         Pos = MAP_APPFONT ( 103 , 73 ) ;
@@ -270,6 +276,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
     };
     ListBox LB_BUL_COLOR
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_NUM_OPTIONS:LB_BUL_COLOR";
         TabStop = TRUE ;
         DropDown = TRUE ;
         Pos = MAP_APPFONT ( 103 , 73 ) ;
@@ -285,6 +292,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
     };
     MetricField MF_BUL_REL_SIZE
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_NUM_OPTIONS:MF_BUL_REL_SIZE";
         Pos = MAP_APPFONT ( 103 , 89 ) ;
         Size = MAP_APPFONT ( 67 , 12 ) ;
         Border = TRUE ;
@@ -307,6 +315,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
     };
     NumericField NF_ALL_LEVEL
     {
+        HelpID = "cui:NumericField:RID_SVXPAGE_NUM_OPTIONS:NF_ALL_LEVEL";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 103 , 89 ) ;
         Size = MAP_APPFONT ( 67 , 12 ) ;
@@ -329,6 +338,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
     };
     NumericField ED_START
     {
+        HelpID = "cui:NumericField:RID_SVXPAGE_NUM_OPTIONS:ED_START";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 103 , 105 ) ;
         Size = MAP_APPFONT ( 67 , 12 ) ;
@@ -351,6 +361,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
     };
     ListBox LB_ALIGN
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_NUM_OPTIONS:LB_ALIGN";
         Pos = MAP_APPFONT ( 103 , 133 ) ;
         Size = MAP_APPFONT ( 40 , 40 ) ;
         TabStop = TRUE ;
@@ -369,6 +380,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
     };
     PushButton PB_BULLET
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_NUM_OPTIONS:PB_BULLET";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 103 , 105 ) ;
         Size = MAP_APPFONT ( 12 , 12 ) ;
@@ -384,6 +396,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
     };
     MenuButton MB_BITMAP
     {
+        HelpID = "cui:MenuButton:RID_SVXPAGE_NUM_OPTIONS:MB_BITMAP";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 103 , 41 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
@@ -416,6 +429,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
     };
     MetricField MF_WIDTH
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_NUM_OPTIONS:MF_WIDTH";
         Pos = MAP_APPFONT ( 103 , 59 ) ;
         Size = MAP_APPFONT ( 67 , 12 ) ;
         Border = TRUE ;
@@ -442,6 +456,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
     };
     MetricField MF_HEIGHT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_NUM_OPTIONS:MF_HEIGHT";
         Pos = MAP_APPFONT ( 103 , 75 ) ;
         Size = MAP_APPFONT ( 67 , 12 ) ;
         Border = TRUE ;
@@ -461,6 +476,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
     };
     CheckBox CB_RATIO
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_NUM_OPTIONS:CB_RATIO";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 50 , 91 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
@@ -475,6 +491,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
     };
     ListBox LB_ORIENT
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_NUM_OPTIONS:LB_ORIENT";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 103 , 103 ) ;
         Size = MAP_APPFONT ( 67 , 72 ) ;
@@ -502,6 +519,7 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
     };
     CheckBox CB_SAME_LEVEL
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_NUM_OPTIONS:CB_SAME_LEVEL";
         Pos = MAP_APPFONT ( 53 , 167 ) ;
         Size = MAP_APPFONT ( 114 , 10 ) ;
         Text [ en-US ] = "~Consecutive numbering" ;
@@ -537,6 +555,7 @@ TabPage RID_SVXPAGE_NUM_POSITION
     };
     MultiListBox LB_LEVEL
     {
+        HelpID = "cui:MultiListBox:RID_SVXPAGE_NUM_POSITION:LB_LEVEL";
         Pos = MAP_APPFONT ( 12 , 25 ) ;
         Size = MAP_APPFONT ( 26 , 154 ) ;
         TabStop = TRUE ;
@@ -559,6 +578,7 @@ TabPage RID_SVXPAGE_NUM_POSITION
     };
     MetricField MF_BORDERDIST
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_BORDERDIST";
         Pos = MAP_APPFONT ( 198 , 25 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         Border = TRUE ;
@@ -577,6 +597,7 @@ TabPage RID_SVXPAGE_NUM_POSITION
     };
     CheckBox CB_RELATIVE
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_NUM_POSITION:CB_RELATIVE";
         Pos = MAP_APPFONT ( 198 , 41 ) ;
         Size = MAP_APPFONT ( 52 , 10 ) ;
         Text [ en-US ] = "Relati~ve" ;
@@ -589,6 +610,7 @@ TabPage RID_SVXPAGE_NUM_POSITION
     };
     MetricField MF_INDENT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_INDENT";
         Pos = MAP_APPFONT ( 198 , 57 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         Border = TRUE ;
@@ -613,6 +635,7 @@ TabPage RID_SVXPAGE_NUM_POSITION
     };
     MetricField MF_NUMDIST
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_NUMDIST";
         Pos = MAP_APPFONT ( 198 , 73 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         Left = TRUE ;
@@ -637,6 +660,7 @@ TabPage RID_SVXPAGE_NUM_POSITION
     };
     ListBox LB_ALIGN
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_NUM_POSITION:LB_ALIGN";
         Pos = MAP_APPFONT ( 198 , 89 ) ;
         Size = MAP_APPFONT ( 40 , 40 ) ;
         TabStop = TRUE ;
@@ -656,6 +680,7 @@ TabPage RID_SVXPAGE_NUM_POSITION
     };
     ListBox LB_LABEL_FOLLOWED_BY
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_NUM_POSITION:LB_LABEL_FOLLOWED_BY";
         Pos = MAP_APPFONT ( 198 , 25 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         TabStop = TRUE ;
@@ -676,6 +701,7 @@ TabPage RID_SVXPAGE_NUM_POSITION
     };
     MetricField MF_LISTTAB
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_LISTTAB";
         Pos = MAP_APPFONT ( 198 , 41 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         Border = TRUE ;
@@ -699,6 +725,7 @@ TabPage RID_SVXPAGE_NUM_POSITION
     };
     ListBox LB_ALIGN_2
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_NUM_POSITION:LB_ALIGN_2";
         Pos = MAP_APPFONT ( 198 , 57 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         TabStop = TRUE ;
@@ -712,6 +739,7 @@ TabPage RID_SVXPAGE_NUM_POSITION
     };
     MetricField MF_ALIGNED_AT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_ALIGNED_AT";
         Pos = MAP_APPFONT ( 198 , 73 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         Left = TRUE ;
@@ -736,6 +764,7 @@ TabPage RID_SVXPAGE_NUM_POSITION
     };
     MetricField MF_INDENT_AT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_INDENT_AT";
         Pos = MAP_APPFONT ( 198 , 89 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         Left = TRUE ;
@@ -754,6 +783,7 @@ TabPage RID_SVXPAGE_NUM_POSITION
     };
     PushButton PB_STANDARD
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_NUM_POSITION:PB_STANDARD";
         Pos = MAP_APPFONT ( 198 , 165 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "Default" ;
diff --git a/cui/source/tabpages/page.src b/cui/source/tabpages/page.src
index 35c06cce5..5e174f3e1 100644
--- a/cui/source/tabpages/page.src
+++ b/cui/source/tabpages/page.src
@@ -54,6 +54,7 @@ TabPage RID_SVXPAGE_PAGE
     };
     ListBox LB_PAPER_SIZE
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_PAGE:LB_PAPER_SIZE";
         Pos = MAP_APPFONT ( 50 , 14 ) ;
         Size = MAP_APPFONT ( 50 , 64 ) ;
         DropDown = TRUE ;
@@ -68,6 +69,7 @@ TabPage RID_SVXPAGE_PAGE
     };
     MetricField ED_PAPER_WIDTH
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_PAGE:ED_PAPER_WIDTH";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 50, 30 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -89,6 +91,7 @@ TabPage RID_SVXPAGE_PAGE
     };
     MetricField ED_PAPER_HEIGHT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_PAGE:ED_PAPER_HEIGHT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 50 , 46 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -109,6 +112,7 @@ TabPage RID_SVXPAGE_PAGE
     };
     RadioButton RB_PORTRAIT
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_PAGE:RB_PORTRAIT";
         Pos = MAP_APPFONT ( 50 , 62 ) ;
         Size = MAP_APPFONT ( 53 , 10 ) ;
         Check = TRUE ;
@@ -116,6 +120,7 @@ TabPage RID_SVXPAGE_PAGE
     };
     RadioButton RB_LANDSCAPE
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_PAGE:RB_LANDSCAPE";
         Pos = MAP_APPFONT ( 50 , 74 ) ;
         Size = MAP_APPFONT ( 53 , 10 ) ;
         Text [ en-US ] = "L~andscape";
@@ -136,6 +141,7 @@ TabPage RID_SVXPAGE_PAGE
     };
     ListBox LB_TEXT_FLOW
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_PAGE:LB_TEXT_FLOW";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 165 , 58 ) ;
         Size = MAP_APPFONT ( 83 , 50 ) ;
@@ -152,6 +158,7 @@ TabPage RID_SVXPAGE_PAGE
     };
     ListBox LB_PAPER_TRAY
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_PAGE:LB_PAPER_TRAY";
         Pos = MAP_APPFONT ( 165 , 72 ) ;
         Size = MAP_APPFONT ( 83 , 50 ) ;
         DropDown = TRUE ;
@@ -172,6 +179,7 @@ TabPage RID_SVXPAGE_PAGE
     };
     MetricField ED_LEFT_MARGIN
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_PAGE:ED_LEFT_MARGIN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 55 , 101 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -193,6 +201,7 @@ TabPage RID_SVXPAGE_PAGE
     };
     MetricField ED_RIGHT_MARGIN
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_PAGE:ED_RIGHT_MARGIN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 55 , 117 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -214,6 +223,7 @@ TabPage RID_SVXPAGE_PAGE
     };
     MetricField ED_TOP_MARGIN
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_PAGE:ED_TOP_MARGIN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 55 , 133 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -235,6 +245,7 @@ TabPage RID_SVXPAGE_PAGE
     };
     MetricField ED_BOTTOM_MARGIN
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_PAGE:ED_BOTTOM_MARGIN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 55 , 149 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -267,6 +278,7 @@ TabPage RID_SVXPAGE_PAGE
     };
     ListBox LB_LAYOUT
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_PAGE:LB_LAYOUT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 170, 101 ) ;
         Size = MAP_APPFONT ( 78 , 44 ) ;
@@ -287,6 +299,7 @@ TabPage RID_SVXPAGE_PAGE
     };
     ListBox LB_NUMBER_FORMAT
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_PAGE:LB_NUMBER_FORMAT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 170 , 117 ) ;
         Size = MAP_APPFONT ( 78 , 64 ) ;
@@ -310,6 +323,7 @@ TabPage RID_SVXPAGE_PAGE
     };
     CheckBox CB_HORZ
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_PAGE:CB_HORZ";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 175 , 133 ) ;
         Size = MAP_APPFONT ( 73 , 10 ) ;
@@ -317,6 +331,7 @@ TabPage RID_SVXPAGE_PAGE
     };
     CheckBox CB_VERT
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_PAGE:CB_VERT";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 175 , 147 ) ;
         Size = MAP_APPFONT ( 73 , 10 ) ;
@@ -324,6 +339,7 @@ TabPage RID_SVXPAGE_PAGE
     };
     CheckBox CB_ADAPT
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_PAGE:CB_ADAPT";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 113 , 133 ) ;
         Size = MAP_APPFONT ( 135 , 10 ) ;
@@ -332,6 +348,7 @@ TabPage RID_SVXPAGE_PAGE
     /* Registerhaltigkeit (fuer SW) */
     CheckBox CB_REGISTER
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_PAGE:CB_REGISTER";
         Pos = MAP_APPFONT ( 113 , 133 ) ;
         Size = MAP_APPFONT ( 135 , 10 ) ;
         Hide = TRUE ;
@@ -346,6 +363,7 @@ TabPage RID_SVXPAGE_PAGE
     };
     ListBox LB_REGISTER
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_PAGE:LB_REGISTER";
         Pos = MAP_APPFONT ( 122 , 157 ) ;
         Size = MAP_APPFONT ( 126 , 50 ) ;
         DropDown = TRUE ;
diff --git a/cui/source/tabpages/paragrph.src b/cui/source/tabpages/paragrph.src
index 9b06d2612..38bae1971 100644
--- a/cui/source/tabpages/paragrph.src
+++ b/cui/source/tabpages/paragrph.src
@@ -46,6 +46,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
     };
     MetricField ED_LEFTINDENT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_LEFTINDENT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 135 , 14 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -68,6 +69,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
     };
     MetricField ED_RIGHTINDENT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_RIGHTINDENT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 135 , 30 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -90,6 +92,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
     };
     MetricField ED_FLINEINDENT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_FLINEINDENT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 135 , 46 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -107,6 +110,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
     };
     CheckBox CB_AUTO
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_STD_PARAGRAPH:CB_AUTO";
         Pos = MAP_APPFONT ( 12 , 61 ) ;
         Size = MAP_APPFONT ( 120 , 10 ) ;
         Hide = TRUE ;
@@ -127,6 +131,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
     };
     MetricField ED_TOPDIST
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_TOPDIST";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 135 , 88 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -149,6 +154,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
     };
     MetricField ED_BOTTOMDIST
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_BOTTOMDIST";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 135 , 104 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -170,6 +176,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
     };
     ListBox LB_LINEDIST
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_STD_PARAGRAPH:LB_LINEDIST";
         Pos = MAP_APPFONT ( 12 , 133 ) ;
         Size = MAP_APPFONT ( 55 , 72 ) ;
         DropDown = TRUE ;
@@ -197,6 +204,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
     };
     MetricField ED_LINEDISTPERCENT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_LINEDISTPERCENT";
         Disable = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 135 , 133 ) ;
@@ -216,6 +224,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
     };
     MetricField ED_LINEDISTMETRIC
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_LINEDISTMETRIC";
         Disable = TRUE ;
         Border = TRUE ;
         Hide = TRUE ;
@@ -245,6 +254,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
     };
     CheckBox CB_REGISTER
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_STD_PARAGRAPH:CB_REGISTER";
         Pos = MAP_APPFONT ( 12 , 162 ) ;
         Size = MAP_APPFONT ( 120 , 10 ) ;
         Hide = TRUE ;
@@ -275,6 +285,7 @@ TabPage RID_SVXPAGE_ALIGN_PARAGRAPH
     };
     RadioButton BTN_LEFTALIGN
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_LEFTALIGN";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 161 , 10 ) ;
         Text [ en-US ] = "~Left" ;
@@ -282,18 +293,21 @@ TabPage RID_SVXPAGE_ALIGN_PARAGRAPH
     };
     RadioButton BTN_RIGHTALIGN
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_RIGHTALIGN";
         Pos = MAP_APPFONT ( 12 , 28 ) ;
         Size = MAP_APPFONT ( 161 , 10 ) ;
         Text [ en-US ] = "Righ~t" ;
     };
     RadioButton BTN_CENTERALIGN
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_CENTERALIGN";
         Pos = MAP_APPFONT ( 12 , 42 ) ;
         Size = MAP_APPFONT ( 161 , 10 ) ;
         Text [ en-US ] = "~Center" ;
     };
     RadioButton BTN_JUSTIFYALIGN
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_JUSTIFYALIGN";
         Pos = MAP_APPFONT ( 12 , 56 ) ;
         Size = MAP_APPFONT ( 161 , 10 ) ;
         Text [ en-US ] = "Justified" ;
@@ -315,6 +329,7 @@ TabPage RID_SVXPAGE_ALIGN_PARAGRAPH
     };
     ListBox LB_LASTLINE
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_LASTLINE";
         Pos = MAP_APPFONT ( 105 , 70 ) ;
         Size = MAP_APPFONT ( 70 , 50 ) ;
         DropDown = TRUE ;
@@ -329,6 +344,7 @@ TabPage RID_SVXPAGE_ALIGN_PARAGRAPH
     };
     CheckBox CB_EXPAND
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_ALIGN_PARAGRAPH:CB_EXPAND";
         Pos = MAP_APPFONT ( 20 , 86 ) ;
         Size = MAP_APPFONT ( 153 , 10 ) ;
         Hide = TRUE ;
@@ -336,6 +352,7 @@ TabPage RID_SVXPAGE_ALIGN_PARAGRAPH
     };
     CheckBox CB_SNAP
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_ALIGN_PARAGRAPH:CB_SNAP";
         Pos = MAP_APPFONT ( 20 , 100 ) ;
         Size = MAP_APPFONT ( 153 , 10 ) ;
         Hide = TRUE ;
@@ -363,6 +380,7 @@ TabPage RID_SVXPAGE_ALIGN_PARAGRAPH
     };
     ListBox LB_VERTALIGN
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_VERTALIGN";
         Pos = MAP_APPFONT ( 105 , 133 ) ;
         Size = MAP_APPFONT ( 70 , 50 ) ;
         DropDown = TRUE ;
@@ -392,6 +410,7 @@ TabPage RID_SVXPAGE_ALIGN_PARAGRAPH
     };
     ListBox LB_TEXTDIRECTION
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_TEXTDIRECTION";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 105 , 165 ) ;
         Size = MAP_APPFONT ( 146 , 50 ) ;
@@ -408,12 +427,14 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
     Size = MAP_APPFONT ( 260 , 185 ) ;
     TriStateBox BTN_HYPHEN
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_HYPHEN";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         Text [ en-US ] = "A~utomatically" ;
     };
     NumericField ED_HYPHENBEFORE
     {
+        HelpID = "cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENBEFORE";
         Disable = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 21 , 26 ) ;
@@ -438,6 +459,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
     };
     NumericField ED_HYPHENAFTER
     {
+        HelpID = "cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENAFTER";
         Disable = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 21 , 41 ) ;
@@ -469,6 +491,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
     };
     NumericField ED_MAXHYPH
     {
+        HelpID = "cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_MAXHYPH";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 21 , 55 ) ;
         Size = MAP_APPFONT ( 24 , 12 ) ;
@@ -501,6 +524,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
     };
     TriStateBox BTN_PAGEBREAK
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGEBREAK";
          //			Disable = TRUE;
         Pos = MAP_APPFONT ( 12 , 86 ) ;
         Size = MAP_APPFONT ( 61 , 10 ) ;
@@ -515,6 +539,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
     };
     ListBox LB_BREAKTYPE
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_BREAKTYPE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 98 , 84 ) ;
         Size = MAP_APPFONT ( 61 , 50 ) ;
@@ -534,6 +559,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
     };
     ListBox LB_BREAKPOSITION
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_BREAKPOSITION";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 211 , 84 ) ;
         Size = MAP_APPFONT ( 40 , 50 ) ;
@@ -546,6 +572,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
     };
     TriStateBox BTN_PAGECOLL
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGECOLL";
          //			Disable = TRUE;
         Pos = MAP_APPFONT (21 , 100 ) ;
         Size = MAP_APPFONT ( 75 , 10 ) ;
@@ -554,6 +581,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
     };
     ListBox LB_PAGECOLL
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_PAGECOLL";
          //			Disable = TRUE;
         Pos = MAP_APPFONT ( 98 , 98 ) ;
         Size = MAP_APPFONT ( 61 , 50 ) ;
@@ -569,6 +597,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
     };
     NumericField ED_PAGENUM
     {
+        HelpID = "cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_PAGENUM";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 211 , 98 ) ;
         Size = MAP_APPFONT ( 26 , 12 ) ;
@@ -583,6 +612,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
     };
     TriStateBox BTN_KEEPTOGETHER
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_KEEPTOGETHER";
         Pos = MAP_APPFONT ( 12 , 127 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         Text [ en-US ] = "~Do not split paragraph" ;
@@ -590,12 +620,14 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
     };
     TriStateBox CB_KEEPTOGETHER
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:CB_KEEPTOGETHER";
         Pos = MAP_APPFONT ( 12, 141 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         Text [ en-US ] = "~Keep with next paragraph" ;
     };
     TriStateBox BTN_ORPHANS
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_ORPHANS";
         Disable = TRUE ;
         Pos = MAP_APPFONT ( 12 , 155 ) ;
         Size = MAP_APPFONT ( 120 , 10 ) ;
@@ -604,6 +636,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
     };
     NumericField ED_ORPHANS
     {
+        HelpID = "cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_ORPHANS";
         Disable = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 134 , 153 ) ;
@@ -628,6 +661,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
     };
     TriStateBox BTN_WIDOWS
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_WIDOWS";
         Disable = TRUE ;
         Pos = MAP_APPFONT ( 12 , 169 ) ;
         Size = MAP_APPFONT ( 120 , 10 ) ;
@@ -636,6 +670,7 @@ TabPage RID_SVXPAGE_EXT_PARAGRAPH
     };
     NumericField ED_WIDOWS
     {
+        HelpID = "cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_WIDOWS";
         Disable = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 134 , 167 ) ;
@@ -676,18 +711,21 @@ TabPage RID_SVXPAGE_PARA_ASIAN
     };
     TriStateBox CB_AS_FORBIDDEN
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_FORBIDDEN";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 242 , 10 ) ;
         Text [ en-US ] = "Apply list of forbidden characters to the beginning and end of lines";
     };
     TriStateBox CB_AS_HANG_PUNC
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_HANG_PUNC";
         Pos = MAP_APPFONT ( 12 , 28 ) ;
         Size = MAP_APPFONT ( 242 , 10 ) ;
         Text [ en-US ] = "Allow hanging punctuation";
     };
     TriStateBox CB_AS_SCRIPT_SPACE
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_SCRIPT_SPACE";
         Pos = MAP_APPFONT ( 12 , 42 ) ;
         Size = MAP_APPFONT ( 242 , 10 ) ;
         Text [ en-US ] = "Apply spacing between Asian, Latin and Complex text";
diff --git a/cui/source/tabpages/swpossizetabpage.src b/cui/source/tabpages/swpossizetabpage.src
index d8bcad8e8..58b9832c1 100644
--- a/cui/source/tabpages/swpossizetabpage.src
+++ b/cui/source/tabpages/swpossizetabpage.src
@@ -52,6 +52,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE
     };
     MetricField MF_WIDTH
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_WIDTH";
         Pos = MAP_APPFONT ( 59 , 14 ) ;
         Size = MAP_APPFONT ( 45 , 12 ) ;
         Border = TRUE ;
@@ -77,6 +78,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE
     };
     MetricField MF_HEIGHT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_HEIGHT";
         Pos = MAP_APPFONT ( 59 , 30 ) ;
         Size = MAP_APPFONT ( 45 , 12 ) ;
         Border = TRUE ;
@@ -95,6 +97,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE
     };
     CheckBox CB_KEEPRATIO
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_SWPOSSIZE:CB_KEEPRATIO";
         Pos = MAP_APPFONT ( 12 , 45 ) ;
         Size = MAP_APPFONT ( 95 , 10 ) ;
         TabStop = TRUE ;
@@ -114,30 +117,35 @@ TabPage RID_SVXPAGE_SWPOSSIZE
     };
     RadioButton RB_TOPAGE
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOPAGE";
         Pos = MAP_APPFONT ( 122 , 14 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text [ en-US ] = "To ~page";
     };
     RadioButton RB_TOPARA
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOPARA";
         Pos = MAP_APPFONT ( 122 , 28 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text [ en-US ] = "To paragrap~h";
     };
     RadioButton RB_TOCHAR
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOCHAR";
         Pos = MAP_APPFONT ( 122 , 42 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text [ en-US ] = "To cha~racter";
     };
     RadioButton RB_ASCHAR
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_ASCHAR";
         Pos = MAP_APPFONT ( 122 , 56 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text [ en-US ] = "~As character" ;
     };
     RadioButton RB_TOFRAME
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOFRAME";
         Hide = TRUE;
         Pos = MAP_APPFONT ( 122 , 70 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
@@ -156,6 +164,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE
     };
     TriStateBox CB_POSITION
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_SWPOSSIZE:CB_POSITION";
         Pos = MAP_APPFONT ( 12 , 97 ) ;
         Size = MAP_APPFONT ( 113 , 10 ) ;
         TabStop = TRUE ;
@@ -163,6 +172,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE
     };
     TriStateBox CB_SIZE
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_SWPOSSIZE:CB_SIZE";
         Pos = MAP_APPFONT ( 122 , 97 ) ;
         Size = MAP_APPFONT ( 113 , 10 ) ;
         TabStop = TRUE ;
@@ -183,6 +193,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE
     };
     ListBox LB_HORI
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_HORI";
         Pos = MAP_APPFONT ( 49 , 124 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         TabStop = TRUE ;
@@ -197,6 +208,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE
     };
     MetricField MF_HORIBY
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_HORIBY";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 123 , 124 ) ;
         Size = MAP_APPFONT ( 35 , 12 ) ;
@@ -221,6 +233,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE
     };
     ListBox LB_HORITO
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_HORITO";
         Pos = MAP_APPFONT ( 183 , 124 ) ;
         Size = MAP_APPFONT ( 65 , 60 ) ;
         TabStop = TRUE ;
@@ -228,6 +241,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE
     };
     CheckBox CB_HORIMIRROR
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_SWPOSSIZE:CB_HORIMIRROR";
         Pos = MAP_APPFONT ( 12 , 139 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         TabStop = TRUE ;
@@ -242,6 +256,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE
     };
     ListBox LB_VERT
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_VERT";
         Pos = MAP_APPFONT ( 49 , 153 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         TabStop = TRUE ;
@@ -256,6 +271,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE
     };
     MetricField MF_VERTBY
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_VERTBY";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 123 , 153 ) ;
         Size = MAP_APPFONT ( 35 , 12 ) ;
@@ -280,6 +296,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE
     };
     ListBox LB_VERTTO
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_VERTTO";
         Pos = MAP_APPFONT ( 183 , 153 ) ;
         Size = MAP_APPFONT ( 65 , 60 ) ;
         TabStop = TRUE ;
@@ -287,6 +304,7 @@ TabPage RID_SVXPAGE_SWPOSSIZE
     };
     CheckBox CB_FOLLOW
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_SWPOSSIZE:CB_FOLLOW";
         Pos = MAP_APPFONT ( 12 , 168 ) ;
         Size = MAP_APPFONT ( 113 , 10 ) ;
         TabStop = TRUE ;
diff --git a/cui/source/tabpages/tabarea.src b/cui/source/tabpages/tabarea.src
index 9ff8c0d6f..af833909d 100644
--- a/cui/source/tabpages/tabarea.src
+++ b/cui/source/tabpages/tabarea.src
@@ -51,18 +51,21 @@ TabPage RID_SVXPAGE_TRANSPARENCE
     };
     RadioButton RBT_TRANS_OFF
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_OFF";
         Pos = MAP_APPFONT ( 12 , 14  ) ;
         Size = MAP_APPFONT ( 110 , 10 ) ;
         Text [ en-US ] = "~No transparency";
     };
     RadioButton RBT_TRANS_LINEAR
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_LINEAR";
         Pos = MAP_APPFONT ( 12 , 28  ) ;
         Size = MAP_APPFONT ( 60 , 10 ) ;
         Text [ en-US ] = "~Transparency";
     };
     MetricField MTR_TRANSPARENT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRANSPARENT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 72 , 26 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -78,6 +81,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE
     };
     RadioButton RBT_TRANS_GRADIENT
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_GRADIENT";
         Pos = MAP_APPFONT ( 12 , 42 ) ;
         Size = MAP_APPFONT ( 110 , 10 ) ;
         Text [ en-US ] = "Gradient";
@@ -90,6 +94,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE
     };
     ListBox LB_TRGR_GRADIENT_TYPES
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_TRANSPARENCE:LB_TRGR_GRADIENT_TYPES";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 72 , 54  ) ;
         Size = MAP_APPFONT ( 53 , 63 ) ;
@@ -113,6 +118,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE
     };
     MetricField MTR_TRGR_CENTER_X
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_X";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 72 , 70 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -134,6 +140,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE
     };
     MetricField MTR_TRGR_CENTER_Y
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_Y";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 72 , 86 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -155,6 +162,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE
     };
     MetricField MTR_TRGR_ANGLE
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_ANGLE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 72 , 102 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -175,6 +183,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE
     };
     MetricField MTR_TRGR_BORDER
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_BORDER";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 66 + TRANS_GRAD_OFFSET_X, 54 + TRANS_GRAD_OFFSET_Y) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -196,6 +205,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE
     };
     MetricField MTR_TRGR_START_VALUE
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_START_VALUE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 72 , 134 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -217,6 +227,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE
     };
     MetricField MTR_TRGR_END_VALUE
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_END_VALUE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 72 , 150 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -261,6 +272,7 @@ TabPage RID_SVXPAGE_AREA
     };
     ListBox LB_AREA_TYPE
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_AREA:LB_AREA_TYPE";
         Pos = MAP_APPFONT ( 12 , 14  ) ;
         Size = MAP_APPFONT ( 108 , 60 ) ;
         DropDown = TRUE;
@@ -278,6 +290,7 @@ TabPage RID_SVXPAGE_AREA
 
     ListBox LB_COLOR
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_AREA:LB_COLOR";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 30 ) ;
         Size = MAP_APPFONT ( 108 , 103 ) ;
@@ -285,6 +298,7 @@ TabPage RID_SVXPAGE_AREA
     };
     ListBox LB_GRADIENT
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_AREA:LB_GRADIENT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 30 ) ;
         Size = MAP_APPFONT ( 108 , 103 ) ;
@@ -292,6 +306,7 @@ TabPage RID_SVXPAGE_AREA
     };
     ListBox LB_HATCHING
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_AREA:LB_HATCHING";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 30 ) ;
         Size = MAP_APPFONT ( 108 , 103 ) ;
@@ -299,6 +314,7 @@ TabPage RID_SVXPAGE_AREA
     };
     ListBox LB_BITMAP
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_AREA:LB_BITMAP";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 30 ) ;
         Size = MAP_APPFONT ( 108 , 103 ) ;
@@ -331,6 +347,7 @@ TabPage RID_SVXPAGE_AREA
     };
     TriStateBox TSB_STEPCOUNT
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_AREA:TSB_STEPCOUNT";
         Pos = MAP_APPFONT ( 138 , 15 ) ;
         Size = MAP_APPFONT ( 68 , 10 ) ;
         TabStop = TRUE ;
@@ -338,6 +355,7 @@ TabPage RID_SVXPAGE_AREA
     };
     NumericField NUM_FLD_STEPCOUNT
     {
+        HelpID = "cui:NumericField:RID_SVXPAGE_AREA:NUM_FLD_STEPCOUNT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 208 , 14 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -355,6 +373,7 @@ TabPage RID_SVXPAGE_AREA
 
     CheckBox CB_HATCHBCKGRD
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_AREA:CB_HATCHBCKGRD";
         Pos = MAP_APPFONT ( 132 , 3 ) ;
         Size = MAP_APPFONT ( 122 , 10 ) ;
         TabStop = TRUE ;
@@ -362,6 +381,7 @@ TabPage RID_SVXPAGE_AREA
     };
     ListBox LB_HATCHBCKGRDCOLOR
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_AREA:LB_HATCHBCKGRDCOLOR";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 141 , 16 ) ;
         Size = MAP_APPFONT ( 70 , 100 ) ;
@@ -380,6 +400,7 @@ TabPage RID_SVXPAGE_AREA
     };
     TriStateBox TSB_ORIGINAL
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_AREA:TSB_ORIGINAL";
         Pos = MAP_APPFONT ( 138 , 15 ) ;
         Size = MAP_APPFONT ( 48 , 10 ) ;
         TabStop = TRUE ;
@@ -387,6 +408,7 @@ TabPage RID_SVXPAGE_AREA
     };
     TriStateBox TSB_SCALE
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_AREA:TSB_SCALE";
         Pos = MAP_APPFONT ( 138 , 30 ) ;
         Size = MAP_APPFONT ( 48 , 10 ) ;
         TabStop = TRUE ;
@@ -400,6 +422,7 @@ TabPage RID_SVXPAGE_AREA
     };
     MetricField MTR_FLD_X_SIZE
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_X_SIZE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 212 , 14 ) ;
         Size = MAP_APPFONT ( 36 , 12 ) ;
@@ -424,6 +447,7 @@ TabPage RID_SVXPAGE_AREA
     };
     MetricField MTR_FLD_Y_SIZE
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_Y_SIZE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 212 , 29  ) ;
         Size = MAP_APPFONT ( 36 , 12 ) ;
@@ -469,6 +493,7 @@ TabPage RID_SVXPAGE_AREA
     };
     MetricField MTR_FLD_X_OFFSET
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_X_OFFSET";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 219 , 87 ) ;
         Size = MAP_APPFONT ( 29 , 12 ) ;
@@ -484,6 +509,7 @@ TabPage RID_SVXPAGE_AREA
     };
     MetricField MTR_FLD_Y_OFFSET
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_Y_OFFSET";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 219 , 102 ) ;
         Size = MAP_APPFONT ( 29 , 12 ) ;
@@ -499,6 +525,7 @@ TabPage RID_SVXPAGE_AREA
     };
     TriStateBox TSB_TILE
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_AREA:TSB_TILE";
         Pos = MAP_APPFONT ( 138 , 117  ) ;
         Size = MAP_APPFONT ( 54 , 10 ) ;
         TabStop = TRUE ;
@@ -506,6 +533,7 @@ TabPage RID_SVXPAGE_AREA
     };
     TriStateBox TSB_STRETCH
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_AREA:TSB_STRETCH";
         Pos = MAP_APPFONT ( 194 , 117  ) ;
         Size = MAP_APPFONT ( 54 , 10 ) ;
         TabStop = TRUE ;
@@ -519,18 +547,21 @@ TabPage RID_SVXPAGE_AREA
     };
     RadioButton RBT_ROW
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_AREA:RBT_ROW";
         Pos = MAP_APPFONT ( 138 , 144  ) ;
         Size = MAP_APPFONT ( 75 , 10 ) ;
         Text [ en-US ] = "Ro~w" ;
     };
     RadioButton RBT_COLUMN
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_AREA:RBT_COLUMN";
         Pos = MAP_APPFONT ( 138 , 158 ) ;
         Size = MAP_APPFONT ( 75 , 10 ) ;
         Text [ en-US ] = "Colu~mn" ;
     };
     MetricField MTR_FLD_OFFSET
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_OFFSET";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 219 , 157 ) ;
         Size = MAP_APPFONT ( 29 , 12 ) ;
@@ -560,6 +591,7 @@ TabPage RID_SVXPAGE_SHADOW
     };
     TriStateBox TSB_SHOW_SHADOW
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_SHADOW:TSB_SHOW_SHADOW";
         Pos = MAP_APPFONT ( 12 , 14  ) ;
         Size = MAP_APPFONT ( 110 , 10 ) ;
         TabStop = TRUE ;
@@ -587,6 +619,7 @@ TabPage RID_SVXPAGE_SHADOW
     };
     MetricField MTR_FLD_DISTANCE
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_SHADOW:MTR_FLD_DISTANCE";
         Pos = MAP_APPFONT ( 65 , 67  ) ;
         Size = MAP_APPFONT ( 47 , 12 ) ;
         Border = TRUE ;
@@ -604,6 +637,7 @@ TabPage RID_SVXPAGE_SHADOW
     };
     ListBox LB_SHADOW_COLOR
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_SHADOW:LB_SHADOW_COLOR";
         Pos = MAP_APPFONT ( 65 , 86  ) ;
         Size = MAP_APPFONT ( 57 , 100 ) ;
         DropDown = TRUE ;
@@ -625,6 +659,7 @@ TabPage RID_SVXPAGE_SHADOW
     };
     MetricField MTR_SHADOW_TRANSPARENT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_SHADOW:MTR_SHADOW_TRANSPARENT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 65 , 105  ) ;
         Size = MAP_APPFONT ( 47 , 12 ) ;
@@ -667,6 +702,7 @@ TabPage RID_SVXPAGE_HATCH
     };
     MetricField MTR_FLD_DISTANCE
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_HATCH:MTR_FLD_DISTANCE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 25  ) ;
         Size = MAP_APPFONT ( 50 , 12 ) ;
@@ -689,6 +725,7 @@ TabPage RID_SVXPAGE_HATCH
     };
     MetricField MTR_FLD_ANGLE
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_HATCH:MTR_FLD_ANGLE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 52  ) ;
         Size = MAP_APPFONT ( 50 , 12 ) ;
@@ -717,6 +754,7 @@ TabPage RID_SVXPAGE_HATCH
     };
     ListBox LB_LINE_TYPE
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_HATCH:LB_LINE_TYPE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 134 ) ;
         Size = MAP_APPFONT ( 62 , 62 ) ;
@@ -737,6 +775,7 @@ TabPage RID_SVXPAGE_HATCH
     };
     ListBox LB_LINE_COLOR
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_HATCH:LB_LINE_COLOR";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 161 ) ;
         Size = MAP_APPFONT ( 62 , 100 ) ;
@@ -746,6 +785,7 @@ TabPage RID_SVXPAGE_HATCH
     };
     ListBox LB_HATCHINGS
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_HATCH:LB_HATCHINGS";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 103 , 14  ) ;
         Size = MAP_APPFONT ( 88 , 110 ) ;
@@ -759,6 +799,7 @@ TabPage RID_SVXPAGE_HATCH
     };
     PushButton BTN_ADD
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_HATCH:BTN_ADD";
         Pos = MAP_APPFONT ( 197 , 14 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Add..." ;
@@ -766,6 +807,7 @@ TabPage RID_SVXPAGE_HATCH
     };
     PushButton BTN_MODIFY
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_HATCH:BTN_MODIFY";
         Pos = MAP_APPFONT ( 197 , 32  ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Modify..." ;
@@ -773,6 +815,7 @@ TabPage RID_SVXPAGE_HATCH
     };
     PushButton BTN_DELETE
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_HATCH:BTN_DELETE";
         Pos = MAP_APPFONT ( 197 , 68  ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Delete..." ;
@@ -780,6 +823,7 @@ TabPage RID_SVXPAGE_HATCH
     };
     ImageButton BTN_LOAD
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_HATCH:BTN_LOAD";
         Pos = MAP_APPFONT ( 197 , 104  ) ;
         Size = MAP_APPFONT ( 16 , 16 ) ;
         TabStop = TRUE ;
@@ -795,6 +839,7 @@ TabPage RID_SVXPAGE_HATCH
     };
     ImageButton BTN_SAVE
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_HATCH:BTN_SAVE";
         Pos = MAP_APPFONT ( 197 , 124 ) ;
         Size = MAP_APPFONT ( 16 , 16 ) ;
         TabStop = TRUE ;
@@ -843,6 +888,7 @@ TabPage RID_SVXPAGE_BITMAP
     };
     ListBox LB_COLOR
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_BITMAP:LB_COLOR";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 115  ) ;
         Size = MAP_APPFONT ( 62 , 100 ) ;
@@ -858,6 +904,7 @@ TabPage RID_SVXPAGE_BITMAP
     };
     ListBox LB_BACKGROUND_COLOR
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_BITMAP:LB_BACKGROUND_COLOR";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 142  ) ;
         Size = MAP_APPFONT ( 62 , 100 ) ;
@@ -872,6 +919,7 @@ TabPage RID_SVXPAGE_BITMAP
     };
     ListBox LB_BITMAPS
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_BITMAP:LB_BITMAPS";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 103 , 14  ) ;
         Size = MAP_APPFONT ( 88 , 110 ) ;
@@ -885,6 +933,7 @@ TabPage RID_SVXPAGE_BITMAP
     };
     PushButton BTN_ADD
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_BITMAP:BTN_ADD";
         Pos = MAP_APPFONT ( 197 , 14 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Add..." ;
@@ -892,6 +941,7 @@ TabPage RID_SVXPAGE_BITMAP
     };
     PushButton BTN_MODIFY
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_BITMAP:BTN_MODIFY";
         Pos = MAP_APPFONT ( 197 , 32  ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Modify..." ;
@@ -899,6 +949,7 @@ TabPage RID_SVXPAGE_BITMAP
     };
     PushButton BTN_IMPORT
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_BITMAP:BTN_IMPORT";
         Pos = MAP_APPFONT ( 197 , 50  ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Import..." ;
@@ -906,6 +957,7 @@ TabPage RID_SVXPAGE_BITMAP
     };
     PushButton BTN_DELETE
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_BITMAP:BTN_DELETE";
         Pos = MAP_APPFONT ( 197 , 68 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Delete..." ;
@@ -913,6 +965,7 @@ TabPage RID_SVXPAGE_BITMAP
     };
     ImageButton BTN_LOAD
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_LOAD";
         Pos = MAP_APPFONT ( 197 , 104  ) ;
         Size = MAP_APPFONT ( 16 , 16 ) ;
         TabStop = TRUE ;
@@ -928,6 +981,7 @@ TabPage RID_SVXPAGE_BITMAP
     };
     ImageButton BTN_SAVE
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_SAVE";
         Pos = MAP_APPFONT ( 197 , 124  ) ;
         Size = MAP_APPFONT ( 16 , 16 ) ;
         TabStop = TRUE ;
@@ -963,6 +1017,7 @@ TabPage RID_SVXPAGE_GRADIENT
     };
     ListBox LB_GRADIENT_TYPES
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_GRADIENT:LB_GRADIENT_TYPES";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 49 , 14  ) ;
         Size = MAP_APPFONT ( 48, 63 ) ;
@@ -986,6 +1041,7 @@ TabPage RID_SVXPAGE_GRADIENT
     };
     MetricField MTR_CENTER_X
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_CENTER_X";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 49 , 30  ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -1007,6 +1063,7 @@ TabPage RID_SVXPAGE_GRADIENT
     };
     MetricField MTR_CENTER_Y
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_CENTER_Y";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 49 , 46  ) ;
         Size = MAP_APPFONT ( 40, 12 ) ;
@@ -1028,6 +1085,7 @@ TabPage RID_SVXPAGE_GRADIENT
     };
     MetricField MTR_ANGLE
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_ANGLE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 49 , 62 ) ;
         Size = MAP_APPFONT ( 40, 12 ) ;
@@ -1048,6 +1106,7 @@ TabPage RID_SVXPAGE_GRADIENT
     };
     MetricField MTR_BORDER
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_BORDER";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 49 , 78  ) ;
         Size = MAP_APPFONT ( 40, 12 ) ;
@@ -1069,6 +1128,7 @@ TabPage RID_SVXPAGE_GRADIENT
     };
     ListBox LB_COLOR_FROM
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_GRADIENT:LB_COLOR_FROM";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 49 , 97 ) ;
         Size = MAP_APPFONT ( 48, 100 ) ;
@@ -1078,6 +1138,7 @@ TabPage RID_SVXPAGE_GRADIENT
     };
     MetricField MTR_COLOR_FROM
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_COLOR_FROM";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 49 , 113  ) ;
         Size = MAP_APPFONT ( 40, 12 ) ;
@@ -1099,6 +1160,7 @@ TabPage RID_SVXPAGE_GRADIENT
     };
     ListBox LB_COLOR_TO
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_GRADIENT:LB_COLOR_TO";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 49 , 131 ) ;
         Size = MAP_APPFONT ( 48, 100 ) ;
@@ -1108,6 +1170,7 @@ TabPage RID_SVXPAGE_GRADIENT
     };
     MetricField MTR_COLOR_TO
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_COLOR_TO";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 49 , 147 ) ;
         Size = MAP_APPFONT ( 40, 12 ) ;
@@ -1123,6 +1186,7 @@ TabPage RID_SVXPAGE_GRADIENT
     };
     ListBox LB_GRADIENTS
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_GRADIENT:LB_GRADIENTS";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 103 , 14  ) ;
         Size = MAP_APPFONT ( 88 , 110 ) ;
@@ -1136,6 +1200,7 @@ TabPage RID_SVXPAGE_GRADIENT
     };
     PushButton BTN_ADD
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_GRADIENT:BTN_ADD";
         Pos = MAP_APPFONT ( 197 , 14 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Add..." ;
@@ -1143,6 +1208,7 @@ TabPage RID_SVXPAGE_GRADIENT
     };
     PushButton BTN_MODIFY
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_GRADIENT:BTN_MODIFY";
         Pos = MAP_APPFONT ( 197 , 32  ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Modify..." ;
@@ -1150,6 +1216,7 @@ TabPage RID_SVXPAGE_GRADIENT
     };
     PushButton BTN_DELETE
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_GRADIENT:BTN_DELETE";
         Pos = MAP_APPFONT ( 197 , 68 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Delete..." ;
@@ -1157,6 +1224,7 @@ TabPage RID_SVXPAGE_GRADIENT
     };
     ImageButton BTN_LOAD
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_GRADIENT:BTN_LOAD";
         Pos = MAP_APPFONT ( 197 , 104  ) ;
         Size = MAP_APPFONT ( 16 , 16 ) ;
         TabStop = TRUE ;
@@ -1172,6 +1240,7 @@ TabPage RID_SVXPAGE_GRADIENT
     };
     ImageButton BTN_SAVE
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_GRADIENT:BTN_SAVE";
         Pos = MAP_APPFONT ( 197 , 124  ) ;
         Size = MAP_APPFONT ( 16 , 16 ) ;
         TabStop = TRUE ;
@@ -1208,6 +1277,7 @@ TabPage RID_SVXPAGE_COLOR
     };
     Edit EDT_NAME
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_COLOR:EDT_NAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 42 , 14  ) ;
         Size = MAP_APPFONT ( 76 , 12 ) ;
@@ -1221,6 +1291,7 @@ TabPage RID_SVXPAGE_COLOR
     };
     ListBox LB_COLOR
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_COLOR:LB_COLOR";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 42 , 30  ) ;
         Size = MAP_APPFONT ( 76 , 100 ) ;
@@ -1258,6 +1329,7 @@ TabPage RID_SVXPAGE_COLOR
     };
     ListBox LB_COLORMODEL
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_COLOR:LB_COLORMODEL";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 157 , 71 ) ;
         Size = MAP_APPFONT ( 34 , 12 ) ;
@@ -1277,6 +1349,7 @@ TabPage RID_SVXPAGE_COLOR
     };
     MetricField MTR_FLD_1
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_COLOR:MTR_FLD_1";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 157 , 87 ) ;
         Size = MAP_APPFONT ( 30 , 12 ) ;
@@ -1296,6 +1369,7 @@ TabPage RID_SVXPAGE_COLOR
     };
     MetricField MTR_FLD_2
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_COLOR:MTR_FLD_2";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 157 , 103 ) ;
         Size = MAP_APPFONT ( 30 , 12 ) ;
@@ -1315,6 +1389,7 @@ TabPage RID_SVXPAGE_COLOR
     };
     MetricField MTR_FLD_3
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_COLOR:MTR_FLD_3";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 157 , 119 ) ;
         Size = MAP_APPFONT ( 30 , 12 ) ;
@@ -1334,6 +1409,7 @@ TabPage RID_SVXPAGE_COLOR
     };
     MetricField MTR_FLD_4
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_COLOR:MTR_FLD_4";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 157 , 135 ) ;
         Size = MAP_APPFONT ( 30 , 12 ) ;
@@ -1347,6 +1423,7 @@ TabPage RID_SVXPAGE_COLOR
     };
     PushButton BTN_ADD
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_COLOR:BTN_ADD";
         Pos = MAP_APPFONT ( 197 , 14 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Add" ;
@@ -1354,6 +1431,7 @@ TabPage RID_SVXPAGE_COLOR
     };
     PushButton BTN_WORK_ON
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_COLOR:BTN_WORK_ON";
         Pos = MAP_APPFONT ( 197 , 50 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Edit..." ;
@@ -1361,6 +1439,7 @@ TabPage RID_SVXPAGE_COLOR
     };
     PushButton BTN_DELETE
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_COLOR:BTN_DELETE";
         Pos = MAP_APPFONT ( 197 , 68  ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Delete..." ;
@@ -1368,6 +1447,7 @@ TabPage RID_SVXPAGE_COLOR
     };
     PushButton BTN_MODIFY
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_COLOR:BTN_MODIFY";
         Pos = MAP_APPFONT ( 197, 32  ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Modify" ;
@@ -1375,6 +1455,7 @@ TabPage RID_SVXPAGE_COLOR
     };
     ImageButton BTN_LOAD
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_COLOR:BTN_LOAD";
         Pos = MAP_APPFONT ( 197 , 104  ) ;
         Size = MAP_APPFONT ( 16 , 16 ) ;
         TabStop = TRUE ;
@@ -1390,6 +1471,7 @@ TabPage RID_SVXPAGE_COLOR
     };
     ImageButton BTN_SAVE
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_COLOR:BTN_SAVE";
         Pos = MAP_APPFONT ( 197 , 124  ) ;
         Size = MAP_APPFONT ( 16 , 16 ) ;
         TabStop = TRUE ;
diff --git a/cui/source/tabpages/tabline.src b/cui/source/tabpages/tabline.src
index 435ff956d..83fc9a402 100644
--- a/cui/source/tabpages/tabline.src
+++ b/cui/source/tabpages/tabline.src
@@ -55,6 +55,7 @@ TabPage RID_SVXPAGE_LINE
     };
     ListBox LB_LINE_STYLE
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_LINE:LB_LINE_STYLE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 25  ) ;
         Size = MAP_APPFONT ( 100 , 100 ) ;
@@ -70,6 +71,7 @@ TabPage RID_SVXPAGE_LINE
     };
     ListBox LB_COLOR
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_LINE:LB_COLOR";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 52  ) ;
         Size = MAP_APPFONT ( 100 , 100 ) ;
@@ -85,6 +87,7 @@ TabPage RID_SVXPAGE_LINE
     };
     MetricField MTR_FLD_LINE_WIDTH
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_LINE_WIDTH";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 79  ) ;
         Size = MAP_APPFONT ( 50 , 12 ) ;
@@ -108,6 +111,7 @@ TabPage RID_SVXPAGE_LINE
     };
     MetricField MTR_LINE_TRANSPARENT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_LINE:MTR_LINE_TRANSPARENT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 106  ) ;
         Size = MAP_APPFONT ( 50 , 12 ) ;
@@ -141,6 +145,7 @@ TabPage RID_SVXPAGE_LINE
     };
     ListBox LB_START_STYLE
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_LINE:LB_START_STYLE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 130 , 25  ) ;
         Size = MAP_APPFONT ( 57 , 99 ) ;
@@ -150,6 +155,7 @@ TabPage RID_SVXPAGE_LINE
     };
     ListBox LB_END_STYLE
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_LINE:LB_END_STYLE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 191 , 25  ) ;
         Size = MAP_APPFONT ( 57 , 100 ) ;
@@ -165,6 +171,7 @@ TabPage RID_SVXPAGE_LINE
     };
     MetricField MTR_FLD_START_WIDTH
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_START_WIDTH";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 130 , 52  ) ;
         Size = MAP_APPFONT ( 45 , 12 ) ;
@@ -182,6 +189,7 @@ TabPage RID_SVXPAGE_LINE
     };
     MetricField MTR_FLD_END_WIDTH
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_END_WIDTH";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 191 , 52  ) ;
         Size = MAP_APPFONT ( 45 , 12 ) ;
@@ -199,6 +207,7 @@ TabPage RID_SVXPAGE_LINE
     };
     TriStateBox TSB_CENTER_START
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_LINE:TSB_CENTER_START";
         Pos = MAP_APPFONT ( 130 , 68  ) ;
         Size = MAP_APPFONT ( 57 , 10 ) ;
         Text [ en-US ] = "Ce~nter" ;
@@ -206,6 +215,7 @@ TabPage RID_SVXPAGE_LINE
     };
     TriStateBox TSB_CENTER_END
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_LINE:TSB_CENTER_END";
         Pos = MAP_APPFONT ( 191 , 68  ) ;
         Size = MAP_APPFONT ( 57 , 10 ) ;
         Text [ en-US ] = "C~enter" ;
@@ -213,6 +223,7 @@ TabPage RID_SVXPAGE_LINE
     };
     CheckBox CBX_SYNCHRONIZE
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_LINE:CBX_SYNCHRONIZE";
         // #116827#
         // Pos = MAP_APPFONT ( 130 , 107  ) ;
         Pos = MAP_APPFONT ( 130 , 68 + (16 - 4) ) ;
@@ -238,6 +249,7 @@ TabPage RID_SVXPAGE_LINE
     };
     ListBox LB_EDGE_STYLE
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_LINE:LB_EDGE_STYLE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 130 , 25 + (16 * 6) - 4 ) ;
         Size = MAP_APPFONT ( 57 , 99 ) ;
@@ -273,6 +285,7 @@ TabPage RID_SVXPAGE_LINE
 
     MenuButton MB_SYMBOL_BITMAP
     {
+        HelpID = "cui:MenuButton:RID_SVXPAGE_LINE:MB_SYMBOL_BITMAP";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 130 , 14  ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
@@ -319,6 +332,7 @@ TabPage RID_SVXPAGE_LINE
     };
     MetricField MF_SYMBOL_WIDTH
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_LINE:MF_SYMBOL_WIDTH";
         Pos = MAP_APPFONT ( 191 , 30  );
         Size = MAP_APPFONT ( 57 , 12 ) ;
         Border = TRUE ;
@@ -345,6 +359,7 @@ TabPage RID_SVXPAGE_LINE
     };
     MetricField MF_SYMBOL_HEIGHT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_LINE:MF_SYMBOL_HEIGHT";
         Pos = MAP_APPFONT ( 191 , 46  );
         Size = MAP_APPFONT ( 57 , 12 ) ;
         Border = TRUE ;
@@ -364,6 +379,7 @@ TabPage RID_SVXPAGE_LINE
     };
     CheckBox CB_SYMBOL_RATIO
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_LINE:CB_SYMBOL_RATIO";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 130 , 62  );
         Size = MAP_APPFONT ( 118 , 10 ) ;
@@ -394,6 +410,7 @@ TabPage RID_SVXPAGE_LINE_DEF
     };
     ListBox LB_TYPE_1
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_LINE_DEF:LB_TYPE_1";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 66 , 32  ) ;
         Size = MAP_APPFONT ( 43 , 49 ) ;
@@ -407,6 +424,7 @@ TabPage RID_SVXPAGE_LINE_DEF
     };
     ListBox LB_TYPE_2
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_LINE_DEF:LB_TYPE_2";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 113 , 32  ) ;
         Size = MAP_APPFONT ( 43 , 49 ) ;
@@ -426,6 +444,7 @@ TabPage RID_SVXPAGE_LINE_DEF
     };
     NumericField NUM_FLD_1
     {
+        HelpID = "cui:NumericField:RID_SVXPAGE_LINE_DEF:NUM_FLD_1";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 66 , 48  ) ;
         Size = MAP_APPFONT ( 43 , 12 ) ;
@@ -440,6 +459,7 @@ TabPage RID_SVXPAGE_LINE_DEF
     };
     NumericField NUM_FLD_2
     {
+        HelpID = "cui:NumericField:RID_SVXPAGE_LINE_DEF:NUM_FLD_2";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 113 , 48  ) ;
         Size = MAP_APPFONT ( 43 , 12 ) ;
@@ -460,6 +480,7 @@ TabPage RID_SVXPAGE_LINE_DEF
     };
     MetricField MTR_FLD_LENGTH_1
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_LENGTH_1";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 66 , 64  ) ;
         Size = MAP_APPFONT ( 43 , 12 ) ;
@@ -480,6 +501,7 @@ TabPage RID_SVXPAGE_LINE_DEF
     };
     MetricField MTR_FLD_LENGTH_2
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_LENGTH_2";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 113 , 64  ) ;
         Size = MAP_APPFONT ( 43 , 12 ) ;
@@ -506,6 +528,7 @@ TabPage RID_SVXPAGE_LINE_DEF
     };
     MetricField MTR_FLD_DISTANCE
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_DISTANCE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 66 , 79  ) ;
         Size = MAP_APPFONT ( 43 , 12 ) ;
@@ -524,6 +547,7 @@ TabPage RID_SVXPAGE_LINE_DEF
     };
     CheckBox CBX_SYNCHRONIZE
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_LINE_DEF:CBX_SYNCHRONIZE";
         Pos = MAP_APPFONT ( 12 , 95  ) ;
         Size = MAP_APPFONT ( 174 , 10 ) ;
         Text [ en-US ] = "~Fit to line width" ;
@@ -540,6 +564,7 @@ TabPage RID_SVXPAGE_LINE_DEF
     };
     ListBox LB_LINESTYLES
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_LINE_DEF:LB_LINESTYLES";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 66 , 14  ) ;
         Size = MAP_APPFONT ( 120 , 80 ) ;
@@ -549,6 +574,7 @@ TabPage RID_SVXPAGE_LINE_DEF
     };
     PushButton BTN_ADD
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_LINE_DEF:BTN_ADD";
         Pos = MAP_APPFONT ( 198 , 14  ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Add..." ;
@@ -556,6 +582,7 @@ TabPage RID_SVXPAGE_LINE_DEF
     };
     PushButton BTN_MODIFY
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_LINE_DEF:BTN_MODIFY";
         Pos = MAP_APPFONT ( 198 , 34  ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Modify..." ;
@@ -563,6 +590,7 @@ TabPage RID_SVXPAGE_LINE_DEF
     };
     PushButton BTN_DELETE
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_LINE_DEF:BTN_DELETE";
         Pos = MAP_APPFONT ( 198 , 54  ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Delete..." ;
@@ -570,6 +598,7 @@ TabPage RID_SVXPAGE_LINE_DEF
     };
     ImageButton BTN_LOAD
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_LINE_DEF:BTN_LOAD";
         Pos = MAP_APPFONT ( 198 , 74  ) ;
         Size = MAP_APPFONT ( 16 , 16 ) ;
         TabStop = TRUE ;
@@ -585,6 +614,7 @@ TabPage RID_SVXPAGE_LINE_DEF
     };
     ImageButton BTN_SAVE
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_LINE_DEF:BTN_SAVE";
         Pos = MAP_APPFONT ( 198 , 96  ) ;
         Size = MAP_APPFONT ( 16 , 16 ) ;
         TabStop = TRUE ;
@@ -638,6 +668,7 @@ TabPage RID_SVXPAGE_LINEEND_DEF
     };
     Edit EDT_NAME
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_LINEEND_DEF:EDT_NAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 98 , 14  ) ;
         Size = MAP_APPFONT ( 87 , 12 ) ;
@@ -651,6 +682,7 @@ TabPage RID_SVXPAGE_LINEEND_DEF
     };
     ListBox LB_LINEENDS
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_LINEEND_DEF:LB_LINEENDS";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 98 , 30  ) ;
         Size = MAP_APPFONT ( 87 , 80 ) ;
@@ -660,6 +692,7 @@ TabPage RID_SVXPAGE_LINEEND_DEF
     };
     PushButton BTN_ADD
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_LINEEND_DEF:BTN_ADD";
         Pos = MAP_APPFONT ( 198 , 14  ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Add..." ;
@@ -667,6 +700,7 @@ TabPage RID_SVXPAGE_LINEEND_DEF
     };
     PushButton BTN_MODIFY
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_LINEEND_DEF:BTN_MODIFY";
         Pos = MAP_APPFONT ( 198 , 34  ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Modify..." ;
@@ -674,6 +708,7 @@ TabPage RID_SVXPAGE_LINEEND_DEF
     };
     PushButton BTN_DELETE
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_LINEEND_DEF:BTN_DELETE";
         Pos = MAP_APPFONT ( 198 , 54  ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Delete..." ;
@@ -681,6 +716,7 @@ TabPage RID_SVXPAGE_LINEEND_DEF
     };
     ImageButton BTN_LOAD
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_LINEEND_DEF:BTN_LOAD";
         Pos = MAP_APPFONT ( 198 , 74  ) ;
         Size = MAP_APPFONT ( 16 , 16 ) ;
         TabStop = TRUE ;
@@ -696,6 +732,7 @@ TabPage RID_SVXPAGE_LINEEND_DEF
     };
     ImageButton BTN_SAVE
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_LINEEND_DEF:BTN_SAVE";
         Pos = MAP_APPFONT ( 198 , 96  ) ;
         Size = MAP_APPFONT ( 16 , 16 ) ;
         TabStop = TRUE ;
diff --git a/cui/source/tabpages/tabstpge.src b/cui/source/tabpages/tabstpge.src
index cb743cf84..860de15db 100644
--- a/cui/source/tabpages/tabstpge.src
+++ b/cui/source/tabpages/tabstpge.src
@@ -45,6 +45,7 @@ TabPage RID_SVXPAGE_TABULATOR
     };
     MetricBox ED_TABPOS
     {
+        HelpID = "cui:MetricBox:RID_SVXPAGE_TABULATOR:ED_TABPOS";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 39 , 165 ) ;
         Minimum = -5600 ;
@@ -66,6 +67,7 @@ TabPage RID_SVXPAGE_TABULATOR
     };
     RadioButton BTN_TABTYPE_LEFT
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_LEFT";
         Pos = MAP_APPFONT ( 66 , 14 ) ;
         Size = MAP_APPFONT ( 89 , 10 ) ;
         Text [ en-US ] = "~Left" ;
@@ -78,6 +80,7 @@ TabPage RID_SVXPAGE_TABULATOR
     };
     RadioButton BTN_TABTYPE_RIGHT
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_RIGHT";
         Pos = MAP_APPFONT ( 66 , 28 ) ;
         Size = MAP_APPFONT ( 89 , 10 ) ;
         Text [ en-US ] = "Righ~t" ;
@@ -89,6 +92,7 @@ TabPage RID_SVXPAGE_TABULATOR
     };
     RadioButton BTN_TABTYPE_CENTER
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_CENTER";
         Pos = MAP_APPFONT ( 66 , 42 ) ;
         Size = MAP_APPFONT ( 89 , 10 ) ;
         Text [ en-US ] = "C~entered" ;
@@ -100,6 +104,7 @@ TabPage RID_SVXPAGE_TABULATOR
     };
     RadioButton BTN_TABTYPE_DECIMAL
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_DECIMAL";
         Pos = MAP_APPFONT ( 66 , 56 ) ;
         Size = MAP_APPFONT ( 89 , 10 ) ;
         Text [ en-US ] = "Deci~mal" ;
@@ -117,6 +122,7 @@ TabPage RID_SVXPAGE_TABULATOR
     };
     Edit ED_TABTYPE_DECCHAR
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_TABULATOR:ED_TABTYPE_DECCHAR";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 156 , 68 ) ;
         Size = MAP_APPFONT ( 9 , 12 ) ;
@@ -130,6 +136,7 @@ TabPage RID_SVXPAGE_TABULATOR
     };
     RadioButton BTN_FILLCHAR_NO
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_NO";
         Pos = MAP_APPFONT ( 66 , 97 ) ;
         Size = MAP_APPFONT ( 89 , 10 ) ;
         Text [ en-US ] = "N~one" ;
@@ -137,30 +144,35 @@ TabPage RID_SVXPAGE_TABULATOR
     };
     RadioButton BTN_FILLCHAR_POINTS
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_POINTS";
         Pos = MAP_APPFONT ( 66 , 111 ) ;
         Size = MAP_APPFONT ( 89 , 10 ) ;
         Text = "~........" ;
     };
     RadioButton BTN_FILLCHAR_DASHLINE
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_DASHLINE";
         Pos = MAP_APPFONT ( 66 , 125 ) ;
         Size = MAP_APPFONT ( 89 , 10 ) ;
         Text = "~--------" ;
     };
     RadioButton BTN_FILLCHAR_UNDERSCORE
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_UNDERSCORE";
         Pos = MAP_APPFONT ( 66 , 139 ) ;
         Size = MAP_APPFONT ( 89 , 10 ) ;
         Text = "~_____" ;
     };
     RadioButton BTN_FILLCHAR_OTHER
     {
+        HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_OTHER";
         Pos = MAP_APPFONT ( 66 , 153 ) ;
         Size = MAP_APPFONT ( 89 , 10 ) ;
         Text [ en-US ] = "Character" ;
     };
     Edit ED_FILLCHAR_OTHER
     {
+        HelpID = "cui:Edit:RID_SVXPAGE_TABULATOR:ED_FILLCHAR_OTHER";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 156 , 151 ) ;
         Size = MAP_APPFONT ( 9 , 12 ) ;
@@ -168,18 +180,21 @@ TabPage RID_SVXPAGE_TABULATOR
     };
     PushButton BTN_NEW
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_NEW";
         Pos = MAP_APPFONT ( 204 , 6 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~New" ;
     };
     PushButton BTN_DELALL
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_DELALL";
         Pos = MAP_APPFONT ( 204 , 23 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "Delete ~All" ;
     };
     PushButton BTN_DEL
     {
+        HelpID = "cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_DEL";
         Pos = MAP_APPFONT ( 204 , 40 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Delete" ;
diff --git a/cui/source/tabpages/textanim.src b/cui/source/tabpages/textanim.src
index c665b2fa5..b0d4ee712 100644
--- a/cui/source/tabpages/textanim.src
+++ b/cui/source/tabpages/textanim.src
@@ -71,6 +71,7 @@
  // RID_SVXPAGE_TEXTANIMATION ---------------------------------------------
 TabPage RID_SVXPAGE_TEXTANIMATION
 {
+    HelpID = "cui:TabPage:RID_SVXPAGE_TEXTANIMATION";
     SVLook = TRUE ;
     Hide = TRUE ;
     Size = MAP_APPFONT ( MA_TOTAL_WIDTH , 185 ) ;
@@ -91,6 +92,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
     };
     ListBox LB_EFFECT
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_TEXTANIMATION:LB_EFFECT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( MA_EFFECTLIST_X, MA_CURR_Y + 1 ) ;
         Size = MAP_APPFONT ( MA_EFFECTLIST_WIDTH , 57 ) ;
@@ -117,6 +119,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
     };
     ImageButton BTN_UP
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_UP";
         Pos = MAP_APPFONT ( MA_TOTAL_WIDTH - MA_MOVEBUT_GRACE_X - 2*MA_BUTTON_WIDTH - RSC_SP_TBPG_INNERBORDER_RIGHT - RSC_SP_FLGR_INNERBORDER_RIGHT,
                             RSC_SP_TBPG_INNERBORDER_TOP + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP );
         Size = BUTTON_SIZE ;
@@ -125,6 +128,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
     };
     ImageButton BTN_LEFT
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_LEFT";
         Pos = MAP_APPFONT ( MA_TOTAL_WIDTH - MA_MOVEBUT_GRACE_X - 3*MA_BUTTON_WIDTH - RSC_SP_TBPG_INNERBORDER_RIGHT - RSC_SP_FLGR_INNERBORDER_RIGHT,
                             RSC_SP_TBPG_INNERBORDER_TOP + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP + MA_BUTTON_HEIGHT);
         Size = BUTTON_SIZE ;
@@ -133,6 +137,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
     };
     ImageButton BTN_RIGHT
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_RIGHT";
         Pos = MAP_APPFONT ( MA_TOTAL_WIDTH - MA_MOVEBUT_GRACE_X - MA_BUTTON_WIDTH - RSC_SP_TBPG_INNERBORDER_RIGHT - RSC_SP_FLGR_INNERBORDER_RIGHT,
                             RSC_SP_TBPG_INNERBORDER_TOP + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP + MA_BUTTON_HEIGHT ) ;
         Size = BUTTON_SIZE ;
@@ -141,6 +146,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
     };
     ImageButton BTN_DOWN
     {
+        HelpID = "cui:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_DOWN";
         Pos = MAP_APPFONT ( MA_TOTAL_WIDTH - MA_MOVEBUT_GRACE_X - 2*MA_BUTTON_WIDTH - RSC_SP_TBPG_INNERBORDER_RIGHT - RSC_SP_FLGR_INNERBORDER_RIGHT,
                             RSC_SP_TBPG_INNERBORDER_TOP + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP + 2*MA_BUTTON_HEIGHT ) ;
         Size = BUTTON_SIZE ;
@@ -157,6 +163,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
 #define MA_CURR_Y2		RSC_SP_TBPG_INNERBORDER_TOP + MA_EFFECTSGROUP_HEIGHT + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP
     TriStateBox TSB_START_INSIDE
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_START_INSIDE";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT, MA_CURR_Y2 ) ;
         Size = MAP_APPFONT ( MA_TOTAL_WIDTH - RSC_SP_TBPG_INNERBORDER_LEFT - RSC_SP_TBPG_INNERBORDER_RIGHT - 12, RSC_CD_CHECKBOX_HEIGHT );
@@ -165,6 +172,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
 #define MA_CURR_Y3		MA_CURR_Y2 + RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y
     TriStateBox TSB_STOP_INSIDE
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_STOP_INSIDE";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT, MA_CURR_Y3 ) ;
         Size = MAP_APPFONT ( MA_TOTAL_WIDTH - RSC_SP_TBPG_INNERBORDER_LEFT - RSC_SP_TBPG_INNERBORDER_RIGHT - 12, RSC_CD_CHECKBOX_HEIGHT );
@@ -181,6 +189,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
 #define MA_CURR_Y5		MA_CURR_Y4 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP
     TriStateBox TSB_ENDLESS
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_ENDLESS";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT + 9 , MA_CURR_Y5 + 2 ) ;
         Size = MAP_APPFONT ( 71 , RSC_CD_CHECKBOX_HEIGHT ) ;
@@ -188,6 +197,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
     };
     NumericField NUM_FLD_COUNT
     {
+        HelpID = "cui:NumericField:RID_SVXPAGE_TEXTANIMATION:NUM_FLD_COUNT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT + 80 + RSC_SP_CTRL_GROUP_X,
                             MA_CURR_Y5 ) ;
@@ -209,6 +219,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
 #define MA_CURR_Y7		MA_CURR_Y6 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP
     TriStateBox TSB_PIXEL
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_PIXEL";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT + 9 , MA_CURR_Y7 + 2 ) ;
         Size = MAP_APPFONT ( 71 , RSC_CD_CHECKBOX_HEIGHT ) ;
@@ -216,6 +227,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
     };
     MetricField MTR_FLD_AMOUNT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_TEXTANIMATION:MTR_FLD_AMOUNT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT + 80 + RSC_SP_CTRL_GROUP_X,
                             MA_CURR_Y7 ) ;
@@ -242,6 +254,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
 #define MA_CURR_Y9		MA_CURR_Y8 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP
     TriStateBox TSB_AUTO
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_AUTO";
         Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT + 9 , MA_CURR_Y9 + 2 ) ;
         Size = MAP_APPFONT ( 71 , RSC_CD_CHECKBOX_HEIGHT ) ;
         TabStop = TRUE ;
@@ -249,6 +262,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
     };
     MetricField MTR_FLD_DELAY
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_TEXTANIMATION:MTR_FLD_DELAY";
         Border = TRUE ;
         Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT + 80 + RSC_SP_CTRL_GROUP_X,
                             MA_CURR_Y9 ) ;
diff --git a/cui/source/tabpages/textattr.src b/cui/source/tabpages/textattr.src
index 23a2138cb..45e5e9cb7 100644
--- a/cui/source/tabpages/textattr.src
+++ b/cui/source/tabpages/textattr.src
@@ -46,6 +46,7 @@ TabPage RID_SVXPAGE_TEXTATTR
     };
     TriStateBox TSB_AUTOGROW_WIDTH
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_WIDTH";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 12 , 14  ) ;
         Size = MAP_APPFONT ( 102 , 10 ) ;
@@ -53,6 +54,7 @@ TabPage RID_SVXPAGE_TEXTATTR
     };
     TriStateBox TSB_AUTOGROW_HEIGHT
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_HEIGHT";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 12 , 28  ) ;
         Size = MAP_APPFONT ( 102 , 10 ) ;
@@ -60,6 +62,7 @@ TabPage RID_SVXPAGE_TEXTATTR
     };
     TriStateBox TSB_FIT_TO_SIZE
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_FIT_TO_SIZE";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 12 , 42  ) ;
         Size = MAP_APPFONT ( 102 , 10 ) ;
@@ -67,6 +70,7 @@ TabPage RID_SVXPAGE_TEXTATTR
     };
     TriStateBox TSB_CONTOUR
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_CONTOUR";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 12 , 56  ) ;
         Size = MAP_APPFONT ( 102 , 10 ) ;
@@ -74,6 +78,7 @@ TabPage RID_SVXPAGE_TEXTATTR
     };
     TriStateBox TSB_WORDWRAP_TEXT
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_WORDWRAP_TEXT";
         TabStop = TRUE;		
         Pos = MAP_APPFONT( 132, 14  ) ;
         Size = MAP_APPFONT( 127 , 10 ) ;
@@ -81,6 +86,7 @@ TabPage RID_SVXPAGE_TEXTATTR
     };
     TriStateBox TSB_AUTOGROW_SIZE
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_SIZE";
         TabStop = TRUE;
         Pos = MAP_APPFONT( 132, 28  );
         Size = MAP_APPFONT( 127 , 10 );
@@ -118,6 +124,7 @@ TabPage RID_SVXPAGE_TEXTATTR
     };
     MetricField MTR_FLD_LEFT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_LEFT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 69 , 83  ) ;
         Size = MAP_APPFONT ( 45 , 12 ) ;
@@ -134,6 +141,7 @@ TabPage RID_SVXPAGE_TEXTATTR
     };
     MetricField MTR_FLD_RIGHT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_RIGHT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 69 , 99  ) ;
         Size = MAP_APPFONT ( 45 , 12 ) ;
@@ -150,6 +158,7 @@ TabPage RID_SVXPAGE_TEXTATTR
     };
     MetricField MTR_FLD_TOP
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_TOP";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 69 , 115  ) ;
         Size = MAP_APPFONT ( 45 , 12 ) ;
@@ -166,6 +175,7 @@ TabPage RID_SVXPAGE_TEXTATTR
     };
     MetricField MTR_FLD_BOTTOM
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_BOTTOM";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 69 , 131  ) ;
         Size = MAP_APPFONT ( 45 , 12 ) ;
@@ -202,6 +212,7 @@ TabPage RID_SVXPAGE_TEXTATTR
     };
     TriStateBox TSB_FULL_WIDTH
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_FULL_WIDTH";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( 132 , 139  ) ;
         Size = MAP_APPFONT ( 116 , 10 ) ;
diff --git a/cui/source/tabpages/transfrm.src b/cui/source/tabpages/transfrm.src
index 5e57d5742..d8960137a 100644
--- a/cui/source/tabpages/transfrm.src
+++ b/cui/source/tabpages/transfrm.src
@@ -61,6 +61,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE
     };
     MetricField MTR_FLD_POS_X
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_POS_X";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 56 , 14 + 8  ) ;
         Size = MAP_APPFONT ( 54 , 12 ) ;
@@ -76,6 +77,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE
     };
     MetricField MTR_FLD_POS_Y
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_POS_Y";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 56 , 30 + 8  ) ;
         Size = MAP_APPFONT ( 54 , 12 ) ;
@@ -127,6 +129,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE
     };
     MetricField MTR_FLD_WIDTH
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_WIDTH";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 56 , 14 + 61  ) ;
         Size = MAP_APPFONT ( 54 , 12 ) ;
@@ -142,6 +145,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE
     };
     MetricField MTR_FLD_HEIGHT
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_HEIGHT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 56 , 30 + 61  ) ;
         Size = MAP_APPFONT ( 54 , 12 ) ;
@@ -172,6 +176,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE
     };
     CheckBox CBX_SCALE
     {
+        HelpID = "cui:CheckBox:RID_SVXPAGE_POSITION_SIZE:CBX_SCALE";
         Pos = MAP_APPFONT ( 12 , 47 + 61 ) ;
         Size = MAP_APPFONT ( 162 , 10 ) ;
         TabStop = TRUE ;
@@ -189,6 +194,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE
 
     TriStateBox TSB_POSPROTECT
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_POSPROTECT";
         Pos = MAP_APPFONT ( 12 , 10 + 120 ) ;
         Size = MAP_APPFONT ( 113 , 10 ) ;
         Text [ en-US ] = "Position" ;
@@ -197,6 +203,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE
 
     TriStateBox TSB_SIZEPROTECT
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_SIZEPROTECT";
         Pos = MAP_APPFONT ( 12 , 24 + 120 ) ;
         Size = MAP_APPFONT ( 113 , 10 ) ;
         Text [ en-US ] = "~Size" ;
@@ -213,6 +220,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE
     };
     TriStateBox TSB_AUTOGROW_WIDTH
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_AUTOGROW_WIDTH";
         Pos = MAP_APPFONT ( 12 + 121 + 8, 10 + 120 ) ;
         Size = MAP_APPFONT ( 113 , 10 ) ;
         Text [ en-US ] = "~Fit width to text" ;
@@ -220,6 +228,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE
     };
     TriStateBox TSB_AUTOGROW_HEIGHT
     {
+        HelpID = "cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_AUTOGROW_HEIGHT";
         Pos = MAP_APPFONT ( 12 + 121 + 8, 24 + 120 ) ;
         Size = MAP_APPFONT ( 113 , 10 ) ;
         Text [ en-US ] = "Fit ~height to text" ;
@@ -251,6 +260,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE
     };
     ListBox LB_ANCHOR
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_POSITION_SIZE:LB_ANCHOR";
         Pos = MAP_APPFONT ( 46 + 121 + 16 , 8 + 120 ) ;
         Size = MAP_APPFONT ( 54 , 60 ) ;
         Hide = TRUE ;
@@ -272,6 +282,7 @@ TabPage RID_SVXPAGE_POSITION_SIZE
     };
     ListBox LB_ORIENT
     {
+        HelpID = "cui:ListBox:RID_SVXPAGE_POSITION_SIZE:LB_ORIENT";
         Pos = MAP_APPFONT ( 46 + 121 + 16 , 22 + 120 );
         Size = MAP_APPFONT ( 54 , 60 ) ;
         Hide = TRUE ;
@@ -319,6 +330,7 @@ TabPage RID_SVXPAGE_ANGLE
     };
     MetricField MTR_FLD_POS_X
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_POS_X";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 56 , 14 + 11  ) ;
         Size = MAP_APPFONT ( 54 , 12 ) ;
@@ -334,6 +346,7 @@ TabPage RID_SVXPAGE_ANGLE
     };
     MetricField MTR_FLD_POS_Y
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_POS_Y";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 56 , 30 + 11 ) ;
         Size = MAP_APPFONT ( 54 , 12 ) ;
@@ -376,6 +389,7 @@ TabPage RID_SVXPAGE_ANGLE
     };
     MetricField MTR_FLD_ANGLE
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_ANGLE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 56 , 82 + 22  ) ;
         Size = MAP_APPFONT ( 54 , 12 ) ;
@@ -427,6 +441,7 @@ TabPage RID_SVXPAGE_SLANT
     };
     MetricField MTR_FLD_RADIUS
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_SLANT:MTR_FLD_RADIUS";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 56 , 14  ) ;
         Size = MAP_APPFONT ( 54 , 12 ) ;
@@ -454,6 +469,7 @@ TabPage RID_SVXPAGE_SLANT
     };
     MetricField MTR_FLD_ANGLE
     {
+        HelpID = "cui:MetricField:RID_SVXPAGE_SLANT:MTR_FLD_ANGLE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 56 , 46  ) ;
         Size = MAP_APPFONT ( 54 , 12 ) ;
diff --git a/extensions/source/abpilot/abspilot.src b/extensions/source/abpilot/abspilot.src
index a69ac07eb..f159ff692 100644
--- a/extensions/source/abpilot/abspilot.src
+++ b/extensions/source/abpilot/abspilot.src
@@ -71,6 +71,7 @@ ModalDialog RID_DLG_ADDRESSBOOKSOURCEPILOT
 //........................................................................
 TabPage RID_PAGE_SELECTABTYPE
 {
+    HelpID = "extensions:TabPage:RID_PAGE_SELECTABTYPE";
     SVLook	= TRUE ;
     Size	= MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
 
@@ -93,56 +94,67 @@ TabPage RID_PAGE_SELECTABTYPE
 
     RadioButton RB_EVOLUTION
      {
+        HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_EVOLUTION";
          Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
         Text [ en-US ] = "Evolution";
     };
     RadioButton RB_EVOLUTION_GROUPWISE
      {
+        HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_EVOLUTION_GROUPWISE";
          Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
         Text [ en-US ] = "Groupwise";
     };
     RadioButton RB_EVOLUTION_LDAP
      {
+        HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_EVOLUTION_LDAP";
          Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
         Text [ en-US ] = "Evolution LDAP";
     };
     RadioButton RB_MORK
     {
+        HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_MORK";
         Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
         Text [ en-US ] = "Mozilla / Netscape";
     };
     RadioButton RB_THUNDERBIRD
     {
+        HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_THUNDERBIRD";
         Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
         Text [ en-US ] = "Thunderbird";
     };
     RadioButton RB_KAB
      {
+        HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_KAB";
          Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
         Text [ en-US ] = "KDE address book";
     };
     RadioButton RB_MACAB
     {
+        HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_MACAB";
         Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
         Text [ en-US ] = "Mac OS X address book";
     };
     RadioButton RB_LDAP
     {
+        HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_LDAP";
         Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
         Text [ en-US ] = "LDAP address data";
     };
     RadioButton RB_OUTLOOK
     {
+        HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OUTLOOK";
         Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
         Text [ en-US ] = "Outlook address book";
     };
     RadioButton RB_OUTLOOKEXPRESS
     {
+        HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OUTLOOKEXPRESS";
         Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
         Text [ en-US ] = "Windows system address book";
     };
     RadioButton RB_OTHER
     {
+        HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OTHER";
         Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
         Text [ en-US ] = "Other external data source";
     };
@@ -151,6 +163,7 @@ TabPage RID_PAGE_SELECTABTYPE
 //........................................................................
 TabPage RID_PAGE_ADMININVOKATION
 {
+    HelpID = "extensions:TabPage:RID_PAGE_ADMININVOKATION";
     SVLook	= TRUE ;
     Size	= MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
 
@@ -165,6 +178,7 @@ TabPage RID_PAGE_ADMININVOKATION
 
     PushButton PB_INVOKE_ADMIN_DIALOG
     {
+        HelpID = "extensions:PushButton:RID_PAGE_ADMININVOKATION:PB_INVOKE_ADMIN_DIALOG";
         Pos		= MAP_APPFONT ( ( WINDOW_SIZE_X - BUTTON_SIZE_X ) / 2, 60 ) ;
         Size	= MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y ) ;
 
@@ -185,6 +199,7 @@ TabPage RID_PAGE_ADMININVOKATION
 //........................................................................
 TabPage RID_PAGE_TABLESELECTION_AB
 {
+    HelpID = "extensions:TabPage:RID_PAGE_TABLESELECTION_AB";
     SVLook	= TRUE ;
     Size	= MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
 
@@ -199,6 +214,7 @@ TabPage RID_PAGE_TABLESELECTION_AB
 
     ListBox LB_TABLELIST
     {
+        HelpID = "extensions:ListBox:RID_PAGE_TABLESELECTION_AB:LB_TABLELIST";
         Pos		= MAP_APPFONT ( BORDER_X, 36 ) ;
         Size	= MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 50 ) ;
         SVLook = TRUE;
@@ -212,6 +228,7 @@ TabPage RID_PAGE_TABLESELECTION_AB
 //........................................................................
 TabPage RID_PAGE_FIELDMAPPING
 {
+    HelpID = "extensions:TabPage:RID_PAGE_FIELDMAPPING";
     SVLook	= TRUE ;
     Size	= MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
 
@@ -226,6 +243,7 @@ TabPage RID_PAGE_FIELDMAPPING
 
     PushButton PB_INVOKE_FIELDS_DIALOG
     {
+        HelpID = "extensions:PushButton:RID_PAGE_FIELDMAPPING:PB_INVOKE_FIELDS_DIALOG";
         Pos		= MAP_APPFONT ( ( WINDOW_SIZE_X - BUTTON_SIZE_X ) / 2, 84 ) ;
         Size	= MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y ) ;
 
@@ -243,6 +261,7 @@ TabPage RID_PAGE_FIELDMAPPING
 //........................................................................
 TabPage RID_PAGE_FINAL
 {
+    HelpID = "extensions:TabPage:RID_PAGE_FINAL";
     SVLook	= TRUE ;
     Size	= MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
 
@@ -266,6 +285,7 @@ TabPage RID_PAGE_FINAL
     
     ComboBox CBB_LOCATION
     {
+        HelpID = "extensions:ComboBox:RID_PAGE_FINAL:CBB_LOCATION";
         Pos		= MAP_APPFONT ( BORDER_X , 64 ) ;
         Size	= MAP_APPFONT ( WINDOW_SIZE_X - 53 - BORDER_X - BORDER_X, 12) ;
         SVLook = TRUE;
@@ -276,6 +296,7 @@ TabPage RID_PAGE_FINAL
     
     PushButton PB_BROWSE
     {
+        HelpID = "extensions:PushButton:RID_PAGE_FINAL:PB_BROWSE";
         Pos		= MAP_APPFONT ( WINDOW_SIZE_X - 50 - BORDER_X  , 63 ) ;
         Size	= MAP_APPFONT ( 50, 14) ;
         SVLook = TRUE;
@@ -286,6 +307,7 @@ TabPage RID_PAGE_FINAL
 
     CheckBox CB_REGISTER_DS
     {
+        HelpID = "extensions:CheckBox:RID_PAGE_FINAL:CB_REGISTER_DS";
         Pos		= MAP_APPFONT ( BORDER_X, 82 ) ;
         Size	= MAP_APPFONT ( WINDOW_SIZE_X - BORDER_X - BORDER_X, 8) ;
         SVLook = TRUE;
@@ -303,6 +325,7 @@ TabPage RID_PAGE_FINAL
 
     Edit ET_DATASOURCENAME
     {
+        HelpID = "extensions:Edit:RID_PAGE_FINAL:ET_DATASOURCENAME";
         Pos		= MAP_APPFONT ( BORDER_X + 10, 104 ) ;
         Size	= MAP_APPFONT ( WINDOW_SIZE_X - 56 - BORDER_X - BORDER_X - 10, 12) ;
         SVLook = TRUE;
diff --git a/extensions/source/bibliography/datman.src b/extensions/source/bibliography/datman.src
index 6b8c4b00e..639e6640d 100644
--- a/extensions/source/bibliography/datman.src
+++ b/extensions/source/bibliography/datman.src
@@ -62,6 +62,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox     LB_IDENTIFIER
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_IDENTIFIER";
         Pos = MAP_APPFONT ( 65 , 13 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -73,6 +74,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_AUTHORITYTYPE
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_AUTHORITYTYPE";
         Pos = MAP_APPFONT ( 171 , 13 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -84,6 +86,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_YEAR
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_YEAR";
         Pos = MAP_APPFONT ( 282 , 13 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -95,6 +98,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_AUTHOR
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_AUTHOR";
         Pos = MAP_APPFONT ( 65 , 28 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -106,6 +110,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_TITLE
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_TITLE";
         Pos = MAP_APPFONT ( 171 , 28 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -117,6 +122,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_PUBLISHER
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_PUBLISHER";
         Pos = MAP_APPFONT ( 65 , 43 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -128,6 +134,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_ADDRESS
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_ADDRESS";
         Pos = MAP_APPFONT ( 171, 43 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -139,6 +146,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_ISBN
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_ISBN";
         Pos = MAP_APPFONT ( 282 , 43 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -150,6 +158,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_CHAPTER
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_CHAPTER";
         Pos = MAP_APPFONT ( 65 , 58 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -161,6 +170,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_PAGES
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_PAGES";
         Pos = MAP_APPFONT ( 171, 58) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -172,6 +182,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_EDITOR
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_EDITOR";
         Pos = MAP_APPFONT ( 65 , 73 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -183,6 +194,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_EDITION
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_EDITION";
         Pos = MAP_APPFONT ( 171 , 73 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -194,6 +206,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_BOOKTITLE
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_BOOKTITLE";
         Pos = MAP_APPFONT ( 65, 88 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -205,6 +218,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_VOLUME
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_VOLUME";
         Pos = MAP_APPFONT ( 171 , 88 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -216,6 +230,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_HOWPUBLISHED
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_HOWPUBLISHED";
         Pos = MAP_APPFONT ( 282, 88 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -227,6 +242,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_ORGANIZATIONS
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_ORGANIZATIONS";
         Pos = MAP_APPFONT ( 65 , 103 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -238,6 +254,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_INSTITUTION
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_INSTITUTION";
         Pos = MAP_APPFONT ( 171 , 103) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -249,6 +266,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_SCHOOL
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_SCHOOL";
         Pos = MAP_APPFONT ( 282 , 103 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -260,6 +278,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_REPORTTYPE
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_REPORTTYPE";
         Pos = MAP_APPFONT ( 65 , 118 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -271,6 +290,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_MONTH
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_MONTH";
         Pos = MAP_APPFONT ( 171 , 118) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -282,6 +302,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_JOURNAL
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_JOURNAL";
         Pos = MAP_APPFONT ( 65 , 133) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -293,6 +314,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_NUMBER
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_NUMBER";
         Pos = MAP_APPFONT ( 171 , 133 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -304,6 +326,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_SERIES
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_SERIES";
         Pos = MAP_APPFONT ( 282 , 133 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -315,6 +338,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_ANNOTE
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_ANNOTE";
         Pos = MAP_APPFONT ( 65 , 148 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -326,6 +350,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_NOTE
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_NOTE";
         Pos = MAP_APPFONT ( 171 , 148 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -337,6 +362,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_URL
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_URL";
         Pos = MAP_APPFONT ( 282, 148 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -348,6 +374,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_CUSTOM1
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_CUSTOM1";
         Pos = MAP_APPFONT ( 65 , 163 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -359,6 +386,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_CUSTOM2
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_CUSTOM2";
         Pos = MAP_APPFONT ( 171 , 163 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -370,6 +398,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_CUSTOM3
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_CUSTOM3";
         Pos = MAP_APPFONT ( 282 , 163 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -381,6 +410,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_CUSTOM4
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_CUSTOM4";
         Pos = MAP_APPFONT ( 65 , 177 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
@@ -392,6 +422,7 @@ ModalDialog RID_DLG_MAPPING
     };
     ListBox LB_CUSTOM5
     {
+        HelpID = "extensions:ListBox:RID_DLG_MAPPING:LB_CUSTOM5";
         Pos = MAP_APPFONT ( 171 , 177 ) ;
         Size = MAP_APPFONT ( 50 , 60 ) ;
         DropDown = TRUE;
diff --git a/extensions/source/dbpilots/commonpagesdbp.src b/extensions/source/dbpilots/commonpagesdbp.src
index 783bdb48b..fd2bef2f4 100644
--- a/extensions/source/dbpilots/commonpagesdbp.src
+++ b/extensions/source/dbpilots/commonpagesdbp.src
@@ -31,6 +31,7 @@
 
 TabPage RID_PAGE_TABLESELECTION
 {
+    HelpID = "extensions:TabPage:RID_PAGE_TABLESELECTION";
     SVLook = TRUE ;
     Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
     Text [ en-US ] = "Data";
@@ -58,6 +59,7 @@ TabPage RID_PAGE_TABLESELECTION
     };
     ListBox LB_DATASOURCE
     {
+        HelpID = "extensions:ListBox:RID_PAGE_TABLESELECTION:LB_DATASOURCE";
         Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3 , 26  ) ;
         Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 27 , 14 ) ;
         SVLook = TRUE ;
@@ -68,6 +70,7 @@ TabPage RID_PAGE_TABLESELECTION
     
     PushButton PB_FORMDATASOURCE
     {
+        HelpID = "extensions:PushButton:RID_PAGE_TABLESELECTION:PB_FORMDATASOURCE";
         Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3 + WINDOW_HALF_SIZE_X - 24 , 25  ) ;
         Size = MAP_APPFONT ( 14 , 14 ) ;
         Text [ en-US ] = "~...";
@@ -82,6 +85,7 @@ TabPage RID_PAGE_TABLESELECTION
     };
     ListBox LB_TABLE
     {
+        HelpID = "extensions:ListBox:RID_PAGE_TABLESELECTION:LB_TABLE";
         Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3, 57  ) ;
         Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10 , WINDOW_SIZE_Y - 6 - 57 ) ;
         SVLook = TRUE ;
@@ -118,6 +122,7 @@ TabPage RID_PAGE_TABLESELECTION
 
 TabPage RID_PAGE_OPTION_DBFIELD
 {
+    HelpID = "extensions:TabPage:RID_PAGE_OPTION_DBFIELD";
     SVLook = TRUE ;
     Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
     Text [ en-US ] = "Database Field";
@@ -142,6 +147,7 @@ TabPage RID_PAGE_OPTION_DBFIELD
     };
     RadioButton RB_STOREINFIELD_YES
     {
+        HelpID = "extensions:RadioButton:RID_PAGE_OPTION_DBFIELD:RB_STOREINFIELD_YES";
         Pos = MAP_APPFONT ( 7 , 53  ) ;
         Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 20, 10 ) ;
         Group = TRUE;
@@ -150,6 +156,7 @@ TabPage RID_PAGE_OPTION_DBFIELD
     };
     ListBox LB_STOREINFIELD
     {
+        HelpID = "extensions:ListBox:RID_PAGE_OPTION_DBFIELD:LB_STOREINFIELD";
         Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 23, 51 ) ;
         Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 30, 14 ) ;
         TabStop = TRUE;
@@ -160,6 +167,7 @@ TabPage RID_PAGE_OPTION_DBFIELD
     };
     RadioButton RB_STOREINFIELD_NO
     {
+        HelpID = "extensions:RadioButton:RID_PAGE_OPTION_DBFIELD:RB_STOREINFIELD_NO";
         Pos = MAP_APPFONT ( 7 , 68 ) ;
         Size = MAP_APPFONT ( WINDOW_SIZE_X - 14, 10 ) ;
         TabStop = FALSE;
@@ -169,6 +177,7 @@ TabPage RID_PAGE_OPTION_DBFIELD
 
 TabPage RID_PAGE_FORM_DATASOURCE_STATUS
 {
+    HelpID = "extensions:TabPage:RID_PAGE_FORM_DATASOURCE_STATUS";
     FixedLine FL_FORMSETINGS
     {
         Pos = MAP_APPFONT ( 4 , 3  ) ;
diff --git a/extensions/source/dbpilots/dbpilots.src b/extensions/source/dbpilots/dbpilots.src
index fcdda32e0..7e5cf6adf 100644
--- a/extensions/source/dbpilots/dbpilots.src
+++ b/extensions/source/dbpilots/dbpilots.src
@@ -31,6 +31,7 @@
 
 ModalDialog RID_DLG_GROUPBOXWIZARD
 {
+    HelpID = "extensions:ModalDialog:RID_DLG_GROUPBOXWIZARD";
     Text [ en-US ] = "Group Element Wizard";
 
     OutputSize		= TRUE ;
@@ -42,6 +43,7 @@ ModalDialog RID_DLG_GROUPBOXWIZARD
 
 ModalDialog RID_DLG_LISTCOMBOWIZARD
 {
+    HelpID = "extensions:ModalDialog:RID_DLG_LISTCOMBOWIZARD";
     OutputSize		= TRUE ;
     SVLook			= TRUE ;
     Moveable		= TRUE ;
@@ -51,6 +53,7 @@ ModalDialog RID_DLG_LISTCOMBOWIZARD
 
 ModalDialog RID_DLG_GRIDWIZARD
 {
+    HelpID = "extensions:ModalDialog:RID_DLG_GRIDWIZARD";
     OutputSize		= TRUE ;
     SVLook			= TRUE ;
     Moveable		= TRUE ;
diff --git a/extensions/source/dbpilots/gridpages.src b/extensions/source/dbpilots/gridpages.src
index 5b5d557ca..ccba53592 100644
--- a/extensions/source/dbpilots/gridpages.src
+++ b/extensions/source/dbpilots/gridpages.src
@@ -31,6 +31,7 @@
 
 TabPage RID_PAGE_GW_FIELDSELECTION
 {
+    HelpID = "extensions:TabPage:RID_PAGE_GW_FIELDSELECTION";
     SVLook = TRUE ;
     Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
 
@@ -51,6 +52,7 @@ TabPage RID_PAGE_GW_FIELDSELECTION
     };
     ListBox LB_EXISTING_FIELDS
     {
+        HelpID = "extensions:ListBox:RID_PAGE_GW_FIELDSELECTION:LB_EXISTING_FIELDS";
         Pos = MAP_APPFONT ( 7 , 63  ) ;
         Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - ITEM_BUTTON_SIZE_X / 2 - 13, WINDOW_SIZE_Y - 63 - 6 ) ;
         SVLook = TRUE ;
@@ -61,24 +63,28 @@ TabPage RID_PAGE_GW_FIELDSELECTION
     };
     PushButton PB_FIELDRIGHT
     {
+        HelpID = "extensions:PushButton:RID_PAGE_GW_FIELDSELECTION:PB_FIELDRIGHT";
         Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X - ITEM_BUTTON_SIZE_X / 2, 63 );
         Size = MAP_APPFONT ( ITEM_BUTTON_SIZE_X, ITEM_BUTTON_SIZE_Y );
         Text = "->";
     };
     PushButton PB_ALLFIELDSRIGHT
     {
+        HelpID = "extensions:PushButton:RID_PAGE_GW_FIELDSELECTION:PB_ALLFIELDSRIGHT";
         Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X - ITEM_BUTTON_SIZE_X / 2, 63 + ITEM_BUTTON_SIZE_Y + 3 );
         Size = MAP_APPFONT ( ITEM_BUTTON_SIZE_X, ITEM_BUTTON_SIZE_Y );
         Text = "=>>";
     };
     PushButton PB_FIELDLEFT
     {
+        HelpID = "extensions:PushButton:RID_PAGE_GW_FIELDSELECTION:PB_FIELDLEFT";
         Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X - ITEM_BUTTON_SIZE_X / 2, 63 + ITEM_BUTTON_SIZE_Y + 3 + ITEM_BUTTON_SIZE_Y + 12 );
         Size = MAP_APPFONT ( ITEM_BUTTON_SIZE_X, ITEM_BUTTON_SIZE_Y );
         Text = "<-";
     };
     PushButton PB_ALLFIELDSLEFT
     {
+        HelpID = "extensions:PushButton:RID_PAGE_GW_FIELDSELECTION:PB_ALLFIELDSLEFT";
         Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X - ITEM_BUTTON_SIZE_X / 2, 63 + ITEM_BUTTON_SIZE_Y + 3 + ITEM_BUTTON_SIZE_Y + 12 + ITEM_BUTTON_SIZE_Y + 3 );
         Size = MAP_APPFONT ( ITEM_BUTTON_SIZE_X, ITEM_BUTTON_SIZE_Y );
         Text = "<<=";
@@ -91,6 +97,7 @@ TabPage RID_PAGE_GW_FIELDSELECTION
     };
     ListBox LB_SELECTED_FIELDS
     {
+        HelpID = "extensions:ListBox:RID_PAGE_GW_FIELDSELECTION:LB_SELECTED_FIELDS";
         Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + ITEM_BUTTON_SIZE_X / 2 + 6 , 63  ) ;
         Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - ITEM_BUTTON_SIZE_X / 2 - 13, WINDOW_SIZE_Y - 63 - 6 ) ;
         SVLook = TRUE ;
diff --git a/extensions/source/dbpilots/groupboxpages.src b/extensions/source/dbpilots/groupboxpages.src
index f5538e2a1..11f77711c 100644
--- a/extensions/source/dbpilots/groupboxpages.src
+++ b/extensions/source/dbpilots/groupboxpages.src
@@ -31,6 +31,7 @@
 
 TabPage RID_PAGE_GROUPRADIOSELECTION
 {
+    HelpID = "extensions:TabPage:RID_PAGE_GROUPRADIOSELECTION";
     SVLook = TRUE ;
     Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
     Text [ en-US ] = "Data";
@@ -50,6 +51,7 @@ TabPage RID_PAGE_GROUPRADIOSELECTION
     };
     Edit ET_RADIOLABELS
     {
+        HelpID = "extensions:Edit:RID_PAGE_GROUPRADIOSELECTION:ET_RADIOLABELS";
         Pos = MAP_APPFONT ( 7 , 79  ) ;
         Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - ITEM_BUTTON_SIZE_X / 2 - 13, 12 ) ;
         SVLook = TRUE ;
@@ -57,12 +59,14 @@ TabPage RID_PAGE_GROUPRADIOSELECTION
     };
     PushButton PB_MOVETORIGHT
     {
+        HelpID = "extensions:PushButton:RID_PAGE_GROUPRADIOSELECTION:PB_MOVETORIGHT";
         Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X - ITEM_BUTTON_SIZE_X / 2 , 79  ) ;
         Size = MAP_APPFONT ( ITEM_BUTTON_SIZE_X , ITEM_BUTTON_SIZE_Y ) ;
         Text = "~>>";
     };
     PushButton PB_MOVETOLEFT
     {
+        HelpID = "extensions:PushButton:RID_PAGE_GROUPRADIOSELECTION:PB_MOVETOLEFT";
         Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X - ITEM_BUTTON_SIZE_X / 2 , 79 + ITEM_BUTTON_SIZE_Y + 3 ) ;
         Size = MAP_APPFONT ( ITEM_BUTTON_SIZE_X , ITEM_BUTTON_SIZE_Y ) ;
         Text = "~<<";
@@ -76,6 +80,7 @@ TabPage RID_PAGE_GROUPRADIOSELECTION
     };
     ListBox LB_RADIOBUTTONS
     {
+        HelpID = "extensions:ListBox:RID_PAGE_GROUPRADIOSELECTION:LB_RADIOBUTTONS";
         Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + ITEM_BUTTON_SIZE_X / 2 + 6 , 79  ) ;
         Size = MAP_APPFONT ( WINDOW_SIZE_X - WINDOW_HALF_SIZE_X - ITEM_BUTTON_SIZE_X / 2 - 6 - 7, WINDOW_SIZE_Y - 79 - 6 ) ;
         SVLook = TRUE ;
@@ -87,6 +92,7 @@ TabPage RID_PAGE_GROUPRADIOSELECTION
 
 TabPage RID_PAGE_DEFAULTFIELDSELECTION
 {
+    HelpID = "extensions:TabPage:RID_PAGE_DEFAULTFIELDSELECTION";
     SVLook = TRUE ;
     Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
     Text [ en-US ] = "Default Field Selection";
@@ -106,6 +112,7 @@ TabPage RID_PAGE_DEFAULTFIELDSELECTION
     };
     RadioButton RB_DEFSELECTION_YES
     {
+        HelpID = "extensions:RadioButton:RID_PAGE_DEFAULTFIELDSELECTION:RB_DEFSELECTION_YES";
         Pos = MAP_APPFONT ( 7 , 44  ) ;
         Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10, 10 ) ;
         Group = TRUE;
@@ -114,6 +121,7 @@ TabPage RID_PAGE_DEFAULTFIELDSELECTION
     };
     ListBox LB_DEFSELECTIONFIELD
     {
+        HelpID = "extensions:ListBox:RID_PAGE_DEFAULTFIELDSELECTION:LB_DEFSELECTIONFIELD";
         Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3 , 42  ) ;
         Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10, 14 ) ;
         TabStop = TRUE;
@@ -125,6 +133,7 @@ TabPage RID_PAGE_DEFAULTFIELDSELECTION
     };
     RadioButton RB_DEFSELECTION_NO
     {
+        HelpID = "extensions:RadioButton:RID_PAGE_DEFAULTFIELDSELECTION:RB_DEFSELECTION_NO";
         Pos = MAP_APPFONT ( 7 , 59  ) ;
         Size = MAP_APPFONT ( WINDOW_SIZE_X - 14, 10 ) ;
         TabStop = FALSE;
@@ -134,6 +143,7 @@ TabPage RID_PAGE_DEFAULTFIELDSELECTION
 
 TabPage RID_PAGE_OPTIONVALUES
 {
+    HelpID = "extensions:TabPage:RID_PAGE_OPTIONVALUES";
     SVLook = TRUE ;
     Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
     Text [ en-US ] = "Field Values";
@@ -160,6 +170,7 @@ TabPage RID_PAGE_OPTIONVALUES
     };
     Edit ET_OPTIONVALUE
     {
+        HelpID = "extensions:Edit:RID_PAGE_OPTIONVALUES:ET_OPTIONVALUE";
         Pos = MAP_APPFONT ( 7 , 61 ) ;
         Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10, 12 ) ;
         SVLook = TRUE ;
@@ -174,6 +185,7 @@ TabPage RID_PAGE_OPTIONVALUES
     };
     ListBox LB_RADIOBUTTONS
     {
+        HelpID = "extensions:ListBox:RID_PAGE_OPTIONVALUES:LB_RADIOBUTTONS";
         Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3 , 26  ) ;
         Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10 , WINDOW_SIZE_Y - 32 ) ;
         SVLook = TRUE ;
@@ -185,6 +197,7 @@ TabPage RID_PAGE_OPTIONVALUES
 
 TabPage RID_PAGE_OPTIONS_FINAL
 {
+    HelpID = "extensions:TabPage:RID_PAGE_OPTIONS_FINAL";
     SVLook = TRUE ;
     Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
     Text [ en-US ] = "Create Option Group";
@@ -203,6 +216,7 @@ TabPage RID_PAGE_OPTIONS_FINAL
     };
     Edit ET_NAMEIT
     {
+        HelpID = "extensions:Edit:RID_PAGE_OPTIONS_FINAL:ET_NAMEIT";
         Pos = MAP_APPFONT ( 7 , 34 ) ;
         Size = MAP_APPFONT ( WINDOW_SIZE_X - 14, 12 ) ;
         SVLook = TRUE ;
diff --git a/extensions/source/dbpilots/listcombopages.src b/extensions/source/dbpilots/listcombopages.src
index 7e48fef2c..dd8603502 100644
--- a/extensions/source/dbpilots/listcombopages.src
+++ b/extensions/source/dbpilots/listcombopages.src
@@ -31,6 +31,7 @@
 
 TabPage RID_PAGE_LCW_CONTENTSELECTION_TABLE
 {
+    HelpID = "extensions:TabPage:RID_PAGE_LCW_CONTENTSELECTION_TABLE";
     SVLook = TRUE ;
     Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
 
@@ -53,6 +54,7 @@ TabPage RID_PAGE_LCW_CONTENTSELECTION_TABLE
     };
     ListBox LB_SELECTTABLE
     {
+        HelpID = "extensions:ListBox:RID_PAGE_LCW_CONTENTSELECTION_TABLE:LB_SELECTTABLE";
         Pos = MAP_APPFONT ( 130 , 52  ) ;
         Size = MAP_APPFONT ( WINDOW_SIZE_X - 130 - 7, WINDOW_SIZE_Y - 52 - 6 ) ;
         SVLook = TRUE ;
@@ -65,6 +67,7 @@ TabPage RID_PAGE_LCW_CONTENTSELECTION_TABLE
 
 TabPage RID_PAGE_LCW_CONTENTSELECTION_FIELD
 {
+    HelpID = "extensions:TabPage:RID_PAGE_LCW_CONTENTSELECTION_FIELD";
     SVLook = TRUE ;
     Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
 
@@ -86,6 +89,7 @@ TabPage RID_PAGE_LCW_CONTENTSELECTION_FIELD
     };
     ListBox LB_SELECTFIELD
     {
+        HelpID = "extensions:ListBox:RID_PAGE_LCW_CONTENTSELECTION_FIELD:LB_SELECTFIELD";
         Pos = MAP_APPFONT ( 7 , 26  ) ;
         Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10, WINDOW_SIZE_Y - 32 ) ;
         SVLook = TRUE ;
@@ -102,6 +106,7 @@ TabPage RID_PAGE_LCW_CONTENTSELECTION_FIELD
     };
     Edit ET_DISPLAYEDFIELD
     {
+        HelpID = "extensions:Edit:RID_PAGE_LCW_CONTENTSELECTION_FIELD:ET_DISPLAYEDFIELD";
         Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3 , 26  ) ;
         Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10, 12 ) ;
         SVLook = TRUE ;
@@ -127,6 +132,7 @@ TabPage RID_PAGE_LCW_CONTENTSELECTION_FIELD
 
 TabPage RID_PAGE_LCW_FIELDLINK
 {
+    HelpID = "extensions:TabPage:RID_PAGE_LCW_FIELDLINK";
     SVLook = TRUE ;
     Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
 
@@ -153,6 +159,7 @@ TabPage RID_PAGE_LCW_FIELDLINK
     };
     ComboBox CMB_VALUELISTFIELD
     {
+        HelpID = "extensions:ComboBox:RID_PAGE_LCW_FIELDLINK:CMB_VALUELISTFIELD";
         Pos = MAP_APPFONT ( 7 , 48  ) ;
         Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10, WINDOW_SIZE_Y - 54 ) ;
         SVLook = TRUE ;
@@ -170,6 +177,7 @@ TabPage RID_PAGE_LCW_FIELDLINK
     };
     ComboBox CMB_TABLEFIELD
     {
+        HelpID = "extensions:ComboBox:RID_PAGE_LCW_FIELDLINK:CMB_TABLEFIELD";
         Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3 , 48 ) ;
         Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10, WINDOW_SIZE_Y - 54 ) ;
         SVLook = TRUE ;
diff --git a/extensions/source/preload/preload.src b/extensions/source/preload/preload.src
index 301e489cd..17ccbf8b4 100644
--- a/extensions/source/preload/preload.src
+++ b/extensions/source/preload/preload.src
@@ -31,6 +31,7 @@
 
 ModalDialog RID_DLG_OEMWIZARD
 {
+    HelpID = "extensions:ModalDialog:RID_DLG_OEMWIZARD";
     Text = "%PRODUCTNAME %PRODUCTVERSION";
 
     OutputSize		= TRUE ;
@@ -40,11 +41,13 @@ ModalDialog RID_DLG_OEMWIZARD
     Hide			= TRUE;
     PushButton PB_PREV
     {
+        HelpID = "extensions:PushButton:RID_DLG_OEMWIZARD:PB_PREV";
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "<< Back" ;
     };
     PushButton PB_NEXT
     {
+        HelpID = "extensions:PushButton:RID_DLG_OEMWIZARD:PB_NEXT";
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "Next >>" ;
     };
@@ -72,6 +75,7 @@ ModalDialog RID_DLG_OEMWIZARD
 };
 TabPage RID_TP_WELCOME
 {
+    HelpID = "extensions:TabPage:RID_TP_WELCOME";
 //    HelpId = ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
@@ -130,6 +134,7 @@ TabPage RID_TP_WELCOME
 
 TabPage RID_TP_LICENSE
 {
+    HelpID = "extensions:TabPage:RID_TP_LICENSE";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Hide = TRUE ;
@@ -138,6 +143,7 @@ TabPage RID_TP_LICENSE
 
     MultiLineEdit ML_LICENSE
     {
+        HelpID = "extensions:MultiLineEdit:RID_TP_LICENSE:ML_LICENSE";
         PosSize = MAP_APPFONT ( LICENSE_COL_1 , LICENSE_ROW_1 , LICENSE_WIDTH , LICENCE_HEIGHT ) ;
         Border = TRUE ;
         VScroll = TRUE ;
@@ -185,6 +191,7 @@ TabPage RID_TP_LICENSE
 
     PushButton PB_PAGEDOWN
     {
+        HelpID = "extensions:PushButton:RID_TP_LICENSE:PB_PAGEDOWN";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( LICENSE_COL_4 , LICENSE_ROW_3 ) ;
         Size = MAP_APPFONT ( PD_WIDTH , PB_HEIGHT ) ;
@@ -209,6 +216,7 @@ TabPage RID_TP_LICENSE
 
     CheckBox CB_ACCEPT
     {
+        HelpID = "extensions:CheckBox:RID_TP_LICENSE:CB_ACCEPT";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( LICENSE_COL_3, LICENSE_ROW_5 ) ;
         Size = MAP_APPFONT ( COL3_WIDTH, FT_HEIGHT ) ;
diff --git a/extensions/source/propctrlr/formlinkdialog.src b/extensions/source/propctrlr/formlinkdialog.src
index ca936a58d..db0ef08d6 100644
--- a/extensions/source/propctrlr/formlinkdialog.src
+++ b/extensions/source/propctrlr/formlinkdialog.src
@@ -35,6 +35,7 @@
 
 ModalDialog RID_DLG_FORMLINKS
 {
+    HelpID = "extensions:ModalDialog:RID_DLG_FORMLINKS";
     OutputSize = TRUE ;
     Moveable = TRUE ;
     Closeable = TRUE ;
@@ -133,6 +134,7 @@ ModalDialog RID_DLG_FORMLINKS
 
     PushButton PB_SUGGEST
     {
+        HelpID = "extensions:PushButton:RID_DLG_FORMLINKS:PB_SUGGEST";
         Pos = MAP_APPFONT( 199, 90 );
         Size = MAP_APPFONT( 50, 14 );
         TabStop =  TRUE;
diff --git a/extensions/source/propctrlr/listselectiondlg.src b/extensions/source/propctrlr/listselectiondlg.src
index 7b148e8a9..c2cae7ab0 100644
--- a/extensions/source/propctrlr/listselectiondlg.src
+++ b/extensions/source/propctrlr/listselectiondlg.src
@@ -35,6 +35,7 @@
 
 ModalDialog RID_DLG_SELECTION
 {
+    HelpID = "extensions:ModalDialog:RID_DLG_SELECTION";
     OutputSize = TRUE ;
     Moveable = TRUE ;
     Closeable = TRUE ;
@@ -49,6 +50,7 @@ ModalDialog RID_DLG_SELECTION
 
     ListBox LB_ENTRIES
     {
+        HelpID = "extensions:ListBox:RID_DLG_SELECTION:LB_ENTRIES";
         Pos  = MAP_APPFONT(  6, 17 );
         Size = MAP_APPFONT( 85, 97 );
 
diff --git a/extensions/source/propctrlr/newdatatype.src b/extensions/source/propctrlr/newdatatype.src
index 6cf39a322..90be27153 100644
--- a/extensions/source/propctrlr/newdatatype.src
+++ b/extensions/source/propctrlr/newdatatype.src
@@ -39,6 +39,7 @@
 
 ModalDialog RID_DLG_NEW_DATA_TYPE
 {
+    HelpID = "extensions:ModalDialog:RID_DLG_NEW_DATA_TYPE";
     OutputSize = TRUE ;
     Moveable = TRUE ;
     Closeable = TRUE ;
@@ -57,6 +58,7 @@ ModalDialog RID_DLG_NEW_DATA_TYPE
 
     Edit ED_NAME
     {
+        HelpID = "extensions:Edit:RID_DLG_NEW_DATA_TYPE:ED_NAME";
         Pos = MAP_APPFONT( 6, 17 );
         Size = MAP_APPFONT( DIALOG_WIDTH - 2 * 6, 12 );
         Border = TRUE;
diff --git a/extensions/source/propctrlr/selectlabeldialog.src b/extensions/source/propctrlr/selectlabeldialog.src
index 93cf7d24e..ab961c456 100644
--- a/extensions/source/propctrlr/selectlabeldialog.src
+++ b/extensions/source/propctrlr/selectlabeldialog.src
@@ -31,6 +31,7 @@
 
 ModalDialog RID_DLG_SELECTLABELCONTROL
 {
+    HelpID = "extensions:ModalDialog:RID_DLG_SELECTLABELCONTROL";
     OutputSize = TRUE;
     Size = MAP_APPFONT( 200, 151 );
     Moveable = TRUE;
@@ -51,6 +52,7 @@ ModalDialog RID_DLG_SELECTLABELCONTROL
     };
     CheckBox 1
     {
+        HelpID = "extensions:CheckBox:RID_DLG_SELECTLABELCONTROL:1";
         Pos = MAP_APPFONT( 6, 115 );
         Size = MAP_APPFONT( 188, 8 );
         Text [ en-US ] = "~No assignment";
diff --git a/extensions/source/propctrlr/taborder.src b/extensions/source/propctrlr/taborder.src
index fe55988f3..1dfe0ee58 100644
--- a/extensions/source/propctrlr/taborder.src
+++ b/extensions/source/propctrlr/taborder.src
@@ -35,6 +35,7 @@
 
 ModalDialog RID_DLG_TABORDER
 {
+    HelpID = "extensions:ModalDialog:RID_DLG_TABORDER";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 168 , 158 ) ;
@@ -60,6 +61,7 @@ ModalDialog RID_DLG_TABORDER
 
     PushButton PB_MOVE_UP
     {
+        HelpID = "extensions:PushButton:RID_DLG_TABORDER:PB_MOVE_UP";
         Pos = MAP_APPFONT ( 102 , 14 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "Move Up" ;
@@ -67,6 +69,7 @@ ModalDialog RID_DLG_TABORDER
 
     PushButton PB_MOVE_DOWN
     {
+        HelpID = "extensions:PushButton:RID_DLG_TABORDER:PB_MOVE_DOWN";
         Pos = MAP_APPFONT ( 102 , 32 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "Move Down" ;
@@ -74,6 +77,7 @@ ModalDialog RID_DLG_TABORDER
 
     PushButton PB_AUTO_ORDER
     {
+        HelpID = "extensions:PushButton:RID_DLG_TABORDER:PB_AUTO_ORDER";
         Pos = MAP_APPFONT ( 102 , 50 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "Automatic Sort" ;
diff --git a/extensions/source/scanner/grid.src b/extensions/source/scanner/grid.src
index ddf593ef7..e1734456f 100644
--- a/extensions/source/scanner/grid.src
+++ b/extensions/source/scanner/grid.src
@@ -28,6 +28,7 @@
 
 ModalDialog GRID_DIALOG
 {
+    HelpID = "extensions:ModalDialog:GRID_DIALOG";
     OutputSize = TRUE ; 
     SVLook = TRUE ; 
     Pos = MAP_APPFONT ( 10 , 10 ) ; 
@@ -48,6 +49,7 @@ ModalDialog GRID_DIALOG
     };
     ListBox GRID_DIALOG_TYPE_BOX
     {
+        HelpID = "extensions:ListBox:GRID_DIALOG:GRID_DIALOG_TYPE_BOX";
         Border = TRUE ; 
         Dropdown = TRUE ; 
         Pos = MAP_APPFONT( 245, 45 );
@@ -55,6 +57,7 @@ ModalDialog GRID_DIALOG
       };
     PushButton GRID_DIALOG_RESET_BTN
     {
+        HelpID = "extensions:PushButton:GRID_DIALOG:GRID_DIALOG_RESET_BTN";
         Pos = MAP_APPFONT( 245, 65 );
         Size = MAP_APPFONT( 50, 15 );
         Text [ en-US ] = "Set";
diff --git a/extensions/source/scanner/sanedlg.src b/extensions/source/scanner/sanedlg.src
index 2b41785c8..20e825c07 100644
--- a/extensions/source/scanner/sanedlg.src
+++ b/extensions/source/scanner/sanedlg.src
@@ -27,6 +27,7 @@
 #include 
 ModalDialog RID_SANE_DIALOG
 {
+    HelpID = "extensions:ModalDialog:RID_SANE_DIALOG";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 10 , 10 ) ;
@@ -46,12 +47,14 @@ ModalDialog RID_SANE_DIALOG
     };
     PushButton RID_DEVICEINFO_BTN
     {
+        HelpID = "extensions:PushButton:RID_SANE_DIALOG:RID_DEVICEINFO_BTN";
         Pos = MAP_APPFONT ( THIRD_COLUMN , 44 ) ;
         Size = MAP_APPFONT ( 55 , 22 ) ;
         Text [ en-US ] = "About\n Dev~ice" ;
     };
     PushButton RID_PREVIEW_BTN
     {
+        HelpID = "extensions:PushButton:RID_SANE_DIALOG:RID_PREVIEW_BTN";
         Pos = MAP_APPFONT ( THIRD_COLUMN , 71 ) ;
         Size = MAP_APPFONT ( 55 , 22 ) ;
         Text [ en-US ] = "Create\nPreview" ;
@@ -76,6 +79,7 @@ ModalDialog RID_SANE_DIALOG
     };
     MetricField RID_SCAN_LEFT_BOX
     {
+        HelpID = "extensions:MetricField:RID_SANE_DIALOG:RID_SCAN_LEFT_BOX";
         Spin = TRUE ;
         Repeat = TRUE ;
         Border = TRUE ;
@@ -90,6 +94,7 @@ ModalDialog RID_SANE_DIALOG
     };
     MetricField RID_SCAN_TOP_BOX
     {
+        HelpID = "extensions:MetricField:RID_SANE_DIALOG:RID_SCAN_TOP_BOX";
         Spin = TRUE ;
         Repeat = TRUE ;
         Border = TRUE ;
@@ -104,6 +109,7 @@ ModalDialog RID_SANE_DIALOG
     };
     MetricField RID_SCAN_RIGHT_BOX
     {
+        HelpID = "extensions:MetricField:RID_SANE_DIALOG:RID_SCAN_RIGHT_BOX";
         Spin = TRUE ;
         Repeat = TRUE ;
         Border = TRUE ;
@@ -118,6 +124,7 @@ ModalDialog RID_SANE_DIALOG
     };
     MetricField RID_SCAN_BOTTOM_BOX
     {
+        HelpID = "extensions:MetricField:RID_SANE_DIALOG:RID_SCAN_BOTTOM_BOX";
         Spin = TRUE ;
         Repeat = TRUE ;
         Border = TRUE ;
@@ -132,6 +139,7 @@ ModalDialog RID_SANE_DIALOG
     };
     ListBox RID_DEVICE_BOX
     {
+        HelpID = "extensions:ListBox:RID_SANE_DIALOG:RID_DEVICE_BOX";
         Border = TRUE ;
         Dropdown = TRUE ;
         Sort = TRUE ;
@@ -146,6 +154,7 @@ ModalDialog RID_SANE_DIALOG
     };
     NumericBox RID_SCAN_RESOLUTION_BOX
     {
+        HelpID = "extensions:NumericBox:RID_SANE_DIALOG:RID_SCAN_RESOLUTION_BOX";
         Dropdown = TRUE ;
         Pos = MAP_APPFONT ( SECOND_COLUMN + 70 , 23 ) ;
         Size = MAP_APPFONT ( 60 , 80 ) ;
@@ -158,6 +167,7 @@ ModalDialog RID_SANE_DIALOG
     };
     CheckBox RID_SCAN_ADVANCED_BOX
     {
+        HelpID = "extensions:CheckBox:RID_SANE_DIALOG:RID_SCAN_ADVANCED_BOX";
         Check = FALSE ;
         Pos = MAP_APPFONT ( SECOND_COLUMN + 120 , 40 ) ;
         Size = MAP_APPFONT ( 8 , 8 ) ;
@@ -188,17 +198,20 @@ ModalDialog RID_SANE_DIALOG
     };
     CheckBox RID_SCAN_BOOL_OPTION_BOX
     {
+        HelpID = "extensions:CheckBox:RID_SANE_DIALOG:RID_SCAN_BOOL_OPTION_BOX";
         Pos = MAP_APPFONT ( SECOND_COLUMN + 120 , 225 ) ;
         Size = MAP_APPFONT ( 8 , 8 ) ;
     };
     Edit RID_SCAN_STRING_OPTION_EDT
     {
+        HelpID = "extensions:Edit:RID_SANE_DIALOG:RID_SCAN_STRING_OPTION_EDT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( SECOND_COLUMN , 234 ) ;
         Size = MAP_APPFONT ( 130 , 12 ) ;
     };
     ListBox RID_SCAN_QUANTUM_RANGE_BOX
     {
+        HelpID = "extensions:ListBox:RID_SANE_DIALOG:RID_SCAN_QUANTUM_RANGE_BOX";
         Border = TRUE ;
         Dropdown = TRUE ;
         Pos = MAP_APPFONT ( SECOND_COLUMN , 234 ) ;
@@ -206,6 +219,7 @@ ModalDialog RID_SANE_DIALOG
     };
     ListBox RID_SCAN_STRING_RANGE_BOX
     {
+        HelpID = "extensions:ListBox:RID_SANE_DIALOG:RID_SCAN_STRING_RANGE_BOX";
         Border = TRUE ;
         Dropdown = TRUE ;
         Pos = MAP_APPFONT ( SECOND_COLUMN , 234 ) ;
@@ -213,6 +227,7 @@ ModalDialog RID_SANE_DIALOG
     };
     Edit RID_SCAN_NUMERIC_OPTION_EDT
     {
+        HelpID = "extensions:Edit:RID_SANE_DIALOG:RID_SCAN_NUMERIC_OPTION_EDT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( SECOND_COLUMN , 234 ) ;
         Size = MAP_APPFONT ( 130 , 12 ) ;
@@ -225,6 +240,7 @@ ModalDialog RID_SANE_DIALOG
     };
     NumericField RID_SCAN_NUMERIC_VECTOR_BOX
     {
+        HelpID = "extensions:NumericField:RID_SANE_DIALOG:RID_SCAN_NUMERIC_VECTOR_BOX";
         Border = TRUE ;
         Spin = TRUE ;
         Repeat = TRUE ;
@@ -233,6 +249,7 @@ ModalDialog RID_SANE_DIALOG
     };
     PushButton RID_SCAN_BUTTON_OPTION_BTN
     {
+        HelpID = "extensions:PushButton:RID_SANE_DIALOG:RID_SCAN_BUTTON_OPTION_BTN";
         Pos = MAP_APPFONT ( SECOND_COLUMN , 234 ) ;
         Size = MAP_APPFONT ( 130 , 14 ) ;
         Text [ en-US ] = "Set" ;
diff --git a/xmlsecurity/source/dialogs/certificatechooser.src b/xmlsecurity/source/dialogs/certificatechooser.src
index 9fa8e5ec7..8bf6ea79f 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.src
+++ b/xmlsecurity/source/dialogs/certificatechooser.src
@@ -59,6 +59,7 @@ ModalDialog RID_XMLSECDLG_CERTCHOOSER
     };
     PushButton BTN_VIEWCERT
     {
+        HelpID = "xmlsecurity:PushButton:RID_XMLSECDLG_CERTCHOOSER:BTN_VIEWCERT";
         Pos = MAP_APPFONT( CS_COL_1, CS_ROW_3 );
         Size = MAP_APPFONT( CS_COL_2-CS_COL_1, RSC_CD_PUSHBUTTON_HEIGHT );
         Text [ en-US ] = "View Certificate...";
diff --git a/xmlsecurity/source/dialogs/certificateviewer.src b/xmlsecurity/source/dialogs/certificateviewer.src
index 19f90de45..e0a9e5bbf 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.src
+++ b/xmlsecurity/source/dialogs/certificateviewer.src
@@ -212,6 +212,7 @@ TabPage RID_XMLSECTP_DETAILS
     };
     MultiLineEdit ML_ELEMENT
     {
+        HelpID = "xmlsecurity:MultiLineEdit:RID_XMLSECTP_DETAILS:ML_ELEMENT";
         Pos = MAP_APPFONT( CV_COL_0, CV_ROW_2 );
         Size = MAP_APPFONT( CV_CONT_WIDTH, CV_ROW_3-CV_ROW_2 );
         ReadOnly = TRUE;
@@ -299,6 +300,7 @@ TabPage RID_XMLSECTP_CERTPATH
     };
     PushButton BTN_VIEWCERT
     {
+        HelpID = "xmlsecurity:PushButton:RID_XMLSECTP_CERTPATH:BTN_VIEWCERT";
         Pos = MAP_APPFONT( CV_COL_1-(CV_COL_B-CV_COL_A), CVP_ROW_2 );
         Size = MAP_APPFONT( CV_COL_B-CV_COL_A, RSC_CD_PUSHBUTTON_HEIGHT );
         Text [ en-US ] = "View Certificate...";
@@ -311,6 +313,7 @@ TabPage RID_XMLSECTP_CERTPATH
     };
     MultiLineEdit ML_CERTSTATUS
     {
+        HelpID = "xmlsecurity:MultiLineEdit:RID_XMLSECTP_CERTPATH:ML_CERTSTATUS";
         Pos = MAP_APPFONT( CV_COL_0, CVP_ROW_4 );
         Size = MAP_APPFONT( CV_CONT_WIDTH, REST_HEIGHT/3 );
         ReadOnly = TRUE;
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.src b/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
index fcdc60bee..b1e688adc 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
@@ -145,18 +145,21 @@ ModalDialog RID_XMLSECDLG_DIGSIG
     };
     PushButton BTN_VIEWCERT
     {
+        HelpID = "xmlsecurity:PushButton:RID_XMLSECDLG_DIGSIG:BTN_VIEWCERT";
         Pos = MAP_APPFONT( 6, 142 );
         Size = MAP_APPFONT( 70, 14 );
         Text [ en-US ] = "View Certificate...";
     };
     PushButton BTN_ADDCERT
     {
+        HelpID = "xmlsecurity:PushButton:RID_XMLSECDLG_DIGSIG:BTN_ADDCERT";
         Pos = MAP_APPFONT( 82, 142 );
         Size = MAP_APPFONT( 70, 14 );
         Text [ en-US ] = "Sign Document...";
     };
     PushButton BTN_REMOVECERT
     {
+        HelpID = "xmlsecurity:PushButton:RID_XMLSECDLG_DIGSIG:BTN_REMOVECERT";
         Pos = MAP_APPFONT( 158, 142 );
         Size = MAP_APPFONT( 70, 14 );
         Text [ en-US ] = "Remove";
diff --git a/xmlsecurity/source/dialogs/macrosecurity.src b/xmlsecurity/source/dialogs/macrosecurity.src
index 9e7411ef9..449c45923 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.src
+++ b/xmlsecurity/source/dialogs/macrosecurity.src
@@ -101,6 +101,7 @@ TabPage RID_XMLSECTP_SECLEVEL
     };
     RadioButton RB_VERYHIGH
     {
+        HelpID = "xmlsecurity:RadioButton:RID_XMLSECTP_SECLEVEL:RB_VERYHIGH";
         Pos = MAP_APPFONT( SL_COL_1, SL_ROW_0 );
         Size = MAP_APPFONT( SL_COL_2-SL_COL_1, RSC_BIG_RADIOBUTTON );
         WordBreak = TRUE;
@@ -108,6 +109,7 @@ TabPage RID_XMLSECTP_SECLEVEL
     };
     RadioButton RB_HIGH
     {
+        HelpID = "xmlsecurity:RadioButton:RID_XMLSECTP_SECLEVEL:RB_HIGH";
         Pos = MAP_APPFONT( SL_COL_1, SL_ROW_1 );
         Size = MAP_APPFONT( SL_COL_2-SL_COL_1, RSC_BIG_RADIOBUTTON );
         WordBreak = TRUE;
@@ -115,6 +117,7 @@ TabPage RID_XMLSECTP_SECLEVEL
     };
     RadioButton RB_MEDIUM
     {
+        HelpID = "xmlsecurity:RadioButton:RID_XMLSECTP_SECLEVEL:RB_MEDIUM";
         Pos = MAP_APPFONT( SL_COL_1, SL_ROW_2 );
         Size = MAP_APPFONT( SL_COL_2-SL_COL_1, RSC_BIG_RADIOBUTTON );
         WordBreak = TRUE;
@@ -122,6 +125,7 @@ TabPage RID_XMLSECTP_SECLEVEL
     };
     RadioButton RB_LOW
     {
+        HelpID = "xmlsecurity:RadioButton:RID_XMLSECTP_SECLEVEL:RB_LOW";
         Pos = MAP_APPFONT( SL_COL_1, SL_ROW_3 );
         Size = MAP_APPFONT( SL_COL_2-SL_COL_1, SL_ROW_4-SL_ROW_3 );
         WordBreak = TRUE;
@@ -161,18 +165,21 @@ TabPage RID_XMLSECTP_TRUSTSOURCES
     };
     PushButton PB_ADD_TRUSTCERT
     {
+        HelpID = "xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:PB_ADD_TRUSTCERT";
         Pos = MAP_APPFONT( TS_COL_2, TS_ROW_2 );
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
         Text [ en-US ] = "Add...";
     };
     PushButton PB_VIEW_TRUSTCERT
     {
+        HelpID = "xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:PB_VIEW_TRUSTCERT";
         Pos = MAP_APPFONT( TS_COL_4, TS_ROW_2 );
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
         Text [ en-US ] = "View...";
     };
     PushButton PB_REMOVE_TRUSTCERT
     {
+        HelpID = "xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:PB_REMOVE_TRUSTCERT";
         Pos = MAP_APPFONT( TS_COL_6, TS_ROW_2 );
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
         Text [ en-US ] = "Remove";
@@ -197,6 +204,7 @@ TabPage RID_XMLSECTP_TRUSTSOURCES
     };
     ListBox LB_TRUSTFILELOC
     {
+        HelpID = "xmlsecurity:ListBox:RID_XMLSECTP_TRUSTSOURCES:LB_TRUSTFILELOC";
         Pos = MAP_APPFONT( TS_COL_1, TS_ROW_5 );
         Size = MAP_APPFONT( TS_COL_7-TS_COL_1, TS_ROW_6-TS_ROW_5 );
         SVLook = TRUE;
@@ -206,12 +214,14 @@ TabPage RID_XMLSECTP_TRUSTSOURCES
     };
     PushButton FL_ADD_TRUSTFILELOC
     {
+        HelpID = "xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:FL_ADD_TRUSTFILELOC";
         Pos = MAP_APPFONT( TS_COL_4, TS_ROW_7 );
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
         Text [ en-US ] = "Add...";
     };
     PushButton FL_REMOVE_TRUSTFILELOC
     {
+        HelpID = "xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:FL_REMOVE_TRUSTFILELOC";
         Pos = MAP_APPFONT( TS_COL_6, TS_ROW_7 );
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
         Text [ en-US ] = "Remove";
diff --git a/xmlsecurity/source/dialogs/warnings.src b/xmlsecurity/source/dialogs/warnings.src
index 913717d3b..aa912ad5d 100644
--- a/xmlsecurity/source/dialogs/warnings.src
+++ b/xmlsecurity/source/dialogs/warnings.src
@@ -69,6 +69,7 @@ ModalDialog RID_XMLSECTP_MACROWARN
     };
     PushButton PB_VIEWSIGNS
     {
+        HelpID = "xmlsecurity:PushButton:RID_XMLSECTP_MACROWARN:PB_VIEWSIGNS";
         Pos = MAP_APPFONT( MW_COL_3, MW_ROW_2 );
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
         Text [ en-US ] = "View Signatures...";
@@ -82,6 +83,7 @@ ModalDialog RID_XMLSECTP_MACROWARN
     };
     CheckBox CB_ALWAYSTRUST
     {
+        HelpID = "xmlsecurity:CheckBox:RID_XMLSECTP_MACROWARN:CB_ALWAYSTRUST";
         Pos = MAP_APPFONT( MW_COL_1, MW_ROW_4 );
         Size = MAP_APPFONT( MW_COL_4-MW_COL_1, RSC_CD_CHECKBOX_HEIGHT );
         Text [ en-US ] = "Always trust macros from this source";
@@ -93,6 +95,7 @@ ModalDialog RID_XMLSECTP_MACROWARN
     };
     PushButton PB_ENABLE
     {
+        HelpID = "xmlsecurity:PushButton:RID_XMLSECTP_MACROWARN:PB_ENABLE";
         Pos = MAP_APPFONT( DLGS_BOTTOM_OK_X( MW_WIDTH ), DLGS_BOTTOM_BTN_Y( MW_HEIGHT ) );
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
         Text [ en-US ] = "Enable Macros";
-- 
cgit v1.2.3


From 1675e3706195bccc633562f406c793479f851480 Mon Sep 17 00:00:00 2001
From: Ingo Schmidt 
Date: Wed, 13 Oct 2010 14:56:29 +0200
Subject: native338 #i115046# new jre6u22

---
 setup_native/source/java/javaversion.dat  | 26 +++++++++++++-------------
 setup_native/source/java/javaversion2.dat | 26 +++++++++++++-------------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/setup_native/source/java/javaversion.dat b/setup_native/source/java/javaversion.dat
index bb935ac2c..a647694a7 100755
--- a/setup_native/source/java/javaversion.dat
+++ b/setup_native/source/java/javaversion.dat
@@ -26,30 +26,30 @@
 #*************************************************************************
 
 # GUI String in the installer ("Java Runtime Environment (${JAVAVERSION})")
-JAVAVERSION=Java 6 Update 21
-WINDOWSJAVAVERSION=Java 6 Update 21
+JAVAVERSION=Java 6 Update 22
+WINDOWSJAVAVERSION=Java 6 Update 22
 
 # Windows (scp2 and downloadtemplate.nsi)
-WINDOWSJAVAFILENAME=jre-6u21-windows-i586.exe
-WINDOWSJAVAREGISTRYENTRY=1.6.0_21
+WINDOWSJAVAFILENAME=jre-6u22-windows-i586.exe
+WINDOWSJAVAREGISTRYENTRY=1.6.0_22
 
 # Linux (scp2)
-LINUXJAVAFILENAME=jre-6u21-linux-i586.rpm
+LINUXJAVAFILENAME=jre-6u22-linux-i586.rpm
 # Linux (rpmUnit.xml, rpm -qp  )
-LINUXJAVANAME=jre-1.6.0_21-fcs
+LINUXJAVANAME=jre-1.6.0_22-fcs
 
 # Linux-x64 (scp2)
-LINUXX64JAVAFILENAME=jre-6u21-linux-amd64.rpm
+LINUXX64JAVAFILENAME=jre-6u22-linux-amd64.rpm
 
 # Solaris Sparc (scp2)
-SOLSJAVARTPACKED=SUNWj6rt_1_6_0_21_sparc.tar.gz
-SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_21_sparc.tar.gz
-SOLSJAVAMANPACKED=SUNWj6man_1_6_0_21_sparc.tar.gz
+SOLSJAVARTPACKED=SUNWj6rt_1_6_0_22_sparc.tar.gz
+SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_22_sparc.tar.gz
+SOLSJAVAMANPACKED=SUNWj6man_1_6_0_22_sparc.tar.gz
 
 # Solaris x86 (scp2)
-SOLIJAVARTPACKED=SUNWj6rt_1_6_0_21_x86.tar.gz
-SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_21_x86.tar.gz
-SOLIJAVAMANPACKED=SUNWj6man_1_6_0_21_x86.tar.gz
+SOLIJAVARTPACKED=SUNWj6rt_1_6_0_22_x86.tar.gz
+SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_22_x86.tar.gz
+SOLIJAVAMANPACKED=SUNWj6man_1_6_0_22_x86.tar.gz
 
 # Solaris (pkgUnit.xml, needs only to be changed in major changes)
 SOLARISJAVART=SUNWj6rt
diff --git a/setup_native/source/java/javaversion2.dat b/setup_native/source/java/javaversion2.dat
index bb935ac2c..a647694a7 100644
--- a/setup_native/source/java/javaversion2.dat
+++ b/setup_native/source/java/javaversion2.dat
@@ -26,30 +26,30 @@
 #*************************************************************************
 
 # GUI String in the installer ("Java Runtime Environment (${JAVAVERSION})")
-JAVAVERSION=Java 6 Update 21
-WINDOWSJAVAVERSION=Java 6 Update 21
+JAVAVERSION=Java 6 Update 22
+WINDOWSJAVAVERSION=Java 6 Update 22
 
 # Windows (scp2 and downloadtemplate.nsi)
-WINDOWSJAVAFILENAME=jre-6u21-windows-i586.exe
-WINDOWSJAVAREGISTRYENTRY=1.6.0_21
+WINDOWSJAVAFILENAME=jre-6u22-windows-i586.exe
+WINDOWSJAVAREGISTRYENTRY=1.6.0_22
 
 # Linux (scp2)
-LINUXJAVAFILENAME=jre-6u21-linux-i586.rpm
+LINUXJAVAFILENAME=jre-6u22-linux-i586.rpm
 # Linux (rpmUnit.xml, rpm -qp  )
-LINUXJAVANAME=jre-1.6.0_21-fcs
+LINUXJAVANAME=jre-1.6.0_22-fcs
 
 # Linux-x64 (scp2)
-LINUXX64JAVAFILENAME=jre-6u21-linux-amd64.rpm
+LINUXX64JAVAFILENAME=jre-6u22-linux-amd64.rpm
 
 # Solaris Sparc (scp2)
-SOLSJAVARTPACKED=SUNWj6rt_1_6_0_21_sparc.tar.gz
-SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_21_sparc.tar.gz
-SOLSJAVAMANPACKED=SUNWj6man_1_6_0_21_sparc.tar.gz
+SOLSJAVARTPACKED=SUNWj6rt_1_6_0_22_sparc.tar.gz
+SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_22_sparc.tar.gz
+SOLSJAVAMANPACKED=SUNWj6man_1_6_0_22_sparc.tar.gz
 
 # Solaris x86 (scp2)
-SOLIJAVARTPACKED=SUNWj6rt_1_6_0_21_x86.tar.gz
-SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_21_x86.tar.gz
-SOLIJAVAMANPACKED=SUNWj6man_1_6_0_21_x86.tar.gz
+SOLIJAVARTPACKED=SUNWj6rt_1_6_0_22_x86.tar.gz
+SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_22_x86.tar.gz
+SOLIJAVAMANPACKED=SUNWj6man_1_6_0_22_x86.tar.gz
 
 # Solaris (pkgUnit.xml, needs only to be changed in major changes)
 SOLARISJAVART=SUNWj6rt
-- 
cgit v1.2.3


From c258ba8ca3b428b1fcc2e273974350464d833a4d Mon Sep 17 00:00:00 2001
From: Mathias Bauer 
Date: Thu, 14 Oct 2010 12:12:02 +0200
Subject: CWS changehid: some fixes for Writer update test

---
 cui/source/options/optimprove.src | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cui/source/options/optimprove.src b/cui/source/options/optimprove.src
index 145cafab4..09252b2ad 100644
--- a/cui/source/options/optimprove.src
+++ b/cui/source/options/optimprove.src
@@ -34,7 +34,7 @@
 
 TabPage RID_SVXPAGE_IMPROVEMENT
 {
-    //!HelpId = HID_OPTIONS_IMPROVEMENT ;
+        HelpId = "cui:TabPage:RID_SVXPAGE_IMPROVEMENT" ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Hide = TRUE ;
-- 
cgit v1.2.3


From 1e3866800db873be1ac20ffd89ed45613f39a608 Mon Sep 17 00:00:00 2001
From: Mathias Bauer 
Date: Thu, 14 Oct 2010 13:11:09 +0200
Subject: CWS changhid: some missing HIDs

---
 basctl/source/basicide/brkdlg.src   | 2 +-
 basctl/source/basicide/macrodlg.src | 2 +-
 basctl/source/basicide/moduldlg.src | 6 +++---
 basctl/source/basicide/moptions.src | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/basctl/source/basicide/brkdlg.src b/basctl/source/basicide/brkdlg.src
index 7029ff39c..8471e8052 100644
--- a/basctl/source/basicide/brkdlg.src
+++ b/basctl/source/basicide/brkdlg.src
@@ -29,7 +29,7 @@
 #include 
 ModalDialog RID_BASICIDE_BREAKPOINTDLG
 {
-     //	HelpId = HID_BASICIDE_BRKPNTS ;
+    HelpId = "basctl:RID_BASICIDE_BREAKPOINTDLG" ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 178 , 116 ) ;
diff --git a/basctl/source/basicide/macrodlg.src b/basctl/source/basicide/macrodlg.src
index 32705d55e..7792d8f7e 100644
--- a/basctl/source/basicide/macrodlg.src
+++ b/basctl/source/basicide/macrodlg.src
@@ -31,7 +31,7 @@
 #include 
 ModalDialog RID_MACROCHOOSER
 {
-     //	HelpId = SID_BASICCHOOSER ;
+    HelpId = "basctl:ModalDialog:RID_MACROCHOOSER" ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 287 , 165 ) ;
diff --git a/basctl/source/basicide/moduldlg.src b/basctl/source/basicide/moduldlg.src
index 3223bee2c..50661430f 100644
--- a/basctl/source/basicide/moduldlg.src
+++ b/basctl/source/basicide/moduldlg.src
@@ -64,7 +64,7 @@ TabDialog RID_TD_ORGANIZE
 };
 TabPage RID_TP_MODULS
 {
-     //	HelpId = HID_BASICIDE_MODULS ;
+    HelpId = "basctl:TabPage:RID_TP_MODULS" ;
     Hide = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 210 , 140 ) ;
@@ -188,7 +188,7 @@ TabPage RID_TP_DLGS
 };
 TabPage RID_TP_LIBS
 {
-     //	HelpId = HID_BASICIDE_LIBS_TP ;
+    HelpId = "basctl:TabPage:RID_TP_LIBS" ;
     Hide = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 210 , 140 ) ;
@@ -284,7 +284,7 @@ TabPage RID_TP_LIBS
 };
 ModalDialog RID_DLG_LIBS
 {
-     //	HelpId = HID_BASICIDE_LIBS_DLG ;
+    HelpId = "basctl:ModalDialog:RID_DLG_LIBS" ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 168 , 132 ) ;
diff --git a/basctl/source/basicide/moptions.src b/basctl/source/basicide/moptions.src
index 22dfa7ce0..e300d4f73 100644
--- a/basctl/source/basicide/moptions.src
+++ b/basctl/source/basicide/moptions.src
@@ -29,7 +29,7 @@
 #include 
 ModalDialog RID_MACROOPTIONS
 {
-     //	HelpId = HID_MACRO_OPTIONS ;
+    HelpId = "basctl:ModalDialog:RID_MACROOPTIONS" ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 224 , 121 ) ;
-- 
cgit v1.2.3


From 78080f904850daaeefb836f7ebbc8aa14f1a2779 Mon Sep 17 00:00:00 2001
From: Mathias Bauer 
Date: Thu, 14 Oct 2010 18:00:38 +0200
Subject: CWS changehid: missing HID

---
 cui/source/customize/macropg.src | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cui/source/customize/macropg.src b/cui/source/customize/macropg.src
index 2baa834bf..ab891445a 100644
--- a/cui/source/customize/macropg.src
+++ b/cui/source/customize/macropg.src
@@ -36,7 +36,7 @@
 
 TabPage RID_SVXPAGE_MACROASSIGN
 {
-     //	HelpID = HID_MACROASSIGN ;
+    HelpID = "cui:TabPage:RID_SVXPAGE_MACROASSIGN" ;
     Hide = TRUE ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
-- 
cgit v1.2.3


From d93aeb0f5168ab0bccf8deb80989e2fb39233b64 Mon Sep 17 00:00:00 2001
From: Mathias Bauer 
Date: Fri, 15 Oct 2010 14:35:13 +0200
Subject: CWS changehid: some missing HIDs

---
 cui/source/options/connpooloptions.src | 1 -
 cui/source/options/dbregister.src      | 2 +-
 cui/source/options/optfltr.src         | 2 --
 cui/source/options/opthtml.src         | 1 -
 cui/source/tabpages/autocdlg.src       | 3 ++-
 5 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/cui/source/options/connpooloptions.src b/cui/source/options/connpooloptions.src
index 406ec76b8..64aa376a7 100644
--- a/cui/source/options/connpooloptions.src
+++ b/cui/source/options/connpooloptions.src
@@ -36,7 +36,6 @@
 TabPage RID_OFAPAGE_CONNPOOLOPTIONS
 {
     HelpID = "cui:TabPage:RID_OFAPAGE_CONNPOOLOPTIONS";
-     //	HelpId = ;
     OutputSize = TRUE ;
     Size = MAP_APPFONT ( PAGE_SIZE_X, PAGE_SIZE_Y ) ;
     SVLook = TRUE ;
diff --git a/cui/source/options/dbregister.src b/cui/source/options/dbregister.src
index 234bd245a..88cd8e4df 100644
--- a/cui/source/options/dbregister.src
+++ b/cui/source/options/dbregister.src
@@ -34,7 +34,7 @@
 #define STD_MASKCOLOR Color { Red=0xffff; Green=0x0000; Blue=0xffff; }
 TabPage RID_SFXPAGE_DBREGISTER
 {
-    // HelpId = HID_OPTIONS_DBREGISTER ;
+    HelpId = "cui:TabPage:RID_SFXPAGE_DBREGISTER" ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Hide = TRUE ;
diff --git a/cui/source/options/optfltr.src b/cui/source/options/optfltr.src
index 7826ed01c..28b0e8214 100644
--- a/cui/source/options/optfltr.src
+++ b/cui/source/options/optfltr.src
@@ -33,7 +33,6 @@
 TabPage RID_OFAPAGE_MSFILTEROPT
 {
     HelpID = "cui:TabPage:RID_OFAPAGE_MSFILTEROPT";
-     //	HelpId = ;
     OutputSize = TRUE ;
     Size = MAP_APPFONT ( 260 , 185 ) ;
     SVLook = TRUE ;
@@ -121,7 +120,6 @@ TabPage RID_OFAPAGE_MSFILTEROPT
 TabPage RID_OFAPAGE_MSFILTEROPT2
 {
     HelpID = "cui:TabPage:RID_OFAPAGE_MSFILTEROPT2";
-     //	HelpId = ;
     OutputSize = TRUE ;
     Size = MAP_APPFONT ( 260 , 185 ) ;
     SVLook = TRUE ;
diff --git a/cui/source/options/opthtml.src b/cui/source/options/opthtml.src
index de629f6a7..06fd5d6c9 100644
--- a/cui/source/options/opthtml.src
+++ b/cui/source/options/opthtml.src
@@ -33,7 +33,6 @@
 TabPage RID_OFAPAGE_HTMLOPT
 {
     HelpID = "cui:TabPage:RID_OFAPAGE_HTMLOPT";
-     //	HelpId = ;
     OutputSize = TRUE ;
     Size = MAP_APPFONT ( 260 , 185 ) ;
     SVLook = TRUE ;
diff --git a/cui/source/tabpages/autocdlg.src b/cui/source/tabpages/autocdlg.src
index e0b288257..cc321322f 100644
--- a/cui/source/tabpages/autocdlg.src
+++ b/cui/source/tabpages/autocdlg.src
@@ -526,8 +526,9 @@ TabPage RID_OFAPAGE_AUTOCORR_QUOTE
         Size = MAP_APPFONT ( 122 , 8 ) ;
         Text [ en-US ] = "Single quotes" ;
     };
-    Checkbox CB_SGL_TYPO
+    CheckBox CB_SGL_TYPO
     {
+            HelpId = "cui:CheckBox:RID_OFAPAGE_AUTOCORR_QUOTE:CB_SGL_TYPO";	
         Pos = MAP_APPFONT ( 7 , 101 ) ;
         Size = MAP_APPFONT ( 86 , 10 ) ;
         Text [ en-US ] = "Repla~ce" ;
-- 
cgit v1.2.3


From d2d9d73945a29ded1e8bec448ec88930787ca1d5 Mon Sep 17 00:00:00 2001
From: Ingo Schmidt 
Date: Tue, 19 Oct 2010 17:42:55 +0200
Subject: native334 #163388# no more change of DS_Store file

---
 .../scripts/osx_install_languagepack.applescript    |   2 +-
 setup_native/scripts/osx_install_patch.applescript  |   2 +-
 setup_native/source/mac/Info.plist.langpack         |   6 +++---
 setup_native/source/mac/broffice/DS_Store           | Bin 12292 -> 12292 bytes
 setup_native/source/mac/ooo/DS_Store                | Bin 12292 -> 12292 bytes
 setup_native/source/mac/ooo/DS_Store_Langpack       | Bin 12292 -> 12292 bytes
 6 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/setup_native/scripts/osx_install_languagepack.applescript b/setup_native/scripts/osx_install_languagepack.applescript
index 33d376ade..9fb4bdacb 100644
--- a/setup_native/scripts/osx_install_languagepack.applescript
+++ b/setup_native/scripts/osx_install_languagepack.applescript
@@ -45,7 +45,7 @@ if (button returned of result) is AbortLabel then
 	return 2
 end if
 
-set the found_ooos to (do shell script "mdfind \"kMDItemContentType == 'com.apple.application-bundle' && kMDItemDisplayName == '[PRODUCTNAME]*' && kMDItemDisplayName != '[FULLPRODUCTNAME].app'\"") & "
+set the found_ooos to (do shell script "mdfind \"kMDItemContentType == 'com.apple.application-bundle' && kMDItemDisplayName == '[PRODUCTNAME]*' && kMDItemDisplayName != '[FULLAPPPRODUCTNAME].app'\"") & "
 " & chooseMyOwn
 
 -- the choice returned is of type "list"
diff --git a/setup_native/scripts/osx_install_patch.applescript b/setup_native/scripts/osx_install_patch.applescript
index 33a9d4126..e9dbd442d 100644
--- a/setup_native/scripts/osx_install_patch.applescript
+++ b/setup_native/scripts/osx_install_patch.applescript
@@ -43,7 +43,7 @@ if (button returned of result) is AbortLabel then
 	return 2
 end if
 
-set the found_ooos to (do shell script "mdfind \"kMDItemContentType == 'com.apple.application-bundle' && kMDItemDisplayName == '[PRODUCTNAME]*' && kMDItemDisplayName != '[FULLPRODUCTNAME].app'\"") & "
+set the found_ooos to (do shell script "mdfind \"kMDItemContentType == 'com.apple.application-bundle' && kMDItemDisplayName == '[PRODUCTNAME]*' && kMDItemDisplayName != '[FULLAPPPRODUCTNAME].app'\"") & "
 " & chooseMyOwn
 
 -- the choice returned is of type "list"
diff --git a/setup_native/source/mac/Info.plist.langpack b/setup_native/source/mac/Info.plist.langpack
index 3c1eb2c6f..38fc794aa 100644
--- a/setup_native/source/mac/Info.plist.langpack
+++ b/setup_native/source/mac/Info.plist.langpack
@@ -10,9 +10,9 @@
 	UTImportedTypeDeclarations
 	
 	CFBundleExecutable
-	[FULLPRODUCTNAME]
+	[FULLAPPPRODUCTNAME]
 	CFBundleGetInfoString
-	[FULLPRODUCTNAME]
+	[FULLAPPPRODUCTNAME]
 	CFBundleIconFile
 	ooo3_installer.icns
 	CFBundleShortVersionString
@@ -22,7 +22,7 @@
 	CFBundleInfoDictionaryVersion
 	6.0
 	CFBundleName
-	[FULLPRODUCTNAME]
+	[FULLAPPPRODUCTNAME]
 	CFBundlePackageType
 	APPL
 	CFBundleSignature
diff --git a/setup_native/source/mac/broffice/DS_Store b/setup_native/source/mac/broffice/DS_Store
index b0407ef50..a534e3bed 100644
Binary files a/setup_native/source/mac/broffice/DS_Store and b/setup_native/source/mac/broffice/DS_Store differ
diff --git a/setup_native/source/mac/ooo/DS_Store b/setup_native/source/mac/ooo/DS_Store
index e722b546e..dae0af0a4 100644
Binary files a/setup_native/source/mac/ooo/DS_Store and b/setup_native/source/mac/ooo/DS_Store differ
diff --git a/setup_native/source/mac/ooo/DS_Store_Langpack b/setup_native/source/mac/ooo/DS_Store_Langpack
index 3a8ad71a5..21b08ffb1 100644
Binary files a/setup_native/source/mac/ooo/DS_Store_Langpack and b/setup_native/source/mac/ooo/DS_Store_Langpack differ
-- 
cgit v1.2.3


From cb48d81421b9d63dc0dd7d92534d6a6d74ca258e Mon Sep 17 00:00:00 2001
From: Ingo Schmidt 
Date: Tue, 19 Oct 2010 17:49:20 +0200
Subject: native334 #i113163# trivial fix

---
 setup_native/scripts/admin.pl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setup_native/scripts/admin.pl b/setup_native/scripts/admin.pl
index 466182b24..d90c76650 100644
--- a/setup_native/scripts/admin.pl
+++ b/setup_native/scripts/admin.pl
@@ -66,7 +66,6 @@ sub usage
 {
     print <
Date: Thu, 21 Oct 2010 09:25:04 +0200
Subject: sb132: #i115169# missing dependency extensions -> curl

---
 extensions/prj/build.lst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/prj/build.lst b/extensions/prj/build.lst
index 1489e2a4e..757116b79 100644
--- a/extensions/prj/build.lst
+++ b/extensions/prj/build.lst
@@ -1,4 +1,4 @@
-ex  extensions :  officecfg  l10n rdbmaker svx SANE:sane TWAIN:twain np_sdk offuh stoc ZLIB:zlib NULL
+ex  extensions :  officecfg  l10n rdbmaker svx SANE:sane TWAIN:twain np_sdk offuh stoc ZLIB:zlib CURL:curl NULL
 
 ex  extensions                                  usr1    -   all ex_mkout NULL
 ex  extensions\inc                              nmake   -   all ex_inc NULL
-- 
cgit v1.2.3


From 9ed7a6db6192e06cc0faff45285ad29b7a22a943 Mon Sep 17 00:00:00 2001
From: sb 
Date: Fri, 22 Oct 2010 10:37:46 +0200
Subject: sb131: #i115124# $(XSLTPROC) implies LIBXSLT:libxslt

---
 UnoControls/prj/build.lst    | 2 +-
 accessibility/prj/build.lst  | 2 +-
 basctl/prj/build.lst         | 2 +-
 embedserv/prj/build.lst      | 2 +-
 extensions/prj/build.lst     | 2 +-
 forms/prj/build.lst          | 2 +-
 lingucomponent/prj/build.lst | 2 +-
 package/prj/build.lst        | 2 +-
 wizards/prj/build.lst        | 2 +-
 xmlsecurity/prj/build.lst    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/UnoControls/prj/build.lst b/UnoControls/prj/build.lst
index de5d7fd81..775cb902f 100644
--- a/UnoControls/prj/build.lst
+++ b/UnoControls/prj/build.lst
@@ -1,4 +1,4 @@
-us	UnoControls	:	cppuhelper offuh tools NULL
+us	UnoControls	: LIBXSLT:libxslt cppuhelper offuh tools NULL
 us	UnoControls								usr1	-	all	us_mkout NULL
 us	UnoControls\source\base					nmake	-	all	us_base NULL
 us	UnoControls\source\controls				nmake	-	all	us_ctrls NULL
diff --git a/accessibility/prj/build.lst b/accessibility/prj/build.lst
index f410ece56..4fbfe1351 100755
--- a/accessibility/prj/build.lst
+++ b/accessibility/prj/build.lst
@@ -1,4 +1,4 @@
-ac  accessibility	:    l10n tools jurt offuh unoil vcl javaunohelper jvmaccess cppu sal toolkit svtools NULL
+ac  accessibility	:    l10n tools jurt offuh unoil vcl javaunohelper jvmaccess cppu sal toolkit svtools LIBXSLT:libxslt NULL
 ac	accessibility                                         	usr1	-	all	ac_mkout NULL
 ac	accessibility\inc                                      	nmake	-	all	ac_inc NULL
 ac	accessibility\bridge\org\openoffice\java\accessibility	nmake	-	w	ac_ooja ac_inc NULL
diff --git a/basctl/prj/build.lst b/basctl/prj/build.lst
index a48a698a9..0c5283ff0 100644
--- a/basctl/prj/build.lst
+++ b/basctl/prj/build.lst
@@ -1,4 +1,4 @@
-bc	basctl	: l10n svx NULL
+bc	basctl	: LIBXSLT:libxslt l10n svx NULL
 bc	basctl									usr1	-	all	bc_mkout NULL
 bc	basctl\inc								nmake	-	all	bc_inc NULL
 bc	basctl\source\inc						get		-	all	bc_sinc NULL
diff --git a/embedserv/prj/build.lst b/embedserv/prj/build.lst
index 73e2b81de..189479e4b 100755
--- a/embedserv/prj/build.lst
+++ b/embedserv/prj/build.lst
@@ -1,4 +1,4 @@
-es	embedserv	:	offuh sal cppu cppuhelper comphelper NULL
+es	embedserv	:	offuh sal cppu cppuhelper comphelper LIBXSLT:libxslt NULL
 es	embedserv								usr1	-	w	es_mkout NULL
 es	embedserv\source\embed					nmake	-	w	es_embed NULL
 es	embedserv\source\inprocserv				nmake	-	w	es_inproc NULL
diff --git a/extensions/prj/build.lst b/extensions/prj/build.lst
index e6a4e02a8..f824b0d99 100644
--- a/extensions/prj/build.lst
+++ b/extensions/prj/build.lst
@@ -1,4 +1,4 @@
-ex  extensions :  officecfg  l10n rdbmaker svx SANE:sane TWAIN:twain np_sdk offuh stoc ZLIB:zlib NULL
+ex  extensions :  officecfg  l10n rdbmaker svx SANE:sane TWAIN:twain np_sdk offuh stoc ZLIB:zlib LIBXSLT:libxslt NULL
 
 ex  extensions                                  usr1    -   all ex_mkout NULL
 ex  extensions\inc                              nmake   -   all ex_inc NULL
diff --git a/forms/prj/build.lst b/forms/prj/build.lst
index 2d7c5f49c..115c035ed 100644
--- a/forms/prj/build.lst
+++ b/forms/prj/build.lst
@@ -1,4 +1,4 @@
-fm	forms	:    l10n oovbaapi svx sfx2 qadevOOo NULL
+fm	forms	:    l10n oovbaapi svx sfx2 qadevOOo LIBXSLT:libxslt NULL
 fm  forms                                   usr1    -   all fm_mkofrm NULL
 fm	forms\inc								nmake	-	all	fm_inc NULL
 fm	forms\source\inc						get		-	all	fm_sinc NULL
diff --git a/lingucomponent/prj/build.lst b/lingucomponent/prj/build.lst
index 15ee595c6..23137e620 100644
--- a/lingucomponent/prj/build.lst
+++ b/lingucomponent/prj/build.lst
@@ -1,4 +1,4 @@
-lc  lingucomponent  :      linguistic LIBTEXTCAT:libtextcat LIBTEXTCATDATA:libtextcat svl HYPHEN:hyphen HUNSPELL:hunspell MYTHES:mythes NULL
+lc  lingucomponent  :      linguistic LIBTEXTCAT:libtextcat LIBTEXTCATDATA:libtextcat svl HYPHEN:hyphen HUNSPELL:hunspell MYTHES:mythes LIBXSLT:libxslt NULL
 lc	lingucomponent								usr1	-	all	lc_mkout NULL
 lc  lingucomponent\inc                                      nmake   -   all lc_inc NULL
 lc  lingucomponent\source\lingutil                          nmake   -   all lc_util lc_inc NULL
diff --git a/package/prj/build.lst b/package/prj/build.lst
index 0b5082717..6afa43455 100644
--- a/package/prj/build.lst
+++ b/package/prj/build.lst
@@ -1,4 +1,4 @@
-pk	package	:	cppu cppuhelper comphelper ucbhelper sal ZLIB:zlib NULL
+pk	package	:	cppu cppuhelper comphelper ucbhelper sal ZLIB:zlib LIBXSLT:libxslt NULL
 pk	package									usr1	-	all	pk_mkout NULL
 pk	package\inc								nmake	-	all	pk_inc NULL
 pk	package\source\zipapi					nmake	-	all	pk_zipapi pk_inc NULL
diff --git a/wizards/prj/build.lst b/wizards/prj/build.lst
index c4d635a92..ca4e940d3 100644
--- a/wizards/prj/build.lst
+++ b/wizards/prj/build.lst
@@ -1,4 +1,4 @@
-wz      wizards     :    l10n rsc javaunohelper unoil NULL
+wz      wizards     :    l10n rsc javaunohelper unoil LIBXSLT:libxslt NULL
 wz      wizards\util                                            nmake           -       all     wz_util NULL
 wz      wizards\source\config                                   nmake           -       all     wz_config NULL
 wz      wizards\source\configshare                              nmake           -       all     wz_configshare NULL
diff --git a/xmlsecurity/prj/build.lst b/xmlsecurity/prj/build.lst
index cd438326b..3d70b9cb1 100644
--- a/xmlsecurity/prj/build.lst
+++ b/xmlsecurity/prj/build.lst
@@ -1,4 +1,4 @@
-xs	xmlsecurity	:    l10n xmloff unotools offapi unoil svx MOZ:moz SO:moz_prebuilt LIBXMLSEC:libxmlsec NSS:nss NULL
+xs	xmlsecurity	:    l10n xmloff unotools offapi unoil svx MOZ:moz SO:moz_prebuilt LIBXMLSEC:libxmlsec NSS:nss LIBXSLT:libxslt NULL
 xs	xmlsecurity                                                        usr1	 -	all	xs_mkout	NULL
 xs	xmlsecurity\inc				                                       nmake -	all	xs_inc NULL
 xs	xmlsecurity\source\framework                                       nmake -	all	xs_fw xs_inc NULL
-- 
cgit v1.2.3


From 302d8ffdad94a17061c8bae95b357ff1f3f0778c Mon Sep 17 00:00:00 2001
From: Dirk Voelzke 
Date: Thu, 28 Oct 2010 11:15:18 +0200
Subject: #dv22#i115288# Allow user to ignore updates for an extension

---
 extensions/source/update/check/Jobs.xcu            |   0
 extensions/source/update/check/download.cxx        |   0
 .../source/update/check/updatecheckconfig.cxx      | 103 +++++++++++++++------
 .../source/update/check/updatecheckconfig.hxx      |  10 +-
 extensions/source/update/check/updateprotocol.cxx  |  10 +-
 5 files changed, 88 insertions(+), 35 deletions(-)
 mode change 100644 => 100755 extensions/source/update/check/Jobs.xcu
 mode change 100755 => 100644 extensions/source/update/check/download.cxx
 mode change 100644 => 100755 extensions/source/update/check/updatecheckconfig.hxx
 mode change 100644 => 100755 extensions/source/update/check/updateprotocol.cxx

diff --git a/extensions/source/update/check/Jobs.xcu b/extensions/source/update/check/Jobs.xcu
old mode 100644
new mode 100755
diff --git a/extensions/source/update/check/download.cxx b/extensions/source/update/check/download.cxx
old mode 100755
new mode 100644
diff --git a/extensions/source/update/check/updatecheckconfig.cxx b/extensions/source/update/check/updatecheckconfig.cxx
index 987e5fce6..163d46576 100755
--- a/extensions/source/update/check/updatecheckconfig.cxx
+++ b/extensions/source/update/check/updatecheckconfig.cxx
@@ -32,10 +32,8 @@
 #include "updatecheckconfig.hxx"
 #include 
 #include 
-
-#ifndef _COM_SUN_STAR_CONTAINER_CHANGESEVENT_HPP_
-#include 
-#endif
+#include 
+#include 
 
 #include 
 #include 
@@ -78,6 +76,8 @@ namespace uno = com::sun::star::uno ;
 #define RELEASE_NOTE            "ReleaseNote"
 #define EXTENSION_PREFIX        "Extension_"
 
+#define PROPERTY_VERSION        UNISTRING("Version")
+
 static const sal_Char * const aUpdateEntryProperties[] = { 
     UPDATE_VERSION, 
     UPDATE_BUILDID, 
@@ -246,19 +246,19 @@ rtl::OUString UpdateCheckConfig::getAllUsersDirectory()
 }
 
 //------------------------------------------------------------------------------
-
-UpdateCheckConfig::UpdateCheckConfig(
-    const uno::Reference& xContainer,
-    const ::rtl::Reference< UpdateCheckConfigListener >& rListener
-) : m_xContainer(xContainer), m_rListener(rListener)
-{
-}
+UpdateCheckConfig::UpdateCheckConfig( const uno::Reference& xContainer,
+                                      const uno::Reference& xAvailableUpdates,
+                                      const uno::Reference& xIgnoredUpdates,
+                                      const ::rtl::Reference< UpdateCheckConfigListener >& rListener ) :
+    m_xContainer( xContainer ),
+    m_xAvailableUpdates( xAvailableUpdates ),
+    m_xIgnoredUpdates( xIgnoredUpdates ),
+    m_rListener( rListener )
+{}
 
 //------------------------------------------------------------------------------
-
 UpdateCheckConfig::~UpdateCheckConfig()
-{
-}
+{}
 
 //------------------------------------------------------------------------------
 
@@ -295,7 +295,15 @@ UpdateCheckConfig::get(
             UNISTRING("com.sun.star.configuration.ConfigurationUpdateAccess"), aArgumentList ),
         uno::UNO_QUERY_THROW );
     
-    return new UpdateCheckConfig( xContainer, rListener );
+    aProperty.Value = uno::makeAny( UNISTRING("/org.openoffice.Office.ExtensionManager/ExtensionUpdateData/IgnoredUpdates") );
+    aArgumentList[0] = uno::makeAny( aProperty );
+    uno::Reference< container::XNameContainer > xIgnoredExt( xConfigProvider->createInstanceWithArguments( UNISTRING("com.sun.star.configuration.ConfigurationUpdateAccess"), aArgumentList ), uno::UNO_QUERY_THROW );
+
+    aProperty.Value = uno::makeAny( UNISTRING("/org.openoffice.Office.ExtensionManager/ExtensionUpdateData/AvailableUpdates") );
+    aArgumentList[0] = uno::makeAny( aProperty );
+    uno::Reference< container::XNameContainer > xUpdateAvail( xConfigProvider->createInstanceWithArguments( UNISTRING("com.sun.star.configuration.ConfigurationUpdateAccess"), aArgumentList ), uno::UNO_QUERY_THROW );
+
+    return new UpdateCheckConfig( xContainer, xUpdateAvail, xIgnoredExt, rListener );
 }
 
 //------------------------------------------------------------------------------
@@ -627,6 +635,19 @@ UpdateCheckConfig::commitChanges()
             }
         }
     }
+
+    xChangesBatch = uno::Reference< util::XChangesBatch > ( m_xAvailableUpdates, uno::UNO_QUERY );
+    if( xChangesBatch.is() && xChangesBatch->hasPendingChanges() )
+    {
+        util::ChangesSet aChangesSet = xChangesBatch->getPendingChanges();
+        xChangesBatch->commitChanges();
+    }
+    xChangesBatch = uno::Reference< util::XChangesBatch > ( m_xIgnoredUpdates, uno::UNO_QUERY );
+    if( xChangesBatch.is() && xChangesBatch->hasPendingChanges() )
+    {
+        util::ChangesSet aChangesSet = xChangesBatch->getPendingChanges();
+        xChangesBatch->commitChanges();
+    }
 }
 
 //------------------------------------------------------------------------------
@@ -654,40 +675,66 @@ UpdateCheckConfig::getPendingChanges(  ) throw (uno::RuntimeException)
 }
 
 //------------------------------------------------------------------------------
-void UpdateCheckConfig::storeExtensionVersion( const rtl::OUString& rExtensionName,
+bool UpdateCheckConfig::storeExtensionVersion( const rtl::OUString& rExtensionName,
                                                const rtl::OUString& rVersion )
 {
-    const rtl::OUString aExtName = UNISTRING( EXTENSION_PREFIX ) + rExtensionName;
-    const uno::Any aValue = uno::makeAny( rVersion );
-    
-    if( m_xContainer->hasByName( aExtName ) )
-        m_xContainer->replaceByName( aExtName, aValue );
+    bool bNotify = true;
+
+    if ( m_xAvailableUpdates->hasByName( rExtensionName ) )
+        uno::Reference< beans::XPropertySet >( m_xAvailableUpdates->getByName( rExtensionName ), uno::UNO_QUERY_THROW )->setPropertyValue( PROPERTY_VERSION, uno::Any( rVersion ) );
     else
-        m_xContainer->insertByName( aExtName, aValue );
+    {
+        uno::Reference< beans::XPropertySet > elem( uno::Reference< lang::XSingleServiceFactory >( m_xAvailableUpdates, uno::UNO_QUERY_THROW )->createInstance(), uno::UNO_QUERY_THROW );
+        elem->setPropertyValue( PROPERTY_VERSION, uno::Any( rVersion ) );
+        m_xAvailableUpdates->insertByName( rExtensionName, uno::Any( elem ) );
+    }
+
+    if ( m_xIgnoredUpdates->hasByName( rExtensionName ) )
+    {
+        ::rtl::OUString aIgnoredVersion;
+        uno::Any aValue( uno::Reference< beans::XPropertySet >( m_xIgnoredUpdates->getByName( rExtensionName ), uno::UNO_QUERY_THROW )->getPropertyValue( PROPERTY_VERSION ) );
+        aValue >>= aIgnoredVersion;
+        if ( aIgnoredVersion.getLength() == 0 ) // no version means ignore all updates
+            bNotify = false;
+        else if ( aIgnoredVersion == rVersion ) // the user wanted to ignore this update
+            bNotify = false;
+    }
 
     commitChanges();
+
+    return bNotify;
 }
 
 //------------------------------------------------------------------------------
 bool UpdateCheckConfig::checkExtensionVersion( const rtl::OUString& rExtensionName,
                                                const rtl::OUString& rVersion )
 {
-    const rtl::OUString aExtName = UNISTRING( EXTENSION_PREFIX ) + rExtensionName;
-
-    if( m_xContainer->hasByName( aExtName ) )
+    if ( m_xAvailableUpdates->hasByName( rExtensionName ) )
     {
-        uno::Any aValue = m_xContainer->getByName( aExtName );
-        rtl::OUString aStoredVersion;
+        ::rtl::OUString aStoredVersion;
+        uno::Any aValue( uno::Reference< beans::XPropertySet >( m_xAvailableUpdates->getByName( rExtensionName ), uno::UNO_QUERY_THROW )->getPropertyValue( PROPERTY_VERSION ) );
         aValue >>= aStoredVersion;
 
+        if ( m_xIgnoredUpdates->hasByName( rExtensionName ) )
+        {
+            ::rtl::OUString aIgnoredVersion;
+            uno::Any aValue2( uno::Reference< beans::XPropertySet >( m_xIgnoredUpdates->getByName( rExtensionName ), uno::UNO_QUERY_THROW )->getPropertyValue( PROPERTY_VERSION ) );
+            aValue2 >>= aIgnoredVersion;
+            if ( aIgnoredVersion.getLength() == 0 ) // no version means ignore all updates
+                return false;
+            else if ( aIgnoredVersion == aStoredVersion ) // the user wanted to ignore this update
+                return false;
+            // TODO: else delete ignored entry?
+        }
         if ( isVersionGreater( rVersion, aStoredVersion ) )
             return true;
         else
         {
-            m_xContainer->removeByName( aExtName );
+            m_xAvailableUpdates->removeByName( rExtensionName );
             commitChanges();
         }
     }
+
     return false;
 }
 
diff --git a/extensions/source/update/check/updatecheckconfig.hxx b/extensions/source/update/check/updatecheckconfig.hxx
old mode 100644
new mode 100755
index 1cf320711..7169ad44c
--- a/extensions/source/update/check/updatecheckconfig.hxx
+++ b/extensions/source/update/check/updatecheckconfig.hxx
@@ -93,8 +93,10 @@ class UpdateCheckConfig : public ::cppu::WeakImplHelper3<
     ::com::sun::star::util::XChangesBatch,
     ::com::sun::star::lang::XServiceInfo >
 {
-    UpdateCheckConfig(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xContainer,
-                      const ::rtl::Reference< UpdateCheckConfigListener >& rListener );
+    UpdateCheckConfig( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xContainer,
+                       const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xAvailableUpdates,
+                       const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xIgnoredUpdates,
+                       const ::rtl::Reference< UpdateCheckConfigListener >& rListener );
     
     virtual ~UpdateCheckConfig();
 
@@ -154,7 +156,7 @@ public:
     static rtl::OUString getAllUsersDirectory();
 
     // store and retrieve information about extensions
-    void storeExtensionVersion( const rtl::OUString& rExtensionName,
+    bool storeExtensionVersion( const rtl::OUString& rExtensionName,
                                 const rtl::OUString& rVersion );
     bool checkExtensionVersion( const rtl::OUString& rExtensionName,
                                 const rtl::OUString& rVersion );
@@ -205,6 +207,8 @@ private:
     static bool isVersionGreater( const rtl::OUString& rVersion1, const rtl::OUString& rVersion2 );
     
     const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xContainer;
+    const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xAvailableUpdates;
+    const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xIgnoredUpdates;
     const ::rtl::Reference< UpdateCheckConfigListener > m_rListener;
 };
 
diff --git a/extensions/source/update/check/updateprotocol.cxx b/extensions/source/update/check/updateprotocol.cxx
old mode 100644
new mode 100755
index 83d982986..98d17e520
--- a/extensions/source/update/check/updateprotocol.cxx
+++ b/extensions/source/update/check/updateprotocol.cxx
@@ -255,16 +255,18 @@ checkForUpdates(
 bool storeExtensionUpdateInfos( const uno::Reference< uno::XComponentContext > & rxContext,
                                 const uno::Sequence< uno::Sequence< rtl::OUString > > &rUpdateInfos )
 {
+    bool bNotify = false;
+
     if ( rUpdateInfos.hasElements() )
     {
         rtl::Reference< UpdateCheckConfig > aConfig = UpdateCheckConfig::get( rxContext );
 
         for ( sal_Int32 i = rUpdateInfos.getLength() - 1; i >= 0; i-- )
         {
-            aConfig->storeExtensionVersion( rUpdateInfos[i][0], rUpdateInfos[i][1] );
+            bNotify |= aConfig->storeExtensionVersion( rUpdateInfos[i][0], rUpdateInfos[i][1] );
         }
     }
-    return rUpdateInfos.hasElements();
+    return bNotify;
 }
 
 //------------------------------------------------------------------------------
@@ -289,9 +291,9 @@ bool checkForExtensionUpdates( const uno::Reference< uno::XComponentContext > &
     if ( !xInfoProvider.is() ) return false;
 
     aUpdateList = xInfoProvider->isUpdateAvailable( ::rtl::OUString() );
-    storeExtensionUpdateInfos( rxContext, aUpdateList );
+    bool bNotify = storeExtensionUpdateInfos( rxContext, aUpdateList );
 
-    return aUpdateList.hasElements();
+    return bNotify;
 }
 
 //------------------------------------------------------------------------------
-- 
cgit v1.2.3


From 8b9029ef63d38621eee7bafae0070a39e486164a Mon Sep 17 00:00:00 2001
From: Mathias Bauer 
Date: Fri, 29 Oct 2010 15:36:30 +0200
Subject: CWS gnumake2: resolve conflicts and make sources buildable on Linux

---
 basctl/source/basicide/basidesh.cxx | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index 0dbe2c4e0..71d158503 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -155,18 +155,12 @@ public:
 
 TYPEINIT1( BasicIDEShell, SfxViewShell );
 
-<<<<<<< local
-SFX_IMPL_VIEWFACTORY( BasicIDEShell )
-=======
 SFX_IMPL_NAMED_VIEWFACTORY( BasicIDEShell, "Default" )
->>>>>>> other
 {
     SFX_VIEW_REGISTRATION( BasicDocShell );
 }
 
 
-// MI: Prinzipiel IDL, aber ich lieber doch nicht?
-// SFX_IMPL_ /*IDL_*/ INTERFACE( BasicIDEShell, SfxViewShell, IDEResId( RID_STR_IDENAME ) )
 SFX_IMPL_INTERFACE( BasicIDEShell, SfxViewShell, IDEResId( RID_STR_IDENAME ) )
 {
     SFX_CHILDWINDOW_REGISTRATION( SID_SEARCH_DLG );
-- 
cgit v1.2.3


From 7e2244e9a006b1d3df92c41206002061b87b811b Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" 
Date: Mon, 1 Nov 2010 13:32:13 +0100
Subject: dba34a: #i114403# when delivering our text (getText, plus
 notifications), and we're a filter list box created for a list box control,
 translate between display strings and values. (Filter list boxes (*not* combo
 boxes!) still messed up. This needs a follow-up issue.)

---
 forms/source/component/Filter.cxx | 34 +++++++++++++++++++++++++++++++++-
 forms/source/component/Filter.hxx |  5 ++++-
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx
index eff4ef144..49b0779dc 100644
--- a/forms/source/component/Filter.cxx
+++ b/forms/source/component/Filter.cxx
@@ -346,7 +346,19 @@ namespace frm
                 try
                 {
                     const Reference< XItemList > xItemList( getModel(), UNO_QUERY_THROW );
-                    const ::rtl::OUString sItemText( xItemList->getItemText( rEvent.Selected ) );
+                    ::rtl::OUString sItemText( xItemList->getItemText( rEvent.Selected ) );
+
+                    const MapString2String::const_iterator itemPos = m_aDisplayItemToValueItem.find( sItemText );
+                    if ( itemPos != m_aDisplayItemToValueItem.end() )
+                    {
+                        sItemText = itemPos->second;
+                        if ( sItemText.getLength() )
+                        {
+                            ::dbtools::OPredicateInputController aPredicateInput( m_aContext.getLegacyServiceFactory(), m_xConnection, getParseContext() );
+                            ::rtl::OUString sErrorMessage;
+                            OSL_VERIFY( aPredicateInput.normalizePredicateString( sItemText, m_xField, &sErrorMessage ) );
+                        }
+                    }
                     aText.append( sItemText );
                 }
                 catch( const Exception& )
@@ -620,6 +632,16 @@ namespace frm
                 {
                     m_aText = aText;
                     xListBox->selectItem(m_aText, sal_True);
+                    if ( xListBox->getSelectedItemPos() >= 0 )
+                    {
+                        const bool isQuoted =   ( aText.getLength() > 0 )
+                                            &&  ( aText[0] == '\'' )
+                                            &&  ( aText[aText.getLength() - 1] == '\'' );
+                        if ( isQuoted )
+                        {
+                            xListBox->selectItem( aText.copy( 1, aText.getLength() - 2 ), sal_True );
+                        }
+                    }
                 }
             } break;
             default:
@@ -810,6 +832,16 @@ namespace frm
                         case FormComponentType::LISTBOX:
                         case FormComponentType::COMBOBOX:
                             m_nControlClass = nClassId;
+                            if ( FormComponentType::LISTBOX == nClassId )
+                            {
+                                Sequence< ::rtl::OUString > aDisplayItems;
+                                OSL_VERIFY( xControlModel->getPropertyValue( PROPERTY_STRINGITEMLIST ) >>= aDisplayItems );
+                                Sequence< ::rtl::OUString > aValueItems;
+                                OSL_VERIFY( xControlModel->getPropertyValue( PROPERTY_VALUE_SEQ ) >>= aValueItems );
+                                OSL_ENSURE( aDisplayItems.getLength() == aValueItems.getLength(), "OFilterControl::initialize: inconsistent item lists!" );
+                                for ( sal_Int32 i=0; i < ::std::min( aDisplayItems.getLength(), aValueItems.getLength() ); ++i )
+                                    m_aDisplayItemToValueItem[ aDisplayItems[i] ] = aValueItems[i];
+                            }
                             break;
                         default:
                             m_bMultiLine = ::comphelper::hasProperty( PROPERTY_MULTILINE, xControlModel ) && ::comphelper::getBOOL( xControlModel->getPropertyValue( PROPERTY_MULTILINE ) );
diff --git a/forms/source/component/Filter.hxx b/forms/source/component/Filter.hxx
index b9b4b0064..01d06ebd4 100644
--- a/forms/source/component/Filter.hxx
+++ b/forms/source/component/Filter.hxx
@@ -45,7 +45,7 @@
 #include 
 #include 
 
-class Window;
+#include 
 
 //.........................................................................
 namespace frm
@@ -75,6 +75,9 @@ namespace frm
         ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > 			m_xMetaData;
         ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >						m_xMessageParent;
 
+        typedef ::std::hash_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash > MapString2String;
+        MapString2String                m_aDisplayItemToValueItem;
+
         ::rtl::OUString					m_aText;
         ::connectivity::OSQLParser		m_aParser;
         sal_Int16						m_nControlClass;		// which kind of control do we use?
-- 
cgit v1.2.3


From da3a723326c4e1dc88bda287e0c69422ea17139a Mon Sep 17 00:00:00 2001
From: Mikhail Voytenko 
Date: Thu, 4 Nov 2010 17:56:39 +0100
Subject: pl08: #163778# use EncryptionData from MediaDescriptor

---
 package/source/xstor/ohierarchyholder.cxx |  21 +-
 package/source/xstor/ohierarchyholder.hxx |  18 +-
 package/source/xstor/owriteablestream.cxx | 206 ++++++-----
 package/source/xstor/owriteablestream.hxx |  38 +-
 package/source/xstor/xstorage.cxx         | 594 +++++++++++++++++-------------
 package/source/xstor/xstorage.hxx         |  66 +++-
 package/source/zippackage/ZipPackage.cxx  |   2 +-
 7 files changed, 556 insertions(+), 389 deletions(-)

diff --git a/package/source/xstor/ohierarchyholder.cxx b/package/source/xstor/ohierarchyholder.cxx
index 4ade3b89e..2fc56ff93 100644
--- a/package/source/xstor/ohierarchyholder.cxx
+++ b/package/source/xstor/ohierarchyholder.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_package.hxx"
 #include 
 #include 
-#include 
+#include 
 #include 
 
 #include "ohierarchyholder.hxx"
@@ -41,7 +41,7 @@ using namespace ::com::sun::star;
 //===============================================
 
 //-----------------------------------------------
-uno::Reference< embed::XExtendedStorageStream > OHierarchyHolder_Impl::GetStreamHierarchically( sal_Int32 nStorageMode, OStringList_Impl& aListPath, sal_Int32 nStreamMode, const ::rtl::OUString& aPass )
+uno::Reference< embed::XExtendedStorageStream > OHierarchyHolder_Impl::GetStreamHierarchically( sal_Int32 nStorageMode, OStringList_Impl& aListPath, sal_Int32 nStreamMode, const ::comphelper::SequenceAsHashMap& aEncryptionData )
 {
     uno::Reference< embed::XStorage > xOwnStor( m_xWeakOwnStorage.get(), uno::UNO_QUERY_THROW );
 
@@ -49,7 +49,7 @@ uno::Reference< embed::XExtendedStorageStream > OHierarchyHolder_Impl::GetStream
         throw io::IOException();
 
     uno::Reference< embed::XExtendedStorageStream > xResult =
-        m_xChild->GetStreamHierarchically( nStorageMode, aListPath, nStreamMode, aPass );
+        m_xChild->GetStreamHierarchically( nStorageMode, aListPath, nStreamMode, aEncryptionData );
     if ( !xResult.is() )
         throw uno::RuntimeException();
 
@@ -88,7 +88,7 @@ OStringList_Impl OHierarchyHolder_Impl::GetListPathFromString( const ::rtl::OUSt
 //===============================================
 
 //-----------------------------------------------
-uno::Reference< embed::XExtendedStorageStream > OHierarchyElement_Impl::GetStreamHierarchically( sal_Int32 nStorageMode, OStringList_Impl& aListPath, sal_Int32 nStreamMode, const ::rtl::OUString& aPass )
+uno::Reference< embed::XExtendedStorageStream > OHierarchyElement_Impl::GetStreamHierarchically( sal_Int32 nStorageMode, OStringList_Impl& aListPath, sal_Int32 nStreamMode, const ::comphelper::SequenceAsHashMap& aEncryptionData )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -110,11 +110,16 @@ uno::Reference< embed::XExtendedStorageStream > OHierarchyElement_Impl::GetStrea
 
     if ( !aListPath.size() )
     {
-        uno::Reference< embed::XHierarchicalStorageAccess > xHStorage( xOwnStor, uno::UNO_QUERY_THROW );
-        if ( !aPass.getLength() )
+        if ( !aEncryptionData.size() )
+        {
+            uno::Reference< embed::XHierarchicalStorageAccess > xHStorage( xOwnStor, uno::UNO_QUERY_THROW );
             xResult = xHStorage->openStreamElementByHierarchicalName( aNextName, nStreamMode );
+        }
         else
-            xResult = xHStorage->openEncryptedStreamElementByHierarchicalName( aNextName, nStreamMode, aPass );
+        {
+            uno::Reference< embed::XHierarchicalStorageAccess2 > xHStorage( xOwnStor, uno::UNO_QUERY_THROW );
+            xResult = xHStorage->openEncryptedStreamByHierarchicalName( aNextName, nStreamMode, aEncryptionData.getAsConstNamedValueList() );
+        }
 
         uno::Reference< embed::XTransactedObject > xTransact( xResult, uno::UNO_QUERY );
         if ( xTransact.is() )
@@ -150,7 +155,7 @@ uno::Reference< embed::XExtendedStorageStream > OHierarchyElement_Impl::GetStrea
             aElement = new OHierarchyElement_Impl( NULL, xChildStorage );
         }
 
-        xResult = aElement->GetStreamHierarchically( nStorageMode, aListPath, nStreamMode, aPass );
+        xResult = aElement->GetStreamHierarchically( nStorageMode, aListPath, nStreamMode, aEncryptionData );
         if ( !xResult.is() )
             throw uno::RuntimeException();
 
diff --git a/package/source/xstor/ohierarchyholder.hxx b/package/source/xstor/ohierarchyholder.hxx
index 2adffe190..d5111e6a8 100644
--- a/package/source/xstor/ohierarchyholder.hxx
+++ b/package/source/xstor/ohierarchyholder.hxx
@@ -33,6 +33,8 @@
 #include 
 #include 
 
+#include 
+
 #include 
 
 #include 
@@ -90,10 +92,10 @@ public:
     void RemoveElement( const ::rtl::Reference< OHierarchyElement_Impl >& aRef );
 
     ::com::sun::star::uno::Reference< ::com::sun::star::embed::XExtendedStorageStream >
-                                        GetStreamHierarchically( sal_Int32 nStorageMode,
-                                                                OStringList_Impl& aPath,
-                                                                sal_Int32 nStreamMode,
-                                                                const ::rtl::OUString& aPassword = ::rtl::OUString() );
+        GetStreamHierarchically( sal_Int32 nStorageMode,
+                                OStringList_Impl& aPath,
+                                sal_Int32 nStreamMode,
+                                const ::comphelper::SequenceAsHashMap& aEncryptionData = ::comphelper::SequenceAsHashMap() );
 
     void RemoveStreamHierarchically( OStringList_Impl& aListPath );
 
@@ -127,10 +129,10 @@ public:
     static OStringList_Impl GetListPathFromString( const ::rtl::OUString& aPath );
 
     ::com::sun::star::uno::Reference< ::com::sun::star::embed::XExtendedStorageStream >
-                                        GetStreamHierarchically( sal_Int32 nStorageMode,
-                                                                OStringList_Impl& aListPath,
-                                                                sal_Int32 nStreamMode,
-                                                                const ::rtl::OUString& aPassword = ::rtl::OUString() );
+        GetStreamHierarchically( sal_Int32 nStorageMode,
+                                OStringList_Impl& aListPath,
+                                sal_Int32 nStreamMode,
+                                const ::comphelper::SequenceAsHashMap& aEncryptionData = ::comphelper::SequenceAsHashMap() );
 
     void RemoveStreamHierarchically( OStringList_Impl& aListPath );
 };
diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx
index e17ffeeac..5c29e0d1c 100644
--- a/package/source/xstor/owriteablestream.cxx
+++ b/package/source/xstor/owriteablestream.cxx
@@ -64,29 +64,25 @@ using namespace ::com::sun::star;
 namespace package
 {
 //-----------------------------------------------
-uno::Sequence< sal_Int8 > MakeKeyFromPass( const ::rtl::OUString& aPass, sal_Bool bUseUTF )
+bool PackageEncryptionDatasEqual( const ::comphelper::SequenceAsHashMap& aHash1, const ::comphelper::SequenceAsHashMap& aHash2 )
 {
-    // MS_1252 encoding was used for SO60 document format password encoding,
-    // this encoding supports only a minor subset of nonascii characters,
-    // but for compatibility reasons it has to be used for old document formats
-
-    ::rtl::OString aByteStrPass;
-    if ( bUseUTF )
-        aByteStrPass = ::rtl::OUStringToOString( aPass, RTL_TEXTENCODING_UTF8 );
-    else
-        aByteStrPass = ::rtl::OUStringToOString( aPass, RTL_TEXTENCODING_MS_1252 );
-
-    sal_uInt8 pBuffer[RTL_DIGEST_LENGTH_SHA1];
-    rtlDigestError nError = rtl_digest_SHA1( aByteStrPass.getStr(),
-                                            aByteStrPass.getLength(),
-                                            pBuffer,
-                                            RTL_DIGEST_LENGTH_SHA1 );
-
-    if ( nError != rtl_Digest_E_None )
-        throw uno::RuntimeException();
-
-    return uno::Sequence< sal_Int8 >( (sal_Int8*)pBuffer, RTL_DIGEST_LENGTH_SHA1 );
+    bool bResult = ( aHash1.size() && aHash1.size() == aHash2.size() );
+    for ( ::comphelper::SequenceAsHashMap::const_iterator aIter = aHash1.begin();
+          bResult && aIter != aHash1.end();
+          aIter++ )
+    {
+        uno::Sequence< sal_Int8 > aKey1;
+        bResult = ( ( aIter->second >>= aKey1 ) && aKey1.getLength() );
+        if ( bResult )
+        {
+            uno::Sequence< sal_Int8 > aKey2 = aHash2.getUnpackedValueOrDefault( aIter->first, uno::Sequence< sal_Int8 >() );
+            bResult = ( aKey1.getLength() == aKey2.getLength() );
+            for ( sal_Int32 nInd = 0; bResult && nInd < aKey1.getLength(); nInd++ )
+                bResult = ( aKey1[nInd] == aKey2[nInd] );
+        }
+    }
 
+    return bResult;
 }
 
 //-----------------------------------------------
@@ -255,8 +251,8 @@ OWriteStream_Impl::OWriteStream_Impl( OStorage_Impl* pParent,
 , m_xFactory( xFactory )
 , m_pParent( pParent )
 , m_bForceEncrypted( bForceEncrypted )
-, m_bUseCommonPass( !bForceEncrypted && nStorageType == embed::StorageFormats::PACKAGE )
-, m_bHasCachedPassword( sal_False )
+, m_bUseCommonEncryption( !bForceEncrypted && nStorageType == embed::StorageFormats::PACKAGE )
+, m_bHasCachedEncryptionData( sal_False )
 , m_bCompressedSetExplicit( !bDefaultCompress )
 , m_xPackage( xPackage )
 , m_bHasInsertedStreamOptimization( sal_False )
@@ -363,7 +359,7 @@ sal_Bool OWriteStream_Impl::IsEncrypted()
     if ( m_nStorageType != embed::StorageFormats::PACKAGE )
         return sal_False;
 
-    if ( m_bForceEncrypted || m_bHasCachedPassword )
+    if ( m_bForceEncrypted || m_bHasCachedEncryptionData )
         return sal_True;
 
     if ( m_aTempURL.getLength() || m_xCacheStream.is() )
@@ -410,7 +406,7 @@ sal_Bool OWriteStream_Impl::IsEncrypted()
     if ( !bWasEncr && bToBeEncr && !aKey.getLength() )
     {
         // the stream is intended to use common storage password
-        m_bUseCommonPass = sal_True;
+        m_bUseCommonEncryption = sal_True;
         return sal_False;
     }
     else
@@ -432,8 +428,8 @@ void OWriteStream_Impl::SetDecrypted()
 
     // remove encryption
     m_bForceEncrypted = sal_False;
-    m_bHasCachedPassword = sal_False;
-    m_aPass = ::rtl::OUString();
+    m_bHasCachedEncryptionData = sal_False;
+    m_aEncryptionData.clear();
 
     for ( sal_Int32 nInd = 0; nInd < m_aProps.getLength(); nInd++ )
     {
@@ -443,12 +439,15 @@ void OWriteStream_Impl::SetDecrypted()
 }
 
 //-----------------------------------------------
-void OWriteStream_Impl::SetEncryptedWithPass( const ::rtl::OUString& aPass )
+void OWriteStream_Impl::SetEncrypted( const ::comphelper::SequenceAsHashMap& aEncryptionData )
 {
     OSL_ENSURE( m_nStorageType == embed::StorageFormats::PACKAGE, "The encryption is supported only for package storages!\n" );
     if ( m_nStorageType != embed::StorageFormats::PACKAGE )
         throw uno::RuntimeException();
 
+    if ( !aEncryptionData.size() )
+        throw uno::RuntimeException();
+
     GetStreamProperties();
 
     // let the stream be modified
@@ -462,10 +461,10 @@ void OWriteStream_Impl::SetEncryptedWithPass( const ::rtl::OUString& aPass )
             m_aProps[nInd].Value <<= sal_True;
     }
 
-    m_bUseCommonPass = sal_False; // very important to set it to false
+    m_bUseCommonEncryption = sal_False; // very important to set it to false
 
-    m_bHasCachedPassword = sal_True;
-    m_aPass = aPass;
+    m_bHasCachedEncryptionData = sal_True;
+    m_aEncryptionData = aEncryptionData;
 }
 
 //-----------------------------------------------
@@ -796,7 +795,7 @@ void OWriteStream_Impl::InsertStreamDirectly( const uno::Reference< io::XInputSt
             xPropertySet->setPropertyValue( aProps[nInd].Name, aProps[nInd].Value );
         }
         else if ( m_nStorageType == embed::StorageFormats::PACKAGE && aProps[nInd].Name.equalsAscii( "UseCommonStoragePasswordEncryption" ) )
-            aProps[nInd].Value >>= m_bUseCommonPass;
+            aProps[nInd].Value >>= m_bUseCommonEncryption;
         else
             throw lang::IllegalArgumentException();
 
@@ -815,7 +814,7 @@ void OWriteStream_Impl::InsertStreamDirectly( const uno::Reference< io::XInputSt
         m_bCompressedSetExplicit = sal_True;
     }
 
-    if ( m_bUseCommonPass )
+    if ( m_bUseCommonEncryption )
     {
         if ( m_nStorageType != embed::StorageFormats::PACKAGE )
             throw uno::RuntimeException();
@@ -914,7 +913,7 @@ void OWriteStream_Impl::Commit()
             xPropertySet->setPropertyValue( m_aProps[nInd].Name, m_aProps[nInd].Value );
     }
 
-    if ( m_bUseCommonPass )
+    if ( m_bUseCommonEncryption )
     {
         if ( m_nStorageType != embed::StorageFormats::PACKAGE )
             throw uno::RuntimeException();
@@ -925,13 +924,13 @@ void OWriteStream_Impl::Commit()
         xPropertySet->setPropertyValue( ::rtl::OUString::createFromAscii( "Encrypted" ),
                                         uno::makeAny( sal_True ) );
     }
-    else if ( m_bHasCachedPassword )
+    else if ( m_bHasCachedEncryptionData )
     {
         if ( m_nStorageType != embed::StorageFormats::PACKAGE )
             throw uno::RuntimeException();
 
         xPropertySet->setPropertyValue( ::rtl::OUString::createFromAscii( "EncryptionKey" ),
-                                        uno::makeAny( ::package::MakeKeyFromPass( m_aPass, sal_True ) ) );
+                                        uno::makeAny( m_aEncryptionData.getUnpackedValueOrDefault( PACKAGE_ENCRYPTIONDATA_SHA1UTF8, uno::Sequence< sal_Int8 >() ) ) );
     }
 
     // the stream should be free soon, after package is stored
@@ -969,9 +968,9 @@ void OWriteStream_Impl::Revert()
 
     m_bHasDataToFlush = sal_False;
 
-    m_bUseCommonPass = sal_True;
-    m_bHasCachedPassword = sal_False;
-    m_aPass = ::rtl::OUString();
+    m_bUseCommonEncryption = sal_True;
+    m_bHasCachedEncryptionData = sal_False;
+    m_aEncryptionData.clear();
 
     if ( m_nStorageType == embed::StorageFormats::OFOPXML )
     {
@@ -1007,7 +1006,7 @@ uno::Sequence< beans::PropertyValue > OWriteStream_Impl::GetStreamProperties()
 //-----------------------------------------------
 uno::Sequence< beans::PropertyValue > OWriteStream_Impl::InsertOwnProps(
                                                                     const uno::Sequence< beans::PropertyValue >& aProps,
-                                                                    sal_Bool bUseCommonPass )
+                                                                    sal_Bool bUseCommonEncryption )
 {
     uno::Sequence< beans::PropertyValue > aResult( aProps );
     sal_Int32 nLen = aResult.getLength();
@@ -1017,13 +1016,13 @@ uno::Sequence< beans::PropertyValue > OWriteStream_Impl::InsertOwnProps(
         for ( sal_Int32 nInd = 0; nInd < nLen; nInd++ )
             if ( aResult[nInd].Name.equalsAscii( "UseCommonStoragePasswordEncryption" ) )
             {
-                aResult[nInd].Value <<= bUseCommonPass;
+                aResult[nInd].Value <<= bUseCommonEncryption;
                 return aResult;
             }
 
         aResult.realloc( ++nLen );
         aResult[nLen - 1].Name = ::rtl::OUString::createFromAscii( "UseCommonStoragePasswordEncryption" );
-        aResult[nLen - 1].Value <<= bUseCommonPass;
+        aResult[nLen - 1].Value <<= bUseCommonEncryption;
     }
     else if ( m_nStorageType == embed::StorageFormats::OFOPXML )
     {
@@ -1172,11 +1171,11 @@ uno::Sequence< beans::PropertyValue > OWriteStream_Impl::ReadPackageStreamProper
 
 //-----------------------------------------------
 void OWriteStream_Impl::CopyInternallyTo_Impl( const uno::Reference< io::XStream >& xDestStream,
-                                                const ::rtl::OUString& aPass )
+                                                const ::comphelper::SequenceAsHashMap& aEncryptionData )
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ) ;
 
-    OSL_ENSURE( !m_bUseCommonPass, "The stream can not be encrypted!" );
+    OSL_ENSURE( !m_bUseCommonEncryption, "The stream can not be encrypted!" );
 
     if ( m_nStorageType != embed::StorageFormats::PACKAGE )
         throw packages::NoEncryptionException();
@@ -1187,16 +1186,16 @@ void OWriteStream_Impl::CopyInternallyTo_Impl( const uno::Reference< io::XStream
     }
     else
     {
-        uno::Reference< io::XStream > xOwnStream = GetStream( embed::ElementModes::READ, aPass, sal_False );
+        uno::Reference< io::XStream > xOwnStream = GetStream( embed::ElementModes::READ, aEncryptionData, sal_False );
         if ( !xOwnStream.is() )
             throw io::IOException(); // TODO
 
         OStorage_Impl::completeStorageStreamCopy_Impl( xOwnStream, xDestStream, m_nStorageType, GetAllRelationshipsIfAny() );
     }
 
-    uno::Reference< embed::XEncryptionProtectedSource > xEncr( xDestStream, uno::UNO_QUERY );
+    uno::Reference< embed::XEncryptionProtectedSource2 > xEncr( xDestStream, uno::UNO_QUERY );
     if ( xEncr.is() )
-        xEncr->setEncryptionPassword( aPass );
+        xEncr->setEncryptionData( aEncryptionData.getAsConstNamedValueList() );
 }
 
 //-----------------------------------------------
@@ -1236,7 +1235,7 @@ void OWriteStream_Impl::CopyInternallyTo_Impl( const uno::Reference< io::XStream
 }
 
 //-----------------------------------------------
-uno::Reference< io::XStream > OWriteStream_Impl::GetStream( sal_Int32 nStreamMode, const ::rtl::OUString& aPass, sal_Bool bHierarchyAccess )
+uno::Reference< io::XStream > OWriteStream_Impl::GetStream( sal_Int32 nStreamMode, const ::comphelper::SequenceAsHashMap& aEncryptionData, sal_Bool bHierarchyAccess )
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ) ;
 
@@ -1254,9 +1253,9 @@ uno::Reference< io::XStream > OWriteStream_Impl::GetStream( sal_Int32 nStreamMod
     if ( !xPropertySet.is() )
         throw uno::RuntimeException();
 
-    if ( m_bHasCachedPassword )
+    if ( m_bHasCachedEncryptionData )
     {
-        if ( !m_aPass.equals( aPass ) )
+        if ( !::package::PackageEncryptionDatasEqual( m_aEncryptionData, aEncryptionData ) )
             throw packages::WrongPasswordException();
 
         // the correct key must be set already
@@ -1264,26 +1263,26 @@ uno::Reference< io::XStream > OWriteStream_Impl::GetStream( sal_Int32 nStreamMod
     }
     else
     {
-        SetEncryptionKeyProperty_Impl( xPropertySet, ::package::MakeKeyFromPass( aPass, sal_True ) );
+        SetEncryptionKeyProperty_Impl( xPropertySet, aEncryptionData.getUnpackedValueOrDefault( PACKAGE_ENCRYPTIONDATA_SHA1UTF8, uno::Sequence< sal_Int8 >() ) );
 
         try {
             xResultStream = GetStream_Impl( nStreamMode, bHierarchyAccess );
 
-            m_bUseCommonPass = sal_False; // very important to set it to false
-            m_bHasCachedPassword = sal_True;
-            m_aPass = aPass;
+            m_bUseCommonEncryption = sal_False; // very important to set it to false
+            m_bHasCachedEncryptionData = sal_True;
+            m_aEncryptionData = aEncryptionData;
         }
         catch( packages::WrongPasswordException& )
         {
             // retry with different encoding
-            SetEncryptionKeyProperty_Impl( xPropertySet, ::package::MakeKeyFromPass( aPass, sal_False ) );
+            SetEncryptionKeyProperty_Impl( xPropertySet, aEncryptionData.getUnpackedValueOrDefault( PACKAGE_ENCRYPTIONDATA_SHA1MS1252, uno::Sequence< sal_Int8 >() ) );
             try {
                 // the stream must be cashed to be resaved
                 xResultStream = GetStream_Impl( nStreamMode | embed::ElementModes::SEEKABLE, bHierarchyAccess );
 
-                m_bUseCommonPass = sal_False; // very important to set it to false
-                m_bHasCachedPassword = sal_True;
-                m_aPass = aPass;
+                m_bUseCommonEncryption = sal_False; // very important to set it to false
+                m_bHasCachedEncryptionData = sal_True;
+                m_aEncryptionData = aEncryptionData;
 
                 // the stream must be resaved with new password encryption
                 if ( nStreamMode & embed::ElementModes::WRITE )
@@ -1343,10 +1342,10 @@ uno::Reference< io::XStream > OWriteStream_Impl::GetStream( sal_Int32 nStreamMod
 
     if ( IsEncrypted() )
     {
-        ::rtl::OUString aGlobalPass;
+        ::comphelper::SequenceAsHashMap aGlobalEncryptionData;
         try
         {
-            aGlobalPass = GetCommonRootPass();
+            aGlobalEncryptionData = GetCommonRootEncryptionData();
         }
         catch( packages::NoEncryptionException& aNoEncryptionException )
         {
@@ -1356,7 +1355,7 @@ uno::Reference< io::XStream > OWriteStream_Impl::GetStream( sal_Int32 nStreamMod
             throw packages::WrongPasswordException();
         }
 
-        xResultStream = GetStream( nStreamMode, aGlobalPass, bHierarchyAccess );
+        xResultStream = GetStream( nStreamMode, aGlobalEncryptionData, bHierarchyAccess );
     }
     else
         xResultStream = GetStream_Impl( nStreamMode, bHierarchyAccess );
@@ -1385,7 +1384,7 @@ uno::Reference< io::XStream > OWriteStream_Impl::GetStream_Impl( sal_Int32 nStre
         if ( !xInStream.is() )
             throw io::IOException();
 
-        OInputCompStream* pStream = new OInputCompStream( *this, xInStream, InsertOwnProps( m_aProps, m_bUseCommonPass ), m_nStorageType );
+        OInputCompStream* pStream = new OInputCompStream( *this, xInStream, InsertOwnProps( m_aProps, m_bUseCommonEncryption ), m_nStorageType );
         uno::Reference< io::XStream > xCompStream(
                         static_cast< ::cppu::OWeakObject* >( pStream ),
                         uno::UNO_QUERY );
@@ -1410,7 +1409,7 @@ uno::Reference< io::XStream > OWriteStream_Impl::GetStream_Impl( sal_Int32 nStre
         if ( !xInStream.is() )
             throw io::IOException();
 
-        OInputSeekStream* pStream = new OInputSeekStream( *this, xInStream, InsertOwnProps( m_aProps, m_bUseCommonPass ), m_nStorageType );
+        OInputSeekStream* pStream = new OInputSeekStream( *this, xInStream, InsertOwnProps( m_aProps, m_bUseCommonEncryption ), m_nStorageType );
         uno::Reference< io::XStream > xSeekStream(
                         static_cast< ::cppu::OWeakObject* >( pStream ),
                         uno::UNO_QUERY );
@@ -1512,7 +1511,7 @@ uno::Reference< io::XInputStream > OWriteStream_Impl::GetRawInStream()
 }
 
 //-----------------------------------------------
-::rtl::OUString OWriteStream_Impl::GetCommonRootPass()
+::comphelper::SequenceAsHashMap OWriteStream_Impl::GetCommonRootEncryptionData()
     throw ( packages::NoEncryptionException )
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ) ;
@@ -1520,7 +1519,7 @@ uno::Reference< io::XInputStream > OWriteStream_Impl::GetRawInStream()
     if ( m_nStorageType != embed::StorageFormats::PACKAGE || !m_pParent )
         throw packages::NoEncryptionException();
 
-    return m_pParent->GetCommonRootPass();
+    return m_pParent->GetCommonRootEncryptionData();
 }
 
 //-----------------------------------------------
@@ -1559,11 +1558,11 @@ void OWriteStream_Impl::CreateReadonlyCopyBasedOnData( const uno::Reference< io:
     if ( !xInStream.is() )
         throw io::IOException();
 
-    // TODO: remember last state of m_bUseCommonPass
+    // TODO: remember last state of m_bUseCommonEncryption
     if ( !xTargetStream.is() )
         xTargetStream = uno::Reference< io::XStream > (
             static_cast< ::cppu::OWeakObject* >(
-                new OInputSeekStream( xInStream, InsertOwnProps( aProps, m_bUseCommonPass ), m_nStorageType ) ),
+                new OInputSeekStream( xInStream, InsertOwnProps( aProps, m_bUseCommonEncryption ), m_nStorageType ) ),
             uno::UNO_QUERY_THROW );
 }
 
@@ -1580,10 +1579,10 @@ void OWriteStream_Impl::GetCopyOfLastCommit( uno::Reference< io::XStream >& xTar
     if ( IsEncrypted() )
     {
         // an encrypted stream must contain input stream
-        ::rtl::OUString aGlobalPass;
+        ::comphelper::SequenceAsHashMap aGlobalEncryptionData;
         try
         {
-            aGlobalPass = GetCommonRootPass();
+            aGlobalEncryptionData = GetCommonRootEncryptionData();
         }
         catch( packages::NoEncryptionException& aNoEncryptionException )
         {
@@ -1593,7 +1592,7 @@ void OWriteStream_Impl::GetCopyOfLastCommit( uno::Reference< io::XStream >& xTar
             throw packages::WrongPasswordException();
         }
 
-        GetCopyOfLastCommit( xTargetStream, aGlobalPass );
+        GetCopyOfLastCommit( xTargetStream, aGlobalEncryptionData );
     }
     else
     {
@@ -1602,12 +1601,12 @@ void OWriteStream_Impl::GetCopyOfLastCommit( uno::Reference< io::XStream >& xTar
         // in case of new inserted package stream it is possible that input stream still was not set
         GetStreamProperties();
 
-        CreateReadonlyCopyBasedOnData( xDataToCopy, m_aProps, m_bUseCommonPass, xTargetStream );
+        CreateReadonlyCopyBasedOnData( xDataToCopy, m_aProps, m_bUseCommonEncryption, xTargetStream );
     }
 }
 
 //-----------------------------------------------
-void OWriteStream_Impl::GetCopyOfLastCommit( uno::Reference< io::XStream >& xTargetStream, const ::rtl::OUString& aPass )
+void OWriteStream_Impl::GetCopyOfLastCommit( uno::Reference< io::XStream >& xTargetStream, const ::comphelper::SequenceAsHashMap& aEncryptionData )
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
 
@@ -1620,12 +1619,12 @@ void OWriteStream_Impl::GetCopyOfLastCommit( uno::Reference< io::XStream >& xTar
 
     uno::Reference< io::XInputStream > xDataToCopy;
 
-    if ( m_bHasCachedPassword )
+    if ( m_bHasCachedEncryptionData )
     {
         // TODO: introduce last commited cashed password information and use it here
         // that means "use common pass" also should be remembered on flash
-        uno::Sequence< sal_Int8 > aNewKey = ::package::MakeKeyFromPass( aPass, sal_True );
-        uno::Sequence< sal_Int8 > aOldKey = ::package::MakeKeyFromPass( aPass, sal_False );
+        uno::Sequence< sal_Int8 > aNewKey = aEncryptionData.getUnpackedValueOrDefault( PACKAGE_ENCRYPTIONDATA_SHA1UTF8, uno::Sequence< sal_Int8 >() );
+        uno::Sequence< sal_Int8 > aOldKey = aEncryptionData.getUnpackedValueOrDefault( PACKAGE_ENCRYPTIONDATA_SHA1MS1252, uno::Sequence< sal_Int8 >() );
 
         uno::Reference< beans::XPropertySet > xProps( m_xPackageStream, uno::UNO_QUERY );
         if ( !xProps.is() )
@@ -1647,7 +1646,7 @@ void OWriteStream_Impl::GetCopyOfLastCommit( uno::Reference< io::XStream >& xTar
     else
     {
         uno::Reference< beans::XPropertySet > xPropertySet( m_xPackageStream, uno::UNO_QUERY );
-        SetEncryptionKeyProperty_Impl( xPropertySet, ::package::MakeKeyFromPass( aPass, sal_True ) );
+        SetEncryptionKeyProperty_Impl( xPropertySet, aEncryptionData.getUnpackedValueOrDefault( PACKAGE_ENCRYPTIONDATA_SHA1UTF8, uno::Sequence< sal_Int8 >() ) );
 
         try {
             xDataToCopy = m_xPackageStream->getDataStream();
@@ -1660,7 +1659,7 @@ void OWriteStream_Impl::GetCopyOfLastCommit( uno::Reference< io::XStream >& xTar
         }
         catch( packages::WrongPasswordException& aWrongPasswordException )
         {
-            SetEncryptionKeyProperty_Impl( xPropertySet, ::package::MakeKeyFromPass( aPass, sal_False ) );
+            SetEncryptionKeyProperty_Impl( xPropertySet, aEncryptionData.getUnpackedValueOrDefault( PACKAGE_ENCRYPTIONDATA_SHA1MS1252, uno::Sequence< sal_Int8 >() ) );
             try {
                 xDataToCopy = m_xPackageStream->getDataStream();
 
@@ -1696,7 +1695,7 @@ void OWriteStream_Impl::GetCopyOfLastCommit( uno::Reference< io::XStream >& xTar
     // in case of new inserted package stream it is possible that input stream still was not set
     GetStreamProperties();
 
-    CreateReadonlyCopyBasedOnData( xDataToCopy, m_aProps, m_bUseCommonPass, xTargetStream );
+    CreateReadonlyCopyBasedOnData( xDataToCopy, m_aProps, m_bUseCommonEncryption, xTargetStream );
 }
 
 //-----------------------------------------------
@@ -2028,6 +2027,7 @@ uno::Any SAL_CALL OWriteStream::queryInterface( const uno::Type& rType )
     {
         aReturn <<= ::cppu::queryInterface
                     (	rType
+                        ,	static_cast ( this )
                         ,	static_cast ( this ) );
     }
     else if ( m_pData->m_nStorageType == embed::StorageFormats::OFOPXML )
@@ -2080,7 +2080,7 @@ uno::Sequence< uno::Type > SAL_CALL OWriteStream::getTypes()
             {
                 if ( m_pData->m_nStorageType == embed::StorageFormats::PACKAGE )
                 {
-                    m_pData->m_pTypeCollection = new ::cppu::OTypeCollection
+                    ::cppu::OTypeCollection aTmpCollection
                                     (	::getCppuType( ( const uno::Reference< lang::XTypeProvider >* )NULL )
                                     ,	::getCppuType( ( const uno::Reference< io::XInputStream >* )NULL )
                                     ,	::getCppuType( ( const uno::Reference< io::XOutputStream >* )NULL )
@@ -2088,11 +2088,15 @@ uno::Sequence< uno::Type > SAL_CALL OWriteStream::getTypes()
                                     ,	::getCppuType( ( const uno::Reference< io::XSeekable >* )NULL )
                                     ,	::getCppuType( ( const uno::Reference< io::XTruncate >* )NULL )
                                     ,	::getCppuType( ( const uno::Reference< lang::XComponent >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< embed::XEncryptionProtectedSource2 >* )NULL )
                                     ,	::getCppuType( ( const uno::Reference< embed::XEncryptionProtectedSource >* )NULL )
                                     ,	::getCppuType( ( const uno::Reference< embed::XExtendedStorageStream >* )NULL )
                                     ,	::getCppuType( ( const uno::Reference< embed::XTransactedObject >* )NULL )
-                                    ,	::getCppuType( ( const uno::Reference< embed::XTransactionBroadcaster >* )NULL )
-                                    ,	::getCppuType( ( const uno::Reference< beans::XPropertySet >* )NULL ) );
+                                    ,	::getCppuType( ( const uno::Reference< embed::XTransactionBroadcaster >* )NULL ) );
+
+                    m_pData->m_pTypeCollection = new ::cppu::OTypeCollection
+                                    (	::getCppuType( ( const uno::Reference< beans::XPropertySet >* )NULL )
+                                    ,   aTmpCollection.getTypes() );
                 }
                 else if ( m_pData->m_nStorageType == embed::StorageFormats::OFOPXML )
                 {
@@ -2138,6 +2142,7 @@ uno::Sequence< uno::Type > SAL_CALL OWriteStream::getTypes()
                                     ,	::getCppuType( ( const uno::Reference< io::XSeekable >* )NULL )
                                     ,	::getCppuType( ( const uno::Reference< io::XTruncate >* )NULL )
                                     ,	::getCppuType( ( const uno::Reference< lang::XComponent >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< embed::XEncryptionProtectedSource2 >* )NULL )
                                     ,	::getCppuType( ( const uno::Reference< embed::XEncryptionProtectedSource >* )NULL )
                                     ,	::getCppuType( ( const uno::Reference< beans::XPropertySet >* )NULL ) );
                 }
@@ -2713,7 +2718,7 @@ void SAL_CALL OWriteStream::setEncryptionPassword( const ::rtl::OUString& aPass
 
     OSL_ENSURE( m_pImpl->m_xPackageStream.is(), "No package stream is set!\n" );
 
-    m_pImpl->SetEncryptedWithPass( aPass );
+    m_pImpl->SetEncrypted( ::comphelper::OStorageHelper::CreatePackageEncryptionData( aPass ) );
 
     ModifyParentUnlockMutex_Impl( aGuard );
 }
@@ -2740,6 +2745,27 @@ void SAL_CALL OWriteStream::removeEncryption()
     ModifyParentUnlockMutex_Impl( aGuard );
 }
 
+//-----------------------------------------------
+void SAL_CALL OWriteStream::setEncryptionData( const uno::Sequence< beans::NamedValue >& aEncryptionData )
+    throw (io::IOException, uno::RuntimeException)
+{
+    ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
+
+    CheckInitOnDemand();
+
+    if ( !m_pImpl )
+    {
+        ::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Disposed!" ) ) );
+        throw lang::DisposedException();
+    }
+
+    OSL_ENSURE( m_pImpl->m_xPackageStream.is(), "No package stream is set!\n" );
+
+    m_pImpl->SetEncrypted( aEncryptionData );
+
+    ModifyParentUnlockMutex_Impl( aGuard );
+}
+
 //-----------------------------------------------
 sal_Bool SAL_CALL OWriteStream::hasByID(  const ::rtl::OUString& sID )
         throw ( io::IOException,
@@ -3181,24 +3207,24 @@ void SAL_CALL OWriteStream::setPropertyValue( const ::rtl::OUString& aPropertyNa
     else if ( m_pData->m_nStorageType == embed::StorageFormats::PACKAGE
             && aPropertyName.equalsAscii( "UseCommonStoragePasswordEncryption" ) )
     {
-        sal_Bool bUseCommonPass = sal_False;
-        if ( aValue >>= bUseCommonPass ) 
+        sal_Bool bUseCommonEncryption = sal_False;
+        if ( aValue >>= bUseCommonEncryption ) 
         {
             if ( m_bInitOnDemand && m_pImpl->m_bHasInsertedStreamOptimization )
             {
                 // the data stream is provided to the packagestream directly
-                m_pImpl->m_bUseCommonPass = bUseCommonPass;
+                m_pImpl->m_bUseCommonEncryption = bUseCommonEncryption;
             }
-            else if ( bUseCommonPass )
+            else if ( bUseCommonEncryption )
             {
-                if ( !m_pImpl->m_bUseCommonPass )
+                if ( !m_pImpl->m_bUseCommonEncryption )
                 {
                     m_pImpl->SetDecrypted();
-                    m_pImpl->m_bUseCommonPass = sal_True;
+                    m_pImpl->m_bUseCommonEncryption = sal_True;
                 }
             }
             else
-                m_pImpl->m_bUseCommonPass = sal_False;
+                m_pImpl->m_bUseCommonEncryption = sal_False;
         }
         else
             throw lang::IllegalArgumentException(); //TODO
@@ -3293,7 +3319,7 @@ uno::Any SAL_CALL OWriteStream::getPropertyValue( const ::rtl::OUString& aProp )
     }
     else if ( m_pData->m_nStorageType == embed::StorageFormats::PACKAGE
             && aPropertyName.equalsAscii( "UseCommonStoragePasswordEncryption" ) )
-        return uno::makeAny( m_pImpl->m_bUseCommonPass );
+        return uno::makeAny( m_pImpl->m_bUseCommonEncryption );
     else if ( aPropertyName.equalsAscii( "Size" ) )
     {
         CheckInitOnDemand();
diff --git a/package/source/xstor/owriteablestream.hxx b/package/source/xstor/owriteablestream.hxx
index 88fdf52fa..731d610eb 100644
--- a/package/source/xstor/owriteablestream.hxx
+++ b/package/source/xstor/owriteablestream.hxx
@@ -38,7 +38,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -53,6 +53,8 @@
 #include 
 #include 
 
+#include 
+
 #include 
 
 #include "ocompinstream.hxx"
@@ -75,7 +77,7 @@ namespace cppu {
 
 namespace package {
     void StaticAddLog( const ::rtl::OUString& aMessage );
-    ::com::sun::star::uno::Sequence< sal_Int8 > MakeKeyFromPass( const ::rtl::OUString& aPass, sal_Bool bUseUTF );
+    bool PackageEncryptionDatasEqual( const ::comphelper::SequenceAsHashMap& aHash1, const ::comphelper::SequenceAsHashMap& aHash2 );
 }
 
 struct WSInternalData_Impl
@@ -127,9 +129,9 @@ struct OWriteStream_Impl : public PreCreationStruct
 
     sal_Bool m_bForceEncrypted;
 
-    sal_Bool m_bUseCommonPass;
-    sal_Bool m_bHasCachedPassword;
-    ::rtl::OUString m_aPass;
+    sal_Bool m_bUseCommonEncryption;
+    sal_Bool m_bHasCachedEncryptionData;
+    ::comphelper::SequenceAsHashMap m_aEncryptionData;
     
     sal_Bool m_bCompressedSetExplicit;
 
@@ -161,12 +163,12 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > GetStream_Impl( sal_Int32 nStreamMode,
                                                                                         sal_Bool bHierarchyAccess );
 
-    ::rtl::OUString GetCommonRootPass() throw ( ::com::sun::star::packages::NoEncryptionException );
+    ::comphelper::SequenceAsHashMap GetCommonRootEncryptionData() throw ( ::com::sun::star::packages::NoEncryptionException );
 
     ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > ReadPackageStreamProperties();
     ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > InsertOwnProps(
                             const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps,
-                            sal_Bool bUseCommonPass );
+                            sal_Bool bUseCommonEncryption );
 
 public:
     OWriteStream_Impl(
@@ -186,7 +188,7 @@ public:
 
     void AddLog( const ::rtl::OUString& aMessage );
 
-    sal_Bool UsesCommonPass_Impl() { return m_bUseCommonPass; }
+    sal_Bool UsesCommonEncryption_Impl() { return m_bUseCommonEncryption; }
     sal_Bool HasTempFile_Impl() { return ( m_aTempURL.getLength() != 0 ); }
     sal_Bool IsTransacted();
 
@@ -198,13 +200,14 @@ public:
 
     void SetToBeCommited() { m_bFlushed = sal_True; }
 
-    sal_Bool HasCachedPassword() { return m_bHasCachedPassword; }
-    ::rtl::OUString GetCachedPassword() { return m_aPass; }
+    sal_Bool HasCachedEncryptionData() { return m_bHasCachedEncryptionData; }
+    ::comphelper::SequenceAsHashMap& GetCachedEncryptionData() { return m_aEncryptionData; }
+
     sal_Bool IsModified() { return m_bHasDataToFlush || m_bFlushed; }
 
     sal_Bool IsEncrypted();
     void SetDecrypted();
-    void SetEncryptedWithPass( const ::rtl::OUString& aPass );
+    void SetEncrypted( const ::comphelper::SequenceAsHashMap& aEncryptionData );
 
     void DisposeWrappers();
 
@@ -226,12 +229,12 @@ public:
     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > GetAllRelationshipsIfAny();
 
     void CopyInternallyTo_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xDestStream,
-                                const ::rtl::OUString& aPass );
+                                const ::comphelper::SequenceAsHashMap& aEncryptionData );
     void CopyInternallyTo_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xDestStream );
 
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > GetStream(
                         sal_Int32 nStreamMode,
-                        const ::rtl::OUString& aPass,
+                        const ::comphelper::SequenceAsHashMap& aEncryptionData,
                         sal_Bool bHierarchyAccess );
 
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > GetStream(
@@ -247,13 +250,13 @@ public:
     void CreateReadonlyCopyBasedOnData(
                     const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xDataToCopy,
                     const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps,
-                    sal_Bool bUseCommonPass,
+                    sal_Bool bUseCommonEncryption,
                     ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xTargetStream );
 
     void GetCopyOfLastCommit( ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xTargetStream );
     void GetCopyOfLastCommit(
                   ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xTargetStream,
-                            const ::rtl::OUString& aPass );
+                            const ::comphelper::SequenceAsHashMap& aEncryptionData );
 
 
     void CommitStreamRelInfo(
@@ -272,7 +275,7 @@ class OWriteStream : ::com::sun::star::lang::XTypeProvider
             , public ::com::sun::star::embed::XExtendedStorageStream
             , public ::com::sun::star::io::XSeekable
             , public ::com::sun::star::io::XTruncate
-            , public ::com::sun::star::embed::XEncryptionProtectedSource
+            , public ::com::sun::star::embed::XEncryptionProtectedSource2
             , public ::com::sun::star::embed::XRelationshipAccess
             , public ::com::sun::star::embed::XTransactedObject
             , public ::com::sun::star::embed::XTransactionBroadcaster
@@ -366,6 +369,9 @@ public:
         throw ( ::com::sun::star::uno::RuntimeException,
                 ::com::sun::star::io::IOException );
 
+    //XEncryptionProtectedSource2
+    virtual void SAL_CALL setEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aEncryptionData ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+
     //XRelationshipAccess
     virtual ::sal_Bool SAL_CALL hasByID( const ::rtl::OUString& sID ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
     virtual ::rtl::OUString SAL_CALL getTargetByID( const ::rtl::OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx
index c6cc37f6f..8ee18c272 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -207,7 +207,7 @@ OStorage_Impl::OStorage_Impl(	uno::Reference< io::XInputStream > xInputStream,
 , m_bListCreated( sal_False )
 , m_xFactory( xFactory )
 , m_xProperties( xProperties )
-, m_bHasCommonPassword( sal_False )
+, m_bHasCommonEncryptionData( sal_False )
 , m_pParent( NULL )
 , m_bControlMediaType( sal_False )
 , m_bMTFallbackUsed( sal_False )
@@ -247,7 +247,7 @@ OStorage_Impl::OStorage_Impl(	uno::Reference< io::XStream > xStream,
 , m_bListCreated( sal_False )
 , m_xFactory( xFactory )
 , m_xProperties( xProperties )
-, m_bHasCommonPassword( sal_False )
+, m_bHasCommonEncryptionData( sal_False )
 , m_pParent( NULL )
 , m_bControlMediaType( sal_False )
 , m_bMTFallbackUsed( sal_False )
@@ -291,7 +291,7 @@ OStorage_Impl::OStorage_Impl(	OStorage_Impl* pParent,
 , m_xPackageFolder( xPackageFolder )
 , m_xPackage( xPackage )
 , m_xFactory( xFactory )
-, m_bHasCommonPassword( sal_False )
+, m_bHasCommonEncryptionData( sal_False )
 , m_pParent( pParent ) // can be empty in case of temporary readonly substorages and relation storage
 , m_bControlMediaType( sal_False )
 , m_bMTFallbackUsed( sal_False )
@@ -748,10 +748,9 @@ void OStorage_Impl::CopyToStorage( const uno::Reference< embed::XStorage >& xDes
         {
             try
             {
-                ::rtl::OUString aCommonPass = GetCommonRootPass();
-                uno::Reference< embed::XEncryptionProtectedSource > xEncr( xDest, uno::UNO_QUERY );
+                uno::Reference< embed::XEncryptionProtectedSource2 > xEncr( xDest, uno::UNO_QUERY );
                 if ( xEncr.is() )
-                    xEncr->setEncryptionPassword( aCommonPass );
+                    xEncr->setEncryptionData( GetCommonRootEncryptionData().getAsConstNamedValueList() );
             }
             catch( packages::NoEncryptionException& aNoEncryptionException )
             {
@@ -855,7 +854,7 @@ void OStorage_Impl::CopyStorageElement( SotElement_Impl* pElement,
                 {
                     aStrProps.realloc( ++nNum );
                     aStrProps[nNum-1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UseCommonStoragePasswordEncryption" ) );
-                    aStrProps[nNum-1].Value <<= (sal_Bool)( pElement->m_pStream->UsesCommonPass_Impl() );
+                    aStrProps[nNum-1].Value <<= (sal_Bool)( pElement->m_pStream->UsesCommonEncryption_Impl() );
                 }
                 else if ( m_nStorageType == embed::StorageFormats::OFOPXML )
                 {
@@ -913,15 +912,15 @@ void OStorage_Impl::CopyStorageElement( SotElement_Impl* pElement,
             OSL_ENSURE( sal_False, "Encryption is only supported in package storage!\n" );
             throw io::IOException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
         }
-        else if ( pElement->m_pStream->HasCachedPassword()
+        else if ( pElement->m_pStream->HasCachedEncryptionData()
              && ( pElement->m_pStream->IsModified() || pElement->m_pStream->HasWriteOwner_Impl() ) )
         {
-            ::rtl::OUString aCommonPass;
-            sal_Bool bHasCommonPass = sal_False;
+            ::comphelper::SequenceAsHashMap aCommonEncryptionData;
+            sal_Bool bHasCommonEncryptionData = sal_False;
             try
             {
-                aCommonPass = GetCommonRootPass();
-                bHasCommonPass = sal_True;
+                aCommonEncryptionData = GetCommonRootEncryptionData();
+                bHasCommonEncryptionData = sal_True;
             }
             catch( packages::NoEncryptionException& aNoEncryptionException )
             {
@@ -929,7 +928,7 @@ void OStorage_Impl::CopyStorageElement( SotElement_Impl* pElement,
                 AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "No Encryption" ) ) );
             }
 
-            if ( bHasCommonPass && pElement->m_pStream->GetCachedPassword().equals( aCommonPass ) )
+            if ( bHasCommonEncryptionData && ::package::PackageEncryptionDatasEqual( pElement->m_pStream->GetCachedEncryptionData(), aCommonEncryptionData ) )
             {
                 // If the stream can be opened with the common storage password
                 // it must be stored with the common storage password as well
@@ -947,13 +946,14 @@ void OStorage_Impl::CopyStorageElement( SotElement_Impl* pElement,
             else
             {
                 // the stream is already opened for writing or was changed
+                uno::Reference< embed::XStorage2 > xDest2( xDest, uno::UNO_QUERY_THROW );
                 uno::Reference< io::XStream > xSubStr =
-                                            xDest->openEncryptedStreamElement( aName,
+                                            xDest2->openEncryptedStream( aName,
                                                 embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE,
-                                                pElement->m_pStream->GetCachedPassword() );
+                                                pElement->m_pStream->GetCachedEncryptionData().getAsConstNamedValueList() );
                 OSL_ENSURE( xSubStr.is(), "No destination substream!\n" );
 
-                pElement->m_pStream->CopyInternallyTo_Impl( xSubStr, pElement->m_pStream->GetCachedPassword() );
+                pElement->m_pStream->CopyInternallyTo_Impl( xSubStr, pElement->m_pStream->GetCachedEncryptionData() );
             }
         }
         else
@@ -1360,7 +1360,7 @@ void OStorage_Impl::Revert()
 }
 
 //-----------------------------------------------
-::rtl::OUString OStorage_Impl::GetCommonRootPass()
+::comphelper::SequenceAsHashMap OStorage_Impl::GetCommonRootEncryptionData()
     throw ( packages::NoEncryptionException )
 {
     ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ) ;
@@ -1370,17 +1370,17 @@ void OStorage_Impl::Revert()
 
     if ( m_bIsRoot )
     {
-        if ( !m_bHasCommonPassword )
+        if ( !m_bHasCommonEncryptionData )
             throw packages::NoEncryptionException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
 
-        return m_aCommonPassword;
+        return m_aCommonEncryptionData;
     }
     else
     {
         if ( !m_pParent )
             throw packages::NoEncryptionException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
 
-        return m_pParent->GetCommonRootPass();
+        return m_pParent->GetCommonRootEncryptionData();
     }
 }
 
@@ -1679,8 +1679,8 @@ void OStorage_Impl::ClearElement( SotElement_Impl* pElement )
 
 //-----------------------------------------------
 void OStorage_Impl::CloneStreamElement( const ::rtl::OUString& aStreamName,
-                                        sal_Bool bPassProvided,
-                                        const ::rtl::OUString& aPass,
+                                        sal_Bool bEncryptionDataProvided,
+                                        const ::comphelper::SequenceAsHashMap& aEncryptionData,
                                         uno::Reference< io::XStream >& xTargetStream )
         throw ( embed::InvalidStorageException,
                 lang::IllegalArgumentException,
@@ -1712,8 +1712,8 @@ void OStorage_Impl::CloneStreamElement( const ::rtl::OUString& aStreamName,
         // storage. The only problem is that some package streams can be accessed from outside
         // at the same time ( now solwed by wrappers that remember own position ).
 
-        if ( bPassProvided )
-            pElement->m_pStream->GetCopyOfLastCommit( xTargetStream, aPass );
+        if ( bEncryptionDataProvided )
+            pElement->m_pStream->GetCopyOfLastCommit( xTargetStream, aEncryptionData );
         else
             pElement->m_pStream->GetCopyOfLastCommit( xTargetStream );
     }
@@ -2247,6 +2247,7 @@ uno::Any SAL_CALL OStorage::queryInterface( const uno::Type& rType )
                 (	rType
                 ,	static_cast ( this )
                 ,	static_cast ( this )
+                ,	static_cast ( this )
                 ,	static_cast ( this )
                 ,	static_cast ( this )
                 ,	static_cast ( this )
@@ -2254,8 +2255,15 @@ uno::Any SAL_CALL OStorage::queryInterface( const uno::Type& rType )
                 ,	static_cast ( this )
                 ,	static_cast ( this )
                 ,	static_cast ( this )
-                ,	static_cast ( this )
-                ,	static_cast ( this ) );
+                ,	static_cast ( this ) );
+
+    if ( aReturn.hasValue() == sal_True )
+        return aReturn ;
+
+    aReturn <<= ::cppu::queryInterface
+                (	rType
+                ,	static_cast ( this )
+                ,	static_cast ( this ) );
 
     if ( aReturn.hasValue() == sal_True )
         return aReturn ;
@@ -2267,7 +2275,8 @@ uno::Any SAL_CALL OStorage::queryInterface( const uno::Type& rType )
             aReturn <<= ::cppu::queryInterface
                         (	rType
                         ,	static_cast ( this )
-                        ,	static_cast ( this ) );
+                        ,	static_cast ( this )
+                        ,	static_cast ( this ) );
         }
         else
         {
@@ -2322,10 +2331,12 @@ uno::Sequence< uno::Type > SAL_CALL OStorage::getTypes()
                     m_pData->m_pTypeCollection = new ::cppu::OTypeCollection
                                     (	::getCppuType( ( const uno::Reference< lang::XTypeProvider >* )NULL )
                                     ,	::getCppuType( ( const uno::Reference< embed::XStorage >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< embed::XStorage2 >* )NULL )
                                     ,	::getCppuType( ( const uno::Reference< embed::XStorageRawAccess >* )NULL )
                                     ,	::getCppuType( ( const uno::Reference< embed::XTransactedObject >* )NULL )
                                     ,	::getCppuType( ( const uno::Reference< embed::XTransactionBroadcaster >* )NULL )
                                     ,	::getCppuType( ( const uno::Reference< util::XModifiable >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< embed::XEncryptionProtectedSource2 >* )NULL )
                                     ,	::getCppuType( ( const uno::Reference< embed::XEncryptionProtectedSource >* )NULL )
                                     ,	::getCppuType( ( const uno::Reference< beans::XPropertySet >* )NULL ) );
                 }
@@ -2334,6 +2345,7 @@ uno::Sequence< uno::Type > SAL_CALL OStorage::getTypes()
                     m_pData->m_pTypeCollection = new ::cppu::OTypeCollection
                                     (	::getCppuType( ( const uno::Reference< lang::XTypeProvider >* )NULL )
                                     ,	::getCppuType( ( const uno::Reference< embed::XStorage >* )NULL )
+                                    ,	::getCppuType( ( const uno::Reference< embed::XStorage2 >* )NULL )
                                     ,	::getCppuType( ( const uno::Reference< embed::XStorageRawAccess >* )NULL )
                                     ,	::getCppuType( ( const uno::Reference< embed::XTransactedObject >* )NULL )
                                     ,	::getCppuType( ( const uno::Reference< embed::XTransactionBroadcaster >* )NULL )
@@ -2576,100 +2588,7 @@ uno::Reference< io::XStream > SAL_CALL OStorage::openEncryptedStreamElement(
 {
     RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::openEncryptedStreamElement" );
 
-    ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
-
-    if ( !m_pImpl )
-    {
-        ::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Disposed!" ) ) );
-        throw lang::DisposedException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
-    }
-
-    if ( m_pData->m_nStorageType != embed::StorageFormats::PACKAGE )
-        packages::NoEncryptionException();
-
-    if ( ( nOpenMode & embed::ElementModes::WRITE ) && m_pData->m_bReadOnlyWrap )
-        throw io::IOException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() ); // TODO: access denied
-
-    if ( !aPass.getLength() )
-        throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >(), 3 );
-
-    uno::Reference< io::XStream > xResult;
-    try
-    {
-        SotElement_Impl *pElement = OpenStreamElement_Impl( aStreamName, nOpenMode, sal_True );
-        OSL_ENSURE( pElement && pElement->m_pStream, "In case element can not be created an exception must be thrown!" );
-
-        xResult = pElement->m_pStream->GetStream( nOpenMode, aPass, sal_False );
-        OSL_ENSURE( xResult.is(), "The method must throw exception instead of removing empty result!\n" );
-
-        if ( m_pData->m_bReadOnlyWrap )
-        {
-            // before the storage disposes the stream it must deregister itself as listener
-            uno::Reference< lang::XComponent > xStreamComponent( xResult, uno::UNO_QUERY );
-            if ( !xStreamComponent.is() )
-                throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
-
-            MakeLinkToSubComponent_Impl( xStreamComponent );
-        }
-    }
-    catch( embed::InvalidStorageException& aInvalidStorageException )
-    {
-        m_pImpl->AddLog( aInvalidStorageException.Message );
-        m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) );
-        throw;
-    }
-    catch( lang::IllegalArgumentException& aIllegalArgumentException )
-    {
-        m_pImpl->AddLog( aIllegalArgumentException.Message );
-        m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) );
-        throw;
-    }
-    catch( packages::NoEncryptionException& aNoEncryptionException )
-    {
-        m_pImpl->AddLog( aNoEncryptionException.Message );
-        m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) );
-        throw;
-    }
-    catch( packages::WrongPasswordException& aWrongPasswordException )
-    {
-        m_pImpl->AddLog( aWrongPasswordException.Message );
-        m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) );
-        throw;
-    }
-    catch( embed::StorageWrappedTargetException& aStorageWrappedTargetException )
-    {
-        m_pImpl->AddLog( aStorageWrappedTargetException.Message );
-        m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) );
-        throw;
-    }
-    catch( io::IOException& aIOException )
-    {
-        m_pImpl->AddLog( aIOException.Message );
-        m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) );
-        throw;
-    }
-    catch( uno::RuntimeException& aRuntimeException )
-    {
-        m_pImpl->AddLog( aRuntimeException.Message );
-        m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) );
-        throw;
-    }
-    catch( uno::Exception& aException )
-    {
-          m_pImpl->AddLog( aException.Message );
-          m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) );
-
-          uno::Any aCaught( ::cppu::getCaughtException() );
-        throw embed::StorageWrappedTargetException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Can't open encrypted stream stream!" ) ),
-                                                 uno::Reference< io::XInputStream >(),
-                                                 aCaught );
-    }
-
-    aGuard.clear();
-
-    BroadcastModifiedIfNecessary();
-
-    return xResult;
+    return openEncryptedStream( aStreamName, nOpenMode, ::comphelper::OStorageHelper::CreatePackageEncryptionData( aPass ) );
 }
 
 //-----------------------------------------------
@@ -2856,7 +2775,7 @@ uno::Reference< io::XStream > SAL_CALL OStorage::cloneStreamElement( const ::rtl
     try
     {
         uno::Reference< io::XStream > xResult;
-        m_pImpl->CloneStreamElement( aStreamName, sal_False, ::rtl::OUString(), xResult );
+        m_pImpl->CloneStreamElement( aStreamName, sal_False, ::comphelper::SequenceAsHashMap(), xResult );
         if ( !xResult.is() )
             throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
         return xResult;
@@ -2923,80 +2842,7 @@ uno::Reference< io::XStream > SAL_CALL OStorage::cloneEncryptedStreamElement(
 {
     RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::cloneEncryptedStreamElement" );
 
-    ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
-
-    if ( !m_pImpl )
-    {
-        ::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Disposed!" ) ) );
-        throw lang::DisposedException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
-    }
-
-    if ( m_pData->m_nStorageType != embed::StorageFormats::PACKAGE )
-        packages::NoEncryptionException();
-
-    if ( !aPass.getLength() )
-        throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >(), 2 );
-
-    try
-    {
-        uno::Reference< io::XStream > xResult;
-        m_pImpl->CloneStreamElement( aStreamName, sal_True, aPass, xResult );
-        if ( !xResult.is() )
-            throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
-        return xResult;
-    }
-    catch( embed::InvalidStorageException& aInvalidStorageException )
-    {
-        m_pImpl->AddLog( aInvalidStorageException.Message );
-        m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) );
-        throw;
-    }
-    catch( lang::IllegalArgumentException& aIllegalArgumentException )
-    {
-        m_pImpl->AddLog( aIllegalArgumentException.Message );
-        m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) );
-        throw;
-    }
-    catch( packages::NoEncryptionException& aNoEncryptionException )
-    {
-        m_pImpl->AddLog( aNoEncryptionException.Message );
-        m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) );
-        throw;
-    }
-    catch( packages::WrongPasswordException& aWrongPasswordException )
-    {
-        m_pImpl->AddLog( aWrongPasswordException.Message );
-        m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) );
-        throw;
-    }
-    catch( io::IOException& aIOException )
-    {
-        m_pImpl->AddLog( aIOException.Message );
-        m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) );
-        throw;
-    }
-    catch( embed::StorageWrappedTargetException& aStorageWrappedTargetException )
-    {
-        m_pImpl->AddLog( aStorageWrappedTargetException.Message );
-        m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) );
-        throw;
-    }
-    catch( uno::RuntimeException& aRuntimeException )
-    {
-        m_pImpl->AddLog( aRuntimeException.Message );
-        m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) );
-        throw;
-    }
-    catch( uno::Exception& aException )
-    {
-          m_pImpl->AddLog( aException.Message );
-          m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) );
-
-          uno::Any aCaught( ::cppu::getCaughtException() );
-        throw embed::StorageWrappedTargetException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Can't clone encrypted stream!" ) ),
-                                                 uno::Reference< io::XInputStream >(),
-                                                 aCaught );
-    }
+    return cloneEncryptedStream( aStreamName, ::comphelper::OStorageHelper::CreatePackageEncryptionData( aPass ) );
 }
 
 //-----------------------------------------------
@@ -3720,6 +3566,210 @@ void SAL_CALL OStorage::moveElementTo(	const ::rtl::OUString& aElementName,
     BroadcastModifiedIfNecessary();
 }
 
+//____________________________________________________________________________________________________
+//	XStorage2
+//____________________________________________________________________________________________________
+
+//-----------------------------------------------
+uno::Reference< io::XStream > SAL_CALL OStorage::openEncryptedStream( 
+    const ::rtl::OUString& aStreamName, sal_Int32 nOpenMode, const uno::Sequence< beans::NamedValue >& aEncryptionData )
+        throw ( embed::InvalidStorageException,
+                lang::IllegalArgumentException,
+                packages::NoEncryptionException,
+                packages::WrongPasswordException,
+                io::IOException,
+                embed::StorageWrappedTargetException,
+                uno::RuntimeException )
+{
+    RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::openEncryptedStream" );
+
+    ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
+
+    if ( !m_pImpl )
+    {
+        ::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Disposed!" ) ) );
+        throw lang::DisposedException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
+    }
+
+    if ( m_pData->m_nStorageType != embed::StorageFormats::PACKAGE )
+        packages::NoEncryptionException();
+
+    if ( ( nOpenMode & embed::ElementModes::WRITE ) && m_pData->m_bReadOnlyWrap )
+        throw io::IOException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() ); // TODO: access denied
+
+    if ( !aEncryptionData.getLength() )
+        throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >(), 3 );
+
+    uno::Reference< io::XStream > xResult;
+    try
+    {
+        SotElement_Impl *pElement = OpenStreamElement_Impl( aStreamName, nOpenMode, sal_True );
+        OSL_ENSURE( pElement && pElement->m_pStream, "In case element can not be created an exception must be thrown!" );
+
+        xResult = pElement->m_pStream->GetStream( nOpenMode, aEncryptionData, sal_False );
+        OSL_ENSURE( xResult.is(), "The method must throw exception instead of removing empty result!\n" );
+
+        if ( m_pData->m_bReadOnlyWrap )
+        {
+            // before the storage disposes the stream it must deregister itself as listener
+            uno::Reference< lang::XComponent > xStreamComponent( xResult, uno::UNO_QUERY );
+            if ( !xStreamComponent.is() )
+                throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
+
+            MakeLinkToSubComponent_Impl( xStreamComponent );
+        }
+    }
+    catch( embed::InvalidStorageException& aInvalidStorageException )
+    {
+        m_pImpl->AddLog( aInvalidStorageException.Message );
+        m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) );
+        throw;
+    }
+    catch( lang::IllegalArgumentException& aIllegalArgumentException )
+    {
+        m_pImpl->AddLog( aIllegalArgumentException.Message );
+        m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) );
+        throw;
+    }
+    catch( packages::NoEncryptionException& aNoEncryptionException )
+    {
+        m_pImpl->AddLog( aNoEncryptionException.Message );
+        m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) );
+        throw;
+    }
+    catch( packages::WrongPasswordException& aWrongPasswordException )
+    {
+        m_pImpl->AddLog( aWrongPasswordException.Message );
+        m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) );
+        throw;
+    }
+    catch( embed::StorageWrappedTargetException& aStorageWrappedTargetException )
+    {
+        m_pImpl->AddLog( aStorageWrappedTargetException.Message );
+        m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) );
+        throw;
+    }
+    catch( io::IOException& aIOException )
+    {
+        m_pImpl->AddLog( aIOException.Message );
+        m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) );
+        throw;
+    }
+    catch( uno::RuntimeException& aRuntimeException )
+    {
+        m_pImpl->AddLog( aRuntimeException.Message );
+        m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) );
+        throw;
+    }
+    catch( uno::Exception& aException )
+    {
+          m_pImpl->AddLog( aException.Message );
+          m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) );
+
+          uno::Any aCaught( ::cppu::getCaughtException() );
+        throw embed::StorageWrappedTargetException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Can't open encrypted stream stream!" ) ),
+                                                 uno::Reference< io::XInputStream >(),
+                                                 aCaught );
+    }
+
+    aGuard.clear();
+
+    BroadcastModifiedIfNecessary();
+
+    return xResult;
+}
+
+//-----------------------------------------------
+uno::Reference< io::XStream > SAL_CALL OStorage::cloneEncryptedStream(
+    const ::rtl::OUString& aStreamName,
+    const uno::Sequence< beans::NamedValue >& aEncryptionData )
+        throw ( embed::InvalidStorageException,
+                lang::IllegalArgumentException,
+                packages::NoEncryptionException,
+                packages::WrongPasswordException,
+                io::IOException,
+                embed::StorageWrappedTargetException,
+                uno::RuntimeException )
+{
+    RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::cloneEncryptedStream" );
+
+    ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
+
+    if ( !m_pImpl )
+    {
+        ::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Disposed!" ) ) );
+        throw lang::DisposedException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
+    }
+
+    if ( m_pData->m_nStorageType != embed::StorageFormats::PACKAGE )
+        packages::NoEncryptionException();
+
+    if ( !aEncryptionData.getLength() )
+        throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >(), 2 );
+
+    try
+    {
+        uno::Reference< io::XStream > xResult;
+        m_pImpl->CloneStreamElement( aStreamName, sal_True, aEncryptionData, xResult );
+        if ( !xResult.is() )
+            throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
+        return xResult;
+    }
+    catch( embed::InvalidStorageException& aInvalidStorageException )
+    {
+        m_pImpl->AddLog( aInvalidStorageException.Message );
+        m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) );
+        throw;
+    }
+    catch( lang::IllegalArgumentException& aIllegalArgumentException )
+    {
+        m_pImpl->AddLog( aIllegalArgumentException.Message );
+        m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) );
+        throw;
+    }
+    catch( packages::NoEncryptionException& aNoEncryptionException )
+    {
+        m_pImpl->AddLog( aNoEncryptionException.Message );
+        m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) );
+        throw;
+    }
+    catch( packages::WrongPasswordException& aWrongPasswordException )
+    {
+        m_pImpl->AddLog( aWrongPasswordException.Message );
+        m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) );
+        throw;
+    }
+    catch( io::IOException& aIOException )
+    {
+        m_pImpl->AddLog( aIOException.Message );
+        m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) );
+        throw;
+    }
+    catch( embed::StorageWrappedTargetException& aStorageWrappedTargetException )
+    {
+        m_pImpl->AddLog( aStorageWrappedTargetException.Message );
+        m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) );
+        throw;
+    }
+    catch( uno::RuntimeException& aRuntimeException )
+    {
+        m_pImpl->AddLog( aRuntimeException.Message );
+        m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) );
+        throw;
+    }
+    catch( uno::Exception& aException )
+    {
+          m_pImpl->AddLog( aException.Message );
+          m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) );
+
+          uno::Any aCaught( ::cppu::getCaughtException() );
+        throw embed::StorageWrappedTargetException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Can't clone encrypted stream!" ) ),
+                                                 uno::Reference< io::XInputStream >(),
+                                                 aCaught );
+    }
+}
+
+
 //____________________________________________________________________________________________________
 //	XStorageRawAccess
 //____________________________________________________________________________________________________
@@ -4608,6 +4658,15 @@ void SAL_CALL OStorage::setEncryptionPassword( const ::rtl::OUString& aPass )
             io::IOException )
 {
     RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::setEncryptionPassword" );
+    setEncryptionData( ::comphelper::OStorageHelper::CreatePackageEncryptionData( aPass ) );
+}
+
+//-----------------------------------------------
+void SAL_CALL OStorage::removeEncryption()
+    throw ( uno::RuntimeException,
+            io::IOException )
+{
+    RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::removeEncryption" );
 
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -4620,12 +4679,11 @@ void SAL_CALL OStorage::setEncryptionPassword( const ::rtl::OUString& aPass )
     if ( m_pData->m_nStorageType != embed::StorageFormats::PACKAGE )
         throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() ); // the interface must be visible only for package storage
 
-    OSL_ENSURE( m_pData->m_bIsRoot, "setEncryptionPassword() method is not available for nonroot storages!\n" );
-
+    OSL_ENSURE( m_pData->m_bIsRoot, "removeEncryption() method is not available for nonroot storages!\n" );
     if ( m_pData->m_bIsRoot )
     {
         try {
-            m_pImpl->ReadContents(); 
+            m_pImpl->ReadContents();
         }
         catch ( uno::RuntimeException& aRuntimeException )
         {
@@ -4639,12 +4697,15 @@ void SAL_CALL OStorage::setEncryptionPassword( const ::rtl::OUString& aPass )
             m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) );
 
             uno::Any aCaught( ::cppu::getCaughtException() );
-            throw lang::WrappedTargetException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Can not open package!\n" ) ),
+            throw lang::WrappedTargetRuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Can not open package!\n" ) ),
                                                 uno::Reference< uno::XInterface >(  static_cast< OWeakObject* >( this ),
                                                                                     uno::UNO_QUERY ),
                                                 aCaught );
         }
-        
+
+        // TODO: check if the password is valid
+        // update all streams that was encrypted with old password
+
         uno::Reference< beans::XPropertySet > xPackPropSet( m_pImpl->m_xPackage, uno::UNO_QUERY );
         if ( !xPackPropSet.is() )
             throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
@@ -4652,10 +4713,10 @@ void SAL_CALL OStorage::setEncryptionPassword( const ::rtl::OUString& aPass )
         try
         {
             xPackPropSet->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EncryptionKey" ) ),
-                                            uno::makeAny( ::package::MakeKeyFromPass( aPass, sal_True ) ) );
+                                            uno::makeAny( uno::Sequence< sal_Int8 >() ) );
 
-            m_pImpl->m_bHasCommonPassword = sal_True;
-            m_pImpl->m_aCommonPassword = aPass;
+            m_pImpl->m_bHasCommonEncryptionData = sal_False;
+            m_pImpl->m_aCommonEncryptionData.clear();
         }
         catch( uno::Exception& aException )
         {
@@ -4668,12 +4729,15 @@ void SAL_CALL OStorage::setEncryptionPassword( const ::rtl::OUString& aPass )
     }
 }
 
-//-----------------------------------------------
-void SAL_CALL OStorage::removeEncryption()
-    throw ( uno::RuntimeException,
-            io::IOException )
+//____________________________________________________________________________________________________
+//	XEncryptionProtectedSource2
+//____________________________________________________________________________________________________
+
+void SAL_CALL OStorage::setEncryptionData( const uno::Sequence< beans::NamedValue >& aEncryptionData )
+    throw ( io::IOException,
+            uno::RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::removeEncryption" );
+    RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::setEncryptionData" );
 
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -4686,12 +4750,14 @@ void SAL_CALL OStorage::removeEncryption()
     if ( m_pData->m_nStorageType != embed::StorageFormats::PACKAGE )
         throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() ); // the interface must be visible only for package storage
 
-    OSL_ENSURE( m_pData->m_bIsRoot, "removeEncryption() method is not available for nonroot storages!\n" );
+    if ( !aEncryptionData.getLength() )
+        throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Unexpected empty encryption data!") ), uno::Reference< uno::XInterface >() );
 
+    OSL_ENSURE( m_pData->m_bIsRoot, "setEncryptionData() method is not available for nonroot storages!\n" );
     if ( m_pData->m_bIsRoot )
     {
         try {
-            m_pImpl->ReadContents();
+            m_pImpl->ReadContents(); 
         }
         catch ( uno::RuntimeException& aRuntimeException )
         {
@@ -4705,38 +4771,37 @@ void SAL_CALL OStorage::removeEncryption()
             m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) );
 
             uno::Any aCaught( ::cppu::getCaughtException() );
-            throw lang::WrappedTargetRuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Can not open package!\n" ) ),
+            throw lang::WrappedTargetException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Can not open package!\n" ) ),
                                                 uno::Reference< uno::XInterface >(  static_cast< OWeakObject* >( this ),
                                                                                     uno::UNO_QUERY ),
                                                 aCaught );
         }
-
-        // TODO: check if the password is valid
-        // update all streams that was encrypted with old password
-
+        
         uno::Reference< beans::XPropertySet > xPackPropSet( m_pImpl->m_xPackage, uno::UNO_QUERY );
         if ( !xPackPropSet.is() )
             throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
 
         try
         {
+            ::comphelper::SequenceAsHashMap aEncryptionMap( aEncryptionData );
             xPackPropSet->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EncryptionKey" ) ),
-                                            uno::makeAny( uno::Sequence< sal_Int8 >() ) );
+                                            uno::makeAny( aEncryptionMap.getUnpackedValueOrDefault( PACKAGE_ENCRYPTIONDATA_SHA1UTF8, uno::Sequence< sal_Int8 >() ) ) );
 
-            m_pImpl->m_bHasCommonPassword = sal_False;
-            m_pImpl->m_aCommonPassword = ::rtl::OUString();
+            m_pImpl->m_bHasCommonEncryptionData = sal_True;
+            m_pImpl->m_aCommonEncryptionData = aEncryptionMap;
         }
         catch( uno::Exception& aException )
         {
             m_pImpl->AddLog( aException.Message );
             m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) );
 
-            OSL_ENSURE( sal_False, "The call must not fail, it is pretty simple!" );
             throw io::IOException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
         }
     }
+
 }
 
+
 //____________________________________________________________________________________________________
 //	XPropertySet
 //____________________________________________________________________________________________________
@@ -5954,7 +6019,7 @@ void SAL_CALL OStorage::copyStreamElementData( const ::rtl::OUString& aStreamNam
     try
     {
         uno::Reference< io::XStream > xNonconstRef = xTargetStream;
-        m_pImpl->CloneStreamElement( aStreamName, sal_False, ::rtl::OUString(), xNonconstRef );
+        m_pImpl->CloneStreamElement( aStreamName, sal_False, ::comphelper::SequenceAsHashMap(), xNonconstRef );
 
         OSL_ENSURE( xNonconstRef == xTargetStream, "The provided stream reference seems not be filled in correctly!\n" );
         if ( xNonconstRef != xTargetStream )
@@ -6082,6 +6147,55 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openEncrypted
                 io::IOException,
                 embed::StorageWrappedTargetException,
                 uno::RuntimeException )
+{
+    return openEncryptedStreamByHierarchicalName( aStreamPath, nOpenMode, ::comphelper::OStorageHelper::CreatePackageEncryptionData( sPassword ) );
+}
+
+//-----------------------------------------------
+void SAL_CALL OStorage::removeStreamElementByHierarchicalName( const ::rtl::OUString& aStreamPath ) 
+        throw ( embed::InvalidStorageException,
+                lang::IllegalArgumentException,
+                container::NoSuchElementException,
+                io::IOException,
+                embed::StorageWrappedTargetException,
+                uno::RuntimeException )
+{
+    ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
+
+    if ( !m_pImpl )
+    {
+        ::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Disposed!" ) ) );
+        throw lang::DisposedException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
+    }
+
+    if ( !aStreamPath.getLength() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aStreamPath, sal_True ) )
+        throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Unexpected entry name syntax." ) ), uno::Reference< uno::XInterface >(), 1 );
+
+    if ( !( m_pImpl->m_nStorageMode & embed::ElementModes::WRITE ) )
+        throw io::IOException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() ); // Access denied
+
+    OStringList_Impl aListPath = OHierarchyHolder_Impl::GetListPathFromString( aStreamPath );
+    OSL_ENSURE( aListPath.size(), "The result list must not be empty!" );
+
+    if ( !m_pData->m_rHierarchyHolder.is() )
+        m_pData->m_rHierarchyHolder = new OHierarchyHolder_Impl(
+            uno::Reference< embed::XStorage >( static_cast< embed::XStorage* >( this ) ) );
+
+    m_pData->m_rHierarchyHolder->RemoveStreamHierarchically( aListPath );
+}
+
+//____________________________________________________________________________________________________
+// XHierarchicalStorageAccess2
+//____________________________________________________________________________________________________
+
+uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openEncryptedStreamByHierarchicalName( const ::rtl::OUString& aStreamPath, ::sal_Int32 nOpenMode, const uno::Sequence< beans::NamedValue >& aEncryptionData ) 
+        throw ( embed::InvalidStorageException,
+                lang::IllegalArgumentException,
+                packages::NoEncryptionException,
+                packages::WrongPasswordException,
+                io::IOException,
+                embed::StorageWrappedTargetException,
+                uno::RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
 
@@ -6097,7 +6211,7 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openEncrypted
     if ( !aStreamPath.getLength() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aStreamPath, sal_True ) )
         throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Unexpected entry name syntax." ) ), uno::Reference< uno::XInterface >(), 1 );
 
-    if ( !sPassword.getLength() )
+    if ( !aEncryptionData.getLength() )
         throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >(), 3 );
 
     if ( !( m_pImpl->m_nStorageMode & embed::ElementModes::WRITE )
@@ -6117,7 +6231,7 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openEncrypted
         OSL_ENSURE( pElement && pElement->m_pStream, "In case element can not be created an exception must be thrown!" );
 
         xResult = uno::Reference< embed::XExtendedStorageStream >(
-                        pElement->m_pStream->GetStream( nOpenMode, sPassword, sal_True ),
+                        pElement->m_pStream->GetStream( nOpenMode, aEncryptionData, sal_True ),
                         uno::UNO_QUERY_THROW );
     }
     else
@@ -6131,7 +6245,7 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openEncrypted
                                                 ( m_pImpl->m_nStorageMode & embed::ElementModes::READWRITE ),
                                                 aListPath,
                                                 nOpenMode,
-                                                sPassword );
+                                                aEncryptionData );
     }
 
     if ( !xResult.is() )
@@ -6140,36 +6254,4 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openEncrypted
     return xResult;
 }
 
-//-----------------------------------------------
-void SAL_CALL OStorage::removeStreamElementByHierarchicalName( const ::rtl::OUString& aStreamPath ) 
-        throw ( embed::InvalidStorageException,
-                lang::IllegalArgumentException,
-                container::NoSuchElementException,
-                io::IOException,
-                embed::StorageWrappedTargetException,
-                uno::RuntimeException )
-{
-    ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
-
-    if ( !m_pImpl )
-    {
-        ::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Disposed!" ) ) );
-        throw lang::DisposedException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
-    }
-
-    if ( !aStreamPath.getLength() || !::comphelper::OStorageHelper::IsValidZipEntryFileName( aStreamPath, sal_True ) )
-        throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Unexpected entry name syntax." ) ), uno::Reference< uno::XInterface >(), 1 );
-
-    if ( !( m_pImpl->m_nStorageMode & embed::ElementModes::WRITE ) )
-        throw io::IOException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() ); // Access denied
-
-    OStringList_Impl aListPath = OHierarchyHolder_Impl::GetListPathFromString( aStreamPath );
-    OSL_ENSURE( aListPath.size(), "The result list must not be empty!" );
-
-    if ( !m_pData->m_rHierarchyHolder.is() )
-        m_pData->m_rHierarchyHolder = new OHierarchyHolder_Impl(
-            uno::Reference< embed::XStorage >( static_cast< embed::XStorage* >( this ) ) );
-
-    m_pData->m_rHierarchyHolder->RemoveStreamHierarchically( aListPath );
-}
 
diff --git a/package/source/xstor/xstorage.hxx b/package/source/xstor/xstorage.hxx
index 52ea8b7d0..a6eda49e4 100644
--- a/package/source/xstor/xstorage.hxx
+++ b/package/source/xstor/xstorage.hxx
@@ -29,14 +29,14 @@
 #define __XSTORAGE_HXX_
 
 #include 
-#include 
+#include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -52,8 +52,10 @@
 #include 
 #include 
 #include 
+
 #include 
 #include 
+#include 
 
 #include "mutexholder.hxx"
 
@@ -157,8 +159,8 @@ struct OStorage_Impl
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > m_xInputStream; // ??? may be stored in properties
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > m_xStream; // ??? may be stored in properties
     ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_xProperties;
-    sal_Bool m_bHasCommonPassword;
-    ::rtl::OUString m_aCommonPassword;
+    sal_Bool m_bHasCommonEncryptionData;
+    ::comphelper::SequenceAsHashMap m_aCommonEncryptionData;
 
     // must be empty in case of root storage
     OStorage_Impl* m_pParent;
@@ -231,7 +233,7 @@ struct OStorage_Impl
     void Commit();
     void Revert();
 
-    ::rtl::OUString GetCommonRootPass() throw ( ::com::sun::star::packages::NoEncryptionException );
+    ::comphelper::SequenceAsHashMap GetCommonRootEncryptionData() throw ( ::com::sun::star::packages::NoEncryptionException );
 
     void CopyToStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xDest,
                         sal_Bool bDirect );
@@ -264,7 +266,7 @@ struct OStorage_Impl
     void CloneStreamElement(
                     const ::rtl::OUString& aStreamName,
                     sal_Bool bPassProvided,
-                    const ::rtl::OUString& aPass,
+                    const ::comphelper::SequenceAsHashMap& aEncryptionData,
                     ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xTargetStream )
         throw ( ::com::sun::star::embed::InvalidStorageException,
                 ::com::sun::star::lang::IllegalArgumentException,
@@ -289,18 +291,18 @@ struct OStorage_Impl
 
 
 class OStorage	: public ::com::sun::star::lang::XTypeProvider
-                , public ::com::sun::star::embed::XStorage
+                , public ::com::sun::star::embed::XStorage2
                 , public ::com::sun::star::embed::XStorageRawAccess
                 , public ::com::sun::star::embed::XTransactedObject
                 , public ::com::sun::star::embed::XTransactionBroadcaster
                 , public ::com::sun::star::util::XModifiable
                 // , public ::com::sun::star::container::XNameAccess
                 // , public ::com::sun::star::lang::XComponent
-                , public ::com::sun::star::embed::XEncryptionProtectedSource
+                , public ::com::sun::star::embed::XEncryptionProtectedSource2
                 , public ::com::sun::star::beans::XPropertySet
                 , public ::com::sun::star::embed::XOptimizedStorage
                 , public ::com::sun::star::embed::XRelationshipAccess
-                , public ::com::sun::star::embed::XHierarchicalStorageAccess
+                , public ::com::sun::star::embed::XHierarchicalStorageAccess2
                 , public ::cppu::OWeakObject
 {
     OStorage_Impl*	m_pImpl;
@@ -489,6 +491,28 @@ public:
                 ::com::sun::star::embed::StorageWrappedTargetException,
                 ::com::sun::star::uno::RuntimeException );
 
+    //____________________________________________________________________________________________________
+    //	XStorage2
+    //____________________________________________________________________________________________________
+
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL openEncryptedStream( const ::rtl::OUString& sStreamName, ::sal_Int32 nOpenMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aEncryptionData )
+        throw ( ::com::sun::star::embed::InvalidStorageException,
+                ::com::sun::star::lang::IllegalArgumentException,
+                ::com::sun::star::packages::NoEncryptionException,
+                ::com::sun::star::packages::WrongPasswordException,
+                ::com::sun::star::io::IOException,
+                ::com::sun::star::embed::StorageWrappedTargetException,
+                ::com::sun::star::uno::RuntimeException);
+
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL cloneEncryptedStream( const ::rtl::OUString& sStreamName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aEncryptionData )
+        throw ( ::com::sun::star::embed::InvalidStorageException,
+                ::com::sun::star::lang::IllegalArgumentException,
+                ::com::sun::star::packages::NoEncryptionException,
+                ::com::sun::star::packages::WrongPasswordException,
+                ::com::sun::star::io::IOException,
+                ::com::sun::star::embed::StorageWrappedTargetException,
+                ::com::sun::star::uno::RuntimeException);
+
     //____________________________________________________________________________________________________
     //	XStorageRawAccess
     //____________________________________________________________________________________________________
@@ -615,6 +639,16 @@ public:
         throw ( ::com::sun::star::uno::RuntimeException,
                 ::com::sun::star::io::IOException );
 
+    //____________________________________________________________________________________________________
+    //  XEncryptionProtectedSource2
+    //____________________________________________________________________________________________________
+
+    virtual void SAL_CALL setEncryptionData(
+            const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aEncryptionData )
+        throw ( ::com::sun::star::io::IOException,
+                ::com::sun::star::uno::RuntimeException );
+
+
     //____________________________________________________________________________________________________
     //	XPropertySet
     //____________________________________________________________________________________________________
@@ -800,6 +834,18 @@ public:
                 ::com::sun::star::embed::StorageWrappedTargetException,
                 ::com::sun::star::uno::RuntimeException);
 
+    //____________________________________________________________________________________________________
+    // XHierarchicalStorageAccess2
+    //____________________________________________________________________________________________________
+
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XExtendedStorageStream > SAL_CALL openEncryptedStreamByHierarchicalName( const ::rtl::OUString& sStreamName, ::sal_Int32 nOpenMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aEncryptionData )
+        throw ( ::com::sun::star::embed::InvalidStorageException,
+                ::com::sun::star::lang::IllegalArgumentException,
+                ::com::sun::star::packages::NoEncryptionException,
+                ::com::sun::star::packages::WrongPasswordException,
+                ::com::sun::star::io::IOException,
+                ::com::sun::star::embed::StorageWrappedTargetException,
+                ::com::sun::star::uno::RuntimeException );
 };
 
 
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx
index cb2224ba5..e374f0c64 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -1650,7 +1650,7 @@ void SAL_CALL ZipPackage::setPropertyValue( const OUString& aPropertyName, const
         throw PropertyVetoException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
     else if (aPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("EncryptionKey") ) )
     {
-        if (!( aValue >>= m_aEncryptionKey ) )
+        if (!( aValue >>= m_aEncryptionKey ) || m_aEncryptionKey.getLength() == 0 )
             throw IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >(), 2 );
     }
     else if (aPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("UseManifest") ) )
-- 
cgit v1.2.3


From 6cf5dc5b1987ff715904c40cc0bdf58bb680a5a3 Mon Sep 17 00:00:00 2001
From: Ingo Schmidt 
Date: Tue, 16 Nov 2010 17:50:25 +0100
Subject: native347 #163968# Java Installer with products in different versions

---
 .../src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java          | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java
index e869254f4..4cef39405 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java
@@ -337,7 +337,9 @@ public class ModuleCtrl {
             }
             else {
                 if ( isInstalled ) {
-                    if ( packageData.isJavaPackage() ) {   // only selected checks, because of performance reasons
+                    // Maybe a required core module is installed in an older version from another product
+                    boolean isRequiredCoreModule = checkRequiredCoreModule(packageData);
+                    if (( packageData.isJavaPackage() ) || ( isRequiredCoreModule )) {   // only selected checks, because of performance reasons
                         boolean installedPackageIsOlder = installer.isInstalledPackageOlder(packageData, installData);
                         if ( ! installedPackageIsOlder ) {
                             // The package is already installed in the same or in a newer version
@@ -345,6 +347,7 @@ public class ModuleCtrl {
                         } else {
                             // This is also something like migrating feature states
                             packageData.setSelectionState(PackageDescription.INSTALL); 
+                            LogManager.addLogfileComment("Adding required older installed package: " + packageData.getPackageName() + "
");                        
                         }
                     } else {  // no version check done -> so what is a good setting for already installed packages?
                         if ( installData.olderVersionExists() ) {  // should never be the case in this function
-- 
cgit v1.2.3


From 88570b51be7e472f2304d867da74d28fb1d8b95c Mon Sep 17 00:00:00 2001
From: Ingo Schmidt 
Date: Tue, 16 Nov 2010 17:54:07 +0100
Subject: native347 #i115537# mac langpack offers no longer mounted volumes

---
 .../scripts/osx_install_languagepack.applescript   | 38 ++++++++++++++++++----
 setup_native/scripts/osx_install_patch.applescript | 38 ++++++++++++++++++----
 2 files changed, 64 insertions(+), 12 deletions(-)

diff --git a/setup_native/scripts/osx_install_languagepack.applescript b/setup_native/scripts/osx_install_languagepack.applescript
index 9fb4bdacb..68c31b709 100644
--- a/setup_native/scripts/osx_install_languagepack.applescript
+++ b/setup_native/scripts/osx_install_languagepack.applescript
@@ -45,13 +45,38 @@ if (button returned of result) is AbortLabel then
 	return 2
 end if
 
-set the found_ooos to (do shell script "mdfind \"kMDItemContentType == 'com.apple.application-bundle' && kMDItemDisplayName == '[PRODUCTNAME]*' && kMDItemDisplayName != '[FULLAPPPRODUCTNAME].app'\"") & "
+set the found_ooos_all to (do shell script "mdfind \"kMDItemContentType == 'com.apple.application-bundle' && kMDItemDisplayName == '[PRODUCTNAME]*' && kMDItemDisplayName != '[FULLAPPPRODUCTNAME].app'\"") & "
 " & chooseMyOwn
 
+set found_ooos_all_paragraphs to paragraphs in found_ooos_all
+
+set found_ooos to {}
+repeat with currentApp in found_ooos_all_paragraphs
+	if currentApp does not start with "/Volumes" then
+		copy currentApp to the end of found_ooos
+	end if
+end repeat
+
+-- repeat with oneApp in found_ooos
+--  display dialog oneApp
+-- end repeat
+
 -- the choice returned is of type "list"
 -- Show selection dialog only if more than one or no product was found
-if (get first paragraph of found_ooos) is "" then
-  set the choice to (choose from list of paragraphs in found_ooos default items (get last paragraph of found_ooos) with prompt listPrompt OK button name listOKLabel cancel button name listCancelLabel)
+-- The first item is an empty string, if no app was found and no app started with "/Volumes"
+-- The first item is chooseMyOwn, if no app was found and at least one app started with "/Volumes"
+if (get first item of found_ooos as string) is "" then
+  set the choice to (choose from list found_ooos default items (get second item of found_ooos) with prompt listPrompt OK button name listOKLabel cancel button name listCancelLabel)
+  if choice is false then
+	  -- do nothing, the user cancelled the installation
+    	return 2 --aborted by user
+  else if (choice as string) is chooseMyOwn then
+	  -- yeah, one needs to use "choose file", otherwise
+	  -- the user would not be able to select the .app
+	  set the choice to POSIX path of (choose file with prompt chooseManual of type "com.apple.application-bundle" without showing package contents and invisibles)
+  end if
+else if (get first item of found_ooos as string) is chooseMyOwn then
+  set the choice to (choose from list found_ooos default items (get first item of found_ooos) with prompt listPrompt OK button name listOKLabel cancel button name listCancelLabel)
   if choice is false then
 	  -- do nothing, the user cancelled the installation
     	return 2 --aborted by user
@@ -60,11 +85,12 @@ if (get first paragraph of found_ooos) is "" then
 	  -- the user would not be able to select the .app
 	  set the choice to POSIX path of (choose file with prompt chooseManual of type "com.apple.application-bundle" without showing package contents and invisibles)
   end if
-else if (get second paragraph of found_ooos) is chooseMyOwn then
+else if (get second item of found_ooos as string) is chooseMyOwn then
   -- set choice to found installation
-  set the choice to (get first paragraph of found_ooos)
+  -- set the choice to (get first paragraph of found_ooos)
+  set the choice to (get first item of found_ooos)
 else 
-  set the choice to (choose from list of paragraphs in found_ooos default items (get first paragraph of found_ooos) with prompt listPrompt OK button name listOKLabel cancel button name listCancelLabel)
+  set the choice to (choose from list found_ooos default items (get first item of found_ooos) with prompt listPrompt OK button name listOKLabel cancel button name listCancelLabel)
   if choice is false then
 	  -- do nothing, the user cancelled the installation
     	return 2 --aborted by user
diff --git a/setup_native/scripts/osx_install_patch.applescript b/setup_native/scripts/osx_install_patch.applescript
index e9dbd442d..fc12f2010 100644
--- a/setup_native/scripts/osx_install_patch.applescript
+++ b/setup_native/scripts/osx_install_patch.applescript
@@ -43,13 +43,38 @@ if (button returned of result) is AbortLabel then
 	return 2
 end if
 
-set the found_ooos to (do shell script "mdfind \"kMDItemContentType == 'com.apple.application-bundle' && kMDItemDisplayName == '[PRODUCTNAME]*' && kMDItemDisplayName != '[FULLAPPPRODUCTNAME].app'\"") & "
+set the found_ooos_all to (do shell script "mdfind \"kMDItemContentType == 'com.apple.application-bundle' && kMDItemDisplayName == '[PRODUCTNAME]*' && kMDItemDisplayName != '[FULLAPPPRODUCTNAME].app'\"") & "
 " & chooseMyOwn
 
+set found_ooos_all_paragraphs to paragraphs in found_ooos_all
+
+set found_ooos to {}
+repeat with currentApp in found_ooos_all_paragraphs
+	if currentApp does not start with "/Volumes" then
+		copy currentApp to the end of found_ooos
+	end if
+end repeat
+
+-- repeat with oneApp in found_ooos
+--  display dialog oneApp
+-- end repeat
+
 -- the choice returned is of type "list"
 -- Show selection dialog only if more than one or no product was found
-if (get first paragraph of found_ooos) is "" then
-  set the choice to (choose from list of paragraphs in found_ooos default items (get last paragraph of found_ooos) with prompt listPrompt OK button name listOKLabel cancel button name listCancelLabel)
+-- The first item is an empty string, if no app was found and no app started with "/Volumes"
+-- The first item is chooseMyOwn, if no app was found and at least one app started with "/Volumes"
+if (get first item of found_ooos as string) is "" then
+  set the choice to (choose from list found_ooos default items (get second item of found_ooos) with prompt listPrompt OK button name listOKLabel cancel button name listCancelLabel)
+  if choice is false then
+	  -- do nothing, the user cancelled the installation
+    	return 2 --aborted by user
+  else if (choice as string) is chooseMyOwn then
+	  -- yeah, one needs to use "choose file", otherwise
+	  -- the user would not be able to select the .app
+	  set the choice to POSIX path of (choose file with prompt chooseManual of type "com.apple.application-bundle" without showing package contents and invisibles)
+  end if
+else if (get first item of found_ooos as string) is chooseMyOwn then
+  set the choice to (choose from list found_ooos default items (get first item of found_ooos) with prompt listPrompt OK button name listOKLabel cancel button name listCancelLabel)
   if choice is false then
 	  -- do nothing, the user cancelled the installation
     	return 2 --aborted by user
@@ -58,11 +83,12 @@ if (get first paragraph of found_ooos) is "" then
 	  -- the user would not be able to select the .app
 	  set the choice to POSIX path of (choose file with prompt chooseManual of type "com.apple.application-bundle" without showing package contents and invisibles)
   end if
-else if (get second paragraph of found_ooos) is chooseMyOwn then
+else if (get second item of found_ooos as string) is chooseMyOwn then
   -- set choice to found installation
-  set the choice to (get first paragraph of found_ooos)
+  -- set the choice to (get first paragraph of found_ooos)
+  set the choice to (get first item of found_ooos)
 else 
-  set the choice to (choose from list of paragraphs in found_ooos default items (get first paragraph of found_ooos) with prompt listPrompt OK button name listOKLabel cancel button name listCancelLabel)
+  set the choice to (choose from list found_ooos default items (get first item of found_ooos) with prompt listPrompt OK button name listOKLabel cancel button name listCancelLabel)
   if choice is false then
 	  -- do nothing, the user cancelled the installation
     	return 2 --aborted by user
-- 
cgit v1.2.3


From 106db4217cb6783e416dd150fdfa692abb231307 Mon Sep 17 00:00:00 2001
From: Ingo Schmidt 
Date: Thu, 18 Nov 2010 14:44:07 +0100
Subject: native349 #i115652# language independent Wizard bitmaps

---
 wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java | 4 ++--
 wizards/com/sun/star/wizards/common/Desktop.java                | 4 ++--
 wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java       | 2 +-
 wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java | 2 +-
 wizards/com/sun/star/wizards/web/FTPDialog.java                 | 2 +-
 wizards/com/sun/star/wizards/web/WWD_Startup.java               | 2 +-
 wizards/source/euro/Init.xba                                    | 2 +-
 wizards/source/formwizard/tools.xba                             | 2 +-
 wizards/source/importwizard/Main.xba                            | 2 +-
 wizards/source/schedule/CalendarMain.xba                        | 2 +-
 wizards/source/template/Samples.xba                             | 2 +-
 wizards/source/tutorials/Functions.xba                          | 8 ++++----
 wizards/source/tutorials/ShowInfoDialog.xba                     | 4 ++--
 wizards/source/webwizard/Language.xba                           | 2 +-
 14 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java
index 963b3002a..0db26d493 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java
+++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java
@@ -213,7 +213,7 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog
         try {
             sTemplatePath = FileAccess.getOfficePath(xMSF, "Template", "share", "/wizard");
             sUserTemplatePath = FileAccess.getOfficePath(xMSF, "Template", "user", "");
-            sBitmapPath = FileAccess.combinePaths(xMSF, sTemplatePath, "/wizard/bitmap");
+            sBitmapPath = FileAccess.combinePaths(xMSF, sTemplatePath, "/../wizard/bitmap");
         } catch (NoValidPathException e) {
             e.printStackTrace();
         }
@@ -302,7 +302,7 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog
         try {
             
             sUserTemplatePath = FileAccess.getOfficePath(xMSF, "Template", "user");
-            sBitmapPath = FileAccess.combinePaths(xMSF, sTemplatePath, "/wizard/bitmap");
+            sBitmapPath = FileAccess.combinePaths(xMSF, sTemplatePath, "/../wizard/bitmap");
         } catch (NoValidPathException e) {
             e.printStackTrace();
         }
diff --git a/wizards/com/sun/star/wizards/common/Desktop.java b/wizards/com/sun/star/wizards/common/Desktop.java
index 9fc58ffe8..a9c04086c 100644
--- a/wizards/com/sun/star/wizards/common/Desktop.java
+++ b/wizards/com/sun/star/wizards/common/Desktop.java
@@ -378,7 +378,7 @@ public class Desktop
             {
                 TemplatePath = FileAccess.getOfficePath(xMSF, "Template", "share", "/wizard");
                 UserTemplatePath = FileAccess.getOfficePath(xMSF, "Template", "user", "");
-                BitmapPath = FileAccess.combinePaths(xMSF, TemplatePath, "/wizard/bitmap");
+                BitmapPath = FileAccess.combinePaths(xMSF, TemplatePath, "/../wizard/bitmap");
                 WorkPath = FileAccess.getOfficePath(xMSF, "Work", "", "");
             }
             catch (NoValidPathException nopathexception)
@@ -417,7 +417,7 @@ public class Desktop
     {
         try
         {
-            String sBitmapPath = FileAccess.combinePaths(_xMSF, getTemplatePath(_xMSF), "/wizard/bitmap");
+            String sBitmapPath = FileAccess.combinePaths(_xMSF, getTemplatePath(_xMSF), "/../wizard/bitmap");
             return sBitmapPath;
         }
         catch (NoValidPathException nopathexception)
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java
index 4750b20a3..80bbaa557 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java
@@ -381,7 +381,7 @@ public class FaxWizardDialogImpl extends FaxWizardDialog
         {
             sTemplatePath = FileAccess.getOfficePath(xMSF, "Template", "share", "/wizard");
             sUserTemplatePath = FileAccess.getOfficePath(xMSF, "Template", "user", "");
-            sBitmapPath = FileAccess.combinePaths(xMSF, sTemplatePath, "/wizard/bitmap");
+            sBitmapPath = FileAccess.combinePaths(xMSF, sTemplatePath, "/../wizard/bitmap");
         }
         catch (NoValidPathException e)
         {
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
index 9a0d47acb..2af134a72 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
@@ -1294,7 +1294,7 @@ public class LetterWizardDialogImpl extends LetterWizardDialog
         {
             sTemplatePath = FileAccess.getOfficePath(xMSF, "Template", "share", "/wizard");
             sUserTemplatePath = FileAccess.getOfficePath(xMSF, "Template", "user", "");
-            sBitmapPath = FileAccess.combinePaths(xMSF, sTemplatePath, "/wizard/bitmap");
+            sBitmapPath = FileAccess.combinePaths(xMSF, sTemplatePath, "/../wizard/bitmap");
         }
         catch (NoValidPathException e)
         {
diff --git a/wizards/com/sun/star/wizards/web/FTPDialog.java b/wizards/com/sun/star/wizards/web/FTPDialog.java
index 4d7d6571e..b90aa7a85 100644
--- a/wizards/com/sun/star/wizards/web/FTPDialog.java
+++ b/wizards/com/sun/star/wizards/web/FTPDialog.java
@@ -187,7 +187,7 @@ public class FTPDialog extends UnoDialog2 implements UIConsts, WWHID
         publish = p;
 
 
-        imagesDirectory = FileAccess.connectURLs(((CGSettings) (publish.root)).soTemplateDir, "wizard/bitmap/");
+        imagesDirectory = FileAccess.connectURLs(((CGSettings) (publish.root)).soTemplateDir, "../wizard/bitmap/");
 
         //Load Resources
         resources = new FTPDialogResources(xmsf);
diff --git a/wizards/com/sun/star/wizards/web/WWD_Startup.java b/wizards/com/sun/star/wizards/web/WWD_Startup.java
index 0af1c4614..a3ca1db93 100644
--- a/wizards/com/sun/star/wizards/web/WWD_Startup.java
+++ b/wizards/com/sun/star/wizards/web/WWD_Startup.java
@@ -241,7 +241,7 @@ public abstract class WWD_Startup extends WWD_General
 
         String soTemplateDir = FileAccess.getOfficePath(xmsf, "Template", "share", "/wizard");
 
-        String exclamationURL = FileAccess.connectURLs(soTemplateDir, "wizard/bitmap/caution_16.png");
+        String exclamationURL = FileAccess.connectURLs(soTemplateDir, "../wizard/bitmap/caution_16.png");
         this.drawNaviBar();
         this.buildStep1();
         this.buildStep2();
diff --git a/wizards/source/euro/Init.xba b/wizards/source/euro/Init.xba
index 45fdafdba..2de1252c7 100644
--- a/wizards/source/euro/Init.xba
+++ b/wizards/source/euro/Init.xba
@@ -550,7 +550,7 @@ Dim Isthere as Boolean
 	InitializeLocales(oLocale)
 	InitializeCurrencies()
 	InitializeControls()
-	BitmapDir = GetOfficeSubPath("Template", "wizard/bitmap")
+	BitmapDir = GetOfficeSubPath("Template", "../wizard/bitmap")
 	If BitmapDir = "" Then
 		Stop
 	End If
diff --git a/wizards/source/formwizard/tools.xba b/wizards/source/formwizard/tools.xba
index 174987e35..8b40b8379 100644
--- a/wizards/source/formwizard/tools.xba
+++ b/wizards/source/formwizard/tools.xba
@@ -304,7 +304,7 @@ End Function
 
 
 Function GetFormWizardPaths() as Boolean
-	FormPath = GetOfficeSubPath("Template","wizard/bitmap")
+	FormPath = GetOfficeSubPath("Template","../wizard/bitmap")
 	If FormPath <> "" Then
 		WebWizardPath = GetOfficeSubPath("Template","wizard/web")
 		If WebWizardPath <> "" Then
diff --git a/wizards/source/importwizard/Main.xba b/wizards/source/importwizard/Main.xba
index 2c25c6abe..3415d0ee8 100644
--- a/wizards/source/importwizard/Main.xba
+++ b/wizards/source/importwizard/Main.xba
@@ -274,7 +274,7 @@ End Sub
 
 
 Function GetImportWizardPaths() as Boolean
-	SOBitmapPath = GetOfficeSubPath("Template", "wizard/bitmap")
+	SOBitmapPath = GetOfficeSubPath("Template", "../wizard/bitmap")
 	If SOBitmapPath <> "" Then
 		SOWorkPath = GetPathSettings("Work", False)
 		If SOWorkPath <> "" Then
diff --git a/wizards/source/schedule/CalendarMain.xba b/wizards/source/schedule/CalendarMain.xba
index bfe49121d..2deb51cca 100644
--- a/wizards/source/schedule/CalendarMain.xba
+++ b/wizards/source/schedule/CalendarMain.xba
@@ -82,7 +82,7 @@ Dim iThisMonth as Integer
 	DlgCalModel = DlgCalendar.Model
     LoadLanguage(sCurLangLocale)
 	CalInitGlobalVariablesDate()
-	BitmapDir = GetOfficeSubPath("Template","wizard/bitmap")
+	BitmapDir = GetOfficeSubPath("Template","../wizard/bitmap")
 	DlgCalModel.imgCountry.ImageURL = BitmapDir & sBitmapFilename
 	CalChoosenLand = -2
 	CalLoadOwnData()
diff --git a/wizards/source/template/Samples.xba b/wizards/source/template/Samples.xba
index b64ddc12d..118fb37d0 100644
--- a/wizards/source/template/Samples.xba
+++ b/wizards/source/template/Samples.xba
@@ -86,7 +86,7 @@ Dim MaxIndex as Integer
 			DialogModel = StylesDialog.Model
 			TemplateDir = GetPathSettings("Template", False, 0)
 			StylesDir = GetOfficeSubPath("Template", "wizard/styles/")
-			sQueryPath = GetOfficeSubPath("Template", "wizard/bitmap/")
+			sQueryPath = GetOfficeSubPath("Template", "../wizard/bitmap/")
 			DialogModel.Title = GetResText(STYLES)
 			DialogModel.cmdCancel.Label = GetResText(STYLES+2)
 			DialogModel.cmdOk.Label = GetResText(STYLES+3)
diff --git a/wizards/source/tutorials/Functions.xba b/wizards/source/tutorials/Functions.xba
index 6524ec193..c1b464aca 100644
--- a/wizards/source/tutorials/Functions.xba
+++ b/wizards/source/tutorials/Functions.xba
@@ -78,15 +78,15 @@ Sub setMaxMinImage(param As String)
 		iPos = InStr(templatePath,"/")
 		If(iPos > 0) Then
 			If(param = "MAX") Then
-				bitmapPath = templatePath & "/wizard/bitmap/maximize.bmp"
+				bitmapPath = templatePath & "../wizard/bitmap/maximize.bmp"
 			ElseIf(param = "MIN") Then	
-				bitmapPath = templatePath & "/wizard/bitmap/minimize.bmp"
+				bitmapPath = templatePath & "../wizard/bitmap/minimize.bmp"
 			End If
 		Else
 			If(param = "MAX") Then
-				bitmapPath = templatePath & "\wizard\bitmap\maximize.bmp"
+				bitmapPath = templatePath & "..\wizard\bitmap\maximize.bmp"
 			ElseIf(param = "MIN") Then	
-				bitmapPath = templatePath & "\wizard\bitmap\minimize.bmp"
+				bitmapPath = templatePath & "..\wizard\bitmap\minimize.bmp"
 			End If		
 		End If
 		'printdbgInfo oCommandButton.Model
diff --git a/wizards/source/tutorials/ShowInfoDialog.xba b/wizards/source/tutorials/ShowInfoDialog.xba
index 4bb0f608d..61c2ed967 100644
--- a/wizards/source/tutorials/ShowInfoDialog.xba
+++ b/wizards/source/tutorials/ShowInfoDialog.xba
@@ -148,9 +148,9 @@ sub setImage(whatever as Object)
 	Dim bitmapPath As String
 	iPos = InStr(templatePath,"/")
 	if(iPos > 0) Then
-		bitmapPath = templatePath & "/wizard/bitmap/tutorial_background.gif"
+		bitmapPath = templatePath & "../wizard/bitmap/tutorial_background.gif"
 	Else
-		bitmapPath = templatePath & "\wizard\bitmap\tutorial_background.gif"
+		bitmapPath = templatePath & "..\wizard\bitmap\tutorial_background.gif"
 	End If
 	
 	dim props(0) as new com.sun.star.beans.PropertyValue
diff --git a/wizards/source/webwizard/Language.xba b/wizards/source/webwizard/Language.xba
index 1aa26fac3..1c6b8c194 100644
--- a/wizards/source/webwizard/Language.xba
+++ b/wizards/source/webwizard/Language.xba
@@ -30,7 +30,7 @@ Dim TemplatePath as String
 				If PhotosDir <> "" Then
 					TemplatePath = GetOfficeSubPath("Template", "wizard/web/")
 					If TemplatePath <> "" Then
-						SOBitmapPath = GetOfficeSubPath("Template", "wizard/bitmap")
+						SOBitmapPath = GetOfficeSubPath("Template", "../wizard/bitmap")
 						If SOBitmapPath <> "" Then
 							GetWebwizardPaths() = True
 							Exit Function
-- 
cgit v1.2.3


From aea3e203d0921d65a186053c9b351acc7b8a3b2b Mon Sep 17 00:00:00 2001
From: Mikhail Voytenko 
Date: Fri, 19 Nov 2010 11:29:27 +0100
Subject: fwk160: #i109943# fix warnings, that could cause problems

---
 wizards/com/sun/star/wizards/common/Configuration.java   | 2 +-
 wizards/com/sun/star/wizards/common/NumberFormatter.java | 2 +-
 wizards/com/sun/star/wizards/form/FormDocument.java      | 4 +++-
 wizards/com/sun/star/wizards/form/StyleApplier.java      | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/wizards/com/sun/star/wizards/common/Configuration.java b/wizards/com/sun/star/wizards/common/Configuration.java
index 2ee2fc51a..521e9be25 100644
--- a/wizards/com/sun/star/wizards/common/Configuration.java
+++ b/wizards/com/sun/star/wizards/common/Configuration.java
@@ -134,7 +134,7 @@ public abstract class Configuration
 
     public static void set(boolean value, String name, Object parent) throws Exception
     {
-        if (value = true)
+        if (value == true)
         {
             set(Boolean.TRUE, name, parent);
         }
diff --git a/wizards/com/sun/star/wizards/common/NumberFormatter.java b/wizards/com/sun/star/wizards/common/NumberFormatter.java
index dc20c4619..b1c8bae6a 100644
--- a/wizards/com/sun/star/wizards/common/NumberFormatter.java
+++ b/wizards/com/sun/star/wizards/common/NumberFormatter.java
@@ -134,7 +134,7 @@ public class NumberFormatter
 
     public double convertStringToNumber(int _nkey, String _sString)throws Exception
     {
-        return convertStringToNumber(_nkey, _sString);
+        return xNumberFormatter.convertStringToNumber(_nkey, _sString);
     }
 
     
diff --git a/wizards/com/sun/star/wizards/form/FormDocument.java b/wizards/com/sun/star/wizards/form/FormDocument.java
index cd82625e3..cbc4c37bd 100644
--- a/wizards/com/sun/star/wizards/form/FormDocument.java
+++ b/wizards/com/sun/star/wizards/form/FormDocument.java
@@ -297,7 +297,9 @@ public class FormDocument extends TextDocument
 
     public ControlForm[] getControlForms()
     {
-        return (ControlForm[]) oControlForms.toArray();
+        ControlForm[] aResult = new ControlForm[oControlForms.size()];
+        oControlForms.toArray( aResult );
+        return aResult;
     }
 
     public boolean finalizeForms(DataEntrySetter _curDataEntrySetter, FieldLinker _curFieldLinker, FormConfiguration _curFormConfiguration)
diff --git a/wizards/com/sun/star/wizards/form/StyleApplier.java b/wizards/com/sun/star/wizards/form/StyleApplier.java
index ed2064594..cb5cff587 100644
--- a/wizards/com/sun/star/wizards/form/StyleApplier.java
+++ b/wizards/com/sun/star/wizards/form/StyleApplier.java
@@ -341,7 +341,7 @@ public class StyleApplier
                     {
                         String[] sPropList = JavaTools.ArrayoutofString(scurline, ":");
                         String sPropValue = sPropList[1];
-                        sPropValue.trim();
+                        sPropValue = sPropValue.trim();
                         if (sPropValue.indexOf("#") > 0)
                         {
                             sPropValue = JavaTools.replaceSubString(sPropValue, "", ";");
-- 
cgit v1.2.3


From 95076a6b09d4e6e1e3bd285ce2a79d4e04e94bbd Mon Sep 17 00:00:00 2001
From: Hans-Joachim Lankenau 
Date: Fri, 19 Nov 2010 12:46:04 +0100
Subject: gnumake2: move svtools toolpanel header

---
 accessibility/source/extended/AccessibleToolPanelDeck.cxx           | 2 +-
 accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx     | 4 ++--
 accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/accessibility/source/extended/AccessibleToolPanelDeck.cxx b/accessibility/source/extended/AccessibleToolPanelDeck.cxx
index 5e25d91fc..0331df77b 100755
--- a/accessibility/source/extended/AccessibleToolPanelDeck.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeck.cxx
@@ -35,7 +35,7 @@
 #include 
 /** === end UNO includes === **/
 
-#include 
+#include 
 #include 
 #include 
 #include 
diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
index 3f5d97918..99aeea1c3 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
@@ -38,8 +38,8 @@
 #include 
 /** === end UNO includes === **/
 
-#include 
-#include 
+#include 
+#include 
 #include 
 #include 
 #include 
diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
index 070a5ebc2..f7a838cdd 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
@@ -35,8 +35,8 @@
 #include 
 /** === end UNO includes === **/
 
-#include 
-#include 
+#include 
+#include 
 #include 
 #include 
 #include 
-- 
cgit v1.2.3


From 458fbd86d9b9f6a7a22aaa17395566f444f1bd66 Mon Sep 17 00:00:00 2001
From: Hans-Joachim Lankenau 
Date: Fri, 19 Nov 2010 15:23:52 +0100
Subject: gnumake2: undo toolpanel header move

---
 accessibility/source/extended/AccessibleToolPanelDeck.cxx           | 2 +-
 accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx     | 4 ++--
 accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/accessibility/source/extended/AccessibleToolPanelDeck.cxx b/accessibility/source/extended/AccessibleToolPanelDeck.cxx
index 0331df77b..5e25d91fc 100755
--- a/accessibility/source/extended/AccessibleToolPanelDeck.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeck.cxx
@@ -35,7 +35,7 @@
 #include 
 /** === end UNO includes === **/
 
-#include 
+#include 
 #include 
 #include 
 #include 
diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
index 99aeea1c3..3f5d97918 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
@@ -38,8 +38,8 @@
 #include 
 /** === end UNO includes === **/
 
-#include 
-#include 
+#include 
+#include 
 #include 
 #include 
 #include 
diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
index f7a838cdd..070a5ebc2 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
@@ -35,8 +35,8 @@
 #include 
 /** === end UNO includes === **/
 
-#include 
-#include 
+#include 
+#include 
 #include 
 #include 
 #include 
-- 
cgit v1.2.3


From c25fc09d45622556003fdda3858d3c4533e7cf74 Mon Sep 17 00:00:00 2001
From: Mikhail Voytenko 
Date: Mon, 22 Nov 2010 12:58:00 +0100
Subject: fwk160: #i59788# use standard InteractionHandler to store documents

---
 wizards/com/sun/star/wizards/document/OfficeDocument.java       | 9 +++++----
 wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java       | 2 +-
 wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/wizards/com/sun/star/wizards/document/OfficeDocument.java b/wizards/com/sun/star/wizards/document/OfficeDocument.java
index b0a01beac..5e4f1440e 100644
--- a/wizards/com/sun/star/wizards/document/OfficeDocument.java
+++ b/wizards/com/sun/star/wizards/document/OfficeDocument.java
@@ -288,7 +288,7 @@ public class OfficeDocument
         return oDocument;
     }
 
-    public static boolean store(XMultiServiceFactory xMSF, XComponent xComponent, String StorePath, String FilterName, boolean bStoreToUrl, String sMsgSavingImpossible)
+    public static boolean store(XMultiServiceFactory xMSF, XComponent xComponent, String StorePath, String FilterName, boolean bStoreToUrl)
     {
         try
         {
@@ -296,10 +296,13 @@ public class OfficeDocument
             PropertyValue[] oStoreProperties;
             if (FilterName.length() > 0)
             {
-                oStoreProperties = new PropertyValue[1];
+                oStoreProperties = new PropertyValue[2];
                 oStoreProperties[0] = new PropertyValue();
                 oStoreProperties[0].Name = "FilterName";
                 oStoreProperties[0].Value = FilterName;
+                oStoreProperties[1] = new PropertyValue();
+                oStoreProperties[1].Name = "InteractionHandler";
+                oStoreProperties[1].Value = (XInteractionHandler) UnoRuntime.queryInterface(XInteractionHandler.class, xMSF.createInstance("com.sun.star.comp.uui.UUIInteractionHandler"));
             }
             else
             {
@@ -319,8 +322,6 @@ public class OfficeDocument
         {
 
             exception.printStackTrace(System.out);
-            //TODO make sure that the peer of the dialog is used when available
-            showMessageBox(xMSF, "ErrorBox", VclWindowPeerAttribute.OK, sMsgSavingImpossible);
             return false;
         }
     }
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java
index 4750b20a3..562d63ca1 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java
@@ -246,7 +246,7 @@ public class FaxWizardDialogImpl extends FaxWizardDialog
             myFaxDoc.killEmptyFrames();
 
 
-            bSaveSuccess = OfficeDocument.store(xMSF, xTextDocument, sPath, "writer8_template", false, "Template could not be saved to" + sPath);
+            bSaveSuccess = OfficeDocument.store(xMSF, xTextDocument, sPath, "writer8_template", false);
             if (bSaveSuccess)
             {
                 saveConfiguration();
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
index 9a0d47acb..0141d5487 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
@@ -305,7 +305,7 @@ public class LetterWizardDialogImpl extends LetterWizardDialog
             myLetterDoc.killEmptyFrames();
 
 
-            bSaveSuccess = OfficeDocument.store(xMSF, xTextDocument, sPath, "writer8_template", false, "Template could not be saved to " + sPath);
+            bSaveSuccess = OfficeDocument.store(xMSF, xTextDocument, sPath, "writer8_template", false);
 
             if (bSaveSuccess)
             {
-- 
cgit v1.2.3


From ff436abc9aef472f29e13435fa87af9a6b9d25ae Mon Sep 17 00:00:00 2001
From: Mikhail Voytenko 
Date: Mon, 22 Nov 2010 16:21:58 +0100
Subject: fwk160: #i106223# replace pkg: protocol with zip: if necessary

---
 wizards/com/sun/star/wizards/web/WWD_Events.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wizards/com/sun/star/wizards/web/WWD_Events.java b/wizards/com/sun/star/wizards/web/WWD_Events.java
index 34261361d..9b204d5a2 100644
--- a/wizards/com/sun/star/wizards/web/WWD_Events.java
+++ b/wizards/com/sun/star/wizards/web/WWD_Events.java
@@ -1001,7 +1001,7 @@ public abstract class WWD_Events extends WWD_Startup
         //replace all '/' with '%2F'
         url1 = JavaTools.replaceSubString(url1, "%2F", "/");
 
-        p.url = "vnd.sun.star.pkg://" + url1 + "/";
+        p.url = "vnd.sun.star.zip://" + url1 + "/";
 
         /*
          * and now ftp...
-- 
cgit v1.2.3


From bab584d2031b340d3223f410df52abe0da80f067 Mon Sep 17 00:00:00 2001
From: Hans-Joachim Lankenau 
Date: Mon, 29 Nov 2010 18:50:33 +0100
Subject: ause128: #i115689# guard additional dependencies of ZIPnTARGETN

---
 extensions/source/macosx/spotlight/makefile.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/extensions/source/macosx/spotlight/makefile.mk b/extensions/source/macosx/spotlight/makefile.mk
index 3d1cb12d1..e7b15150b 100644
--- a/extensions/source/macosx/spotlight/makefile.mk
+++ b/extensions/source/macosx/spotlight/makefile.mk
@@ -74,8 +74,11 @@ ZIP1LIST = *
 
 .INCLUDE : target.mk
 
+.IF "$(ZIP1TARGETN)"!=""
 $(ZIP1TARGETN) : $(plistfiles) $(binaries) $(resources)
 
+.ENDIF          # "$(ZIP1TARGETN)"!=""
+
 # Info.plist is just versioned and copied into the bundle   
 $(CONTENTS)$/%.plist : mdimporter/%.plist
     $(MKDIRHIER) $(@:d)
-- 
cgit v1.2.3


From 624a57b2fdb9dcbf507bd6ac4167d7f56bde4b53 Mon Sep 17 00:00:00 2001
From: Mikhail Voytenko 
Date: Wed, 1 Dec 2010 11:18:45 +0100
Subject: fwk160: #i59788# use standard InteractionHandler to store documents

---
 wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java | 2 +-
 wizards/com/sun/star/wizards/document/OfficeDocument.java       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java
index 963b3002a..97bbc5c79 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java
+++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java
@@ -484,7 +484,7 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog
             
             xTextDocument = (XTextDocument)UnoRuntime.queryInterface(XTextDocument.class,agendaTemplate.document);
             
-            bSaveSuccess = OfficeDocument.store(xMSF, xTextDocument, sPath , "writer8_template", false, resources.resErrSaveTemplate );
+            bSaveSuccess = OfficeDocument.store(xMSF, xTextDocument, sPath , "writer8_template", false );
         } catch (Exception e) {
             SystemDialog.showMessageBox(xMSF, xControl.getPeer(), "ErrBox", VclWindowPeerAttribute.OK, resources.resErrSaveTemplate);
             //e.printStackTrace();
diff --git a/wizards/com/sun/star/wizards/document/OfficeDocument.java b/wizards/com/sun/star/wizards/document/OfficeDocument.java
index 5e4f1440e..3fbb9f469 100644
--- a/wizards/com/sun/star/wizards/document/OfficeDocument.java
+++ b/wizards/com/sun/star/wizards/document/OfficeDocument.java
@@ -48,6 +48,7 @@ import com.sun.star.beans.PropertyVetoException;
 import com.sun.star.sheet.XCellRangeData;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.table.XCellRange;
+import com.sun.star.task.XInteractionHandler;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.Exception;
 import com.sun.star.uno.UnoRuntime;
-- 
cgit v1.2.3


From cb865c0f00bb3856fd685cb3f88822ea0809f9cd Mon Sep 17 00:00:00 2001
From: Hans-Joachim Lankenau 
Date: Mon, 20 Dec 2010 13:58:30 +0100
Subject: #i10000# use sal_Int32 instead of size_t

---
 extensions/source/ole/oleobjw.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx
index 7b76880dd..d461586d0 100755
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -1372,7 +1372,7 @@ uno::Any SAL_CALL IUnknownWrapper_Impl::directInvoke( const ::rtl::OUString& aNa
         arArgs = ptrArgs.get();
         arRefArgs = ptrRefArgs.get();
 
-        size_t nInd = 0;
+        sal_Int32 nInd = 0;
         try
         {
             sal_Int32 revIndex = 0;
-- 
cgit v1.2.3


From b5b35d5b0e1065a4211bde8c289d15addd85ea6e Mon Sep 17 00:00:00 2001
From: Hans-Joachim Lankenau 
Date: Mon, 20 Dec 2010 16:44:39 +0100
Subject: #i10000# avoid warnings

---
 extensions/source/ole/oleobjw.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx
index d461586d0..73820ae40 100755
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -1376,7 +1376,7 @@ uno::Any SAL_CALL IUnknownWrapper_Impl::directInvoke( const ::rtl::OUString& aNa
         try
         {
             sal_Int32 revIndex = 0;
-            for ( nInd = 0; nInd < dispparams.cArgs; nInd++)
+            for ( nInd = 0; nInd < sal_Int32(dispparams.cArgs); nInd++)
             {
                 revIndex = dispparams.cArgs - nInd - 1;
                 arRefArgs[revIndex].byref = 0;
-- 
cgit v1.2.3