Kaydet (Commit) 8df3fbe5 authored tarafından Fridrich Štrba's avatar Fridrich Štrba

Fix mingw build of svl

Change-Id: I9992dba75903fea3d31be73de69e49f439df3a41
üst 68303dee
...@@ -82,8 +82,9 @@ HDDEDATA CALLBACK _export DdeInternal::SvrCallback( ...@@ -82,8 +82,9 @@ HDDEDATA CALLBACK _export DdeInternal::SvrCallback(
DdeQueryString( pInst->hDdeInstSvr, hText1, chTopicBuf, DdeQueryString( pInst->hDdeInstSvr, hText1, chTopicBuf,
sizeof(chTopicBuf)/sizeof(TCHAR), CP_WINUNICODE ); sizeof(chTopicBuf)/sizeof(TCHAR), CP_WINUNICODE );
for( pService = rAll.First();pService;pService = rAll.Next() ) for (DdeServices::iterator aI = rAll.begin(); aI != rAll.end(); ++aI)
{ {
pService = *aI;
if ( !hText2 || ( *pService->pName == hText2 ) ) if ( !hText2 || ( *pService->pName == hText2 ) )
{ {
String sTopics( pService->Topics() ); String sTopics( pService->Topics() );
...@@ -113,8 +114,9 @@ HDDEDATA CALLBACK _export DdeInternal::SvrCallback( ...@@ -113,8 +114,9 @@ HDDEDATA CALLBACK _export DdeInternal::SvrCallback(
return (HDDEDATA)NULL; return (HDDEDATA)NULL;
HSZPAIR* q = pPairs; HSZPAIR* q = pPairs;
for( pService = rAll.First(); pService; pService = rAll.Next() ) for (DdeServices::iterator aI = rAll.begin(); aI != rAll.end(); ++aI)
{ {
pService = *aI;
if ( !hText2 || (*pService->pName == hText2 ) ) if ( !hText2 || (*pService->pName == hText2 ) )
{ {
String sTopics( pService->Topics() ); String sTopics( pService->Topics() );
...@@ -177,8 +179,9 @@ HDDEDATA CALLBACK _export DdeInternal::SvrCallback( ...@@ -177,8 +179,9 @@ HDDEDATA CALLBACK _export DdeInternal::SvrCallback(
return (HDDEDATA)NULL; return (HDDEDATA)NULL;
} }
for ( pService = rAll.First(); pService; pService = rAll.Next() ) for (DdeServices::iterator aI = rAll.begin(); aI != rAll.end(); ++aI)
{ {
pService = *aI;
for ( size_t i = 0, n = pService->pConv->size(); i < n; ++i ) for ( size_t i = 0, n = pService->pConv->size(); i < n; ++i )
{ {
pC = (*pService->pConv)[ i ]; pC = (*pService->pConv)[ i ];
...@@ -365,8 +368,9 @@ DdeService* DdeInternal::FindService( HSZ hService ) ...@@ -365,8 +368,9 @@ DdeService* DdeInternal::FindService( HSZ hService )
{ {
DdeService* s; DdeService* s;
DdeServices& rSvc = DdeService::GetServices(); DdeServices& rSvc = DdeService::GetServices();
for ( s = rSvc.First(); s; s = rSvc.Next() ) for (DdeServices::iterator aI = rSvc.begin(); aI != rSvc.end(); ++aI)
{ {
s = *aI;
if ( *s->pName == hService ) if ( *s->pName == hService )
return s; return s;
} }
...@@ -1033,7 +1037,7 @@ String DdeService::Formats() ...@@ -1033,7 +1037,7 @@ String DdeService::Formats()
{ {
TCHAR buf[128]; TCHAR buf[128];
GetClipboardFormatName( (UINT)f, buf, sizeof(buf) / sizeof(TCHAR) ); GetClipboardFormatName( (UINT)f, buf, sizeof(buf) / sizeof(TCHAR) );
s += rtl::OUString(buf); s += rtl::OUString(reinterpret_cast<sal_Unicode*>(buf));
} }
break; break;
} }
......
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