From ac893720de5b0815d57b87ae5f9a08764df08a93 Mon Sep 17 00:00:00 2001
From: Luboš Luňák <l.lunak@suse.cz>
Date: Mon, 2 Jul 2012 13:58:52 +0200
Subject: PCH for xmloff, including LO headers

Change-Id: I50e8eb58ef9b764cfb847b36b4e42f95bc437233
---
 xmloff/inc/pch/precompiled_xmloff.hxx              | 1235 +++++++++++++++++++-
 xmloff/source/draw/sdxmlexp.cxx                    |    2 +-
 xmloff/source/draw/ximppage.cxx                    |    2 +-
 xmloff/source/forms/attriblistmerge.cxx            |   18 +-
 xmloff/source/forms/formenums.cxx                  |    7 +-
 xmloff/source/forms/formlayerimport.cxx            |    4 +-
 xmloff/source/forms/gridcolumnproptranslator.cxx   |   13 +-
 xmloff/source/forms/layerimport.cxx                |    4 +-
 xmloff/source/style/XMLFontStylesContext.cxx       |    4 +-
 xmloff/source/style/cdouthdl.cxx                   |   88 +-
 xmloff/source/style/undlihdl.cxx                   |  212 ++--
 .../source/text/XMLChangedRegionImportContext.cxx  |    4 +-
 xmloff/source/text/XMLRedlineExport.cxx            |    2 +-
 xmloff/source/text/txtexppr.cxx                    |    6 +-
 xmloff/source/text/txtflde.cxx                     |   18 +-
 xmloff/source/text/txtfldi.cxx                     |    2 +-
 xmloff/source/text/txtimp.cxx                      |    4 +-
 xmloff/source/xforms/SchemaRestrictionContext.cxx  |    7 +-
 xmloff/source/xforms/xformsexport.cxx              |   15 +-
 19 files changed, 1440 insertions(+), 207 deletions(-)

(limited to 'xmloff')

diff --git a/xmloff/inc/pch/precompiled_xmloff.hxx b/xmloff/inc/pch/precompiled_xmloff.hxx
index 66bd46e7d610..d56bd07ea710 100644
--- a/xmloff/inc/pch/precompiled_xmloff.hxx
+++ b/xmloff/inc/pch/precompiled_xmloff.hxx
@@ -1,10 +1,19 @@
-/* -*- 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 .
  */
 
 #ifdef PRECOMPILED_HEADERS
@@ -40,6 +49,1230 @@
 #include <boost/scoped_array.hpp>
 #include <boost/type.hpp>
 
+
+//---MARKER---
+#include "sal/config.h"
+#include "sal/types.h"
+
+#include "com/sun/star/animations/AnimationAdditiveMode.hpp"
+#include "com/sun/star/animations/AnimationCalcMode.hpp"
+#include "com/sun/star/animations/AnimationColorSpace.hpp"
+#include "com/sun/star/animations/AnimationEndSync.hpp"
+#include "com/sun/star/animations/AnimationFill.hpp"
+#include "com/sun/star/animations/AnimationNodeType.hpp"
+#include "com/sun/star/animations/AnimationRestart.hpp"
+#include "com/sun/star/animations/AnimationTransformType.hpp"
+#include "com/sun/star/animations/Event.hpp"
+#include "com/sun/star/animations/EventTrigger.hpp"
+#include "com/sun/star/animations/Timing.hpp"
+#include "com/sun/star/animations/TransitionSubType.hpp"
+#include "com/sun/star/animations/TransitionType.hpp"
+#include "com/sun/star/animations/ValuePair.hpp"
+#include "com/sun/star/animations/XAnimateColor.hpp"
+#include "com/sun/star/animations/XAnimateMotion.hpp"
+#include "com/sun/star/animations/XAnimateSet.hpp"
+#include "com/sun/star/animations/XAnimateTransform.hpp"
+#include "com/sun/star/animations/XAnimationNode.hpp"
+#include "com/sun/star/animations/XAnimationNodeSupplier.hpp"
+#include "com/sun/star/animations/XAudio.hpp"
+#include "com/sun/star/animations/XCommand.hpp"
+#include "com/sun/star/animations/XIterateContainer.hpp"
+#include "com/sun/star/animations/XTransitionFilter.hpp"
+#include "com/sun/star/awt/FontDescriptor.hpp"
+#include "com/sun/star/awt/FontEmphasisMark.hpp"
+#include "com/sun/star/awt/FontFamily.hpp"
+#include "com/sun/star/awt/FontPitch.hpp"
+#include "com/sun/star/awt/FontRelief.hpp"
+#include "com/sun/star/awt/FontSlant.hpp"
+#include "com/sun/star/awt/FontStrikeout.hpp"
+#include "com/sun/star/awt/FontUnderline.hpp"
+#include "com/sun/star/awt/FontWidth.hpp"
+#include "com/sun/star/awt/Gradient.hpp"
+#include "com/sun/star/awt/ImagePosition.hpp"
+#include "com/sun/star/awt/Point.hpp"
+#include "com/sun/star/awt/Rectangle.hdl"
+#include "com/sun/star/awt/Rectangle.hpp"
+#include "com/sun/star/awt/ScrollBarOrientation.hpp"
+#include "com/sun/star/awt/Size.hpp"
+#include "com/sun/star/awt/TextAlign.hpp"
+#include "com/sun/star/awt/VisualEffect.hpp"
+#include "com/sun/star/awt/XBitmap.hpp"
+#include "com/sun/star/awt/XControlModel.hpp"
+#include "com/sun/star/beans/NamedValue.hpp"
+#include "com/sun/star/beans/PropertyAttribute.hpp"
+#include "com/sun/star/beans/PropertyState.hpp"
+#include "com/sun/star/beans/PropertyValue.hpp"
+#include "com/sun/star/beans/PropertyValues.hpp"
+#include "com/sun/star/beans/PropertyVetoException.hpp"
+#include "com/sun/star/beans/TolerantPropertySetResultType.hpp"
+#include "com/sun/star/beans/UnknownPropertyException.hpp"
+#include "com/sun/star/beans/XMultiPropertySet.hpp"
+#include "com/sun/star/beans/XMultiPropertyStates.hpp"
+#include "com/sun/star/beans/XPropertyContainer.hpp"
+#include "com/sun/star/beans/XPropertySet.hpp"
+#include "com/sun/star/beans/XPropertySetInfo.hpp"
+#include "com/sun/star/beans/XPropertyState.hpp"
+#include "com/sun/star/beans/XTolerantMultiPropertySet.hpp"
+#include "com/sun/star/chart/ChartAxisArrangeOrderType.hpp"
+#include "com/sun/star/chart/ChartAxisAssign.hpp"
+#include "com/sun/star/chart/ChartAxisMarks.hpp"
+#include "com/sun/star/chart/ChartDataCaption.hpp"
+#include "com/sun/star/chart/ChartDataRowSource.hpp"
+#include "com/sun/star/chart/ChartErrorCategory.hpp"
+#include "com/sun/star/chart/ChartErrorIndicatorType.hpp"
+#include "com/sun/star/chart/ChartLegendPosition.hpp"
+#include "com/sun/star/chart/ChartRegressionCurveType.hpp"
+#include "com/sun/star/chart/ChartSeriesAddress.hpp"
+#include "com/sun/star/chart/ChartSolidType.hpp"
+#include "com/sun/star/chart/ChartSymbolType.hpp"
+#include "com/sun/star/chart/X3DDisplay.hpp"
+#include "com/sun/star/chart/XAxisZSupplier.hpp"
+#include "com/sun/star/chart/XChartDataArray.hpp"
+#include "com/sun/star/chart/XChartDocument.hpp"
+#include "com/sun/star/chart/XDiagram.hpp"
+#include "com/sun/star/chart/XSecondAxisTitleSupplier.hpp"
+#include "com/sun/star/chart/XStatisticDisplay.hpp"
+#include "com/sun/star/chart/XTwoAxisXSupplier.hpp"
+#include "com/sun/star/chart/XTwoAxisYSupplier.hpp"
+#include "com/sun/star/container/XChild.hpp"
+#include "com/sun/star/container/XContentEnumerationAccess.hpp"
+#include "com/sun/star/container/XEnumeration.hpp"
+#include "com/sun/star/container/XEnumerationAccess.hpp"
+#include "com/sun/star/container/XIdentifierAccess.hpp"
+#include "com/sun/star/container/XIdentifierContainer.hpp"
+#include "com/sun/star/container/XIndexAccess.hpp"
+#include "com/sun/star/container/XIndexContainer.hpp"
+#include "com/sun/star/container/XIndexReplace.hpp"
+#include "com/sun/star/container/XNameAccess.hpp"
+#include "com/sun/star/container/XNameContainer.hpp"
+#include "com/sun/star/container/XNameReplace.hpp"
+#include "com/sun/star/container/XNamed.hpp"
+#include "com/sun/star/container/XSet.hpp"
+#include "com/sun/star/document/PrinterIndependentLayout.hpp"
+#include "com/sun/star/document/XActionLockable.hpp"
+#include "com/sun/star/document/XBinaryStreamResolver.hpp"
+#include "com/sun/star/document/XDocumentInfo.hpp"
+#include "com/sun/star/document/XDocumentInfoSupplier.hpp"
+#include "com/sun/star/document/XDocumentRevisionListPersistence.hpp"
+#include "com/sun/star/document/XEmbeddedObjectResolver.hpp"
+#include "com/sun/star/document/XEmbeddedObjectSupplier.hpp"
+#include "com/sun/star/document/XEventsSupplier.hpp"
+#include "com/sun/star/document/XExporter.hpp"
+#include "com/sun/star/document/XFilter.hpp"
+#include "com/sun/star/document/XGraphicObjectResolver.hpp"
+#include "com/sun/star/document/XImporter.hpp"
+#include "com/sun/star/document/XRedlinesSupplier.hpp"
+#include "com/sun/star/document/XViewDataSupplier.hpp"
+#include "com/sun/star/drawing/Alignment.hpp"
+#include "com/sun/star/drawing/BitmapMode.hpp"
+#include "com/sun/star/drawing/CameraGeometry.hpp"
+#include "com/sun/star/drawing/CircleKind.hpp"
+#include "com/sun/star/drawing/ColorMode.hpp"
+#include "com/sun/star/drawing/ConnectorType.hpp"
+#include "com/sun/star/drawing/DashStyle.hpp"
+#include "com/sun/star/drawing/Direction3D.hpp"
+#include "com/sun/star/drawing/DoubleSequence.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeGluePointType.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeParameter.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeSegment.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeTextFrame.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeTextPathMode.hpp"
+#include "com/sun/star/drawing/EscapeDirection.hpp"
+#include "com/sun/star/drawing/FillStyle.hpp"
+#include "com/sun/star/drawing/FlagSequence.hpp"
+#include "com/sun/star/drawing/FlagSequenceSequence.hpp"
+#include "com/sun/star/drawing/GluePoint2.hpp"
+#include "com/sun/star/drawing/Hatch.hpp"
+#include "com/sun/star/drawing/HomogenMatrix.hpp"
+#include "com/sun/star/drawing/HomogenMatrix3.hpp"
+#include "com/sun/star/drawing/LineDash.hpp"
+#include "com/sun/star/drawing/LineJoint.hpp"
+#include "com/sun/star/drawing/LineStyle.hpp"
+#include "com/sun/star/drawing/MeasureTextHorzPos.hpp"
+#include "com/sun/star/drawing/MeasureTextVertPos.hpp"
+#include "com/sun/star/drawing/NormalsKind.hpp"
+#include "com/sun/star/drawing/PointSequence.hpp"
+#include "com/sun/star/drawing/PointSequenceSequence.hpp"
+#include "com/sun/star/drawing/PolyPolygonBezierCoords.hpp"
+#include "com/sun/star/drawing/PolyPolygonShape3D.hpp"
+#include "com/sun/star/drawing/Position3D.hpp"
+#include "com/sun/star/drawing/ProjectionMode.hpp"
+#include "com/sun/star/drawing/RectanglePoint.hpp"
+#include "com/sun/star/drawing/ShadeMode.hpp"
+#include "com/sun/star/drawing/TextAnimationDirection.hpp"
+#include "com/sun/star/drawing/TextAnimationKind.hpp"
+#include "com/sun/star/drawing/TextFitToSizeType.hpp"
+#include "com/sun/star/drawing/TextHorizontalAdjust.hpp"
+#include "com/sun/star/drawing/TextVerticalAdjust.hpp"
+#include "com/sun/star/drawing/TextureKind.hpp"
+#include "com/sun/star/drawing/TextureMode.hpp"
+#include "com/sun/star/drawing/TextureProjectionMode.hpp"
+#include "com/sun/star/drawing/XControlShape.hpp"
+#include "com/sun/star/drawing/XCustomShapeEngine.hpp"
+#include "com/sun/star/drawing/XDrawPage.hpp"
+#include "com/sun/star/drawing/XDrawPageSupplier.hpp"
+#include "com/sun/star/drawing/XDrawPages.hpp"
+#include "com/sun/star/drawing/XDrawPagesSupplier.hpp"
+#include "com/sun/star/drawing/XGluePointsSupplier.hpp"
+#include "com/sun/star/drawing/XLayerManager.hpp"
+#include "com/sun/star/drawing/XLayerSupplier.hpp"
+#include "com/sun/star/drawing/XMasterPageTarget.hpp"
+#include "com/sun/star/drawing/XMasterPagesSupplier.hpp"
+#include "com/sun/star/drawing/XShape.hpp"
+#include "com/sun/star/drawing/XShapes.hpp"
+#include "com/sun/star/embed/ElementModes.hpp"
+#include "com/sun/star/embed/XStorage.hpp"
+#include "com/sun/star/form/FormButtonType.hpp"
+#include "com/sun/star/form/FormComponentType.hpp"
+#include "com/sun/star/form/FormSubmitEncoding.hpp"
+#include "com/sun/star/form/FormSubmitMethod.hpp"
+#include "com/sun/star/form/ListSourceType.hpp"
+#include "com/sun/star/form/NavigationBarMode.hpp"
+#include "com/sun/star/form/TabulatorCycle.hpp"
+#include "com/sun/star/form/XForm.hpp"
+#include "com/sun/star/form/XFormsSupplier.hpp"
+#include "com/sun/star/form/XFormsSupplier2.hpp"
+#include "com/sun/star/form/XGridColumnFactory.hpp"
+#include "com/sun/star/form/binding/XBindableValue.hpp"
+#include "com/sun/star/form/binding/XListEntrySink.hpp"
+#include "com/sun/star/form/binding/XListEntrySource.hpp"
+#include "com/sun/star/form/binding/XValueBinding.hpp"
+#include "com/sun/star/form/submission/XSubmission.hpp"
+#include "com/sun/star/form/submission/XSubmissionSupplier.hpp"
+#include "com/sun/star/formula/SymbolDescriptor.hpp"
+#include "com/sun/star/frame/XModel.hpp"
+#include "com/sun/star/frame/XStorable.hpp"
+#include "com/sun/star/i18n/NativeNumberXmlAttributes.hpp"
+#include "com/sun/star/i18n/UnicodeType.hpp"
+#include "com/sun/star/i18n/XCharacterClassification.hpp"
+#include "com/sun/star/i18n/XForbiddenCharacters.hpp"
+#include "com/sun/star/io/XActiveDataSource.hpp"
+#include "com/sun/star/io/XInputStream.hpp"
+#include "com/sun/star/io/XOutputStream.hpp"
+#include "com/sun/star/io/XPersistObject.hpp"
+#include "com/sun/star/lang/IllegalArgumentException.hpp"
+#include "com/sun/star/lang/Locale.hpp"
+#include "com/sun/star/lang/ServiceNotRegisteredException.hpp"
+#include "com/sun/star/lang/WrappedTargetException.hpp"
+#include "com/sun/star/lang/XEventListener.hpp"
+#include "com/sun/star/lang/XInitialization.hpp"
+#include "com/sun/star/lang/XMultiServiceFactory.hpp"
+#include "com/sun/star/lang/XServiceInfo.hpp"
+#include "com/sun/star/lang/XSingleServiceFactory.hpp"
+#include "com/sun/star/lang/XTypeProvider.hpp"
+#include "com/sun/star/lang/XUnoTunnel.hpp"
+#include "com/sun/star/linguistic2/XSupportedLocales.hpp"
+#include "com/sun/star/media/ZoomLevel.hpp"
+#include "com/sun/star/presentation/AnimationEffect.hpp"
+#include "com/sun/star/presentation/AnimationSpeed.hpp"
+#include "com/sun/star/presentation/ClickAction.hpp"
+#include "com/sun/star/presentation/EffectCommands.hpp"
+#include "com/sun/star/presentation/EffectNodeType.hpp"
+#include "com/sun/star/presentation/EffectPresetClass.hpp"
+#include "com/sun/star/presentation/FadeEffect.hpp"
+#include "com/sun/star/presentation/ParagraphTarget.hpp"
+#include "com/sun/star/presentation/ShapeAnimationSubType.hpp"
+#include "com/sun/star/presentation/TextAnimationType.hpp"
+#include "com/sun/star/presentation/XCustomPresentationSupplier.hpp"
+#include "com/sun/star/presentation/XHandoutMasterSupplier.hpp"
+#include "com/sun/star/presentation/XPresentationPage.hpp"
+#include "com/sun/star/presentation/XPresentationSupplier.hpp"
+#include "com/sun/star/registry/XRegistryKey.hpp"
+#include "com/sun/star/script/ScriptEventDescriptor.hpp"
+#include "com/sun/star/script/XEventAttacherManager.hpp"
+#include "com/sun/star/sdb/CommandType.hpp"
+#include "com/sun/star/sheet/XSpreadsheetDocument.hpp"
+#include "com/sun/star/style/BreakType.hpp"
+#include "com/sun/star/style/CaseMap.hpp"
+#include "com/sun/star/style/DropCapFormat.hpp"
+#include "com/sun/star/style/GraphicLocation.hpp"
+#include "com/sun/star/style/LineNumberPosition.hpp"
+#include "com/sun/star/style/LineSpacing.hpp"
+#include "com/sun/star/style/LineSpacingMode.hpp"
+#include "com/sun/star/style/NumberingType.hpp"
+#include "com/sun/star/style/PageStyleLayout.hpp"
+#include "com/sun/star/style/ParagraphAdjust.hpp"
+#include "com/sun/star/style/ParagraphStyleCategory.hpp"
+#include "com/sun/star/style/TabAlign.hpp"
+#include "com/sun/star/style/TabStop.hpp"
+#include "com/sun/star/style/VerticalAlignment.hpp"
+#include "com/sun/star/style/XStyle.hpp"
+#include "com/sun/star/style/XStyleFamiliesSupplier.hpp"
+#include "com/sun/star/table/BorderLine.hpp"
+#include "com/sun/star/table/CellAddress.hpp"
+#include "com/sun/star/table/CellRangeAddress.hpp"
+#include "com/sun/star/table/ShadowFormat.hpp"
+#include "com/sun/star/table/XCellRange.hpp"
+#include "com/sun/star/task/XStatusIndicator.hpp"
+#include "com/sun/star/task/XStatusIndicatorSupplier.hpp"
+#include "com/sun/star/text/BibliographyDataField.hpp"
+#include "com/sun/star/text/BibliographyDataType.hpp"
+#include "com/sun/star/text/ChapterFormat.hpp"
+#include "com/sun/star/text/ControlCharacter.hpp"
+#include "com/sun/star/text/FilenameDisplayFormat.hpp"
+#include "com/sun/star/text/FontEmphasis.hpp"
+#include "com/sun/star/text/FontRelief.hpp"
+#include "com/sun/star/text/FootnoteNumbering.hpp"
+#include "com/sun/star/text/GraphicCrop.hpp"
+#include "com/sun/star/text/HoriOrientation.hpp"
+#include "com/sun/star/text/HorizontalAdjust.hpp"
+#include "com/sun/star/text/PageNumberType.hpp"
+#include "com/sun/star/text/ParagraphVertAlign.hpp"
+#include "com/sun/star/text/PlaceholderType.hpp"
+#include "com/sun/star/text/PositionLayoutDir.hpp"
+#include "com/sun/star/text/ReferenceFieldPart.hpp"
+#include "com/sun/star/text/ReferenceFieldSource.hpp"
+#include "com/sun/star/text/RelOrientation.hpp"
+#include "com/sun/star/text/RubyAdjust.hpp"
+#include "com/sun/star/text/SectionFileLink.hpp"
+#include "com/sun/star/text/SetVariableType.hpp"
+#include "com/sun/star/text/SizeType.hpp"
+#include "com/sun/star/text/TemplateDisplayFormat.hpp"
+#include "com/sun/star/text/TextColumn.hpp"
+#include "com/sun/star/text/TextContentAnchorType.hpp"
+#include "com/sun/star/text/TextGridMode.hpp"
+#include "com/sun/star/text/UserDataPart.hpp"
+#include "com/sun/star/text/VertOrientation.hpp"
+#include "com/sun/star/text/WrapInfluenceOnPosition.hpp"
+#include "com/sun/star/text/WrapTextMode.hpp"
+#include "com/sun/star/text/WritingMode.hpp"
+#include "com/sun/star/text/WritingMode2.hpp"
+#include "com/sun/star/text/XChapterNumberingSupplier.hpp"
+#include "com/sun/star/text/XDependentTextField.hpp"
+#include "com/sun/star/text/XDocumentIndex.hpp"
+#include "com/sun/star/text/XEndnotesSupplier.hpp"
+#include "com/sun/star/text/XFootnote.hpp"
+#include "com/sun/star/text/XFootnotesSupplier.hpp"
+#include "com/sun/star/text/XLineNumberingProperties.hpp"
+#include "com/sun/star/text/XNumberingTypeInfo.hpp"
+#include "com/sun/star/text/XRelativeTextContentInsert.hpp"
+#include "com/sun/star/text/XRelativeTextContentRemove.hpp"
+#include "com/sun/star/text/XText.hpp"
+#include "com/sun/star/text/XTextColumns.hpp"
+#include "com/sun/star/text/XTextContent.hpp"
+#include "com/sun/star/text/XTextCursor.hpp"
+#include "com/sun/star/text/XTextDocument.hpp"
+#include "com/sun/star/text/XTextEmbeddedObjectsSupplier.hpp"
+#include "com/sun/star/text/XTextField.hpp"
+#include "com/sun/star/text/XTextFieldsSupplier.hpp"
+#include "com/sun/star/text/XTextFrame.hpp"
+#include "com/sun/star/text/XTextFramesSupplier.hpp"
+#include "com/sun/star/text/XTextGraphicObjectsSupplier.hpp"
+#include "com/sun/star/text/XTextRange.hpp"
+#include "com/sun/star/text/XTextRangeCompare.hpp"
+#include "com/sun/star/text/XTextSection.hpp"
+#include "com/sun/star/text/XTextShapesSupplier.hpp"
+#include "com/sun/star/ucb/XAnyCompare.hpp"
+#include "com/sun/star/ucb/XAnyCompareFactory.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/Reference.h"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.h"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/Type.h"
+#include "com/sun/star/uno/Type.hxx"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uri/XUriReferenceFactory.hpp"
+#include "com/sun/star/uri/XVndSunStarScriptUrl.hpp"
+#include "com/sun/star/util/Date.hpp"
+#include "com/sun/star/util/NumberFormat.hpp"
+#include "com/sun/star/util/RevisionTag.hpp"
+#include "com/sun/star/util/Time.hpp"
+#include "com/sun/star/util/XCloneable.hpp"
+#include "com/sun/star/util/XModifiable.hpp"
+#include "com/sun/star/util/XNumberFormats.hpp"
+#include "com/sun/star/util/XNumberFormatsSupplier.hpp"
+#include "com/sun/star/util/XStringMapping.hpp"
+#include "com/sun/star/util/XStringSubstitution.hpp"
+#include "com/sun/star/util/XUpdatable.hpp"
+#include "com/sun/star/view/PaperOrientation.hpp"
+#include "com/sun/star/xforms/XDataTypeRepository.hpp"
+#include "com/sun/star/xforms/XFormsSupplier.hpp"
+#include "com/sun/star/xforms/XModel.hpp"
+#include "com/sun/star/xml/AttributeData.hpp"
+#include "com/sun/star/xml/dom/NodeType.hpp"
+#include "com/sun/star/xml/dom/XAttr.hpp"
+#include "com/sun/star/xml/dom/XDocument.hpp"
+#include "com/sun/star/xml/dom/XDocumentBuilder.hpp"
+#include "com/sun/star/xml/dom/XElement.hpp"
+#include "com/sun/star/xml/dom/XEntity.hpp"
+#include "com/sun/star/xml/dom/XNamedNodeMap.hpp"
+#include "com/sun/star/xml/dom/XNode.hpp"
+#include "com/sun/star/xml/dom/XNotation.hpp"
+#include "com/sun/star/xml/sax/InputSource.hpp"
+#include "com/sun/star/xml/sax/SAXException.hpp"
+#include "com/sun/star/xml/sax/SAXInvalidCharacterException.hpp"
+#include "com/sun/star/xml/sax/SAXParseException.hpp"
+#include "com/sun/star/xml/sax/XAttributeList.hpp"
+#include "com/sun/star/xml/sax/XDocumentHandler.hpp"
+#include "com/sun/star/xml/sax/XExtendedDocumentHandler.hpp"
+#include "com/sun/star/xml/sax/XLocator.hpp"
+#include "com/sun/star/xml/sax/XParser.hpp"
+#include "com/sun/star/xsd/DataTypeClass.hpp"
+#include "com/sun/star/xsd/WhiteSpaceTreatment.hpp"
+#include "com/sun/star/xsd/XDataType.hpp"
+
+#include "comphelper/genericpropertyset.hxx"
+#include "comphelper/namecontainer.hxx"
+#include "comphelper/processfactory.hxx"
+#include "comphelper/sequence.hxx"
+#include "comphelper/stl_types.hxx"
+#include "comphelper/types.hxx"
+
+#include "cppuhelper/factory.hxx"
+#include "cppuhelper/implbase1.hxx"
+#include "cppuhelper/implbase2.hxx"
+#include "cppuhelper/implbase3.hxx"
+#include "cppuhelper/implbase4.hxx"
+#include "cppuhelper/implbase6.hxx"
+#include "cppuhelper/weak.hxx"
+#include "cppuhelper/weakref.hxx"
+
+#include "i18npool/lang.h"
+#include "i18npool/mslangid.hxx"
+
+#include "osl/diagnose.h"
+#include "osl/interlck.h"
+#include "osl/mutex.hxx"
+
+#include "rsc/rscsfx.hxx"
+
+#include "rtl/logfile.hxx"
+#include "rtl/math.hxx"
+#include "rtl/memory.h"
+#include "rtl/ustrbuf.hxx"
+#include "rtl/ustring.hxx"
+#include "rtl/uuid.h"
+
+#include "salhelper/simplereferenceobject.hxx"
+
+#include "sot/clsids.hxx"
+
+#include "svl/cntnrsrt.hxx"
+#include "svl/itemset.hxx"
+#include "unotools/moduleoptions.hxx"
+#include "svl/nfsymbol.hxx"
+#include "svl/numuno.hxx"
+#include "svl/poolitem.hxx"
+#include "svl/svarray.hxx"
+#include "svl/svstdarr.hxx"
+#include "svl/urihelper.hxx"
+
+
+#include "tools/bigint.hxx"
+#include "tools/color.hxx"
+#include "tools/debug.hxx"
+#include "tools/gen.hxx"
+#include "tools/globname.hxx"
+#include "tools/list.hxx"
+#include "tools/ref.hxx"
+#include "tools/rtti.hxx"
+#include "tools/solar.h"
+#include "tools/string.hxx"
+#include "tools/time.hxx"
+#include "tools/urlobj.hxx"
+
+#include "uno/lbnames.h"
+
+#include "unotools/bootstrap.hxx"
+#include "unotools/charclass.hxx"
+#include "unotools/configmgr.hxx"
+#include "unotools/streamwrap.hxx"
+
+#include "tools/fldunit.hxx"
+#include "unotools/fontcvt.hxx"
+#include "tools/mapunit.hxx"
+
+#include "xmloff/dllapi.h"
+//---MARKER---
+
+#if 0
+
+#include "basegfx/basegfxdllapi.h"
+#include "basegfx/matrix/b2dhommatrix.hxx"
+#include "basegfx/matrix/b3dhommatrix.hxx"
+#include "basegfx/numeric/ftools.hxx"
+#include "basegfx/point/b2dpoint.hxx"
+#include "basegfx/point/b2ipoint.hxx"
+#include "basegfx/point/b3dpoint.hxx"
+#include "basegfx/polygon/b2dpolygon.hxx"
+#include "basegfx/polygon/b2dpolypolygon.hxx"
+#include "basegfx/polygon/b2dpolypolygontools.hxx"
+#include "basegfx/polygon/b3dpolypolygon.hxx"
+#include "basegfx/range/b2drange.hxx"
+#include "basegfx/range/basicrange.hxx"
+#include "basegfx/tools/unotools.hxx"
+#include "basegfx/tuple/b2dtuple.hxx"
+#include "basegfx/tuple/b2ituple.hxx"
+#include "basegfx/tuple/b3dtuple.hxx"
+#include "basegfx/vector/b2dvector.hxx"
+#include "basegfx/vector/b2enums.hxx"
+#include "basegfx/vector/b2ivector.hxx"
+#include "basegfx/vector/b3dvector.hxx"
+#include "boost/config.hpp"
+#include "boost/detail/workaround.hpp"
+#include "boost/iterator.hpp"
+#include "boost/iterator/detail/enable_if.hpp"
+#include "boost/iterator/iterator_adaptor.hpp"
+#include "boost/iterator/iterator_categories.hpp"
+#include "boost/iterator/transform_iterator.hpp"
+#include "boost/iterator_adaptors.hpp"
+#include "boost/mpl/aux_/config/lambda.hpp"
+#include "boost/mpl/aux_/config/overload_resolution.hpp"
+#include "boost/mpl/aux_/lambda_support.hpp"
+#include "boost/mpl/aux_/preprocessor/params.hpp"
+#include "boost/mpl/aux_/template_arity_fwd.hpp"
+#include "boost/mpl/bool.hpp"
+#include "boost/mpl/int.hpp"
+#include "boost/mpl/not.hpp"
+#include "boost/noncopyable.hpp"
+#include "boost/optional.hpp"
+#include "boost/scoped_array.hpp"
+#include "boost/scoped_ptr.hpp"
+#include "boost/shared_ptr.hpp"
+#include "boost/static_assert.hpp"
+#include "boost/tuple/detail/tuple_basic.hpp"
+#include "boost/tuple/tuple.hpp"
+#include "boost/type_traits/add_const.hpp"
+#include "boost/type_traits/add_cv.hpp"
+#include "boost/type_traits/add_pointer.hpp"
+#include "boost/type_traits/add_volatile.hpp"
+#include "boost/type_traits/broken_compiler_spec.hpp"
+#include "boost/type_traits/cv_traits.hpp"
+#include "boost/type_traits/detail/bool_trait_def.hpp"
+#include "boost/type_traits/detail/bool_trait_undef.hpp"
+#include "boost/type_traits/detail/cv_traits_impl.hpp"
+#include "boost/type_traits/detail/template_arity_spec.hpp"
+#include "boost/type_traits/detail/type_trait_def.hpp"
+#include "boost/type_traits/detail/type_trait_undef.hpp"
+#include "boost/type_traits/function_traits.hpp"
+#include "boost/type_traits/integral_constant.hpp"
+#include "boost/type_traits/intrinsics.hpp"
+#include "boost/type_traits/is_base_and_derived.hpp"
+#include "boost/type_traits/is_class.hpp"
+#include "boost/type_traits/is_const.hpp"
+#include "boost/type_traits/is_function.hpp"
+#include "boost/type_traits/is_reference.hpp"
+#include "boost/type_traits/is_volatile.hpp"
+#include "boost/type_traits/remove_const.hpp"
+#include "boost/type_traits/remove_cv.hpp"
+#include "boost/type_traits/remove_reference.hpp"
+#include "boost/type_traits/remove_volatile.hpp"
+#include "boost/utility.hpp"
+#include "com/sun/star/uno/Any.h"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.h"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.h"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/Type.h"
+#include "com/sun/star/uno/Type.hxx"
+#include "comphelper/comphelperdllapi.h"
+#include "comphelper/componentcontext.hxx"
+#include "comphelper/configuration.hxx"
+#include "comphelper/documentconstants.hxx"
+#include "comphelper/extract.hxx"
+#include "comphelper/genericpropertyset.hxx"
+#include "comphelper/InlineContainer.hxx"
+#include "comphelper/mediadescriptor.hxx"
+#include "comphelper/namecontainer.hxx"
+#include "comphelper/namedvaluecollection.hxx"
+#include "comphelper/processfactory.hxx"
+#include "comphelper/sequence.hxx"
+#include "comphelper/sequenceashashmap.hxx"
+#include "comphelper/sequenceasvector.hxx"
+#include "comphelper/servicehelper.hxx"
+#include "comphelper/stl_types.hxx"
+#include "comphelper/stlunosequence.hxx"
+#include "comphelper/storagehelper.hxx"
+#include "comphelper/string.hxx"
+#include "comphelper/types.hxx"
+#include "comphelper/xmltools.hxx"
+#include "cppu/macros.hxx"
+#include "cppu/unotype.hxx"
+#include "cppuhelper/basemutex.hxx"
+#include "cppuhelper/compbase_ex.hxx"
+#include "cppuhelper/compbase3.hxx"
+#include "cppuhelper/cppuhelperdllapi.h"
+#include "cppuhelper/exc_hlp.hxx"
+#include "cppuhelper/factory.hxx"
+#include "cppuhelper/implbase_ex.hxx"
+#include "cppuhelper/implbase1.hxx"
+#include "cppuhelper/implbase2.hxx"
+#include "cppuhelper/implbase3.hxx"
+#include "cppuhelper/implbase6.hxx"
+#include "cppuhelper/interfacecontainer.h"
+#include "cppuhelper/interfacecontainer.hxx"
+#include "cppuhelper/weak.hxx"
+#include "cppuhelper/weakref.hxx"
+#include "i18npool/lang.h"
+#include "i18npool/mslangid.hxx"
+#include "o3tl/cow_wrapper.hxx"
+#include "offapi/com/sun/star/animations/AnimationAdditiveMode.hpp"
+#include "offapi/com/sun/star/animations/AnimationCalcMode.hpp"
+#include "offapi/com/sun/star/animations/AnimationColorSpace.hpp"
+#include "offapi/com/sun/star/animations/AnimationEndSync.hpp"
+#include "offapi/com/sun/star/animations/AnimationFill.hpp"
+#include "offapi/com/sun/star/animations/AnimationNodeType.hpp"
+#include "offapi/com/sun/star/animations/AnimationRestart.hpp"
+#include "offapi/com/sun/star/animations/AnimationTransformType.hpp"
+#include "offapi/com/sun/star/animations/Event.hpp"
+#include "offapi/com/sun/star/animations/EventTrigger.hpp"
+#include "offapi/com/sun/star/animations/Timing.hpp"
+#include "offapi/com/sun/star/animations/TransitionSubType.hpp"
+#include "offapi/com/sun/star/animations/TransitionType.hpp"
+#include "offapi/com/sun/star/animations/ValuePair.hpp"
+#include "offapi/com/sun/star/animations/XAnimateColor.hpp"
+#include "offapi/com/sun/star/animations/XAnimateMotion.hpp"
+#include "offapi/com/sun/star/animations/XAnimateSet.hpp"
+#include "offapi/com/sun/star/animations/XAnimateTransform.hpp"
+#include "offapi/com/sun/star/animations/XAnimationNode.hpp"
+#include "offapi/com/sun/star/animations/XAnimationNodeSupplier.hpp"
+#include "offapi/com/sun/star/animations/XAudio.hpp"
+#include "offapi/com/sun/star/animations/XCommand.hpp"
+#include "offapi/com/sun/star/animations/XIterateContainer.hpp"
+#include "offapi/com/sun/star/animations/XTransitionFilter.hpp"
+#include "offapi/com/sun/star/awt/FontDescriptor.hpp"
+#include "offapi/com/sun/star/awt/FontEmphasisMark.hpp"
+#include "offapi/com/sun/star/awt/FontFamily.hpp"
+#include "offapi/com/sun/star/awt/FontPitch.hpp"
+#include "offapi/com/sun/star/awt/FontRelief.hpp"
+#include "offapi/com/sun/star/awt/FontSlant.hpp"
+#include "offapi/com/sun/star/awt/FontStrikeout.hpp"
+#include "offapi/com/sun/star/awt/FontUnderline.hpp"
+#include "offapi/com/sun/star/awt/FontWeight.hpp"
+#include "offapi/com/sun/star/awt/FontWidth.hpp"
+#include "offapi/com/sun/star/awt/Gradient.hpp"
+#include "offapi/com/sun/star/awt/ImagePosition.hpp"
+#include "offapi/com/sun/star/awt/ImageScaleMode.hpp"
+#include "offapi/com/sun/star/awt/Point.hpp"
+#include "offapi/com/sun/star/awt/PosSize.hpp"
+#include "offapi/com/sun/star/awt/Rectangle.hpp"
+#include "offapi/com/sun/star/awt/ScrollBarOrientation.hpp"
+#include "offapi/com/sun/star/awt/Size.hpp"
+#include "offapi/com/sun/star/awt/TextAlign.hpp"
+#include "offapi/com/sun/star/awt/VisualEffect.hpp"
+#include "offapi/com/sun/star/awt/XBitmap.hpp"
+#include "offapi/com/sun/star/awt/XControlModel.hpp"
+#include "offapi/com/sun/star/chart/ChartAxisArrangeOrderType.hpp"
+#include "offapi/com/sun/star/chart/ChartAxisAssign.hpp"
+#include "offapi/com/sun/star/chart/ChartAxisLabelPosition.hpp"
+#include "offapi/com/sun/star/chart/ChartAxisMarkPosition.hpp"
+#include "offapi/com/sun/star/chart/ChartAxisMarks.hpp"
+#include "offapi/com/sun/star/chart/ChartAxisPosition.hpp"
+#include "offapi/com/sun/star/chart/ChartAxisType.hpp"
+#include "offapi/com/sun/star/chart/ChartDataCaption.hpp"
+#include "offapi/com/sun/star/chart/ChartDataRowSource.hpp"
+#include "offapi/com/sun/star/chart/ChartErrorCategory.hpp"
+#include "offapi/com/sun/star/chart/ChartErrorIndicatorType.hpp"
+#include "offapi/com/sun/star/chart/ChartLegendExpansion.hpp"
+#include "offapi/com/sun/star/chart/ChartLegendPosition.hpp"
+#include "offapi/com/sun/star/chart/ChartRegressionCurveType.hpp"
+#include "offapi/com/sun/star/chart/ChartSeriesAddress.hpp"
+#include "offapi/com/sun/star/chart/ChartSolidType.hpp"
+#include "offapi/com/sun/star/chart/ChartSymbolType.hpp"
+#include "offapi/com/sun/star/chart/DataLabelPlacement.hpp"
+#include "offapi/com/sun/star/chart/ErrorBarStyle.hpp"
+#include "offapi/com/sun/star/chart/MissingValueTreatment.hpp"
+#include "offapi/com/sun/star/chart/TimeIncrement.hpp"
+#include "offapi/com/sun/star/chart/TimeInterval.hpp"
+#include "offapi/com/sun/star/chart/TimeUnit.hpp"
+#include "offapi/com/sun/star/chart/X3DDisplay.hpp"
+#include "offapi/com/sun/star/chart/XAxis.hpp"
+#include "offapi/com/sun/star/chart/XAxisSupplier.hpp"
+#include "offapi/com/sun/star/chart/XChartDataArray.hpp"
+#include "offapi/com/sun/star/chart/XChartDocument.hpp"
+#include "offapi/com/sun/star/chart/XComplexDescriptionAccess.hpp"
+#include "offapi/com/sun/star/chart/XDiagram.hpp"
+#include "offapi/com/sun/star/chart/XDiagramPositioning.hpp"
+#include "offapi/com/sun/star/chart/XSecondAxisTitleSupplier.hpp"
+#include "offapi/com/sun/star/chart/XStatisticDisplay.hpp"
+#include "offapi/com/sun/star/chart2/AxisOrientation.hpp"
+#include "offapi/com/sun/star/chart2/AxisType.hpp"
+#include "offapi/com/sun/star/chart2/data/HighlightedRange.hpp"
+#include "offapi/com/sun/star/chart2/data/LabelOrigin.hpp"
+#include "offapi/com/sun/star/chart2/data/XDatabaseDataProvider.hpp"
+#include "offapi/com/sun/star/chart2/data/XDataProvider.hpp"
+#include "offapi/com/sun/star/chart2/data/XDataReceiver.hpp"
+#include "offapi/com/sun/star/chart2/data/XDataSequence.hpp"
+#include "offapi/com/sun/star/chart2/data/XDataSink.hpp"
+#include "offapi/com/sun/star/chart2/data/XDataSource.hpp"
+#include "offapi/com/sun/star/chart2/data/XLabeledDataSequence.hpp"
+#include "offapi/com/sun/star/chart2/data/XNumericalDataSequence.hpp"
+#include "offapi/com/sun/star/chart2/data/XRangeHighlighter.hpp"
+#include "offapi/com/sun/star/chart2/data/XRangeXMLConversion.hpp"
+#include "offapi/com/sun/star/chart2/data/XTextualDataSequence.hpp"
+#include "offapi/com/sun/star/chart2/IncrementData.hpp"
+#include "offapi/com/sun/star/chart2/RelativePosition.hpp"
+#include "offapi/com/sun/star/chart2/ScaleData.hpp"
+#include "offapi/com/sun/star/chart2/SubIncrement.hpp"
+#include "offapi/com/sun/star/chart2/XAnyDescriptionAccess.hpp"
+#include "offapi/com/sun/star/chart2/XAxis.hpp"
+#include "offapi/com/sun/star/chart2/XChartDocument.hpp"
+#include "offapi/com/sun/star/chart2/XChartType.hpp"
+#include "offapi/com/sun/star/chart2/XChartTypeContainer.hpp"
+#include "offapi/com/sun/star/chart2/XChartTypeManager.hpp"
+#include "offapi/com/sun/star/chart2/XColorScheme.hpp"
+#include "offapi/com/sun/star/chart2/XCoordinateSystem.hpp"
+#include "offapi/com/sun/star/chart2/XCoordinateSystemContainer.hpp"
+#include "offapi/com/sun/star/chart2/XDataSeries.hpp"
+#include "offapi/com/sun/star/chart2/XDataSeriesContainer.hpp"
+#include "offapi/com/sun/star/chart2/XDiagram.hpp"
+#include "offapi/com/sun/star/chart2/XFormattedString.hpp"
+#include "offapi/com/sun/star/chart2/XInternalDataProvider.hpp"
+#include "offapi/com/sun/star/chart2/XLegend.hpp"
+#include "offapi/com/sun/star/chart2/XRegressionCurve.hpp"
+#include "offapi/com/sun/star/chart2/XRegressionCurveCalculator.hpp"
+#include "offapi/com/sun/star/chart2/XRegressionCurveContainer.hpp"
+#include "offapi/com/sun/star/chart2/XScaling.hpp"
+#include "offapi/com/sun/star/chart2/XTitle.hpp"
+#include "offapi/com/sun/star/chart2/XTitled.hpp"
+#include "offapi/com/sun/star/configuration/CorruptedConfigurationException.hpp"
+#include "offapi/com/sun/star/datatransfer/DataFlavor.hpp"
+#include "offapi/com/sun/star/datatransfer/UnsupportedFlavorException.hpp"
+#include "offapi/com/sun/star/document/PrinterIndependentLayout.hpp"
+#include "offapi/com/sun/star/document/XActionLockable.hpp"
+#include "offapi/com/sun/star/document/XBinaryStreamResolver.hpp"
+#include "offapi/com/sun/star/document/XDocumentProperties.hpp"
+#include "offapi/com/sun/star/document/XDocumentPropertiesSupplier.hpp"
+#include "offapi/com/sun/star/document/XDocumentRevisionListPersistence.hpp"
+#include "offapi/com/sun/star/document/XEmbeddedObjectResolver.hpp"
+#include "offapi/com/sun/star/document/XEmbeddedObjectSupplier.hpp"
+#include "offapi/com/sun/star/document/XEmbeddedScripts.hpp"
+#include "offapi/com/sun/star/document/XEventsSupplier.hpp"
+#include "offapi/com/sun/star/document/XExporter.hpp"
+#include "offapi/com/sun/star/document/XFilter.hpp"
+#include "offapi/com/sun/star/document/XGraphicObjectResolver.hpp"
+#include "offapi/com/sun/star/document/XImporter.hpp"
+#include "offapi/com/sun/star/document/XRedlinesSupplier.hpp"
+#include "offapi/com/sun/star/document/XStorageBasedDocument.hpp"
+#include "offapi/com/sun/star/document/XStorageChangeListener.hpp"
+#include "offapi/com/sun/star/document/XViewDataSupplier.hpp"
+#include "offapi/com/sun/star/drawing/Alignment.hpp"
+#include "offapi/com/sun/star/drawing/BitmapMode.hpp"
+#include "offapi/com/sun/star/drawing/CameraGeometry.hpp"
+#include "offapi/com/sun/star/drawing/CircleKind.hpp"
+#include "offapi/com/sun/star/drawing/ColorMode.hpp"
+#include "offapi/com/sun/star/drawing/ConnectorType.hpp"
+#include "offapi/com/sun/star/drawing/DashStyle.hpp"
+#include "offapi/com/sun/star/drawing/Direction3D.hpp"
+#include "offapi/com/sun/star/drawing/DoubleSequence.hpp"
+#include "offapi/com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp"
+#include "offapi/com/sun/star/drawing/EnhancedCustomShapeGluePointType.hpp"
+#include "offapi/com/sun/star/drawing/EnhancedCustomShapeParameter.hpp"
+#include "offapi/com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp"
+#include "offapi/com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp"
+#include "offapi/com/sun/star/drawing/EnhancedCustomShapeSegment.hpp"
+#include "offapi/com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp"
+#include "offapi/com/sun/star/drawing/EnhancedCustomShapeTextFrame.hpp"
+#include "offapi/com/sun/star/drawing/EnhancedCustomShapeTextPathMode.hpp"
+#include "offapi/com/sun/star/drawing/EscapeDirection.hpp"
+#include "offapi/com/sun/star/drawing/FillStyle.hpp"
+#include "offapi/com/sun/star/drawing/FlagSequence.hpp"
+#include "offapi/com/sun/star/drawing/GluePoint2.hpp"
+#include "offapi/com/sun/star/drawing/Hatch.hpp"
+#include "offapi/com/sun/star/drawing/HomogenMatrix.hpp"
+#include "offapi/com/sun/star/drawing/HomogenMatrix3.hpp"
+#include "offapi/com/sun/star/drawing/LineDash.hpp"
+#include "offapi/com/sun/star/drawing/LineJoint.hpp"
+#include "offapi/com/sun/star/drawing/LineStyle.hpp"
+#include "offapi/com/sun/star/drawing/MeasureTextHorzPos.hpp"
+#include "offapi/com/sun/star/drawing/MeasureTextVertPos.hpp"
+#include "offapi/com/sun/star/drawing/NormalsKind.hpp"
+#include "offapi/com/sun/star/drawing/PointSequence.hpp"
+#include "offapi/com/sun/star/drawing/PointSequenceSequence.hpp"
+#include "offapi/com/sun/star/drawing/PolyPolygonBezierCoords.hpp"
+#include "offapi/com/sun/star/drawing/PolyPolygonShape3D.hpp"
+#include "offapi/com/sun/star/drawing/Position3D.hpp"
+#include "offapi/com/sun/star/drawing/ProjectionMode.hpp"
+#include "offapi/com/sun/star/drawing/RectanglePoint.hpp"
+#include "offapi/com/sun/star/drawing/ShadeMode.hpp"
+#include "offapi/com/sun/star/drawing/TextAnimationDirection.hpp"
+#include "offapi/com/sun/star/drawing/TextAnimationKind.hpp"
+#include "offapi/com/sun/star/drawing/TextFitToSizeType.hpp"
+#include "offapi/com/sun/star/drawing/TextHorizontalAdjust.hpp"
+#include "offapi/com/sun/star/drawing/TextureKind.hpp"
+#include "offapi/com/sun/star/drawing/TextureMode.hpp"
+#include "offapi/com/sun/star/drawing/TextureProjectionMode.hpp"
+#include "offapi/com/sun/star/drawing/TextVerticalAdjust.hpp"
+#include "offapi/com/sun/star/drawing/XControlShape.hpp"
+#include "offapi/com/sun/star/drawing/XCustomShapeEngine.hpp"
+#include "offapi/com/sun/star/drawing/XDrawPage.hpp"
+#include "offapi/com/sun/star/drawing/XDrawPages.hpp"
+#include "offapi/com/sun/star/drawing/XDrawPagesSupplier.hpp"
+#include "offapi/com/sun/star/drawing/XDrawPageSupplier.hpp"
+#include "offapi/com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp"
+#include "offapi/com/sun/star/drawing/XGluePointsSupplier.hpp"
+#include "offapi/com/sun/star/drawing/XLayerManager.hpp"
+#include "offapi/com/sun/star/drawing/XLayerSupplier.hpp"
+#include "offapi/com/sun/star/drawing/XMasterPagesSupplier.hpp"
+#include "offapi/com/sun/star/drawing/XMasterPageTarget.hpp"
+#include "offapi/com/sun/star/drawing/XShape.hpp"
+#include "offapi/com/sun/star/drawing/XShapes.hpp"
+#include "offapi/com/sun/star/embed/Aspects.hpp"
+#include "offapi/com/sun/star/embed/ElementModes.hpp"
+#include "offapi/com/sun/star/embed/VisualRepresentation.hpp"
+#include "offapi/com/sun/star/embed/WrongStateException.hpp"
+#include "offapi/com/sun/star/embed/XEncryptionProtectedSource.hpp"
+#include "offapi/com/sun/star/embed/XEncryptionProtectedSource2.hpp"
+#include "offapi/com/sun/star/embed/XStorage.hpp"
+#include "offapi/com/sun/star/embed/XTransactedObject.hpp"
+#include "offapi/com/sun/star/embed/XVisualObject.hpp"
+#include "offapi/com/sun/star/form/binding/XBindableValue.hpp"
+#include "offapi/com/sun/star/form/binding/XListEntrySink.hpp"
+#include "offapi/com/sun/star/form/binding/XListEntrySource.hpp"
+#include "offapi/com/sun/star/form/binding/XValueBinding.hpp"
+#include "offapi/com/sun/star/form/FormButtonType.hpp"
+#include "offapi/com/sun/star/form/FormComponentType.hpp"
+#include "offapi/com/sun/star/form/FormSubmitEncoding.hpp"
+#include "offapi/com/sun/star/form/FormSubmitMethod.hpp"
+#include "offapi/com/sun/star/form/ListSourceType.hpp"
+#include "offapi/com/sun/star/form/NavigationBarMode.hpp"
+#include "offapi/com/sun/star/form/submission/XSubmission.hpp"
+#include "offapi/com/sun/star/form/submission/XSubmissionSupplier.hpp"
+#include "offapi/com/sun/star/form/TabulatorCycle.hpp"
+#include "offapi/com/sun/star/form/XForm.hpp"
+#include "offapi/com/sun/star/form/XFormsSupplier.hpp"
+#include "offapi/com/sun/star/form/XFormsSupplier2.hpp"
+#include "offapi/com/sun/star/form/XGridColumnFactory.hpp"
+#include "offapi/com/sun/star/formula/SymbolDescriptor.hpp"
+#include "offapi/com/sun/star/frame/DoubleInitializationException.hpp"
+#include "offapi/com/sun/star/frame/XModel.hpp"
+#include "offapi/com/sun/star/frame/XStorable.hpp"
+#include "offapi/com/sun/star/geometry/RealPoint2D.hpp"
+#include "offapi/com/sun/star/geometry/RealSize2D.hpp"
+#include "offapi/com/sun/star/graphic/GraphicProvider.hpp"
+#include "offapi/com/sun/star/graphic/XGraphic.hpp"
+#include "offapi/com/sun/star/graphic/XGraphicProvider.hpp"
+#include "offapi/com/sun/star/i18n/Boundary.hpp"
+#include "offapi/com/sun/star/i18n/Calendar.hpp"
+#include "offapi/com/sun/star/i18n/Calendar2.hpp"
+#include "offapi/com/sun/star/i18n/CalendarItem.hpp"
+#include "offapi/com/sun/star/i18n/CalendarItem2.hpp"
+#include "offapi/com/sun/star/i18n/CollatorOptions.hpp"
+#include "offapi/com/sun/star/i18n/Currency.hpp"
+#include "offapi/com/sun/star/i18n/Currency2.hpp"
+#include "offapi/com/sun/star/i18n/ForbiddenCharacters.hpp"
+#include "offapi/com/sun/star/i18n/FormatElement.hpp"
+#include "offapi/com/sun/star/i18n/Implementation.hpp"
+#include "offapi/com/sun/star/i18n/LanguageCountryInfo.hpp"
+#include "offapi/com/sun/star/i18n/LineBreakHyphenationOptions.hpp"
+#include "offapi/com/sun/star/i18n/LineBreakResults.hpp"
+#include "offapi/com/sun/star/i18n/LineBreakUserOptions.hpp"
+#include "offapi/com/sun/star/i18n/LocaleDataItem.hpp"
+#include "offapi/com/sun/star/i18n/LocaleItem.hpp"
+#include "offapi/com/sun/star/i18n/MultipleCharsOutputException.hpp"
+#include "offapi/com/sun/star/i18n/NativeNumberXmlAttributes.hpp"
+#include "offapi/com/sun/star/i18n/NumberFormatCode.hpp"
+#include "offapi/com/sun/star/i18n/reservedWords.hpp"
+#include "offapi/com/sun/star/i18n/TransliterationModules.hpp"
+#include "offapi/com/sun/star/i18n/TransliterationModulesNew.hpp"
+#include "offapi/com/sun/star/i18n/UnicodeType.hpp"
+#include "offapi/com/sun/star/i18n/XBreakIterator.hpp"
+#include "offapi/com/sun/star/i18n/XCharacterClassification.hpp"
+#include "offapi/com/sun/star/i18n/XCollator.hpp"
+#include "offapi/com/sun/star/i18n/XExtendedTransliteration.hpp"
+#include "offapi/com/sun/star/i18n/XForbiddenCharacters.hpp"
+#include "offapi/com/sun/star/i18n/XLocaleData.hpp"
+#include "offapi/com/sun/star/i18n/XLocaleData2.hpp"
+#include "offapi/com/sun/star/i18n/XLocaleData3.hpp"
+#include "offapi/com/sun/star/i18n/XLocaleData4.hpp"
+#include "offapi/com/sun/star/i18n/XNativeNumberSupplier.hpp"
+#include "offapi/com/sun/star/i18n/XTransliteration.hpp"
+#include "offapi/com/sun/star/linguistic2/XHyphenatedWord.hpp"
+#include "offapi/com/sun/star/linguistic2/XHyphenator.hpp"
+#include "offapi/com/sun/star/linguistic2/XPossibleHyphens.hpp"
+#include "offapi/com/sun/star/linguistic2/XSupportedLocales.hpp"
+#include "offapi/com/sun/star/media/ZoomLevel.hpp"
+#include "offapi/com/sun/star/office/XAnnotation.hpp"
+#include "offapi/com/sun/star/office/XAnnotationAccess.hpp"
+#include "offapi/com/sun/star/office/XAnnotationEnumeration.hpp"
+#include "offapi/com/sun/star/packages/zip/ZipIOException.hpp"
+#include "offapi/com/sun/star/presentation/AnimationEffect.hpp"
+#include "offapi/com/sun/star/presentation/AnimationSpeed.hpp"
+#include "offapi/com/sun/star/presentation/ClickAction.hpp"
+#include "offapi/com/sun/star/presentation/EffectCommands.hpp"
+#include "offapi/com/sun/star/presentation/EffectNodeType.hpp"
+#include "offapi/com/sun/star/presentation/EffectPresetClass.hpp"
+#include "offapi/com/sun/star/presentation/FadeEffect.hpp"
+#include "offapi/com/sun/star/presentation/ParagraphTarget.hpp"
+#include "offapi/com/sun/star/presentation/ShapeAnimationSubType.hpp"
+#include "offapi/com/sun/star/presentation/TextAnimationType.hpp"
+#include "offapi/com/sun/star/presentation/XCustomPresentationSupplier.hpp"
+#include "offapi/com/sun/star/presentation/XHandoutMasterSupplier.hpp"
+#include "offapi/com/sun/star/presentation/XPresentationPage.hpp"
+#include "offapi/com/sun/star/presentation/XPresentationSupplier.hpp"
+#include "offapi/com/sun/star/rdf/ParseException.hpp"
+#include "offapi/com/sun/star/rdf/QueryException.hpp"
+#include "offapi/com/sun/star/rdf/RepositoryException.hpp"
+#include "offapi/com/sun/star/rdf/Statement.hpp"
+#include "offapi/com/sun/star/rdf/URI.hpp"
+#include "offapi/com/sun/star/rdf/URIs.hpp"
+#include "offapi/com/sun/star/rdf/XBlankNode.hpp"
+#include "offapi/com/sun/star/rdf/XDocumentMetadataAccess.hpp"
+#include "offapi/com/sun/star/rdf/XDocumentRepository.hpp"
+#include "offapi/com/sun/star/rdf/XLiteral.hpp"
+#include "offapi/com/sun/star/rdf/XMetadatable.hpp"
+#include "offapi/com/sun/star/rdf/XNamedGraph.hpp"
+#include "offapi/com/sun/star/rdf/XNode.hpp"
+#include "offapi/com/sun/star/rdf/XQuerySelectResult.hpp"
+#include "offapi/com/sun/star/rdf/XRepository.hpp"
+#include "offapi/com/sun/star/rdf/XRepositorySupplier.hpp"
+#include "offapi/com/sun/star/rdf/XResource.hpp"
+#include "offapi/com/sun/star/rdf/XURI.hpp"
+#include "offapi/com/sun/star/rendering/FillRule.hpp"
+#include "offapi/com/sun/star/rendering/XBezierPolyPolygon2D.hpp"
+#include "offapi/com/sun/star/rendering/XLinePolyPolygon2D.hpp"
+#include "offapi/com/sun/star/rendering/XPolyPolygon2D.hpp"
+#include "offapi/com/sun/star/script/XLibraryContainer.hpp"
+#include "offapi/com/sun/star/script/XLibraryContainer2.hpp"
+#include "offapi/com/sun/star/script/XPersistentLibraryContainer.hpp"
+#include "offapi/com/sun/star/script/XStorageBasedLibraryContainer.hpp"
+#include "offapi/com/sun/star/sdb/CommandType.hpp"
+#include "offapi/com/sun/star/sdbc/SQLException.hpp"
+#include "offapi/com/sun/star/sdbc/XArray.hpp"
+#include "offapi/com/sun/star/sdbc/XBlob.hpp"
+#include "offapi/com/sun/star/sdbc/XClob.hpp"
+#include "offapi/com/sun/star/sdbc/XCloseable.hpp"
+#include "offapi/com/sun/star/sdbc/XConnection.hpp"
+#include "offapi/com/sun/star/sdbc/XDatabaseMetaData.hpp"
+#include "offapi/com/sun/star/sdbc/XParameters.hpp"
+#include "offapi/com/sun/star/sdbc/XPreparedStatement.hpp"
+#include "offapi/com/sun/star/sdbc/XRef.hpp"
+#include "offapi/com/sun/star/sdbc/XResultSet.hpp"
+#include "offapi/com/sun/star/sdbc/XRowSet.hpp"
+#include "offapi/com/sun/star/sdbc/XRowSetListener.hpp"
+#include "offapi/com/sun/star/sdbc/XStatement.hpp"
+#include "offapi/com/sun/star/sheet/RangeSelectionEvent.hpp"
+#include "offapi/com/sun/star/sheet/XRangeSelection.hpp"
+#include "offapi/com/sun/star/sheet/XRangeSelectionChangeListener.hpp"
+#include "offapi/com/sun/star/sheet/XRangeSelectionListener.hpp"
+#include "offapi/com/sun/star/sheet/XSpreadsheetDocument.hpp"
+#include "offapi/com/sun/star/style/BreakType.hpp"
+#include "offapi/com/sun/star/style/CaseMap.hpp"
+#include "offapi/com/sun/star/style/DropCapFormat.hpp"
+#include "offapi/com/sun/star/style/GraphicLocation.hpp"
+#include "offapi/com/sun/star/style/LineNumberPosition.hpp"
+#include "offapi/com/sun/star/style/LineSpacing.hpp"
+#include "offapi/com/sun/star/style/NumberingType.hpp"
+#include "offapi/com/sun/star/style/PageStyleLayout.hpp"
+#include "offapi/com/sun/star/style/ParagraphAdjust.hpp"
+#include "offapi/com/sun/star/style/ParagraphStyleCategory.hpp"
+#include "offapi/com/sun/star/style/TabAlign.hpp"
+#include "offapi/com/sun/star/style/TabStop.hpp"
+#include "offapi/com/sun/star/style/VerticalAlignment.hpp"
+#include "offapi/com/sun/star/style/XAutoStyle.hpp"
+#include "offapi/com/sun/star/style/XAutoStyleFamily.hpp"
+#include "offapi/com/sun/star/style/XAutoStyles.hpp"
+#include "offapi/com/sun/star/style/XAutoStylesSupplier.hpp"
+#include "offapi/com/sun/star/style/XStyle.hpp"
+#include "offapi/com/sun/star/style/XStyleFamiliesSupplier.hpp"
+#include "offapi/com/sun/star/table/BorderLine.hpp"
+#include "offapi/com/sun/star/table/BorderLine2.hpp"
+#include "offapi/com/sun/star/table/CellAddress.hpp"
+#include "offapi/com/sun/star/table/CellContentType.hpp"
+#include "offapi/com/sun/star/table/CellRangeAddress.hpp"
+#include "offapi/com/sun/star/table/ShadowFormat.hpp"
+#include "offapi/com/sun/star/table/XCell.hpp"
+#include "offapi/com/sun/star/table/XCellCursor.hpp"
+#include "offapi/com/sun/star/table/XCellRange.hpp"
+#include "offapi/com/sun/star/table/XColumnRowRange.hpp"
+#include "offapi/com/sun/star/table/XMergeableCell.hpp"
+#include "offapi/com/sun/star/table/XMergeableCellRange.hpp"
+#include "offapi/com/sun/star/table/XTable.hpp"
+#include "offapi/com/sun/star/table/XTableColumns.hpp"
+#include "offapi/com/sun/star/table/XTableRows.hpp"
+#include "offapi/com/sun/star/task/ErrorCodeIOException.hpp"
+#include "offapi/com/sun/star/task/XStatusIndicator.hpp"
+#include "offapi/com/sun/star/task/XStatusIndicatorSupplier.hpp"
+#include "offapi/com/sun/star/text/BibliographyDataField.hpp"
+#include "offapi/com/sun/star/text/BibliographyDataType.hpp"
+#include "offapi/com/sun/star/text/ChapterFormat.hpp"
+#include "offapi/com/sun/star/text/ControlCharacter.hpp"
+#include "offapi/com/sun/star/text/DefaultNumberingProvider.hpp"
+#include "offapi/com/sun/star/text/FilenameDisplayFormat.hpp"
+#include "offapi/com/sun/star/text/FontEmphasis.hpp"
+#include "offapi/com/sun/star/text/FontRelief.hpp"
+#include "offapi/com/sun/star/text/FootnoteNumbering.hpp"
+#include "offapi/com/sun/star/text/GraphicCrop.hpp"
+#include "offapi/com/sun/star/text/HoriOrientation.hpp"
+#include "offapi/com/sun/star/text/HorizontalAdjust.hpp"
+#include "offapi/com/sun/star/text/LabelFollow.hpp"
+#include "offapi/com/sun/star/text/PageNumberType.hpp"
+#include "offapi/com/sun/star/text/ParagraphVertAlign.hpp"
+#include "offapi/com/sun/star/text/PlaceholderType.hpp"
+#include "offapi/com/sun/star/text/PositionAndSpaceMode.hpp"
+#include "offapi/com/sun/star/text/PositionLayoutDir.hpp"
+#include "offapi/com/sun/star/text/ReferenceFieldPart.hpp"
+#include "offapi/com/sun/star/text/ReferenceFieldSource.hpp"
+#include "offapi/com/sun/star/text/RelOrientation.hpp"
+#include "offapi/com/sun/star/text/RubyAdjust.hpp"
+#include "offapi/com/sun/star/text/SectionFileLink.hpp"
+#include "offapi/com/sun/star/text/SetVariableType.hpp"
+#include "offapi/com/sun/star/text/SizeType.hpp"
+#include "offapi/com/sun/star/text/TemplateDisplayFormat.hpp"
+#include "offapi/com/sun/star/text/TextColumn.hpp"
+#include "offapi/com/sun/star/text/TextContentAnchorType.hpp"
+#include "offapi/com/sun/star/text/UserDataPart.hpp"
+#include "offapi/com/sun/star/text/VertOrientation.hpp"
+#include "offapi/com/sun/star/text/WrapTextMode.hpp"
+#include "offapi/com/sun/star/text/WritingMode.hpp"
+#include "offapi/com/sun/star/text/WritingMode2.hpp"
+#include "offapi/com/sun/star/text/XBookmarksSupplier.hpp"
+#include "offapi/com/sun/star/text/XChapterNumberingSupplier.hpp"
+#include "offapi/com/sun/star/text/XDefaultNumberingProvider.hpp"
+#include "offapi/com/sun/star/text/XDependentTextField.hpp"
+#include "offapi/com/sun/star/text/XDocumentIndex.hpp"
+#include "offapi/com/sun/star/text/XEndnotesSupplier.hpp"
+#include "offapi/com/sun/star/text/XFootnote.hpp"
+#include "offapi/com/sun/star/text/XFootnotesSupplier.hpp"
+#include "offapi/com/sun/star/text/XFormField.hpp"
+#include "offapi/com/sun/star/text/XLineNumberingProperties.hpp"
+#include "offapi/com/sun/star/text/XNumberingRulesSupplier.hpp"
+#include "offapi/com/sun/star/text/XNumberingTypeInfo.hpp"
+#include "offapi/com/sun/star/text/XRelativeTextContentInsert.hpp"
+#include "offapi/com/sun/star/text/XRelativeTextContentRemove.hpp"
+#include "offapi/com/sun/star/text/XText.hpp"
+#include "offapi/com/sun/star/text/XTextColumns.hpp"
+#include "offapi/com/sun/star/text/XTextContent.hpp"
+#include "offapi/com/sun/star/text/XTextCursor.hpp"
+#include "offapi/com/sun/star/text/XTextDocument.hpp"
+#include "offapi/com/sun/star/text/XTextEmbeddedObjectsSupplier.hpp"
+#include "offapi/com/sun/star/text/XTextField.hpp"
+#include "offapi/com/sun/star/text/XTextFieldsSupplier.hpp"
+#include "offapi/com/sun/star/text/XTextFrame.hpp"
+#include "offapi/com/sun/star/text/XTextFramesSupplier.hpp"
+#include "offapi/com/sun/star/text/XTextGraphicObjectsSupplier.hpp"
+#include "offapi/com/sun/star/text/XTextRange.hpp"
+#include "offapi/com/sun/star/text/XTextRangeCompare.hpp"
+#include "offapi/com/sun/star/text/XTextSection.hpp"
+#include "offapi/com/sun/star/text/XTextSectionsSupplier.hpp"
+#include "offapi/com/sun/star/text/XTextShapesSupplier.hpp"
+#include "offapi/com/sun/star/text/XTextTable.hpp"
+#include "offapi/com/sun/star/text/XTextTableCursor.hpp"
+#include "offapi/com/sun/star/text/XTextTablesSupplier.hpp"
+#include "offapi/com/sun/star/ucb/XAnyCompare.hpp"
+#include "offapi/com/sun/star/ucb/XAnyCompareFactory.hpp"
+#include "offapi/com/sun/star/util/CloseVetoException.hpp"
+#include "offapi/com/sun/star/util/Color.hpp"
+#include "offapi/com/sun/star/util/Date.hpp"
+#include "offapi/com/sun/star/util/Duration.hpp"
+#include "offapi/com/sun/star/util/MeasureUnit.hpp"
+#include "offapi/com/sun/star/util/NumberFormat.hpp"
+#include "offapi/com/sun/star/util/PathSubstitution.hpp"
+#include "offapi/com/sun/star/util/RevisionTag.hpp"
+#include "offapi/com/sun/star/util/Time.hpp"
+#include "offapi/com/sun/star/util/XCloneable.hpp"
+#include "offapi/com/sun/star/util/XModifiable.hpp"
+#include "offapi/com/sun/star/util/XModifiable2.hpp"
+#include "offapi/com/sun/star/util/XNumberFormats.hpp"
+#include "offapi/com/sun/star/util/XNumberFormatsSupplier.hpp"
+#include "offapi/com/sun/star/util/XRefreshable.hpp"
+#include "offapi/com/sun/star/util/XRefreshListener.hpp"
+#include "offapi/com/sun/star/util/XStringMapping.hpp"
+#include "offapi/com/sun/star/util/XStringSubstitution.hpp"
+#include "offapi/com/sun/star/util/XUpdatable.hpp"
+#include "offapi/com/sun/star/view/PaperOrientation.hpp"
+#include "offapi/com/sun/star/view/XSelectionChangeListener.hpp"
+#include "offapi/com/sun/star/xforms/XDataTypeRepository.hpp"
+#include "offapi/com/sun/star/xforms/XFormsSupplier.hpp"
+#include "offapi/com/sun/star/xforms/XModel.hpp"
+#include "offapi/com/sun/star/xml/AttributeData.hpp"
+#include "offapi/com/sun/star/xml/dom/NodeType.hpp"
+#include "offapi/com/sun/star/xml/dom/SAXDocumentBuilderState.hpp"
+#include "offapi/com/sun/star/xml/dom/XAttr.hpp"
+#include "offapi/com/sun/star/xml/dom/XDocument.hpp"
+#include "offapi/com/sun/star/xml/dom/XDocumentBuilder.hpp"
+#include "offapi/com/sun/star/xml/dom/XDocumentFragment.hpp"
+#include "offapi/com/sun/star/xml/dom/XElement.hpp"
+#include "offapi/com/sun/star/xml/dom/XEntity.hpp"
+#include "offapi/com/sun/star/xml/dom/XNode.hpp"
+#include "offapi/com/sun/star/xml/dom/XNodeList.hpp"
+#include "offapi/com/sun/star/xml/dom/XNotation.hpp"
+#include "offapi/com/sun/star/xml/dom/XSAXDocumentBuilder.hpp"
+#include "offapi/com/sun/star/xml/sax/InputSource.hpp"
+#include "offapi/com/sun/star/xml/sax/SAXException.hpp"
+#include "offapi/com/sun/star/xml/sax/SAXInvalidCharacterException.hpp"
+#include "offapi/com/sun/star/xml/sax/SAXParseException.hpp"
+#include "offapi/com/sun/star/xml/sax/XAttributeList.hpp"
+#include "offapi/com/sun/star/xml/sax/XDocumentHandler.hpp"
+#include "offapi/com/sun/star/xml/sax/XExtendedDocumentHandler.hpp"
+#include "offapi/com/sun/star/xml/sax/XLocator.hpp"
+#include "offapi/com/sun/star/xml/sax/XSAXSerializable.hpp"
+#include "offapi/com/sun/star/xml/xpath/Libxml2ExtensionHandle.hpp"
+#include "offapi/com/sun/star/xml/xpath/XPathException.hpp"
+#include "offapi/com/sun/star/xml/xpath/XPathObjectType.hpp"
+#include "offapi/com/sun/star/xml/xpath/XXPathAPI.hpp"
+#include "offapi/com/sun/star/xml/xpath/XXPathExtension.hpp"
+#include "offapi/com/sun/star/xml/xpath/XXPathObject.hpp"
+#include "offapi/com/sun/star/xsd/DataTypeClass.hpp"
+#include "offapi/com/sun/star/xsd/WhiteSpaceTreatment.hpp"
+#include "offapi/com/sun/star/xsd/XDataType.hpp"
+#include "officecfg/Office/Common.hxx"
+#include "osl/diagnose.h"
+#include "osl/interlck.h"
+#include "osl/mutex.hxx"
+#include "osl/thread.h"
+#include "rsc/rscsfx.hxx"
+#include "rtl/alloc.h"
+#include "rtl/instance.hxx"
+#include "rtl/logfile.hxx"
+#include "rtl/math.hxx"
+#include "rtl/memory.h"
+#include "rtl/oustringostreaminserter.hxx"
+#include "rtl/ref.hxx"
+#include "rtl/strbuf.h"
+#include "rtl/strbuf.hxx"
+#include "rtl/string.h"
+#include "rtl/string.hxx"
+#include "rtl/stringutils.hxx"
+#include "rtl/textenc.h"
+#include "rtl/ustrbuf.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "rtl/uuid.h"
+#include "sal/config.h"
+#include "sal/macros.h"
+#include "sal/types.h"
+#include "salhelper/simplereferenceobject.hxx"
+#include "sax/saxdllapi.h"
+#include "sax/tools/converter.hxx"
+#include "sot/clsids.hxx"
+#include "svl/cntnrsrt.hxx"
+#include "svl/itemset.hxx"
+#include "svl/nfkeytab.hxx"
+#include "svl/nfsymbol.hxx"
+#include "svl/nfversi.hxx"
+#include "svl/numuno.hxx"
+#include "svl/ondemand.hxx"
+#include "svl/svarray.hxx"
+#include "svl/svldllapi.h"
+#include "svl/svstdarr.hxx"
+#include "svl/urihelper.hxx"
+#include "svl/zforlist.hxx"
+#include "svl/zformat.hxx"
+#include "tools/color.hxx"
+#include "tools/date.hxx"
+#include "tools/debug.hxx"
+#include "tools/diagnose_ex.h"
+#include "tools/fldunit.hxx"
+#include "tools/fontenum.hxx"
+#include "tools/gen.hxx"
+#include "tools/globname.hxx"
+#include "tools/link.hxx"
+#include "tools/mapunit.hxx"
+#include "tools/ref.hxx"
+#include "tools/rtti.hxx"
+#include "tools/solar.h"
+#include "tools/string.hxx"
+#include "tools/time.hxx"
+#include "tools/toolsdllapi.h"
+#include "tools/urlobj.hxx"
+#include "tools/wintypes.hxx"
+#include "typelib/typeclass.h"
+#include "typelib/typedescription.h"
+#include "udkapi/com/sun/star/beans/IllegalTypeException.hpp"
+#include "udkapi/com/sun/star/beans/NamedValue.hpp"
+#include "udkapi/com/sun/star/beans/Pair.hpp"
+#include "udkapi/com/sun/star/beans/PropertyAttribute.hpp"
+#include "udkapi/com/sun/star/beans/PropertyState.hpp"
+#include "udkapi/com/sun/star/beans/PropertyValue.hpp"
+#include "udkapi/com/sun/star/beans/PropertyValues.hpp"
+#include "udkapi/com/sun/star/beans/PropertyVetoException.hpp"
+#include "udkapi/com/sun/star/beans/StringPair.hpp"
+#include "udkapi/com/sun/star/beans/TolerantPropertySetResultType.hpp"
+#include "udkapi/com/sun/star/beans/UnknownPropertyException.hpp"
+#include "udkapi/com/sun/star/beans/XFastPropertySet.hpp"
+#include "udkapi/com/sun/star/beans/XMultiPropertySet.hpp"
+#include "udkapi/com/sun/star/beans/XMultiPropertyStates.hpp"
+#include "udkapi/com/sun/star/beans/XPropertyAccess.hpp"
+#include "udkapi/com/sun/star/beans/XPropertyContainer.hpp"
+#include "udkapi/com/sun/star/beans/XPropertySet.hpp"
+#include "udkapi/com/sun/star/beans/XPropertySetInfo.hpp"
+#include "udkapi/com/sun/star/beans/XPropertyState.hpp"
+#include "udkapi/com/sun/star/beans/XTolerantMultiPropertySet.hpp"
+#include "udkapi/com/sun/star/container/ElementExistException.hpp"
+#include "udkapi/com/sun/star/container/NoSuchElementException.hpp"
+#include "udkapi/com/sun/star/container/XChild.hpp"
+#include "udkapi/com/sun/star/container/XContentEnumerationAccess.hpp"
+#include "udkapi/com/sun/star/container/XEnumeration.hpp"
+#include "udkapi/com/sun/star/container/XEnumerationAccess.hpp"
+#include "udkapi/com/sun/star/container/XIdentifierAccess.hpp"
+#include "udkapi/com/sun/star/container/XIdentifierContainer.hpp"
+#include "udkapi/com/sun/star/container/XIndexAccess.hpp"
+#include "udkapi/com/sun/star/container/XIndexContainer.hpp"
+#include "udkapi/com/sun/star/container/XIndexReplace.hpp"
+#include "udkapi/com/sun/star/container/XNameAccess.hpp"
+#include "udkapi/com/sun/star/container/XNameContainer.hpp"
+#include "udkapi/com/sun/star/container/XNamed.hpp"
+#include "udkapi/com/sun/star/container/XNameReplace.hpp"
+#include "udkapi/com/sun/star/container/XSet.hpp"
+#include "udkapi/com/sun/star/io/IOException.hpp"
+#include "udkapi/com/sun/star/io/WrongFormatException.hpp"
+#include "udkapi/com/sun/star/io/XActiveDataSource.hpp"
+#include "udkapi/com/sun/star/io/XInputStream.hpp"
+#include "udkapi/com/sun/star/io/XOutputStream.hpp"
+#include "udkapi/com/sun/star/io/XPersistObject.hpp"
+#include "udkapi/com/sun/star/io/XSeekable.hpp"
+#include "udkapi/com/sun/star/io/XSeekableInputStream.hpp"
+#include "udkapi/com/sun/star/io/XStream.hpp"
+#include "udkapi/com/sun/star/lang/DisposedException.hpp"
+#include "udkapi/com/sun/star/lang/EventObject.hpp"
+#include "udkapi/com/sun/star/lang/IllegalArgumentException.hpp"
+#include "udkapi/com/sun/star/lang/IndexOutOfBoundsException.hpp"
+#include "udkapi/com/sun/star/lang/Locale.hpp"
+#include "udkapi/com/sun/star/lang/NoSupportException.hpp"
+#include "udkapi/com/sun/star/lang/ServiceNotRegisteredException.hpp"
+#include "udkapi/com/sun/star/lang/WrappedTargetException.hpp"
+#include "udkapi/com/sun/star/lang/WrappedTargetRuntimeException.hpp"
+#include "udkapi/com/sun/star/lang/XComponent.hpp"
+#include "udkapi/com/sun/star/lang/XEventListener.hpp"
+#include "udkapi/com/sun/star/lang/XInitialization.hpp"
+#include "udkapi/com/sun/star/lang/XMultiComponentFactory.hpp"
+#include "udkapi/com/sun/star/lang/XMultiServiceFactory.hpp"
+#include "udkapi/com/sun/star/lang/XServiceInfo.hpp"
+#include "udkapi/com/sun/star/lang/XServiceName.hpp"
+#include "udkapi/com/sun/star/lang/XSingleServiceFactory.hpp"
+#include "udkapi/com/sun/star/lang/XUnoTunnel.hpp"
+#include "udkapi/com/sun/star/registry/XRegistryKey.hpp"
+#include "udkapi/com/sun/star/script/ScriptEventDescriptor.hpp"
+#include "udkapi/com/sun/star/script/XEventAttacherManager.hpp"
+#include "udkapi/com/sun/star/task/XInteractionHandler.hpp"
+#include "udkapi/com/sun/star/uno/DeploymentException.hpp"
+#include "udkapi/com/sun/star/uno/Exception.hpp"
+#include "udkapi/com/sun/star/uno/RuntimeException.hpp"
+#include "udkapi/com/sun/star/uno/TypeClass.hpp"
+#include "udkapi/com/sun/star/uno/XComponentContext.hpp"
+#include "udkapi/com/sun/star/uno/XInterface.hpp"
+#include "udkapi/com/sun/star/uri/UriReferenceFactory.hpp"
+#include "udkapi/com/sun/star/uri/XUriReference.hpp"
+#include "udkapi/com/sun/star/uri/XUriReferenceFactory.hpp"
+#include "uno/lbnames.h"
+#include "unotools/bootstrap.hxx"
+#include "unotools/calendarwrapper.hxx"
+#include "unotools/charclass.hxx"
+#include "unotools/collatorwrapper.hxx"
+#include "unotools/configmgr.hxx"
+#include "unotools/docinfohelper.hxx"
+#include "unotools/fontcvt.hxx"
+#include "unotools/localedatawrapper.hxx"
+#include "unotools/moduleoptions.hxx"
+#include "unotools/nativenumberwrapper.hxx"
+#include "unotools/options.hxx"
+#include "unotools/readwritemutexguard.hxx"
+#include "unotools/saveopt.hxx"
+#include "unotools/streamwrap.hxx"
+#include "unotools/syslocale.hxx"
+#include "unotools/transliterationwrapper.hxx"
+#include "unotools/unotoolsdllapi.h"
+
+#endif
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index e80ccdac10be..237f670c45f0 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -2768,7 +2768,7 @@ void SdXMLExport::exportAnnotations( const Reference<XDrawPage>& xDrawPage )
 
                 {
                     // date time
-                    DateTime aDate( xAnnotation->getDateTime() );
+                    com::sun::star::util::DateTime aDate( xAnnotation->getDateTime() );
                     ::sax::Converter::convertDateTime(sStringBuffer, aDate, true);
                     SvXMLElementExport aDateElem( *this, XML_NAMESPACE_DC, XML_DATE, sal_True, sal_False );
                     Characters(sStringBuffer.makeStringAndClear());
diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx
index 0bc59bb48c9b..dbae7c7f733d 100644
--- a/xmloff/source/draw/ximppage.cxx
+++ b/xmloff/source/draw/ximppage.cxx
@@ -193,7 +193,7 @@ void DrawAnnotationContext::EndElement()
     {
         mxAnnotation->setAuthor( maAuthorBuffer.makeStringAndClear() );
 
-        DateTime aDateTime;
+        util::DateTime aDateTime;
         if (::sax::Converter::convertDateTime(aDateTime,
                 maDateBuffer.makeStringAndClear()))
         {
diff --git a/xmloff/source/forms/attriblistmerge.cxx b/xmloff/source/forms/attriblistmerge.cxx
index 3e73761a7ce3..8d74287dd640 100644
--- a/xmloff/source/forms/attriblistmerge.cxx
+++ b/xmloff/source/forms/attriblistmerge.cxx
@@ -25,13 +25,13 @@ namespace xmloff
 //.........................................................................
 
     using namespace ::com::sun::star::uno;
-    using namespace ::com::sun::star::xml;
+    using namespace ::com::sun::star;
 
     //=====================================================================
     //= OAttribListMerger
     //=====================================================================
     //---------------------------------------------------------------------
-    void OAttribListMerger::addList(const Reference< sax::XAttributeList >& _rxList)
+    void OAttribListMerger::addList(const Reference< xml::sax::XAttributeList >& _rxList)
     {
         OSL_ENSURE(_rxList.is(), "OAttribListMerger::addList: invalid list!");
         if (_rxList.is())
@@ -39,7 +39,7 @@ namespace xmloff
     }
 
     //---------------------------------------------------------------------
-    sal_Bool OAttribListMerger::seekToIndex(sal_Int16 _nGlobalIndex, Reference< sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex)
+    sal_Bool OAttribListMerger::seekToIndex(sal_Int16 _nGlobalIndex, Reference< xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex)
     {
         sal_Int16 nLeftOver = _nGlobalIndex;
         ConstAttributeListArrayIterator aLookupSublist = m_aLists.begin();
@@ -60,7 +60,7 @@ namespace xmloff
     }
 
     //---------------------------------------------------------------------
-    sal_Bool OAttribListMerger::seekToName(const ::rtl::OUString& _rName, Reference< sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex)
+    sal_Bool OAttribListMerger::seekToName(const ::rtl::OUString& _rName, Reference< xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex)
     {
         for (   ConstAttributeListArrayIterator aLookupSublist = m_aLists.begin();
                 aLookupSublist != m_aLists.end();
@@ -93,7 +93,7 @@ namespace xmloff
     //---------------------------------------------------------------------
     ::rtl::OUString SAL_CALL OAttribListMerger::getNameByIndex( sal_Int16 i ) throw(RuntimeException)
     {
-        Reference< sax::XAttributeList > xSubList;
+        Reference< xml::sax::XAttributeList > xSubList;
         sal_Int16 nLocalIndex;
 
         if (!seekToIndex(i, xSubList, nLocalIndex))
@@ -105,7 +105,7 @@ namespace xmloff
     //---------------------------------------------------------------------
     ::rtl::OUString SAL_CALL OAttribListMerger::getTypeByIndex( sal_Int16 i ) throw(RuntimeException)
     {
-        Reference< sax::XAttributeList > xSubList;
+        Reference< xml::sax::XAttributeList > xSubList;
         sal_Int16 nLocalIndex;
 
         if (!seekToIndex(i, xSubList, nLocalIndex))
@@ -117,7 +117,7 @@ namespace xmloff
     //---------------------------------------------------------------------
     ::rtl::OUString SAL_CALL OAttribListMerger::getTypeByName( const ::rtl::OUString& _rName ) throw(RuntimeException)
     {
-        Reference< sax::XAttributeList > xSubList;
+        Reference< xml::sax::XAttributeList > xSubList;
         sal_Int16 nLocalIndex;
 
         if (!seekToName(_rName, xSubList, nLocalIndex))
@@ -131,7 +131,7 @@ namespace xmloff
     //---------------------------------------------------------------------
     ::rtl::OUString SAL_CALL OAttribListMerger::getValueByIndex( sal_Int16 i ) throw(RuntimeException)
     {
-        Reference< sax::XAttributeList > xSubList;
+        Reference< xml::sax::XAttributeList > xSubList;
         sal_Int16 nLocalIndex;
 
         if (!seekToIndex(i, xSubList, nLocalIndex))
@@ -143,7 +143,7 @@ namespace xmloff
     //---------------------------------------------------------------------
     ::rtl::OUString SAL_CALL OAttribListMerger::getValueByName( const ::rtl::OUString& _rName ) throw(RuntimeException)
     {
-        Reference< sax::XAttributeList > xSubList;
+        Reference< xml::sax::XAttributeList > xSubList;
         sal_Int16 nLocalIndex;
 
         if (!seekToName(_rName, xSubList, nLocalIndex))
diff --git a/xmloff/source/forms/formenums.cxx b/xmloff/source/forms/formenums.cxx
index c285269df78b..d68de5cc4db4 100644
--- a/xmloff/source/forms/formenums.cxx
+++ b/xmloff/source/forms/formenums.cxx
@@ -44,6 +44,7 @@ namespace xmloff
     using namespace ::com::sun::star::form;
     using namespace ::com::sun::star::sdb;
     using namespace ::com::sun::star::awt;
+    using namespace ::com::sun::star;
     using namespace ::xmloff::token;
 
     const SvXMLEnumMapEntry*    OEnumMapper::s_pEnumMap[OEnumMapper::KNOWN_ENUM_PROPERTIES] =
@@ -187,9 +188,9 @@ namespace xmloff
                 {
                     static SvXMLEnumMapEntry aTextAlignMap[] =
                     {
-                        { XML_START,        TextAlign::LEFT },
-                        { XML_CENTER,       TextAlign::CENTER },
-                        { XML_END,          TextAlign::RIGHT },
+                        { XML_START,        awt::TextAlign::LEFT },
+                        { XML_CENTER,       awt::TextAlign::CENTER },
+                        { XML_END,          awt::TextAlign::RIGHT },
                         { XML_JUSTIFY,      (sal_uInt16)-1 },
                         { XML_JUSTIFIED,    (sal_uInt16)-1 },
                         { XML_TOKEN_INVALID, 0 }
diff --git a/xmloff/source/forms/formlayerimport.cxx b/xmloff/source/forms/formlayerimport.cxx
index 741d318188e8..c9e06a012145 100644
--- a/xmloff/source/forms/formlayerimport.cxx
+++ b/xmloff/source/forms/formlayerimport.cxx
@@ -30,7 +30,7 @@ namespace xmloff
     using namespace ::com::sun::star::beans;
     using namespace ::com::sun::star::container;
     using namespace ::com::sun::star::drawing;
-    using namespace ::com::sun::star::xml;
+    using namespace ::com::sun::star;
 
     //=====================================================================
     //= OFormLayerXMLExport
@@ -84,7 +84,7 @@ namespace xmloff
 
     //---------------------------------------------------------------------
     SvXMLImportContext* OFormLayerXMLImport::createContext(const sal_uInt16 _nPrefix, const rtl::OUString& _rLocalName,
-        const Reference< sax::XAttributeList >& _rxAttribs)
+        const Reference< xml::sax::XAttributeList >& _rxAttribs)
     {
         return m_pImpl->createContext(_nPrefix, _rLocalName, _rxAttribs);
     }
diff --git a/xmloff/source/forms/gridcolumnproptranslator.cxx b/xmloff/source/forms/gridcolumnproptranslator.cxx
index d20d05514f22..f9f2e8ddca45 100644
--- a/xmloff/source/forms/gridcolumnproptranslator.cxx
+++ b/xmloff/source/forms/gridcolumnproptranslator.cxx
@@ -34,6 +34,7 @@ namespace xmloff
 
     using namespace ::com::sun::star::uno;
     using namespace ::com::sun::star::awt;
+    using namespace ::com::sun::star;
     using namespace ::com::sun::star::lang;
     using namespace ::com::sun::star::beans;
     using namespace ::com::sun::star::style;
@@ -74,12 +75,12 @@ namespace xmloff
             // note that order matters:
             // valueAlignToParaAdjust and valueParaAdjustToAlign search this map from the _beginning_
             // and use the first matching entry
-            { ParagraphAdjust_LEFT,             TextAlign::LEFT     },
-            { ParagraphAdjust_CENTER,           TextAlign::CENTER   },
-            { ParagraphAdjust_RIGHT,            TextAlign::RIGHT    },
-            { ParagraphAdjust_BLOCK,            TextAlign::RIGHT    },
-            { ParagraphAdjust_STRETCH,          TextAlign::LEFT     },
-            { ParagraphAdjust_MAKE_FIXED_SIZE,  TextAlign::LEFT     },
+            { ParagraphAdjust_LEFT,             awt::TextAlign::LEFT     },
+            { ParagraphAdjust_CENTER,           awt::TextAlign::CENTER   },
+            { ParagraphAdjust_RIGHT,            awt::TextAlign::RIGHT    },
+            { ParagraphAdjust_BLOCK,            awt::TextAlign::RIGHT    },
+            { ParagraphAdjust_STRETCH,          awt::TextAlign::LEFT     },
+            { ParagraphAdjust_MAKE_FIXED_SIZE,  awt::TextAlign::LEFT     },
             { ParagraphAdjust_MAKE_FIXED_SIZE,  -1 }
         };
 
diff --git a/xmloff/source/forms/layerimport.cxx b/xmloff/source/forms/layerimport.cxx
index d45ed57fcf89..af8bb19ed9ed 100644
--- a/xmloff/source/forms/layerimport.cxx
+++ b/xmloff/source/forms/layerimport.cxx
@@ -67,7 +67,7 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::drawing;
-using namespace ::com::sun::star::xml;
+using namespace ::com::sun::star;
 using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::form;
 using namespace ::com::sun::star::sdb;
@@ -505,7 +505,7 @@ SvXMLImportContext* OFormLayerXMLImport_Impl::createOfficeFormsContext(
 
 //---------------------------------------------------------------------
 SvXMLImportContext* OFormLayerXMLImport_Impl::createContext(const sal_uInt16 _nPrefix, const rtl::OUString& _rLocalName,
-    const Reference< sax::XAttributeList >&)
+    const Reference< xml::sax::XAttributeList >&)
 {
     SvXMLImportContext* pContext = NULL;
     if ( 0 == _rLocalName.compareToAscii( "form" ) )
diff --git a/xmloff/source/style/XMLFontStylesContext.cxx b/xmloff/source/style/XMLFontStylesContext.cxx
index c7775b9747c7..5997f1912c62 100644
--- a/xmloff/source/style/XMLFontStylesContext.cxx
+++ b/xmloff/source/style/XMLFontStylesContext.cxx
@@ -128,8 +128,8 @@ XMLFontStyleContext_Impl::XMLFontStyleContext_Impl( SvXMLImport& rImport,
     OUString sEmpty;
     aFamilyName <<= sEmpty;
     aStyleName <<= sEmpty;
-    aFamily <<= (sal_Int16)FontFamily::DONTKNOW;
-    aPitch <<= (sal_Int16)FontPitch::DONTKNOW;
+    aFamily <<= (sal_Int16)awt::FontFamily::DONTKNOW;
+    aPitch <<= (sal_Int16)awt::FontPitch::DONTKNOW;
     aEnc <<= (sal_Int16)rStyles.GetDfltCharset();
 }
 
diff --git a/xmloff/source/style/cdouthdl.cxx b/xmloff/source/style/cdouthdl.cxx
index d9f21e1d6fc1..8ea49063b909 100644
--- a/xmloff/source/style/cdouthdl.cxx
+++ b/xmloff/source/style/cdouthdl.cxx
@@ -34,43 +34,43 @@ using namespace ::xmloff::token;
 
 SvXMLEnumMapEntry pXML_CrossedoutType_Enum[] =
 {
-    { XML_NONE,                 FontStrikeout::NONE },
-    { XML_SINGLE,   FontStrikeout::SINGLE },
-    { XML_DOUBLE,               FontStrikeout::DOUBLE },
-    { XML_SINGLE,    FontStrikeout::BOLD },
-    { XML_SINGLE,    FontStrikeout::SLASH },
-    { XML_SINGLE,    FontStrikeout::X },
+    { XML_NONE,                 awt::FontStrikeout::NONE },
+    { XML_SINGLE,   awt::FontStrikeout::SINGLE },
+    { XML_DOUBLE,               awt::FontStrikeout::DOUBLE },
+    { XML_SINGLE,    awt::FontStrikeout::BOLD },
+    { XML_SINGLE,    awt::FontStrikeout::SLASH },
+    { XML_SINGLE,    awt::FontStrikeout::X },
     { XML_TOKEN_INVALID,                0 }
 };
 
 SvXMLEnumMapEntry pXML_CrossedoutStyle_Enum[] =
 {
-    { XML_NONE,                         FontStrikeout::NONE },
-    { XML_SOLID,                        FontStrikeout::SINGLE },
-    { XML_SOLID,                        FontStrikeout::DOUBLE },
-    { XML_SOLID,                        FontStrikeout::BOLD },
-    { XML_SOLID,                        FontStrikeout::SLASH },
-    { XML_SOLID,                        FontStrikeout::X },
-    { XML_DOTTED,               FontStrikeout::SINGLE },
-    { XML_DASH,             FontStrikeout::SINGLE },
-    { XML_LONG_DASH,            FontStrikeout::SINGLE },
-    { XML_DOT_DASH,         FontStrikeout::SINGLE },
-    { XML_DOT_DOT_DASH,     FontStrikeout::SINGLE },
-    { XML_WAVE,             FontStrikeout::SINGLE },
+    { XML_NONE,                         awt::FontStrikeout::NONE },
+    { XML_SOLID,                        awt::FontStrikeout::SINGLE },
+    { XML_SOLID,                        awt::FontStrikeout::DOUBLE },
+    { XML_SOLID,                        awt::FontStrikeout::BOLD },
+    { XML_SOLID,                        awt::FontStrikeout::SLASH },
+    { XML_SOLID,                        awt::FontStrikeout::X },
+    { XML_DOTTED,               awt::FontStrikeout::SINGLE },
+    { XML_DASH,             awt::FontStrikeout::SINGLE },
+    { XML_LONG_DASH,            awt::FontStrikeout::SINGLE },
+    { XML_DOT_DASH,         awt::FontStrikeout::SINGLE },
+    { XML_DOT_DOT_DASH,     awt::FontStrikeout::SINGLE },
+    { XML_WAVE,             awt::FontStrikeout::SINGLE },
     { XML_TOKEN_INVALID,                0 }
 };
 
 SvXMLEnumMapEntry pXML_CrossedoutWidth_Enum[] =
 {
-    { XML_AUTO,                 FontStrikeout::NONE },
-    { XML_AUTO,                 FontStrikeout::SINGLE },
-    { XML_AUTO,                 FontStrikeout::DOUBLE },
-    { XML_BOLD,     FontStrikeout::BOLD },
-    { XML_AUTO,                 FontStrikeout::SLASH },
-    { XML_AUTO,                 FontStrikeout::X },
-    { XML_THIN,                 FontStrikeout::NONE },
-    { XML_MEDIUM,               FontStrikeout::NONE },
-    { XML_THICK,                FontStrikeout::NONE },
+    { XML_AUTO,                 awt::FontStrikeout::NONE },
+    { XML_AUTO,                 awt::FontStrikeout::SINGLE },
+    { XML_AUTO,                 awt::FontStrikeout::DOUBLE },
+    { XML_BOLD,     awt::FontStrikeout::BOLD },
+    { XML_AUTO,                 awt::FontStrikeout::SLASH },
+    { XML_AUTO,                 awt::FontStrikeout::X },
+    { XML_THIN,                 awt::FontStrikeout::NONE },
+    { XML_MEDIUM,               awt::FontStrikeout::NONE },
+    { XML_THICK,                awt::FontStrikeout::NONE },
     { XML_TOKEN_INVALID,                0 }
 };
 
@@ -94,23 +94,23 @@ sal_Bool XMLCrossedOutTypePropHdl::importXML( const OUString& rStrImpValue, uno:
         // multi property: style and width might be set already.
         // If the old value is NONE, the new is used unchanged.
         sal_Int16 eStrikeout = sal_Int16();
-        if( (rValue >>= eStrikeout) && FontStrikeout::NONE!=eStrikeout )
+        if( (rValue >>= eStrikeout) && awt::FontStrikeout::NONE!=eStrikeout )
         {
             switch( eNewStrikeout )
             {
-            case FontStrikeout::NONE:
-            case FontStrikeout::SINGLE:
+            case awt::FontStrikeout::NONE:
+            case awt::FontStrikeout::SINGLE:
                 // keep existing line style
                 eNewStrikeout = eStrikeout;
                 break;
-            case FontStrikeout::DOUBLE:
+            case awt::FontStrikeout::DOUBLE:
                 // A double line style has priority over a solid or a bold
                 // line style,
                 // but not about any other line style
                 switch( eStrikeout )
                 {
-                case FontStrikeout::SINGLE:
-                case FontStrikeout::BOLD:
+                case awt::FontStrikeout::SINGLE:
+                case awt::FontStrikeout::BOLD:
                     break;
                 default:
                     // If a double line style is not supported for the existing
@@ -141,7 +141,7 @@ sal_Bool XMLCrossedOutTypePropHdl::exportXML( OUString& rStrExpValue, const uno:
     sal_Int16 nValue = sal_Int16();
     OUStringBuffer aOut;
 
-    if( (rValue >>= nValue) && FontStrikeout::DOUBLE==nValue )
+    if( (rValue >>= nValue) && awt::FontStrikeout::DOUBLE==nValue )
     {
         bRet = SvXMLUnitConverter::convertEnum(
             aOut, (sal_uInt16)nValue, pXML_CrossedoutType_Enum );
@@ -172,7 +172,7 @@ sal_Bool XMLCrossedOutStylePropHdl::importXML( const OUString& rStrImpValue, uno
         // multi property: style and width might be set already.
         // If the old value is NONE, the new is used unchanged.
         sal_Int16 eStrikeout = sal_Int16();
-        if( (rValue >>= eStrikeout) && FontStrikeout::NONE!=eStrikeout )
+        if( (rValue >>= eStrikeout) && awt::FontStrikeout::NONE!=eStrikeout )
         {
             // one NONE a SINGLE are possible new values. For both, the
             // existing value is kept.
@@ -223,18 +223,18 @@ sal_Bool XMLCrossedOutWidthPropHdl::importXML( const OUString& rStrImpValue, uno
         // multi property: style and width might be set already.
         // If the old value is NONE, the new is used unchanged.
         sal_Int16 eStrikeout = sal_Int16();
-        if( (rValue >>= eStrikeout) && FontStrikeout::NONE!=eStrikeout )
+        if( (rValue >>= eStrikeout) && awt::FontStrikeout::NONE!=eStrikeout )
         {
             switch( eNewStrikeout )
             {
-            case FontStrikeout::NONE:
+            case awt::FontStrikeout::NONE:
                 // keep existing line style
                 eNewStrikeout = eStrikeout;
                 break;
-            case FontStrikeout::BOLD:
+            case awt::FontStrikeout::BOLD:
                 switch( eStrikeout )
                 {
-                case FontStrikeout::SINGLE:
+                case awt::FontStrikeout::SINGLE:
                     break;
                 default:
                     // If a double line style is not supported for the existing
@@ -264,7 +264,7 @@ sal_Bool XMLCrossedOutWidthPropHdl::exportXML( OUString& rStrExpValue, const uno
     sal_Int16 nValue = sal_Int16();
     OUStringBuffer aOut;
 
-    if( (rValue >>= nValue) && (FontStrikeout::BOLD == nValue) )
+    if( (rValue >>= nValue) && (awt::FontStrikeout::BOLD == nValue) )
     {
         bRet = SvXMLUnitConverter::convertEnum(
             aOut, (sal_uInt16)nValue, pXML_CrossedoutWidth_Enum );
@@ -292,8 +292,8 @@ sal_Bool XMLCrossedOutTextPropHdl::importXML( const OUString& rStrImpValue, uno:
     if( !rStrImpValue.isEmpty() )
     {
         sal_Int16 eStrikeout = ('/' == rStrImpValue[0]
-                                        ? FontStrikeout::SLASH
-                                        : FontStrikeout::X);
+                                        ? awt::FontStrikeout::SLASH
+                                        : awt::FontStrikeout::X);
         rValue <<= (sal_Int16)eStrikeout;
         bRet = sal_True;
     }
@@ -307,10 +307,10 @@ sal_Bool XMLCrossedOutTextPropHdl::exportXML( OUString& rStrExpValue, const uno:
     sal_Int16 nValue = sal_Int16();
 
     if( (rValue >>= nValue) &&
-        (FontStrikeout::SLASH == nValue || FontStrikeout::X == nValue) )
+        (awt::FontStrikeout::SLASH == nValue || awt::FontStrikeout::X == nValue) )
     {
         rStrExpValue = OUString::valueOf(
-            static_cast< sal_Unicode>( FontStrikeout::SLASH == nValue ? '/'
+            static_cast< sal_Unicode>( awt::FontStrikeout::SLASH == nValue ? '/'
                                                                       : 'X' ) );
         bRet = sal_True;
     }
diff --git a/xmloff/source/style/undlihdl.cxx b/xmloff/source/style/undlihdl.cxx
index 803fb5fe9416..a4b4907ec4a0 100644
--- a/xmloff/source/style/undlihdl.cxx
+++ b/xmloff/source/style/undlihdl.cxx
@@ -35,72 +35,72 @@ using namespace ::xmloff::token;
 
 SvXMLEnumMapEntry const pXML_UnderlineType_Enum[] =
 {
-    { XML_NONE,                         FontUnderline::NONE },
-    { XML_SINGLE,               FontUnderline::SINGLE },
-    { XML_DOUBLE,                       FontUnderline::DOUBLE },
-    { XML_SINGLE,               FontUnderline::DOTTED },
-    { XML_SINGLE,               FontUnderline::DASH },
-    { XML_SINGLE,               FontUnderline::LONGDASH },
-    { XML_SINGLE,               FontUnderline::DASHDOT },
-    { XML_SINGLE,               FontUnderline::DASHDOTDOT },
-    { XML_SINGLE,               FontUnderline::WAVE },
-    { XML_SINGLE,               FontUnderline::BOLD },
-    { XML_SINGLE,               FontUnderline::BOLDDOTTED },
-    { XML_SINGLE,               FontUnderline::BOLDDASH },
-    { XML_SINGLE,               FontUnderline::BOLDLONGDASH },
-    { XML_SINGLE,               FontUnderline::BOLDDASHDOT },
-    { XML_SINGLE,           FontUnderline::BOLDDASHDOTDOT },
-    { XML_SINGLE,               FontUnderline::BOLDWAVE },
-    { XML_DOUBLE,                       FontUnderline::DOUBLEWAVE },
-    { XML_SINGLE,               FontUnderline::SMALLWAVE },
+    { XML_NONE,                         awt::FontUnderline::NONE },
+    { XML_SINGLE,               awt::FontUnderline::SINGLE },
+    { XML_DOUBLE,                       awt::FontUnderline::DOUBLE },
+    { XML_SINGLE,               awt::FontUnderline::DOTTED },
+    { XML_SINGLE,               awt::FontUnderline::DASH },
+    { XML_SINGLE,               awt::FontUnderline::LONGDASH },
+    { XML_SINGLE,               awt::FontUnderline::DASHDOT },
+    { XML_SINGLE,               awt::FontUnderline::DASHDOTDOT },
+    { XML_SINGLE,               awt::FontUnderline::WAVE },
+    { XML_SINGLE,               awt::FontUnderline::BOLD },
+    { XML_SINGLE,               awt::FontUnderline::BOLDDOTTED },
+    { XML_SINGLE,               awt::FontUnderline::BOLDDASH },
+    { XML_SINGLE,               awt::FontUnderline::BOLDLONGDASH },
+    { XML_SINGLE,               awt::FontUnderline::BOLDDASHDOT },
+    { XML_SINGLE,           awt::FontUnderline::BOLDDASHDOTDOT },
+    { XML_SINGLE,               awt::FontUnderline::BOLDWAVE },
+    { XML_DOUBLE,                       awt::FontUnderline::DOUBLEWAVE },
+    { XML_SINGLE,               awt::FontUnderline::SMALLWAVE },
     { XML_TOKEN_INVALID,                0 }
 };
 
 SvXMLEnumMapEntry const pXML_UnderlineStyle_Enum[] =
 {
-    { XML_NONE,                         FontUnderline::NONE },
-    { XML_SOLID,                        FontUnderline::SINGLE },
-    { XML_SOLID,                        FontUnderline::DOUBLE },
-    { XML_DOTTED,               FontUnderline::DOTTED },
-    { XML_DASH,             FontUnderline::DASH },
-    { XML_LONG_DASH,            FontUnderline::LONGDASH },
-    { XML_DOT_DASH,         FontUnderline::DASHDOT },
-    { XML_DOT_DOT_DASH,     FontUnderline::DASHDOTDOT },
-    { XML_WAVE,             FontUnderline::WAVE },
-    { XML_SOLID,                        FontUnderline::BOLD },
-    { XML_DOTTED,               FontUnderline::BOLDDOTTED },
-    { XML_DASH,             FontUnderline::BOLDDASH },
-    { XML_LONG_DASH,            FontUnderline::BOLDLONGDASH },
-    { XML_DOT_DASH,         FontUnderline::BOLDDASHDOT },
-    { XML_DOT_DOT_DASH,         FontUnderline::BOLDDASHDOTDOT },
-    { XML_WAVE,             FontUnderline::BOLDWAVE },
-    { XML_WAVE,                 FontUnderline::DOUBLEWAVE },
-    { XML_SMALL_WAVE,           FontUnderline::SMALLWAVE },
+    { XML_NONE,                         awt::FontUnderline::NONE },
+    { XML_SOLID,                        awt::FontUnderline::SINGLE },
+    { XML_SOLID,                        awt::FontUnderline::DOUBLE },
+    { XML_DOTTED,               awt::FontUnderline::DOTTED },
+    { XML_DASH,             awt::FontUnderline::DASH },
+    { XML_LONG_DASH,            awt::FontUnderline::LONGDASH },
+    { XML_DOT_DASH,         awt::FontUnderline::DASHDOT },
+    { XML_DOT_DOT_DASH,     awt::FontUnderline::DASHDOTDOT },
+    { XML_WAVE,             awt::FontUnderline::WAVE },
+    { XML_SOLID,                        awt::FontUnderline::BOLD },
+    { XML_DOTTED,               awt::FontUnderline::BOLDDOTTED },
+    { XML_DASH,             awt::FontUnderline::BOLDDASH },
+    { XML_LONG_DASH,            awt::FontUnderline::BOLDLONGDASH },
+    { XML_DOT_DASH,         awt::FontUnderline::BOLDDASHDOT },
+    { XML_DOT_DOT_DASH,         awt::FontUnderline::BOLDDASHDOTDOT },
+    { XML_WAVE,             awt::FontUnderline::BOLDWAVE },
+    { XML_WAVE,                 awt::FontUnderline::DOUBLEWAVE },
+    { XML_SMALL_WAVE,           awt::FontUnderline::SMALLWAVE },
     { XML_TOKEN_INVALID,                0 }
 };
 
 SvXMLEnumMapEntry const pXML_UnderlineWidth_Enum[] =
 {
-    { XML_AUTO,                         FontUnderline::NONE },
-    { XML_AUTO,                         FontUnderline::SINGLE },
-    { XML_AUTO,                         FontUnderline::DOUBLE },
-    { XML_AUTO,                         FontUnderline::DOTTED },
-    { XML_AUTO,                         FontUnderline::DASH },
-    { XML_AUTO,                         FontUnderline::LONGDASH },
-    { XML_AUTO,                         FontUnderline::DASHDOT },
-    { XML_AUTO,                         FontUnderline::DASHDOTDOT },
-    { XML_AUTO,                         FontUnderline::WAVE },
-    { XML_BOLD,             FontUnderline::BOLD },
-    { XML_BOLD,             FontUnderline::BOLDDOTTED },
-    { XML_BOLD,             FontUnderline::BOLDDASH },
-    { XML_BOLD,             FontUnderline::BOLDLONGDASH },
-    { XML_BOLD,             FontUnderline::BOLDDASHDOT },
-    { XML_BOLD,                 FontUnderline::BOLDDASHDOTDOT },
-    { XML_BOLD,             FontUnderline::BOLDWAVE },
-    { XML_AUTO,                         FontUnderline::DOUBLEWAVE },
-    { XML_THIN,                         FontUnderline::NONE },
-    { XML_MEDIUM,                       FontUnderline::NONE },
-    { XML_THICK,                        FontUnderline::BOLD},
+    { XML_AUTO,                         awt::FontUnderline::NONE },
+    { XML_AUTO,                         awt::FontUnderline::SINGLE },
+    { XML_AUTO,                         awt::FontUnderline::DOUBLE },
+    { XML_AUTO,                         awt::FontUnderline::DOTTED },
+    { XML_AUTO,                         awt::FontUnderline::DASH },
+    { XML_AUTO,                         awt::FontUnderline::LONGDASH },
+    { XML_AUTO,                         awt::FontUnderline::DASHDOT },
+    { XML_AUTO,                         awt::FontUnderline::DASHDOTDOT },
+    { XML_AUTO,                         awt::FontUnderline::WAVE },
+    { XML_BOLD,             awt::FontUnderline::BOLD },
+    { XML_BOLD,             awt::FontUnderline::BOLDDOTTED },
+    { XML_BOLD,             awt::FontUnderline::BOLDDASH },
+    { XML_BOLD,             awt::FontUnderline::BOLDLONGDASH },
+    { XML_BOLD,             awt::FontUnderline::BOLDDASHDOT },
+    { XML_BOLD,                 awt::FontUnderline::BOLDDASHDOTDOT },
+    { XML_BOLD,             awt::FontUnderline::BOLDWAVE },
+    { XML_AUTO,                         awt::FontUnderline::DOUBLEWAVE },
+    { XML_THIN,                         awt::FontUnderline::NONE },
+    { XML_MEDIUM,                       awt::FontUnderline::NONE },
+    { XML_THICK,                        awt::FontUnderline::BOLD},
     { XML_TOKEN_INVALID,                0 }
 };
 
@@ -126,26 +126,26 @@ sal_Bool XMLUnderlineTypePropHdl::importXML( const OUString& rStrImpValue, uno::
         // multi property: style and width might be set already.
         // If the old value is NONE, the new is used unchanged.
         sal_Int16 eUnderline = sal_Int16();
-        if( (rValue >>= eUnderline) && FontUnderline::NONE!=eUnderline )
+        if( (rValue >>= eUnderline) && awt::FontUnderline::NONE!=eUnderline )
         {
             switch( eNewUnderline )
             {
-            case FontUnderline::NONE:
-            case FontUnderline::SINGLE:
+            case awt::FontUnderline::NONE:
+            case awt::FontUnderline::SINGLE:
                 // keep existing line style
                 eNewUnderline = eUnderline;
                 break;
-            case FontUnderline::DOUBLE:
+            case awt::FontUnderline::DOUBLE:
                 // A double line style has priority over a bold line style,
                 // but not over the line style itself.
                 switch( eUnderline )
                 {
-                case FontUnderline::SINGLE:
-                case FontUnderline::BOLD:
+                case awt::FontUnderline::SINGLE:
+                case awt::FontUnderline::BOLD:
                     break;
-                case FontUnderline::WAVE:
-                case FontUnderline::BOLDWAVE:
-                    eNewUnderline = FontUnderline::DOUBLEWAVE;
+                case awt::FontUnderline::WAVE:
+                case awt::FontUnderline::BOLDWAVE:
+                    eNewUnderline = awt::FontUnderline::DOUBLEWAVE;
                     break;
                 default:
                     // If a double line style is not supported for the existing
@@ -177,8 +177,8 @@ sal_Bool XMLUnderlineTypePropHdl::exportXML( OUString& rStrExpValue, const uno::
     OUStringBuffer aOut;
 
     if( (rValue >>= nValue) &&
-        (FontUnderline::DOUBLE == nValue ||
-         FontUnderline::DOUBLEWAVE == nValue) )
+        (awt::FontUnderline::DOUBLE == nValue ||
+         awt::FontUnderline::DOUBLEWAVE == nValue) )
     {
         bRet = SvXMLUnitConverter::convertEnum(
             aOut, (sal_uInt16)nValue, pXML_UnderlineType_Enum );
@@ -209,40 +209,40 @@ sal_Bool XMLUnderlineStylePropHdl::importXML( const OUString& rStrImpValue, uno:
         // multi property: style and width might be set already.
         // If the old value is NONE, the new is used unchanged.
         sal_Int16 eUnderline = sal_Int16();
-        if( (rValue >>= eUnderline) && FontUnderline::NONE!=eUnderline )
+        if( (rValue >>= eUnderline) && awt::FontUnderline::NONE!=eUnderline )
         {
             switch( eNewUnderline )
             {
-            case FontUnderline::NONE:
-            case FontUnderline::SINGLE:
+            case awt::FontUnderline::NONE:
+            case awt::FontUnderline::SINGLE:
                 // keep double or bold line style
                 eNewUnderline = eUnderline;
-            case FontUnderline::DOTTED:
+            case awt::FontUnderline::DOTTED:
                 // The line style has priority over a double type.
-                if( FontUnderline::BOLD == eUnderline )
-                    eNewUnderline = FontUnderline::BOLDDOTTED;
+                if( awt::FontUnderline::BOLD == eUnderline )
+                    eNewUnderline = awt::FontUnderline::BOLDDOTTED;
                 break;
-            case FontUnderline::DASH:
-                if( FontUnderline::BOLD == eUnderline )
-                    eNewUnderline = FontUnderline::BOLDDASH;
+            case awt::FontUnderline::DASH:
+                if( awt::FontUnderline::BOLD == eUnderline )
+                    eNewUnderline = awt::FontUnderline::BOLDDASH;
                 break;
-            case FontUnderline::LONGDASH:
-                if( FontUnderline::BOLD == eUnderline )
-                    eNewUnderline = FontUnderline::BOLDLONGDASH;
+            case awt::FontUnderline::LONGDASH:
+                if( awt::FontUnderline::BOLD == eUnderline )
+                    eNewUnderline = awt::FontUnderline::BOLDLONGDASH;
                 break;
-            case FontUnderline::DASHDOT:
-                if( FontUnderline::BOLD == eUnderline )
-                    eNewUnderline = FontUnderline::BOLDDASHDOT;
+            case awt::FontUnderline::DASHDOT:
+                if( awt::FontUnderline::BOLD == eUnderline )
+                    eNewUnderline = awt::FontUnderline::BOLDDASHDOT;
                 break;
-            case FontUnderline::DASHDOTDOT:
-                if( FontUnderline::BOLD == eUnderline )
-                    eNewUnderline = FontUnderline::BOLDDASHDOTDOT;
+            case awt::FontUnderline::DASHDOTDOT:
+                if( awt::FontUnderline::BOLD == eUnderline )
+                    eNewUnderline = awt::FontUnderline::BOLDDASHDOTDOT;
                 break;
-            case FontUnderline::WAVE:
-                if( FontUnderline::BOLD == eUnderline )
-                    eNewUnderline = FontUnderline::BOLDWAVE;
+            case awt::FontUnderline::WAVE:
+                if( awt::FontUnderline::BOLD == eUnderline )
+                    eNewUnderline = awt::FontUnderline::BOLDWAVE;
                 break;
-            case FontUnderline::SMALLWAVE:
+            case awt::FontUnderline::SMALLWAVE:
                 // SMALLWAVE is not used
             default:
                 OSL_ENSURE( bRet, "unexpected line style value" );
@@ -297,38 +297,38 @@ sal_Bool XMLUnderlineWidthPropHdl::importXML( const OUString& rStrImpValue, uno:
         // multi property: style and width might be set already.
         // If the old value is NONE, the new is used unchanged.
         sal_Int16 eUnderline = sal_Int16();
-        if( (rValue >>= eUnderline) && FontUnderline::NONE!=eUnderline )
+        if( (rValue >>= eUnderline) && awt::FontUnderline::NONE!=eUnderline )
         {
             switch( eNewUnderline )
             {
-            case FontUnderline::NONE:
+            case awt::FontUnderline::NONE:
                 // keep existing line style
                 eNewUnderline = eUnderline;
                 break;
-            case FontUnderline::BOLD:
+            case awt::FontUnderline::BOLD:
                 // A double line style has priority over a bold line style,
                 // but not over the line style itself.
                 switch( eUnderline )
                 {
-                case FontUnderline::SINGLE:
+                case awt::FontUnderline::SINGLE:
                     break;
-                case FontUnderline::DOTTED:
-                    eNewUnderline = FontUnderline::BOLDDOTTED;
+                case awt::FontUnderline::DOTTED:
+                    eNewUnderline = awt::FontUnderline::BOLDDOTTED;
                     break;
-                case FontUnderline::DASH:
-                    eNewUnderline = FontUnderline::BOLDDASH;
+                case awt::FontUnderline::DASH:
+                    eNewUnderline = awt::FontUnderline::BOLDDASH;
                     break;
-                case FontUnderline::LONGDASH:
-                    eNewUnderline = FontUnderline::BOLDLONGDASH;
+                case awt::FontUnderline::LONGDASH:
+                    eNewUnderline = awt::FontUnderline::BOLDLONGDASH;
                     break;
-                case FontUnderline::DASHDOT:
-                    eNewUnderline = FontUnderline::BOLDDASHDOT;
+                case awt::FontUnderline::DASHDOT:
+                    eNewUnderline = awt::FontUnderline::BOLDDASHDOT;
                     break;
-                case FontUnderline::DASHDOTDOT:
-                    eNewUnderline = FontUnderline::BOLDDASHDOTDOT;
+                case awt::FontUnderline::DASHDOTDOT:
+                    eNewUnderline = awt::FontUnderline::BOLDDASHDOTDOT;
                     break;
-                case FontUnderline::WAVE:
-                    eNewUnderline = FontUnderline::BOLDWAVE;
+                case awt::FontUnderline::WAVE:
+                    eNewUnderline = awt::FontUnderline::BOLDWAVE;
                     break;
                 default:
                     // a doube line style overwrites a bold one
@@ -358,7 +358,7 @@ sal_Bool XMLUnderlineWidthPropHdl::exportXML( OUString& rStrExpValue, const uno:
     sal_Int16 nValue = sal_Int16();
     OUStringBuffer aOut;
 
-    if( (rValue >>= nValue) && (FontUnderline::NONE != nValue) )
+    if( (rValue >>= nValue) && (awt::FontUnderline::NONE != nValue) )
     {
         bRet = SvXMLUnitConverter::convertEnum(
             aOut, (sal_uInt16)nValue, pXML_UnderlineWidth_Enum );
diff --git a/xmloff/source/text/XMLChangedRegionImportContext.cxx b/xmloff/source/text/XMLChangedRegionImportContext.cxx
index 0dfbfeb9b8d9..3db31fd5d9d5 100644
--- a/xmloff/source/text/XMLChangedRegionImportContext.cxx
+++ b/xmloff/source/text/XMLChangedRegionImportContext.cxx
@@ -36,7 +36,7 @@ using namespace ::xmloff::token;
 using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::text::XTextCursor;
-using ::com::sun::star::util::DateTime;
+using namespace ::com::sun::star;
 using ::com::sun::star::xml::sax::XAttributeList;
 
 
@@ -156,7 +156,7 @@ void XMLChangedRegionImportContext::SetChangeInfo(
     const OUString& rComment,
     const OUString& rDate)
 {
-    DateTime aDateTime;
+    util::DateTime aDateTime;
     if (::sax::Converter::convertDateTime(aDateTime, rDate))
     {
         GetImport().GetTextImport()->RedlineAdd(
diff --git a/xmloff/source/text/XMLRedlineExport.cxx b/xmloff/source/text/XMLRedlineExport.cxx
index 4cb67cb9c9ba..69d72a1b222e 100644
--- a/xmloff/source/text/XMLRedlineExport.cxx
+++ b/xmloff/source/text/XMLRedlineExport.cxx
@@ -55,7 +55,7 @@ using ::com::sun::star::text::XTextSection;
 using ::com::sun::star::uno::Any;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::util::DateTime;
+using namespace ::com::sun::star;
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
 using ::std::list;
diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx
index f281d579211d..ceff1d0025d6 100644
--- a/xmloff/source/text/txtexppr.cxx
+++ b/xmloff/source/text/txtexppr.cxx
@@ -204,8 +204,8 @@ void XMLTextExportPropertySetMapper::ContextFontFilter(
 {
     OUString sFamilyName;
     OUString sStyleName;
-    sal_Int16 nFamily = FontFamily::DONTKNOW;
-    sal_Int16 nPitch = FontPitch::DONTKNOW;
+    sal_Int16 nFamily = awt::FontFamily::DONTKNOW;
+    sal_Int16 nPitch = awt::FontPitch::DONTKNOW;
     rtl_TextEncoding eEnc = RTL_TEXTENCODING_DONTKNOW;
 
     OUString sTmp;
@@ -608,7 +608,7 @@ void XMLTextExportPropertySetMapper::ContextFilter(
         {
             sal_Int16 nUnderline = 0;
             pUnderlineState->maValue >>= nUnderline;
-            bClear = FontUnderline::NONE == nUnderline;
+            bClear = awt::FontUnderline::NONE == nUnderline;
         }
         if( bClear )
         {
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index 950fa20cef1a..ea806cce151a 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -264,9 +264,9 @@ inline sal_Int16 GetInt16Property(const OUString&,
                                         const Reference<XPropertySet> &);
 inline sal_Int8 GetInt8Property(const OUString&,
                                       const Reference<XPropertySet> &);
-inline DateTime const GetDateTimeProperty( const OUString& sPropName,
+inline util::DateTime const GetDateTimeProperty( const OUString& sPropName,
                                            const Reference<XPropertySet> & xPropSet);
-inline Date const GetDateProperty( const OUString& sPropName,
+inline util::Date const GetDateProperty( const OUString& sPropName,
                                    const Reference<XPropertySet> & xPropSet);
 inline Sequence<OUString> const GetStringSequenceProperty(
                                    const OUString& sPropName,
@@ -1747,7 +1747,7 @@ void XMLTextFieldExport::ExportFieldHelper(
         }
 
         // date time
-        DateTime aDate( GetDateTimeProperty(sPropertyDateTimeValue, rPropSet) );
+        util::DateTime aDate( GetDateTimeProperty(sPropertyDateTimeValue, rPropSet) );
         {
             OUStringBuffer aBuffer;
             ::sax::Converter::convertDateTime(aBuffer, aDate, true);
@@ -2639,13 +2639,13 @@ void XMLTextFieldExport::ProcessDateTime(enum XMLTokenEnum eName,
 
 /// export a date or time
 void XMLTextFieldExport::ProcessDateTime(enum XMLTokenEnum eName,
-                                         const DateTime& rTime,
+                                         const util::DateTime& rTime,
                                          sal_Bool bIsDate,
                                          sal_uInt16 nPrefix)
 {
     OUStringBuffer aBuffer;
 
-    DateTime aDateTime(rTime);
+    util::DateTime aDateTime(rTime);
 
     // truncate dates
     if(bIsDate)
@@ -3578,22 +3578,22 @@ inline sal_Int8 GetInt8Property(
     return nInt;
 }
 
-inline DateTime const GetDateTimeProperty(
+inline util::DateTime const GetDateTimeProperty(
     const OUString& sPropName,
     const Reference<XPropertySet> & xPropSet)
 {
     Any aAny = xPropSet->getPropertyValue(sPropName);
-    DateTime aTime;
+    util::DateTime aTime;
     aAny >>= aTime;
     return aTime;
 }
 
-inline Date const GetDateProperty(
+inline util::Date const GetDateProperty(
     const OUString& sPropName,
     const Reference<XPropertySet> & xPropSet)
 {
     Any aAny = xPropSet->getPropertyValue(sPropName);
-    Date aDate;
+    util::Date aDate;
     aAny >>= aDate;
     return aDate;
 }
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index 30dadc75d12d..4b7dc53ab317 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -3813,7 +3813,7 @@ void XMLAnnotationImportContext::PrepareField(
     OUString sInitials( aInitialsBuffer.makeStringAndClear() );
     xPropertySet->setPropertyValue(sPropertyInitials, makeAny(sInitials));
 
-    DateTime aDateTime;
+    util::DateTime aDateTime;
     if (::sax::Converter::convertDateTime(aDateTime,
                                             aDateBuffer.makeStringAndClear()))
     {
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index b48225aac68d..b00b8a20dafb 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -74,7 +74,7 @@ using namespace ::com::sun::star::drawing;
 using namespace ::com::sun::star::xml::sax;
 using namespace ::com::sun::star::lang;
 using namespace ::xmloff::token;
-using ::com::sun::star::util::DateTime;
+using namespace ::com::sun::star;
 using namespace ::com::sun::star::ucb;
 using namespace ::com::sun::star;
 using ::comphelper::UStringLess;
@@ -2772,7 +2772,7 @@ void XMLTextImportHelper::RedlineAdd( const OUString& /*rType*/,
                                       const OUString& /*rId*/,
                                       const OUString& /*rAuthor*/,
                                       const OUString& /*rComment*/,
-                                      const DateTime& /*rDateTime*/,
+                                      const util::DateTime& /*rDateTime*/,
                                       sal_Bool /*bMergeLastPara*/)
 {
     // dummy implementation: do nothing
diff --git a/xmloff/source/xforms/SchemaRestrictionContext.cxx b/xmloff/source/xforms/SchemaRestrictionContext.cxx
index 105cfa84ae04..141e5f8675dd 100644
--- a/xmloff/source/xforms/SchemaRestrictionContext.cxx
+++ b/xmloff/source/xforms/SchemaRestrictionContext.cxx
@@ -48,8 +48,7 @@ using com::sun::star::uno::Exception;
 using com::sun::star::uno::Any;
 using com::sun::star::uno::makeAny;
 using com::sun::star::uno::UNO_QUERY;
-using com::sun::star::util::Date;
-using com::sun::star::util::DateTime;
+using namespace com::sun::star;
 using com::sun::star::util::Duration;
 using com::sun::star::xml::sax::XAttributeList;
 using com::sun::star::beans::XPropertySet;
@@ -188,7 +187,7 @@ Any xforms_date( const OUString& rValue )
     sal_Int32 nPos2 = rValue.indexOf( sal_Unicode('-'), nPos1 + 1 );
     if( nPos1 > 0  &&  nPos2 > 0 )
     {
-        Date aDate;
+        util::Date aDate;
         aDate.Year = static_cast<sal_uInt16>(
                      rValue.copy( 0, nPos1 ).toInt32() );
         aDate.Month = static_cast<sal_uInt16>(
@@ -202,7 +201,7 @@ Any xforms_date( const OUString& rValue )
 
 Any xforms_dateTime( const OUString& rValue )
 {
-    DateTime aDateTime;
+    util::DateTime aDateTime;
     bool const bSuccess = ::sax::Converter::convertDateTime(aDateTime, rValue);
     return bSuccess ? makeAny( aDateTime ) : Any();
 }
diff --git a/xmloff/source/xforms/xformsexport.cxx b/xmloff/source/xforms/xformsexport.cxx
index 092ff712b67b..8166f37088d5 100644
--- a/xmloff/source/xforms/xformsexport.cxx
+++ b/xmloff/source/xforms/xformsexport.cxx
@@ -81,8 +81,7 @@ using com::sun::star::beans::PropertyValue;
 using com::sun::star::xsd::XDataType;
 using com::sun::star::xforms::XDataTypeRepository;
 using com::sun::star::xforms::XFormsSupplier;
-using com::sun::star::util::Date;
-using com::sun::star::util::DateTime;
+using namespace com::sun::star;
 using com::sun::star::util::Duration;
 
 void exportXForms( SvXMLExport& rExport )
@@ -137,14 +136,14 @@ OUString xforms_whitespace( const Any& );
 template<typename T, void (*FUNC)( OUStringBuffer&, T )> OUString xforms_convert( const Any& );
 template<typename T, void (*FUNC)( OUStringBuffer&, const T& )> OUString xforms_convertRef( const Any& );
 
-void xforms_formatDate( OUStringBuffer& aBuffer, const Date& aDate );
+void xforms_formatDate( OUStringBuffer& aBuffer, const util::Date& aDate );
 void xforms_formatTime( OUStringBuffer& aBuffer, const com::sun::star::util::Time& aTime );
-void xforms_formatDateTime( OUStringBuffer& aBuffer, const DateTime& aDateTime );
+void xforms_formatDateTime( OUStringBuffer& aBuffer, const util::DateTime& aDateTime );
 
 convert_t xforms_int32    = &xforms_convert<sal_Int32,&::sax::Converter::convertNumber>;
 convert_t xforms_double   = &xforms_convert<double,&::sax::Converter::convertDouble>;
-convert_t xforms_dateTime = &xforms_convertRef<DateTime,&xforms_formatDateTime>;
-convert_t xforms_date     = &xforms_convertRef<Date,&xforms_formatDate>;
+convert_t xforms_dateTime = &xforms_convertRef<util::DateTime,&xforms_formatDateTime>;
+convert_t xforms_date     = &xforms_convertRef<util::Date,&xforms_formatDate>;
 convert_t xforms_time     = &xforms_convertRef<com::sun::star::util::Time,&xforms_formatTime>;
 
 // other functions
@@ -676,7 +675,7 @@ OUString xforms_bool( const Any& rAny )
     return OUString();
 }
 
-void xforms_formatDate( OUStringBuffer& aBuffer, const Date& rDate )
+void xforms_formatDate( OUStringBuffer& aBuffer, const util::Date& rDate )
 {
     aBuffer.append( static_cast<sal_Int32>( rDate.Year ) );
     aBuffer.append( sal_Unicode('-') );
@@ -695,7 +694,7 @@ void xforms_formatTime( OUStringBuffer& aBuffer, const com::sun::star::util::Tim
     ::sax::Converter::convertDuration( aBuffer, aDuration );
 }
 
-void xforms_formatDateTime( OUStringBuffer& aBuffer, const DateTime& aDateTime )
+void xforms_formatDateTime( OUStringBuffer& aBuffer, const util::DateTime& aDateTime )
 {
     ::sax::Converter::convertDateTime( aBuffer, aDateTime );
 }
-- 
cgit