summaryrefslogtreecommitdiff
path: root/oox
ModeNameSize
-rw-r--r--AllLangMoTarget_oox.mk479logplain
-rw-r--r--CppunitTest_oox_crypto.mk1961logplain
-rw-r--r--CppunitTest_oox_drawingml.mk1264logplain
-rw-r--r--CppunitTest_oox_mathml.mk1221logplain
-rw-r--r--CppunitTest_oox_shape.mk1220logplain
-rw-r--r--CppunitTest_oox_tokenmap.mk1304logplain
-rw-r--r--CppunitTest_oox_vba_compression.mk958logplain
-rw-r--r--CppunitTest_oox_vba_encryption.mk953logplain
-rw-r--r--CppunitTest_oox_vml.mk1198logplain
-rw-r--r--CustomTarget_generated.mk2046logplain
-rw-r--r--IwyuFilter_oox.yaml5616logplain
-rw-r--r--Library_oox.mk11624logplain
-rw-r--r--Makefile478logplain
-rw-r--r--Module_oox.mk872logplain
-rw-r--r--Package_customshapes.mk558logplain
-rw-r--r--Package_generated.mk586logplain
-rw-r--r--README7196logplain
-rw-r--r--README.vars126logplain
d---------documentation53logplain
d---------inc145logplain
d---------qa63logplain
d---------source418logplain
d---------util41logplain
& _rDT )
- {
- return DateTime(_rDT);
- }
-
- OUString GetDateTimeString( const css::util::DateTime& _rDT )
- {
- // String with date and time information (#i20172#)
- DateTime aDT( GetDateTime( _rDT ) );
- const LocaleDataWrapper& rLoDa = GetLocaleData();
-
- return rLoDa.getDate( aDT ) + " " + rLoDa.getTime( aDT );
- }
-
- OUString GetDateString( const css::util::DateTime& _rDT )
- {
- return GetLocaleData().getDate( GetDateTime( _rDT ) );
- }
-
OUString GetCertificateKind( const css::security::CertificateKind &rKind )
{
switch (rKind)
@@ -354,5 +330,6 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
return aStr.makeStringAndClear();
}
}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/SignSignatureLineDialog.cxx b/cui/source/dialogs/SignSignatureLineDialog.cxx
index a6e5ae4d6642..a3230eedcfb2 100644
--- a/cui/source/dialogs/SignSignatureLineDialog.cxx
+++ b/cui/source/dialogs/SignSignatureLineDialog.cxx
@@ -16,6 +16,7 @@
#include <strings.hrc>
#include <comphelper/processfactory.hxx>
+#include <comphelper/xmlsechelper.hxx>
#include <tools/stream.hxx>
#include <unotools/localedatawrapper.hxx>
#include <unotools/streamwrap.hxx>
@@ -40,6 +41,7 @@
#include <com/sun/star/text/XTextContent.hpp>
#include <com/sun/star/text/XTextDocument.hpp>
+using namespace comphelper;
using namespace css;
using namespace css::uno;
using namespace css::beans;
@@ -138,7 +140,8 @@ IMPL_LINK_NOARG(SignSignatureLineDialog, chooseCertificate, weld::Button&, void)
if (xSignCertificate.is())
{
m_xSelectedCertifate = xSignCertificate;
- m_xBtnChooseCertificate->set_label(xSignCertificate->getIssuerName());
+ m_xBtnChooseCertificate->set_label(
+ xmlsec::GetContentPart(xSignCertificate->getIssuerName()));
}
ValidateFields();
}
@@ -175,8 +178,9 @@ SignSignatureLineDialog::getSignedGraphic(bool bValid)
aSvgImage = aSvgImage.replaceAll("[SIGNER_TITLE]", getCDataString(m_aSuggestedSignerTitle));
aSvgImage = aSvgImage.replaceAll("[SIGNATURE]", getCDataString(m_xEditName->get_text()));
- OUString aIssuerLine = CuiResId(RID_SVXSTR_SIGNATURELINE_SIGNED_BY)
- .replaceFirst("%1", m_xSelectedCertifate->getIssuerName());
+ OUString aIssuerLine
+ = CuiResId(RID_SVXSTR_SIGNATURELINE_SIGNED_BY)
+ .replaceFirst("%1", xmlsec::GetContentPart(m_xSelectedCertifate->getIssuerName()));
aSvgImage = aSvgImage.replaceAll("[SIGNED_BY]", getCDataString(aIssuerLine));
if (bValid)
aSvgImage = aSvgImage.replaceAll("[INVALID_SIGNATURE]", "");
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);
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index fe9aecae089e..b8eac28b471d 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist