include/o3tl/lru_map.hxx | 6 ++++++
vcl/inc/svdata.hxx | 1 +
vcl/source/gdi/FileDefinitionWidgetDraw.cxx | 2 +-
vcl/source/gdi/WidgetDefinition.cxx | 2 +-
4 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit ab71569a7c1e1a262bfbfac998cf4acb092ed383
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Tue Mar 12 01:11:20 2019 +0100
Commit: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
CommitDate: Tue Mar 12 01:11:20 2019 +0100
fix build failures because of diff against master
Change-Id: Iefe4683f456750b53c96e1634d7930f4b042e573
diff --git a/include/o3tl/lru_map.hxx b/include/o3tl/lru_map.hxx
index 2f41521795fc..53b5d5c8d004 100644
--- a/include/o3tl/lru_map.hxx
+++ b/include/o3tl/lru_map.hxx
@@ -132,6 +132,12 @@ public:
{
return mLruList.size();
}
+
+ void clear()
+ {
+ mLruMap.clear();
+ mLruList.clear();
+ }
};
}
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 10051ec30660..9a17b6f176ef 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -41,6 +41,7 @@
#include "ControlCacheKey.hxx"
#include "schedulerimpl.hxx"
#include <basegfx/DrawCommands.hxx>
+#include <o3tl/lru_map.hxx>
struct ImplPostEventData;
struct ImplTimerData;
diff --git a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
index 06b85f9a2928..d4ee5a1d6dd7 100644
--- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
+++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
@@ -211,7 +211,7 @@ void drawFromDrawCommands(gfx::DrawRoot const& rDrawRoot,
SalGraphics& rGraphics
{
for (size_t i = 0; i < rPolygon.count(); ++i)
{
- auto& rPoint = rPolygon.getB2DPoint(i);
+ auto const& rPoint = rPolygon.getB2DPoint(i);
double x = rPoint.getX();
double y = rPoint.getY();
diff --git a/vcl/source/gdi/WidgetDefinition.cxx
b/vcl/source/gdi/WidgetDefinition.cxx
index 668fe74bf403..069e0b99e0f0 100644
--- a/vcl/source/gdi/WidgetDefinition.cxx
+++ b/vcl/source/gdi/WidgetDefinition.cxx
@@ -184,7 +184,7 @@ void WidgetDefinitionState::addDrawImage(OUString const&
sSource)
void WidgetDefinitionState::addDrawExternal(OUString const& sSource)
{
- auto pCommand(std::make_unique<ExternalSourceDrawCommand>());
+ auto pCommand(std::make_shared<ExternalSourceDrawCommand>());
pCommand->msSource = sSource;
mpDrawCommands.push_back(std::move(pCommand));
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
