Stephan Bergmann
b475873cd0
...by simply making the two used functions OOX_DLLPUBLIC.
This solves an issue for mergelibs builds, where
09605513f4 "SmartArt: Progress in standard
FileFormat RoundTrip" had started to make this test fail with
> cppunittester: oox/source/drawingml/diagram/diagramhelper_oox.cxx:542: oox::drawingml::DiagramHelperFactory_oox::DiagramHelperFactory_oox(): Assertion `nullptr == pSingleGlobalDiagramHelperFactory_svx && "DiagramHelperFactory initialized multiple times (!)"' failed.
as that
> static DiagramHelperFactory_oox aSingleGlobalDiagramHelperFactory_oox;
in oox/source/drawingml/diagram/diagramhelper_oox.cxx was present twice now in
the process, in workdir/LinkTarget/CppunitTest/libtest_oox_tokenmap.so and in
instdir/program/libmergedlo.so.
Change-Id: I9c7ea35339a188c427a50e18d7eb7978e63e52fc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200931
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@collabora.com>
63 lines
2.1 KiB
C++
63 lines
2.1 KiB
C++
/* -*- 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_OOX_TOKEN_TOKENMAP_HXX
|
|
#define INCLUDED_OOX_TOKEN_TOKENMAP_HXX
|
|
|
|
#include <sal/config.h>
|
|
|
|
#include <string_view>
|
|
|
|
#include <com/sun/star/uno/Sequence.hxx>
|
|
#include <oox/dllapi.h>
|
|
#include <rtl/ustring.hxx>
|
|
#include <sal/types.h>
|
|
|
|
namespace oox {
|
|
|
|
|
|
namespace TokenMap
|
|
{
|
|
/** Returns the token identifier for a UTF8 string passed in pToken */
|
|
OOX_DLLPUBLIC sal_Int32 getTokenFromUtf8(std::string_view token);
|
|
|
|
/** Returns the token identifier for the passed Unicode token name. */
|
|
inline sal_Int32 getTokenFromUnicode(std::u16string_view rUnicodeName)
|
|
{
|
|
return getTokenFromUtf8(OUStringToOString(rUnicodeName, RTL_TEXTENCODING_UTF8));
|
|
}
|
|
|
|
/** Returns the UTF8 name of the passed token identifier as byte sequence. */
|
|
OOX_DLLPUBLIC css::uno::Sequence<sal_Int8> const& getUtf8TokenName(sal_Int32 nToken);
|
|
|
|
/** Returns the name of the passed token identifier as OUString. */
|
|
inline OUString getUnicodeTokenName(sal_Int32 nToken)
|
|
{
|
|
auto name = getUtf8TokenName(nToken);
|
|
return OUString(reinterpret_cast<const char*>(name.getConstArray()), name.getLength(),
|
|
RTL_TEXTENCODING_UTF8);
|
|
}
|
|
};
|
|
|
|
} // namespace oox
|
|
|
|
#endif
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|