rebase XSecuritySAXEventKeeper

Change-Id: I7ca3461ece4a18cdc9642ba02d18d53a7fdbc576

3 files changed, 45 insertions, 118 deletions

diff --git a/offapi/com/sun/star/xml/crypto/sax/ElementMarkPriority.idl b/offapi/com/sun/star/xml/crypto/sax/ElementMarkPriority.idl
deleted file mode 100644
index 8c13371eee15..000000000000
--- a/offapi/com/sun/star/xml/crypto/sax/ElementMarkPriority.idl
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- 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 .
- */
-
-//i20156 - new file for xmlsecurity module
-
-/** -- idl definition -- **/
-
-#ifndef __com_sun_star_xml_crypto_sax_elementmarkpriority_idl_
-#define __com_sun_star_xml_crypto_sax_elementmarkpriority_idl_
-
-module com { module sun { module star { module xml { module crypto { module sax {
-
-/**
- * Defines priority for the element mark's notification.
- * <p>
- * The PRI_MINIMUM priority is a value less than any practical
- * priority value, it is used when compare between different
- * priority values.
- * <p>
- * The PRI_AFTERMODIFY priority represents the notification will be
- * sent after any internal modification has finished.
- * <p>
- * The PRI_BEFOREMODIFY proirity represents the notification will be
- * sent before any internal modification happens.
- * <p>
- * So an element mark with PRI_BEFOREMODIFY will be handled first,
- * and one with PRI_AFTERMODIFY will be handled at last.
- */
-enum ElementMarkPriority
-{
-    MINIMUM = 1,
-    AFTERMODIFY,
-    BEFOREMODIFY
-};
-
-} ; } ; } ; } ; } ; } ;
-
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/xml/crypto/sax/ElementMarkType.idl b/offapi/com/sun/star/xml/crypto/sax/ElementMarkType.idl
deleted file mode 100644
index 7ae935ca413c..000000000000
--- a/offapi/com/sun/star/xml/crypto/sax/ElementMarkType.idl
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-//i20156 - new file for xmlsecurity module
-
-/** -- idl definition -- **/
-
-#ifndef __com_sun_star_xml_crypto_sax_elementmarktype_idl_
-#define __com_sun_star_xml_crypto_sax_elementmarktype_idl_
-
-module com { module sun { module star { module xml { module crypto { module sax {
-
-/**
- * Defines types of element mark.
- * <p>
- * the TYPEOFELEMENTMARK type represents a blocker, and the TYPEOFELEMENTCOLLECTOR
- * type represents a element collector.
- */
-enum ElementMarkType
-{
-    ELEMENTMARK = 1,
-    ELEMENTCOLLECTOR
-};
-
-
-} ; } ; } ; } ; } ; } ;
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl b/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl
index 855397d4e068..493eabfc3d86 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -17,7 +16,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-//i20156 - new file for XML security module
+
+//i20156 - new file for xmlsecurity module
 
 /** -- idl definition -- **/
 
@@ -27,13 +27,53 @@
 #include <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/uno/Exception.idl>
 #include <com/sun/star/xml/crypto/sax/XSAXEventKeeper.idl>
-#include <com/sun/star/xml/crypto/sax/ConstOfSecurityId.idl>
-#include <com/sun/star/xml/crypto/sax/ElementMarkPriority.idl>
-#include <com/sun/star/xml/crypto/sax/ElementMarkType.idl>
 
 module com { module sun { module star { module xml { module crypto { module sax {
 
 /**
+ * Represents the undefined security id
+ */
+constants ConstOfSecurityId
+{
+    const long UNDEFINEDSECURITYID = -1;
+};
+
+/**
+ * Defines priority for the element mark's notification.
+ * <p>
+ * The PRI_MINIMUM priority is a value less than any practical
+ * priority value, it is used when compare between different
+ * priority values.
+ * <p>
+ * The PRI_AFTERMODIFY priority represents the notification will be
+ * sent after any internal modification has finished.
+ * <p>
+ * The PRI_BEFOREMODIFY proirity represents the notification will be
+ * sent before any internal modification happens.
+ * <p>
+ * So an element mark with PRI_BEFOREMODIFY will be handled first,
+ * and one with PRI_AFTERMODIFY will be handled at last.
+ */
+enum ElementMarkPriority
+{
+    MINIMUM = 1,
+    AFTERMODIFY,
+    BEFOREMODIFY
+};
+
+/**
+ * Defines types of element mark.
+ * <p>
+ * the TYPEOFELEMENTMARK type represents a blocker, and the TYPEOFELEMENTCOLLECTOR
+ * type represents a element collector.
+ */
+enum ElementMarkType
+{
+    ELEMENTMARK = 1,
+    ELEMENTCOLLECTOR
+};
+
+/**
  * Interface of Security SAX Event Keeper.
  * <p>
  * This interface is an extension of the XSAXEventKeeper interface,
@@ -83,4 +123,3 @@ interface XSecuritySAXEventKeeper : XSAXEventKeeper
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */