vcl/inc/SwapFile.hxx | 40 ----------------------------------------
vcl/source/gdi/impgraph.cxx | 7 ++++---
2 files changed, 4 insertions(+), 43 deletions(-)
New commits:
commit 98448a25219166d4775a81a01b1deb029d7d7efd
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Thu Dec 29 12:33:29 2022 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Dec 29 11:38:08 2022 +0000
merge SwapFile into ImpSwapFile
no need for this
Change-Id: I0367582adb616a00f260b5d78b63d288068b7d15
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144857
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/vcl/inc/SwapFile.hxx b/vcl/inc/SwapFile.hxx
deleted file mode 100644
index 7ca34fb60698..000000000000
--- a/vcl/inc/SwapFile.hxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- 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/tempfile.hxx>
-#include <utility>
-
-namespace vcl
-{
-class VCL_DLLPUBLIC SwapFile
-{
-private:
- utl::TempFileFast maTempFile;
-
-public:
- SvStream* getStream() { return
maTempFile.GetStream(StreamMode::READWRITE); }
-};
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 65f8fb25a827..2e1edf1a1a68 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -20,8 +20,6 @@
#include <sal/config.h>
#include <sal/log.hxx>
-#include <SwapFile.hxx>
-
#include <comphelper/fileformat.h>
#include <o3tl/make_shared.hxx>
#include <tools/fract.hxx>
@@ -59,9 +57,11 @@
using namespace com::sun::star;
-class ImpSwapFile : public vcl::SwapFile
+
+class ImpSwapFile
{
private:
+ utl::TempFileFast maTempFile;
OUString maOriginURL;
public:
@@ -70,6 +70,7 @@ public:
{
}
+ SvStream* getStream() { return
maTempFile.GetStream(StreamMode::READWRITE); }
OUString const & getOriginURL() const { return maOriginURL; }
};
