summaryrefslogtreecommitdiff
path: root/automation
diff options
context:
space:
mode:
authorPhilipp Lohmann [pl] <Philipp.Lohmann@Sun.COM>2010-06-04 13:46:22 +0200
committerPhilipp Lohmann [pl] <Philipp.Lohmann@Sun.COM>2010-06-04 13:46:22 +0200
commit383957c96aac78301a126746c14c631314ee6329 (patch)
treea5b71bd66574175b88d26fcba5375b774ec3f7f1 /automation
parent8a7f8ca1a440b8ccc9c5aa241560bbb1ca963969 (diff)
changehid: #i111874# remove SmartId, make HID of type rtl::OString, fill in dummies for all explicit help ids
Diffstat (limited to 'automation')
-rw-r--r--automation/inc/automation/commtypes.hxx3
-rw-r--r--automation/source/inc/cmdbasestream.hxx25
-rw-r--r--automation/source/inc/testapp.hxx3
-rw-r--r--automation/source/miniapp/testapp.cxx3
-rw-r--r--automation/source/server/cmdbasestream.cxx28
-rw-r--r--automation/source/server/recorder.cxx133
-rw-r--r--automation/source/server/recorder.hxx9
-rw-r--r--automation/source/server/retstrm.cxx19
-rw-r--r--automation/source/server/retstrm.hxx25
-rw-r--r--automation/source/server/server.cxx2
-rw-r--r--automation/source/server/sta_list.cxx50
-rw-r--r--automation/source/server/statemnt.cxx284
-rw-r--r--automation/source/server/statemnt.hxx27
-rw-r--r--automation/source/testtool/cmdstrm.cxx5
-rw-r--r--automation/source/testtool/cretstrm.hxx2
-rw-r--r--automation/source/testtool/objtest.cxx174
-rw-r--r--automation/source/testtool/objtest.hxx25
17 files changed, 536 insertions, 281 deletions
diff --git a/automation/inc/automation/commtypes.hxx b/automation/inc/automation/commtypes.hxx
index ad8443518e85..a5a5437f0343 100644
--- a/automation/inc/automation/commtypes.hxx
+++ b/automation/inc/automation/commtypes.hxx
@@ -52,6 +52,7 @@
#include <sal/types.h>
typedef sal_Unicode comm_UniChar;
+#include "rtl/string.hxx"
// this is a trick to be sure the SO types are unknown, so the compiler will yell at us in case we use them
#ifndef _SOLAR_H
@@ -93,7 +94,7 @@ typedef UINT32 comm_UINT32;
typedef sal_uInt16 comm_WORD;
typedef sal_uInt32 comm_DWORD;
-class SmartId;
+class rtl::OString;
class String;
#define comm_String String
diff --git a/automation/source/inc/cmdbasestream.hxx b/automation/source/inc/cmdbasestream.hxx
index d103dd071e43..e192b66ed8b6 100644
--- a/automation/source/inc/cmdbasestream.hxx
+++ b/automation/source/inc/cmdbasestream.hxx
@@ -38,6 +38,7 @@
#include <automation/commtypes.hxx>
#include "icommstream.hxx"
+#include "rtl/string.hxx"
class CmdBaseStream
{
@@ -48,20 +49,20 @@ protected:
public:
- void GenError( SmartId *pUId, comm_String *pString );
+ void GenError( rtl::OString *pUId, comm_String *pString );
void GenReturn( comm_USHORT nRet, comm_ULONG nNr );
- void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_ULONG nNr );
- void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_String *pString );
- void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_BOOL bBool );
- void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_ULONG nNr, comm_String *pString, comm_BOOL bBool );
+ void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_ULONG nNr );
+ void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_String *pString );
+ void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_BOOL bBool );
+ void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_ULONG nNr, comm_String *pString, comm_BOOL bBool );
// MacroRecorder
- void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod );
- void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod, comm_String *pString );
- void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod, comm_String *pString, comm_BOOL bBool );
- void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod, comm_BOOL bBool );
- void GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod, comm_ULONG nNr );
+ void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod );
+ void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_String *pString );
+ void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_String *pString, comm_BOOL bBool );
+ void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_BOOL bBool );
+ void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_ULONG nNr );
void Read ( comm_USHORT &nNr );
void Read ( comm_ULONG &nNr );
@@ -76,10 +77,10 @@ public:
// Complex Datatypes to be handled system dependent
virtual void Read ( comm_String *&pString );
- virtual void Read ( SmartId* &pId );
+ virtual void Read ( rtl::OString* &pId );
virtual void Write( comm_String *pString );
- virtual void Write( SmartId* pId );
+ virtual void Write( rtl::OString* pId );
};
#endif
diff --git a/automation/source/inc/testapp.hxx b/automation/source/inc/testapp.hxx
index 14b9e30362d0..8393019d1605 100644
--- a/automation/source/inc/testapp.hxx
+++ b/automation/source/inc/testapp.hxx
@@ -30,7 +30,6 @@
#include <basic/sbmod.hxx>
#include <basic/testtool.hxx>
-#include <vcl/smartid.hxx>
class CommunicationLink;
class CommunicationManagerClientViaSocketTT;
@@ -129,7 +128,7 @@ private:
BOOL bReturnOK; // Bricht WaitForAnswer ab
CRevNames *pShortNames; // Aktuell verwendete Controls, zur gewinnung des Namens aus Fehlermeldung
ULONG nSequence; // Sequence um Antwort und Anfrage zu syncronisieren
- SmartId aNextReturnId; // Id des Returnwertes i.e. UId
+ rtl::OString aNextReturnId; // Id des Returnwertes i.e. UId
void ReplaceNumbers(String &aText); // Zahlen im String mit speziellem Format in Namen umwandeln
String aLastRecordedKontext;// Keeps the last kontext recorded by the Macro Recorder
diff --git a/automation/source/miniapp/testapp.cxx b/automation/source/miniapp/testapp.cxx
index 0a29fcc7e6e1..eec1d8ac837b 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 718bc52dad70..bd9f429b9e75 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 6c941032f104..06446952f318 100644
--- a/automation/source/server/recorder.cxx
+++ b/automation/source/server/recorder.cxx
@@ -105,30 +105,34 @@ IMPL_LINK( MacroRecorder, HookRefreshHdl, void*, EMPTYARG )
return 0;
}
-void MacroRecorder::LogVCL( SmartId aParentID, USHORT nVCLWindowType, SmartId aID, String aMethod, USHORT nParam )
+void MacroRecorder::LogVCL( rtl::OString aParentID, USHORT nVCLWindowType, rtl::OString aID, String aMethod, USHORT nParam )
{
- ::comphelper::UiEventsLogger::logVcl( aParentID.GetText(), nVCLWindowType, aID.GetText(), aMethod, nParam );
+ // FIXME: HELPID
+ ::comphelper::UiEventsLogger::logVcl( rtl::OStringToOUString( aParentID, RTL_TEXTENCODING_UTF8 ), nVCLWindowType, rtl::OStringToOUString( aID, RTL_TEXTENCODING_UTF8 ), aMethod, nParam );
}
-void MacroRecorder::LogVCL( SmartId aParentID, USHORT nVCLWindowType, SmartId aID, String aMethod )
+void MacroRecorder::LogVCL( rtl::OString aParentID, USHORT nVCLWindowType, rtl::OString aID, String aMethod )
{
- ::comphelper::UiEventsLogger::logVcl( aParentID.GetText(), nVCLWindowType, aID.GetText(), aMethod );
+ // FIXME: HELPID
+ ::comphelper::UiEventsLogger::logVcl( rtl::OStringToOUString( aParentID, RTL_TEXTENCODING_UTF8 ), nVCLWindowType, rtl::OStringToOUString( aID, RTL_TEXTENCODING_UTF8 ), aMethod );
}
Window* MacroRecorder::GetParentWithID( Window* pThis )
{
Window *pOverlap = pThis->GetWindow( WINDOW_OVERLAP );
- while ( pOverlap != pThis && !pThis->GetSmartUniqueOrHelpId().HasAny() && pThis->GET_REAL_PARENT() )
+ // FIXME: HELPID
+ while ( pOverlap != pThis && !pThis->GetUniqueOrHelpId().getLength() && pThis->GET_REAL_PARENT() )
pThis = pThis->GET_REAL_PARENT();
return pThis;
}
-SmartId MacroRecorder::GetParentID( Window* pThis )
+rtl::OString MacroRecorder::GetParentID( Window* pThis )
{
+ // FIXME: HELPID
if ( pThis->GetParent() )
- return pThis->GetParent()->GetSmartUniqueOrHelpId();
+ return pThis->GetParent()->GetUniqueOrHelpId();
else
- return SmartId();
+ return rtl::OString();
}
IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
@@ -177,7 +181,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
}
if ( m_bLog )
{
-// HACK Too many KeyEvents generated LogVCL( SmartId(), 0, aKeyUniqueID, CUniString("TypeKeys"), aKeyString.Len() );
+// HACK Too many KeyEvents generated LogVCL( rtl::OString(), 0, aKeyUniqueID, CUniString("TypeKeys"), aKeyString.Len() );
}
// cleanup
aKeyString.Erase();
@@ -193,12 +197,16 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
case VCLEVENT_WINDOW_ACTIVATE:
if ( m_bRecord )
{
- StatementList::pRet->GenReturn( RET_MacroRecorder, SmartId(), (comm_USHORT)(M_SetPage|M_RET_NUM_CONTROL), static_cast<comm_ULONG>(pWin->GetSmartUniqueOrHelpId().GetNum()) ); //GetNum() ULONG != comm_ULONG on 64bit
+ // FIXME: HELPID
+ #if 0
+ StatementList::pRet->GenReturn( RET_MacroRecorder, rtl::OString(), (comm_USHORT)(M_SetPage|M_RET_NUM_CONTROL), static_cast<comm_ULONG>(pWin->GetUniqueOrHelpId().GetNum()) ); //GetNum() ULONG != comm_ULONG on 64bit
+ #endif
bSendData = TRUE;
}
if ( m_bLog )
{
- LogVCL( SmartId(), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), CUniString("SetPage") );
+ // FIXME: HELPID
+ LogVCL( rtl::OString(), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("SetPage") );
}
break;
}
@@ -213,12 +221,16 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
{
if ( m_bRecord )
{
- StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), (comm_USHORT)M_Check );
+ // FIXME: HELPID
+ #if 0
+ StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Check );
+ #endif
bSendData = TRUE;
}
if ( m_bLog )
{
- LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), CUniString("Check") );
+ // FIXME: HELPID
+ LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Check") );
}
}
}
@@ -243,12 +255,16 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
}
if ( m_bRecord )
{
+ // FIXME: HELPID
+ #if 0
StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), nMethod );
+ #endif
bSendData = TRUE;
}
if ( m_bLog )
{
- LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), aMethod );
+ // FIXME: HELPID
+ LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), aMethod );
}
}
break;
@@ -277,12 +293,16 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
case VCLEVENT_LISTBOX_SELECT:
if ( m_bRecord )
{
- StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), (comm_USHORT)M_Select, comm_ULONG( ((ListBox*)pWin)->GetSelectEntryPos() +1 ) );
+ // FIXME: HELPID
+ #if 0
+ StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Select, comm_ULONG( ((ListBox*)pWin)->GetSelectEntryPos() +1 ) );
+ #endif
bSendData = TRUE;
}
if ( m_bLog )
{
- LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), CUniString("Select"), ((ListBox*)pWin)->GetSelectEntryPos() );
+ // FIXME: HELPID
+ LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Select"), ((ListBox*)pWin)->GetSelectEntryPos() );
}
break;
}
@@ -312,13 +332,17 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
Sound::Beep();
else
{
- StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), (comm_USHORT)M_Select, (comm_ULONG) nPos+1 );
+ // FIXME: HELPID
+ #if 0
+ StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Select, (comm_ULONG) nPos+1 );
+ #endif
bSendData = TRUE;
}
}
if ( m_bLog )
{
- LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), CUniString("Select"), nPos );
+ // FIXME: HELPID
+ LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Select"), nPos );
}
}
}
@@ -334,7 +358,8 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
case VCLEVENT_BUTTON_CLICK:
Window* pParent = pWin->GetParent();
BOOL bDone = FALSE;
- if ( pParent->IsDialog() && !pWin->GetSmartUniqueOrHelpId().HasAny() )
+ // FIXME: HELPID
+ if ( pParent->IsDialog() && !pWin->GetUniqueOrHelpId().getLength() )
{
switch ( pParent->GetType() )
{
@@ -373,18 +398,23 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
}
if ( m_bRecord )
{
+ // FIXME: HELPID
+ #if 0
if ( nMethod != M_Click )
- StatementList::pRet->GenReturn( RET_MacroRecorder, SmartId( 0 ), nMethod );
+ StatementList::pRet->GenReturn( RET_MacroRecorder, rtl::OString( 0 ), nMethod );
else
- StatementList::pRet->GenReturn( RET_MacroRecorder, SmartId( 0 ), nMethod, (comm_ULONG)nCurrentButtonId );
+ StatementList::pRet->GenReturn( RET_MacroRecorder, rtl::OString( 0 ), nMethod, (comm_ULONG)nCurrentButtonId );
+ #endif
bSendData = TRUE;
}
if ( m_bLog )
{
if ( nMethod != M_Click )
- LogVCL( SmartId(), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), aMethod );
+ // FIXME: HELPID
+ LogVCL( rtl::OString(), pWin->GetType(), pWin->GetUniqueOrHelpId(), aMethod );
else
- LogVCL( SmartId(), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), aMethod, nCurrentButtonId );
+ // FIXME: HELPID
+ LogVCL( rtl::OString(), pWin->GetType(), pWin->GetUniqueOrHelpId(), aMethod, nCurrentButtonId );
bDone = TRUE;
}
}
@@ -403,12 +433,16 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
}
if ( m_bRecord )
{
+ // FIXME: HELPID
+ #if 0
StatementList::pRet->GenReturn( RET_MacroRecorder, pParent->GetSmartUniqueOrHelpId(), nMethod );
+ #endif
bSendData = TRUE;
}
if ( m_bLog )
{
- LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), aMethod );
+ // FIXME: HELPID
+ LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), aMethod );
bDone = TRUE;
}
}
@@ -417,16 +451,21 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
}
if ( m_bRecord )
{
- if ( !bSendData && pWin->GetSmartUniqueOrHelpId().HasAny() )
+ // FIXME: HELPID
+ if ( !bSendData && pWin->GetUniqueOrHelpId().getLength() )
{
+ // FIXME: HELPID
+ #if 0
StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), (comm_USHORT)M_Click );
+ #endif
bSendData = TRUE;
}
}
if ( m_bLog )
{
if ( !bDone )
- LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), CUniString("Click") );
+ // FIXME: HELPID
+ LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Click") );
}
}
break;
@@ -480,12 +519,16 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
}
if ( m_bRecord )
{
- StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), nMethod );
+ // FIXME: HELPID
+ #if 0
+ StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), nMethod );
+ #endif
bSendData = TRUE;
}
if ( m_bLog )
{
- LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), aMethod );
+ // FIXME: HELPID
+ LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), aMethod );
}
}
break;
@@ -502,12 +545,16 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
case VCLEVENT_BUTTON_CLICK:
if ( m_bRecord )
{
- StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), (comm_USHORT)M_Click );
+ // FIXME: HELPID
+ #if 0
+ StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Click );
+ #endif
bSendData = TRUE;
}
if ( m_bLog )
{
- LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), CUniString("Click") );
+ // FIXME: HELPID
+ LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Click") );
}
break;
/* Keyevent or Timeout
@@ -540,12 +587,15 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
// compare to 1 for floating ToolBoxes
if ( m_bRecord )
{
- if ( !pWin->GetSmartUniqueOrHelpId().HasAny() || pWin->GetSmartUniqueOrHelpId().Matches( 1 ) )
+ // FIXME: HELPID
+ #if 0
+ if ( !pWin->GetUniqueOrHelpId().getLength() || pWin->GetUniqueOrHelpId().Matches( 1 ) )
// generate direct Button access
- StatementList::pRet->GenReturn( RET_MacroRecorder, SmartId( pTB->GetItemCommand( pTB->GetCurItemId() ) ), (comm_USHORT)(M_Click) );
+ StatementList::pRet->GenReturn( RET_MacroRecorder, rtl::OString( pTB->GetItemCommand( pTB->GetCurItemId() ) ), (comm_USHORT)(M_Click) );
else
// access via Toolbox
- StatementList::pRet->GenReturn( RET_MacroRecorder, pTB->GetSmartUniqueOrHelpId(), (comm_USHORT)(M_Click|M_RET_NUM_CONTROL), static_cast<comm_ULONG>(pTB->GetHelpId( pTB->GetCurItemId() )) ); // GetHelpId() ULONG != comm_ULONG on 64bit
+ StatementList::pRet->GenReturn( RET_MacroRecorder, pTB->GetUniqueOrHelpId(), (comm_USHORT)(M_Click|M_RET_NUM_CONTROL), static_cast<comm_ULONG>(pTB->GetHelpId( pTB->GetCurItemId() )) ); // GetHelpId() ULONG != comm_ULONG on 64bit
+ #endif
bSendData = TRUE;
}
/* not needed if ( m_bLog )
@@ -566,7 +616,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
// {
// if ( !pWin->GetSmartUniqueOrHelpId().HasAny() || pWin->GetSmartUniqueOrHelpId().Matches( 1 ) )
// // generate direct Button access
-// StatementList::pRet->GenReturn( RET_MacroRecorder, SmartId( pActionParent->GetHelpId( pActionParent->GetCurItemId() ) ), (comm_USHORT)(M_TearOff) );
+// StatementList::pRet->GenReturn( RET_MacroRecorder, rtl::OString( pActionParent->GetHelpId( pActionParent->GetCurItemId() ) ), (comm_USHORT)(M_TearOff) );
// else
// // access via Toolbox
// StatementList::pRet->GenReturn( RET_MacroRecorder, pActionParent->GetSmartUniqueOrHelpId(), (comm_USHORT)(M_TearOff|M_RET_NUM_CONTROL), static_cast<comm_ULONG>(pActionParent->GetHelpId( pActionParent->GetCurItemId() )) ); // GetHelpId() ULONG != comm_ULONG on 64bit
@@ -574,7 +624,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
// }
// if ( m_bLog )
// {
-// LogVCL( pActionParent->GetSmartUniqueOrHelpId(), pWin->GetType(), SmartId( pActionParent->GetHelpId( pActionParent->GetCurItemId() ) ), CUniString("TearOff") );
+// LogVCL( pActionParent->GetSmartUniqueOrHelpId(), pWin->GetType(), rtl::OString( pActionParent->GetHelpId( pActionParent->GetCurItemId() ) ), CUniString("TearOff") );
// }
// }
// pActionParent = NULL;
@@ -676,11 +726,12 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
Window *pIdWin = GetParentWithID( pWin );
if ( pIdWin != pWin )
bKeyFollowFocus = TRUE;
- aKeyUniqueID = pIdWin->GetSmartUniqueOrHelpId();
+ // FIXME: HELPID
+ aKeyUniqueID = pIdWin->GetUniqueOrHelpId();
if ( m_bLog )
{
// HACK Too many KeyEvents generated if ( aKeyString.Len() == 0 )
-// HACK Too many KeyEvents generated LogVCL( SmartId(), 0, aKeyUniqueID, CUniString("TypeKeysStart") );
+// HACK Too many KeyEvents generated LogVCL( rtl::OString(), 0, aKeyUniqueID, CUniString("TypeKeysStart") );
}
if ( ( !aKeyCode.IsMod1() && !aKeyCode.IsMod2() ) &&
(( aKeyCode.GetGroup() == KEYGROUP_NUM) ||
@@ -1024,12 +1075,16 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
{
if ( m_bRecord )
{
- StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), M_SetText, aEditModifyString );
+ // FIXME: HELPID
+ #if 0
+ StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), M_SetText, aEditModifyString );
+ #endif
bSendData = TRUE;
}
if ( m_bLog )
{
- LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), CUniString("Modify") );
+ // FIXME: HELPID
+ LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Modify") );
}
pEditModify = NULL;
aEditModifyString.Erase(); //could be somewhat lengthy
diff --git a/automation/source/server/recorder.hxx b/automation/source/server/recorder.hxx
index baa6355848ff..5a409513cacc 100644
--- a/automation/source/server/recorder.hxx
+++ b/automation/source/server/recorder.hxx
@@ -27,7 +27,6 @@
#include <tools/string.hxx>
#include <tools/link.hxx>
-#include <vcl/smartid.hxx>
#include <vcl/timer.hxx>
class ToolBox;
@@ -38,7 +37,7 @@ class MacroRecorder
{
private:
Window* GetParentWithID( Window* pThis );
- SmartId GetParentID( Window* pThis );
+ rtl::OString GetParentID( Window* pThis );
Link aEventListenerHdl;
DECL_LINK( EventListener, VclSimpleEvent* );
@@ -51,7 +50,7 @@ private:
// record keys
String aKeyString;
- SmartId aKeyUniqueID; // has to be remembered seperately since Window might be gone when needed
+ rtl::OString aKeyUniqueID; // has to be remembered seperately since Window might be gone when needed
Window* pKeyWin;
BOOL bKeyFollowFocus;
@@ -60,8 +59,8 @@ private:
void RemoveEventHooks();
DECL_LINK( HookRefreshHdl, void* );
- void LogVCL( SmartId aParentID, USHORT nVCLWindowType, SmartId aID, String aMethod, USHORT aParam );
- void LogVCL( SmartId aParentID, USHORT nVCLWindowType, SmartId aID, String aMethod );
+ void LogVCL( rtl::OString aParentID, USHORT nVCLWindowType, rtl::OString aID, String aMethod, USHORT aParam );
+ void LogVCL( rtl::OString aParentID, USHORT nVCLWindowType, rtl::OString aID, String aMethod );
static MacroRecorder *pMacroRecorder;
diff --git a/automation/source/server/retstrm.cxx b/automation/source/server/retstrm.cxx
index 13a9e9b72258..36c783fe7fbd 100644
--- a/automation/source/server/retstrm.cxx
+++ b/automation/source/server/retstrm.cxx
@@ -47,17 +47,17 @@ RetStream::~RetStream()
delete pSammel;
}
-void RetStream::GenError ( SmartId aUId, String aString )
+void RetStream::GenError ( rtl::OString aUId, String aString )
{
CmdBaseStream::GenError ( &aUId, &aString );
}
-void RetStream::GenReturn ( USHORT nRet, SmartId aUId, String aString )
+void RetStream::GenReturn ( USHORT nRet, rtl::OString aUId, String aString )
{
CmdBaseStream::GenReturn ( nRet, &aUId, &aString );
}
-void RetStream::GenReturn ( USHORT nRet, SmartId aUId, SbxValue &aValue )
+void RetStream::GenReturn ( USHORT nRet, rtl::OString aUId, SbxValue &aValue )
{
Write(USHORT(SIReturn));
Write(nRet);
@@ -66,17 +66,17 @@ void RetStream::GenReturn ( USHORT nRet, SmartId aUId, SbxValue &aValue )
Write(aValue);
}
-void RetStream::GenReturn ( USHORT nRet, SmartId aUId, comm_ULONG nNr, String aString, BOOL bBool )
+void RetStream::GenReturn ( USHORT nRet, rtl::OString aUId, comm_ULONG nNr, String aString, BOOL bBool )
{
CmdBaseStream::GenReturn ( nRet, &aUId, nNr, &aString, bBool );
}
-void RetStream::GenReturn( USHORT nRet, SmartId aUId, comm_USHORT nMethod, String aString )
+void RetStream::GenReturn( USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, String aString )
{
CmdBaseStream::GenReturn ( nRet, &aUId, nMethod, &aString );
}
-void RetStream::GenReturn( USHORT nRet, SmartId aUId, comm_USHORT nMethod, String aString, BOOL bBool )
+void RetStream::GenReturn( USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, String aString, BOOL bBool )
{
CmdBaseStream::GenReturn ( nRet, &aUId, nMethod, &aString, bBool );
}
@@ -93,9 +93,11 @@ void RetStream::Write( SbxValue &aValue )
aValue.Store( *pSammel );
}
-void RetStream::Write( SmartId* pId )
+void RetStream::Write( rtl::OString* pId )
{
- DBG_ASSERT( !pId->HasString() || !pId->HasNumeric(), "SmartId contains Number and String. using String only." );
+ // FIXME: HELPID
+ #if 0
+ DBG_ASSERT( !pId->HasString() || !pId->HasNumeric(), "rtl::OString contains Number and String. using String only." );
if ( pId->HasString() )
{
String aTmp( pId->GetStr() );
@@ -103,6 +105,7 @@ void RetStream::Write( SmartId* pId )
}
else
Write( static_cast<comm_ULONG>(pId->GetNum()) ); ////GetNum() ULONG != comm_ULONG on 64bit
+ #endif
}
diff --git a/automation/source/server/retstrm.hxx b/automation/source/server/retstrm.hxx
index 888d1717422c..0a340ee41a4a 100644
--- a/automation/source/server/retstrm.hxx
+++ b/automation/source/server/retstrm.hxx
@@ -28,7 +28,6 @@
#define _RETSTRM_HXX
#include <basic/sbxvar.hxx>
-#include <vcl/smartid.hxx>
#include "cmdbasestream.hxx"
class SvStream;
@@ -43,24 +42,24 @@ public:
using CmdBaseStream::GenError;
// void GenError( comm_ULONG nError, const comm_UniChar* aString, comm_USHORT nLenInChars ){CmdBaseStream::GenError( nError, aString, nLenInChars );}
// new
- void GenError( SmartId aUId, String aString );
+ void GenError( rtl::OString aUId, String aString );
using CmdBaseStream::GenReturn;
void GenReturn( comm_USHORT nRet, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, nNr );}
- void GenReturn( comm_USHORT nRet, SmartId aUId, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nNr );}
- void GenReturn( comm_USHORT nRet, SmartId aUId, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, bBool );}
+ void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nNr );}
+ void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, bBool );}
// MacroRecorder
- void GenReturn( comm_USHORT nRet, SmartId aUId, comm_USHORT nMethod ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod );}
- void GenReturn( comm_USHORT nRet, SmartId aUId, comm_USHORT nMethod, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, bBool );}
- void GenReturn( comm_USHORT nRet, SmartId aUId, comm_USHORT nMethod, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, nNr );}
+ void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_USHORT nMethod ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod );}
+ void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, bBool );}
+ void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, nNr );}
// new
- void GenReturn( USHORT nRet, SmartId aUId, String aString );
- void GenReturn( USHORT nRet, SmartId aUId, SbxValue &aValue );
- void GenReturn( USHORT nRet, SmartId aUId, comm_ULONG nNr, String aString, BOOL bBool );
+ void GenReturn( USHORT nRet, rtl::OString aUId, String aString );
+ void GenReturn( USHORT nRet, rtl::OString aUId, SbxValue &aValue );
+ void GenReturn( USHORT nRet, rtl::OString aUId, comm_ULONG nNr, String aString, BOOL bBool );
// MacroRecorder
- void GenReturn( USHORT nRet, SmartId aUId, comm_USHORT nMethod, String aString );
- void GenReturn( USHORT nRet, SmartId aUId, comm_USHORT nMethod, String aString, BOOL bBool );
+ void GenReturn( USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, String aString );
+ void GenReturn( USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, String aString, BOOL bBool );
void Reset();
SvStream* GetStream();
@@ -75,7 +74,7 @@ public:
void Write( SbxValue &aValue );
// Complex Datatypes to be handled system dependent
- virtual void Write( SmartId* pId );
+ virtual void Write( rtl::OString* pId );
virtual void Write( String *pString );
SvStream *pSammel;
diff --git a/automation/source/server/server.cxx b/automation/source/server/server.cxx
index e4e59251dd63..5a27e2b3b71b 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 rcksetzen, da handler sowieso verlassen wird
+ StatementList::aWindowWaitUId = rtl::OString(); // Warten rcksetzen, da handler sowieso verlassen wird
/* if( StatementList::pFirst && !StatementList::bReadingCommands )
// Abfrage ntig, da andere CommandHdl aktiv sein knnen oder
diff --git a/automation/source/server/sta_list.cxx b/automation/source/server/sta_list.cxx
index 7f346c298563..f87746eb7988 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(); // Untermens 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(); // Untermens bei PopupMenus
+rtl::OString StatementList::aSubMenuId2 = rtl::OString(); // erstmal 2-Stufig
+rtl::OString StatementList::aSubMenuId3 = rtl::OString(); // and now even 3 levels #i31512#
SystemWindow *StatementList::pMenuWindow = NULL;
TTProperties *StatementList::pTTProperties = NULL;
@@ -129,7 +129,8 @@ TTSettings* GetTTSettings()
-#define IS_WINP_CLOSING(pWin) (pWin->GetSmartHelpId().Matches( 4321 ) && pWin->GetSmartUniqueId().Matches( 1234 ))
+// FIXME: HELPID
+#define IS_WINP_CLOSING(pWin) (pWin->GetHelpId().equals( "4321" ) && pWin->GetUniqueId().equals( "1234" ))
/*
UniString GEN_RES_STR0( ULONG nResId ) { return ResString( nResId ); }
@@ -154,7 +155,7 @@ void StatementList::InitProfile()
#if OSL_DEBUG_LEVEL > 1
if ( pCurrentProfileStatement != NULL && pCurrentProfileStatement != this )
- pRet->GenReturn( RET_ProfileInfo, SmartId(), CUniString("InitProfile von anderem Statement gerufen ohne SendProfile\n") );
+ pRet->GenReturn( RET_ProfileInfo, rtl::OString(), CUniString("InitProfile von anderem Statement gerufen ohne SendProfile\n") );
#endif
pCurrentProfileStatement = this;
}
@@ -170,18 +171,18 @@ void StatementList::SendProfile( String aText )
pProfiler->EndProfileInterval();
if ( pProfiler->IsProfilingPerCommand() )
- pRet->GenReturn( RET_ProfileInfo, SmartId(), pProfiler->GetProfileLine( aText ) );
+ pRet->GenReturn( RET_ProfileInfo, rtl::OString(), pProfiler->GetProfileLine( aText ) );
if ( pProfiler->IsPartitioning() )
- pRet->GenReturn( RET_ProfileInfo, SmartId( S_ProfileTime ), static_cast<comm_ULONG>(pProfiler->GetPartitioningTime()) ); // GetPartitioningTime() ULONG != comm_ULONG on 64bit
+ pRet->GenReturn( RET_ProfileInfo, rtl::OString( S_ProfileTime ), static_cast<comm_ULONG>(pProfiler->GetPartitioningTime()) ); // GetPartitioningTime() ULONG != comm_ULONG on 64bit
}
if ( pProfiler->IsAutoProfiling() )
- pRet->GenReturn( RET_ProfileInfo, SmartId(), pProfiler->GetAutoProfiling() );
+ pRet->GenReturn( RET_ProfileInfo, rtl::OString(), pProfiler->GetAutoProfiling() );
#if OSL_DEBUG_LEVEL > 1
if ( pCurrentProfileStatement == NULL )
- pRet->GenReturn( RET_ProfileInfo, SmartId(), CUniString("SendProfile ohne InitProfile\n") );
+ pRet->GenReturn( RET_ProfileInfo, rtl::OString(), CUniString("SendProfile ohne InitProfile\n") );
#endif
pCurrentProfileStatement = NULL;
}
@@ -389,7 +390,9 @@ Window* StatementList::SearchClientWin( Window *pBase, Search &aSearch, BOOL May
BOOL SearchUID::IsWinOK( Window *pWin )
{
- if ( aUId.Matches( pWin->GetSmartUniqueOrHelpId() ) )
+ // FIXME: HELPID
+ #if 0
+ if ( aUId.Matches( pWin->GetUniqueOrHelpId() ) )
{
if ( ( pWin->IsEnabled() || HasSearchFlag( SEARCH_FIND_DISABLED ) ) && pWin->IsVisible() )
return TRUE;
@@ -451,10 +454,11 @@ BOOL SearchUID::IsWinOK( Window *pWin )
return FALSE;
}
else
+ #endif
return FALSE;
}
-Window* StatementList::SearchTree( SmartId aUId ,BOOL bSearchButtonOnToolbox )
+Window* StatementList::SearchTree( rtl::OString aUId ,BOOL bSearchButtonOnToolbox )
{
SearchUID aSearch(aUId,bSearchButtonOnToolbox);
@@ -973,7 +977,8 @@ String StatementList::ClientTree(Window *pBase, int Indent)
WRITE(sIndent);
WRITEc("UId : ");
- WRITE(UIdString(pBase->GetSmartUniqueOrHelpId()));
+ // FIXME: HELPID
+ WRITE(String(rtl::OStringToOUString(pBase->GetUniqueOrHelpId(), RTL_TEXTENCODING_UTF8)));
WRITEc(":0x");
WRITE(
String::CreateFromInt64(
@@ -1038,10 +1043,11 @@ BOOL StatementList::CheckWindowWait()
#if OSL_DEBUG_LEVEL > 1
m_pDbgWin->AddText( "Close timed out. Going on!! " );
#endif
- pWindowWaitPointer->SetSmartHelpId(aWindowWaitOldHelpId, SMART_SET_ALL);
- pWindowWaitPointer->SetSmartUniqueId(aWindowWaitOldUniqueId, SMART_SET_ALL);
+ // FIXME: HELPID
+ pWindowWaitPointer->SetHelpId(aWindowWaitOldHelpId);
+ pWindowWaitPointer->SetUniqueId(aWindowWaitOldUniqueId);
- aWindowWaitUId = SmartId();
+ aWindowWaitUId = rtl::OString();
pWindowWaitPointer = NULL;
StartTime = Time(0L);
return TRUE;
@@ -1050,7 +1056,7 @@ BOOL StatementList::CheckWindowWait()
return FALSE;
}
pWindowWaitPointer = NULL;
- aWindowWaitUId = SmartId();
+ aWindowWaitUId = rtl::OString();
#if OSL_DEBUG_LEVEL > 1
m_pDbgWin->AddText( "Closed, Going on.\n" );
#endif
@@ -1061,10 +1067,10 @@ BOOL StatementList::CheckWindowWait()
void StatementList::ReportError(String aMessage)
{
- ReportError ( SmartId(), aMessage );
+ ReportError ( rtl::OString(), aMessage );
}
-void StatementList::ReportError(SmartId aUId, String aMessage)
+void StatementList::ReportError(rtl::OString aUId, String aMessage)
{
pRet->GenError ( aUId, aMessage );
IsError = TRUE;
@@ -1078,7 +1084,7 @@ void StatementList::ReportError(String aMessage, ULONG nWhatever)
void StatementList::DirectLog( ULONG nType, String aMessage )
{
if ( pRet )
- pRet->GenReturn( RET_DirectLoging, SmartId(nType), aMessage );
+ pRet->GenReturn( RET_DirectLoging, rtl::OString(nType), aMessage );
}
diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx
index 68ff61bbaa0d..f4a2ed5ddd4b 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 whrend 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 zugehrigen Tabdialog nehmen
pControl = pControl->GET_REAL_PARENT();
- nRT = ImpGetRType( pControl, pControl->GetSmartUniqueOrHelpId() );
+ // FIXME: HELPID
+ nRT = ImpGetRType( pControl, pControl->GetUniqueOrHelpId() );
}
switch( nRT )
@@ -2692,7 +2733,12 @@ BOOL StatementCommand::Execute()
else if ( !IsDialog(pWin) )
ReportError( GEN_RES_STR0( S_NO_DIALOG_IN_GETACTIVE ) );
else
- pRet->GenReturn( RET_Value, aSmartMethodId, static_cast<comm_ULONG>(pWin->GetSmartUniqueOrHelpId().GetNum())); //GetNum() ULONG != comm_ULONG on 64bit
+ {
+ // FIXME: HELPID
+ #if 0
+ pRet->GenReturn( RET_Value, aSmartMethodId, static_cast<comm_ULONG>(pWin->GetUniqueOrHelpId().GetNum())); //GetNum() ULONG != comm_ULONG on 64bit
+ #endif
+ }
}
break;
case RC_UseBindings:
@@ -2725,7 +2771,7 @@ BOOL StatementCommand::Execute()
pProfiler->StartAutoProfiling( nNr1 );
// Der Header ist abhngig 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 zurck bertragen.
// Das ist zwar etwas eigenartig, aber ansonsten msste 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 abhngig 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 flschen 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 4e580a09749c..2014e6d3a4fe 100644
--- a/automation/source/server/statemnt.hxx
+++ b/automation/source/server/statemnt.hxx
@@ -54,7 +54,6 @@
#include <basic/sbstar.hxx>
#include <vcl/event.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
-#include <vcl/smartid.hxx>
#include <automation/commtypes.hxx>
class Window;
@@ -241,7 +240,7 @@ public:
protected:
static Window* SearchClientWin( Window *pBase, Search &aSearch, BOOL MaybeBase = TRUE );
- Window* SearchTree( SmartId aUId, BOOL bSearchButtonOnToolbox = FALSE );
+ Window* SearchTree( rtl::OString aUId, BOOL bSearchButtonOnToolbox = FALSE );
Window* GetActive( WindowType nRT, BOOL MaybeBase = TRUE );
Window* GetFocus( WindowType nRT, BOOL MaybeBase = TRUE );
Window* GetAnyActive( BOOL MaybeBase = TRUE );
@@ -253,7 +252,7 @@ protected:
Window* GetDocWin( USHORT nNr );
USHORT GetDocWinCount();
Window* GetFadeSplitWin( Window *pBase, WindowAlign nAlign, BOOL MaybeBase = TRUE );
- BOOL ValueOK(SmartId nId, String aBezeichnung, ULONG nValue, ULONG nMax);
+ BOOL ValueOK(rtl::OString nId, String aBezeichnung, ULONG nValue, ULONG nMax);
USHORT GetCurrentMenues( PopupMenu *&pPopup, MenuBar *&pMenuBar, Menu *&pMenu );
@@ -274,7 +273,7 @@ public:
***************************************************************************/
void ReportError(String aMessage);
- void ReportError(SmartId aUId, String aMessage);
+ void ReportError(rtl::OString aUId, String aMessage);
void ReportError(String aMessage, ULONG nWhatever);
static void DirectLog( ULONG nType, String aString );
@@ -285,18 +284,18 @@ public:
StatementList *pNext;
static StatementList /**pCurrent,*/ *pFirst;
static BOOL bReadingCommands;
- static SmartId aWindowWaitUId;
+ static rtl::OString aWindowWaitUId;
static Window *pWindowWaitPointer;
- static SmartId aWindowWaitOldHelpId;
- static SmartId aWindowWaitOldUniqueId;
+ static rtl::OString aWindowWaitOldHelpId;
+ static rtl::OString aWindowWaitOldUniqueId;
static RetStream *pRet;
static BOOL IsError;
static BOOL bDying;
static BOOL bExecuting; // Gesetzt, wenn ein Befehl rescheduled ohne einen neuen Befehl zu erlauben
BOOL bWasExecuting; // Wurde bei einem MaybeResetSafeReschedule resettet, so wird der Zustand danach wiederhergestellt
- static SmartId aSubMenuId1; // Untermens bei PopupMenus
- static SmartId aSubMenuId2; // erstmal 2-Stufig
- static SmartId aSubMenuId3; // and now even 3 levels #i31512#
+ static rtl::OString aSubMenuId1; // Untermens 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 ausfhren (wintree, re
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 4f6d413f4280..a0e50e912498 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 75229bb32cb7..147b04bc0414 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 2361361f277f..779cf32648b2 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 Te
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 d82e4626a4d2..f62d59311024 100644
--- a/automation/source/testtool/objtest.hxx
+++ b/automation/source/testtool/objtest.hxx
@@ -35,7 +35,6 @@
#include <testtool.hxx>
#include "cmdstrm.hxx"
#include <basic/basicrt.hxx>
-#include <vcl/smartid.hxx>
#include "httprequest.hxx"
#include <map>
@@ -106,7 +105,7 @@ class ControlData
{
public:
String Kurzname;
- SmartId aUId;
+ rtl::OString aUId;
};
DBG_NAMEEX( ControlItem )
@@ -118,8 +117,8 @@ private:
public:
ControlData *pData;
- ControlItem( const char *Name, SmartId aUIdP );
- ControlItem( const String &Name, SmartId aUIdP );
+ ControlItem( const char *Name, rtl::OString aUIdP );
+ ControlItem( const String &Name, rtl::OString aUIdP );
// ControlItem( const String &Name, const String &URL, const URLType aType );
// ControlItem( const String &Name, const String &URL, const ULONG nUId );
// ControlItem( const char *Name, const String &URL, const ULONG nUId );
@@ -158,9 +157,9 @@ public:
class ControlItemSon : public ControlItem, public ControlSon
{
public:
- ControlItemSon(const char *Name, SmartId aUIdP )
+ ControlItemSon(const char *Name, rtl::OString aUIdP )
: ControlItem( Name, aUIdP ) {}
- ControlItemSon(const String &Name, SmartId aUIdP );
+ ControlItemSon(const String &Name, rtl::OString aUIdP );
// ControlItemSon(const String &Name, const String &URL, const URLType aType );
// ControlItemSon(const String &Name, const String &URL, const ULONG nUId );
// ControlItemSon(const char *Name, const String &URL, const ULONG nUId );
@@ -170,9 +169,9 @@ public:
class ControlDef : public ControlItemSon
{
public:
- ControlDef(const char *Name, SmartId aUIdP )
+ ControlDef(const char *Name, rtl::OString aUIdP )
: ControlItemSon( Name, aUIdP ) {DBG_CTOR(ControlDef,0);}
- ControlDef(const String &Name, SmartId aUIdP );
+ ControlDef(const String &Name, rtl::OString aUIdP );
// ControlDef(const String &Name, const String &URL, const URLType aType );
ControlDef(const String &aOldName, const String &aNewName, ControlDef *pOriginal, BOOL bWithSons = FALSE );
~ControlDef() {DBG_DTOR(ControlDef,0);}
@@ -185,7 +184,7 @@ public:
class ControlItemUId : public ControlItem
{
public:
- ControlItemUId(String Name, SmartId aUIdP)
+ ControlItemUId(String Name, rtl::OString aUIdP)
: ControlItem( Name, aUIdP){}
virtual BOOL operator < (const ControlItem &rPar);
virtual BOOL operator == (const ControlItem &rPar);
@@ -194,7 +193,7 @@ public:
class ControlItemUIdSon : public ControlItemUId, public ControlSon
{
public:
- ControlItemUIdSon(String Name, SmartId aUIdP) : ControlItemUId( Name, aUIdP) {}
+ ControlItemUIdSon(String Name, rtl::OString aUIdP) : ControlItemUId( Name, aUIdP) {}
MK_SON_ACCESS( ControlItemUId )
};
@@ -203,14 +202,14 @@ class ReverseName : public ControlItemUId
public:
ULONG LastSequence;
- ReverseName(String Name, SmartId aUIdP, ULONG nSeq) : ControlItemUId( Name, aUIdP), LastSequence(nSeq) {}
+ ReverseName(String Name, rtl::OString aUIdP, ULONG nSeq) : ControlItemUId( Name, aUIdP), LastSequence(nSeq) {}
};
class CRevNames: public CNames
{
public:
- void Insert( String aName, SmartId aUId, ULONG nSeq );
- String GetName( SmartId aUId );
+ void Insert( String aName, rtl::OString aUId, ULONG nSeq );
+ String GetName( rtl::OString aUId );
void Invalidate ( ULONG nSeq );
};
generated by cgit (git 2.34.1) at 2024-05-29 21:45:53 +0000