summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2011-02-11 16:05:35 -0600
committerNorbert Thiebaud <nthiebaud@gmail.com>2011-02-11 16:05:35 -0600
commit95565916b0f9bc46521bead9ae148f73e6beda61 (patch)
treec0f4155d24e6f18c33ab23d92b34a5ec64bfc16c
parentf327d71f9cc07c3a4e384d73d6023792a5151e7a (diff)
merge trivial non-conflicting changes to avmedia
-rw-r--r--.gitignore11
-rw-r--r--avmedia/inc/avmedia/mediaitem.hxx7
-rw-r--r--avmedia/inc/avmedia/mediaplayer.hxx3
-rw-r--r--avmedia/inc/avmedia/mediatoolbox.hxx3
-rw-r--r--avmedia/inc/avmedia/mediawindow.hxx3
-rw-r--r--avmedia/inc/mediacontrol.hxx3
-rw-r--r--avmedia/source/framework/mediacontrol.cxx3
-rw-r--r--avmedia/source/framework/mediacontrol.hrc2
-rw-r--r--avmedia/source/framework/mediacontrol.src66
-rw-r--r--avmedia/source/framework/mediaitem.cxx21
-rw-r--r--avmedia/source/framework/mediamisc.cxx3
-rw-r--r--avmedia/source/framework/mediaplayer.cxx3
-rw-r--r--avmedia/source/framework/mediatoolbox.cxx3
-rw-r--r--avmedia/source/framework/soundhandler.cxx13
-rw-r--r--avmedia/source/framework/soundhandler.hxx7
-rw-r--r--avmedia/source/framework/soundhandler.xml2
-rw-r--r--avmedia/source/gstreamer/ChangeLog112
-rw-r--r--avmedia/source/gstreamer/gstcommon.hxx68
-rw-r--r--avmedia/source/inc/mediamisc.hxx7
-rw-r--r--avmedia/source/quicktime/framegrabber.cxx3
-rw-r--r--avmedia/source/quicktime/framegrabber.hxx5
-rw-r--r--avmedia/source/quicktime/manager.cxx3
-rw-r--r--avmedia/source/quicktime/manager.hxx5
-rw-r--r--avmedia/source/quicktime/player.cxx3
-rw-r--r--avmedia/source/quicktime/player.hxx5
-rw-r--r--avmedia/source/quicktime/quicktimecommon.hxx3
-rw-r--r--avmedia/source/quicktime/quicktimeuno.cxx7
-rw-r--r--avmedia/source/quicktime/window.cxx3
-rw-r--r--avmedia/source/quicktime/window.hxx5
-rw-r--r--avmedia/source/viewer/mediaevent_impl.cxx20
-rw-r--r--avmedia/source/viewer/mediaevent_impl.hxx3
-rw-r--r--avmedia/source/viewer/mediawindow.cxx3
-rw-r--r--avmedia/source/viewer/mediawindow_impl.cxx9
-rw-r--r--avmedia/source/viewer/mediawindow_impl.hxx6
-rw-r--r--avmedia/source/viewer/mediawindowbase_impl.cxx5
-rw-r--r--avmedia/source/viewer/mediawindowbase_impl.hxx3
-rw-r--r--avmedia/source/win/framegrabber.cxx3
-rw-r--r--avmedia/source/win/framegrabber.hxx5
-rw-r--r--avmedia/source/win/interface.hxx2
-rw-r--r--avmedia/source/win/makefile.mk1
-rw-r--r--avmedia/source/win/manager.cxx3
-rw-r--r--avmedia/source/win/manager.hxx5
-rw-r--r--avmedia/source/win/player.cxx6
-rw-r--r--avmedia/source/win/player.hxx5
-rw-r--r--avmedia/source/win/wincommon.hxx3
-rw-r--r--avmedia/source/win/window.cxx3
-rw-r--r--avmedia/source/win/window.hxx5
-rw-r--r--avmedia/source/win/winuno.cxx5
-rw-r--r--avmedia/source/xine/manager.cxx3
-rw-r--r--avmedia/source/xine/manager.hxx5
-rw-r--r--avmedia/source/xine/player.cxx3
-rw-r--r--avmedia/source/xine/player.hxx5
-rw-r--r--avmedia/source/xine/window.cxx107
-rw-r--r--avmedia/source/xine/window.hxx5
-rw-r--r--avmedia/source/xine/xinecommon.hxx3
-rw-r--r--avmedia/source/xine/xineuno.cxx7
-rw-r--r--avmedia/util/makefile.mk4
-rw-r--r--xmloff/source/chart/PropertyMaps.cxx19
-rw-r--r--xmloff/source/chart/SchXMLAutoStylePoolP.cxx3
-rw-r--r--xmloff/source/chart/SchXMLAutoStylePoolP.hxx3
-rw-r--r--[-rwxr-xr-x]xmloff/source/chart/SchXMLCalculationSettingsContext.cxx3
-rw-r--r--[-rwxr-xr-x]xmloff/source/chart/SchXMLCalculationSettingsContext.hxx3
-rw-r--r--xmloff/source/chart/SchXMLChartContext.cxx55
-rw-r--r--xmloff/source/chart/SchXMLChartContext.hxx3
-rw-r--r--xmloff/source/chart/SchXMLExport.cxx69
-rw-r--r--xmloff/source/chart/SchXMLImport.cxx41
-rw-r--r--xmloff/source/chart/SchXMLParagraphContext.cxx3
-rw-r--r--xmloff/source/chart/SchXMLParagraphContext.hxx3
-rw-r--r--xmloff/source/chart/SchXMLPlotAreaContext.cxx143
-rw-r--r--xmloff/source/chart/SchXMLPlotAreaContext.hxx3
-rw-r--r--xmloff/source/chart/SchXMLSeries2Context.cxx15
-rw-r--r--xmloff/source/chart/SchXMLSeries2Context.hxx3
-rw-r--r--xmloff/source/chart/SchXMLSeriesHelper.cxx8
-rw-r--r--xmloff/source/chart/SchXMLSeriesHelper.hxx3
-rw-r--r--xmloff/source/chart/SchXMLTableContext.cxx1
-rw-r--r--xmloff/source/chart/SchXMLTableContext.hxx4
-rwxr-xr-xxmloff/source/chart/SchXMLTextListContext.hxx11
-rw-r--r--xmloff/source/chart/SchXMLTools.cxx76
-rw-r--r--xmloff/source/chart/SchXMLTools.hxx3
-rw-r--r--xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx3
-rw-r--r--xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx3
-rw-r--r--xmloff/source/chart/XMLChartPropertyContext.cxx3
-rw-r--r--xmloff/source/chart/XMLChartPropertyContext.hxx3
-rw-r--r--xmloff/source/chart/XMLChartStyleContext.cxx3
-rw-r--r--xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx3
-rw-r--r--xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx3
-rw-r--r--xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx5
-rw-r--r--xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx3
-rw-r--r--xmloff/source/chart/XMLLabelSeparatorContext.cxx3
-rw-r--r--xmloff/source/chart/XMLLabelSeparatorContext.hxx3
-rw-r--r--xmloff/source/chart/XMLSymbolImageContext.cxx5
-rw-r--r--xmloff/source/chart/XMLSymbolImageContext.hxx3
-rw-r--r--xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx3
-rw-r--r--xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx3
-rw-r--r--xmloff/source/chart/XMLTextOrientationHdl.cxx3
-rw-r--r--xmloff/source/chart/XMLTextOrientationHdl.hxx3
-rw-r--r--xmloff/source/chart/contexts.cxx2
-rw-r--r--xmloff/source/chart/contexts.hxx3
-rw-r--r--xmloff/source/chart/transporttypes.cxx3
-rw-r--r--xmloff/source/chart/transporttypes.hxx3
-rw-r--r--xmloff/source/core/DocumentSettingsContext.cxx14
-rw-r--r--xmloff/source/core/DomBuilderContext.cxx3
-rw-r--r--xmloff/source/core/DomExport.cxx3
-rw-r--r--xmloff/source/core/ProgressBarHelper.cxx2
-rw-r--r--xmloff/source/core/PropertySetMerger.cxx5
-rw-r--r--xmloff/source/core/RDFaExportHelper.cxx4
-rw-r--r--xmloff/source/core/RDFaImportHelper.cxx4
-rw-r--r--xmloff/source/core/SettingsExportHelper.cxx3
-rw-r--r--xmloff/source/core/XMLBase64Export.cxx2
-rw-r--r--xmloff/source/core/XMLBase64ImportContext.cxx3
-rw-r--r--xmloff/source/core/XMLBasicExportFilter.cxx3
-rw-r--r--xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx3
-rw-r--r--xmloff/source/core/XMLEmbeddedObjectImportContext.cxx5
-rw-r--r--xmloff/source/core/attrlist.cxx2
-rw-r--r--xmloff/source/core/facreg.cxx2
-rw-r--r--xmloff/source/core/i18nmap.cxx2
-rw-r--r--xmloff/source/core/nmspmap.cxx17
-rw-r--r--xmloff/source/core/unoatrcn.cxx8
-rw-r--r--xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx2
-rw-r--r--xmloff/source/core/xmlcnitm.cxx2
-rw-r--r--xmloff/source/core/xmlehelp.cxx5
-rw-r--r--xmloff/source/core/xmlenums.hxx3
-rw-r--r--xmloff/source/core/xmlerror.cxx11
-rw-r--r--xmloff/source/core/xmlexp.cxx114
-rw-r--r--xmloff/source/core/xmlictxt.cxx2
-rw-r--r--xmloff/source/core/xmlimp.cxx37
-rw-r--r--xmloff/source/core/xmltkmap.cxx2
-rw-r--r--xmloff/source/core/xmltoken.cxx55
-rw-r--r--xmloff/source/core/xmluconv.cxx27
-rw-r--r--xmloff/source/draw/EnhancedCustomShapeToken.cxx3
-rw-r--r--xmloff/source/draw/XMLGraphicsDefaultStyle.cxx4
-rw-r--r--xmloff/source/draw/XMLImageMapContext.cxx8
-rw-r--r--xmloff/source/draw/XMLImageMapExport.cxx5
-rw-r--r--xmloff/source/draw/XMLNumberStyles.cxx3
-rw-r--r--xmloff/source/draw/XMLNumberStylesExport.hxx2
-rw-r--r--xmloff/source/draw/XMLReplacementImageContext.cxx2
-rw-r--r--xmloff/source/draw/XMLShapePropertySetContext.cxx5
-rw-r--r--xmloff/source/draw/XMLShapeStyleContext.cxx2
-rw-r--r--xmloff/source/draw/animationexport.cxx23
-rw-r--r--xmloff/source/draw/animationimport.cxx16
-rw-r--r--xmloff/source/draw/animexp.cxx5
-rw-r--r--xmloff/source/draw/animimp.cxx3
-rw-r--r--xmloff/source/draw/descriptionimp.cxx2
-rw-r--r--xmloff/source/draw/descriptionimp.hxx2
-rw-r--r--xmloff/source/draw/eventimp.cxx51
-rw-r--r--xmloff/source/draw/eventimp.hxx2
-rw-r--r--xmloff/source/draw/layerexp.cxx3
-rw-r--r--xmloff/source/draw/layerexp.hxx2
-rw-r--r--xmloff/source/draw/layerimp.cxx3
-rw-r--r--xmloff/source/draw/layerimp.hxx2
-rw-r--r--xmloff/source/draw/numithdl.cxx2
-rw-r--r--xmloff/source/draw/numithdl.hxx3
-rw-r--r--xmloff/source/draw/propimp0.cxx3
-rw-r--r--xmloff/source/draw/propimp0.hxx3
-rw-r--r--xmloff/source/draw/sdpropls.cxx38
-rw-r--r--xmloff/source/draw/sdpropls.hxx3
-rw-r--r--xmloff/source/draw/sdxmlexp.cxx169
-rw-r--r--xmloff/source/draw/sdxmlexp_impl.hxx15
-rw-r--r--xmloff/source/draw/sdxmlimp.cxx35
-rw-r--r--xmloff/source/draw/sdxmlimp_impl.hxx5
-rw-r--r--xmloff/source/draw/shapeexport.cxx37
-rw-r--r--xmloff/source/draw/shapeexport2.cxx131
-rw-r--r--xmloff/source/draw/shapeexport3.cxx5
-rw-r--r--xmloff/source/draw/shapeexport4.cxx7
-rw-r--r--xmloff/source/draw/shapeimport.cxx250
-rw-r--r--xmloff/source/draw/viewcontext.cxx3
-rw-r--r--xmloff/source/draw/viewcontext.hxx3
-rw-r--r--xmloff/source/draw/xexptran.cxx52
-rw-r--r--xmloff/source/draw/ximp3dobject.cxx63
-rw-r--r--xmloff/source/draw/ximp3dobject.hxx3
-rw-r--r--xmloff/source/draw/ximp3dscene.cxx44
-rw-r--r--xmloff/source/draw/ximp3dscene.hxx3
-rw-r--r--xmloff/source/draw/ximpbody.cxx3
-rw-r--r--xmloff/source/draw/ximpbody.hxx3
-rw-r--r--xmloff/source/draw/ximpcustomshape.cxx39
-rw-r--r--xmloff/source/draw/ximpcustomshape.hxx3
-rw-r--r--xmloff/source/draw/ximpgrp.cxx2
-rw-r--r--xmloff/source/draw/ximpgrp.hxx3
-rw-r--r--xmloff/source/draw/ximplink.cxx2
-rw-r--r--xmloff/source/draw/ximplink.hxx3
-rw-r--r--xmloff/source/draw/ximpnote.cxx3
-rw-r--r--xmloff/source/draw/ximpnote.hxx3
-rw-r--r--xmloff/source/draw/ximppage.cxx3
-rw-r--r--xmloff/source/draw/ximppage.hxx3
-rw-r--r--xmloff/source/draw/ximpshap.cxx57
-rw-r--r--xmloff/source/draw/ximpshap.hxx3
-rw-r--r--xmloff/source/draw/ximpshow.cxx2
-rw-r--r--xmloff/source/draw/ximpshow.hxx2
-rw-r--r--xmloff/source/draw/ximpstyl.cxx162
-rw-r--r--xmloff/source/draw/ximpstyl.hxx72
-rw-r--r--xmloff/source/forms/attriblistmerge.cxx2
-rw-r--r--xmloff/source/forms/attriblistmerge.hxx2
-rw-r--r--xmloff/source/forms/callbacks.hxx6
-rw-r--r--xmloff/source/forms/controlelement.cxx2
-rw-r--r--xmloff/source/forms/controlelement.hxx2
-rw-r--r--xmloff/source/forms/controlpropertyhdl.cxx2
-rw-r--r--xmloff/source/forms/controlpropertymap.cxx4
-rw-r--r--xmloff/source/forms/controlpropertymap.hxx2
-rw-r--r--xmloff/source/forms/elementexport.cxx90
-rw-r--r--xmloff/source/forms/elementexport.hxx2
-rw-r--r--xmloff/source/forms/elementimport.cxx20
-rw-r--r--xmloff/source/forms/elementimport.hxx4
-rw-r--r--xmloff/source/forms/elementimport_impl.hxx2
-rw-r--r--xmloff/source/forms/eventexport.cxx6
-rw-r--r--xmloff/source/forms/eventexport.hxx2
-rw-r--r--xmloff/source/forms/eventimport.cxx2
-rw-r--r--xmloff/source/forms/eventimport.hxx2
-rw-r--r--xmloff/source/forms/formattributes.cxx10
-rw-r--r--xmloff/source/forms/formattributes.hxx5
-rw-r--r--xmloff/source/forms/formcellbinding.cxx3
-rw-r--r--xmloff/source/forms/formcellbinding.hxx3
-rw-r--r--xmloff/source/forms/formenums.cxx2
-rw-r--r--xmloff/source/forms/formenums.hxx2
-rw-r--r--xmloff/source/forms/formevents.cxx2
-rw-r--r--xmloff/source/forms/formevents.hxx2
-rw-r--r--xmloff/source/forms/formlayerexport.cxx4
-rw-r--r--xmloff/source/forms/formlayerimport.cxx4
-rw-r--r--xmloff/source/forms/formsimp.cxx5
-rw-r--r--xmloff/source/forms/formstyles.cxx2
-rw-r--r--xmloff/source/forms/formstyles.hxx2
-rw-r--r--xmloff/source/forms/gridcolumnproptranslator.cxx2
-rw-r--r--xmloff/source/forms/gridcolumnproptranslator.hxx2
-rw-r--r--xmloff/source/forms/ifacecompare.hxx2
-rw-r--r--xmloff/source/forms/layerexport.cxx16
-rw-r--r--xmloff/source/forms/layerexport.hxx10
-rw-r--r--xmloff/source/forms/layerimport.cxx10
-rw-r--r--xmloff/source/forms/layerimport.hxx10
-rw-r--r--xmloff/source/forms/logging.cxx2
-rw-r--r--xmloff/source/forms/logging.hxx2
-rw-r--r--xmloff/source/forms/officeforms.cxx4
-rw-r--r--xmloff/source/forms/officeforms.hxx2
-rw-r--r--xmloff/source/forms/propertyexport.cxx6
-rw-r--r--xmloff/source/forms/propertyexport.hxx2
-rw-r--r--xmloff/source/forms/propertyimport.cxx4
-rw-r--r--xmloff/source/forms/propertyimport.hxx4
-rw-r--r--xmloff/source/forms/strings.cxx2
-rw-r--r--xmloff/source/forms/strings.hxx4
-rw-r--r--xmloff/source/forms/valueproperties.cxx2
-rw-r--r--xmloff/source/forms/valueproperties.hxx2
-rw-r--r--xmloff/source/meta/MetaExportComponent.cxx21
-rw-r--r--xmloff/source/meta/MetaImportComponent.cxx14
-rw-r--r--xmloff/source/meta/xmlmetae.cxx2
-rw-r--r--xmloff/source/meta/xmlmetai.cxx10
-rw-r--r--xmloff/source/meta/xmlversion.cxx8
-rw-r--r--xmloff/source/script/XMLEventExport.cxx11
-rw-r--r--xmloff/source/script/XMLEventImportHelper.cxx7
-rw-r--r--xmloff/source/script/XMLEventsImportContext.cxx11
-rw-r--r--xmloff/source/script/XMLScriptContextFactory.cxx3
-rw-r--r--xmloff/source/script/XMLScriptExportHandler.cxx5
-rw-r--r--xmloff/source/script/XMLStarBasicContextFactory.cxx3
-rw-r--r--xmloff/source/script/XMLStarBasicExportHandler.cxx5
-rw-r--r--xmloff/source/script/xmlbasici.cxx3
-rw-r--r--xmloff/source/script/xmlbasici.hxx3
-rw-r--r--xmloff/source/script/xmlscripti.cxx4
-rw-r--r--xmloff/source/style/AttributeContainerHandler.cxx3
-rw-r--r--xmloff/source/style/DashStyle.cxx7
-rw-r--r--xmloff/source/style/DrawAspectHdl.cxx4
-rw-r--r--xmloff/source/style/DrawAspectHdl.hxx3
-rw-r--r--xmloff/source/style/EnumPropertyHdl.cxx2
-rw-r--r--xmloff/source/style/FillStyleContext.cxx3
-rw-r--r--xmloff/source/style/FillStyleContext.hxx3
-rw-r--r--xmloff/source/style/GradientStyle.cxx7
-rw-r--r--xmloff/source/style/HatchStyle.cxx7
-rw-r--r--xmloff/source/style/ImageStyle.cxx5
-rw-r--r--xmloff/source/style/MarkerStyle.cxx3
-rw-r--r--xmloff/source/style/MultiPropertySetHelper.cxx5
-rw-r--r--xmloff/source/style/NamedBoolPropertyHdl.cxx2
-rw-r--r--xmloff/source/style/PageHeaderFooterContext.cxx3
-rw-r--r--xmloff/source/style/PageHeaderFooterContext.hxx2
-rw-r--r--xmloff/source/style/PageMasterExportPropMapper.cxx15
-rw-r--r--xmloff/source/style/PageMasterExportPropMapper.hxx2
-rw-r--r--xmloff/source/style/PageMasterImportContext.cxx8
-rw-r--r--xmloff/source/style/PageMasterImportPropMapper.cxx22
-rw-r--r--xmloff/source/style/PageMasterImportPropMapper.hxx5
-rw-r--r--xmloff/source/style/PageMasterPropHdl.cxx2
-rw-r--r--xmloff/source/style/PageMasterPropHdl.hxx2
-rw-r--r--xmloff/source/style/PageMasterPropHdlFactory.cxx6
-rw-r--r--xmloff/source/style/PageMasterPropHdlFactory.hxx2
-rw-r--r--xmloff/source/style/PageMasterPropMapper.cxx6
-rw-r--r--xmloff/source/style/PageMasterPropMapper.hxx3
-rw-r--r--xmloff/source/style/PageMasterStyleMap.cxx3
-rw-r--r--xmloff/source/style/PagePropertySetContext.cxx6
-rw-r--r--xmloff/source/style/PagePropertySetContext.hxx3
-rw-r--r--xmloff/source/style/SinglePropertySetInfoCache.cxx5
-rw-r--r--xmloff/source/style/StyleMap.cxx2
-rw-r--r--xmloff/source/style/TransGradientStyle.cxx7
-rw-r--r--xmloff/source/style/VisAreaContext.cxx3
-rw-r--r--xmloff/source/style/VisAreaExport.cxx2
-rw-r--r--xmloff/source/style/WordWrapPropertyHdl.cxx2
-rw-r--r--xmloff/source/style/XMLBackgroundImageContext.cxx5
-rw-r--r--xmloff/source/style/XMLBackgroundImageExport.cxx3
-rw-r--r--xmloff/source/style/XMLBitmapLogicalSizePropertyHandler.cxx2
-rw-r--r--xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler.cxx2
-rw-r--r--xmloff/source/style/XMLClipPropertyHandler.cxx3
-rw-r--r--xmloff/source/style/XMLConstantsPropertyHandler.cxx2
-rw-r--r--xmloff/source/style/XMLElementPropertyContext.cxx2
-rw-r--r--xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx2
-rw-r--r--xmloff/source/style/XMLFontAutoStylePool.cxx3
-rw-r--r--xmloff/source/style/XMLFontStylesContext.cxx5
-rw-r--r--xmloff/source/style/XMLFootnoteSeparatorExport.cxx5
-rw-r--r--xmloff/source/style/XMLFootnoteSeparatorExport.hxx3
-rw-r--r--xmloff/source/style/XMLFootnoteSeparatorImport.cxx5
-rw-r--r--xmloff/source/style/XMLFootnoteSeparatorImport.hxx3
-rw-r--r--xmloff/source/style/XMLIsPercentagePropertyHandler.cxx2
-rw-r--r--xmloff/source/style/XMLPageExport.cxx7
-rw-r--r--xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx3
-rw-r--r--xmloff/source/style/XMLRectangleMembersHandler.cxx4
-rw-r--r--xmloff/source/style/adjushdl.cxx8
-rw-r--r--xmloff/source/style/adjushdl.hxx3
-rw-r--r--xmloff/source/style/backhdl.cxx2
-rw-r--r--xmloff/source/style/backhdl.hxx3
-rw-r--r--xmloff/source/style/bordrhdl.cxx59
-rw-r--r--xmloff/source/style/bordrhdl.hxx2
-rw-r--r--xmloff/source/style/breakhdl.cxx3
-rw-r--r--xmloff/source/style/breakhdl.hxx3
-rw-r--r--xmloff/source/style/cdouthdl.cxx2
-rw-r--r--xmloff/source/style/cdouthdl.hxx3
-rw-r--r--xmloff/source/style/chrhghdl.cxx2
-rw-r--r--xmloff/source/style/chrhghdl.hxx2
-rw-r--r--xmloff/source/style/chrlohdl.cxx3
-rw-r--r--xmloff/source/style/chrlohdl.hxx2
-rw-r--r--xmloff/source/style/csmaphdl.cxx3
-rw-r--r--xmloff/source/style/csmaphdl.hxx3
-rw-r--r--xmloff/source/style/durationhdl.cxx3
-rw-r--r--xmloff/source/style/durationhdl.hxx3
-rw-r--r--xmloff/source/style/escphdl.cxx3
-rw-r--r--xmloff/source/style/escphdl.hxx2
-rw-r--r--xmloff/source/style/fonthdl.cxx7
-rw-r--r--xmloff/source/style/fonthdl.hxx1
-rw-r--r--xmloff/source/style/impastp1.cxx23
-rw-r--r--xmloff/source/style/impastp2.cxx3
-rw-r--r--xmloff/source/style/impastp3.cxx36
-rw-r--r--xmloff/source/style/impastp4.cxx34
-rw-r--r--xmloff/source/style/impastpl.hxx16
-rw-r--r--xmloff/source/style/kernihdl.cxx3
-rw-r--r--xmloff/source/style/kernihdl.hxx3
-rw-r--r--xmloff/source/style/lspachdl.cxx3
-rw-r--r--xmloff/source/style/lspachdl.hxx2
-rw-r--r--xmloff/source/style/numehelp.cxx3
-rw-r--r--xmloff/source/style/opaquhdl.cxx3
-rw-r--r--xmloff/source/style/opaquhdl.hxx3
-rw-r--r--xmloff/source/style/postuhdl.cxx4
-rw-r--r--xmloff/source/style/postuhdl.hxx3
-rw-r--r--xmloff/source/style/prhdlfac.cxx9
-rw-r--r--xmloff/source/style/prstylei.cxx15
-rw-r--r--xmloff/source/style/shadwhdl.cxx3
-rw-r--r--xmloff/source/style/shadwhdl.hxx3
-rw-r--r--xmloff/source/style/shdwdhdl.cxx3
-rw-r--r--xmloff/source/style/shdwdhdl.hxx3
-rw-r--r--xmloff/source/style/styleexp.cxx57
-rw-r--r--xmloff/source/style/tabsthdl.cxx2
-rw-r--r--xmloff/source/style/tabsthdl.hxx3
-rw-r--r--xmloff/source/style/undlihdl.cxx8
-rw-r--r--xmloff/source/style/undlihdl.hxx3
-rw-r--r--xmloff/source/style/uniref.cxx3
-rw-r--r--xmloff/source/style/weighhdl.cxx2
-rw-r--r--xmloff/source/style/weighhdl.hxx3
-rw-r--r--xmloff/source/style/xmlaustp.cxx11
-rw-r--r--xmloff/source/style/xmlbahdl.cxx16
-rw-r--r--xmloff/source/style/xmlbahdl.hxx3
-rw-r--r--xmloff/source/style/xmlexppr.cxx25
-rw-r--r--xmloff/source/style/xmlimppr.cxx9
-rw-r--r--xmloff/source/style/xmlnume.cxx149
-rw-r--r--xmloff/source/style/xmlnumfe.cxx15
-rw-r--r--xmloff/source/style/xmlnumfi.cxx185
-rw-r--r--xmloff/source/style/xmlnumi.cxx139
-rw-r--r--xmloff/source/style/xmlprcon.cxx2
-rw-r--r--xmloff/source/style/xmlprhdl.cxx3
-rw-r--r--xmloff/source/style/xmlprmap.cxx9
-rw-r--r--xmloff/source/style/xmlstyle.cxx57
-rw-r--r--xmloff/source/style/xmltabe.cxx2
-rw-r--r--xmloff/source/style/xmltabi.cxx4
-rw-r--r--xmloff/source/table/XMLTableExport.cxx4
-rw-r--r--xmloff/source/table/XMLTableImport.cxx17
-rw-r--r--xmloff/source/table/table.hxx3
-rw-r--r--xmloff/source/text/XMLAnchorTypePropHdl.hxx5
-rw-r--r--xmloff/source/text/XMLAutoMarkFileContext.cxx3
-rw-r--r--xmloff/source/text/XMLAutoMarkFileContext.hxx3
-rw-r--r--xmloff/source/text/XMLAutoTextContainerEventImport.cxx3
-rw-r--r--xmloff/source/text/XMLAutoTextContainerEventImport.hxx3
-rw-r--r--xmloff/source/text/XMLAutoTextEventExport.cxx8
-rw-r--r--xmloff/source/text/XMLAutoTextEventExport.hxx2
-rw-r--r--xmloff/source/text/XMLAutoTextEventImport.cxx2
-rw-r--r--xmloff/source/text/XMLAutoTextEventImport.hxx2
-rw-r--r--xmloff/source/text/XMLCalculationSettingsContext.cxx3
-rw-r--r--xmloff/source/text/XMLCalculationSettingsContext.hxx3
-rw-r--r--xmloff/source/text/XMLChangeElementImportContext.cxx3
-rw-r--r--xmloff/source/text/XMLChangeElementImportContext.hxx3
-rw-r--r--xmloff/source/text/XMLChangeImportContext.cxx3
-rw-r--r--xmloff/source/text/XMLChangeImportContext.hxx3
-rw-r--r--xmloff/source/text/XMLChangeInfoContext.cxx3
-rw-r--r--xmloff/source/text/XMLChangeInfoContext.hxx3
-rw-r--r--xmloff/source/text/XMLChangedRegionImportContext.cxx5
-rw-r--r--xmloff/source/text/XMLChangedRegionImportContext.hxx3
-rw-r--r--xmloff/source/text/XMLFootnoteBodyImportContext.cxx3
-rw-r--r--xmloff/source/text/XMLFootnoteBodyImportContext.hxx3
-rw-r--r--xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx14
-rw-r--r--xmloff/source/text/XMLFootnoteImportContext.cxx5
-rw-r--r--xmloff/source/text/XMLFootnoteImportContext.hxx3
-rw-r--r--xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx5
-rw-r--r--xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx3
-rw-r--r--xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx9
-rw-r--r--xmloff/source/text/XMLIndexBibliographyEntryContext.cxx3
-rw-r--r--xmloff/source/text/XMLIndexBibliographyEntryContext.hxx3
-rw-r--r--xmloff/source/text/XMLIndexBibliographySourceContext.cxx3
-rw-r--r--xmloff/source/text/XMLIndexBibliographySourceContext.hxx3
-rw-r--r--xmloff/source/text/XMLIndexBodyContext.cxx3
-rw-r--r--xmloff/source/text/XMLIndexBodyContext.hxx3
-rw-r--r--xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx7
-rw-r--r--xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx3
-rw-r--r--xmloff/source/text/XMLIndexIllustrationSourceContext.cxx3
-rw-r--r--xmloff/source/text/XMLIndexIllustrationSourceContext.hxx3
-rw-r--r--xmloff/source/text/XMLIndexMarkExport.cxx3
-rw-r--r--xmloff/source/text/XMLIndexMarkExport.hxx3
-rw-r--r--xmloff/source/text/XMLIndexObjectSourceContext.cxx5
-rw-r--r--xmloff/source/text/XMLIndexObjectSourceContext.hxx3
-rw-r--r--xmloff/source/text/XMLIndexSimpleEntryContext.cxx3
-rw-r--r--xmloff/source/text/XMLIndexSimpleEntryContext.hxx3
-rw-r--r--xmloff/source/text/XMLIndexSourceBaseContext.cxx7
-rw-r--r--xmloff/source/text/XMLIndexSourceBaseContext.hxx3
-rw-r--r--xmloff/source/text/XMLIndexSpanEntryContext.cxx2
-rw-r--r--xmloff/source/text/XMLIndexSpanEntryContext.hxx3
-rw-r--r--xmloff/source/text/XMLIndexTOCContext.cxx7
-rw-r--r--xmloff/source/text/XMLIndexTOCContext.hxx3
-rw-r--r--xmloff/source/text/XMLIndexTOCSourceContext.cxx9
-rw-r--r--xmloff/source/text/XMLIndexTOCSourceContext.hxx3
-rw-r--r--xmloff/source/text/XMLIndexTOCStylesContext.cxx3
-rw-r--r--xmloff/source/text/XMLIndexTOCStylesContext.hxx6
-rw-r--r--xmloff/source/text/XMLIndexTabStopEntryContext.cxx5
-rw-r--r--xmloff/source/text/XMLIndexTabStopEntryContext.hxx3
-rw-r--r--xmloff/source/text/XMLIndexTableSourceContext.cxx9
-rw-r--r--xmloff/source/text/XMLIndexTableSourceContext.hxx3
-rw-r--r--xmloff/source/text/XMLIndexTemplateContext.cxx2
-rw-r--r--xmloff/source/text/XMLIndexTemplateContext.hxx3
-rw-r--r--xmloff/source/text/XMLIndexTitleTemplateContext.cxx3
-rw-r--r--xmloff/source/text/XMLIndexTitleTemplateContext.hxx3
-rw-r--r--xmloff/source/text/XMLIndexUserSourceContext.cxx5
-rw-r--r--xmloff/source/text/XMLIndexUserSourceContext.hxx3
-rw-r--r--xmloff/source/text/XMLLineNumberingExport.cxx5
-rw-r--r--xmloff/source/text/XMLLineNumberingExport.hxx3
-rw-r--r--xmloff/source/text/XMLLineNumberingImportContext.cxx4
-rw-r--r--xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx3
-rw-r--r--xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx3
-rw-r--r--xmloff/source/text/XMLPropertyBackpatcher.cxx1
-rw-r--r--xmloff/source/text/XMLPropertyBackpatcher.hxx8
-rw-r--r--xmloff/source/text/XMLRedlineExport.cxx3
-rw-r--r--xmloff/source/text/XMLRedlineExport.hxx3
-rw-r--r--xmloff/source/text/XMLSectionExport.cxx13
-rw-r--r--xmloff/source/text/XMLSectionExport.hxx3
-rw-r--r--xmloff/source/text/XMLSectionFootnoteConfigExport.cxx5
-rw-r--r--xmloff/source/text/XMLSectionFootnoteConfigExport.hxx3
-rw-r--r--xmloff/source/text/XMLSectionFootnoteConfigImport.cxx3
-rw-r--r--xmloff/source/text/XMLSectionFootnoteConfigImport.hxx3
-rw-r--r--xmloff/source/text/XMLSectionImportContext.cxx8
-rw-r--r--xmloff/source/text/XMLSectionImportContext.hxx3
-rw-r--r--xmloff/source/text/XMLSectionSourceDDEImportContext.cxx7
-rw-r--r--xmloff/source/text/XMLSectionSourceDDEImportContext.hxx3
-rw-r--r--xmloff/source/text/XMLSectionSourceImportContext.cxx5
-rw-r--r--xmloff/source/text/XMLSectionSourceImportContext.hxx3
-rw-r--r--xmloff/source/text/XMLStringBufferImportContext.cxx2
-rw-r--r--xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx2
-rw-r--r--xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx3
-rw-r--r--xmloff/source/text/XMLTextColumnsContext.cxx9
-rw-r--r--xmloff/source/text/XMLTextColumnsExport.cxx2
-rw-r--r--xmloff/source/text/XMLTextFrameContext.cxx52
-rw-r--r--xmloff/source/text/XMLTextFrameContext.hxx24
-rw-r--r--xmloff/source/text/XMLTextFrameHyperlinkContext.cxx8
-rw-r--r--xmloff/source/text/XMLTextFrameHyperlinkContext.hxx12
-rw-r--r--xmloff/source/text/XMLTextHeaderFooterContext.cxx16
-rw-r--r--xmloff/source/text/XMLTextListAutoStylePool.cxx2
-rw-r--r--xmloff/source/text/XMLTextListBlockContext.cxx44
-rw-r--r--xmloff/source/text/XMLTextListBlockContext.hxx10
-rw-r--r--xmloff/source/text/XMLTextListItemContext.cxx16
-rw-r--r--xmloff/source/text/XMLTextListItemContext.hxx6
-rw-r--r--xmloff/source/text/XMLTextMarkImportContext.cxx8
-rw-r--r--xmloff/source/text/XMLTextMarkImportContext.hxx3
-rw-r--r--xmloff/source/text/XMLTextMasterPageContext.cxx3
-rw-r--r--xmloff/source/text/XMLTextMasterPageExport.cxx2
-rw-r--r--xmloff/source/text/XMLTextMasterStylesContext.cxx7
-rw-r--r--xmloff/source/text/XMLTextNumRuleInfo.cxx22
-rw-r--r--xmloff/source/text/XMLTextNumRuleInfo.hxx27
-rw-r--r--xmloff/source/text/XMLTextPropertySetContext.cxx6
-rw-r--r--xmloff/source/text/XMLTextPropertySetContext.hxx3
-rw-r--r--xmloff/source/text/XMLTextShapeImportHelper.cxx7
-rw-r--r--xmloff/source/text/XMLTextShapeStyleContext.cxx8
-rw-r--r--xmloff/source/text/XMLTextTableContext.cxx3
-rw-r--r--xmloff/source/text/XMLTrackedChangesImportContext.cxx5
-rw-r--r--xmloff/source/text/XMLTrackedChangesImportContext.hxx3
-rw-r--r--xmloff/source/text/txtdrope.cxx2
-rw-r--r--xmloff/source/text/txtdrope.hxx3
-rw-r--r--xmloff/source/text/txtdropi.cxx4
-rw-r--r--xmloff/source/text/txtdropi.hxx3
-rw-r--r--xmloff/source/text/txtexppr.cxx32
-rw-r--r--xmloff/source/text/txtexppr.hxx5
-rw-r--r--xmloff/source/text/txtflde.cxx160
-rw-r--r--xmloff/source/text/txtfldi.cxx60
-rw-r--r--xmloff/source/text/txtftne.cxx5
-rw-r--r--xmloff/source/text/txtimp.cxx147
-rw-r--r--xmloff/source/text/txtimppr.cxx14
-rw-r--r--xmloff/source/text/txtlists.cxx41
-rw-r--r--xmloff/source/text/txtparae.cxx307
-rw-r--r--xmloff/source/text/txtparai.cxx68
-rw-r--r--xmloff/source/text/txtparai.hxx6
-rw-r--r--xmloff/source/text/txtparaimphint.hxx15
-rw-r--r--xmloff/source/text/txtprhdl.cxx62
-rw-r--r--xmloff/source/text/txtprhdl.hxx3
-rw-r--r--xmloff/source/text/txtprmap.cxx20
-rw-r--r--xmloff/source/text/txtsecte.cxx6
-rw-r--r--xmloff/source/text/txtstyle.cxx14
-rw-r--r--xmloff/source/text/txtstyli.cxx56
-rw-r--r--xmloff/source/text/txtvfldi.cxx14
-rw-r--r--xmloff/source/transform/ActionMapTypesOASIS.hxx3
-rw-r--r--xmloff/source/transform/ActionMapTypesOOo.hxx3
-rw-r--r--xmloff/source/transform/AttrTransformerAction.hxx6
-rw-r--r--xmloff/source/transform/ChartOASISTContext.cxx5
-rw-r--r--xmloff/source/transform/ChartOASISTContext.hxx2
-rw-r--r--xmloff/source/transform/ChartOOoTContext.cxx6
-rw-r--r--xmloff/source/transform/ChartOOoTContext.hxx2
-rw-r--r--xmloff/source/transform/ChartPlotAreaOASISTContext.cxx3
-rw-r--r--xmloff/source/transform/ChartPlotAreaOASISTContext.hxx3
-rw-r--r--xmloff/source/transform/ChartPlotAreaOOoTContext.cxx3
-rw-r--r--xmloff/source/transform/ChartPlotAreaOOoTContext.hxx3
-rw-r--r--xmloff/source/transform/ControlOASISTContext.cxx5
-rw-r--r--xmloff/source/transform/ControlOASISTContext.hxx2
-rw-r--r--xmloff/source/transform/ControlOOoTContext.cxx5
-rw-r--r--xmloff/source/transform/ControlOOoTContext.hxx2
-rw-r--r--xmloff/source/transform/CreateElemTContext.cxx5
-rw-r--r--xmloff/source/transform/CreateElemTContext.hxx2
-rw-r--r--xmloff/source/transform/DeepTContext.cxx6
-rw-r--r--xmloff/source/transform/DeepTContext.hxx2
-rw-r--r--xmloff/source/transform/DlgOASISTContext.cxx5
-rw-r--r--xmloff/source/transform/DlgOASISTContext.hxx2
-rw-r--r--xmloff/source/transform/DocumentTContext.cxx7
-rw-r--r--xmloff/source/transform/DocumentTContext.hxx2
-rw-r--r--xmloff/source/transform/ElemTransformerAction.hxx3
-rw-r--r--xmloff/source/transform/EventMap.cxx3
-rw-r--r--xmloff/source/transform/EventMap.hxx2
-rw-r--r--xmloff/source/transform/EventOASISTContext.cxx13
-rw-r--r--xmloff/source/transform/EventOASISTContext.hxx2
-rw-r--r--xmloff/source/transform/EventOOoTContext.cxx6
-rw-r--r--xmloff/source/transform/EventOOoTContext.hxx2
-rw-r--r--xmloff/source/transform/FamilyType.hxx2
-rw-r--r--xmloff/source/transform/FlatTContext.cxx5
-rw-r--r--xmloff/source/transform/FlatTContext.hxx2
-rw-r--r--xmloff/source/transform/FormPropOASISTContext.cxx5
-rw-r--r--xmloff/source/transform/FormPropOASISTContext.hxx2
-rw-r--r--xmloff/source/transform/FormPropOOoTContext.cxx7
-rw-r--r--xmloff/source/transform/FormPropOOoTContext.hxx2
-rw-r--r--xmloff/source/transform/FrameOASISTContext.cxx5
-rw-r--r--xmloff/source/transform/FrameOASISTContext.hxx2
-rw-r--r--xmloff/source/transform/FrameOOoTContext.cxx5
-rw-r--r--xmloff/source/transform/FrameOOoTContext.hxx2
-rw-r--r--xmloff/source/transform/IgnoreTContext.cxx4
-rw-r--r--xmloff/source/transform/IgnoreTContext.hxx2
-rw-r--r--xmloff/source/transform/MergeElemTContext.cxx5
-rw-r--r--xmloff/source/transform/MergeElemTContext.hxx2
-rw-r--r--xmloff/source/transform/MetaTContext.cxx4
-rw-r--r--xmloff/source/transform/MetaTContext.hxx4
-rw-r--r--xmloff/source/transform/MutableAttrList.cxx3
-rw-r--r--xmloff/source/transform/MutableAttrList.hxx3
-rw-r--r--xmloff/source/transform/NotesTContext.cxx7
-rw-r--r--xmloff/source/transform/NotesTContext.hxx2
-rw-r--r--xmloff/source/transform/OOo2Oasis.cxx30
-rw-r--r--xmloff/source/transform/OOo2Oasis.hxx5
-rw-r--r--xmloff/source/transform/Oasis2OOo.cxx26
-rw-r--r--xmloff/source/transform/Oasis2OOo.hxx5
-rw-r--r--xmloff/source/transform/PersAttrListTContext.cxx5
-rw-r--r--xmloff/source/transform/PersAttrListTContext.hxx2
-rw-r--r--xmloff/source/transform/PersMixedContentTContext.cxx5
-rw-r--r--xmloff/source/transform/PersMixedContentTContext.hxx2
-rw-r--r--xmloff/source/transform/ProcAddAttrTContext.cxx4
-rw-r--r--xmloff/source/transform/ProcAddAttrTContext.hxx2
-rw-r--r--xmloff/source/transform/ProcAttrTContext.cxx5
-rw-r--r--xmloff/source/transform/ProcAttrTContext.hxx2
-rw-r--r--xmloff/source/transform/PropType.hxx3
-rw-r--r--xmloff/source/transform/PropertyActionsOASIS.cxx3
-rw-r--r--xmloff/source/transform/PropertyActionsOASIS.hxx3
-rw-r--r--xmloff/source/transform/PropertyActionsOOo.cxx12
-rw-r--r--xmloff/source/transform/PropertyActionsOOo.hxx6
-rw-r--r--xmloff/source/transform/RenameElemTContext.cxx5
-rw-r--r--xmloff/source/transform/RenameElemTContext.hxx2
-rw-r--r--xmloff/source/transform/StyleOASISTContext.cxx9
-rw-r--r--xmloff/source/transform/StyleOASISTContext.hxx2
-rw-r--r--xmloff/source/transform/StyleOOoTContext.cxx26
-rw-r--r--xmloff/source/transform/StyleOOoTContext.hxx2
-rw-r--r--xmloff/source/transform/TContextVector.hxx2
-rw-r--r--xmloff/source/transform/Transformer.hxx3
-rw-r--r--xmloff/source/transform/TransformerAction.hxx3
-rw-r--r--xmloff/source/transform/TransformerActionInit.hxx3
-rw-r--r--xmloff/source/transform/TransformerActions.cxx3
-rw-r--r--xmloff/source/transform/TransformerActions.hxx3
-rw-r--r--xmloff/source/transform/TransformerBase.cxx26
-rw-r--r--xmloff/source/transform/TransformerBase.hxx5
-rw-r--r--xmloff/source/transform/TransformerContext.cxx7
-rw-r--r--xmloff/source/transform/TransformerContext.hxx2
-rw-r--r--xmloff/source/transform/TransformerTokenMap.cxx5
-rw-r--r--xmloff/source/transform/TransformerTokenMap.hxx5
-rw-r--r--xmloff/source/transform/XMLFilterRegistration.cxx2
-rw-r--r--xmloff/source/xforms/SchemaContext.cxx3
-rw-r--r--xmloff/source/xforms/SchemaContext.hxx3
-rw-r--r--xmloff/source/xforms/SchemaRestrictionContext.cxx3
-rw-r--r--xmloff/source/xforms/SchemaRestrictionContext.hxx3
-rw-r--r--xmloff/source/xforms/SchemaSimpleTypeContext.cxx3
-rw-r--r--xmloff/source/xforms/SchemaSimpleTypeContext.hxx3
-rw-r--r--xmloff/source/xforms/TokenContext.cxx3
-rw-r--r--xmloff/source/xforms/TokenContext.hxx3
-rw-r--r--xmloff/source/xforms/XFormsBindContext.cxx3
-rw-r--r--xmloff/source/xforms/XFormsBindContext.hxx3
-rw-r--r--xmloff/source/xforms/XFormsInstanceContext.cxx3
-rw-r--r--xmloff/source/xforms/XFormsInstanceContext.hxx3
-rw-r--r--xmloff/source/xforms/XFormsModelContext.cxx3
-rw-r--r--xmloff/source/xforms/XFormsModelContext.hxx3
-rw-r--r--xmloff/source/xforms/XFormsModelExport.hxx3
-rw-r--r--xmloff/source/xforms/XFormsSubmissionContext.cxx5
-rw-r--r--xmloff/source/xforms/XFormsSubmissionContext.hxx3
-rw-r--r--xmloff/source/xforms/xformsapi.cxx4
-rw-r--r--xmloff/source/xforms/xformsapi.hxx3
-rw-r--r--xmloff/source/xforms/xformsexport.cxx3
-rw-r--r--xmloff/source/xforms/xformsimport.cxx3
-rw-r--r--xmlscript/inc/pch/precompiled_xmlscript.cxx2
-rw-r--r--xmlscript/inc/pch/precompiled_xmlscript.hxx2
-rw-r--r--xmlscript/inc/xmlscript/xml_helper.hxx3
-rw-r--r--xmlscript/inc/xmlscript/xml_import.hxx3
-rw-r--r--xmlscript/inc/xmlscript/xmldlg_imexp.hxx31
-rw-r--r--xmlscript/inc/xmlscript/xmllib_imexp.hxx3
-rw-r--r--xmlscript/inc/xmlscript/xmlmod_imexp.hxx3
-rw-r--r--xmlscript/inc/xmlscript/xmlns.h3
-rw-r--r--xmlscript/source/inc/misc.hxx3
-rw-r--r--xmlscript/source/misc/unoservices.cxx5
-rw-r--r--xmlscript/source/xml_helper/xml_byteseq.cxx3
-rw-r--r--xmlscript/source/xml_helper/xml_element.cxx3
-rw-r--r--xmlscript/source/xml_helper/xml_impctx.cxx3
-rw-r--r--xmlscript/source/xmldlg_imexp/common.hxx4
-rw-r--r--xmlscript/source/xmldlg_imexp/exp_share.hxx43
-rw-r--r--xmlscript/source/xmldlg_imexp/imp_share.hxx286
-rw-r--r--xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx14
-rw-r--r--xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx535
-rw-r--r--xmlscript/source/xmldlg_imexp/xmldlg_export.cxx464
-rw-r--r--xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx510
-rw-r--r--xmlscript/source/xmldlg_imexp/xmldlg_import.cxx202
-rw-r--r--xmlscript/source/xmlflat_imexp/xmlbas_export.cxx3
-rw-r--r--xmlscript/source/xmlflat_imexp/xmlbas_export.hxx3
-rw-r--r--xmlscript/source/xmlflat_imexp/xmlbas_import.cxx3
-rw-r--r--xmlscript/source/xmlflat_imexp/xmlbas_import.hxx5
-rw-r--r--xmlscript/source/xmllib_imexp/imp_share.hxx3
-rw-r--r--xmlscript/source/xmllib_imexp/xmllib_export.cxx2
-rw-r--r--xmlscript/source/xmllib_imexp/xmllib_import.cxx3
-rw-r--r--xmlscript/source/xmlmod_imexp/imp_share.hxx3
-rw-r--r--xmlscript/source/xmlmod_imexp/xmlmod_export.cxx2
-rw-r--r--xmlscript/source/xmlmod_imexp/xmlmod_import.cxx2
-rw-r--r--xmlscript/test/imexp.cxx2
651 files changed, 5020 insertions, 3879 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000..25df1065c1
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,11 @@
+# backup and temporary files
+*~
+.*.sw[op]
+
+# the build directories
+/*/unxlng??
+/*/unxlng??.pro
+/*/wntmsc???
+/*/wntmsc???.pro
+/*/unxmac??
+/*/unxmac??.pro
diff --git a/avmedia/inc/avmedia/mediaitem.hxx b/avmedia/inc/avmedia/mediaitem.hxx
index c9f11acf3c..a4a10a94af 100644
--- a/avmedia/inc/avmedia/mediaitem.hxx
+++ b/avmedia/inc/avmedia/mediaitem.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -82,8 +83,8 @@ public:
SfxMapUnit ePresUnit,
XubString& rText,
const IntlWrapper *pIntl ) const;
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
void merge( const MediaItem& rMediaItem );
@@ -131,3 +132,5 @@ typedef ::avmedia::MediaItem avmedia_MediaItem;
}
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/inc/avmedia/mediaplayer.hxx b/avmedia/inc/avmedia/mediaplayer.hxx
index 22adfdec74..175719a8f4 100644
--- a/avmedia/inc/avmedia/mediaplayer.hxx
+++ b/avmedia/inc/avmedia/mediaplayer.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -94,3 +95,5 @@ private:
}
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/inc/avmedia/mediatoolbox.hxx b/avmedia/inc/avmedia/mediatoolbox.hxx
index 97b50f6bb1..c65a670a58 100644
--- a/avmedia/inc/avmedia/mediatoolbox.hxx
+++ b/avmedia/inc/avmedia/mediatoolbox.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -63,3 +64,5 @@ private:
}
#endif // _AVMEDIA_MEDIATOOLBOX_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/inc/avmedia/mediawindow.hxx b/avmedia/inc/avmedia/mediawindow.hxx
index 8643318631..62b998b2e1 100644
--- a/avmedia/inc/avmedia/mediawindow.hxx
+++ b/avmedia/inc/avmedia/mediawindow.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -168,3 +169,5 @@ namespace avmedia
}
#endif // _AVMEDIA_MEDIAWINDOW_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/inc/mediacontrol.hxx b/avmedia/inc/mediacontrol.hxx
index 0574e4a709..20e90c4ee2 100644
--- a/avmedia/inc/mediacontrol.hxx
+++ b/avmedia/inc/mediacontrol.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -112,3 +113,5 @@ private:
}
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index a251846e67..2f8871ee04 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -629,3 +630,5 @@ IMPL_LINK( MediaControl, implTimeoutHdl, Timer*, EMPTYARG )
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/framework/mediacontrol.hrc b/avmedia/source/framework/mediacontrol.hrc
index ef9ddc2a1b..1c98b5ac81 100644
--- a/avmedia/source/framework/mediacontrol.hrc
+++ b/avmedia/source/framework/mediacontrol.hrc
@@ -48,6 +48,4 @@
#define AVMEDIA_IMG_MUTE 2054
#define AVMEDIA_IMGLST 3072
-#define AVMEDIA_IMGLST_HC 3073
#define AVMEDIA_IMGLST_L 3074
-#define AVMEDIA_IMGLST_L_HC 3075
diff --git a/avmedia/source/framework/mediacontrol.src b/avmedia/source/framework/mediacontrol.src
index f56e1bbeae..e7d6958e65 100644
--- a/avmedia/source/framework/mediacontrol.src
+++ b/avmedia/source/framework/mediacontrol.src
@@ -32,92 +32,66 @@ String AVMEDIA_STR_OPEN
Text[en-US] = "Open";
};
-// ------------------------------------------------------------------------------
-
String AVMEDIA_STR_INSERT
{
Text [ en-US ] = "Apply" ;
};
-// ------------------------------------------------------------------------------
-
String AVMEDIA_STR_PLAY
{
Text[en-US] = "Play";
};
-// ------------------------------------------------------------------------------
-
String AVMEDIA_STR_PAUSE
{
Text[en-US] = "Pause";
};
-// ------------------------------------------------------------------------------
-
String AVMEDIA_STR_STOP
{
Text[en-US] = "Stop";
};
-// ------------------------------------------------------------------------------
-
String AVMEDIA_STR_ENDLESS
{
Text[en-US] = "Repeat";
};
-// ------------------------------------------------------------------------------
-
String AVMEDIA_STR_MUTE
{
Text[en-US] = "Mute";
};
-// ------------------------------------------------------------------------------
-
String AVMEDIA_STR_ZOOM
{
Text[en-US] = "View";
};
-// ------------------------------------------------------------------------------
-
String AVMEDIA_STR_ZOOM_50
{
Text[en-US] = "50%";
};
-// ------------------------------------------------------------------------------
-
String AVMEDIA_STR_ZOOM_100
{
Text[en-US] = "100%";
};
-// ------------------------------------------------------------------------------
-
String AVMEDIA_STR_ZOOM_200
{
Text[en-US] = "200%";
};
-// ------------------------------------------------------------------------------
-
String AVMEDIA_STR_ZOOM_FIT
{
Text[en-US] = "Scaled";
};
-// ------------------------------------------------------------------------------
-
String AVMEDIA_STR_MEDIAPLAYER
{
Text[en-US] = "Media Player";
};
-// ------------------------------------------------------------------------------
-
ImageList AVMEDIA_IMGLST
{
Prefix = "av";
@@ -135,8 +109,6 @@ ImageList AVMEDIA_IMGLST
IdCount = 7;
};
-// ------------------------------------------------------------------------------
-
ImageList AVMEDIA_IMGLST_L
{
Prefix = "avl";
@@ -153,41 +125,3 @@ ImageList AVMEDIA_IMGLST_L
};
IdCount = 7;
};
-
-// ------------------------------------------------------------------------------
-
-ImageList AVMEDIA_IMGLST_HC
-{
- Prefix = "avh";
- MaskColor = Color{ Red = 0xff00; Green = 0x0000; Blue = 0xff00; };
- IdList =
- {
- AVMEDIA_IMG_OPEN;
- AVMEDIA_IMG_PLAY;
- AVMEDIA_IMG_PAUSE;
- AVMEDIA_IMG_STOP;
- AVMEDIA_IMG_ENDLESS;
- AVMEDIA_IMG_INSERT;
- AVMEDIA_IMG_MUTE;
- };
- IdCount = 7;
-};
-
-// ------------------------------------------------------------------------------
-
-ImageList AVMEDIA_IMGLST_L_HC
-{
- Prefix = "avlh";
- MaskColor = Color{ Red = 0xff00; Green = 0x0000; Blue = 0xff00; };
- IdList =
- {
- AVMEDIA_IMG_OPEN;
- AVMEDIA_IMG_PLAY;
- AVMEDIA_IMG_PAUSE;
- AVMEDIA_IMG_STOP;
- AVMEDIA_IMG_ENDLESS;
- AVMEDIA_IMG_INSERT;
- AVMEDIA_IMG_MUTE;
- };
- IdCount = 7;
-};
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx
index 9d53c0d3e3..8501fd054d 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -122,7 +123,7 @@ SfxItemPresentation MediaItem::GetPresentation( SfxItemPresentation,
//------------------------------------------------------------------------
-BOOL MediaItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const
+bool MediaItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const
{
uno::Sequence< uno::Any > aSeq( 9 );
@@ -135,23 +136,23 @@ BOOL MediaItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const
aSeq[ 6 ] <<= mbLoop;
aSeq[ 7 ] <<= mbMute;
aSeq[ 8 ] <<= meZoom;
-
+
rVal <<= aSeq;
-
+
return true;
}
//------------------------------------------------------------------------
-BOOL MediaItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
+bool MediaItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
{
uno::Sequence< uno::Any > aSeq;
- BOOL bRet = false;
-
+ bool bRet = false;
+
if( ( rVal >>= aSeq ) && ( aSeq.getLength() == 9 ) )
{
sal_Int32 nInt32 = 0;
-
+
aSeq[ 0 ] >>= maURL;
aSeq[ 1 ] >>= mnMaskSet;
aSeq[ 2 ] >>= nInt32; meState = static_cast< MediaState >( nInt32 );
@@ -161,10 +162,10 @@ BOOL MediaItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
aSeq[ 6 ] >>= mbLoop;
aSeq[ 7 ] >>= mbMute;
aSeq[ 8 ] >>= meZoom;
-
+
bRet = true;
}
-
+
return bRet;
}
@@ -327,3 +328,5 @@ void MediaItem::setZoom( ::com::sun::star::media::ZoomLevel eZoom )
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/framework/mediamisc.cxx b/avmedia/source/framework/mediamisc.cxx
index 89786eb221..73f1d75206 100644
--- a/avmedia/source/framework/mediamisc.cxx
+++ b/avmedia/source/framework/mediamisc.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -46,3 +47,5 @@ ResMgr* GetResMgr()
}
} // namespace avemdia
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx
index 669f8616af..9ef4042c5b 100644
--- a/avmedia/source/framework/mediaplayer.cxx
+++ b/avmedia/source/framework/mediaplayer.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -164,3 +165,5 @@ void MediaFloater::dispatchCurrentURL()
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/framework/mediatoolbox.cxx b/avmedia/source/framework/mediatoolbox.cxx
index 7cca17a416..993bf5d507 100644
--- a/avmedia/source/framework/mediatoolbox.cxx
+++ b/avmedia/source/framework/mediatoolbox.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -166,3 +167,5 @@ void MediaToolBoxControl::implExecuteMediaControl( const MediaItem& rItem )
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx
index 784e023e19..d2c09563d2 100644
--- a/avmedia/source/framework/soundhandler.cxx
+++ b/avmedia/source/framework/soundhandler.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,13 +30,9 @@
// my own includes
//_________________________________________________________________________________________________________________
-#ifndef __FRAMEWORK_DISPATCH_SOUNDHANDLER_HXX_
#include "soundhandler.hxx"
-#endif
-#ifndef __COMPHELPER_MEDIADESCRIPTOR_HXX_
#include <comphelper/mediadescriptor.hxx>
-#endif
//_________________________________________________________________________________________________________________
// interface includes
@@ -333,7 +330,7 @@ void SAL_CALL SoundHandler::dispatchWithNotification(const css::util::URL&
const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw(css::uno::RuntimeException)
{
// SAFE {
- const ::vos::OGuard aLock( m_aLock );
+ const ::osl::MutexGuard aLock( m_aLock );
{
//close streams otherwise on windows we can't reopen the file in the
@@ -427,7 +424,7 @@ void SAL_CALL SoundHandler::dispatch( const css::util::URL&
// I think we can the following ones:
// a) look for given extension of url to map our type decision HARD CODED!!!
// b) return preferred type every time... it's easy :-)
- sTypeName = ::rtl::OUString::createFromAscii("wav_Wave_Audio_File");
+ sTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("wav_Wave_Audio_File"));
aDescriptor[::comphelper::MediaDescriptor::PROP_TYPENAME()] <<= sTypeName;
aDescriptor >> lDescriptor;
}
@@ -452,7 +449,7 @@ void SAL_CALL SoundHandler::dispatch( const css::util::URL&
IMPL_LINK( SoundHandler, implts_PlayerNotify, void*, EMPTYARG )
{
// SAFE {
- ::vos::OClearableGuard aLock( m_aLock );
+ ::osl::ClearableMutexGuard aLock( m_aLock );
if (m_xPlayer.is() && m_xPlayer->isPlaying() && m_xPlayer->getMediaTime() < m_xPlayer->getDuration())
{
@@ -523,3 +520,5 @@ extern "C" void* SAL_CALL component_getFactory(const sal_Char* pImplementationNa
/* Return with result of this operation. */
return pReturn;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/framework/soundhandler.hxx b/avmedia/source/framework/soundhandler.hxx
index 4a707c507a..decb177178 100644
--- a/avmedia/source/framework/soundhandler.hxx
+++ b/avmedia/source/framework/soundhandler.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -53,7 +54,7 @@
#include <vcl/timer.hxx>
#include <tools/link.hxx>
#include <avmedia/mediawindow.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
namespace css = ::com::sun::star;
@@ -74,7 +75,7 @@ namespace avmedia{
struct ThreadHelpBase
{
public:
- mutable ::vos::OMutex m_aLock;
+ mutable ::osl::Mutex m_aLock;
};
/*-************************************************************************************************************//**
@@ -185,3 +186,5 @@ class SoundHandler : // interfaces
} // namespace avmedia
#endif // #ifndef __FRAMEWORK_HANDLER_SOUNDHANDLER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/framework/soundhandler.xml b/avmedia/source/framework/soundhandler.xml
index e0304239da..3eb039dec7 100644
--- a/avmedia/source/framework/soundhandler.xml
+++ b/avmedia/source/framework/soundhandler.xml
@@ -20,7 +20,6 @@
<project-build-dependency> cppu </project-build-dependency>
<project-build-dependency> cppuhelper </project-build-dependency>
- <project-build-dependency> vos </project-build-dependency>
<project-build-dependency> sal </project-build-dependency>
<project-build-dependency> tools </project-build-dependency>
<project-build-dependency> svtools </project-build-dependency>
@@ -34,7 +33,6 @@
<runtime-module-dependency> cppu2 </runtime-module-dependency>
<runtime-module-dependency> cppuhelper </runtime-module-dependency>
- <runtime-module-dependency> vos2$(COM) </runtime-module-dependency>
<runtime-module-dependency> sal2 </runtime-module-dependency>
<runtime-module-dependency> tl </runtime-module-dependency>
<runtime-module-dependency> svt </runtime-module-dependency>
diff --git a/avmedia/source/gstreamer/ChangeLog b/avmedia/source/gstreamer/ChangeLog
new file mode 100644
index 0000000000..8671b11a97
--- /dev/null
+++ b/avmedia/source/gstreamer/ChangeLog
@@ -0,0 +1,112 @@
+2006-09-22 Radek Doulik <rodo@novell.com>
+
+ * gstplayer.cxx (processSyncMessage): remember GstXOverlay
+ (processMessage): explicit expose when we reach paused state -
+ this mean that now once stream is loaded/video inserted, the 1st
+ frame is rendered
+ (setMediaTime): if not playing set PAUSED state again, seems like
+ seek is changing state to PLAYING. this fixes problem when stop
+ seeked to begin and started playing again
+
+2006-09-21 Radek Doulik <rodo@novell.com>
+
+ * gstplayer.cxx (processSyncMessage): when error occurs, set the
+ condition so that OOo does'n waste time waiting for us to finish
+ reaching PAUSED state
+
+2006-09-19 Radek Doulik <rodo@novell.com>
+
+ * gstplayer.cxx (processSyncMessage): set condition even if we
+ weren't able to get video size - might be audio only stream
+ (getPreferredPlayerWindowSize): init size to 0, 0 - in case we
+ don't have video size, it will fallback to system media window
+ content (some icon)
+
+2006-08-31 Radek Doulik <rodo@novell.com>
+
+ * gstplayer.cxx (processSyncMessage): when we get to paused state,
+ get stream-info from playbin and look for video size. set
+ condition when done
+ (Player): added width, height, size condition
+ (preparePlaybin): new helper method, extracted from create
+ method. use fake video sink in the beggining so that we don't get
+ xwindow-id message too early
+ (getPreferredPlayerWindowSize): wait for size condition to be sure
+ we know video size (if possible). reset video sink to default one
+ (NULL) and set state to READY and immediatelly to PAUSE so that
+ the default sink is relinked
+
+2006-08-16 Radek Doulik <rodo@novell.com>
+
+ * gstplayer.cxx (create): set state to PAUSED so that we can query
+ duration ASAP
+ (processMessage): watch for state changed and query duration when
+ going to PAUSED state
+
+2006-08-15 Radek Doulik <rodo@novell.com>
+
+ * makefile.mk: require gstreamer-plugins-base-0.10 and link with
+ gst interfaces library
+
+ * gstwindow.cxx: make it build
+
+ * gstplayer.cxx: removed WINNT ifdefs (relict from time when I
+ thought Cedric develops on win architecture)
+ (gst_pipeline_bus_callback): added sync handler for setting
+ xwindow id to to video sink
+ (processSyncMessage): new metrhod, process message from sync
+ handler
+ (create): set playbin state to READY so that playback start is
+ faster
+ (createPlayerWindow): implemented, we pass xwindow id in 3rd
+ argument
+
+2006-08-04 Radek Doulik <rodo@novell.com>
+
+ * gstplayer.cxx (create): add bus watch, watch for EOS in
+ processMessage method (called from watch callback)
+
+2006-08-02 Radek Doulik <rodo@novell.com>
+
+ * gstplayer.cxx: test for mpPlaybin != NULL before using it,
+ initialize it in constructor to NULL and also reset it to NULL
+ after unrefing
+ (getDuration): check for sucessful query and the right format
+ (getMediaTime): ditto,
+ (setMediaTime): implemented
+
+2006-08-01 Radek Doulik <rodo@novell.com>
+
+ * gstwindow.hxx: removed mpWndClass for now, so that the rest
+ compiles
+
+ * gstuno.cxx (component_getFactory): s/DirectX/GStreamer so that
+ component is loaded
+
+ * gstplayer.cxx (Player::Player): do not create gerror object, it
+ is noit needed, free the error object only if created during
+ initialization of gstremer
+ (Player::create, start, stop): use g_main_loop only on windows
+ (create): fixed ascURL declaration, added rtl namespace prefix
+ (setMute): set mbMuted
+ (setVolumeDB): convert avmedia volume to gstreamer volume, added
+ missing NULL to the end of g_object_set call
+ (getVolumeDB): convert gstreamer volume back to avmedia volume
+
+ * gstplayer.hxx: keep g_main_loop only on win platform. make
+ mnUnmutedVolume double, moved mbInitialized to the end to quiet
+ compiler warning
+
+ * gstcommon.hxx: removed wrong #include <rtl/ustring>
+
+ * renamed source files, prefixed the names with gst so that obj
+ file names do not clash with xine object files
+
+ * makefile.mk: changed PRJNAME and TARGET to reflect
+ gstreamer. enabled build on unix as well. removed win library
+ references. removed source files which are not yet ported from
+ SLOFILES list.
+
+2006-08-31 Radek Doulik <rodo@novell.com>
+
+ * imported initial sources from Cedric Bosdonnat \ No newline at end of file
diff --git a/avmedia/source/gstreamer/gstcommon.hxx b/avmedia/source/gstreamer/gstcommon.hxx
deleted file mode 100644
index 83bb818aef..0000000000
--- a/avmedia/source/gstreamer/gstcommon.hxx
+++ /dev/null
@@ -1,68 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _GSTCOMMON_HXX
-#define _GSTCOMMON_HXX
-
-#include <osl/mutex.hxx>
-#include <rtl/ustring.hxx>
-#include <tools/debug.hxx>
-#include <tools/stream.hxx>
-#include <tools/string.hxx>
-#include <tools/urlobj.hxx>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/weak.hxx>
-#include <cppuhelper/factory.hxx>
-
-#include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/uno/RuntimeException.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/awt/Rectangle.hpp>
-#include <com/sun/star/awt/KeyModifier.hpp>
-#include <com/sun/star/awt/MouseButton.hpp>
-#include <com/sun/star/media/XManager.hpp>
-
-#include <memory>
-
-#define AVMEDIA_GSTREAMER_MANAGER_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.Manager_GStreamer"
-#define AVMEDIA_GSTREAMER_MANAGER_SERVICENAME "com.sun.star.media.Manager_GStreamer"
-
-#define AVMEDIA_GSTREAMER_PLAYER_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.Player_GStreamer"
-#define AVMEDIA_GSTREAMER_PLAYER_SERVICENAME "com.sun.star.media.Player_GStreamer"
-
-#define AVMEDIA_GSTREAMER_WINDOW_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.Window_GStreamer"
-#define AVMEDIA_GSTREAMER_WINDOW_SERVICENAME "com.sun.star.media.Window_GStreamer"
-
-#define AVMEDIA_GSTREAMER_FRAMEGRABBER_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.FrameGrabber_GStreamer"
-#define AVMEDIA_GSTREAMER_FRAMEGRABBER_SERVICENAME "com.sun.star.media.FrameGrabber_GStreamer"
-
-#endif // _GSTCOMMOM_HXX
diff --git a/avmedia/source/inc/mediamisc.hxx b/avmedia/source/inc/mediamisc.hxx
index 32066bf489..47c78f3f13 100644
--- a/avmedia/source/inc/mediamisc.hxx
+++ b/avmedia/source/inc/mediamisc.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,6 +30,9 @@ class ResMgr;
#define AVMEDIA_RESID( nId ) ResId( nId, * ::avmedia::GetResMgr() )
+#ifdef GSTREAMER
+#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_GStreamer"
+#else
#ifdef WNT
#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_DirectX"
@@ -56,8 +60,11 @@ class ResMgr;
#endif
#endif
+#endif
namespace avmedia
{
ResMgr* GetResMgr();
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/quicktime/framegrabber.cxx b/avmedia/source/quicktime/framegrabber.cxx
index 29f652c3c0..d6b51290cc 100644
--- a/avmedia/source/quicktime/framegrabber.cxx
+++ b/avmedia/source/quicktime/framegrabber.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -150,3 +151,5 @@ uno::Sequence< ::rtl::OUString > SAL_CALL FrameGrabber::getSupportedServiceNames
} // namespace quicktime
} // namespace avmedia
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/quicktime/framegrabber.hxx b/avmedia/source/quicktime/framegrabber.hxx
index 6ddee8493c..95d62c18cf 100644
--- a/avmedia/source/quicktime/framegrabber.hxx
+++ b/avmedia/source/quicktime/framegrabber.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,9 +31,7 @@
#include "quicktimecommon.hxx"
-#ifndef _COM_SUN_STAR_MEDIA_XFRAMEGRABBER_HDL_
#include "com/sun/star/media/XFrameGrabber.hdl"
-#endif
namespace avmedia { namespace quicktime {
@@ -71,3 +70,5 @@ private:
} // namespace avmedia
#endif // _FRAMEGRABBER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/quicktime/manager.cxx b/avmedia/source/quicktime/manager.cxx
index e4c093988b..bdf5105cae 100644
--- a/avmedia/source/quicktime/manager.cxx
+++ b/avmedia/source/quicktime/manager.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -94,3 +95,5 @@ uno::Sequence< ::rtl::OUString > SAL_CALL Manager::getSupportedServiceNames( )
} // namespace quicktime
} // namespace avmedia
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/quicktime/manager.hxx b/avmedia/source/quicktime/manager.hxx
index cbb7ab2bd9..2fb8f3d106 100644
--- a/avmedia/source/quicktime/manager.hxx
+++ b/avmedia/source/quicktime/manager.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,9 +31,7 @@
#include "quicktimecommon.hxx"
-#ifndef _COM_SUN_STAR_MEDIA_XMANAGER_HDL_
#include "com/sun/star/media/XManager.hdl"
-#endif
// -----------
// - Manager -
@@ -64,3 +63,5 @@ private:
} // namespace avmedia
#endif // _MANAGER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/quicktime/player.cxx b/avmedia/source/quicktime/player.cxx
index 3e8498b6d1..079307fd37 100644
--- a/avmedia/source/quicktime/player.cxx
+++ b/avmedia/source/quicktime/player.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -499,3 +500,5 @@ uno::Sequence< ::rtl::OUString > SAL_CALL Player::getSupportedServiceNames( )
} // namespace quicktime
} // namespace avmedia
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/quicktime/player.hxx b/avmedia/source/quicktime/player.hxx
index a4d04b32b7..204f520703 100644
--- a/avmedia/source/quicktime/player.hxx
+++ b/avmedia/source/quicktime/player.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,9 +32,7 @@
#include <osl/conditn.h>
#include "quicktimecommon.hxx"
-#ifndef _COM_SUN_STAR_MEDIA_XPLAYER_HDL_
#include "com/sun/star/media/XPlayer.hdl"
-#endif
namespace avmedia { namespace quicktime {
@@ -111,3 +110,5 @@ private:
} // namespace avmedia
#endif // _PLAYER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/quicktime/quicktimecommon.hxx b/avmedia/source/quicktime/quicktimecommon.hxx
index ac0507bf9d..e89bc21dc4 100644
--- a/avmedia/source/quicktime/quicktimecommon.hxx
+++ b/avmedia/source/quicktime/quicktimecommon.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -79,3 +80,5 @@
#endif // _QUICKTIMECOMMOM_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/quicktime/quicktimeuno.cxx b/avmedia/source/quicktime/quicktimeuno.cxx
index d43dc02685..f127beb788 100644
--- a/avmedia/source/quicktime/quicktimeuno.cxx
+++ b/avmedia/source/quicktime/quicktimeuno.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -59,11 +60,11 @@ extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void*
if( rtl_str_compare( pImplName, AVMEDIA_QUICKTIME_MANAGER_IMPLEMENTATIONNAME ) == 0 )
{
- const ::rtl::OUString aServiceName( ::rtl::OUString::createFromAscii( AVMEDIA_QUICKTIME_MANAGER_SERVICENAME ) );
+ const ::rtl::OUString aServiceName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_QUICKTIME_MANAGER_SERVICENAME )) );
xFactory = uno::Reference< lang::XSingleServiceFactory >( ::cppu::createSingleFactory(
reinterpret_cast< lang::XMultiServiceFactory* >( pServiceManager ),
- ::rtl::OUString::createFromAscii( AVMEDIA_QUICKTIME_MANAGER_IMPLEMENTATIONNAME ),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_QUICKTIME_MANAGER_IMPLEMENTATIONNAME )),
create_MediaPlayer, uno::Sequence< ::rtl::OUString >( &aServiceName, 1 ) ) );
}
@@ -75,3 +76,5 @@ extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void*
return pRet;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/quicktime/window.cxx b/avmedia/source/quicktime/window.cxx
index 053dea581d..024354093b 100644
--- a/avmedia/source/quicktime/window.cxx
+++ b/avmedia/source/quicktime/window.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -351,3 +352,5 @@ uno::Sequence< ::rtl::OUString > SAL_CALL Window::getSupportedServiceNames( )
} // namespace quicktime
} // namespace avmedia
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/quicktime/window.hxx b/avmedia/source/quicktime/window.hxx
index 95921259f5..a2e58ece2c 100644
--- a/avmedia/source/quicktime/window.hxx
+++ b/avmedia/source/quicktime/window.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,9 +32,7 @@
#include "quicktimecommon.hxx"
#include <cppuhelper/interfacecontainer.h>
-#ifndef _COM_SUN_STAR_MEDIA_XPLAYERWINDOW_HDL_
#include "com/sun/star/media/XPlayerWindow.hdl"
-#endif
namespace avmedia { namespace quicktime {
@@ -113,3 +112,5 @@ private:
} // namespace avmedia
#endif // _WINDOW_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/viewer/mediaevent_impl.cxx b/avmedia/source/viewer/mediaevent_impl.cxx
index ded5471e82..1d96dc9245 100644
--- a/avmedia/source/viewer/mediaevent_impl.cxx
+++ b/avmedia/source/viewer/mediaevent_impl.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,7 +29,7 @@
#include "mediaevent_impl.hxx"
#include "mediawindow_impl.hxx"
#include <osl/mutex.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <vcl/event.hxx>
@@ -73,7 +74,7 @@ void SAL_CALL MediaEventListenersImpl::keyPressed( const ::com::sun::star::awt::
throw (::com::sun::star::uno::RuntimeException)
{
const ::osl::MutexGuard aGuard( maMutex );
- const ::vos::OGuard aAppGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aAppGuard;
if( mpNotifyWindow )
{
@@ -93,7 +94,7 @@ void SAL_CALL MediaEventListenersImpl::keyReleased( const ::com::sun::star::awt:
throw (::com::sun::star::uno::RuntimeException)
{
const ::osl::MutexGuard aGuard( maMutex );
- const ::vos::OGuard aAppGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aAppGuard;
if( mpNotifyWindow )
{
@@ -112,7 +113,7 @@ void SAL_CALL MediaEventListenersImpl::mousePressed( const ::com::sun::star::awt
throw (::com::sun::star::uno::RuntimeException)
{
const ::osl::MutexGuard aGuard( maMutex );
- const ::vos::OGuard aAppGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aAppGuard;
if( mpNotifyWindow )
{
@@ -133,7 +134,7 @@ void SAL_CALL MediaEventListenersImpl::mouseReleased( const ::com::sun::star::aw
throw (::com::sun::star::uno::RuntimeException)
{
const ::osl::MutexGuard aGuard( maMutex );
- const ::vos::OGuard aAppGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aAppGuard;
if( mpNotifyWindow )
{
@@ -154,7 +155,7 @@ void SAL_CALL MediaEventListenersImpl::mouseEntered( const ::com::sun::star::awt
throw (::com::sun::star::uno::RuntimeException)
{
const ::osl::MutexGuard aGuard( maMutex );
- const ::vos::OGuard aAppGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aAppGuard;
if( mpNotifyWindow )
{
@@ -167,7 +168,7 @@ void SAL_CALL MediaEventListenersImpl::mouseExited( const ::com::sun::star::awt:
throw (::com::sun::star::uno::RuntimeException)
{
const ::osl::MutexGuard aGuard( maMutex );
- const ::vos::OGuard aAppGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aAppGuard;
if( mpNotifyWindow )
{
@@ -180,7 +181,7 @@ void SAL_CALL MediaEventListenersImpl::mouseDragged( const ::com::sun::star::awt
throw (::com::sun::star::uno::RuntimeException)
{
const ::osl::MutexGuard aGuard( maMutex );
- const ::vos::OGuard aAppGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aAppGuard;
if( mpNotifyWindow )
{
@@ -195,7 +196,7 @@ void SAL_CALL MediaEventListenersImpl::mouseMoved( const ::com::sun::star::awt::
throw (::com::sun::star::uno::RuntimeException)
{
const ::osl::MutexGuard aGuard( maMutex );
- const ::vos::OGuard aAppGuard( Application::GetSolarMutex() );
+ const SolarMutexGuard aAppGuard;
if( mpNotifyWindow )
{
@@ -221,3 +222,4 @@ void SAL_CALL MediaEventListenersImpl::focusLost( const ::com::sun::star::awt::F
} // namespace priv
} // namespace avemdia
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/viewer/mediaevent_impl.hxx b/avmedia/source/viewer/mediaevent_impl.hxx
index 501501bdbb..7246eb7b36 100644
--- a/avmedia/source/viewer/mediaevent_impl.hxx
+++ b/avmedia/source/viewer/mediaevent_impl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -87,3 +88,5 @@ namespace avmedia
}
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index b5667dfaa3..ba0e53673e 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -571,3 +572,5 @@ uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( const ::rtl::OUStrin
}
} // namespace avemdia
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index cb5d9675a1..9ffdc54bca 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -36,13 +36,12 @@
#include <osl/mutex.hxx>
#include <tools/time.hxx>
#include <vcl/svapp.hxx>
+#ifdef UNX
+#include <vcl/sysdata.hxx>
+#endif
-#ifndef _COM_SUN_STAR_AWT_SYSTEMPOINTER_HDL_
#include <com/sun/star/awt/SystemPointer.hdl>
-#endif
-#ifndef _COM_SUN_STAR_LANG_XCOMPONENT_HDL_
#include <com/sun/star/lang/XComponent.hdl>
-#endif
#define AVMEDIA_TOOLBOXITEM_PREV 0x0001
#define AVMEDIA_TOOLBOXITEM_PLAY 0x0002
@@ -545,3 +544,5 @@ void MediaWindowImpl::StartDrag( sal_Int8 nAction, const Point& rPosPixel )
} // namespace priv
} // namespace avmedia
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/viewer/mediawindow_impl.hxx b/avmedia/source/viewer/mediawindow_impl.hxx
index d82c50bcec..30f98cfef7 100644
--- a/avmedia/source/viewer/mediawindow_impl.hxx
+++ b/avmedia/source/viewer/mediawindow_impl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -6,9 +7,6 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: mediawindow_impl.hxx,v $
- * $Revision: 1.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -146,3 +144,5 @@ namespace avmedia
}
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/viewer/mediawindowbase_impl.cxx b/avmedia/source/viewer/mediawindowbase_impl.cxx
index db6d1f174e..21cb4d4a94 100644
--- a/avmedia/source/viewer/mediawindowbase_impl.cxx
+++ b/avmedia/source/viewer/mediawindowbase_impl.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,9 +34,7 @@
#include <comphelper/processfactory.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/media/XManager.hpp>
-#ifndef _COM_SUN_STAR_LANG_XCOMPONENT_HDL_
#include <com/sun/star/lang/XComponent.hdl>
-#endif
#define MEDIA_TIMER_TIMEOUT 100
@@ -465,3 +464,5 @@ void MediaWindowBaseImpl::executeMediaItem( const MediaItem& rItem )
} // namespace priv
} // namespace avemdia
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/viewer/mediawindowbase_impl.hxx b/avmedia/source/viewer/mediawindowbase_impl.hxx
index c406ae3664..9cfa52e005 100644
--- a/avmedia/source/viewer/mediawindowbase_impl.hxx
+++ b/avmedia/source/viewer/mediawindowbase_impl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -132,3 +133,5 @@ namespace avmedia
}
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/win/framegrabber.cxx b/avmedia/source/win/framegrabber.cxx
index 28fc885c4f..59a9217da4 100644
--- a/avmedia/source/win/framegrabber.cxx
+++ b/avmedia/source/win/framegrabber.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -245,3 +246,5 @@ uno::Sequence< ::rtl::OUString > SAL_CALL FrameGrabber::getSupportedServiceNames
} // namespace win
} // namespace avmedia
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/win/framegrabber.hxx b/avmedia/source/win/framegrabber.hxx
index b9e7e63aaf..9d3b23753c 100644
--- a/avmedia/source/win/framegrabber.hxx
+++ b/avmedia/source/win/framegrabber.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,9 +31,7 @@
#include "wincommon.hxx"
-#ifndef _COM_SUN_STAR_MEDIA_XFRAMEGRABBER_HDL_
#include "com/sun/star/media/XFrameGrabber.hdl"
-#endif
struct IMediaDet;
@@ -72,3 +71,5 @@ private:
} // namespace avmedia
#endif // _FRAMEGRABBER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/win/interface.hxx b/avmedia/source/win/interface.hxx
index 5d2e65553a..be9efe3fcd 100644
--- a/avmedia/source/win/interface.hxx
+++ b/avmedia/source/win/interface.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -121,3 +122,4 @@ public:
};
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/win/makefile.mk b/avmedia/source/win/makefile.mk
index bdbb3c991b..edd28f3521 100644
--- a/avmedia/source/win/makefile.mk
+++ b/avmedia/source/win/makefile.mk
@@ -67,7 +67,6 @@ DEF1EXPORTFILE=exports.dxp
SHL1STDLIBS += $(OLE32LIB)
SHL1STDLIBS += $(OLEAUT32LIB)
SHL1STDLIBS += $(GDI32LIB)
-SHL1STDLIBS += $(DDRAWLIB)
.IF "$(COM)"=="GCC"
SHL1STDLIBS += $(PSDK_HOME)$/lib$/strmiids.lib
diff --git a/avmedia/source/win/manager.cxx b/avmedia/source/win/manager.cxx
index 9b661b9bbd..3ba63fab82 100644
--- a/avmedia/source/win/manager.cxx
+++ b/avmedia/source/win/manager.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -95,3 +96,5 @@ uno::Sequence< ::rtl::OUString > SAL_CALL Manager::getSupportedServiceNames( )
} // namespace win
} // namespace avmedia
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/win/manager.hxx b/avmedia/source/win/manager.hxx
index 110b3d2600..9f4d6b46bb 100644
--- a/avmedia/source/win/manager.hxx
+++ b/avmedia/source/win/manager.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,9 +31,7 @@
#include "wincommon.hxx"
-#ifndef _COM_SUN_STAR_MEDIA_XMANAGER_HDL_
#include "com/sun/star/media/XManager.hdl"
-#endif
// -----------
// - Manager -
@@ -64,3 +63,5 @@ private:
} // namespace avmedia
#endif // _MANAGER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx
index 12c2bfe728..5f45b503ae 100644
--- a/avmedia/source/win/player.cxx
+++ b/avmedia/source/win/player.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -206,7 +207,8 @@ void Player::setDDrawParams( IDirectDraw* pDDraw, IDirectDrawSurface* pDDrawSurf
long Player::processEvent()
{
- long nCode, nParam1, nParam2;
+ long nCode;
+ LONG_PTR nParam1, nParam2;
if( mpME && SUCCEEDED( mpME->GetEvent( &nCode, &nParam1, &nParam2, 0 ) ) )
{
@@ -492,3 +494,5 @@ uno::Sequence< ::rtl::OUString > SAL_CALL Player::getSupportedServiceNames( )
} // namespace win
} // namespace avmedia
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/win/player.hxx b/avmedia/source/win/player.hxx
index 793da23b09..c91a1435e5 100644
--- a/avmedia/source/win/player.hxx
+++ b/avmedia/source/win/player.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,9 +31,7 @@
#include "wincommon.hxx"
-#ifndef _COM_SUN_STAR_MEDIA_XPLAYER_HDL_
#include "com/sun/star/media/XPlayer.hdl"
-#endif
struct IGraphBuilder;
struct IBaseFilter;
@@ -121,3 +120,5 @@ private:
} // namespace avmedia
#endif // _PLAYER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/win/wincommon.hxx b/avmedia/source/win/wincommon.hxx
index 8396303be1..d0877fd055 100644
--- a/avmedia/source/win/wincommon.hxx
+++ b/avmedia/source/win/wincommon.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -54,3 +55,5 @@
#define WM_GRAPHNOTIFY (WM_USER + 567)
#endif // _WINCOMMOM_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/win/window.cxx b/avmedia/source/win/window.cxx
index 030bfee04c..3c2006abb8 100644
--- a/avmedia/source/win/window.cxx
+++ b/avmedia/source/win/window.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -738,3 +739,5 @@ uno::Sequence< ::rtl::OUString > SAL_CALL Window::getSupportedServiceNames( )
} // namespace win
} // namespace avmedia
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/win/window.hxx b/avmedia/source/win/window.hxx
index 758289954e..047f1744c8 100644
--- a/avmedia/source/win/window.hxx
+++ b/avmedia/source/win/window.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,9 +32,7 @@
#include "wincommon.hxx"
#include <cppuhelper/interfacecontainer.h>
-#ifndef _COM_SUN_STAR_MEDIA_XPLAYERWINDOW_HDL_
#include "com/sun/star/media/XPlayerWindow.hdl"
-#endif
struct IVideoWindow;
@@ -123,3 +122,5 @@ private:
} // namespace avmedia
#endif // _WINDOW_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/win/winuno.cxx b/avmedia/source/win/winuno.cxx
index 8a56e3dd77..0a897841d1 100644
--- a/avmedia/source/win/winuno.cxx
+++ b/avmedia/source/win/winuno.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -59,7 +60,7 @@ extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void*
if( rtl_str_compare( pImplName, "com.sun.star.comp.avmedia.Manager_DirectX" ) == 0 )
{
- const ::rtl::OUString aServiceName( ::rtl::OUString::createFromAscii( "com.sun.star.media.Manager_DirectX" ) );
+ const ::rtl::OUString aServiceName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.media.Manager_DirectX" )) );
xFactory = uno::Reference< lang::XSingleServiceFactory >( ::cppu::createSingleFactory(
reinterpret_cast< lang::XMultiServiceFactory* >( pServiceManager ),
@@ -75,3 +76,5 @@ extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void*
return pRet;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/xine/manager.cxx b/avmedia/source/xine/manager.cxx
index fdf5655134..151a63001f 100644
--- a/avmedia/source/xine/manager.cxx
+++ b/avmedia/source/xine/manager.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -89,3 +90,5 @@ uno::Sequence< ::rtl::OUString > SAL_CALL Manager::getSupportedServiceNames( )
} // namespace xine
} // namespace avmedia
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/xine/manager.hxx b/avmedia/source/xine/manager.hxx
index 9969aef01f..93cd7b6deb 100644
--- a/avmedia/source/xine/manager.hxx
+++ b/avmedia/source/xine/manager.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,9 +31,7 @@
#include "xinecommon.hxx"
-#ifndef _COM_SUN_STAR_MEDIA_XMANAGER_HDL_
#include "com/sun/star/media/XManager.hdl"
-#endif
// -----------
// - Manager -
@@ -64,3 +63,5 @@ private:
} // namespace avmedia
#endif // _MANAGER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/xine/player.cxx b/avmedia/source/xine/player.cxx
index d4956c1b00..71b62b9e1a 100644
--- a/avmedia/source/xine/player.cxx
+++ b/avmedia/source/xine/player.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -260,3 +261,5 @@ uno::Sequence< ::rtl::OUString > SAL_CALL Player::getSupportedServiceNames( )
} // namespace xine
} // namespace avmedia
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/xine/player.hxx b/avmedia/source/xine/player.hxx
index 45678d7819..cb503e61af 100644
--- a/avmedia/source/xine/player.hxx
+++ b/avmedia/source/xine/player.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,9 +31,7 @@
#include "xinecommon.hxx"
-#ifndef _COM_SUN_STAR_MEDIA_XPLAYER_HDL_
#include "com/sun/star/media/XPlayer.hdl"
-#endif
namespace avmedia { namespace xine {
@@ -82,3 +81,5 @@ private:
} // namespace avmedia
#endif // _PLAYER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/xine/window.cxx b/avmedia/source/xine/window.cxx
index bdee960263..12caca6a27 100644
--- a/avmedia/source/xine/window.cxx
+++ b/avmedia/source/xine/window.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -56,110 +57,6 @@ static ::osl::Mutex& ImplGetOwnStaticMutex()
return *pMutex;
}
-// -----------
-// - WndProc -
-// -----------
-
-/*
-LRESULT CALLBACK MediaPlayerWndProc( HWND hWnd,UINT nMsg, WPARAM nPar1, LPARAM nPar2 )
-{
- Window* pWindow = (Window*) ::GetWindowLong( hWnd, 0 );
- bool bProcessed = true;
-
- if( pWindow )
- {
- switch( nMsg )
- {
- case( WM_SETCURSOR ):
- pWindow->updatePointer();
- break;
-
- case( WM_GRAPHNOTIFY ):
- pWindow->processGraphEvent();
- break;
-
- case( WM_MOUSEMOVE ):
- case( WM_LBUTTONDOWN ):
- case( WM_MBUTTONDOWN ):
- case( WM_RBUTTONDOWN ):
- case( WM_LBUTTONUP ):
- case( WM_MBUTTONUP ):
- case( WM_RBUTTONUP ):
- {
- awt::MouseEvent aUNOEvt;
- POINT aWinPoint;
-
- if( !::GetCursorPos( &aWinPoint ) || !::ScreenToClient( hWnd, &aWinPoint ) )
- {
- aWinPoint.x = GET_X_LPARAM( nPar2 );
- aWinPoint.y = GET_Y_LPARAM( nPar2 );
- }
- aUNOEvt.Modifiers = 0;
- aUNOEvt.Buttons = 0;
- aUNOEvt.X = aWinPoint.x;
- aUNOEvt.Y = aWinPoint.y;
- aUNOEvt.PopupTrigger = false;
-
- // Modifiers
- if( nPar1 & MK_SHIFT )
- aUNOEvt.Modifiers |= awt::KeyModifier::SHIFT;
-
- if( nPar1 & MK_CONTROL )
- aUNOEvt.Modifiers |= awt::KeyModifier::MOD1;
-
- // Buttons
- if( WM_LBUTTONDOWN == nMsg || WM_LBUTTONUP == nMsg )
- aUNOEvt.Buttons |= awt::MouseButton::LEFT;
-
- if( WM_MBUTTONDOWN == nMsg || WM_MBUTTONUP == nMsg )
- aUNOEvt.Buttons |= awt::MouseButton::MIDDLE;
-
- if( WM_RBUTTONDOWN == nMsg || WM_RBUTTONUP == nMsg )
- aUNOEvt.Buttons |= awt::MouseButton::RIGHT;
-
- // event type
- if( WM_LBUTTONDOWN == nMsg ||
- WM_MBUTTONDOWN == nMsg ||
- WM_RBUTTONDOWN == nMsg )
- {
- aUNOEvt.ClickCount = 1;
- pWindow->fireMousePressedEvent( aUNOEvt );
- }
- else if( WM_LBUTTONUP == nMsg ||
- WM_MBUTTONUP == nMsg ||
- WM_RBUTTONUP == nMsg )
- {
- aUNOEvt.ClickCount = 1;
- pWindow->fireMouseReleasedEvent( aUNOEvt );
- }
- else if( WM_MOUSEMOVE == nMsg )
- {
- aUNOEvt.ClickCount = 0;
- pWindow->fireMouseMovedEvent( aUNOEvt );
- pWindow->updatePointer();
- }
- }
- break;
-
- case( WM_SETFOCUS ):
- {
- const awt::FocusEvent aUNOEvt;
- pWindow->fireSetFocusEvent( aUNOEvt );
- }
- break;
-
- default:
- bProcessed = false;
- break;
- }
- }
- else
- bProcessed = false;
-
- return( bProcessed ? 0 : DefWindowProc( hWnd, nMsg, nPar1, nPar2 ) );
-}
-*/
-
// ---------------
// - Window -
// ---------------
@@ -569,3 +466,5 @@ uno::Sequence< ::rtl::OUString > SAL_CALL Window::getSupportedServiceNames( )
} // namespace xine
} // namespace avmedia
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/xine/window.hxx b/avmedia/source/xine/window.hxx
index 75d6b690cc..1db5bc65c5 100644
--- a/avmedia/source/xine/window.hxx
+++ b/avmedia/source/xine/window.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,9 +32,7 @@
#include "xinecommon.hxx"
#include <cppuhelper/interfacecontainer.h>
-#ifndef _COM_SUN_STAR_MEDIA_XPLAYERWINDOW_HDL_
#include "com/sun/star/media/XPlayerWindow.hdl"
-#endif
namespace avmedia { namespace xine {
@@ -112,3 +111,5 @@ private:
} // namespace avmedia
#endif // _WINDOW_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/xine/xinecommon.hxx b/avmedia/source/xine/xinecommon.hxx
index ca87f8d189..11f964f205 100644
--- a/avmedia/source/xine/xinecommon.hxx
+++ b/avmedia/source/xine/xinecommon.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -63,3 +64,5 @@
#define AVMEDIA_XINE_WINDOW_SERVICENAME "com.sun.star.media.Window_Xine"
#endif // _XINECOMMOM_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/xine/xineuno.cxx b/avmedia/source/xine/xineuno.cxx
index 52d8bac62c..621e59d5d7 100644
--- a/avmedia/source/xine/xineuno.cxx
+++ b/avmedia/source/xine/xineuno.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -59,11 +60,11 @@ extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void*
if( rtl_str_compare( pImplName, AVMEDIA_XINE_MANAGER_IMPLEMENTATIONNAME ) == 0 )
{
- const ::rtl::OUString aServiceName( ::rtl::OUString::createFromAscii( AVMEDIA_XINE_MANAGER_SERVICENAME ) );
+ const ::rtl::OUString aServiceName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_XINE_MANAGER_SERVICENAME )) );
xFactory = uno::Reference< lang::XSingleServiceFactory >( ::cppu::createSingleFactory(
reinterpret_cast< lang::XMultiServiceFactory* >( pServiceManager ),
- ::rtl::OUString::createFromAscii( AVMEDIA_XINE_MANAGER_IMPLEMENTATIONNAME ),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_XINE_MANAGER_IMPLEMENTATIONNAME )),
create_MediaPlayer, uno::Sequence< ::rtl::OUString >( &aServiceName, 1 ) ) );
}
@@ -75,3 +76,5 @@ extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void*
return pRet;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/util/makefile.mk b/avmedia/util/makefile.mk
index 175f1a4f32..a26460cb50 100644
--- a/avmedia/util/makefile.mk
+++ b/avmedia/util/makefile.mk
@@ -38,7 +38,7 @@ GEN_HID_OTHER=TRUE
# --- Resources ---------------------------------
RESLIB1NAME=$(TARGET)
-RESLIB1IMAGES=$(PRJ)$/res
+RESLIB1IMAGES=$(PRJ)$/res
RESLIB1SRSFILES= \
$(SRS)$/viewer.srs \
$(SRS)$/framework.srs
@@ -54,7 +54,7 @@ LIB1FILES=\
SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
SHL1IMPLIB=i$(TARGET)
-SHL1STDLIBS=$(UNOTOOLSLIB) $(TOOLSLIB) $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(SVTOOLLIB) $(SVLLIB) $(SFXLIB) $(VOSLIB)
+SHL1STDLIBS=$(UNOTOOLSLIB) $(TOOLSLIB) $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(SVTOOLLIB) $(SVLLIB) $(SFXLIB)
SHL1DEF=$(MISC)$/$(SHL1TARGET).def
SHL1LIBS=$(SLB)$/$(TARGET).lib
diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx
index 0514d4b04b..74f231bcf2 100644
--- a/xmloff/source/chart/PropertyMaps.cxx
+++ b/xmloff/source/chart/PropertyMaps.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -216,7 +217,7 @@ void XMLChartExportPropertyMapper::ContextFilter(
// filter properties
for( std::vector< XMLPropertyState >::iterator property = rProperties.begin();
property != rProperties.end();
- property++ )
+ ++property )
{
// find properties with context
// to prevent writing this property set mnIndex member to -1
@@ -225,24 +226,24 @@ void XMLChartExportPropertyMapper::ContextFilter(
// if Auto... is set the corresponding properties mustn't be exported
case XML_SCH_CONTEXT_MIN:
bCheckAuto = sal_True;
- aAutoPropName = ::rtl::OUString::createFromAscii( "AutoMin" );
+ aAutoPropName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "AutoMin" ));
break;
case XML_SCH_CONTEXT_MAX:
bCheckAuto = sal_True;
- aAutoPropName = ::rtl::OUString::createFromAscii( "AutoMax" );
+ aAutoPropName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "AutoMax" ));
break;
case XML_SCH_CONTEXT_STEP_MAIN:
bCheckAuto = sal_True;
- aAutoPropName = ::rtl::OUString::createFromAscii( "AutoStepMain" );
+ aAutoPropName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "AutoStepMain" ));
break;
case XML_SCH_CONTEXT_STEP_HELP_COUNT:
bCheckAuto = sal_True;
- aAutoPropName = ::rtl::OUString::createFromAscii( "AutoStepHelp" );
+ aAutoPropName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "AutoStepHelp" ));
break;
case XML_SCH_CONTEXT_ORIGIN:
bCheckAuto = sal_True;
- aAutoPropName = ::rtl::OUString::createFromAscii( "AutoOrigin" );
+ aAutoPropName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "AutoOrigin" ));
break;
// the following property is deprecated
@@ -496,7 +497,7 @@ XMLChartImportPropertyMapper::~XMLChartImportPropertyMapper()
{
}
-sal_Bool XMLChartImportPropertyMapper::handleSpecialItem(
+bool XMLChartImportPropertyMapper::handleSpecialItem(
XMLPropertyState& rProperty,
::std::vector< XMLPropertyState >& rProperties,
const ::rtl::OUString& rValue,
@@ -510,7 +511,7 @@ sal_Bool XMLChartImportPropertyMapper::handleSpecialItem(
if( nContextId )
{
sal_Int32 nValue = 0;
- sal_Bool bValue = sal_False;
+ bool bValue = false;
switch( nContextId )
{
@@ -616,3 +617,5 @@ sal_Bool XMLChartImportPropertyMapper::handleSpecialItem(
void XMLChartImportPropertyMapper::finished( ::std::vector< XMLPropertyState >& /*rProperties*/, sal_Int32 /*nStartIndex*/, sal_Int32 /*nEndIndex*/ ) const
{
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/SchXMLAutoStylePoolP.cxx b/xmloff/source/chart/SchXMLAutoStylePoolP.cxx
index accdce4941..4768c13878 100644
--- a/xmloff/source/chart/SchXMLAutoStylePoolP.cxx
+++ b/xmloff/source/chart/SchXMLAutoStylePoolP.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -89,3 +90,5 @@ void SchXMLAutoStylePoolP::exportStyleAttributes(
}
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/SchXMLAutoStylePoolP.hxx b/xmloff/source/chart/SchXMLAutoStylePoolP.hxx
index e75d253855..d725139a42 100644
--- a/xmloff/source/chart/SchXMLAutoStylePoolP.hxx
+++ b/xmloff/source/chart/SchXMLAutoStylePoolP.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -51,3 +52,5 @@ public:
};
#endif // _SCH_XMLAUTOSTYLEPOOLP_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx b/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx
index d9684dfc72..b2b9e6c31e 100755..100644
--- a/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx
+++ b/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -84,3 +85,5 @@ void SchXMLCalculationSettingsContext::EndElement()
xPropSet->setPropertyValue ( sNullDate, m_aNullDate );
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx b/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx
index 6f5ffee572..f63f33ca59 100755..100644
--- a/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx
+++ b/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -49,3 +50,5 @@ public:
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx
index 6cf1b5c7e2..f0d498823b 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -131,7 +132,7 @@ void lcl_setRoleAtLabeledSequence(
{
uno::Reference< beans::XPropertySet > xProp( xValues, uno::UNO_QUERY );
if( xProp.is())
- xProp->setPropertyValue(OUString::createFromAscii("Role"), uno::makeAny( rRole ));
+ xProp->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM( "Role" )), uno::makeAny( rRole ));
}
}
@@ -277,7 +278,7 @@ uno::Sequence< sal_Int32 > lcl_getNumberSequenceFromString( const ::rtl::OUStrin
} // anonymous namespace
-static __FAR_DATA SvXMLEnumMapEntry aXMLLegendAlignmentMap[] =
+static SvXMLEnumMapEntry aXMLLegendAlignmentMap[] =
{
// { XML_LEFT, chart::ChartLegendPosition_LEFT },
// #i35421#
@@ -422,9 +423,9 @@ void SchXMLChartContext::StartElement( const uno::Reference< xml::sax::XAttribut
{
try
{
- xDocProp->getPropertyValue( ::rtl::OUString::createFromAscii("BaseDiagram")) >>= aOldChartTypeName;
+ xDocProp->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "BaseDiagram" ))) >>= aOldChartTypeName;
maChartTypeServiceName = SchXMLTools::GetNewChartTypeName( aOldChartTypeName );
- xDocProp->setPropertyValue( rtl::OUString::createFromAscii( "RefreshAddInAllowed" ) , uno::makeAny( sal_False) );
+ xDocProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RefreshAddInAllowed" )) , uno::makeAny( sal_False) );
}
catch( uno::Exception & )
{
@@ -702,15 +703,15 @@ void lcl_ApplyDataFromRectangularRangeToDiagram(
uno::Sequence< beans::PropertyValue > aArgs( 3 );
aArgs[0] = beans::PropertyValue(
- ::rtl::OUString::createFromAscii("CellRangeRepresentation"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CellRangeRepresentation" )),
-1, uno::makeAny( rRectangularRange ),
beans::PropertyState_DIRECT_VALUE );
aArgs[1] = beans::PropertyValue(
- ::rtl::OUString::createFromAscii("DataRowSource"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataRowSource" )),
-1, uno::makeAny( eDataRowSource ),
beans::PropertyState_DIRECT_VALUE );
aArgs[2] = beans::PropertyValue(
- ::rtl::OUString::createFromAscii("FirstCellAsLabel"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FirstCellAsLabel" )),
-1, uno::makeAny( bFirstCellAsLabel ),
beans::PropertyState_DIRECT_VALUE );
@@ -718,7 +719,7 @@ void lcl_ApplyDataFromRectangularRangeToDiagram(
{
aArgs.realloc( aArgs.getLength() + 1 );
aArgs[ aArgs.getLength() - 1 ] = beans::PropertyValue(
- ::rtl::OUString::createFromAscii("SequenceMapping"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "SequenceMapping" )),
-1, uno::makeAny( sColTrans.getLength()
? lcl_getNumberSequenceFromString( sColTrans, bHasCateories && !xNewDoc->hasInternalDataProvider() )
: lcl_getNumberSequenceFromString( sRowTrans, bHasCateories && !xNewDoc->hasInternalDataProvider() ) ),
@@ -744,7 +745,7 @@ void lcl_ApplyDataFromRectangularRangeToDiagram(
{
aArgs.realloc( aArgs.getLength() + 1 );
aArgs[ aArgs.getLength() - 1 ] = beans::PropertyValue(
- ::rtl::OUString::createFromAscii("ChartOleObjectName"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ChartOleObjectName" )),
-1, uno::makeAny( aChartOleObjectName ),
beans::PropertyState_DIRECT_VALUE );
}
@@ -756,7 +757,7 @@ void lcl_ApplyDataFromRectangularRangeToDiagram(
aArgs.realloc( aArgs.getLength() + 1 );
aArgs[ aArgs.getLength() - 1 ] = beans::PropertyValue(
- ::rtl::OUString::createFromAscii("HasCategories"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasCategories" )),
-1, uno::makeAny( bHasCateories ),
beans::PropertyState_DIRECT_VALUE );
@@ -835,9 +836,9 @@ void SchXMLChartContext::EndElement()
return;
bool bHasOwnData = false;
- if( m_aXLinkHRefAttributeToIndicateDataProvider.equalsAscii( "." ) ) //data comes from the chart itself
+ if( m_aXLinkHRefAttributeToIndicateDataProvider.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "." ) ) ) //data comes from the chart itself
bHasOwnData = true;
- else if( m_aXLinkHRefAttributeToIndicateDataProvider.equalsAscii( ".." ) ) //data comes from the parent application
+ else if( m_aXLinkHRefAttributeToIndicateDataProvider.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".." ) ) ) //data comes from the parent application
bHasOwnData = false;
else if( m_aXLinkHRefAttributeToIndicateDataProvider.getLength() ) //not supported so far to get the data by sibling objects -> fall back to chart itself if data are available
bHasOwnData = m_bHasTableElement;
@@ -846,7 +847,7 @@ void SchXMLChartContext::EndElement()
if( xNewDoc->hasInternalDataProvider())
{
- if( !m_bHasTableElement && !m_aXLinkHRefAttributeToIndicateDataProvider.equalsAscii( "." ) )
+ if( !m_bHasTableElement && !m_aXLinkHRefAttributeToIndicateDataProvider.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "." ) ) )
{
//#i103147# ODF, workaround broken files with a missing table:cell-range-address at the plot-area
bool bSwitchSuccessful = SchXMLTools::switchBackToDataProviderFromParent( xNewDoc, maLSequencesPerIndex );
@@ -860,7 +861,7 @@ void SchXMLChartContext::EndElement()
xNewDoc->createInternalDataProvider( sal_False /* bCloneExistingData */ );
}
if( bHasOwnData )
- msChartAddress = ::rtl::OUString::createFromAscii("all");
+ msChartAddress = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "all" ));
bool bSwitchRangesFromOuterToInternalIfNecessary = false;
if( !bHasOwnData && mbAllRangeAddressesAvailable )
@@ -908,7 +909,7 @@ void SchXMLChartContext::EndElement()
if(!bHasOwnData)
{
bHasOwnData = true;
- msChartAddress = ::rtl::OUString::createFromAscii("all");
+ msChartAddress = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "all" ));
if( !xNewDoc->hasInternalDataProvider() )
{
xNewDoc->createInternalDataProvider( sal_False /* bCloneExistingData */ );
@@ -993,7 +994,7 @@ void SchXMLChartContext::EndElement()
}
if( xProp.is())
- xProp->setPropertyValue( rtl::OUString::createFromAscii( "RefreshAddInAllowed" ) , uno::makeAny( sal_True) );
+ xProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RefreshAddInAllowed" )) , uno::makeAny( sal_True) );
}
void SchXMLChartContext::MergeSeriesForStockChart()
@@ -1022,7 +1023,7 @@ void SchXMLChartContext::MergeSeriesForStockChart()
{
xDSContainer.set( aChartTypes[nCTIdx], uno::UNO_QUERY_THROW );
uno::Reference< beans::XPropertySet > xCTProp( aChartTypes[nCTIdx], uno::UNO_QUERY_THROW );
- xCTProp->getPropertyValue( ::rtl::OUString::createFromAscii("Japanese")) >>= bHasJapaneseCandlestick;
+ xCTProp->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Japanese" ))) >>= bHasJapaneseCandlestick;
break;
}
}
@@ -1044,27 +1045,27 @@ void SchXMLChartContext::MergeSeriesForStockChart()
if( bHasJapaneseCandlestick )
{
// open values
- lcl_setRoleAtFirstSequence( aSeriesSeq[ nSeriesIndex ], OUString::createFromAscii("values-first"));
+ lcl_setRoleAtFirstSequence( aSeriesSeq[ nSeriesIndex ], OUString(RTL_CONSTASCII_USTRINGPARAM( "values-first" )));
aNewSeries[i] = aSeriesSeq[ nSeriesIndex ];
// low values
lcl_MoveDataToCandleStickSeries(
uno::Reference< chart2::data::XDataSource >( aSeriesSeq[ ++nSeriesIndex ], uno::UNO_QUERY_THROW ),
- aNewSeries[i], OUString::createFromAscii("values-min"));
+ aNewSeries[i], OUString(RTL_CONSTASCII_USTRINGPARAM( "values-min" )));
}
else
{
// low values
- lcl_setRoleAtFirstSequence( aSeriesSeq[ nSeriesIndex ], OUString::createFromAscii("values-min"));
+ lcl_setRoleAtFirstSequence( aSeriesSeq[ nSeriesIndex ], OUString(RTL_CONSTASCII_USTRINGPARAM( "values-min" )));
aNewSeries[i] = aSeriesSeq[ nSeriesIndex ];
}
// high values
lcl_MoveDataToCandleStickSeries(
uno::Reference< chart2::data::XDataSource >( aSeriesSeq[ ++nSeriesIndex ], uno::UNO_QUERY_THROW ),
- aNewSeries[i], OUString::createFromAscii("values-max"));
+ aNewSeries[i], OUString(RTL_CONSTASCII_USTRINGPARAM( "values-max" )));
// close values
lcl_MoveDataToCandleStickSeries(
uno::Reference< chart2::data::XDataSource >( aSeriesSeq[ ++nSeriesIndex ], uno::UNO_QUERY_THROW ),
- aNewSeries[i], OUString::createFromAscii("values-last"));
+ aNewSeries[i], OUString(RTL_CONSTASCII_USTRINGPARAM( "values-last" )));
}
xDSContainer->setDataSeries( aNewSeries );
}
@@ -1107,7 +1108,7 @@ SvXMLImportContext* SchXMLChartContext::CreateChildContext(
{
if( xProp.is())
{
- xProp->setPropertyValue( rtl::OUString::createFromAscii( "HasMainTitle" ), aTrueBool );
+ xProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasMainTitle" )), aTrueBool );
}
uno::Reference< drawing::XShape > xTitleShape( xDoc->getTitle(), uno::UNO_QUERY );
pContext = new SchXMLTitleContext( mrImportHelper, GetImport(),
@@ -1120,7 +1121,7 @@ SvXMLImportContext* SchXMLChartContext::CreateChildContext(
{
if( xProp.is())
{
- xProp->setPropertyValue( rtl::OUString::createFromAscii( "HasSubTitle" ), aTrueBool );
+ xProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasSubTitle" )), aTrueBool );
}
uno::Reference< drawing::XShape > xTitleShape( xDoc->getSubTitle(), uno::UNO_QUERY );
pContext = new SchXMLTitleContext( mrImportHelper, GetImport(),
@@ -1340,7 +1341,7 @@ void SchXMLLegendContext::StartElement( const uno::Reference< xml::sax::XAttribu
aTrueBool <<= (sal_Bool)(sal_True);
try
{
- xDocProp->setPropertyValue( rtl::OUString::createFromAscii( "HasLegend" ), aTrueBool );
+ xDocProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasLegend" )), aTrueBool );
}
catch( beans::UnknownPropertyException )
{
@@ -1380,7 +1381,7 @@ void SchXMLLegendContext::StartElement( const uno::Reference< xml::sax::XAttribu
{
uno::Any aAny;
aAny <<= (chart::ChartLegendPosition)(nEnumVal);
- xProp->setPropertyValue( rtl::OUString::createFromAscii( "Alignment" ), aAny );
+ xProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Alignment" )), aAny );
}
}
catch( beans::UnknownPropertyException )
@@ -1430,3 +1431,5 @@ void SchXMLLegendContext::StartElement( const uno::Reference< xml::sax::XAttribu
SchXMLLegendContext::~SchXMLLegendContext()
{
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/SchXMLChartContext.hxx b/xmloff/source/chart/SchXMLChartContext.hxx
index 190d0d2ee7..54151a93a4 100644
--- a/xmloff/source/chart/SchXMLChartContext.hxx
+++ b/xmloff/source/chart/SchXMLChartContext.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -187,3 +188,5 @@ public:
};
#endif // _SCH_XMLCHARTCONTEXT_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 2fd18f914e..e6de583e8b 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -281,7 +282,7 @@ Reference< uno::XComponentContext > lcl_getComponentContext()
{
Reference< beans::XPropertySet > xFactProp( comphelper::getProcessServiceFactory(), uno::UNO_QUERY );
if( xFactProp.is())
- xFactProp->getPropertyValue(OUString::createFromAscii("DefaultContext")) >>= xContext;
+ xFactProp->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= xContext;
}
catch( uno::Exception& )
{}
@@ -382,7 +383,7 @@ Reference< chart2::data::XDataSource > lcl_createDataSource(
if( xContext.is() )
xSink.set(
xContext->getServiceManager()->createInstanceWithContext(
- OUString::createFromAscii("com.sun.star.chart2.data.DataSource"),
+ OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.data.DataSource" )),
xContext ), uno::UNO_QUERY_THROW );
if( xSink.is())
xSink->setData( aData );
@@ -448,12 +449,12 @@ Reference< chart2::data::XDataSource > lcl_pressUsedDataIntoRectangularFormat( c
//the first x-values is always the next sequence //todo ... other x-values get lost for old format
Reference< chart2::data::XLabeledDataSequence > xXValues(
- lcl_getDataSequenceByRole( aSeriesSeqVector, OUString::createFromAscii("values-x" ) ) );
+ lcl_getDataSequenceByRole( aSeriesSeqVector, OUString(RTL_CONSTASCII_USTRINGPARAM( "values-x" )) ) );
if( xXValues.is() )
aLabeledSeqVector.push_back( xXValues );
//add all other sequences now without x-values
- lcl_MatchesRole aHasXValues( OUString::createFromAscii("values-x" ) );
+ lcl_MatchesRole aHasXValues( OUString(RTL_CONSTASCII_USTRINGPARAM( "values-x" )) );
for( sal_Int32 nN=0; nN<aSeriesSeqVector.getLength(); nN++ )
{
if( !aHasXValues( aSeriesSeqVector[nN] ) )
@@ -1063,7 +1064,7 @@ SchXMLExportHelper_Impl::SchXMLExportHelper_Impl(
msCLSID = OUString( SvGlobalName( SO3_SCH_CLASSID ).GetHexName());
}
- msTableName = OUString::createFromAscii( "local-table" );
+ msTableName = OUString(RTL_CONSTASCII_USTRINGPARAM( "local-table" ));
// create factory
mxPropertyHandlerFactory = new XMLChartPropHdlFactory;
@@ -1079,16 +1080,16 @@ SchXMLExportHelper_Impl::SchXMLExportHelper_Impl(
// register chart auto-style family
mrAutoStylePool.AddFamily(
XML_STYLE_FAMILY_SCH_CHART_ID,
- OUString::createFromAscii( XML_STYLE_FAMILY_SCH_CHART_NAME ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_SCH_CHART_NAME )),
mxExpPropMapper.get(),
- OUString::createFromAscii( XML_STYLE_FAMILY_SCH_CHART_PREFIX ));
+ OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_SCH_CHART_PREFIX )));
// register shape family
mrAutoStylePool.AddFamily(
XML_STYLE_FAMILY_SD_GRAPHICS_ID,
- OUString::createFromAscii( XML_STYLE_FAMILY_SD_GRAPHICS_NAME ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_SD_GRAPHICS_NAME )),
mxExpPropMapper.get(),
- OUString::createFromAscii( XML_STYLE_FAMILY_SD_GRAPHICS_PREFIX ));
+ OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_SD_GRAPHICS_PREFIX )));
// register paragraph family also for shapes
mrAutoStylePool.AddFamily(
XML_STYLE_FAMILY_TEXT_PARAGRAPH,
@@ -1514,7 +1515,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >&
// get a sequence of non-chart shapes (inserted via clipboard)
try
{
- Any aShapesAny = xDocPropSet->getPropertyValue( OUString::createFromAscii( "AdditionalShapes" ));
+ Any aShapesAny = xDocPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "AdditionalShapes" )));
aShapesAny >>= mxAdditionalShapes;
}
catch( uno::Exception & rEx )
@@ -2131,7 +2132,7 @@ void SchXMLExportHelper_Impl::exportAxes(
return;
// variables for autostyles
- const OUString sNumFormat( OUString::createFromAscii( "NumberFormat" ));
+ const OUString sNumFormat( OUString(RTL_CONSTASCII_USTRINGPARAM( "NumberFormat" )));
Reference< beans::XPropertySet > xPropSet;
std::vector< XMLPropertyState > aPropertyStates;
@@ -2164,31 +2165,31 @@ void SchXMLExportHelper_Impl::exportAxes(
if (xServiceInfo.is())
{
if (xServiceInfo->supportsService(
- OUString::createFromAscii ("com.sun.star.chart.ChartAxisXSupplier")))
+ OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.chart.ChartAxisXSupplier"))))
{
aDiagramProperties.Add (
OUString(RTL_CONSTASCII_USTRINGPARAM("HasXAxis")), bHasXAxis);
}
if (xServiceInfo->supportsService(
- OUString::createFromAscii ("com.sun.star.chart.ChartAxisYSupplier")))
+ OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.chart.ChartAxisYSupplier"))))
{
aDiagramProperties.Add (
OUString(RTL_CONSTASCII_USTRINGPARAM("HasYAxis")), bHasYAxis);
}
if (xServiceInfo->supportsService(
- OUString::createFromAscii ("com.sun.star.chart.ChartAxisZSupplier")))
+ OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.chart.ChartAxisZSupplier"))))
{
aDiagramProperties.Add (
OUString(RTL_CONSTASCII_USTRINGPARAM("HasZAxis")), bHasZAxis);
}
if (xServiceInfo->supportsService(
- OUString::createFromAscii ("com.sun.star.chart.ChartTwoAxisXSupplier")))
+ OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.chart.ChartTwoAxisXSupplier"))))
{
aDiagramProperties.Add (
OUString(RTL_CONSTASCII_USTRINGPARAM("HasSecondaryXAxis")), bHasSecondaryXAxis);
}
if (xServiceInfo->supportsService(
- OUString::createFromAscii ("com.sun.star.chart.ChartTwoAxisYSupplier")))
+ OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.chart.ChartTwoAxisYSupplier"))))
{
aDiagramProperties.Add (
OUString(RTL_CONSTASCII_USTRINGPARAM("HasSecondaryYAxis")), bHasSecondaryYAxis);
@@ -2739,8 +2740,8 @@ void SchXMLExportHelper_Impl::exportSeries(
std::vector< XMLPropertyState > aPropertyStates;
- const OUString sNumFormat( OUString::createFromAscii( "NumberFormat" ));
- const OUString sPercentageNumFormat( OUString::createFromAscii( "PercentageNumberFormat" ));
+ const OUString sNumFormat(RTL_CONSTASCII_USTRINGPARAM("NumberFormat"));
+ const OUString sPercentageNumFormat(RTL_CONSTASCII_USTRINGPARAM( "PercentageNumberFormat"));
Sequence< Reference< chart2::XCoordinateSystem > >
aCooSysSeq( xBCooSysCnt->getCoordinateSystems());
@@ -2765,7 +2766,7 @@ void SchXMLExportHelper_Impl::exportSeries(
sal_Bool bJapaneseCandleSticks = sal_False;
Reference< beans::XPropertySet > xCTProp( aCTSeq[nCTIdx], uno::UNO_QUERY );
if( xCTProp.is())
- xCTProp->getPropertyValue( OUString::createFromAscii("Japanese")) >>= bJapaneseCandleSticks;
+ xCTProp->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "Japanese" ))) >>= bJapaneseCandleSticks;
exportCandleStickSeries(
xDSCnt->getDataSeries(), xNewDiagram, bJapaneseCandleSticks, bExportContent );
continue;
@@ -2805,7 +2806,7 @@ void SchXMLExportHelper_Impl::exportSeries(
{
Reference< beans::XPropertySet > xSeqProp( xTempValueSeq, uno::UNO_QUERY );
if( xSeqProp.is())
- xSeqProp->getPropertyValue(OUString::createFromAscii("Role")) >>= aRole;
+ xSeqProp->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM( "Role" ))) >>= aRole;
// "main" sequence
if( aRole.equals( aLabelRole ))
{
@@ -2947,7 +2948,7 @@ void SchXMLExportHelper_Impl::exportSeries(
Reference< chart2::data::XDataSequence > xYValuesForBubbleChart;
if( bIsBubbleChart )
{
- Reference< chart2::data::XLabeledDataSequence > xSequence( lcl_getDataSequenceByRole( aSeqCnt, OUString::createFromAscii("values-y" ) ) );
+ Reference< chart2::data::XLabeledDataSequence > xSequence( lcl_getDataSequenceByRole( aSeqCnt, OUString(RTL_CONSTASCII_USTRINGPARAM( "values-y" )) ) );
if( xSequence.is() )
{
xYValuesForBubbleChart = xSequence->getValues();
@@ -2957,7 +2958,7 @@ void SchXMLExportHelper_Impl::exportSeries(
}
if( bIsScatterChart || bIsBubbleChart )
{
- Reference< chart2::data::XLabeledDataSequence > xSequence( lcl_getDataSequenceByRole( aSeqCnt, OUString::createFromAscii("values-x" ) ) );
+ Reference< chart2::data::XLabeledDataSequence > xSequence( lcl_getDataSequenceByRole( aSeqCnt, OUString(RTL_CONSTASCII_USTRINGPARAM( "values-x" )) ) );
if( xSequence.is() )
{
Reference< chart2::data::XDataSequence > xValues( xSequence->getValues() );
@@ -3228,7 +3229,7 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries(
xSource->getDataSequences());
sal_Int32 nSeriesLength =
- lcl_getSequenceLengthByRole( aSeqCnt, OUString::createFromAscii("values-last"));
+ lcl_getSequenceLengthByRole( aSeqCnt, OUString(RTL_CONSTASCII_USTRINGPARAM( "values-last" )));
if( bExportContent )
{
@@ -3239,7 +3240,7 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries(
if( bJapaneseCandleSticks )
{
tLabelAndValueRange aRanges( lcl_getLabelAndValueRangeByRole(
- aSeqCnt, OUString::createFromAscii("values-first"), xNewDoc, m_aDataSequencesToExport ));
+ aSeqCnt, OUString(RTL_CONSTASCII_USTRINGPARAM( "values-first" )), xNewDoc, m_aDataSequencesToExport ));
if( aRanges.second.getLength())
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_VALUES_CELL_RANGE_ADDRESS, aRanges.second );
if( aRanges.first.getLength())
@@ -3256,7 +3257,7 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries(
// low
{
tLabelAndValueRange aRanges( lcl_getLabelAndValueRangeByRole(
- aSeqCnt, OUString::createFromAscii("values-min"), xNewDoc, m_aDataSequencesToExport ));
+ aSeqCnt, OUString(RTL_CONSTASCII_USTRINGPARAM( "values-min" )), xNewDoc, m_aDataSequencesToExport ));
if( aRanges.second.getLength())
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_VALUES_CELL_RANGE_ADDRESS, aRanges.second );
if( aRanges.first.getLength())
@@ -3273,7 +3274,7 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries(
// high
{
tLabelAndValueRange aRanges( lcl_getLabelAndValueRangeByRole(
- aSeqCnt, OUString::createFromAscii("values-max"), xNewDoc, m_aDataSequencesToExport ));
+ aSeqCnt, OUString(RTL_CONSTASCII_USTRINGPARAM( "values-max" )), xNewDoc, m_aDataSequencesToExport ));
if( aRanges.second.getLength())
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_VALUES_CELL_RANGE_ADDRESS, aRanges.second );
if( aRanges.first.getLength())
@@ -3290,7 +3291,7 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries(
// close
{
tLabelAndValueRange aRanges( lcl_getLabelAndValueRangeByRole(
- aSeqCnt, OUString::createFromAscii("values-last"), xNewDoc, m_aDataSequencesToExport ));
+ aSeqCnt, OUString(RTL_CONSTASCII_USTRINGPARAM( "values-last" )), xNewDoc, m_aDataSequencesToExport ));
if( aRanges.second.getLength())
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_VALUES_CELL_RANGE_ADDRESS, aRanges.second );
if( aRanges.first.getLength())
@@ -3346,8 +3347,8 @@ void SchXMLExportHelper_Impl::exportDataPoints(
std::vector< XMLPropertyState > aPropertyStates;
- const OUString sNumFormat( OUString::createFromAscii( "NumberFormat" ));
- const OUString sPercentageNumFormat( OUString::createFromAscii( "PercentageNumberFormat" ));
+ const OUString sNumFormat(RTL_CONSTASCII_USTRINGPARAM("NumberFormat"));
+ const OUString sPercentageNumFormat(RTL_CONSTASCII_USTRINGPARAM( "PercentageNumberFormat"));
bool bVaryColorsByPoint = false;
Sequence< sal_Int32 > aDataPointSeq;
@@ -3747,7 +3748,7 @@ void SchXMLExport::_ExportContent()
if( xServ.is())
{
if( xServ->supportsService(
- OUString::createFromAscii( "com.sun.star.chart.ChartTableAddressSupplier" )))
+ OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartTableAddressSupplier" ))))
{
Reference< beans::XPropertySet > xProp( xServ, uno::UNO_QUERY );
if( xProp.is())
@@ -3757,13 +3758,13 @@ void SchXMLExport::_ExportContent()
{
OUString sChartAddress;
aAny = xProp->getPropertyValue(
- OUString::createFromAscii( "ChartRangeAddress" ));
+ OUString(RTL_CONSTASCII_USTRINGPARAM( "ChartRangeAddress" )));
aAny >>= sChartAddress;
maExportHelper.m_pImpl->SetChartRangeAddress( sChartAddress );
OUString sTableNumberList;
aAny = xProp->getPropertyValue(
- OUString::createFromAscii( "TableNumberList" ));
+ OUString(RTL_CONSTASCII_USTRINGPARAM( "TableNumberList" )));
aAny >>= sTableNumberList;
maExportHelper.m_pImpl->SetTableNumberList( sTableNumberList );
@@ -4047,6 +4048,8 @@ OUString SAL_CALL SchXMLExport::getImplementationName() throw( uno::RuntimeExcep
case EXPORT_SETTINGS:
// there is no settings component in chart
default:
- return OUString::createFromAscii( "SchXMLExport" );
+ return OUString(RTL_CONSTASCII_USTRINGPARAM( "SchXMLExport" ));
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx
index 7896ab2b7f..a6b2dc2687 100644
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -80,7 +81,7 @@ Reference< uno::XComponentContext > lcl_getComponentContext()
{
Reference< beans::XPropertySet > xFactProp( comphelper::getProcessServiceFactory(), uno::UNO_QUERY );
if( xFactProp.is())
- xFactProp->getPropertyValue(OUString::createFromAscii("DefaultContext")) >>= xContext;
+ xFactProp->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= xContext;
}
catch( uno::Exception& )
{}
@@ -219,7 +220,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetDocElemTokenMap()
{
if( ! mpChartDocElemTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aDocElemTokenMap[] =
+ static SvXMLTokenMapEntry aDocElemTokenMap[] =
{
{ XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES },
{ XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES },
@@ -238,7 +239,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetTableElemTokenMap()
{
if( ! mpTableElemTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aTableElemTokenMap[] =
+ static SvXMLTokenMapEntry aTableElemTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS, XML_TOK_TABLE_HEADER_COLS },
{ XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, XML_TOK_TABLE_COLUMNS },
@@ -259,7 +260,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetChartElemTokenMap()
{
if( ! mpChartElemTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aChartElemTokenMap[] =
+ static SvXMLTokenMapEntry aChartElemTokenMap[] =
{
{ XML_NAMESPACE_CHART, XML_PLOT_AREA, XML_TOK_CHART_PLOT_AREA },
{ XML_NAMESPACE_CHART, XML_TITLE, XML_TOK_CHART_TITLE },
@@ -279,7 +280,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetPlotAreaElemTokenMap()
{
if( ! mpPlotAreaElemTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aPlotAreaElemTokenMap[] =
+ static SvXMLTokenMapEntry aPlotAreaElemTokenMap[] =
{
{ XML_NAMESPACE_CHART_EXT, XML_COORDINATE_REGION, XML_TOK_PA_COORDINATE_REGION_EXT },
{ XML_NAMESPACE_CHART, XML_COORDINATE_REGION, XML_TOK_PA_COORDINATE_REGION },
@@ -304,7 +305,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetSeriesElemTokenMap()
{
if( ! mpSeriesElemTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aSeriesElemTokenMap[] =
+ static SvXMLTokenMapEntry aSeriesElemTokenMap[] =
{
{ XML_NAMESPACE_CHART, XML_DATA_POINT, XML_TOK_SERIES_DATA_POINT },
{ XML_NAMESPACE_CHART, XML_DOMAIN, XML_TOK_SERIES_DOMAIN },
@@ -324,7 +325,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetAxisElemTokenMap()
{
if( ! mpAxisElemTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aAxisElemTokenMap[] =
+ static SvXMLTokenMapEntry aAxisElemTokenMap[] =
{
{ XML_NAMESPACE_CHART, XML_TITLE, XML_TOK_AXIS_TITLE },
{ XML_NAMESPACE_CHART, XML_CATEGORIES, XML_TOK_AXIS_CATEGORIES },
@@ -344,7 +345,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetChartAttrTokenMap()
{
if( ! mpChartAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aChartAttrTokenMap[] =
+ static SvXMLTokenMapEntry aChartAttrTokenMap[] =
{
{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_CHART_HREF },
{ XML_NAMESPACE_CHART, XML_CLASS, XML_TOK_CHART_CLASS },
@@ -366,7 +367,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetPlotAreaAttrTokenMap()
{
if( ! mpPlotAreaAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aPlotAreaAttrTokenMap[] =
+ static SvXMLTokenMapEntry aPlotAreaAttrTokenMap[] =
{
{ XML_NAMESPACE_SVG, XML_X, XML_TOK_PA_X },
{ XML_NAMESPACE_SVG, XML_Y, XML_TOK_PA_Y },
@@ -399,7 +400,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetAxisAttrTokenMap()
{
if( ! mpAxisAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aAxisAttrTokenMap[] =
+ static SvXMLTokenMapEntry aAxisAttrTokenMap[] =
{
{ XML_NAMESPACE_CHART, XML_DIMENSION, XML_TOK_AXIS_DIMENSION },
{ XML_NAMESPACE_CHART, XML_NAME, XML_TOK_AXIS_NAME },
@@ -417,7 +418,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetLegendAttrTokenMap()
{
if( ! mpLegendAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aLegendAttrTokenMap[] =
+ static SvXMLTokenMapEntry aLegendAttrTokenMap[] =
{
{ XML_NAMESPACE_CHART, XML_LEGEND_POSITION, XML_TOK_LEGEND_POSITION },
{ XML_NAMESPACE_SVG, XML_X, XML_TOK_LEGEND_X },
@@ -436,7 +437,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetAutoStyleAttrTokenMap()
{
if( ! mpAutoStyleAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aAutoStyleAttrTokenMap[] =
+ static SvXMLTokenMapEntry aAutoStyleAttrTokenMap[] =
{
{ XML_NAMESPACE_STYLE, XML_FAMILY, XML_TOK_AS_FAMILY },
{ XML_NAMESPACE_STYLE, XML_NAME, XML_TOK_AS_NAME },
@@ -453,7 +454,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetCellAttrTokenMap()
{
if( ! mpCellAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aCellAttrTokenMap[] =
+ static SvXMLTokenMapEntry aCellAttrTokenMap[] =
{
{ XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_TOK_CELL_VAL_TYPE },
{ XML_NAMESPACE_OFFICE, XML_VALUE, XML_TOK_CELL_VALUE },
@@ -470,7 +471,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetSeriesAttrTokenMap()
{
if( ! mpSeriesAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aSeriesAttrTokenMap[] =
+ static SvXMLTokenMapEntry aSeriesAttrTokenMap[] =
{
{ XML_NAMESPACE_CHART, XML_VALUES_CELL_RANGE_ADDRESS, XML_TOK_SERIES_CELL_RANGE },
{ XML_NAMESPACE_CHART, XML_LABEL_CELL_ADDRESS, XML_TOK_SERIES_LABEL_ADDRESS },
@@ -490,7 +491,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetRegEquationAttrTokenMap()
{
if( ! mpRegEquationAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aRegressionEquationAttrTokenMap[] =
+ static SvXMLTokenMapEntry aRegressionEquationAttrTokenMap[] =
{
{ XML_NAMESPACE_CHART, XML_STYLE_NAME, XML_TOK_REGEQ_STYLE_NAME },
{ XML_NAMESPACE_CHART, XML_DISPLAY_EQUATION, XML_TOK_REGEQ_DISPLAY_EQUATION },
@@ -620,7 +621,7 @@ Reference< chart2::XDataSeries > SchXMLImportHelper::GetNewDataSeries(
{
xResult.set(
xContext->getServiceManager()->createInstanceWithContext(
- OUString::createFromAscii("com.sun.star.chart2.DataSeries"),
+ OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.DataSeries" )),
xContext ), uno::UNO_QUERY_THROW );
}
if( xResult.is() )
@@ -739,8 +740,8 @@ SvXMLImportContext *SchXMLImport::CreateContext( USHORT nPrefix, const OUString&
if (xDPS.is()) {
uno::Reference<xml::sax::XDocumentHandler> xDocBuilder(
mxServiceFactory->createInstance(
- ::rtl::OUString::createFromAscii(
- "com.sun.star.xml.dom.SAXDocumentBuilder")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.xml.dom.SAXDocumentBuilder"))),
uno::UNO_QUERY_THROW);
pContext = (IsXMLToken(rLocalName, XML_DOCUMENT_META))
? new SvXMLMetaDocumentContext(*this,
@@ -955,6 +956,8 @@ OUString SAL_CALL SchXMLImport::getImplementationName() throw( uno::RuntimeExcep
case IMPORT_SETTINGS:
// there is no settings component in chart
default:
- return OUString::createFromAscii( "SchXMLImport" );
+ return OUString(RTL_CONSTASCII_USTRINGPARAM( "SchXMLImport" ));
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/SchXMLParagraphContext.cxx b/xmloff/source/chart/SchXMLParagraphContext.cxx
index 1fb22eeefb..a4671ecde8 100644
--- a/xmloff/source/chart/SchXMLParagraphContext.cxx
+++ b/xmloff/source/chart/SchXMLParagraphContext.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -116,3 +117,5 @@ void SchXMLParagraphContext::Characters( const OUString& rChars )
{
maBuffer.append( rChars );
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/SchXMLParagraphContext.hxx b/xmloff/source/chart/SchXMLParagraphContext.hxx
index 271b041dae..7b49e4f988 100644
--- a/xmloff/source/chart/SchXMLParagraphContext.hxx
+++ b/xmloff/source/chart/SchXMLParagraphContext.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -62,3 +63,5 @@ public:
};
#endif // _SCH_XMLPARAGRAPHCONTEXT_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 35e607db5a..46c6aee9cc 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -84,7 +85,7 @@ using namespace ::xmloff::token;
using ::rtl::OUString;
using com::sun::star::uno::Reference;
-static __FAR_DATA SvXMLEnumMapEntry aXMLAxisClassMap[] =
+static SvXMLEnumMapEntry aXMLAxisClassMap[] =
{
{ XML_X, SCH_XML_AXIS_X },
{ XML_Y, SCH_XML_AXIS_Y },
@@ -146,7 +147,7 @@ void SchXML3DSceneAttributesHelper::getCameraDefaultFromDiagram( const uno::Refe
if( xProp.is() )
{
drawing::CameraGeometry aCamGeo;
- xProp->getPropertyValue( ::rtl::OUString::createFromAscii("D3DCameraGeometry")) >>= aCamGeo;
+ xProp->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "D3DCameraGeometry" ))) >>= aCamGeo;
maVRP.setX( aCamGeo.vrp.PositionX );
maVRP.setY( aCamGeo.vrp.PositionY );
maVRP.setZ( aCamGeo.vrp.PositionZ );
@@ -239,51 +240,51 @@ SchXMLPlotAreaContext::SchXMLPlotAreaContext(
{
try
{
- if( xInfo->supportsService( rtl::OUString::createFromAscii( "com.sun.star.chart.ChartAxisXSupplier" )))
+ if( xInfo->supportsService( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartAxisXSupplier" ))))
{
xProp->setPropertyValue(
- rtl::OUString::createFromAscii( "HasXAxis" ), aFalseBool );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasXAxis" )), aFalseBool );
xProp->setPropertyValue(
- rtl::OUString::createFromAscii( "HasXAxisGrid" ), aFalseBool );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasXAxisGrid" )), aFalseBool );
xProp->setPropertyValue(
- rtl::OUString::createFromAscii( "HasXAxisDescription" ), aFalseBool );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasXAxisDescription" )), aFalseBool );
}
- if( xInfo->supportsService( rtl::OUString::createFromAscii( "com.sun.star.chart.ChartTwoAxisXSupplier" )))
+ if( xInfo->supportsService( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartTwoAxisXSupplier" ))))
{
xProp->setPropertyValue(
- rtl::OUString::createFromAscii( "HasSecondaryXAxis" ), aFalseBool );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryXAxis" )), aFalseBool );
xProp->setPropertyValue(
- rtl::OUString::createFromAscii( "HasSecondaryXAxisDescription" ), aFalseBool );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryXAxisDescription" )), aFalseBool );
}
- if( xInfo->supportsService( rtl::OUString::createFromAscii( "com.sun.star.chart.ChartAxisYSupplier" )))
+ if( xInfo->supportsService( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartAxisYSupplier" ))))
{
xProp->setPropertyValue(
- rtl::OUString::createFromAscii( "HasYAxis" ), aFalseBool );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasYAxis" )), aFalseBool );
xProp->setPropertyValue(
- rtl::OUString::createFromAscii( "HasYAxisGrid" ), aFalseBool );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasYAxisGrid" )), aFalseBool );
xProp->setPropertyValue(
- rtl::OUString::createFromAscii( "HasYAxisDescription" ), aFalseBool );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasYAxisDescription" )), aFalseBool );
}
- if( xInfo->supportsService( rtl::OUString::createFromAscii( "com.sun.star.chart.ChartTwoAxisYSupplier" )))
+ if( xInfo->supportsService( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartTwoAxisYSupplier" ))))
{
xProp->setPropertyValue(
- rtl::OUString::createFromAscii( "HasSecondaryYAxis" ), aFalseBool );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryYAxis" )), aFalseBool );
xProp->setPropertyValue(
- rtl::OUString::createFromAscii( "HasSecondaryYAxisDescription" ), aFalseBool );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryYAxisDescription" )), aFalseBool );
}
- if( xInfo->supportsService( rtl::OUString::createFromAscii( "com.sun.star.chart.ChartAxisZSupplier" )))
+ if( xInfo->supportsService( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartAxisZSupplier" ))))
{
xProp->setPropertyValue(
- rtl::OUString::createFromAscii( "HasZAxis" ), aFalseBool );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasZAxis" )), aFalseBool );
xProp->setPropertyValue(
- rtl::OUString::createFromAscii( "HasZAxisDescription" ), aFalseBool );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasZAxisDescription" )), aFalseBool );
}
uno::Any aAny;
chart::ChartDataRowSource eSource = chart::ChartDataRowSource_COLUMNS;
aAny <<= eSource;
- xProp->setPropertyValue( rtl::OUString::createFromAscii( "DataRowSource" ), aAny );
+ xProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataRowSource" )), aAny );
}
catch( beans::UnknownPropertyException & )
{
@@ -361,12 +362,12 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri
uno::Any aAny;
aAny <<= (sal_Bool)(mrColHasLabels);
xDocProp->setPropertyValue(
- ::rtl::OUString::createFromAscii( "DataSourceLabelsInFirstColumn" ),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataSourceLabelsInFirstColumn" )),
aAny );
aAny <<= (sal_Bool)(mrRowHasLabels);
xDocProp->setPropertyValue(
- ::rtl::OUString::createFromAscii( "DataSourceLabelsInFirstRow" ),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataSourceLabelsInFirstRow" )),
aAny );
}
catch( beans::UnknownPropertyException & )
@@ -396,7 +397,7 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri
pPropStyleContext->FillPropertySet( xProp );
// get the data row source that was set without having data
- xProp->getPropertyValue( ::rtl::OUString::createFromAscii("DataRowSource"))
+ xProp->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataRowSource" )))
>>= mrDataRowSource;
//lines on/off
@@ -490,9 +491,9 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri
//
bool bCreateInternalDataProvider = false;
- if( m_rXLinkHRefAttributeToIndicateDataProvider.equalsAscii( "." ) ) //data comes from the chart itself
+ if( m_rXLinkHRefAttributeToIndicateDataProvider.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "." ) ) ) //data comes from the chart itself
bCreateInternalDataProvider = true;
- else if( m_rXLinkHRefAttributeToIndicateDataProvider.equalsAscii( ".." ) ) //data comes from the parent application
+ else if( m_rXLinkHRefAttributeToIndicateDataProvider.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".." ) ) ) //data comes from the parent application
bCreateInternalDataProvider = false;
else if( m_rXLinkHRefAttributeToIndicateDataProvider.getLength() ) //not supported so far to get the data by sibling objects -> fall back to chart itself
bCreateInternalDataProvider = true;
@@ -506,7 +507,7 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri
// data yet.
mxNewDoc->createInternalDataProvider( false /* bCloneExistingData */ );
if( xProp.is() && mrDataRowSource!=chart::ChartDataRowSource_COLUMNS )
- xProp->setPropertyValue( rtl::OUString::createFromAscii( "DataRowSource" ), uno::makeAny(mrDataRowSource) );
+ xProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataRowSource" )), uno::makeAny(mrDataRowSource) );
}
}
@@ -634,7 +635,7 @@ void SchXMLPlotAreaContext::EndElement()
if( xDiaProp.is())
{
sal_Bool bIsThreeDim = sal_False;
- uno::Any aAny = xDiaProp->getPropertyValue( ::rtl::OUString::createFromAscii( "Dim3D" ));
+ uno::Any aAny = xDiaProp->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Dim3D" )));
aAny >>= bIsThreeDim;
// set 3d scene attributes
@@ -715,9 +716,9 @@ void SchXMLPlotAreaContext::CorrectAxisPositions()
{
::rtl::OUString aODFVersionOfFile( GetImport().GetODFVersion() );
- if( ( !aODFVersionOfFile.getLength() || aODFVersionOfFile.equalsAscii("1.0")
- || aODFVersionOfFile.equalsAscii("1.1")
- || ( aODFVersionOfFile.equalsAscii("1.2") && !m_bAxisPositionAttributeImported ) ) )
+ if( ( !aODFVersionOfFile.getLength() || aODFVersionOfFile.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("1.0"))
+ || aODFVersionOfFile.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("1.1"))
+ || ( aODFVersionOfFile.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("1.2")) && !m_bAxisPositionAttributeImported ) ) )
{
uno::Reference< chart2::XChartDocument > xNewDoc( mrImportHelper.GetChartDocument(), uno::UNO_QUERY );
@@ -746,31 +747,31 @@ void SchXMLPlotAreaContext::CorrectAxisPositions()
chart2::ScaleData aMainXScale = xMainXAxis->getScaleData();
if( 0 == maChartTypeServiceName.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.ScatterChartType" ) ) )
{
- xMainYAxisProp->setPropertyValue( rtl::OUString::createFromAscii("CrossoverPosition")
+ xMainYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverPosition" ))
, uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_VALUE) );
double fCrossoverValue = 0.0;
aMainXScale.Origin >>= fCrossoverValue;
- xMainYAxisProp->setPropertyValue( rtl::OUString::createFromAscii("CrossoverValue")
+ xMainYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverValue" ))
, uno::makeAny( fCrossoverValue ) );
if( aMainXScale.Orientation == chart2::AxisOrientation_REVERSE )
{
- xMainYAxisProp->setPropertyValue( rtl::OUString::createFromAscii("LabelPosition")
+ xMainYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "LabelPosition" ))
, uno::makeAny( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_END) );
- xMainYAxisProp->setPropertyValue( rtl::OUString::createFromAscii("MarkPosition")
+ xMainYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MarkPosition" ))
, uno::makeAny( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS) );
if( xSecondaryYAxisProp.is() )
- xSecondaryYAxisProp->setPropertyValue( rtl::OUString::createFromAscii("CrossoverPosition")
+ xSecondaryYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverPosition" ))
, uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START) );
}
else
{
- xMainYAxisProp->setPropertyValue( rtl::OUString::createFromAscii("LabelPosition")
+ xMainYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "LabelPosition" ))
, uno::makeAny( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_START) );
- xMainYAxisProp->setPropertyValue( rtl::OUString::createFromAscii("MarkPosition")
+ xMainYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MarkPosition" ))
, uno::makeAny( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS) );
if( xSecondaryYAxisProp.is() )
- xSecondaryYAxisProp->setPropertyValue( rtl::OUString::createFromAscii("CrossoverPosition")
+ xSecondaryYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverPosition" ))
, uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_END) );
}
}
@@ -778,48 +779,48 @@ void SchXMLPlotAreaContext::CorrectAxisPositions()
{
if( aMainXScale.Orientation == chart2::AxisOrientation_REVERSE )
{
- xMainYAxisProp->setPropertyValue( rtl::OUString::createFromAscii("CrossoverPosition")
+ xMainYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverPosition" ))
, uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_END) );
if( xSecondaryYAxisProp.is() )
- xSecondaryYAxisProp->setPropertyValue( rtl::OUString::createFromAscii("CrossoverPosition")
+ xSecondaryYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverPosition" ))
, uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START) );
}
else
{
- xMainYAxisProp->setPropertyValue( rtl::OUString::createFromAscii("CrossoverPosition")
+ xMainYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverPosition" ))
, uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START) );
if( xSecondaryYAxisProp.is() )
- xSecondaryYAxisProp->setPropertyValue( rtl::OUString::createFromAscii("CrossoverPosition")
+ xSecondaryYAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverPosition" ))
, uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_END) );
}
}
chart2::ScaleData aMainYScale = xMainYAxis->getScaleData();
- xMainXAxisProp->setPropertyValue( rtl::OUString::createFromAscii("CrossoverPosition")
+ xMainXAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverPosition" ))
, uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_VALUE) );
double fCrossoverValue = 0.0;
aMainYScale.Origin >>= fCrossoverValue;
- xMainXAxisProp->setPropertyValue( rtl::OUString::createFromAscii("CrossoverValue")
+ xMainXAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverValue" ))
, uno::makeAny( fCrossoverValue ) );
if( aMainYScale.Orientation == chart2::AxisOrientation_REVERSE )
{
- xMainXAxisProp->setPropertyValue( rtl::OUString::createFromAscii("LabelPosition")
+ xMainXAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "LabelPosition" ))
, uno::makeAny( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_END) );
- xMainXAxisProp->setPropertyValue( rtl::OUString::createFromAscii("MarkPosition")
+ xMainXAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MarkPosition" ))
, uno::makeAny( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS) );
if( xSecondaryXAxisProp.is() )
- xSecondaryXAxisProp->setPropertyValue( rtl::OUString::createFromAscii("CrossoverPosition")
+ xSecondaryXAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverPosition" ))
, uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START) );
}
else
{
- xMainXAxisProp->setPropertyValue( rtl::OUString::createFromAscii("LabelPosition")
+ xMainXAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "LabelPosition" ))
, uno::makeAny( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_START) );
- xMainXAxisProp->setPropertyValue( rtl::OUString::createFromAscii("MarkPosition")
+ xMainXAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MarkPosition" ))
, uno::makeAny( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS) );
if( xSecondaryXAxisProp.is() )
- xSecondaryXAxisProp->setPropertyValue( rtl::OUString::createFromAscii("CrossoverPosition")
+ xSecondaryXAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CrossoverPosition" ))
, uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_END) );
}
}
@@ -877,7 +878,7 @@ uno::Reference< drawing::XShape > SchXMLAxisContext::getTitleShape()
if( xSuppl.is())
{
if( xDiaProp.is())
- xDiaProp->setPropertyValue( rtl::OUString::createFromAscii( "HasXAxisTitle" ), aTrueBool );
+ xDiaProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasXAxisTitle" )), aTrueBool );
xResult = uno::Reference< drawing::XShape >( xSuppl->getXAxisTitle(), uno::UNO_QUERY );
}
}
@@ -887,7 +888,7 @@ uno::Reference< drawing::XShape > SchXMLAxisContext::getTitleShape()
if( xSuppl.is() )
{
if( xDiaProp.is() )
- xDiaProp->setPropertyValue( rtl::OUString::createFromAscii( "HasSecondaryXAxisTitle" ), aTrueBool );
+ xDiaProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryXAxisTitle" )), aTrueBool );
xResult = uno::Reference< drawing::XShape >( xSuppl->getSecondXAxisTitle(), uno::UNO_QUERY );
}
}
@@ -899,7 +900,7 @@ uno::Reference< drawing::XShape > SchXMLAxisContext::getTitleShape()
if( xSuppl.is())
{
if( xDiaProp.is())
- xDiaProp->setPropertyValue( rtl::OUString::createFromAscii( "HasYAxisTitle" ), aTrueBool );
+ xDiaProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasYAxisTitle" )), aTrueBool );
xResult = uno::Reference< drawing::XShape >( xSuppl->getYAxisTitle(), uno::UNO_QUERY );
}
}
@@ -909,7 +910,7 @@ uno::Reference< drawing::XShape > SchXMLAxisContext::getTitleShape()
if( xSuppl.is() )
{
if( xDiaProp.is() )
- xDiaProp->setPropertyValue( rtl::OUString::createFromAscii( "HasSecondaryYAxisTitle" ), aTrueBool );
+ xDiaProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryYAxisTitle" )), aTrueBool );
xResult = uno::Reference< drawing::XShape >( xSuppl->getSecondYAxisTitle(), uno::UNO_QUERY );
}
}
@@ -920,7 +921,7 @@ uno::Reference< drawing::XShape > SchXMLAxisContext::getTitleShape()
if( xSuppl.is())
{
if( xDiaProp.is())
- xDiaProp->setPropertyValue( rtl::OUString::createFromAscii( "HasZAxisTitle" ), aTrueBool );
+ xDiaProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasZAxisTitle" )), aTrueBool );
xResult = uno::Reference< drawing::XShape >( xSuppl->getZAxisTitle(), uno::UNO_QUERY );
}
break;
@@ -954,13 +955,13 @@ void SchXMLAxisContext::CreateGrid( ::rtl::OUString sAutoStyleName,
if( bIsMajor )
{
if( xDiaProp.is())
- xDiaProp->setPropertyValue( ::rtl::OUString::createFromAscii("HasXAxisGrid"), aTrueBool );
+ xDiaProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasXAxisGrid" )), aTrueBool );
xGridProp = xSuppl->getXMainGrid();
}
else
{
if( xDiaProp.is())
- xDiaProp->setPropertyValue( ::rtl::OUString::createFromAscii("HasXAxisHelpGrid"), aTrueBool );
+ xDiaProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasXAxisHelpGrid" )), aTrueBool );
xGridProp = xSuppl->getXHelpGrid();
}
}
@@ -974,13 +975,13 @@ void SchXMLAxisContext::CreateGrid( ::rtl::OUString sAutoStyleName,
if( bIsMajor )
{
if( xDiaProp.is())
- xDiaProp->setPropertyValue( ::rtl::OUString::createFromAscii("HasYAxisGrid"), aTrueBool );
+ xDiaProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasYAxisGrid" )), aTrueBool );
xGridProp = xSuppl->getYMainGrid();
}
else
{
if( xDiaProp.is())
- xDiaProp->setPropertyValue( ::rtl::OUString::createFromAscii("HasYAxisHelpGrid"), aTrueBool );
+ xDiaProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasYAxisHelpGrid" )), aTrueBool );
xGridProp = xSuppl->getYHelpGrid();
}
}
@@ -994,13 +995,13 @@ void SchXMLAxisContext::CreateGrid( ::rtl::OUString sAutoStyleName,
if( bIsMajor )
{
if( xDiaProp.is())
- xDiaProp->setPropertyValue( ::rtl::OUString::createFromAscii("HasZAxisGrid"), aTrueBool );
+ xDiaProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasZAxisGrid" )), aTrueBool );
xGridProp = xSuppl->getZMainGrid();
}
else
{
if( xDiaProp.is())
- xDiaProp->setPropertyValue( ::rtl::OUString::createFromAscii("HasZAxisHelpGrid"), aTrueBool );
+ xDiaProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasZAxisHelpGrid" )), aTrueBool );
xGridProp = xSuppl->getZHelpGrid();
}
}
@@ -1158,7 +1159,7 @@ void SchXMLAxisContext::CreateAxis()
try
{
xDiaProp->setPropertyValue(
- rtl::OUString::createFromAscii( "HasXAxis" ), aTrueBool );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasXAxis" )), aTrueBool );
}
catch( beans::UnknownPropertyException & )
{
@@ -1173,7 +1174,7 @@ void SchXMLAxisContext::CreateAxis()
try
{
xDiaProp->setPropertyValue(
- rtl::OUString::createFromAscii( "HasSecondaryXAxis" ), aTrueBool );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryXAxis" )), aTrueBool );
}
catch( beans::UnknownPropertyException & )
{
@@ -1191,7 +1192,7 @@ void SchXMLAxisContext::CreateAxis()
try
{
xDiaProp->setPropertyValue(
- rtl::OUString::createFromAscii( "HasYAxis" ), aTrueBool );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasYAxis" )), aTrueBool );
}
catch( beans::UnknownPropertyException & )
{
@@ -1209,7 +1210,7 @@ void SchXMLAxisContext::CreateAxis()
try
{
xDiaProp->setPropertyValue(
- rtl::OUString::createFromAscii( "HasXAxis" ), uno::makeAny(sal_True) );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasXAxis" )), uno::makeAny(sal_True) );
}
catch( beans::UnknownPropertyException & )
{
@@ -1223,7 +1224,7 @@ void SchXMLAxisContext::CreateAxis()
try
{
xDiaProp->setPropertyValue(
- rtl::OUString::createFromAscii( "HasSecondaryYAxis" ), aTrueBool );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryYAxis" )), aTrueBool );
}
catch( beans::UnknownPropertyException & )
{
@@ -1271,7 +1272,7 @@ void SchXMLAxisContext::CreateAxis()
xProp->setPropertyValue( rtl::OUString::createFromAscii( "DisplayLabels" ), aFalseBool );
// #88077# AutoOrigin 'on' is default
- xProp->setPropertyValue( rtl::OUString::createFromAscii( "AutoOrigin" ), aTrueBool );
+ xProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "AutoOrigin" )), aTrueBool );
if( msAutoStyleName.getLength())
{
@@ -1327,7 +1328,7 @@ void SchXMLAxisContext::CreateAxis()
uno::Reference< beans::XPropertySet > xNewAxisProp( xAxis, uno::UNO_QUERY );
if( xNewAxisProp.is() )
{
- xNewAxisProp->setPropertyValue( rtl::OUString::createFromAscii("LineStyle")
+ xNewAxisProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "LineStyle" ))
, uno::makeAny(drawing::LineStyle_NONE));
}
}
@@ -2053,8 +2054,8 @@ void SchXMLEquationContext::StartElement( const uno::Reference< xml::sax::XAttri
const SvXMLTokenMap& rAttrTokenMap = mrImportHelper.GetRegEquationAttrTokenMap();
OUString sAutoStyleName;
- sal_Bool bShowEquation = sal_True;
- sal_Bool bShowRSquare = sal_False;
+ bool bShowEquation = true;
+ bool bShowRSquare = false;
awt::Point aPosition;
bool bHasXPos = false;
bool bHasYPos = false;
@@ -2128,3 +2129,5 @@ void SchXMLEquationContext::StartElement( const uno::Reference< xml::sax::XAttri
}
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.hxx b/xmloff/source/chart/SchXMLPlotAreaContext.hxx
index c7e55f9571..f16a60ef3a 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.hxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -389,3 +390,5 @@ private:
};
#endif // _SCH_XMLPLOTAREACONTEXT_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx
index 0675f42ae9..df35f1cdec 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.cxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -54,9 +55,7 @@
#include <rtl/ustrbuf.hxx>
#include "xmloff/xmlnmspe.hxx"
#include <xmloff/xmlimp.hxx>
-#ifndef _XMLOFF_NMSPMAP_HX
#include <xmloff/nmspmap.hxx>
-#endif
#include "SchXMLImport.hxx"
// header for class XMLPropStyleContext
#include <xmloff/prstylei.hxx>
@@ -240,7 +239,7 @@ Reference< chart2::data::XLabeledDataSequence > lcl_createAndAddSequenceToSeries
Reference< chart2::data::XDataSequence > xSeq = SchXMLTools::CreateDataSequence( rRange, xChartDoc );
Reference< beans::XPropertySet > xSeqProp( xSeq, uno::UNO_QUERY );
if( xSeqProp.is())
- xSeqProp->setPropertyValue(OUString::createFromAscii("Role"), uno::makeAny( rRole));
+ xSeqProp->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM( "Role" )), uno::makeAny( rRole));
xLabeledSeq->setValues( xSeq );
// add new sequence to data series / push to front to have the correct sequence order if charttype is changed afterwards
@@ -521,7 +520,7 @@ void SchXMLSeries2Context::EndElement()
//different handling for different chart types necessary
if( bIsScatterChart || ( nDomainCount==1 && !bIsBubbleChart ) )
{
- DomainInfo aDomainInfo( OUString::createFromAscii("values-x"), m_rGlobalSeriesImportInfo.aFirstFirstDomainAddress, m_rGlobalSeriesImportInfo.nFirstFirstDomainIndex ) ;
+ DomainInfo aDomainInfo( OUString(RTL_CONSTASCII_USTRINGPARAM( "values-x" )), m_rGlobalSeriesImportInfo.aFirstFirstDomainAddress, m_rGlobalSeriesImportInfo.nFirstFirstDomainIndex ) ;
bool bCreateXValues = true;
if( !maDomainAddresses.empty() )
{
@@ -554,7 +553,7 @@ void SchXMLSeries2Context::EndElement()
{
if( nDomainCount>1 )
{
- DomainInfo aDomainInfo( OUString::createFromAscii("values-x"), maDomainAddresses[1], m_rGlobalSeriesImportInfo.nCurrentDataIndex ) ;
+ DomainInfo aDomainInfo( OUString(RTL_CONSTASCII_USTRINGPARAM( "values-x" )), maDomainAddresses[1], m_rGlobalSeriesImportInfo.nCurrentDataIndex ) ;
if( !m_rGlobalSeriesImportInfo.aFirstSecondDomainAddress.getLength() )
{
//for bubble chart the second domain contains the x values which should become an index smaller than y values for own data table
@@ -567,12 +566,12 @@ void SchXMLSeries2Context::EndElement()
}
else if( m_rGlobalSeriesImportInfo.aFirstSecondDomainAddress.getLength() )
{
- DomainInfo aDomainInfo( OUString::createFromAscii("values-x"), m_rGlobalSeriesImportInfo.aFirstSecondDomainAddress, m_rGlobalSeriesImportInfo.nFirstSecondDomainIndex ) ;
+ DomainInfo aDomainInfo( OUString(RTL_CONSTASCII_USTRINGPARAM( "values-x" )), m_rGlobalSeriesImportInfo.aFirstSecondDomainAddress, m_rGlobalSeriesImportInfo.nFirstSecondDomainIndex ) ;
aDomainInfos.push_back( aDomainInfo );
}
if( nDomainCount>0)
{
- DomainInfo aDomainInfo( OUString::createFromAscii("values-y"), maDomainAddresses.front(), m_rGlobalSeriesImportInfo.nCurrentDataIndex ) ;
+ DomainInfo aDomainInfo( OUString(RTL_CONSTASCII_USTRINGPARAM( "values-y" )), maDomainAddresses.front(), m_rGlobalSeriesImportInfo.nCurrentDataIndex ) ;
if( !m_rGlobalSeriesImportInfo.aFirstFirstDomainAddress.getLength() )
{
m_rGlobalSeriesImportInfo.aFirstFirstDomainAddress = maDomainAddresses.front();
@@ -1071,3 +1070,5 @@ void SchXMLSeries2Context::switchSeriesLinesOff( ::std::list< DataRowPointStyle
}
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/SchXMLSeries2Context.hxx b/xmloff/source/chart/SchXMLSeries2Context.hxx
index 6278df710c..274eaa24a2 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.hxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -133,3 +134,5 @@ public:
// XMLOFF_SCHXMLSERIES2CONTEXT_HXX
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/SchXMLSeriesHelper.cxx b/xmloff/source/chart/SchXMLSeriesHelper.cxx
index cb693f7dc0..c2a07cae75 100644
--- a/xmloff/source/chart/SchXMLSeriesHelper.cxx
+++ b/xmloff/source/chart/SchXMLSeriesHelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -206,7 +207,7 @@ Reference< chart2::XDataSeries > SchXMLSeriesHelper::getFirstCandleStickSeries(
for( sal_Int32 nCTIdx=0; !xResult.is() && nCTIdx<aCTSeq.getLength(); ++nCTIdx )
{
if( aCTSeq[nCTIdx]->getChartType().equals(
- ::rtl::OUString::createFromAscii("com.sun.star.chart2.CandleStickChartType")))
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.CandleStickChartType" ))))
{
Reference< chart2::XDataSeriesContainer > xSeriesCnt( aCTSeq[nCTIdx], uno::UNO_QUERY_THROW );
Sequence< Reference< chart2::XDataSeries > > aSeriesSeq( xSeriesCnt->getDataSeries() );
@@ -239,7 +240,7 @@ uno::Reference< beans::XPropertySet > SchXMLSeriesHelper::createOldAPISeriesProp
if( xFactory.is() )
{
xRet = uno::Reference< beans::XPropertySet >( xFactory->createInstance(
- OUString::createFromAscii( "com.sun.star.comp.chart2.DataSeriesWrapper" ) ), uno::UNO_QUERY );
+ OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.DataSeriesWrapper" )) ), uno::UNO_QUERY );
Reference< lang::XInitialization > xInit( xRet, uno::UNO_QUERY );
if(xInit.is())
{
@@ -276,7 +277,7 @@ uno::Reference< beans::XPropertySet > SchXMLSeriesHelper::createOldAPIDataPointP
if( xFactory.is() )
{
xRet = uno::Reference< beans::XPropertySet >( xFactory->createInstance(
- OUString::createFromAscii( "com.sun.star.comp.chart2.DataSeriesWrapper" ) ), uno::UNO_QUERY );
+ OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.DataSeriesWrapper" )) ), uno::UNO_QUERY );
Reference< lang::XInitialization > xInit( xRet, uno::UNO_QUERY );
if(xInit.is())
{
@@ -299,3 +300,4 @@ uno::Reference< beans::XPropertySet > SchXMLSeriesHelper::createOldAPIDataPointP
return xRet;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/SchXMLSeriesHelper.hxx b/xmloff/source/chart/SchXMLSeriesHelper.hxx
index fbbc63b991..0c5b03eee7 100644
--- a/xmloff/source/chart/SchXMLSeriesHelper.hxx
+++ b/xmloff/source/chart/SchXMLSeriesHelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -78,3 +79,5 @@ public:
// _XMLOFF_SCH_XML_SERIESHELPER_HXX
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx
index 05947651c7..f7423d305c 100644
--- a/xmloff/source/chart/SchXMLTableContext.cxx
+++ b/xmloff/source/chart/SchXMLTableContext.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/xmloff/source/chart/SchXMLTableContext.hxx b/xmloff/source/chart/SchXMLTableContext.hxx
index c6ecd060c5..6106033199 100644
--- a/xmloff/source/chart/SchXMLTableContext.hxx
+++ b/xmloff/source/chart/SchXMLTableContext.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,7 +30,6 @@
#include <xmloff/xmlictxt.hxx>
#include "SchXMLImport.hxx"
-// #include "SchXMLChartContext.hxx"
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/chart/ChartDataRowSource.hpp>
@@ -227,3 +227,5 @@ public:
};
#endif // _SCH_XMLTABLECONTEXT_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/SchXMLTextListContext.hxx b/xmloff/source/chart/SchXMLTextListContext.hxx
index f80be8bbc7..05a98d3534 100755
--- a/xmloff/source/chart/SchXMLTextListContext.hxx
+++ b/xmloff/source/chart/SchXMLTextListContext.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -50,6 +51,16 @@ public:
const ::rtl::OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
+ /// returns a legacy view name. This is "view" with an appended ordinal/ID.
+ String GetLegacyViewName() const;
+
+ /** returns a API-compatible view name.
+
+ For details on which view names are specified, see the XModel2.getAvailableViewControllerNames
+ documentation.
+ */
+ String GetAPIViewName() const;
+
private:
::com::sun::star::uno::Sequence< ::rtl::OUString>& m_rTextList;
std::vector< ::rtl::OUString> m_aTextVector;
diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx
index 742a45d698..6b2c7f9093 100644
--- a/xmloff/source/chart/SchXMLTools.cxx
+++ b/xmloff/source/chart/SchXMLTools.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,7 +40,6 @@
#include <xmloff/xmluconv.hxx>
// header for struct SvXMLEnumMapEntry
#include <xmloff/xmlement.hxx>
-// header for define __FAR_DATA
#include <tools/solar.h>
// header for class SvXMLImportPropertyMapper
@@ -84,7 +84,7 @@ Reference< uno::XComponentContext > lcl_getComponentContext()
{
Reference< beans::XPropertySet > xFactProp( comphelper::getProcessServiceFactory(), uno::UNO_QUERY );
if( xFactProp.is())
- xFactProp->getPropertyValue(OUString::createFromAscii("DefaultContext")) >>= xContext;
+ xFactProp->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= xContext;
}
catch( uno::Exception& )
{}
@@ -163,7 +163,7 @@ Reference< chart2::data::XDataSequence > lcl_createNewSequenceFromCachedXMLRange
namespace SchXMLTools
{
-static __FAR_DATA SvXMLEnumMapEntry aXMLChartClassMap[] =
+static SvXMLEnumMapEntry aXMLChartClassMap[] =
{
{ XML_LINE, XML_CHART_CLASS_LINE },
{ XML_AREA, XML_CHART_CLASS_AREA },
@@ -196,35 +196,35 @@ const tMakeStringStringMap& lcl_getChartTypeNameMap()
//shape property -- chart model object property
static tMakeStringStringMap g_aChartTypeNameMap =
tMakeStringStringMap
- ( ::rtl::OUString::createFromAscii( "com.sun.star.chart.LineDiagram" )
- , ::rtl::OUString::createFromAscii( "com.sun.star.chart2.LineChartType" ) )
+ ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.LineDiagram" ))
+ , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.LineChartType" )) )
- ( ::rtl::OUString::createFromAscii( "com.sun.star.chart.AreaDiagram" )
- , ::rtl::OUString::createFromAscii( "com.sun.star.chart2.AreaChartType" ) )
+ ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.AreaDiagram" ))
+ , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.AreaChartType" )) )
- ( ::rtl::OUString::createFromAscii( "com.sun.star.chart.BarDiagram" )
- , ::rtl::OUString::createFromAscii( "com.sun.star.chart2.ColumnChartType" ) )
+ ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.BarDiagram" ))
+ , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ColumnChartType" )) )
- ( ::rtl::OUString::createFromAscii( "com.sun.star.chart.PieDiagram" )
- , ::rtl::OUString::createFromAscii( "com.sun.star.chart2.PieChartType" ) )
+ ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.PieDiagram" ))
+ , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.PieChartType" )) )
- ( ::rtl::OUString::createFromAscii( "com.sun.star.chart.DonutDiagram" )
- , ::rtl::OUString::createFromAscii( "com.sun.star.chart2.DonutChartType" ) )
+ ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.DonutDiagram" ))
+ , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.DonutChartType" )) )
- ( ::rtl::OUString::createFromAscii( "com.sun.star.chart.XYDiagram" )
- , ::rtl::OUString::createFromAscii( "com.sun.star.chart2.ScatterChartType" ) )
+ ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.XYDiagram" ))
+ , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ScatterChartType" )) )
- ( ::rtl::OUString::createFromAscii( "com.sun.star.chart.NetDiagram" )
- , ::rtl::OUString::createFromAscii( "com.sun.star.chart2.NetChartType" ) )
+ ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.NetDiagram" ))
+ , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.NetChartType" )) )
- ( ::rtl::OUString::createFromAscii( "com.sun.star.chart.FilledNetDiagram" )
- , ::rtl::OUString::createFromAscii( "com.sun.star.chart2.FilledNetChartType" ) )
+ ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.FilledNetDiagram" ))
+ , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.FilledNetChartType" )) )
- ( ::rtl::OUString::createFromAscii( "com.sun.star.chart.StockDiagram" )
- , ::rtl::OUString::createFromAscii( "com.sun.star.chart2.CandleStickChartType" ) )
+ ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.StockDiagram" ))
+ , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.CandleStickChartType" )) )
- ( ::rtl::OUString::createFromAscii( "com.sun.star.chart.BubbleDiagram" )
- , ::rtl::OUString::createFromAscii( "com.sun.star.chart2.BubbleChartType" ) )
+ ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.BubbleDiagram" ))
+ , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.BubbleChartType" )) )
;
return g_aChartTypeNameMap;
@@ -346,28 +346,28 @@ XMLTokenEnum getTokenByChartType(
{
OUString aServiceName( rChartTypeService.copy( nSkip, nTypeLength ));
- if( aServiceName.equalsAscii("Line"))
+ if( aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Line")))
eResult = XML_LINE;
- else if( aServiceName.equalsAscii("Area"))
+ else if( aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Area")))
eResult = XML_AREA;
- else if( aServiceName.equalsAscii("Bar") ||
- (!bUseOldNames && aServiceName.equalsAscii("Column")))
+ else if( aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Bar")) ||
+ (!bUseOldNames && aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Column"))))
eResult = XML_BAR;
- else if( aServiceName.equalsAscii("Pie"))
+ else if( aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Pie")))
eResult = XML_CIRCLE;
- else if( aServiceName.equalsAscii("Donut"))
+ else if( aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Donut")))
eResult = XML_RING;
- else if( (bUseOldNames && aServiceName.equalsAscii("XY")) ||
- (!bUseOldNames && aServiceName.equalsAscii("Scatter")))
+ else if( (bUseOldNames && aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("XY"))) ||
+ (!bUseOldNames && aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Scatter"))))
eResult = XML_SCATTER;
- else if( aServiceName.equalsAscii("Bubble"))
+ else if( aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Bubble")))
eResult = XML_BUBBLE;
- else if( aServiceName.equalsAscii("Net"))
+ else if( aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Net")))
eResult = XML_RADAR;
- else if( aServiceName.equalsAscii("FilledNet"))
+ else if( aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FilledNet")))
eResult = XML_FILLED_RADAR;
- else if( (bUseOldNames && aServiceName.equalsAscii("Stock")) ||
- (!bUseOldNames && aServiceName.equalsAscii("CandleStick")))
+ else if( (bUseOldNames && aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Stock"))) ||
+ (!bUseOldNames && aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("CandleStick"))))
eResult = XML_STOCK;
}
}
@@ -385,7 +385,7 @@ Reference< chart2::data::XLabeledDataSequence > GetNewLabeledDataSequence()
if( xContext.is() )
xResult.set(
xContext->getServiceManager()->createInstanceWithContext(
- OUString::createFromAscii("com.sun.star.chart2.data.LabeledDataSequence"),
+ OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.data.LabeledDataSequence" )),
xContext ), uno::UNO_QUERY_THROW );
return xResult;
}
@@ -895,3 +895,5 @@ Reference< chart2::data::XDataProvider > getDataProviderFromParent( const Refere
}
} // namespace SchXMLTools
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/SchXMLTools.hxx b/xmloff/source/chart/SchXMLTools.hxx
index 52a17b31ba..3027585f43 100644
--- a/xmloff/source/chart/SchXMLTools.hxx
+++ b/xmloff/source/chart/SchXMLTools.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -150,3 +151,5 @@ namespace SchXMLTools
}
#endif // SCH_XML_TOOLS_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx b/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx
index 4cb63a61c4..ff60b399f9 100644
--- a/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx
+++ b/xmloff/source/chart/XMLAxisPositionPropertyHdl.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -126,3 +127,5 @@ sal_Bool XMLAxisPositionPropertyHdl::exportXML( OUString& rStrExpValue,
}
return bResult;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx b/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx
index f3195eb996..be77844740 100644
--- a/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx
+++ b/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -43,3 +44,5 @@ private:
};
#endif // _XMLAXISPOSITIONPROPERTYHDL_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/XMLChartPropertyContext.cxx b/xmloff/source/chart/XMLChartPropertyContext.cxx
index daeed3db21..168d931887 100644
--- a/xmloff/source/chart/XMLChartPropertyContext.cxx
+++ b/xmloff/source/chart/XMLChartPropertyContext.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -80,3 +81,5 @@ SvXMLImportContext* XMLChartPropertyContext::CreateChildContext(
return pContext;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/XMLChartPropertyContext.hxx b/xmloff/source/chart/XMLChartPropertyContext.hxx
index 5ce1945bc2..12969e74db 100644
--- a/xmloff/source/chart/XMLChartPropertyContext.hxx
+++ b/xmloff/source/chart/XMLChartPropertyContext.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -56,3 +57,5 @@ private:
};
#endif // _XMLOFF_CHARTPROPERTYCONTEXT_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/XMLChartStyleContext.cxx b/xmloff/source/chart/XMLChartStyleContext.cxx
index 69133d8894..9176e196e8 100644
--- a/xmloff/source/chart/XMLChartStyleContext.cxx
+++ b/xmloff/source/chart/XMLChartStyleContext.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -159,3 +160,5 @@ SvXMLImportContext *XMLChartStyleContext::CreateChildContext(
return pContext;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx
index 2633467359..57c0311a61 100644
--- a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx
+++ b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -66,3 +67,5 @@ sal_Bool XMLErrorBarStylePropertyHdl::exportXML( OUString& rStrExpValue,
return XMLEnumPropertyHdl::exportXML( rStrExpValue, aValue, rUnitConverter );
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx
index bc6fa25350..a77c25b06f 100644
--- a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx
+++ b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,3 +40,5 @@ public:
};
#endif // _XMLERRORBARSTYLEPROPERTYHDL_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx
index 1fb3899bd9..9cc566a8a4 100644
--- a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx
+++ b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,7 +41,7 @@ XMLErrorIndicatorPropertyHdl::~XMLErrorIndicatorPropertyHdl()
sal_Bool XMLErrorIndicatorPropertyHdl::importXML( const ::rtl::OUString& rStrImpValue,
uno::Any& rValue, const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
- sal_Bool bValue;
+ bool bValue;
SvXMLUnitConverter::convertBool( bValue, rStrImpValue );
// modify existing value
@@ -103,3 +104,5 @@ sal_Bool XMLErrorIndicatorPropertyHdl::exportXML( ::rtl::OUString& rStrExpValue,
// only export if set to true
return bValue;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx
index e01a9ebd2c..a09a055938 100644
--- a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx
+++ b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -44,3 +45,5 @@ public:
};
#endif // _XMLERRORINDICATORPROPERTYHDL_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/XMLLabelSeparatorContext.cxx b/xmloff/source/chart/XMLLabelSeparatorContext.cxx
index 075be64096..8b40a87380 100644
--- a/xmloff/source/chart/XMLLabelSeparatorContext.cxx
+++ b/xmloff/source/chart/XMLLabelSeparatorContext.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -85,3 +86,5 @@ void XMLLabelSeparatorContext::EndElement()
XMLElementPropertyContext::EndElement();
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/XMLLabelSeparatorContext.hxx b/xmloff/source/chart/XMLLabelSeparatorContext.hxx
index a7c883e6b0..813f400b67 100644
--- a/xmloff/source/chart/XMLLabelSeparatorContext.hxx
+++ b/xmloff/source/chart/XMLLabelSeparatorContext.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -52,3 +53,5 @@ private:
};
#endif // _XMLOFF_SYMBOLIMAGECONTEXT_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/XMLSymbolImageContext.cxx b/xmloff/source/chart/XMLSymbolImageContext.cxx
index aac47da7e9..64b3ec8ec7 100644
--- a/xmloff/source/chart/XMLSymbolImageContext.cxx
+++ b/xmloff/source/chart/XMLSymbolImageContext.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -49,7 +50,7 @@ enum SvXMLTokenMapAttrs
XML_TOK_SYMBOL_IMAGE_END = XML_TOK_UNKNOWN
};
-static __FAR_DATA SvXMLTokenMapEntry aSymbolImageAttrTokenMap[] =
+static SvXMLTokenMapEntry aSymbolImageAttrTokenMap[] =
{
{ XML_NAMESPACE_XLINK, ::xmloff::token::XML_HREF, XML_TOK_SYMBOL_IMAGE_HREF },
{ XML_NAMESPACE_XLINK, ::xmloff::token::XML_TYPE, XML_TOK_SYMBOL_IMAGE_TYPE },
@@ -148,3 +149,5 @@ void XMLSymbolImageContext::EndElement()
XMLElementPropertyContext::EndElement();
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/XMLSymbolImageContext.hxx b/xmloff/source/chart/XMLSymbolImageContext.hxx
index 823836e1c7..f25b739fe1 100644
--- a/xmloff/source/chart/XMLSymbolImageContext.hxx
+++ b/xmloff/source/chart/XMLSymbolImageContext.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -57,3 +58,5 @@ private:
};
#endif // _XMLOFF_SYMBOLIMAGECONTEXT_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx b/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx
index ead835c513..b2d224104b 100644
--- a/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx
+++ b/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -168,3 +169,5 @@ sal_Bool XMLSymbolTypePropertyHdl::exportXML( OUString& rStrExpValue,
return bResult;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx b/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx
index 2987b9b2a8..f8787dcbee 100644
--- a/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx
+++ b/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -44,3 +45,5 @@ private:
};
#endif // _XMLSYMBOLTYPEPROPERTYHDL_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/XMLTextOrientationHdl.cxx b/xmloff/source/chart/XMLTextOrientationHdl.cxx
index a3ca9fbd12..6ed303ae7e 100644
--- a/xmloff/source/chart/XMLTextOrientationHdl.cxx
+++ b/xmloff/source/chart/XMLTextOrientationHdl.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -78,3 +79,5 @@ sal_Bool XMLTextOrientationHdl::exportXML(
return bRetval;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/XMLTextOrientationHdl.hxx b/xmloff/source/chart/XMLTextOrientationHdl.hxx
index 539952f3f7..76684c09b7 100644
--- a/xmloff/source/chart/XMLTextOrientationHdl.hxx
+++ b/xmloff/source/chart/XMLTextOrientationHdl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -44,3 +45,5 @@ public:
};
#endif // _XMLTEXTORIENTATIONHDL_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/contexts.cxx b/xmloff/source/chart/contexts.cxx
index 007920f77c..143bdf03bc 100644
--- a/xmloff/source/chart/contexts.cxx
+++ b/xmloff/source/chart/contexts.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -231,3 +232,4 @@ SvXMLImportContext* SchXMLBodyContext::CreateChildContext(
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/contexts.hxx b/xmloff/source/chart/contexts.hxx
index ee0fa92bc4..f5d9186b17 100644
--- a/xmloff/source/chart/contexts.hxx
+++ b/xmloff/source/chart/contexts.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -113,3 +114,5 @@ public:
// ========================================
#endif // _SCH_XML_CONTEXTS_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/transporttypes.cxx b/xmloff/source/chart/transporttypes.cxx
index 63a32fb5d3..7e58c701c2 100644
--- a/xmloff/source/chart/transporttypes.cxx
+++ b/xmloff/source/chart/transporttypes.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -36,3 +37,5 @@ bool operator < ( const tSchXMLIndexWithPart & rFirst, const tSchXMLIndexWithPar
return (static_cast< int >( rFirst.second ) < static_cast< int >( rSecond.second ));
return (rFirst.first < rSecond.first);
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/transporttypes.hxx b/xmloff/source/chart/transporttypes.hxx
index eabd38ec26..c96a22cac8 100644
--- a/xmloff/source/chart/transporttypes.hxx
+++ b/xmloff/source/chart/transporttypes.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -223,3 +224,5 @@ typedef ::std::multimap< ::rtl::OUString, ::com::sun::star::uno::Reference<
::com::sun::star::chart2::data::XDataSequence > > tSchXMLRangeSequenceMap;
#endif // SCH_XML_TRANSPORTTYPES_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx
index 6de33d9e13..e2261eab04 100644
--- a/xmloff/source/core/DocumentSettingsContext.cxx
+++ b/xmloff/source/core/DocumentSettingsContext.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,9 +39,7 @@
#include <xmloff/xmluconv.hxx>
#include <tools/debug.hxx>
-#ifndef __SGI_STL_LIST
#include <list>
-#endif
#include <com/sun/star/i18n/XForbiddenCharacters.hpp>
#include <com/sun/star/container/XIndexContainer.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -104,8 +103,8 @@ uno::Sequence<beans::PropertyValue> XMLMyList::GetSequence()
while (aItr != aProps.end())
{
*pProps = *aItr;
- pProps++;
- aItr++;
+ ++pProps;
+ ++aItr;
}
}
return aSeq;
@@ -129,7 +128,7 @@ uno::Reference<container::XNameContainer> XMLMyList::GetNameContainer()
while (aItr != aProps.end())
{
xNameContainer->insertByName(aItr->Name, aItr->Value);
- aItr++;
+ ++aItr;
}
}
}
@@ -154,8 +153,8 @@ uno::Reference<container::XIndexContainer> XMLMyList::GetIndexContainer()
while (aItr != aProps.end())
{
xIndexContainer->insertByIndex(i, aItr->Value);
- aItr++;
- i++;
+ ++aItr;
+ ++i;
}
}
}
@@ -1012,3 +1011,4 @@ void XMLConfigItemMapIndexedContext::EndElement()
}
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/DomBuilderContext.cxx b/xmloff/source/core/DomBuilderContext.cxx
index bd91d04e8c..7ffc211b0a 100644
--- a/xmloff/source/core/DomBuilderContext.cxx
+++ b/xmloff/source/core/DomBuilderContext.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -262,3 +263,5 @@ Reference<XNode> lcl_createElement( SvXMLImport& rImport,
xParent->appendChild( xNode );
return xNode;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/DomExport.cxx b/xmloff/source/core/DomExport.cxx
index bf9008209c..10088fe61e 100644
--- a/xmloff/source/core/DomExport.cxx
+++ b/xmloff/source/core/DomExport.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -303,3 +304,5 @@ void exportDom( SvXMLExport& rExport, const Reference<XNode>& xNode )
DomExport aDomExport( rExport );
visit( aDomExport, xNode );
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/ProgressBarHelper.cxx b/xmloff/source/core/ProgressBarHelper.cxx
index 53bcb4658c..ffdac30586 100644
--- a/xmloff/source/core/ProgressBarHelper.cxx
+++ b/xmloff/source/core/ProgressBarHelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -137,3 +138,4 @@ void ProgressBarHelper::SetValue(sal_Int32 nTempValue)
}
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/PropertySetMerger.cxx b/xmloff/source/core/PropertySetMerger.cxx
index 2028f7306b..584c924c57 100644
--- a/xmloff/source/core/PropertySetMerger.cxx
+++ b/xmloff/source/core/PropertySetMerger.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -37,9 +38,7 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::lang;
-#ifndef _CPPUHELPER_IMPLBASE1_HXX_
#include <cppuhelper/implbase3.hxx>
-#endif
class SvXMLAttrContainerItem_Impl;
@@ -265,3 +264,5 @@ Reference< XPropertySet > PropertySetMerger_CreateInstance( Reference< XProperty
{
return new PropertySetMergerImpl( rPropSet1, rPropSet2 );
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/RDFaExportHelper.cxx b/xmloff/source/core/RDFaExportHelper.cxx
index f6841db6ed..71413d0ac5 100644
--- a/xmloff/source/core/RDFaExportHelper.cxx
+++ b/xmloff/source/core/RDFaExportHelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -214,7 +215,7 @@ RDFaExportHelper::AddRDFa(
::boost::bind(&makeCURIE, &m_rExport,
::boost::bind(&rdf::Statement::Predicate, _1))),
::comphelper::OUStringBufferAppender(property),
- ::rtl::OUString::createFromAscii(" "));
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ")));
m_rExport.AddAttribute(XML_NAMESPACE_XHTML, token::XML_PROPERTY,
property.makeStringAndClear());
@@ -229,3 +230,4 @@ RDFaExportHelper::AddRDFa(
} // namespace xmloff
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/RDFaImportHelper.cxx b/xmloff/source/core/RDFaImportHelper.cxx
index a217b3115e..ca7d24095c 100644
--- a/xmloff/source/core/RDFaImportHelper.cxx
+++ b/xmloff/source/core/RDFaImportHelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -194,7 +195,7 @@ RDFaReader::ReadCURIE(::rtl::OUString const & i_rCURIE) const
::rtl::OUString Namespace;
sal_uInt16 nKey( GetImport().GetNamespaceMap()._GetKeyByAttrName(
i_rCURIE, &Prefix, &LocalName, &Namespace) );
- if (Prefix.equalsAscii("_"))
+ if (Prefix.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("_")))
{
// eeek, it's a bnode!
// "_" is not a valid URI scheme => we can identify bnodes
@@ -499,3 +500,4 @@ void RDFaImportHelper::InsertRDFa(
} // namespace xmloff
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/SettingsExportHelper.cxx b/xmloff/source/core/SettingsExportHelper.cxx
index cf31896491..19c4f61ca5 100644
--- a/xmloff/source/core/SettingsExportHelper.cxx
+++ b/xmloff/source/core/SettingsExportHelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -567,3 +568,5 @@ void XMLSettingsExportHelper::ManipulateSetting( uno::Any& rAny, const rtl::OUSt
}
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/XMLBase64Export.cxx b/xmloff/source/core/XMLBase64Export.cxx
index 525350b294..bab3e02212 100644
--- a/xmloff/source/core/XMLBase64Export.cxx
+++ b/xmloff/source/core/XMLBase64Export.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -93,3 +94,4 @@ sal_Bool XMLBase64Export::exportOfficeBinaryDataElement(
::xmloff::token::XML_BINARY_DATA );
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/XMLBase64ImportContext.cxx b/xmloff/source/core/XMLBase64ImportContext.cxx
index d6ccdf667f..a06a6608ea 100644
--- a/xmloff/source/core/XMLBase64ImportContext.cxx
+++ b/xmloff/source/core/XMLBase64ImportContext.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -89,3 +90,5 @@ void XMLBase64ImportContext::Characters( const ::rtl::OUString& rChars )
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/XMLBasicExportFilter.cxx b/xmloff/source/core/XMLBasicExportFilter.cxx
index f9aa74c177..36cb0469d9 100644
--- a/xmloff/source/core/XMLBasicExportFilter.cxx
+++ b/xmloff/source/core/XMLBasicExportFilter.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -123,3 +124,5 @@ void XMLBasicExportFilter::setDocumentLocator( const Reference< xml::sax::XLocat
}
// -----------------------------------------------------------------------------
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx b/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx
index 5ca4a465d8..a978054923 100644
--- a/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx
+++ b/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -180,3 +181,5 @@ Sequence< OUString > SAL_CALL XMLEmbeddedObjectExportFilter::getSupportedService
Sequence< OUString > aSeq;
return aSeq;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
index 5adac50f79..bbd96f67b7 100644
--- a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
+++ b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,9 +34,7 @@
#include <com/sun/star/frame/XStorable.hpp>
// #110680#
-//#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
//#include <comphelper/processfactory.hxx>
-//#endif
#include <tools/globname.hxx>
#include <sot/clsids.hxx>
#include <tools/globname.hxx>
@@ -393,3 +392,5 @@ void XMLEmbeddedObjectImportContext::Characters( const ::rtl::OUString& rChars )
xHandler->characters( rChars );
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/attrlist.cxx b/xmloff/source/core/attrlist.cxx
index be9c6a159d..b70de47183 100644
--- a/xmloff/source/core/attrlist.cxx
+++ b/xmloff/source/core/attrlist.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -299,3 +300,4 @@ sal_Int64 SAL_CALL SvXMLAttributeList::getSomething( const uno::Sequence< sal_In
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx
index 8936bd2694..5e40c187ab 100644
--- a/xmloff/source/core/facreg.cxx
+++ b/xmloff/source/core/facreg.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -281,3 +282,4 @@ XMLOFF_DLLPUBLIC void * SAL_CALL component_getFactory( const sal_Char * pImplNam
}
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/i18nmap.cxx b/xmloff/source/core/i18nmap.cxx
index 1b09f31111..a13a30b08f 100644
--- a/xmloff/source/core/i18nmap.cxx
+++ b/xmloff/source/core/i18nmap.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -124,3 +125,4 @@ const OUString& SvI18NMap::Get( USHORT nKind, const OUString& rName ) const
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx
index 1863d97f6d..746de75848 100644
--- a/xmloff/source/core/nmspmap.cxx
+++ b/xmloff/source/core/nmspmap.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,9 +32,7 @@
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
-#ifndef _XMLTOKEN_HXX
#include <xmloff/xmltoken.hxx>
-#endif
#include <xmloff/nmspmap.hxx>
#include "xmloff/xmlnmspe.hxx"
@@ -82,7 +81,7 @@ SvXMLNamespaceMap::~SvXMLNamespaceMap()
while ( aIter != aEnd )
{
const OUString *pString = (*aIter).first.second;
- aIter++;
+ ++aIter;
delete pString;
}
}
@@ -107,7 +106,7 @@ sal_uInt16 SvXMLNamespaceMap::_Add( const OUString& rPrefix, const OUString &rNa
}
while ( sal_True );
}
- ::vos::ORef<NameSpaceEntry> pEntry(new NameSpaceEntry);
+ ::rtl::Reference<NameSpaceEntry> pEntry(new NameSpaceEntry);
pEntry->sName = rName;
pEntry->nKey = nKey;
pEntry->sPrefix = rPrefix;
@@ -172,7 +171,7 @@ sal_uInt16 SvXMLNamespaceMap::GetKeyByName( const OUString& rName ) const
nKey = (*aIter).second->nKey;
break;
}
- aIter++;
+ ++aIter;
}
return nKey;
}
@@ -309,7 +308,7 @@ sal_uInt16 SvXMLNamespaceMap::_GetKeyByAttrName( const OUString& rAttrName,
it = aNameCache.end();
if ( it != aNameCache.end() )
{
- const NameSpaceEntry &rEntry = (*it).second.getBody();
+ const NameSpaceEntry &rEntry = *((*it).second);
if ( pPrefix )
*pPrefix = rEntry.sPrefix;
if ( pLocalName )
@@ -323,7 +322,7 @@ sal_uInt16 SvXMLNamespaceMap::_GetKeyByAttrName( const OUString& rAttrName,
}
else
{
- vos::ORef<NameSpaceEntry> xEntry(new NameSpaceEntry());
+ rtl::Reference<NameSpaceEntry> xEntry(new NameSpaceEntry());
sal_Int32 nColonPos = rAttrName.indexOf( sal_Unicode(':') );
if( -1L == nColonPos )
@@ -361,7 +360,7 @@ sal_uInt16 SvXMLNamespaceMap::_GetKeyByAttrName( const OUString& rAttrName,
if (bCache)
{
- typedef std::pair< const rtl::OUString, vos::ORef<NameSpaceEntry> > value_type;
+ typedef std::pair< const rtl::OUString, rtl::Reference<NameSpaceEntry> > value_type;
(void) const_cast<NameSpaceHash*>(&aNameCache)->insert (value_type (rAttrName, xEntry));
}
}
@@ -591,3 +590,5 @@ sal_Bool SvXMLNamespaceMap::NormalizeOasisURN( ::rtl::OUString& rName )
return sal_True;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/unoatrcn.cxx b/xmloff/source/core/unoatrcn.cxx
index 9d05f59550..9fa6dbe718 100644
--- a/xmloff/source/core/unoatrcn.cxx
+++ b/xmloff/source/core/unoatrcn.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -159,7 +160,7 @@ uno::Any SAL_CALL SvUnoAttributeContainer::getByName(const OUString& aName)
xml::AttributeData aData;
aData.Namespace = mpContainer->GetAttrNamespace(nAttr);
- aData.Type = OUString::createFromAscii("CDATA");
+ aData.Type = OUString(RTL_CONSTASCII_USTRINGPARAM("CDATA"));
aData.Value = mpContainer->GetAttrValue(nAttr);
uno::Any aAny;
@@ -286,13 +287,13 @@ void SAL_CALL SvUnoAttributeContainer::removeByName(const OUString& Name)
//XServiceInfo
OUString SAL_CALL SvUnoAttributeContainer::getImplementationName(void) throw( uno::RuntimeException )
{
- return OUString::createFromAscii( "SvUnoAttributeContainer" );
+ return OUString(RTL_CONSTASCII_USTRINGPARAM( "SvUnoAttributeContainer" ));
}
uno::Sequence< OUString > SvUnoAttributeContainer::getSupportedServiceNames(void)
throw( uno::RuntimeException )
{
- OUString aSN( OUString::createFromAscii( "com.sun.star.xml.AttributeContainer" ) );
+ OUString aSN( OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.AttributeContainer" )) );
uno::Sequence< OUString > aNS( &aSN, 1L );
return aNS;
}
@@ -313,3 +314,4 @@ sal_Bool SvUnoAttributeContainer::supportsService(const OUString& ServiceName)
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx b/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
index 75bc1eeaa9..e95d09f976 100644
--- a/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
+++ b/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -169,3 +170,4 @@ bool UnoInterfaceToUniqueIdentifierMapper::findIdentifier( const OUString& rIden
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/xmlcnitm.cxx b/xmloff/source/core/xmlcnitm.cxx
index 4cd422dd47..a811e5de70 100644
--- a/xmloff/source/core/xmlcnitm.cxx
+++ b/xmloff/source/core/xmlcnitm.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -216,3 +217,4 @@ const ::rtl::OUString& SvXMLAttrContainerData::GetAttrValue(sal_uInt16 i) const
return *(*pValues)[i];
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/xmlehelp.cxx b/xmloff/source/core/xmlehelp.cxx
index e51cea4a0c..65ae260bee 100644
--- a/xmloff/source/core/xmlehelp.cxx
+++ b/xmloff/source/core/xmlehelp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,9 +34,7 @@
#include <rtl/ustrbuf.hxx>
#include "xmlehelp.hxx"
-#ifndef _XMLOFF_XMTOKEN_HXX
#include <xmloff/xmltoken.hxx>
-#endif
using ::rtl::OUString;
using ::rtl::OUStringBuffer;
@@ -498,3 +497,5 @@ MapUnit SvXMLExportHelper::GetUnitFromString(const ::rtl::OUString& rString, Map
return eRetUnit;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/xmlenums.hxx b/xmloff/source/core/xmlenums.hxx
index 7161bcd464..059d309a46 100644
--- a/xmloff/source/core/xmlenums.hxx
+++ b/xmloff/source/core/xmlenums.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -53,3 +54,5 @@ enum XMLSymbolDescriptorsEnum
XML_SYMBOL_DESCRIPTOR_MAX
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/xmlerror.cxx b/xmloff/source/core/xmlerror.cxx
index 657ce78f7d..9951eaedcb 100644
--- a/xmloff/source/core/xmlerror.cxx
+++ b/xmloff/source/core/xmlerror.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -73,8 +74,8 @@ public:
OUString sExceptionMessage;/// message of original exception (if available)
// XLocator information:
- sal_Int32 nRow; /// row number where error occured (or -1 for unknown)
- sal_Int32 nColumn; /// column number where error occured (or -1)
+ sal_Int32 nRow; /// row number where error occurred (or -1 for unknown)
+ sal_Int32 nColumn; /// column number where error occurred (or -1)
OUString sPublicId; /// public identifier
OUString sSystemId; /// public identifier
@@ -129,7 +130,7 @@ void XMLErrors::AddRecord(
OUStringBuffer sMessage;
- sMessage.appendAscii( "An error or a warning has occured during XML import/export!\n" );
+ sMessage.appendAscii( "An error or a warning has occurred during XML import/export!\n" );
// ID & flags
sMessage.appendAscii( "Error-Id: 0x");
@@ -241,7 +242,7 @@ void XMLErrors::ThrowErrorAsSAXException(sal_Int32 nIdMask)
// search first error/warning that matches the nIdMask
for( ErrorList::iterator aIter = aErrors.begin();
aIter != aErrors.end();
- aIter++ )
+ ++aIter )
{
if ( (aIter->nId & nIdMask) != 0 )
{
@@ -255,3 +256,5 @@ void XMLErrors::ThrowErrorAsSAXException(sal_Int32 nIdMask)
}
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index ae1a7f7001..614a2e57c5 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -78,7 +79,7 @@
#include "xmloff/XMLFilterServiceNames.h"
#include "xmloff/XMLEmbeddedObjectExportFilter.hxx"
#include "XMLBasicExportFilter.hxx"
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <rtl/logfile.hxx>
#include <cppuhelper/implbase1.hxx>
#include <comphelper/extract.hxx>
@@ -112,10 +113,8 @@ using namespace ::com::sun::star::xml::sax;
using namespace ::com::sun::star::io;
using namespace ::xmloff::token;
-sal_Char __READONLY_DATA sXML_1_1[] = "1.1";
-sal_Char __READONLY_DATA sXML_1_2[] = "1.2";
-
-const sal_Char *sOpenOfficeOrgProject ="OpenOffice.org_project";
+sal_Char const sXML_1_1[] = "1.1";
+sal_Char const sXML_1_2[] = "1.2";
const sal_Char s_grddl_xsl[] =
"http://docs.oasis-open.org/office/1.2/xslt/odf2rdf.xsl";
@@ -269,12 +268,9 @@ public:
uno::Reference< uri::XUriReferenceFactory > mxUriReferenceFactory;
rtl::OUString msPackageURI;
rtl::OUString msPackageURIScheme;
- // --> OD 2006-09-27 #i69627#
+ // Written OpenDocument file format doesn't fit to the created text document (#i69627#)
sal_Bool mbOutlineStyleAsNormalListStyle;
- // <--
- // --> PB 2007-07-06 #i146851#
sal_Bool mbSaveBackwardCompatibleODF;
- // <--
uno::Reference< embed::XStorage > mxTargetStorage;
@@ -296,9 +292,7 @@ public:
::std::auto_ptr< ::xmloff::RDFaExportHelper> mpRDFaHelper;
- // --> OD 2008-11-26 #158694#
sal_Bool mbExportTextNumberElement;
- // <--
sal_Bool mbNullDateInitialized;
void SetSchemeOf( const ::rtl::OUString& rOrigFileName )
@@ -310,20 +304,15 @@ public:
};
SvXMLExport_Impl::SvXMLExport_Impl()
- // --> OD 2006-09-27 #i69627#
+ // Written OpenDocument file format doesn't fit to the created text document (#i69627#)
: mbOutlineStyleAsNormalListStyle( false )
- // <--
- // --> PB 2007-07-06 #i146851#
,mbSaveBackwardCompatibleODF( sal_True )
- // <--
,mxComponentContext( ::comphelper::getProcessComponentContext() )
,mStreamName()
,mNamespaceMaps()
,mDepth(0)
,mpRDFaHelper() // lazy
- // --> OD 2008-11-26 #158694#
,mbExportTextNumberElement( sal_False )
- // <--
,mbNullDateInitialized( sal_False )
{
OSL_ENSURE(mxComponentContext.is(), "SvXMLExport: no ComponentContext");
@@ -409,6 +398,7 @@ void SvXMLExport::_InitCtor()
mpNamespaceMap->Add( GetXMLToken(XML_NP_XSD), GetXMLToken(XML_N_XSD), XML_NAMESPACE_XSD );
mpNamespaceMap->Add( GetXMLToken(XML_NP_XSI), GetXMLToken(XML_N_XSI), XML_NAMESPACE_XSI );
mpNamespaceMap->Add( GetXMLToken(XML_NP_FIELD), GetXMLToken(XML_N_FIELD), XML_NAMESPACE_FIELD );
+ mpNamespaceMap->Add( GetXMLToken(XML_NP_FORMX), GetXMLToken(XML_N_FORMX), XML_NAMESPACE_FORMX );
}
// RDFa: needed for content and header/footer styles
if( (getExportFlags() & (EXPORT_STYLES|EXPORT_AUTOSTYLES|EXPORT_MASTERSTYLES|EXPORT_CONTENT) ) != 0 )
@@ -422,6 +412,12 @@ void SvXMLExport::_InitCtor()
mpNamespaceMap->Add( GetXMLToken(XML_NP_GRDDL),
GetXMLToken(XML_N_GRDDL), XML_NAMESPACE_GRDDL );
}
+ // CSS Text Level 3 for distributed text justification.
+ if ( (getExportFlags() & (EXPORT_STYLES|EXPORT_AUTOSTYLES|EXPORT_MASTERSTYLES)) != 0 )
+ {
+ mpNamespaceMap->Add(
+ GetXMLToken(XML_NP_CSS3TEXT), GetXMLToken(XML_N_CSS3TEXT), XML_NAMESPACE_CSS3TEXT );
+ }
mxAttrList = (xml::sax::XAttributeList*)mpAttrList;
@@ -436,14 +432,11 @@ void SvXMLExport::_InitCtor()
mxModel->addEventListener(mxEventListener);
}
- // --> OD 2006-03-10 #i51726# - determine model type
+ // Determine model type (#i51726#)
_DetermineModelType();
- // <--
mbEnableExperimentalOdfExport = getenv("ENABLE_EXPERIMENTAL_ODF_EXPORT") != NULL;
- // --> PB 2007-07-06 #146851# - load mbSaveBackwardCompatibleODF from configuration
-
// cl: but only if we do export to current oasis format, old openoffice format *must* always be compatible
if( (getExportFlags() & EXPORT_OASIS) != 0 )
{
@@ -459,7 +452,7 @@ void SvXMLExport::_InitCtor()
// <--
}
-// --> OD 2006-03-14 #i51726#
+// Shapes in Writer cannot be named via context menu (#i51726#)
void SvXMLExport::_DetermineModelType()
{
meModelType = SvtModuleOptions::E_UNKNOWN_FACTORY;
@@ -469,18 +462,14 @@ void SvXMLExport::_DetermineModelType()
meModelType = SvtModuleOptions::ClassifyFactoryByModel( mxModel );
}
}
-// <--
-// #110680#
SvXMLExport::SvXMLExport(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
MapUnit eDfltUnit, const enum XMLTokenEnum eClass, sal_uInt16 nExportFlags )
: mpImpl( new SvXMLExport_Impl ),
- // #110680#
mxServiceFactory(xServiceFactory),
mpAttrList( new SvXMLAttributeList ),
mpNamespaceMap( new SvXMLNamespaceMap ),
- // #110680#
mpUnitConv( new SvXMLUnitConverter( MAP_100TH_MM, eDfltUnit, getServiceFactory() ) ),
mpNumExport(0L),
mpProgressBarHelper( NULL ),
@@ -498,21 +487,18 @@ SvXMLExport::SvXMLExport(
_InitCtor();
}
-// #110680#
SvXMLExport::SvXMLExport(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
const OUString &rFileName,
const uno::Reference< xml::sax::XDocumentHandler > & rHandler,
MapUnit eDfltUnit )
: mpImpl( new SvXMLExport_Impl ),
- // #110680#
mxServiceFactory(xServiceFactory),
mxHandler( rHandler ),
mxExtHandler( rHandler, uno::UNO_QUERY ),
mpAttrList( new SvXMLAttributeList ),
msOrigFileName( rFileName ),
mpNamespaceMap( new SvXMLNamespaceMap ),
- // #110680#
mpUnitConv( new SvXMLUnitConverter( MAP_100TH_MM, eDfltUnit, getServiceFactory() ) ),
mpNumExport(0L),
mpProgressBarHelper( NULL ),
@@ -534,7 +520,6 @@ SvXMLExport::SvXMLExport(
mpNumExport = new SvXMLNumFmtExport(*this, mxNumberFormatsSupplier);
}
-// #110680#
SvXMLExport::SvXMLExport(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
const OUString &rFileName,
@@ -542,7 +527,6 @@ SvXMLExport::SvXMLExport(
const Reference< XModel >& rModel,
sal_Int16 eDfltUnit )
: mpImpl( new SvXMLExport_Impl ),
- // #110680#
mxServiceFactory(xServiceFactory),
mxModel( rModel ),
mxHandler( rHandler ),
@@ -551,8 +535,6 @@ SvXMLExport::SvXMLExport(
mpAttrList( new SvXMLAttributeList ),
msOrigFileName( rFileName ),
mpNamespaceMap( new SvXMLNamespaceMap ),
- // #110680#
- // pUnitConv( new SvXMLUnitConverter( MAP_100TH_MM, SvXMLUnitConverter::GetMapUnit(eDfltUnit) ) ),
mpUnitConv( new SvXMLUnitConverter( MAP_100TH_MM, SvXMLUnitConverter::GetMapUnit(eDfltUnit), getServiceFactory() ) ),
mpNumExport(0L),
mpProgressBarHelper( NULL ),
@@ -574,7 +556,6 @@ SvXMLExport::SvXMLExport(
mpNumExport = new SvXMLNumFmtExport(*this, mxNumberFormatsSupplier);
}
-// #110680#
SvXMLExport::SvXMLExport(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
const OUString &rFileName,
@@ -583,7 +564,6 @@ SvXMLExport::SvXMLExport(
const Reference< document::XGraphicObjectResolver >& rEmbeddedGraphicObjects,
sal_Int16 eDfltUnit )
: mpImpl( new SvXMLExport_Impl ),
- // #110680#
mxServiceFactory(xServiceFactory),
mxModel( rModel ),
mxHandler( rHandler ),
@@ -593,7 +573,6 @@ SvXMLExport::SvXMLExport(
mpAttrList( new SvXMLAttributeList ),
msOrigFileName( rFileName ),
mpNamespaceMap( new SvXMLNamespaceMap ),
- // #110680#
mpUnitConv( new SvXMLUnitConverter( MAP_100TH_MM, SvXMLUnitConverter::GetMapUnit(eDfltUnit), getServiceFactory() ) ),
mpNumExport(0L),
mpProgressBarHelper( NULL ),
@@ -724,12 +703,10 @@ void SAL_CALL SvXMLExport::setSourceDocument( const uno::Reference< lang::XCompo
}
}
- // --> PB 2007-07-06 #i146851#
if ( mpImpl->mbSaveBackwardCompatibleODF )
mnExportFlags |= EXPORT_SAVEBACKWARDCOMPATIBLE;
else
mnExportFlags &= ~EXPORT_SAVEBACKWARDCOMPATIBLE;
- // <--
// namespaces for user defined attributes
Reference< XMultiServiceFactory > xFactory( mxModel, UNO_QUERY );
@@ -765,9 +742,8 @@ void SAL_CALL SvXMLExport::setSourceDocument( const uno::Reference< lang::XCompo
}
}
- // --> OD 2006-03-10 #i51726# - determine model type
+ // Determine model type (#i51726#)
_DetermineModelType();
- // <--
}
// XInitialize
@@ -857,7 +833,7 @@ void SAL_CALL SvXMLExport::initialize( const uno::Sequence< uno::Any >& aArgumen
}
mpImpl->mStreamName = sName; // Note: may be empty (XSLT)
- // --> OD 2006-09-26 #i69627#
+ // Written OpenDocument file format doesn't fit to the created text document (#i69627#)
const ::rtl::OUString sOutlineStyleAsNormalListStyle(
RTL_CONSTASCII_USTRINGPARAM("OutlineStyleAsNormalListStyle") );
if( xPropertySetInfo->hasPropertyByName( sOutlineStyleAsNormalListStyle ) )
@@ -865,13 +841,11 @@ void SAL_CALL SvXMLExport::initialize( const uno::Sequence< uno::Any >& aArgumen
uno::Any aAny = mxExportInfo->getPropertyValue( sOutlineStyleAsNormalListStyle );
aAny >>= (mpImpl->mbOutlineStyleAsNormalListStyle);
}
- // <--
OUString sTargetStorage( RTL_CONSTASCII_USTRINGPARAM("TargetStorage") );
if( xPropertySetInfo->hasPropertyByName( sTargetStorage ) )
mxExportInfo->getPropertyValue( sTargetStorage ) >>= mpImpl->mxTargetStorage;
- // --> OD 2008-11-26 #158694#
const ::rtl::OUString sExportTextNumberElement(
RTL_CONSTASCII_USTRINGPARAM("ExportTextNumberElement") );
if( xPropertySetInfo->hasPropertyByName( sExportTextNumberElement ) )
@@ -879,7 +853,6 @@ void SAL_CALL SvXMLExport::initialize( const uno::Sequence< uno::Any >& aArgumen
uno::Any aAny = mxExportInfo->getPropertyValue( sExportTextNumberElement );
aAny >>= (mpImpl->mbExportTextNumberElement);
}
- // <--
}
}
@@ -950,8 +923,8 @@ sal_Bool SAL_CALL SvXMLExport::filter( const uno::Sequence< beans::PropertyValue
aSeq, e.Message, NULL );
}
- // return true only if no error occured
- return (GetErrorFlags() & (ERROR_DO_NOTHING|ERROR_ERROR_OCCURED)) == 0;
+ // return true only if no error occurred
+ return (GetErrorFlags() & (ERROR_DO_NOTHING|ERROR_ERROR_OCCURRED)) == 0;
}
void SAL_CALL SvXMLExport::cancel() throw(uno::RuntimeException)
@@ -1240,19 +1213,6 @@ void SvXMLExport::ImplExportAutoStyles( sal_Bool )
SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE,
XML_AUTOMATIC_STYLES, sal_True, sal_True );
-#if 0
- AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
- AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, XML_STYLES_HREF );
- AddAttribute( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD );
- AddAttribute( XML_NAMESPACE_XLINK, XML_ROLE,
- pNamespaceMap->GetQNameByKey( XML_NAMESPACE_OFFICE,
- GetXMLToken(XML_STYLESHEET)) );
- {
- // <style:use-styles>
- SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE,
- XML_USE_STYLES, sal_True, sal_True );
- }
-#endif
_ExportAutoStyles();
}
}
@@ -1267,19 +1227,6 @@ void SvXMLExport::ImplExportMasterStyles( sal_Bool )
_ExportMasterStyles();
}
-#if 0
- AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
- AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, XML_AUTO_STYLES_HREF );
- AddAttribute( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD );
- AddAttribute( XML_NAMESPACE_XLINK, XML_ROLE,
- pNamespaceMap->GetQNameByKey( XML_NAMESPACE_OFFICE,
- GetXMLToken(XML_STYLESHEET) ) );
- {
- // <style:use-styles>
- SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE,
- XML_USE_STYLES, sal_True, sal_True );
- }
-#endif
}
void SvXMLExport::ImplExportContent()
@@ -1403,7 +1350,7 @@ sal_uInt32 SvXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum eClass )
// get filter component
Reference< xml::sax::XDocumentHandler > xTmpDocHandler(
xFactory->createInstanceWithArguments(
- OUString::createFromAscii("com.sun.star.comp.Oasis2OOoTransformer"),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Oasis2OOoTransformer")),
aArgs), UNO_QUERY);
OSL_ENSURE( xTmpDocHandler.is(),
"can't instantiate OASIS transformer component" );
@@ -2447,14 +2394,14 @@ void SvXMLExport::SetError(
const Reference<XLocator>& rLocator )
{
// allow multi-threaded access to the cancel() method
- static ::vos::OMutex aMutex;
- ::vos::OGuard aGuard(aMutex);
+ static osl::Mutex aMutex;
+ osl::MutexGuard aGuard(aMutex);
// maintain error flags
if ( ( nId & XMLERROR_FLAG_ERROR ) != 0 )
- mnErrorFlags |= ERROR_ERROR_OCCURED;
+ mnErrorFlags |= ERROR_ERROR_OCCURRED;
if ( ( nId & XMLERROR_FLAG_WARNING ) != 0 )
- mnErrorFlags |= ERROR_WARNING_OCCURED;
+ mnErrorFlags |= ERROR_WARNING_OCCURRED;
if ( ( nId & XMLERROR_FLAG_SEVERE ) != 0 )
mnErrorFlags |= ERROR_DO_NOTHING;
@@ -2483,16 +2430,13 @@ XMLErrors* SvXMLExport::GetErrors()
void SvXMLExport::DisposingModel()
{
mxModel.clear();
- // --> OD 2006-03-13 #i51726#
+ // Shapes in Writer cannot be named via context menu (#i51726#)
meModelType = SvtModuleOptions::E_UNKNOWN_FACTORY;;
- // <--
mxEventListener.clear();
}
-// #110680#
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > SvXMLExport::getServiceFactory()
{
- // #110680#
return mxServiceFactory;
}
@@ -2507,12 +2451,11 @@ SvXMLExport::GetComponentContext() const
return mpImpl->maInterfaceToIdentifierMapper;
}
-// --> OD 2006-09-27 #i69627#
+// Written OpenDocument file format doesn't fit to the created text document (#i69627#)
sal_Bool SvXMLExport::writeOutlineStyleAsNormalListStyle() const
{
return mpImpl->mbOutlineStyleAsNormalListStyle;
}
-// <--
uno::Reference< embed::XStorage > SvXMLExport::GetTargetStorage()
{
@@ -2589,7 +2532,7 @@ SvXMLExport::AddAttributeXmlId(uno::Reference<uno::XInterface> const & i_xIfc)
// a) just omit styles.xml ids -- they are unlikely anyway...
// b) somehow find out whether we are currently exporting styles
// or content, and prefix "s" or "c" => unique
- if ( mdref.First.equalsAscii("content.xml") )
+ if ( mdref.First.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("content.xml")) )
{
AddAttribute( XML_NAMESPACE_XML, XML_ID, mdref.Second );
}
@@ -2628,12 +2571,10 @@ SvXMLExport::AddAttributesRDFa(
mpImpl->mpRDFaHelper->AddRDFa(xMeta);
}
-// --> OD 2008-11-26 #158694#
sal_Bool SvXMLExport::exportTextNumberElement() const
{
return mpImpl->mbExportTextNumberElement;
}
-// <--
sal_Bool SvXMLExport::SetNullDateOnUnitConverter()
{
@@ -2757,3 +2698,4 @@ SvXMLElementExport::~SvXMLElementExport()
}
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/xmlictxt.cxx b/xmloff/source/core/xmlictxt.cxx
index 62a7832024..34feaa1de0 100644
--- a/xmloff/source/core/xmlictxt.cxx
+++ b/xmloff/source/core/xmlictxt.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -82,3 +83,4 @@ void SvXMLImportContext::Characters( const OUString& )
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 6291672af7..efc7799889 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -182,14 +183,11 @@ public:
::rtl::OUString aODFVersion;
- // --> OD 2004-08-10 #i28749# - boolean, indicating that position attributes
+ // Boolean, indicating that position attributes
// of shapes are given in horizontal left-to-right layout. This is the case
- // for the OpenOffice.org file format.
+ // for the OpenOffice.org file format. (#i28749#)
sal_Bool mbShapePositionInHoriL2R;
- // <--
- // --> OD 2007-12-19 #152540#
sal_Bool mbTextDocInOOoFileFormat;
- // <--
const uno::Reference< uno::XComponentContext > mxComponentContext;
@@ -200,12 +198,9 @@ public:
mbOwnGraphicResolver( false ),
mbOwnEmbeddedResolver( false ),
mStreamName(),
- // --> OD 2004-08-11 #i28749#
+ // Convert drawing object positions from OOo file format to OASIS (#i28749#)
mbShapePositionInHoriL2R( sal_False ),
- // <--
- // --> OD 2007-12-19 #152540#
mbTextDocInOOoFileFormat( sal_False ),
- // <--
mxComponentContext( ::comphelper::getProcessComponentContext() ),
mpRDFaHelper() // lazy
{
@@ -309,6 +304,9 @@ void SvXMLImport::_InitCtor()
mpNamespaceMap->Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__xforms) ),
GetXMLToken(XML_N_XFORMS_1_0),
XML_NAMESPACE_XFORMS );
+ mpNamespaceMap->Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__formx) ),
+ GetXMLToken( XML_N_FORMX ),
+ XML_NAMESPACE_FORMX );
mpNamespaceMap->Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__xsd) ),
GetXMLToken(XML_N_XSD),
XML_NAMESPACE_XSD );
@@ -323,6 +321,9 @@ void SvXMLImport::_InitCtor()
mpNamespaceMap->Add(
OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__xhtml ) ),
GetXMLToken(XML_N_XHTML), XML_NAMESPACE_XHTML );
+ mpNamespaceMap->Add(
+ OUString( RTL_CONSTASCII_USTRINGPARAM( sXML_np__css3text ) ),
+ GetXMLToken(XML_N_CSS3TEXT), XML_NAMESPACE_CSS3TEXT );
}
msPackageProtocol = OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.Package:" ) );
@@ -659,7 +660,7 @@ void SAL_CALL SvXMLImport::startElement( const OUString& rName,
for( INT16 i=0; i < nAttrCount; i++ )
{
const OUString& rAttrName = xAttrList->getNameByIndex( i );
- if ( rAttrName.equalsAscii("office:version") )
+ if ( rAttrName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("office:version")) )
{
mpImpl->aODFVersion = xAttrList->getValueByIndex( i );
@@ -990,22 +991,19 @@ void SAL_CALL SvXMLImport::initialize( const uno::Sequence< uno::Any >& aArgumen
mpImpl->aBaseURL.insertName( sName );
}
mpImpl->mStreamName = sName; // Note: may be empty (XSLT)
- // --> OD 2004-08-10 #i28749# - retrieve property <ShapePositionInHoriL2R>
+ // Retrieve property <ShapePositionInHoriL2R> (#i28749#)
sPropName = OUString( RTL_CONSTASCII_USTRINGPARAM("ShapePositionInHoriL2R" ) );
if( xPropertySetInfo->hasPropertyByName(sPropName) )
{
uno::Any aAny = mxImportInfo->getPropertyValue(sPropName);
aAny >>= (mpImpl->mbShapePositionInHoriL2R);
}
- // <--
- // --> OD 2007-12-19 #152540#
sPropName = OUString( RTL_CONSTASCII_USTRINGPARAM("TextDocInOOoFileFormat" ) );
if( xPropertySetInfo->hasPropertyByName(sPropName) )
{
uno::Any aAny = mxImportInfo->getPropertyValue(sPropName);
aAny >>= (mpImpl->mbTextDocInOOoFileFormat);
}
- // <--
}
}
}
@@ -1754,9 +1752,9 @@ void SvXMLImport::SetError(
{
// maintain error flags
if ( ( nId & XMLERROR_FLAG_ERROR ) != 0 )
- mnErrorFlags |= ERROR_ERROR_OCCURED;
+ mnErrorFlags |= ERROR_ERROR_OCCURRED;
if ( ( nId & XMLERROR_FLAG_WARNING ) != 0 )
- mnErrorFlags |= ERROR_WARNING_OCCURED;
+ mnErrorFlags |= ERROR_WARNING_OCCURRED;
if ( ( nId & XMLERROR_FLAG_SEVERE ) != 0 )
mnErrorFlags |= ERROR_DO_NOTHING;
@@ -1889,21 +1887,17 @@ String SvXMLImport::GetDocumentBase() const
return mpImpl->mStreamName;
}
-// --> OD 2004-08-10 #i28749#
+// Convert drawing object positions from OOo file format to OASIS (#i28749#)
sal_Bool SvXMLImport::IsShapePositionInHoriL2R() const
{
return mpImpl->mbShapePositionInHoriL2R;
}
-// <--
-// --> OD 2007-12-19 #152540#
sal_Bool SvXMLImport::IsTextDocInOOoFileFormat() const
{
return mpImpl->mbTextDocInOOoFileFormat;
}
-// <--
-
void SvXMLImport::initXForms()
{
// dummy method; to be implemented by derived classes supporting XForms
@@ -2013,3 +2007,4 @@ SvXMLImport::AddRDFa(uno::Reference<rdf::XMetadatable> i_xObject,
i_rAbout, i_rProperty, i_rContent, i_rDatatype);
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/xmltkmap.cxx b/xmloff/source/core/xmltkmap.cxx
index fcab07679e..be06698d95 100644
--- a/xmloff/source/core/xmltkmap.cxx
+++ b/xmloff/source/core/xmltkmap.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -120,3 +121,4 @@ sal_uInt16 SvXMLTokenMap::Get( sal_uInt16 nKeyPrefix,
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index a0ad3b873d..0af77a102c 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,6 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_xmloff.hxx"
+#include <sal/macros.h>
#include <xmloff/xmltoken.hxx>
#include <tools/debug.hxx>
#include <rtl/ustring.hxx>
@@ -614,6 +616,7 @@ namespace xmloff { namespace token {
TOKEN( "distance", XML_DISTANCE ),
TOKEN( "distance-after-sep", XML_DISTANCE_AFTER_SEP ),
TOKEN( "distance-before-sep", XML_DISTANCE_BEFORE_SEP ),
+ TOKEN( "distribute", XML_DISTRIBUTE ),
TOKEN( "distribute-letter", XML_DISTRIBUTE_LETTER ),
TOKEN( "distribute-space", XML_DISTRIBUTE_SPACE ),
TOKEN( "divide", XML_DIVIDE ),
@@ -927,14 +930,13 @@ namespace xmloff { namespace token {
TOKEN( "hint", XML_HINT),
TOKEN( "horizontal", XML_HORIZONTAL ),
TOKEN( "horizontal-lines", XML_HORIZONTAL_LINES ),
- // --> OD 2005-05-12 #i49139#
- // XML_HORIZONTAL_ON_LEFT_PAGES and XML_HORIZONTAL_ON_RIGHT_PAGES
- // are replaced by XML_HORIZONTAL_ON_EVEN and XML_HORIZONTAL_ON_ODD.
- // Usage is deprecated, but the old token are needed for the
- // OpenOffice.org file format import/export filter for the renaming
+ /* XML_HORIZONTAL_ON_LEFT_PAGES and XML_HORIZONTAL_ON_RIGHT_PAGES
+ are replaced by XML_HORIZONTAL_ON_EVEN and XML_HORIZONTAL_ON_ODD.
+ Usage is deprecated, but the old token are needed for the
+ OpenOffice.org file format import/export filter for the renaming (#i49139#)
+ */
TOKEN( "horizontal-on-left-pages", XML_HORIZONTAL_ON_LEFT_PAGES ),
TOKEN( "horizontal-on-right-pages", XML_HORIZONTAL_ON_RIGHT_PAGES ),
- // <--
TOKEN( "horizontal-pos", XML_HORIZONTAL_POS ),
TOKEN( "horizontal-rel", XML_HORIZONTAL_REL ),
TOKEN( "horizontal-scrollbar-width", XML_HORIZONTAL_SCROLLBAR_WIDTH ),
@@ -1419,6 +1421,8 @@ namespace xmloff { namespace token {
TOKEN( "size", XML_PROTECT_SIZE ),
TOKEN( "protected", XML_PROTECTED ),
TOKEN( "protection-key", XML_PROTECTION_KEY ),
+ TOKEN( "protection-key-digest-algorithm", XML_PROTECTION_KEY_DIGEST_ALGORITHM ),
+ TOKEN( "protection-key-digest-algorithm-2", XML_PROTECTION_KEY_DIGEST_ALGORITHM_2 ),
TOKEN( "prsubset", XML_PRSUBSET ),
TOKEN( "publisher", XML_PUBLISHER ),
TOKEN( "punctuation-wrap", XML_PUNCTUATION_WRAP ),
@@ -1528,6 +1532,8 @@ namespace xmloff { namespace token {
TOKEN( "section-name", XML_SECTION_NAME ),
TOKEN( "section-source", XML_SECTION_SOURCE ),
TOKEN( "select-page", XML_SELECT_PAGE ),
+ TOKEN( "select-protected-cells", XML_SELECT_PROTECTED_CELLS ),
+ TOKEN( "select-unprotected-cells", XML_SELECT_UNPROTECTED_CELLS ),
TOKEN( "selector", XML_SELECTOR ),
TOKEN( "semantics", XML_SEMANTICS ),
TOKEN( "semi-automatic", XML_SEMI_AUTOMATIC ),
@@ -1740,6 +1746,7 @@ namespace xmloff { namespace token {
TOKEN( "table-of-content-entry-template", XML_TABLE_OF_CONTENT_ENTRY_TEMPLATE ),
TOKEN( "table-of-content-source", XML_TABLE_OF_CONTENT_SOURCE ),
TOKEN( "table-page", XML_TABLE_PAGE ),
+ TOKEN( "table-protection", XML_TABLE_PROTECTION ),
TOKEN( "table-row", XML_TABLE_ROW ),
TOKEN( "table-row-group", XML_TABLE_ROW_GROUP ),
TOKEN( "table-rows", XML_TABLE_ROWS ),
@@ -1779,6 +1786,7 @@ namespace xmloff { namespace token {
TOKEN( "text-global", XML_TEXT_GLOBAL ),
TOKEN( "text-indent", XML_TEXT_INDENT ),
TOKEN( "text-input", XML_TEXT_INPUT ),
+ TOKEN( "text-justify", XML_TEXT_JUSTIFY ),
TOKEN( "text-outline", XML_TEXT_OUTLINE ),
TOKEN( "text-position", XML_TEXT_POSITION ),
TOKEN( "text-rotation-angle", XML_TEXT_ROTATION_ANGLE ),
@@ -1912,6 +1920,7 @@ namespace xmloff { namespace token {
TOKEN( "version-list", XML_VERSION_LIST ),
TOKEN( "vertical", XML_VERTICAL ),
TOKEN( "vertical-align", XML_VERTICAL_ALIGN ),
+ TOKEN( "vertical-justify", XML_VERTICAL_JUSTIFY ),
TOKEN( "vertical-lines", XML_VERTICAL_LINES ),
TOKEN( "vertical-pos", XML_VERTICAL_POS ),
TOKEN( "vertical-rel", XML_VERTICAL_REL ),
@@ -2363,8 +2372,7 @@ namespace xmloff { namespace token {
// OD 2004-05-05 #i28701#
TOKEN( "wrap-influence-on-position", XML_WRAP_INFLUENCE_ON_POSITION ),
- // --> OD 2004-10-18 #i35017# - tokens have been renamed and
- // <XML_ITERATIVE> has been added
+ // Tokens have been renamed and <XML_ITERATIVE> has been added (#i35017#)
TOKEN( "once-successive", XML_ONCE_SUCCESSIVE ),
TOKEN( "once-concurrent", XML_ONCE_CONCURRENT ),
@@ -2516,6 +2524,7 @@ namespace xmloff { namespace token {
TOKEN( "show-filter-button", XML_SHOW_FILTER_BUTTON ),
TOKEN( "drill-down-on-double-click", XML_DRILL_DOWN_ON_DOUBLE_CLICK ),
+ TOKEN( "header-grid-layout", XML_HEADER_GRID_LAYOUT ),
TOKEN( "grouped-by", XML_GROUPED_BY ),
TOKEN( "days", XML_DAYS ),
TOKEN( "months", XML_MONTHS ),
@@ -2876,12 +2885,10 @@ namespace xmloff { namespace token {
TOKEN( "http://www.w3.org/", XML_URI_W3_PREFIX ),
TOKEN( "/xforms", XML_URI_XFORMS_SUFFIX ),
- // --> OD 2005-05-12 #i49139#
- // XML_HORIZONTAL_ON_LEFT_PAGES and XML_HORIZONTAL_ON_RIGHT_PAGES
- // are replaced by XML_HORIZONTAL_ON_EVEN and XML_HORIZONTAL_ON_ODD.
+ /* XML_HORIZONTAL_ON_LEFT_PAGES and XML_HORIZONTAL_ON_RIGHT_PAGES
+ are replaced by XML_HORIZONTAL_ON_EVEN and XML_HORIZONTAL_ON_ODD. (#i49139#)
+ */
TOKEN( "horizontal-on-even", XML_HORIZONTAL_ON_EVEN ),
- // <--
- // --> OJ 2005-09-01
TOKEN( "urn:oasis:names:tc:opendocument:xmlns:report:1.0", XML_N_RPT_OASIS ),
TOKEN( "http://openoffice.org/2005/report", XML_N_RPT ),
TOKEN( "group", XML_GROUP ),
@@ -2957,15 +2964,11 @@ namespace xmloff { namespace token {
TOKEN( "odd-rows", XML_ODD_ROWS ),
TOKEN( "even-columns", XML_EVEN_COLUMNS ),
TOKEN( "odd-columns", XML_ODD_COLUMNS ),
-
- // <--
TOKEN( "horizontal-on-odd", XML_HORIZONTAL_ON_ODD ),
- // --> OD 2005-10-10 #i45874#
+ // Password error from 1.4 to 2.0 Beta (#i45874#)
TOKEN( "restart-numbering", XML_RESTART_NUMBERING),
- // <--
- // -> FLR #i52127#
+ // OpenDocument <text:numbered-paragraph> element not supported on OpenDocument import (#i52127#)
TOKEN( "numbered-paragraph", XML_NUMBERED_PARAGRAPH),
- // <--
TOKEN( "master-detail-fields", XML_MASTER_DETAIL_FIELDS),
TOKEN( "master-detail-field", XML_MASTER_DETAIL_FIELD),
TOKEN( "sub-document", XML_SUB_DOCUMENT),
@@ -3023,11 +3026,9 @@ namespace xmloff { namespace token {
TOKEN( "table-include-filter", XML_TABLE_INCLUDE_FILTER ),
TOKEN( "default-row-style-name", XML_DEFAULT_ROW_STYLE_NAME),
TOKEN( "angle-offset", XML_ANGLE_OFFSET ),
- // --> OD 2007-09-14 #i81002#
+ // Core implementation for direct cross-references (#i81002#)
TOKEN( "number-no-superior", XML_NUMBER_NO_SUPERIOR ),
TOKEN( "number-all-superior", XML_NUMBER_ALL_SUPERIOR ),
- // <--
- // --> OD 2008-01-15 #newlistlevelattrs#
TOKEN( "list-level-position-and-space-mode", XML_LIST_LEVEL_POSITION_AND_SPACE_MODE ),
TOKEN( "label-width-and-position", XML_LABEL_WIDTH_AND_POSITION ),
TOKEN( "label-alignment", XML_LABEL_ALIGNMENT ),
@@ -3037,7 +3038,6 @@ namespace xmloff { namespace token {
TOKEN( "space", XML_SPACE ),
TOKEN( "nothing", XML_NOTHING ),
TOKEN( "list-tab-stop-position", XML_LIST_TAB_STOP_POSITION ),
- // <--
// bm: chart error bar extensions (ODF 1.2)
TOKEN( "standard-error", XML_STANDARD_ERROR ),
@@ -3045,12 +3045,10 @@ namespace xmloff { namespace token {
TOKEN( "error-lower-range", XML_ERROR_LOWER_RANGE ),
TOKEN( "error-upper-range", XML_ERROR_UPPER_RANGE ),
- // --> OD 2008-04-22 #refactorlists#
TOKEN( "continue-list", XML_CONTINUE_LIST ),
TOKEN( "style-override", XML_STYLE_OVERRIDE ),
- // <--
- //
- // fs: #i90243#
+
+ // XForms: Changes to model should optionally set document's modified state. (#i90243#)
TOKEN( "xforms-settings", XML_XFORM_MODEL_SETTINGS ),
// ODF 1.2 metadata
@@ -3144,7 +3142,7 @@ namespace xmloff { namespace token {
#endif
DBG_ASSERT( eToken > XML_TOKEN_INVALID, "token value too low!" );
DBG_ASSERT( eToken < XML_TOKEN_END, "token value too high!" );
- DBG_ASSERT(sal_uInt16(eToken) < sizeof(aTokenList)/sizeof(aTokenList[0]),"Illegal position!");
+ DBG_ASSERT(sal_uInt16(eToken) < SAL_N_ELEMENTS(aTokenList),"Illegal position!");
XMLTokenEntry* pToken = &aTokenList[(sal_uInt16)eToken];
if (!pToken->pOUString)
@@ -3197,3 +3195,4 @@ namespace xmloff { namespace token {
}
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx
index e2295cb250..a436850fef 100644
--- a/xmloff/source/core/xmluconv.cxx
+++ b/xmloff/source/core/xmluconv.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -50,9 +51,7 @@
#include <tools/fldunit.hxx>
// #110680#
-//#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
//#include <comphelper/processfactory.hxx>
-//#endif
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include <com/sun/star/style/NumberingType.hpp>
#include <com/sun/star/text/XNumberingTypeInfo.hpp>
@@ -441,7 +440,7 @@ void SvXMLUnitConverter::convertMeasure( OUStringBuffer& rBuffer,
}
/** convert string to boolean */
-sal_Bool SvXMLUnitConverter::convertBool( sal_Bool& rBool,
+sal_Bool SvXMLUnitConverter::convertBool( bool& rBool,
const OUString& rString )
{
rBool = IsXMLToken(rString, XML_TRUE);
@@ -1729,7 +1728,6 @@ void SvXMLUnitConverter::convertNumFormat( OUStringBuffer& rBuffer,
sal_Int16 nType ) const
{
enum XMLTokenEnum eFormat = XML_TOKEN_INVALID;
- sal_Bool bExt = sal_False;
switch( nType )
{
case NumberingType::CHARS_UPPER_LETTER: eFormat = XML_A_UPCASE; break;
@@ -1747,7 +1745,6 @@ void SvXMLUnitConverter::convertNumFormat( OUStringBuffer& rBuffer,
DBG_ASSERT( eFormat != XML_TOKEN_INVALID, "invalid number format" );
break;
default:
- bExt = sal_True;
break;
}
@@ -1902,8 +1899,8 @@ OUString SvXMLUnitConverter::encodeStyleName(
->xCharClass =
Reference < XCharacterClassification >(
mxServiceFactory->createInstance(
- OUString::createFromAscii(
- "com.sun.star.i18n.CharacterClassification_Unicode") ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.i18n.CharacterClassification_Unicode")) ),
UNO_QUERY );
OSL_ENSURE( xCharClass.is(),
@@ -2245,15 +2242,15 @@ sal_Bool SvXMLUnitConverter::convertAny( com::sun::star::uno::Any& aValue,
{
sal_Bool bConverted = sal_False;
- if (sType.equalsAscii("boolean"))
+ if (sType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("boolean")))
{
- sal_Bool bTempValue = sal_False;
+ bool bTempValue = false;
SvXMLUnitConverter::convertBool(bTempValue, sValue);
aValue <<= bTempValue;
bConverted = sal_True;
}
else
- if (sType.equalsAscii("integer"))
+ if (sType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("integer")))
{
sal_Int32 nTempValue = 0;
SvXMLUnitConverter::convertNumber(nTempValue, sValue);
@@ -2261,7 +2258,7 @@ sal_Bool SvXMLUnitConverter::convertAny( com::sun::star::uno::Any& aValue,
bConverted = sal_True;
}
else
- if (sType.equalsAscii("float"))
+ if (sType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("float")))
{
double fTempValue = 0.0;
SvXMLUnitConverter::convertDouble(fTempValue, sValue);
@@ -2269,13 +2266,13 @@ sal_Bool SvXMLUnitConverter::convertAny( com::sun::star::uno::Any& aValue,
bConverted = sal_True;
}
else
- if (sType.equalsAscii("string"))
+ if (sType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("string")))
{
aValue <<= sValue;
bConverted = sal_True;
}
else
- if (sType.equalsAscii("date"))
+ if (sType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("date")))
{
com::sun::star::util::DateTime aTempValue;
SvXMLUnitConverter::convertDateTime(aTempValue, sValue);
@@ -2283,7 +2280,7 @@ sal_Bool SvXMLUnitConverter::convertAny( com::sun::star::uno::Any& aValue,
bConverted = sal_True;
}
else
- if (sType.equalsAscii("time"))
+ if (sType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("time")))
{
com::sun::star::util::DateTime aTempValue;
com::sun::star::util::Time aConvValue;
@@ -2298,3 +2295,5 @@ sal_Bool SvXMLUnitConverter::convertAny( com::sun::star::uno::Any& aValue,
return bConverted;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/EnhancedCustomShapeToken.cxx b/xmloff/source/draw/EnhancedCustomShapeToken.cxx
index 8f97a89007..2b02915545 100644
--- a/xmloff/source/draw/EnhancedCustomShapeToken.cxx
+++ b/xmloff/source/draw/EnhancedCustomShapeToken.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -219,3 +220,5 @@ rtl::OUString EASGet( const EnhancedCustomShapeTokenEnum eToken )
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
index 55bdab987c..f4b1e0e6fa 100644
--- a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
+++ b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,9 +35,7 @@
#include "xmloff/xmlnmspe.hxx"
#include <xmloff/xmltoken.hxx>
-#ifndef _XMLOFF_FAMILIES_HXX
#include <xmloff/families.hxx>
-#endif
#include "XMLShapePropertySetContext.hxx"
#include <xmloff/XMLGraphicsDefaultStyle.hxx>
@@ -127,3 +126,4 @@ void XMLGraphicsDefaultStyle::SetDefaults()
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/XMLImageMapContext.cxx b/xmloff/source/draw/XMLImageMapContext.cxx
index a6b74ca40a..7b143ac41d 100644
--- a/xmloff/source/draw/XMLImageMapContext.cxx
+++ b/xmloff/source/draw/XMLImageMapContext.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,17 +32,13 @@
#include <rtl/ustrbuf.hxx>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/beans/XPropertySet.hpp>
-#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSETINFO_HPP
#include <com/sun/star/beans/XPropertySetInfo.hpp>
-#endif
#include <com/sun/star/xml/sax/XAttributeList.hpp>
#include <com/sun/star/container/XIndexContainer.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/drawing/PointSequenceSequence.hpp>
-#ifndef _COM_SUN_STAR_DOCUMENT_XEVENTSSUPPLIER_HPP
#include <com/sun/star/document/XEventsSupplier.hpp>
-#endif
#include <com/sun/star/awt/Rectangle.hpp>
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlimp.hxx>
@@ -91,7 +88,7 @@ enum XMLImageMapToken
XML_TOK_IMAP_TARGET
};
-static __FAR_DATA SvXMLTokenMapEntry aImageMapObjectTokenMap[] =
+static SvXMLTokenMapEntry aImageMapObjectTokenMap[] =
{
{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_IMAP_URL },
{ XML_NAMESPACE_OFFICE, XML_NAME, XML_TOK_IMAP_NAME },
@@ -721,3 +718,4 @@ void XMLImageMapContext::EndElement()
xPropertySet->setPropertyValue(sImageMap, uno::makeAny( xImageMap ) );
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/XMLImageMapExport.cxx b/xmloff/source/draw/XMLImageMapExport.cxx
index 13495df8ac..3e28543678 100644
--- a/xmloff/source/draw/XMLImageMapExport.cxx
+++ b/xmloff/source/draw/XMLImageMapExport.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -37,9 +38,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/container/XIndexContainer.hpp>
-#ifndef _COM_SUN_STAR_DOCUMENT_XEVENTSSUPPLIER_HPP
#include <com/sun/star/document/XEventsSupplier.hpp>
-#endif
#include <com/sun/star/awt/Rectangle.hpp>
#include <com/sun/star/awt/Point.hpp>
#include <com/sun/star/awt/Size.hpp>
@@ -384,3 +383,5 @@ void XMLImageMapExport::ExportPolygon(
mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_POINTS,
aPoints.GetExportString());
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx
index 01ed62f1d0..a4c7315d2a 100644
--- a/xmloff/source/draw/XMLNumberStyles.cxx
+++ b/xmloff/source/draw/XMLNumberStyles.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -741,3 +742,5 @@ SvXMLImportContext * SdXMLNumberFormatImportContext::CreateChildContext( USHORT
{
return new SdXMLNumberFormatMemberImportContext( GetImport(), nPrefix, rLocalName, xAttrList, this, SvXMLNumFormatContext::CreateChildContext( nPrefix, rLocalName, xAttrList ) );
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/XMLNumberStylesExport.hxx b/xmloff/source/draw/XMLNumberStylesExport.hxx
index b9de191017..e2fbec51e5 100644
--- a/xmloff/source/draw/XMLNumberStylesExport.hxx
+++ b/xmloff/source/draw/XMLNumberStylesExport.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -51,3 +52,4 @@ public:
#endif // _XMLOFF_NUMBERSTYLESEXPORT_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/XMLReplacementImageContext.cxx b/xmloff/source/draw/XMLReplacementImageContext.cxx
index 6b51e9ccdb..db1abfb844 100644
--- a/xmloff/source/draw/XMLReplacementImageContext.cxx
+++ b/xmloff/source/draw/XMLReplacementImageContext.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -134,3 +135,4 @@ SvXMLImportContext *XMLReplacementImageContext::CreateChildContext(
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/XMLShapePropertySetContext.cxx b/xmloff/source/draw/XMLShapePropertySetContext.cxx
index 59a30c99b1..18e8c8d746 100644
--- a/xmloff/source/draw/XMLShapePropertySetContext.cxx
+++ b/xmloff/source/draw/XMLShapePropertySetContext.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,9 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_xmloff.hxx"
-#ifndef _XMLOFF_XMLSHAPEPROPERTYSETCONTEXT_HXX_
#include "XMLShapePropertySetContext.hxx"
-#endif
#include <xmloff/xmlimp.hxx>
#include <xmloff/xmlnumi.hxx>
#include "xmltabi.hxx"
@@ -114,3 +113,5 @@ SvXMLImportContext *XMLShapePropertySetContext::CreateChildContext(
return pContext;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/XMLShapeStyleContext.cxx b/xmloff/source/draw/XMLShapeStyleContext.cxx
index 6d3a1f9d5e..3e8299d62e 100644
--- a/xmloff/source/draw/XMLShapeStyleContext.cxx
+++ b/xmloff/source/draw/XMLShapeStyleContext.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -324,3 +325,4 @@ void XMLShapeStyleContext::Finish( sal_Bool /*bOverwrite*/ )
{
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx
index 72eef3acc0..fb0843e09a 100644
--- a/xmloff/source/draw/animationexport.cxx
+++ b/xmloff/source/draw/animationexport.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -525,11 +526,11 @@ public:
Reference< XInterface > getParagraphTarget( const ParagraphTarget* pTarget ) const;
- void convertPath( OUStringBuffer& sTmp, const Any& rPath );
- void convertValue( XMLTokenEnum eAttributeName, OUStringBuffer& sTmp, const Any& rValue );
- void convertTiming( OUStringBuffer& sTmp, const Any& rTiming );
- void convertSource( OUStringBuffer& sTmp, const Any& rSource );
- void convertTarget( OUStringBuffer& sTmp, const Any& rTarget );
+ void convertPath( OUStringBuffer& sTmp, const Any& rPath ) const;
+ void convertValue( XMLTokenEnum eAttributeName, OUStringBuffer& sTmp, const Any& rValue ) const;
+ void convertTiming( OUStringBuffer& sTmp, const Any& rTiming ) const;
+ void convertSource( OUStringBuffer& sTmp, const Any& rSource ) const;
+ void convertTarget( OUStringBuffer& sTmp, const Any& rTarget ) const;
void prepareValue( const Any& rValue );
@@ -1436,7 +1437,7 @@ Reference< XInterface > AnimationsExporterImpl::getParagraphTarget( const Paragr
return xRef;
}
-void AnimationsExporterImpl::convertPath( OUStringBuffer& sTmp, const Any& rPath )
+void AnimationsExporterImpl::convertPath( OUStringBuffer& sTmp, const Any& rPath ) const
{
OUString aStr;
rPath >>= aStr;
@@ -1444,7 +1445,7 @@ void AnimationsExporterImpl::convertPath( OUStringBuffer& sTmp, const Any& rPath
sTmp = aStr;
}
-void AnimationsExporterImpl::convertValue( XMLTokenEnum eAttributeName, OUStringBuffer& sTmp, const Any& rValue )
+void AnimationsExporterImpl::convertValue( XMLTokenEnum eAttributeName, OUStringBuffer& sTmp, const Any& rValue ) const
{
if( !rValue.hasValue() )
return;
@@ -1580,7 +1581,7 @@ void AnimationsExporterImpl::convertValue( XMLTokenEnum eAttributeName, OUString
*/
}
-void AnimationsExporterImpl::convertTiming( OUStringBuffer& sTmp, const Any& rValue )
+void AnimationsExporterImpl::convertTiming( OUStringBuffer& sTmp, const Any& rValue ) const
{
if( !rValue.hasValue() )
return;
@@ -1647,12 +1648,12 @@ void AnimationsExporterImpl::convertTiming( OUStringBuffer& sTmp, const Any& rVa
}
}
-void AnimationsExporterImpl::convertSource( OUStringBuffer& sTmp, const Any& rSource )
+void AnimationsExporterImpl::convertSource( OUStringBuffer& sTmp, const Any& rSource ) const
{
convertTarget( sTmp, rSource );
}
-void AnimationsExporterImpl::convertTarget( OUStringBuffer& sTmp, const Any& rTarget )
+void AnimationsExporterImpl::convertTarget( OUStringBuffer& sTmp, const Any& rTarget ) const
{
if( !rTarget.hasValue() )
return;
@@ -1780,3 +1781,5 @@ void AnimationsExporter::exportAnimations( Reference< XAnimationNode > xRootNode
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx
index 8e4e6c3685..90a1dbd261 100644
--- a/xmloff/source/draw/animationimport.cxx
+++ b/xmloff/source/draw/animationimport.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -165,7 +166,7 @@ const SvXMLTokenMap& AnimationsImportHelperImpl::getAnimationNodeTokenMap()
{
if( mpAnimationNodeTokenMap == NULL )
{
- static __FAR_DATA SvXMLTokenMapEntry aAnimationNodeTokenMap[] =
+ static SvXMLTokenMapEntry aAnimationNodeTokenMap[] =
{
{ XML_NAMESPACE_ANIMATION, XML_PAR, (sal_uInt16)AnimationNodeType::PAR },
{ XML_NAMESPACE_ANIMATION, XML_SEQ, (sal_uInt16)AnimationNodeType::SEQ },
@@ -244,7 +245,7 @@ const SvXMLTokenMap& AnimationsImportHelperImpl::getAnimationNodeAttributeTokenM
{
if( mpAnimationNodeAttributeTokenMap == NULL )
{
- static __FAR_DATA SvXMLTokenMapEntry aAnimationNodeAttributeTokenMap[] =
+ static SvXMLTokenMapEntry aAnimationNodeAttributeTokenMap[] =
{
{ XML_NAMESPACE_SMIL, XML_BEGIN, (sal_uInt16)ANA_Begin },
{ XML_NAMESPACE_SMIL, XML_DUR, (sal_uInt16)ANA_Dur },
@@ -529,8 +530,8 @@ Sequence< Any > AnimationsImportHelperImpl::convertValueSequence( XMLTokenEnum e
// fill the sequence
Any* pValues = aValues.getArray();
- sal_Int32 nIndex, nElement;
- for( nIndex = 0, nElement = 0; nElements && (nIndex >= 0); nElements-- )
+ sal_Int32 nIndex;
+ for( nIndex = 0; nElements && (nIndex >= 0); nElements-- )
{
*pValues++ = convertValue( eAttributeName, rValue.getToken( 0, ';', nIndex ) );
}
@@ -873,7 +874,7 @@ void AnimationNodeContext::init_node( const ::com::sun::star::uno::Reference< :
break;
case ANA_AutoReverse:
{
- sal_Bool bTemp;
+ bool bTemp;
if( SvXMLUnitConverter::convertBool( bTemp, rValue ) )
mxNode->setAutoReverse( bTemp );
}
@@ -918,7 +919,7 @@ void AnimationNodeContext::init_node( const ::com::sun::star::uno::Reference< :
break;
case ANA_After_Effect:
{
- sal_Bool bTemp;
+ bool bTemp;
if( SvXMLUnitConverter::convertBool( bTemp, rValue ) )
aUserData.push_back( NamedValue( GetXMLToken( XML_AFTER_EFFECT ), makeAny( bTemp ) ) );
}
@@ -1511,7 +1512,7 @@ OUString SAL_CALL AnimationsImport::getImplementationName() throw(RuntimeExcepti
sal_Bool SAL_CALL AnimationsImport::supportsService( const OUString& ServiceName ) throw(RuntimeException)
{
- return ServiceName.equalsAscii( "com.sun.star.comp.Xmloff.AnimationsImport" );
+ return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.comp.Xmloff.AnimationsImport" ) );
}
Sequence< OUString > SAL_CALL AnimationsImport::getSupportedServiceNames() throw(RuntimeException)
@@ -1521,3 +1522,4 @@ Sequence< OUString > SAL_CALL AnimationsImport::getSupportedServiceNames() throw
} // namespace xmloff
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/animexp.cxx b/xmloff/source/draw/animexp.cxx
index 5f1a43a771..b7e7b6b56e 100644
--- a/xmloff/source/draw/animexp.cxx
+++ b/xmloff/source/draw/animexp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -544,10 +545,12 @@ void XMLAnimationsExporter::exportAnimations( SvXMLExport& rExport )
}
}
- aIter++;
+ ++aIter;
}
while( aIter != aEnd );
}
mpImpl->maEffects.clear();
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx
index 37d519e09e..38d77b1139 100644
--- a/xmloff/source/draw/animimp.cxx
+++ b/xmloff/source/draw/animimp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -692,3 +693,5 @@ SvXMLImportContext * XMLAnimationsContext::CreateChildContext( USHORT nPrefix, c
{
return new XMLAnimationsEffectContext( GetImport(), nPrefix, rLocalName, xAttrList, mpImpl );
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/descriptionimp.cxx b/xmloff/source/draw/descriptionimp.cxx
index e8325b87cc..a70fe2717a 100644
--- a/xmloff/source/draw/descriptionimp.cxx
+++ b/xmloff/source/draw/descriptionimp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -91,3 +92,4 @@ void SdXMLDescriptionContext::Characters( const ::rtl::OUString& rChars )
msText += rChars;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/descriptionimp.hxx b/xmloff/source/draw/descriptionimp.hxx
index c2ee2cdea2..7ba7f9c294 100644
--- a/xmloff/source/draw/descriptionimp.hxx
+++ b/xmloff/source/draw/descriptionimp.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -58,3 +59,4 @@ public:
#endif // _XMLOFF_EVENTIMP_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx
index 29ed9d6704..15d998b891 100644
--- a/xmloff/source/draw/eventimp.cxx
+++ b/xmloff/source/draw/eventimp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -64,7 +65,7 @@ using namespace ::xmloff::token;
///////////////////////////////////////////////////////////////////////
-SvXMLEnumMapEntry __READONLY_DATA aXML_EventActions_EnumMap[] =
+SvXMLEnumMapEntry const aXML_EventActions_EnumMap[] =
{
{ XML_NONE, ClickAction_NONE },
{ XML_PREVIOUS_PAGE, ClickAction_PREVPAGE },
@@ -101,9 +102,6 @@ public:
sal_Bool mbValid;
sal_Bool mbScript;
-#ifdef ISSUE66550_HLINK_FOR_SHAPES
- sal_Bool mbActionEvent;
-#endif
ClickAction meClickAction;
XMLEffect meEffect;
XMLEffectDirection meDirection;
@@ -115,9 +113,6 @@ public:
OUString msMacroName;
OUString msBookmark;
OUString msLanguage;
-#ifdef ISSUE66550_HLINK_FOR_SHAPES
- OUString msHyperURL;
-#endif
};
///////////////////////////////////////////////////////////////////////
@@ -176,18 +171,11 @@ TYPEINIT1( SdXMLEventContext, SvXMLImportContext );
SdXMLEventContext::SdXMLEventContext( SvXMLImport& rImp, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, const Reference< XShape >& rxShape )
: SvXMLImportContext(rImp, nPrfx, rLocalName),
-#ifdef ISSUE66550_HLINK_FOR_SHAPES
- mxShape( rxShape ), mbScript( sal_False ), mbActionEvent( sal_False ), meClickAction( ClickAction_NONE ),
-#else
mxShape( rxShape ), mbScript( sal_False ), meClickAction( ClickAction_NONE ),
-#endif
meEffect( EK_none ), meDirection( ED_none ), mnStartScale( 100 ),
meSpeed( AnimationSpeed_MEDIUM ), mnVerb(0), mbPlayFull( sal_False )
{
static const OUString sXMLClickName( RTL_CONSTASCII_USTRINGPARAM( "click" ) );
-#ifdef ISSUE66550_HLINK_FOR_SHAPES
- static const OUString sXMLActionName( RTL_CONSTASCII_USTRINGPARAM( "action" ) );
-#endif
if( nPrfx == XML_NAMESPACE_PRESENTATION && IsXMLToken( rLocalName, XML_EVENT_LISTENER ) )
{
@@ -258,12 +246,7 @@ SdXMLEventContext::SdXMLEventContext( SvXMLImport& rImp, sal_uInt16 nPrfx, cons
sEventName = sValue;
sal_uInt16 nScriptPrefix =
GetImport().GetNamespaceMap().GetKeyByAttrName( sValue, &sEventName );
-#ifdef ISSUE66550_HLINK_FOR_SHAPES
- mbValid = XML_NAMESPACE_DOM == nScriptPrefix && ( sEventName == sXMLClickName || sEventName == sXMLActionName );
- mbActionEvent = mbValid && (sEventName == sXMLActionName);
-#else
mbValid = XML_NAMESPACE_DOM == nScriptPrefix && sEventName == sXMLClickName;
-#endif
}
else if( IsXMLToken( aAttrLocalName, XML_LANGUAGE ) )
{
@@ -292,12 +275,6 @@ SdXMLEventContext::SdXMLEventContext( SvXMLImport& rImp, sal_uInt16 nPrfx, cons
{
msMacroName = sValue;
}
-#ifdef ISSUE66550_HLINK_FOR_SHAPES
- else if ( mbActionEvent )
- {
- msHyperURL = sValue;
- }
-#endif
else
{
const rtl::OUString &rTmp =
@@ -343,26 +320,6 @@ void SdXMLEventContext::EndElement()
OUString sAPIEventName;
uno::Sequence< beans::PropertyValue > aProperties;
-#ifdef ISSUE66550_HLINK_FOR_SHAPES
- if( mbActionEvent )
- {
- sAPIEventName = OUString( RTL_CONSTASCII_USTRINGPARAM( "OnAction" ) );
- aProperties.realloc( 2 );
- beans::PropertyValue* pProperty = aProperties.getArray();
-
- pProperty->Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "EventType" ) );
- pProperty->Handle = -1;
- pProperty->Value <<= OUString( RTL_CONSTASCII_USTRINGPARAM( "Action" ) );
- pProperty->State = beans::PropertyState_DIRECT_VALUE;
- ++pProperty;
- pProperty->Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) );
- pProperty->Handle = -1;
- pProperty->Value <<= msHyperURL;
- pProperty->State = beans::PropertyState_DIRECT_VALUE;
- }
- else
-#endif
- {
sAPIEventName = OUString( RTL_CONSTASCII_USTRINGPARAM( "OnClick" ) );
if( mbScript )
@@ -547,8 +504,6 @@ void SdXMLEventContext::EndElement()
break;
}
}
- }
-
xEvents->replaceByName( sAPIEventName, uno::Any( aProperties ) );
} while(0);
@@ -573,3 +528,5 @@ SvXMLImportContext * SdXMLEventsContext::CreateChildContext( USHORT nPrfx, const
{
return new SdXMLEventContext( GetImport(), nPrfx, rLocalName, xAttrList, mxShape );
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/eventimp.hxx b/xmloff/source/draw/eventimp.hxx
index c6029b4a3c..9041b01163 100644
--- a/xmloff/source/draw/eventimp.hxx
+++ b/xmloff/source/draw/eventimp.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -55,3 +56,4 @@ public:
#endif // _XMLOFF_EVENTIMP_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/layerexp.cxx b/xmloff/source/draw/layerexp.cxx
index 2bc690cf69..3a7ea11a93 100644
--- a/xmloff/source/draw/layerexp.cxx
+++ b/xmloff/source/draw/layerexp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -107,3 +108,5 @@ void SdXMLayerExporter::exportLayer( SvXMLExport& rExport )
}
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/layerexp.hxx b/xmloff/source/draw/layerexp.hxx
index 6c8cfe14b0..69d45cb8ba 100644
--- a/xmloff/source/draw/layerexp.hxx
+++ b/xmloff/source/draw/layerexp.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,3 +39,4 @@ public:
#endif // _XMLOFF_ANIMEXP_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/layerimp.cxx b/xmloff/source/draw/layerimp.cxx
index f527bdf799..e70193a7e2 100644
--- a/xmloff/source/draw/layerimp.cxx
+++ b/xmloff/source/draw/layerimp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -178,3 +179,5 @@ SvXMLImportContext * SdXMLLayerSetContext::CreateChildContext( USHORT nPrefix, c
{
return new SdXMLLayerContext( GetImport(), nPrefix, rLocalName, xAttrList, mxLayerManager );
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/layerimp.hxx b/xmloff/source/draw/layerimp.hxx
index 5360faaff4..b914d5ddde 100644
--- a/xmloff/source/draw/layerimp.hxx
+++ b/xmloff/source/draw/layerimp.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -56,3 +57,4 @@ public:
#endif // _XMLOFF_ANIMIMP_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/numithdl.cxx b/xmloff/source/draw/numithdl.cxx
index cd90ac90cb..7a72d32116 100644
--- a/xmloff/source/draw/numithdl.cxx
+++ b/xmloff/source/draw/numithdl.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -61,3 +62,4 @@ sal_Bool XMLNumRulePropHdl::exportXML( ::rtl::OUString& /*rStrExpValue*/, const
return sal_False;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/numithdl.hxx b/xmloff/source/draw/numithdl.hxx
index c009b456b9..49bc519a0d 100644
--- a/xmloff/source/draw/numithdl.hxx
+++ b/xmloff/source/draw/numithdl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -50,3 +51,5 @@ public:
};
#endif // _XMLOFF_PROPERTYHANDLER_NUMRULE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/propimp0.cxx b/xmloff/source/draw/propimp0.cxx
index 996aee9b1e..085398bbe6 100644
--- a/xmloff/source/draw/propimp0.cxx
+++ b/xmloff/source/draw/propimp0.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -270,3 +271,5 @@ sal_Bool XMLDateTimeFormatHdl::exportXML( rtl::OUString& rStrExpValue, const ::c
return sal_False;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/propimp0.hxx b/xmloff/source/draw/propimp0.hxx
index 5a9c4f4980..9998a95c1e 100644
--- a/xmloff/source/draw/propimp0.hxx
+++ b/xmloff/source/draw/propimp0.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -76,3 +77,5 @@ public:
#endif // _PROPIMP0_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
index 06b5448440..6f3ba340f4 100644
--- a/xmloff/source/draw/sdpropls.cxx
+++ b/xmloff/source/draw/sdpropls.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,9 +40,7 @@
#include <com/sun/star/drawing/RectanglePoint.hpp>
#include <com/sun/star/drawing/CircleKind.hpp>
-#ifndef _COM_SUN_STAR_DRAWING_BitmapMode_HPP_
#include <com/sun/star/drawing/BitmapMode.hpp>
-#endif
#include <com/sun/star/text/WritingMode.hpp>
#include <xmloff/EnumPropertyHdl.hxx>
#include <xmloff/NamedBoolPropertyHdl.hxx>
@@ -574,7 +573,7 @@ SvXMLEnumMapEntry aXML_WritingMode_EnumMap[] =
{ XML_TOKEN_INVALID, 0 }
};
-SvXMLEnumMapEntry __READONLY_DATA pXML_TextAnimation_Enum[] =
+SvXMLEnumMapEntry const pXML_TextAnimation_Enum[] =
{
{ XML_NONE, drawing::TextAnimationKind_NONE },
{ XML_BLINKING, drawing::TextAnimationKind_BLINK }, // will be filtered
@@ -584,7 +583,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_TextAnimation_Enum[] =
{ XML_TOKEN_INVALID, 0 }
};
-SvXMLEnumMapEntry __READONLY_DATA pXML_TextAnimation_Blinking_Enum[] =
+SvXMLEnumMapEntry const pXML_TextAnimation_Blinking_Enum[] =
{
{ XML_FALSE, drawing::TextAnimationKind_NONE },
{ XML_TRUE, drawing::TextAnimationKind_BLINK },
@@ -594,7 +593,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_TextAnimation_Blinking_Enum[] =
{ XML_TOKEN_INVALID, 0 }
};
-SvXMLEnumMapEntry __READONLY_DATA pXML_TextAnimationDirection_Enum[] =
+SvXMLEnumMapEntry const pXML_TextAnimationDirection_Enum[] =
{
{ XML_LEFT, drawing::TextAnimationDirection_LEFT },
{ XML_RIGHT, drawing::TextAnimationDirection_RIGHT }, // will be filtered
@@ -603,7 +602,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_TextAnimationDirection_Enum[] =
{ XML_TOKEN_INVALID, 0 }
};
-SvXMLEnumMapEntry __READONLY_DATA pXML_TextAlign_Enum[] =
+SvXMLEnumMapEntry const pXML_TextAlign_Enum[] =
{
{ XML_LEFT, drawing::TextHorizontalAdjust_LEFT },
{ XML_CENTER, drawing::TextHorizontalAdjust_CENTER },
@@ -612,7 +611,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_TextAlign_Enum[] =
{ XML_TOKEN_INVALID, 0 }
};
-SvXMLEnumMapEntry __READONLY_DATA pXML_VerticalAlign_Enum[] =
+SvXMLEnumMapEntry const pXML_VerticalAlign_Enum[] =
{
{ XML_TOP, drawing::TextVerticalAdjust_TOP },
{ XML_MIDDLE, drawing::TextVerticalAdjust_CENTER },
@@ -621,16 +620,16 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_VerticalAlign_Enum[] =
{ XML_TOKEN_INVALID, 0 }
};
-SvXMLEnumMapEntry __READONLY_DATA pXML_FitToSize_Enum[] =
+SvXMLEnumMapEntry const pXML_FitToSize_Enum[] =
{
{ XML_FALSE, drawing::TextFitToSizeType_NONE },
{ XML_TRUE, drawing::TextFitToSizeType_PROPORTIONAL },
- { XML_TRUE, drawing::TextFitToSizeType_ALLLINES },
- { XML_TRUE, drawing::TextFitToSizeType_RESIZEATTR },
+ { XML_ALL, drawing::TextFitToSizeType_ALLLINES },
+ { XML_SHRINK_TO_FIT,drawing::TextFitToSizeType_AUTOFIT },
{ XML_TOKEN_INVALID, 0 }
};
-SvXMLEnumMapEntry __READONLY_DATA pXML_MeasureUnit_Enum[] =
+SvXMLEnumMapEntry const pXML_MeasureUnit_Enum[] =
{
{ XML_AUTOMATIC, 0 },
{ XML_UNIT_MM, 1 },
@@ -645,7 +644,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_MeasureUnit_Enum[] =
{ XML_TOKEN_INVALID,0 }
};
-SvXMLEnumMapEntry __READONLY_DATA pXML_Measure_HAlign_Enum[] =
+SvXMLEnumMapEntry const pXML_Measure_HAlign_Enum[] =
{
{ XML_AUTOMATIC, drawing::MeasureTextHorzPos_AUTO },
{ XML_LEFT_OUTSIDE, drawing::MeasureTextHorzPos_LEFTOUTSIDE },
@@ -654,7 +653,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_Measure_HAlign_Enum[] =
{ XML_TOKEN_INVALID,0 }
};
-SvXMLEnumMapEntry __READONLY_DATA pXML_Measure_VAlign_Enum[] =
+SvXMLEnumMapEntry const pXML_Measure_VAlign_Enum[] =
{
{ XML_AUTOMATIC, drawing::MeasureTextVertPos_AUTO },
{ XML_ABOVE, drawing::MeasureTextVertPos_EAST },
@@ -664,7 +663,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_Measure_VAlign_Enum[] =
};
// #FontWork#
-SvXMLEnumMapEntry __READONLY_DATA pXML_Fontwork_Style_Enum[] =
+SvXMLEnumMapEntry const pXML_Fontwork_Style_Enum[] =
{
{ XML_ROTATE, 0 }, //XFT_ROTATE,
{ XML_UPRIGHT, 1 }, //XFT_UPRIGHT,
@@ -674,7 +673,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_Fontwork_Style_Enum[] =
{ XML_TOKEN_INVALID,0 }
};
-SvXMLEnumMapEntry __READONLY_DATA pXML_Fontwork_Adjust_Enum[] =
+SvXMLEnumMapEntry const pXML_Fontwork_Adjust_Enum[] =
{
{ XML_LEFT, 0 }, //XFT_LEFT,
{ XML_RIGHT, 1 }, //XFT_RIGHT,
@@ -683,7 +682,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_Fontwork_Adjust_Enum[] =
{ XML_TOKEN_INVALID,0 }
};
-SvXMLEnumMapEntry __READONLY_DATA pXML_Fontwork_Shadow_Enum[] =
+SvXMLEnumMapEntry const pXML_Fontwork_Shadow_Enum[] =
{
{ XML_NORMAL, 0 }, //XFTSHADOW_NORMAL,
{ XML_SLANT, 1 }, //XFTSHADOW_SLANT,
@@ -691,7 +690,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_Fontwork_Shadow_Enum[] =
{ XML_TOKEN_INVALID,0 }
};
-SvXMLEnumMapEntry __READONLY_DATA pXML_Fontwork_Form_Enum[] =
+SvXMLEnumMapEntry const pXML_Fontwork_Form_Enum[] =
{
{ XML_NONE, 0 }, //XFTFORM_NONE,
{ XML_TOPCIRCLE, 1 }, //XFTFORM_TOPCIRC,
@@ -709,7 +708,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_Fontwork_Form_Enum[] =
{ XML_TOKEN_INVALID,0 }
};
-SvXMLEnumMapEntry __READONLY_DATA pXML_Caption_Esc_Dir_Enum[] =
+SvXMLEnumMapEntry const pXML_Caption_Esc_Dir_Enum[] =
{
{ XML_HORIZONTAL, 0 }, //SDRCAPT_ESCHORIZONTAL,
{ XML_VERTICAL, 1 }, //SDRCAPT_ESCVERTICAL,
@@ -717,7 +716,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_Caption_Esc_Dir_Enum[] =
{ XML_TOKEN_INVALID,0 }
};
-SvXMLEnumMapEntry __READONLY_DATA pXML_Caption_Type_Enum[] =
+SvXMLEnumMapEntry const pXML_Caption_Type_Enum[] =
{
{ XML_STRAIGHT_LINE, 0 }, //SDRCAPT_TYPE1,
{ XML_ANGLED_LINE, 1 }, //SDRCAPT_TYPE2,
@@ -1762,3 +1761,4 @@ void XMLPageExportPropertyMapper::handleElementItem(
}
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/sdpropls.hxx b/xmloff/source/draw/sdpropls.hxx
index 37c22dc056..82a3567ca5 100644
--- a/xmloff/source/draw/sdpropls.hxx
+++ b/xmloff/source/draw/sdpropls.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -332,3 +333,5 @@ public:
};
#endif // _SDPROPLS_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 002a7a1368..fd368ef4ae 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -1,10 +1,11 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* This file is part of OpenOffice.org.
*
@@ -68,9 +69,7 @@
#include <com/sun/star/beans/XPropertyState.hpp>
#include "xexptran.hxx"
-#ifndef _CPPUHELPER_IMPLBASE1_HXX
#include <cppuhelper/implbase1.hxx>
-#endif
#include <comphelper/extract.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include "PropertySetMerger.hxx"
@@ -205,8 +204,6 @@ void ImpXMLEXPPageMasterInfo::SetName(const OUString& rStr)
msName = rStr;
}
-DECLARE_LIST(ImpXMLEXPPageMasterList, ImpXMLEXPPageMasterInfo*)
-
//////////////////////////////////////////////////////////////////////////////
#define IMP_AUTOLAYOUT_INFO_MAX (35L)
@@ -406,12 +403,10 @@ ImpXMLAutoLayoutInfo::ImpXMLAutoLayoutInfo(sal_uInt16 nTyp, ImpXMLEXPPageMasterI
maPresRect.SetSize(aLayoutSize);
}
-DECLARE_LIST(ImpXMLAutoLayoutInfoList, ImpXMLAutoLayoutInfo*)
-
//////////////////////////////////////////////////////////////////////////////
// #110680#
-SdXMLExport::SdXMLExport(
+SdXMLExport::SdXMLExport(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
sal_Bool bIsDraw, sal_uInt16 nExportFlags )
: SvXMLExport( xServiceFactory, MAP_CM, bIsDraw ? XML_DRAWING : XML_PRESENTATION, nExportFlags ),
@@ -419,11 +414,11 @@ SdXMLExport::SdXMLExport(
mnDocDrawPageCount(0L),
mnShapeStyleInfoIndex(0L),
mnObjectCount(0L),
- mpPageMasterInfoList(new ImpXMLEXPPageMasterList(1, 4, 4)),
- mpPageMasterUsageList(new ImpXMLEXPPageMasterList(1, 4, 4)),
- mpNotesPageMasterUsageList(new ImpXMLEXPPageMasterList(1, 4, 4)),
+ mpPageMasterInfoList(new ImpXMLEXPPageMasterList()),
+ mpPageMasterUsageList(new ImpXMLEXPPageMasterList()),
+ mpNotesPageMasterUsageList(new ImpXMLEXPPageMasterList()),
mpHandoutPageMaster(NULL),
- mpAutoLayoutInfoList(new ImpXMLAutoLayoutInfoList(1, 4, 4)),
+ mpAutoLayoutInfoList(new ImpXMLAutoLayoutInfoList()),
mpSdPropHdlFactory(0L),
mpPropertySetMapper(0L),
mpPresPagePropsMapper(0L),
@@ -628,24 +623,24 @@ void SAL_CALL SdXMLExport::setSourceDocument( const Reference< lang::XComponent
// add namespaces
_GetNamespaceMap().Add(
GetXMLToken(XML_NP_PRESENTATION),
- GetXMLToken(XML_N_PRESENTATION),
+ GetXMLToken(XML_N_PRESENTATION),
XML_NAMESPACE_PRESENTATION);
_GetNamespaceMap().Add(
GetXMLToken(XML_NP_SMIL),
- GetXMLToken(XML_N_SMIL_COMPAT),
+ GetXMLToken(XML_N_SMIL_COMPAT),
XML_NAMESPACE_SMIL);
_GetNamespaceMap().Add(
GetXMLToken(XML_NP_ANIMATION),
- GetXMLToken(XML_N_ANIMATION),
+ GetXMLToken(XML_N_ANIMATION),
XML_NAMESPACE_ANIMATION);
if( getDefaultVersion() > SvtSaveOptions::ODFVER_012 )
{
_GetNamespaceMap().Add(
GetXMLToken(XML_NP_OFFICE_EXT),
- GetXMLToken(XML_N_OFFICE_EXT),
+ GetXMLToken(XML_N_OFFICE_EXT),
XML_NAMESPACE_OFFICE_EXT);
_GetNamespaceMap().Add(
@@ -692,7 +687,7 @@ sal_uInt32 SdXMLExport::ImpRecursiveObjectCount(Reference< drawing::XShapes > xS
//////////////////////////////////////////////////////////////////////////////
-__EXPORT SdXMLExport::~SdXMLExport()
+SdXMLExport::~SdXMLExport()
{
// cleanup factory, decrease refcount. Should lead to destruction.
if(mpSdPropHdlFactory)
@@ -716,34 +711,40 @@ __EXPORT SdXMLExport::~SdXMLExport()
}
// clear evtl. temporary page master infos
- if(mpPageMasterInfoList)
- {
- while(mpPageMasterInfoList->Count())
- delete mpPageMasterInfoList->Remove(mpPageMasterInfoList->Count() - 1L);
- delete mpPageMasterInfoList;
- mpPageMasterInfoList = 0L;
- }
if(mpPageMasterUsageList)
{
+ // note: all items in this list are also in mpPageMasterInfoList
delete mpPageMasterUsageList;
mpPageMasterUsageList = 0L;
}
+
if(mpNotesPageMasterUsageList)
{
+ // note: all items in this list are also in mpPageMasterInfoList
delete mpNotesPageMasterUsageList;
mpNotesPageMasterUsageList = 0L;
}
+ if(mpPageMasterInfoList)
+ {
+ for ( size_t i = 0, n = mpPageMasterInfoList->size(); i < n; ++i )
+ delete mpPageMasterInfoList->at( i );
+ mpPageMasterInfoList->clear();
+ delete mpPageMasterInfoList;
+ mpPageMasterInfoList = 0L;
+ }
+
// clear auto-layout infos
if(mpAutoLayoutInfoList)
{
- while(mpAutoLayoutInfoList->Count())
- delete mpAutoLayoutInfoList->Remove(mpAutoLayoutInfoList->Count() - 1L);
+ for ( size_t i = 0, n = mpAutoLayoutInfoList->size(); i < n; ++i )
+ delete mpAutoLayoutInfoList->at( i );
+ mpAutoLayoutInfoList->clear();
delete mpAutoLayoutInfoList;
mpAutoLayoutInfoList = 0L;
}
-// #82003# status indicator stop is called exclusively
+// #82003# status indicator stop is called exclusively
// from SdXMLFilter::Export() now.
//
// stop progress view
@@ -806,35 +807,6 @@ void SAL_CALL ImpDefaultMapper::removeVetoableChangeListener( const OUString&, c
//////////////////////////////////////////////////////////////////////////////
-/* moved to shapeexport.cxx
-void SdXMLExport::ImpWriteObjGraphicStyleInfos()
-{
- XMLStyleExport aStEx(*this, OUString(), GetAutoStylePool().get());
- const UniReference< SvXMLExportPropertyMapper > aMapperRef( GetPropertySetMapper() );
-
- // write graphic family default style
- Reference< lang::XMultiServiceFactory > xFact( GetModel(), UNO_QUERY );
- if( xFact.is() )
- {
- try
- {
- Reference< beans::XPropertySet > xDefaults( xFact->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Defaults") ) ), UNO_QUERY );
- if( xDefaults.is() )
- {
- aStEx.exportDefaultStyle( xDefaults, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_SD_GRAPHICS_NAME)), aMapperRef );
-
- // write graphic family styles
- aStEx.exportStyleFamily(XML_STYLE_FAMILY_SD_GRAPHICS_NAME, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_SD_GRAPHICS_NAME)), aMapperRef, FALSE, XML_STYLE_FAMILY_SD_GRAPHICS_ID);
- }
- }
- catch( lang::ServiceNotRegisteredException& )
- {
- }
- }
-}
-*/
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLExport::ImpPrepAutoLayoutInfos()
{
if(IsImpress())
@@ -905,21 +877,21 @@ BOOL SdXMLExport::ImpPrepAutoLayoutInfo(const Reference<XDrawPage>& xPage, OUStr
ImpXMLAutoLayoutInfo* pNew = new ImpXMLAutoLayoutInfo(nType, pInfo);
BOOL bDidExist(FALSE);
- for(sal_uInt32 nCnt = 0L; !bDidExist && nCnt < mpAutoLayoutInfoList->Count(); nCnt++)
+ for( size_t nCnt = 0; !bDidExist && nCnt < mpAutoLayoutInfoList->size(); nCnt++)
{
- if(*mpAutoLayoutInfoList->GetObject(nCnt) == *pNew)
+ if( *mpAutoLayoutInfoList->at( nCnt ) == *pNew)
{
delete pNew;
- pNew = mpAutoLayoutInfoList->GetObject(nCnt);
+ pNew = mpAutoLayoutInfoList->at( nCnt );
bDidExist = TRUE;
}
}
if(!bDidExist)
{
- mpAutoLayoutInfoList->Insert(pNew, LIST_APPEND);
+ mpAutoLayoutInfoList->push_back( pNew );
OUString sNewName = OUString(RTL_CONSTASCII_USTRINGPARAM("AL"));
- sNewName += OUString::valueOf(sal_Int32(mpAutoLayoutInfoList->Count() - 1));
+ sNewName += OUString::valueOf(sal_Int32( mpAutoLayoutInfoList->size() - 1 ));
sNewName += OUString(RTL_CONSTASCII_USTRINGPARAM("T"));
sNewName += OUString::valueOf(sal_Int32(nType));
pNew->SetLayoutName(sNewName);
@@ -938,11 +910,11 @@ BOOL SdXMLExport::ImpPrepAutoLayoutInfo(const Reference<XDrawPage>& xPage, OUStr
void SdXMLExport::ImpWriteAutoLayoutInfos()
{
- if(mpAutoLayoutInfoList->Count())
+ if( !mpAutoLayoutInfoList->empty() )
{
- for(sal_uInt32 nCnt = 0L; nCnt < mpAutoLayoutInfoList->Count(); nCnt++)
+ for(size_t nCnt = 0; nCnt < mpAutoLayoutInfoList->size(); nCnt++)
{
- ImpXMLAutoLayoutInfo* pInfo = mpAutoLayoutInfoList->GetObject(nCnt);
+ ImpXMLAutoLayoutInfo* pInfo = mpAutoLayoutInfoList->at( nCnt );
if(pInfo)
{
// prepare presentation-page layout attributes, style-name
@@ -1380,19 +1352,20 @@ ImpXMLEXPPageMasterInfo* SdXMLExport::ImpGetOrCreatePageMasterInfo( Reference< X
ImpXMLEXPPageMasterInfo* pNewInfo = new ImpXMLEXPPageMasterInfo(*this, xMasterPage);
// compare with prev page-master infos
- for(sal_uInt32 a = 0; !bDoesExist && a < mpPageMasterInfoList->Count(); a++)
+ for( size_t a = 0; !bDoesExist && a < mpPageMasterInfoList->size(); a++)
{
- if(mpPageMasterInfoList->GetObject(a)
- && *mpPageMasterInfoList->GetObject(a) == *pNewInfo)
+ if ( mpPageMasterInfoList->at(a)
+ && *mpPageMasterInfoList->at(a) == *pNewInfo
+ )
{
delete pNewInfo;
- pNewInfo = mpPageMasterInfoList->GetObject(a);
+ pNewInfo = mpPageMasterInfoList->at(a);
bDoesExist = true;
}
}
// add entry when not found same page-master infos
if(!bDoesExist)
- mpPageMasterInfoList->Insert(pNewInfo, LIST_APPEND);
+ mpPageMasterInfoList->push_back( pNewInfo );
return pNewInfo;
}
@@ -1424,7 +1397,7 @@ void SdXMLExport::ImpPrepPageMasterInfos()
if(xMasterPage.is())
pNewInfo = ImpGetOrCreatePageMasterInfo(xMasterPage);
- mpPageMasterUsageList->Insert(pNewInfo, LIST_APPEND);
+ mpPageMasterUsageList->push_back( pNewInfo );
// look for page master of handout page
if(IsImpress())
@@ -1439,7 +1412,7 @@ void SdXMLExport::ImpPrepPageMasterInfos()
pNewInfo = ImpGetOrCreatePageMasterInfo(xNotesPage);
}
}
- mpNotesPageMasterUsageList->Insert( pNewInfo, LIST_APPEND );
+ mpNotesPageMasterUsageList->push_back( pNewInfo );
}
}
}
@@ -1450,9 +1423,9 @@ void SdXMLExport::ImpPrepPageMasterInfos()
void SdXMLExport::ImpWritePageMasterInfos()
{
// write created page-masters, create names for these
- for(sal_uInt32 nCnt = 0L; nCnt < mpPageMasterInfoList->Count(); nCnt++)
+ for( size_t nCnt = 0; nCnt < mpPageMasterInfoList->size(); nCnt++)
{
- ImpXMLEXPPageMasterInfo* pInfo = mpPageMasterInfoList->GetObject(nCnt);
+ ImpXMLEXPPageMasterInfo* pInfo = mpPageMasterInfoList->at(nCnt);
if(pInfo)
{
// create name
@@ -1511,11 +1484,11 @@ void SdXMLExport::ImpWritePageMasterInfos()
ImpXMLEXPPageMasterInfo* SdXMLExport::ImpGetPageMasterInfoByName(const OUString& rName)
{
- if(rName.getLength() && mpPageMasterInfoList->Count())
+ if(rName.getLength() && !mpPageMasterInfoList->empty())
{
- for(sal_uInt32 nCnt = 0L; nCnt < mpPageMasterInfoList->Count(); nCnt++)
+ for( size_t nCnt = 0; nCnt < mpPageMasterInfoList->size(); nCnt++)
{
- ImpXMLEXPPageMasterInfo* pInfo = mpPageMasterInfoList->GetObject(nCnt);
+ ImpXMLEXPPageMasterInfo* pInfo = mpPageMasterInfoList->at(nCnt);
if(pInfo)
{
if(pInfo->GetMasterPageName().getLength() && rName.equals(pInfo->GetMasterPageName()))
@@ -1561,7 +1534,7 @@ static OUString findOrAppendImpl( std::vector< OUString >& rVector, const OUStri
// search rVector if there is already a string that equals rText
std::vector< OUString >::iterator aIter;
sal_Int32 nIndex;
- for( nIndex = 1, aIter = rVector.begin(); aIter != rVector.end(); aIter++, nIndex++ )
+ for( nIndex = 1, aIter = rVector.begin(); aIter != rVector.end(); ++aIter, ++nIndex )
{
if( (*aIter) == rText )
break;
@@ -1583,7 +1556,7 @@ static OUString findOrAppendImpl( std::vector< DateTimeDeclImpl >& rVector, cons
// search rVector if there is already a DateTimeDeclImpl with rText,bFixed and nFormat
std::vector< DateTimeDeclImpl >::iterator aIter;
sal_Int32 nIndex;
- for( nIndex = 1, aIter = rVector.begin(); aIter != rVector.end(); aIter++, nIndex++ )
+ for( nIndex = 1, aIter = rVector.begin(); aIter != rVector.end(); ++aIter, ++nIndex )
{
const DateTimeDeclImpl& rDecl = (*aIter);
if( (rDecl.mbFixed == bFixed ) &&
@@ -1619,7 +1592,7 @@ HeaderFooterPageSettingsImpl SdXMLExport::ImpPrepDrawPageHeaderFooterDecls( cons
HeaderFooterPageSettingsImpl aSettings;
if( xDrawPage.is() ) try
- {
+ {
Reference< XPropertySet > xSet( xDrawPage, UNO_QUERY_THROW );
Reference< XPropertySetInfo > xInfo( xSet->getPropertySetInfo() );
@@ -1679,7 +1652,7 @@ void SdXMLExport::ImpWriteHeaderFooterDecls()
const OUString aPrefix( OUString::createFromAscii( gpStrHeaderTextPrefix ) );
std::vector< OUString >::iterator aIter;
sal_Int32 nIndex;
- for( nIndex = 1, aIter = maHeaderDeclsVector.begin(); aIter != maHeaderDeclsVector.end(); aIter++, nIndex++ )
+ for( nIndex = 1, aIter = maHeaderDeclsVector.begin(); aIter != maHeaderDeclsVector.end(); ++aIter, ++nIndex )
{
sBuffer.append( aPrefix );
sBuffer.append( nIndex );
@@ -1696,7 +1669,7 @@ void SdXMLExport::ImpWriteHeaderFooterDecls()
const OUString aPrefix( OUString::createFromAscii( gpStrFooterTextPrefix ) );
std::vector< OUString >::iterator aIter;
sal_Int32 nIndex;
- for( nIndex = 1, aIter = maFooterDeclsVector.begin(); aIter != maFooterDeclsVector.end(); aIter++, nIndex++ )
+ for( nIndex = 1, aIter = maFooterDeclsVector.begin(); aIter != maFooterDeclsVector.end(); ++aIter, ++nIndex )
{
sBuffer.append( aPrefix );
sBuffer.append( nIndex );
@@ -1713,7 +1686,7 @@ void SdXMLExport::ImpWriteHeaderFooterDecls()
const OUString aPrefix( OUString::createFromAscii( gpStrDateTimeTextPrefix ) );
std::vector< DateTimeDeclImpl >::iterator aIter;
sal_Int32 nIndex;
- for( nIndex = 1, aIter = maDateTimeDeclsVector.begin(); aIter != maDateTimeDeclsVector.end(); aIter++, nIndex++ )
+ for( nIndex = 1, aIter = maDateTimeDeclsVector.begin(); aIter != maDateTimeDeclsVector.end(); ++aIter, ++nIndex )
{
const DateTimeDeclImpl& rDecl = (*aIter);
@@ -1722,7 +1695,7 @@ void SdXMLExport::ImpWriteHeaderFooterDecls()
AddAttribute( XML_NAMESPACE_PRESENTATION, XML_NAME, sBuffer.makeStringAndClear());
AddAttribute( XML_NAMESPACE_PRESENTATION, XML_SOURCE, rDecl.mbFixed ? XML_FIXED : XML_CURRENT_DATE );
-
+
if( !rDecl.mbFixed )
AddAttribute( XML_NAMESPACE_STYLE, XML_DATA_STYLE_NAME, getDataStyleName( rDecl.mnFormat ) );
@@ -1825,7 +1798,7 @@ void SdXMLExport::ImpPrepMasterPageInfos()
{
Reference< presentation::XHandoutMasterSupplier > xHandoutSupp( GetModel(), UNO_QUERY );
if( xHandoutSupp.is() )
- {
+ {
Reference< XDrawPage > xHandoutPage( xHandoutSupp->getHandoutMasterPage() );
if( xHandoutPage.is() )
{
@@ -1882,7 +1855,7 @@ void SdXMLExport::SetProgress(sal_Int32 nProg)
void SdXMLExport::_ExportMeta()
{
uno::Sequence<beans::NamedValue> stats(1);
- stats[0] = beans::NamedValue(::rtl::OUString::createFromAscii("ObjectCount"),
+ stats[0] = beans::NamedValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ObjectCount" )),
uno::makeAny(mnObjectCount));
// update document statistics at the model
@@ -1921,7 +1894,7 @@ void SdXMLExport::_ExportContent()
// draw:style-name (presentation page attributes AND background attributes)
if( maDrawPagesStyleNames[nPageInd].getLength() )
- AddAttribute(XML_NAMESPACE_DRAW, XML_STYLE_NAME,
+ AddAttribute(XML_NAMESPACE_DRAW, XML_STYLE_NAME,
maDrawPagesStyleNames[nPageInd]);
// draw:master-page-name
@@ -1934,7 +1907,7 @@ void SdXMLExport::_ExportContent()
Reference < container::XNamed > xMasterNamed(xUsedMasterPage, UNO_QUERY);
if(xMasterNamed.is())
{
- AddAttribute(XML_NAMESPACE_DRAW, XML_MASTER_PAGE_NAME,
+ AddAttribute(XML_NAMESPACE_DRAW, XML_MASTER_PAGE_NAME,
EncodeStyleName( xMasterNamed->getName()) );
}
}
@@ -2566,15 +2539,15 @@ void SdXMLExport::_ExportMasterStyles()
{
sal_Bool bEncoded = sal_False;
sMasterPageName = xNamed->getName();
- AddAttribute(XML_NAMESPACE_STYLE, XML_NAME,
+ AddAttribute(XML_NAMESPACE_STYLE, XML_NAME,
EncodeStyleName( sMasterPageName, &bEncoded ));
if( bEncoded )
- AddAttribute(
+ AddAttribute(
XML_NAMESPACE_STYLE, XML_DISPLAY_NAME,
sMasterPageName );
}
- ImpXMLEXPPageMasterInfo* pInfo = mpPageMasterUsageList->GetObject(nMPageId);
+ ImpXMLEXPPageMasterInfo* pInfo = mpPageMasterUsageList->at( nMPageId );
if(pInfo)
{
OUString sString = pInfo->GetName();
@@ -2583,7 +2556,7 @@ void SdXMLExport::_ExportMasterStyles()
// draw:style-name (background attributes)
if( maMasterPagesStyleNames[nMPageId].getLength() )
- AddAttribute(XML_NAMESPACE_DRAW, XML_STYLE_NAME,
+ AddAttribute(XML_NAMESPACE_DRAW, XML_STYLE_NAME,
maMasterPagesStyleNames[nMPageId]);
// write masterpage
@@ -2609,7 +2582,7 @@ void SdXMLExport::_ExportMasterStyles()
Reference< drawing::XShapes > xShapes(xNotesPage, UNO_QUERY);
if(xShapes.is())
{
- ImpXMLEXPPageMasterInfo* pMasterInfo = mpNotesPageMasterUsageList->GetObject(nMPageId);
+ ImpXMLEXPPageMasterInfo* pMasterInfo = mpNotesPageMasterUsageList->at( nMPageId );
if(pMasterInfo)
{
OUString sString = pMasterInfo->GetName();
@@ -2628,7 +2601,7 @@ void SdXMLExport::_ExportMasterStyles()
}
}
}
- exportAnnotations( xMasterPage );
+ exportAnnotations( xMasterPage );
}
}
}
@@ -2654,7 +2627,7 @@ void SdXMLExport::exportFormsElement( Reference< XDrawPage > xDrawPage )
void SdXMLExport::GetViewSettings(uno::Sequence<beans::PropertyValue>& rProps)
{
- rProps.realloc(4);
+ rProps.realloc(4);
beans::PropertyValue* pProps = rProps.getArray();
if(pProps)
{
@@ -2763,7 +2736,7 @@ OUString SdXMLExport::getNavigationOrder( const Reference< XDrawPage >& xDrawPag
Reference< XIndexAccess > xNavOrder( xSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "NavigationOrder" ) ) ), UNO_QUERY_THROW );
Reference< XIndexAccess > xZOrderAccess( xDrawPage, UNO_QUERY );
-
+
// only export navigation order if it is different from the z-order
if( (xNavOrder.get() != xZOrderAccess.get()) && (xNavOrder->getCount() == xDrawPage->getCount()) )
{
@@ -2817,7 +2790,7 @@ void SdXMLExport::exportAnnotations( const Reference<XDrawPage>& xDrawPage )
// do not export in ODF 1.2 or older
if( getDefaultVersion() <= SvtSaveOptions::ODFVER_012 )
return;
-
+
Reference< XAnnotationAccess > xAnnotationAccess( xDrawPage, UNO_QUERY );
if( xAnnotationAccess.is() ) try
{
@@ -2985,9 +2958,11 @@ OUString SAL_CALL SdXMLExport::getImplementationName() throw( uno::RuntimeExcept
return XMLImpressMetaExportOasis_getImplementationName();
case EXPORT_OASIS|EXPORT_SETTINGS:
return XMLImpressSettingsExportOasis_getImplementationName();
-
+
default:
return XMLImpressExportOOO_getImplementationName();
}
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/sdxmlexp_impl.hxx b/xmloff/source/draw/sdxmlexp_impl.hxx
index e80bb005c2..bc7bba544e 100644
--- a/xmloff/source/draw/sdxmlexp_impl.hxx
+++ b/xmloff/source/draw/sdxmlexp_impl.hxx
@@ -1,10 +1,11 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* This file is part of OpenOffice.org.
*
@@ -30,13 +31,14 @@
#include <xmloff/xmlexp.hxx>
-
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/task/XStatusIndicator.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/drawing/XDrawPage.hpp>
#include <comphelper/stl_types.hxx>
+#include <vector>
+
//////////////////////////////////////////////////////////////////////////////
class SvXMLUnitConverter;
@@ -48,16 +50,18 @@ class OUStringsSort_Impl;
class Rectangle;
class ImpPresPageDrawStylePropMapper;
-class ImpXMLEXPPageMasterList;
class ImpXMLEXPPageMasterInfo;
class ImpXMLDrawPageInfoList;
-class ImpXMLAutoLayoutInfoList;
+class ImpXMLAutoLayoutInfo;
class SvXMLAutoStylePoolP;
class XMLSdPropHdlFactory;
class ImpXMLShapeStyleInfo;
class XMLShapeExportPropertyMapper;
class XMLPageExportPropertyMapper;
+typedef ::std::vector< ImpXMLEXPPageMasterInfo* > ImpXMLEXPPageMasterList;
+typedef ::std::vector< ImpXMLAutoLayoutInfo* > ImpXMLAutoLayoutInfoList;
+
//////////////////////////////////////////////////////////////////////////////
enum XmlPlaceholder
@@ -192,7 +196,7 @@ protected:
public:
// #110680#
- SdXMLExport(
+ SdXMLExport(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
sal_Bool bIsDraw, sal_uInt16 nExportFlags = EXPORT_ALL );
virtual ~SdXMLExport();
@@ -226,3 +230,4 @@ public:
#endif // _SDXMLEXP_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index 3483e48ed4..2cb3bcbe28 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,15 +31,11 @@
#include <tools/string.hxx>
-#ifndef _XMLOFF_XMLMETAI_HXX
#include <xmloff/xmlscripti.hxx>
-#endif
#include "sdxmlimp_impl.hxx"
#include "ximpbody.hxx"
-#ifndef _SFX_XMLMETAI_HXX
#include <xmloff/xmlmetai.hxx>
-#endif
#include "ximpstyl.hxx"
#include "xmloff/xmlnmspe.hxx"
#include <xmloff/xmltoken.hxx>
@@ -505,7 +502,7 @@ const SvXMLTokenMap& SdXMLImport::GetDocElemTokenMap()
{
if(!mpDocElemTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry aDocElemTokenMap[] =
+ static SvXMLTokenMapEntry aDocElemTokenMap[] =
{
{ XML_NAMESPACE_OFFICE, XML_FONT_FACE_DECLS, XML_TOK_DOC_FONTDECLS },
{ XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES },
@@ -530,7 +527,7 @@ const SvXMLTokenMap& SdXMLImport::GetBodyElemTokenMap()
{
if(!mpBodyElemTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry aBodyElemTokenMap[] =
+ static SvXMLTokenMapEntry aBodyElemTokenMap[] =
{
{ XML_NAMESPACE_DRAW, XML_PAGE, XML_TOK_BODY_PAGE },
{ XML_NAMESPACE_PRESENTATION, XML_SETTINGS, XML_TOK_BODY_SETTINGS },
@@ -553,7 +550,7 @@ const SvXMLTokenMap& SdXMLImport::GetStylesElemTokenMap()
{
if(!mpStylesElemTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry aStylesElemTokenMap[] =
+ static SvXMLTokenMapEntry aStylesElemTokenMap[] =
{
{ XML_NAMESPACE_STYLE, XML_PAGE_LAYOUT, XML_TOK_STYLES_PAGE_MASTER },
{ XML_NAMESPACE_STYLE, XML_PRESENTATION_PAGE_LAYOUT, XML_TOK_STYLES_PRESENTATION_PAGE_LAYOUT },
@@ -573,7 +570,7 @@ const SvXMLTokenMap& SdXMLImport::GetMasterPageElemTokenMap()
{
if(!mpMasterPageElemTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry aMasterPageElemTokenMap[] =
+ static SvXMLTokenMapEntry aMasterPageElemTokenMap[] =
{
{ XML_NAMESPACE_STYLE, XML_STYLE, XML_TOK_MASTERPAGE_STYLE },
{ XML_NAMESPACE_PRESENTATION, XML_NOTES, XML_TOK_MASTERPAGE_NOTES },
@@ -592,7 +589,7 @@ const SvXMLTokenMap& SdXMLImport::GetMasterPageAttrTokenMap()
{
if(!mpMasterPageAttrTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry aMasterPageAttrTokenMap[] =
+ static SvXMLTokenMapEntry aMasterPageAttrTokenMap[] =
{
{ XML_NAMESPACE_STYLE, XML_NAME, XML_TOK_MASTERPAGE_NAME },
{ XML_NAMESPACE_STYLE, XML_DISPLAY_NAME, XML_TOK_MASTERPAGE_DISPLAY_NAME },
@@ -617,7 +614,7 @@ const SvXMLTokenMap& SdXMLImport::GetPageMasterAttrTokenMap()
{
if(!mpPageMasterAttrTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry aPageMasterAttrTokenMap[] =
+ static SvXMLTokenMapEntry aPageMasterAttrTokenMap[] =
{
{ XML_NAMESPACE_STYLE, XML_NAME, XML_TOK_PAGEMASTER_NAME },
XML_TOKEN_MAP_END
@@ -635,7 +632,7 @@ const SvXMLTokenMap& SdXMLImport::GetPageMasterStyleAttrTokenMap()
{
if(!mpPageMasterStyleAttrTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry aPageMasterStyleAttrTokenMap[] =
+ static SvXMLTokenMapEntry aPageMasterStyleAttrTokenMap[] =
{
{ XML_NAMESPACE_FO, XML_MARGIN_TOP, XML_TOK_PAGEMASTERSTYLE_MARGIN_TOP },
{ XML_NAMESPACE_FO, XML_MARGIN_BOTTOM, XML_TOK_PAGEMASTERSTYLE_MARGIN_BOTTOM },
@@ -659,7 +656,7 @@ const SvXMLTokenMap& SdXMLImport::GetDrawPageAttrTokenMap()
{
if(!mpDrawPageAttrTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry aDrawPageAttrTokenMap[] =
+ static SvXMLTokenMapEntry aDrawPageAttrTokenMap[] =
{
{ XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_DRAWPAGE_NAME },
{ XML_NAMESPACE_DRAW, XML_STYLE_NAME, XML_TOK_DRAWPAGE_STYLE_NAME },
@@ -687,7 +684,7 @@ const SvXMLTokenMap& SdXMLImport::GetDrawPageElemTokenMap()
{
if(!mpDrawPageElemTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry aDrawPageElemTokenMap[] =
+ static SvXMLTokenMapEntry aDrawPageElemTokenMap[] =
{
{ XML_NAMESPACE_PRESENTATION, XML_NOTES, XML_TOK_DRAWPAGE_NOTES },
{ XML_NAMESPACE_ANIMATION, XML_PAR, XML_TOK_DRAWPAGE_PAR },
@@ -707,7 +704,7 @@ const SvXMLTokenMap& SdXMLImport::GetPresentationPlaceholderAttrTokenMap()
{
if(!mpPresentationPlaceholderAttrTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry aPresentationPlaceholderAttrTokenMap[] =
+ static SvXMLTokenMapEntry aPresentationPlaceholderAttrTokenMap[] =
{
{ XML_NAMESPACE_PRESENTATION, XML_OBJECT, XML_TOK_PRESENTATIONPLACEHOLDER_OBJECTNAME },
{ XML_NAMESPACE_SVG, XML_X, XML_TOK_PRESENTATIONPLACEHOLDER_X },
@@ -743,8 +740,8 @@ SvXMLImportContext *SdXMLImport::CreateContext(USHORT nPrefix,
} else if ( (XML_NAMESPACE_OFFICE == nPrefix) &&
( IsXMLToken(rLocalName, XML_DOCUMENT)) ) {
uno::Reference<xml::sax::XDocumentHandler> xDocBuilder(
- mxServiceFactory->createInstance(::rtl::OUString::createFromAscii(
- "com.sun.star.xml.dom.SAXDocumentBuilder")),
+ mxServiceFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.xml.dom.SAXDocumentBuilder"))),
uno::UNO_QUERY_THROW);
uno::Reference<document::XDocumentPropertiesSupplier> xDPS(
GetModel(), uno::UNO_QUERY_THROW);
@@ -768,8 +765,8 @@ SvXMLImportContext *SdXMLImport::CreateMetaContext(const OUString& rLocalName,
if (!IsStylesOnlyMode() && (getImportFlags() & IMPORT_META))
{
uno::Reference<xml::sax::XDocumentHandler> xDocBuilder(
- mxServiceFactory->createInstance(::rtl::OUString::createFromAscii(
- "com.sun.star.xml.dom.SAXDocumentBuilder")),
+ mxServiceFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.xml.dom.SAXDocumentBuilder"))),
uno::UNO_QUERY_THROW);
uno::Reference<document::XDocumentPropertiesSupplier> xDPS(
GetModel(), uno::UNO_QUERY_THROW);
@@ -1099,3 +1096,5 @@ void SdXMLImport::AddDateTimeDecl( const ::rtl::OUString& rName, const ::rtl::OU
}
// eof
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx
index 0bc22d9ae9..f0c10ae38b 100644
--- a/xmloff/source/draw/sdxmlimp_impl.hxx
+++ b/xmloff/source/draw/sdxmlimp_impl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,9 +35,7 @@
#include <xmloff/xmltkmap.hxx>
#include <com/sun/star/container/XNameAccess.hpp>
-#ifndef __SGI_STL_VECTOR
#include <vector>
-#endif
#include <xmloff/xmlimp.hxx>
//////////////////////////////////////////////////////////////////////////////
@@ -337,3 +336,5 @@ public:
};
#endif // _SDXMLIMP_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 41c6ffa9ce..0b8b9eefcc 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -90,11 +91,6 @@ XMLShapeExport::XMLShapeExport(SvXMLExport& rExp,
msStartShape( RTL_CONSTASCII_USTRINGPARAM("StartShape") ),
msEndShape( RTL_CONSTASCII_USTRINGPARAM("EndShape") ),
msOnClick( RTL_CONSTASCII_USTRINGPARAM("OnClick") ),
-#ifdef ISSUE66550_HLINK_FOR_SHAPES
- msOnAction( RTL_CONSTASCII_USTRINGPARAM("OnAction") ),
- msAction( RTL_CONSTASCII_USTRINGPARAM("Action") ),
- msURL( RTL_CONSTASCII_USTRINGPARAM("URL") ),
-#endif
msEventType( RTL_CONSTASCII_USTRINGPARAM("EventType") ),
msPresentation( RTL_CONSTASCII_USTRINGPARAM("Presentation") ),
msMacroName( RTL_CONSTASCII_USTRINGPARAM("MacroName") ),
@@ -177,10 +173,10 @@ uno::Reference< drawing::XShape > XMLShapeExport::checkForCustomShapeReplacement
{
uno::Sequence< uno::Any > aArgument( 1 );
uno::Sequence< beans::PropertyValue > aPropValues( 2 );
- aPropValues[ 0 ].Name = rtl::OUString::createFromAscii( "CustomShape" );
+ aPropValues[ 0 ].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CustomShape" ));
aPropValues[ 0 ].Value <<= xShape;
sal_Bool bForceGroupWithText = sal_True;
- aPropValues[ 1 ].Name = rtl::OUString::createFromAscii( "ForceGroupWithText" );
+ aPropValues[ 1 ].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ForceGroupWithText" ));
aPropValues[ 1 ].Value <<= bForceGroupWithText;
aArgument[ 0 ] <<= aPropValues;
uno::Reference< uno::XInterface > xInterface( xFactory->createInstanceWithArguments( aEngine, aArgument ) );
@@ -364,7 +360,7 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap
{
if( aIter->mnIndex != -1 )
nCount++;
- aIter++;
+ ++aIter;
}
}
@@ -433,7 +429,7 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap
{
if( aIter->mnIndex != -1 )
nCount++;
- aIter++;
+ ++aIter;
}
if( nCount )
@@ -511,7 +507,6 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap
///////////////////////////////////////////////////////////////////////
-// --> OD 2008-05-08 #refactorlists#
namespace
{
class NewTextListsHelper
@@ -588,9 +583,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
return;
}
- // --> OD 2008-05-08 #refactorlists#
NewTextListsHelper aNewTextListsHelper( mrExport );
- // <--
const ImplXMLShapeExportInfo& aShapeInfo = aShapeInfoVector[nZIndex];
@@ -623,16 +616,13 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
if( mxAnimationsExporter.is() )
mxAnimationsExporter->collect( xShape, mrExport );
- // -------------------------------
- // export shapes name if he has one
- // --> OD 2006-03-13 #i51726#
- // Export of the shape name for text documents only if the OpenDocument
- // file format is written - exceptions are group shapes.
- // Note: Writer documents in OpenOffice.org file format doesn't contain
- // any names for shapes, except for group shapes.
- // -------------------------------
+ /* Export shapes name if he has one (#i51726#)
+ Export of the shape name for text documents only if the OpenDocument
+ file format is written - exceptions are group shapes.
+ Note: Writer documents in OpenOffice.org file format doesn't contain
+ any names for shapes, except for group shapes.
+ */
{
- // --> OD 2006-03-10 #i51726#
if ( ( GetExport().GetModelType() != SvtModuleOptions::E_WRITER &&
GetExport().GetModelType() != SvtModuleOptions::E_WRITERWEB &&
GetExport().GetModelType() != SvtModuleOptions::E_WRITERGLOBAL ) ||
@@ -649,7 +639,6 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_NAME, aName );
}
}
- // <--
}
// ------------------
@@ -696,7 +685,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
{
uno::Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY );
OUString aLayerName;
- xProps->getPropertyValue( OUString::createFromAscii( "LayerName" ) ) >>= aLayerName;
+ xProps->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "LayerName" )) ) >>= aLayerName;
mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_LAYER, aLayerName );
}
@@ -1301,3 +1290,5 @@ const rtl::Reference< XMLTableExport >& XMLShapeExport::GetShapeTableExport()
return mxShapeTableExport;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx
index 8445b0b0fb..4fb5839a0e 100644
--- a/xmloff/source/draw/shapeexport2.cxx
+++ b/xmloff/source/draw/shapeexport2.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,9 +41,7 @@
#include <com/sun/star/media/ZoomLevel.hpp>
#include "anim.hxx"
-#ifndef _XMLOFF_SHAPEEXPORT_HXX
#include <xmloff/shapeexport.hxx>
-#endif
#include "sdpropls.hxx"
#include <tools/debug.hxx>
#include <tools/urlobj.hxx>
@@ -89,16 +88,17 @@ void XMLShapeExport::ImpExportNewTrans(const uno::Reference< beans::XPropertySet
void XMLShapeExport::ImpExportNewTrans_GetB2DHomMatrix(::basegfx::B2DHomMatrix& rMatrix,
const uno::Reference< beans::XPropertySet >& xPropSet)
{
- // --> OD 2004-08-09 #i28749# - Get <TransformationInHoriL2R>, if it exist
- // and if the document is exported into the OpenOffice.org file format.
- // This property only exists at service com::sun::star::text::Shape - the
- // Writer UNO service for shapes.
- // This code is needed, because the positioning attributes in the
- // OpenOffice.org file format are given in horizontal left-to-right layout
- // regardless the layout direction the shape is in. In the OASIS Open Office
- // file format the positioning attributes are correctly given in the layout
- // direction the shape is in. Thus, this code provides the conversion from
- // the OASIS Open Office file format to the OpenOffice.org file format.
+ /* Get <TransformationInHoriL2R>, if it exist
+ and if the document is exported into the OpenOffice.org file format.
+ This property only exists at service com::sun::star::text::Shape - the
+ Writer UNO service for shapes.
+ This code is needed, because the positioning attributes in the
+ OpenOffice.org file format are given in horizontal left-to-right layout
+ regardless the layout direction the shape is in. In the OASIS Open Office
+ file format the positioning attributes are correctly given in the layout
+ direction the shape is in. Thus, this code provides the conversion from
+ the OASIS Open Office file format to the OpenOffice.org file format. (#i28749#)
+ */
uno::Any aAny;
if ( ( GetExport().getExportFlags() & EXPORT_OASIS ) == 0 &&
xPropSet->getPropertySetInfo()->hasPropertyByName(
@@ -110,7 +110,6 @@ void XMLShapeExport::ImpExportNewTrans_GetB2DHomMatrix(::basegfx::B2DHomMatrix&
{
aAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Transformation")));
}
- // <--
drawing::HomogenMatrix3 aMatrix;
aAny >>= aMatrix;
@@ -293,9 +292,6 @@ const sal_Int32 FOUND_CLICKEVENTTYPE = 0x00000080;
const sal_Int32 FOUND_MACRO = 0x00000100;
const sal_Int32 FOUND_LIBRARY = 0x00000200;
const sal_Int32 FOUND_ACTIONEVENTTYPE = 0x00000400;
-#ifdef ISSUE66550_HLINK_FOR_SHAPES
-const sal_Int32 FOUND_URL = 0x00000800;
-#endif
} // namespace
@@ -385,33 +381,6 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x
}
}
-#ifdef ISSUE66550_HLINK_FOR_SHAPES
- // extract properties from "OnAction" event -------------------------------
-
- OUString aActionEventType;
- OUString aHyperURL;
-
- uno::Sequence< beans::PropertyValue > aActionProperties;
- if( xEvents->hasByName( msOnAction ) && (xEvents->getByName( msOnAction ) >>= aActionProperties) )
- {
- const beans::PropertyValue* pProperty = aActionProperties.getConstArray();
- const beans::PropertyValue* pPropertyEnd = pProperty + aActionProperties.getLength();
- for( ; pProperty != pPropertyEnd; ++pProperty )
- {
- if( ( ( nFound & FOUND_ACTIONEVENTTYPE ) == 0 ) && pProperty->Name == msEventType )
- {
- if( pProperty->Value >>= aActionEventType )
- nFound |= FOUND_ACTIONEVENTTYPE;
- }
- else if( ( ( nFound & FOUND_URL ) == 0 ) && ( pProperty->Name == msURL ) )
- {
- if( pProperty->Value >>= aHyperURL )
- nFound |= FOUND_URL;
- }
- }
- }
-#endif
-
// create the XML elements
if( aClickEventType == msPresentation )
@@ -563,15 +532,9 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x
SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SCRIPT, XML_EVENT_LISTENER, sal_True, sal_True);
}
}
-#ifdef ISSUE66550_HLINK_FOR_SHAPES
- else if( aClickEventType == msScript || aActionEventType == msAction )
- {
- if( nFound & ( FOUND_MACRO | FOUND_URL ) )
-#else
else if( aClickEventType == msScript )
{
if( nFound & FOUND_MACRO )
-#endif
{
SvXMLElementExport aEventsElemt(mrExport, XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS, sal_True, sal_True);
if ( nFound & FOUND_MACRO )
@@ -586,18 +549,6 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x
SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SCRIPT, XML_EVENT_LISTENER, sal_True, sal_True);
}
-#ifdef ISSUE66550_HLINK_FOR_SHAPES
- if ( nFound & FOUND_URL )
- {
- OUString aEventQName(
- mrExport.GetNamespaceMap().GetQNameByKey(
- XML_NAMESPACE_DOM, OUString( RTL_CONSTASCII_USTRINGPARAM( "action" ) ) ) );
- mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_EVENT_NAME, aEventQName );
- mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, aHyperURL );
-
- SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_PRESENTATION, XML_EVENT_LISTENER, sal_True, sal_True);
- }
-#endif
}
}
}
@@ -613,8 +564,8 @@ void XMLShapeExport::ImpExportDescription( const uno::Reference< drawing::XShape
OUString aDescription;
uno::Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY_THROW );
- xProps->getPropertyValue( OUString::createFromAscii( "Title" ) ) >>= aTitle;
- xProps->getPropertyValue( OUString::createFromAscii( "Description" ) ) >>= aDescription;
+ xProps->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "Title" )) ) >>= aTitle;
+ xProps->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "Description" )) ) >>= aDescription;
if(aTitle.getLength())
{
@@ -1193,7 +1144,7 @@ void XMLShapeExport::ImpExportGraphicObjectShape(
{
if( aStr[ 0 ] == '#' )
{
- aStreamURL = OUString::createFromAscii( "vnd.sun.star.Package:" );
+ aStreamURL = OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.Package:" ));
aStreamURL = aStreamURL.concat( aStr.copy( 1, aStr.getLength() - 1 ) );
}
@@ -1335,17 +1286,18 @@ void XMLShapeExport::ImpExportConnectorShape(
awt::Point aStart(0,0);
awt::Point aEnd(1,1);
- // --> OD 2004-08-09 #i36248# - Get <StartPositionInHoriL2R> and
- // <EndPositionInHoriL2R>, if they exist and if the document is exported
- // into the OpenOffice.org file format.
- // These properties only exist at service com::sun::star::text::Shape - the
- // Writer UNO service for shapes.
- // This code is needed, because the positioning attributes in the
- // OpenOffice.org file format are given in horizontal left-to-right layout
- // regardless the layout direction the shape is in. In the OASIS Open Office
- // file format the positioning attributes are correctly given in the layout
- // direction the shape is in. Thus, this code provides the conversion from
- // the OASIS Open Office file format to the OpenOffice.org file format.
+ /* Get <StartPositionInHoriL2R> and
+ <EndPositionInHoriL2R>, if they exist and if the document is exported
+ into the OpenOffice.org file format.
+ These properties only exist at service com::sun::star::text::Shape - the
+ Writer UNO service for shapes.
+ This code is needed, because the positioning attributes in the
+ OpenOffice.org file format are given in horizontal left-to-right layout
+ regardless the layout direction the shape is in. In the OASIS Open Office
+ file format the positioning attributes are correctly given in the layout
+ direction the shape is in. Thus, this code provides the conversion from
+ the OASIS Open Office file format to the OpenOffice.org file format. (#i36248#)
+ */
if ( ( GetExport().getExportFlags() & EXPORT_OASIS ) == 0 &&
xProps->getPropertySetInfo()->hasPropertyByName(
OUString(RTL_CONSTASCII_USTRINGPARAM("StartPositionInHoriL2R"))) &&
@@ -1360,7 +1312,6 @@ void XMLShapeExport::ImpExportConnectorShape(
xProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("StartPosition"))) >>= aStart;
xProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("EndPosition"))) >>= aEnd;
}
- // <--
if( pRefPoint )
{
@@ -1507,17 +1458,18 @@ void XMLShapeExport::ImpExportMeasureShape(
awt::Point aStart(0,0);
awt::Point aEnd(1,1);
- // --> OD 2004-08-09 #i36248# - Get <StartPositionInHoriL2R> and
- // <EndPositionInHoriL2R>, if they exist and if the document is exported
- // into the OpenOffice.org file format.
- // These properties only exist at service com::sun::star::text::Shape - the
- // Writer UNO service for shapes.
- // This code is needed, because the positioning attributes in the
- // OpenOffice.org file format are given in horizontal left-to-right layout
- // regardless the layout direction the shape is in. In the OASIS Open Office
- // file format the positioning attributes are correctly given in the layout
- // direction the shape is in. Thus, this code provides the conversion from
- // the OASIS Open Office file format to the OpenOffice.org file format.
+ /* Get <StartPositionInHoriL2R> and
+ <EndPositionInHoriL2R>, if they exist and if the document is exported
+ into the OpenOffice.org file format.
+ These properties only exist at service com::sun::star::text::Shape - the
+ Writer UNO service for shapes.
+ This code is needed, because the positioning attributes in the
+ OpenOffice.org file format are given in horizontal left-to-right layout
+ regardless the layout direction the shape is in. In the OASIS Open Office
+ file format the positioning attributes are correctly given in the layout
+ direction the shape is in. Thus, this code provides the conversion from
+ the OASIS Open Office file format to the OpenOffice.org file format. (#i36248#)
+ */
if ( ( GetExport().getExportFlags() & EXPORT_OASIS ) == 0 &&
xProps->getPropertySetInfo()->hasPropertyByName(
OUString(RTL_CONSTASCII_USTRINGPARAM("StartPositionInHoriL2R"))) &&
@@ -1532,7 +1484,6 @@ void XMLShapeExport::ImpExportMeasureShape(
xProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("StartPosition"))) >>= aStart;
xProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("EndPosition"))) >>= aEnd;
}
- // <--
if( pRefPoint )
{
@@ -1642,7 +1593,7 @@ void XMLShapeExport::ImpExportOLE2Shape(
{
// OOo internal links have no storage persistance, URL is stored in the XML file
// the result LinkURL is empty in case the object is not a link
- xPropSet->getPropertyValue( OUString::createFromAscii( "LinkURL" ) ) >>= sURL;
+ xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "LinkURL" )) ) >>= sURL;
}
xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "PersistName" ) ) ) >>= sPersistName;
@@ -2054,3 +2005,5 @@ void XMLShapeExport::ImpExportMediaShape(
}
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/shapeexport3.cxx b/xmloff/source/draw/shapeexport3.cxx
index c1ac8988c3..41558e2513 100644
--- a/xmloff/source/draw/shapeexport3.cxx
+++ b/xmloff/source/draw/shapeexport3.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -37,9 +38,7 @@
#include <com/sun/star/drawing/DoubleSequence.hpp>
#include <tools/gen.hxx>
-#ifndef _XMLOFF_SHAPEEXPORT_HXX
#include <xmloff/shapeexport.hxx>
-#endif
#include "sdpropls.hxx"
#include <tools/debug.hxx>
#include <rtl/ustrbuf.hxx>
@@ -496,3 +495,5 @@ void XMLShapeExport::export3DLamps( const com::sun::star::uno::Reference< com::s
}
//////////////////////////////////////////////////////////////////////////////
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/shapeexport4.cxx b/xmloff/source/draw/shapeexport4.cxx
index 644f66a77a..e5d36fc70d 100644
--- a/xmloff/source/draw/shapeexport4.cxx
+++ b/xmloff/source/draw/shapeexport4.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -44,9 +45,7 @@
#include <com/sun/star/table/XColumnRowRange.hpp>
-#ifndef _XMLOFF_SHAPEEXPORT_HXX
#include <xmloff/shapeexport.hxx>
-#endif
#include "sdpropls.hxx"
#include <tools/debug.hxx>
#include <rtl/ustrbuf.hxx>
@@ -58,9 +57,7 @@
#include <com/sun/star/container/XIdentifierContainer.hpp>
#include <com/sun/star/drawing/ShadeMode.hpp>
#include <com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp>
-#ifndef _COM_SUN_STAR_DRAWING_ENHANCEDCUSTOMSHAPEPARAMETERPARI_HPP_
#include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
-#endif
#include <com/sun/star/drawing/EnhancedCustomShapeGluePointType.hpp>
#include <com/sun/star/drawing/EnhancedCustomShapeTextFrame.hpp>
#include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp>
@@ -1242,3 +1239,5 @@ void XMLShapeExport::ImpExportTableShape( const uno::Reference< drawing::XShape
DBG_ERROR( "xmloff::XMLShapeExport::ImpExportTableShape(), exception caught!" );
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx
index 792c7606f0..c6f62831cc 100644
--- a/xmloff/source/draw/shapeimport.cxx
+++ b/xmloff/source/draw/shapeimport.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -37,9 +38,7 @@
#include <list>
-#ifndef _XMLOFF_SHAPEIMPORT_HXX
#include <xmloff/shapeimport.hxx>
-#endif
#include <xmloff/xmltkmap.hxx>
#include "xmloff/xmlnmspe.hxx"
#include <xmloff/xmltoken.hxx>
@@ -232,16 +231,7 @@ XMLShapeImportHelper::~XMLShapeImportHelper()
if(mpGroupShapeElemTokenMap) delete mpGroupShapeElemTokenMap;
if(mpFrameShapeElemTokenMap) delete mpFrameShapeElemTokenMap;
-/*
- if(mpShapeAttrTokenMap) delete mpShapeAttrTokenMap;
- if(mpRectShapeAttrTokenMap) delete mpRectShapeAttrTokenMap;
- if(mpLineShapeAttrTokenMap) delete mpLineShapeAttrTokenMap;
- if(mpEllipseShapeAttrTokenMap) delete mpEllipseShapeAttrTokenMap;
- if(mpTextBoxShapeAttrTokenMap) delete mpTextBoxShapeAttrTokenMap;
- if(mpControlShapeAttrTokenMap) delete mpControlShapeAttrTokenMap;
- if(mpPageShapeAttrTokenMap) delete mpPageShapeAttrTokenMap;
- if(mpGraphicObjectShapeAttrTokenMap) delete mpGraphicObjectShapeAttrTokenMap;
-*/
+
if(mpPolygonShapeAttrTokenMap) delete mpPolygonShapeAttrTokenMap;
if(mpPathShapeAttrTokenMap) delete mpPathShapeAttrTokenMap;
if(mp3DSceneShapeElemTokenMap) delete mp3DSceneShapeElemTokenMap;
@@ -276,7 +266,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::GetGroupShapeElemTokenMap()
{
if(!mpGroupShapeElemTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry aGroupShapeElemTokenMap[] =
+ static SvXMLTokenMapEntry aGroupShapeElemTokenMap[] =
{
{ XML_NAMESPACE_DRAW, XML_G, XML_TOK_GROUP_GROUP },
{ XML_NAMESPACE_DRAW, XML_RECT, XML_TOK_GROUP_RECT },
@@ -316,7 +306,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::GetFrameShapeElemTokenMap()
{
if(!mpFrameShapeElemTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry aFrameShapeElemTokenMap[] =
+ static SvXMLTokenMapEntry aFrameShapeElemTokenMap[] =
{
{ XML_NAMESPACE_DRAW, XML_TEXT_BOX, XML_TOK_FRAME_TEXT_BOX },
{ XML_NAMESPACE_DRAW, XML_IMAGE, XML_TOK_FRAME_IMAGE },
@@ -342,7 +332,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DSceneShapeElemTokenMap()
{
if(!mp3DSceneShapeElemTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry a3DSceneShapeElemTokenMap[] =
+ static SvXMLTokenMapEntry a3DSceneShapeElemTokenMap[] =
{
{ XML_NAMESPACE_DR3D, XML_SCENE, XML_TOK_3DSCENE_3DSCENE },
{ XML_NAMESPACE_DR3D, XML_CUBE, XML_TOK_3DSCENE_3DCUBE },
@@ -359,38 +349,13 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DSceneShapeElemTokenMap()
}
//////////////////////////////////////////////////////////////////////////////
-/*
-
-const SvXMLTokenMap& XMLShapeImportHelper::GetShapeAttrTokenMap()
-{
- if(!mpShapeAttrTokenMap)
- {
- static __FAR_DATA SvXMLTokenMapEntry aShapeAttrTokenMap[] =
-{
- { XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_SHAPE_NAME },
- { XML_NAMESPACE_DRAW, XML_STYLE_NAME, XML_TOK_SHAPE_DRAWSTYLE_NAME_GRAPHICS },
- { XML_NAMESPACE_PRESENTATION, XML_CLASS, XML_TOK_SHAPE_PRESENTATION_CLASS },
- { XML_NAMESPACE_PRESENTATION, XML_STYLE_NAME, XML_TOK_SHAPE_DRAWSTYLE_NAME_PRESENTATION },
- { XML_NAMESPACE_SVG, XML_TRANSFORM, XML_TOK_SHAPE_TRANSFORM },
- { XML_NAMESPACE_PRESENTATION, XML_PLACEHOLDER, XML_TOK_SHAPE_IS_PLACEHOLDER },
- { XML_NAMESPACE_PRESENTATION, XML_USER_TRANSFORMED, XML_TOK_SHAPE_IS_USER_TRANSFORMED },
- XML_TOKEN_MAP_END
-};
-
- mpShapeAttrTokenMap = new SvXMLTokenMap(aShapeAttrTokenMap);
- }
-
- return *mpShapeAttrTokenMap;
-}
-*/
-//////////////////////////////////////////////////////////////////////////////
const SvXMLTokenMap& XMLShapeImportHelper::Get3DObjectAttrTokenMap()
{
if(!mp3DObjectAttrTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry a3DObjectAttrTokenMap[] =
+ static SvXMLTokenMapEntry a3DObjectAttrTokenMap[] =
{
{ XML_NAMESPACE_DRAW, XML_STYLE_NAME, XML_TOK_3DOBJECT_DRAWSTYLE_NAME },
{ XML_NAMESPACE_DR3D, XML_TRANSFORM, XML_TOK_3DOBJECT_TRANSFORM },
@@ -410,7 +375,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DPolygonBasedAttrTokenMap()
{
if(!mp3DPolygonBasedAttrTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry a3DPolygonBasedAttrTokenMap[] =
+ static SvXMLTokenMapEntry a3DPolygonBasedAttrTokenMap[] =
{
{ XML_NAMESPACE_SVG, XML_VIEWBOX, XML_TOK_3DPOLYGONBASED_VIEWBOX },
{ XML_NAMESPACE_SVG, XML_D, XML_TOK_3DPOLYGONBASED_D },
@@ -430,7 +395,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DCubeObjectAttrTokenMap()
{
if(!mp3DCubeObjectAttrTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry a3DCubeObjectAttrTokenMap[] =
+ static SvXMLTokenMapEntry a3DCubeObjectAttrTokenMap[] =
{
{ XML_NAMESPACE_DR3D, XML_MIN_EDGE, XML_TOK_3DCUBEOBJ_MINEDGE },
{ XML_NAMESPACE_DR3D, XML_MAX_EDGE, XML_TOK_3DCUBEOBJ_MAXEDGE },
@@ -450,7 +415,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DSphereObjectAttrTokenMap()
{
if(!mp3DSphereObjectAttrTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry a3DSphereObjectAttrTokenMap[] =
+ static SvXMLTokenMapEntry a3DSphereObjectAttrTokenMap[] =
{
{ XML_NAMESPACE_DR3D, XML_CENTER, XML_TOK_3DSPHEREOBJ_CENTER },
{ XML_NAMESPACE_DR3D, XML_SIZE, XML_TOK_3DSPHEREOBJ_SIZE },
@@ -464,81 +429,13 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DSphereObjectAttrTokenMap()
}
//////////////////////////////////////////////////////////////////////////////
-/*
-
-const SvXMLTokenMap& XMLShapeImportHelper::GetRectShapeAttrTokenMap()
-{
- if(!mpRectShapeAttrTokenMap)
- {
- static __FAR_DATA SvXMLTokenMapEntry aRectShapeAttrTokenMap[] =
-{
- { XML_NAMESPACE_SVG, XML_X, XML_TOK_RECTSHAPE_X },
- { XML_NAMESPACE_SVG, XML_Y, XML_TOK_RECTSHAPE_Y },
- { XML_NAMESPACE_SVG, XML_WIDTH, XML_TOK_RECTSHAPE_WIDTH },
- { XML_NAMESPACE_SVG, XML_HEIGHT, XML_TOK_RECTSHAPE_HEIGHT },
- { XML_NAMESPACE_DRAW, XML_CORNER_RADIUS, XML_TOK_RECTSHAPE_CORNER_RADIUS },
- XML_TOKEN_MAP_END
-};
-
- mpRectShapeAttrTokenMap = new SvXMLTokenMap(aRectShapeAttrTokenMap);
- }
-
- return *mpRectShapeAttrTokenMap;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-
-const SvXMLTokenMap& XMLShapeImportHelper::GetLineShapeAttrTokenMap()
-{
- if(!mpLineShapeAttrTokenMap)
- {
- static __FAR_DATA SvXMLTokenMapEntry aLineShapeAttrTokenMap[] =
-{
- { XML_NAMESPACE_SVG, XML_X1, XML_TOK_LINESHAPE_X1 },
- { XML_NAMESPACE_SVG, XML_Y1, XML_TOK_LINESHAPE_Y1 },
- { XML_NAMESPACE_SVG, XML_X2, XML_TOK_LINESHAPE_X2 },
- { XML_NAMESPACE_SVG, XML_Y2, XML_TOK_LINESHAPE_Y2 },
- XML_TOKEN_MAP_END
-};
-
- mpLineShapeAttrTokenMap = new SvXMLTokenMap(aLineShapeAttrTokenMap);
- }
-
- return *mpLineShapeAttrTokenMap;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-
-const SvXMLTokenMap& XMLShapeImportHelper::GetEllipseShapeAttrTokenMap()
-{
- if(!mpEllipseShapeAttrTokenMap)
- {
- static __FAR_DATA SvXMLTokenMapEntry aEllipseShapeAttrTokenMap[] =
-{
- { XML_NAMESPACE_SVG, XML_RX, XML_TOK_ELLIPSESHAPE_RX },
- { XML_NAMESPACE_SVG, XML_RY, XML_TOK_ELLIPSESHAPE_RY },
- { XML_NAMESPACE_SVG, XML_CX, XML_TOK_ELLIPSESHAPE_CX },
- { XML_NAMESPACE_SVG, XML_CY, XML_TOK_ELLIPSESHAPE_CY },
- { XML_NAMESPACE_SVG, XML_R, XML_TOK_ELLIPSESHAPE_R },
- XML_TOKEN_MAP_END
-};
-
- mpEllipseShapeAttrTokenMap = new SvXMLTokenMap(aEllipseShapeAttrTokenMap);
- }
-
- return *mpEllipseShapeAttrTokenMap;
-}
-//////////////////////////////////////////////////////////////////////////////
-*/
const SvXMLTokenMap& XMLShapeImportHelper::GetPolygonShapeAttrTokenMap()
{
if(!mpPolygonShapeAttrTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry aPolygonShapeAttrTokenMap[] =
+ static SvXMLTokenMapEntry aPolygonShapeAttrTokenMap[] =
{
{ XML_NAMESPACE_SVG, XML_VIEWBOX, XML_TOK_POLYGONSHAPE_VIEWBOX },
{ XML_NAMESPACE_DRAW, XML_POINTS, XML_TOK_POLYGONSHAPE_POINTS },
@@ -558,7 +455,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::GetPathShapeAttrTokenMap()
{
if(!mpPathShapeAttrTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry aPathShapeAttrTokenMap[] =
+ static SvXMLTokenMapEntry aPathShapeAttrTokenMap[] =
{
{ XML_NAMESPACE_SVG, XML_VIEWBOX, XML_TOK_PATHSHAPE_VIEWBOX },
{ XML_NAMESPACE_SVG, XML_D, XML_TOK_PATHSHAPE_D },
@@ -570,51 +467,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::GetPathShapeAttrTokenMap()
return *mpPathShapeAttrTokenMap;
}
-/*
-//////////////////////////////////////////////////////////////////////////////
-
-
-const SvXMLTokenMap& XMLShapeImportHelper::GetTextBoxShapeAttrTokenMap()
-{
- if(!mpTextBoxShapeAttrTokenMap)
- {
- static __FAR_DATA SvXMLTokenMapEntry aTextBoxShapeAttrTokenMap[] =
-{
- { XML_NAMESPACE_SVG, XML_X, XML_TOK_TEXTBOXSHAPE_X },
- { XML_NAMESPACE_SVG, XML_Y, XML_TOK_TEXTBOXSHAPE_Y },
- { XML_NAMESPACE_SVG, XML_WIDTH, XML_TOK_TEXTBOXSHAPE_WIDTH },
- { XML_NAMESPACE_SVG, XML_HEIGHT, XML_TOK_TEXTBOXSHAPE_HEIGHT },
- XML_TOKEN_MAP_END
-};
- mpTextBoxShapeAttrTokenMap = new SvXMLTokenMap(aTextBoxShapeAttrTokenMap);
- }
-
- return *mpTextBoxShapeAttrTokenMap;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-
-const SvXMLTokenMap& XMLShapeImportHelper::GetControlShapeAttrTokenMap()
-{
- if(!mpControlShapeAttrTokenMap)
- {
- static __FAR_DATA SvXMLTokenMapEntry aControlShapeAttrTokenMap[] =
-{
- { XML_NAMESPACE_SVG, XML_X, XML_TOK_CONTROLSHAPE_X },
- { XML_NAMESPACE_SVG, XML_Y, XML_TOK_CONTROLSHAPE_Y },
- { XML_NAMESPACE_SVG, XML_WIDTH, XML_TOK_CONTROLSHAPE_WIDTH },
- { XML_NAMESPACE_SVG, XML_HEIGHT, XML_TOK_CONTROLSHAPE_HEIGHT },
- XML_TOKEN_MAP_END
-};
-
- mpControlShapeAttrTokenMap = new SvXMLTokenMap(aControlShapeAttrTokenMap);
- }
-
- return *mpControlShapeAttrTokenMap;
-}
-*/
//////////////////////////////////////////////////////////////////////////////
@@ -622,7 +475,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DSceneShapeAttrTokenMap()
{
if(!mp3DSceneShapeAttrTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry a3DSceneShapeAttrTokenMap[] =
+ static SvXMLTokenMapEntry a3DSceneShapeAttrTokenMap[] =
{
{ XML_NAMESPACE_DR3D, XML_TRANSFORM, XML_TOK_3DSCENESHAPE_TRANSFORM },
{ XML_NAMESPACE_DR3D, XML_VRP, XML_TOK_3DSCENESHAPE_VRP },
@@ -651,7 +504,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DLightAttrTokenMap()
{
if(!mp3DLightAttrTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry a3DLightAttrTokenMap[] =
+ static SvXMLTokenMapEntry a3DLightAttrTokenMap[] =
{
{ XML_NAMESPACE_DR3D, XML_DIFFUSE_COLOR, XML_TOK_3DLIGHT_DIFFUSE_COLOR },
{ XML_NAMESPACE_DR3D, XML_DIRECTION, XML_TOK_3DLIGHT_DIRECTION },
@@ -667,52 +520,8 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DLightAttrTokenMap()
}
//////////////////////////////////////////////////////////////////////////////
-/*
-
-const SvXMLTokenMap& XMLShapeImportHelper::GetPageShapeAttrTokenMap()
-{
- if(!mpPageShapeAttrTokenMap)
- {
- static __FAR_DATA SvXMLTokenMapEntry aPageShapeAttrTokenMap[] =
-{
- { XML_NAMESPACE_SVG, XML_X, XML_TOK_PAGESHAPE_X },
- { XML_NAMESPACE_SVG, XML_Y, XML_TOK_PAGESHAPE_Y },
- { XML_NAMESPACE_SVG, XML_WIDTH, XML_TOK_PAGESHAPE_WIDTH },
- { XML_NAMESPACE_SVG, XML_HEIGHT, XML_TOK_PAGESHAPE_HEIGHT },
- XML_TOKEN_MAP_END
-};
-
- mpPageShapeAttrTokenMap = new SvXMLTokenMap(aPageShapeAttrTokenMap);
- }
-
- return *mpPageShapeAttrTokenMap;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-const SvXMLTokenMap& XMLShapeImportHelper::GetGraphicObjectShapeAttrTokenMap()
-{
- if(!mpGraphicObjectShapeAttrTokenMap)
- {
- static __FAR_DATA SvXMLTokenMapEntry aGraphicObjectShapeAttrTokenMap[] =
-{
- { XML_NAMESPACE_SVG, XML_X, XML_TOK_GOSHAPE_X },
- { XML_NAMESPACE_SVG, XML_Y, XML_TOK_GOSHAPE_Y },
- { XML_NAMESPACE_SVG, XML_WIDTH, XML_TOK_GOSHAPE_WIDTH },
- { XML_NAMESPACE_SVG, XML_HEIGHT, XML_TOK_GOSHAPE_HEIGHT },
- { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_GOSHAPE_URL },
- XML_TOKEN_MAP_END
-};
-
- mpGraphicObjectShapeAttrTokenMap = new SvXMLTokenMap(aGraphicObjectShapeAttrTokenMap);
- }
-
- return *mpGraphicObjectShapeAttrTokenMap;
-}
-*/
-//////////////////////////////////////////////////////////////////////////////
-
SvXMLShapeContext* XMLShapeImportHelper::Create3DSceneChildContext(
SvXMLImport& rImport,
USHORT p_nPrefix,
@@ -1053,18 +862,19 @@ void XMLShapeImportHelper::finishShape(
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >&,
com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >&)
{
- // --> OD 2004-08-10 #i28749#, #i36248# - set property <PositionLayoutDir>
- // to <PositionInHoriL2R>, if it exists and the import states that
- // the shape positioning attributes are in horizontal left-to-right
- // layout. This is the case for the OpenOffice.org file format.
- // This setting is done for Writer documents, because the property
- // only exists at service com::sun::star::text::Shape - the Writer
- // UNO service for shapes.
- // The value indicates that the positioning attributes are given
- // in horizontal left-to-right layout. The property is evaluated
- // during the first positioning of the shape in order to convert
- // the shape position given in the OpenOffice.org file format to
- // the one for the OASIS Open Office file format.
+ /* Set property <PositionLayoutDir>
+ to <PositionInHoriL2R>, if it exists and the import states that
+ the shape positioning attributes are in horizontal left-to-right
+ layout. This is the case for the OpenOffice.org file format.
+ This setting is done for Writer documents, because the property
+ only exists at service com::sun::star::text::Shape - the Writer
+ UNO service for shapes.
+ The value indicates that the positioning attributes are given
+ in horizontal left-to-right layout. The property is evaluated
+ during the first positioning of the shape in order to convert
+ the shape position given in the OpenOffice.org file format to
+ the one for the OASIS Open Office file format. (#i28749#, #i36248#)
+ */
uno::Reference< beans::XPropertySet > xPropSet(rShape, uno::UNO_QUERY);
if ( xPropSet.is() )
{
@@ -1134,7 +944,7 @@ void ShapeSortContext::moveShape( sal_Int32 nSourcePos, sal_Int32 nDestPos )
DBG_ASSERT( (*aIter).nIs >= nDestPos, "Shape sorting failed" );
(*aIter).nIs++;
}
- aIter++;
+ ++aIter;
}
aIter = maUnsortedList.begin();
@@ -1147,7 +957,7 @@ void ShapeSortContext::moveShape( sal_Int32 nSourcePos, sal_Int32 nDestPos )
DBG_ASSERT( (*aIter).nIs >= nDestPos, "shape sorting failed" );
(*aIter).nIs++;
}
- aIter++;
+ ++aIter;
}
}
}
@@ -1379,7 +1189,7 @@ void XMLShapeImportHelper::moveGluePointMapping( const com::sun::star::uno::Refe
{
if ( (*aShapeIdIter).second != -1 )
(*aShapeIdIter).second += n;
- aShapeIdIter++;
+ ++aShapeIdIter;
}
}
}
@@ -1464,3 +1274,5 @@ void SvXMLShapeContext::setHyperlink( const OUString& rHyperlink )
{
msHyperlink = rHyperlink;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/viewcontext.cxx b/xmloff/source/draw/viewcontext.cxx
index d98d8ea171..1a9845fe23 100644
--- a/xmloff/source/draw/viewcontext.cxx
+++ b/xmloff/source/draw/viewcontext.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -89,3 +90,5 @@ void SdXMLViewSettingsContext::EndElement()
xProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "VisibleArea" ) ), aAny );
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/viewcontext.hxx b/xmloff/source/draw/viewcontext.hxx
index 73682f6930..af92bdbabc 100644
--- a/xmloff/source/draw/viewcontext.hxx
+++ b/xmloff/source/draw/viewcontext.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -52,3 +53,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx
index 5820f854ff..6a5e866fe2 100644
--- a/xmloff/source/draw/xexptran.cxx
+++ b/xmloff/source/draw/xexptran.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -424,14 +425,14 @@ const OUString& SdXMLImExTransform2D::GetExportString(const SvXMLUnitConverter&
{
case IMP_SDXMLEXP_TRANSOBJ2D_ROTATE :
{
- aNewString += OUString::createFromAscii("rotate (");
+ aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "rotate (" ));
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DRotate*)pObj)->mfRotate);
aNewString += aClosingBrace;
break;
}
case IMP_SDXMLEXP_TRANSOBJ2D_SCALE :
{
- aNewString += OUString::createFromAscii("scale (");
+ aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "scale (" ));
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DScale*)pObj)->maScale.getX());
aNewString += aEmptySpace;
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DScale*)pObj)->maScale.getY());
@@ -440,7 +441,7 @@ const OUString& SdXMLImExTransform2D::GetExportString(const SvXMLUnitConverter&
}
case IMP_SDXMLEXP_TRANSOBJ2D_TRANSLATE :
{
- aNewString += OUString::createFromAscii("translate (");
+ aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "translate (" ));
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DTranslate*)pObj)->maTranslate.getX(), true);
aNewString += aEmptySpace;
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DTranslate*)pObj)->maTranslate.getY(), true);
@@ -449,21 +450,21 @@ const OUString& SdXMLImExTransform2D::GetExportString(const SvXMLUnitConverter&
}
case IMP_SDXMLEXP_TRANSOBJ2D_SKEWX :
{
- aNewString += OUString::createFromAscii("skewX (");
+ aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "skewX (" ));
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DSkewX*)pObj)->mfSkewX);
aNewString += aClosingBrace;
break;
}
case IMP_SDXMLEXP_TRANSOBJ2D_SKEWY :
{
- aNewString += OUString::createFromAscii("skewY (");
+ aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "skewY (" ));
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DSkewY*)pObj)->mfSkewY);
aNewString += aClosingBrace;
break;
}
case IMP_SDXMLEXP_TRANSOBJ2D_MATRIX :
{
- aNewString += OUString::createFromAscii("matrix (");
+ aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "matrix (" ));
// a
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DMatrix*)pObj)->maMatrix.get(0, 0));
@@ -530,12 +531,12 @@ void SdXMLImExTransform2D::SetString(const OUString& rNew, const SvXMLUnitConver
const OUString aStr(msString.getStr(), (sal_uInt16)msString.getLength());
const sal_Int32 nLen(aStr.getLength());
- const OUString aString_rotate(OUString::createFromAscii("rotate"));
- const OUString aString_scale(OUString::createFromAscii("scale"));
- const OUString aString_translate(OUString::createFromAscii("translate"));
- const OUString aString_skewX(OUString::createFromAscii("skewX"));
- const OUString aString_skewY(OUString::createFromAscii("skewY"));
- const OUString aString_matrix(OUString::createFromAscii("matrix"));
+ const OUString aString_rotate(RTL_CONSTASCII_USTRINGPARAM( "rotate" ));
+ const OUString aString_scale(RTL_CONSTASCII_USTRINGPARAM( "scale" ));
+ const OUString aString_translate(RTL_CONSTASCII_USTRINGPARAM( "translate" ));
+ const OUString aString_skewX(RTL_CONSTASCII_USTRINGPARAM( "skewX" ));
+ const OUString aString_skewY(RTL_CONSTASCII_USTRINGPARAM( "skewY" ));
+ const OUString aString_matrix(RTL_CONSTASCII_USTRINGPARAM( "matrix" ));
sal_Int32 nPos(0);
@@ -900,28 +901,28 @@ const OUString& SdXMLImExTransform3D::GetExportString(const SvXMLUnitConverter&
{
case IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_X :
{
- aNewString += OUString::createFromAscii("rotatex (");
+ aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "rotatex (" ));
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DRotateX*)pObj)->mfRotateX);
aNewString += aClosingBrace;
break;
}
case IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_Y :
{
- aNewString += OUString::createFromAscii("rotatey (");
+ aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "rotatey (" ));
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DRotateY*)pObj)->mfRotateY);
aNewString += aClosingBrace;
break;
}
case IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_Z :
{
- aNewString += OUString::createFromAscii("rotatez (");
+ aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "rotatez (" ));
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DRotateZ*)pObj)->mfRotateZ);
aNewString += aClosingBrace;
break;
}
case IMP_SDXMLEXP_TRANSOBJ3D_SCALE :
{
- aNewString += OUString::createFromAscii("scale (");
+ aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "scale (" ));
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DScale*)pObj)->maScale.getX());
aNewString += aEmptySpace;
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DScale*)pObj)->maScale.getY());
@@ -932,7 +933,7 @@ const OUString& SdXMLImExTransform3D::GetExportString(const SvXMLUnitConverter&
}
case IMP_SDXMLEXP_TRANSOBJ3D_TRANSLATE :
{
- aNewString += OUString::createFromAscii("translate (");
+ aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "translate (" ));
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DTranslate*)pObj)->maTranslate.getX(), true);
aNewString += aEmptySpace;
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DTranslate*)pObj)->maTranslate.getY(), true);
@@ -943,7 +944,7 @@ const OUString& SdXMLImExTransform3D::GetExportString(const SvXMLUnitConverter&
}
case IMP_SDXMLEXP_TRANSOBJ3D_MATRIX :
{
- aNewString += OUString::createFromAscii("matrix (");
+ aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "matrix (" ));
// a
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DMatrix*)pObj)->maMatrix.get(0, 0));
@@ -1034,12 +1035,12 @@ void SdXMLImExTransform3D::SetString(const OUString& rNew, const SvXMLUnitConver
const OUString aStr(msString.getStr(), (sal_uInt16)msString.getLength());
const sal_Int32 nLen(aStr.getLength());
- const OUString aString_rotatex(OUString::createFromAscii("rotatex"));
- const OUString aString_rotatey(OUString::createFromAscii("rotatey"));
- const OUString aString_rotatez(OUString::createFromAscii("rotatez"));
- const OUString aString_scale(OUString::createFromAscii("scale"));
- const OUString aString_translate(OUString::createFromAscii("translate"));
- const OUString aString_matrix(OUString::createFromAscii("matrix"));
+ const OUString aString_rotatex(RTL_CONSTASCII_USTRINGPARAM( "rotatex" ));
+ const OUString aString_rotatey(RTL_CONSTASCII_USTRINGPARAM( "rotatey" ));
+ const OUString aString_rotatez(RTL_CONSTASCII_USTRINGPARAM( "rotatez" ));
+ const OUString aString_scale(RTL_CONSTASCII_USTRINGPARAM( "scale" ));
+ const OUString aString_translate(RTL_CONSTASCII_USTRINGPARAM( "translate" ));
+ const OUString aString_matrix(RTL_CONSTASCII_USTRINGPARAM( "matrix" ));
sal_Int32 nPos(0);
@@ -2358,6 +2359,7 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const OUString& rNew,
}
DBG_ASSERT(!bEllipticalArc, "XMLIMP: non-interpreted tags in svg:d element!");
+ (void)bEllipticalArc;
if(nNumPolys)
{
@@ -3115,3 +3117,5 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const OUString& rNew,
}
// eof
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximp3dobject.cxx b/xmloff/source/draw/ximp3dobject.cxx
index 860bc6b3e5..64cc139a67 100644
--- a/xmloff/source/draw/ximp3dobject.cxx
+++ b/xmloff/source/draw/ximp3dobject.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -123,66 +124,6 @@ void SdXML3DObjectContext::EndElement()
SdXMLShapeContext::EndElement();
}
-//////////////////////////////////////////////////////////////////////////////
-/*
-void SdXML3DObjectContext::AddShape(uno::Reference< drawing::XShape >& xShape)
-{
- if(xShape.is() && mxShapes.is())
- {
- // set shape local
- mxShape = xShape;
-
- // add new shape to parent
- mxShapes->add( xShape );
- }
-}
-*/
-//////////////////////////////////////////////////////////////////////////////
-/*
-void SdXML3DObjectContext::SetStyle()
-{
- // set style on shape
- if(maDrawStyleName.getLength() && mxShape.is())
- {
- const SvXMLStyleContext* pStyle = 0L;
- sal_Bool bAutoStyle(FALSE);
-
- if(GetImport().GetShapeImport()->GetAutoStylesContext())
- pStyle = GetImport().GetShapeImport()->GetAutoStylesContext()->FindStyleChildContext(
- XML_STYLE_FAMILY_SD_GRAPHICS_ID, maDrawStyleName);
-
- if(pStyle)
- bAutoStyle = TRUE;
-
- if(!pStyle && GetImport().GetShapeImport()->GetStylesContext())
- pStyle = GetImport().GetShapeImport()->GetStylesContext()->
- FindStyleChildContext(XML_STYLE_FAMILY_SD_GRAPHICS_ID, maDrawStyleName);
-
- if(pStyle && pStyle->ISA(XMLShapeStyleContext))
- {
- uno::Reference< beans::XPropertySet > xPropSet(mxShape, uno::UNO_QUERY);
- if(xPropSet.is())
- {
- XMLShapeStyleContext* pDocStyle = (XMLShapeStyleContext*)pStyle;
-
- if(pDocStyle->GetStyle().is())
- {
- // set style on object
- uno::Any aAny;
- aAny <<= pDocStyle->GetStyle();
- xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Style")), aAny);
- }
-
- if(bAutoStyle)
- {
- // set PropertySet on object
- pDocStyle->FillPropertySet(xPropSet);
- }
- }
- }
- }
-}
-*/
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -611,3 +552,5 @@ void SdXML3DExtrudeObjectShapeContext::EndElement()
}
// EOF
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximp3dobject.hxx b/xmloff/source/draw/ximp3dobject.hxx
index a7ad16fffe..482927c5ab 100644
--- a/xmloff/source/draw/ximp3dobject.hxx
+++ b/xmloff/source/draw/ximp3dobject.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -177,3 +178,5 @@ public:
};
#endif // _XIMP3DOBJECT_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx
index a31c0cec27..319e253257 100644
--- a/xmloff/source/draw/ximp3dscene.cxx
+++ b/xmloff/source/draw/ximp3dscene.cxx
@@ -1,10 +1,11 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* This file is part of OpenOffice.org.
*
@@ -46,16 +47,16 @@ using namespace ::xmloff::token;
//////////////////////////////////////////////////////////////////////////////
// dr3d:3dlight context
-SdXML3DLightContext::SdXML3DLightContext(
- SvXMLImport& rImport,
+SdXML3DLightContext::SdXML3DLightContext(
+ SvXMLImport& rImport,
sal_uInt16 nPrfx,
- const rtl::OUString& rLName,
+ const rtl::OUString& rLName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList)
: SvXMLImportContext( rImport, nPrfx, rLName),
maDiffuseColor(0x00000000),
maDirection(0.0, 0.0, 1.0),
- mbEnabled(FALSE),
- mbSpecular(FALSE)
+ mbEnabled(false),
+ mbSpecular(false)
{
// read attributes for the 3DScene
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
@@ -101,13 +102,13 @@ SdXML3DLightContext::~SdXML3DLightContext()
TYPEINIT1( SdXML3DSceneShapeContext, SdXMLShapeContext );
-SdXML3DSceneShapeContext::SdXML3DSceneShapeContext(
+SdXML3DSceneShapeContext::SdXML3DSceneShapeContext(
SvXMLImport& rImport,
- USHORT nPrfx,
+ USHORT nPrfx,
const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
uno::Reference< drawing::XShapes >& rShapes,
- sal_Bool bTemporaryShapes)
+ sal_Bool bTemporaryShapes)
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShapes ), SdXML3DSceneAttributesHelper( rImport )
{
}
@@ -124,7 +125,7 @@ void SdXML3DSceneShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
{
// create new 3DScene shape and add it to rShapes, use it
// as base for the new 3DScene import
- AddShape( "com.sun.star.drawing.Shape3DSceneObject" );
+ AddShape( "com.sun.star.drawing.Shape3DSceneObject" );
if( mxShape.is() )
{
SetStyle();
@@ -187,7 +188,7 @@ SvXMLImportContext* SdXML3DSceneShapeContext::CreateChildContext( USHORT nPrefix
SvXMLImportContext* pContext = 0L;
// #i68101#
- if( nPrefix == XML_NAMESPACE_SVG &&
+ if( nPrefix == XML_NAMESPACE_SVG &&
(IsXMLToken( rLocalName, XML_TITLE ) || IsXMLToken( rLocalName, XML_DESC ) ) )
{
pContext = new SdXMLDescriptionContext( GetImport(), nPrefix, rLocalName, xAttrList, mxShape );
@@ -231,7 +232,7 @@ SdXML3DSceneAttributesHelper::SdXML3DSceneAttributesHelper( SvXMLImport& rImport
mnShadowSlant(0),
mxShadeMode(drawing::ShadeMode_SMOOTH),
maAmbientColor(0x00666666),
- mbLightingMode(FALSE),
+ mbLightingMode(false),
maVRP(0.0, 0.0, 1.0),
maVPN(0.0, 0.0, 1.0),
maVUP(0.0, 1.0, 0.0),
@@ -244,8 +245,9 @@ SdXML3DSceneAttributesHelper::SdXML3DSceneAttributesHelper( SvXMLImport& rImport
SdXML3DSceneAttributesHelper::~SdXML3DSceneAttributesHelper()
{
// release remembered light contexts, they are no longer needed
- while(maList.Count())
- maList.Remove(maList.Count() - 1)->ReleaseRef();
+ for ( size_t i = maList.size(); i > 0; )
+ maList[ --i ]->ReleaseRef();
+ maList.clear();
}
/** creates a 3d ligth context and adds it to the internal list for later processing */
@@ -257,7 +259,7 @@ SvXMLImportContext * SdXML3DSceneAttributesHelper::create3DLightContext( sal_uIn
if(pContext)
{
pContext->AddRef();
- maList.Insert((SdXML3DLightContext*)pContext, LIST_APPEND);
+ maList.push_back( (SdXML3DLightContext*)pContext );
}
return pContext;
@@ -291,7 +293,7 @@ void SdXML3DSceneAttributesHelper::processSceneAttribute( sal_uInt16 nPrefix, co
{
::basegfx::B3DVector aNewVec;
mrImport.GetMM100UnitConverter().convertB3DVector(aNewVec, rValue);
-
+
if(aNewVec != maVPN)
{
maVPN = aNewVec;
@@ -303,7 +305,7 @@ void SdXML3DSceneAttributesHelper::processSceneAttribute( sal_uInt16 nPrefix, co
{
::basegfx::B3DVector aNewVec;
mrImport.GetMM100UnitConverter().convertB3DVector(aNewVec, rValue);
-
+
if(aNewVec != maVUP)
{
maVUP = aNewVec;
@@ -395,15 +397,15 @@ void SdXML3DSceneAttributesHelper::setSceneAttributes( const com::sun::star::uno
aAny <<= mbLightingMode;
xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DSceneTwoSidedLighting")), aAny);
- if(maList.Count())
+ if( !maList.empty() )
{
uno::Any aAny2;
uno::Any aAny3;
// set lights
- for(sal_uInt32 a(0L); a < maList.Count(); a++)
+ for( size_t a = 0; a < maList.size(); a++)
{
- SdXML3DLightContext* pCtx = (SdXML3DLightContext*)maList.GetObject(a);
+ SdXML3DLightContext* pCtx = (SdXML3DLightContext*)maList[ a ];
// set anys
aAny <<= pCtx->GetDiffuseColor().GetColor();
@@ -495,3 +497,5 @@ void SdXML3DSceneAttributesHelper::setSceneAttributes( const com::sun::star::uno
aAny <<= mxPrjMode;
xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("D3DScenePerspective")), aAny);
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximp3dscene.hxx b/xmloff/source/draw/ximp3dscene.hxx
index 0a408182e2..24d0bd1aad 100644
--- a/xmloff/source/draw/ximp3dscene.hxx
+++ b/xmloff/source/draw/ximp3dscene.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -79,3 +80,5 @@ public:
#endif // _XIMPGROUP_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximpbody.cxx b/xmloff/source/draw/ximpbody.cxx
index 3742134b2d..fb54f83222 100644
--- a/xmloff/source/draw/ximpbody.cxx
+++ b/xmloff/source/draw/ximpbody.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -386,3 +387,5 @@ SvXMLImportContext *SdXMLBodyContext::CreateChildContext(
return pContext;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximpbody.hxx b/xmloff/source/draw/ximpbody.hxx
index efc088105a..1fe2a5b4d1 100644
--- a/xmloff/source/draw/ximpbody.hxx
+++ b/xmloff/source/draw/ximpbody.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -77,3 +78,5 @@ public:
#endif // _XIMPBODY_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx
index 2b1f0220af..9767acfb52 100644
--- a/xmloff/source/draw/ximpcustomshape.cxx
+++ b/xmloff/source/draw/ximpcustomshape.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -86,7 +87,7 @@ const SvXMLEnumMapEntry aXML_GluePointEnumMap[] =
void GetBool( std::vector< com::sun::star::beans::PropertyValue >& rDest,
const rtl::OUString& rValue, const EnhancedCustomShapeTokenEnum eDestProp )
{
- sal_Bool bAttrBool;
+ bool bAttrBool;
if ( SvXMLUnitConverter::convertBool( bAttrBool, rValue ) )
{
beans::PropertyValue aProp;
@@ -316,10 +317,10 @@ sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter
if ( bNumberRequired )
{
sal_Int32 nStartIndex = nIndex;
+ sal_Int32 nEIndex = 0; // index of "E" in double
- sal_Bool bM = sal_False; // set if the value is negative
sal_Bool bE = sal_False; // set if a double is including a "E" statement
- sal_Bool bEM = sal_False; // set if a double is including a "E-"statement
+ sal_Bool bENum = sal_False; // there is at least one number after "E"
sal_Bool bDot = sal_False; // set if there is a dot included
sal_Bool bEnd = sal_False; // set for each value that can not be part of a double/integer
@@ -347,11 +348,16 @@ sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter
else
{
if ( nStartIndex == nIndex )
- bM = sal_True;
+ bValid = sal_True;
else if ( bE )
- bEM = sal_True;
- else
- bValid = sal_False;
+ {
+ if ( nEIndex + 1 == nIndex )
+ bValid = sal_True;
+ else if ( bENum )
+ bEnd = sal_True;
+ else
+ bValid = sal_False;
+ }
}
}
break;
@@ -364,7 +370,10 @@ sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter
else
{
if ( !bE )
+ {
bE = sal_True;
+ nEIndex = nIndex;
+ }
else
bEnd = sal_True;
}
@@ -380,6 +389,10 @@ sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter
case '7' :
case '8' :
case '9' :
+ {
+ if ( bE && ! bENum )
+ bENum = sal_True;
+ }
break;
default:
bEnd = sal_True;
@@ -882,7 +895,7 @@ void XMLEnhancedCustomShapeContext::StartElement( const uno::Reference< xml::sax
double fFactor = SvXMLExportHelper::GetConversionFactor( aUnitStr, MAP_100TH_MM, eSrcUnit );
if ( ( fFactor != 1.0 ) && ( fFactor != 0.0 ) )
{
- double fDepth;
+ double fDepth(0.0);
if ( rDepth.Value >>= fDepth )
{
fDepth /= fFactor;
@@ -1164,7 +1177,7 @@ void XMLEnhancedCustomShapeContext::EndElement()
while( aEquationNameIter != aEquationNameEnd )
{
(*pH)[ *aEquationNameIter ] = (sal_Int32)( aEquationNameIter - maEquationNames.begin() );
- aEquationNameIter++;
+ ++aEquationNameIter;
}
// resolve equation
@@ -1195,7 +1208,7 @@ void XMLEnhancedCustomShapeContext::EndElement()
}
}
while( nIndexOf != -1 );
- aEquationIter++;
+ ++aEquationIter;
}
// Path
@@ -1236,7 +1249,7 @@ void XMLEnhancedCustomShapeContext::EndElement()
default:
break;
}
- aPathIter++;
+ ++aPathIter;
}
std::vector< beans::PropertyValues >::iterator aHandleIter = maHandles.begin();
std::vector< beans::PropertyValues >::iterator aHandleEnd = maHandles.end();
@@ -1273,7 +1286,7 @@ void XMLEnhancedCustomShapeContext::EndElement()
}
pValues++;
}
- aHandleIter++;
+ ++aHandleIter;
}
delete pH;
}
@@ -1382,3 +1395,5 @@ SvXMLImportContext* XMLEnhancedCustomShapeContext::CreateChildContext( USHORT nP
}
return SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList );
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximpcustomshape.hxx b/xmloff/source/draw/ximpcustomshape.hxx
index 159bd5c985..12c0a6ac40 100644
--- a/xmloff/source/draw/ximpcustomshape.hxx
+++ b/xmloff/source/draw/ximpcustomshape.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -75,3 +76,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximpgrp.cxx b/xmloff/source/draw/ximpgrp.cxx
index 2eb4700d95..13924dd305 100644
--- a/xmloff/source/draw/ximpgrp.cxx
+++ b/xmloff/source/draw/ximpgrp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -128,3 +129,4 @@ void SdXMLGroupShapeContext::EndElement()
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximpgrp.hxx b/xmloff/source/draw/ximpgrp.hxx
index 1a4b5326dc..d0f2d2883f 100644
--- a/xmloff/source/draw/ximpgrp.hxx
+++ b/xmloff/source/draw/ximpgrp.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -70,3 +71,5 @@ public:
#endif // _XIMPGROUP_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximplink.cxx b/xmloff/source/draw/ximplink.cxx
index 5260690e5b..1ea1764d42 100644
--- a/xmloff/source/draw/ximplink.cxx
+++ b/xmloff/source/draw/ximplink.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -100,3 +101,4 @@ void SdXMLShapeLinkContext::EndElement()
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximplink.hxx b/xmloff/source/draw/ximplink.hxx
index 1ff631f8b5..8d9ca87889 100644
--- a/xmloff/source/draw/ximplink.hxx
+++ b/xmloff/source/draw/ximplink.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -64,3 +65,5 @@ public:
#endif // _XIMPLINK_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximpnote.cxx b/xmloff/source/draw/ximpnote.cxx
index 5bb6d9fe4c..9f8999be8d 100644
--- a/xmloff/source/draw/ximpnote.cxx
+++ b/xmloff/source/draw/ximpnote.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -140,3 +141,5 @@ void SdXMLNotesContext::EndElement()
{
SdXMLGenericPageContext::EndElement();
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximpnote.hxx b/xmloff/source/draw/ximpnote.hxx
index 7d810431f0..bf6108373d 100644
--- a/xmloff/source/draw/ximpnote.hxx
+++ b/xmloff/source/draw/ximpnote.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -56,3 +57,5 @@ public:
#endif // _XIMPNOTES_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx
index 97729795d4..be830b502f 100644
--- a/xmloff/source/draw/ximppage.cxx
+++ b/xmloff/source/draw/ximppage.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -645,3 +646,5 @@ void SdXMLGenericPageContext::SetNavigationOrder()
DBG_ERROR("xmloff::SdXMLGenericPageContext::SetNavigationOrder(), unexpected exception cought while importing shape navigation order!");
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximppage.hxx b/xmloff/source/draw/ximppage.hxx
index 2ec9dcc8dd..96f8fd5bc6 100644
--- a/xmloff/source/draw/ximppage.hxx
+++ b/xmloff/source/draw/ximppage.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -94,3 +95,5 @@ public:
#endif // _XIMPGROUP_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index ba2d8cdb1f..94448e9450 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -1,10 +1,11 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* This file is part of OpenOffice.org.
*
@@ -86,10 +87,7 @@
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <tools/string.hxx>
#include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp>
-
-// --> OD 2006-02-22 #b6382898#
#include <com/sun/star/text/XTextDocument.hpp>
-// <--
using ::rtl::OUString;
using ::rtl::OUStringBuffer;
@@ -187,7 +185,7 @@ SvXMLImportContext *SdXMLShapeContext::CreateChildContext( USHORT p_nPrefix,
SvXMLImportContext * pContext = NULL;
// #i68101#
- if( p_nPrefix == XML_NAMESPACE_SVG &&
+ if( p_nPrefix == XML_NAMESPACE_SVG &&
(IsXMLToken( rLocalName, XML_TITLE ) || IsXMLToken( rLocalName, XML_DESC ) ) )
{
pContext = new SdXMLDescriptionContext( GetImport(), p_nPrefix, rLocalName, xAttrList, mxShape );
@@ -497,23 +495,22 @@ void SdXMLShapeContext::AddShape(const char* pServiceName )
{
try
{
- // --> OD 2006-02-22 #b6382898#
- // Since fix for issue i33294 the Writer model doesn't support
- // com.sun.star.drawing.OLE2Shape anymore.
- // To handle Draw OLE objects it's decided to import these
- // objects as com.sun.star.drawing.OLE2Shape and convert these
- // objects after the import into com.sun.star.drawing.GraphicObjectShape.
+ /* Since fix for issue i33294 the Writer model doesn't support
+ com.sun.star.drawing.OLE2Shape anymore.
+ To handle Draw OLE objects it's decided to import these
+ objects as com.sun.star.drawing.OLE2Shape and convert these
+ objects after the import into com.sun.star.drawing.GraphicObjectShape.
+ */
uno::Reference< drawing::XShape > xShape;
if ( OUString::createFromAscii(pServiceName).compareToAscii( "com.sun.star.drawing.OLE2Shape" ) == 0 &&
uno::Reference< text::XTextDocument >(GetImport().GetModel(), uno::UNO_QUERY).is() )
{
- xShape = uno::Reference< drawing::XShape >(xServiceFact->createInstance(OUString::createFromAscii("com.sun.star.drawing.temporaryForXMLImportOLE2Shape")), uno::UNO_QUERY);
+ xShape = uno::Reference< drawing::XShape >(xServiceFact->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.temporaryForXMLImportOLE2Shape"))), uno::UNO_QUERY);
}
else
{
xShape = uno::Reference< drawing::XShape >(xServiceFact->createInstance(OUString::createFromAscii(pServiceName)), uno::UNO_QUERY);
}
- // <--
if( xShape.is() )
AddShape( xShape );
}
@@ -1834,8 +1831,8 @@ void SdXMLConnectorShapeContext::processAttribute( sal_uInt16 nPrefix, const ::r
{
SdXMLImExViewBox aViewBox( 0, 0, 1, 1 );
awt::Point aPoint( 0, 0 );
- awt::Size aSize( 1, 1 );
-
+ awt::Size aSize( 1, 1 );
+
SdXMLImExSvgDElement aPoints( rValue, aViewBox,
aPoint, aSize, GetImport().GetMM100UnitConverter() );
@@ -2212,7 +2209,7 @@ void SdXMLCaptionShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
uno::Reference< beans::XPropertySet > xProps( mxShape, uno::UNO_QUERY );
// SJ: If AutoGrowWidthItem is set, SetTransformation will lead to the wrong SnapRect
- // because NbcAdjustTextFrameWidthAndHeight() is called (text is set later and center alignment
+ // because NbcAdjustTextFrameWidthAndHeight() is called (text is set later and center alignment
// is the default setting, so the top left reference point that is used by the caption point is
// no longer correct) There are two ways to solve this problem, temporarily disabling the
// autogrowwith as we are doing here or to apply the CaptionPoint after setting text
@@ -2225,7 +2222,7 @@ void SdXMLCaptionShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
if ( bIsAutoGrowWidth )
xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("TextAutoGrowWidth")), uno::makeAny( sal_False ) );
}
-
+
// set pos, size, shear and rotate
SetTransformation();
if( xProps.is() )
@@ -2849,7 +2846,7 @@ void SdXMLAppletShapeContext::EndElement()
aAny <<= aRect;
xProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "VisibleArea" ) ), aAny );
}
-
+
if( maParams.getLength() )
{
aAny <<= maParams;
@@ -3087,17 +3084,17 @@ void SdXMLPluginShapeContext::EndElement()
else
{
// in case we have a media object
-
+
OUString sTempRef;
-
+
// check for package URL
if( GetImport().IsPackageURL( maHref ) )
{
- sTempRef = OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.Package:" ) );
+ sTempRef = OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.Package:" ) );
}
-
+
sTempRef += maHref;
-
+
xProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaURL" ) ), uno::makeAny( sTempRef ) );
for( sal_Int32 nParam = 0; nParam < maParams.getLength(); ++nParam )
@@ -3334,9 +3331,16 @@ SvXMLImportContext *SdXMLFrameShapeContext::CreateChildContext( USHORT nPrefix,
if( !mxImplContext.Is() )
{
- pContext = GetImport().GetShapeImport()->CreateFrameChildContext(
+
+ SvXMLShapeContext* pShapeContext= GetImport().GetShapeImport()->CreateFrameChildContext(
GetImport(), nPrefix, rLocalName, xAttrList, mxShapes, mxAttrList );
+ pContext = pShapeContext;
+
+ // propagate the hyperlink to child context
+ if ( msHyperlink.getLength() > 0 )
+ pShapeContext->setHyperlink( msHyperlink );
+
mxImplContext = pContext;
mbSupportsReplacement = IsXMLToken( rLocalName, XML_OBJECT ) ||
IsXMLToken( rLocalName, XML_OBJECT_OLE );
@@ -3361,7 +3365,7 @@ SvXMLImportContext *SdXMLFrameShapeContext::CreateChildContext( USHORT nPrefix,
}
}
}
- else if(
+ else if(
( nPrefix == XML_NAMESPACE_SVG && // #i68101#
(IsXMLToken( rLocalName, XML_TITLE ) || IsXMLToken( rLocalName, XML_DESC ) ) ) ||
(nPrefix == XML_NAMESPACE_OFFICE && IsXMLToken( rLocalName, XML_EVENT_LISTENERS ) ) ||
@@ -3697,7 +3701,7 @@ void SdXMLTableShapeContext::StartElement( const ::com::sun::star::uno::Referenc
catch( Exception& )
{
DBG_ERROR("SdXMLTableShapeContext::StartElement(), exception caught!");
- }
+ }
}
}
@@ -3769,3 +3773,4 @@ SvXMLImportContext* SdXMLTableShapeContext::CreateChildContext( USHORT nPrefix,
return SdXMLShapeContext::CreateChildContext(nPrefix, rLocalName, xAttrList);
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx
index 17b7c7a420..e17a35cf86 100644
--- a/xmloff/source/draw/ximpshap.hxx
+++ b/xmloff/source/draw/ximpshap.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -662,3 +663,5 @@ private:
};
#endif // _XIMPSHAPE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximpshow.cxx b/xmloff/source/draw/ximpshow.cxx
index 7bdb523f60..28a208cb77 100644
--- a/xmloff/source/draw/ximpshow.cxx
+++ b/xmloff/source/draw/ximpshow.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -280,3 +281,4 @@ SvXMLImportContext * SdXMLShowsContext::CreateChildContext( USHORT p_nPrefix, co
return new SvXMLImportContext( GetImport(), p_nPrefix, rLocalName );
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximpshow.hxx b/xmloff/source/draw/ximpshow.hxx
index 4536ccca3e..a8086a0212 100644
--- a/xmloff/source/draw/ximpshow.hxx
+++ b/xmloff/source/draw/ximpshow.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -55,3 +56,4 @@ public:
#endif // _XMLOFF_XIMPSHOW_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 23d9c79392..385a3961cb 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -1,10 +1,11 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* This file is part of OpenOffice.org.
*
@@ -98,7 +99,7 @@ SdXMLDrawingPagePropertySetContext::SdXMLDrawingPagePropertySetContext(
const uno::Reference< xml::sax::XAttributeList > & xAttrList,
::std::vector< XMLPropertyState > &rProps,
const UniReference < SvXMLImportPropertyMapper > &rMap ) :
- SvXMLPropertySetContext( rImport, nPrfx, rLName, xAttrList,
+ SvXMLPropertySetContext( rImport, nPrfx, rLName, xAttrList,
XML_TYPE_PROP_DRAWING_PAGE, rProps, rMap )
{
}
@@ -136,12 +137,12 @@ SvXMLImportContext *SdXMLDrawingPagePropertySetContext::CreateChildContext(
break;
}
}
-
+
if( !pContext )
pContext = SvXMLPropertySetContext::CreateChildContext( p_nPrefix, rLocalName,
- xAttrList,
+ xAttrList,
rProperties, rProp );
-
+
return pContext;
}
@@ -153,9 +154,9 @@ public:
TYPEINFO();
SdXMLDrawingPageStyleContext(
- SvXMLImport& rImport,
- sal_uInt16 nPrfx,
- const rtl::OUString& rLName,
+ SvXMLImport& rImport,
+ sal_uInt16 nPrfx,
+ const rtl::OUString& rLName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList,
SvXMLStylesContext& rStyles,
sal_uInt16 nFamily = XML_STYLE_FAMILY_SD_DRAWINGPAGE_ID);
@@ -177,9 +178,9 @@ public:
TYPEINIT1( SdXMLDrawingPageStyleContext, XMLPropStyleContext );
SdXMLDrawingPageStyleContext::SdXMLDrawingPageStyleContext(
- SvXMLImport& rImport,
- sal_uInt16 nPrfx,
- const OUString& rLName,
+ SvXMLImport& rImport,
+ sal_uInt16 nPrfx,
+ const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList,
SvXMLStylesContext& rStyles,
sal_uInt16 nFamily)
@@ -209,7 +210,7 @@ SvXMLImportContext *SdXMLDrawingPageStyleContext::CreateChildContext(
GetProperties(),
xImpPrMap );
}
-
+
if( !pContext )
pContext = XMLPropStyleContext::CreateChildContext( nPrefix, rLocalName,
xAttrList );
@@ -242,12 +243,12 @@ void SdXMLDrawingPageStyleContext::Finish( sal_Bool bOverwrite )
sal_Int32 nStyle = 0;
SdXMLNumberFormatImportContext* pSdNumStyle =
- PTR_CAST( SdXMLNumberFormatImportContext,
+ PTR_CAST( SdXMLNumberFormatImportContext,
GetStyles()->FindStyleChildContext( XML_STYLE_FAMILY_DATA_STYLE, sStyleName, sal_True ) );
if( pSdNumStyle )
nStyle = pSdNumStyle->GetDrawKey();
-
+
(*property).maValue <<= nStyle;
}
break;
@@ -321,11 +322,11 @@ void SdXMLDrawingPageStyleContext::FillPropertySet(
TYPEINIT1( SdXMLPageMasterStyleContext, SvXMLStyleContext );
-SdXMLPageMasterStyleContext::SdXMLPageMasterStyleContext(
+SdXMLPageMasterStyleContext::SdXMLPageMasterStyleContext(
SdXMLImport& rImport,
- sal_uInt16 nPrfx,
+ sal_uInt16 nPrfx,
const OUString& rLName,
- const uno::Reference< xml::sax::XAttributeList>& xAttrList)
+ const uno::Reference< xml::sax::XAttributeList>& xAttrList)
: SvXMLStyleContext(rImport, nPrfx, rLName, xAttrList, XML_STYLE_FAMILY_SD_PAGEMASTERSTYLECONEXT_ID),
mnBorderBottom( 0L ),
mnBorderLeft( 0L ),
@@ -335,7 +336,7 @@ SdXMLPageMasterStyleContext::SdXMLPageMasterStyleContext(
mnHeight( 0L ),
meOrientation(GetSdImport().IsDraw() ? view::PaperOrientation_PORTRAIT : view::PaperOrientation_LANDSCAPE)
{
- // set family to something special at SvXMLStyleContext
+ // set family to something special at SvXMLStyleContext
// for differences in search-methods
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
@@ -402,15 +403,15 @@ SdXMLPageMasterStyleContext::~SdXMLPageMasterStyleContext()
TYPEINIT1( SdXMLPageMasterContext, SvXMLStyleContext );
-SdXMLPageMasterContext::SdXMLPageMasterContext(
+SdXMLPageMasterContext::SdXMLPageMasterContext(
SdXMLImport& rImport,
- sal_uInt16 nPrfx,
+ sal_uInt16 nPrfx,
const OUString& rLName,
- const uno::Reference< xml::sax::XAttributeList>& xAttrList)
+ const uno::Reference< xml::sax::XAttributeList>& xAttrList)
: SvXMLStyleContext(rImport, nPrfx, rLName, xAttrList, XML_STYLE_FAMILY_SD_PAGEMASTERCONEXT_ID),
mpPageMasterStyle( 0L )
{
- // set family to something special at SvXMLStyleContext
+ // set family to something special at SvXMLStyleContext
// for differences in search-methods
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
@@ -447,8 +448,8 @@ SdXMLPageMasterContext::~SdXMLPageMasterContext()
//////////////////////////////////////////////////////////////////////////////
-SvXMLImportContext *SdXMLPageMasterContext::CreateChildContext(
- sal_uInt16 nPrefix,
+SvXMLImportContext *SdXMLPageMasterContext::CreateChildContext(
+ sal_uInt16 nPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList )
{
@@ -466,7 +467,7 @@ SvXMLImportContext *SdXMLPageMasterContext::CreateChildContext(
mpPageMasterStyle = (SdXMLPageMasterStyleContext*)pContext;
}
}
-
+
// call base class
if(!pContext)
pContext = SvXMLStyleContext::CreateChildContext(nPrefix, rLocalName, xAttrList);
@@ -480,14 +481,14 @@ SvXMLImportContext *SdXMLPageMasterContext::CreateChildContext(
TYPEINIT1( SdXMLPresentationPageLayoutContext, SvXMLStyleContext );
SdXMLPresentationPageLayoutContext::SdXMLPresentationPageLayoutContext(
- SdXMLImport& rImport,
- sal_uInt16 nPrfx,
- const OUString& rLName,
+ SdXMLImport& rImport,
+ sal_uInt16 nPrfx,
+ const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList)
: SvXMLStyleContext(rImport, nPrfx, rLName, xAttrList, XML_STYLE_FAMILY_SD_PRESENTATIONPAGELAYOUT_ID),
mnTypeId( 20 ) // AUTOLAYOUT_NONE
{
- // set family to somethiong special at SvXMLStyleContext
+ // set family to somethiong special at SvXMLStyleContext
// for differences in search-methods
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
@@ -508,8 +509,8 @@ SdXMLPresentationPageLayoutContext::~SdXMLPresentationPageLayoutContext()
{
}
-SvXMLImportContext *SdXMLPresentationPageLayoutContext::CreateChildContext(
- sal_uInt16 nPrefix,
+SvXMLImportContext *SdXMLPresentationPageLayoutContext::CreateChildContext(
+ sal_uInt16 nPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList )
{
@@ -518,14 +519,14 @@ SvXMLImportContext *SdXMLPresentationPageLayoutContext::CreateChildContext(
if(nPrefix == XML_NAMESPACE_PRESENTATION && IsXMLToken( rLocalName, XML_PLACEHOLDER ) )
{
// presentation:placeholder inside style:presentation-page-layout context
- pContext = new SdXMLPresentationPlaceholderContext(
+ pContext = new SdXMLPresentationPlaceholderContext(
GetSdImport(), nPrefix, rLocalName, xAttrList);
// remember SdXMLPresentationPlaceholderContext for later evaluation
if(pContext)
{
pContext->AddRef();
- maList.Insert((SdXMLPresentationPlaceholderContext*)pContext, LIST_APPEND);
+ maList.push_back( (SdXMLPresentationPlaceholderContext*)pContext );
}
}
@@ -541,12 +542,12 @@ void SdXMLPresentationPageLayoutContext::EndElement()
// build presentation page layout type here
// calc mnTpeId due to content of maList
// at the moment only use number of types used there
- if(maList.Count())
+ if( !maList.empty() )
{
- SdXMLPresentationPlaceholderContext* pObj0 = maList.GetObject(0);
+ SdXMLPresentationPlaceholderContext* pObj0 = maList[ 0 ];
if(pObj0->GetName().equals(OUString(RTL_CONSTASCII_USTRINGPARAM("handout"))))
{
- switch( maList.Count() )
+ switch( maList.size() )
{
case 1:
mnTypeId = 22; // AUTOLAYOUT_HANDOUT1
@@ -569,7 +570,7 @@ void SdXMLPresentationPageLayoutContext::EndElement()
}
else
{
- switch(maList.Count())
+ switch( maList.size() )
{
case 1:
{
@@ -585,8 +586,8 @@ void SdXMLPresentationPageLayoutContext::EndElement()
}
case 2:
{
- SdXMLPresentationPlaceholderContext* pObj1 = maList.GetObject(1);
-
+ SdXMLPresentationPlaceholderContext* pObj1 = maList[ 1 ];
+
if(pObj1->GetName().equals(
OUString(RTL_CONSTASCII_USTRINGPARAM("subtitle"))))
{
@@ -634,8 +635,8 @@ void SdXMLPresentationPageLayoutContext::EndElement()
}
case 3:
{
- SdXMLPresentationPlaceholderContext* pObj1 = maList.GetObject(1);
- SdXMLPresentationPlaceholderContext* pObj2 = maList.GetObject(2);
+ SdXMLPresentationPlaceholderContext* pObj1 = maList[ 1 ];
+ SdXMLPresentationPlaceholderContext* pObj2 = maList[ 2 ];
if(pObj1->GetName().equals(
OUString(RTL_CONSTASCII_USTRINGPARAM("outline"))))
@@ -689,7 +690,7 @@ void SdXMLPresentationPageLayoutContext::EndElement()
OUString(RTL_CONSTASCII_USTRINGPARAM("vertical_outline"))))
{
// AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART
- mnTypeId = 27;
+ mnTypeId = 27;
}
else
{
@@ -706,8 +707,8 @@ void SdXMLPresentationPageLayoutContext::EndElement()
}
case 4:
{
- SdXMLPresentationPlaceholderContext* pObj1 = maList.GetObject(1);
- SdXMLPresentationPlaceholderContext* pObj2 = maList.GetObject(2);
+ SdXMLPresentationPlaceholderContext* pObj1 = maList[ 1 ];
+ SdXMLPresentationPlaceholderContext* pObj2 = maList[ 2 ];
if(pObj1->GetName().equals(
OUString(RTL_CONSTASCII_USTRINGPARAM("object"))))
@@ -743,7 +744,7 @@ void SdXMLPresentationPageLayoutContext::EndElement()
break;
}
- case 7:
+ case 7:
{
mnTypeId = 33; // AUTOLAYOUT_6CLIPART
break;
@@ -757,17 +758,18 @@ void SdXMLPresentationPageLayoutContext::EndElement()
}
// release remembered contexts, they are no longer needed
- while(maList.Count())
- maList.Remove(maList.Count() - 1)->ReleaseRef();
+ for ( size_t i = maList.size(); i > 0; )
+ maList[ --i ]->ReleaseRef();
+ maList.clear();
}
}
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
-SdXMLPresentationPlaceholderContext::SdXMLPresentationPlaceholderContext(
- SdXMLImport& rImport,
- sal_uInt16 nPrfx, const
+SdXMLPresentationPlaceholderContext::SdXMLPresentationPlaceholderContext(
+ SdXMLImport& rImport,
+ sal_uInt16 nPrfx, const
OUString& rLName,
const uno::Reference< xml::sax::XAttributeList>& xAttrList)
: SvXMLImportContext( rImport, nPrfx, rLName),
@@ -827,12 +829,12 @@ SdXMLPresentationPlaceholderContext::~SdXMLPresentationPlaceholderContext()
TYPEINIT1( SdXMLMasterPageContext, SdXMLGenericPageContext );
-SdXMLMasterPageContext::SdXMLMasterPageContext(
+SdXMLMasterPageContext::SdXMLMasterPageContext(
SdXMLImport& rImport,
- sal_uInt16 nPrfx,
+ sal_uInt16 nPrfx,
const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList>& xAttrList,
- uno::Reference< drawing::XShapes >& rShapes)
+ uno::Reference< drawing::XShapes >& rShapes)
: SdXMLGenericPageContext( rImport, nPrfx, rLName, xAttrList, rShapes )
{
const sal_Bool bHandoutMaster = IsXMLToken( rLName, XML_HANDOUT_MASTER );
@@ -943,7 +945,7 @@ void SdXMLMasterPageContext::EndElement()
//////////////////////////////////////////////////////////////////////////////
-SvXMLImportContext* SdXMLMasterPageContext::CreateChildContext(
+SvXMLImportContext* SdXMLMasterPageContext::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList>& xAttrList )
@@ -959,11 +961,11 @@ SvXMLImportContext* SdXMLMasterPageContext::CreateChildContext(
if(GetSdImport().GetShapeImport()->GetStylesContext())
{
// style:style inside master-page context -> presentation style
- XMLShapeStyleContext* pNew = new XMLShapeStyleContext(
- GetSdImport(), nPrefix, rLocalName, xAttrList,
- *GetSdImport().GetShapeImport()->GetStylesContext(),
+ XMLShapeStyleContext* pNew = new XMLShapeStyleContext(
+ GetSdImport(), nPrefix, rLocalName, xAttrList,
+ *GetSdImport().GetShapeImport()->GetStylesContext(),
XML_STYLE_FAMILY_SD_PRESENTATION_ID);
-
+
// add this style to the outer StylesContext class for later processing
if(pNew)
{
@@ -1010,10 +1012,10 @@ TYPEINIT1( SdXMLStylesContext, SvXMLStyleContext );
SdXMLStylesContext::SdXMLStylesContext(
SdXMLImport& rImport,
- sal_uInt16 nPrfx,
+ sal_uInt16 nPrfx,
const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList,
- sal_Bool bIsAutoStyle)
+ sal_Bool bIsAutoStyle)
: SvXMLStylesContext(rImport, nPrfx, rLName, xAttrList),
mbIsAutoStyle(bIsAutoStyle)
{
@@ -1038,8 +1040,8 @@ SdXMLStylesContext::~SdXMLStylesContext()
//////////////////////////////////////////////////////////////////////////////
-SvXMLStyleContext* SdXMLStylesContext::CreateStyleChildContext(
- sal_uInt16 nPrefix,
+SvXMLStyleContext* SdXMLStylesContext::CreateStyleChildContext(
+ sal_uInt16 nPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList)
{
@@ -1109,9 +1111,9 @@ SvXMLStyleContext* SdXMLStylesContext::CreateStyleChildContext(
//////////////////////////////////////////////////////////////////////////////
-SvXMLStyleContext* SdXMLStylesContext::CreateStyleStyleChildContext(
+SvXMLStyleContext* SdXMLStylesContext::CreateStyleStyleChildContext(
sal_uInt16 nFamily,
- sal_uInt16 nPrefix,
+ sal_uInt16 nPrefix,
const OUString& rLocalName,
const uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList)
{
@@ -1190,7 +1192,7 @@ UniReference< SvXMLImportPropertyMapper > SdXMLStylesContext::GetImportPropertyM
{
UniReference < SvXMLImportPropertyMapper > xMapper;
-// if(XML_STYLE_FAMILY_SD_GRAPHICS_ID == nFamily
+// if(XML_STYLE_FAMILY_SD_GRAPHICS_ID == nFamily
// || XML_STYLE_FAMILY_SD_PRESENTATION_ID == nFamily
// || XML_STYLE_FAMILY_SD_POOL_ID == nFamily)
// {
@@ -1217,7 +1219,7 @@ UniReference< SvXMLImportPropertyMapper > SdXMLStylesContext::GetImportPropertyM
xMapper = xPresImpPropMapper;
break;
}
-
+
case XML_STYLE_FAMILY_TABLE_COLUMN:
case XML_STYLE_FAMILY_TABLE_ROW:
case XML_STYLE_FAMILY_TABLE_CELL:
@@ -1325,7 +1327,7 @@ void SdXMLStylesContext::SetMasterPageStyles(SdXMLMasterPageContext& rMaster) co
}
//////////////////////////////////////////////////////////////////////////////
-// Process styles list:
+// Process styles list:
// set graphic styles (all with family="graphics"). Remember xStyle at list element.
//
void SdXMLStylesContext::ImpSetGraphicStyles() const
@@ -1470,7 +1472,7 @@ void SdXMLStylesContext::ImpSetGraphicStyles( uno::Reference< container::XNameAc
catch( Exception& e)
{
uno::Sequence<OUString> aSeq(0);
- const_cast<SdXMLImport*>(&GetSdImport())->SetError( XMLERROR_FLAG_WARNING | XMLERROR_API, aSeq, e.Message, NULL );
+ const_cast<SdXMLImport*>(&GetSdImport())->SetError( XMLERROR_FLAG_WARNING | XMLERROR_API, aSeq, e.Message, NULL );
}
}
@@ -1510,7 +1512,7 @@ void SdXMLStylesContext::ImpSetGraphicStyles( uno::Reference< container::XNameAc
catch( Exception& e )
{
uno::Sequence<OUString> aSeq(0);
- const_cast<SdXMLImport*>(&GetSdImport())->SetError( XMLERROR_FLAG_WARNING | XMLERROR_API, aSeq, e.Message, NULL );
+ const_cast<SdXMLImport*>(&GetSdImport())->SetError( XMLERROR_FLAG_WARNING | XMLERROR_API, aSeq, e.Message, NULL );
}
}
}
@@ -1541,8 +1543,8 @@ uno::Reference< container::XNameAccess > SdXMLStylesContext::getPageLayouts() co
//
TYPEINIT1( SdXMLMasterStylesContext, SvXMLImportContext );
-SdXMLMasterStylesContext::SdXMLMasterStylesContext(
- SdXMLImport& rImport,
+SdXMLMasterStylesContext::SdXMLMasterStylesContext(
+ SdXMLImport& rImport,
sal_uInt16 nPrfx,
const rtl::OUString& rLName)
: SvXMLImportContext( rImport, nPrfx, rLName)
@@ -1551,13 +1553,14 @@ SdXMLMasterStylesContext::SdXMLMasterStylesContext(
SdXMLMasterStylesContext::~SdXMLMasterStylesContext()
{
- while(maMasterPageList.Count())
- maMasterPageList.Remove(maMasterPageList.Count() - 1)->ReleaseRef();
+ for ( size_t i = maMasterPageList.size(); i > 0; )
+ maMasterPageList[ --i ]->ReleaseRef();
+ maMasterPageList.clear();
}
-SvXMLImportContext* SdXMLMasterStylesContext::CreateChildContext(
- sal_uInt16 nPrefix,
- const rtl::OUString& rLocalName,
+SvXMLImportContext* SdXMLMasterStylesContext::CreateChildContext(
+ sal_uInt16 nPrefix,
+ const rtl::OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList)
{
SvXMLImportContext* pContext = 0;
@@ -1590,13 +1593,13 @@ SvXMLImportContext* SdXMLMasterStylesContext::CreateChildContext(
uno::Reference< drawing::XShapes > xNewShapes(xNewMasterPage, uno::UNO_QUERY);
if(xNewShapes.is() && GetSdImport().GetShapeImport()->GetStylesContext())
{
- pContext = new SdXMLMasterPageContext(GetSdImport(),
+ pContext = new SdXMLMasterPageContext(GetSdImport(),
nPrefix, rLocalName, xAttrList, xNewShapes);
if(pContext)
{
pContext->AddRef();
- maMasterPageList.Insert((SdXMLMasterPageContext*)pContext, LIST_APPEND);
+ maMasterPageList.push_back( (SdXMLMasterPageContext*)pContext );
}
}
}
@@ -1611,7 +1614,7 @@ SvXMLImportContext* SdXMLMasterStylesContext::CreateChildContext(
uno::Reference< drawing::XShapes > xHandoutPage( xHandoutSupp->getHandoutMasterPage(), uno::UNO_QUERY );
if(xHandoutPage.is() && GetSdImport().GetShapeImport()->GetStylesContext())
{
- pContext = new SdXMLMasterPageContext(GetSdImport(),
+ pContext = new SdXMLMasterPageContext(GetSdImport(),
nPrefix, rLocalName, xAttrList, xHandoutPage);
}
}
@@ -1690,3 +1693,4 @@ void SdXMLHeaderFooterDeclContext::Characters( const ::rtl::OUString& rChars )
maStrText += rChars;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximpstyl.hxx b/xmloff/source/draw/ximpstyl.hxx
index 9bfd0cd209..f36586bc2b 100644
--- a/xmloff/source/draw/ximpstyl.hxx
+++ b/xmloff/source/draw/ximpstyl.hxx
@@ -1,10 +1,11 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * OpenOffice.org - a multi-platform office productivity suite
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* This file is part of OpenOffice.org.
*
@@ -33,6 +34,7 @@
#include "ximppage.hxx"
#include <xmloff/xmlstyle.hxx>
#include <com/sun/star/view/PaperOrientation.hpp>
+#include <vector>
class SvNumberFormatter;
class SvXMLNumFmtHelper;
@@ -56,10 +58,10 @@ class SdXMLPageMasterStyleContext: public SvXMLStyleContext
public:
TYPEINFO();
- SdXMLPageMasterStyleContext(
- SdXMLImport& rImport,
+ SdXMLPageMasterStyleContext(
+ SdXMLImport& rImport,
sal_uInt16 nPrfx,
- const rtl::OUString& rLName,
+ const rtl::OUString& rLName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList);
virtual ~SdXMLPageMasterStyleContext();
@@ -86,14 +88,14 @@ class SdXMLPageMasterContext: public SvXMLStyleContext
public:
TYPEINFO();
- SdXMLPageMasterContext(
- SdXMLImport& rImport,
+ SdXMLPageMasterContext(
+ SdXMLImport& rImport,
sal_uInt16 nPrfx,
- const rtl::OUString& rLName,
+ const rtl::OUString& rLName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList);
virtual ~SdXMLPageMasterContext();
- virtual SvXMLImportContext *CreateChildContext(
+ virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix, const rtl::OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
@@ -114,15 +116,15 @@ class SdXMLMasterPageContext: public SdXMLGenericPageContext
public:
TYPEINFO();
- SdXMLMasterPageContext(
- SdXMLImport& rImport,
+ SdXMLMasterPageContext(
+ SdXMLImport& rImport,
sal_uInt16 nPrfx,
- const rtl::OUString& rLName,
+ const rtl::OUString& rLName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList,
com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes);
virtual ~SdXMLMasterPageContext();
- virtual SvXMLImportContext *CreateChildContext(
+ virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix, const rtl::OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
@@ -133,7 +135,7 @@ public:
const rtl::OUString& GetDisplayName() const { return msDisplayName; }
};
-DECLARE_LIST(ImpMasterPageList, SdXMLMasterPageContext*)
+typedef ::std::vector< SdXMLMasterPageContext* > ImpMasterPageList;
//////////////////////////////////////////////////////////////////////////////
// presentation:placeholder context
@@ -150,10 +152,10 @@ class SdXMLPresentationPlaceholderContext: public SvXMLImportContext
SdXMLImport& GetSdImport() { return (SdXMLImport&)GetImport(); }
public:
- SdXMLPresentationPlaceholderContext(
- SdXMLImport& rImport,
+ SdXMLPresentationPlaceholderContext(
+ SdXMLImport& rImport,
sal_uInt16 nPrfx,
- const rtl::OUString& rLName,
+ const rtl::OUString& rLName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList);
virtual ~SdXMLPresentationPlaceholderContext();
@@ -163,7 +165,7 @@ public:
sal_Int32 GetWidth() const { return mnWidth; }
sal_Int32 GetHeight() const { return mnHeight; }
};
-DECLARE_LIST(ImpPlaceholderList, SdXMLPresentationPlaceholderContext*)
+typedef ::std::vector< SdXMLPresentationPlaceholderContext* > ImpPlaceholderList;
//////////////////////////////////////////////////////////////////////////////
// style:presentation-page-layout context
@@ -181,13 +183,13 @@ public:
TYPEINFO();
SdXMLPresentationPageLayoutContext(
- SdXMLImport& rImport,
- sal_uInt16 nPrfx,
- const rtl::OUString& rLName,
+ SdXMLImport& rImport,
+ sal_uInt16 nPrfx,
+ const rtl::OUString& rLName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList);
virtual ~SdXMLPresentationPageLayoutContext();
- virtual SvXMLImportContext *CreateChildContext(
+ virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix, const rtl::OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
@@ -210,18 +212,18 @@ class SdXMLStylesContext : public SvXMLStylesContext
void ImpSetGraphicStyles() const;
void ImpSetCellStyles() const;
- void ImpSetGraphicStyles( com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& xPageStyles,
+ void ImpSetGraphicStyles( com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& xPageStyles,
sal_uInt16 nFamily, const UniString& rPrefix) const;
protected:
- virtual SvXMLStyleContext* CreateStyleChildContext(
- sal_uInt16 nPrefix,
+ virtual SvXMLStyleContext* CreateStyleChildContext(
+ sal_uInt16 nPrefix,
const rtl::OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList);
- virtual SvXMLStyleContext *CreateStyleStyleChildContext(
+ virtual SvXMLStyleContext *CreateStyleStyleChildContext(
sal_uInt16 nFamily,
- sal_uInt16 nPrefix,
+ sal_uInt16 nPrefix,
const rtl::OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList);
@@ -234,8 +236,8 @@ public:
TYPEINFO();
SdXMLStylesContext(
- SdXMLImport& rImport,
- sal_uInt16 nPrfx,
+ SdXMLImport& rImport,
+ sal_uInt16 nPrfx,
const rtl::OUString& rLName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList,
sal_Bool bIsAutoStyle);
@@ -259,19 +261,19 @@ class SdXMLMasterStylesContext : public SvXMLImportContext
const SdXMLImport& GetSdImport() const { return (const SdXMLImport&)GetImport(); }
SdXMLImport& GetSdImport() { return (SdXMLImport&)GetImport(); }
-
+
public:
TYPEINFO();
- SdXMLMasterStylesContext(
- SdXMLImport& rImport,
+ SdXMLMasterStylesContext(
+ SdXMLImport& rImport,
sal_uInt16 nPrfx,
const rtl::OUString& rLName);
virtual ~SdXMLMasterStylesContext();
- virtual SvXMLImportContext* CreateChildContext(
- sal_uInt16 nPrefix,
- const rtl::OUString& rLocalName,
+ virtual SvXMLImportContext* CreateChildContext(
+ sal_uInt16 nPrefix,
+ const rtl::OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
const ImpMasterPageList& GetMasterPageList() const { return maMasterPageList; }
@@ -300,3 +302,5 @@ private:
#endif // _XIMPSTYLE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/attriblistmerge.cxx b/xmloff/source/forms/attriblistmerge.cxx
index 65ab21a01b..1b2926b277 100644
--- a/xmloff/source/forms/attriblistmerge.cxx
+++ b/xmloff/source/forms/attriblistmerge.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -168,3 +169,4 @@ namespace xmloff
} // namespace xmloff
//.........................................................................
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/attriblistmerge.hxx b/xmloff/source/forms/attriblistmerge.hxx
index c876d1f559..8039281497 100644
--- a/xmloff/source/forms/attriblistmerge.hxx
+++ b/xmloff/source/forms/attriblistmerge.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -83,3 +84,4 @@ namespace xmloff
#endif // _XMLOFF_FORMS_ATTRIBLISTMERGE_HXX_
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/callbacks.hxx b/xmloff/source/forms/callbacks.hxx
index b0cb120b11..1b53a6de78 100644
--- a/xmloff/source/forms/callbacks.hxx
+++ b/xmloff/source/forms/callbacks.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,7 +33,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/script/ScriptEventDescriptor.hpp>
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
class SvXMLImport;
class SvXMLExport;
@@ -53,7 +54,7 @@ namespace xmloff
{
public:
virtual SvXMLExport& getGlobalContext() = 0;
- virtual ::vos::ORef< SvXMLExportPropertyMapper > getStylePropertyMapper() = 0;
+ virtual ::rtl::Reference< SvXMLExportPropertyMapper > getStylePropertyMapper() = 0;
/** steps through a collection and exports all children of this collection
*/
@@ -93,3 +94,4 @@ namespace xmloff
#endif // _XMLOFF_FORMS_CALLBACKS_HXX_
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/controlelement.cxx b/xmloff/source/forms/controlelement.cxx
index 09ed9b93f3..d8e0362af3 100644
--- a/xmloff/source/forms/controlelement.cxx
+++ b/xmloff/source/forms/controlelement.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -70,3 +71,4 @@ namespace xmloff
} // namespace xmloff
//.........................................................................
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/controlelement.hxx b/xmloff/source/forms/controlelement.hxx
index 88aaeb3e36..e150f447ff 100644
--- a/xmloff/source/forms/controlelement.hxx
+++ b/xmloff/source/forms/controlelement.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -93,3 +94,4 @@ namespace xmloff
#endif // _XMLOFF_FORMS_CONTROLELEMENT_HXX_
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/controlpropertyhdl.cxx b/xmloff/source/forms/controlpropertyhdl.cxx
index 55d41f7c6b..88e5b47559 100644
--- a/xmloff/source/forms/controlpropertyhdl.cxx
+++ b/xmloff/source/forms/controlpropertyhdl.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -388,3 +389,4 @@ namespace xmloff
} // namespace xmloff
//.........................................................................
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/controlpropertymap.cxx b/xmloff/source/forms/controlpropertymap.cxx
index cad6ac1886..6322350079 100644
--- a/xmloff/source/forms/controlpropertymap.cxx
+++ b/xmloff/source/forms/controlpropertymap.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,9 +32,7 @@
#include <xmloff/xmltoken.hxx>
#include <xmloff/maptype.hxx>
#include <xmloff/xmltypes.hxx>
-#ifndef __SGI_STL_ALGORITHM
#include <algorithm>
-#endif
#include "strings.hxx"
#include <xmloff/contextid.hxx>
#include "controlpropertymap.hxx"
@@ -154,3 +153,4 @@ namespace xmloff
//.........................................................................
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/controlpropertymap.hxx b/xmloff/source/forms/controlpropertymap.hxx
index 44350fb3de..984bb7a777 100644
--- a/xmloff/source/forms/controlpropertymap.hxx
+++ b/xmloff/source/forms/controlpropertymap.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -66,3 +67,4 @@ namespace xmloff
#endif // _XMLOFF_FORMS_CONTROLPROPERTYMAP_HXX_
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx
index a5b7c09c6b..a2d31e1c0b 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -69,6 +70,7 @@
#include <tools/time.hxx>
#include <tools/diagnose_ex.h>
#include <comphelper/extract.hxx>
+#include <sal/macros.h>
#include <stdio.h>
#include <algorithm>
@@ -581,11 +583,10 @@ namespace xmloff
{
PROPERTY_LABEL, PROPERTY_TITLE
};
- OSL_ENSURE( sizeof(aStringPropertyNames)/sizeof(aStringPropertyNames[0]) ==
- sizeof(nStringPropertyAttributeIds)/sizeof(nStringPropertyAttributeIds[0]),
+ OSL_ENSURE( SAL_N_ELEMENTS(aStringPropertyNames) == SAL_N_ELEMENTS(nStringPropertyAttributeIds),
"OControlExport::exportCommonControlAttributes: somebody tampered with the maps (1)!");
- for (i=0; i<sizeof(nStringPropertyAttributeIds)/sizeof(nStringPropertyAttributeIds[0]); ++i)
+ for (i=0; i < SAL_N_ELEMENTS(nStringPropertyAttributeIds); ++i)
if (nStringPropertyAttributeIds[i] & m_nIncludeCommon)
{
exportStringPropertyAttribute(
@@ -616,13 +617,13 @@ namespace xmloff
BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_FALSE | BOOLATTR_INVERSE_SEMANTICS, BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_TRUE, BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_VOID, BOOLATTR_DEFAULT_FALSE
};
#if OSL_DEBUG_LEVEL > 0
- sal_Int32 nIdCount = sizeof(nBooleanPropertyAttributeIds) / sizeof(nBooleanPropertyAttributeIds[0]);
- sal_Int32 nNameCount = sizeof(pBooleanPropertyNames) / sizeof(pBooleanPropertyNames[0]);
- sal_Int32 nFlagsCount = sizeof(nBooleanPropertyAttrFlags) / sizeof(nBooleanPropertyAttrFlags[0]);
+ sal_Int32 nIdCount = SAL_N_ELEMENTS(nBooleanPropertyAttributeIds);
+ sal_Int32 nNameCount = SAL_N_ELEMENTS(pBooleanPropertyNames);
+ sal_Int32 nFlagsCount = SAL_N_ELEMENTS(nBooleanPropertyAttrFlags);
OSL_ENSURE((nIdCount == nNameCount) && (nNameCount == nFlagsCount),
"OControlExport::exportCommonControlAttributes: somebody tampered with the maps (2)!");
#endif
- for (i=0; i<sizeof(nBooleanPropertyAttributeIds)/sizeof(nBooleanPropertyAttributeIds[0]); ++i)
+ for (i=0; i < SAL_N_ELEMENTS(nBooleanPropertyAttributeIds); ++i)
if (nBooleanPropertyAttributeIds[i] & m_nIncludeCommon)
{
exportBooleanPropertyAttribute(
@@ -659,13 +660,13 @@ namespace xmloff
exportedProperty(PROPERTY_MAXTEXTLENGTH);
#if OSL_DEBUG_LEVEL > 0
- sal_Int32 nIdCount = sizeof(nIntegerPropertyAttributeIds) / sizeof(nIntegerPropertyAttributeIds[0]);
- sal_Int32 nNameCount = sizeof(pIntegerPropertyNames) / sizeof(pIntegerPropertyNames[0]);
- sal_Int32 nDefaultCount = sizeof(nIntegerPropertyAttrDefaults) / sizeof(nIntegerPropertyAttrDefaults[0]);
+ sal_Int32 nIdCount = SAL_N_ELEMENTS(nIntegerPropertyAttributeIds);
+ sal_Int32 nNameCount = SAL_N_ELEMENTS(pIntegerPropertyNames);
+ sal_Int32 nDefaultCount = SAL_N_ELEMENTS(nIntegerPropertyAttrDefaults);
OSL_ENSURE((nIdCount == nNameCount) && (nNameCount == nDefaultCount),
"OControlExport::exportCommonControlAttributes: somebody tampered with the maps (3)!");
#endif
- for (i=0; i<sizeof(nIntegerPropertyAttributeIds)/sizeof(nIntegerPropertyAttributeIds[0]); ++i)
+ for (i=0; i < SAL_N_ELEMENTS(nIntegerPropertyAttributeIds); ++i)
if (nIntegerPropertyAttributeIds[i] & m_nIncludeCommon)
{
exportInt16PropertyAttribute(
@@ -1014,9 +1015,9 @@ namespace xmloff
&PROPERTY_STRICTFORMAT, &PROPERTY_MULTILINE, &PROPERTY_AUTOCOMPLETE, &PROPERTY_MULTISELECTION, &PROPERTY_DEFAULTBUTTON, &PROPERTY_TRISTATE,
&PROPERTY_TOGGLE, &PROPERTY_FOCUS_ON_CLICK
};
- sal_Int32 nIdCount = sizeof(nBooleanPropertyAttributeIds) / sizeof(nBooleanPropertyAttributeIds[0]);
+ sal_Int32 nIdCount = SAL_N_ELEMENTS(nBooleanPropertyAttributeIds);
#if OSL_DEBUG_LEVEL > 0
- sal_Int32 nNameCount = sizeof(pBooleanPropertyNames) / sizeof(pBooleanPropertyNames[0]);
+ sal_Int32 nNameCount = SAL_N_ELEMENTS(pBooleanPropertyNames);
OSL_ENSURE((nIdCount == nNameCount),
"OControlExport::exportSpecialAttributes: somebody tampered with the maps (1)!");
#endif
@@ -1056,12 +1057,12 @@ namespace xmloff
10
};
- sal_Int32 nIdCount = sizeof( nIntegerPropertyAttributeIds ) / sizeof( nIntegerPropertyAttributeIds[0] );
+ sal_Int32 nIdCount = SAL_N_ELEMENTS( nIntegerPropertyAttributeIds );
#if OSL_DEBUG_LEVEL > 0
- sal_Int32 nNameCount = sizeof( pIntegerPropertyNames ) / sizeof( pIntegerPropertyNames[0] );
+ sal_Int32 nNameCount = SAL_N_ELEMENTS( pIntegerPropertyNames );
OSL_ENSURE( ( nIdCount == nNameCount ),
"OControlExport::exportSpecialAttributes: somebody tampered with the maps (2)!" );
- sal_Int32 nDefaultCount = sizeof( nIntegerPropertyAttrDefaults ) / sizeof( nIntegerPropertyAttrDefaults[0] );
+ sal_Int32 nDefaultCount = SAL_N_ELEMENTS( nIntegerPropertyAttrDefaults );
OSL_ENSURE( ( nIdCount == nDefaultCount ),
"OControlExport::exportSpecialAttributes: somebody tampered with the maps (3)!" );
#endif
@@ -1189,6 +1190,39 @@ namespace xmloff
}
// ----------------------------------
+ // the string properties
+ {
+ static sal_Int32 nStringPropertyAttributeIds[] =
+ { // attribute flags
+ SCA_GROUP_NAME
+ };
+ static const ::rtl::OUString* pStringPropertyNames[] =
+ { // property names
+ &PROPERTY_GROUP_NAME
+ };
+
+ sal_Int32 nIdCount = SAL_N_ELEMENTS( nStringPropertyAttributeIds );
+ #if OSL_DEBUG_LEVEL > 0
+ sal_Int32 nNameCount = SAL_N_ELEMENTS( pStringPropertyNames );
+ OSL_ENSURE( ( nIdCount == nNameCount ),
+ "OControlExport::exportSpecialAttributes: somebody tampered with the maps (2)!" );
+ #endif
+ for ( i = 0; i < nIdCount; ++i )
+ if ( nStringPropertyAttributeIds[i] & m_nIncludeSpecial )
+ {
+ exportStringPropertyAttribute(
+ OAttributeMetaData::getSpecialAttributeNamespace( nStringPropertyAttributeIds[i] ),
+ OAttributeMetaData::getSpecialAttributeName( nStringPropertyAttributeIds[i] ),
+ *( pStringPropertyNames[i] )
+ );
+ #if OSL_DEBUG_LEVEL > 0
+ // reset the bit for later checking
+ m_nIncludeSpecial = m_nIncludeSpecial & ~nStringPropertyAttributeIds[i];
+ #endif
+ }
+ }
+
+ // ----------------------------------
if ((SCA_MIN_VALUE | SCA_MAX_VALUE) & m_nIncludeSpecial)
{
// need to export the min value and the max value as attributes
@@ -1671,6 +1705,8 @@ namespace xmloff
}
if ( m_xPropertyInfo->hasPropertyByName( PROPERTY_IMAGE_POSITION ) )
m_nIncludeSpecial |= SCA_IMAGE_POSITION;
+ if ( m_xPropertyInfo->hasPropertyByName( PROPERTY_GROUP_NAME ) )
+ m_nIncludeSpecial |= SCA_GROUP_NAME;
m_nIncludeDatabase = DA_DATA_FIELD | DA_INPUT_REQUIRED;
m_nIncludeEvents = EA_CONTROL_EVENTS | EA_ON_CHANGE;
break;
@@ -2129,9 +2165,9 @@ namespace xmloff
{
PROPERTY_NAME, /*PROPERTY_TARGETURL,*/ PROPERTY_COMMAND, PROPERTY_FILTER, PROPERTY_ORDER
};
- sal_Int32 nIdCount = sizeof(eStringPropertyIds) / sizeof(eStringPropertyIds[0]);
+ sal_Int32 nIdCount = SAL_N_ELEMENTS(eStringPropertyIds);
#if OSL_DEBUG_LEVEL > 0
- sal_Int32 nNameCount = sizeof(aStringPropertyNames) / sizeof(aStringPropertyNames[0]);
+ sal_Int32 nNameCount = SAL_N_ELEMENTS(aStringPropertyNames);
OSL_ENSURE((nIdCount == nNameCount),
"OFormExport::exportAttributes: somebody tampered with the maps (1)!");
#endif
@@ -2178,10 +2214,10 @@ namespace xmloff
{
BOOLATTR_DEFAULT_TRUE, BOOLATTR_DEFAULT_TRUE, BOOLATTR_DEFAULT_TRUE, BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_TRUE, BOOLATTR_DEFAULT_FALSE
};
- sal_Int32 nIdCount = sizeof(eBooleanPropertyIds) / sizeof(eBooleanPropertyIds[0]);
+ sal_Int32 nIdCount = SAL_N_ELEMENTS(eBooleanPropertyIds);
#if OSL_DEBUG_LEVEL > 0
- sal_Int32 nNameCount = sizeof(pBooleanPropertyNames) / sizeof(pBooleanPropertyNames[0]);
- sal_Int32 nFlagsCount = sizeof(nBooleanPropertyAttrFlags) / sizeof(nBooleanPropertyAttrFlags[0]);
+ sal_Int32 nNameCount = SAL_N_ELEMENTS(pBooleanPropertyNames);
+ sal_Int32 nFlagsCount = SAL_N_ELEMENTS(nBooleanPropertyAttrFlags);
OSL_ENSURE((nIdCount == nNameCount) && (nNameCount == nFlagsCount),
"OFormExport::exportAttributes: somebody tampered with the maps (2)!");
#endif
@@ -2217,12 +2253,12 @@ namespace xmloff
{
sal_False, sal_False, sal_False, sal_False, sal_True
};
- sal_Int32 nIdCount = sizeof(eEnumPropertyIds) / sizeof(eEnumPropertyIds[0]);
+ sal_Int32 nIdCount = SAL_N_ELEMENTS(eEnumPropertyIds);
#if OSL_DEBUG_LEVEL > 0
- sal_Int32 nNameCount = sizeof(pEnumPropertyNames) / sizeof(pEnumPropertyNames[0]);
- sal_Int32 nDefaultCount = sizeof(nEnumPropertyAttrDefaults) / sizeof(nEnumPropertyAttrDefaults[0]);
- sal_Int32 nDefaultFlagCount = sizeof(nEnumPropertyAttrDefaultFlags) / sizeof(nEnumPropertyAttrDefaultFlags[0]);
- sal_Int32 nMapCount = sizeof(eEnumPropertyMaps) / sizeof(eEnumPropertyMaps[0]);
+ sal_Int32 nNameCount = SAL_N_ELEMENTS(pEnumPropertyNames);
+ sal_Int32 nDefaultCount = SAL_N_ELEMENTS(nEnumPropertyAttrDefaults);
+ sal_Int32 nDefaultFlagCount = SAL_N_ELEMENTS(nEnumPropertyAttrDefaultFlags);
+ sal_Int32 nMapCount = SAL_N_ELEMENTS(eEnumPropertyMaps);
OSL_ENSURE((nIdCount == nNameCount) && (nNameCount == nDefaultCount) && (nDefaultCount == nDefaultFlagCount) && (nDefaultFlagCount == nMapCount),
"OFormExport::exportAttributes: somebody tampered with the maps (3)!");
#endif
@@ -2258,3 +2294,5 @@ namespace xmloff
//.........................................................................
} // namespace xmloff
//.........................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/elementexport.hxx b/xmloff/source/forms/elementexport.hxx
index 048b3e0a78..269e086da3 100644
--- a/xmloff/source/forms/elementexport.hxx
+++ b/xmloff/source/forms/elementexport.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -327,3 +328,4 @@ namespace xmloff
#endif // _XMLOFF_ELEMENTEXPORT_HXX_
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx
index 9bc01052e3..117b3561b4 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -493,7 +494,7 @@ namespace xmloff
// no optimization here. If this method gets called, the XML stream did not contain a name for the
// element, which is a heavy error. So in this case we don't care for performance
Sequence< ::rtl::OUString > aNames = m_xParentContainer->getElementNames();
- static const ::rtl::OUString sUnnamedName = ::rtl::OUString::createFromAscii("unnamed");
+ static const ::rtl::OUString sUnnamedName(RTL_CONSTASCII_USTRINGPARAM("unnamed"));
::rtl::OUString sReturn;
const ::rtl::OUString* pNames = NULL;
@@ -1124,7 +1125,7 @@ namespace xmloff
}
//---------------------------------------------------------------------
- //added by BerryJia for fixing bug102407 2002-11-5
+
Reference< XPropertySet > OControlImport::createElement()
{
const Reference<XPropertySet> xPropSet = OElementImport::createElement();
@@ -1558,7 +1559,7 @@ namespace xmloff
{
::rtl::OUString sDefaultControl;
OSL_VERIFY( aDefaultControlPropertyPos->Value >>= sDefaultControl );
- if ( sDefaultControl.equalsAscii( "stardiv.one.form.control.Edit" ) )
+ if ( sDefaultControl.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "stardiv.one.form.control.Edit" ) ) )
{
// complete remove this property value from the array. Today's "default value" of the "DefaultControl"
// property is sufficient
@@ -1622,12 +1623,12 @@ namespace xmloff
const Reference< sax::XAttributeList >& _rxAttrList)
{
// is it the "option" sub tag of a listbox ?
- static const ::rtl::OUString s_sOptionElementName = ::rtl::OUString::createFromAscii("option");
+ static const ::rtl::OUString s_sOptionElementName(RTL_CONSTASCII_USTRINGPARAM("option"));
if (s_sOptionElementName == _rLocalName)
return new OListOptionImport(GetImport(), _nPrefix, _rLocalName, this);
// is it the "item" sub tag of a combobox ?
- static const ::rtl::OUString s_sItemElementName = ::rtl::OUString::createFromAscii("item");
+ static const ::rtl::OUString s_sItemElementName(RTL_CONSTASCII_USTRINGPARAM("item"));
if (s_sItemElementName == _rLocalName)
return new OComboItemImport(GetImport(), _nPrefix, _rLocalName, this);
@@ -1839,9 +1840,9 @@ namespace xmloff
// the label and the value
const SvXMLNamespaceMap& rMap = GetImport().GetNamespaceMap();
const ::rtl::OUString sLabelAttribute = rMap.GetQNameByKey(
- GetPrefix(), ::rtl::OUString::createFromAscii("label"));
+ GetPrefix(), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("label")));
const ::rtl::OUString sValueAttribute = rMap.GetQNameByKey(
- GetPrefix(), ::rtl::OUString::createFromAscii("value"));
+ GetPrefix(), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value")));
// -------------------
// the label attribute
@@ -1878,13 +1879,13 @@ namespace xmloff
GetPrefix(), ::rtl::OUString::createFromAscii(OAttributeMetaData::getCommonControlAttributeName(CCA_SELECTED)));
// propagate the selected flag
- sal_Bool bSelected;
+ bool bSelected;
GetImport().GetMM100UnitConverter().convertBool(bSelected, _rxAttrList->getValueByName(sSelectedAttribute));
if (bSelected)
m_xListBoxImport->implSelectCurrentItem();
// same for the default selected
- sal_Bool bDefaultSelected;
+ bool bDefaultSelected;
GetImport().GetMM100UnitConverter().convertBool(bDefaultSelected, _rxAttrList->getValueByName(sDefaultSelectedAttribute));
if (bDefaultSelected)
m_xListBoxImport->implDefaultSelectCurrentItem();
@@ -2229,3 +2230,4 @@ namespace xmloff
} // namespace xmloff
//.........................................................................
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/elementimport.hxx b/xmloff/source/forms/elementimport.hxx
index 4bf108c5ed..bd6af1501b 100644
--- a/xmloff/source/forms/elementimport.hxx
+++ b/xmloff/source/forms/elementimport.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -283,7 +284,7 @@ namespace xmloff
virtual void doRegisterXFormsSubmission( const ::rtl::OUString& );
protected:
- //added by BerryJia for fixing bug102407 2002-11-5
+
// OElementImport overridables
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
createElement();
@@ -771,3 +772,4 @@ namespace xmloff
#endif // _XMLOFF_FORMS_ELEMENTIMPORT_HXX_
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/elementimport_impl.hxx b/xmloff/source/forms/elementimport_impl.hxx
index d0abeb0824..5b92da41d3 100644
--- a/xmloff/source/forms/elementimport_impl.hxx
+++ b/xmloff/source/forms/elementimport_impl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -121,3 +122,4 @@ template <class BASE>
return xReturn;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/eventexport.cxx b/xmloff/source/forms/eventexport.cxx
index 29c120abce..9d898b6102 100644
--- a/xmloff/source/forms/eventexport.cxx
+++ b/xmloff/source/forms/eventexport.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -106,7 +107,7 @@ namespace xmloff
void SAL_CALL OEventDescriptorMapper::replaceByName( const ::rtl::OUString&, const Any& ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException)
{
throw IllegalArgumentException(
- ::rtl::OUString::createFromAscii("replacing is not implemented for this wrapper class."), static_cast< ::cppu::OWeakObject* >(this), 1);
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("replacing is not implemented for this wrapper class.")), static_cast< ::cppu::OWeakObject* >(this), 1);
}
//---------------------------------------------------------------------
@@ -115,7 +116,7 @@ namespace xmloff
ConstMapString2PropertyValueSequenceIterator aPos = m_aMappedEvents.find(_rName);
if (m_aMappedEvents.end() == aPos)
throw NoSuchElementException(
- ::rtl::OUString::createFromAscii("There is no element named ") += _rName,
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("There is no element named ")) += _rName,
static_cast< ::cppu::OWeakObject* >(this));
return makeAny(aPos->second);
@@ -158,3 +159,4 @@ namespace xmloff
} // namespace xmloff
//.........................................................................
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/eventexport.hxx b/xmloff/source/forms/eventexport.hxx
index 8c3578dd55..262ba421a2 100644
--- a/xmloff/source/forms/eventexport.hxx
+++ b/xmloff/source/forms/eventexport.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -84,3 +85,4 @@ namespace xmloff
#endif // _XMLOFF_FORMS_EVENTEXPORT_HXX_
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/eventimport.cxx b/xmloff/source/forms/eventimport.cxx
index e4127722d5..cc3f7833ef 100644
--- a/xmloff/source/forms/eventimport.cxx
+++ b/xmloff/source/forms/eventimport.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -161,3 +162,4 @@ namespace xmloff
//.........................................................................
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/eventimport.hxx b/xmloff/source/forms/eventimport.hxx
index db0933a244..b7ae845907 100644
--- a/xmloff/source/forms/eventimport.hxx
+++ b/xmloff/source/forms/eventimport.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -93,3 +94,4 @@ namespace xmloff
#endif // _XMLOFF_FORMS_EVENTIMPORT_HXX_
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/formattributes.cxx b/xmloff/source/forms/formattributes.cxx
index 2b2b12b550..a91695640f 100644
--- a/xmloff/source/forms/formattributes.cxx
+++ b/xmloff/source/forms/formattributes.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -192,6 +193,7 @@ namespace xmloff
case SCA_MAX_VALUE: return "max-value";
case SCA_MIN_VALUE: return "min-value";
case SCA_VALIDATION: return "validation";
+ case SCA_GROUP_NAME: return "group-name";
case SCA_MULTI_LINE: return "multi-line";
case SCA_AUTOMATIC_COMPLETION: return "auto-complete";
case SCA_MULTIPLE: return "multiple";
@@ -212,9 +214,12 @@ namespace xmloff
}
//---------------------------------------------------------------------
- sal_uInt16 OAttributeMetaData::getSpecialAttributeNamespace(sal_Int32 /*_nId*/)
+ sal_uInt16 OAttributeMetaData::getSpecialAttributeNamespace(sal_Int32 _nId)
{
- // nothing special here
+ switch( _nId )
+ {
+ case SCA_GROUP_NAME: return XML_NAMESPACE_FORMX;
+ }
return XML_NAMESPACE_FORM;
}
@@ -339,3 +344,4 @@ namespace xmloff
} // namespace xmloff
//.........................................................................
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/formattributes.hxx b/xmloff/source/forms/formattributes.hxx
index f2e7bb7cc3..e3908e989b 100644
--- a/xmloff/source/forms/formattributes.hxx
+++ b/xmloff/source/forms/formattributes.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,7 +31,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <sal/types.h>
-#include <vos/refernce.hxx>
+#include <salhelper/simplereferenceobject.hxx>
#include <comphelper/stl_types.hxx>
class SvXMLExport;
@@ -123,6 +124,7 @@ namespace xmloff
#define SCA_MAX_VALUE 0x00000002
#define SCA_MIN_VALUE 0x00000004
#define SCA_VALIDATION 0x00000008
+ #define SCA_GROUP_NAME 0x00000010
#define SCA_MULTI_LINE 0x00000020
#define SCA_AUTOMATIC_COMPLETION 0x00000080
#define SCA_MULTIPLE 0x00000100
@@ -361,3 +363,4 @@ namespace xmloff
#endif // _XMLOFF_FORMATTRIBUTES_HXX_
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/formcellbinding.cxx b/xmloff/source/forms/formcellbinding.cxx
index 488299a1e2..58d3b252f6 100644
--- a/xmloff/source/forms/formcellbinding.cxx
+++ b/xmloff/source/forms/formcellbinding.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -488,3 +489,5 @@ bool FormCellBindingHelper::doConvertAddressRepresentations( const ::rtl::OUStri
//............................................................................
} // namespace xmloff
//............................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/formcellbinding.hxx b/xmloff/source/forms/formcellbinding.hxx
index 1e35561455..02aa33f8ad 100644
--- a/xmloff/source/forms/formcellbinding.hxx
+++ b/xmloff/source/forms/formcellbinding.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -277,3 +278,5 @@ namespace xmloff
//............................................................................
#endif // XMLOFF_FORMS_FORMCELLBINDING
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/formenums.cxx b/xmloff/source/forms/formenums.cxx
index 3db9423c22..3207344b45 100644
--- a/xmloff/source/forms/formenums.cxx
+++ b/xmloff/source/forms/formenums.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -346,3 +347,4 @@ namespace xmloff
} // namespace xmloff
//.........................................................................
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/formenums.hxx b/xmloff/source/forms/formenums.hxx
index 403b82e908..5b34d8f5b2 100644
--- a/xmloff/source/forms/formenums.hxx
+++ b/xmloff/source/forms/formenums.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -78,3 +79,4 @@ namespace xmloff
#endif // _XMLOFF_FORMENUMS_HXX_
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/formevents.cxx b/xmloff/source/forms/formevents.cxx
index 5823b69f10..e783d240fe 100644
--- a/xmloff/source/forms/formevents.cxx
+++ b/xmloff/source/forms/formevents.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -83,3 +84,4 @@ namespace xmloff
} // namespace xmloff
//.........................................................................
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/formevents.hxx b/xmloff/source/forms/formevents.hxx
index 6740a99d8b..e0d356519d 100644
--- a/xmloff/source/forms/formevents.hxx
+++ b/xmloff/source/forms/formevents.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -45,3 +46,4 @@ namespace xmloff
#endif // _XMLOFF_FORMS_FORMEVENTS_HXX_
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/formlayerexport.cxx b/xmloff/source/forms/formlayerexport.cxx
index 4e1e8a8318..f1fc512793 100644
--- a/xmloff/source/forms/formlayerexport.cxx
+++ b/xmloff/source/forms/formlayerexport.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -93,7 +94,7 @@ namespace xmloff
}
//---------------------------------------------------------------------
- ::vos::ORef< SvXMLExportPropertyMapper > OFormLayerXMLExport::getStylePropertyMapper()
+ ::rtl::Reference< SvXMLExportPropertyMapper > OFormLayerXMLExport::getStylePropertyMapper()
{
return m_pImpl->getStylePropertyMapper();
}
@@ -185,3 +186,4 @@ namespace xmloff
} // namespace xmloff
//.........................................................................
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/formlayerimport.cxx b/xmloff/source/forms/formlayerimport.cxx
index 0f8e65e623..4217b95ab7 100644
--- a/xmloff/source/forms/formlayerimport.cxx
+++ b/xmloff/source/forms/formlayerimport.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -60,7 +61,7 @@ namespace xmloff
}
//---------------------------------------------------------------------
- ::vos::ORef< SvXMLImportPropertyMapper > OFormLayerXMLImport::getStylePropertyMapper() const
+ ::rtl::Reference< SvXMLImportPropertyMapper > OFormLayerXMLImport::getStylePropertyMapper() const
{
return m_pImpl->getStylePropertyMapper();
}
@@ -127,3 +128,4 @@ namespace xmloff
} // namespace xmloff
//.........................................................................
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/formsimp.cxx b/xmloff/source/forms/formsimp.cxx
index 85d7a3efbf..2cf288480b 100644
--- a/xmloff/source/forms/formsimp.cxx
+++ b/xmloff/source/forms/formsimp.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,9 +33,7 @@
#include "xmloff/xmlnmspe.hxx"
#include <xmloff/nmspmap.hxx>
-#ifndef _XMLOFF_ANIMIMP_HXX
#include <xmloff/formsimp.hxx>
-#endif
using ::rtl::OUString;
using ::rtl::OUStringBuffer;
@@ -56,3 +55,5 @@ SvXMLImportContext * XMLFormsContext::CreateChildContext( USHORT nPrefix, const
{
return GetImport().GetFormImport()->createContext( nPrefix, rLocalName, xAttrList );
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/formstyles.cxx b/xmloff/source/forms/formstyles.cxx
index c4eee13554..5c02f64ff2 100644
--- a/xmloff/source/forms/formstyles.cxx
+++ b/xmloff/source/forms/formstyles.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -64,3 +65,4 @@ namespace xmloff
//.........................................................................
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/formstyles.hxx b/xmloff/source/forms/formstyles.hxx
index c2255a97f0..bc15ae032b 100644
--- a/xmloff/source/forms/formstyles.hxx
+++ b/xmloff/source/forms/formstyles.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -70,3 +71,4 @@ namespace xmloff
#endif // XMLOFF_FORMSTYLES_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/gridcolumnproptranslator.cxx b/xmloff/source/forms/gridcolumnproptranslator.cxx
index 803058285c..86b317d7a7 100644
--- a/xmloff/source/forms/gridcolumnproptranslator.cxx
+++ b/xmloff/source/forms/gridcolumnproptranslator.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -343,3 +344,4 @@ namespace xmloff
} // namespace xmloff
//........................................................................
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/gridcolumnproptranslator.hxx b/xmloff/source/forms/gridcolumnproptranslator.hxx
index 36c24928a5..bf2b18ada8 100644
--- a/xmloff/source/forms/gridcolumnproptranslator.hxx
+++ b/xmloff/source/forms/gridcolumnproptranslator.hxx<