fixincludeguards.sh: uno*

Change-Id: I8fb3c25cd583b688104a0ee8620696e7b2958ab5

unodevtools/inc/unodevtools/options.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_UNODEVTOOLS_OPTIONS_HXX
-#define INCLUDED_UNODEVTOOLS_OPTIONS_HXX
+#ifndef INCLUDED_UNODEVTOOLS_INC_UNODEVTOOLS_OPTIONS_HXX
+#define INCLUDED_UNODEVTOOLS_INC_UNODEVTOOLS_OPTIONS_HXX
 
 #include "sal/config.h"
 
@@ -37,6 +37,6 @@ sal_Bool readOption( sal_Bool * pbOpt, const sal_Char * pOpt,
 
 } // end of namespace unodevtools
 
-#endif // INCLUDED_UNODEVTOOLS_OPTIONS_HXX
+#endif // INCLUDED_UNODEVTOOLS_INC_UNODEVTOOLS_OPTIONS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

unodevtools/source/skeletonmaker/skeletonjava.hxx

@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_UNODEVTOOLS_SKELETONJAVA_HXX
-#define INCLUDED_UNODEVTOOLS_SKELETONJAVA_HXX
+#ifndef INCLUDED_UNODEVTOOLS_SOURCE_SKELETONMAKER_SKELETONJAVA_HXX
+#define INCLUDED_UNODEVTOOLS_SOURCE_SKELETONMAKER_SKELETONJAVA_HXX
 
 #include <fstream>
 
@@ -50,6 +50,6 @@ void generateSkeleton(ProgramOptions const & options, rtl::Reference< TypeManage
 
 } }
 
-#endif // INCLUDED_UNODEVTOOLS_SKELETONJAVA_HXX
+#endif // INCLUDED_UNODEVTOOLS_SOURCE_SKELETONMAKER_SKELETONJAVA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

unoidl/source/legacyprovider.hxx

@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_UNOIDL_LEGACYPROVIDER_HXX
-#define INCLUDED_UNOIDL_LEGACYPROVIDER_HXX
+#ifndef INCLUDED_UNOIDL_SOURCE_LEGACYPROVIDER_HXX
+#define INCLUDED_UNOIDL_SOURCE_LEGACYPROVIDER_HXX
 
 #include "sal/config.h"
 

unoidl/source/sourcefileprovider.hxx

@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_UNOIDL_SOURCEFILEPROVIDER_HXX
-#define INCLUDED_UNOIDL_SOURCEFILEPROVIDER_HXX
+#ifndef INCLUDED_UNOIDL_SOURCE_SOURCEFILEPROVIDER_HXX
+#define INCLUDED_UNOIDL_SOURCE_SOURCEFILEPROVIDER_HXX
 
 #include "sal/config.h"
 

unoidl/source/sourcetreeprovider.hxx

@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_UNOIDL_SOURCETREEPROVIDER_HXX
-#define INCLUDED_UNOIDL_SOURCETREEPROVIDER_HXX
+#ifndef INCLUDED_UNOIDL_SOURCE_SOURCETREEPROVIDER_HXX
+#define INCLUDED_UNOIDL_SOURCE_SOURCETREEPROVIDER_HXX
 
 #include "sal/config.h"
 

unoidl/source/unoidlprovider.hxx

@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_UNOIDL_UNOIDLPROVIDER_HXX
-#define INCLUDED_UNOIDL_UNOIDLPROVIDER_HXX
+#ifndef INCLUDED_UNOIDL_SOURCE_UNOIDLPROVIDER_HXX
+#define INCLUDED_UNOIDL_SOURCE_UNOIDLPROVIDER_HXX
 
 #include "sal/config.h"
 

unotest/source/cpp/getargument.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_TEST_SOURCE_CPP_GETARGUMENT_HXX
-#define INCLUDED_TEST_SOURCE_CPP_GETARGUMENT_HXX
+#ifndef INCLUDED_UNOTEST_SOURCE_CPP_GETARGUMENT_HXX
+#define INCLUDED_UNOTEST_SOURCE_CPP_GETARGUMENT_HXX
 
 #include "sal/config.h"
 

unoxml/source/dom/attr.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_ATTR_HXX
-#define DOM_ATTR_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_ATTR_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_ATTR_HXX
 
 #include <memory>
 

unoxml/source/dom/attributesmap.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_ATTRIBUTESMAP_HXX
-#define DOM_ATTRIBUTESMAP_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_ATTRIBUTESMAP_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_ATTRIBUTESMAP_HXX
 
 #include <sal/types.h>
 #include <rtl/ref.hxx>

unoxml/source/dom/cdatasection.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_CDATASECTION_HXX
-#define DOM_CDATASECTION_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_CDATASECTION_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_CDATASECTION_HXX
 
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/xml/dom/XCDATASection.hpp>

unoxml/source/dom/characterdata.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_CHARACTERDATA_HXX
-#define DOM_CHARACTERDATA_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_CHARACTERDATA_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_CHARACTERDATA_HXX
 
 #include <libxml/tree.h>
 

unoxml/source/dom/childlist.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_CHILDLIST_HXX
-#define DOM_CHILDLIST_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_CHILDLIST_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_CHILDLIST_HXX
 
 #include <sal/types.h>
 #include <rtl/ref.hxx>

unoxml/source/dom/comment.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_COMMENT_HXX
-#define DOM_COMMENT_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_COMMENT_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_COMMENT_HXX
 
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/xml/dom/XComment.hpp>

unoxml/source/dom/document.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_DOCUMENT_HXX
-#define DOM_DOCUMENT_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_DOCUMENT_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_DOCUMENT_HXX
 
 #include <set>
 #include <memory>

unoxml/source/dom/documentbuilder.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_DOCUMENTBUILDER_HXX
-#define DOM_DOCUMENTBUILDER_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_DOCUMENTBUILDER_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_DOCUMENTBUILDER_HXX
 
 #include <sal/types.h>
 

unoxml/source/dom/documentfragment.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_DOCUMENTFRAGMENT_HXX
-#define DOM_DOCUMENTFRAGMENT_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_DOCUMENTFRAGMENT_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_DOCUMENTFRAGMENT_HXX
 
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/xml/dom/XDocumentFragment.hpp>

unoxml/source/dom/documenttype.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_DOCUMENTTYPE_HXX
-#define DOM_DOCUMENTTYPE_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_DOCUMENTTYPE_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_DOCUMENTTYPE_HXX
 
 #include <libxml/tree.h>
 

unoxml/source/dom/domimplementation.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_DOMIMPLEMENTATION_HXX
-#define DOM_DOMIMPLEMENTATION_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_DOMIMPLEMENTATION_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_DOMIMPLEMENTATION_HXX
 
 #include <sal/types.h>
 

unoxml/source/dom/element.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_ELEMENT_HXX
-#define DOM_ELEMENT_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_ELEMENT_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_ELEMENT_HXX
 
 #include <libxml/tree.h>
 

unoxml/source/dom/elementlist.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_ELEMENTLIST_HXX
-#define DOM_ELEMENTLIST_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_ELEMENTLIST_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_ELEMENTLIST_HXX
 
 #include <vector>
 

unoxml/source/dom/entitiesmap.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_ENTITIESMAP_HXX
-#define DOM_ENTITIESMAP_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_ENTITIESMAP_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_ENTITIESMAP_HXX
 
 #include <sal/types.h>
 #include <rtl/ref.hxx>

unoxml/source/dom/entity.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_ENTITY_HXX
-#define DOM_ENTITY_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_ENTITY_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_ENTITY_HXX
 
 #include <libxml/tree.h>
 #include <libxml/entities.h>

unoxml/source/dom/entityreference.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_ENTITYREFERENCE_HXX
-#define DOM_ENTITYREFERENCE_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_ENTITYREFERENCE_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_ENTITYREFERENCE_HXX
 
 #include <libxml/tree.h>
 

unoxml/source/dom/node.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_NODE_HXX
-#define DOM_NODE_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_NODE_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_NODE_HXX
 
 #include <libxml/tree.h>
 

unoxml/source/dom/notation.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_NOTATION_HXX
-#define DOM_NOTATION_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_NOTATION_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_NOTATION_HXX
 
 #include <libxml/tree.h>
 

unoxml/source/dom/notationsmap.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_NOTATIONSMAP_HXX
-#define DOM_NOTATIONSMAP_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_NOTATIONSMAP_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_NOTATIONSMAP_HXX
 
 #include <sal/types.h>
 #include <rtl/ref.hxx>

unoxml/source/dom/processinginstruction.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_PROCESSINGINSTRUCTION_HXX
-#define DOM_PROCESSINGINSTRUCTION_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_PROCESSINGINSTRUCTION_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_PROCESSINGINSTRUCTION_HXX
 
 #include <libxml/tree.h>
 

unoxml/source/dom/saxbuilder.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_SAXBUILDER_HXX
-#define DOM_SAXBUILDER_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_SAXBUILDER_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_SAXBUILDER_HXX
 
 #include <stack>
 #include <map>

unoxml/source/dom/text.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOM_TEXT_HXX
-#define DOM_TEXT_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_DOM_TEXT_HXX
+#define INCLUDED_UNOXML_SOURCE_DOM_TEXT_HXX
 
 #include <libxml/tree.h>
 

unoxml/source/events/event.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EVENT_EVENT_HXX
-#define EVENT_EVENT_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_EVENTS_EVENT_HXX
+#define INCLUDED_UNOXML_SOURCE_EVENTS_EVENT_HXX
 
 #include <sal/types.h>
 

unoxml/source/events/eventdispatcher.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EVENT_EVENT_DISPATCHER_HXX
-#define EVENT_EVENT_DISPATCHER_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_EVENTS_EVENTDISPATCHER_HXX
+#define INCLUDED_UNOXML_SOURCE_EVENTS_EVENTDISPATCHER_HXX
 
 #include <map>
 #include <vector>

unoxml/source/events/mouseevent.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EVENT_MOUSEEVENT_HXX
-#define EVENT_MOUSEEVENT_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_EVENTS_MOUSEEVENT_HXX
+#define INCLUDED_UNOXML_SOURCE_EVENTS_MOUSEEVENT_HXX
 
 #include <com/sun/star/xml/dom/events/PhaseType.hpp>
 #include <com/sun/star/xml/dom/events/XMouseEvent.hpp>

unoxml/source/events/mutationevent.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EVENT_MUTATIONEVENT_HXX
-#define EVENT_MUTATIONEVENT_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_EVENTS_MUTATIONEVENT_HXX
+#define INCLUDED_UNOXML_SOURCE_EVENTS_MUTATIONEVENT_HXX
 
 #include <sal/types.h>
 

unoxml/source/events/testlistener.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EVENT_TESTLISTENER_HXX
-#define EVENT_TESTLISTENER_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_EVENTS_TESTLISTENER_HXX
+#define INCLUDED_UNOXML_SOURCE_EVENTS_TESTLISTENER_HXX
 
 #include <sal/types.h>
 

unoxml/source/events/uievent.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EVENT_UIEVENT_HXX
-#define EVENT_UIEVENT_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_EVENTS_UIEVENT_HXX
+#define INCLUDED_UNOXML_SOURCE_EVENTS_UIEVENT_HXX
 
 #include <sal/types.h>
 

unoxml/source/rdf/CNodes.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CNODES_HXX
-#define _CNODES_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_RDF_CNODES_HXX
+#define INCLUDED_UNOXML_SOURCE_RDF_CNODES_HXX
 
 #include <sal/config.h>
 #include <cppuhelper/factory.hxx>

unoxml/source/rdf/librdf_repository.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _LIBRDF_REPOSITORY_HXX
-#define _LIBRDF_REPOSITORY_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_RDF_LIBRDF_REPOSITORY_HXX
+#define INCLUDED_UNOXML_SOURCE_RDF_LIBRDF_REPOSITORY_HXX
 
 #include <sal/config.h>
 #include <cppuhelper/factory.hxx>

unoxml/source/xpath/nodelist.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef XPATH_NODELIST_HXX
-#define XPATH_NODELIST_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_XPATH_NODELIST_HXX
+#define INCLUDED_UNOXML_SOURCE_XPATH_NODELIST_HXX
 
 #include <sal/types.h>
 #include <rtl/ref.hxx>

unoxml/source/xpath/xpathapi.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef XPATH_XPATHAPI_HXX
-#define XPATH_XPATHAPI_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_XPATH_XPATHAPI_HXX
+#define INCLUDED_UNOXML_SOURCE_XPATH_XPATHAPI_HXX
 
 #include <map>
 #include <vector>

unoxml/source/xpath/xpathobject.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef XPATH_XPATHOBJECT_HXX
-#define XPATH_XPATHOBJECT_HXX
+#ifndef INCLUDED_UNOXML_SOURCE_XPATH_XPATHOBJECT_HXX
+#define INCLUDED_UNOXML_SOURCE_XPATH_XPATHOBJECT_HXX
 
 #include <boost/shared_ptr.hpp>