From 38ecca9b30e0fc5f7cc6264857f983e40dd58195 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Fri, 24 Jul 2015 16:22:29 +0200
Subject: inline a bunch of use-once macros

no point in having a macro unless it's actually going to reduce the
number of lines of code

Change-Id: Ic8760d6506cf272d7bd088f7b3b4dcbf288099fc
---
 ucb/source/ucp/ftp/ftpurl.cxx | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'ucb/source/ucp/ftp/ftpurl.cxx')

diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx
index 645236fca963..eff2b4232633 100644
--- a/ucb/source/ucp/ftp/ftpurl.cxx
+++ b/ucb/source/ucp/ftp/ftpurl.cxx
@@ -378,12 +378,6 @@ namespace ftp {
                      &control)
 
 
-#define SET_DATA_CONTAINER                                        \
-        curl_easy_setopt(curl,CURLOPT_NOBODY,false);              \
-    MemoryContainer data;                                         \
-    curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,memory_write);    \
-    curl_easy_setopt(curl,CURLOPT_WRITEDATA,&data)
-
 #define SET_URL(url)                                              \
     OString urlParAscii(url.getStr(),                        \
                              url.getLength(),                     \
@@ -439,7 +433,11 @@ std::vector<FTPDirentry> FTPURL::list(
     CURL *curl = m_pFCP->handle();
 
     SET_CONTROL_CONTAINER;
-    SET_DATA_CONTAINER;
+    curl_easy_setopt(curl,CURLOPT_NOBODY,false);
+    MemoryContainer data;
+    curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,memory_write);
+    curl_easy_setopt(curl,CURLOPT_WRITEDATA,&data);
+
     OUString url(ident(true,true));
     SET_URL(url);
     curl_easy_setopt(curl,CURLOPT_POSTQUOTE,0);
-- 
cgit 

<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Change-Id: Ic861003f522e76431fffaadc408d0a153b12d0e2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99003
Tested-by: Jenkins
Reviewed-by: Noel Grandin &lt;noel.grandin@collabora.co.uk&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>use more compact namespace syntax in /include</title>
<updated>2020-05-03T07:21:51+00:00</updated>
<author>
<name>Noel Grandin</name>
<email>noel.grandin@collabora.co.uk</email>
</author>
<published>2020-05-01T12:52:05+00:00</published>
<link rel='alternate' type='text/html' href='https://go.suokunlong.cn:88/cgit/lo/core/commit/?id=47cd34a60ff9048404075823e519f1abdd4b0e9a'/>
<id>47cd34a60ff9048404075823e519f1abdd4b0e9a</id>
<content type='text'>
excluding the UDK headers of course

Change-Id: Iac7ab83d60265f7d362c860776f1de9d5e444ec0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93268
Tested-by: Jenkins
Reviewed-by: Noel Grandin &lt;noel.grandin@collabora.co.uk&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
excluding the UDK headers of course

Change-Id: Iac7ab83d60265f7d362c860776f1de9d5e444ec0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93268
Tested-by: Jenkins
Reviewed-by: Noel Grandin &lt;noel.grandin@collabora.co.uk&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>tdf#42949 Fix IWYU warnings in include/vcl/[B-E]*</title>
<updated>2018-11-21T10:02:04+00:00</updated>
<author>
<name>Gabor Kelemen</name>
<email>kelemeng@ubuntu.com</email>
</author>
<published>2018-11-15T21:04:54+00:00</published>
<link rel='alternate' type='text/html' href='https://go.suokunlong.cn:88/cgit/lo/core/commit/?id=40710c488de3e4eef585c5a5276c9a0943d36f2e'/>
<id>40710c488de3e4eef585c5a5276c9a0943d36f2e</id>
<content type='text'>
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

Change-Id: Iabe571aa8f00492902c499094bea8365a3e17fca
Reviewed-on: https://gerrit.libreoffice.org/63623
Tested-by: Jenkins
Reviewed-by: Miklos Vajna &lt;vmiklos@collabora.com&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

Change-Id: Iabe571aa8f00492902c499094bea8365a3e17fca
Reviewed-on: https://gerrit.libreoffice.org/63623
Tested-by: Jenkins
Reviewed-by: Miklos Vajna &lt;vmiklos@collabora.com&gt;
</pre>
</div>
</content>
</entry>