diff options
author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2018-11-09 16:42:16 +0100 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2018-11-12 14:52:09 +0100 |
commit | 9c5d3e5c59a9d0ffcb5fd99f5d4c98b0f6b5560e (patch) | |
tree | 21e1f2cd8b791414812a484f7df8691ac4e2e594 /include | |
parent | 3d885f20269dd4b7485fbe09c70014646e799366 (diff) |
tdf#118581 Correctly display issuer name in signature line
Move the xmlsec helper methods to comphelper so that we can use them in cui
Change-Id: If9b10cfff5f5abd6b16e48f043af7959edbb1142
Reviewed-on: https://gerrit.libreoffice.org/63198
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'include')
-rw-r--r-- | include/comphelper/xmlsechelper.hxx | 47 | ||||
-rw-r--r-- | include/unotools/datetime.hxx | 5 |
2 files changed, 52 insertions, 0 deletions
diff --git a/include/comphelper/xmlsechelper.hxx b/include/comphelper/xmlsechelper.hxx new file mode 100644 index 000000000000..ba702fa683c6 --- /dev/null +++ b/include/comphelper/xmlsechelper.hxx @@ -0,0 +1,47 @@ +/* -*- 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_COMPHELPER_XMLSECHELPER_HXX +#define INCLUDED_COMPHELPER_XMLSECHELPER_HXX + +#include <comphelper/comphelperdllapi.h> + +#include <com/sun/star/security/CertificateKind.hpp> +#include <com/sun/star/uno/Sequence.hxx> + +#include <vector> + +namespace comphelper +{ +namespace xmlsec +{ +COMPHELPER_DLLPUBLIC OUString GetCertificateKind(const css::security::CertificateKind& rKind); + +COMPHELPER_DLLPUBLIC std::vector<std::pair<OUString, OUString>> parseDN(const OUString& rRawString); +COMPHELPER_DLLPUBLIC std::pair<OUString, OUString> +GetDNForCertDetailsView(const OUString& rRawString); +COMPHELPER_DLLPUBLIC OUString GetContentPart(const OUString& _rRawString); + +COMPHELPER_DLLPUBLIC OUString GetHexString(const css::uno::Sequence<sal_Int8>& _rSeq, + const char* _pSep, sal_uInt16 _nLineBreak = 0xFFFF); +} +} +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/unotools/datetime.hxx b/include/unotools/datetime.hxx index dcae945188be..bd630e2ffca2 100644 --- a/include/unotools/datetime.hxx +++ b/include/unotools/datetime.hxx @@ -31,9 +31,14 @@ namespace com { namespace sun { namespace star { namespace util { struct Time; } class Date; class DateTime; +class LocaleDataWrapper; namespace utl { + UNOTOOLS_DLLPUBLIC const LocaleDataWrapper& GetLocaleData(); + UNOTOOLS_DLLPUBLIC DateTime GetDateTime(const css::util::DateTime& _rDT); + UNOTOOLS_DLLPUBLIC OUString GetDateTimeString(const css::util::DateTime& _rDT); + UNOTOOLS_DLLPUBLIC OUString GetDateString(const css::util::DateTime& _rDT); UNOTOOLS_DLLPUBLIC void typeConvert(const Date& _rDate, css::util::Date& _rOut); UNOTOOLS_DLLPUBLIC void typeConvert(const css::util::Date& _rDate, Date& _rOut); |