From c733be973e1483fb40f48bacc9182ccf0977ede3 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 23 Oct 2015 14:35:25 +0200 Subject: com::sun::star->css in lotuswordpro,mysqlc,oox Change-Id: Id99ff87c4eb3f1b36702261ce63d5d2793ea35d7 --- oox/source/drawingml/chart/axisconverter.cxx | 4 ++-- oox/source/drawingml/chart/chartspaceconverter.cxx | 2 +- oox/source/drawingml/chart/typegroupconverter.cxx | 2 +- oox/source/drawingml/color.cxx | 2 +- oox/source/drawingml/customshapegeometry.cxx | 10 +++++----- oox/source/drawingml/customshapeproperties.cxx | 2 +- .../drawingml/diagram/diagramfragmenthandler.hxx | 4 ++-- oox/source/drawingml/diagram/diagramlayoutatoms.hxx | 10 +++++----- oox/source/drawingml/shape.cxx | 2 +- oox/source/drawingml/table/tablecell.cxx | 6 +++--- oox/source/drawingml/textparagraphproperties.cxx | 18 +++++++++--------- .../drawingml/textparagraphpropertiescontext.cxx | 2 +- oox/source/drawingml/texttabstoplistcontext.hxx | 4 ++-- 13 files changed, 34 insertions(+), 34 deletions(-) (limited to 'oox/source/drawingml') diff --git a/oox/source/drawingml/chart/axisconverter.cxx b/oox/source/drawingml/chart/axisconverter.cxx index 352e45ec908e..4dabec2da288 100644 --- a/oox/source/drawingml/chart/axisconverter.cxx +++ b/oox/source/drawingml/chart/axisconverter.cxx @@ -75,12 +75,12 @@ sal_Int32 lclGetApiTimeUnit( sal_Int32 nTimeUnit ) void lclConvertTimeInterval( Any& orInterval, const OptValue< double >& rofUnit, sal_Int32 nTimeUnit ) { if( rofUnit.has() && (1.0 <= rofUnit.get()) && (rofUnit.get() <= SAL_MAX_INT32) ) - orInterval <<= ::com::sun::star::chart::TimeInterval( static_cast< sal_Int32 >( rofUnit.get() ), lclGetApiTimeUnit( nTimeUnit ) ); + orInterval <<= css::chart::TimeInterval( static_cast< sal_Int32 >( rofUnit.get() ), lclGetApiTimeUnit( nTimeUnit ) ); else orInterval.clear(); } -::com::sun::star::chart::ChartAxisLabelPosition lclGetLabelPosition( sal_Int32 nToken ) +css::chart::ChartAxisLabelPosition lclGetLabelPosition( sal_Int32 nToken ) { using namespace ::com::sun::star::chart; switch( nToken ) diff --git a/oox/source/drawingml/chart/chartspaceconverter.cxx b/oox/source/drawingml/chart/chartspaceconverter.cxx index 758ad647751d..e720ab5ceeff 100644 --- a/oox/source/drawingml/chart/chartspaceconverter.cxx +++ b/oox/source/drawingml/chart/chartspaceconverter.cxx @@ -197,7 +197,7 @@ void ChartSpaceConverter::convertFromModel( const Reference< XShapes >& rxExtern if(!mrModel.maSheetPath.isEmpty() ) { - Reference< ::com::sun::star::chart::XChartDocument > xChartDoc( getChartDocument(), UNO_QUERY ); + Reference< css::chart::XChartDocument > xChartDoc( getChartDocument(), UNO_QUERY ); PropertySet aProps( xChartDoc->getDiagram() ); aProps.setProperty( PROP_ExternalData , uno::makeAny(mrModel.maSheetPath) ); } diff --git a/oox/source/drawingml/chart/typegroupconverter.cxx b/oox/source/drawingml/chart/typegroupconverter.cxx index ba65b1f68ecb..860364a8238b 100644 --- a/oox/source/drawingml/chart/typegroupconverter.cxx +++ b/oox/source/drawingml/chart/typegroupconverter.cxx @@ -394,7 +394,7 @@ void TypeGroupConverter::convertFromModel( const Reference< XDiagram >& rxDiagra getFormatter().convertFrameFormatting( aSeriesProp, mrModel.mxHiLowLines, OBJECTTYPE_HILOLINE ); else // hi/low-lines cannot be switched off via "ShowHighLow" property (?) - aSeriesProp.setProperty( PROP_LineStyle, ::com::sun::star::drawing::LineStyle_NONE ); + aSeriesProp.setProperty( PROP_LineStyle, css::drawing::LineStyle_NONE ); // formatting of up/down bars bool bUpDownBars = mrModel.mxUpDownBars.is(); diff --git a/oox/source/drawingml/color.cxx b/oox/source/drawingml/color.cxx index 2d36cbf7fd6d..e92713ba1b91 100644 --- a/oox/source/drawingml/color.cxx +++ b/oox/source/drawingml/color.cxx @@ -304,7 +304,7 @@ void Color::addTransformation( sal_Int32 nElement, sal_Int32 nValue ) sal_Int32 nSize = maInteropTransformations.getLength(); maInteropTransformations.realloc(nSize + 1); maInteropTransformations[nSize].Name = getColorTransformationName( nToken ); - maInteropTransformations[nSize].Value = ::com::sun::star::uno::Any( nValue ); + maInteropTransformations[nSize].Value = css::uno::Any( nValue ); } void Color::addChartTintTransformation( double fTint ) diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx index 0ee26fef1b56..6875629f87f2 100644 --- a/oox/source/drawingml/customshapegeometry.cxx +++ b/oox/source/drawingml/customshapegeometry.cxx @@ -223,7 +223,7 @@ OUString GetFormulaParameter( const EnhancedCustomShapeParameter& rParameter ) static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCustomShapeProperties, const OUString& rValue, bool bNoSymbols = true ) { - com::sun::star::drawing::EnhancedCustomShapeParameter aRet; + css::drawing::EnhancedCustomShapeParameter aRet; if ( !rValue.isEmpty() ) { bool bConstant = true; @@ -942,18 +942,18 @@ ContextHandlerRef Path2DCubicBezierToContext::onCreateContext( sal_Int32 aElemen class Path2DContext : public ContextHandler2 { public: - Path2DContext( ContextHandler2Helper& rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties, std::vector< com::sun::star::drawing::EnhancedCustomShapeSegment >& rSegments, Path2D& rPath2D ); + Path2DContext( ContextHandler2Helper& rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties, std::vector< css::drawing::EnhancedCustomShapeSegment >& rSegments, Path2D& rPath2D ); virtual ~Path2DContext(); virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) override; protected: Path2D& mrPath2D; - std::vector< com::sun::star::drawing::EnhancedCustomShapeSegment >& mrSegments; + std::vector< css::drawing::EnhancedCustomShapeSegment >& mrSegments; CustomShapeProperties& mrCustomShapeProperties; }; -Path2DContext::Path2DContext( ContextHandler2Helper& rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties, std::vector< com::sun::star::drawing::EnhancedCustomShapeSegment >& rSegments, Path2D& rPath2D ) +Path2DContext::Path2DContext( ContextHandler2Helper& rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties, std::vector< css::drawing::EnhancedCustomShapeSegment >& rSegments, Path2D& rPath2D ) : ContextHandler2( rParent ) , mrPath2D( rPath2D ) , mrSegments( rSegments ) @@ -1148,7 +1148,7 @@ public: protected: CustomShapeProperties& mrCustomShapeProperties; - std::vector< com::sun::star::drawing::EnhancedCustomShapeSegment >& mrSegments; + std::vector< css::drawing::EnhancedCustomShapeSegment >& mrSegments; std::vector< Path2D >& mrPath2DList; }; diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx index 12c7c3f85d0c..cb40b1fb20cd 100644 --- a/oox/source/drawingml/customshapeproperties.cxx +++ b/oox/source/drawingml/customshapeproperties.cxx @@ -188,7 +188,7 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi const OUString sAdjustmentValues("AdjustmentValues"); if ( aGeoPropSeq[ i ].Name.equals( sAdjustmentValues ) ) { - uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue > aAdjustmentSeq; + uno::Sequence< css::drawing::EnhancedCustomShapeAdjustmentValue > aAdjustmentSeq; if ( aGeoPropSeq[ i ].Value >>= aAdjustmentSeq ) { int nIndex=0; diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx index fa1bf9d799ad..cbd09ae94ef9 100644 --- a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx +++ b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx @@ -31,7 +31,7 @@ public: DiagramDataFragmentHandler( oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, const DiagramDataPtr& rDataPtr ) throw(); virtual ~DiagramDataFragmentHandler() throw(); - virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL endDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; private: @@ -45,7 +45,7 @@ public: DiagramLayoutFragmentHandler( oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, const DiagramLayoutPtr& rDataPtr ) throw(); virtual ~DiagramLayoutFragmentHandler() throw(); - virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL endDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; private: diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx index 7e511cc8597e..6cebe6f24ef3 100644 --- a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx +++ b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx @@ -43,7 +43,7 @@ struct IteratorAttr IteratorAttr(); // not sure this belong here, but wth - void loadFromXAttr( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes ); + void loadFromXAttr( const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttributes ); sal_Int32 mnAxis; sal_Int32 mnCnt; @@ -58,7 +58,7 @@ struct ConditionAttr ConditionAttr(); // not sure this belong here, but wth - void loadFromXAttr( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes ); + void loadFromXAttr( const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttributes ); sal_Int32 mnFunc; sal_Int32 mnArg; @@ -177,7 +177,7 @@ class ForEachAtom : public LayoutAtom { public: - explicit ForEachAtom(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes); + explicit ForEachAtom(const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttributes); virtual ~ForEachAtom() { } @@ -195,7 +195,7 @@ class ConditionAtom : public LayoutAtom { public: - explicit ConditionAtom(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes); + explicit ConditionAtom(const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttributes); virtual ~ConditionAtom() { } virtual void accept( LayoutAtomVisitor& ) override; @@ -239,7 +239,7 @@ public: }; // we know that the array is of fixed size // the use of Any allow having empty values - typedef boost::array< ::com::sun::star::uno::Any, 9 > VarMap; + typedef boost::array< css::uno::Any, 9 > VarMap; LayoutNode() : mnChildOrder(0) {} virtual ~LayoutNode() { } diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 748f31314dec..c7728bbd1e20 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -397,7 +397,7 @@ Reference< XShape > Shape::createAndInsert( ::oox::core::XmlFilterBase& rFilterBase, const OUString& rServiceName, const Theme* pTheme, - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes, + const css::uno::Reference< css::drawing::XShapes >& rxShapes, const awt::Rectangle* /* pShapeRect */, bool bClearText, bool bDoNotInsertEmptyTextBody, diff --git a/oox/source/drawingml/table/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx index 135e5b256658..8033218c822b 100644 --- a/oox/source/drawingml/table/tablecell.cxx +++ b/oox/source/drawingml/table/tablecell.cxx @@ -156,7 +156,7 @@ void applyTableStylePart( const ::oox::core::XmlFilterBase& rFilterBase, aTextCharProps.moItalic = *rTableStylePart.getTextItalicStyle(); } -void applyTableCellProperties( const Reference < ::com::sun::star::table::XCell >& rxCell, const TableCell& rTableCell ) +void applyTableCellProperties( const Reference < css::table::XCell >& rxCell, const TableCell& rTableCell ) { Reference< XPropertySet > xPropSet( rxCell, UNO_QUERY_THROW ); xPropSet->setPropertyValue( "TextUpperDistance", Any( static_cast< sal_Int32 >( rTableCell.getTopMargin() / 360 ) ) ); @@ -178,7 +178,7 @@ void applyTableCellProperties( const Reference < ::com::sun::star::table::XCell } void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, ::oox::drawingml::TextListStylePtr pMasterTextListStyle, - const ::com::sun::star::uno::Reference < ::com::sun::star::table::XCell >& rxCell, const TableProperties& rTableProperties, + const css::uno::Reference < css::table::XCell >& rxCell, const TableProperties& rTableProperties, const TableStyle& rTableStyle, sal_Int32 nColumn, sal_Int32 nMaxColumn, sal_Int32 nRow, sal_Int32 nMaxRow ) { TableStyle& rTable( const_cast< TableStyle& >( rTableStyle ) ); @@ -415,7 +415,7 @@ void TableCell::pushToXCell( const ::oox::core::XmlFilterBase& rFilterBase, ::oo if ( getVertToken() == XML_eaVert ) { - xPropSet->setPropertyValue("TextWritingMode", Any(com::sun::star::text::WritingMode_TB_RL)); + xPropSet->setPropertyValue("TextWritingMode", Any(css::text::WritingMode_TB_RL)); } getTextBody()->insertAt( rFilterBase, xText, xAt, aTextStyleProps, pMasterTextListStyle ); diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx index a4797f35d7e8..f66d2e03c301 100644 --- a/oox/source/drawingml/textparagraphproperties.cxx +++ b/oox/source/drawingml/textparagraphproperties.cxx @@ -73,7 +73,7 @@ void BulletList::setBulletChar( const OUString & sChar ) msBulletChar <<= sChar; } -void BulletList::setGraphic( ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& rXGraphic ) +void BulletList::setGraphic( css::uno::Reference< css::graphic::XGraphic >& rXGraphic ) { mnNumberingType <<= NumberingType::BITMAP; maGraphic <<= rXGraphic; @@ -344,7 +344,7 @@ void BulletList::pushToPropMap( const ::oox::core::XmlFilterBase* pFilterBase, P } if ( maGraphic.hasValue() ) { - Reference< com::sun::star::awt::XBitmap > xBitmap( maGraphic, UNO_QUERY ); + Reference< css::awt::XBitmap > xBitmap( maGraphic, UNO_QUERY ); if ( xBitmap.is() ) rPropMap.setProperty( PROP_Graphic, xBitmap); } @@ -411,7 +411,7 @@ void TextParagraphProperties::pushToPropSet( const ::oox::core::XmlFilterBase* p { fCharacterSize = getCharHeightPoints( fCharacterSize ); - com::sun::star::awt::Size aBulletSize; + css::awt::Size aBulletSize; aBulletSize.Width = aBulletSize.Height = static_cast< sal_Int32 >( ( fCharacterSize * ( 2540.0 / 72.0 ) * 0.8 ) ); rioBulletMap.setProperty( PROP_GraphicSize, aBulletSize); } @@ -488,7 +488,7 @@ void TextParagraphProperties::pushToPropSet( const ::oox::core::XmlFilterBase* p } else { - aPropSet.setProperty( PROP_ParaAdjust, com::sun::star::style::ParagraphAdjust_LEFT); + aPropSet.setProperty( PROP_ParaAdjust, css::style::ParagraphAdjust_LEFT); } } @@ -502,10 +502,10 @@ float TextParagraphProperties::getCharHeightPoints( float fDefault ) const // debugging pptx import problems. void TextParagraphProperties::dump() const { - Reference< ::com::sun::star::drawing::XShape > xShape( oox::ppt::PowerPointImport::mpDebugFilterBase->getModelFactory()->createInstance( "com.sun.star.presentation.TitleTextShape" ), UNO_QUERY ); - Reference< ::com::sun::star::text::XText > xText( xShape, UNO_QUERY ); + Reference< css::drawing::XShape > xShape( oox::ppt::PowerPointImport::mpDebugFilterBase->getModelFactory()->createInstance( "com.sun.star.presentation.TitleTextShape" ), UNO_QUERY ); + Reference< css::text::XText > xText( xShape, UNO_QUERY ); - Reference< com::sun::star::drawing::XDrawPage > xDebugPage(ppt::SlidePersist::mxDebugPage.get(), UNO_QUERY); + Reference< css::drawing::XDrawPage > xDebugPage(ppt::SlidePersist::mxDebugPage.get(), UNO_QUERY); if (xDebugPage.is()) xDebugPage->add( xShape ); @@ -513,8 +513,8 @@ void TextParagraphProperties::dump() const const OUString sText = "debug"; xText->setString( sText ); - Reference< ::com::sun::star::text::XTextCursor > xStart( xText->createTextCursor(), UNO_QUERY ); - Reference< ::com::sun::star::text::XTextRange > xRange( xStart, UNO_QUERY ); + Reference< css::text::XTextCursor > xStart( xText->createTextCursor(), UNO_QUERY ); + Reference< css::text::XTextRange > xRange( xStart, UNO_QUERY ); xStart->gotoEnd( sal_True ); Reference< XPropertySet > xPropSet( xRange, UNO_QUERY ); pushToPropSet( NULL, xPropSet, emptyMap, NULL, false, 0 ); diff --git a/oox/source/drawingml/textparagraphpropertiescontext.cxx b/oox/source/drawingml/textparagraphpropertiescontext.cxx index a79cfe0287b2..f811cdb60f5c 100644 --- a/oox/source/drawingml/textparagraphpropertiescontext.cxx +++ b/oox/source/drawingml/textparagraphpropertiescontext.cxx @@ -135,7 +135,7 @@ TextParagraphPropertiesContext::~TextParagraphPropertiesContext() if ( maLineSpacing.bHasValue ) rPropertyMap.setProperty( PROP_ParaLineSpacing, maLineSpacing.toLineSpacing()); else - rPropertyMap.setProperty( PROP_ParaLineSpacing, ::com::sun::star::style::LineSpacing( ::com::sun::star::style::LineSpacingMode::PROP, 100 )); + rPropertyMap.setProperty( PROP_ParaLineSpacing, css::style::LineSpacing( css::style::LineSpacingMode::PROP, 100 )); ::std::list< TabStop >::size_type nTabCount = maTabList.size(); if( nTabCount != 0 ) diff --git a/oox/source/drawingml/texttabstoplistcontext.hxx b/oox/source/drawingml/texttabstoplistcontext.hxx index 1acb0e506475..cbec67799bc1 100644 --- a/oox/source/drawingml/texttabstoplistcontext.hxx +++ b/oox/source/drawingml/texttabstoplistcontext.hxx @@ -32,13 +32,13 @@ namespace oox { namespace drawingml { { public: TextTabStopListContext( ::oox::core::ContextHandler2Helper& rParent, - ::std::list< ::com::sun::star::style::TabStop > & aTabList ); + ::std::list< css::style::TabStop > & aTabList ); virtual ~TextTabStopListContext(); virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; protected: - ::std::list< ::com::sun::star::style::TabStop > & maTabList; + ::std::list< css::style::TabStop > & maTabList; }; } } -- cgit