testtool: fix libsts to work with old testtool

1 files changed, 14 insertions, 23 deletions

diff --git a/automation/source/server/sta_list.cxx b/automation/source/server/sta_list.cxx
index 9d7fb5597068..c491e66885cc 100644
--- a/automation/source/server/sta_list.cxx
+++ b/automation/source/server/sta_list.cxx
@@ -84,9 +84,9 @@ rtl::OString StatementList::aWindowWaitOldHelpId = rtl::OString();
 rtl::OString StatementList::aWindowWaitOldUniqueId = rtl::OString();
 USHORT StatementList::nUseBindings = 0;
 
-rtl::OString StatementList::aSubMenuId1 = rtl::OString();   // Untermenüs bei PopupMenus
-rtl::OString StatementList::aSubMenuId2 = rtl::OString();   // erstmal 2-Stufig
-rtl::OString StatementList::aSubMenuId3 = rtl::OString();   // and now even 3 levels #i31512#
+USHORT StatementList::aSubMenuId1 = 0;  // Untermenüs bei PopupMenus
+USHORT StatementList::aSubMenuId2 = 0;  // erstmal 2-Stufig
+USHORT StatementList::aSubMenuId3 = 0;  // and now even 3 levels #i31512#
 SystemWindow *StatementList::pMenuWindow = NULL;
 TTProperties *StatementList::pTTProperties = NULL;
 
@@ -131,7 +131,7 @@ TTSettings* GetTTSettings()
 
 
 // FIXME: HELPID
-#define IS_WINP_CLOSING(pWin) (pWin->GetHelpId().equals( "4321" ) && pWin->GetUniqueId().equals( "1234" ))
+#define IS_WINP_CLOSING(pWin) (pWin->GetHelpId().equals( "TT_Win_is_closing_HID" ) && pWin->GetUniqueId().equals( "TT_Win_is_closing_UID" ))
 
 /*
 UniString GEN_RES_STR0( ULONG nResId ) { return ResString( nResId ); }
@@ -156,7 +156,7 @@ void StatementList::InitProfile()
 
 #if OSL_DEBUG_LEVEL > 1
         if ( pCurrentProfileStatement != NULL && pCurrentProfileStatement != this )
-            pRet->GenReturn( RET_ProfileInfo, rtl::OString(), CUniString("InitProfile von anderem Statement gerufen ohne SendProfile\n") );
+            pRet->GenReturn( RET_ProfileInfo, 0, CUniString("InitProfile von anderem Statement gerufen ohne SendProfile\n") );
 #endif
         pCurrentProfileStatement = this;
     }
@@ -172,19 +172,19 @@ void StatementList::SendProfile( String aText )
                 pProfiler->EndProfileInterval();
 
             if ( pProfiler->IsProfilingPerCommand() )
-                pRet->GenReturn( RET_ProfileInfo, rtl::OString(), pProfiler->GetProfileLine( aText ) );
+                pRet->GenReturn( RET_ProfileInfo, 0, pProfiler->GetProfileLine( aText ) );
 
             if ( pProfiler->IsPartitioning() )
                                 // FIXME: HELPID
-                pRet->GenReturn( RET_ProfileInfo, rtl::OString( /*S_ProfileTime*/ ), static_cast<comm_ULONG>(pProfiler->GetPartitioningTime()) ); // GetPartitioningTime() ULONG != comm_ULONG on 64bit
+                pRet->GenReturn( RET_ProfileInfo, S_ProfileTime, static_cast<comm_ULONG>(pProfiler->GetPartitioningTime()) ); // GetPartitioningTime() ULONG != comm_ULONG on 64bit
         }
 
         if ( pProfiler->IsAutoProfiling() )
-            pRet->GenReturn( RET_ProfileInfo, rtl::OString(), pProfiler->GetAutoProfiling() );
+            pRet->GenReturn( RET_ProfileInfo, 0, pProfiler->GetAutoProfiling() );
 
 #if OSL_DEBUG_LEVEL > 1
         if ( pCurrentProfileStatement == NULL )
-            pRet->GenReturn( RET_ProfileInfo, rtl::OString(), CUniString("SendProfile ohne InitProfile\n") );
+            pRet->GenReturn( RET_ProfileInfo, 0, CUniString("SendProfile ohne InitProfile\n") );
 #endif
         pCurrentProfileStatement = NULL;
     }
@@ -392,9 +392,7 @@ Window* StatementList::SearchClientWin( Window *pBase, Search &aSearch, BOOL May
 
 BOOL SearchUID::IsWinOK( Window *pWin )
 {
-    // FIXME: HELPID
-    #if 0
-    if ( aUId.Matches( pWin->GetUniqueOrHelpId() ) )
+    if ( aUId.equals( pWin->GetUniqueOrHelpId() ) )
     {
         if ( ( pWin->IsEnabled() || HasSearchFlag( SEARCH_FIND_DISABLED ) ) && pWin->IsVisible() )
             return TRUE;
@@ -411,7 +409,7 @@ BOOL SearchUID::IsWinOK( Window *pWin )
         USHORT i;
         for ( i = 0; i < pTB->GetItemCount() ; i++ )
         {
-            if ( aUId.Matches( pTB->GetItemCommand(pTB->GetItemId( i )) ) || aUId.Matches( pTB->GetHelpId(pTB->GetItemId( i )) ) )
+            if ( aUId.equals( Str2Id( pTB->GetItemCommand(pTB->GetItemId( i )) ) ) || aUId.equals( pTB->GetHelpId(pTB->GetItemId( i )) ) )
             {       // ID matches.
                 Window *pItemWin;
                 pItemWin = pTB->GetItemWindow( pTB->GetItemId( i ) );
@@ -456,9 +454,6 @@ BOOL SearchUID::IsWinOK( Window *pWin )
         return FALSE;
     }
     else
-    #else
-    (void)pWin;
-    #endif
         return FALSE;
 }
 
@@ -981,8 +976,7 @@ String StatementList::ClientTree(Window *pBase, int Indent)
 
     WRITE(sIndent);
     WRITEc("UId : ");
-    // FIXME: HELPID
-    WRITE(String(rtl::OStringToOUString(pBase->GetUniqueOrHelpId(), RTL_TEXTENCODING_UTF8)));
+    WRITE(Id2Str(pBase->GetUniqueOrHelpId()));
     WRITEc(":0x");
     WRITE(
         String::CreateFromInt64(
@@ -1039,7 +1033,7 @@ BOOL StatementList::CheckWindowWait()
         if ( WinPtrValid(pWindowWaitPointer) && IS_WINP_CLOSING(pWindowWaitPointer) )
         {
 #if OSL_DEBUG_LEVEL > 1
-            m_pDbgWin->AddText( aWindowWaitUId.GetText().AppendAscii(" Still Open. RType=") );
+            m_pDbgWin->AddText( Id2Str(aWindowWaitUId).AppendAscii(" Still Open. RType=") );
             m_pDbgWin->AddText( String::CreateFromInt32( pWindowWaitPointer->GetType() ).AppendAscii("\n") );
 #endif
 
@@ -1049,7 +1043,6 @@ BOOL StatementList::CheckWindowWait()
 #if OSL_DEBUG_LEVEL > 1
                 m_pDbgWin->AddText( "Close timed out. Going on!! " );
 #endif
-                // FIXME: HELPID
                 pWindowWaitPointer->SetHelpId(aWindowWaitOldHelpId);
                 pWindowWaitPointer->SetUniqueId(aWindowWaitOldUniqueId);
 
@@ -1090,9 +1083,7 @@ void StatementList::ReportError(String aMessage, ULONG nWhatever)
 void StatementList::DirectLog( ULONG nType, String aMessage )
 {
     if ( pRet )
-                // FIXME: HELPID
-        pRet->GenReturn( RET_DirectLoging, rtl::OString(/*nType*/), aMessage );
-        (void) nType;
+        pRet->GenReturn( RET_DirectLoging, nType, aMessage );
 }