Kaydet (Commit) 3b1416e6 authored tarafından Philipp Lohmann [pl]'s avatar Philipp Lohmann [pl]

fix windows compile

üst 00b95402
...@@ -174,7 +174,8 @@ void StatementList::SendProfile( String aText ) ...@@ -174,7 +174,8 @@ void StatementList::SendProfile( String aText )
pRet->GenReturn( RET_ProfileInfo, rtl::OString(), pProfiler->GetProfileLine( aText ) ); pRet->GenReturn( RET_ProfileInfo, rtl::OString(), pProfiler->GetProfileLine( aText ) );
if ( pProfiler->IsPartitioning() ) 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() ) if ( pProfiler->IsAutoProfiling() )
...@@ -1086,7 +1087,9 @@ void StatementList::ReportError(String aMessage, ULONG nWhatever) ...@@ -1086,7 +1087,9 @@ void StatementList::ReportError(String aMessage, ULONG nWhatever)
void StatementList::DirectLog( ULONG nType, String aMessage ) void StatementList::DirectLog( ULONG nType, String aMessage )
{ {
if ( pRet ) if ( pRet )
pRet->GenReturn( RET_DirectLoging, rtl::OString(nType), aMessage ); // FIXME: HELPID
pRet->GenReturn( RET_DirectLoging, rtl::OString(/*nType*/), aMessage );
(void) nType;
} }
......
...@@ -1184,7 +1184,8 @@ void TestToolObj::ReadFlat( String Filename, CNames *&pNames, BOOL bSortByName ) ...@@ -1184,7 +1184,8 @@ void TestToolObj::ReadFlat( String Filename, CNames *&pNames, BOOL bSortByName )
} }
aLongname = aLine.GetToken(0,cMyDelim); 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 ) if ( bSortByName )
pNewItem = new ControlDef( aLongname, aUId ); pNewItem = new ControlDef( aLongname, aUId );
...@@ -1233,7 +1234,8 @@ void ReadFlatArray( const ControlDefLoad arWas [], CNames *&pNames ) ...@@ -1233,7 +1234,8 @@ void ReadFlatArray( const ControlDefLoad arWas [], CNames *&pNames )
while ( String::CreateFromAscii(arWas[nIndex].Kurzname).Len() > 0 ) 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); const ControlItem *pX = new ControlDef( arWas[nIndex].Kurzname, aUId);
pNames->C40_PTR_INSERT(ControlItem, pX); pNames->C40_PTR_INSERT(ControlItem, pX);
nIndex++; nIndex++;
...@@ -1541,7 +1543,7 @@ BOOL TestToolObj::ReadNamesBin( String Filename, CNames *&pSIds, CNames *&pContr ...@@ -1541,7 +1543,7 @@ BOOL TestToolObj::ReadNamesBin( String Filename, CNames *&pSIds, CNames *&pContr
{ {
comm_ULONG nUId; comm_ULONG nUId;
aStream >> nUId; aStream >> nUId;
aUId = rtl::OString( nUId ); aUId = rtl::OString();// nUId;
} }
if (aName.GetChar(0) == '*' || bIsFlat ) // Globaler Kurzname (Dialogname oder SId) if (aName.GetChar(0) == '*' || bIsFlat ) // Globaler Kurzname (Dialogname oder SId)
...@@ -2218,7 +2220,8 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, ...@@ -2218,7 +2220,8 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
if ( !IsError() && ((SbxTransportMethod*)pVar)->nValue & M_WITH_RETURN ) if ( !IsError() && ((SbxTransportMethod*)pVar)->nValue & M_WITH_RETURN )
{ {
pImpl->pNextReturn = ((SbxTransportMethod*)pVar); pImpl->pNextReturn = ((SbxTransportMethod*)pVar);
aNextReturnId = rtl::OString( ((SbxTransportMethod*)pVar)->nValue ); // FIXME: HELPID
aNextReturnId = rtl::OString();// ((SbxTransportMethod*)pVar)->nValue );
} }
if ( SingleCommandBlock ) if ( SingleCommandBlock )
EndBlock(); EndBlock();
...@@ -2291,7 +2294,8 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, ...@@ -2291,7 +2294,8 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
{ {
In->GenCmdControl (pMember->GetULong(), In->GenCmdControl (pMember->GetULong(),
(USHORT)((SbxTransportMethod*)pVar)->nValue, rPar); (USHORT)((SbxTransportMethod*)pVar)->nValue, rPar);
aNextReturnId = rtl::OString( pMember->GetULong() ); // FIXME: HELPID
aNextReturnId = rtl::OString();// pMember->GetULong() );
} }
else else
{ {
...@@ -3789,7 +3793,8 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) ...@@ -3789,7 +3793,8 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
if ( m_pReverseControls ) if ( m_pReverseControls )
{ {
USHORT nNr; 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) ) if ( m_pReverseControls->Seek_Entry(pNewItem,&nNr) )
aULongNames = m_pReverseControls->GetObject(nNr)->pData->Kurzname; aULongNames = m_pReverseControls->GetObject(nNr)->pData->Kurzname;
delete pNewItem; delete pNewItem;
...@@ -4144,7 +4149,8 @@ static ControlDefLoad __READONLY_DATA arRes_Type [] = ...@@ -4144,7 +4149,8 @@ static ControlDefLoad __READONLY_DATA arRes_Type [] =
bFound = FALSE; bFound = FALSE;
if ( aType.CompareTo(UIdKenn) == COMPARE_EQUAL ) if ( aType.CompareTo(UIdKenn) == COMPARE_EQUAL )
{ {
aResult = pShortNames->GetName(rtl::OString(nNumber)); // FIXME: HELPID
aResult = pShortNames->GetName(rtl::OString(/*nNumber*/));
bFound = TRUE; bFound = TRUE;
} }
if ( aType.CompareTo(MethodKenn ) == COMPARE_EQUAL ) if ( aType.CompareTo(MethodKenn ) == COMPARE_EQUAL )
...@@ -4198,7 +4204,8 @@ static ControlDefLoad __READONLY_DATA arRes_Type [] = ...@@ -4198,7 +4204,8 @@ static ControlDefLoad __READONLY_DATA arRes_Type [] =
} }
if ( aType.CompareTo(SlotKenn ) == COMPARE_EQUAL ) if ( aType.CompareTo(SlotKenn ) == COMPARE_EQUAL )
{ {
aResult = pShortNames->GetName(rtl::OString(nNumber)); // FIXME: HELPID
aResult = pShortNames->GetName(rtl::OString(/*nNumber*/));
bFound = TRUE; bFound = TRUE;
} }
if ( aType.CompareTo(TabKenn ) == COMPARE_EQUAL ) if ( aType.CompareTo(TabKenn ) == COMPARE_EQUAL )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment