diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2012-12-13 19:02:26 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2012-12-13 21:49:59 +0100 |
| commit | 78fc1e1b954e1b09a0a0e779202d892759564489 (patch) | |
| tree | 4263e485ebebeb69cc32d50186085be606e405a1 /oox | |
| parent | 68a7d2c412ddd3ead977af1d0a6bff31cf601248 (diff) | |
PCH for Library_oox
Diffstat (limited to 'oox')
25 files changed, 551 insertions, 172 deletions
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk index b1b81646d036..6b496dad689c 100644 --- a/oox/Library_oox.mk +++ b/oox/Library_oox.mk @@ -33,6 +33,8 @@ $(eval $(call gb_Library_use_packages,oox,\ oox_tokens \ )) +$(eval $(call gb_Library_set_precompiled_header,oox,$(SRCDIR)/oox/inc/pch/precompiled_oox)) + $(eval $(call gb_Library_use_custom_headers,oox,oox/generated)) $(eval $(call gb_Library_set_include,oox,\ diff --git a/oox/inc/pch/precompiled_oox.cxx b/oox/inc/pch/precompiled_oox.cxx new file mode 100644 index 000000000000..52dbf23b5c30 --- /dev/null +++ b/oox/inc/pch/precompiled_oox.cxx @@ -0,0 +1,12 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include "precompiled_oox.hxx" + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/inc/pch/precompiled_oox.hxx b/oox/inc/pch/precompiled_oox.hxx new file mode 100644 index 000000000000..59a0721c7585 --- /dev/null +++ b/oox/inc/pch/precompiled_oox.hxx @@ -0,0 +1,366 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include <algorithm> +#include <assert.h> +#include <basegfx/matrix/b2dhommatrix.hxx> +#include "basegfx/numeric/ftools.hxx" +#include <basegfx/numeric/ftools.hxx> +#include <basegfx/point/b2dpoint.hxx> +#include <basegfx/polygon/b2dpolygon.hxx> +#include <boost/bind.hpp> +#include <boost/unordered_map.hpp> +#include "comphelper/anytostring.hxx" +#include <comphelper/configurationhelper.hxx> +#include <comphelper/docpasswordhelper.hxx> +#include <comphelper/genericpropertyset.hxx> +#include <comphelper/mediadescriptor.hxx> +#include <comphelper/processfactory.hxx> +#include <comphelper/seqstream.hxx> +#include <comphelper/sequenceashashmap.hxx> +#include <comphelper/stl_types.hxx> +#include <comphelper/storagehelper.hxx> +#include <comphelper/string.hxx> +#include <com/sun/star/animations/AnimationCalcMode.hpp> +#include <com/sun/star/animations/AnimationColorSpace.hpp> +#include <com/sun/star/animations/AnimationEndSync.hpp> +#include <com/sun/star/animations/AnimationFill.hpp> +#include <com/sun/star/animations/AnimationNodeType.hpp> +#include <com/sun/star/animations/AnimationRestart.hpp> +#include <com/sun/star/animations/AnimationTransformType.hpp> +#include <com/sun/star/animations/Event.hpp> +#include <com/sun/star/animations/EventTrigger.hpp> +#include <com/sun/star/animations/Timing.hpp> +#include <com/sun/star/animations/TransitionSubType.hpp> +#include <com/sun/star/animations/TransitionType.hpp> +#include <com/sun/star/animations/XAnimateColor.hpp> +#include <com/sun/star/animations/XAnimate.hpp> +#include <com/sun/star/animations/XAnimateMotion.hpp> +#include <com/sun/star/animations/XAnimateSet.hpp> +#include <com/sun/star/animations/XAnimateTransform.hpp> +#include <com/sun/star/animations/XAnimationNode.hpp> +#include <com/sun/star/animations/XAnimationNodeSupplier.hpp> +#include <com/sun/star/animations/XCommand.hpp> +#include <com/sun/star/animations/XIterateContainer.hpp> +#include <com/sun/star/animations/XTimeContainer.hpp> +#include <com/sun/star/awt/FontDescriptor.hpp> +#include <com/sun/star/awt/FontFamily.hpp> +#include <com/sun/star/awt/FontPitch.hpp> +#include <com/sun/star/awt/FontSlant.hpp> +#include <com/sun/star/awt/FontStrikeout.hpp> +#include <com/sun/star/awt/FontUnderline.hpp> +#include <com/sun/star/awt/FontWeight.hpp> +#include <com/sun/star/awt/Gradient.hpp> +#include <com/sun/star/awt/CharSet.hpp> +#include <com/sun/star/awt/ImagePosition.hpp> +#include <com/sun/star/awt/ImageScaleMode.hpp> +#include <com/sun/star/awt/KeyEvent.hpp> +#include <com/sun/star/awt/Point.hpp> +#include <com/sun/star/awt/Rectangle.hpp> +#include <com/sun/star/awt/ScrollBarOrientation.hpp> +#include <com/sun/star/awt/Size.hpp> +#include <com/sun/star/awt/TextAlign.hpp> +#include <com/sun/star/awt/VisualEffect.hpp> +#include <com/sun/star/awt/XBitmap.hpp> +#include <com/sun/star/awt/XControlModel.hpp> +#include <com/sun/star/awt/XDevice.hpp> +#include <com/sun/star/awt/XUnitConversion.hpp> +#include <com/sun/star/beans/NamedValue.hpp> +#include <com/sun/star/beans/PropertyAttribute.hpp> +#include <com/sun/star/beans/PropertyExistException.hpp> +#include <com/sun/star/beans/Property.hpp> +#include <com/sun/star/beans/PropertyValue.hpp> +#include <com/sun/star/beans/PropertyValues.hpp> +#include <com/sun/star/beans/XMultiPropertySet.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/beans/XPropertySetInfo.hpp> +#include <com/sun/star/beans/XPropertyState.hpp> +#include <com/sun/star/container/XEnumerationAccess.hpp> +#include <com/sun/star/container/XChild.hpp> +#include <com/sun/star/container/XIndexAccess.hpp> +#include <com/sun/star/container/XIndexContainer.hpp> +#include <com/sun/star/container/XIndexReplace.hpp> +#include <com/sun/star/container/XNameAccess.hpp> +#include <com/sun/star/container/XNameContainer.hpp> +#include <com/sun/star/container/XNamed.hpp> +#include <com/sun/star/document/XActionLockable.hpp> +#include <com/sun/star/document/XDocumentProperties.hpp> +#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> +#include <com/sun/star/document/XEmbeddedObjectResolver.hpp> +#include <com/sun/star/document/XExporter.hpp> +#include <com/sun/star/document/XOOXMLDocumentPropertiesImporter.hpp> +#include <com/sun/star/document/XStorageBasedDocument.hpp> +#include <com/sun/star/drawing/BitmapMode.hpp> +#include <com/sun/star/drawing/ColorMode.hpp> +#include <com/sun/star/drawing/ConnectorType.hpp> +#include <com/sun/star/drawing/Direction3D.hpp> +#include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp> +#include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp> +#include <com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp> +#include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp> +#include <com/sun/star/drawing/EnhancedCustomShapeTextFrame.hpp> +#include <com/sun/star/drawing/FillStyle.hpp> +#include <com/sun/star/drawing/FlagSequence.hpp> +#include <com/sun/star/drawing/HomogenMatrix3.hpp> +#include <com/sun/star/drawing/LineDash.hpp> +#include <com/sun/star/drawing/LineJoint.hpp> +#include <com/sun/star/drawing/LineStyle.hpp> +#include <com/sun/star/drawing/PointSequence.hpp> +#include <com/sun/star/drawing/PointSequenceSequence.hpp> +#include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp> +#include <com/sun/star/drawing/ProjectionMode.hpp> +#include <com/sun/star/drawing/RectanglePoint.hpp> +#include <com/sun/star/drawing/ShadeMode.hpp> +#include <com/sun/star/drawing/TextFitToSizeType.hpp> +#include <com/sun/star/drawing/TextHorizontalAdjust.hpp> +#include <com/sun/star/drawing/TextVerticalAdjust.hpp> +#include <com/sun/star/drawing/XControlShape.hpp> +#include <com/sun/star/drawing/XDrawPages.hpp> +#include <com/sun/star/drawing/XDrawPagesSupplier.hpp> +#include <com/sun/star/drawing/XDrawPageSupplier.hpp> +#include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp> +#include <com/sun/star/drawing/XMasterPagesSupplier.hpp> +#include <com/sun/star/drawing/XMasterPageTarget.hpp> +#include <com/sun/star/drawing/XShape.hpp> +#include <com/sun/star/drawing/XShapes.hpp> +#include <com/sun/star/embed/Aspects.hpp> +#include <com/sun/star/embed/ElementModes.hpp> +#include <com/sun/star/embed/XHierarchicalStorageAccess.hpp> +#include <com/sun/star/embed/XRelationshipAccess.hpp> +#include <com/sun/star/embed/XStorage.hpp> +#include <com/sun/star/embed/XTransactedObject.hpp> +#include <com/sun/star/form/binding/XBindableValue.hpp> +#include <com/sun/star/form/binding/XListEntrySink.hpp> +#include <com/sun/star/form/binding/XListEntrySource.hpp> +#include <com/sun/star/form/binding/XValueBinding.hpp> +#include <com/sun/star/form/FormComponentType.hpp> +#include <com/sun/star/form/XFormComponent.hpp> +#include <com/sun/star/form/XForm.hpp> +#include <com/sun/star/form/XFormsSupplier.hpp> +#include <com/sun/star/frame/XFramesSupplier.hpp> +#include <com/sun/star/frame/XModel.hpp> +#include <com/sun/star/graphic/GraphicObject.hpp> +#include <com/sun/star/graphic/GraphicProvider.hpp> +#include <com/sun/star/graphic/XGraphic.hpp> +#include <com/sun/star/graphic/XGraphicProvider.hpp> +#include <com/sun/star/graphic/XGraphicTransformer.hpp> +#include <com/sun/star/chart/DataLabelPlacement.hpp> +#include <com/sun/star/chart/ErrorBarStyle.hpp> +#include <com/sun/star/chart/ChartAxisArrangeOrderType.hpp> +#include <com/sun/star/chart/ChartAxisAssign.hpp> +#include <com/sun/star/chart/ChartAxisLabelPosition.hpp> +#include <com/sun/star/chart/ChartAxisMarkPosition.hpp> +#include <com/sun/star/chart/ChartAxisMarks.hpp> +#include <com/sun/star/chart/ChartAxisPosition.hpp> +#include <com/sun/star/chart/ChartDataRowSource.hpp> +#include <com/sun/star/chart/ChartLegendExpansion.hpp> +#include <com/sun/star/chart/ChartLegendPosition.hpp> +#include <com/sun/star/chart/ChartSeriesAddress.hpp> +#include <com/sun/star/chart/ChartSolidType.hpp> +#include <com/sun/star/chart/ChartSymbolType.hpp> +#include <com/sun/star/chart/MissingValueTreatment.hpp> +#include <com/sun/star/chart/TimeInterval.hpp> +#include <com/sun/star/chart/TimeUnit.hpp> +#include <com/sun/star/chart/XAxisXSupplier.hpp> +#include <com/sun/star/chart/XAxisYSupplier.hpp> +#include <com/sun/star/chart/XAxisZSupplier.hpp> +#include <com/sun/star/chart/XDiagramPositioning.hpp> +#include <com/sun/star/chart/XChartDataArray.hpp> +#include <com/sun/star/chart/XChartDocument.hpp> +#include <com/sun/star/chart/XSecondAxisTitleSupplier.hpp> +#include <com/sun/star/chart/XStatisticDisplay.hpp> +#include <com/sun/star/chart/XTwoAxisXSupplier.hpp> +#include <com/sun/star/chart/XTwoAxisYSupplier.hpp> +#include <com/sun/star/chart/X3DDisplay.hpp> +#include <com/sun/star/chart2/AxisType.hpp> +#include <com/sun/star/chart2/CurveStyle.hpp> +#include <com/sun/star/chart2/DataPointGeometry3D.hpp> +#include <com/sun/star/chart2/DataPointLabel.hpp> +#include <com/sun/star/chart2/data/XDatabaseDataProvider.hpp> +#include <com/sun/star/chart2/data/XDataProvider.hpp> +#include <com/sun/star/chart2/data/XDataReceiver.hpp> +#include <com/sun/star/chart2/data/XDataSink.hpp> +#include <com/sun/star/chart2/data/XDataSource.hpp> +#include <com/sun/star/chart2/data/XNumericalDataSequence.hpp> +#include <com/sun/star/chart2/data/XRangeXMLConversion.hpp> +#include <com/sun/star/chart2/data/XTextualDataSequence.hpp> +#include <com/sun/star/chart2/LegendPosition.hpp> +#include <com/sun/star/chart2/RelativePosition.hpp> +#include <com/sun/star/chart2/RelativeSize.hpp> +#include <com/sun/star/chart2/StackingDirection.hpp> +#include <com/sun/star/chart2/Symbol.hpp> +#include <com/sun/star/chart2/TickmarkStyle.hpp> +#include <com/sun/star/chart2/XAxis.hpp> +#include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> +#include <com/sun/star/chart2/XCoordinateSystem.hpp> +#include <com/sun/star/chart2/XDataSeriesContainer.hpp> +#include <com/sun/star/chart2/XDataSeries.hpp> +#include <com/sun/star/chart2/XDiagram.hpp> +#include <com/sun/star/chart2/XFormattedString.hpp> +#include <com/sun/star/chart2/XChartDocument.hpp> +#include <com/sun/star/chart2/XChartTypeContainer.hpp> +#include <com/sun/star/chart2/XLegend.hpp> +#include <com/sun/star/chart2/XRegressionCurveContainer.hpp> +#include <com/sun/star/chart2/XRegressionCurve.hpp> +#include <com/sun/star/chart2/XTitled.hpp> +#include <com/sun/star/chart2/XTitle.hpp> +#include <com/sun/star/io/TempFile.hpp> +#include <com/sun/star/io/XActiveDataSink.hpp> +#include <com/sun/star/io/XActiveDataSource.hpp> +#include <com/sun/star/io/XInputStream.hpp> +#include <com/sun/star/io/XInputStreamProvider.hpp> +#include <com/sun/star/io/XOutputStream.hpp> +#include <com/sun/star/io/XSeekable.hpp> +#include <com/sun/star/io/XStream.hpp> +#include <com/sun/star/io/XTextInputStream.hpp> +#include <com/sun/star/io/XTextOutputStream.hpp> +#include <com/sun/star/i18n/ScriptType.hpp> +#include <com/sun/star/lang/DisposedException.hpp> +#include <com/sun/star/lang/Locale.hpp> +#include <com/sun/star/lang/XComponent.hpp> +#include <com/sun/star/lang/XInitialization.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/presentation/AnimationSpeed.hpp> +#include <com/sun/star/presentation/EffectCommands.hpp> +#include <com/sun/star/presentation/EffectNodeType.hpp> +#include <com/sun/star/presentation/EffectPresetClass.hpp> +#include <com/sun/star/presentation/ParagraphTarget.hpp> +#include <com/sun/star/presentation/ShapeAnimationSubType.hpp> +#include <com/sun/star/presentation/TextAnimationType.hpp> +#include <com/sun/star/presentation/XPresentationPage.hpp> +#include <com/sun/star/script/ModuleInfo.hpp> +#include <com/sun/star/script/ModuleType.hpp> +#include <com/sun/star/script/vba/XVBACompatibility.hpp> +#include <com/sun/star/script/vba/XVBAMacroResolver.hpp> +#include <com/sun/star/script/vba/XVBAModuleInfo.hpp> +#include <com/sun/star/script/XLibraryContainer.hpp> +#include <com/sun/star/sheet/AddressConvention.hpp> +#include <com/sun/star/sheet/FormulaToken.hpp> +#include <com/sun/star/sheet/XCellRangeAddressable.hpp> +#include <com/sun/star/sheet/XCellRangeReferrer.hpp> +#include <com/sun/star/sheet/XFormulaParser.hpp> +#include <com/sun/star/sheet/XFormulaTokens.hpp> +#include <com/sun/star/sheet/XSpreadsheetDocument.hpp> +#include <com/sun/star/style/CaseMap.hpp> +#include <com/sun/star/style/LineSpacing.hpp> +#include <com/sun/star/style/LineSpacingMode.hpp> +#include <com/sun/star/style/ParagraphAdjust.hpp> +#include <com/sun/star/style/TabStop.hpp> +#include <com/sun/star/style/VerticalAlignment.hpp> +#include <com/sun/star/style/XStyleFamiliesSupplier.hpp> +#include <com/sun/star/style/XStyle.hpp> +#include <com/sun/star/table/BorderLine2.hpp> +#include <com/sun/star/table/CellAddress.hpp> +#include <com/sun/star/table/CellRangeAddress.hpp> +#include <com/sun/star/table/XCellRange.hpp> +#include <com/sun/star/table/XColumnRowRange.hpp> +#include <com/sun/star/table/XMergeableCell.hpp> +#include <com/sun/star/table/XMergeableCellRange.hpp> +#include <com/sun/star/table/XTable.hpp> +#include <com/sun/star/task/XInteractionHandler.hpp> +#include <com/sun/star/task/XStatusIndicator.hpp> +#include <com/sun/star/text/ControlCharacter.hpp> +#include <com/sun/star/text/GraphicCrop.hpp> +#include <com/sun/star/text/HoriOrientation.hpp> +#include <com/sun/star/text/RelOrientation.hpp> +#include <com/sun/star/text/SizeType.hpp> +#include <com/sun/star/text/TextContentAnchorType.hpp> +#include <com/sun/star/text/VertOrientation.hpp> +#include <com/sun/star/text/WritingMode.hpp> +#include <com/sun/star/text/XNumberingRulesSupplier.hpp> +#include <com/sun/star/text/XSimpleText.hpp> +#include <com/sun/star/text/XTextContent.hpp> +#include <com/sun/star/text/XTextCursor.hpp> +#include <com/sun/star/text/XTextDocument.hpp> +#include <com/sun/star/text/XTextField.hpp> +#include <com/sun/star/text/XTextFrame.hpp> +#include <com/sun/star/text/XText.hpp> +#include <com/sun/star/text/XTextRange.hpp> +#include <com/sun/star/ucb/SimpleFileAccess.hpp> +#include <com/sun/star/uno/Any.hxx> +#include <com/sun/star/uno/XComponentContext.hpp> +#include <com/sun/star/uri/UriReferenceFactory.hpp> +#include <com/sun/star/util/MeasureUnit.hpp> +#include <com/sun/star/util/XNumberFormatsSupplier.hpp> +#include <com/sun/star/util/XNumberFormatTypes.hpp> +#include <com/sun/star/xml/AttributeData.hpp> +#include <com/sun/star/xml/dom/DocumentBuilder.hpp> +#include <com/sun/star/xml/dom/XDocument.hpp> +#include <com/sun/star/xml/sax/FastToken.hpp> +#include <com/sun/star/xml/sax/InputSource.hpp> +#include <com/sun/star/xml/sax/XFastContextHandler.hpp> +#include <com/sun/star/xml/sax/XFastParser.hpp> +#include <com/sun/star/xml/sax/XFastSAXSerializable.hpp> +#include <com/sun/star/xml/sax/XLocator.hpp> +#include "cppuhelper/exc_hlp.hxx" +#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implementationentry.hxx> +#include <cstdio> +#include <editeng/svxenum.hxx> +#include <filter/msfilter/escherex.hxx> +#include <filter/msfilter/msvbahelper.hxx> +#include <filter/msfilter/util.hxx> +#include <fstream> +#include <functional> +#include <iostream> +#include <list> +#include <map> +#include <math.h> +#include <openssl/evp.h> +#include <osl/diagnose.h> +#include <osl/file.hxx> +#include <osl/mutex.hxx> +#include <osl/thread.h> +#include <osl/time.h> +#include <rtl/digest.h> +#include <rtl/instance.hxx> +#include <rtl/math.hxx> +#include <rtl/strbuf.hxx> +#include <rtl/string.hxx> +#include <rtl/tencinfo.h> +#include <rtl/uri.hxx> +#include <rtl/ustrbuf.h> +#include "rtl/ustrbuf.hxx" +#include <rtl/ustrbuf.hxx> +#include <rtl/ustring.h> +#include <rtl/ustring.hxx> +#include <sax/fshelper.hxx> +#include <sax/tools/converter.hxx> +#include <set> +#include <sfx2/app.hxx> +#include <stdio.h> +#include <string.h> +#include <svl/languageoptions.hxx> +#include <svtools/grfmgr.hxx> +#include <svtools/wmf.hxx> +#include <svx/svdoashp.hxx> +#include <svx/svdoole2.hxx> +#include <svx/svdotext.hxx> +#include <svx/unoapi.hxx> +#include <time.h> +#include <tools/debug.hxx> +#include <tools/globname.hxx> +#include <tools/solar.h> +#include <tools/stream.hxx> +#include "tools/string.hxx" +#include <tools/string.hxx> +#include <typeinfo> +#include <unotools/fontcvt.hxx> +#include <unotools/fontdefs.hxx> +#include <unotools/streamwrap.hxx> +#include <vcl/cvtgrf.hxx> +#include <vcl/graph.hxx> +#include <vcl/outdev.hxx> +#include <vcl/unohelp.hxx> +#include <vector> +#include <xmlscript/xmldlg_imexp.hxx> + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx index be0b96f225fc..bfca0d73010b 100644 --- a/oox/source/core/xmlfilterbase.cxx +++ b/oox/source/core/xmlfilterbase.cxx @@ -62,6 +62,7 @@ namespace core { // ============================================================================ +using namespace ::com::sun::star; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::document; @@ -69,7 +70,6 @@ using namespace ::com::sun::star::embed; using namespace ::com::sun::star::io; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::util; using namespace ::com::sun::star::xml::sax; using ::comphelper::MediaDescriptor; @@ -115,10 +115,10 @@ struct XmlFilterBaseImpl namespace { struct NamespaceIds: public rtl::StaticWithInit< - Sequence< Pair< OUString, sal_Int32 > >, + Sequence< beans::Pair< OUString, sal_Int32 > >, NamespaceIds> { - Sequence< Pair< OUString, sal_Int32 > > operator()() + Sequence< beans::Pair< OUString, sal_Int32 > > operator()() { static const char* const namespaceURIs[] = { "http://www.w3.org/XML/1998/namespace", @@ -168,7 +168,7 @@ namespace NMSP_xlsExtLst }; - Sequence< Pair< OUString, sal_Int32 > > aRet(STATIC_ARRAY_SIZE(namespaceIds)); + Sequence< beans::Pair< OUString, sal_Int32 > > aRet(STATIC_ARRAY_SIZE(namespaceIds)); for( sal_Int32 i=0; i<aRet.getLength(); ++i ) aRet[i] = make_Pair( OUString::createFromAscii(namespaceURIs[i]), @@ -186,7 +186,7 @@ XmlFilterBaseImpl::XmlFilterBaseImpl( const Reference< XComponentContext >& rxCo maVmlSuffix( CREATE_OUSTRING( ".vml" ) ) { // register XML namespaces - const Sequence< Pair< OUString, sal_Int32 > > ids= + const Sequence< beans::Pair< OUString, sal_Int32 > > ids= NamespaceIds::get(); for( sal_Int32 i=0; i<ids.getLength(); ++i ) maFastParser.registerNamespace( ids[i].Second ); @@ -473,7 +473,7 @@ writeElement( FSHelperPtr pDoc, sal_Int32 nXmlElement, const sal_Int32 nValue ) } static void -writeElement( FSHelperPtr pDoc, sal_Int32 nXmlElement, const DateTime& rTime ) +writeElement( FSHelperPtr pDoc, sal_Int32 nXmlElement, const util::DateTime& rTime ) { if( rTime.Year == 0 ) return; diff --git a/oox/source/drawingml/chart/chartconverter.cxx b/oox/source/drawingml/chart/chartconverter.cxx index 07226f0e2b87..607572d489f9 100644 --- a/oox/source/drawingml/chart/chartconverter.cxx +++ b/oox/source/drawingml/chart/chartconverter.cxx @@ -33,7 +33,7 @@ namespace chart { // ============================================================================ -using namespace ::com::sun::star::awt; +using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using namespace ::com::sun::star::chart2::data; using namespace ::com::sun::star::drawing; @@ -97,7 +97,7 @@ ChartConverter::~ChartConverter() void ChartConverter::convertFromModel( XmlFilterBase& rFilter, ChartSpaceModel& rChartModel, const Reference< XChartDocument >& rxChartDoc, - const Reference< XShapes >& rxExternalPage, const Point& rChartPos, const Size& rChartSize ) + const Reference< XShapes >& rxExternalPage, const awt::Point& rChartPos, const awt::Size& rChartSize ) { OSL_ENSURE( rxChartDoc.is(), "ChartConverter::convertFromModel - missing chart document" ); if( rxChartDoc.is() ) diff --git a/oox/source/drawingml/chart/chartdrawingfragment.cxx b/oox/source/drawingml/chart/chartdrawingfragment.cxx index be05de9675c5..707a4abd5401 100644 --- a/oox/source/drawingml/chart/chartdrawingfragment.cxx +++ b/oox/source/drawingml/chart/chartdrawingfragment.cxx @@ -31,7 +31,7 @@ namespace chart { // ============================================================================ -using namespace ::com::sun::star::awt; +using namespace ::com::sun::star; using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::uno; using namespace ::oox::core; @@ -113,7 +113,7 @@ EmuRectangle ShapeAnchor::calcAnchorRectEmu( const EmuRectangle& rChartRect ) co ChartDrawingFragment::ChartDrawingFragment( XmlFilterBase& rFilter, const OUString& rFragmentPath, const Reference< XShapes >& rxDrawPage, - const Size& rChartSize, const Point& rShapesOffset, bool bOleSupport ) : + const awt::Size& rChartSize, const awt::Point& rShapesOffset, bool bOleSupport ) : FragmentHandler2( rFilter, rFragmentPath ), mxDrawPage( rxDrawPage ), mbOleSupport( bOleSupport ) @@ -209,7 +209,7 @@ void ChartDrawingFragment::onEndElement() if( (aShapeRectEmu.X >= 0) && (aShapeRectEmu.Y >= 0) && (aShapeRectEmu.Width >= 0) && (aShapeRectEmu.Height >= 0) ) { // TODO: DrawingML implementation expects 32-bit coordinates for EMU rectangles (change that to EmuRectangle) - Rectangle aShapeRectEmu32( + awt::Rectangle aShapeRectEmu32( getLimitedValue< sal_Int32, sal_Int64 >( aShapeRectEmu.X, 0, SAL_MAX_INT32 ), getLimitedValue< sal_Int32, sal_Int64 >( aShapeRectEmu.Y, 0, SAL_MAX_INT32 ), getLimitedValue< sal_Int32, sal_Int64 >( aShapeRectEmu.Width, 0, SAL_MAX_INT32 ), diff --git a/oox/source/drawingml/chart/chartspaceconverter.cxx b/oox/source/drawingml/chart/chartspaceconverter.cxx index 10e9e6ae6610..dd7bded7d01d 100644 --- a/oox/source/drawingml/chart/chartspaceconverter.cxx +++ b/oox/source/drawingml/chart/chartspaceconverter.cxx @@ -32,7 +32,7 @@ #include "oox/drawingml/chart/plotareaconverter.hxx" #include "oox/drawingml/chart/titleconverter.hxx" -using ::com::sun::star::awt::Point; +using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Exception; using ::com::sun::star::uno::UNO_QUERY; @@ -70,7 +70,7 @@ ChartSpaceConverter::~ChartSpaceConverter() { } -void ChartSpaceConverter::convertFromModel( const Reference< XShapes >& rxExternalPage, const Point& rChartPos ) +void ChartSpaceConverter::convertFromModel( const Reference< XShapes >& rxExternalPage, const awt::Point& rChartPos ) { if( !getChartConverter() ) return; @@ -177,7 +177,7 @@ void ChartSpaceConverter::convertFromModel( const Reference< XShapes >& rxExtern /* Get the internal draw page of the chart document, if no external drawing page has been passed. */ Reference< XShapes > xShapes; - Point aShapesOffset( 0, 0 ); + awt::Point aShapesOffset( 0, 0 ); if( rxExternalPage.is() ) { xShapes = rxExternalPage; diff --git a/oox/source/drawingml/chart/converterbase.cxx b/oox/source/drawingml/chart/converterbase.cxx index bc109530915c..e8714b9c19e3 100644 --- a/oox/source/drawingml/chart/converterbase.cxx +++ b/oox/source/drawingml/chart/converterbase.cxx @@ -42,7 +42,7 @@ namespace chart { namespace cssc = ::com::sun::star::chart; -using namespace ::com::sun::star::awt; +using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::frame; @@ -152,14 +152,14 @@ struct ConverterData XmlFilterBase& mrFilter; ChartConverter& mrConverter; Reference< XChartDocument > mxDoc; - Size maSize; + awt::Size maSize; explicit ConverterData( XmlFilterBase& rFilter, ChartConverter& rChartConverter, const ChartSpaceModel& rChartModel, const Reference< XChartDocument >& rxChartDoc, - const Size& rChartSize ); + const awt::Size& rChartSize ); ~ConverterData(); }; @@ -170,7 +170,7 @@ ConverterData::ConverterData( ChartConverter& rChartConverter, const ChartSpaceModel& rChartModel, const Reference< XChartDocument >& rxChartDoc, - const Size& rChartSize ) : + const awt::Size& rChartSize ) : maFormatter( rFilter, rxChartDoc, rChartModel ), mrFilter( rFilter ), mrConverter( rChartConverter ), @@ -217,7 +217,7 @@ ConverterRoot::ConverterRoot( ChartConverter& rChartConverter, const ChartSpaceModel& rChartModel, const Reference< XChartDocument >& rxChartDoc, - const Size& rChartSize ) : + const awt::Size& rChartSize ) : mxData( new ConverterData( rFilter, rChartConverter, rChartModel, rxChartDoc, rChartSize ) ) { } @@ -255,7 +255,7 @@ Reference< XChartDocument > ConverterRoot::getChartDocument() const return mxData->mxDoc; } -const Size& ConverterRoot::getChartSize() const +const awt::Size& ConverterRoot::getChartSize() const { return mxData->maSize; } @@ -354,11 +354,11 @@ LayoutConverter::~LayoutConverter() { } -bool LayoutConverter::calcAbsRectangle( Rectangle& orRect ) const +bool LayoutConverter::calcAbsRectangle( awt::Rectangle& orRect ) const { if( !mrModel.mbAutoLayout ) { - const Size& rChartSize = getChartSize(); + const awt::Size& rChartSize = getChartSize(); orRect.X = lclCalcPosition( rChartSize.Width, mrModel.mfX, mrModel.mnXMode ); orRect.Y = lclCalcPosition( rChartSize.Height, mrModel.mfY, mrModel.mnYMode ); if( (orRect.X >= 0) && (orRect.Y >= 0) ) @@ -399,14 +399,14 @@ bool LayoutConverter::convertFromModel( const Reference< XShape >& rxShape, doub { if( !mrModel.mbAutoLayout ) { - const Size& rChartSize = getChartSize(); - Point aShapePos( + const awt::Size& rChartSize = getChartSize(); + awt::Point aShapePos( lclCalcPosition( rChartSize.Width, mrModel.mfX, mrModel.mnXMode ), lclCalcPosition( rChartSize.Height, mrModel.mfY, mrModel.mnYMode ) ); if( (aShapePos.X >= 0) && (aShapePos.Y >= 0) ) { // the call to XShape.getSize() may recalc the chart view - Size aShapeSize = rxShape->getSize(); + awt::Size aShapeSize = rxShape->getSize(); // rotated shapes need special handling... double fSin = fabs( sin( fRotationAngle * F_PI180 ) ); // add part of height to X direction, if title is rotated down diff --git a/oox/source/drawingml/chart/plotareaconverter.cxx b/oox/source/drawingml/chart/plotareaconverter.cxx index c17d619ff0a3..5346291a5c22 100644 --- a/oox/source/drawingml/chart/plotareaconverter.cxx +++ b/oox/source/drawingml/chart/plotareaconverter.cxx @@ -37,7 +37,7 @@ namespace chart { // ============================================================================ -using namespace ::com::sun::star::awt; +using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using namespace ::com::sun::star::uno; @@ -410,7 +410,7 @@ void PlotAreaConverter::convertPositionFromModel() { LayoutModel& rLayout = mrModel.mxLayout.getOrCreate(); LayoutConverter aLayoutConv( *this, rLayout ); - Rectangle aDiagramRect; + awt::Rectangle aDiagramRect; if( aLayoutConv.calcAbsRectangle( aDiagramRect ) ) try { namespace cssc = ::com::sun::star::chart; diff --git a/oox/source/drawingml/drawingmltypes.cxx b/oox/source/drawingml/drawingmltypes.cxx index 931bd26681d3..9dd42eb01595 100644 --- a/oox/source/drawingml/drawingmltypes.cxx +++ b/oox/source/drawingml/drawingmltypes.cxx @@ -27,7 +27,7 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::xml::sax::XFastAttributeList; -using namespace ::com::sun::star::awt; +using namespace ::com::sun::star; using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::geometry; using namespace ::com::sun::star::style; @@ -71,9 +71,9 @@ double GetPositiveFixedPercentage( const OUString& sValue ) // -------------------------------------------------------------------- /** converts the attributes from an CT_TLPoint into an awt Point with 1/1000% */ -Point GetPointPercent( const Reference< XFastAttributeList >& xAttribs ) +awt::Point GetPointPercent( const Reference< XFastAttributeList >& xAttribs ) { - return Point( GetPercent( xAttribs->getOptionalValue( XML_x ) ), GetCoordinate( xAttribs->getOptionalValue( XML_y ) ) ); + return awt::Point( GetPercent( xAttribs->getOptionalValue( XML_x ) ), GetCoordinate( xAttribs->getOptionalValue( XML_y ) ) ); } // -------------------------------------------------------------------- @@ -114,26 +114,26 @@ sal_Int16 GetFontUnderline( sal_Int32 nToken ) OSL_ASSERT((nToken & sal_Int32(0xFFFF0000))==0); switch( nToken ) { - case XML_none: return FontUnderline::NONE; - case XML_dash: return FontUnderline::DASH; - case XML_dashHeavy: return FontUnderline::BOLDDASH; - case XML_dashLong: return FontUnderline::LONGDASH; - case XML_dashLongHeavy: return FontUnderline::BOLDLONGDASH; - case XML_dbl: return FontUnderline::DOUBLE; - case XML_dotDash: return FontUnderline::DASHDOT; - case XML_dotDashHeavy: return FontUnderline::BOLDDASHDOT; - case XML_dotDotDash: return FontUnderline::DASHDOTDOT; - case XML_dotDotDashHeavy: return FontUnderline::BOLDDASHDOTDOT; - case XML_dotted: return FontUnderline::DOTTED; - case XML_dottedHeavy: return FontUnderline::BOLDDOTTED; - case XML_heavy: return FontUnderline::BOLD; - case XML_sng: return FontUnderline::SINGLE; - case XML_wavy: return FontUnderline::WAVE; - case XML_wavyDbl: return FontUnderline::DOUBLEWAVE; - case XML_wavyHeavy: return FontUnderline::BOLDWAVE; + case XML_none: return awt::FontUnderline::NONE; + case XML_dash: return awt::FontUnderline::DASH; + case XML_dashHeavy: return awt::FontUnderline::BOLDDASH; + case XML_dashLong: return awt::FontUnderline::LONGDASH; + case XML_dashLongHeavy: return awt::FontUnderline::BOLDLONGDASH; + case XML_dbl: return awt::FontUnderline::DOUBLE; + case XML_dotDash: return awt::FontUnderline::DASHDOT; + case XML_dotDashHeavy: return awt::FontUnderline::BOLDDASHDOT; + case XML_dotDotDash: return awt::FontUnderline::DASHDOTDOT; + case XML_dotDotDashHeavy: return awt::FontUnderline::BOLDDASHDOTDOT; + case XML_dotted: return awt::FontUnderline::DOTTED; + case XML_dottedHeavy: return awt::FontUnderline::BOLDDOTTED; + case XML_heavy: return awt::FontUnderline::BOLD; + case XML_sng: return awt::FontUnderline::SINGLE; + case XML_wavy: return awt::FontUnderline::WAVE; + case XML_wavyDbl: return awt::FontUnderline::DOUBLEWAVE; + case XML_wavyHeavy: return awt::FontUnderline::BOLDWAVE; // case XML_words: // TODO } - return FontUnderline::DONTKNOW; + return awt::FontUnderline::DONTKNOW; } sal_Int16 GetFontStrikeout( sal_Int32 nToken ) @@ -141,11 +141,11 @@ sal_Int16 GetFontStrikeout( sal_Int32 nToken ) OSL_ASSERT((nToken & sal_Int32(0xFFFF0000))==0); switch( nToken ) { - case XML_dblStrike: return FontStrikeout::DOUBLE; - case XML_noStrike: return FontStrikeout::NONE; - case XML_sngStrike: return FontStrikeout::SINGLE; + case XML_dblStrike: return awt::FontStrikeout::DOUBLE; + case XML_noStrike: return awt::FontStrikeout::NONE; + case XML_sngStrike: return awt::FontStrikeout::SINGLE; } - return FontStrikeout::DONTKNOW; + return awt::FontStrikeout::DONTKNOW; } sal_Int16 GetCaseMap( sal_Int32 nToken ) @@ -231,9 +231,9 @@ IntegerRectangle2D GetRelativeRect( const Reference< XFastAttributeList >& xAttr // ============================================================================ /** converts the attributes from an CT_Size2D into an awt Size with 1/100thmm */ -Size GetSize2D( const Reference< XFastAttributeList >& xAttribs ) +awt::Size GetSize2D( const Reference< XFastAttributeList >& xAttribs ) { - return Size( GetCoordinate( xAttribs->getOptionalValue( XML_cx ) ), GetCoordinate( xAttribs->getOptionalValue( XML_cy ) ) ); + return awt::Size( GetCoordinate( xAttribs->getOptionalValue( XML_cx ) ), GetCoordinate( xAttribs->getOptionalValue( XML_cy ) ) ); } IndexRange GetIndexRange( const Reference< XFastAttributeList >& xAttributes ) diff --git a/oox/source/drawingml/lineproperties.cxx b/oox/source/drawingml/lineproperties.cxx index 05a0adfc3d6c..1d049eec3219 100644 --- a/oox/source/drawingml/lineproperties.cxx +++ b/oox/source/drawingml/lineproperties.cxx @@ -34,12 +34,12 @@ #include "oox/helper/graphichelper.hxx" #include "oox/token/tokens.hxx" +using namespace ::com::sun::star; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::drawing; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; -using ::com::sun::star::awt::Point; using ::com::sun::star::container::XNameContainer; namespace oox { @@ -238,9 +238,9 @@ void lclPushMarkerProperties( ShapePropertyMap& rPropMap, if( !rPropMap.hasNamedLineMarkerInTable( aMarkerName ) ) { // pass X and Y as percentage to OOX_ARROW_POINT -#define OOX_ARROW_POINT( x, y ) Point( static_cast< sal_Int32 >( fArrowWidth * x ), static_cast< sal_Int32 >( fArrowLength * y ) ) +#define OOX_ARROW_POINT( x, y ) awt::Point( static_cast< sal_Int32 >( fArrowWidth * x ), static_cast< sal_Int32 >( fArrowLength * y ) ) - ::std::vector< Point > aPoints; + ::std::vector< awt::Point > aPoints; OSL_ASSERT((rArrowProps.moArrowType.get() & sal_Int32(0xFFFF0000))==0); switch( rArrowProps.moArrowType.get() ) { @@ -367,13 +367,13 @@ void LineProperties::pushToPropMap( ShapePropertyMap& rPropMap, if( maLineFill.moFillType.has() ) { // line style (our core only supports none and solid) - LineStyle eLineStyle = (maLineFill.moFillType.get() == XML_noFill) ? LineStyle_NONE : LineStyle_SOLID; + drawing::LineStyle eLineStyle = (maLineFill.moFillType.get() == XML_noFill) ? drawing::LineStyle_NONE : drawing::LineStyle_SOLID; // convert line width from EMUs to 1/100mm sal_Int32 nLineWidth = convertEmuToHmm( moLineWidth.get( 0 ) ); // create line dash from preset dash token (not for invisible line) - if( (eLineStyle != LineStyle_NONE) && (moPresetDash.differsFrom( XML_solid ) || (!moPresetDash && !maCustomDash.empty())) ) + if( (eLineStyle != drawing::LineStyle_NONE) && (moPresetDash.differsFrom( XML_solid ) || (!moPresetDash && !maCustomDash.empty())) ) { LineDash aLineDash; aLineDash.Style = lclGetDashStyle( moLineCap.get( XML_rnd ) ); @@ -391,7 +391,7 @@ void LineProperties::pushToPropMap( ShapePropertyMap& rPropMap, aLineDash.Distance *= nBaseLineWidth; if( rPropMap.setProperty( SHAPEPROP_LineDash, aLineDash ) ) - eLineStyle = LineStyle_DASH; + eLineStyle = drawing::LineStyle_DASH; } // set final line style property diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 3318ab8fccb7..e6a02060d9b9 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -55,7 +55,6 @@ using namespace ::oox::core; using namespace ::com::sun::star; -using namespace ::com::sun::star::awt; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::frame; @@ -613,9 +612,9 @@ TextBodyPtr Shape::getTextBody() return mpTextBody; } -void Shape::moveAllToPosition( const Point &rPoint ) +void Shape::moveAllToPosition( const awt::Point &rPoint ) { - setPosition( Point( rPoint.X + maPosition.X, rPoint.Y + maPosition.Y ) ); + setPosition( awt::Point( rPoint.X + maPosition.X, rPoint.Y + maPosition.Y ) ); for( ::std::vector<ShapePtr>::const_iterator aIt = maChildren.begin(), aEnd = maChildren.end();aIt != aEnd; ++aIt ) (*aIt)->moveAllToPosition( rPoint ); } @@ -627,14 +626,14 @@ void Shape::setMasterTextListStyle( const TextListStylePtr& pMasterTextListStyle mpMasterTextListStyle = pMasterTextListStyle; } -OUString Shape::finalizeServiceName( XmlFilterBase& rFilter, const OUString& rServiceName, const Rectangle& rShapeRect ) +OUString Shape::finalizeServiceName( XmlFilterBase& rFilter, const OUString& rServiceName, const awt::Rectangle& rShapeRect ) { OUString aServiceName = rServiceName; switch( meFrameType ) { case FRAMETYPE_OLEOBJECT: { - Size aOleSize( rShapeRect.Width, rShapeRect.Height ); + awt::Size aOleSize( rShapeRect.Width, rShapeRect.Height ); if( rFilter.getOleObjectHelper().importOleObject( maShapeProperties, *mxOleObjectInfo, aOleSize ) ) aServiceName = CREATE_OUSTRING( "com.sun.star.drawing.OLE2Shape" ); diff --git a/oox/source/drawingml/shapepropertymap.cxx b/oox/source/drawingml/shapepropertymap.cxx index cea46c352f8e..1268f8ccb38f 100644 --- a/oox/source/drawingml/shapepropertymap.cxx +++ b/oox/source/drawingml/shapepropertymap.cxx @@ -30,7 +30,7 @@ namespace drawingml { // ============================================================================ -using namespace ::com::sun::star::awt; +using namespace ::com::sun::star; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::uno; @@ -156,9 +156,9 @@ bool ShapePropertyMap::setFillGradient( sal_Int32 nPropId, const Any& rValue ) return setAnyProperty( nPropId, rValue ); // create named gradient and push its name - if( rValue.has< Gradient >() ) + if( rValue.has< awt::Gradient >() ) { - OUString aGradientName = mrModelObjHelper.insertFillGradient( rValue.get< Gradient >() ); + OUString aGradientName = mrModelObjHelper.insertFillGradient( rValue.get< awt::Gradient >() ); return !aGradientName.isEmpty() && setProperty( nPropId, aGradientName ); } @@ -168,9 +168,9 @@ bool ShapePropertyMap::setFillGradient( sal_Int32 nPropId, const Any& rValue ) bool ShapePropertyMap::setGradientTrans( sal_Int32 nPropId, const Any& rValue ) { // create named gradient and push its name - if( rValue.has< Gradient >() ) + if( rValue.has< awt::Gradient >() ) { - OUString aGradientName = mrModelObjHelper.insertTransGrandient( rValue.get< Gradient >() ); + OUString aGradientName = mrModelObjHelper.insertTransGrandient( rValue.get< awt::Gradient >() ); return !aGradientName.isEmpty() && setProperty( nPropId, aGradientName ); } diff --git a/oox/source/drawingml/table/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx index d81f35012f5e..7efc01ce0e37 100644 --- a/oox/source/drawingml/table/tablecell.cxx +++ b/oox/source/drawingml/table/tablecell.cxx @@ -38,7 +38,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using ::com::sun::star::table::BorderLine2; -using ::com::sun::star::drawing::LineStyle; namespace oox { namespace drawingml { namespace table { diff --git a/oox/source/drawingml/transform2dcontext.cxx b/oox/source/drawingml/transform2dcontext.cxx index d35c5d3c921a..a28160bf8307 100644 --- a/oox/source/drawingml/transform2dcontext.cxx +++ b/oox/source/drawingml/transform2dcontext.cxx @@ -22,8 +22,7 @@ #include "oox/drawingml/shape.hxx" #include "oox/drawingml/textbody.hxx" -using ::com::sun::star::awt::Point; -using ::com::sun::star::awt::Size; +using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::RuntimeException; using ::com::sun::star::xml::sax::SAXException; @@ -79,16 +78,16 @@ Reference< XFastContextHandler > Transform2DContext::createFastChildContext( sal switch( aElementToken ) { case A_TOKEN( off ): // horz/vert translation - mrShape.setPosition( Point( xAttribs->getOptionalValue( XML_x ).toInt32(), xAttribs->getOptionalValue( XML_y ).toInt32() ) ); + mrShape.setPosition( awt::Point( xAttribs->getOptionalValue( XML_x ).toInt32(), xAttribs->getOptionalValue( XML_y ).toInt32() ) ); break; case A_TOKEN( ext ): // horz/vert size - mrShape.setSize( Size( xAttribs->getOptionalValue( XML_cx ).toInt32(), xAttribs->getOptionalValue( XML_cy ).toInt32() ) ); + mrShape.setSize( awt::Size( xAttribs->getOptionalValue( XML_cx ).toInt32(), xAttribs->getOptionalValue( XML_cy ).toInt32() ) ); break; case A_TOKEN( chOff ): // horz/vert translation of children - mrShape.setChildPosition( Point( xAttribs->getOptionalValue( XML_x ).toInt32(), xAttribs->getOptionalValue( XML_y ).toInt32() ) ); + mrShape.setChildPosition( awt::Point( xAttribs->getOptionalValue( XML_x ).toInt32(), xAttribs->getOptionalValue( XML_y ).toInt32() ) ); break; case A_TOKEN( chExt ): // horz/vert size of children - mrShape.setChildSize( Size( xAttribs->getOptionalValue( XML_cx ).toInt32(), xAttribs->getOptionalValue( XML_cy ).toInt32() ) ); + mrShape.setChildSize( awt::Size( xAttribs->getOptionalValue( XML_cx ).toInt32(), xAttribs->getOptionalValue( XML_cy ).toInt32() ) ); break; } diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx index 02bfa4cbfd0d..1825b33fcbb3 100644 --- a/oox/source/dump/dumperbase.cxx +++ b/oox/source/dump/dumperbase.cxx @@ -39,12 +39,12 @@ namespace dump { // ============================================================================ +using namespace ::com::sun::star; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::io; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::ucb; using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::util; using ::comphelper::MediaDescriptor; using ::oox::core::FilterBase; @@ -1736,7 +1736,7 @@ void Output::writeBool( bool bData ) StringHelper::appendBool( maLine, bData ); } -void Output::writeDateTime( const DateTime& rDateTime ) +void Output::writeDateTime( const util::DateTime& rDateTime ) { writeDec( rDateTime.Year, 4, '0' ); writeChar( '-' ); @@ -2065,7 +2065,7 @@ void OutputObjectBase::writeArrayItem( const String& rName, const sal_uInt8* pnD mxOut->writeArray( pnData, nSize, cSep ); } -void OutputObjectBase::writeDateTimeItem( const String& rName, const DateTime& rDateTime ) +void OutputObjectBase::writeDateTimeItem( const String& rName, const util::DateTime& rDateTime ) { ItemGuard aItem( mxOut, rName ); mxOut->writeDateTime( rDateTime ); @@ -2264,9 +2264,9 @@ OUString InputObjectBase::dumpUnicodeArray( const String& rName, sal_Int32 nLen, return aString; } -DateTime InputObjectBase::dumpFileTime( const String& rName ) +util::DateTime InputObjectBase::dumpFileTime( const String& rName ) { - DateTime aDateTime; + util::DateTime aDateTime; ItemGuard aItem( mxOut, rName( "file-time" ) ); sal_Int64 nFileTime = dumpDec< sal_Int64 >( EMPTY_STRING ); diff --git a/oox/source/helper/attributelist.cxx b/oox/source/helper/attributelist.cxx index 183794263ef0..8afe869125c8 100644 --- a/oox/source/helper/attributelist.cxx +++ b/oox/source/helper/attributelist.cxx @@ -27,8 +27,8 @@ namespace oox { // ============================================================================ +using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::util; using namespace ::com::sun::star::xml::sax; using ::rtl::OUString; @@ -201,10 +201,10 @@ OptValue< bool > AttributeList::getBool( sal_Int32 nAttrToken ) const return OptValue< bool >( onValue.has(), onValue.get() != 0 ); } -OptValue< DateTime > AttributeList::getDateTime( sal_Int32 nAttrToken ) const +OptValue< util::DateTime > AttributeList::getDateTime( sal_Int32 nAttrToken ) const { OUString aValue = mxAttribs->getOptionalValue( nAttrToken ); - DateTime aDateTime; + util::DateTime aDateTime; bool bValid = (aValue.getLength() == 19) && (aValue[ 4 ] == '-') && (aValue[ 7 ] == '-') && (aValue[ 10 ] == 'T') && (aValue[ 13 ] == ':') && (aValue[ 16 ] == ':'); if( bValid ) @@ -216,7 +216,7 @@ OptValue< DateTime > AttributeList::getDateTime( sal_Int32 nAttrToken ) const aDateTime.Minutes = static_cast< sal_uInt16 >( aValue.copy( 14, 2 ).toInt32() ); aDateTime.Seconds = static_cast< sal_uInt16 >( aValue.copy( 17, 2 ).toInt32() ); } - return OptValue< DateTime >( bValid, aDateTime ); + return OptValue< util::DateTime >( bValid, aDateTime ); } // defaulted return values ---------------------------------------------------- @@ -277,7 +277,7 @@ bool AttributeList::getBool( sal_Int32 nAttrToken, bool bDefault ) const return getBool( nAttrToken ).get( bDefault ); } -DateTime AttributeList::getDateTime( sal_Int32 nAttrToken, const DateTime& rDefault ) const +util::DateTime AttributeList::getDateTime( sal_Int32 nAttrToken, const util::DateTime& rDefault ) const { return getDateTime( nAttrToken ).get( rDefault ); } diff --git a/oox/source/helper/graphichelper.cxx b/oox/source/helper/graphichelper.cxx index 1c5eaa6000e8..6ddf640caa37 100644 --- a/oox/source/helper/graphichelper.cxx +++ b/oox/source/helper/graphichelper.cxx @@ -302,7 +302,7 @@ OUString GraphicHelper::createGraphicObject( const Reference< XGraphic >& rxGrap OUString aGraphicObjUrl; if( mxContext.is() && rxGraphic.is() ) try { - Reference< XGraphicObject > xGraphicObj( GraphicObject::create( mxContext ), UNO_SET_THROW ); + Reference< XGraphicObject > xGraphicObj( graphic::GraphicObject::create( mxContext ), UNO_SET_THROW ); xGraphicObj->setGraphic( rxGraphic ); maGraphicObjects.push_back( xGraphicObj ); aGraphicObjUrl = maGraphicObjScheme + xGraphicObj->getUniqueID(); diff --git a/oox/source/helper/modelobjecthelper.cxx b/oox/source/helper/modelobjecthelper.cxx index 5811b62fc161..0982f3c21180 100644 --- a/oox/source/helper/modelobjecthelper.cxx +++ b/oox/source/helper/modelobjecthelper.cxx @@ -31,7 +31,7 @@ namespace oox { // ============================================================================ -using namespace ::com::sun::star::awt; +using namespace ::com::sun::star; using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; @@ -117,12 +117,12 @@ OUString ModelObjectHelper::insertLineDash( const LineDash& rDash ) return maDashContainer.insertObject( maDashNameBase, Any( rDash ), true ); } -OUString ModelObjectHelper::insertFillGradient( const Gradient& rGradient ) +OUString ModelObjectHelper::insertFillGradient( const awt::Gradient& rGradient ) { return maGradientContainer.insertObject( maGradientNameBase, Any( rGradient ), true ); } -OUString ModelObjectHelper::insertTransGrandient( const Gradient& rGradient ) +OUString ModelObjectHelper::insertTransGrandient( const awt::Gradient& rGradient ) { return maTransGradContainer.insertObject( maTransGradNameBase, Any( rGradient ), true ); } diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx index e056fdef3a2a..b39b77a3c1f9 100644 --- a/oox/source/ole/axcontrol.cxx +++ b/oox/source/ole/axcontrol.cxx @@ -58,6 +58,7 @@ namespace oox { namespace ole { +using namespace ::com::sun::star; using namespace ::com::sun::star::awt; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; @@ -251,7 +252,7 @@ ControlConverter::~ControlConverter() void ControlConverter::convertPosition( PropertyMap& rPropMap, const AxPairData& rPos ) const { // position is given in 1/100 mm, UNO needs AppFont units - Point aAppFontPos = mrGraphicHelper.convertHmmToAppFont( Point( rPos.first, rPos.second ) ); + awt::Point aAppFontPos = mrGraphicHelper.convertHmmToAppFont( awt::Point( rPos.first, rPos.second ) ); rPropMap.setProperty( PROP_PositionX, aAppFontPos.X ); rPropMap.setProperty( PROP_PositionY, aAppFontPos.Y ); } @@ -259,7 +260,7 @@ void ControlConverter::convertPosition( PropertyMap& rPropMap, const AxPairData& void ControlConverter::convertSize( PropertyMap& rPropMap, const AxPairData& rSize ) const { // size is given in 1/100 mm, UNO needs AppFont units - Size aAppFontSize = mrGraphicHelper.convertHmmToAppFont( Size( rSize.first, rSize.second ) ); + awt::Size aAppFontSize = mrGraphicHelper.convertHmmToAppFont( awt::Size( rSize.first, rSize.second ) ); rPropMap.setProperty( PROP_Width, aAppFontSize.Width ); rPropMap.setProperty( PROP_Height, aAppFontSize.Height ); } @@ -316,8 +317,8 @@ void ControlConverter::convertScrollabilitySettings( PropertyMap& rPropMap, const AxPairData& rScrollPos, const AxPairData& rScrollArea, sal_Int32 nScrollBars ) const { - Size tmpSize = mrGraphicHelper.convertHmmToAppFont( Size( rScrollArea.first, rScrollArea.second ) ); - Point tmpPos = mrGraphicHelper.convertHmmToAppFont( Point( rScrollPos.first, rScrollPos.second ) ); + awt::Size tmpSize = mrGraphicHelper.convertHmmToAppFont( awt::Size( rScrollArea.first, rScrollArea.second ) ); + awt::Point tmpPos = mrGraphicHelper.convertHmmToAppFont( awt::Point( rScrollPos.first, rScrollPos.second ) ); rPropMap.setProperty( PROP_ScrollHeight, tmpSize.Height ); rPropMap.setProperty( PROP_ScrollWidth, tmpSize.Width ); rPropMap.setProperty( PROP_ScrollTop, tmpPos.Y ); @@ -909,10 +910,10 @@ void AxFontDataModel::convertProperties( PropertyMap& rPropMap, const ControlCon rPropMap.setProperty( PROP_FontName, maFontData.maFontName ); // font effects - rPropMap.setProperty( PROP_FontWeight, getFlagValue( maFontData.mnFontEffects, AX_FONTDATA_BOLD, FontWeight::BOLD, FontWeight::NORMAL ) ); + rPropMap.setProperty( PROP_FontWeight, getFlagValue( maFontData.mnFontEffects, AX_FONTDATA_BOLD, awt::FontWeight::BOLD, awt::FontWeight::NORMAL ) ); rPropMap.setProperty( PROP_FontSlant, getFlagValue< sal_Int16 >( maFontData.mnFontEffects, AX_FONTDATA_ITALIC, FontSlant_ITALIC, FontSlant_NONE ) ); - rPropMap.setProperty( PROP_FontUnderline, getFlagValue( maFontData.mnFontEffects, AX_FONTDATA_UNDERLINE, maFontData.mbDblUnderline ? FontUnderline::DOUBLE : FontUnderline::SINGLE, FontUnderline::NONE ) ); - rPropMap.setProperty( PROP_FontStrikeout, getFlagValue( maFontData.mnFontEffects, AX_FONTDATA_STRIKEOUT, FontStrikeout::SINGLE, FontStrikeout::NONE ) ); + rPropMap.setProperty( PROP_FontUnderline, getFlagValue( maFontData.mnFontEffects, AX_FONTDATA_UNDERLINE, maFontData.mbDblUnderline ? awt::FontUnderline::DOUBLE : awt::FontUnderline::SINGLE, awt::FontUnderline::NONE ) ); + rPropMap.setProperty( PROP_FontStrikeout, getFlagValue( maFontData.mnFontEffects, AX_FONTDATA_STRIKEOUT, awt::FontStrikeout::SINGLE, awt::FontStrikeout::NONE ) ); rPropMap.setProperty( PROP_FontHeight, maFontData.getHeightPoints() ); // font character set @@ -925,12 +926,12 @@ void AxFontDataModel::convertProperties( PropertyMap& rPropMap, const ControlCon // text alignment if( mbSupportsAlign ) { - sal_Int32 nAlign = TextAlign::LEFT; + sal_Int32 nAlign = awt::TextAlign::LEFT; switch( maFontData.mnHorAlign ) { - case AX_FONTDATA_LEFT: nAlign = TextAlign::LEFT; break; - case AX_FONTDATA_RIGHT: nAlign = TextAlign::RIGHT; break; - case AX_FONTDATA_CENTER: nAlign = TextAlign::CENTER; break; + case AX_FONTDATA_LEFT: nAlign = awt::TextAlign::LEFT; break; + case AX_FONTDATA_RIGHT: nAlign = awt::TextAlign::RIGHT; break; + case AX_FONTDATA_CENTER: nAlign = awt::TextAlign::CENTER; break; default: OSL_FAIL( "AxFontDataModel::convertProperties - unknown text alignment" ); } // form controls expect short value @@ -946,17 +947,17 @@ void AxFontDataModel::convertFromProperties( PropertySet& rPropSet, const Contro rPropSet.getProperty( maFontData.maFontName, PROP_FontName ); float fontWeight = (float)0; if ( rPropSet.getProperty(fontWeight, PROP_FontWeight ) ) - setFlag( maFontData.mnFontEffects, AX_FONTDATA_BOLD, ( fontWeight == FontWeight::BOLD ) ); + setFlag( maFontData.mnFontEffects, AX_FONTDATA_BOLD, ( fontWeight == awt::FontWeight::BOLD ) ); sal_Int16 nSlant = FontSlant_NONE; if ( rPropSet.getProperty( nSlant, PROP_FontSlant ) ) setFlag( maFontData.mnFontEffects, AX_FONTDATA_ITALIC, ( nSlant == FontSlant_ITALIC ) ); - sal_Int16 nUnderLine = FontUnderline::NONE; + sal_Int16 nUnderLine = awt::FontUnderline::NONE; if ( rPropSet.getProperty( nUnderLine, PROP_FontUnderline ) ) - setFlag( maFontData.mnFontEffects, AX_FONTDATA_UNDERLINE, nUnderLine != FontUnderline::NONE ); - sal_Int16 nStrikeout = FontStrikeout::NONE ; + setFlag( maFontData.mnFontEffects, AX_FONTDATA_UNDERLINE, nUnderLine != awt::FontUnderline::NONE ); + sal_Int16 nStrikeout = awt::FontStrikeout::NONE ; if ( rPropSet.getProperty( nStrikeout, PROP_FontStrikeout ) ) - setFlag( maFontData.mnFontEffects, AX_FONTDATA_STRIKEOUT, nStrikeout != FontStrikeout::NONE ); + setFlag( maFontData.mnFontEffects, AX_FONTDATA_STRIKEOUT, nStrikeout != awt::FontStrikeout::NONE ); float fontHeight = 0.0; if ( rPropSet.getProperty( fontHeight, PROP_FontHeight ) ) @@ -968,9 +969,9 @@ void AxFontDataModel::convertFromProperties( PropertySet& rPropSet, const Contro { switch ( nAlign ) { - case TextAlign::LEFT: maFontData.mnHorAlign = AX_FONTDATA_LEFT; break; - case TextAlign::RIGHT: maFontData.mnHorAlign = AX_FONTDATA_RIGHT; break; - case TextAlign::CENTER: maFontData.mnHorAlign = AX_FONTDATA_CENTER; break; + case awt::TextAlign::LEFT: maFontData.mnHorAlign = AX_FONTDATA_LEFT; break; + case awt::TextAlign::RIGHT: maFontData.mnHorAlign = AX_FONTDATA_RIGHT; break; + case awt::TextAlign::CENTER: maFontData.mnHorAlign = AX_FONTDATA_CENTER; break; default: OSL_FAIL( "AxFontDataModel::convertFromProperties - unknown text alignment" ); } } diff --git a/oox/source/ole/oleobjecthelper.cxx b/oox/source/ole/oleobjecthelper.cxx index 7409d608b868..cc529f024232 100644 --- a/oox/source/ole/oleobjecthelper.cxx +++ b/oox/source/ole/oleobjecthelper.cxx @@ -34,7 +34,7 @@ namespace ole { // ============================================================================ -using namespace ::com::sun::star::awt; +using namespace ::com::sun::star; using namespace ::com::sun::star::container; using namespace ::com::sun::star::embed; using namespace ::com::sun::star::io; @@ -79,7 +79,7 @@ OleObjectHelper::~OleObjectHelper() } } -bool OleObjectHelper::importOleObject( PropertyMap& rPropMap, const OleObjectInfo& rOleObject, const Size& rObjSize ) +bool OleObjectHelper::importOleObject( PropertyMap& rPropMap, const OleObjectInfo& rOleObject, const awt::Size& rObjSize ) { bool bRet = false; @@ -121,7 +121,7 @@ bool OleObjectHelper::importOleObject( PropertyMap& rPropMap, const OleObjectInf if( bRet ) { rPropMap[ PROP_Aspect ] <<= (rOleObject.mbShowAsIcon ? Aspects::MSOLE_ICON : Aspects::MSOLE_CONTENT); - rPropMap[ PROP_VisualArea ] <<= Rectangle( 0, 0, rObjSize.Width, rObjSize.Height ); + rPropMap[ PROP_VisualArea ] <<= awt::Rectangle( 0, 0, rObjSize.Width, rObjSize.Height ); } return bRet; } diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx index 352ce58fc311..39ef150527a3 100644 --- a/oox/source/ppt/timenodelistcontext.cxx +++ b/oox/source/ppt/timenodelistcontext.cxx @@ -53,12 +53,12 @@ using namespace ::oox::core; using namespace ::oox::drawingml; +using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::animations; using namespace ::com::sun::star::presentation; using namespace ::com::sun::star::xml::sax; -using namespace ::com::sun::star::awt; using ::com::sun::star::beans::NamedValue; using ::rtl::OUString; @@ -674,7 +674,7 @@ namespace oox { namespace ppt { case PPT_TOKEN( to ): { // CT_TLPoint - Point p = GetPointPercent( rAttribs.getFastAttributeList() ); + awt::Point p = GetPointPercent( rAttribs.getFastAttributeList() ); maTo <<= p.X; maTo <<= p.Y; return this; @@ -682,7 +682,7 @@ namespace oox { namespace ppt { case PPT_TOKEN( from ): { // CT_TLPoint - Point p = GetPointPercent( rAttribs.getFastAttributeList() ); + awt::Point p = GetPointPercent( rAttribs.getFastAttributeList() ); maFrom <<= p.X; maFrom <<= p.Y; return this; @@ -690,7 +690,7 @@ namespace oox { namespace ppt { case PPT_TOKEN( by ): { // CT_TLPoint - Point p = GetPointPercent( rAttribs.getFastAttributeList() ); + awt::Point p = GetPointPercent( rAttribs.getFastAttributeList() ); maBy <<= p.X; maBy <<= p.Y; return this; @@ -814,7 +814,7 @@ namespace oox { namespace ppt { case PPT_TOKEN( to ): { // CT_TLPoint - Point p = GetPointPercent( rAttribs.getFastAttributeList() ); + awt::Point p = GetPointPercent( rAttribs.getFastAttributeList() ); Any rAny; rAny <<= p.X; rAny <<= p.Y; @@ -824,7 +824,7 @@ namespace oox { namespace ppt { case PPT_TOKEN( from ): { // CT_TLPoint - Point p = GetPointPercent( rAttribs.getFastAttributeList() ); + awt::Point p = GetPointPercent( rAttribs.getFastAttributeList() ); Any rAny; rAny <<= p.X; rAny <<= p.Y; @@ -834,7 +834,7 @@ namespace oox { namespace ppt { case PPT_TOKEN( by ): { // CT_TLPoint - Point p = GetPointPercent( rAttribs.getFastAttributeList() ); + awt::Point p = GetPointPercent( rAttribs.getFastAttributeList() ); Any rAny; rAny <<= p.X; rAny <<= p.Y; @@ -844,7 +844,7 @@ namespace oox { namespace ppt { case PPT_TOKEN( rCtr ): { // CT_TLPoint - Point p = GetPointPercent( rAttribs.getFastAttributeList() ); + awt::Point p = GetPointPercent( rAttribs.getFastAttributeList() ); // TODO push (void)p; return this; diff --git a/oox/source/vml/vmldrawing.cxx b/oox/source/vml/vmldrawing.cxx index 1406ebea48d5..e986b851289f 100644 --- a/oox/source/vml/vmldrawing.cxx +++ b/oox/source/vml/vmldrawing.cxx @@ -38,6 +38,7 @@ namespace vml { // ============================================================================ +using namespace ::com::sun::star; using namespace ::com::sun::star::awt; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::drawing; @@ -205,7 +206,7 @@ const ControlInfo* Drawing::getControlInfo( const OUString& rShapeId ) const } Reference< XShape > Drawing::createAndInsertXShape( const OUString& rService, - const Reference< XShapes >& rxShapes, const Rectangle& rShapeRect ) const + const Reference< XShapes >& rxShapes, const awt::Rectangle& rShapeRect ) const { OSL_ENSURE( !rService.isEmpty(), "Drawing::createAndInsertXShape - missing UNO shape service name" ); OSL_ENSURE( rxShapes.is(), "Drawing::createAndInsertXShape - missing XShapes container" ); @@ -218,7 +219,7 @@ Reference< XShape > Drawing::createAndInsertXShape( const OUString& rService, { // insert shape into passed shape collection (maybe drawpage or group shape) rxShapes->add( xShape ); - xShape->setPosition( Point( rShapeRect.X, rShapeRect.Y ) ); + xShape->setPosition( awt::Point( rShapeRect.X, rShapeRect.Y ) ); } else { @@ -228,7 +229,7 @@ Reference< XShape > Drawing::createAndInsertXShape( const OUString& rService, xPropSet->setPropertyValue( OUString::createFromAscii( "HoriOrientPosition" ), makeAny( rShapeRect.X ) ); xPropSet->setPropertyValue( OUString::createFromAscii( "VertOrientPosition" ), makeAny( rShapeRect.Y ) ); } - xShape->setSize( Size( rShapeRect.Width, rShapeRect.Height ) ); + xShape->setSize( awt::Size( rShapeRect.Width, rShapeRect.Height ) ); } catch( Exception& e ) { @@ -239,7 +240,7 @@ Reference< XShape > Drawing::createAndInsertXShape( const OUString& rService, } Reference< XShape > Drawing::createAndInsertXControlShape( const ::oox::ole::EmbeddedControl& rControl, - const Reference< XShapes >& rxShapes, const Rectangle& rShapeRect, sal_Int32& rnCtrlIndex ) const + const Reference< XShapes >& rxShapes, const awt::Rectangle& rShapeRect, sal_Int32& rnCtrlIndex ) const { Reference< XShape > xShape; try @@ -270,19 +271,19 @@ OUString Drawing::getShapeBaseName( const ShapeBase& /*rShape*/ ) const return OUString(); } -bool Drawing::convertClientAnchor( Rectangle& /*orShapeRect*/, const OUString& /*rShapeAnchor*/ ) const +bool Drawing::convertClientAnchor( awt::Rectangle& /*orShapeRect*/, const OUString& /*rShapeAnchor*/ ) const { return false; } Reference< XShape > Drawing::createAndInsertClientXShape( const ShapeBase& /*rShape*/, - const Reference< XShapes >& /*rxShapes*/, const Rectangle& /*rShapeRect*/ ) const + const Reference< XShapes >& /*rxShapes*/, const awt::Rectangle& /*rShapeRect*/ ) const { return Reference< XShape >(); } void Drawing::notifyXShapeInserted( const Reference< XShape >& /*rxShape*/, - const Rectangle& /*rShapeRect*/, const ShapeBase& /*rShape*/, bool /*bGroupChild*/ ) + const awt::Rectangle& /*rShapeRect*/, const ShapeBase& /*rShape*/, bool /*bGroupChild*/ ) { } diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx index a70f51fd9844..df6d3b5b02ca 100644 --- a/oox/source/vml/vmlshape.cxx +++ b/oox/source/vml/vmlshape.cxx @@ -63,7 +63,7 @@ namespace vml { // ============================================================================ -using namespace ::com::sun::star::awt; +using namespace ::com::sun::star; using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::graphic; using namespace ::com::sun::star::uno; @@ -82,21 +82,21 @@ const sal_Int32 VML_SHAPETYPE_HOSTCONTROL = 201; // ---------------------------------------------------------------------------- -Point lclGetAbsPoint( const Point& rRelPoint, const Rectangle& rShapeRect, const Rectangle& rCoordSys ) +awt::Point lclGetAbsPoint( const awt::Point& rRelPoint, const awt::Rectangle& rShapeRect, const awt::Rectangle& rCoordSys ) { double fWidthRatio = static_cast< double >( rShapeRect.Width ) / rCoordSys.Width; double fHeightRatio = static_cast< double >( rShapeRect.Height ) / rCoordSys.Height; - Point aAbsPoint; + awt::Point aAbsPoint; aAbsPoint.X = static_cast< sal_Int32 >( rShapeRect.X + fWidthRatio * (rRelPoint.X - rCoordSys.X) + 0.5 ); aAbsPoint.Y = static_cast< sal_Int32 >( rShapeRect.Y + fHeightRatio * (rRelPoint.Y - rCoordSys.Y) + 0.5 ); return aAbsPoint; } -Rectangle lclGetAbsRect( const Rectangle& rRelRect, const Rectangle& rShapeRect, const Rectangle& rCoordSys ) +awt::Rectangle lclGetAbsRect( const awt::Rectangle& rRelRect, const awt::Rectangle& rShapeRect, const awt::Rectangle& rCoordSys ) { double fWidthRatio = static_cast< double >( rShapeRect.Width ) / rCoordSys.Width; double fHeightRatio = static_cast< double >( rShapeRect.Height ) / rCoordSys.Height; - Rectangle aAbsRect; + awt::Rectangle aAbsRect; aAbsRect.X = static_cast< sal_Int32 >( rShapeRect.X + fWidthRatio * (rRelRect.X - rCoordSys.X) + 0.5 ); aAbsRect.Y = static_cast< sal_Int32 >( rShapeRect.Y + fHeightRatio * (rRelRect.Y - rCoordSys.Y) + 0.5 ); aAbsRect.Width = static_cast< sal_Int32 >( fWidthRatio * rRelRect.Width + 0.5 ); @@ -148,21 +148,21 @@ OUString ShapeType::getGraphicPath() const return maTypeModel.moGraphicPath.get( OUString() ); } -Rectangle ShapeType::getCoordSystem() const +awt::Rectangle ShapeType::getCoordSystem() const { Int32Pair aCoordPos = maTypeModel.moCoordPos.get( Int32Pair( 0, 0 ) ); Int32Pair aCoordSize = maTypeModel.moCoordSize.get( Int32Pair( 1000, 1000 ) ); - return Rectangle( aCoordPos.first, aCoordPos.second, aCoordSize.first, aCoordSize.second ); + return awt::Rectangle( aCoordPos.first, aCoordPos.second, aCoordSize.first, aCoordSize.second ); } -Rectangle ShapeType::getRectangle( const ShapeParentAnchor* pParentAnchor ) const +awt::Rectangle ShapeType::getRectangle( const ShapeParentAnchor* pParentAnchor ) const { return pParentAnchor ? lclGetAbsRect( getRelRectangle(), pParentAnchor->maShapeRect, pParentAnchor->maCoordSys ) : getAbsRectangle(); } -Rectangle ShapeType::getAbsRectangle() const +awt::Rectangle ShapeType::getAbsRectangle() const { const GraphicHelper& rGraphicHelper = mrDrawing.getFilter().getGraphicHelper(); @@ -179,15 +179,15 @@ Rectangle ShapeType::getAbsRectangle() const if (nLeft == 0 && maTypeModel.maPosition == "absolute") nLeft = 1; - return Rectangle( + return awt::Rectangle( nLeft, ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maTypeModel.maTop, 0, false, true ) + ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maTypeModel.maMarginTop, 0, false, true ), nWidth, nHeight ); } -Rectangle ShapeType::getRelRectangle() const +awt::Rectangle ShapeType::getRelRectangle() const { - return Rectangle( + return awt::Rectangle( maTypeModel.maLeft.toInt32(), maTypeModel.maTop.toInt32(), maTypeModel.maWidth.toInt32(), @@ -293,7 +293,7 @@ Reference< XShape > ShapeBase::convertAndInsert( const Reference< XShapes >& rxS { /* Calculate shape rectangle. Applications may do something special according to some imported shape client data (e.g. Excel cell anchor). */ - Rectangle aShapeRect = calcShapeRectangle( pParentAnchor ); + awt::Rectangle aShapeRect = calcShapeRectangle( pParentAnchor ); // convert the shape, if the calculated rectangle is not empty if( ((aShapeRect.Width > 0) || (aShapeRect.Height > 0)) && rxShapes.is() ) @@ -328,13 +328,13 @@ void ShapeBase::convertFormatting( const Reference< XShape >& rxShape, const Sha { /* Calculate shape rectangle. Applications may do something special according to some imported shape client data (e.g. Excel cell anchor). */ - Rectangle aShapeRect = calcShapeRectangle( pParentAnchor ); + awt::Rectangle aShapeRect = calcShapeRectangle( pParentAnchor ); // convert the shape, if the calculated rectangle is not empty if( (aShapeRect.Width > 0) || (aShapeRect.Height > 0) ) { - rxShape->setPosition( Point( aShapeRect.X, aShapeRect.Y ) ); - rxShape->setSize( Size( aShapeRect.Width, aShapeRect.Height ) ); + rxShape->setPosition( awt::Point( aShapeRect.X, aShapeRect.Y ) ); + rxShape->setSize( awt::Size( aShapeRect.Width, aShapeRect.Height ) ); convertShapeProperties( rxShape ); } } @@ -342,11 +342,11 @@ void ShapeBase::convertFormatting( const Reference< XShape >& rxShape, const Sha // protected ------------------------------------------------------------------ -Rectangle ShapeBase::calcShapeRectangle( const ShapeParentAnchor* pParentAnchor ) const +awt::Rectangle ShapeBase::calcShapeRectangle( const ShapeParentAnchor* pParentAnchor ) const { /* Calculate shape rectangle. Applications may do something special according to some imported shape client data (e.g. Excel cell anchor). */ - Rectangle aShapeRect; + awt::Rectangle aShapeRect; const ClientData* pClientData = getClientData(); if( !pClientData || !mrDrawing.convertClientAnchor( aShapeRect, pClientData->maAnchor ) ) aShapeRect = getRectangle( pParentAnchor ); @@ -425,9 +425,9 @@ void lcl_SetAnchorType(PropertySet& rPropSet, const ShapeTypeModel& rTypeModel) } } -Reference< XShape > SimpleShape::implConvertAndInsert( const Reference< XShapes >& rxShapes, const Rectangle& rShapeRect ) const +Reference< XShape > SimpleShape::implConvertAndInsert( const Reference< XShapes >& rxShapes, const awt::Rectangle& rShapeRect ) const { - Rectangle aShapeRect(rShapeRect); + awt::Rectangle aShapeRect(rShapeRect); if (!maTypeModel.maFlip.isEmpty()) { if (maTypeModel.maFlip.equalsAscii("x")) @@ -510,7 +510,7 @@ Reference< XShape > SimpleShape::implConvertAndInsert( const Reference< XShapes return xShape; } -Reference< XShape > SimpleShape::createPictureObject( const Reference< XShapes >& rxShapes, const Rectangle& rShapeRect, OUString& rGraphicPath ) const +Reference< XShape > SimpleShape::createPictureObject( const Reference< XShapes >& rxShapes, const awt::Rectangle& rShapeRect, OUString& rGraphicPath ) const { Reference< XShape > xShape = mrDrawing.createAndInsertXShape( "com.sun.star.drawing.GraphicObjectShape", rxShapes, rShapeRect ); if( xShape.is() ) @@ -542,7 +542,7 @@ RectangleShape::RectangleShape( Drawing& rDrawing ) : { } -Reference<XShape> RectangleShape::implConvertAndInsert(const Reference<XShapes>& rxShapes, const Rectangle& rShapeRect) const +Reference<XShape> RectangleShape::implConvertAndInsert(const Reference<XShapes>& rxShapes, const awt::Rectangle& rShapeRect) const { OUString aGraphicPath = getGraphicPath(); @@ -583,14 +583,14 @@ PolyLineShape::PolyLineShape( Drawing& rDrawing ) : { } -Reference< XShape > PolyLineShape::implConvertAndInsert( const Reference< XShapes >& rxShapes, const Rectangle& rShapeRect ) const +Reference< XShape > PolyLineShape::implConvertAndInsert( const Reference< XShapes >& rxShapes, const awt::Rectangle& rShapeRect ) const { Reference< XShape > xShape = SimpleShape::implConvertAndInsert( rxShapes, rShapeRect ); // polygon path - Rectangle aCoordSys = getCoordSystem(); + awt::Rectangle aCoordSys = getCoordSystem(); if( !maShapeModel.maPoints.empty() && (aCoordSys.Width > 0) && (aCoordSys.Height > 0) ) { - ::std::vector< Point > aAbsPoints; + ::std::vector< awt::Point > aAbsPoints; for( ShapeModel::PointVector::const_iterator aIt = maShapeModel.maPoints.begin(), aEnd = maShapeModel.maPoints.end(); aIt != aEnd; ++aIt ) aAbsPoints.push_back( lclGetAbsPoint( *aIt, rShapeRect, aCoordSys ) ); PointSequenceSequence aPointSeq( 1 ); @@ -606,10 +606,10 @@ LineShape::LineShape(Drawing& rDrawing) { } -Reference<XShape> LineShape::implConvertAndInsert(const Reference<XShapes>& rxShapes, const Rectangle& rShapeRect) const +Reference<XShape> LineShape::implConvertAndInsert(const Reference<XShapes>& rxShapes, const awt::Rectangle& rShapeRect) const { const GraphicHelper& rGraphicHelper = mrDrawing.getFilter().getGraphicHelper(); - Rectangle aShapeRect(rShapeRect); + awt::Rectangle aShapeRect(rShapeRect); sal_Int32 nIndex = 0; aShapeRect.X = ConversionHelper::decodeMeasureToHmm(rGraphicHelper, maShapeModel.maFrom.getToken(0, ',', nIndex), 0, true, true); @@ -628,17 +628,17 @@ BezierShape::BezierShape(Drawing& rDrawing) { } -Reference< XShape > BezierShape::implConvertAndInsert( const Reference< XShapes >& rxShapes, const Rectangle& rShapeRect ) const +Reference< XShape > BezierShape::implConvertAndInsert( const Reference< XShapes >& rxShapes, const awt::Rectangle& rShapeRect ) const { Reference< XShape > xShape = SimpleShape::implConvertAndInsert( rxShapes, rShapeRect ); - Rectangle aCoordSys = getCoordSystem(); + awt::Rectangle aCoordSys = getCoordSystem(); if( (aCoordSys.Width > 0) && (aCoordSys.Height > 0) ) { const GraphicHelper& rGraphicHelper = mrDrawing.getFilter().getGraphicHelper(); // Bezier paths may consist of one or more sub-paths - typedef ::std::vector< ::std::vector< Point > > SubPathList; + typedef ::std::vector< ::std::vector< awt::Point > > SubPathList; typedef ::std::vector< ::std::vector< PolygonFlags > > FlagsList; SubPathList aCoordLists; FlagsList aFlagLists; @@ -647,24 +647,24 @@ Reference< XShape > BezierShape::implConvertAndInsert( const Reference< XShapes // Curve defined by to, from, control1 and control2 attributes if ( maShapeModel.maVmlPath.isEmpty() ) { - aCoordLists.push_back( ::std::vector< Point >() ); + aCoordLists.push_back( ::std::vector< awt::Point >() ); aFlagLists.push_back( ::std::vector< PolygonFlags >() ); // Start point aCoordLists[ 0 ].push_back( - Point(ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maShapeModel.maFrom.getToken( 0, ',', nIndex ), 0, true, true ), + awt::Point(ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maShapeModel.maFrom.getToken( 0, ',', nIndex ), 0, true, true ), ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maShapeModel.maFrom.getToken( 0, ',', nIndex ), 0, false, true ) ) ); // Control point 1 aCoordLists[ 0 ].push_back( - Point( ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maShapeModel.maControl1.getToken( 0, ',', nIndex ), 0, true, true ), + awt::Point( ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maShapeModel.maControl1.getToken( 0, ',', nIndex ), 0, true, true ), ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maShapeModel.maControl1.getToken( 0, ',', nIndex ), 0, false, true ) ) ); // Control point 2 aCoordLists[ 0 ].push_back( - Point( ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maShapeModel.maControl2.getToken( 0, ',', nIndex ), 0, true, true ), + awt::Point( ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maShapeModel.maControl2.getToken( 0, ',', nIndex ), 0, true, true ), ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maShapeModel.maControl2.getToken( 0, ',', nIndex ), 0, false, true ) ) ); // End point aCoordLists[ 0 ].push_back( - Point( ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maShapeModel.maTo.getToken( 0, ',', nIndex ), 0, true, true ), + awt::Point( ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maShapeModel.maTo.getToken( 0, ',', nIndex ), 0, true, true ), ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maShapeModel.maTo.getToken( 0, ',', nIndex ), 0, false, true ) ) ); // First and last points are normals, points 2 and 4 are controls @@ -679,7 +679,7 @@ Reference< XShape > BezierShape::implConvertAndInsert( const Reference< XShapes ConversionHelper::decodeVmlPath( aCoordLists, aFlagLists, maShapeModel.maVmlPath ); for ( SubPathList::iterator aListIt = aCoordLists.begin(); aListIt != aCoordLists.end(); ++aListIt ) - for ( ::std::vector< Point >::iterator aPointIt = (*aListIt).begin(); aPointIt != (*aListIt).end(); ++aPointIt) + for ( ::std::vector< awt::Point >::iterator aPointIt = (*aListIt).begin(); aPointIt != (*aListIt).end(); ++aPointIt) { (*aPointIt) = lclGetAbsPoint( (*aPointIt), rShapeRect, aCoordSys ); } @@ -699,8 +699,8 @@ Reference< XShape > BezierShape::implConvertAndInsert( const Reference< XShapes } // Hacky way of ensuring the shape is correctly sized/positioned - xShape->setSize( Size( rShapeRect.Width, rShapeRect.Height ) ); - xShape->setPosition( Point( rShapeRect.X, rShapeRect.Y ) ); + xShape->setSize( awt::Size( rShapeRect.Width, rShapeRect.Height ) ); + xShape->setPosition( awt::Point( rShapeRect.X, rShapeRect.Y ) ); return xShape; } @@ -711,7 +711,7 @@ CustomShape::CustomShape( Drawing& rDrawing ) : { } -Reference< XShape > CustomShape::implConvertAndInsert( const Reference< XShapes >& rxShapes, const Rectangle& rShapeRect ) const +Reference< XShape > CustomShape::implConvertAndInsert( const Reference< XShapes >& rxShapes, const awt::Rectangle& rShapeRect ) const { // try to create a custom shape Reference< XShape > xShape = SimpleShape::implConvertAndInsert( rxShapes, rShapeRect ); @@ -736,7 +736,7 @@ ComplexShape::ComplexShape( Drawing& rDrawing ) : { } -Reference< XShape > ComplexShape::implConvertAndInsert( const Reference< XShapes >& rxShapes, const Rectangle& rShapeRect ) const +Reference< XShape > ComplexShape::implConvertAndInsert( const Reference< XShapes >& rxShapes, const awt::Rectangle& rShapeRect ) const { XmlFilterBase& rFilter = mrDrawing.getFilter(); sal_Int32 nShapeType = getShapeType(); @@ -752,7 +752,7 @@ Reference< XShape > ComplexShape::implConvertAndInsert( const Reference< XShapes return Reference< XShape >(); PropertyMap aOleProps; - Size aOleSize( rShapeRect.Width, rShapeRect.Height ); + awt::Size aOleSize( rShapeRect.Width, rShapeRect.Height ); if( rFilter.getOleObjectHelper().importOleObject( aOleProps, *pOleObjectInfo, aOleSize ) ) { Reference< XShape > xShape = mrDrawing.createAndInsertXShape( CREATE_OUSTRING( "com.sun.star.drawing.OLE2Shape" ), rxShapes, rShapeRect ); @@ -844,7 +844,7 @@ const ShapeBase* GroupShape::getChildById( const OUString& rShapeId ) const return mxChildren->getShapeById( rShapeId, true ); } -Reference< XShape > GroupShape::implConvertAndInsert( const Reference< XShapes >& rxShapes, const Rectangle& rShapeRect ) const +Reference< XShape > GroupShape::implConvertAndInsert( const Reference< XShapes >& rxShapes, const awt::Rectangle& rShapeRect ) const { Reference< XShape > xGroupShape; // check that this shape contains children and a valid coordinate system diff --git a/oox/source/vml/vmlshapecontext.cxx b/oox/source/vml/vmlshapecontext.cxx index 394c963abd32..165b7358ac7c 100644 --- a/oox/source/vml/vmlshapecontext.cxx +++ b/oox/source/vml/vmlshapecontext.cxx @@ -30,7 +30,7 @@ namespace vml { // ============================================================================ -using namespace ::com::sun::star::awt; +using namespace ::com::sun::star; using ::oox::core::ContextHandler2; using ::oox::core::ContextHandler2Helper; @@ -432,7 +432,7 @@ void ShapeContext::setPoints( const OUString& rPoints ) { sal_Int32 nX = rPoints.getToken( 0, ',', nIndex ).toInt32(); sal_Int32 nY = rPoints.getToken( 0, ',', nIndex ).toInt32(); - mrShapeModel.maPoints.push_back( Point( nX, nY ) ); + mrShapeModel.maPoints.push_back( awt::Point( nX, nY ) ); } } |