diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-04-11 18:28:57 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-04-11 19:33:39 +0000 |
| commit | a96425461482ac24e54f01e3a48b4fcd96a45bda (patch) | |
| tree | 0ae362f585a030a762046c730ce5b34057f25b96 /writerfilter | |
| parent | 6ab69492b7dfb0ef0016f442e7b249c2723a5110 (diff) | |
writerfilter: no need to spell out com::sun::star, css is enough
Change-Id: I7dfcb041509508969135a325bdef709de7a8218f
Reviewed-on: https://gerrit.libreoffice.org/15247
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'writerfilter')
30 files changed, 262 insertions, 291 deletions
diff --git a/writerfilter/inc/dmapper/resourcemodel.hxx b/writerfilter/inc/dmapper/resourcemodel.hxx index d76a0a464d79..9a1fc0a7ad98 100644 --- a/writerfilter/inc/dmapper/resourcemodel.hxx +++ b/writerfilter/inc/dmapper/resourcemodel.hxx @@ -223,7 +223,7 @@ public: /** Receives a shape. */ - virtual void startShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > const& xShape ) = 0; + virtual void startShape(css::uno::Reference<css::drawing::XShape> const& xShape) = 0; virtual void endShape( ) = 0; diff --git a/writerfilter/source/dmapper/BorderHandler.hxx b/writerfilter/source/dmapper/BorderHandler.hxx index 58e3bc0627a2..602e2fed244c 100644 --- a/writerfilter/source/dmapper/BorderHandler.hxx +++ b/writerfilter/source/dmapper/BorderHandler.hxx @@ -55,7 +55,7 @@ private: bool m_bOOXML; bool m_aFilledLines[BORDER_COUNT]; - ::com::sun::star::table::BorderLine2 m_aBorderLines[BORDER_COUNT]; + css::table::BorderLine2 m_aBorderLines[BORDER_COUNT]; OUString m_aInteropGrabBagName; std::vector<css::beans::PropertyValue> m_aInteropGrabBag; void appendGrabBag(const OUString& aKey, const OUString& aValue); @@ -69,7 +69,7 @@ public: virtual ~BorderHandler(); ::std::shared_ptr<PropertyMap> getProperties(); - ::com::sun::star::table::BorderLine2 getBorderLine(); + css::table::BorderLine2 getBorderLine(); sal_Int32 getLineDistance() const { return m_nLineDistance;} bool getShadow() { return m_bShadow;} void enableInteropGrabBag(const OUString& aName); diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx b/writerfilter/source/dmapper/ConversionHelper.cxx index 495ab695a85f..77f935c80829 100644 --- a/writerfilter/source/dmapper/ConversionHelper.cxx +++ b/writerfilter/source/dmapper/ConversionHelper.cxx @@ -581,9 +581,9 @@ sal_Int16 ConvertNumberingType(sal_Int32 nFmt) return nRet; } -com::sun::star::util::DateTime ConvertDateStringToDateTime( const OUString& rDateTime ) +util::DateTime ConvertDateStringToDateTime( const OUString& rDateTime ) { - com::sun::star::util::DateTime aDateTime; + util::DateTime aDateTime; //xsd::DateTime in the format [-]CCYY-MM-DDThh:mm:ss[Z|(+|-)hh:mm] example: 2008-01-21T10:42:00Z //OUString getToken( sal_Int32 token, sal_Unicode cTok, sal_Int32& index ) const sal_Int32 nIndex = 0; diff --git a/writerfilter/source/dmapper/ConversionHelper.hxx b/writerfilter/source/dmapper/ConversionHelper.hxx index 53ff4b644903..b9067759410d 100644 --- a/writerfilter/source/dmapper/ConversionHelper.hxx +++ b/writerfilter/source/dmapper/ConversionHelper.hxx @@ -36,19 +36,20 @@ namespace dmapper{ namespace ConversionHelper{ // create a border line and return the distance value - void MakeBorderLine( sal_Int32 nLineThickness, sal_Int32 nLineType, - sal_Int32 nLineColor, - ::com::sun::star::table::BorderLine2& rToFill, bool bIsOOXML ); + void MakeBorderLine(sal_Int32 nLineThickness, + sal_Int32 nLineType, + sal_Int32 nLineColor, + css::table::BorderLine2& rToFill, + bool bIsOOXML); //convert the number format string form MS format to SO format - OUString ConvertMSFormatStringToSO( - const OUString& rFormat, ::com::sun::star::lang::Locale& rLocale, bool bHijri); + OUString ConvertMSFormatStringToSO(const OUString& rFormat, css::lang::Locale& rLocale, bool bHijri); // export just for test SAL_DLLPUBLIC_EXPORT sal_Int32 convertTwipToMM100(sal_Int32 _t); SAL_DLLPUBLIC_EXPORT sal_uInt32 convertTwipToMM100Unsigned(sal_Int32 _t); sal_Int16 convertTableJustification( sal_Int32 nIntValue ); sal_Int16 ConvertNumberingType(sal_Int32 nFmt); - com::sun::star::util::DateTime ConvertDateStringToDateTime( const OUString& rDateTime ); + css::util::DateTime ConvertDateStringToDateTime(const OUString& rDateTime); } // namespace ConversionHelper } //namespace dmapper } // namespace writerfilter diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 32528c564f5e..9a8dca19f066 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -2701,9 +2701,9 @@ void DomainMapper::lcl_startParagraphGroup() m_pImpl->SetCurrentParaStyleId(sDefault); } if (m_pImpl->isBreakDeferred(PAGE_BREAK)) - m_pImpl->GetTopContext()->Insert( PROP_BREAK_TYPE, uno::makeAny( com::sun::star::style::BreakType_PAGE_BEFORE) ); + m_pImpl->GetTopContext()->Insert(PROP_BREAK_TYPE, uno::makeAny(style::BreakType_PAGE_BEFORE)); else if (m_pImpl->isBreakDeferred(COLUMN_BREAK)) - m_pImpl->GetTopContext()->Insert( PROP_BREAK_TYPE, uno::makeAny( com::sun::star::style::BreakType_COLUMN_BEFORE) ); + m_pImpl->GetTopContext()->Insert(PROP_BREAK_TYPE, uno::makeAny(style::BreakType_COLUMN_BEFORE)); if (m_pImpl->isParaSdtEndDeferred()) m_pImpl->GetTopContext()->Insert(PROP_PARA_SDT_END_BEFORE, uno::makeAny(true), true, PARA_GRAB_BAG); @@ -2748,7 +2748,7 @@ void DomainMapper::lcl_startShape(uno::Reference<drawing::XShape> const& xShape) lcl_endCharacterGroup(); lcl_endParagraphGroup(); lcl_startParagraphGroup(); - m_pImpl->GetTopContext()->Insert(PROP_BREAK_TYPE, uno::makeAny( com::sun::star::style::BreakType_PAGE_BEFORE)); + m_pImpl->GetTopContext()->Insert(PROP_BREAK_TYPE, uno::makeAny(style::BreakType_PAGE_BEFORE)); } m_pImpl->PushShapeContext( xShape ); lcl_startParagraphGroup(); @@ -2884,12 +2884,12 @@ void DomainMapper::lcl_text(const sal_uInt8 * data_, size_t len) } PropertyMapPtr pContext = m_pImpl->GetTopContext(); - if ( pContext && !pContext->GetFootnote().is() ) - { - if (m_pImpl->isBreakDeferred(PAGE_BREAK)) - m_pImpl->GetTopContext()->Insert( PROP_BREAK_TYPE, uno::makeAny( com::sun::star::style::BreakType_PAGE_BEFORE) ); + if (pContext && !pContext->GetFootnote().is()) + { + if (m_pImpl->isBreakDeferred(PAGE_BREAK)) + m_pImpl->GetTopContext()->Insert(PROP_BREAK_TYPE, uno::makeAny(style::BreakType_PAGE_BEFORE)); else if (m_pImpl->isBreakDeferred(COLUMN_BREAK)) - m_pImpl->GetTopContext()->Insert( PROP_BREAK_TYPE, uno::makeAny( com::sun::star::style::BreakType_COLUMN_BEFORE) ); + m_pImpl->GetTopContext()->Insert(PROP_BREAK_TYPE, uno::makeAny(style::BreakType_COLUMN_BEFORE)); m_pImpl->clearDeferredBreaks(); } @@ -3046,9 +3046,9 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, size_t len) if (pContext && m_pImpl->GetSettingsTable()->GetSplitPgBreakAndParaMark()) { if (m_pImpl->isBreakDeferred(PAGE_BREAK)) - pContext->Insert(PROP_BREAK_TYPE, uno::makeAny( com::sun::star::style::BreakType_PAGE_BEFORE)); + pContext->Insert(PROP_BREAK_TYPE, uno::makeAny(style::BreakType_PAGE_BEFORE)); else if (m_pImpl->isBreakDeferred(COLUMN_BREAK)) - pContext->Insert(PROP_BREAK_TYPE, uno::makeAny( com::sun::star::style::BreakType_COLUMN_BEFORE)); + pContext->Insert(PROP_BREAK_TYPE, uno::makeAny(style::BreakType_COLUMN_BEFORE)); m_pImpl->clearDeferredBreaks(); } @@ -3079,7 +3079,7 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, size_t len) m_pImpl->finishParagraph(m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH)); lcl_startParagraphGroup(); } - m_pImpl->GetTopContext()->Insert( PROP_BREAK_TYPE, uno::makeAny( com::sun::star::style::BreakType_PAGE_BEFORE) ); + m_pImpl->GetTopContext()->Insert(PROP_BREAK_TYPE, uno::makeAny(style::BreakType_PAGE_BEFORE)); } else if (m_pImpl->isBreakDeferred(COLUMN_BREAK)) { @@ -3089,7 +3089,7 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, size_t len) m_pImpl->finishParagraph(m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH)); lcl_startParagraphGroup(); } - m_pImpl->GetTopContext()->Insert( PROP_BREAK_TYPE, uno::makeAny( com::sun::star::style::BreakType_COLUMN_BEFORE) ); + m_pImpl->GetTopContext()->Insert(PROP_BREAK_TYPE, uno::makeAny(style::BreakType_COLUMN_BEFORE)); } m_pImpl->clearDeferredBreaks(); } @@ -3310,15 +3310,15 @@ sal_Int16 DomainMapper::getEmphasisValue(const sal_Int32 nIntValue) switch (nIntValue) { case NS_ooxml::LN_Value_ST_Em_dot: - return com::sun::star::text::FontEmphasis::DOT_ABOVE; + return text::FontEmphasis::DOT_ABOVE; case NS_ooxml::LN_Value_ST_Em_comma: - return com::sun::star::text::FontEmphasis::ACCENT_ABOVE; + return text::FontEmphasis::ACCENT_ABOVE; case NS_ooxml::LN_Value_ST_Em_circle: - return com::sun::star::text::FontEmphasis::CIRCLE_ABOVE; + return text::FontEmphasis::CIRCLE_ABOVE; case NS_ooxml::LN_Value_ST_Em_underDot: - return com::sun::star::text::FontEmphasis::DOT_BELOW; + return text::FontEmphasis::DOT_BELOW; default: - return com::sun::star::text::FontEmphasis::NONE; + return text::FontEmphasis::NONE; } } @@ -3352,7 +3352,7 @@ OUString DomainMapper::getBracketStringFromEnum(const sal_Int32 nIntValue, const } } -com::sun::star::style::TabAlign DomainMapper::getTabAlignFromValue(const sal_Int32 nIntValue) +style::TabAlign DomainMapper::getTabAlignFromValue(const sal_Int32 nIntValue) { switch (nIntValue) { @@ -3360,16 +3360,16 @@ com::sun::star::style::TabAlign DomainMapper::getTabAlignFromValue(const sal_Int case NS_ooxml::LN_Value_ST_TabJc_left: case NS_ooxml::LN_Value_ST_TabJc_bar: // bar not supported case NS_ooxml::LN_Value_ST_TabJc_num: // num not supported - return com::sun::star::style::TabAlign_LEFT; + return style::TabAlign_LEFT; case NS_ooxml::LN_Value_ST_TabJc_center: - return com::sun::star::style::TabAlign_CENTER; + return style::TabAlign_CENTER; case NS_ooxml::LN_Value_ST_TabJc_end: case NS_ooxml::LN_Value_ST_TabJc_right: - return com::sun::star::style::TabAlign_RIGHT; + return style::TabAlign_RIGHT; case NS_ooxml::LN_Value_ST_TabJc_decimal: - return com::sun::star::style::TabAlign_DECIMAL; + return style::TabAlign_DECIMAL; } - return com::sun::star::style::TabAlign_LEFT; + return style::TabAlign_LEFT; } sal_Unicode DomainMapper::getFillCharFromValue(const sal_Int32 nIntValue) diff --git a/writerfilter/source/dmapper/DomainMapper.hxx b/writerfilter/source/dmapper/DomainMapper.hxx index 9340722ea257..5225c3fb7904 100644 --- a/writerfilter/source/dmapper/DomainMapper.hxx +++ b/writerfilter/source/dmapper/DomainMapper.hxx @@ -51,7 +51,7 @@ namespace utl class MediaDescriptor; } -typedef std::vector< com::sun::star::beans::PropertyValue > PropertyValueVector_t; +typedef std::vector<css::beans::PropertyValue> PropertyValueVector_t; namespace writerfilter { namespace dmapper @@ -75,13 +75,13 @@ class DomainMapper : public LoggedProperties, public LoggedTable, DomainMapper_Impl *m_pImpl; public: - DomainMapper(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > const& xInputStream, - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > const& xModel, - bool bRepairStorage, - SourceDocumentType eDocumentType, - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > const& xInsertTextRange, - utl::MediaDescriptor& rMediaDesc); + DomainMapper(const css::uno::Reference<css::uno::XComponentContext>& xContext, + css::uno::Reference<css::io::XInputStream> const& xInputStream, + css::uno::Reference<css::lang::XComponent> const& xModel, + bool bRepairStorage, + SourceDocumentType eDocumentType, + css::uno::Reference<css::text::XTextRange> const& xInsertTextRange, + utl::MediaDescriptor& rMediaDesc); virtual ~DomainMapper(); // Stream @@ -102,24 +102,23 @@ public: bool IsOOXMLImport() const; bool IsRTFImport() const; - ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > GetTextFactory() const; + css::uno::Reference<css::lang::XMultiServiceFactory> GetTextFactory() const; void AddListIDToLFOTable( sal_Int32 nAbstractNumId ); - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > GetCurrentTextRange(); + css::uno::Reference<css::text::XTextRange> GetCurrentTextRange(); OUString getOrCreateCharStyle( PropertyValueVector_t& rCharProperties ); std::shared_ptr< StyleSheetTable > GetStyleSheetTable( ); GraphicZOrderHelper* graphicZOrderHelper(); /// Return the first from the pending (not inserted to the document) shapes, if there are any. - com::sun::star::uno::Reference<com::sun::star::drawing::XShape> PopPendingShape(); + css::uno::Reference<css::drawing::XShape> PopPendingShape(); bool IsInHeaderFooter() const; bool IsStyleSheetImport() const; /** @see DomainMapper_Impl::processDeferredCharacterProperties() */ - void processDeferredCharacterProperties( - const std::map< sal_Int32, com::sun::star::uno::Any >& deferredCharacterProperties ); + void processDeferredCharacterProperties(const std::map<sal_Int32, css::uno::Any>& rDeferredCharacterProperties); void setInTableStyleRunProps(bool bInTableStyleRunProps); /// Enable storing of seen tokens in a named grab bag. @@ -140,7 +139,7 @@ private: virtual void lcl_endParagraphGroup() SAL_OVERRIDE; virtual void lcl_startCharacterGroup() SAL_OVERRIDE; virtual void lcl_endCharacterGroup() SAL_OVERRIDE; - virtual void lcl_startShape( ::com::sun::star::uno::Reference< com::sun::star::drawing::XShape > const& xShape ) SAL_OVERRIDE; + virtual void lcl_startShape(css::uno::Reference<css::drawing::XShape> const& xShape) SAL_OVERRIDE; virtual void lcl_endShape( ) SAL_OVERRIDE; virtual void lcl_text(const sal_uInt8 * data, size_t len) SAL_OVERRIDE; @@ -168,7 +167,7 @@ private: bool getColorFromId(const Id, sal_Int32 &nColor); sal_Int16 getEmphasisValue(const sal_Int32 nIntValue); OUString getBracketStringFromEnum(const sal_Int32 nIntValue, const bool bIsPrefix = true); - com::sun::star::style::TabAlign getTabAlignFromValue(const sal_Int32 nIntValue); + css::style::TabAlign getTabAlignFromValue(const sal_Int32 nIntValue); sal_Unicode getFillCharFromValue(const sal_Int32 nIntValue); bool mbIsSplitPara; boost::scoped_ptr< GraphicZOrderHelper > zOrderHelper; diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx index 470c7975baa5..818f20fa1547 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx @@ -29,18 +29,18 @@ namespace writerfilter { namespace dmapper { typedef css::uno::Reference< css::text::XTextRange > Handle_t; -typedef ::com::sun::star::uno::Sequence< Handle_t> CellSequence_t; +typedef css::uno::Sequence<Handle_t> CellSequence_t; typedef std::shared_ptr<CellSequence_t> CellSequencePointer_t; -typedef ::com::sun::star::uno::Sequence< CellSequence_t > RowSequence_t; +typedef css::uno::Sequence<CellSequence_t> RowSequence_t; typedef std::shared_ptr<RowSequence_t> RowSequencePointer_t; -typedef ::com::sun::star::uno::Sequence< RowSequence_t> TableSequence_t; +typedef css::uno::Sequence<RowSequence_t> TableSequence_t; typedef std::shared_ptr<TableSequence_t> TableSequencePointer_t; -typedef ::com::sun::star::text::XTextAppendAndConvert Text_t; -typedef ::com::sun::star::uno::Reference<Text_t> TextReference_t; +typedef css::text::XTextAppendAndConvert Text_t; +typedef css::uno::Reference<Text_t> TextReference_t; -typedef ::com::sun::star::beans::PropertyValues TablePropertyValues_t; -typedef ::com::sun::star::uno::Sequence< TablePropertyValues_t > RowPropertyValuesSeq_t; -typedef ::com::sun::star::uno::Sequence< RowPropertyValuesSeq_t> CellPropertyValuesSeq_t; +typedef css::beans::PropertyValues TablePropertyValues_t; +typedef css::uno::Sequence<TablePropertyValues_t> RowPropertyValuesSeq_t; +typedef css::uno::Sequence<RowPropertyValuesSeq_t> CellPropertyValuesSeq_t; typedef std::vector<PropertyMapPtr> PropertyMapVector1; typedef std::vector<PropertyMapVector1> PropertyMapVector2; diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx b/writerfilter/source/dmapper/DomainMapperTableManager.hxx index 3de305a6c4eb..79338b0337fe 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx @@ -102,7 +102,7 @@ public: const OUString& getTableStyleName() const { return m_sTableStyleName; } /// Turn the attributes collected so far in m_aTableLook into a property and clear the container. void finishTableLook(); - const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> getCurrentTablePosition(); + const css::uno::Sequence<css::beans::PropertyValue> getCurrentTablePosition(); TablePositionHandler* getCurrentTableRealPosition(); virtual void cellProps(TablePropertyMapPtr pProps) SAL_OVERRIDE diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 62b98aaa74a2..48ad8a2fa8e4 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1650,7 +1650,7 @@ void DomainMapper_Impl::CreateRedline(uno::Reference<text::XTextRange> const& xR sType = rPropNameSupplier.GetName( PROP_PARAGRAPH_FORMAT ); break; default: - throw ::com::sun::star::lang::IllegalArgumentException("illegal redline token type", nullptr, 0); + throw lang::IllegalArgumentException("illegal redline token type", nullptr, 0); } uno::Reference < text::XRedline > xRedline( xRange, uno::UNO_QUERY_THROW ); beans::PropertyValues aRedlineProperties( 3 ); @@ -2415,7 +2415,7 @@ void DomainMapper_Impl::SetNumberFormat( const OUString& rCommand, uno::Reference< util::XNumberFormatsSupplier > xNumberSupplier( m_xTextDocument, uno::UNO_QUERY_THROW ); if( bDetectFormat ) { - uno::Reference< util::XNumberFormatter> xFormatter( ::com::sun::star::util::NumberFormatter::create( m_xComponentContext ), uno::UNO_QUERY_THROW ); + uno::Reference< util::XNumberFormatter> xFormatter(util::NumberFormatter::create(m_xComponentContext), uno::UNO_QUERY_THROW); xFormatter->attachNumberFormatsSupplier( xNumberSupplier ); nKey = xFormatter->detectNumberFormat( 0, rCommand ); } @@ -2541,9 +2541,7 @@ void DomainMapper_Impl::ChainTextFrames() } } -uno::Reference< beans::XPropertySet > DomainMapper_Impl::FindOrCreateFieldMaster( - const sal_Char* pFieldMasterService, const OUString& rFieldMasterName ) - throw(::com::sun::star::uno::Exception) +uno::Reference<beans::XPropertySet> DomainMapper_Impl::FindOrCreateFieldMaster(const sal_Char* pFieldMasterService, const OUString& rFieldMasterName) throw(uno::Exception) { // query master, create if not available uno::Reference< text::XTextFieldsSupplier > xFieldsSupplier( GetTextDocument(), uno::UNO_QUERY_THROW ); @@ -4007,8 +4005,8 @@ void DomainMapper_Impl::CloseFieldCommand() uno::UNO_QUERY_THROW); OUString sCmd(pContext->GetCommand());//sCmd is the entire instrText inclusing the index e.g. CITATION Kra06 \l 1033 if( !sCmd.isEmpty()){ - uno::Sequence<com::sun::star::beans::PropertyValue> aValues(1); - com::sun::star::beans::PropertyValue propertyVal; + uno::Sequence<beans::PropertyValue> aValues(1); + beans::PropertyValue propertyVal; propertyVal.Name = "Identifier"; propertyVal.Value = uno::makeAny(sCmd); aValues[0] = propertyVal; @@ -4130,7 +4128,7 @@ void DomainMapper_Impl::AppendFieldResult(OUString const& rString) } // Calculates css::DateTime based on ddddd.sssss since 1900-1-0 -::com::sun::star::util::DateTime lcl_dateTimeFromSerial(const double& dSerial) +util::DateTime lcl_dateTimeFromSerial(const double& dSerial) { const sal_uInt32 secondsPerDay = 86400; const sal_uInt16 secondsPerHour = 3600; @@ -4141,7 +4139,7 @@ void DomainMapper_Impl::AppendFieldResult(OUString const& rString) double frac = dSerial - (long)dSerial; sal_uInt32 seconds = frac * secondsPerDay; - ::com::sun::star::util::DateTime date; + util::DateTime date; date.Year = d.GetYear(); date.Month = d.GetMonth(); date.Day = d.GetDay(); @@ -4193,10 +4191,10 @@ void DomainMapper_Impl::SetFieldResult(OUString const& rResult) bool bIsSetbiblio = xServiceInfo->supportsService("com.sun.star.text.TextField.Bibliography"); if( bIsSetbiblio ) { - com::sun::star::uno::Any aProperty = xFieldProperties->getPropertyValue("Fields"); - uno::Sequence<com::sun::star::beans::PropertyValue> aValues ; + uno::Any aProperty = xFieldProperties->getPropertyValue("Fields"); + uno::Sequence<beans::PropertyValue> aValues ; aProperty >>= aValues; - com::sun::star::beans::PropertyValue propertyVal; + beans::PropertyValue propertyVal; bool bTitleFound = false; int i=0; for (; i < aValues.getLength(); i++) @@ -4231,7 +4229,7 @@ void DomainMapper_Impl::SetFieldResult(OUString const& rResult) { uno::Reference< util::XNumberFormatsSupplier > xNumberSupplier( m_xTextDocument, uno::UNO_QUERY_THROW ); - uno::Reference< util::XNumberFormatter > xFormatter( ::com::sun::star::util::NumberFormatter::create( m_xComponentContext ), uno::UNO_QUERY_THROW ); + uno::Reference<util::XNumberFormatter> xFormatter(util::NumberFormatter::create(m_xComponentContext), uno::UNO_QUERY_THROW); xFormatter->attachNumberFormatsSupplier( xNumberSupplier ); sal_Int32 nKey = 0; diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx index a19af0dcc7dd..a6fa2c0f186d 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx @@ -136,17 +136,17 @@ public: class FieldContext { bool m_bFieldCommandCompleted; - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > m_xStartRange; + css::uno::Reference<css::text::XTextRange> m_xStartRange; OUString m_sCommand; OUString m_sResult; bool m_bFieldLocked; - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextField > m_xTextField; - ::com::sun::star::uno::Reference< ::com::sun::star::text::XFormField > m_xFormField; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xTOC;//TOX - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xTC;//TOX entry - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xCustomField; + css::uno::Reference<css::text::XTextField> m_xTextField; + css::uno::Reference<css::text::XFormField> m_xFormField; + css::uno::Reference<css::beans::XPropertySet> m_xTOC; + css::uno::Reference<css::beans::XPropertySet> m_xTC; // TOX entry + css::uno::Reference<css::beans::XPropertySet> m_xCustomField; OUString m_sHyperlinkURL; FFDataHandler::Pointer_t m_pFFDataHandler; FormControlHelper::Pointer_t m_pFormControlHelper; @@ -154,10 +154,10 @@ class FieldContext PropertyMapPtr m_pProperties; public: - FieldContext(::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > const& xStart); + FieldContext(css::uno::Reference<css::text::XTextRange> const& xStart); ~FieldContext(); - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > GetStartRange() const { return m_xStartRange; } + css::uno::Reference<css::text::XTextRange> GetStartRange() const { return m_xStartRange; } void AppendCommand(const OUString& rPart); const OUString& GetCommand() const {return m_sCommand; } @@ -171,18 +171,18 @@ public: void SetFieldLocked() { m_bFieldLocked = true; } bool IsFieldLocked() { return m_bFieldLocked; } - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > GetCustomField() const { return m_xCustomField; } - void SetCustomField( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > const& xCustomField ) { m_xCustomField = xCustomField; } - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextField > GetTextField() const { return m_xTextField;} - void SetTextField(::com::sun::star::uno::Reference< ::com::sun::star::text::XTextField > const& xTextField) { m_xTextField = xTextField;} - ::com::sun::star::uno::Reference< ::com::sun::star::text::XFormField > GetFormField() const { return m_xFormField;} - void SetFormField(::com::sun::star::uno::Reference< ::com::sun::star::text::XFormField > const& xFormField) { m_xFormField = xFormField;} + css::uno::Reference<css::beans::XPropertySet> GetCustomField() const { return m_xCustomField; } + void SetCustomField(css::uno::Reference<css::beans::XPropertySet> const& xCustomField) { m_xCustomField = xCustomField; } + css::uno::Reference<css::text::XTextField> GetTextField() const { return m_xTextField;} + void SetTextField(css::uno::Reference<css::text::XTextField> const& xTextField) { m_xTextField = xTextField;} + css::uno::Reference<css::text::XFormField> GetFormField() const { return m_xFormField;} + void SetFormField(css::uno::Reference<css::text::XFormField> const& xFormField) { m_xFormField = xFormField;} - void SetTOC( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > const& xTOC ) { m_xTOC = xTOC; } - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > GetTOC() { return m_xTOC; } + void SetTOC(css::uno::Reference<css::beans::XPropertySet> const& xTOC) { m_xTOC = xTOC; } + css::uno::Reference<css::beans::XPropertySet> GetTOC() { return m_xTOC; } - void SetTC( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > const& xTC ) { m_xTC = xTC; } - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > GetTC( ) { return m_xTC; } + void SetTC(css::uno::Reference<css::beans::XPropertySet> const& xTC) { m_xTC = xTC; } + css::uno::Reference<css::beans::XPropertySet> GetTC() { return m_xTC; } void SetHyperlinkURL( const OUString& rURL ) { m_sHyperlinkURL = rURL; } const OUString& GetHyperlinkURL() { return m_sHyperlinkURL; } @@ -199,14 +199,13 @@ public: struct TextAppendContext { - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextAppend > xTextAppend; - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > xInsertPosition; - ::com::sun::star::uno::Reference< ::com::sun::star::text::XParagraphCursor > xCursor; + css::uno::Reference<css::text::XTextAppend> xTextAppend; + css::uno::Reference<css::text::XTextRange> xInsertPosition; + css::uno::Reference<css::text::XParagraphCursor> xCursor; ParagraphPropertiesPtr pLastParagraphProperties; - TextAppendContext( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextAppend >& xAppend, - const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor >& xCur ) : - xTextAppend( xAppend ) + TextAppendContext(const css::uno::Reference<css::text::XTextAppend>& xAppend, const css::uno::Reference<css::text::XTextCursor>& xCur) + : xTextAppend(xAppend) { xCursor.set(xCur, css::uno::UNO_QUERY); xInsertPosition.set(xCursor, css::uno::UNO_QUERY); @@ -215,11 +214,13 @@ struct TextAppendContext struct AnchoredContext { - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > xTextContent; - bool bToRemove; + css::uno::Reference<css::text::XTextContent> xTextContent; + bool bToRemove; - AnchoredContext( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >& xContent ) : - xTextContent( xContent ), bToRemove( false ) {} + AnchoredContext(const css::uno::Reference<css::text::XTextContent>& xContent) + : xTextContent(xContent), bToRemove(false) + { + } }; typedef std::shared_ptr<FieldContext> FieldContextPtr; @@ -234,7 +235,7 @@ typedef std::stack< AnchoredContext > TextContentStack; /*------------------------------------------------------------------------- extended tab stop struct -----------------------------------------------------------------------*/ -struct DeletableTabStop : public ::com::sun::star::style::TabStop +struct DeletableTabStop : public css::style::TabStop { bool bDeleted; DeletableTabStop() @@ -244,9 +245,11 @@ struct DeletableTabStop : public ::com::sun::star::style::TabStop FillChar = ' '; DecimalChar = ','; } - DeletableTabStop( const ::com::sun::star::style::TabStop& rTabStop ) : - TabStop( rTabStop ), - bDeleted( false ){} + DeletableTabStop(const css::style::TabStop& rTabStop) + : TabStop(rTabStop), + bDeleted(false) + { + } }; /*------------------------------------------------------------------------- /// helper to remember bookmark start position @@ -255,9 +258,8 @@ struct BookmarkInsertPosition { bool m_bIsStartOfText; OUString m_sBookmarkName; - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > m_xTextRange; - BookmarkInsertPosition(bool bIsStartOfText, const OUString& rName, - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > const& xTextRange): + css::uno::Reference<css::text::XTextRange> m_xTextRange; + BookmarkInsertPosition(bool bIsStartOfText, const OUString& rName, css::uno::Reference<css::text::XTextRange> const& xTextRange): m_bIsStartOfText( bIsStartOfText ), m_sBookmarkName( rName ), m_xTextRange( xTextRange ) @@ -267,8 +269,8 @@ struct BookmarkInsertPosition /// Stores the start/end positions of an annotation before its insertion. struct AnnotationPosition { - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > m_xStart; - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > m_xEnd; + css::uno::Reference<css::text::XTextRange> m_xStart; + css::uno::Reference<css::text::XTextRange> m_xEnd; }; typedef std::unordered_map< sal_Int32, AnnotationPosition > AnnotationPositions_t; @@ -319,13 +321,13 @@ public: private: SourceDocumentType m_eDocumentType; DomainMapper& m_rDMapper; - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextDocument > m_xTextDocument; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xDocumentSettings; - ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > m_xTextFactory; - ::com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > m_xComponentContext; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xPageStyles; - ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > m_xBodyText; - ::com::sun::star::uno::Reference< css::text::XTextContent > m_xEmbedded; + css::uno::Reference<css::text::XTextDocument> m_xTextDocument; + css::uno::Reference<css::beans::XPropertySet> m_xDocumentSettings; + css::uno::Reference<css::lang::XMultiServiceFactory> m_xTextFactory; + css::uno::Reference<css::uno::XComponentContext> m_xComponentContext; + css::uno::Reference<css::container::XNameContainer> m_xPageStyles; + css::uno::Reference<css::text::XText> m_xBodyText; + css::uno::Reference<css::text::XTextContent> m_xEmbedded; TextAppendStack m_aTextAppendStack; @@ -371,7 +373,7 @@ private: ContextStack m_aContextStack; FontTablePtr m_pFontTable; ListsManager::Pointer m_pListTable; - std::deque< com::sun::star::uno::Reference< com::sun::star::drawing::XShape > > m_aPendingShapes; + std::deque< css::uno::Reference<css::drawing::XShape> > m_aPendingShapes; StyleSheetTablePtr m_pStyleSheetTable; ThemeTablePtr m_pThemeTable; SettingsTablePtr m_pSettingsTable; @@ -396,9 +398,9 @@ private: bool m_bIsCustomFtnMark; //registered frame properties - ::com::sun::star::uno::Sequence< css::beans::PropertyValue > m_aFrameProperties; - ::com::sun::star::uno::Reference< css::text::XTextRange > m_xFrameStartRange; - ::com::sun::star::uno::Reference< css::text::XTextRange > m_xFrameEndRange; + css::uno::Sequence<css::beans::PropertyValue> m_aFrameProperties; + css::uno::Reference<css::text::XTextRange> m_xFrameStartRange; + css::uno::Reference<css::text::XTextRange> m_xFrameEndRange; // Redline stack std::stack< std::vector< RedlineParamsPtr > > m_aRedlines; @@ -431,20 +433,15 @@ private: sal_Int32 m_nAnnotationId; AnnotationPositions_t m_aAnnotationPositions; - void GetCurrentLocale(::com::sun::star::lang::Locale& rLocale); - void SetNumberFormat( const OUString& rCommand, - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > const& xPropertySet, - bool bDetectFormat = false ); - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > - FindOrCreateFieldMaster( const sal_Char* pFieldMasterService, - const OUString& rFieldMasterName ) - throw(::com::sun::star::uno::Exception); - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > GetDocumentSettings(); + void GetCurrentLocale(css::lang::Locale& rLocale); + void SetNumberFormat(const OUString& rCommand, css::uno::Reference<css::beans::XPropertySet> const& xPropertySet, bool bDetectFormat = false); + css::uno::Reference<css::beans::XPropertySet> FindOrCreateFieldMaster(const sal_Char* pFieldMasterService, const OUString& rFieldMasterName) throw(css::uno::Exception); + css::uno::Reference<css::beans::XPropertySet> GetDocumentSettings(); - std::map< sal_Int32, com::sun::star::uno::Any > deferredCharacterProperties; + std::map<sal_Int32, css::uno::Any> deferredCharacterProperties; public: - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > m_xInsertTextRange; + css::uno::Reference<css::text::XTextRange> m_xInsertTextRange; private: bool m_bIsNewDoc; public: @@ -462,27 +459,27 @@ public: return dynamic_cast< SectionPropertyMap* >( m_pLastSectionContext.get( ) ); } - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > GetPageStyles(); - ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > GetBodyText(); - ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > GetTextFactory() const + css::uno::Reference<css::container::XNameContainer> GetPageStyles(); + css::uno::Reference<css::text::XText> GetBodyText(); + css::uno::Reference<css::lang::XMultiServiceFactory> GetTextFactory() const { return m_xTextFactory; } - ::com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > GetComponentContext() const + css::uno::Reference<css::uno::XComponentContext> GetComponentContext() const { return m_xComponentContext; } - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextDocument > GetTextDocument() const + css::uno::Reference<css::text::XTextDocument> GetTextDocument() const { return m_xTextDocument; } void SetDocumentSettingsProperty( const OUString& rPropName, const css::uno::Any& rValue ); - void CreateRedline( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > const& xRange, RedlineParamsPtr pRedline ); + void CreateRedline(css::uno::Reference<css::text::XTextRange> const& xRange, RedlineParamsPtr pRedline); - void CheckParaMarkerRedline( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > const& xRange ); + void CheckParaMarkerRedline(css::uno::Reference<css::text::XTextRange> const& xRange); - void CheckRedline( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > const& xRange ); + void CheckRedline(css::uno::Reference<css::text::XTextRange> const& xRange); void StartParaMarkerChange( ); void EndParaMarkerChange( ); @@ -524,12 +521,10 @@ public: void finishParagraph( PropertyMapPtr pPropertyMap ); void appendTextPortion( const OUString& rString, PropertyMapPtr pPropertyMap ); - void appendTextContent( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >&, - const css::uno::Sequence< css::beans::PropertyValue >& ); + void appendTextContent(const css::uno::Reference<css::text::XTextContent>&, const css::uno::Sequence<css::beans::PropertyValue>&); void appendOLE( const OUString& rStreamName, OLEHandlerPtr pOleHandler ); void appendStarMath( const Value& v ); - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > appendTextSectionAfter( - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xBefore ); + css::uno::Reference<css::beans::XPropertySet> appendTextSectionAfter(css::uno::Reference<css::text::XTextRange>& xBefore); // push the new properties onto the stack and make it the 'current' property map void PushProperties(ContextType eId); @@ -544,7 +539,7 @@ public: } PropertyMapPtr GetTopContextOfType(ContextType eId); - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextAppend > GetTopTextAppend(); + css::uno::Reference<css::text::XTextAppend> GetTopTextAppend(); FieldContextPtr GetTopFieldContext(); FontTablePtr GetFontTable() @@ -579,28 +574,28 @@ public: // this method deletes the current m_pGraphicImport after import void ImportGraphic(writerfilter::Reference< Properties>::Pointer_t, GraphicImportType eGraphicImportType ); - void InitTabStopFromStyle( const ::com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop >& rInitTabStops ); + void InitTabStopFromStyle(const css::uno::Sequence<css::style::TabStop>& rInitTabStops); void IncorporateTabStop( const DeletableTabStop &aTabStop ); - ::com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > GetCurrentTabStopAndClear(); + css::uno::Sequence<css::style::TabStop> GetCurrentTabStopAndClear(); void NextTabStop() {++m_nCurrentTabStopIndex;} void SetCurrentParaStyleId(const OUString& sStringValue) {m_sCurrentParaStyleId = sStringValue;} OUString GetCurrentParaStyleId() const {return m_sCurrentParaStyleId;} - ::com::sun::star::uno::Any GetPropertyFromStyleSheet(PropertyIds eId); + css::uno::Any GetPropertyFromStyleSheet(PropertyIds eId); void SetStyleSheetImport( bool bSet ) { m_bInStyleSheetImport = bSet;} bool IsStyleSheetImport()const { return m_bInStyleSheetImport;} void SetAnyTableImport( bool bSet ) { m_bInAnyTableImport = bSet;} bool IsAnyTableImport()const { return m_bInAnyTableImport;} bool IsInShape()const { return m_aAnchoredStack.size() > 0;} - void PushShapeContext( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xShape ); + void PushShapeContext(const css::uno::Reference<css::drawing::XShape>& xShape); void PopShapeContext(); - void UpdateEmbeddedShapeProps( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xShape ); + void UpdateEmbeddedShapeProps(const css::uno::Reference<css::drawing::XShape>& xShape); /// Add a pending shape: it's currently inserted into the document, but it should be removed before the import finishes. - void PushPendingShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xShape ); + void PushPendingShape(const css::uno::Reference<css::drawing::XShape>& xShape); /// Get the first pending shape, if there are any. - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > PopPendingShape(); + css::uno::Reference<css::drawing::XShape> PopPendingShape(); void PushPageHeader(SectionPropertyMap::PageType eType); void PushPageFooter(SectionPropertyMap::PageType eType); @@ -732,11 +727,9 @@ public: void CheckUnregisteredFrameConversion( ); - void RegisterFrameConversion( - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > const& xFrameStartRange, - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > const& xFrameEndRange, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aFrameProperties - ); + void RegisterFrameConversion(css::uno::Reference<css::text::XTextRange> const& xFrameStartRange, + css::uno::Reference<css::text::XTextRange> const& xFrameEndRange, + const css::uno::Sequence<css::beans::PropertyValue>& aFrameProperties); bool ExecuteFrameConversion(); void AddNewRedline( sal_uInt32 sprmId ); @@ -759,9 +752,9 @@ public: void ApplySettingsTable(); SectionPropertyMap * GetSectionContext(); /// If the current paragraph has a numbering style associated, this method returns its character style (part of the numbering rules) - com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> GetCurrentNumberingCharStyle(); + css::uno::Reference<css::beans::XPropertySet> GetCurrentNumberingCharStyle(); /// If the current paragraph has a numbering style associated, this method returns its numbering rules - com::sun::star::uno::Reference<com::sun::star::container::XIndexAccess> GetCurrentNumberingRules(sal_Int32* pListLevel = nullptr); + css::uno::Reference<css::container::XIndexAccess> GetCurrentNumberingRules(sal_Int32* pListLevel = nullptr); /** Used for attributes/sprms which cannot be evaluated immediatelly (e.g. they depend diff --git a/writerfilter/source/dmapper/FontTable.hxx b/writerfilter/source/dmapper/FontTable.hxx index 8c13f0434649..9c6560e0a78c 100644 --- a/writerfilter/source/dmapper/FontTable.hxx +++ b/writerfilter/source/dmapper/FontTable.hxx @@ -89,7 +89,7 @@ class FontTable : public LoggedProperties, public LoggedTable virtual void lcl_substream(Id name, ::writerfilter::Reference<Stream>::Pointer_t ref) SAL_OVERRIDE; virtual void lcl_info(const std::string & info) SAL_OVERRIDE; - virtual void lcl_startShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > const& xShape ) SAL_OVERRIDE; + virtual void lcl_startShape(css::uno::Reference<css::drawing::XShape> const& xShape) SAL_OVERRIDE; virtual void lcl_endShape( ) SAL_OVERRIDE; }; @@ -107,7 +107,7 @@ private: const char* const style; OUString id; OUString fontKey; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > inputStream; + css::uno::Reference<css::io::XInputStream> inputStream; }; diff --git a/writerfilter/source/dmapper/GraphicHelpers.cxx b/writerfilter/source/dmapper/GraphicHelpers.cxx index de940e5d8150..f0bf7b282785 100644 --- a/writerfilter/source/dmapper/GraphicHelpers.cxx +++ b/writerfilter/source/dmapper/GraphicHelpers.cxx @@ -209,7 +209,7 @@ sal_Int32 WrapHandler::getWrapMode( ) { // The wrap values do not map directly to our wrap mode, // e.g. none in .docx actually means through in LO. - sal_Int32 nMode = com::sun::star::text::WrapTextMode_THROUGHT; + sal_Int32 nMode = text::WrapTextMode_THROUGHT; switch ( m_nType ) { @@ -221,22 +221,22 @@ sal_Int32 WrapHandler::getWrapMode( ) switch ( m_nSide ) { case NS_ooxml::LN_Value_vml_wordprocessingDrawing_ST_WrapSide_left: - nMode = com::sun::star::text::WrapTextMode_LEFT; + nMode = text::WrapTextMode_LEFT; break; case NS_ooxml::LN_Value_vml_wordprocessingDrawing_ST_WrapSide_right: - nMode = com::sun::star::text::WrapTextMode_RIGHT; + nMode = text::WrapTextMode_RIGHT; break; default: - nMode = com::sun::star::text::WrapTextMode_PARALLEL; + nMode = text::WrapTextMode_PARALLEL; } } break; case NS_ooxml::LN_Value_vml_wordprocessingDrawing_ST_WrapType_topAndBottom: - nMode = com::sun::star::text::WrapTextMode_NONE; + nMode = text::WrapTextMode_NONE; break; case NS_ooxml::LN_Value_vml_wordprocessingDrawing_ST_WrapType_none: default: - nMode = com::sun::star::text::WrapTextMode_THROUGHT; + nMode = text::WrapTextMode_THROUGHT; } return nMode; diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 9cfae2905612..d098daa2ea0b 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -704,7 +704,7 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) bContainsEffects = true; } - ::com::sun::star::beans::PropertyValues aMediaProperties( 1 ); + beans::PropertyValues aMediaProperties( 1 ); aMediaProperties[0].Name = "URL"; aMediaProperties[0].Value <<= sUrl; @@ -1218,16 +1218,16 @@ uno::Reference< text::XTextContent > GraphicImport::createGraphicObject( const b if (m_pImpl->nShadowXDistance > 0) { if (m_pImpl->nShadowYDistance > 0) - aShadow.Location = com::sun::star::table::ShadowLocation_BOTTOM_RIGHT; + aShadow.Location = table::ShadowLocation_BOTTOM_RIGHT; else - aShadow.Location = com::sun::star::table::ShadowLocation_TOP_RIGHT; + aShadow.Location = table::ShadowLocation_TOP_RIGHT; } else { if (m_pImpl->nShadowYDistance > 0) - aShadow.Location = com::sun::star::table::ShadowLocation_BOTTOM_LEFT; + aShadow.Location = table::ShadowLocation_BOTTOM_LEFT; else - aShadow.Location = com::sun::star::table::ShadowLocation_TOP_LEFT; + aShadow.Location = table::ShadowLocation_TOP_LEFT; } xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName(PROP_SHADOW_FORMAT), uno::makeAny(aShadow)); @@ -1385,7 +1385,7 @@ void GraphicImport::data(const sal_uInt8* buf, size_t len, writerfilter::Referen { PropertyNameSupplier& rPropNameSupplier = PropertyNameSupplier::GetPropertyNameSupplier(); - ::com::sun::star::beans::PropertyValues aMediaProperties( 1 ); + beans::PropertyValues aMediaProperties( 1 ); aMediaProperties[0].Name = rPropNameSupplier.GetName(PROP_INPUT_STREAM); uno::Reference< io::XInputStream > xIStream = new XInputStreamHelper( buf, len, m_pImpl->bIsBitmap ); diff --git a/writerfilter/source/dmapper/LoggedResources.hxx b/writerfilter/source/dmapper/LoggedResources.hxx index 4b9c3872b45e..3fc391d0778d 100644 --- a/writerfilter/source/dmapper/LoggedResources.hxx +++ b/writerfilter/source/dmapper/LoggedResources.hxx @@ -59,7 +59,7 @@ public: void endParagraphGroup() SAL_OVERRIDE; void startCharacterGroup() SAL_OVERRIDE; void endCharacterGroup() SAL_OVERRIDE; - void startShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > const& xShape ) SAL_OVERRIDE; + void startShape(css::uno::Reference<css::drawing::XShape> const& xShape) SAL_OVERRIDE; void endShape() SAL_OVERRIDE; void text(const sal_uInt8 * data, size_t len) SAL_OVERRIDE; void utext(const sal_uInt8 * data, size_t len) SAL_OVERRIDE; @@ -78,7 +78,7 @@ protected: virtual void lcl_endParagraphGroup() = 0; virtual void lcl_startCharacterGroup() = 0; virtual void lcl_endCharacterGroup() = 0; - virtual void lcl_startShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > const& xShape ) = 0; + virtual void lcl_startShape(css::uno::Reference<css::drawing::XShape> const& xShape) = 0; virtual void lcl_endShape() = 0; virtual void lcl_text(const sal_uInt8 * data, size_t len) = 0; virtual void lcl_utext(const sal_uInt8 * data, size_t len) = 0; diff --git a/writerfilter/source/dmapper/ModelEventListener.hxx b/writerfilter/source/dmapper/ModelEventListener.hxx index d0933b35efbf..a04686b3fb7e 100644 --- a/writerfilter/source/dmapper/ModelEventListener.hxx +++ b/writerfilter/source/dmapper/ModelEventListener.hxx @@ -26,8 +26,7 @@ namespace writerfilter { namespace dmapper{ -class ModelEventListener : - public cppu::WeakImplHelper< ::com::sun::star::document::XEventListener > +class ModelEventListener : public cppu::WeakImplHelper<css::document::XEventListener> { bool m_bIndexes; bool m_bControls; @@ -35,8 +34,8 @@ public: ModelEventListener(bool bIndexes, bool bControls); virtual ~ModelEventListener(); - virtual void SAL_CALL notifyEvent( const ::com::sun::star::document::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL notifyEvent(const css::document::EventObject& Event) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; }//namespace writerfilter diff --git a/writerfilter/source/dmapper/NumberingManager.hxx b/writerfilter/source/dmapper/NumberingManager.hxx index dffb0de47941..bbc9ba97ef3c 100644 --- a/writerfilter/source/dmapper/NumberingManager.hxx +++ b/writerfilter/source/dmapper/NumberingManager.hxx @@ -52,7 +52,7 @@ class ListLevel : public PropertyMap sal_Int16 m_nXChFollow; //LN_IXCHFOLLOW OUString m_sBulletChar; OUString m_sGraphicURL; - com::sun::star::uno::Reference< com::sun::star::graphic::XGraphic > m_sGraphicBitmap; + css::uno::Reference<css::graphic::XGraphic> m_sGraphicBitmap; sal_Int32 m_nTabstop; std::shared_ptr< StyleSheetEntry > m_pParaStyle; bool m_outline; @@ -80,7 +80,7 @@ public: void SetValue( Id nId, sal_Int32 nValue ); void SetBulletChar( const OUString& sValue ) { m_sBulletChar = sValue; }; void SetGraphicURL( const OUString& sValue ) { m_sGraphicURL = sValue; }; - void SetGraphicBitmap( com::sun::star::uno::Reference< com::sun::star::graphic::XGraphic > const& sValue ) + void SetGraphicBitmap(css::uno::Reference<css::graphic::XGraphic> const& sValue) { m_sGraphicBitmap = sValue; } void SetParaStyle( std::shared_ptr< StyleSheetEntry > pStyle ); void AddRGBXchNums( const OUString& sValue ) { m_sRGBXchNums += sValue; }; @@ -96,17 +96,14 @@ public: static sal_Int16 GetParentNumbering( const OUString& sText, sal_Int16 nLevel, OUString& rPrefix, OUString& rSuffix ); - com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > - GetProperties( ); + css::uno::Sequence<css::beans::PropertyValue> GetProperties(); - com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue> - GetCharStyleProperties( ); + css::uno::Sequence<css::beans::PropertyValue> GetCharStyleProperties(); private: - com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > - GetLevelProperties( ); + css::uno::Sequence<css::beans::PropertyValue> GetLevelProperties(); - void AddParaProperties( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* props ); + void AddParaProperties(css::uno::Sequence<css::beans::PropertyValue>* pProps); }; /// Represents a numbering picture bullet: an id and a graphic. @@ -119,11 +116,11 @@ public: void SetId(sal_Int32 nId); sal_Int32 GetId() { return m_nId;} - void SetShape(com::sun::star::uno::Reference<com::sun::star::drawing::XShape> const& xShape); - com::sun::star::uno::Reference<com::sun::star::drawing::XShape> GetShape() { return m_xShape;} + void SetShape(css::uno::Reference<css::drawing::XShape> const& xShape); + css::uno::Reference<css::drawing::XShape> GetShape() { return m_xShape; } private: sal_Int32 m_nId; - com::sun::star::uno::Reference<com::sun::star::drawing::XShape> m_xShape; + css::uno::Reference<css::drawing::XShape> m_xShape; }; class AbstractListDef @@ -166,9 +163,7 @@ public: ListLevel::Pointer GetCurrentLevel( ) { return m_pCurrentLevel; }; - virtual com::sun::star::uno::Sequence< - com::sun::star::uno::Sequence< - com::sun::star::beans::PropertyValue > > GetPropertyValues( ); + virtual css::uno::Sequence< css::uno::Sequence<css::beans::PropertyValue> > GetPropertyValues(); void SetNumStyleLink(const OUString& sValue) { m_sNumStyleLink = sValue; }; OUString GetNumStyleLink() { return m_sNumStyleLink; }; @@ -196,17 +191,11 @@ public: // Mapping functions static OUString GetStyleName( sal_Int32 nId ); - com::sun::star::uno::Sequence< - com::sun::star::uno::Sequence< - com::sun::star::beans::PropertyValue > > GetPropertyValues( ) SAL_OVERRIDE; + css::uno::Sequence< css::uno::Sequence<css::beans::PropertyValue> > GetPropertyValues() SAL_OVERRIDE; - void CreateNumberingRules( - DomainMapper& rDMapper, - com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory> const& xFactory ); + void CreateNumberingRules(DomainMapper& rDMapper, css::uno::Reference<css::lang::XMultiServiceFactory> const& xFactory); - ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > - GetNumberingRules( ) { return m_xNumRules; }; + css::uno::Reference<css::container::XIndexReplace> GetNumberingRules() { return m_xNumRules; } }; @@ -219,8 +208,7 @@ class ListsManager : private: DomainMapper& m_rDMapper; - com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory > m_xFactory; + css::uno::Reference<css::lang::XMultiServiceFactory> m_xFactory; // The numbering entries std::vector< NumPicBullet::Pointer > m_aNumPicBullets; @@ -244,9 +232,7 @@ private: public: - ListsManager( - DomainMapper& rDMapper, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xFactory); + ListsManager(DomainMapper& rDMapper, const css::uno::Reference<css::lang::XMultiServiceFactory>& xFactory); virtual ~ListsManager(); typedef std::shared_ptr< ListsManager > Pointer; diff --git a/writerfilter/source/dmapper/OLEHandler.hxx b/writerfilter/source/dmapper/OLEHandler.hxx index 5c7011550d89..3e61a959960f 100644 --- a/writerfilter/source/dmapper/OLEHandler.hxx +++ b/writerfilter/source/dmapper/OLEHandler.hxx @@ -62,14 +62,14 @@ class OLEHandler : public LoggedProperties sal_Int32 m_nDyaOrig; sal_Int32 m_nWrapMode; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > m_xShape; + css::uno::Reference<css::drawing::XShape> m_xShape; - ::com::sun::star::awt::Size m_aShapeSize; - ::com::sun::star::awt::Point m_aShapePosition; + css::awt::Size m_aShapeSize; + css::awt::Point m_aShapePosition; - ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > m_xReplacement; + css::uno::Reference<css::graphic::XGraphic> m_xReplacement; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > m_xInputStream; + css::uno::Reference<css::io::XInputStream> m_xInputStream; DomainMapper& m_rDomainMapper; // Properties @@ -77,16 +77,17 @@ class OLEHandler : public LoggedProperties virtual void lcl_sprm(Sprm & sprm) SAL_OVERRIDE; // Interoperability - void saveInteropProperties( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextDocument > const& xTextDocument, - const OUString& sObjectName, const OUString& sOldObjectName = OUString() ); + void saveInteropProperties(css::uno::Reference<css::text::XTextDocument> const& xTextDocument, + const OUString& sObjectName, + const OUString& sOldObjectName = OUString()); public: OLEHandler(DomainMapper& rDomainMapper); virtual ~OLEHandler(); - inline ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getShape( ) { return m_xShape; }; + css::uno::Reference<css::drawing::XShape> getShape() { return m_xShape; }; - inline bool isOLEObject( ) { return m_xInputStream.is( ); }; + bool isOLEObject() { return m_xInputStream.is(); } /// In case of a valid CLSID, import the native data to the previously created empty OLE object. void importStream(css::uno::Reference<css::uno::XComponentContext> xComponentContext, @@ -96,12 +97,11 @@ public: /// Get the CLSID of the OLE object, in case we can find one based on m_sProgId. OUString getCLSID(css::uno::Reference<css::uno::XComponentContext> xComponentContext) const; - OUString copyOLEOStream( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextDocument > const & xTextDocument ); + OUString copyOLEOStream(css::uno::Reference<css::text::XTextDocument> const& xTextDocument); - ::com::sun::star::awt::Size getSize() const { return m_aShapeSize;} - ::com::sun::star::awt::Point getPosition() const { return m_aShapePosition;} - ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > - getReplacement() const { return m_xReplacement; } + css::awt::Size getSize() const { return m_aShapeSize; } + css::awt::Point getPosition() const { return m_aShapePosition; } + css::uno::Reference<css::graphic::XGraphic> getReplacement() const { return m_xReplacement; } }; typedef std::shared_ptr< OLEHandler > OLEHandlerPtr; diff --git a/writerfilter/source/dmapper/PageBordersHandler.hxx b/writerfilter/source/dmapper/PageBordersHandler.hxx index 9b782639661f..7c2d3adf72c8 100644 --- a/writerfilter/source/dmapper/PageBordersHandler.hxx +++ b/writerfilter/source/dmapper/PageBordersHandler.hxx @@ -36,7 +36,7 @@ namespace dmapper { class _PgBorder { public: - com::sun::star::table::BorderLine2 m_rLine; + css::table::BorderLine2 m_rLine; sal_Int32 m_nDistance; BorderPosition m_ePos; bool m_bShadow; diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index dde808edd0d8..261e5d2507c9 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -1117,8 +1117,7 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl ) //set the start value at the beginning of the document xRangeProperties = uno::Reference< beans::XPropertySet >( rDM_Impl.GetTextDocument()->getText()->getStart(), uno::UNO_QUERY_THROW ); } - xRangeProperties->setPropertyValue( rPropNameSupplier.GetName( PROP_BREAK_TYPE ), - uno::makeAny( com::sun::star::style::BreakType_COLUMN_BEFORE)); + xRangeProperties->setPropertyValue(rPropNameSupplier.GetName(PROP_BREAK_TYPE), uno::makeAny(style::BreakType_COLUMN_BEFORE)); } else { diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx index c413d8c065a0..4fdb821dbb09 100644 --- a/writerfilter/source/dmapper/PropertyMap.hxx +++ b/writerfilter/source/dmapper/PropertyMap.hxx @@ -105,14 +105,14 @@ public: class PropertyMap { /// Cache the property values for the GetPropertyValues() call(s). - std::vector< ::com::sun::star::beans::PropertyValue > m_aValues; + std::vector<css::beans::PropertyValue> m_aValues; //marks context as footnote context - ::text( ) events contain either the footnote character or can be ignored //depending on sprmCSymbol sal_Unicode m_cFootnoteSymbol; // 0 == invalid sal_Int32 m_nFootnoteFontId; // negative values are invalid ids OUString m_sFootnoteFontName; - ::com::sun::star::uno::Reference< ::com::sun::star::text::XFootnote > m_xFootnote; + css::uno::Reference<css::text::XFootnote> m_xFootnote; std::map< PropertyIds, PropValue > m_vMap; @@ -133,13 +133,13 @@ public: PropertyMap(); virtual ~PropertyMap(); - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > GetPropertyValues(bool bCharGrabBag = true); + css::uno::Sequence<css::beans::PropertyValue> GetPropertyValues(bool bCharGrabBag = true); //Sequence: Grab Bags: The CHAR_GRAB_BAG has Name "CharInteropGrabBag" and the PARA_GRAB_BAG has Name "ParaInteropGrabBag" // the contained properties are their Value. bool hasEmptyPropertyValues() const {return m_aValues.empty();} //Add property, optionally overwriting existing attributes - void Insert( PropertyIds eId, const ::com::sun::star::uno::Any& rAny, bool bOverwrite = true, GrabBagType i_GrabBagType = NO_GRAB_BAG ); + void Insert(PropertyIds eId, const css::uno::Any& rAny, bool bOverwrite = true, GrabBagType i_GrabBagType = NO_GRAB_BAG); void Insert( PropertyIds eId, const PropValue& rValue, bool bOverwrite = true ); //Remove a named property from *this, does nothing if the property id has not been set void Erase( PropertyIds eId); @@ -153,8 +153,8 @@ public: //Has the property named been set (via Insert)? bool isSet( PropertyIds eId ) const; - const ::com::sun::star::uno::Reference< ::com::sun::star::text::XFootnote>& GetFootnote() const { return m_xFootnote;} - void SetFootnote( ::com::sun::star::uno::Reference< ::com::sun::star::text::XFootnote> const& xF ) { m_xFootnote = xF; } + const css::uno::Reference<css::text::XFootnote>& GetFootnote() const { return m_xFootnote; } + void SetFootnote(css::uno::Reference<css::text::XFootnote> const& xF) { m_xFootnote = xF; } sal_Unicode GetFootnoteSymbol() const { return m_cFootnoteSymbol;} void SetFootnoteSymbol(sal_Unicode cSet) { m_cFootnoteSymbol = cSet;} @@ -174,7 +174,7 @@ public: #ifdef DEBUG_WRITERFILTER void dumpXml( const TagLogger::Pointer_t pLogger ) const; #endif - static com::sun::star::table::ShadowFormat getShadowFromBorder(const css::table::BorderLine2& rBorder); + static css::table::ShadowFormat getShadowFromBorder(const css::table::BorderLine2& rBorder); }; typedef std::shared_ptr<PropertyMap> PropertyMapPtr; @@ -188,14 +188,14 @@ class SectionPropertyMap : public PropertyMap // empty strings mark page settings as not yet imported bool m_bIsFirstSection; - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > m_xStartingRange; + css::uno::Reference<css::text::XTextRange> m_xStartingRange; OUString m_sFirstPageStyleName; OUString m_sFollowPageStyleName; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_aFirstPageStyle; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_aFollowPageStyle; + css::uno::Reference<css::beans::XPropertySet> m_aFirstPageStyle; + css::uno::Reference<css::beans::XPropertySet> m_aFollowPageStyle; - ::com::sun::star::table::BorderLine2* m_pBorderLines[4]; + css::table::BorderLine2* m_pBorderLines[4]; sal_Int32 m_nBorderDistances[4]; sal_Int32 m_nBorderParams; bool m_bBorderShadows[4]; @@ -237,18 +237,22 @@ class SectionPropertyMap : public PropertyMap sal_Int32 m_ndxaLnn; sal_Int32 m_nLnnMin; - void _ApplyProperties( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > const& xStyle ); - ::com::sun::star::uno::Reference< com::sun::star::text::XTextColumns > ApplyColumnProperties( - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > const& xFollowPageStyle, DomainMapper_Impl& rDM_Impl ); + void _ApplyProperties(css::uno::Reference<css::beans::XPropertySet> const& xStyle); + css::uno::Reference<css::text::XTextColumns> ApplyColumnProperties(css::uno::Reference<css::beans::XPropertySet> const& xFollowPageStyle, + DomainMapper_Impl& rDM_Impl); void CopyLastHeaderFooter( bool bFirstPage, DomainMapper_Impl& rDM_Impl ); - void CopyHeaderFooter( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPrevStyle, - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xStyle ); + void CopyHeaderFooter(css::uno::Reference<css::beans::XPropertySet> xPrevStyle, + css::uno::Reference<css::beans::XPropertySet> xStyle); void PrepareHeaderFooterProperties( bool bFirstPage ); bool HasHeader( bool bFirstPage ) const; bool HasFooter( bool bFirstPage ) const; - void SetBorderDistance( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > const& xStyle, - PropertyIds eMarginId, PropertyIds eDistId, sal_Int32 nDistance, sal_Int32 nOffsetFrom, sal_uInt32 nLineWidth ); + void SetBorderDistance(css::uno::Reference<css::beans::XPropertySet> const& xStyle, + PropertyIds eMarginId, + PropertyIds eDistId, + sal_Int32 nDistance, + sal_Int32 nOffsetFrom, + sal_uInt32 nLineWidth); public: explicit SectionPropertyMap(bool bIsFirstSection); @@ -261,19 +265,18 @@ public: PAGE_RIGHT }; - void SetStart( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange ) + void SetStart(const css::uno::Reference<css::text::XTextRange>& xRange) { m_xStartingRange = xRange; } - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > GetStartingRange() const { return m_xStartingRange; } + css::uno::Reference<css::text::XTextRange> GetStartingRange() const { return m_xStartingRange; } - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > GetPageStyle( - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xStyles, - const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory >& xTextFactory, - bool bFirst ); + css::uno::Reference<css::beans::XPropertySet> GetPageStyle(const css::uno::Reference<css::container::XNameContainer>& xStyles, + const css::uno::Reference<css::lang::XMultiServiceFactory>& xTextFactory, + bool bFirst); - void SetBorder( BorderPosition ePos, sal_Int32 nLineDistance, const ::com::sun::star::table::BorderLine2& rBorderLine, bool bShadow ); + void SetBorder(BorderPosition ePos, sal_Int32 nLineDistance, const css::table::BorderLine2& rBorderLine, bool bShadow); void SetBorderParams( sal_Int32 nSet ) { m_nBorderParams = nSet; } void SetColumnCount( sal_Int16 nCount ) { m_nColumnCount = nCount; } @@ -317,10 +320,9 @@ public: void SetLnnMin( sal_Int32 nValue ) { m_nLnnMin = nValue; } //determine which style gets the borders - void ApplyBorderToPageStyles( - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xStyles, - const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory >& xTextFactory, - sal_Int32 nValue ); + void ApplyBorderToPageStyles(const css::uno::Reference<css::container::XNameContainer>& xStyles, + const css::uno::Reference<css::lang::XMultiServiceFactory>& xTextFactory, + sal_Int32 nValue); void CloseSectionGroup( DomainMapper_Impl& rDM_Impl ); /// Handling of margins, header and footer for any kind of sections breaks. @@ -354,8 +356,8 @@ class ParagraphProperties OUString m_sParaStyleName; - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > m_xStartingRange; //start of a frame - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > m_xEndingRange; //end of the frame + css::uno::Reference<css::text::XTextRange> m_xStartingRange; // start of a frame + css::uno::Reference<css::text::XTextRange> m_xEndingRange; // end of the frame public: ParagraphProperties(); @@ -416,11 +418,11 @@ public: sal_Int8 GetDropCapLength() const { return m_nDropCapLength;} void SetDropCapLength(sal_Int8 nSet) { m_nDropCapLength = nSet;} - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > GetStartingRange() const { return m_xStartingRange; } - void SetStartingRange( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > const& xSet ) { m_xStartingRange = xSet; } + css::uno::Reference<css::text::XTextRange> GetStartingRange() const { return m_xStartingRange; } + void SetStartingRange(css::uno::Reference<css::text::XTextRange> const& xSet) { m_xStartingRange = xSet; } - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > GetEndingRange() const { return m_xEndingRange; } - void SetEndingRange( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > const& xSet ) { m_xEndingRange = xSet; } + css::uno::Reference<css::text::XTextRange> GetEndingRange() const { return m_xEndingRange; } + void SetEndingRange(css::uno::Reference<css::text::XTextRange> const& xSet) { m_xEndingRange = xSet; } void SetParaStyleName( const OUString& rSet ) { m_sParaStyleName = rSet;} const OUString& GetParaStyleName() const { return m_sParaStyleName;} diff --git a/writerfilter/source/dmapper/SettingsTable.hxx b/writerfilter/source/dmapper/SettingsTable.hxx index c74150b0e442..16ed8f839b3a 100644 --- a/writerfilter/source/dmapper/SettingsTable.hxx +++ b/writerfilter/source/dmapper/SettingsTable.hxx @@ -44,9 +44,7 @@ class SettingsTable : public LoggedProperties, public LoggedTable SettingsTable_Impl *m_pImpl; public: - SettingsTable( DomainMapper& rDMapper, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xTextFactory - ); + SettingsTable(DomainMapper& rDMapper, const css::uno::Reference<css::lang::XMultiServiceFactory>& xTextFactory); virtual ~SettingsTable(); //returns default TabStop in 1/100th mm diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx b/writerfilter/source/dmapper/StyleSheetTable.hxx index e7eaf02ea47c..44d33ea95e6e 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.hxx +++ b/writerfilter/source/dmapper/StyleSheetTable.hxx @@ -88,8 +88,7 @@ class StyleSheetTable : StyleSheetTable_Impl *m_pImpl; public: - StyleSheetTable( DomainMapper& rDMapper, - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextDocument> const& xTextDocument, bool bIsNewDoc ); + StyleSheetTable(DomainMapper& rDMapper, css::uno::Reference<css::text::XTextDocument> const& xTextDocument, bool bIsNewDoc); virtual ~StyleSheetTable(); void ApplyStyleSheets( FontTablePtr rFontTable ); diff --git a/writerfilter/source/dmapper/TDefTableHandler.hxx b/writerfilter/source/dmapper/TDefTableHandler.hxx index 7128ac4a7418..eb6b37b517cc 100644 --- a/writerfilter/source/dmapper/TDefTableHandler.hxx +++ b/writerfilter/source/dmapper/TDefTableHandler.hxx @@ -44,14 +44,14 @@ private: ::std::vector<sal_Int32> m_aCellBorderPositions; ::std::vector<sal_Int32> m_aCellVertAlign; - ::std::vector< ::com::sun::star::table::BorderLine2 > m_aLeftBorderLines; - ::std::vector< ::com::sun::star::table::BorderLine2 > m_aRightBorderLines; - ::std::vector< ::com::sun::star::table::BorderLine2 > m_aTopBorderLines; - ::std::vector< ::com::sun::star::table::BorderLine2 > m_aBottomBorderLines; - ::std::vector< ::com::sun::star::table::BorderLine2 > m_aInsideHBorderLines; - ::std::vector< ::com::sun::star::table::BorderLine2 > m_aInsideVBorderLines; - ::std::vector< ::com::sun::star::table::BorderLine2 > m_aTl2brBorderLines; - ::std::vector< ::com::sun::star::table::BorderLine2 > m_aTr2blBorderLines; + std::vector<css::table::BorderLine2> m_aLeftBorderLines; + std::vector<css::table::BorderLine2> m_aRightBorderLines; + std::vector<css::table::BorderLine2> m_aTopBorderLines; + std::vector<css::table::BorderLine2> m_aBottomBorderLines; + std::vector<css::table::BorderLine2> m_aInsideHBorderLines; + std::vector<css::table::BorderLine2> m_aInsideVBorderLines; + std::vector<css::table::BorderLine2> m_aTl2brBorderLines; + std::vector<css::table::BorderLine2> m_aTr2blBorderLines; //values of the current border sal_Int32 m_nLineWidth; diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx b/writerfilter/source/dmapper/TablePropertiesHandler.cxx index 4bc10ec0a908..202be04b83de 100644 --- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx +++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx @@ -159,7 +159,7 @@ namespace dmapper { nToken = XML_tableCellDelete; break; default: - throw ::com::sun::star::lang::IllegalArgumentException("illegal redline token type", nullptr, 0); + throw lang::IllegalArgumentException("illegal redline token type", nullptr, 0); break; }; TrackChangesHandlerPtr pTrackChangesHandler( new TrackChangesHandler( nToken ) ); diff --git a/writerfilter/source/dmapper/TrackChangesHandler.hxx b/writerfilter/source/dmapper/TrackChangesHandler.hxx index 7ff7b8c5e3f9..31b4d61bb631 100644 --- a/writerfilter/source/dmapper/TrackChangesHandler.hxx +++ b/writerfilter/source/dmapper/TrackChangesHandler.hxx @@ -35,8 +35,8 @@ public: TrackChangesHandler( sal_Int32 nToken ); virtual ~TrackChangesHandler(); - // Compute the UNO properties for the track changes object based on the received tokens. - com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> getRedlineProperties() const; + /// Compute the UNO properties for the track changes object based on the received tokens. + css::uno::Sequence<css::beans::PropertyValue> getRedlineProperties() const; }; typedef std::shared_ptr<TrackChangesHandler> TrackChangesHandlerPtr; }} diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index 8a8e1b877571..85c5f1bad1b1 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -155,7 +155,7 @@ bool OOXMLFastContextHandler::prepareMceContext(Token_t nElement, const uno::Ref return false; } -// ::com::sun::star::xml::sax::XFastContextHandler: +// xml::sax::XFastContextHandler: void SAL_CALL OOXMLFastContextHandler::startFastElement (Token_t Element, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx index f4e0ba751a9f..d6e6933cfb83 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx @@ -58,7 +58,7 @@ public: virtual ~OOXMLFastContextHandler(); - // ::com::sun::star::xml::sax::XFastContextHandler: + // css::xml::sax::XFastContextHandler: virtual void SAL_CALL startFastElement (Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; @@ -459,7 +459,7 @@ public: virtual std::string getType() const SAL_OVERRIDE { return "Shape"; } - // ::com::sun::star::xml::sax::XFastContextHandler: + // css::xml::sax::XFastContextHandler: virtual void SAL_CALL startUnknownElement (const OUString & Namespace, const OUString & Name, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; @@ -498,9 +498,8 @@ protected: /** OOXMLFastContextHandlerWrapper wraps an OOXMLFastContextHandler. - The method calls for the interface - ::com::sun::star::xml::sax::XFastContextHandler are forwarded to the wrapped - OOXMLFastContextHandler. + The method calls for the interface css::xml::sax::XFastContextHandler are + forwarded to the wrapped OOXMLFastContextHandler. */ class OOXMLFastContextHandlerWrapper : public OOXMLFastContextHandler { @@ -508,7 +507,7 @@ public: explicit OOXMLFastContextHandlerWrapper(OOXMLFastContextHandler * pParent, css::uno::Reference<css::xml::sax::XFastContextHandler> xContext); virtual ~OOXMLFastContextHandlerWrapper(); - // ::com::sun::star::xml::sax::XFastContextHandler: + // css::xml::sax::XFastContextHandler: virtual void SAL_CALL startUnknownElement(const OUString & Namespace, const OUString & Name, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx index 46aa31fc40ed..cdd4644cd4b6 100644 --- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx @@ -46,7 +46,7 @@ OOXMLFastDocumentHandler::OOXMLFastDocumentHandler( { } -// ::com::sun::star::xml::sax::XFastContextHandler: +// css::xml::sax::XFastContextHandler: void SAL_CALL OOXMLFastDocumentHandler::startFastElement (::sal_Int32 #ifdef DEBUG_WRITERFILTER @@ -182,7 +182,7 @@ void SAL_CALL OOXMLFastDocumentHandler::characters(const OUString & /*aChars*/) { } -// ::com::sun::star::xml::sax::XFastDocumentHandler: +// css::xml::sax::XFastDocumentHandler: void SAL_CALL OOXMLFastDocumentHandler::startDocument() throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx index d3ac6bca8b2e..8678c07c9909 100644 --- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx +++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx @@ -44,7 +44,7 @@ public: sal_Int32 nXNoteId ); virtual ~OOXMLFastDocumentHandler() {} - // ::com::sun::star::xml::sax::XFastDocumentHandler: + // css::xml::sax::XFastDocumentHandler: virtual void SAL_CALL startDocument() throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL endDocument() @@ -53,7 +53,7 @@ public: (const css::uno::Reference< css::xml::sax::XLocator > & xLocator) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; - // ::com::sun::star::xml::sax::XFastContextHandler: + // css::xml::sax::XFastContextHandler: virtual void SAL_CALL startFastElement (::sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx index f755c202e4bd..735019f20e5e 100644 --- a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx +++ b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx @@ -25,8 +25,6 @@ #include <com/sun/star/uri/UriReferenceFactory.hpp> #include <com/sun/star/xml/sax/Parser.hpp> -//#define DEBUG_STREAM - namespace writerfilter { namespace ooxml { @@ -126,11 +124,11 @@ bool OOXMLStreamImpl::lcl_getTarget(uno::Reference<embed::XRelationshipAccess> } bool bFound = false; - static uno::Reference< com::sun::star::uri::XUriReferenceFactory > xFac = ::com::sun::star::uri::UriReferenceFactory::create( mxContext ); + static uno::Reference<uri::XUriReferenceFactory> xFac = uri::UriReferenceFactory::create(mxContext); // use '/' to representent the root of the zip package ( and provide a 'file' scheme to // keep the XUriReference implementation happy ) // add mspath to represent the 'source' of this stream - uno::Reference< com::sun::star::uri::XUriReference > xBase = xFac->parse( "file:///" + msPath ); + uno::Reference<uri::XUriReference> xBase = xFac->parse("file:///" + msPath); static const char sType[] = "Type"; static const char sDocumentType[] = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument"; @@ -325,8 +323,8 @@ bool OOXMLStreamImpl::lcl_getTarget(uno::Reference<embed::XRelationshipAccess> // with a base Uri of file://base/foo will resolve to // file://base/word. We need something more than some // simple string concatination here to handle that. - uno::Reference< com::sun::star::uri::XUriReference > xPart = xFac->parse( sMyTarget ); - uno::Reference< com::sun::star::uri::XUriReference > xAbs = xFac->makeAbsolute( xBase, xPart, sal_True, com::sun::star::uri::RelativeUriExcessParentSegments_RETAIN ); + uno::Reference<uri::XUriReference> xPart = xFac->parse(sMyTarget); + uno::Reference<uri::XUriReference> xAbs = xFac->makeAbsolute(xBase, xPart, sal_True, uri::RelativeUriExcessParentSegments_RETAIN); rDocumentTarget = xAbs->getPath(); // path will start with the fragment separator. need to // remove that |