[Libreoffice-commits] core.git: basctl/source desktop/source framework/source xmlsecurity/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Wed May 13 13:47:39 UTC 2020
basctl/source/basicide/doceventnotifier.cxx | 6
desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx | 82 +++----
framework/source/services/ContextChangeEventMultiplexer.cxx | 49 ++--
xmlsecurity/source/framework/buffernode.cxx | 28 +-
xmlsecurity/source/framework/elementcollector.cxx | 13 -
xmlsecurity/source/framework/elementmark.cxx | 4
xmlsecurity/source/framework/saxeventkeeperimpl.cxx | 75 +++---
xmlsecurity/source/framework/signaturecreatorimpl.cxx | 30 +-
xmlsecurity/source/framework/signatureengine.cxx | 19 -
xmlsecurity/source/framework/signatureverifierimpl.cxx | 25 +-
xmlsecurity/source/helper/xsecctl.cxx | 120 +++++------
xmlsecurity/source/helper/xsecparser.cxx | 39 +--
xmlsecurity/source/helper/xsecsign.cxx | 26 +-
xmlsecurity/source/helper/xsecverify.cxx | 44 +---
xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx | 10
xmlsecurity/source/xmlsec/saxhelper.cxx | 15 -
xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx | 67 ++----
17 files changed, 297 insertions(+), 355 deletions(-)
New commits:
commit 943fbfad668da76f7d0ebd4f4d8cdd67224d2f01
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Tue May 12 16:17:25 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed May 13 15:47:06 2020 +0200
expand out some namespace aliases
Change-Id: I5fdb554a1b116824843f35645bc1cea3ca91e0f2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94093
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/basctl/source/basicide/doceventnotifier.cxx b/basctl/source/basicide/doceventnotifier.cxx
index b8806a58bdd3..83d2ea04dff3 100644
--- a/basctl/source/basicide/doceventnotifier.cxx
+++ b/basctl/source/basicide/doceventnotifier.cxx
@@ -45,8 +45,6 @@ namespace basctl
using ::com::sun::star::frame::theGlobalEventBroadcaster;
using ::com::sun::star::uno::UNO_QUERY;
- namespace csslang = ::com::sun::star::lang;
-
// DocumentEventNotifier::Impl
typedef ::cppu::WeakComponentImplHelper< XDocumentEventListener
@@ -79,7 +77,7 @@ namespace basctl
virtual void SAL_CALL documentEventOccured( const DocumentEvent& Event ) override;
// XEventListener
- virtual void SAL_CALL disposing( const csslang::EventObject& Event ) override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Event ) override;
// ComponentHelper
virtual void SAL_CALL disposing() override;
@@ -171,7 +169,7 @@ namespace basctl
}
}
- void SAL_CALL DocumentEventNotifier::Impl::disposing( const csslang::EventObject& /*Event*/ )
+ void SAL_CALL DocumentEventNotifier::Impl::disposing( const css::lang::EventObject& /*Event*/ )
{
SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( m_aMutex );
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index 0ebfa19694ab..f38a853de71f 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -54,8 +54,6 @@
#include <vector>
-namespace cssu = ::com::sun::star::uno;
-
using dp_misc::StrTitle;
namespace dp_gui {
@@ -63,7 +61,7 @@ namespace dp_gui {
class UpdateInstallDialog::Thread: public salhelper::Thread {
friend class UpdateCommandEnv;
public:
- Thread(cssu::Reference< cssu::XComponentContext > const & ctx,
+ Thread(css::uno::Reference< css::uno::XComponentContext > const & ctx,
UpdateInstallDialog & dialog, std::vector< dp_gui::UpdateData > & aVecUpdateData);
void stop();
@@ -80,8 +78,8 @@ private:
UpdateInstallDialog & m_dialog;
// guarded by Application::GetSolarMutex():
- cssu::Reference< css::task::XAbortChannel > m_abort;
- cssu::Reference< cssu::XComponentContext > m_xComponentContext;
+ css::uno::Reference< css::task::XAbortChannel > m_abort;
+ css::uno::Reference< css::uno::XComponentContext > m_xComponentContext;
std::vector< dp_gui::UpdateData > & m_aVecUpdateData;
::rtl::Reference<UpdateCommandEnv> m_updateCmdEnv;
@@ -100,31 +98,31 @@ class UpdateCommandEnv
friend class UpdateInstallDialog::Thread;
::rtl::Reference<UpdateInstallDialog::Thread> m_installThread;
- cssu::Reference< cssu::XComponentContext > m_xContext;
+ css::uno::Reference< css::uno::XComponentContext > m_xContext;
public:
- UpdateCommandEnv( cssu::Reference< cssu::XComponentContext > const & xCtx,
+ UpdateCommandEnv( css::uno::Reference< css::uno::XComponentContext > const & xCtx,
::rtl::Reference<UpdateInstallDialog::Thread>const & thread);
// XCommandEnvironment
- virtual cssu::Reference<css::task::XInteractionHandler > SAL_CALL
+ virtual css::uno::Reference<css::task::XInteractionHandler > SAL_CALL
getInteractionHandler() override;
- virtual cssu::Reference<css::ucb::XProgressHandler >
+ virtual css::uno::Reference<css::ucb::XProgressHandler >
SAL_CALL getProgressHandler() override;
// XInteractionHandler
virtual void SAL_CALL handle(
- cssu::Reference<css::task::XInteractionRequest > const & xRequest ) override;
+ css::uno::Reference<css::task::XInteractionRequest > const & xRequest ) override;
// XProgressHandler
- virtual void SAL_CALL push( cssu::Any const & Status ) override;
- virtual void SAL_CALL update( cssu::Any const & Status ) override;
+ virtual void SAL_CALL push( css::uno::Any const & Status ) override;
+ virtual void SAL_CALL update( css::uno::Any const & Status ) override;
virtual void SAL_CALL pop() override;
};
UpdateInstallDialog::Thread::Thread(
- cssu::Reference< cssu::XComponentContext> const & xCtx,
+ css::uno::Reference< css::uno::XComponentContext> const & xCtx,
UpdateInstallDialog & dialog,
std::vector< dp_gui::UpdateData > & aVecUpdateData):
salhelper::Thread("dp_gui_updateinstalldialog"),
@@ -136,7 +134,7 @@ UpdateInstallDialog::Thread::Thread(
{}
void UpdateInstallDialog::Thread::stop() {
- cssu::Reference< css::task::XAbortChannel > abort;
+ css::uno::Reference< css::task::XAbortChannel > abort;
{
SolarMutexGuard g;
abort = m_abort;
@@ -178,7 +176,7 @@ void UpdateInstallDialog::Thread::execute()
UpdateInstallDialog::UpdateInstallDialog(
weld::Window* pParent,
std::vector<dp_gui::UpdateData> & aVecUpdateData,
- cssu::Reference< cssu::XComponentContext > const & xCtx)
+ css::uno::Reference< css::uno::XComponentContext > const & xCtx)
: GenericDialogController(pParent, "desktop/ui/updateinstalldialog.ui",
"UpdateInstallDialog")
, m_thread(new Thread(xCtx, *this, aVecUpdateData))
@@ -292,12 +290,12 @@ void UpdateInstallDialog::Thread::downloadExtensions()
//create the download directory in the temp folder
OUString sTempDir;
if (::osl::FileBase::getTempDirURL(sTempDir) != ::osl::FileBase::E_None)
- throw cssu::Exception("Could not get URL for the temp directory. No extensions will be installed.", nullptr);
+ throw css::uno::Exception("Could not get URL for the temp directory. No extensions will be installed.", nullptr);
//create a unique name for the directory
OUString tempEntry, destFolder;
if (::osl::File::createTempFile(&sTempDir, nullptr, &tempEntry ) != ::osl::File::E_None)
- throw cssu::Exception("Could not create a temporary file in " + sTempDir +
+ throw css::uno::Exception("Could not create a temporary file in " + sTempDir +
". No extensions will be installed", nullptr );
tempEntry = tempEntry.copy( tempEntry.lastIndexOf( '/' ) + 1 );
@@ -307,7 +305,7 @@ void UpdateInstallDialog::Thread::downloadExtensions()
try
{
dp_misc::create_folder(nullptr, destFolder, m_updateCmdEnv.get() );
- } catch (const cssu::Exception & e)
+ } catch (const css::uno::Exception & e)
{
css::uno::Any anyEx = cppu::getCaughtException();
throw css::lang::WrappedTargetException( e.Message + " No extensions will be installed",
@@ -337,8 +335,8 @@ void UpdateInstallDialog::Thread::downloadExtensions()
}
dp_misc::DescriptionInfoset info(m_xComponentContext, updateData.aUpdateInfo);
//remember occurring exceptions in case we need to print out error information
- std::vector< std::pair<OUString, cssu::Exception> > vecExceptions;
- cssu::Sequence<OUString> seqDownloadURLs = info.getUpdateDownloadUrls();
+ std::vector< std::pair<OUString, css::uno::Exception> > vecExceptions;
+ css::uno::Sequence<OUString> seqDownloadURLs = info.getUpdateDownloadUrls();
OSL_ENSURE(seqDownloadURLs.hasElements(), "No download URL provided!");
for (sal_Int32 j = 0; j < seqDownloadURLs.getLength(); j++)
{
@@ -349,7 +347,7 @@ void UpdateInstallDialog::Thread::downloadExtensions()
if (bCancelled || !updateData.sLocalURL.isEmpty())
break;
}
- catch ( cssu::Exception & e )
+ catch ( css::uno::Exception & e )
{
vecExceptions.emplace_back(seqDownloadURLs[j], e);
//There can be several different errors, for example, the URL is wrong, webserver cannot be reached,
@@ -386,7 +384,7 @@ void UpdateInstallDialog::Thread::downloadExtensions()
}
}
- catch (const cssu::Exception & e)
+ catch (const css::uno::Exception & e)
{
SolarMutexGuard g;
if (m_stop) {
@@ -427,11 +425,11 @@ void UpdateInstallDialog::Thread::installExtensions()
}
bool bError = false;
bool bLicenseDeclined = false;
- cssu::Reference<css::deployment::XPackage> xExtension;
- cssu::Exception exc;
+ css::uno::Reference<css::deployment::XPackage> xExtension;
+ css::uno::Exception exc;
try
{
- cssu::Reference< css::task::XAbortChannel > xAbortChannel(
+ css::uno::Reference< css::task::XAbortChannel > xAbortChannel(
updateData.aInstalledPackage->createAbortChannel() );
{
SolarMutexGuard g;
@@ -478,11 +476,11 @@ void UpdateInstallDialog::Thread::installExtensions()
}
else
{
- exc = de.Cause.get<cssu::Exception>();
+ exc = de.Cause.get<css::uno::Exception>();
bError = true;
}
}
- catch (cssu::Exception& e)
+ catch (css::uno::Exception& e)
{
exc = e;
bError = true;
@@ -524,10 +522,10 @@ void UpdateInstallDialog::Thread::removeTempDownloads()
if (!m_sDownloadFolder.isEmpty())
{
dp_misc::erase_path(m_sDownloadFolder,
- cssu::Reference<css::ucb::XCommandEnvironment>(),false /* no throw: ignore errors */ );
+ css::uno::Reference<css::ucb::XCommandEnvironment>(),false /* no throw: ignore errors */ );
//remove also the temp file which we have used to create the unique name
OUString tempFile = m_sDownloadFolder.copy(0, m_sDownloadFolder.getLength() - 1);
- dp_misc::erase_path(tempFile, cssu::Reference<css::ucb::XCommandEnvironment>(),false);
+ dp_misc::erase_path(tempFile, css::uno::Reference<css::ucb::XCommandEnvironment>(),false);
m_sDownloadFolder.clear();
}
}
@@ -548,7 +546,7 @@ bool UpdateInstallDialog::Thread::download(OUString const & sDownloadURL, Update
nullptr, &tempEntry ) != ::osl::File::E_None)
{
//ToDo feedback in window that download of this component failed
- throw cssu::Exception("Could not create temporary file in folder " + destFolder + ".", nullptr);
+ throw css::uno::Exception("Could not create temporary file in folder " + destFolder + ".", nullptr);
}
tempEntry = tempEntry.copy( tempEntry.lastIndexOf( '/' ) + 1 );
@@ -579,7 +577,7 @@ bool UpdateInstallDialog::Thread::download(OUString const & sDownloadURL, Update
return m_stop;
}
-UpdateCommandEnv::UpdateCommandEnv( cssu::Reference< cssu::XComponentContext > const & xCtx,
+UpdateCommandEnv::UpdateCommandEnv( css::uno::Reference< css::uno::XComponentContext > const & xCtx,
::rtl::Reference<UpdateInstallDialog::Thread>const & thread)
: m_installThread(thread),
m_xContext(xCtx)
@@ -587,22 +585,22 @@ UpdateCommandEnv::UpdateCommandEnv( cssu::Reference< cssu::XComponentContext > c
}
// XCommandEnvironment
-cssu::Reference<css::task::XInteractionHandler> UpdateCommandEnv::getInteractionHandler()
+css::uno::Reference<css::task::XInteractionHandler> UpdateCommandEnv::getInteractionHandler()
{
return this;
}
-cssu::Reference<css::ucb::XProgressHandler> UpdateCommandEnv::getProgressHandler()
+css::uno::Reference<css::ucb::XProgressHandler> UpdateCommandEnv::getProgressHandler()
{
return this;
}
// XInteractionHandler
void UpdateCommandEnv::handle(
- cssu::Reference< css::task::XInteractionRequest> const & xRequest )
+ css::uno::Reference< css::task::XInteractionRequest> const & xRequest )
{
- cssu::Any request( xRequest->getRequest() );
- OSL_ASSERT( request.getValueTypeClass() == cssu::TypeClass_EXCEPTION );
+ css::uno::Any request( xRequest->getRequest() );
+ OSL_ASSERT( request.getValueTypeClass() == css::uno::TypeClass_EXCEPTION );
dp_misc::TRACE("[dp_gui_cmdenv.cxx] incoming request:\n"
+ ::comphelper::anyToString(request) + "\n\n");
@@ -626,16 +624,16 @@ void UpdateCommandEnv::handle(
else
{
// select:
- cssu::Sequence< cssu::Reference< css::task::XInteractionContinuation > > conts(
+ css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > conts(
xRequest->getContinuations() );
- cssu::Reference< css::task::XInteractionContinuation > const * pConts =
+ css::uno::Reference< css::task::XInteractionContinuation > const * pConts =
conts.getConstArray();
sal_Int32 len = conts.getLength();
for ( sal_Int32 pos = 0; pos < len; ++pos )
{
if (approve) {
- cssu::Reference< css::task::XInteractionApprove > xInteractionApprove(
- pConts[ pos ], cssu::UNO_QUERY );
+ css::uno::Reference< css::task::XInteractionApprove > xInteractionApprove(
+ pConts[ pos ], css::uno::UNO_QUERY );
if (xInteractionApprove.is()) {
xInteractionApprove->select();
// don't query again for ongoing continuations:
@@ -647,11 +645,11 @@ void UpdateCommandEnv::handle(
}
// XProgressHandler
-void UpdateCommandEnv::push( cssu::Any const & /*Status*/ )
+void UpdateCommandEnv::push( css::uno::Any const & /*Status*/ )
{
}
-void UpdateCommandEnv::update( cssu::Any const & /*Status */)
+void UpdateCommandEnv::update( css::uno::Any const & /*Status */)
{
}
diff --git a/framework/source/services/ContextChangeEventMultiplexer.cxx b/framework/source/services/ContextChangeEventMultiplexer.cxx
index d7e59bda0b87..417823b2c760 100644
--- a/framework/source/services/ContextChangeEventMultiplexer.cxx
+++ b/framework/source/services/ContextChangeEventMultiplexer.cxx
@@ -33,9 +33,6 @@
#include <map>
#include <vector>
-namespace cssl = css::lang;
-namespace cssu = css::uno;
-
using namespace css;
using namespace css::uno;
@@ -60,28 +57,28 @@ public:
// XContextChangeEventMultiplexer
virtual void SAL_CALL addContextChangeEventListener (
- const cssu::Reference<css::ui::XContextChangeEventListener>& rxListener,
- const cssu::Reference<cssu::XInterface>& rxEventFocus) override;
+ const css::uno::Reference<css::ui::XContextChangeEventListener>& rxListener,
+ const css::uno::Reference<css::uno::XInterface>& rxEventFocus) override;
virtual void SAL_CALL removeContextChangeEventListener (
- const cssu::Reference<css::ui::XContextChangeEventListener>& rxListener,
- const cssu::Reference<cssu::XInterface>& rxEventFocus) override;
+ const css::uno::Reference<css::ui::XContextChangeEventListener>& rxListener,
+ const css::uno::Reference<css::uno::XInterface>& rxEventFocus) override;
virtual void SAL_CALL removeAllContextChangeEventListeners (
- const cssu::Reference<css::ui::XContextChangeEventListener>& rxListener) override;
+ const css::uno::Reference<css::ui::XContextChangeEventListener>& rxListener) override;
virtual void SAL_CALL broadcastContextChangeEvent (
const css::ui::ContextChangeEventObject& rContextChangeEventObject,
- const cssu::Reference<cssu::XInterface>& rxEventFocus) override;
+ const css::uno::Reference<css::uno::XInterface>& rxEventFocus) override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
virtual sal_Bool SAL_CALL supportsService (
const OUString& rsServiceName) override;
- virtual cssu::Sequence< OUString> SAL_CALL getSupportedServiceNames() override;
+ virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() override;
// XEventListener
virtual void SAL_CALL disposing (
const css::lang::EventObject& rEvent) override;
- typedef ::std::vector<cssu::Reference<css::ui::XContextChangeEventListener> > ListenerContainer;
+ typedef ::std::vector<css::uno::Reference<css::ui::XContextChangeEventListener> > ListenerContainer;
class FocusDescriptor
{
public:
@@ -89,7 +86,7 @@ public:
OUString msCurrentApplicationName;
OUString msCurrentContextName;
};
- typedef ::std::map<cssu::Reference<cssu::XInterface>, FocusDescriptor> ListenerMap;
+ typedef ::std::map<css::uno::Reference<css::uno::XInterface>, FocusDescriptor> ListenerMap;
ListenerMap maListeners;
/** Notify all listeners in the container that is associated with
@@ -100,9 +97,9 @@ public:
*/
void BroadcastEventToSingleContainer (
const css::ui::ContextChangeEventObject& rEventObject,
- const cssu::Reference<cssu::XInterface>& rxEventFocus);
+ const css::uno::Reference<css::uno::XInterface>& rxEventFocus);
FocusDescriptor* GetFocusDescriptor (
- const cssu::Reference<cssu::XInterface>& rxEventFocus,
+ const css::uno::Reference<css::uno::XInterface>& rxEventFocus,
const bool bCreateWhenMissing);
};
@@ -117,7 +114,7 @@ void SAL_CALL ContextChangeEventMultiplexer::disposing()
ListenerMap aListeners;
aListeners.swap(maListeners);
- cssu::Reference<cssu::XInterface> xThis (static_cast<XWeak*>(this));
+ css::uno::Reference<css::uno::XInterface> xThis (static_cast<XWeak*>(this));
css::lang::EventObject aEvent (xThis);
for (auto const& container : aListeners)
{
@@ -137,8 +134,8 @@ void SAL_CALL ContextChangeEventMultiplexer::disposing()
// XContextChangeEventMultiplexer
void SAL_CALL ContextChangeEventMultiplexer::addContextChangeEventListener (
- const cssu::Reference<css::ui::XContextChangeEventListener>& rxListener,
- const cssu::Reference<cssu::XInterface>& rxEventFocus)
+ const css::uno::Reference<css::ui::XContextChangeEventListener>& rxListener,
+ const css::uno::Reference<css::uno::XInterface>& rxEventFocus)
{
if ( ! rxListener.is())
throw css::lang::IllegalArgumentException(
@@ -154,7 +151,7 @@ void SAL_CALL ContextChangeEventMultiplexer::addContextChangeEventListener (
{
// The listener was added for the same event focus
// previously. That is an error.
- throw cssl::IllegalArgumentException("listener added twice", static_cast<XWeak*>(this), 0);
+ throw css::lang::IllegalArgumentException("listener added twice", static_cast<XWeak*>(this), 0);
}
rContainer.push_back(rxListener);
}
@@ -189,11 +186,11 @@ void SAL_CALL ContextChangeEventMultiplexer::addContextChangeEventListener (
}
void SAL_CALL ContextChangeEventMultiplexer::removeContextChangeEventListener (
- const cssu::Reference<css::ui::XContextChangeEventListener>& rxListener,
- const cssu::Reference<cssu::XInterface>& rxEventFocus)
+ const css::uno::Reference<css::ui::XContextChangeEventListener>& rxListener,
+ const css::uno::Reference<css::uno::XInterface>& rxEventFocus)
{
if ( ! rxListener.is())
- throw cssl::IllegalArgumentException(
+ throw css::lang::IllegalArgumentException(
"can not remove an empty reference",
static_cast<XWeak*>(this), 0);
@@ -215,10 +212,10 @@ void SAL_CALL ContextChangeEventMultiplexer::removeContextChangeEventListener (
}
void SAL_CALL ContextChangeEventMultiplexer::removeAllContextChangeEventListeners (
- const cssu::Reference<css::ui::XContextChangeEventListener>& rxListener)
+ const css::uno::Reference<css::ui::XContextChangeEventListener>& rxListener)
{
if ( ! rxListener.is())
- throw cssl::IllegalArgumentException(
+ throw css::lang::IllegalArgumentException(
"can not remove an empty reference",
static_cast<XWeak*>(this), 0);
@@ -238,7 +235,7 @@ void SAL_CALL ContextChangeEventMultiplexer::removeAllContextChangeEventListener
void SAL_CALL ContextChangeEventMultiplexer::broadcastContextChangeEvent (
const css::ui::ContextChangeEventObject& rEventObject,
- const cssu::Reference<cssu::XInterface>& rxEventFocus)
+ const css::uno::Reference<css::uno::XInterface>& rxEventFocus)
{
// Remember the current context.
if (rxEventFocus.is())
@@ -258,7 +255,7 @@ void SAL_CALL ContextChangeEventMultiplexer::broadcastContextChangeEvent (
void ContextChangeEventMultiplexer::BroadcastEventToSingleContainer (
const css::ui::ContextChangeEventObject& rEventObject,
- const cssu::Reference<cssu::XInterface>& rxEventFocus)
+ const css::uno::Reference<css::uno::XInterface>& rxEventFocus)
{
FocusDescriptor* pFocusDescriptor = GetFocusDescriptor(rxEventFocus, false);
if (pFocusDescriptor != nullptr)
@@ -274,7 +271,7 @@ void ContextChangeEventMultiplexer::BroadcastEventToSingleContainer (
}
ContextChangeEventMultiplexer::FocusDescriptor* ContextChangeEventMultiplexer::GetFocusDescriptor (
- const cssu::Reference<cssu::XInterface>& rxEventFocus,
+ const css::uno::Reference<css::uno::XInterface>& rxEventFocus,
const bool bCreateWhenMissing)
{
ListenerMap::iterator iDescriptor (maListeners.find(rxEventFocus));
diff --git a/xmlsecurity/source/framework/buffernode.cxx b/xmlsecurity/source/framework/buffernode.cxx
index dfffa6650c5b..0a0a58421dbb 100644
--- a/xmlsecurity/source/framework/buffernode.cxx
+++ b/xmlsecurity/source/framework/buffernode.cxx
@@ -25,11 +25,7 @@
#include <osl/diagnose.h>
#include <rtl/ustrbuf.hxx>
-namespace cssu = com::sun::star::uno;
-namespace cssxw = com::sun::star::xml::wrapper;
-namespace cssxc = com::sun::star::xml::crypto;
-
-BufferNode::BufferNode( const cssu::Reference< cssxw::XXMLElementWrapper >& xXMLElement )
+BufferNode::BufferNode( const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& xXMLElement )
:m_pParent(nullptr),
m_pBlocker(nullptr),
m_bAllReceived(false),
@@ -65,9 +61,9 @@ bool BufferNode::isECOfBeforeModifyIncluded(sal_Int32 nIgnoredSecurityId) const
{
return std::any_of(m_vElementCollectors.cbegin(), m_vElementCollectors.cend(),
[nIgnoredSecurityId](const ElementCollector* pElementCollector) {
- return (nIgnoredSecurityId == cssxc::sax::ConstOfSecurityId::UNDEFINEDSECURITYID ||
+ return (nIgnoredSecurityId == css::xml::crypto::sax::ConstOfSecurityId::UNDEFINEDSECURITYID ||
pElementCollector->getSecurityId() != nIgnoredSecurityId) &&
- (pElementCollector->getPriority() == cssxc::sax::ElementMarkPriority_BEFOREMODIFY);
+ (pElementCollector->getPriority() == css::xml::crypto::sax::ElementMarkPriority_BEFOREMODIFY);
});
}
@@ -215,10 +211,10 @@ OUString BufferNode::printChildren() const
switch (ii->getPriority())
{
- case cssxc::sax::ElementMarkPriority_BEFOREMODIFY:
+ case css::xml::crypto::sax::ElementMarkPriority_BEFOREMODIFY:
rc.append("BEFOREMODIFY");
break;
- case cssxc::sax::ElementMarkPriority_AFTERMODIFY:
+ case css::xml::crypto::sax::ElementMarkPriority_AFTERMODIFY:
rc.append("AFTERMODIFY");
break;
default:
@@ -618,7 +614,7 @@ const BufferNode* BufferNode::getNextNodeByTreeOrder() const
}
-void BufferNode::setXMLElement( const cssu::Reference< cssxw::XXMLElementWrapper >& xXMLElement )
+void BufferNode::setXMLElement( const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& xXMLElement )
{
m_xXMLElement = xXMLElement;
}
@@ -672,8 +668,8 @@ void BufferNode::elementCollectorNotify()
{
if (!m_vElementCollectors.empty())
{
- cssxc::sax::ElementMarkPriority nMaxPriority = cssxc::sax::ElementMarkPriority_MINIMUM;
- cssxc::sax::ElementMarkPriority nPriority;
+ css::xml::crypto::sax::ElementMarkPriority nMaxPriority = css::xml::crypto::sax::ElementMarkPriority_MINIMUM;
+ css::xml::crypto::sax::ElementMarkPriority nPriority;
/*
* get the max priority among ElementCollectors on this BufferNode
@@ -703,7 +699,7 @@ void BufferNode::elementCollectorNotify()
* unless its priority is BEFOREMODIFY.
*/
if (nPriority == nMaxPriority &&
- (nPriority == cssxc::sax::ElementMarkPriority_BEFOREMODIFY ||
+ (nPriority == css::xml::crypto::sax::ElementMarkPriority_BEFOREMODIFY ||
!isBlockerInSubTreeIncluded(pElementCollector->getSecurityId())))
{
/*
@@ -716,7 +712,7 @@ void BufferNode::elementCollectorNotify()
* will destroy the buffered element, in turn, ElementCollectors
* mentioned above can't perform their mission.
*/
- //if (!(nMaxPriority == cssxc::sax::ElementMarkPriority_PRI_MODIFY &&
+ //if (!(nMaxPriority == css::xml::crypto::sax::ElementMarkPriority_PRI_MODIFY &&
if (!(bToModify &&
(isECInSubTreeIncluded(pElementCollector->getSecurityId()) ||
isECOfBeforeModifyInAncestorIncluded(pElementCollector->getSecurityId()))
@@ -755,7 +751,7 @@ bool BufferNode::isECInSubTreeIncluded(sal_Int32 nIgnoredSecurityId) const
{
bool rc = std::any_of(m_vElementCollectors.begin(), m_vElementCollectors.end(),
[nIgnoredSecurityId](const ElementCollector* pElementCollector) {
- return nIgnoredSecurityId == cssxc::sax::ConstOfSecurityId::UNDEFINEDSECURITYID ||
+ return nIgnoredSecurityId == css::xml::crypto::sax::ConstOfSecurityId::UNDEFINEDSECURITYID ||
pElementCollector->getSecurityId() != nIgnoredSecurityId;
});
@@ -841,7 +837,7 @@ bool BufferNode::isBlockerInSubTreeIncluded(sal_Int32 nIgnoredSecurityId) const
[nIgnoredSecurityId](const std::unique_ptr<BufferNode>& pBufferNode) {
ElementMark* pBlocker = pBufferNode->getBlocker();
return (pBlocker != nullptr &&
- (nIgnoredSecurityId == cssxc::sax::ConstOfSecurityId::UNDEFINEDSECURITYID ||
+ (nIgnoredSecurityId == css::xml::crypto::sax::ConstOfSecurityId::UNDEFINEDSECURITYID ||
pBlocker->getSecurityId() != nIgnoredSecurityId )) ||
pBufferNode->isBlockerInSubTreeIncluded(nIgnoredSecurityId);
});
diff --git a/xmlsecurity/source/framework/elementcollector.cxx b/xmlsecurity/source/framework/elementcollector.cxx
index 80581d1c2029..7801d6328b7f 100644
--- a/xmlsecurity/source/framework/elementcollector.cxx
+++ b/xmlsecurity/source/framework/elementcollector.cxx
@@ -23,15 +23,12 @@
#include <com/sun/star/xml/crypto/sax/ConstOfSecurityId.hpp>
#include <com/sun/star/xml/crypto/sax/XReferenceResolvedListener.hpp>
-namespace cssu = com::sun::star::uno;
-namespace cssxc = com::sun::star::xml::crypto;
-
ElementCollector::ElementCollector(
sal_Int32 nBufferId,
- cssxc::sax::ElementMarkPriority nPriority,
+ css::xml::crypto::sax::ElementMarkPriority nPriority,
bool bToModify,
const css::uno::Reference< css::xml::crypto::sax::XReferenceResolvedListener >& xReferenceResolvedListener)
- :ElementMark(cssxc::sax::ConstOfSecurityId::UNDEFINEDSECURITYID, nBufferId),
+ :ElementMark(css::xml::crypto::sax::ConstOfSecurityId::UNDEFINEDSECURITYID, nBufferId),
m_nPriority(nPriority),
m_bToModify(bToModify),
m_bAbleToNotify(false),
@@ -67,7 +64,7 @@ ElementCollector::ElementCollector(
* - the listener that this ElementCollector notifies to.
******************************************************************************/
{
- m_type = cssxc::sax::ElementMarkType_ELEMENTCOLLECTOR;
+ m_type = css::xml::crypto::sax::ElementMarkType_ELEMENTCOLLECTOR;
}
@@ -89,7 +86,7 @@ void ElementCollector::notifyListener()
}
void ElementCollector::setReferenceResolvedListener(
- const cssu::Reference< cssxc::sax::XReferenceResolvedListener >& xReferenceResolvedListener)
+ const css::uno::Reference< css::xml::crypto::sax::XReferenceResolvedListener >& xReferenceResolvedListener)
/****** ElementCollector/setReferenceResolvedListener *************************
*
* NAME
@@ -130,7 +127,7 @@ void ElementCollector::doNotify()
if (!m_bNotified &&
m_bAbleToNotify &&
m_xReferenceResolvedListener.is() &&
- m_nSecurityId != cssxc::sax::ConstOfSecurityId::UNDEFINEDSECURITYID)
+ m_nSecurityId != css::xml::crypto::sax::ConstOfSecurityId::UNDEFINEDSECURITYID)
{
m_bNotified = true;
m_xReferenceResolvedListener->referenceResolved(m_nBufferId);
diff --git a/xmlsecurity/source/framework/elementmark.cxx b/xmlsecurity/source/framework/elementmark.cxx
index c333527f42b2..71444d7cd33b 100644
--- a/xmlsecurity/source/framework/elementmark.cxx
+++ b/xmlsecurity/source/framework/elementmark.cxx
@@ -20,13 +20,11 @@
#include "elementmark.hxx"
-namespace cssxc = com::sun::star::xml::crypto;
-
ElementMark::ElementMark(sal_Int32 nSecurityId, sal_Int32 nBufferId)
:m_pBufferNode(nullptr),
m_nSecurityId(nSecurityId),
m_nBufferId(nBufferId),
- m_type(cssxc::sax::ElementMarkType_ELEMENTMARK)
+ m_type(css::xml::crypto::sax::ElementMarkType_ELEMENTMARK)
/****** ElementMark/ElementMark ***********************************************
*
* NAME
diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
index 7356de79a5d4..cde39d929959 100644
--- a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
+++ b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
@@ -30,13 +30,6 @@
#include <osl/diagnose.h>
#include <rtl/ustrbuf.hxx>
-namespace cssu = com::sun::star::uno;
-namespace cssl = com::sun::star::lang;
-namespace cssxc = com::sun::star::xml::crypto;
-namespace cssxcsax = com::sun::star::xml::csax;
-namespace cssxw = com::sun::star::xml::wrapper;
-namespace cssxs = com::sun::star::xml::sax;
-
#define IMPLEMENTATION_NAME "com.sun.star.xml.security.framework.SAXEventKeeperImpl"
SAXEventKeeperImpl::SAXEventKeeperImpl( )
@@ -331,7 +324,7 @@ OUString SAXEventKeeperImpl::printBufferNode(
return rc.makeStringAndClear();
}
-cssu::Sequence< cssu::Reference< cssxw::XXMLElementWrapper > >
+css::uno::Sequence< css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > >
SAXEventKeeperImpl::collectChildWorkingElement(BufferNode const * pBufferNode)
/****** SAXEventKeeperImpl/collectChildWorkingElement ************************
*
@@ -351,8 +344,8 @@ cssu::Sequence< cssu::Reference< cssxw::XXMLElementWrapper > >
{
std::vector< std::unique_ptr<BufferNode> > const & vChildren = pBufferNode->getChildren();
- cssu::Sequence < cssu::Reference<
- cssxw::XXMLElementWrapper > > aChildrenCollection ( vChildren.size());
+ css::uno::Sequence < css::uno::Reference<
+ css::xml::wrapper::XXMLElementWrapper > > aChildrenCollection ( vChildren.size());
sal_Int32 nIndex = 0;
for( const auto& i : vChildren )
@@ -416,7 +409,7 @@ void SAXEventKeeperImpl::smashBufferNode(
*/
if (bClearRoot)
{
- cssu::Sequence< cssu::Reference< cssxw::XXMLElementWrapper > >
+ css::uno::Sequence< css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > >
aChildElements = collectChildWorkingElement(m_pRootBufferNode.get());
/*
@@ -467,7 +460,7 @@ void SAXEventKeeperImpl::smashBufferNode(
*/
if ( bIsNotBlocking || bIsBlockInside || bIsBlockingAfterward )
{
- cssu::Sequence< cssu::Reference< cssxw::XXMLElementWrapper > >
+ css::uno::Sequence< css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > >
aChildElements = collectChildWorkingElement(pBufferNode);
/*
@@ -595,7 +588,7 @@ void SAXEventKeeperImpl::releaseElementMarkBuffer()
if (pElementMark != nullptr)
{
- if (cssxc::sax::ElementMarkType_ELEMENTCOLLECTOR
+ if (css::xml::crypto::sax::ElementMarkType_ELEMENTCOLLECTOR
== pElementMark->getType())
/*
* it is a EC
@@ -603,14 +596,14 @@ void SAXEventKeeperImpl::releaseElementMarkBuffer()
{
ElementCollector* pElementCollector = static_cast<ElementCollector*>(pElementMark);
- cssxc::sax::ElementMarkPriority nPriority = pElementCollector->getPriority();
+ css::xml::crypto::sax::ElementMarkPriority nPriority = pElementCollector->getPriority();
/*
* Delete the EC from the buffer node.
*/
BufferNode* pBufferNode = pElementCollector->getBufferNode();
pBufferNode->removeElementCollector(pElementCollector);
- if ( nPriority == cssxc::sax::ElementMarkPriority_BEFOREMODIFY)
+ if ( nPriority == css::xml::crypto::sax::ElementMarkPriority_BEFOREMODIFY)
{
pBufferNode->notifyBranch();
}
@@ -737,9 +730,9 @@ void SAXEventKeeperImpl::markElementMarkBuffer(sal_Int32 nId)
}
sal_Int32 SAXEventKeeperImpl::createElementCollector(
- cssxc::sax::ElementMarkPriority nPriority,
+ css::xml::crypto::sax::ElementMarkPriority nPriority,
bool bModifyElement,
- const cssu::Reference< cssxc::sax::XReferenceResolvedListener >& xReferenceResolvedListener)
+ const css::uno::Reference< css::xml::crypto::sax::XReferenceResolvedListener >& xReferenceResolvedListener)
/****** SAXEventKeeperImpl/createElementCollector ****************************
*
* NAME
@@ -805,7 +798,7 @@ sal_Int32 SAXEventKeeperImpl::createBlocker()
OSL_ASSERT(m_pNewBlocker == nullptr);
- m_pNewBlocker = new ElementMark(cssxc::sax::ConstOfSecurityId::UNDEFINEDSECURITYID, nId);
+ m_pNewBlocker = new ElementMark(css::xml::crypto::sax::ConstOfSecurityId::UNDEFINEDSECURITYID, nId);
m_vElementMarkBuffers.push_back(
std::unique_ptr<const ElementMark>(m_pNewBlocker));
@@ -816,7 +809,7 @@ sal_Int32 SAXEventKeeperImpl::createBlocker()
sal_Int32 SAL_CALL SAXEventKeeperImpl::addElementCollector( )
{
return createElementCollector(
- cssxc::sax::ElementMarkPriority_AFTERMODIFY,
+ css::xml::crypto::sax::ElementMarkPriority_AFTERMODIFY,
false,
nullptr);
}
@@ -841,10 +834,10 @@ sal_Bool SAL_CALL SAXEventKeeperImpl::isBlocking( )
return (m_pCurrentBlockingBufferNode != nullptr);
}
-cssu::Reference< cssxw::XXMLElementWrapper > SAL_CALL
+css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > SAL_CALL
SAXEventKeeperImpl::getElement( sal_Int32 id )
{
- cssu::Reference< cssxw::XXMLElementWrapper > rc;
+ css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > rc;
ElementMark* pElementMark = findElementMarkBuffer(id);
if (pElementMark != nullptr)
@@ -857,7 +850,7 @@ cssu::Reference< cssxw::XXMLElementWrapper > SAL_CALL
void SAL_CALL SAXEventKeeperImpl::setElement(
sal_Int32 id,
- const cssu::Reference< cssxw::XXMLElementWrapper >& aElement )
+ const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& aElement )
{
if (aElement.is())
{
@@ -886,10 +879,10 @@ void SAL_CALL SAXEventKeeperImpl::setElement(
}
}
-cssu::Reference< cssxs::XDocumentHandler > SAL_CALL SAXEventKeeperImpl::setNextHandler(
- const cssu::Reference< cssxs::XDocumentHandler >& xNewHandler )
+css::uno::Reference< css::xml::sax::XDocumentHandler > SAL_CALL SAXEventKeeperImpl::setNextHandler(
+ const css::uno::Reference< css::xml::sax::XDocumentHandler >& xNewHandler )
{
- cssu::Reference< cssxs::XDocumentHandler > xOldHandler = m_xNextHandler;
+ css::uno::Reference< css::xml::sax::XDocumentHandler > xOldHandler = m_xNextHandler;
m_xNextHandler = xNewHandler;
return xOldHandler;
@@ -906,9 +899,9 @@ OUString SAL_CALL SAXEventKeeperImpl::printBufferNodeTree()
return rc;
}
-cssu::Reference< cssxw::XXMLElementWrapper > SAL_CALL SAXEventKeeperImpl::getCurrentBlockingNode()
+css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > SAL_CALL SAXEventKeeperImpl::getCurrentBlockingNode()
{
- cssu::Reference< cssxw::XXMLElementWrapper > rc;
+ css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > rc;
if (m_pCurrentBlockingBufferNode != nullptr)
{
@@ -920,7 +913,7 @@ cssu::Reference< cssxw::XXMLElementWrapper > SAL_CALL SAXEventKeeperImpl::getCur
/* XSecuritySAXEventKeeper */
sal_Int32 SAL_CALL SAXEventKeeperImpl::addSecurityElementCollector(
- cssxc::sax::ElementMarkPriority priority,
+ css::xml::crypto::sax::ElementMarkPriority priority,
sal_Bool modifyElement )
{
return createElementCollector(
@@ -942,7 +935,7 @@ void SAL_CALL SAXEventKeeperImpl::setSecurityId( sal_Int32 id, sal_Int32 securit
/* XReferenceResolvedBroadcaster */
void SAL_CALL SAXEventKeeperImpl::addReferenceResolvedListener(
sal_Int32 referenceId,
- const cssu::Reference< cssxc::sax::XReferenceResolvedListener >& listener )
+ const css::uno::Reference< css::xml::crypto::sax::XReferenceResolvedListener >& listener )
{
ElementCollector* pElementCollector = static_cast<ElementCollector*>(findElementMarkBuffer(referenceId));
if (pElementCollector != nullptr)
@@ -953,19 +946,19 @@ void SAL_CALL SAXEventKeeperImpl::addReferenceResolvedListener(
void SAL_CALL SAXEventKeeperImpl::removeReferenceResolvedListener(
sal_Int32 /*referenceId*/,
- const cssu::Reference< cssxc::sax::XReferenceResolvedListener >&)
+ const css::uno::Reference< css::xml::crypto::sax::XReferenceResolvedListener >&)
{
}
/* XSAXEventKeeperStatusChangeBroadcaster */
void SAL_CALL SAXEventKeeperImpl::addSAXEventKeeperStatusChangeListener(
- const cssu::Reference< cssxc::sax::XSAXEventKeeperStatusChangeListener >& listener )
+ const css::uno::Reference< css::xml::crypto::sax::XSAXEventKeeperStatusChangeListener >& listener )
{
m_xSAXEventKeeperStatusChangeListener = listener;
}
void SAL_CALL SAXEventKeeperImpl::removeSAXEventKeeperStatusChangeListener(
- const cssu::Reference< cssxc::sax::XSAXEventKeeperStatusChangeListener >&)
+ const css::uno::Reference< css::xml::crypto::sax::XSAXEventKeeperStatusChangeListener >&)
{
}
@@ -988,7 +981,7 @@ void SAL_CALL SAXEventKeeperImpl::endDocument( )
void SAL_CALL SAXEventKeeperImpl::startElement(
const OUString& aName,
- const cssu::Reference< cssxs::XAttributeList >& xAttribs )
+ const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs )
{
/*
* If there is a following handler and no blocking now, then
@@ -1007,7 +1000,7 @@ void SAL_CALL SAXEventKeeperImpl::startElement(
if (!m_bIsForwarding)
{
sal_Int32 nLength = xAttribs->getLength();
- cssu::Sequence< cssxcsax::XMLAttribute > aAttributes (nLength);
+ css::uno::Sequence< css::xml::csax::XMLAttribute > aAttributes (nLength);
for ( int i = 0; i<nLength; ++i )
{
@@ -1117,18 +1110,18 @@ void SAL_CALL SAXEventKeeperImpl::processingInstruction(
}
}
-void SAL_CALL SAXEventKeeperImpl::setDocumentLocator( const cssu::Reference< cssxs::XLocator >&)
+void SAL_CALL SAXEventKeeperImpl::setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >&)
{
}
/* XInitialization */
-void SAL_CALL SAXEventKeeperImpl::initialize( const cssu::Sequence< cssu::Any >& aArguments )
+void SAL_CALL SAXEventKeeperImpl::initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
{
OSL_ASSERT(aArguments.getLength() == 1);
aArguments[0] >>= m_xXMLDocument;
- m_xDocumentHandler.set( m_xXMLDocument, cssu::UNO_QUERY );
- m_xCompressedDocumentHandler.set( m_xXMLDocument, cssu::UNO_QUERY );
+ m_xDocumentHandler.set( m_xXMLDocument, css::uno::UNO_QUERY );
+ m_xCompressedDocumentHandler.set( m_xXMLDocument, css::uno::UNO_QUERY );
m_pRootBufferNode.reset( new BufferNode(m_xXMLDocument->getCurrentElement()) );
m_pCurrentBufferNode = m_pRootBufferNode.get();
@@ -1139,9 +1132,9 @@ OUString SAXEventKeeperImpl_getImplementationName ()
return IMPLEMENTATION_NAME;
}
-cssu::Sequence< OUString > SAXEventKeeperImpl_getSupportedServiceNames( )
+css::uno::Sequence< OUString > SAXEventKeeperImpl_getSupportedServiceNames( )
{
- cssu::Sequence<OUString> aRet { "com.sun.star.xml.crypto.sax.SAXEventKeeper" };
+ css::uno::Sequence<OUString> aRet { "com.sun.star.xml.crypto.sax.SAXEventKeeper" };
return aRet;
}
@@ -1156,7 +1149,7 @@ sal_Bool SAL_CALL SAXEventKeeperImpl::supportsService( const OUString& rServiceN
return cppu::supportsService(this, rServiceName);
}
-cssu::Sequence< OUString > SAL_CALL SAXEventKeeperImpl::getSupportedServiceNames( )
+css::uno::Sequence< OUString > SAL_CALL SAXEventKeeperImpl::getSupportedServiceNames( )
{
return SAXEventKeeperImpl_getSupportedServiceNames();
}
diff --git a/xmlsecurity/source/framework/signaturecreatorimpl.cxx b/xmlsecurity/source/framework/signaturecreatorimpl.cxx
index 131365ac9fb0..a3d8cd45814e 100644
--- a/xmlsecurity/source/framework/signaturecreatorimpl.cxx
+++ b/xmlsecurity/source/framework/signaturecreatorimpl.cxx
@@ -28,10 +28,6 @@
namespace com::sun::star::xml::wrapper { class XXMLElementWrapper; }
using namespace com::sun::star::uno;
-namespace cssu = com::sun::star::uno;
-namespace cssl = com::sun::star::lang;
-namespace cssxc = com::sun::star::xml::crypto;
-namespace cssxw = com::sun::star::xml::wrapper;
#define IMPLEMENTATION_NAME "com.sun.star.xml.security.framework.SignatureCreatorImpl"
@@ -52,8 +48,8 @@ void SignatureCreatorImpl::notifyResultListener() const
* creation result.
******************************************************************************/
{
- cssu::Reference< cssxc::sax::XSignatureCreationResultListener >
- xSignatureCreationResultListener ( m_xResultListener , cssu::UNO_QUERY ) ;
+ css::uno::Reference< css::xml::crypto::sax::XSignatureCreationResultListener >
+ xSignatureCreationResultListener ( m_xResultListener , css::uno::UNO_QUERY ) ;
xSignatureCreationResultListener->signatureCreated( m_nSecurityId, m_nStatus );
}
@@ -74,20 +70,20 @@ void SignatureCreatorImpl::startEngine(const rtl::Reference<XMLSignatureTemplate
* elements) to be signed.
******************************************************************************/
{
- cssu::Reference< cssxc::XXMLSignatureTemplate > xResultTemplate;
+ css::uno::Reference< css::xml::crypto::XXMLSignatureTemplate > xResultTemplate;
try
{
xResultTemplate = m_xXMLSignature->generate(css::uno::Reference<css::xml::crypto::XXMLSignatureTemplate>(xSignatureTemplate.get()), m_xSecurityEnvironment);
m_nStatus = xResultTemplate->getStatus();
}
- catch( cssu::Exception& )
+ catch( css::uno::Exception& )
{
- m_nStatus = cssxc::SecurityOperationStatus_RUNTIMEERROR_FAILED;
+ m_nStatus = css::xml::crypto::SecurityOperationStatus_RUNTIMEERROR_FAILED;
}
- if (m_nStatus == cssxc::SecurityOperationStatus_OPERATION_SUCCEEDED)
+ if (m_nStatus == css::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED)
{
- cssu::Reference < cssxw::XXMLElementWrapper > xResultSignature = xResultTemplate->getTemplate();
+ css::uno::Reference < css::xml::wrapper::XXMLElementWrapper > xResultSignature = xResultTemplate->getTemplate();
m_xSAXEventKeeper->setElement(m_nIdOfTemplateEC, xResultSignature);
}
}
@@ -124,19 +120,19 @@ void SAL_CALL SignatureCreatorImpl::setBlockerId( sal_Int32 id )
/* XSignatureCreationResultBroadcaster */
void SAL_CALL SignatureCreatorImpl::addSignatureCreationResultListener(
- const cssu::Reference< cssxc::sax::XSignatureCreationResultListener >& listener )
+ const css::uno::Reference< css::xml::crypto::sax::XSignatureCreationResultListener >& listener )
{
m_xResultListener = listener;
tryToPerform();
}
void SAL_CALL SignatureCreatorImpl::removeSignatureCreationResultListener(
- const cssu::Reference< cssxc::sax::XSignatureCreationResultListener >&)
+ const css::uno::Reference< css::xml::crypto::sax::XSignatureCreationResultListener >&)
{
}
/* XInitialization */
-void SAL_CALL SignatureCreatorImpl::initialize( const cssu::Sequence< cssu::Any >& aArguments )
+void SAL_CALL SignatureCreatorImpl::initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
{
OSL_ASSERT(aArguments.getLength() == 5);
@@ -157,9 +153,9 @@ OUString SignatureCreatorImpl_getImplementationName ()
return IMPLEMENTATION_NAME;
}
-cssu::Sequence< OUString > SignatureCreatorImpl_getSupportedServiceNames( )
+css::uno::Sequence< OUString > SignatureCreatorImpl_getSupportedServiceNames( )
{
- cssu::Sequence<OUString> aRet { "com.sun.star.xml.crypto.sax.SignatureCreator" };
+ css::uno::Sequence<OUString> aRet { "com.sun.star.xml.crypto.sax.SignatureCreator" };
return aRet;
}
@@ -174,7 +170,7 @@ sal_Bool SAL_CALL SignatureCreatorImpl::supportsService( const OUString& rServic
return cppu::supportsService(this, rServiceName);
}
-cssu::Sequence< OUString > SAL_CALL SignatureCreatorImpl::getSupportedServiceNames( )
+css::uno::Sequence< OUString > SAL_CALL SignatureCreatorImpl::getSupportedServiceNames( )
{
return SignatureCreatorImpl_getSupportedServiceNames();
}
diff --git a/xmlsecurity/source/framework/signatureengine.cxx b/xmlsecurity/source/framework/signatureengine.cxx
index ff1025e9d783..095b2d04d4d7 100644
--- a/xmlsecurity/source/framework/signatureengine.cxx
+++ b/xmlsecurity/source/framework/signatureengine.cxx
@@ -25,9 +25,6 @@
namespace com::sun::star::xml::wrapper { class XXMLElementWrapper; }
using namespace com::sun::star::uno;
-namespace cssu = com::sun::star::uno;
-namespace cssxc = com::sun::star::xml::crypto;
-namespace cssxw = com::sun::star::xml::wrapper;
SignatureEngine::SignatureEngine()
: m_nTotalReferenceNumber(-1)
@@ -93,7 +90,7 @@ void SignatureEngine::tryToPerform( )
{
rtl::Reference<XMLSignatureTemplateImpl> xSignatureTemplate = new XMLSignatureTemplateImpl();
- cssu::Reference< cssxw::XXMLElementWrapper >
+ css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >
xXMLElement = m_xSAXEventKeeper->getElement( m_nIdOfTemplateEC );
xSignatureTemplate->setTemplate(xXMLElement);
@@ -135,11 +132,11 @@ void SignatureEngine::clearUp( ) const
* 3. releases the ElementCollector for the key element, if there is one.
******************************************************************************/
{
- cssu::Reference < cssxc::sax::XReferenceResolvedBroadcaster >
- xReferenceResolvedBroadcaster( m_xSAXEventKeeper, cssu::UNO_QUERY );
+ css::uno::Reference < css::xml::crypto::sax::XReferenceResolvedBroadcaster >
+ xReferenceResolvedBroadcaster( m_xSAXEventKeeper, css::uno::UNO_QUERY );
xReferenceResolvedBroadcaster->removeReferenceResolvedListener(
m_nIdOfTemplateEC,
- static_cast<const cssu::Reference < cssxc::sax::XReferenceResolvedListener > >(static_cast<SecurityEngine *>(const_cast<SignatureEngine *>(this))));
+ static_cast<const css::uno::Reference < css::xml::crypto::sax::XReferenceResolvedListener > >(static_cast<SecurityEngine *>(const_cast<SignatureEngine *>(this))));
m_xSAXEventKeeper->removeElementCollector(m_nIdOfTemplateEC);
@@ -147,7 +144,7 @@ void SignatureEngine::clearUp( ) const
{
xReferenceResolvedBroadcaster->removeReferenceResolvedListener(
i,
- static_cast<const cssu::Reference < cssxc::sax::XReferenceResolvedListener > >(static_cast<SecurityEngine *>(const_cast<SignatureEngine *>(this))));
+ static_cast<const css::uno::Reference < css::xml::crypto::sax::XReferenceResolvedListener > >(static_cast<SecurityEngine *>(const_cast<SignatureEngine *>(this))));
m_xSAXEventKeeper->removeElementCollector(i);
}
@@ -172,15 +169,15 @@ void SAL_CALL SignatureEngine::setReferenceId( sal_Int32 id )
/* XUriBinding */
void SAL_CALL SignatureEngine::setUriBinding(
const OUString& uri,
- const cssu::Reference< css::io::XInputStream >& aInputStream )
+ const css::uno::Reference< css::io::XInputStream >& aInputStream )
{
m_vUris.push_back(uri);
m_vXInputStreams.push_back(aInputStream);
}
-cssu::Reference< css::io::XInputStream > SAL_CALL SignatureEngine::getUriBinding( const OUString& uri )
+css::uno::Reference< css::io::XInputStream > SAL_CALL SignatureEngine::getUriBinding( const OUString& uri )
{
- cssu::Reference< css::io::XInputStream > xInputStream;
+ css::uno::Reference< css::io::XInputStream > xInputStream;
int size = m_vUris.size();
diff --git a/xmlsecurity/source/framework/signatureverifierimpl.cxx b/xmlsecurity/source/framework/signatureverifierimpl.cxx
index 7a697f355b0c..4daf8d203c6a 100644
--- a/xmlsecurity/source/framework/signatureverifierimpl.cxx
+++ b/xmlsecurity/source/framework/signatureverifierimpl.cxx
@@ -25,9 +25,6 @@
#include <osl/diagnose.h>
#include <rtl/ref.hxx>
-namespace cssu = com::sun::star::uno;
-namespace cssl = com::sun::star::lang;
-namespace cssxc = com::sun::star::xml::crypto;
#define IMPLEMENTATION_NAME "com.sun.star.xml.security.framework.SignatureVerifierImpl"
@@ -47,8 +44,8 @@ void SignatureVerifierImpl::notifyResultListener() const
* notifyResultListener -- notifies the listener about the verify result.
******************************************************************************/
{
- cssu::Reference< cssxc::sax::XSignatureVerifyResultListener >
- xSignatureVerifyResultListener ( m_xResultListener , cssu::UNO_QUERY ) ;
+ css::uno::Reference< css::xml::crypto::sax::XSignatureVerifyResultListener >
+ xSignatureVerifyResultListener ( m_xResultListener , css::uno::UNO_QUERY ) ;
xSignatureVerifyResultListener->signatureVerified( m_nSecurityId, m_nStatus );
}
@@ -64,34 +61,34 @@ void SignatureVerifierImpl::startEngine( const rtl::Reference<XMLSignatureTempla
* elements) to be verified.
******************************************************************************/
{
- cssu::Reference< cssxc::XXMLSignatureTemplate > xResultTemplate;
+ css::uno::Reference< css::xml::crypto::XXMLSignatureTemplate > xResultTemplate;
try
{
xResultTemplate = m_xXMLSignature->validate(css::uno::Reference<css::xml::crypto::XXMLSignatureTemplate>(xSignatureTemplate.get()), m_xXMLSecurityContext);
m_nStatus = xResultTemplate->getStatus();
}
- catch( cssu::Exception& )
+ catch( css::uno::Exception& )
{
- m_nStatus = cssxc::SecurityOperationStatus_RUNTIMEERROR_FAILED;
+ m_nStatus = css::xml::crypto::SecurityOperationStatus_RUNTIMEERROR_FAILED;
}
}
/* XSignatureVerifyResultBroadcaster */
void SAL_CALL SignatureVerifierImpl::addSignatureVerifyResultListener(
- const cssu::Reference< cssxc::sax::XSignatureVerifyResultListener >& listener )
+ const css::uno::Reference< css::xml::crypto::sax::XSignatureVerifyResultListener >& listener )
{
m_xResultListener = listener;
tryToPerform();
}
void SAL_CALL SignatureVerifierImpl::removeSignatureVerifyResultListener(
- const cssu::Reference< cssxc::sax::XSignatureVerifyResultListener >&)
+ const css::uno::Reference< css::xml::crypto::sax::XSignatureVerifyResultListener >&)
{
}
/* XInitialization */
void SAL_CALL SignatureVerifierImpl::initialize(
- const cssu::Sequence< cssu::Any >& aArguments )
+ const css::uno::Sequence< css::uno::Any >& aArguments )
{
OSL_ASSERT(aArguments.getLength() == 5);
@@ -112,9 +109,9 @@ OUString SignatureVerifierImpl_getImplementationName ()
return IMPLEMENTATION_NAME;
}
-cssu::Sequence< OUString > SignatureVerifierImpl_getSupportedServiceNames( )
+css::uno::Sequence< OUString > SignatureVerifierImpl_getSupportedServiceNames( )
{
- cssu::Sequence<OUString> aRet { "com.sun.star.xml.crypto.sax.SignatureVerifier" };
+ css::uno::Sequence<OUString> aRet { "com.sun.star.xml.crypto.sax.SignatureVerifier" };
return aRet;
}
@@ -129,7 +126,7 @@ sal_Bool SAL_CALL SignatureVerifierImpl::supportsService( const OUString& rServi
return cppu::supportsService(this, rServiceName);
}
-cssu::Sequence< OUString > SAL_CALL SignatureVerifierImpl::getSupportedServiceNames( )
+css::uno::Sequence< OUString > SAL_CALL SignatureVerifierImpl::getSupportedServiceNames( )
{
return SignatureVerifierImpl_getSupportedServiceNames();
}
diff --git a/xmlsecurity/source/helper/xsecctl.cxx b/xmlsecurity/source/helper/xsecctl.cxx
index ab108d13c224..cac30006b6a7 100644
--- a/xmlsecurity/source/helper/xsecctl.cxx
+++ b/xmlsecurity/source/helper/xsecctl.cxx
@@ -41,10 +41,6 @@
#include "ooxmlsecexporter.hxx"
#include <xmlsignaturehelper2.hxx>
-namespace cssu = com::sun::star::uno;
-namespace cssl = com::sun::star::lang;
-namespace cssxc = com::sun::star::xml::crypto;
-namespace cssxs = com::sun::star::xml::sax;
using namespace com::sun::star;
namespace
@@ -53,11 +49,11 @@ OUString getDigestURI(sal_Int32 nID)
{
switch( nID )
{
- case cssxc::DigestID::SHA1:
+ case css::xml::crypto::DigestID::SHA1:
return ALGO_XMLDSIGSHA1;
- case cssxc::DigestID::SHA256:
+ case css::xml::crypto::DigestID::SHA256:
return ALGO_XMLDSIGSHA256;
- case cssxc::DigestID::SHA512:
+ case css::xml::crypto::DigestID::SHA512:
return ALGO_XMLDSIGSHA512;
default:
return ALGO_XMLDSIGSHA1;
@@ -71,13 +67,13 @@ OUString getSignatureURI(svl::crypto::SignatureMethodAlgorithm eAlgorithm, sal_I
{
switch (nDigestID)
{
- case cssxc::DigestID::SHA1:
+ case css::xml::crypto::DigestID::SHA1:
aRet = ALGO_ECDSASHA1;
break;
- case cssxc::DigestID::SHA256:
+ case css::xml::crypto::DigestID::SHA256:
aRet = ALGO_ECDSASHA256;
break;
- case cssxc::DigestID::SHA512:
+ case css::xml::crypto::DigestID::SHA512:
aRet = ALGO_ECDSASHA512;
break;
default:
@@ -90,11 +86,11 @@ OUString getSignatureURI(svl::crypto::SignatureMethodAlgorithm eAlgorithm, sal_I
switch (nDigestID)
{
- case cssxc::DigestID::SHA1:
+ case css::xml::crypto::DigestID::SHA1:
return ALGO_RSASHA1;
- case cssxc::DigestID::SHA256:
+ case css::xml::crypto::DigestID::SHA256:
return ALGO_RSASHA256;
- case cssxc::DigestID::SHA512:
+ case css::xml::crypto::DigestID::SHA512:
return ALGO_RSASHA512;
default:
return ALGO_RSASHA1;
@@ -102,7 +98,7 @@ OUString getSignatureURI(svl::crypto::SignatureMethodAlgorithm eAlgorithm, sal_I
}
}
-XSecController::XSecController( const cssu::Reference<cssu::XComponentContext>& rxCtx )
+XSecController::XSecController( const css::uno::Reference<css::uno::XComponentContext>& rxCtx )
: mxCtx(rxCtx)
, m_nNextSecurityId(1)
, m_bIsPreviousNodeInitializable(false)
@@ -177,15 +173,15 @@ void XSecController::createXSecComponent( )
m_xXMLDocumentWrapper = nullptr;
m_xSAXEventKeeper = nullptr;
- cssu::Reference< cssl::XMultiComponentFactory > xMCF( mxCtx->getServiceManager() );
+ css::uno::Reference< css::lang::XMultiComponentFactory > xMCF( mxCtx->getServiceManager() );
#if HAVE_FEATURE_GPGME
- uno::Reference< lang::XServiceInfo > xServiceInfo( m_xSecurityContext, cssu::UNO_QUERY );
+ uno::Reference< lang::XServiceInfo > xServiceInfo( m_xSecurityContext, css::uno::UNO_QUERY );
if (xServiceInfo->getImplementationName() == "com.sun.star.xml.security.gpg.XMLSecurityContext_GpgImpl")
m_xXMLSignature.set(new XMLSignature_GpgImpl());
else // xmlsec or mscrypt
#endif
- m_xXMLSignature.set(xMCF->createInstanceWithContext("com.sun.star.xml.crypto.XMLSignature", mxCtx), cssu::UNO_QUERY);
+ m_xXMLSignature.set(xMCF->createInstanceWithContext("com.sun.star.xml.crypto.XMLSignature", mxCtx), css::uno::UNO_QUERY);
bool bSuccess = m_xXMLSignature.is();
if ( bSuccess )
@@ -205,11 +201,11 @@ void XSecController::createXSecComponent( )
* SAXEventKeeper created successfully.
*/
{
- cssu::Sequence <cssu::Any> arg(1);
+ css::uno::Sequence <css::uno::Any> arg(1);
arg[0] <<= uno::Reference<xml::wrapper::XXMLDocumentWrapper>(m_xXMLDocumentWrapper.get());
m_xSAXEventKeeper->initialize(arg);
- cssu::Reference< cssxc::sax::XSAXEventKeeperStatusChangeListener >
+ css::uno::Reference< css::xml::crypto::sax::XSAXEventKeeperStatusChangeListener >
xStatusChangeListener = this;
m_xSAXEventKeeper->addSAXEventKeeperStatusChangeListener( xStatusChangeListener );
@@ -272,7 +268,7 @@ bool XSecController::chainOn()
*/
m_xSAXEventKeeper->setNextHandler( nullptr );
- cssu::Reference< cssxs::XDocumentHandler > xSEKHandler(static_cast<cppu::OWeakObject*>(m_xSAXEventKeeper.get()), cssu::UNO_QUERY);
+ css::uno::Reference< css::xml::sax::XDocumentHandler > xSEKHandler(static_cast<cppu::OWeakObject*>(m_xSAXEventKeeper.get()), css::uno::UNO_QUERY);
/*
* connects the previous document handler on the SAX chain
@@ -281,17 +277,17 @@ bool XSecController::chainOn()
{
if ( m_bIsPreviousNodeInitializable )
{
- cssu::Reference< cssl::XInitialization > xInitialization
- (m_xPreviousNodeOnSAXChain, cssu::UNO_QUERY);
+ css::uno::Reference< css::lang::XInitialization > xInitialization
+ (m_xPreviousNodeOnSAXChain, css::uno::UNO_QUERY);
- cssu::Sequence<cssu::Any> aArgs( 1 );
+ css::uno::Sequence<css::uno::Any> aArgs( 1 );
aArgs[0] <<= xSEKHandler;
xInitialization->initialize(aArgs);
}
else
{
- cssu::Reference< cssxs::XParser > xParser
- (m_xPreviousNodeOnSAXChain, cssu::UNO_QUERY);
+ css::uno::Reference< css::xml::sax::XParser > xParser
+ (m_xPreviousNodeOnSAXChain, css::uno::UNO_QUERY);
xParser->setDocumentHandler( xSEKHandler );
}
}
@@ -327,16 +323,16 @@ void XSecController::chainOff()
{
if ( m_bIsPreviousNodeInitializable )
{
- cssu::Reference< cssl::XInitialization > xInitialization
- (m_xPreviousNodeOnSAXChain, cssu::UNO_QUERY);
+ css::uno::Reference< css::lang::XInitialization > xInitialization
+ (m_xPreviousNodeOnSAXChain, css::uno::UNO_QUERY);
- cssu::Sequence<cssu::Any> aArgs( 1 );
+ css::uno::Sequence<css::uno::Any> aArgs( 1 );
aArgs[0] <<= uno::Reference<xml::sax::XDocumentHandler>();
xInitialization->initialize(aArgs);
}
else
{
- cssu::Reference< cssxs::XParser > xParser(m_xPreviousNodeOnSAXChain, cssu::UNO_QUERY);
+ css::uno::Reference< css::xml::sax::XParser > xParser(m_xPreviousNodeOnSAXChain, css::uno::UNO_QUERY);
xParser->setDocumentHandler(uno::Reference<xml::sax::XDocumentHandler>());
}
}
@@ -393,7 +389,7 @@ void XSecController::initializeSAXChain()
chainOff();
}
-cssu::Reference< css::io::XInputStream >
+css::uno::Reference< css::io::XInputStream >
XSecController::getObjectInputStream( const OUString& objectURL )
/****** XSecController/getObjectInputStream ************************************
*
@@ -410,7 +406,7 @@ cssu::Reference< css::io::XInputStream >
* xInputStream - the XInputStream interface
******************************************************************************/
{
- cssu::Reference< css::io::XInputStream > xObjectInputStream;
+ css::uno::Reference< css::io::XInputStream > xObjectInputStream;
SAL_WARN_IF( !m_xUriBinding.is(), "xmlsecurity.helper", "Need XUriBinding!" );
@@ -430,7 +426,7 @@ sal_Int32 XSecController::getNewSecurityId( )
return nId;
}
-void XSecController::startMission(const rtl::Reference<UriBindingHelper>& xUriBinding, const cssu::Reference< cssxc::XXMLSecurityContext >& xSecurityContext )
+void XSecController::startMission(const rtl::Reference<UriBindingHelper>& xUriBinding, const css::uno::Reference< css::xml::crypto::XXMLSecurityContext >& xSecurityContext )
/****** XSecController/startMission *******************************************
*
* NAME
@@ -456,7 +452,7 @@ void XSecController::startMission(const rtl::Reference<UriBindingHelper>& xUriBi
m_bVerifyCurrentSignature = false;
}
-void XSecController::setSAXChainConnector(const cssu::Reference< cssl::XInitialization >& xInitialization)
+void XSecController::setSAXChainConnector(const css::uno::Reference< css::lang::XInitialization >& xInitialization)
/****** XSecController/setSAXChainConnector ***********************************
*
* NAME
@@ -507,8 +503,8 @@ void XSecController::endMission()
* ResolvedListener only exist when the security components are created.
*/
{
- cssu::Reference< cssxc::sax::XMissionTaker > xMissionTaker
- ( m_vInternalSignatureInformations[i].xReferenceResolvedListener, cssu::UNO_QUERY );
+ css::uno::Reference< css::xml::crypto::sax::XMissionTaker > xMissionTaker
+ ( m_vInternalSignatureInformations[i].xReferenceResolvedListener, css::uno::UNO_QUERY );
/*
* asks the SignatureCreator/SignatureVerifier to release
@@ -567,7 +563,7 @@ void writeUnsignedProperties(
}
void XSecController::exportSignature(
- const cssu::Reference<cssxs::XDocumentHandler>& xDocumentHandler,
+ const css::uno::Reference<css::xml::sax::XDocumentHandler>& xDocumentHandler,
const SignatureInformation& signatureInfo,
bool bXAdESCompliantIfODF )
/****** XSecController/exportSignature ****************************************
@@ -601,19 +597,19 @@ void XSecController::exportSignature(
signatureInfo.ouSignatureId);
}
- xDocumentHandler->startElement( "Signature", cssu::Reference< cssxs::XAttributeList > (pAttributeList));
+ xDocumentHandler->startElement( "Signature", css::uno::Reference< css::xml::sax::XAttributeList > (pAttributeList));
{
/* Write SignedInfo element */
xDocumentHandler->startElement(
"SignedInfo",
- cssu::Reference< cssxs::XAttributeList > (new SvXMLAttributeList()));
+ css::uno::Reference< css::xml::sax::XAttributeList > (new SvXMLAttributeList()));
{
/* Write CanonicalizationMethod element */
pAttributeList = new SvXMLAttributeList();
pAttributeList->AddAttribute(
"Algorithm",
ALGO_C14N);
- xDocumentHandler->startElement( "CanonicalizationMethod", cssu::Reference< cssxs::XAttributeList > (pAttributeList) );
+ xDocumentHandler->startElement( "CanonicalizationMethod", css::uno::Reference< css::xml::sax::XAttributeList > (pAttributeList) );
xDocumentHandler->endElement( "CanonicalizationMethod" );
/* Write SignatureMethod element */
@@ -627,7 +623,7 @@ void XSecController::exportSignature(
pAttributeList->AddAttribute(
"Algorithm",
getSignatureURI(signatureInfo.eAlgorithmID, vReferenceInfors[0].nDigestID));
- xDocumentHandler->startElement( "SignatureMethod", cssu::Reference< cssxs::XAttributeList > (pAttributeList) );
+ xDocumentHandler->startElement( "SignatureMethod", css::uno::Reference< css::xml::sax::XAttributeList > (pAttributeList) );
xDocumentHandler->endElement( "SignatureMethod" );
/* Write Reference element */
@@ -666,7 +662,7 @@ void XSecController::exportSignature(
}
}
- xDocumentHandler->startElement( "Reference", cssu::Reference< cssxs::XAttributeList > (pAttributeList) );
+ xDocumentHandler->startElement( "Reference", css::uno::Reference< css::xml::sax::XAttributeList > (pAttributeList) );
{
/* Write Transforms element */
if (refInfor.nType == SignatureReferenceType::XMLSTREAM)
@@ -676,7 +672,7 @@ void XSecController::exportSignature(
{
xDocumentHandler->startElement(
"Transforms",
- cssu::Reference< cssxs::XAttributeList > (new SvXMLAttributeList()));
+ css::uno::Reference< css::xml::sax::XAttributeList > (new SvXMLAttributeList()));
{
pAttributeList = new SvXMLAttributeList();
pAttributeList->AddAttribute(
@@ -684,7 +680,7 @@ void XSecController::exportSignature(
ALGO_C14N);
xDocumentHandler->startElement(
"Transform",
- cssu::Reference< cssxs::XAttributeList > (pAttributeList) );
+ css::uno::Reference< css::xml::sax::XAttributeList > (pAttributeList) );
xDocumentHandler->endElement( "Transform" );
}
xDocumentHandler->endElement( "Transforms" );
@@ -697,13 +693,13 @@ void XSecController::exportSignature(
getDigestURI(refInfor.nDigestID));
xDocumentHandler->startElement(
"DigestMethod",
- cssu::Reference< cssxs::XAttributeList > (pAttributeList) );
+ css::uno::Reference< css::xml::sax::XAttributeList > (pAttributeList) );
xDocumentHandler->endElement( "DigestMethod" );
/* Write DigestValue element */
xDocumentHandler->startElement(
"DigestValue",
- cssu::Reference< cssxs::XAttributeList > (new SvXMLAttributeList()));
+ css::uno::Reference< css::xml::sax::XAttributeList > (new SvXMLAttributeList()));
xDocumentHandler->characters( refInfor.ouDigestValue );
xDocumentHandler->endElement( "DigestValue" );
}
@@ -715,14 +711,14 @@ void XSecController::exportSignature(
/* Write SignatureValue element */
xDocumentHandler->startElement(
"SignatureValue",
- cssu::Reference< cssxs::XAttributeList > (new SvXMLAttributeList()));
+ css::uno::Reference< css::xml::sax::XAttributeList > (new SvXMLAttributeList()));
xDocumentHandler->characters( signatureInfo.ouSignatureValue );
xDocumentHandler->endElement( "SignatureValue" );
/* Write KeyInfo element */
xDocumentHandler->startElement(
"KeyInfo",
- cssu::Reference< cssxs::XAttributeList > (new SvXMLAttributeList()));
+ css::uno::Reference< css::xml::sax::XAttributeList > (new SvXMLAttributeList()));
{
// GPG or X509 key?
if (!signatureInfo.ouGpgCertificate.isEmpty())
@@ -732,12 +728,12 @@ void XSecController::exportSignature(
/* Write PGPData element */
xDocumentHandler->startElement(
"PGPData",
- cssu::Reference< cssxs::XAttributeList > (pAttributeList));
+ css::uno::Reference< css::xml::sax::XAttributeList > (pAttributeList));
{
/* Write keyid element */
xDocumentHandler->startElement(
"PGPKeyID",
- cssu::Reference< cssxs::XAttributeList > (new SvXMLAttributeList()));
+ css::uno::Reference< css::xml::sax::XAttributeList > (new SvXMLAttributeList()));
xDocumentHandler->characters( signatureInfo.ouCertDigest );
xDocumentHandler->endElement( "PGPKeyID" );
@@ -746,7 +742,7 @@ void XSecController::exportSignature(
{
xDocumentHandler->startElement(
"PGPKeyPacket",
- cssu::Reference< cssxs::XAttributeList > (new SvXMLAttributeList()));
+ css::uno::Reference< css::xml::sax::XAttributeList > (new SvXMLAttributeList()));
xDocumentHandler->characters( signatureInfo.ouGpgCertificate );
xDocumentHandler->endElement( "PGPKeyPacket" );
}
@@ -754,7 +750,7 @@ void XSecController::exportSignature(
/* Write PGPOwner element */
xDocumentHandler->startElement(
"loext:PGPOwner",
- cssu::Reference< cssxs::XAttributeList >(new SvXMLAttributeList()));
+ css::uno::Reference< css::xml::sax::XAttributeList >(new SvXMLAttributeList()));
xDocumentHandler->characters( signatureInfo.ouGpgOwner );
xDocumentHandler->endElement( "loext:PGPOwner" );
}
@@ -765,24 +761,24 @@ void XSecController::exportSignature(
/* Write X509Data element */
xDocumentHandler->startElement(
"X509Data",
- cssu::Reference< cssxs::XAttributeList > (new SvXMLAttributeList()));
+ css::uno::Reference< css::xml::sax::XAttributeList > (new SvXMLAttributeList()));
{
/* Write X509IssuerSerial element */
xDocumentHandler->startElement(
"X509IssuerSerial",
- cssu::Reference< cssxs::XAttributeList > (new SvXMLAttributeList()));
+ css::uno::Reference< css::xml::sax::XAttributeList > (new SvXMLAttributeList()));
{
/* Write X509IssuerName element */
xDocumentHandler->startElement(
"X509IssuerName",
- cssu::Reference< cssxs::XAttributeList > (new SvXMLAttributeList()));
+ css::uno::Reference< css::xml::sax::XAttributeList > (new SvXMLAttributeList()));
xDocumentHandler->characters( signatureInfo.ouX509IssuerName );
xDocumentHandler->endElement( "X509IssuerName" );
/* Write X509SerialNumber element */
xDocumentHandler->startElement(
"X509SerialNumber",
- cssu::Reference< cssxs::XAttributeList > (new SvXMLAttributeList()));
+ css::uno::Reference< css::xml::sax::XAttributeList > (new SvXMLAttributeList()));
xDocumentHandler->characters( signatureInfo.ouX509SerialNumber );
xDocumentHandler->endElement( "X509SerialNumber" );
}
@@ -793,7 +789,7 @@ void XSecController::exportSignature(
{
xDocumentHandler->startElement(
"X509Certificate",
- cssu::Reference< cssxs::XAttributeList > (new SvXMLAttributeList()));
+ css::uno::Reference< css::xml::sax::XAttributeList > (new SvXMLAttributeList()));
xDocumentHandler->characters( signatureInfo.ouX509Certificate );
xDocumentHandler->endElement( "X509Certificate" );
}
@@ -808,12 +804,12 @@ void XSecController::exportSignature(
/* Write Object element */
xDocumentHandler->startElement(
"Object",
- cssu::Reference< cssxs::XAttributeList > (new SvXMLAttributeList()));
+ css::uno::Reference< css::xml::sax::XAttributeList > (new SvXMLAttributeList()));
{
/* Write SignatureProperties element */
xDocumentHandler->startElement(
"SignatureProperties",
- cssu::Reference< cssxs::XAttributeList > (new SvXMLAttributeList()));
+ css::uno::Reference< css::xml::sax::XAttributeList > (new SvXMLAttributeList()));
{
/* Write SignatureProperty element */
pAttributeList = new SvXMLAttributeList();
@@ -825,7 +821,7 @@ void XSecController::exportSignature(
"#" + signatureInfo.ouSignatureId);
xDocumentHandler->startElement(
"SignatureProperty",
- cssu::Reference< cssxs::XAttributeList > (pAttributeList));
+ css::uno::Reference< css::xml::sax::XAttributeList > (pAttributeList));
{
/* Write timestamp element */
@@ -836,7 +832,7 @@ void XSecController::exportSignature(
xDocumentHandler->startElement(
"dc:date",
- cssu::Reference< cssxs::XAttributeList > (pAttributeList));
+ css::uno::Reference< css::xml::sax::XAttributeList > (pAttributeList));
OUStringBuffer buffer;
//If the xml signature was already contained in the document,
@@ -894,13 +890,13 @@ void XSecController::exportSignature(
pAttributeList->AddAttribute("xmlns:xd", NS_XD);
xDocumentHandler->startElement(
"Object",
- cssu::Reference< cssxs::XAttributeList > (pAttributeList));
+ css::uno::Reference< css::xml::sax::XAttributeList > (pAttributeList));
{
pAttributeList = new SvXMLAttributeList();
pAttributeList->AddAttribute("Target", "#" + signatureInfo.ouSignatureId);
xDocumentHandler->startElement(
"xd:QualifyingProperties",
- cssu::Reference< cssxs::XAttributeList > (pAttributeList));
+ css::uno::Reference< css::xml::sax::XAttributeList > (pAttributeList));
DocumentSignatureHelper::writeSignedProperties(xDocumentHandler, signatureInfo, sDate, true);
writeUnsignedProperties(xDocumentHandler, signatureInfo);
xDocumentHandler->endElement( "xd:QualifyingProperties" );
diff --git a/xmlsecurity/source/helper/xsecparser.cxx b/xmlsecurity/source/helper/xsecparser.cxx
index 82f347bff976..9f2bbe074a1b 100644
--- a/xmlsecurity/source/helper/xsecparser.cxx
+++ b/xmlsecurity/source/helper/xsecparser.cxx
@@ -25,9 +25,6 @@
#include <cppuhelper/exc_hlp.hxx>
#include <sal/log.hxx>
-namespace cssu = com::sun::star::uno;
-namespace cssxc = com::sun::star::xml::crypto;
-namespace cssxs = com::sun::star::xml::sax;
XSecParser::XSecParser(XMLSignatureHelper& rXMLSignatureHelper,
XSecController* pXSecController)
@@ -49,12 +46,12 @@ XSecParser::XSecParser(XMLSignatureHelper& rXMLSignatureHelper,
, m_bInSignatureLineInvalidImage(false)
, m_pXSecController(pXSecController)
, m_bReferenceUnresolved(false)
- , m_nReferenceDigestID(cssxc::DigestID::SHA1)
+ , m_nReferenceDigestID(css::xml::crypto::DigestID::SHA1)
, m_rXMLSignatureHelper(rXMLSignatureHelper)
{
}
-OUString XSecParser::getIdAttr(const cssu::Reference< cssxs::XAttributeList >& xAttribs )
+OUString XSecParser::getIdAttr(const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs )
{
OUString ouIdAttr = xAttribs->getValueByName("id");
@@ -98,7 +95,7 @@ void SAL_CALL XSecParser::endDocument( )
void SAL_CALL XSecParser::startElement(
const OUString& aName,
- const cssu::Reference< cssxs::XAttributeList >& xAttribs )
+ const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs )
{
try
{
@@ -158,11 +155,11 @@ void SAL_CALL XSecParser::startElement(
&& ouAlgorithm != ALGO_XMLDSIGSHA512,
"xmlsecurity.helper", "Algorithm neither SHA1, SHA256 nor SHA512");
if (ouAlgorithm == ALGO_XMLDSIGSHA1)
- m_nReferenceDigestID = cssxc::DigestID::SHA1;
+ m_nReferenceDigestID = css::xml::crypto::DigestID::SHA1;
else if (ouAlgorithm == ALGO_XMLDSIGSHA256)
- m_nReferenceDigestID = cssxc::DigestID::SHA256;
+ m_nReferenceDigestID = css::xml::crypto::DigestID::SHA256;
else if (ouAlgorithm == ALGO_XMLDSIGSHA512)
- m_nReferenceDigestID = cssxc::DigestID::SHA512;
+ m_nReferenceDigestID = css::xml::crypto::DigestID::SHA512;
else
m_nReferenceDigestID = 0;
}
@@ -285,18 +282,18 @@ void SAL_CALL XSecParser::startElement(
m_xNextHandler->startElement(aName, xAttribs);
}
}
- catch (cssu::Exception& )
+ catch (css::uno::Exception& )
{//getCaughtException MUST be the first line in the catch block
- cssu::Any exc = cppu::getCaughtException();
- throw cssxs::SAXException(
+ css::uno::Any exc = cppu::getCaughtException();
+ throw css::xml::sax::SAXException(
"xmlsecurity: Exception in XSecParser::startElement",
nullptr, exc);
}
catch (...)
{
- throw cssxs::SAXException(
+ throw css::xml::sax::SAXException(
"xmlsecurity: unexpected exception in XSecParser::startElement", nullptr,
- cssu::Any());
+ css::uno::Any());
}
}
@@ -409,18 +406,18 @@ void SAL_CALL XSecParser::endElement( const OUString& aName )
m_xNextHandler->endElement(aName);
}
}
- catch (cssu::Exception& )
+ catch (css::uno::Exception& )
{//getCaughtException MUST be the first line in the catch block
- cssu::Any exc = cppu::getCaughtException();
- throw cssxs::SAXException(
+ css::uno::Any exc = cppu::getCaughtException();
+ throw css::xml::sax::SAXException(
"xmlsecurity: Exception in XSecParser::endElement",
nullptr, exc);
}
catch (...)
{
- throw cssxs::SAXException(
+ throw css::xml::sax::SAXException(
"xmlsecurity: unexpected exception in XSecParser::endElement", nullptr,
- cssu::Any());
+ css::uno::Any());
}
}
@@ -513,7 +510,7 @@ void SAL_CALL XSecParser::processingInstruction( const OUString& aTarget, const
}
}
-void SAL_CALL XSecParser::setDocumentLocator( const cssu::Reference< cssxs::XLocator >& xLocator )
+void SAL_CALL XSecParser::setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator )
{
if (m_xNextHandler.is())
{
@@ -525,7 +522,7 @@ void SAL_CALL XSecParser::setDocumentLocator( const cssu::Reference< cssxs::XLoc
* XInitialization
*/
void SAL_CALL XSecParser::initialize(
- const cssu::Sequence< cssu::Any >& aArguments )
+ const css::uno::Sequence< css::uno::Any >& aArguments )
{
aArguments[0] >>= m_xNextHandler;
}
diff --git a/xmlsecurity/source/helper/xsecsign.cxx b/xmlsecurity/source/helper/xsecsign.cxx
index 4d1b89949feb..b9648ed64397 100644
--- a/xmlsecurity/source/helper/xsecsign.cxx
+++ b/xmlsecurity/source/helper/xsecsign.cxx
@@ -33,10 +33,6 @@ namespace com::sun::star::graphic { class XGraphic; }
using namespace css;
using namespace css::uno;
using namespace css::graphic;
-namespace cssu = com::sun::star::uno;
-namespace cssl = com::sun::star::lang;
-namespace cssxc = com::sun::star::xml::crypto;
-namespace cssxs = com::sun::star::xml::sax;
/* protected: for signature generation */
OUString XSecController::createId()
@@ -54,7 +50,7 @@ OUString XSecController::createId()
return OUString::createFromAscii(str);
}
-cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepareSignatureToWrite(
+css::uno::Reference< css::xml::crypto::sax::XReferenceResolvedListener > XSecController::prepareSignatureToWrite(
InternalSignatureInformation& internalSignatureInfor,
sal_Int32 nStorageFormat,
bool bXAdESCompliantIfODF)
@@ -65,13 +61,13 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar
sal_Int32 nIdOfSignatureElementCollector;
nIdOfSignatureElementCollector =
- m_xSAXEventKeeper->addSecurityElementCollector( cssxc::sax::ElementMarkPriority_AFTERMODIFY, true );
+ m_xSAXEventKeeper->addSecurityElementCollector( css::xml::crypto::sax::ElementMarkPriority_AFTERMODIFY, true );
m_xSAXEventKeeper->setSecurityId(nIdOfSignatureElementCollector, nSecurityId);
rtl::Reference<SignatureCreatorImpl> xSignatureCreator(new SignatureCreatorImpl);
- cssu::Sequence<cssu::Any> args(5);
+ css::uno::Sequence<css::uno::Any> args(5);
args[0] <<= OUString::number(nSecurityId);
args[1] <<= uno::Reference<xml::crypto::sax::XSecuritySAXEventKeeper>(static_cast<cppu::OWeakObject*>(m_xSAXEventKeeper.get()), uno::UNO_QUERY);
args[2] <<= OUString::number(nIdOfSignatureElementCollector);
@@ -116,7 +112,7 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar
{
const SignatureReferenceInformation& refInfor = vReferenceInfors[i];
- cssu::Reference< css::io::XInputStream > xInputStream
+ css::uno::Reference< css::io::XInputStream > xInputStream
= getObjectInputStream( refInfor.ouURI );
if (xInputStream.is())
@@ -127,7 +123,7 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar
// use sha512 for gpg signing unconditionally
const sal_Int32 digestID = !internalSignatureInfor.signatureInfor.ouGpgCertificate.isEmpty()?
- cssxc::DigestID::SHA512 : (bXAdESCompliantIfODF ? cssxc::DigestID::SHA256 : cssxc::DigestID::SHA1);
+ css::xml::crypto::DigestID::SHA512 : (bXAdESCompliantIfODF ? css::xml::crypto::DigestID::SHA256 : css::xml::crypto::DigestID::SHA1);
if (nStorageFormat != embed::StorageFormats::OFOPXML)
{
@@ -178,7 +174,7 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar
void XSecController::signAStream( sal_Int32 securityId, const OUString& uri, bool isBinary, bool bXAdESCompliantIfODF)
{
const SignatureReferenceType type = isBinary ? SignatureReferenceType::BINARYSTREAM : SignatureReferenceType::XMLSTREAM;
- sal_Int32 digestID = bXAdESCompliantIfODF ? cssxc::DigestID::SHA256 : cssxc::DigestID::SHA1;
+ sal_Int32 digestID = bXAdESCompliantIfODF ? css::xml::crypto::DigestID::SHA256 : css::xml::crypto::DigestID::SHA1;
int index = findSignatureInfor( securityId );
@@ -192,7 +188,7 @@ void XSecController::signAStream( sal_Int32 securityId, const OUString& uri, boo
{
// use sha512 for gpg signing unconditionally
if (!m_vInternalSignatureInformations[index].signatureInfor.ouGpgCertificate.isEmpty())
- digestID = cssxc::DigestID::SHA512;
+ digestID = css::xml::crypto::DigestID::SHA512;
m_vInternalSignatureInformations[index].addReference(type, digestID, uri, -1, OUString());
}
}
@@ -347,7 +343,7 @@ void XSecController::setSignatureLineInvalidGraphic(
}
bool XSecController::WriteSignature(
- const cssu::Reference<cssxs::XDocumentHandler>& xDocumentHandler,
+ const css::uno::Reference<css::xml::sax::XDocumentHandler>& xDocumentHandler,
bool bXAdESCompliantIfODF )
{
bool rc = false;
@@ -373,7 +369,7 @@ bool XSecController::WriteSignature(
/*
* export the signature template
*/
- cssu::Reference<cssxs::XDocumentHandler> xSEKHandler(static_cast<cppu::OWeakObject*>(m_xSAXEventKeeper.get()),cssu::UNO_QUERY);
+ css::uno::Reference<css::xml::sax::XDocumentHandler> xSEKHandler(static_cast<cppu::OWeakObject*>(m_xSAXEventKeeper.get()),css::uno::UNO_QUERY);
int i;
int sigNum = m_vInternalSignatureInformations.size();
@@ -394,7 +390,7 @@ bool XSecController::WriteSignature(
rc = true;
}
- catch( cssu::Exception& )
+ catch( css::uno::Exception& )
{
}
@@ -422,7 +418,7 @@ bool XSecController::WriteOOXMLSignature(const uno::Reference<embed::XStorage>&
try
{
// Export the signature template.
- cssu::Reference<xml::sax::XDocumentHandler> xSEKHandler(static_cast<cppu::OWeakObject*>(m_xSAXEventKeeper.get()), uno::UNO_QUERY);
+ css::uno::Reference<xml::sax::XDocumentHandler> xSEKHandler(static_cast<cppu::OWeakObject*>(m_xSAXEventKeeper.get()), uno::UNO_QUERY);
for (InternalSignatureInformation & rInformation : m_vInternalSignatureInformations)
{
diff --git a/xmlsecurity/source/helper/xsecverify.cxx b/xmlsecurity/source/helper/xsecverify.cxx
index c6a1539f2ac0..c826971b1c7d 100644
--- a/xmlsecurity/source/helper/xsecverify.cxx
+++ b/xmlsecurity/source/helper/xsecverify.cxx
@@ -46,13 +46,9 @@ namespace com::sun::star::graphic { class XGraphic; }
using namespace css;
using namespace css::uno;
using namespace css::beans;
-namespace cssu = com::sun::star::uno;
-namespace cssl = com::sun::star::lang;
-namespace cssxc = com::sun::star::xml::crypto;
-namespace cssxs = com::sun::star::xml::sax;
/* protected: for signature verify */
-cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepareSignatureToRead(
+css::uno::Reference< css::xml::crypto::sax::XReferenceResolvedListener > XSecController::prepareSignatureToRead(
sal_Int32 nSecurityId)
{
if ( m_eStatusOfSecurityComponents != InitializationState::INITIALIZED )
@@ -61,10 +57,10 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar
}
sal_Int32 nIdOfSignatureElementCollector;
- cssu::Reference< cssxc::sax::XReferenceResolvedListener > xReferenceResolvedListener;
+ css::uno::Reference< css::xml::crypto::sax::XReferenceResolvedListener > xReferenceResolvedListener;
nIdOfSignatureElementCollector =
- m_xSAXEventKeeper->addSecurityElementCollector( cssxc::sax::ElementMarkPriority_BEFOREMODIFY, false);
+ m_xSAXEventKeeper->addSecurityElementCollector( css::xml::crypto::sax::ElementMarkPriority_BEFOREMODIFY, false);
m_xSAXEventKeeper->setSecurityId(nIdOfSignatureElementCollector, nSecurityId);
@@ -73,9 +69,9 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar
*/
xReferenceResolvedListener = new SignatureVerifierImpl;
- cssu::Reference<cssl::XInitialization> xInitialization(xReferenceResolvedListener, cssu::UNO_QUERY);
+ css::uno::Reference<css::lang::XInitialization> xInitialization(xReferenceResolvedListener, css::uno::UNO_QUERY);
- cssu::Sequence<cssu::Any> args(5);
+ css::uno::Sequence<css::uno::Any> args(5);
args[0] <<= OUString::number(nSecurityId);
args[1] <<= uno::Reference<xml::crypto::sax::XSecuritySAXEventKeeper>(static_cast<cppu::OWeakObject*>(m_xSAXEventKeeper.get()), uno::UNO_QUERY);
args[2] <<= OUString::number(nIdOfSignatureElementCollector);
@@ -83,8 +79,8 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar
args[4] <<= m_xXMLSignature;
xInitialization->initialize(args);
- cssu::Reference< cssxc::sax::XSignatureVerifyResultBroadcaster >
- signatureVerifyResultBroadcaster(xReferenceResolvedListener, cssu::UNO_QUERY);
+ css::uno::Reference< css::xml::crypto::sax::XSignatureVerifyResultBroadcaster >
+ signatureVerifyResultBroadcaster(xReferenceResolvedListener, css::uno::UNO_QUERY);
signatureVerifyResultBroadcaster->addSignatureVerifyResultListener( this );
@@ -92,7 +88,7 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar
nIdOfSignatureElementCollector,
xReferenceResolvedListener);
- cssu::Reference<cssxc::sax::XKeyCollector> keyCollector (xReferenceResolvedListener, cssu::UNO_QUERY);
+ css::uno::Reference<css::xml::crypto::sax::XKeyCollector> keyCollector (xReferenceResolvedListener, css::uno::UNO_QUERY);
keyCollector->setKeyId(0);
return xReferenceResolvedListener;
@@ -100,7 +96,7 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar
void XSecController::addSignature()
{
- cssu::Reference< cssxc::sax::XReferenceResolvedListener > xReferenceResolvedListener;
+ css::uno::Reference< css::xml::crypto::sax::XReferenceResolvedListener > xReferenceResolvedListener;
sal_Int32 nSignatureId = 0;
@@ -177,13 +173,13 @@ void XSecController::addStreamReference(
/*
* get the input stream
*/
- cssu::Reference< css::io::XInputStream > xObjectInputStream
+ css::uno::Reference< css::io::XInputStream > xObjectInputStream
= getObjectInputStream( ouUri );
if ( xObjectInputStream.is() )
{
- cssu::Reference<cssxc::XUriBinding> xUriBinding
- (isi.xReferenceResolvedListener, cssu::UNO_QUERY);
+ css::uno::Reference<css::xml::crypto::XUriBinding> xUriBinding
+ (isi.xReferenceResolvedListener, css::uno::UNO_QUERY);
xUriBinding->setUriBinding(ouUri, xObjectInputStream);
}
}
@@ -219,8 +215,8 @@ void XSecController::setReferenceCount() const
}
}
- cssu::Reference<cssxc::sax::XReferenceCollector> xReferenceCollector
- (isi.xReferenceResolvedListener, cssu::UNO_QUERY);
+ css::uno::Reference<css::xml::crypto::sax::XReferenceCollector> xReferenceCollector
+ (isi.xReferenceResolvedListener, css::uno::UNO_QUERY);
xReferenceCollector->setReferenceCount( referenceCount );
}
}
@@ -465,7 +461,7 @@ void XSecController::collectToVerify( const OUString& referenceId )
*/
{
bool bJustChainingOn = false;
- cssu::Reference< cssxs::XDocumentHandler > xHandler;
+ css::uno::Reference< css::xml::sax::XDocumentHandler > xHandler;
int i,j;
int sigNum = m_vInternalSignatureInformations.size();
@@ -489,10 +485,10 @@ void XSecController::collectToVerify( const OUString& referenceId )
}
sal_Int32 nKeeperId = m_xSAXEventKeeper->addSecurityElementCollector(
- cssxc::sax::ElementMarkPriority_BEFOREMODIFY, false );
+ css::xml::crypto::sax::ElementMarkPriority_BEFOREMODIFY, false );
- cssu::Reference<cssxc::sax::XReferenceCollector> xReferenceCollector
- ( isi.xReferenceResolvedListener, cssu::UNO_QUERY );
+ css::uno::Reference<css::xml::crypto::sax::XReferenceCollector> xReferenceCollector
+ ( isi.xReferenceResolvedListener, css::uno::UNO_QUERY );
m_xSAXEventKeeper->setSecurityId(nKeeperId, isi.signatureInfor.nSecurityId);
m_xSAXEventKeeper->addReferenceResolvedListener( nKeeperId, isi.xReferenceResolvedListener);
@@ -519,13 +515,13 @@ void XSecController::addSignature( sal_Int32 nSignatureId )
m_bVerifyCurrentSignature = true;
}
-cssu::Reference< cssxs::XDocumentHandler > const & XSecController::createSignatureReader(XMLSignatureHelper& rXMLSignatureHelper, sal_Int32 nType)
+css::uno::Reference< css::xml::sax::XDocumentHandler > const & XSecController::createSignatureReader(XMLSignatureHelper& rXMLSignatureHelper, sal_Int32 nType)
{
if (nType == embed::StorageFormats::OFOPXML)
m_xSecParser = new OOXMLSecParser(rXMLSignatureHelper, this);
else
m_xSecParser = new XSecParser(rXMLSignatureHelper, this);
- cssu::Reference< cssl::XInitialization > xInitialization(m_xSecParser, uno::UNO_QUERY);
+ css::uno::Reference< css::lang::XInitialization > xInitialization(m_xSecParser, uno::UNO_QUERY);
setSAXChainConnector(xInitialization);
diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
index 22ad88f24fc5..3e59efa48e0d 100644
--- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
@@ -28,8 +28,6 @@
#include <cert.h>
-namespace cssxc = css::xml::crypto;
-
using namespace com::sun::star;
@@ -43,7 +41,7 @@ SEInitializer_NssImpl::~SEInitializer_NssImpl()
}
/* XSEInitializer */
-uno::Reference< cssxc::XXMLSecurityContext > SAL_CALL
+uno::Reference< css::xml::crypto::XXMLSecurityContext > SAL_CALL
SEInitializer_NssImpl::createSecurityContext( const OUString& )
{
CERTCertDBHandle *pCertHandle = nullptr ;
@@ -56,9 +54,9 @@ uno::Reference< cssxc::XXMLSecurityContext > SAL_CALL
try
{
/* Build XML Security Context */
- uno::Reference< cssxc::XXMLSecurityContext > xSecCtx = cssxc::XMLSecurityContext::create( m_xContext );
+ uno::Reference< css::xml::crypto::XXMLSecurityContext > xSecCtx = css::xml::crypto::XMLSecurityContext::create( m_xContext );
- uno::Reference< cssxc::XSecurityEnvironment > xSecEnv = cssxc::SecurityEnvironment::create( m_xContext );
+ uno::Reference< css::xml::crypto::XSecurityEnvironment > xSecEnv = css::xml::crypto::SecurityEnvironment::create( m_xContext );
uno::Reference< lang::XUnoTunnel > xSecEnvTunnel(xSecEnv, uno::UNO_QUERY_THROW);
SecurityEnvironment_NssImpl* pSecEnv = reinterpret_cast<SecurityEnvironment_NssImpl*>(
sal::static_int_cast<sal_uIntPtr>(
@@ -78,7 +76,7 @@ uno::Reference< cssxc::XXMLSecurityContext > SAL_CALL
}
}
-void SAL_CALL SEInitializer_NssImpl::freeSecurityContext( const uno::Reference< cssxc::XXMLSecurityContext >& )
+void SAL_CALL SEInitializer_NssImpl::freeSecurityContext( const uno::Reference< css::xml::crypto::XXMLSecurityContext >& )
{
/*
* because the security context will free all its content when it
diff --git a/xmlsecurity/source/xmlsec/saxhelper.cxx b/xmlsecurity/source/xmlsec/saxhelper.cxx
index 1410eb5b0874..f34766666cd1 100644
--- a/xmlsecurity/source/xmlsec/saxhelper.cxx
+++ b/xmlsecurity/source/xmlsec/saxhelper.cxx
@@ -30,9 +30,6 @@
#include "libxslt/xslt.h"
#endif
-namespace cssu = com::sun::star::uno;
-namespace cssxcsax = com::sun::star::xml::csax;
-
/**
* The return value is NULL terminated. The application has the responsibility to
* deallocate the return value.
@@ -59,7 +56,7 @@ static xmlChar* ous_to_nxmlstr( const OUString& oustr, int& length )
* The return value and the referenced value must be NULL terminated.
* The application has the responsibility to deallocate the return value.
*/
-static const xmlChar** attrlist_to_nxmlstr( const cssu::Sequence< cssxcsax::XMLAttribute >& aAttributes )
+static const xmlChar** attrlist_to_nxmlstr( const css::uno::Sequence< css::xml::csax::XMLAttribute >& aAttributes )
{
xmlChar* attname = nullptr ;
xmlChar* attvalue = nullptr ;
@@ -132,7 +129,7 @@ SAXHelper::SAXHelper( )
// in other parts of the office.
// xmlCleanupParser() ;
// and neither can we call xsltCleanupGlobals()
- throw cssu::RuntimeException() ;
+ throw css::uno::RuntimeException() ;
}
xmlSAXVersion(m_pParserCtxt->sax, 1);
@@ -151,7 +148,7 @@ SAXHelper::SAXHelper( )
// xmlCleanupParser() ;
// and neither can we call xsltCleanupGlobals()
m_pParserCtxt = nullptr ;
- throw cssu::RuntimeException() ;
+ throw css::uno::RuntimeException() ;
}
else
{
@@ -218,7 +215,7 @@ void SAXHelper::startDocument()
{
if( m_pParserCtxt == nullptr)
{
- throw cssu::RuntimeException() ;
+ throw css::uno::RuntimeException() ;
}
/*
* Adjust inputTab
@@ -235,7 +232,7 @@ void SAXHelper::startDocument()
if( m_pParserCtxt->myDoc == nullptr )
{
- throw cssu::RuntimeException() ;
+ throw css::uno::RuntimeException() ;
}
}
@@ -252,7 +249,7 @@ void SAXHelper::endDocument()
*/
void SAXHelper::startElement(
const OUString& aName,
- const cssu::Sequence< cssxcsax::XMLAttribute >& aAttributes )
+ const css::uno::Sequence< css::xml::csax::XMLAttribute >& aAttributes )
{
const xmlChar* fullName = nullptr ;
const xmlChar** attrs = nullptr ;
diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
index 2f01b464471d..2d98e44d0908 100644
--- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
+++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
@@ -33,11 +33,6 @@
#endif
using namespace com::sun::star;
-namespace cssl = com::sun::star::lang;
-namespace cssxc = com::sun::star::xml::crypto;
-namespace cssxcsax = com::sun::star::xml::csax;
-namespace cssxs = com::sun::star::xml::sax;
-namespace cssxw = com::sun::star::xml::wrapper;
#define STRXMLNS "xmlns"
@@ -58,7 +53,7 @@ XMLDocumentWrapper_XmlSecImpl::XMLDocumentWrapper_XmlSecImpl()
/*
* creates the virtual root element
*/
- saxHelper.startElement("root", uno::Sequence<cssxcsax::XMLAttribute>());
+ saxHelper.startElement("root", uno::Sequence<css::xml::csax::XMLAttribute>());
m_pRootElement = saxHelper.getCurrentNode();
m_pCurrentElement = m_pRootElement;
@@ -156,8 +151,8 @@ void XMLDocumentWrapper_XmlSecImpl::getNextSAXEvent()
}
void XMLDocumentWrapper_XmlSecImpl::sendStartElement(
- const uno::Reference< cssxs::XDocumentHandler >& xHandler,
- const uno::Reference< cssxs::XDocumentHandler >& xHandler2,
+ const uno::Reference< css::xml::sax::XDocumentHandler >& xHandler,
+ const uno::Reference< css::xml::sax::XDocumentHandler >& xHandler2,
const xmlNodePtr pNode)
/****** XMLDocumentWrapper_XmlSecImpl/sendStartElement ************************
*
@@ -179,7 +174,7 @@ void XMLDocumentWrapper_XmlSecImpl::sendStartElement(
******************************************************************************/
{
SvXMLAttributeList* pAttributeList = new SvXMLAttributeList();
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list