[Libreoffice-commits] .: svl/source

[Fridrich Strba]

 svl/source/svdde/ddesvr.cxx |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 8df3fbe5249c3f4a1ea3d5586b5c073d5a756fb0
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Jul 31 22:30:34 2012 +0200

    Fix mingw build of svl
    
    Change-Id: I9992dba75903fea3d31be73de69e49f439df3a41

diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx
index dadba45..25cc3cf 100644
--- a/svl/source/svdde/ddesvr.cxx
+++ b/svl/source/svdde/ddesvr.cxx
@@ -82,8 +82,9 @@ HDDEDATA CALLBACK _export DdeInternal::SvrCallback(
                 DdeQueryString( pInst->hDdeInstSvr, hText1, chTopicBuf,
                                 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 ) )
                 {
                     String sTopics( pService->Topics() );
@@ -113,8 +114,9 @@ HDDEDATA CALLBACK _export DdeInternal::SvrCallback(
                 return (HDDEDATA)NULL;
 
             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 ) )
                 {
                     String sTopics( pService->Topics() );
@@ -177,8 +179,9 @@ HDDEDATA CALLBACK _export DdeInternal::SvrCallback(
             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 )
         {
             pC = (*pService->pConv)[ i ];
@@ -365,8 +368,9 @@ DdeService* DdeInternal::FindService( HSZ hService )
 {
     DdeService*  s;
     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 )
             return s;
     }
@@ -1033,7 +1037,7 @@ String DdeService::Formats()
                 {
                     TCHAR buf[128];
                     GetClipboardFormatName( (UINT)f, buf, sizeof(buf) / sizeof(TCHAR) );
-                    s += rtl::OUString(buf);
+                    s += rtl::OUString(reinterpret_cast<sal_Unicode*>(buf));
                 }
                 break;
         }