diff options
Diffstat (limited to 'sw/source/filter')
46 files changed, 346 insertions, 346 deletions
diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index ae2693af88a4..9db885407650 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -58,7 +58,7 @@ #include <rtl/bootstrap.hxx> using namespace utl; -using namespace com::sun::star::uno; +using namespace css::uno; using namespace com::sun::star; SwRead ReadAscii = 0, ReadHTML = 0, ReadXML = 0; @@ -267,7 +267,7 @@ void SwFilterOptions::GetValues( sal_uInt16 nCnt, const sal_Char** ppNames, } void SwFilterOptions::ImplCommit() {} -void SwFilterOptions::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {} +void SwFilterOptions::Notify( const css::uno::Sequence< OUString >& ) {} void StgReader::SetFltName( const OUString& rFltNm ) { diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx index 8421dedac9a2..6b9819ef7a2b 100644 --- a/sw/source/filter/basflt/iodetect.cxx +++ b/sw/source/filter/basflt/iodetect.cxx @@ -87,7 +87,7 @@ const SfxFilter* SwIoSystem::GetFilterOfFormat(const OUString& rFormatNm, return 0; } -bool SwIoSystem::IsValidStgFilter( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rStg, const SfxFilter& rFilter) +bool SwIoSystem::IsValidStgFilter( const css::uno::Reference < css::embed::XStorage >& rStg, const SfxFilter& rFilter) { bool bRet = false; try @@ -97,7 +97,7 @@ bool SwIoSystem::IsValidStgFilter( const com::sun::star::uno::Reference < com::s if ( bRet ) bRet = ( nStgFormatId != SotClipboardFormatId::NONE && ( rFilter.GetFormat() == nStgFormatId ) ); } - catch (const com::sun::star::uno::Exception& ) + catch (const css::uno::Exception& ) { } diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx index 303d8e1e22d3..2305a92aac0b 100644 --- a/sw/source/filter/html/htmlbas.cxx +++ b/sw/source/filter/html/htmlbas.cxx @@ -46,8 +46,8 @@ #include "swhtml.hxx" using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::container; +using namespace css::uno; +using namespace css::container; static HTMLOutEvent aBodyEventTable[] = { diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index f9c5ded4e078..984dcc94604b 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -77,9 +77,9 @@ #include "htmlform.hxx" using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::form; +using namespace css::uno; +using namespace css::lang; +using namespace css::form; const sal_uInt16 TABINDEX_MIN = 0; const sal_uInt16 TABINDEX_MAX = 32767; diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index 4f18d04b6c38..613b94e75537 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -772,8 +772,8 @@ private: SfxItemSet& rCSS1ItemSet, SvxCSS1PropertyInfo& rCSS1PropInfo, bool bHidden=false ); - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > InsertControl( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > & rFormComp, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rFCompPropSet, + css::uno::Reference< css::drawing::XShape > InsertControl( const css::uno::Reference< css::form::XFormComponent > & rFormComp, + const css::uno::Reference< css::beans::XPropertySet > & rFCompPropSet, const Size& rSize, sal_Int16 eVertOri, sal_Int16 eHoriOri, @@ -784,7 +784,7 @@ private: const std::vector<OUString>& rUnoMacroParamTable, bool bSetPropSet = true, bool bHidden = false ); - void SetControlSize( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rShape, const Size& rTextSz, + void SetControlSize( const css::uno::Reference< css::drawing::XShape > & rShape, const Size& rTextSz, bool bMinWidth, bool bMinHeight ); public: @@ -899,8 +899,8 @@ public: // for reading asynchronously from SvStream virtual void Continue( int nToken ) override; - virtual bool ParseMetaOptions( const ::com::sun::star::uno::Reference< - ::com::sun::star::document::XDocumentProperties>&, + virtual bool ParseMetaOptions( const css::uno::Reference< + css::document::XDocumentProperties>&, SvKeyValueIterator* ) override; }; diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index fe4e5e9de740..990f2d47e10c 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -138,7 +138,7 @@ using namespace nsSwDocInfoSubType; using namespace nsFieldFlags; using namespace sw::util; using namespace ::com::sun::star; -using namespace ::com::sun::star::drawing; +using namespace css::drawing; static const sal_Int32 Tag_StartParagraph_1 = 1; static const sal_Int32 Tag_StartParagraph_2 = 2; @@ -304,7 +304,7 @@ void DocxAttributeOutput::StartParagraph( ww8::WW8TableNodeInfo::Pointer_t pText if (const SfxPoolItem* pItem = pSet->GetItem(RES_PARATR_GRABBAG)) { const SfxGrabBagItem& rParaGrabBag = static_cast<const SfxGrabBagItem&>(*pItem); - const std::map<OUString, com::sun::star::uno::Any>& rMap = rParaGrabBag.GetGrabBag(); + const std::map<OUString, css::uno::Any>& rMap = rParaGrabBag.GetGrabBag(); bEndParaSdt = m_bStartedParaSdt && rMap.find("ParaSdtEndBefore") != rMap.end(); } } @@ -3240,7 +3240,7 @@ void DocxAttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t FSEND ); // Look for the table style property in the table grab bag - std::map<OUString, com::sun::star::uno::Any> aGrabBag = + std::map<OUString, css::uno::Any> aGrabBag = pTableFormat->GetAttrSet().GetItem<SfxGrabBagItem>(RES_FRMATR_GRABBAG)->GetGrabBag(); // We should clear the TableStyle map. In case of Table inside multiple tables it contains the @@ -3249,7 +3249,7 @@ void DocxAttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t m_aTableStyleConf.clear(); // Extract properties from grab bag - std::map<OUString, com::sun::star::uno::Any>::iterator aGrabBagElement; + std::map<OUString, css::uno::Any>::iterator aGrabBagElement; for( aGrabBagElement = aGrabBag.begin(); aGrabBagElement != aGrabBag.end(); ++aGrabBagElement ) { if( aGrabBagElement->first == "TableStyleName") @@ -3467,11 +3467,11 @@ void DocxAttributeOutput::TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_ Color aColor = pColorProp ? pColorProp->GetColor() : COL_AUTO; OString sColor = msfilter::util::ConvertColor( aColor ); - std::map<OUString, com::sun::star::uno::Any> aGrabBag = + std::map<OUString, css::uno::Any> aGrabBag = pFormat->GetAttrSet().GetItem<SfxGrabBagItem>(RES_FRMATR_GRABBAG)->GetGrabBag(); OString sOriginalColor; - std::map<OUString, com::sun::star::uno::Any>::iterator aGrabBagElement = aGrabBag.find("originalColor"); + std::map<OUString, css::uno::Any>::iterator aGrabBagElement = aGrabBag.find("originalColor"); if( aGrabBagElement != aGrabBag.end() ) sOriginalColor = OUStringToOString( aGrabBagElement->second.get<OUString>(), RTL_TEXTENCODING_UTF8 ); @@ -4108,7 +4108,7 @@ void DocxAttributeOutput::WriteSrcRect(const SdrObject* pSdrObj ) xPropSet->getPropertyValue("GraphicURL") >>= sUrl; Size aOriginalSize( GraphicObject::CreateGraphicObjectFromURL( sUrl ).GetPrefSize() ); - ::com::sun::star::text::GraphicCrop aGraphicCropStruct; + css::text::GraphicCrop aGraphicCropStruct; xPropSet->getPropertyValue( "GraphicCrop" ) >>= aGraphicCropStruct; const MapMode aMap100mm( MAP_100TH_MM ); @@ -5885,7 +5885,7 @@ void DocxAttributeOutput::EmbedFontStyle( const OUString& name, int tag, FontFam osl::File file( fontUrl ); if( file.open( osl_File_OpenFlag_Read ) != osl::File::E_None ) return; - uno::Reference< com::sun::star::io::XOutputStream > xOutStream = m_rExport.GetFilter().openFragmentStream( + uno::Reference< css::io::XOutputStream > xOutStream = m_rExport.GetFilter().openFragmentStream( "word/fonts/font" + OUString::number(m_nextFontId) + ".odttf", "application/vnd.openxmlformats-officedocument.obfuscatedFont" ); // Not much point in trying hard with the obfuscation key, whoever reads the spec can read the font anyway, @@ -8069,8 +8069,8 @@ void DocxAttributeOutput::FormatFrameDirection( const SvxFrameDirectionItem& rDi void DocxAttributeOutput::ParaGrabBag(const SfxGrabBagItem& rItem) { - const std::map<OUString, com::sun::star::uno::Any>& rMap = rItem.GetGrabBag(); - for (std::map<OUString, com::sun::star::uno::Any>::const_iterator i = rMap.begin(); i != rMap.end(); ++i) + const std::map<OUString, css::uno::Any>& rMap = rItem.GetGrabBag(); + for (std::map<OUString, css::uno::Any>::const_iterator i = rMap.begin(); i != rMap.end(); ++i) { if (i->first == "MirrorIndents") m_pSerializer->singleElementNS(XML_w, XML_mirrorIndents, FSEND); @@ -8264,7 +8264,7 @@ void DocxAttributeOutput::ParaGrabBag(const SfxGrabBagItem& rItem) void DocxAttributeOutput::CharGrabBag( const SfxGrabBagItem& rItem ) { - const std::map< OUString, com::sun::star::uno::Any >& rMap = rItem.GetGrabBag(); + const std::map< OUString, css::uno::Any >& rMap = rItem.GetGrabBag(); // get original values of theme-derived properties to check if they have changed during the edition bool bWriteCSTheme = true; @@ -8272,7 +8272,7 @@ void DocxAttributeOutput::CharGrabBag( const SfxGrabBagItem& rItem ) bool bWriteEastAsiaTheme = true; bool bWriteThemeFontColor = true; OUString sOriginalValue; - for ( std::map< OUString, com::sun::star::uno::Any >::const_iterator i = rMap.begin(); i != rMap.end(); ++i ) + for ( std::map< OUString, css::uno::Any >::const_iterator i = rMap.begin(); i != rMap.end(); ++i ) { if ( m_pFontsAttrList.is() && i->first == "CharThemeFontNameCs" ) { @@ -8302,7 +8302,7 @@ void DocxAttributeOutput::CharGrabBag( const SfxGrabBagItem& rItem ) // save theme attributes back to the run properties OUString str; - for ( std::map< OUString, com::sun::star::uno::Any >::const_iterator i = rMap.begin(); i != rMap.end(); ++i ) + for ( std::map< OUString, css::uno::Any >::const_iterator i = rMap.begin(); i != rMap.end(); ++i ) { if ( i->first == "CharThemeNameAscii" && bWriteAsciiTheme ) { diff --git a/sw/source/filter/ww8/docxexport.hxx b/sw/source/filter/ww8/docxexport.hxx index 8ce9c1857078..3643a6569ada 100644 --- a/sw/source/filter/ww8/docxexport.hxx +++ b/sw/source/filter/ww8/docxexport.hxx @@ -162,19 +162,19 @@ public: const OUString &rHelp, const OUString &ToolTip, const OUString &rSelected, - com::sun::star::uno::Sequence<OUString> &rListItems) override; + css::uno::Sequence<OUString> &rListItems) override; virtual void DoFormText(const SwInputField * pField) override; virtual sal_uLong ReplaceCr( sal_uInt8 nChar ) override; /// Returns the relationd id - OString OutputChart( com::sun::star::uno::Reference< com::sun::star::frame::XModel >& xModel, sal_Int32 nCount, ::sax_fastparser::FSHelperPtr m_pSerializer ); + OString OutputChart( css::uno::Reference< css::frame::XModel >& xModel, sal_Int32 nCount, ::sax_fastparser::FSHelperPtr m_pSerializer ); OString WriteOLEObject( SwOLEObj& rObject, const OUString& sMediaType, const OUString& sRelationType, const OUString& sFileExtension ); static bool lcl_CopyStream( css::uno::Reference< css::io::XInputStream> xIn, css::uno::Reference< css::io::XOutputStream > xOut ); /// Writes the shape using drawingML syntax. - void OutputDML( com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape ); + void OutputDML( css::uno::Reference< css::drawing::XShape >& xShape ); void WriteOutliner(const OutlinerParaObject& rOutliner, sal_uInt8 nTyp); diff --git a/sw/source/filter/ww8/docxexportfilter.hxx b/sw/source/filter/ww8/docxexportfilter.hxx index 425d2461a93a..b5ed18d3bbd9 100644 --- a/sw/source/filter/ww8/docxexportfilter.hxx +++ b/sw/source/filter/ww8/docxexportfilter.hxx @@ -30,7 +30,7 @@ class DocxExportFilter : public oox::core::XmlFilterBase { public: - explicit DocxExportFilter( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext ); + explicit DocxExportFilter( const css::uno::Reference< css::uno::XComponentContext >& xContext ); // FIXME these should not even exist for the export-only filter! // For now, let's just do empty implementations of those. diff --git a/sw/source/filter/ww8/escher.hxx b/sw/source/filter/ww8/escher.hxx index 88c08beb789a..4e5fa49eb662 100644 --- a/sw/source/filter/ww8/escher.hxx +++ b/sw/source/filter/ww8/escher.hxx @@ -102,7 +102,7 @@ protected: EscherPropertyContainer& rPropOpt); void WriteOLEPicture(EscherPropertyContainer &rPropOpt, sal_uInt32 nShapeFlags, const Graphic &rGraphic, const SdrObject &rObj, - sal_uInt32 nShapeId, const com::sun::star::awt::Rectangle* pVisArea ); + sal_uInt32 nShapeId, const css::awt::Rectangle* pVisArea ); static void WriteGrfAttr(const SwNoTextNode& rNd,EscherPropertyContainer& rPropOpt); sal_Int32 DrawModelToEmu(sal_Int32 nVal) const @@ -157,8 +157,8 @@ private: EscherPropertyContainer& rPropOpt) override; virtual sal_uInt32 QueryTextID( - const com::sun::star::uno::Reference< - com::sun::star::drawing::XShape > &,sal_uInt32) override; + const css::uno::Reference< + css::drawing::XShape > &,sal_uInt32) override; virtual void SetPicId(const SdrObject &rSdrObj, sal_uInt32 nShapeId, EscherPropertyContainer &rPropOpt) override; public: @@ -169,8 +169,8 @@ public: virtual void WriteFrmExtraData(const SwFrameFormat& rFormat) override; - EscherExHostAppData* StartShape(const com::sun::star::uno::Reference< - com::sun::star::drawing::XShape > &, const Rectangle*) override {return &aHostData;} + EscherExHostAppData* StartShape(const css::uno::Reference< + css::drawing::XShape > &, const Rectangle*) override {return &aHostData;} private: SwEscherEx(const SwEscherEx&) = delete; SwEscherEx &operator=(const SwEscherEx&) = delete; diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx index 7186b924be36..d537e2d084de 100644 --- a/sw/source/filter/ww8/writerhelper.cxx +++ b/sw/source/filter/ww8/writerhelper.cxx @@ -334,11 +334,11 @@ namespace sw OSL_ENSURE( !mrPers.GetEmbeddedObjectContainer().HasEmbeddedObject( mxIPRef ), "Object in adaptor is inserted?!" ); try { - uno::Reference < com::sun::star::util::XCloseable > xClose( mxIPRef, uno::UNO_QUERY ); + uno::Reference < css::util::XCloseable > xClose( mxIPRef, uno::UNO_QUERY ); if ( xClose.is() ) xClose->close(sal_True); } - catch ( const com::sun::star::util::CloseVetoException& ) + catch ( const css::util::CloseVetoException& ) { } diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx index 0f5f52879f34..0d115bb90451 100644 --- a/sw/source/filter/ww8/writerhelper.hxx +++ b/sw/source/filter/ww8/writerhelper.hxx @@ -809,7 +809,7 @@ namespace sw class DrawingOLEAdaptor { private: - com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > mxIPRef; + css::uno::Reference < css::embed::XEmbeddedObject > mxIPRef; SfxObjectShell& mrPers; const Graphic* mpGraphic; public: diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx index f9d3fc94146f..d468e39f4556 100644 --- a/sw/source/filter/ww8/writerwordglue.cxx +++ b/sw/source/filter/ww8/writerwordglue.cxx @@ -533,7 +533,7 @@ namespace sw } } - using namespace ::com::sun::star::i18n; + using namespace css::i18n; sal_uInt16 nScript = i18n::ScriptType::LATIN; if (!rText.isEmpty() && g_pBreakIt && g_pBreakIt->GetBreakIter().is()) diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index c0558940a2b4..a9da2b338571 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -108,10 +108,10 @@ using namespace com::sun::star; using namespace sw::util; using namespace sw::types; using namespace nsFieldFlags; -using ::com::sun::star::uno::Reference; -using ::com::sun::star::uno::UNO_QUERY; -using ::com::sun::star::beans::XPropertySet; -using ::com::sun::star::drawing::XShape; +using css::uno::Reference; +using css::uno::UNO_QUERY; +using css::beans::XPropertySet; +using css::drawing::XShape; bool SwBasicEscherEx::IsRelUrl() { @@ -3162,14 +3162,14 @@ SwMSConvertControls::SwMSConvertControls( SfxObjectShell *pDSh,SwPaM *pP ) : oox // in transitioning away old filter for ole/ocx controls, ReadOCXStream has been made pure virtual in // filter/source/msocximex.cxx, so.. we need an implementation here bool SwMSConvertControls::ReadOCXStream( tools::SvRef<SotStorage>& rSrc1, - com::sun::star::uno::Reference< com::sun::star::drawing::XShape > *pShapeRef, + css::uno::Reference< css::drawing::XShape > *pShapeRef, bool bFloatingCtrl ) { uno::Reference< form::XFormComponent > xFComp; bool bRes = oox::ole::MSConvertOCXControls::ReadOCXStorage( rSrc1, xFComp ); if ( bRes && xFComp.is() ) { - com::sun::star::awt::Size aSz; // not used in import + css::awt::Size aSz; // not used in import bRes = InsertControl( xFComp, aSz,pShapeRef,bFloatingCtrl); } return bRes; diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index d948f8c51d77..d059403f9cef 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -100,7 +100,7 @@ #include <cstdio> using namespace ::com::sun::star; -using namespace ::com::sun::star::i18n; +using namespace css::i18n; using namespace sw::util; using namespace sw::types; using namespace sw::mark; diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index e05c50e9b676..aaadd8e08c0d 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -120,7 +120,7 @@ class WW8_WrPc; namespace com { namespace sun { namespace star { namespace embed { class XEmbeddedObject; } } } } -typedef std::map<const com::sun::star::embed::XEmbeddedObject*, sal_Int32> WW8OleMap; +typedef std::map<const css::embed::XEmbeddedObject*, sal_Int32> WW8OleMap; struct WW8_PdAttrDesc; class SvxBrushItem; @@ -765,7 +765,7 @@ public: const OUString &rHelp, const OUString &ToolTip, const OUString &rSelected, - com::sun::star::uno::Sequence<OUString> &rListItems) = 0; + css::uno::Sequence<OUString> &rListItems) = 0; virtual void DoFormText(const SwInputField * pField) = 0; @@ -992,8 +992,8 @@ private: void RestoreMacroCmds(); - void DoComboBox(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> xPropSet); - void DoCheckBox(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> xPropSet); + void DoComboBox(css::uno::Reference<css::beans::XPropertySet> xPropSet); + void DoCheckBox(css::uno::Reference<css::beans::XPropertySet> xPropSet); public: @@ -1113,7 +1113,7 @@ public: const OUString &rHelp, const OUString &ToolTip, const OUString &rSelected, - com::sun::star::uno::Sequence<OUString> &rListItems) override; + css::uno::Sequence<OUString> &rListItems) override; virtual void DoFormText(const SwInputField * pField) override; diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index a7b7f9f57909..22249f1c17ea 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -766,7 +766,7 @@ void MSWordExportBase::OutputFormat( const SwFormat& rFormat, bool bPapFormat, b ItemGet<SvxLRSpaceItem>(aSet, RES_LR_SPACE)); aSet.Put( aLR ); OutputItemSet( aSet, bPapFormat, bChpFormat, - com::sun::star::i18n::ScriptType::LATIN, m_bExportModeRTF); + css::i18n::ScriptType::LATIN, m_bExportModeRTF); bCallOutSet = false; } } @@ -5173,7 +5173,7 @@ void AttributeOutputBase::CharBackgroundBase( const SvxBrushItem& rBrush ) // Check shading marker { const SfxGrabBagItem& aGrabBag = static_cast< const SfxGrabBagItem& >( GetExport().GetItem( RES_CHRATR_GRABBAG ) ); - const std::map<OUString, com::sun::star::uno::Any>& rMap = aGrabBag.GetGrabBag(); + const std::map<OUString, css::uno::Any>& rMap = aGrabBag.GetGrabBag(); auto aIterator = rMap.find("CharShadingMarker"); if( aIterator != rMap.end() ) { diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index fbf205375768..0886debc7155 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -579,7 +579,7 @@ SdrObject* SwMSDffManager::ImportOLE( long nOLEId, { tools::SvRef<SotStorage> xSrc = xSrcStg->OpenSotStorage( sStorageName ); OSL_ENSURE(rReader.m_pFormImpl, "No Form Implementation!"); - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape; + css::uno::Reference< css::drawing::XShape > xShape; if ( (!(rReader.m_bIsHeader || rReader.m_bIsFooter)) && rReader.m_pFormImpl->ReadOCXStream(xSrc,&xShape,true)) { @@ -995,7 +995,7 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt, fExtraTextRotation /= 100.0; SdrCustomShapeGeometryItem aGeometryItem( static_cast<const SdrCustomShapeGeometryItem&>(pCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )) ); const OUString sTextRotateAngle( "TextRotateAngle" ); - com::sun::star::beans::PropertyValue aPropVal; + css::beans::PropertyValue aPropVal; aPropVal.Name = sTextRotateAngle; aPropVal.Value <<= fExtraTextRotation; aGeometryItem.SetPropertyValue( aPropVal ); @@ -2755,7 +2755,7 @@ rtl_TextEncoding SwWW8ImplReader::GetCharSetFromLanguage() */ const SvxLanguageItem *pLang = static_cast<const SvxLanguageItem*>(GetFormatAttr(RES_CHRATR_LANGUAGE)); LanguageType eLang = pLang ? pLang->GetLanguage() : LANGUAGE_SYSTEM; - ::com::sun::star::lang::Locale aLocale(LanguageTag::convertToLocale(eLang)); + css::lang::Locale aLocale(LanguageTag::convertToLocale(eLang)); return msfilter::util::getBestTextEncodingFromLocale(aLocale); } @@ -2773,7 +2773,7 @@ rtl_TextEncoding SwWW8ImplReader::GetCJKCharSetFromLanguage() */ const SvxLanguageItem *pLang = static_cast<const SvxLanguageItem*>(GetFormatAttr(RES_CHRATR_CJK_LANGUAGE)); LanguageType eLang = pLang ? pLang->GetLanguage() : LANGUAGE_SYSTEM; - ::com::sun::star::lang::Locale aLocale(LanguageTag::convertToLocale(eLang)); + css::lang::Locale aLocale(LanguageTag::convertToLocale(eLang)); return msfilter::util::getBestTextEncodingFromLocale(aLocale); } diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 6c6b3613368e..8406e64d6a75 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -687,11 +687,11 @@ public: std::vector<OUString> maListEntries; virtual ~WW8FormulaControl() {} void FormulaRead(SwWw8ControlType nWhich,SvStream *pD); - virtual bool Import(const com::sun::star::uno::Reference < - com::sun::star::lang::XMultiServiceFactory> &rServiceFactory, - com::sun::star::uno::Reference < - com::sun::star::form::XFormComponent> &rFComp, - com::sun::star::awt::Size &rSz) = 0; + virtual bool Import(const css::uno::Reference < + css::lang::XMultiServiceFactory> &rServiceFactory, + css::uno::Reference < + css::form::XFormComponent> &rFComp, + css::awt::Size &rSz) = 0; OUString msName; }; @@ -704,11 +704,11 @@ private: public: explicit WW8FormulaCheckBox(SwWW8ImplReader &rR); - virtual bool Import(const com::sun::star::uno::Reference < - com::sun::star::lang::XMultiServiceFactory> &rServiceFactory, - com::sun::star::uno::Reference < - com::sun::star::form::XFormComponent> &rFComp, - com::sun::star::awt::Size &rSz) override; + virtual bool Import(const css::uno::Reference < + css::lang::XMultiServiceFactory> &rServiceFactory, + css::uno::Reference < + css::form::XFormComponent> &rFComp, + css::awt::Size &rSz) override; }; class WW8FormulaListBox : public WW8FormulaControl @@ -720,11 +720,11 @@ private: public: explicit WW8FormulaListBox(SwWW8ImplReader &rR); - virtual bool Import(const com::sun::star::uno::Reference < - com::sun::star::lang::XMultiServiceFactory> &rServiceFactory, - com::sun::star::uno::Reference < - com::sun::star::form::XFormComponent> &rFComp, - com::sun::star::awt::Size &rSz) override; + virtual bool Import(const css::uno::Reference < + css::lang::XMultiServiceFactory> &rServiceFactory, + css::uno::Reference < + css::form::XFormComponent> &rFComp, + css::awt::Size &rSz) override; }; class WW8FormulaEditBox : public WW8FormulaControl @@ -735,11 +735,11 @@ private: public: explicit WW8FormulaEditBox(SwWW8ImplReader &rR); //no real implementation, return false - virtual bool Import(const com::sun::star::uno::Reference < - com::sun::star::lang::XMultiServiceFactory> & /* rServiceFactory */, - com::sun::star::uno::Reference < - com::sun::star::form::XFormComponent> & /* rFComp */, - com::sun::star::awt::Size & /* rSz */) override { return false; } + virtual bool Import(const css::uno::Reference < + css::lang::XMultiServiceFactory> & /* rServiceFactory */, + css::uno::Reference < + css::form::XFormComponent> & /* rFComp */, + css::awt::Size & /* rSz */) override { return false; } }; class SwMSConvertControls: public oox::ole::MSConvertOCXControls @@ -747,15 +747,15 @@ class SwMSConvertControls: public oox::ole::MSConvertOCXControls public: SwMSConvertControls( SfxObjectShell *pDSh,SwPaM *pP ); bool InsertFormula( WW8FormulaControl &rFormula); - virtual bool InsertControl(const com::sun::star::uno::Reference< - com::sun::star::form::XFormComponent >& rFComp, - const ::com::sun::star::awt::Size& rSize, - com::sun::star::uno::Reference < - com::sun::star::drawing::XShape > *pShape, bool bFloatingCtrl) override; + virtual bool InsertControl(const css::uno::Reference< + css::form::XFormComponent >& rFComp, + const css::awt::Size& rSize, + css::uno::Reference < + css::drawing::XShape > *pShape, bool bFloatingCtrl) override; bool ExportControl(WW8Export &rWrt, const SdrUnoObj& rFormObj); bool ReadOCXStream( tools::SvRef<SotStorage>& rSrc1, - com::sun::star::uno::Reference< - com::sun::star::drawing::XShape > *pShapeRef=0, + css::uno::Reference< + css::drawing::XShape > *pShapeRef=0, bool bFloatingCtrl=false ); private: sal_uInt32 GenerateObjectID() { return ++mnObjectId; } @@ -771,7 +771,7 @@ private: std::map<sal_uInt32,OString> aOldEscherBlipCache; virtual bool GetOLEStorageName( long nOLEId, OUString& rStorageName, - tools::SvRef<SotStorage>& rSrcStorage, com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rDestStorage ) const override; + tools::SvRef<SotStorage>& rSrcStorage, css::uno::Reference < css::embed::XStorage >& rDestStorage ) const override; virtual bool ShapeHasText( sal_uLong nShapeId, sal_uLong nFilePos ) const override; // #i32596# - new parameter <_nCalledByGroup>, which // indicates, if the OLE object is imported inside a group object @@ -1692,7 +1692,7 @@ private: // #i84783# // determine object attribute "Layout in Table Cell" bool IsObjectLayoutInTableCell( const sal_uInt32 nLayoutInTableCell ) const; - bool ReadGlobalTemplateSettings( const OUString& sCreatedFrom, const com::sun::star::uno::Reference< com::sun::star::container::XNameContainer >& xPrjNameMap ); + bool ReadGlobalTemplateSettings( const OUString& sCreatedFrom, const css::uno::Reference< css::container::XNameContainer >& xPrjNameMap ); SwWW8ImplReader(const SwWW8ImplReader &) = delete; SwWW8ImplReader& operator=(const SwWW8ImplReader&) = delete; public: // really private, but can only be done public @@ -1852,8 +1852,8 @@ public: // really private, but can only be done public eF_ResT Read_F_FormTextBox( WW8FieldDesc* pF, OUString& rStr); eF_ResT Read_F_FormCheckBox( WW8FieldDesc* pF, OUString& rStr ); eF_ResT Read_F_FormListBox( WW8FieldDesc* pF, OUString& rStr); - com::sun::star::awt::Size MiserableDropDownFormHack(const OUString &rString, - com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& + css::awt::Size MiserableDropDownFormHack(const OUString &rString, + css::uno::Reference<css::beans::XPropertySet>& rPropSet); eF_ResT Read_F_Macro( WW8FieldDesc*, OUString& rStr); diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 85b2fc614cdd..958f50680d6f 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -3851,8 +3851,8 @@ void SwWW8ImplReader::Read_CharShadow( sal_uInt16, const sal_uInt8* pData, shor // Add a marker to the grabbag indicating that character background was imported from MSO shading SfxGrabBagItem aGrabBag = *(static_cast<const SfxGrabBagItem*>(GetFormatAttr(RES_CHRATR_GRABBAG))); - std::map<OUString, com::sun::star::uno::Any>& rMap = aGrabBag.GetGrabBag(); - rMap.insert(std::pair<OUString, com::sun::star::uno::Any>("CharShadingMarker",uno::makeAny(true))); + std::map<OUString, css::uno::Any>& rMap = aGrabBag.GetGrabBag(); + rMap.insert(std::pair<OUString, css::uno::Any>("CharShadingMarker",uno::makeAny(true))); NewAttr(aGrabBag); } } @@ -3873,8 +3873,8 @@ void SwWW8ImplReader::Read_TextBackColor(sal_uInt16, const sal_uInt8* pData, sho // Add a marker to the grabbag indicating that character background was imported from MSO shading SfxGrabBagItem aGrabBag = *(static_cast<const SfxGrabBagItem*>(GetFormatAttr(RES_CHRATR_GRABBAG))); - std::map<OUString, com::sun::star::uno::Any>& rMap = aGrabBag.GetGrabBag(); - rMap.insert(std::pair<OUString, com::sun::star::uno::Any>("CharShadingMarker",uno::makeAny(true))); + std::map<OUString, css::uno::Any>& rMap = aGrabBag.GetGrabBag(); + rMap.insert(std::pair<OUString, css::uno::Any>("CharShadingMarker",uno::makeAny(true))); NewAttr(aGrabBag); } } diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 8f9cc49fbbc5..1ed3dab3924f 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -49,7 +49,7 @@ #include <stdio.h> #endif -using namespace ::com::sun::star::lang; +using namespace css::lang; //-begin namespace SL @@ -6103,7 +6103,7 @@ rtl_TextEncoding WW8Fib::GetFIBCharset(sal_uInt16 chs, sal_uInt16 nLidLocale) value was the nLocale. If value is < 999, then it is the nLocale, otherwise it is the lid. */ - ::com::sun::star::lang::Locale aLocale(LanguageTag::convertToLocale(nLidLocale)); + css::lang::Locale aLocale(LanguageTag::convertToLocale(nLidLocale)); return msfilter::util::getBestTextEncodingFromLocale(aLocale); } return rtl_getTextEncodingFromWindowsCharset(static_cast<sal_uInt8>(chs)); diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx index 099d0c6e8318..ad6855c2b27f 100644 --- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx +++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx @@ -33,17 +33,17 @@ #include <osl/mutex.hxx> using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; +using namespace css::uno; using namespace ::xmloff::token; -using ::com::sun::star::frame::XModel; -using ::com::sun::star::text::XTextCursor; -using ::com::sun::star::text::XTextRange; -using ::com::sun::star::text::XText; -using ::com::sun::star::text::XWordCursor; -using ::com::sun::star::lang::XUnoTunnel; -using ::com::sun::star::beans::XPropertySet; -using ::com::sun::star::beans::XPropertySetInfo; +using css::frame::XModel; +using css::text::XTextCursor; +using css::text::XTextRange; +using css::text::XText; +using css::text::XWordCursor; +using css::lang::XUnoTunnel; +using css::beans::XPropertySet; +using css::beans::XPropertySetInfo; // collision with tools/DateTime: use UNO DateTime as util::DateTime // using util::DateTime; diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.hxx b/sw/source/filter/xml/XMLRedlineImportHelper.hxx index 277de4699579..40c1e612600f 100644 --- a/sw/source/filter/xml/XMLRedlineImportHelper.hxx +++ b/sw/source/filter/xml/XMLRedlineImportHelper.hxx @@ -54,13 +54,13 @@ class XMLRedlineImportHelper bool bIgnoreRedlines; // save information for saving and reconstruction of the redline mode - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> xModelPropertySet; - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> xImportInfoPropertySet; + css::uno::Reference< + css::beans::XPropertySet> xModelPropertySet; + css::uno::Reference< + css::beans::XPropertySet> xImportInfoPropertySet; bool bShowChanges; bool bRecordChanges; - ::com::sun::star::uno::Sequence<sal_Int8> aProtectionKey; + css::uno::Sequence<sal_Int8> aProtectionKey; public: @@ -69,10 +69,10 @@ public: // property sets of model + import info for saving + restoring the // redline mode - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rModel, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rImportInfoSet ); + const css::uno::Reference< + css::beans::XPropertySet> & rModel, + const css::uno::Reference< + css::beans::XPropertySet> & rImportInfoSet ); virtual ~XMLRedlineImportHelper(); // create a redline object @@ -83,15 +83,15 @@ public: const OUString& rId, // use to identify this redline const OUString& rAuthor, // name of the author const OUString& rComment, // redline comment - const ::com::sun::star::util::DateTime& rDateTime, // date+time + const css::util::DateTime& rDateTime, // date+time bool bMergeLastParagraph); // merge last paragraph? // create a text section for the redline, and return an // XText/XTextCursor that may be used to write into it. - ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextCursor> CreateRedlineTextSection( - ::com::sun::star::uno::Reference< // needed to get the document - ::com::sun::star::text::XTextCursor> xOldCursor, + css::uno::Reference< + css::text::XTextCursor> CreateRedlineTextSection( + css::uno::Reference< // needed to get the document + css::text::XTextCursor> xOldCursor, const OUString& rId); // ID used to RedlineAdd() call // Set start or end position for a redline in the text body. @@ -99,8 +99,8 @@ public: void SetCursor( const OUString& rId, // ID used in RedlineAdd() call bool bStart, // start or end Range - ::com::sun::star::uno::Reference< // the actual XTextRange - ::com::sun::star::text::XTextRange> & rRange, + css::uno::Reference< // the actual XTextRange + css::text::XTextRange> & rRange, // text range is (from an XML view) outside of a paragraph // (i.e. before a table) bool bIsOusideOfParagraph); @@ -117,8 +117,8 @@ public: const OUString& rId, // ID used in RedlineAdd() call bool bStart, // XTextRange _inside_ a table/section - ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange> & rRange); + css::uno::Reference< + css::text::XTextRange> & rRange); // set redline mode: show changes void SetShowChanges( bool bShowChanges ); @@ -128,7 +128,7 @@ public: // set redline protection key void SetProtectionKey( - const ::com::sun::star::uno::Sequence<sal_Int8> & rKey ); + const css::uno::Sequence<sal_Int8> & rKey ); private: diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index b32c7317bff5..bccfbdd5fbb8 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -77,11 +77,11 @@ #include <sfx2/DocumentMetadataAccess.hxx> using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::text; -using namespace ::com::sun::star::container; -using namespace ::com::sun::star::document; -using namespace ::com::sun::star::lang; +using namespace css::uno; +using namespace css::text; +using namespace css::container; +using namespace css::document; +using namespace css::lang; static void lcl_EnsureValidPam( SwPaM& rPam ) { @@ -616,7 +616,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c cppu::UnoType<bool>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("SourceStorage"), 0, cppu::UnoType<embed::XStorage>::get(), - ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, + css::beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } }; uno::Reference< beans::XPropertySet > xInfoSet( diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx index 853942a17f0a..bddc90b9974b 100644 --- a/sw/source/filter/xml/wrtxml.cxx +++ b/sw/source/filter/xml/wrtxml.cxx @@ -54,11 +54,11 @@ #include <com/sun/star/rdf/XDocumentMetadataAccess.hpp> using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::container; -using namespace ::com::sun::star::document; -using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::lang; +using namespace css::uno; +using namespace css::container; +using namespace css::document; +using namespace css::beans; +using namespace css::lang; SwXMLWriter::SwXMLWriter( const OUString& rBaseURL ) { @@ -151,7 +151,7 @@ sal_uInt32 SwXMLWriter::_Write( const uno::Reference < task::XStatusIndicator >& cppu::UnoType<bool>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("TargetStorage"),0, cppu::UnoType<embed::XStorage>::get(), - ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, + css::beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } }; uno::Reference< beans::XPropertySet > xInfoSet( diff --git a/sw/source/filter/xml/wrtxml.hxx b/sw/source/filter/xml/wrtxml.hxx index eedd9d83ff76..6e6c56b51c89 100644 --- a/sw/source/filter/xml/wrtxml.hxx +++ b/sw/source/filter/xml/wrtxml.hxx @@ -38,7 +38,7 @@ namespace com { namespace sun { namespace star { class SwXMLWriter : public StgWriter { - sal_uInt32 _Write( const com::sun::star::uno::Reference < com::sun::star::task::XStatusIndicator>&, const OUString& ); + sal_uInt32 _Write( const css::uno::Reference < css::task::XStatusIndicator>&, const OUString& ); using StgWriter::Write; @@ -60,34 +60,34 @@ private: // write a single XML stream into the package bool WriteThroughComponent( // the component we export - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XComponent> & xComponent, + const css::uno::Reference< + css::lang::XComponent> & xComponent, const sal_Char* pStreamName, // the stream name // service factory for pServiceName - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext> & rFactory, + const css::uno::Reference< + css::uno::XComponentContext> & rFactory, const sal_Char* pServiceName, // service name of the component // the argument (XInitialization) - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Any> & rArguments, + const css::uno::Sequence< + css::uno::Any> & rArguments, // output descriptor - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue> & rMediaDesc ); + const css::uno::Sequence< + css::beans::PropertyValue> & rMediaDesc ); // write a single output stream // (to be called either directly or by WriteThroughComponent(...)) static bool WriteThroughComponent( - const ::com::sun::star::uno::Reference< - ::com::sun::star::io::XOutputStream> & xOutputStream, - const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XComponent> & xComponent, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext> & rFactory, + const css::uno::Reference< + css::io::XOutputStream> & xOutputStream, + const css::uno::Reference< + css::lang::XComponent> & xComponent, + const css::uno::Reference< + css::uno::XComponentContext> & rFactory, const sal_Char* pServiceName, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Any> & rArguments, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue> & rMediaDesc ); + const css::uno::Sequence< + css::uno::Any> & rArguments, + const css::uno::Sequence< + css::beans::PropertyValue> & rMediaDesc ); }; #endif // INCLUDED_SW_SOURCE_FILTER_XML_WRTXML_HXX diff --git a/sw/source/filter/xml/xmlbrsh.cxx b/sw/source/filter/xml/xmlbrsh.cxx index 4e07c24a1fe2..8f9abcfe18fd 100644 --- a/sw/source/filter/xml/xmlbrsh.cxx +++ b/sw/source/filter/xml/xmlbrsh.cxx @@ -38,7 +38,7 @@ #include "xmlexpit.hxx" using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; +using namespace css::uno; using namespace ::xmloff::token; enum SvXMLTokenMapAttrs diff --git a/sw/source/filter/xml/xmlbrshi.hxx b/sw/source/filter/xml/xmlbrshi.hxx index 3edbb4fe07e6..6b2ab2ea0147 100644 --- a/sw/source/filter/xml/xmlbrshi.hxx +++ b/sw/source/filter/xml/xmlbrshi.hxx @@ -35,12 +35,12 @@ namespace com { namespace sun { namespace star { class SwXMLBrushItemImportContext : public SvXMLImportContext { private: - ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > xBase64Stream; + css::uno::Reference < css::io::XOutputStream > xBase64Stream; SvxBrushItem *pItem; void ProcessAttrs( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< + css::xml::sax::XAttributeList > & xAttrList, const SvXMLUnitConverter& rUnitConv ); public: @@ -50,8 +50,8 @@ public: SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< + css::xml::sax::XAttributeList > & xAttrList, const SvXMLUnitConverter& rUnitConv, const SvxBrushItem& rItem ); @@ -59,8 +59,8 @@ public: SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< + css::xml::sax::XAttributeList > & xAttrList, const SvXMLUnitConverter& rUnitConv, sal_uInt16 nWhich ); @@ -68,8 +68,8 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< + css::xml::sax::XAttributeList > & xAttrList ) override; virtual void EndElement() override; diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index 0c7ffd555b4c..2d0b37057ca5 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -69,17 +69,17 @@ #include <pausethreadstarting.hxx> using namespace ::com::sun::star; -using namespace ::com::sun::star::frame; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::xml::sax; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::text; -using namespace ::com::sun::star::container; -using namespace ::com::sun::star::document; -using namespace ::com::sun::star::drawing; -using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::i18n; -using namespace ::com::sun::star::xforms; +using namespace css::frame; +using namespace css::lang; +using namespace css::xml::sax; +using namespace css::uno; +using namespace css::text; +using namespace css::container; +using namespace css::document; +using namespace css::drawing; +using namespace css::beans; +using namespace css::i18n; +using namespace css::xforms; using namespace ::xmloff::token; SwXMLExport::SwXMLExport( @@ -542,85 +542,85 @@ const SwDoc* SwXMLExport::getDoc() const return const_cast< SwXMLExport* >( this )->getDoc(); } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_Writer_XMLExporter_get_implementation(::com::sun::star::uno::XComponentContext* context, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_comp_Writer_XMLExporter_get_implementation(css::uno::XComponentContext* context, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new SwXMLExport(context, OUString("com.sun.star.comp.Writer.XMLExporter"), SvXMLExportFlags::ALL)); } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_Writer_XMLStylesExporter_get_implementation(::com::sun::star::uno::XComponentContext* context, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_comp_Writer_XMLStylesExporter_get_implementation(css::uno::XComponentContext* context, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new SwXMLExport(context, OUString("com.sun.star.comp.Writer.XMLStylesExporter"), SvXMLExportFlags::STYLES | SvXMLExportFlags::MASTERSTYLES | SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::FONTDECLS)); } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_Writer_XMLContentExporter_get_implementation(::com::sun::star::uno::XComponentContext* context, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_comp_Writer_XMLContentExporter_get_implementation(css::uno::XComponentContext* context, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new SwXMLExport(context, OUString("com.sun.star.comp.Writer.XMLContentExporter"), SvXMLExportFlags::SCRIPTS | SvXMLExportFlags::CONTENT | SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::FONTDECLS)); } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_Writer_XMLMetaExporter_get_implementation(::com::sun::star::uno::XComponentContext* context, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_comp_Writer_XMLMetaExporter_get_implementation(css::uno::XComponentContext* context, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new SwXMLExport(context, OUString("com.sun.star.comp.Writer.XMLMetaExporter"), SvXMLExportFlags::META)); } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_Writer_XMLSettingsExporter_get_implementation(::com::sun::star::uno::XComponentContext* context, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_comp_Writer_XMLSettingsExporter_get_implementation(css::uno::XComponentContext* context, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new SwXMLExport(context, OUString("com.sun.star.comp.Writer.XMLSettingsExporter"), SvXMLExportFlags::SETTINGS)); } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_Writer_XMLOasisExporter_get_implementation(::com::sun::star::uno::XComponentContext* context, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_comp_Writer_XMLOasisExporter_get_implementation(css::uno::XComponentContext* context, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new SwXMLExport(context, OUString("com.sun.star.comp.Writer.XMLOasisExporter"), SvXMLExportFlags::ALL | SvXMLExportFlags::OASIS)); } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_Writer_XMLOasisStylesExporter_get_implementation(::com::sun::star::uno::XComponentContext* context, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_comp_Writer_XMLOasisStylesExporter_get_implementation(css::uno::XComponentContext* context, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new SwXMLExport(context, OUString("com.sun.star.comp.Writer.XMLOasisStylesExporter"), SvXMLExportFlags::STYLES | SvXMLExportFlags::MASTERSTYLES | SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::FONTDECLS | SvXMLExportFlags::OASIS)); } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_Writer_XMLOasisContentExporter_get_implementation(::com::sun::star::uno::XComponentContext* context, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_comp_Writer_XMLOasisContentExporter_get_implementation(css::uno::XComponentContext* context, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new SwXMLExport(context, OUString("com.sun.star.comp.Writer.XMLOasisContentExporter"), SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::CONTENT | SvXMLExportFlags::SCRIPTS | SvXMLExportFlags::FONTDECLS | SvXMLExportFlags::OASIS)); } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_Writer_XMLOasisMetaExporter_get_implementation(::com::sun::star::uno::XComponentContext* context, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_comp_Writer_XMLOasisMetaExporter_get_implementation(css::uno::XComponentContext* context, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new SwXMLExport(context, OUString("com.sun.star.comp.Writer.XMLOasisMetaExporter"), SvXMLExportFlags::META | SvXMLExportFlags::OASIS)); } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_Writer_XMLOasisSettingsExporter_get_implementation(::com::sun::star::uno::XComponentContext* context, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_comp_Writer_XMLOasisSettingsExporter_get_implementation(css::uno::XComponentContext* context, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new SwXMLExport(context, OUString("com.sun.star.comp.Writer.XMLOasisSettingsExporter"), SvXMLExportFlags::SETTINGS | SvXMLExportFlags::OASIS)); diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx index 165aa1e55f87..c7450aefce4f 100644 --- a/sw/source/filter/xml/xmlexp.hxx +++ b/sw/source/filter/xml/xmlexp.hxx @@ -94,8 +94,8 @@ class SwXMLExport : public SvXMLExport virtual void _ExportMasterStyles() override; virtual void SetBodyAttributes() override; virtual void _ExportContent() override; - virtual void GetViewSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps) override; - virtual void GetConfigurationSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps) override; + virtual void GetViewSettings(css::uno::Sequence<css::beans::PropertyValue>& aProps) override; + virtual void GetConfigurationSettings(css::uno::Sequence<css::beans::PropertyValue>& aProps) override; virtual sal_Int32 GetDocumentSpecificSettings( ::std::list< SettingsGroup >& _out_rSettings ) override; // string constants for table cell export @@ -116,7 +116,7 @@ protected: public: SwXMLExport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext, + const css::uno::Reference< css::uno::XComponentContext >& rContext, OUString const & implementationName, SvXMLExportFlags nExportFlags); virtual ~SwXMLExport(); @@ -135,8 +135,8 @@ public: bool IsBlockMode() const { return bBlock; } // XUnoTunnel - static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; const SwDoc* getDoc() const; SwDoc* getDoc(); diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx index b5df169bdfef..978d22990847 100644 --- a/sw/source/filter/xml/xmlfmte.cxx +++ b/sw/source/filter/xml/xmlfmte.cxx @@ -39,11 +39,11 @@ #include "xmlexp.hxx" #include <SwStyleNameMapper.hxx> -using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::text; -using namespace ::com::sun::star::drawing; -using namespace ::com::sun::star::lang; +using namespace css::beans; +using namespace css::uno; +using namespace css::text; +using namespace css::drawing; +using namespace css::lang; using namespace ::xmloff::token; void SwXMLExport::ExportFormat( const SwFormat& rFormat, enum XMLTokenEnum eFamily ) diff --git a/sw/source/filter/xml/xmlfonte.cxx b/sw/source/filter/xml/xmlfonte.cxx index a59ae3a3aa15..228a0fffadf0 100644 --- a/sw/source/filter/xml/xmlfonte.cxx +++ b/sw/source/filter/xml/xmlfonte.cxx @@ -27,9 +27,9 @@ #include <xmlimp.hxx> #include <IDocumentSettingAccess.hxx> -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::text; +using namespace css::uno; +using namespace css::lang; +using namespace css::text; class SwXMLFontAutoStylePool_Impl: public XMLFontAutoStylePool { diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index 3307cd560004..7677cf684de0 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -76,14 +76,14 @@ #include <unordered_set> using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::text; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::container; -using namespace ::com::sun::star::i18n; -using namespace ::com::sun::star::drawing; -using namespace ::com::sun::star::xforms; +using namespace css::uno; +using namespace css::text; +using namespace css::lang; +using namespace css::beans; +using namespace css::container; +using namespace css::i18n; +using namespace css::drawing; +using namespace css::xforms; using namespace ::xmloff::token; using namespace ::std; @@ -1564,18 +1564,18 @@ const SwDoc* SwXMLImport::getDoc() const return const_cast< SwXMLImport* >( this )->getDoc(); } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_Writer_XMLOasisImporter_get_implementation(::com::sun::star::uno::XComponentContext* context, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_comp_Writer_XMLOasisImporter_get_implementation(css::uno::XComponentContext* context, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new SwXMLImport(context, OUString("com.sun.star.comp.Writer.XMLOasisImporter"), SvXMLImportFlags::ALL)); } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_Writer_XMLOasisStylesImporter_get_implementation(::com::sun::star::uno::XComponentContext* context, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_comp_Writer_XMLOasisStylesImporter_get_implementation(css::uno::XComponentContext* context, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new SwXMLImport(context, OUString("com.sun.star.comp.Writer.XMLOasisStylesImporter"), SvXMLImportFlags::STYLES | SvXMLImportFlags::MASTERSTYLES | SvXMLImportFlags::AUTOSTYLES | @@ -1583,27 +1583,27 @@ com_sun_star_comp_Writer_XMLOasisStylesImporter_get_implementation(::com::sun::s } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_Writer_XMLOasisContentImporter_get_implementation(::com::sun::star::uno::XComponentContext* context, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_comp_Writer_XMLOasisContentImporter_get_implementation(css::uno::XComponentContext* context, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new SwXMLImport(context, OUString("com.sun.star.comp.Writer.XMLOasisContentImporter"), SvXMLImportFlags::CONTENT | SvXMLImportFlags::SCRIPTS | SvXMLImportFlags::AUTOSTYLES | SvXMLImportFlags::FONTDECLS)); } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_Writer_XMLOasisMetaImporter_get_implementation(::com::sun::star::uno::XComponentContext* context, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_comp_Writer_XMLOasisMetaImporter_get_implementation(css::uno::XComponentContext* context, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new SwXMLImport(context, OUString("com.sun.star.comp.Writer.XMLOasisMetaImporter"), SvXMLImportFlags::META)); } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_Writer_XMLOasisSettingsImporter_get_implementation(::com::sun::star::uno::XComponentContext* context, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_comp_Writer_XMLOasisSettingsImporter_get_implementation(css::uno::XComponentContext* context, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new SwXMLImport(context, OUString("com.sun.star.comp.Writer.XMLOasisSettingsImporter"), SvXMLImportFlags::SETTINGS)); diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx index 1309e1f3fc46..62d9773f181a 100644 --- a/sw/source/filter/xml/xmlimp.hxx +++ b/sw/source/filter/xml/xmlimp.hxx @@ -64,7 +64,7 @@ class SwXMLImport: public SvXMLImport SvXMLItemMapEntriesRef xTableRowItemMap; SvXMLItemMapEntriesRef xTableCellItemMap; tools::SvRef<SotStorage> xPackage; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > + css::uno::Reference< css::container::XNameContainer > xLateInitSettings; sal_uInt16 nStyleFamilyMask;// Mask of styles to load @@ -86,8 +86,8 @@ class SwXMLImport: public SvXMLImport void UpdateTextCollConditions( SwDoc *pDoc ); void setTextInsertMode( - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange > & rInsertPos ); + const css::uno::Reference< + css::text::XTextRange > & rInsertPos ); void setStyleInsertMode( sal_uInt16 nFamilies, bool bOverwrite ); void setBlockMode(); @@ -99,8 +99,8 @@ protected: // before a context for the current element has been pushed. virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< + css::xml::sax::XAttributeList > & xAttrList ) override; virtual XMLTextImportHelper* CreateTextImport() override; @@ -108,25 +108,25 @@ protected: public: SwXMLImport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext, + const css::uno::Reference< css::uno::XComponentContext >& rContext, OUString const & implementationName, SvXMLImportFlags nImportFlags); virtual ~SwXMLImport() throw(); - // ::com::sun::star::xml::sax::XDocumentHandler + // css::xml::sax::XDocumentHandler virtual void SAL_CALL startDocument() - throw (::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, + throw (css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL endDocument() - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; // XUnoTunnel - static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; void InsertStyles( bool bAuto ); void FinishStyles(); @@ -139,17 +139,17 @@ public: SvXMLImportContext *CreateScriptContext( const OUString& rLocalName ); SvXMLImportContext *CreateStylesContext( const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< + css::xml::sax::XAttributeList > & xAttrList, bool bAuto ); SvXMLImportContext *CreateMasterStylesContext( const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + const css::uno::Reference< + css::xml::sax::XAttributeList > & xAttrList ); SvXMLImportContext *CreateFontDeclsContext( const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + const css::uno::Reference< + css::xml::sax::XAttributeList > & xAttrList ); SvXMLImportContext *CreateBodyContentContext( const OUString& rLocalName ); sal_uInt16 GetStyleFamilyMask() const { return nStyleFamilyMask; } bool IsInsertMode() const { return bInsert; } @@ -162,8 +162,8 @@ public: inline SvXMLImportItemMapper& GetTableItemMapper(); SvXMLImportContext *CreateTableItemImportContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< + css::xml::sax::XAttributeList > & xAttrList, sal_uInt16 nSubFamily, SfxItemSet& rItemSet ); const SvXMLTokenMap& GetDocElemTokenMap(); @@ -176,18 +176,18 @@ public: OUString *pParent=0 ) const; virtual void SetStatistics( - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue> & i_rStats) override; - virtual void SetViewSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aViewProps) override; - virtual void SetConfigurationSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aConfigProps) override; + const css::uno::Sequence< css::beans::NamedValue> & i_rStats) override; + virtual void SetViewSettings(const css::uno::Sequence<css::beans::PropertyValue>& aViewProps) override; + virtual void SetConfigurationSettings(const css::uno::Sequence<css::beans::PropertyValue>& aConfigProps) override; virtual void SetDocumentSpecificSettings(const OUString& _rSettingsGroupName, - const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& _rSettings) override; + const css::uno::Sequence<css::beans::PropertyValue>& _rSettings) override; // initialize XForms virtual void initXForms() override; // get the document properties, but only if they actually need importing - ::com::sun::star::uno::Reference< - ::com::sun::star::document::XDocumentProperties> + css::uno::Reference< + css::document::XDocumentProperties> GetDocumentProperties() const; virtual void NotifyEmbeddedFontRead() override; diff --git a/sw/source/filter/xml/xmlimpit.hxx b/sw/source/filter/xml/xmlimpit.hxx index d93026aa1867..0a959a757e83 100644 --- a/sw/source/filter/xml/xmlimpit.hxx +++ b/sw/source/filter/xml/xmlimpit.hxx @@ -44,7 +44,7 @@ public: /** fills the given itemset with the attributes in the given list */ void importXML( SfxItemSet& rSet, - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > xAttrList, + css::uno::Reference< css::xml::sax::XAttributeList > xAttrList, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap ); diff --git a/sw/source/filter/xml/xmlitem.hxx b/sw/source/filter/xml/xmlitem.hxx index 8984fe6184e6..b927d0427235 100644 --- a/sw/source/filter/xml/xmlitem.hxx +++ b/sw/source/filter/xml/xmlitem.hxx @@ -41,7 +41,7 @@ public: SvXMLItemSetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, SfxItemSet& rItemSet, SvXMLImportItemMapper& rIMap, const SvXMLUnitConverter& rUnitConv ); @@ -50,14 +50,14 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; // This method is called from this instance implementation of // CreateChildContext if the element matches an entry in the // SvXMLImportItemMapper with the mid flag MID_SW_FLAG_ELEMENT_ITEM_IMPORT virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, SfxItemSet& rItemSet, const SvXMLItemMapEntry& rEntry, const SvXMLUnitConverter& rUnitConv ); diff --git a/sw/source/filter/xml/xmliteme.cxx b/sw/source/filter/xml/xmliteme.cxx index 2b28b352f7df..2183c9673352 100644 --- a/sw/source/filter/xml/xmliteme.cxx +++ b/sw/source/filter/xml/xmliteme.cxx @@ -42,7 +42,7 @@ #include <comphelper/processfactory.hxx> using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; +using namespace css::uno; using namespace ::xmloff::token; extern SvXMLItemMapEntry aXMLTableItemMap[]; diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx index ddecdccc0c35..0c4789a32d24 100644 --- a/sw/source/filter/xml/xmlitemi.cxx +++ b/sw/source/filter/xml/xmlitemi.cxx @@ -50,7 +50,7 @@ #include "xmlitem.hxx" using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; +using namespace css::uno; extern SvXMLItemMapEntry aXMLTableItemMap[]; extern SvXMLItemMapEntry aXMLTableColItemMap[]; diff --git a/sw/source/filter/xml/xmlmeta.cxx b/sw/source/filter/xml/xmlmeta.cxx index 9a201702688f..b81a84f654c2 100644 --- a/sw/source/filter/xml/xmlmeta.cxx +++ b/sw/source/filter/xml/xmlmeta.cxx @@ -35,9 +35,9 @@ #include "xmlexp.hxx" using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::text; +using namespace css::uno; +using namespace css::lang; +using namespace css::text; using namespace ::xmloff::token; uno::Reference<document::XDocumentProperties> diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx index 66b1388b377c..af816d0cf1b5 100644 --- a/sw/source/filter/xml/xmltble.cxx +++ b/sw/source/filter/xml/xmltble.cxx @@ -52,11 +52,11 @@ #include <textboxhelper.hxx> using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::text; -using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::container; +using namespace css::uno; +using namespace css::text; +using namespace css::beans; +using namespace css::lang; +using namespace css::container; using namespace ::xmloff::token; using table::XCell; using ::std::vector; diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index 386326a22f88..1b49a0878fe9 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -65,12 +65,12 @@ using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::text; -using namespace ::com::sun::star::frame; -using namespace ::com::sun::star::table; -using namespace ::com::sun::star::xml::sax; +using namespace css::uno; +using namespace css::lang; +using namespace css::text; +using namespace css::frame; +using namespace css::table; +using namespace css::xml::sax; using namespace ::xmloff::token; enum SwXMLTableElemTokens diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx index f9c781f3d885..d19cea868a50 100644 --- a/sw/source/filter/xml/xmltbli.hxx +++ b/sw/source/filter/xml/xmltbli.hxx @@ -59,10 +59,10 @@ class SwXMLTableContext : public XMLTextTableContext std::vector<ColumnWidthInfo> aColumnWidths; std::vector<OUString> *pColumnDefaultCellStyleNames; - ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextCursor > xOldCursor; - ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextContent > xTextContent; + css::uno::Reference < + css::text::XTextCursor > xOldCursor; + css::uno::Reference < + css::text::XTextContent > xTextContent; SwXMLTableRows_Impl * m_pRows; @@ -133,20 +133,20 @@ public: SwXMLTableContext( SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + const css::uno::Reference< + css::xml::sax::XAttributeList > & xAttrList ); SwXMLTableContext( SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< + css::xml::sax::XAttributeList > & xAttrList, SwXMLTableContext *pTable ); virtual ~SwXMLTableContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< + css::xml::sax::XAttributeList > & xAttrList ) override; SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); } diff --git a/sw/source/filter/xml/xmltext.cxx b/sw/source/filter/xml/xmltext.cxx index debc85c5fd6e..07b18b817658 100644 --- a/sw/source/filter/xml/xmltext.cxx +++ b/sw/source/filter/xml/xmltext.cxx @@ -21,8 +21,8 @@ #include "xmlimp.hxx" using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::text; +using namespace css::uno; +using namespace css::text; class SwXMLBodyContentContext_Impl : public SvXMLImportContext { diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx index fe2a0730b91d..d760bfbd9c31 100644 --- a/sw/source/filter/xml/xmltexte.cxx +++ b/sw/source/filter/xml/xmltexte.cxx @@ -48,12 +48,12 @@ #include <SwStyleNameMapper.hxx> using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::style; -using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::document; -using namespace ::com::sun::star::io; +using namespace css::uno; +using namespace css::style; +using namespace css::beans; +using namespace css::lang; +using namespace css::document; +using namespace css::io; using namespace ::xmloff::token; enum SvEmbeddedObjectTypes diff --git a/sw/source/filter/xml/xmltexte.hxx b/sw/source/filter/xml/xmltexte.hxx index d64d7b14f72a..cc2fcdaadc5a 100644 --- a/sw/source/filter/xml/xmltexte.hxx +++ b/sw/source/filter/xml/xmltexte.hxx @@ -42,26 +42,26 @@ class SwXMLTextParagraphExport : public XMLTextParagraphExport const SvGlobalName aOutplaceClassId; static SwNoTextNode *GetNoTextNode( - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet >& rPropSet ); + const css::uno::Reference < + css::beans::XPropertySet >& rPropSet ); protected: virtual void exportStyleContent( - const ::com::sun::star::uno::Reference< - ::com::sun::star::style::XStyle > & rStyle ) override; + const css::uno::Reference< + css::style::XStyle > & rStyle ) override; virtual void _collectTextEmbeddedAutoStyles( - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rPropSet ) override; + const css::uno::Reference < + css::beans::XPropertySet > & rPropSet ) override; virtual void _exportTextEmbedded( - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rPropSet, - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySetInfo > & rPropSetInfo ) override; + const css::uno::Reference < + css::beans::XPropertySet > & rPropSet, + const css::uno::Reference < + css::beans::XPropertySetInfo > & rPropSetInfo ) override; virtual void exportTable( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextContent > & rTextContent, + const css::uno::Reference < + css::text::XTextContent > & rTextContent, bool bAutoStyles, bool bProgress ) override; public: diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx index deaf437e6ca9..4f914a9fcac1 100644 --- a/sw/source/filter/xml/xmltexti.cxx +++ b/sw/source/filter/xml/xmltexti.cxx @@ -62,11 +62,11 @@ #include <svl/urihelper.hxx> using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::text; -using namespace ::com::sun::star::frame; -using namespace ::com::sun::star::beans; +using namespace css::uno; +using namespace css::lang; +using namespace css::text; +using namespace css::frame; +using namespace css::beans; using namespace xml::sax; struct XMLServiceMapEntry_Impl diff --git a/sw/source/filter/xml/xmltexti.hxx b/sw/source/filter/xml/xmltexti.hxx index f753c44f33d8..685a0e2c73c1 100644 --- a/sw/source/filter/xml/xmltexti.hxx +++ b/sw/source/filter/xml/xmltexti.hxx @@ -32,37 +32,37 @@ protected: virtual SvXMLImportContext *CreateTableChildContext( SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< + css::xml::sax::XAttributeList > & xAttrList ) override; public: SwXMLTextImportHelper( - const ::com::sun::star::uno::Reference < - ::com::sun::star::frame::XModel>& rModel, + const css::uno::Reference < + css::frame::XModel>& rModel, SvXMLImport& rImport, - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet>& rInfoSet, + const css::uno::Reference < + css::beans::XPropertySet>& rInfoSet, bool bInsertM, bool bStylesOnlyM, bool bProgress, bool bBlockM, bool bOrganizerM, bool bPreserveRedlineMode ); virtual ~SwXMLTextImportHelper(); - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> + virtual css::uno::Reference< + css::beans::XPropertySet> createAndInsertOLEObject( SvXMLImport& rImport, const OUString& rHRef, const OUString& rStyleName, const OUString& rTableName, sal_Int32 nWidth, sal_Int32 nHeight ) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> + virtual css::uno::Reference< + css::beans::XPropertySet> createAndInsertOOoLink( SvXMLImport& rImport, const OUString& rHRef, const OUString& rStyleName, const OUString& rTableName, sal_Int32 nWidth, sal_Int32 nHeight ) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> + virtual css::uno::Reference< + css::beans::XPropertySet> createAndInsertApplet( const OUString &rName, const OUString &rCode, @@ -70,15 +70,15 @@ public: const OUString& rHRef, sal_Int32 nWidth, sal_Int32 nHeight ) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> + virtual css::uno::Reference< + css::beans::XPropertySet> createAndInsertPlugin( const OUString &rMimeType, const OUString& rHRef, sal_Int32 nWidth, sal_Int32 nHeight ) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> + virtual css::uno::Reference< + css::beans::XPropertySet> createAndInsertFloatingFrame( const OUString &rName, const OUString &rHRef, @@ -86,7 +86,7 @@ public: sal_Int32 nWidth, sal_Int32 nHeight ) override; virtual void endAppletOrPlugin( - const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > &rPropSet, + const css::uno::Reference < css::beans::XPropertySet > &rPropSet, ::std::map < const OUString, OUString > &rParamMap) override; virtual bool IsInHeaderFooter() const override; @@ -98,12 +98,12 @@ public: const OUString& rId, /// use to identify this redline const OUString& rAuthor, /// name of the author const OUString& rComment, /// redline comment - const ::com::sun::star::util::DateTime& rDateTime, /// date+time + const css::util::DateTime& rDateTime, /// date+time bool bMergeLastPara) override; /// merge last paragraph - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextCursor> RedlineCreateText( - ::com::sun::star::uno::Reference< /// needed to get the document - ::com::sun::star::text::XTextCursor> & rOldCursor, + virtual css::uno::Reference< + css::text::XTextCursor> RedlineCreateText( + css::uno::Reference< /// needed to get the document + css::text::XTextCursor> & rOldCursor, const OUString& rId) override; /// ID used to RedlineAdd() call virtual void RedlineSetCursor( const OUString& rId, /// ID used to RedlineAdd() call @@ -113,7 +113,7 @@ public: virtual void SetShowChanges( bool bShowChanges ) override; virtual void SetRecordChanges( bool bRecordChanges ) override; virtual void SetChangesProtectionKey( - const ::com::sun::star::uno::Sequence<sal_Int8> & rKey ) override; + const css::uno::Sequence<sal_Int8> & rKey ) override; }; #endif // INCLUDED_SW_SOURCE_FILTER_XML_XMLTEXTI_HXX |