From a1cb4c7665f474c9099c734ad3e6a16c9079a6af Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 21 Jun 2021 10:49:55 +0200 Subject: reduce allocation in ZipContentInfo map This is a small struct, no sense in allocating it separately Change-Id: I709daebbde648a79f175f74c207bdf4871ae6ff1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117604 Tested-by: Jenkins Reviewed-by: Noel Grandin --- package/source/zippackage/ContentInfo.hxx | 60 ------------------------------- 1 file changed, 60 deletions(-) delete mode 100644 package/source/zippackage/ContentInfo.hxx (limited to 'package/source/zippackage/ContentInfo.hxx') diff --git a/package/source/zippackage/ContentInfo.hxx b/package/source/zippackage/ContentInfo.hxx deleted file mode 100644 index a3e34de1434d..000000000000 --- a/package/source/zippackage/ContentInfo.hxx +++ /dev/null @@ -1,60 +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 . - */ -#ifndef INCLUDED_PACKAGE_SOURCE_ZIPPACKAGE_CONTENTINFO_HXX -#define INCLUDED_PACKAGE_SOURCE_ZIPPACKAGE_CONTENTINFO_HXX - -#include -#include -#include -#include - -struct ZipContentInfo -{ - css::uno::Reference < css::lang::XUnoTunnel > xTunnel; - bool bFolder; - union - { - ZipPackageFolder *pFolder; - ZipPackageStream *pStream; - }; - ZipContentInfo ( ZipPackageStream * pNewStream ) - : xTunnel ( pNewStream ) - , bFolder ( false ) - , pStream ( pNewStream ) - { - } - ZipContentInfo ( ZipPackageFolder * pNewFolder ) - : xTunnel ( pNewFolder ) - , bFolder ( true ) - , pFolder ( pNewFolder ) - { - } - - ~ZipContentInfo() - { - if ( bFolder ) - pFolder->clearParent(); - else - pStream->clearParent(); - } -}; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit