include/vcl/SwapFile.hxx | 72 ++++++++++++++++++++++++++++++++++++++++++++
vcl/source/gdi/impgraph.cxx | 38 ++---------------------
2 files changed, 76 insertions(+), 34 deletions(-)
New commits:
commit b50c64eb28af7b6f95edb9cd5098d49d5701b5b0
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Wed Nov 25 16:23:09 2020 +0900
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Sun Dec 6 23:32:56 2020 +0100
vcl: extract SwapFile impl. into its own class and use in Graphic
Change-Id: Ib4c06b81b4ed87cf6b461a67a28bae90b2b26535
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107282
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/include/vcl/SwapFile.hxx b/include/vcl/SwapFile.hxx
new file mode 100644
index 000000000000..55146d608eb8
--- /dev/null
+++ b/include/vcl/SwapFile.hxx
@@ -0,0 +1,72 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+#include <vcl/dllapi.h>
+#include <tools/urlobj.hxx>
+#include <tools/stream.hxx>
+#include <unotools/ucbhelper.hxx>
+#include <unotools/ucbstreamhelper.hxx>
+
+namespace vcl
+{
+class VCL_DLLPUBLIC SwapFile
+{
+private:
+ INetURLObject maSwapURL;
+
+public:
+ SwapFile(INetURLObject const& rSwapURL)
+ : maSwapURL(rSwapURL)
+ {
+ }
+
+ ~SwapFile() COVERITY_NOEXCEPT_FALSE
+ {
+
utl::UCBContentHelper::Kill(maSwapURL.GetMainURL(INetURLObject::DecodeMechanism::NONE));
+ }
+
+ INetURLObject getSwapURL() const { return maSwapURL; }
+
+ OUString getSwapURLString() const
+ {
+ return maSwapURL.GetMainURL(INetURLObject::DecodeMechanism::NONE);
+ }
+
+ std::unique_ptr<SvStream> openOutputStream()
+ {
+ OUString sSwapURL = getSwapURLString();
+ if (!sSwapURL.isEmpty())
+ {
+ try
+ {
+ return utl::UcbStreamHelper::CreateStream(
+ sSwapURL, StreamMode::READWRITE |
StreamMode::SHARE_DENYWRITE);
+ }
+ catch (const css::uno::Exception&)
+ {
+ }
+ }
+ return std::unique_ptr<SvStream>();
+ }
+};
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 6bb3489c2562..d251eab7a6c9 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -20,6 +20,8 @@
#include <sal/config.h>
#include <sal/log.hxx>
+#include <vcl/SwapFile.hxx>
+
#include <comphelper/fileformat.h>
#include <o3tl/make_shared.hxx>
#include <tools/fract.hxx>
@@ -67,51 +69,19 @@ constexpr sal_uInt32 constPdfMagic((sal_uInt32('s') << 24)
| (sal_uInt32('v') <<
using namespace com::sun::star;
-class ImpSwapFile
+class ImpSwapFile : public vcl::SwapFile
{
private:
- INetURLObject maSwapURL;
OUString maOriginURL;
public:
ImpSwapFile(INetURLObject const & rSwapURL, OUString const & rOriginURL)
- : maSwapURL(rSwapURL)
+ : SwapFile(rSwapURL)
, maOriginURL(rOriginURL)
{
}
- ~ImpSwapFile() COVERITY_NOEXCEPT_FALSE
- {
-
utl::UCBContentHelper::Kill(maSwapURL.GetMainURL(INetURLObject::DecodeMechanism::NONE));
- }
-
- INetURLObject getSwapURL() const
- {
- return maSwapURL;
- }
-
- OUString getSwapURLString() const
- {
- return maSwapURL.GetMainURL(INetURLObject::DecodeMechanism::NONE);
- }
-
OUString const & getOriginURL() const { return maOriginURL; }
-
- std::unique_ptr<SvStream> openOutputStream()
- {
- OUString sSwapURL = getSwapURLString();
- if (!sSwapURL.isEmpty())
- {
- try
- {
- return utl::UcbStreamHelper::CreateStream(sSwapURL,
StreamMode::READWRITE | StreamMode::SHARE_DENYWRITE);
- }
- catch (const css::uno::Exception&)
- {
- }
- }
- return std::unique_ptr<SvStream>();
- }
};
OUString ImpGraphic::getSwapFileURL() const
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
