[Libreoffice-commits] core.git: xmloff/inc xmloff/source

Noel Grandin noel at peralex.com
Thu Nov 26 02:47:35 PST 2015


 xmloff/inc/AttributeContainerHandler.hxx                      |    6 
 xmloff/inc/DomBuilderContext.hxx                              |   10 
 xmloff/inc/DomExport.hxx                                      |    2 
 xmloff/inc/MetaExportComponent.hxx                            |    7 
 xmloff/inc/MultiPropertySetHelper.hxx                         |   31 -
 xmloff/inc/PageMasterImportContext.hxx                        |    7 
 xmloff/inc/PropertySetMerger.hxx                              |    6 
 xmloff/inc/RDFaExportHelper.hxx                               |    9 
 xmloff/inc/RDFaImportHelper.hxx                               |    9 
 xmloff/inc/SchXMLExport.hxx                                   |    4 
 xmloff/inc/SchXMLImport.hxx                                   |   10 
 xmloff/inc/StyleMap.hxx                                       |    9 
 xmloff/inc/TransGradientStyle.hxx                             |    7 
 xmloff/inc/XMLBackgroundImageContext.hxx                      |   13 
 xmloff/inc/XMLBackgroundImageExport.hxx                       |    8 
 xmloff/inc/XMLBase64Export.hxx                                |    9 
 xmloff/inc/XMLBasicExportFilter.hxx                           |   26 -
 xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx            |    4 
 xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx           |    4 
 xmloff/inc/XMLChartPropertySetMapper.hxx                      |    8 
 xmloff/inc/XMLChartStyleContext.hxx                           |    7 
 xmloff/inc/XMLClipPropertyHandler.hxx                         |    6 
 xmloff/inc/XMLEmbeddedObjectImportContext.hxx                 |   16 
 xmloff/inc/XMLEventImportHelper.hxx                           |    3 
 xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx               |    4 
 xmloff/inc/XMLFootnoteConfigurationImportContext.hxx          |   12 
 xmloff/inc/XMLImageMapContext.hxx                             |   12 
 xmloff/inc/XMLImageMapExport.hxx                              |   18 
 xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx       |   12 
 xmloff/inc/XMLIsPercentagePropertyHandler.hxx                 |    4 
 xmloff/inc/XMLLineNumberingImportContext.hxx                  |    9 
 xmloff/inc/XMLNumberStylesImport.hxx                          |    4 
 xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx             |    4 
 xmloff/inc/XMLRectangleMembersHandler.hxx                     |    4 
 xmloff/inc/XMLReplacementImageContext.hxx                     |   15 
 xmloff/inc/XMLScriptContextFactory.hxx                        |    3 
 xmloff/inc/XMLScriptExportHandler.hxx                         |    3 
 xmloff/inc/XMLShapePropertySetContext.hxx                     |    5 
 xmloff/inc/XMLStarBasicContextFactory.hxx                     |    3 
 xmloff/inc/XMLStarBasicExportHandler.hxx                      |    3 
 xmloff/inc/XMLStringBufferImportContext.hxx                   |    3 
 xmloff/inc/XMLTextColumnsContext.hxx                          |    5 
 xmloff/inc/XMLTextColumnsExport.hxx                           |    2 
 xmloff/inc/XMLTextColumnsPropertyHandler.hxx                  |    8 
 xmloff/inc/XMLTextHeaderFooterContext.hxx                     |   14 
 xmloff/inc/anim.hxx                                           |    4 
 xmloff/inc/animationimport.hxx                                |   14 
 xmloff/inc/animimp.hxx                                        |    4 
 xmloff/inc/forms/property_handler.hxx                         |    4 
 xmloff/inc/txtflde.hxx                                        |   78 +---
 xmloff/inc/txtfldi.hxx                                        |  171 +++------
 xmloff/inc/txtlists.hxx                                       |   16 
 xmloff/inc/txtvfldi.hxx                                       |   47 +-
 xmloff/inc/xexptran.hxx                                       |    4 
 xmloff/inc/xmltabi.hxx                                        |    2 
 xmloff/inc/xmlversion.hxx                                     |   36 -
 xmloff/source/chart/ColorPropertySet.hxx                      |   89 ++--
 xmloff/source/chart/MultiPropertySetHandler.hxx               |   38 +-
 xmloff/source/chart/PropertyMap.hxx                           |   84 ++--
 xmloff/source/chart/SchXMLAxisContext.cxx                     |   54 +-
 xmloff/source/chart/SchXMLAxisContext.hxx                     |   16 
 xmloff/source/chart/SchXMLCalculationSettingsContext.cxx      |    5 
 xmloff/source/chart/SchXMLCalculationSettingsContext.hxx      |    7 
 xmloff/source/chart/SchXMLChartContext.cxx                    |   17 
 xmloff/source/chart/SchXMLChartContext.hxx                    |   53 +-
 xmloff/source/chart/SchXMLExport.cxx                          |   81 +---
 xmloff/source/chart/SchXMLLegendContext.hxx                   |    2 
 xmloff/source/chart/SchXMLParagraphContext.hxx                |    4 
 xmloff/source/chart/SchXMLPlotAreaContext.cxx                 |   20 -
 xmloff/source/chart/SchXMLPlotAreaContext.hxx                 |   63 +--
 xmloff/source/chart/SchXMLPropertyMappingContext.hxx          |   10 
 xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx    |   25 -
 xmloff/source/chart/SchXMLSeries2Context.hxx                  |   18 
 xmloff/source/chart/SchXMLTableContext.cxx                    |    2 
 xmloff/source/chart/SchXMLTableContext.hxx                    |   30 -
 xmloff/source/chart/SchXMLTextListContext.cxx                 |    2 
 xmloff/source/chart/SchXMLTextListContext.hxx                 |    8 
 xmloff/source/chart/SchXMLTools.cxx                           |    2 
 xmloff/source/chart/SchXMLTools.hxx                           |   49 +-
 xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx            |   16 
 xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx            |    4 
 xmloff/source/chart/XMLChartPropertyContext.hxx               |    6 
 xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx           |    8 
 xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx           |    4 
 xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx          |    4 
 xmloff/source/chart/XMLLabelSeparatorContext.hxx              |    4 
 xmloff/source/chart/XMLSymbolImageContext.hxx                 |    6 
 xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx              |    4 
 xmloff/source/chart/XMLTextOrientationHdl.cxx                 |    4 
 xmloff/source/chart/XMLTextOrientationHdl.hxx                 |    4 
 xmloff/source/chart/contexts.hxx                              |    8 
 xmloff/source/chart/transporttypes.hxx                        |   35 -
 xmloff/source/core/DocumentSettingsContext.cxx                |   83 +---
 xmloff/source/core/ProgressBarHelper.cxx                      |    2 
 xmloff/source/core/XMLEmbeddedObjectImportContext.cxx         |   10 
 xmloff/source/core/attrlist.cxx                               |   20 -
 xmloff/source/core/unoatrcn.cxx                               |    4 
 xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx   |    4 
 xmloff/source/core/xmlexp.cxx                                 |   24 -
 xmloff/source/core/xmlictxt.cxx                               |    2 
 xmloff/source/core/xmlimp.cxx                                 |   17 
 xmloff/source/core/xmluconv.cxx                               |   12 
 xmloff/source/draw/XMLImageMapContext.cxx                     |   34 -
 xmloff/source/draw/XMLNumberStyles.cxx                        |   16 
 xmloff/source/draw/XMLShapeStyleContext.cxx                   |    4 
 xmloff/source/draw/animationexport.cxx                        |    8 
 xmloff/source/draw/animationimport.cxx                        |   10 
 xmloff/source/draw/animimp.cxx                                |    4 
 xmloff/source/draw/descriptionimp.hxx                         |    6 
 xmloff/source/draw/eventimp.cxx                               |    4 
 xmloff/source/draw/eventimp.hxx                               |    8 
 xmloff/source/draw/layerimp.cxx                               |    6 
 xmloff/source/draw/layerimp.hxx                               |    6 
 xmloff/source/draw/numithdl.cxx                               |    6 
 xmloff/source/draw/numithdl.hxx                               |   10 
 xmloff/source/draw/propimp0.cxx                               |   16 
 xmloff/source/draw/propimp0.hxx                               |   16 
 xmloff/source/draw/sdpropls.cxx                               |   36 -
 xmloff/source/draw/sdpropls.hxx                               |   12 
 xmloff/source/draw/sdxmlexp.cxx                               |    8 
 xmloff/source/draw/sdxmlexp_impl.hxx                          |   34 -
 xmloff/source/draw/sdxmlimp.cxx                               |    8 
 xmloff/source/draw/sdxmlimp_impl.hxx                          |   48 +-
 xmloff/source/draw/shapeexport.cxx                            |  170 ++++----
 xmloff/source/draw/shapeimport.cxx                            |   34 -
 xmloff/source/draw/xexptran.cxx                               |    2 
 xmloff/source/draw/ximp3dobject.cxx                           |   12 
 xmloff/source/draw/ximp3dobject.hxx                           |   38 +-
 xmloff/source/draw/ximp3dscene.cxx                            |    8 
 xmloff/source/draw/ximp3dscene.hxx                            |   10 
 xmloff/source/draw/ximpbody.cxx                               |    4 
 xmloff/source/draw/ximpbody.hxx                               |    8 
 xmloff/source/draw/ximpcustomshape.cxx                        |  184 ++++-----
 xmloff/source/draw/ximpcustomshape.hxx                        |   20 -
 xmloff/source/draw/ximpgrp.hxx                                |   10 
 xmloff/source/draw/ximplink.hxx                               |   10 
 xmloff/source/draw/ximpnote.cxx                               |    2 
 xmloff/source/draw/ximpnote.hxx                               |    8 
 xmloff/source/draw/ximppage.cxx                               |    4 
 xmloff/source/draw/ximppage.hxx                               |   16 
 xmloff/source/draw/ximpshap.cxx                               |   76 ++--
 xmloff/source/draw/ximpshap.hxx                               |  190 +++++-----
 xmloff/source/draw/ximpshow.hxx                               |    4 
 xmloff/source/draw/ximpstyl.cxx                               |   17 
 xmloff/source/draw/ximpstyl.hxx                               |   40 +-
 xmloff/source/forms/attriblistmerge.hxx                       |   22 -
 xmloff/source/forms/callbacks.hxx                             |   10 
 xmloff/source/forms/elementexport.hxx                         |   22 -
 xmloff/source/forms/elementimport.cxx                         |    6 
 xmloff/source/forms/elementimport.hxx                         |  118 +++---
 xmloff/source/forms/elementimport_impl.hxx                    |   18 
 xmloff/source/forms/eventexport.hxx                           |   18 
 xmloff/source/forms/eventimport.hxx                           |   10 
 xmloff/source/forms/formattributes.cxx                        |    4 
 xmloff/source/forms/formattributes.hxx                        |    6 
 xmloff/source/forms/formcellbinding.hxx                       |   56 +-
 xmloff/source/forms/gridcolumnproptranslator.cxx              |    6 
 xmloff/source/forms/gridcolumnproptranslator.hxx              |   32 -
 xmloff/source/forms/handler/vcl_date_handler.hxx              |    2 
 xmloff/source/forms/handler/vcl_time_handler.hxx              |    2 
 xmloff/source/forms/ifacecompare.hxx                          |   10 
 xmloff/source/forms/layerexport.hxx                           |   56 +-
 xmloff/source/forms/layerimport.hxx                           |   28 -
 xmloff/source/forms/officeforms.hxx                           |   14 
 xmloff/source/forms/propertyexport.cxx                        |   10 
 xmloff/source/forms/propertyexport.hxx                        |   18 
 xmloff/source/forms/propertyimport.cxx                        |   30 -
 xmloff/source/forms/propertyimport.hxx                        |   36 -
 xmloff/source/meta/MetaExportComponent.cxx                    |    6 
 xmloff/source/meta/MetaImportComponent.cxx                    |   12 
 xmloff/source/meta/xmlmetae.cxx                               |    2 
 xmloff/source/meta/xmlmetai.cxx                               |   15 
 xmloff/source/meta/xmlversion.cxx                             |   14 
 xmloff/source/script/xmlbasici.hxx                            |   18 
 xmloff/source/script/xmlscripti.cxx                           |    8 
 xmloff/source/style/DrawAspectHdl.hxx                         |    4 
 xmloff/source/style/FillStyleContext.cxx                      |    2 
 xmloff/source/style/FillStyleContext.hxx                      |   28 -
 xmloff/source/style/ImageStyle.cxx                            |    2 
 xmloff/source/style/PageHeaderFooterContext.cxx               |    6 
 xmloff/source/style/PageHeaderFooterContext.hxx               |    6 
 xmloff/source/style/PageMasterExportPropMapper.hxx            |    2 
 xmloff/source/style/PageMasterImportContext.cxx               |    2 
 xmloff/source/style/PageMasterPropHdl.hxx                     |   32 -
 xmloff/source/style/PagePropertySetContext.hxx                |    5 
 xmloff/source/style/XMLFontStylesContext.cxx                  |   15 
 xmloff/source/style/XMLFontStylesContext_impl.hxx             |   28 -
 xmloff/source/style/XMLFootnoteSeparatorImport.hxx            |    3 
 xmloff/source/style/XMLIsPercentagePropertyHandler.cxx        |    2 
 xmloff/source/style/adjushdl.hxx                              |    8 
 xmloff/source/style/backhdl.hxx                               |    8 
 xmloff/source/style/bordrhdl.hxx                              |    8 
 xmloff/source/style/breakhdl.hxx                              |    8 
 xmloff/source/style/cdouthdl.hxx                              |   16 
 xmloff/source/style/chrhghdl.hxx                              |   12 
 xmloff/source/style/chrlohdl.cxx                              |   10 
 xmloff/source/style/chrlohdl.hxx                              |   24 -
 xmloff/source/style/csmaphdl.hxx                              |    8 
 xmloff/source/style/durationhdl.hxx                           |    4 
 xmloff/source/style/escphdl.hxx                               |    8 
 xmloff/source/style/fonthdl.hxx                               |   16 
 xmloff/source/style/impastpl.cxx                              |    2 
 xmloff/source/style/impastpl.hxx                              |    6 
 xmloff/source/style/kernihdl.hxx                              |    4 
 xmloff/source/style/lspachdl.hxx                              |   12 
 xmloff/source/style/numehelp.cxx                              |    8 
 xmloff/source/style/opaquhdl.hxx                              |    4 
 xmloff/source/style/postuhdl.hxx                              |    4 
 xmloff/source/style/shadwhdl.hxx                              |    4 
 xmloff/source/style/shdwdhdl.hxx                              |    4 
 xmloff/source/style/tabsthdl.cxx                              |    4 
 xmloff/source/style/tabsthdl.hxx                              |    6 
 xmloff/source/style/undlihdl.hxx                              |   12 
 xmloff/source/style/weighhdl.cxx                              |   24 -
 xmloff/source/style/weighhdl.hxx                              |    4 
 xmloff/source/style/xmlaustp.cxx                              |    4 
 xmloff/source/style/xmlbahdl.hxx                              |   86 ++--
 xmloff/source/style/xmlimppr.cxx                              |    5 
 xmloff/source/style/xmlnume.cxx                               |    4 
 xmloff/source/style/xmlnumfe.cxx                              |    7 
 xmloff/source/style/xmlnumfi.cxx                              |   28 -
 xmloff/source/style/xmlprhdl.cxx                              |    2 
 xmloff/source/style/xmltabe.cxx                               |    8 
 xmloff/source/table/XMLTableImport.cxx                        |    6 
 xmloff/source/text/XMLAnchorTypePropHdl.hxx                   |    6 
 xmloff/source/text/XMLAutoMarkFileContext.hxx                 |    3 
 xmloff/source/text/XMLAutoTextContainerEventImport.hxx        |    9 
 xmloff/source/text/XMLAutoTextEventExport.cxx                 |    4 
 xmloff/source/text/XMLAutoTextEventExport.hxx                 |   12 
 xmloff/source/text/XMLAutoTextEventImport.cxx                 |    2 
 xmloff/source/text/XMLAutoTextEventImport.hxx                 |   24 -
 xmloff/source/text/XMLCalculationSettingsContext.cxx          |    3 
 xmloff/source/text/XMLCalculationSettingsContext.hxx          |    3 
 xmloff/source/text/XMLChangeElementImportContext.hxx          |    5 
 xmloff/source/text/XMLChangeImportContext.hxx                 |    3 
 xmloff/source/text/XMLChangeInfoContext.hxx                   |    6 
 xmloff/source/text/XMLChangedRegionImportContext.hxx          |    9 
 xmloff/source/text/XMLFootnoteBodyImportContext.hxx           |    3 
 xmloff/source/text/XMLFootnoteImportContext.hxx               |   12 
 xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx      |    2 
 xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx      |    6 
 xmloff/source/text/XMLIndexBibliographyEntryContext.cxx       |    3 
 xmloff/source/text/XMLIndexBibliographyEntryContext.hxx       |    6 
 xmloff/source/text/XMLIndexBibliographySourceContext.hxx      |    6 
 xmloff/source/text/XMLIndexBodyContext.hxx                    |    3 
 xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx        |    3 
 xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx        |    6 
 xmloff/source/text/XMLIndexIllustrationSourceContext.hxx      |    6 
 xmloff/source/text/XMLIndexMarkExport.hxx                     |   15 
 xmloff/source/text/XMLIndexObjectSourceContext.hxx            |    6 
 xmloff/source/text/XMLIndexSimpleEntryContext.cxx             |    5 
 xmloff/source/text/XMLIndexSimpleEntryContext.hxx             |    6 
 xmloff/source/text/XMLIndexSourceBaseContext.hxx              |   12 
 xmloff/source/text/XMLIndexSpanEntryContext.hxx               |    3 
 xmloff/source/text/XMLIndexTOCContext.hxx                     |    9 
 xmloff/source/text/XMLIndexTOCSourceContext.hxx               |    6 
 xmloff/source/text/XMLIndexTOCStylesContext.hxx               |   12 
 xmloff/source/text/XMLIndexTabStopEntryContext.hxx            |    6 
 xmloff/source/text/XMLIndexTableSourceContext.hxx             |    6 
 xmloff/source/text/XMLIndexTemplateContext.cxx                |    2 
 xmloff/source/text/XMLIndexTemplateContext.hxx                |   16 
 xmloff/source/text/XMLIndexTitleTemplateContext.cxx           |    2 
 xmloff/source/text/XMLIndexTitleTemplateContext.hxx           |    9 
 xmloff/source/text/XMLIndexUserSourceContext.hxx              |    6 
 xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx |    4 
 xmloff/source/text/XMLPropertyBackpatcher.hxx                 |    9 
 xmloff/source/text/XMLRedlineExport.hxx                       |   42 --
 xmloff/source/text/XMLSectionExport.hxx                       |   85 +---
 xmloff/source/text/XMLSectionFootnoteConfigExport.cxx         |    2 
 xmloff/source/text/XMLSectionFootnoteConfigImport.hxx         |    3 
 xmloff/source/text/XMLSectionImportContext.hxx                |   20 -
 xmloff/source/text/XMLSectionSourceDDEImportContext.hxx       |   12 
 xmloff/source/text/XMLSectionSourceImportContext.hxx          |   12 
 xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx     |    5 
 xmloff/source/text/XMLTextFrameContext.cxx                    |   49 +-
 xmloff/source/text/XMLTextFrameContext.hxx                    |   25 -
 xmloff/source/text/XMLTextFrameHyperlinkContext.hxx           |   20 -
 xmloff/source/text/XMLTextListBlockContext.hxx                |   12 
 xmloff/source/text/XMLTextListItemContext.hxx                 |   12 
 xmloff/source/text/XMLTextMarkImportContext.cxx               |   10 
 xmloff/source/text/XMLTextMarkImportContext.hxx               |   17 
 xmloff/source/text/XMLTextMasterPageContext.cxx               |    2 
 xmloff/source/text/XMLTextNumRuleInfo.cxx                     |    3 
 xmloff/source/text/XMLTextNumRuleInfo.hxx                     |    6 
 xmloff/source/text/XMLTextPropertySetContext.hxx              |    9 
 xmloff/source/text/XMLTrackedChangesImportContext.hxx         |    6 
 xmloff/source/text/txtdrope.hxx                               |    2 
 xmloff/source/text/txtdropi.hxx                               |    6 
 xmloff/source/text/txtexppr.hxx                               |    3 
 xmloff/source/text/txtflde.cxx                                |    6 
 xmloff/source/text/txtfldi.cxx                                |   10 
 xmloff/source/text/txtimp.cxx                                 |    2 
 xmloff/source/text/txtimppr.cxx                               |    4 
 xmloff/source/text/txtparae.cxx                               |   12 
 xmloff/source/text/txtparai.hxx                               |   41 --
 xmloff/source/text/txtprhdl.cxx                               |   60 +--
 xmloff/source/text/txtstyle.cxx                               |    3 
 xmloff/source/text/txtstyli.cxx                               |    2 
 xmloff/source/transform/ChartOASISTContext.hxx                |    2 
 xmloff/source/transform/ChartOOoTContext.hxx                  |    2 
 xmloff/source/transform/ChartPlotAreaOASISTContext.hxx        |    2 
 xmloff/source/transform/ChartPlotAreaOOoTContext.hxx          |    2 
 xmloff/source/transform/ControlOASISTContext.hxx              |    2 
 xmloff/source/transform/ControlOOoTContext.hxx                |    7 
 xmloff/source/transform/CreateElemTContext.hxx                |    2 
 xmloff/source/transform/DeepTContext.hxx                      |    2 
 xmloff/source/transform/DlgOASISTContext.hxx                  |    2 
 xmloff/source/transform/DocumentTContext.hxx                  |    2 
 xmloff/source/transform/EventOASISTContext.cxx                |    9 
 xmloff/source/transform/EventOASISTContext.hxx                |    2 
 xmloff/source/transform/EventOOoTContext.hxx                  |    4 
 xmloff/source/transform/FormPropOASISTContext.hxx             |    2 
 xmloff/source/transform/FormPropOOoTContext.cxx               |    2 
 xmloff/source/transform/FormPropOOoTContext.hxx               |    7 
 xmloff/source/transform/FrameOASISTContext.hxx                |   10 
 xmloff/source/transform/FrameOOoTContext.hxx                  |    4 
 xmloff/source/transform/IgnoreTContext.hxx                    |    4 
 xmloff/source/transform/MergeElemTContext.cxx                 |    4 
 xmloff/source/transform/MergeElemTContext.hxx                 |    7 
 xmloff/source/transform/MetaTContext.hxx                      |    2 
 xmloff/source/transform/MutableAttrList.cxx                   |    2 
 xmloff/source/transform/MutableAttrList.hxx                   |   37 -
 xmloff/source/transform/NotesTContext.hxx                     |    4 
 xmloff/source/transform/OOo2Oasis.cxx                         |   17 
 xmloff/source/transform/OOo2Oasis.hxx                         |   36 -
 xmloff/source/transform/Oasis2OOo.cxx                         |   14 
 xmloff/source/transform/Oasis2OOo.hxx                         |   10 
 xmloff/source/transform/PersAttrListTContext.hxx              |   10 
 xmloff/source/transform/PersMixedContentTContext.cxx          |    4 
 xmloff/source/transform/ProcAddAttrTContext.hxx               |    2 
 xmloff/source/transform/ProcAttrTContext.hxx                  |    2 
 xmloff/source/transform/RenameElemTContext.hxx                |    2 
 xmloff/source/transform/StyleOASISTContext.cxx                |    5 
 xmloff/source/transform/StyleOASISTContext.hxx                |    4 
 xmloff/source/transform/StyleOOoTContext.cxx                  |    7 
 xmloff/source/transform/StyleOOoTContext.hxx                  |    4 
 xmloff/source/transform/Transformer.hxx                       |    8 
 xmloff/source/transform/TransformerBase.cxx                   |    2 
 xmloff/source/transform/TransformerBase.hxx                   |   58 +--
 xmloff/source/transform/TransformerContext.hxx                |    4 
 xmloff/source/xforms/SchemaContext.hxx                        |    6 
 xmloff/source/xforms/SchemaRestrictionContext.cxx             |   48 +-
 xmloff/source/xforms/SchemaRestrictionContext.hxx             |    8 
 xmloff/source/xforms/SchemaSimpleTypeContext.hxx              |    6 
 xmloff/source/xforms/TokenContext.hxx                         |    6 
 xmloff/source/xforms/XFormsBindContext.hxx                    |   10 
 xmloff/source/xforms/XFormsInstanceContext.hxx                |   10 
 xmloff/source/xforms/XFormsModelContext.hxx                   |    6 
 xmloff/source/xforms/XFormsModelExport.hxx                    |    2 
 xmloff/source/xforms/XFormsSubmissionContext.hxx              |    6 
 xmloff/source/xforms/xformsapi.cxx                            |   40 +-
 xmloff/source/xforms/xformsapi.hxx                            |   24 -
 xmloff/source/xforms/xformsexport.cxx                         |   58 +--
 353 files changed, 2437 insertions(+), 2892 deletions(-)

New commits:
commit 80735fcbb0503ff1de198d1d9936fed9f5ae77a2
Author: Noel Grandin <noel at peralex.com>
Date:   Thu Nov 26 08:43:00 2015 +0200

    com::sun::star->css in xmloff/
    
    Change-Id: Iee6e21e093fb1383f19a0716dbc1c341f446b8c2
    Reviewed-on: https://gerrit.libreoffice.org/20192
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
    Tested-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/xmloff/inc/AttributeContainerHandler.hxx b/xmloff/inc/AttributeContainerHandler.hxx
index d330198..0e98615 100644
--- a/xmloff/inc/AttributeContainerHandler.hxx
+++ b/xmloff/inc/AttributeContainerHandler.hxx
@@ -30,10 +30,10 @@ class XMLAttributeContainerHandler : public XMLPropertyHandler
 public:
     virtual ~XMLAttributeContainerHandler();
 
-    virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override;
+    virtual bool equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const override;
 
-    virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override;
-    virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override;
+    virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override;
+    virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override;
 };
 
 #endif // INCLUDED_XMLOFF_INC_ATTRIBUTECONTAINERHANDLER_HXX
diff --git a/xmloff/inc/DomBuilderContext.hxx b/xmloff/inc/DomBuilderContext.hxx
index 4031e46..2b01b46 100644
--- a/xmloff/inc/DomBuilderContext.hxx
+++ b/xmloff/inc/DomBuilderContext.hxx
@@ -44,7 +44,7 @@ class SvXMLImportContext;
  * XML data from a sequence of SAX events */
 class DomBuilderContext : public SvXMLImportContext
 {
-    com::sun::star::uno::Reference<com::sun::star::xml::dom::XNode> mxNode;
+    css::uno::Reference<css::xml::dom::XNode> mxNode;
 
 public:
 
@@ -57,7 +57,7 @@ public:
     DomBuilderContext( SvXMLImport& rImport,
                        sal_uInt16 nPrefix,
                        const OUString& rLocalName,
-                       com::sun::star::uno::Reference<com::sun::star::xml::dom::XNode>& );
+                       css::uno::Reference<css::xml::dom::XNode>& );
 
     virtual ~DomBuilderContext();
 
@@ -67,7 +67,7 @@ public:
 
 
     /** access the DOM tree */
-    com::sun::star::uno::Reference<com::sun::star::xml::dom::XDocument> getTree();
+    css::uno::Reference<css::xml::dom::XDocument> getTree();
 
 
 
@@ -77,10 +77,10 @@ public:
     virtual SvXMLImportContext* CreateChildContext(
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
-        const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList >& xAttrList ) override;
+        const css::uno::Reference<css::xml::sax::XAttributeList >& xAttrList ) override;
 
     virtual void StartElement(
-        const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ) override;
+        const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override;
 
     virtual void EndElement() override;
 
diff --git a/xmloff/inc/DomExport.hxx b/xmloff/inc/DomExport.hxx
index c8c9a5d..47745940c 100644
--- a/xmloff/inc/DomExport.hxx
+++ b/xmloff/inc/DomExport.hxx
@@ -29,7 +29,7 @@ namespace com { namespace sun { namespace star {
     namespace xml { namespace dom { class XNode; } }
 } } }
 
-void exportDom( SvXMLExport&, const com::sun::star::uno::Reference<com::sun::star::xml::dom::XDocument>& );
+void exportDom( SvXMLExport&, const css::uno::Reference<css::xml::dom::XDocument>& );
 
 #endif
 
diff --git a/xmloff/inc/MetaExportComponent.hxx b/xmloff/inc/MetaExportComponent.hxx
index 31194b2..58a3a05 100644
--- a/xmloff/inc/MetaExportComponent.hxx
+++ b/xmloff/inc/MetaExportComponent.hxx
@@ -26,12 +26,11 @@
 
 class XMLMetaExportComponent : public SvXMLExport
 {
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::document::XDocumentProperties > mxDocProps;
+    css::uno::Reference< css::document::XDocumentProperties > mxDocProps;
 
 public:
     XMLMetaExportComponent(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext,
+        const css::uno::Reference< css::uno::XComponentContext >& xContext,
         OUString const & implementationName, SvXMLExportFlags nFlags
         );
 
@@ -43,7 +42,7 @@ protected:
         enum ::xmloff::token::XMLTokenEnum eClass = xmloff::token::XML_TOKEN_INVALID ) override;
 
     // accept XDocumentProperties in addition to XModel
-    virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
 
     // override
     virtual void _ExportMeta() override;
diff --git a/xmloff/inc/MultiPropertySetHelper.hxx b/xmloff/inc/MultiPropertySetHelper.hxx
index 35650f5..028a3437 100644
--- a/xmloff/inc/MultiPropertySetHelper.hxx
+++ b/xmloff/inc/MultiPropertySetHelper.hxx
@@ -62,20 +62,20 @@ class MultiPropertySetHelper
 
     /// the sequence of property names that the current (multi)
     /// property set implementation supports
-    ::com::sun::star::uno::Sequence< OUString > aPropertySequence;
+    css::uno::Sequence< OUString > aPropertySequence;
 
     /// an array of indices that maps from pPropertyNames indices to
     /// aPropertySequence indices
     sal_Int16* pSequenceIndex;
 
     /// the last set of values retrieved by getValues
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aValues;
+    css::uno::Sequence< css::uno::Any > aValues;
 
     /// result of aValues.getConstArray()
-    const ::com::sun::star::uno::Any* pValues;
+    const css::uno::Any* pValues;
 
     /// an empty Any
-    ::com::sun::star::uno::Any aEmptyAny;
+    css::uno::Any aEmptyAny;
 
 public:
 
@@ -88,8 +88,7 @@ public:
      * Call hasPropertiesByName for the provided XPropertySetInfo and build
      * list of allowed properties.
      */
-    void hasProperties( const ::com::sun::star::uno::Reference<
-                            ::com::sun::star::beans::XPropertySetInfo> & );
+    void hasProperties( const css::uno::Reference<css::beans::XPropertySetInfo> & );
 
 
     /**
@@ -104,8 +103,7 @@ public:
      * May only be called after hasProperties() was called for the
      * appropriate XPropertySetInfo.
      */
-    void getValues( const ::com::sun::star::uno::Reference<
-                            ::com::sun::star::beans::XMultiPropertySet> & );
+    void getValues( const css::uno::Reference<css::beans::XMultiPropertySet> & );
 
     /**
      * Get values from the XPropertySet. This can be much slower than
@@ -115,8 +113,7 @@ public:
      * May only be called after hasProperties() was called for the
      * appropriate XPropertySetInfo.
      */
-    void getValues( const ::com::sun::star::uno::Reference<
-                            ::com::sun::star::beans::XPropertySet> & );
+    void getValues( const css::uno::Reference<css::beans::XPropertySet> & );
 
 
 
@@ -125,7 +122,7 @@ public:
      *
      * May only be called after getValues() was called.
      */
-    inline const ::com::sun::star::uno::Any& getValue( sal_Int16 nIndex );
+    inline const css::uno::Any& getValue( sal_Int16 nIndex );
 
     /**
      * Find out if this property is supported.
@@ -144,9 +141,8 @@ public:
      * bTryMult is set, the XMultiPropertySet is used to get the values.
      *
      */
-    const ::com::sun::star::uno::Any& getValue( sal_Int16 nIndex,
-                        const ::com::sun::star::uno::Reference<
-                            ::com::sun::star::beans::XPropertySet> &,
+    const css::uno::Any& getValue( sal_Int16 nIndex,
+                        const css::uno::Reference<css::beans::XPropertySet> &,
                         bool bTryMulti = false );
 
     /**
@@ -159,9 +155,8 @@ public:
      * XMultiPropertySet is used to get the values.
      *
      */
-    const ::com::sun::star::uno::Any& getValue( sal_Int16 nIndex,
-                        const ::com::sun::star::uno::Reference<
-                            ::com::sun::star::beans::XMultiPropertySet> & );
+    const css::uno::Any& getValue( sal_Int16 nIndex,
+                        const css::uno::Reference<css::beans::XMultiPropertySet> & );
 
     inline void resetValues() { pValues = nullptr; }
 };
@@ -169,7 +164,7 @@ public:
 
 // inline implementations of the often-called methods getValue and hasProperty:
 
-const ::com::sun::star::uno::Any& MultiPropertySetHelper::getValue(
+const css::uno::Any& MultiPropertySetHelper::getValue(
     sal_Int16 nValueNo )
 {
     assert(pValues && "called getValue() without calling getValues()");
diff --git a/xmloff/inc/PageMasterImportContext.hxx b/xmloff/inc/PageMasterImportContext.hxx
index 05e0c09..9deea73 100644
--- a/xmloff/inc/PageMasterImportContext.hxx
+++ b/xmloff/inc/PageMasterImportContext.hxx
@@ -42,7 +42,7 @@ public:
 
     PageStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
             const OUString& rLName,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
+            const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList,
             SvXMLStylesContext& rStyles,
             bool bDefaultStyle=false);
     virtual ~PageStyleContext();
@@ -50,11 +50,10 @@ public:
     virtual SvXMLImportContext *CreateChildContext(
             sal_uInt16 nPrefix,
             const OUString& rLocalName,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
+            const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
 
     virtual void FillPropertySet(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::beans::XPropertySet > & rPropSet ) override;
+            const css::uno::Reference< css::beans::XPropertySet > & rPropSet ) override;
 
     //text grid enhancement
     virtual void SetDefaults() override;
diff --git a/xmloff/inc/PropertySetMerger.hxx b/xmloff/inc/PropertySetMerger.hxx
index ff966caa..7a711d3 100644
--- a/xmloff/inc/PropertySetMerger.hxx
+++ b/xmloff/inc/PropertySetMerger.hxx
@@ -22,10 +22,10 @@
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 
-extern ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
+extern css::uno::Reference< css::beans::XPropertySet >
     PropertySetMerger_CreateInstance(
-        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rPropSet1,
-        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rPropSet2 ) throw();
+        css::uno::Reference< css::beans::XPropertySet > rPropSet1,
+        css::uno::Reference< css::beans::XPropertySet > rPropSet2 ) throw();
 
 #endif
 
diff --git a/xmloff/inc/RDFaExportHelper.hxx b/xmloff/inc/RDFaExportHelper.hxx
index 56e4c0a..2b79a04 100644
--- a/xmloff/inc/RDFaExportHelper.hxx
+++ b/xmloff/inc/RDFaExportHelper.hxx
@@ -42,8 +42,7 @@ class RDFaExportHelper
 private:
     SvXMLExport & m_rExport;
 
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::rdf::XDocumentRepository> m_xRepository;
+    css::uno::Reference<css::rdf::XDocumentRepository> m_xRepository;
 
     typedef ::std::map< OUString, OUString >
         BlankNodeMap_t;
@@ -53,15 +52,13 @@ private:
     long m_Counter;
 
     OUString
-    LookupBlankNode( ::com::sun::star::uno::Reference<
-        ::com::sun::star::rdf::XBlankNode> const & i_xBlankNode);
+    LookupBlankNode( css::uno::Reference<css::rdf::XBlankNode> const & i_xBlankNode);
 
 public:
     RDFaExportHelper(SvXMLExport & i_rExport);
 
     void
-    AddRDFa(::com::sun::star::uno::Reference<
-        ::com::sun::star::rdf::XMetadatable> const & i_xMetadatable);
+    AddRDFa(css::uno::Reference<css::rdf::XMetadatable> const & i_xMetadatable);
 };
 
 } // namespace xmloff
diff --git a/xmloff/inc/RDFaImportHelper.hxx b/xmloff/inc/RDFaImportHelper.hxx
index ceb4c2e..b25c09b 100644
--- a/xmloff/inc/RDFaImportHelper.hxx
+++ b/xmloff/inc/RDFaImportHelper.hxx
@@ -66,14 +66,12 @@ public:
 
     /** Add a RDFa statement; must have been parsed with ParseRDFa */
     void AddRDFa(
-        ::com::sun::star::uno::Reference< ::com::sun::star::rdf::XMetadatable>
-            const & i_xObject,
+        css::uno::Reference< css::rdf::XMetadatable> const & i_xObject,
         std::shared_ptr<ParsedRDFaAttributes> & i_pRDFaAttributes);
 
     /** Parse and add a RDFa statement; parameters are XML attribute values */
     void ParseAndAddRDFa(
-        ::com::sun::star::uno::Reference< ::com::sun::star::rdf::XMetadatable>
-            const & i_xObject,
+        css::uno::Reference< css::rdf::XMetadatable> const & i_xObject,
         OUString const & i_rAbout,
         OUString const & i_rProperty,
         OUString const & i_rContent,
@@ -83,8 +81,7 @@ public:
         <p> This is done <em>after</em> the input file has been read,
         to prevent collision between generated ids and ids in the file.</p>
      */
-    void InsertRDFa( ::com::sun::star::uno::Reference<
-        ::com::sun::star::rdf::XRepositorySupplier > const & i_xModel);
+    void InsertRDFa( css::uno::Reference< css::rdf::XRepositorySupplier > const & i_xModel);
 };
 
 } // namespace xmloff
diff --git a/xmloff/inc/SchXMLExport.hxx b/xmloff/inc/SchXMLExport.hxx
index 95c9b10..f61879b 100644
--- a/xmloff/inc/SchXMLExport.hxx
+++ b/xmloff/inc/SchXMLExport.hxx
@@ -36,7 +36,7 @@ namespace com { namespace sun { namespace star {
 class SchXMLExport : public SvXMLExport
 {
 private:
-    com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > mxStatusIndicator;
+    css::uno::Reference< css::task::XStatusIndicator > mxStatusIndicator;
     rtl::Reference<SchXMLAutoStylePoolP> maAutoStylePool;
 
     rtl::Reference<SchXMLExportHelper> maExportHelper;
@@ -51,7 +51,7 @@ protected:
 
 public:
     SchXMLExport(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext,
+        const css::uno::Reference< css::uno::XComponentContext >& xContext,
         OUString const & implementationName,
         SvXMLExportFlags nExportFlags = SvXMLExportFlags::ALL );
     virtual ~SchXMLExport();
diff --git a/xmloff/inc/SchXMLImport.hxx b/xmloff/inc/SchXMLImport.hxx
index 596b3f1..aae955c 100644
--- a/xmloff/inc/SchXMLImport.hxx
+++ b/xmloff/inc/SchXMLImport.hxx
@@ -158,7 +158,7 @@ enum SchXMLRegEquationAttrMap
 class SchXMLImport : public SvXMLImport
 {
 private:
-    com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > mxStatusIndicator;
+    css::uno::Reference< css::task::XStatusIndicator > mxStatusIndicator;
 
     rtl::Reference<SchXMLImportHelper> maImportHelper;
 
@@ -166,20 +166,20 @@ protected:
     virtual SvXMLImportContext *CreateContext(
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
-        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) override;
+        const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
 
 public:
     SchXMLImport(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext,
+        const css::uno::Reference< css::uno::XComponentContext >& xContext,
         OUString const & implementationName, SvXMLImportFlags nImportFlags );
 
     virtual ~SchXMLImport() throw ();
 
     SvXMLImportContext* CreateStylesContext( const OUString& rLocalName,
-        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
+        const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList );
 
     // XImporter
-    virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
 };
 
 #endif // INCLUDED_XMLOFF_INC_SCHXMLIMPORT_HXX
diff --git a/xmloff/inc/StyleMap.hxx b/xmloff/inc/StyleMap.hxx
index e47d3d1..4d838ab 100644
--- a/xmloff/inc/StyleMap.hxx
+++ b/xmloff/inc/StyleMap.hxx
@@ -63,7 +63,7 @@ inline bool StyleNameHash_Impl::operator()(
 }
 
 class StyleMap :
-    public ::cppu::WeakImplHelper< ::com::sun::star::lang::XUnoTunnel>,
+    public ::cppu::WeakImplHelper< css::lang::XUnoTunnel>,
     public std::unordered_map< StyleNameKey_Impl, OUString,
                             StyleNameHash_Impl, StyleNameHash_Impl >
 {
@@ -73,14 +73,13 @@ public:
     StyleMap();
     virtual ~StyleMap();
 
-    static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
+    static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
     static StyleMap* getImplementation(
-            ::com::sun::star::uno::Reference<
-                ::com::sun::star::uno::XInterface > ) throw();
+            css::uno::Reference< css::uno::XInterface > ) throw();
 
     // XUnoTunnel
     virtual sal_Int64 SAL_CALL getSomething(
-                const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+                const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
 };
 
 #endif // INCLUDED_XMLOFF_INC_STYLEMAP_HXX
diff --git a/xmloff/inc/TransGradientStyle.hxx b/xmloff/inc/TransGradientStyle.hxx
index b65f05e..c2d8293 100644
--- a/xmloff/inc/TransGradientStyle.hxx
+++ b/xmloff/inc/TransGradientStyle.hxx
@@ -42,9 +42,8 @@ public:
     ~XMLTransGradientStyleImport();
 
     bool importXML(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
-        ::com::sun::star::uno::Any& rValue,
+        const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList,
+        css::uno::Any& rValue,
         OUString& rStrName );
 };
 
@@ -56,7 +55,7 @@ public:
     XMLTransGradientStyleExport( SvXMLExport& rExport );
     ~XMLTransGradientStyleExport();
 
-    bool exportXML( const OUString& rStrName, const ::com::sun::star::uno::Any& rValue );
+    bool exportXML( const OUString& rStrName, const css::uno::Any& rValue );
 };
 
 #endif // INCLUDED_XMLOFF_INC_TRANSGRADIENTSTYLE_HXX
diff --git a/xmloff/inc/XMLBackgroundImageContext.hxx b/xmloff/inc/XMLBackgroundImageContext.hxx
index 6ff4d06..13da75c 100644
--- a/xmloff/inc/XMLBackgroundImageContext.hxx
+++ b/xmloff/inc/XMLBackgroundImageContext.hxx
@@ -34,17 +34,16 @@ class XMLBackgroundImageContext : public XMLElementPropertyContext
     XMLPropertyState aFilterProp;
     XMLPropertyState aTransparencyProp;
 
-    ::com::sun::star::style::GraphicLocation ePos;
+    css::style::GraphicLocation ePos;
     OUString sURL;
     OUString sFilter;
     sal_Int8 nTransparency;
 
-    ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > xBase64Stream;
+    css::uno::Reference < css::io::XOutputStream > xBase64Stream;
 
 private:
     void ProcessAttrs(
-            const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
+            const css::uno::Reference<css::xml::sax::XAttributeList > & xAttrList );
 
 public:
 
@@ -52,8 +51,7 @@ public:
         SvXMLImport& rImport,
         sal_uInt16 nPrfx,
         const OUString& rLName,
-        const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
+        const css::uno::Reference<css::xml::sax::XAttributeList > & xAttrList,
         const XMLPropertyState& rProp,
         sal_Int32 nPosIdx,
         sal_Int32 nFilterIdx,
@@ -65,8 +63,7 @@ public:
 
     SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                 const OUString& rLocalName,
-                 const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
+                 const css::uno::Reference<css::xml::sax::XAttributeList > & xAttrList ) override;
 
     virtual void EndElement() override;
 };
diff --git a/xmloff/inc/XMLBackgroundImageExport.hxx b/xmloff/inc/XMLBackgroundImageExport.hxx
index 36c2291..0eb7468 100644
--- a/xmloff/inc/XMLBackgroundImageExport.hxx
+++ b/xmloff/inc/XMLBackgroundImageExport.hxx
@@ -41,10 +41,10 @@ public:
 
     ~XMLBackgroundImageExport();
 
-    void exportXML( const ::com::sun::star::uno::Any& rURL,
-                    const ::com::sun::star::uno::Any *pPos,
-                    const ::com::sun::star::uno::Any *pFilter,
-                    const ::com::sun::star::uno::Any *pTransparency,
+    void exportXML( const css::uno::Any& rURL,
+                    const css::uno::Any *pPos,
+                    const css::uno::Any *pFilter,
+                    const css::uno::Any *pTransparency,
                     sal_uInt16 nPrefix,
                     const OUString& rLocalName );
 };
diff --git a/xmloff/inc/XMLBase64Export.hxx b/xmloff/inc/XMLBase64Export.hxx
index 1a2cf4d..f3cbac2 100644
--- a/xmloff/inc/XMLBase64Export.hxx
+++ b/xmloff/inc/XMLBase64Export.hxx
@@ -37,15 +37,12 @@ public:
 
     XMLBase64Export( SvXMLExport& rExport );
 
-    bool exportXML( const ::com::sun::star::uno::Reference <
-            ::com::sun::star::io::XInputStream > & rIn );
-    bool exportElement( const ::com::sun::star::uno::Reference <
-            ::com::sun::star::io::XInputStream > & rIn,
+    bool exportXML( const css::uno::Reference < css::io::XInputStream > & rIn );
+    bool exportElement( const css::uno::Reference < css::io::XInputStream > & rIn,
             sal_uInt16 nNamespace,
             enum ::xmloff::token::XMLTokenEnum eName );
     bool exportOfficeBinaryDataElement(
-            const ::com::sun::star::uno::Reference <
-                ::com::sun::star::io::XInputStream > & rIn );
+            const css::uno::Reference < css::io::XInputStream > & rIn );
 };
 
 
diff --git a/xmloff/inc/XMLBasicExportFilter.hxx b/xmloff/inc/XMLBasicExportFilter.hxx
index dac0afb..3fc8d5b 100644
--- a/xmloff/inc/XMLBasicExportFilter.hxx
+++ b/xmloff/inc/XMLBasicExportFilter.hxx
@@ -26,36 +26,36 @@
 // class XMLBasicExportFilter
 
 typedef ::cppu::WeakImplHelper<
-    ::com::sun::star::xml::sax::XDocumentHandler > XMLBasicExportFilter_BASE;
+    css::xml::sax::XDocumentHandler > XMLBasicExportFilter_BASE;
 
 class XMLBasicExportFilter : public XMLBasicExportFilter_BASE
 {
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >    m_xHandler;
+    css::uno::Reference< css::xml::sax::XDocumentHandler >    m_xHandler;
 
 public:
     XMLBasicExportFilter(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >& rxHandler );
+        const css::uno::Reference< css::xml::sax::XDocumentHandler >& rxHandler );
     virtual ~XMLBasicExportFilter();
 
     // XDocumentHandler
     virtual void SAL_CALL startDocument()
-        throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL endDocument()
-        throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL startElement( const OUString& aName,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs )
-        throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs )
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL endElement( const OUString& aName )
-        throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL characters( const OUString& aChars )
-        throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces )
-        throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData )
-        throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator )
-        throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator )
+        throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
 };
 
 #endif // INCLUDED_XMLOFF_INC_XMLBASICEXPORTFILTER_HXX
diff --git a/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx b/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx
index f451dcc..caf3c2b 100644
--- a/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx
+++ b/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx
@@ -40,13 +40,13 @@ public:
     /// Imports the given value in cas of the given XML-data-type
     virtual bool importXML(
             const OUString& rStrImpValue,
-            ::com::sun::star::uno::Any& rValue,
+            css::uno::Any& rValue,
             const SvXMLUnitConverter& rUnitConverter ) const override;
 
     /// Exports the given value in cas of the given XML-data-type
     virtual bool exportXML(
             OUString& rStrExpValue,
-            const ::com::sun::star::uno::Any& rValue,
+            const css::uno::Any& rValue,
             const SvXMLUnitConverter& rUnitConverter ) const override;
 };
 
diff --git a/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx b/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx
index 1f9ac3d..523c87f 100644
--- a/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx
+++ b/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx
@@ -42,13 +42,13 @@ public:
     /// Imports the given value in cas of the given XML-data-type
     virtual bool importXML(
             const OUString& rStrImpValue,
-            ::com::sun::star::uno::Any& rValue,
+            css::uno::Any& rValue,
             const SvXMLUnitConverter& rUnitConverter ) const override;
 
     /// Exports the given value in cas of the given XML-data-type
     virtual bool exportXML(
             OUString& rStrExpValue,
-            const ::com::sun::star::uno::Any& rValue,
+            const css::uno::Any& rValue,
             const SvXMLUnitConverter& rUnitConverter ) const override;
 };
 
diff --git a/xmloff/inc/XMLChartPropertySetMapper.hxx b/xmloff/inc/XMLChartPropertySetMapper.hxx
index 1f88294e..819865b 100644
--- a/xmloff/inc/XMLChartPropertySetMapper.hxx
+++ b/xmloff/inc/XMLChartPropertySetMapper.hxx
@@ -46,14 +46,13 @@ class XMLChartExportPropertyMapper : public SvXMLExportPropertyMapper
 {
 private:
     SvXMLExport& mrExport;
-    com::sun::star::uno::Reference< com::sun::star::chart2::XChartDocument > mxChartDoc;
+    css::uno::Reference< css::chart2::XChartDocument > mxChartDoc;
 
 protected:
     virtual void ContextFilter(
         bool bEnableFoFontFamily,
         ::std::vector< XMLPropertyState >& rProperties,
-        ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet > rPropSet ) const override;
+        css::uno::Reference<css::beans::XPropertySet > rPropSet ) const override;
 
 private:
     /// this method is called for every item that has the MID_FLAG_ELEMENT_EXPORT flag set
@@ -75,8 +74,7 @@ public:
                                   SvXMLExport& rExport );
     virtual ~XMLChartExportPropertyMapper();
 
-    void setChartDoc( com::sun::star::uno::Reference<
-            com::sun::star::chart2::XChartDocument > xChartDoc );
+    void setChartDoc( css::uno::Reference< css::chart2::XChartDocument > xChartDoc );
 };
 
 class XMLChartImportPropertyMapper : public SvXMLImportPropertyMapper
diff --git a/xmloff/inc/XMLChartStyleContext.hxx b/xmloff/inc/XMLChartStyleContext.hxx
index 746261f..09751ba 100644
--- a/xmloff/inc/XMLChartStyleContext.hxx
+++ b/xmloff/inc/XMLChartStyleContext.hxx
@@ -39,20 +39,19 @@ public:
     XMLChartStyleContext(
         SvXMLImport& rImport, sal_uInt16 nPrfx,
         const OUString& rLName,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
+        const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList,
         SvXMLStylesContext& rStyles, sal_uInt16 nFamily );
     virtual ~XMLChartStyleContext();
 
     /// is called after all styles have been read to apply styles
     void FillPropertySet(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet > & rPropSet ) override;
+        const css::uno::Reference<css::beans::XPropertySet > & rPropSet ) override;
 
     /// necessary for property context (element-property symbol-image)
     virtual SvXMLImportContext *CreateChildContext(
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
+        const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
 };
 
 #endif // INCLUDED_XMLOFF_INC_XMLCHARTSTYLECONTEXT_HXX
diff --git a/xmloff/inc/XMLClipPropertyHandler.hxx b/xmloff/inc/XMLClipPropertyHandler.hxx
index b415fd2..01b6940 100644
--- a/xmloff/inc/XMLClipPropertyHandler.hxx
+++ b/xmloff/inc/XMLClipPropertyHandler.hxx
@@ -32,9 +32,9 @@ public:
     XMLClipPropertyHandler( bool bODF11 );
     virtual ~XMLClipPropertyHandler();
 
-    virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const override;
-    virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override;
-    virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override;
+    virtual bool equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const override;
+    virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override;
+    virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override;
 };
 
 #endif // INCLUDED_XMLOFF_INC_XMLCLIPPROPERTYHANDLER_HXX
diff --git a/xmloff/inc/XMLEmbeddedObjectImportContext.hxx b/xmloff/inc/XMLEmbeddedObjectImportContext.hxx
index acb7a5f..f5c6cbc 100644
--- a/xmloff/inc/XMLEmbeddedObjectImportContext.hxx
+++ b/xmloff/inc/XMLEmbeddedObjectImportContext.hxx
@@ -28,10 +28,8 @@ namespace com { namespace sun { namespace star { namespace lang {
 
 class XMLEmbeddedObjectImportContext : public SvXMLImportContext
 {
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::xml::sax::XDocumentHandler > xHandler;
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::lang::XComponent > xComp;
+    css::uno::Reference<css::xml::sax::XDocumentHandler > xHandler;
+    css::uno::Reference<css::lang::XComponent > xComp;
 
     OUString sFilterService;
     OUString sCLSID;
@@ -43,24 +41,22 @@ public:
 
     XMLEmbeddedObjectImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
                                     const OUString& rLName,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
+        const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList );
 
     virtual ~XMLEmbeddedObjectImportContext();
 
     virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                    const OUString& rLocalName,
-                                   const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override;
+                                   const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
 
-    virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override;
+    virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
 
     virtual void EndElement() override;
 
     virtual void Characters( const OUString& rChars ) override;
 
     bool SetComponent(
-        ::com::sun::star::uno::Reference<
-            ::com::sun::star::lang::XComponent >& rComp );
+        css::uno::Reference< css::lang::XComponent >& rComp );
 
 };
 
diff --git a/xmloff/inc/XMLEventImportHelper.hxx b/xmloff/inc/XMLEventImportHelper.hxx
index 27c7f9a..23b7358 100644
--- a/xmloff/inc/XMLEventImportHelper.hxx
+++ b/xmloff/inc/XMLEventImportHelper.hxx
@@ -85,8 +85,7 @@ public:
         SvXMLImport& rImport,
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList> & xAttrList,
+        const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList,
         XMLEventsImportContext* rEvents,
         const OUString& rXmlEventName,
         const OUString& rLanguage);
diff --git a/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx b/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx
index 40b59bb..6425a58 100644
--- a/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx
+++ b/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx
@@ -40,13 +40,13 @@ public:
     /// Imports the given value in cas of the given XML-data-type
     virtual bool importXML(
             const OUString& rStrImpValue,
-            ::com::sun::star::uno::Any& rValue,
+            css::uno::Any& rValue,
             const SvXMLUnitConverter& rUnitConverter ) const override;
 
     /// Exports the given value in cas of the given XML-data-type
     virtual bool exportXML(
             OUString& rStrExpValue,
-            const ::com::sun::star::uno::Any& rValue,
+            const css::uno::Any& rValue,
             const SvXMLUnitConverter& rUnitConverter ) const override;
 };
 
diff --git a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx
index 0a61d4d..1f05299 100644
--- a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx
+++ b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx
@@ -70,22 +70,19 @@ public:
         SvXMLImport& rImport,
         sal_uInt16 nPrfx,
         const OUString& rLName,
-        const ::com::sun::star::uno::Reference<
-                ::com::sun::star::xml::sax::XAttributeList> & xAttrList);
+        const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList);
 
     virtual ~XMLFootnoteConfigurationImportContext();
 
     /// parse attributes
     virtual void StartElement(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override;
+        const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList ) override;
 
     /// for footnotes, also parse begin and end notices
     virtual SvXMLImportContext *CreateChildContext(
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override;
+        const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList ) override;
 
     /// get token map for attributes
     const SvXMLTokenMap& GetFtnConfigAttrTokenMap();
@@ -98,8 +95,7 @@ public:
 
     /// set configuration at document
     void ProcessSettings(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet> & rConfig);
+        const css::uno::Reference< css::beans::XPropertySet> & rConfig);
 
     /// for helper class: set begin notice
     void SetBeginNotice( const OUString& sText);
diff --git a/xmloff/inc/XMLImageMapContext.hxx b/xmloff/inc/XMLImageMapContext.hxx
index aee8905..1c8db86 100644
--- a/xmloff/inc/XMLImageMapContext.hxx
+++ b/xmloff/inc/XMLImageMapContext.hxx
@@ -36,13 +36,11 @@ class XMLImageMapContext : public SvXMLImportContext
     const OUString sImageMap;
 
     /// the image map to be imported
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::container::XIndexContainer> xImageMap;
+    css::uno::Reference< css::container::XIndexContainer> xImageMap;
 
     /// the property set from which to get and where eventually to set the
     /// image map
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> xPropertySet;
+    css::uno::Reference< css::beans::XPropertySet> xPropertySet;
 
 public:
 
@@ -50,16 +48,14 @@ public:
         SvXMLImport& rImport,
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
-        ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet> & rPropertySet);
+        css::uno::Reference< css::beans::XPropertySet> & rPropertySet);
 
     virtual ~XMLImageMapContext();
 
     virtual SvXMLImportContext *CreateChildContext(
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override;
+        const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
 
     virtual void EndElement() override;
 };
diff --git a/xmloff/inc/XMLImageMapExport.hxx b/xmloff/inc/XMLImageMapExport.hxx
index 84de735..ada29c3 100644
--- a/xmloff/inc/XMLImageMapExport.hxx
+++ b/xmloff/inc/XMLImageMapExport.hxx
@@ -62,15 +62,13 @@ public:
      */
     void Export(
         /// the property set containing the ImageMap property
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet> & rPropertySet);
+        const css::uno::Reference< css::beans::XPropertySet> & rPropertySet);
     /**
      * Export an ImageMap (XIndexContainer).
      */
     void Export(
         /// the container containing the image map elements
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::container::XIndexContainer> & rContainer);
+        const css::uno::Reference< css::container::XIndexContainer> & rContainer);
 
 protected:
 
@@ -80,32 +78,28 @@ protected:
      * Calls methods for specific image map entries.
      */
     void ExportMapEntry(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet> & rPropertySet);
+        const css::uno::Reference< css::beans::XPropertySet> & rPropertySet);
 
     /**
      * Export the specifics of a rectangular image map entry.
      * To be called by ExportMapEntry.
      */
     void ExportRectangle(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet> & rPropertySet);
+        const css::uno::Reference< css::beans::XPropertySet> & rPropertySet);
 
     /**
      * Export the specifics of a circular image map entry.
      * To be called by ExportMapEntry.
      */
     void ExportCircle(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet> & rPropertySet);
+        const css::uno::Reference< css::beans::XPropertySet> & rPropertySet);
 
     /**
      * Export the specifics of a polygonal image map entry;
      * To be called by ExportMapEntry.
      */
     void ExportPolygon(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet> & rPropertySet);
+        const css::uno::Reference< css::beans::XPropertySet> & rPropertySet);
 };
 
 #endif
diff --git a/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx b/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx
index babf25c..2b15766 100644
--- a/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx
+++ b/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx
@@ -61,8 +61,7 @@ class XMLIndexBibliographyConfigurationContext : public SvXMLStyleContext
     bool bNumberedEntries;
     bool bSortByPosition;
 
-    ::std::vector< ::com::sun::star::uno::Sequence<
-                        ::com::sun::star::beans::PropertyValue> > aSortKeys;
+    ::std::vector< css::uno::Sequence< css::beans::PropertyValue> > aSortKeys;
 
 public:
 
@@ -71,24 +70,21 @@ public:
         SvXMLImport& rImport,
         sal_uInt16 nPrfx,
         const OUString& rLocalName,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList> & xAttrList);
+        const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList);
 
     virtual ~XMLIndexBibliographyConfigurationContext();
 
 protected:
 
     virtual void StartElement(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override;
+        const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList) override;
 
     virtual void CreateAndInsert( bool bOverwrite ) override;
 
     virtual SvXMLImportContext *CreateChildContext(
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override;
+        const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList ) override;
 
     void ProcessAttribute(
         sal_uInt16 nPrefix,
diff --git a/xmloff/inc/XMLIsPercentagePropertyHandler.hxx b/xmloff/inc/XMLIsPercentagePropertyHandler.hxx
index c1b5574..d27fe04 100644
--- a/xmloff/inc/XMLIsPercentagePropertyHandler.hxx
+++ b/xmloff/inc/XMLIsPercentagePropertyHandler.hxx
@@ -33,11 +33,11 @@ public:
 
     virtual bool importXML(
             const OUString& rStrImpValue,
-            ::com::sun::star::uno::Any& rValue,
+            css::uno::Any& rValue,
             const SvXMLUnitConverter& rUnitConverter ) const override;
     virtual bool exportXML(
             OUString& rStrExpValue,
-            const ::com::sun::star::uno::Any& rValue,
+            const css::uno::Any& rValue,
             const SvXMLUnitConverter& rUnitConverter ) const override;
 };
 
diff --git a/xmloff/inc/XMLLineNumberingImportContext.hxx b/xmloff/inc/XMLLineNumberingImportContext.hxx
index 6d1f663..f15d14c 100644
--- a/xmloff/inc/XMLLineNumberingImportContext.hxx
+++ b/xmloff/inc/XMLLineNumberingImportContext.hxx
@@ -82,8 +82,7 @@ public:
         SvXMLImport& rImport,
         sal_uInt16 nPrfx,
         const OUString& rLocalName,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList> & xAttrList);
+        const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList);
 
     virtual ~XMLLineNumberingImportContext();
 
@@ -94,8 +93,7 @@ public:
 protected:
 
     virtual void StartElement(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override;
+        const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override;
 
     void ProcessAttribute(
         enum LineNumberingToken eToken,
@@ -106,8 +104,7 @@ protected:
     virtual SvXMLImportContext *CreateChildContext(
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override;
+        const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList ) override;
 };
 
 #endif
diff --git a/xmloff/inc/XMLNumberStylesImport.hxx b/xmloff/inc/XMLNumberStylesImport.hxx
index 0534800..be2de70 100644
--- a/xmloff/inc/XMLNumberStylesImport.hxx
+++ b/xmloff/inc/XMLNumberStylesImport.hxx
@@ -51,14 +51,14 @@ public:
         sal_uInt16 nPrfx,
         const OUString& rLocalName,
         SvXMLNumImpData* pNewData, sal_uInt16 nNewType,
-        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
+        const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
         SvXMLStylesContext& rStyles);
     virtual ~SdXMLNumberFormatImportContext();
 
     virtual void EndElement() override;
 
     virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName,
-        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) override;
+        const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override;
 
     sal_Int32 GetDrawKey() const { return mnKey; }
 };
diff --git a/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx b/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx
index ea8a59f..b293acc 100644
--- a/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx
+++ b/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx
@@ -35,11 +35,11 @@ public:
 
     virtual bool importXML(
             const OUString& rStrImpValue,
-            ::com::sun::star::uno::Any& rValue,
+            css::uno::Any& rValue,
             const SvXMLUnitConverter& rUnitConverter ) const override;
     virtual bool exportXML(
             OUString& rStrExpValue,
-            const ::com::sun::star::uno::Any& rValue,
+            const css::uno::Any& rValue,
             const SvXMLUnitConverter& rUnitConverter ) const override;
 };
 
diff --git a/xmloff/inc/XMLRectangleMembersHandler.hxx b/xmloff/inc/XMLRectangleMembersHandler.hxx
index 5667245..ce21f05 100644
--- a/xmloff/inc/XMLRectangleMembersHandler.hxx
+++ b/xmloff/inc/XMLRectangleMembersHandler.hxx
@@ -42,13 +42,13 @@ public:
     /// Imports the given value in cas of the given XML-data-type
     virtual bool importXML(
             const OUString& rStrImpValue,
-            ::com::sun::star::uno::Any& rValue,
+            css::uno::Any& rValue,
             const SvXMLUnitConverter& rUnitConverter ) const override;
 
     /// Exports the given value in cas of the given XML-data-type
     virtual bool exportXML(
             OUString& rStrExpValue,
-            const ::com::sun::star::uno::Any& rValue,
+            const css::uno::Any& rValue,
             const SvXMLUnitConverter& rUnitConverter ) const override;
 };
 
diff --git a/xmloff/inc/XMLReplacementImageContext.hxx b/xmloff/inc/XMLReplacementImageContext.hxx
index 4dae10a..243db0b 100644
--- a/xmloff/inc/XMLReplacementImageContext.hxx
+++ b/xmloff/inc/XMLReplacementImageContext.hxx
@@ -30,10 +30,8 @@ namespace com { namespace sun { namespace star {
 
 class XMLReplacementImageContext : public SvXMLImportContext
 {
-    ::com::sun::star::uno::Reference <
-        ::com::sun::star::io::XOutputStream > m_xBase64Stream;
-::com::sun::star::uno::Reference <
-        ::com::sun::star::beans::XPropertySet > m_xPropSet;
+    css::uno::Reference < css::io::XOutputStream > m_xBase64Stream;
+    css::uno::Reference < css::beans::XPropertySet > m_xPropSet;
 
     OUString m_sHRef;
     const OUString m_sGraphicURL;
@@ -44,18 +42,15 @@ public:
     XMLReplacementImageContext( SvXMLImport& rImport,
             sal_uInt16 nPrfx,
             const OUString& rLName,
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::xml::sax::XAttributeList > & rAttrList,
-            const ::com::sun::star::uno::Reference <
-                ::com::sun::star::beans::XPropertySet >& rPropSet );
+            const css::uno::Reference< css::xml::sax::XAttributeList > & rAttrList,
+            const css::uno::Reference< css::beans::XPropertySet >& rPropSet );
     virtual ~XMLReplacementImageContext();
 
     virtual void EndElement() override;
 
     SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                 const OUString& rLocalName,
-                 const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
+                const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
 
 };
 
diff --git a/xmloff/inc/XMLScriptContextFactory.hxx b/xmloff/inc/XMLScriptContextFactory.hxx
index a054a5c..9e687df 100644
--- a/xmloff/inc/XMLScriptContextFactory.hxx
+++ b/xmloff/inc/XMLScriptContextFactory.hxx
@@ -45,8 +45,7 @@ public:
                   sal_uInt16 nPrefix,    /// element: namespace prefix
                   const OUString & rLocalName, /// element: local name
                   /// attribute list
-                  const ::com::sun::star::uno::Reference<
-                  ::com::sun::star::xml::sax::XAttributeList> & xAttrList,
+                  const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList,
                   /// the context for the enclosing <script:events> element
                   XMLEventsImportContext * rEvents,
                   /// the event name (as understood by the API)
diff --git a/xmloff/inc/XMLScriptExportHandler.hxx b/xmloff/inc/XMLScriptExportHandler.hxx
index 994ce63..101f5ba 100644
--- a/xmloff/inc/XMLScriptExportHandler.hxx
+++ b/xmloff/inc/XMLScriptExportHandler.hxx
@@ -43,8 +43,7 @@ public:
     virtual void Export(
         SvXMLExport& rExport,
         const OUString& rEventName,
-        ::com::sun::star::uno::Sequence<
-            ::com::sun::star::beans::PropertyValue> & rValues,
+        css::uno::Sequence<css::beans::PropertyValue> & rValues,
         bool bUseWhitespace) override;
 };
 
diff --git a/xmloff/inc/XMLShapePropertySetContext.hxx b/xmloff/inc/XMLShapePropertySetContext.hxx
index 1893f4e..9a11ad2 100644
--- a/xmloff/inc/XMLShapePropertySetContext.hxx
+++ b/xmloff/inc/XMLShapePropertySetContext.hxx
@@ -32,8 +32,7 @@ public:
 
     XMLShapePropertySetContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
                 const OUString& rLName,
-                 const ::com::sun::star::uno::Reference<
-                         ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
+                 const css::uno::Reference<css::xml::sax::XAttributeList >& xAttrList,
                  sal_uInt32 nFam,
                  ::std::vector< XMLPropertyState > &rProps,
                  const rtl::Reference < SvXMLImportPropertyMapper > &rMap );
@@ -45,7 +44,7 @@ public:
     using SvXMLPropertySetContext::CreateChildContext;
     virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                    const OUString& rLocalName,
-                                   const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
+                                   const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList,
                                    ::std::vector< XMLPropertyState > &rProperties,
                                    const XMLPropertyState& rProp) override;
 };
diff --git a/xmloff/inc/XMLStarBasicContextFactory.hxx b/xmloff/inc/XMLStarBasicContextFactory.hxx
index 0b5ef38..f03e566 100644
--- a/xmloff/inc/XMLStarBasicContextFactory.hxx
+++ b/xmloff/inc/XMLStarBasicContextFactory.hxx
@@ -46,8 +46,7 @@ public:
         SvXMLImport& rImport,               /// import context
         sal_uInt16 nPrefix,                 /// element: namespace prefix
         const OUString& rLocalName,  /// element: local name
-        const ::com::sun::star::uno::Reference<     /// attribute list
-            ::com::sun::star::xml::sax::XAttributeList> & xAttrList,
+        const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList,/// attribute list
         /// the context for the enclosing <script:events> element
         XMLEventsImportContext* rEvents,
         /// the event name (as understood by the API)
diff --git a/xmloff/inc/XMLStarBasicExportHandler.hxx b/xmloff/inc/XMLStarBasicExportHandler.hxx
index e5d8eef..60d558b 100644
--- a/xmloff/inc/XMLStarBasicExportHandler.hxx
+++ b/xmloff/inc/XMLStarBasicExportHandler.hxx
@@ -47,8 +47,7 @@ public:
     virtual void Export(
         SvXMLExport& rExport,
         const OUString& rEventName,
-        ::com::sun::star::uno::Sequence<
-            ::com::sun::star::beans::PropertyValue> & rValues,
+        css::uno::Sequence<css::beans::PropertyValue> & rValues,
         bool bUseWhitespace) override;
 };
 
diff --git a/xmloff/inc/XMLStringBufferImportContext.hxx b/xmloff/inc/XMLStringBufferImportContext.hxx
index 97d2dae..db92e9c 100644
--- a/xmloff/inc/XMLStringBufferImportContext.hxx
+++ b/xmloff/inc/XMLStringBufferImportContext.hxx
@@ -48,8 +48,7 @@ public:
     virtual SvXMLImportContext *CreateChildContext(
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override;
+        const css::uno::Reference<css::xml::sax::XAttributeList >& xAttrList ) override;
 
     virtual void Characters(
         const OUString& rChars ) override;
diff --git a/xmloff/inc/XMLTextColumnsContext.hxx b/xmloff/inc/XMLTextColumnsContext.hxx
index 6c6c7d9..f743632 100644
--- a/xmloff/inc/XMLTextColumnsContext.hxx
+++ b/xmloff/inc/XMLTextColumnsContext.hxx
@@ -52,8 +52,7 @@ public:
     XMLTextColumnsContext(
         SvXMLImport& rImport, sal_uInt16 nPrfx,
         const OUString& rLName,
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
+        const css::uno::Reference<css::xml::sax::XAttributeList > & xAttrList,
         const XMLPropertyState& rProp,
         ::std::vector< XMLPropertyState > &rProps );
 
@@ -61,7 +60,7 @@ public:
 
     virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                                    const OUString& rLocalName,
-                                   const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
+                                   const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
 
     virtual void EndElement() override;
 };
diff --git a/xmloff/inc/XMLTextColumnsExport.hxx b/xmloff/inc/XMLTextColumnsExport.hxx
index 65aaf09..11f206a 100644
--- a/xmloff/inc/XMLTextColumnsExport.hxx
+++ b/xmloff/inc/XMLTextColumnsExport.hxx
@@ -44,7 +44,7 @@ public:
 
     XMLTextColumnsExport( SvXMLExport& rExport );
 
-    void exportXML( const ::com::sun::star::uno::Any& rAny );
+    void exportXML( const css::uno::Any& rAny );
 };
 
 
diff --git a/xmloff/inc/XMLTextColumnsPropertyHandler.hxx b/xmloff/inc/XMLTextColumnsPropertyHandler.hxx
index 2b04d84..0b2f2d4 100644
--- a/xmloff/inc/XMLTextColumnsPropertyHandler.hxx
+++ b/xmloff/inc/XMLTextColumnsPropertyHandler.hxx
@@ -31,17 +31,17 @@ public:
     virtual ~XMLTextColumnsPropertyHandler ();
 
     virtual bool equals(
-            const ::com::sun::star::uno::Any& r1,
-            const ::com::sun::star::uno::Any& r2 ) const override;
+            const css::uno::Any& r1,
+            const css::uno::Any& r2 ) const override;
 
     /// TabStops will be imported/exported as XML-Elements. So the Import/Export-work must be done at another place.
     virtual bool importXML(
             const OUString& rStrImpValue,
-            ::com::sun::star::uno::Any& rValue,
+            css::uno::Any& rValue,
             const SvXMLUnitConverter& rUnitConverter ) const override;
     virtual bool exportXML(
             OUString& rStrExpValue,
-            const ::com::sun::star::uno::Any& rValue,
+            const css::uno::Any& rValue,
             const SvXMLUnitConverter& rUnitConverter ) const override;
 };
 
diff --git a/xmloff/inc/XMLTextHeaderFooterContext.hxx b/xmloff/inc/XMLTextHeaderFooterContext.hxx
index 4ace724..d229074 100644
--- a/xmloff/inc/XMLTextHeaderFooterContext.hxx
+++ b/xmloff/inc/XMLTextHeaderFooterContext.hxx
@@ -29,10 +29,8 @@ namespace com { namespace sun { namespace star {
 
 class XMLTextHeaderFooterContext: public SvXMLImportContext
 {
-    ::com::sun::star::uno::Reference <
-        ::com::sun::star::text::XTextCursor > xOldTextCursor;
-    ::com::sun::star::uno::Reference <
-        ::com::sun::star::beans::XPropertySet > xPropSet;
+    css::uno::Reference< css::text::XTextCursor > xOldTextCursor;
+    css::uno::Reference< css::beans::XPropertySet > xPropSet;
 
     const OUString sOn;
     const OUString sShareContent;
@@ -49,10 +47,8 @@ public:
 
     XMLTextHeaderFooterContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
             const OUString& rLName,
-            const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
-            const ::com::sun::star::uno::Reference <
-                       ::com::sun::star::beans::XPropertySet > & rPageStylePropSet,
+            const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList,
+            const css::uno::Reference< css::beans::XPropertySet > & rPageStylePropSet,
                bool bFooter, bool bLft, bool bFrst );
 
     virtual ~XMLTextHeaderFooterContext();
@@ -60,7 +56,7 @@ public:
     virtual SvXMLImportContext *CreateChildContext(
             sal_uInt16 nPrefix,
             const OUString& rLocalName,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override;
+            const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
 
     virtual void EndElement() override;
 };
diff --git a/xmloff/inc/anim.hxx b/xmloff/inc/anim.hxx
index 2438562..6dafc1f 100644
--- a/xmloff/inc/anim.hxx
+++ b/xmloff/inc/anim.hxx
@@ -88,8 +88,8 @@ extern SvXMLEnumMapEntry aXML_AnimationDirection_EnumMap[];
 
 extern SvXMLEnumMapEntry aXML_AnimationSpeed_EnumMap[];
 
-void SdXMLImplSetEffect( ::com::sun::star::presentation::AnimationEffect eEffect, XMLEffect& eKind, XMLEffectDirection& eDirection, sal_Int16& nStartScale, bool& bIn );
-::com::sun::star::presentation::AnimationEffect ImplSdXMLgetEffect( XMLEffect eKind, XMLEffectDirection eDirection, sal_Int16 nStartScale, bool bIn );
+void SdXMLImplSetEffect( css::presentation::AnimationEffect eEffect, XMLEffect& eKind, XMLEffectDirection& eDirection, sal_Int16& nStartScale, bool& bIn );
+css::presentation::AnimationEffect ImplSdXMLgetEffect( XMLEffect eKind, XMLEffectDirection eDirection, sal_Int16 nStartScale, bool bIn );
 
 #endif // INCLUDED_XMLOFF_INC_ANIM_HXX
 
diff --git a/xmloff/inc/animationimport.hxx b/xmloff/inc/animationimport.hxx
index 307dafe..afe509c 100644
--- a/xmloff/inc/animationimport.hxx
+++ b/xmloff/inc/animationimport.hxx
@@ -33,27 +33,27 @@ class AnimationNodeContext : public SvXMLImportContext
 {
     AnimationsImportHelperImpl* mpHelper;
     bool mbRootContext;
-    ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > mxNode;
+    css::uno::Reference< css::animations::XAnimationNode > mxNode;
 
-    void init_node( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
+    void init_node( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList );
 
 public:
 
     AnimationNodeContext(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xParentNode,
+        const css::uno::Reference< css::animations::XAnimationNode >& xParentNode,
         SvXMLImport& rImport,
         sal_uInt16 nPrfx,
         const OUString& rLocalName,
-        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
+        const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
         AnimationsImportHelperImpl* mpImpl = nullptr );
     virtual ~AnimationNodeContext();
 
-    virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override;
+    virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
 
     virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName,
-        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) override;
+        const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override;
 
-    static void postProcessRootNode( SvXMLImport& rImport, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xPageProps );
+    static void postProcessRootNode( SvXMLImport& rImport, const css::uno::Reference< css::animations::XAnimationNode >& xNode, css::uno::Reference< css::beans::XPropertySet >& xPageProps );
 };
 
 }
diff --git a/xmloff/inc/animimp.hxx b/xmloff/inc/animimp.hxx
index 9d80281..19b9bbe 100644
--- a/xmloff/inc/animimp.hxx
+++ b/xmloff/inc/animimp.hxx
@@ -36,11 +36,11 @@ public:
     XMLAnimationsContext( SvXMLImport& rImport,
         sal_uInt16 nPrfx,
         const OUString& rLocalName,
-        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList);
+        const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList);
     virtual ~XMLAnimationsContext();
 
     virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName,
-        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) override;
+        const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override;
 };
 
 #endif // INCLUDED_XMLOFF_INC_ANIMIMP_HXX
diff --git a/xmloff/inc/forms/property_handler.hxx b/xmloff/inc/forms/property_handler.hxx
index daa1f0f..2f59795 100644
--- a/xmloff/inc/forms/property_handler.hxx
+++ b/xmloff/inc/forms/property_handler.hxx
@@ -33,7 +33,7 @@
 namespace xmloff
 {
 
-    typedef ::std::map< PropertyId, ::com::sun::star::uno::Any >    PropertyValues;
+    typedef ::std::map< PropertyId, css::uno::Any >    PropertyValues;
 
     class PropertyHandlerBase : public ::salhelper::SimpleReferenceObject
     {
@@ -46,7 +46,7 @@ namespace xmloff
         /** is a convenience method for XML attributes whose value comprises of only one UNO API property
         */
         virtual OUString
-            getAttributeValue( const ::com::sun::star::uno::Any& i_propertyValue ) const = 0;
+            getAttributeValue( const css::uno::Any& i_propertyValue ) const = 0;
 
         /** retrieves the values of the properties controlled by an XML attributed, described by a given attribute value
         */
diff --git a/xmloff/inc/txtflde.hxx b/xmloff/inc/txtflde.hxx
index a3b723e..a520184 100644
--- a/xmloff/inc/txtflde.hxx
+++ b/xmloff/inc/txtflde.hxx
@@ -156,7 +156,7 @@ class XMLTextFieldExport
 
     /// store used text field master names (NULL means: don't collect)
     ::std::map<
-            ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >,
+            css::uno::Reference< css::text::XText >,
             ::std::set< OUString > > *
         pUsedMasters;
 
@@ -169,16 +169,14 @@ public:
 
     /// Export this field and the surrounding span element with the formatting.
     /// To be called for every field in the document body.
-    void ExportField(const ::com::sun::star::uno::Reference <
-                        ::com::sun::star::text::XTextField > & rTextField,
+    void ExportField(const css::uno::Reference < css::text::XTextField > & rTextField,
                      bool bProgress );
 
     /// collect styles (character styles, data styles, ...) for this field
     /// (if appropriate).
     /// Also collect used field masters (if pUsedMasters is set)
     /// to be called for every field during style export.
-    void ExportFieldAutoStyle(const ::com::sun::star::uno::Reference <
-                        ::com::sun::star::text::XTextField > & rTextField,
+    void ExportFieldAutoStyle(const css::uno::Reference < css::text::XTextField > & rTextField,
                  const bool bProgress, const bool bRecursive );
 
     /// export field declarations.
@@ -189,8 +187,7 @@ public:
     /// (Requires that a list of used field declarations has previously been
     ///  built-up in ExportFieldAutoStyle() )
     void ExportFieldDeclarations(
-        const ::com::sun::star::uno::Reference <
-                ::com::sun::star::text::XText > & rText);
+        const css::uno::Reference < css::text::XText > & rText);
 
     /// export all field declarations, or only those that have been used?
     /// Calling this method will reset the list of used field declataions.
@@ -209,13 +206,10 @@ public:
     static enum ::xmloff::token::XMLTokenEnum MapCountFieldName(FieldIdEnum nToken);
     static enum ::xmloff::token::XMLTokenEnum MapBibliographyFieldName(const OUString& sName);
     static enum ::xmloff::token::XMLTokenEnum MapMeasureKind(sal_Int16 nKind);
-    enum ::xmloff::token::XMLTokenEnum MapPageNumberName(const ::com::sun::star::uno::Reference<
-                      ::com::sun::star::beans::XPropertySet> & xPropSet,
+    enum ::xmloff::token::XMLTokenEnum MapPageNumberName(const css::uno::Reference< css::beans::XPropertySet> & xPropSet,
                       sal_Int32& nOffset);  /// also adjust page offset
-    enum ::xmloff::token::XMLTokenEnum MapAuthorFieldName(const ::com::sun::star::uno::Reference <
-                      ::com::sun::star::beans::XPropertySet > & xPropSet);
-    enum ::xmloff::token::XMLTokenEnum MapSenderFieldName(const ::com::sun::star::uno::Reference <
-                      ::com::sun::star::beans::XPropertySet > & xPropSet);
+    enum ::xmloff::token::XMLTokenEnum MapAuthorFieldName(const css::uno::Reference< css::beans::XPropertySet > & xPropSet);
+    enum ::xmloff::token::XMLTokenEnum MapSenderFieldName(const css::uno::Reference< css::beans::XPropertySet > & xPropSet);
 
 protected:
 
@@ -223,12 +217,9 @@ protected:
 
     /// export a field after <text:span> is already written
     void ExportFieldHelper(
-        const ::com::sun::star::uno::Reference<
-                ::com::sun::star::text::XTextField> & rTextField,
-        const ::com::sun::star::uno::Reference<
-                ::com::sun::star::beans::XPropertySet> & rPropSet,
-        const ::com::sun::star::uno::Reference<
-                ::com::sun::star::beans::XPropertySet> & rRangePropSet,
+        const css::uno::Reference< css::text::XTextField> & rTextField,
+        const css::uno::Reference< css::beans::XPropertySet> & rPropSet,
+        const css::uno::Reference< css::beans::XPropertySet> & rRangePropSet,
         enum FieldIdEnum nToken,
         bool bProgress );
 
@@ -244,13 +235,11 @@ protected:
                                                         /// element?
 
     /// export a macro (as used in the macro field)
-    void ExportMacro( const ::com::sun::star::uno::Reference<
-                          ::com::sun::star::beans::XPropertySet> & rPropSet,
+    void ExportMacro( const css::uno::Reference< css::beans::XPropertySet> & rPropSet,
                       const OUString& rContent);
 
     /// export text:meta-field (RDF metadata)
-    void ExportMetaField( const ::com::sun::star::uno::Reference<
-                              ::com::sun::star::beans::XPropertySet> & i_xMeta,
+    void ExportMetaField( const css::uno::Reference< css::beans::XPropertySet> & i_xMeta,
                           bool i_bAutoStyles, bool i_bProgress );
 
     /// export a boolean attribute
@@ -363,70 +352,61 @@ protected:
     /// export times, dates and durations according to ISO 8601
     void ProcessDateTime(
         enum ::xmloff::token::XMLTokenEnum eXMLName,    /// attribute token
-        const ::com::sun::star::util::DateTime& rTime,      /// date/time value
+        const css::util::DateTime& rTime,      /// date/time value
         bool bIsDate,           /// export as date (rather than date/time)?
         sal_uInt16 nPrefix = XML_NAMESPACE_TEXT);   /// attribute name prefix
 
     /// export time or dateTime
     void ProcessTimeOrDateTime(
         enum ::xmloff::token::XMLTokenEnum eXMLName,    /// attribute token
-        const ::com::sun::star::util::DateTime& rTime,  /// date/time value
+        const css::util::DateTime& rTime,  /// date/time value
         sal_uInt16 nPrefix = XML_NAMESPACE_TEXT);   /// attribute name prefix
 
     /// export all attributes for bibliography data fields
     void ProcessBibliographyData(
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::beans::XPropertySet > & rPropertySet);
+        const css::uno::Reference <
+            css::beans::XPropertySet > & rPropertySet);
 
     /// export CommandTypeAttribute
     void ProcessCommandType(
-        sal_Int32 nCommandType);        /// com::sun::star::sdb::CommandType
+        sal_Int32 nCommandType);        /// css::sdb::CommandType
 
     void ProcessStringSequence(
-        const ::com::sun::star::uno::Sequence<OUString>& rSequence,
+        const css::uno::Sequence<OUString>& rSequence,
         const OUString& sSelected );
 
     void ProcessStringSequence(
-        const ::com::sun::star::uno::Sequence<OUString>& rSequence,
+        const css::uno::Sequence<OUString>& rSequence,
         sal_Int32 nSelected );
 
     /// export attributes that describe a data source
     void ExportDataBaseElement(
         enum ::xmloff::token::XMLTokenEnum eElement,
         const OUString& sContent,
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::beans::XPropertySet > & rPropertySet,
-        const ::com::sun::star::uno::Reference <
-            ::com::sun::star::beans::XPropertySetInfo > & rPropertySetInfo );
+        const css::uno::Reference < css::beans::XPropertySet > & rPropertySet,
+        const css::uno::Reference < css::beans::XPropertySetInfo > & rPropertySetInfo );
 
     /// for XDependentTextFields, get PropertySet of FieldMaster
-    static ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet >
-    GetMasterPropertySet(const ::com::sun::star::uno::Reference <
-                         ::com::sun::star::text::XTextField > & rTextField);
+    static css::uno::Reference < css::beans::XPropertySet >
+    GetMasterPropertySet(const css::uno::Reference < css::text::XTextField > & rTextField);
 
     /// get PropertySet of (any) DependentTextField for this FieldMaster
     bool GetDependentFieldPropertySet(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xmaster,
-        ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xField);
+        const css::uno::Reference< css::beans::XPropertySet> & xmaster,
+        css::uno::Reference< css::beans::XPropertySet> & xField);
 
 
     /// get field ID from XTextField (and it's Property-Set)
-    enum FieldIdEnum GetFieldID(const ::com::sun::star::uno::Reference <
-                          ::com::sun::star::text::XTextField > & rTextField,
-                          const ::com::sun::star::uno::Reference <
-                          ::com::sun::star::beans::XPropertySet > & xPropSet);
+    enum FieldIdEnum GetFieldID(const css::uno::Reference < css::text::XTextField > & rTextField,
+                          const css::uno::Reference < css::beans::XPropertySet > & xPropSet);
 
     /// get field ID from XTextField service name (and it's PropertySet)
     enum FieldIdEnum MapFieldName(const OUString& sFieldName,
-                            const ::com::sun::star::uno::Reference <
-                            ::com::sun::star::beans::XPropertySet> & xPropSet);
+                            const css::uno::Reference < css::beans::XPropertySet> & xPropSet);
 
     /// determine, whether field has string or numeric content
     bool IsStringField(FieldIdEnum nFieldType,  /// field ID
-                           const ::com::sun::star::uno::Reference <
-                           ::com::sun::star::beans::XPropertySet > & xPropSet);
+                           const css::uno::Reference < css::beans::XPropertySet > & xPropSet);
 
 
     /// explode a field master name into field type and field name
diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx
index e9436c4..c3c986d 100644
--- a/xmloff/inc/txtfldi.hxx
+++ b/xmloff/inc/txtfldi.hxx
@@ -139,8 +139,7 @@ public:
 
     /// parses attributes and calls ProcessAttribute
     virtual void StartElement(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override;
+        const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList) override;
 
     /// create XTextField and insert into document; calls PrepareTextField
     virtual void EndElement() override;
@@ -169,19 +168,16 @@ protected:
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) = 0;
+        const css::uno::Reference< css::beans::XPropertySet> & xPropertySet) = 0;
 
     /// create field from ServiceName
-    bool CreateField(::com::sun::star::uno::Reference<
-                         ::com::sun::star::beans::XPropertySet> & xField,
+    bool CreateField(css::uno::Reference< css::beans::XPropertySet> & xField,
                          const OUString& sServiceName);
 
     /// force an update of the field's value
     /// call update on optional XUptadeable interface; (disable Fixed property)
     static void ForceUpdate(
-        const ::com::sun::star::uno::Reference<
-            ::com::sun::star::beans::XPropertySet> & rPropertySet);
+        const css::uno::Reference< css::beans::XPropertySet> & rPropertySet);
 };
 
 class XMLSenderFieldImportContext : public XMLTextFieldImportContext
@@ -210,8 +206,7 @@ public:
 protected:
     /// start element
     virtual void StartElement(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override;
+        const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList) override;
 
     /// process attribute values
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
@@ -219,8 +214,7 @@ protected:
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
+        const css::uno::Reference< css::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** inherit sender field because of fixed attribute in ProcessAttributes */
@@ -244,13 +238,11 @@ public:
 protected:
     /// start element
     virtual void StartElement(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override;
+        const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList) override;
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
+        const css::uno::Reference< css::beans::XPropertySet> & xPropertySet) override;
 };
 
 class XMLPlaceholderFieldImportContext : public XMLTextFieldImportContext
@@ -278,8 +270,7 @@ protected:
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
+        const css::uno::Reference< css::beans::XPropertySet> & xPropertySet) override;
 };
 
 class XMLTimeFieldImportContext : public XMLTextFieldImportContext
@@ -293,7 +284,7 @@ protected:
     const OUString sPropertyIsDate;
     const OUString sPropertyIsFixedLanguage;
 
-    ::com::sun::star::util::DateTime aDateTimeValue;
+    css::util::DateTime aDateTimeValue;
     sal_Int32 nAdjust;
     sal_Int32 nFormatKey;
     bool bTimeOK;
@@ -317,8 +308,7 @@ public:
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
+        const css::uno::Reference< css::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import date fields (<text:date>);
@@ -346,7 +336,7 @@ class XMLPageContinuationImportContext : public XMLTextFieldImportContext
     const OUString sPropertyNumberingType;
 
     OUString sString;            /// continuation string
-    com::sun::star::text::PageNumberType eSelectPage;   /// previous, current
+    css::text::PageNumberType eSelectPage;   /// previous, current
                                                         /// or next page
     bool sStringOK;                 /// continuation string encountered?
 
@@ -364,8 +354,7 @@ public:
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
+        const css::uno::Reference< css::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import page number fields (<text:page-number>) */
@@ -378,7 +367,7 @@ class XMLPageNumberImportContext : public XMLTextFieldImportContext
     OUString sNumberFormat;
     OUString sNumberSync;
     sal_Int16 nPageAdjust;
-    com::sun::star::text::PageNumberType eSelectPage;   /// previous, current
+    css::text::PageNumberType eSelectPage;   /// previous, current
                                                         /// or next page
     bool sNumberFormatOK;
 
@@ -397,8 +386,7 @@ public:
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
+        const css::uno::Reference< css::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** superclass for database fields: handle database and table names */
@@ -443,15 +431,13 @@ public:
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
+        const css::uno::Reference< css::beans::XPropertySet> & xPropertySet) override;
 
     /// handle database-location children
     virtual SvXMLImportContext *CreateChildContext(
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override;
+        const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList ) override;
 };
 
 /** import database name fields (<text:database-name>) */
@@ -498,8 +484,7 @@ public:
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
+        const css::uno::Reference< css::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import database select fields (<text:database-select>) */
@@ -522,8 +507,8 @@ public:
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
+        const css::uno::Reference<
+        css::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import database display number fields (<text:database-row-number>) */
@@ -549,8 +534,7 @@ public:
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
+        const css::uno::Reference< css::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import docinfo fields with only fixed attribute */
@@ -583,8 +567,7 @@ protected:
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
+        const css::uno::Reference< css::beans::XPropertySet> & xPropertySet) override;
 
     static const sal_Char* MapTokenToServiceName(sal_uInt16 nToken);
 };
@@ -617,8 +600,7 @@ protected:
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
+        const css::uno::Reference< css::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import revision field (<text:editing-cycles>) */
@@ -637,8 +619,7 @@ public:
 protected:
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
+        const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import user docinfo field (<text:user-defined>) */
@@ -665,8 +646,7 @@ protected:
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
                                    const OUString& sAttrValue ) override;
     virtual void PrepareField(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
+        const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import hidden paragraph fields (<text:hidden-paragraph>) */
@@ -692,8 +672,7 @@ protected:
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
+        const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import conditional text fields (<text:conditional-text>) */
@@ -728,8 +707,7 @@ protected:
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
+        const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import conditional text fields (<text:hidden-text>) */
@@ -760,8 +738,7 @@ protected:
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
+        const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import file name fields (<text:file-name>) */
@@ -788,8 +765,7 @@ protected:
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
+        const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import document template name fields (<text:template-name>) */
@@ -813,8 +789,7 @@ protected:
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
+        const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import chapter fields (<text:chapter>) */
@@ -840,8 +815,7 @@ protected:
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
+        const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import count fields (<text:[XXX]-count>) */
@@ -869,8 +843,7 @@ protected:
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
+        const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
 
     static const sal_Char* MapTokenToServiceName(sal_uInt16 nToken);
 };
@@ -899,8 +872,7 @@ protected:
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
+        const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import page variable fields (<text:get-page-variable>) */
@@ -926,8 +898,7 @@ protected:
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
+        const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import macro fields (<text:execute-macro>) */
@@ -956,8 +927,7 @@ protected:
     virtual SvXMLImportContext *CreateChildContext(
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override;
+        const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList ) override;
 
     /// process attribute values
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
@@ -965,8 +935,7 @@ protected:
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
+        const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import reference fields (<text:reference-get>) */
@@ -996,8 +965,7 @@ public:
 protected:
     /// start element
     virtual void StartElement(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override;
+        const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override;
 
     /// process attribute values
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
@@ -1005,8 +973,7 @@ protected:
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
+        const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import dde field declaration container (<text:dde-connection-decls>) */
@@ -1023,8 +990,7 @@ public:
     virtual SvXMLImportContext *CreateChildContext(
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override;
+        const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList ) override;
 };
 
 /** import dde field declaration (<text:dde-connection-decl>) */
@@ -1047,8 +1013,7 @@ public:
 
     // create fieldmaster
     virtual void StartElement(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override;
+        const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override;
 };
 
 /** import dde fields (<text:dde-connection>) */
@@ -1074,8 +1039,7 @@ protected:
 
     /// empty method
     virtual void PrepareField(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
+        const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import sheet name fields (Calc) dde fields (<text:sheet-name>) */
@@ -1096,8 +1060,7 @@ protected:
 
     /// no attributes -> empty method
     virtual void PrepareField(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
+        const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import page|slide name fields (<text:page-name>) */
@@ -1117,8 +1080,7 @@ public:
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
+        const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import hyperlinks as URL fields (Calc, Impress, Draw) (<office:a>) */
@@ -1146,8 +1108,7 @@ protected:
 
     /// no attributes -> empty method
     virtual void PrepareField(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
+        const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import bibliography info fields (<text:bibliography-mark>) */
@@ -1155,7 +1116,7 @@ class XMLBibliographyFieldImportContext : public XMLTextFieldImportContext
 {
     const OUString sPropertyFields;
 
-    ::std::vector< ::com::sun::star::beans::PropertyValue> aValues;
+    ::std::vector< css::beans::PropertyValue> aValues;
 
 public:
 
@@ -1167,8 +1128,7 @@ public:
 protected:
     /// process attributes (fill aValues)
     virtual void StartElement(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override;
+        const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override;
 
     /// empty method; all attributes are handled in StartElement
     virtual void ProcessAttribute( sal_uInt16 nAttrToken,
@@ -1176,8 +1136,7 @@ protected:
 
     /// convert aValues into sequence and set property
     virtual void PrepareField(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
+        const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
 
     static const sal_Char* MapBibliographyFieldName(const OUString& sName);
 };
@@ -1198,9 +1157,9 @@ class XMLAnnotationImportContext : public XMLTextFieldImportContext
     OUStringBuffer aTextBuffer;
     OUStringBuffer aDateBuffer;
 
-    com::sun::star::uno::Reference < com::sun::star::beans::XPropertySet > mxField;
-    com::sun::star::uno::Reference < com::sun::star::text::XTextCursor >  mxCursor;
-    com::sun::star::uno::Reference < com::sun::star::text::XTextCursor >  mxOldCursor;
+    css::uno::Reference < css::beans::XPropertySet > mxField;
+    css::uno::Reference < css::text::XTextCursor >  mxCursor;
+    css::uno::Reference < css::text::XTextCursor >  mxOldCursor;
 
     sal_uInt16 m_nToken;
 
@@ -1219,13 +1178,12 @@ protected:
 
     /// set properties
     virtual void PrepareField(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xPropertySet) override;
+        const css::uno::Reference< css::beans::XPropertySet > & xPropertySet) override;
 
     virtual SvXMLImportContext *CreateChildContext(
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
-        const ::com::sun::star::uno::Reference<
-                ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override;
+        const css::uno::Reference<css::xml::sax::XAttributeList >& xAttrList ) override;
     virtual void EndElement() override;
 };
 
@@ -1256,8 +1214,7 @@ protected:
 
     /// set properties
     virtual void PrepareField(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
+        const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import measure fields (<text:measure>) */
@@ -1279,8 +1236,7 @@ protected:
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
+        const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** dropdown field (filter legacy) */
@@ -1311,7 +1267,7 @@ public:
     virtual SvXMLImportContext* CreateChildContext(
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
-        const ::com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList >& xAttrList ) override;
+        const css::uno::Reference<css::xml::sax::XAttributeList >& xAttrList ) override;
 
 protected:
     /// process attribute values
@@ -1320,8 +1276,7 @@ protected:
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
+        const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import header fields (<draw:header>) */
@@ -1341,8 +1296,7 @@ public:
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
+        const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import footer fields (<draw:footer>) */
@@ -1362,8 +1316,7 @@ public:
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
+        const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
 };
 
 /** import footer fields (<draw:date-and-time>) */
@@ -1383,13 +1336,12 @@ public:
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
+        const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
 };
 
 class XMLCustomPropertyFieldImportContext : public XMLTextFieldImportContext
 {
-    ::com::sun::star::uno::Any aValue;
+    css::uno::Any aValue;
 
 public:
 
@@ -1405,8 +1357,7 @@ protected:
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
+        const css::uno::Reference<css::beans::XPropertySet> & xPropertySet) override;
 };
 
 #endif
diff --git a/xmloff/inc/txtlists.hxx b/xmloff/inc/txtlists.hxx
index b204eab..46beb4b 100644
--- a/xmloff/inc/txtlists.hxx
+++ b/xmloff/inc/txtlists.hxx
@@ -91,8 +91,7 @@ class XMLTextListsHelper : private boost::noncopyable
             note that the ID namespace for numbered-paragraph and regular list
             is distinct; we never combine a list and a n-p
          */
-        ::com::sun::star::uno::Reference<
-                ::com::sun::star::container::XIndexReplace>
+        css::uno::Reference< css::container::XIndexReplace>
         EnsureNumberedParagraph(
             SvXMLImport & i_rImport,
             const OUString& i_ListId,
@@ -112,11 +111,9 @@ class XMLTextListsHelper : private boost::noncopyable
             @param o_rRestartNumbering   set to true if no style (defaulting)
             @param io_rSetDefaults  set to true if no style (defaulting)
          */
-        static ::com::sun::star::uno::Reference<
-                ::com::sun::star::container::XIndexReplace> MakeNumRule(
+        static css::uno::Reference< css::container::XIndexReplace> MakeNumRule(
             SvXMLImport & i_rImport,
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::container::XIndexReplace>& i_xNumRule,
+            const css::uno::Reference< css::container::XIndexReplace>& i_xNumRule,
             const OUString& i_ParentStyleName,
             const OUString& i_StyleName,
             sal_Int16 & io_rLevel,
@@ -168,9 +165,10 @@ class XMLTextListsHelper : private boost::noncopyable
         LastNumberedParagraphs_t mLastNumberedParagraphs;
 
         /// numbered-paragraphs
-        typedef ::std::vector< ::std::pair< OUString,
-            ::com::sun::star::uno::Reference<
-                ::com::sun::star::container::XIndexReplace > > > NumParaList_t;
+        typedef ::std::vector<
+                    ::std::pair<
+                        OUString,
+                        css::uno::Reference< css::container::XIndexReplace > > > NumParaList_t;
         ::std::map< OUString, NumParaList_t > mNPLists;
 
 };
diff --git a/xmloff/inc/txtvfldi.hxx b/xmloff/inc/txtvfldi.hxx
index 5dd636a..43c8a28 100644
--- a/xmloff/inc/txtvfldi.hxx
+++ b/xmloff/inc/txtvfldi.hxx
@@ -81,8 +81,7 @@ public:
 
     /// prepare XTextField for insertion into document
     void PrepareField(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet);
+        const css::uno::Reference<css::beans::XPropertySet> & xPropertySet);
 
     /// is value a string (rather than double)?
     inline bool IsStringValue() { return bStringType; }
@@ -186,8 +185,8 @@ protected:
 
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;
+        const css::uno::Reference<
+        css::beans::XPropertySet> & xPropertySet) override;
 
     // various accessor methods:
     inline OUString GetName()    { return sName; }
@@ -212,8 +211,8 @@ public:
 protected:
     /// prepare XTextField for insertion into document
     virtual void PrepareField(
-        const ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet> & xPropertySet) override;

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list