[Libreoffice-commits] core.git: svl/source

[Libreoffice Gerrit user]

 svl/source/svdde/ddesvr.cxx |   23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

New commits:
commit aa3b2f90a62678c8e594830277a32e3ad742e826
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Oct 19 17:42:40 2018 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Sat Oct 20 20:47:29 2018 +0200

    result of DdeQueryStringW unused
    
    since
    
    commit 88e3b846b8a4bd4ce5507d1bc5441ee4167e5326
    Date:   Wed Apr 6 11:28:44 2016 +0200
    
        remove some dead bits of DDE
    
    Change-Id: I66b2f8365e3fed15391ff0fe2eb3c874b5054e91
    Reviewed-on: https://gerrit.libreoffice.org/62070
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx
index e79f26063237..1848342b893b 100644
--- a/svl/source/svdde/ddesvr.cxx
+++ b/svl/source/svdde/ddesvr.cxx
@@ -356,29 +356,14 @@ DdeTopic* DdeInternal::FindTopic( DdeService& rService, 
HSZ hTopic )
 {
     std::vector<DdeTopic*>::iterator iter;
     std::vector<DdeTopic*> &rTopics = rService.aTopics;
-    bool bContinue = false;
     DdeInstData* pInst = ImpGetInstData();
     assert(pInst);
 
-    do
-    {   // middle check loop
-        for ( iter = rTopics.begin(); iter != rTopics.end(); ++iter )
-        {
-            if ( *(*iter)->pName == hTopic )
-                return *iter;
-        }
-
-        bContinue = !bContinue;
-        if( !bContinue )
-            break;
-
-        // Let's query our subclass
-        WCHAR chBuf[250];
-        
DdeQueryStringW(pInst->hDdeInstSvr,hTopic,chBuf,SAL_N_ELEMENTS(chBuf),CP_WINUNICODE
 );
-        bContinue = false;
-        // We need to search again
+    for ( iter = rTopics.begin(); iter != rTopics.end(); ++iter )
+    {
+        if ( *(*iter)->pName == hTopic )
+            return *iter;
     }
-    while( bContinue );
 
     return nullptr;
 }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits