summaryrefslogtreecommitdiff
path: root/xmloff/inc/PropertySetMerger.hxx
blob: f002f4c8f63901c4b63edb39bb53185175a104c7 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
/* -*- 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 <com/sun/star/beans/XPropertySet.hpp>

extern css::uno::Reference<css::beans::XPropertySet> PropertySetMerger_CreateInstance(
    const css::uno::Reference<css::beans::XPropertySet>& rPropSet1,
    const css::uno::Reference<css::beans::XPropertySet>& rPropSet2) noexcept;

/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
cli_ure?id=7ebd82e885b60552464e060236e869162fcadc71'>tdf#123936 Formatting files in module cli_ure with clang-formatPhilipp Hofer 2020-09-17cli_ure: Disable .NET for Windows Arm64 buildJan-Marek Glogowski 2020-04-22Fix typosAndrea Gelmini 2019-09-10Fix typosAndrea Gelmini 2019-08-16Fix typosAndrea Gelmini 2019-07-29Fix typosAndrea Gelmini 2019-06-07Fix typoAndrea Gelmini 2019-05-13fix wrong SET/QUERY flags passed to uno::ReferenceNoel Grandin 2019-05-10an uno -> a unoCaolán McNamara 2019-04-15Fix typoAndrea Gelmini 2019-04-15Fix typoAndrea Gelmini 2019-04-14Fix typoAndrea Gelmini 2019-04-14Fix typoAndrea Gelmini 2019-04-01tdf#120703 PVS: Silence V522 warningsMike Kaganski 2019-03-12Simplify containers iterations in chart2, cli_ure, comphelper, configmgrArkadiy Illarionov 2019-02-20createInstanceWithContextAndArguments->createInstanceWithArgumentsAndContextCaolán McNamara 2019-02-19Some uses of C++17 class template argument deductionStephan Bergmann 2019-02-04Fix typoAndrea Gelmini 2018-11-02fix signatures of deleted copy/assign operatorsNoel Grandin 2018-10-27tdf#120703 (PVS): V519 The variable is assigned values twice successivelyMike Kaganski 2018-10-21pvs-studio: Potentially uninitialized pointer 'ret_type' used.Caolán McNamara 2018-08-29replace rtl_allocateMemory with std::mallocNoel Grandin 2018-08-20Simplify containers iterations, tdf#96099 follow-upArkadiy Illarionov 2018-07-23Fix typosAndrea Gelmini 2018-07-09Add missing sal/log.hxx headersGabor Kelemen 2018-06-11tdf#96099 Remove some trivial std::vector typedefsArkadiy Illarionov