vcl/source/outdev/text.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit a95958759a84c570b49fc19a9d8939ebed0d9cbf
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Dec 18 09:29:18 2019 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Dec 18 09:55:46 2019 +0100
use o3tl::optional rather than boost::optional
Change-Id: Ia02e4c37935445e35e806964570fa900e3981463
Reviewed-on: https://gerrit.libreoffice.org/85357
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 8de7cece1bbb..ec0711eb101d 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -48,7 +48,7 @@
#include <textlayout.hxx>
#include <textlineinfo.hxx>
#include <impglyphitem.hxx>
-#include <boost/optional.hpp>
+#include <o3tl/optional.hxx>
#define TEXT_DRAW_ELLIPSIS (DrawTextFlags::EndEllipsis |
DrawTextFlags::PathEllipsis | DrawTextFlags::NewsEllipsis)
@@ -1191,7 +1191,7 @@ ImplLayoutArgs OutputDevice::ImplPrepareLayoutArgs(
OUString& rStr,
const sal_Unicode* pBase = rStr.getStr();
const sal_Unicode* pStr = pBase + nMinIndex;
const sal_Unicode* pEnd = pBase + nEndIndex;
- boost::optional<OUStringBuffer> xTmpStr;
+ o3tl::optional<OUStringBuffer> xTmpStr;
for( ; pStr < pEnd; ++pStr )
{
// TODO: are there non-digit localizations?
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
