summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Lohmann [pl] <Philipp.Lohmann@Sun.COM>2010-06-04 20:07:26 +0200
committerPhilipp Lohmann [pl] <Philipp.Lohmann@Sun.COM>2010-06-04 20:07:26 +0200
commit3b1416e6d35dea58daaa93a7b14477f6e0c15eed (patch)
treef8f3f6ff33107914a5ccec04e754fdc77397287e
parent00b95402e79f521a027375efc47409096a7766dc (diff)
fix windows compile
-rw-r--r--automation/source/server/sta_list.cxx7
-rw-r--r--automation/source/testtool/objtest.cxx23
2 files changed, 20 insertions, 10 deletions
diff --git a/automation/source/server/sta_list.cxx b/automation/source/server/sta_list.cxx
index 258ca8e751fa..fedec0f77b76 100644
--- a/automation/source/server/sta_list.cxx
+++ b/automation/source/server/sta_list.cxx
@@ -174,7 +174,8 @@ void StatementList::SendProfile( String aText )
pRet->GenReturn( RET_ProfileInfo, rtl::OString(), pProfiler->GetProfileLine( aText ) );
if ( pProfiler->IsPartitioning() )
- pRet->GenReturn( RET_ProfileInfo, rtl::OString( S_ProfileTime ), static_cast<comm_ULONG>(pProfiler->GetPartitioningTime()) ); // GetPartitioningTime() ULONG != comm_ULONG on 64bit
+ // FIXME: HELPID
+ pRet->GenReturn( RET_ProfileInfo, rtl::OString( /*S_ProfileTime*/ ), static_cast<comm_ULONG>(pProfiler->GetPartitioningTime()) ); // GetPartitioningTime() ULONG != comm_ULONG on 64bit
}
if ( pProfiler->IsAutoProfiling() )
@@ -1086,7 +1087,9 @@ void StatementList::ReportError(String aMessage, ULONG nWhatever)
void StatementList::DirectLog( ULONG nType, String aMessage )
{
if ( pRet )
- pRet->GenReturn( RET_DirectLoging, rtl::OString(nType), aMessage );
+ // FIXME: HELPID
+ pRet->GenReturn( RET_DirectLoging, rtl::OString(/*nType*/), aMessage );
+ (void) nType;
}
diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index 34840cd3e16b..efb2294a5549 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -1184,7 +1184,8 @@ void TestToolObj::ReadFlat( String Filename, CNames *&pNames, BOOL bSortByName )
}
aLongname = aLine.GetToken(0,cMyDelim);
- aUId = rtl::OString( (ULONG)aLine.GetToken(1,cMyDelim).ToInt64() );
+ // FIXME: HELPID
+ aUId = rtl::OUStringToOString( aLine.GetToken(1,cMyDelim), RTL_TEXTENCODING_UTF8 );
if ( bSortByName )
pNewItem = new ControlDef( aLongname, aUId );
@@ -1233,7 +1234,8 @@ void ReadFlatArray( const ControlDefLoad arWas [], CNames *&pNames )
while ( String::CreateFromAscii(arWas[nIndex].Kurzname).Len() > 0 )
{
- rtl::OString aUId (arWas[nIndex].nUId);
+ // FIXME: HELPID
+ rtl::OString aUId;// (arWas[nIndex].nUId);
const ControlItem *pX = new ControlDef( arWas[nIndex].Kurzname, aUId);
pNames->C40_PTR_INSERT(ControlItem, pX);
nIndex++;
@@ -1541,7 +1543,7 @@ BOOL TestToolObj::ReadNamesBin( String Filename, CNames *&pSIds, CNames *&pContr
{
comm_ULONG nUId;
aStream >> nUId;
- aUId = rtl::OString( nUId );
+ aUId = rtl::OString();// nUId;
}
if (aName.GetChar(0) == '*' || bIsFlat ) // Globaler Kurzname (Dialogname oder SId)
@@ -2218,7 +2220,8 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
if ( !IsError() && ((SbxTransportMethod*)pVar)->nValue & M_WITH_RETURN )
{
pImpl->pNextReturn = ((SbxTransportMethod*)pVar);
- aNextReturnId = rtl::OString( ((SbxTransportMethod*)pVar)->nValue );
+ // FIXME: HELPID
+ aNextReturnId = rtl::OString();// ((SbxTransportMethod*)pVar)->nValue );
}
if ( SingleCommandBlock )
EndBlock();
@@ -2291,7 +2294,8 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
{
In->GenCmdControl (pMember->GetULong(),
(USHORT)((SbxTransportMethod*)pVar)->nValue, rPar);
- aNextReturnId = rtl::OString( pMember->GetULong() );
+ // FIXME: HELPID
+ aNextReturnId = rtl::OString();// pMember->GetULong() );
}
else
{
@@ -3789,7 +3793,8 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
if ( m_pReverseControls )
{
USHORT nNr;
- ControlItem *pNewItem = new ControlItemUId( String(), rtl::OString( nLNr1 ) );
+ // FIXME: HELPID
+ ControlItem *pNewItem = new ControlItemUId( String(), rtl::OString( /*nLNr1*/ ) );
if ( m_pReverseControls->Seek_Entry(pNewItem,&nNr) )
aULongNames = m_pReverseControls->GetObject(nNr)->pData->Kurzname;
delete pNewItem;
@@ -4144,7 +4149,8 @@ static ControlDefLoad __READONLY_DATA arRes_Type [] =
bFound = FALSE;
if ( aType.CompareTo(UIdKenn) == COMPARE_EQUAL )
{
- aResult = pShortNames->GetName(rtl::OString(nNumber));
+ // FIXME: HELPID
+ aResult = pShortNames->GetName(rtl::OString(/*nNumber*/));
bFound = TRUE;
}
if ( aType.CompareTo(MethodKenn ) == COMPARE_EQUAL )
@@ -4198,7 +4204,8 @@ static ControlDefLoad __READONLY_DATA arRes_Type [] =
}
if ( aType.CompareTo(SlotKenn ) == COMPARE_EQUAL )
{
- aResult = pShortNames->GetName(rtl::OString(nNumber));
+ // FIXME: HELPID
+ aResult = pShortNames->GetName(rtl::OString(/*nNumber*/));
bFound = TRUE;
}
if ( aType.CompareTo(TabKenn ) == COMPARE_EQUAL )