diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-30 14:17:06 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-10-01 12:20:41 +0200 |
| commit | bd8a4ae22376cf9e43df3f4924d37daa8a0796c1 (patch) | |
| tree | 0c60a496c0570a08d953c093e6cc34e0d8d198b5 | |
| parent | f1de3e14df9665ce48d676ac6f3439506d2b81f2 (diff) | |
com::sun::star->css in filter/
Change-Id: I3a5e6a349c903259698118542b0000b0f119859e
74 files changed, 858 insertions, 872 deletions
diff --git a/filter/source/config/cache/contenthandlerfactory.hxx b/filter/source/config/cache/contenthandlerfactory.hxx index ee7d2b28f0ad..2bb1eb51a1b8 100644 --- a/filter/source/config/cache/contenthandlerfactory.hxx +++ b/filter/source/config/cache/contenthandlerfactory.hxx @@ -128,21 +128,21 @@ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper< BaseContaine // Overrides to resolve ambiguity - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return BaseContainer::getByName(aName); } - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return BaseContainer::getElementNames(); } - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return BaseContainer::hasByName(aName); } - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return BaseContainer::getElementType(); } - virtual sal_Bool SAL_CALL hasElements() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return BaseContainer::hasElements(); } - virtual ::com::sun::star::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery( const ::rtl::OUString& Query ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery( const ::rtl::OUString& Query ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return BaseContainer::createSubSetEnumerationByQuery(Query); } - virtual ::com::sun::star::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties( const ::com::sun::star::uno::Sequence< css::beans::NamedValue >& Properties ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties( const css::uno::Sequence< css::beans::NamedValue >& Properties ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return BaseContainer::createSubSetEnumerationByProperties(Properties); } diff --git a/filter/source/config/cache/frameloaderfactory.hxx b/filter/source/config/cache/frameloaderfactory.hxx index 71553ca743df..c93fe1acceac 100644 --- a/filter/source/config/cache/frameloaderfactory.hxx +++ b/filter/source/config/cache/frameloaderfactory.hxx @@ -127,21 +127,21 @@ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper< BaseContainer static css::uno::Reference< css::uno::XInterface > impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); // Overrides to resolve ambiguity - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return BaseContainer::getByName(aName); } - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return BaseContainer::getElementNames(); } - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return BaseContainer::hasByName(aName); } - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return BaseContainer::getElementType(); } - virtual sal_Bool SAL_CALL hasElements() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return BaseContainer::hasElements(); } - virtual ::com::sun::star::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery( const ::rtl::OUString& Query ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery( const ::rtl::OUString& Query ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return BaseContainer::createSubSetEnumerationByQuery(Query); } - virtual ::com::sun::star::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties( const ::com::sun::star::uno::Sequence< css::beans::NamedValue >& Properties ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties( const css::uno::Sequence< css::beans::NamedValue >& Properties ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return BaseContainer::createSubSetEnumerationByProperties(Properties); } }; diff --git a/filter/source/config/cache/querytokenizer.hxx b/filter/source/config/cache/querytokenizer.hxx index cb754e5a2c6a..823836f957e5 100644 --- a/filter/source/config/cache/querytokenizer.hxx +++ b/filter/source/config/cache/querytokenizer.hxx @@ -29,16 +29,16 @@ namespace filter{ /** @short It can be used to split any query string (which can be used at the - related interface <type scope="com::sun::star::container">XContainerQuery</type>) + related interface <type scope="css::container">XContainerQuery</type>) into its different tokens using a fix schema. @descr All queries implemented of the services <ul> - <li><type scope="com::sun::star::document">TypeDetection</type></li> - <li><type scope="com::sun::star::document">FilterFactory</type></li> - <li><type scope="com::sun::star::document">ExtendedTypeDetectionFactory</type></li> - <li><type scope="com::sun::star::frame">FrameLoaderFactory</type></li> - <li><type scope="com::sun::star::frame">ContentHandlerFactory</type></li> + <li><type scope="css::document">TypeDetection</type></li> + <li><type scope="css::document">FilterFactory</type></li> + <li><type scope="css::document">ExtendedTypeDetectionFactory</type></li> + <li><type scope="css::frame">FrameLoaderFactory</type></li> + <li><type scope="css::frame">ContentHandlerFactory</type></li> </ul> uses this schema. diff --git a/filter/source/config/cache/registration.cxx b/filter/source/config/cache/registration.cxx index 3687a24f4a76..d9e4318ce194 100644 --- a/filter/source/config/cache/registration.cxx +++ b/filter/source/config/cache/registration.cxx @@ -40,9 +40,9 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL if ((!pImplementationName) || (!pServiceManager )) return NULL; - com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > - xSMGR = static_cast< com::sun::star::lang::XMultiServiceFactory* >(pServiceManager); - com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > xFactory; + css::uno::Reference< css::lang::XMultiServiceFactory > + xSMGR = static_cast< css::lang::XMultiServiceFactory* >(pServiceManager); + css::uno::Reference< css::lang::XSingleServiceFactory > xFactory; OUString sImplName = OUString::createFromAscii(pImplementationName); if (TypeDetection::impl_getImplementationName() == sImplName) diff --git a/filter/source/config/cache/typedetection.hxx b/filter/source/config/cache/typedetection.hxx index f433a796ec64..14e179438193 100644 --- a/filter/source/config/cache/typedetection.hxx +++ b/filter/source/config/cache/typedetection.hxx @@ -67,10 +67,10 @@ public: private: bool impl_getPreselectionForType( - const OUString& sPreSelType, const com::sun::star::util::URL& aParsedURL, FlatDetection& rFlatTypes, bool bDocService); + const OUString& sPreSelType, const css::util::URL& aParsedURL, FlatDetection& rFlatTypes, bool bDocService); bool impl_getPreselectionForDocumentService( - const OUString& sPreSelDocumentService, const com::sun::star::util::URL& aParsedURL, FlatDetection& rFlatTypes); + const OUString& sPreSelDocumentService, const css::util::URL& aParsedURL, FlatDetection& rFlatTypes); OUString impl_getTypeFromFilter(const OUString& rFilterName); @@ -78,7 +78,7 @@ private: * Get all format types that we handle. */ void impl_getAllFormatTypes( - const com::sun::star::util::URL& aParsedURL, utl::MediaDescriptor& rDescriptor, + const css::util::URL& aParsedURL, utl::MediaDescriptor& rDescriptor, FlatDetection& rFlatTypes); diff --git a/filter/source/flash/impswfdialog.hxx b/filter/source/flash/impswfdialog.hxx index 5ff6f085d635..259d5a6cdaad 100644 --- a/filter/source/flash/impswfdialog.hxx +++ b/filter/source/flash/impswfdialog.hxx @@ -56,11 +56,11 @@ private: public: ImpSWFDialog( vcl::Window* pParent, - com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rFilterData ); + css::uno::Sequence< css::beans::PropertyValue >& rFilterData ); virtual ~ImpSWFDialog(); virtual void dispose() SAL_OVERRIDE; - com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > GetFilterData(); + css::uno::Sequence< css::beans::PropertyValue > GetFilterData(); }; #endif // INCLUDED_FILTER_SOURCE_FLASH_IMPSWFDIALOG_HXX diff --git a/filter/source/flash/swfdialog.hxx b/filter/source/flash/swfdialog.hxx index 2130f79f38b2..e004c15d0506 100644 --- a/filter/source/flash/swfdialog.hxx +++ b/filter/source/flash/swfdialog.hxx @@ -34,44 +34,44 @@ class ResMgr; class SWFDialog : public ::svt::OGenericUnoDialog, public ::comphelper::OPropertyArrayUsageHelper< SWFDialog >, - public ::com::sun::star::beans::XPropertyAccess, - public ::com::sun::star::document::XExporter + public css::beans::XPropertyAccess, + public css::document::XExporter { private: - com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > maMediaDescriptor; - com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > maFilterData; - com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mxSrcDoc; + css::uno::Sequence< css::beans::PropertyValue > maMediaDescriptor; + css::uno::Sequence< css::beans::PropertyValue > maFilterData; + css::uno::Reference< css::lang::XComponent > mxSrcDoc; protected: // XInterface - virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& aType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; virtual void SAL_CALL release() throw () SAL_OVERRIDE; // OGenericUnoDialog - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual VclPtr<Dialog> createDialog( vcl::Window* pParent ) SAL_OVERRIDE; virtual void executedDialog( sal_Int16 nExecutionResult ) SAL_OVERRIDE; - virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; // XPropertyAccess using ::cppu::OPropertySetHelper::getPropertyValues; using ::cppu::OPropertySetHelper::setPropertyValues; - virtual com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues( ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPropertyValues( const com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps ) throw (com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& aProps ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XExporter - virtual void SAL_CALL setSourceDocument( const com::sun::star::uno::Reference< com::sun::star::lang::XComponent >& xDoc ) throw(com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: - SWFDialog( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext ); + SWFDialog( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~SWFDialog(); }; diff --git a/filter/source/flash/swfexporter.cxx b/filter/source/flash/swfexporter.cxx index 2a6a7005138f..8ddc7fde7f4c 100644 --- a/filter/source/flash/swfexporter.cxx +++ b/filter/source/flash/swfexporter.cxx @@ -591,7 +591,7 @@ void FlashExporter::exportShape( const Reference< XShape >& xShape, bool bMaster try { - com::sun::star::awt::Rectangle aBoundRect; + css::awt::Rectangle aBoundRect; xPropSet->getPropertyValue( "BoundRect" ) >>= aBoundRect; std::unique_ptr<ShapeInfo> pShapeInfo(new ShapeInfo()); diff --git a/filter/source/flash/swfexporter.hxx b/filter/source/flash/swfexporter.hxx index 7b086693cd72..8895f39bce97 100644 --- a/filter/source/flash/swfexporter.hxx +++ b/filter/source/flash/swfexporter.hxx @@ -64,32 +64,32 @@ public: sal_Int32 mnWidth; sal_Int32 mnHeight; - ::com::sun::star::presentation::AnimationEffect meEffect; - ::com::sun::star::presentation::AnimationEffect meTextEffect; - ::com::sun::star::presentation::AnimationSpeed meEffectSpeed; + css::presentation::AnimationEffect meEffect; + css::presentation::AnimationEffect meTextEffect; + css::presentation::AnimationSpeed meEffectSpeed; sal_Int32 mnPresOrder; - ::com::sun::star::presentation::ClickAction meClickAction; + css::presentation::ClickAction meClickAction; OUString maBookmark; sal_Int32 mnDimColor; - bool mbDimHide; - bool mbDimPrev; + bool mbDimHide; + bool mbDimPrev; - bool mbSoundOn; - bool mbPlayFull; - OUString maSoundURL; + bool mbSoundOn; + bool mbPlayFull; + OUString maSoundURL; sal_Int32 mnBlueScreenColor; ShapeInfo() : mnID(0), mnX(0), mnY(0), mnWidth(0), mnHeight(0), - meEffect( ::com::sun::star::presentation::AnimationEffect_NONE ), - meTextEffect( ::com::sun::star::presentation::AnimationEffect_NONE ), - meEffectSpeed( ::com::sun::star::presentation::AnimationSpeed_MEDIUM ), + meEffect( css::presentation::AnimationEffect_NONE ), + meTextEffect( css::presentation::AnimationEffect_NONE ), + meEffectSpeed( css::presentation::AnimationSpeed_MEDIUM ), mnPresOrder( 0 ), - meClickAction( ::com::sun::star::presentation::ClickAction_NONE ), + meClickAction( css::presentation::ClickAction_NONE ), mnDimColor( 0 ), mbDimHide( false ), mbDimPrev( false ), @@ -139,11 +139,11 @@ class FlashExporter { public: FlashExporter( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, // #i56084# variables for selection export - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxSelectedShapes, - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& rxSelectedDrawPage, + const css::uno::Reference< css::drawing::XShapes >& rxSelectedShapes, + const css::uno::Reference< css::drawing::XDrawPage >& rxSelectedDrawPage, sal_Int32 nJPEGCompressMode = -1, bool bExportOLEAsJPEG = false); @@ -151,10 +151,10 @@ public: void Flush(); - bool exportAll( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xDoc, com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > &xOutputStream, ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator> &xStatusIndicator ); - bool exportSlides( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > xDrawPage, com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > &xOutputStream, sal_uInt16 nPage); - sal_uInt16 exportBackgrounds( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > xDrawPage, com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > &xOutputStream, sal_uInt16 nPage, bool bExportObjects ); - sal_uInt16 exportBackgrounds( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > xDrawPage, sal_uInt16 nPage, bool bExportObjects ); + bool exportAll( css::uno::Reference< css::lang::XComponent > xDoc, css::uno::Reference< css::io::XOutputStream > &xOutputStream, css::uno::Reference< css::task::XStatusIndicator> &xStatusIndicator ); + bool exportSlides( css::uno::Reference< css::drawing::XDrawPage > xDrawPage, css::uno::Reference< css::io::XOutputStream > &xOutputStream, sal_uInt16 nPage); + sal_uInt16 exportBackgrounds( css::uno::Reference< css::drawing::XDrawPage > xDrawPage, css::uno::Reference< css::io::XOutputStream > &xOutputStream, sal_uInt16 nPage, bool bExportObjects ); + sal_uInt16 exportBackgrounds( css::uno::Reference< css::drawing::XDrawPage > xDrawPage, sal_uInt16 nPage, bool bExportObjects ); ChecksumCache gMasterCache; ChecksumCache gPrivateCache; @@ -162,28 +162,28 @@ public: ChecksumCache gMetafileCache; private: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext; + css::uno::Reference< css::uno::XComponentContext > mxContext; // #i56084# variables for selection export - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > mxSelectedShapes; - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > mxSelectedDrawPage; + const css::uno::Reference< css::drawing::XShapes > mxSelectedShapes; + const css::uno::Reference< css::drawing::XDrawPage > mxSelectedDrawPage; bool mbExportSelection; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XGraphicExportFilter > mxGraphicExporter; + css::uno::Reference< css::drawing::XGraphicExportFilter > mxGraphicExporter; ::std::map<sal_uInt32, PageInfo> maPagesMap; - sal_uInt16 exportDrawPageBackground(sal_uInt16 nPage, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage); - sal_uInt16 exportMasterPageObjects(sal_uInt16 nPage, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xMasterPage); + sal_uInt16 exportDrawPageBackground(sal_uInt16 nPage, css::uno::Reference< css::drawing::XDrawPage >& xPage); + sal_uInt16 exportMasterPageObjects(sal_uInt16 nPage, css::uno::Reference< css::drawing::XDrawPage >& xMasterPage); - void exportDrawPageContents( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage, bool bStream, bool bMaster ); - void exportShapes( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xShapes, bool bStream, bool bMaster ); - void exportShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape, bool bMaster); + void exportDrawPageContents( const css::uno::Reference< css::drawing::XDrawPage >& xPage, bool bStream, bool bMaster ); + void exportShapes( const css::uno::Reference< css::drawing::XShapes >& xShapes, bool bStream, bool bMaster ); + void exportShape( const css::uno::Reference< css::drawing::XShape >& xShape, bool bMaster); - BitmapChecksum ActionSummer(::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape); - BitmapChecksum ActionSummer(::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xShapes); + BitmapChecksum ActionSummer(css::uno::Reference< css::drawing::XShape >& xShape); + BitmapChecksum ActionSummer(css::uno::Reference< css::drawing::XShapes >& xShapes); - bool getMetaFile( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >&xComponent, GDIMetaFile& rMtf, bool bOnlyBackground = false, bool bExportAsJPEG = false ); + bool getMetaFile( css::uno::Reference< css::lang::XComponent >&xComponent, GDIMetaFile& rMtf, bool bOnlyBackground = false, bool bExportAsJPEG = false ); Writer* mpWriter; diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx index 7d18c2054729..b51a4bc5e2ae 100644 --- a/filter/source/flash/swffilter.cxx +++ b/filter/source/flash/swffilter.cxx @@ -62,7 +62,7 @@ using ::com::sun::star::frame::XModel; namespace swf { -class OslOutputStreamWrapper : public ::cppu::WeakImplHelper<com::sun::star::io::XOutputStream> +class OslOutputStreamWrapper : public ::cppu::WeakImplHelper<css::io::XOutputStream> { osl::File mrFile; @@ -74,12 +74,12 @@ public: } // css::io::XOutputStream - virtual void SAL_CALL writeBytes( const ::com::sun::star::uno::Sequence< sal_Int8 >& aData ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL flush( ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL closeOutput( ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL flush( ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL closeOutput( ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; -void SAL_CALL OslOutputStreamWrapper::writeBytes( const ::com::sun::star::uno::Sequence< sal_Int8 >& aData ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OslOutputStreamWrapper::writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) { sal_uInt64 uBytesToWrite = aData.getLength(); sal_uInt64 uBytesWritten = 0; @@ -104,7 +104,7 @@ void SAL_CALL OslOutputStreamWrapper::writeBytes( const ::com::sun::star::uno::S case osl::File::E_NOLINK: // Link has been severed case osl::File::E_NOSPC: // No space left on device case osl::File::E_NXIO: // No such device or address - throw com::sun::star::io::IOException(); // TODO: Better error handling + throw css::io::IOException(); // TODO: Better error handling default: break; } @@ -113,11 +113,11 @@ void SAL_CALL OslOutputStreamWrapper::writeBytes( const ::com::sun::star::uno::S } } -void SAL_CALL OslOutputStreamWrapper::flush( ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OslOutputStreamWrapper::flush( ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) { } -void SAL_CALL OslOutputStreamWrapper::closeOutput( ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OslOutputStreamWrapper::closeOutput( ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) { osl::File::RC eRC = mrFile.close(); @@ -130,7 +130,7 @@ void SAL_CALL OslOutputStreamWrapper::closeOutput( ) throw (::com::sun::star::i case osl::File::E_NOLINK: // Link has been severed case osl::File::E_NOSPC: // No space left on device case osl::File::E_IO: // I/O error - throw com::sun::star::io::IOException(); // TODO: Better error handling + throw css::io::IOException(); // TODO: Better error handling default: break; } } @@ -139,10 +139,10 @@ void SAL_CALL OslOutputStreamWrapper::closeOutput( ) throw (::com::sun::star::i class FlashExportFilter : public cppu::WeakImplHelper < - com::sun::star::document::XFilter, - com::sun::star::document::XExporter, - com::sun::star::lang::XInitialization, - com::sun::star::lang::XServiceInfo + css::document::XFilter, + css::document::XExporter, + css::lang::XInitialization, + css::lang::XServiceInfo > { Reference< XComponent > mxDoc; @@ -230,7 +230,7 @@ TYPE findPropertyValue(const Sequence< PropertyValue >& aPropertySequence, const return def; } -sal_Bool SAL_CALL FlashExportFilter::filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) +sal_Bool SAL_CALL FlashExportFilter::filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) throw (RuntimeException, std::exception) { mxStatusIndicator = findPropertyValue<Reference<XStatusIndicator> >(aDescriptor, "StatusIndicator", mxStatusIndicator); @@ -483,8 +483,8 @@ void SAL_CALL FlashExportFilter::cancel( ) // XExporter -void SAL_CALL FlashExportFilter::setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) - throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException, std::exception) +void SAL_CALL FlashExportFilter::setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) + throw (css::lang::IllegalArgumentException, RuntimeException, std::exception) { mxDoc = xDoc; } @@ -492,7 +492,7 @@ void SAL_CALL FlashExportFilter::setSourceDocument( const ::com::sun::star::uno: // XInitialization -void SAL_CALL FlashExportFilter::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& /* aArguments */ ) +void SAL_CALL FlashExportFilter::initialize( const css::uno::Sequence< css::uno::Any >& /* aArguments */ ) throw (Exception, RuntimeException, std::exception) { } @@ -531,7 +531,7 @@ sal_Bool SAL_CALL FlashExportFilter::supportsService( const OUString& rServiceNa return cppu::supportsService( this, rServiceName ); } -::com::sun::star::uno::Sequence< OUString > SAL_CALL FlashExportFilter::getSupportedServiceNames( ) +css::uno::Sequence< OUString > SAL_CALL FlashExportFilter::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { return FlashExportFilter_getSupportedServiceNames(); diff --git a/filter/source/flash/swfwriter.hxx b/filter/source/flash/swfwriter.hxx index a9a795f34de7..64a3dac40f54 100644 --- a/filter/source/flash/swfwriter.hxx +++ b/filter/source/flash/swfwriter.hxx @@ -267,7 +267,7 @@ public: Writer( sal_Int32 nDocWidthInput, sal_Int32 nDocHeightInput, sal_Int32 nDocWidth, sal_Int32 nDocHeight, sal_Int32 nJPEGcompressMode = -1 ); ~Writer(); - void storeTo( com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > &xOutStream ); + void storeTo( css::uno::Reference< css::io::XOutputStream > &xOutStream ); // geometry void setClipping( const tools::PolyPolygon* pClipPolyPolygon ); @@ -375,10 +375,10 @@ private: const double P3x, const double P3y, const double P4x, const double P4y ); - com::sun::star::uno::Reference < com::sun::star::i18n::XBreakIterator > Impl_GetBreakIterator(); + css::uno::Reference < css::i18n::XBreakIterator > Impl_GetBreakIterator(); private: - com::sun::star::uno::Reference< com::sun::star::i18n::XBreakIterator > mxBreakIterator; + css::uno::Reference< css::i18n::XBreakIterator > mxBreakIterator; FontMap maFonts; @@ -410,7 +410,7 @@ private: sal_uInt16 mnNextId; sal_uInt32 mnFrames; -// com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > mxOutStream; +// css::uno::Reference< css::io::XOutputStream > mxOutStream; oslFileHandle mxOutStream; utl::TempFile maMovieTempFile; diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx index d2b1695d999e..2ac0c0f098b1 100644 --- a/filter/source/graphicfilter/egif/egif.cxx +++ b/filter/source/graphicfilter/egif/egif.cxx @@ -63,7 +63,7 @@ class GIFWriter void WriteBitmapEx( const BitmapEx& rBmpEx, const Point& rPoint, bool bExtended, long nTimer = 0, Disposal eDisposal = DISPOSE_NOT ); - com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator; + css::uno::Reference< css::task::XStatusIndicator > xStatusIndicator; public: diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx index a65a4cc79011..0fcbbdbbe2af 100644 --- a/filter/source/graphicfilter/eos2met/eos2met.cxx +++ b/filter/source/graphicfilter/eos2met/eos2met.cxx @@ -159,7 +159,7 @@ private: ScopedVclPtr<VirtualDevice> apDummyVDev; VclPtr<OutputDevice> pCompDev; - com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator; + css::uno::Reference< css::task::XStatusIndicator > xStatusIndicator; void MayCallback(); // calculates a percentage based on the 5 parameters above and then does a diff --git a/filter/source/graphicfilter/epbm/epbm.cxx b/filter/source/graphicfilter/epbm/epbm.cxx index 1e1118a76c61..f848c803b005 100644 --- a/filter/source/graphicfilter/epbm/epbm.cxx +++ b/filter/source/graphicfilter/epbm/epbm.cxx @@ -43,7 +43,7 @@ private: void ImplWriteBody(); void ImplWriteNumber( sal_Int32 ); - com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator; + css::uno::Reference< css::task::XStatusIndicator > xStatusIndicator; public: PBMWriter(SvStream &rPBM); diff --git a/filter/source/graphicfilter/epgm/epgm.cxx b/filter/source/graphicfilter/epgm/epgm.cxx index 71b33098678b..d27e7c199668 100644 --- a/filter/source/graphicfilter/epgm/epgm.cxx +++ b/filter/source/graphicfilter/epgm/epgm.cxx @@ -43,7 +43,7 @@ private: void ImplWriteBody(); void ImplWriteNumber( sal_Int32 ); - com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator; + css::uno::Reference< css::task::XStatusIndicator > xStatusIndicator; public: PGMWriter(SvStream &rStream); diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx index b4afb21861b8..b421497ee51a 100644 --- a/filter/source/graphicfilter/epict/epict.cxx +++ b/filter/source/graphicfilter/epict/epict.cxx @@ -67,7 +67,7 @@ private: bool bStatus; sal_uLong nLastPercent; // with which number pCallback has been called the last time - com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator; + css::uno::Reference< css::task::XStatusIndicator > xStatusIndicator; SvStream * pPict; diff --git a/filter/source/graphicfilter/eppm/eppm.cxx b/filter/source/graphicfilter/eppm/eppm.cxx index dfd48d3bc161..8210edf801de 100644 --- a/filter/source/graphicfilter/eppm/eppm.cxx +++ b/filter/source/graphicfilter/eppm/eppm.cxx @@ -43,7 +43,7 @@ private: void ImplWriteBody(); void ImplWriteNumber( sal_Int32 ); - com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator; + css::uno::Reference< css::task::XStatusIndicator > xStatusIndicator; public: PPMWriter(SvStream &rStrm); diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index 2a5856354574..e62e31d22eb9 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -159,7 +159,7 @@ private: sal_uInt32 nOffset; sal_uInt32 dwShift; - com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator; + css::uno::Reference< css::task::XStatusIndicator > xStatusIndicator; void ImplWriteProlog( const Graphic* pPreviewEPSI = NULL ); void ImplWriteEpilog(); @@ -2497,17 +2497,17 @@ void PSWriter::ImplWriteLineInfo( const LineInfo& rLineInfo ) } switch(rLineInfo.GetLineCap()) { - default: /* com::sun::star::drawing::LineCap_BUTT */ + default: /* css::drawing::LineCap_BUTT */ { aCapType = SvtGraphicStroke::capButt; break; } - case com::sun::star::drawing::LineCap_ROUND: + case css::drawing::LineCap_ROUND: { aCapType = SvtGraphicStroke::capRound; break; } - case com::sun::star::drawing::LineCap_SQUARE: + case css::drawing::LineCap_SQUARE: { aCapType = SvtGraphicStroke::capSquare; break; diff --git a/filter/source/graphicfilter/eras/eras.cxx b/filter/source/graphicfilter/eras/eras.cxx index 3950a40ea164..1f23212f56f6 100644 --- a/filter/source/graphicfilter/eras/eras.cxx +++ b/filter/source/graphicfilter/eras/eras.cxx @@ -40,7 +40,7 @@ private: sal_uLong mnRepCount; sal_uInt8 mnRepVal; - com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator; + css::uno::Reference< css::task::XStatusIndicator > xStatusIndicator; void ImplCallback( sal_uLong nCurrentYPos ); bool ImplWriteHeader(); diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx index 619187cdf4b6..afc51cd46dd1 100644 --- a/filter/source/graphicfilter/etiff/etiff.cxx +++ b/filter/source/graphicfilter/etiff/etiff.cxx @@ -92,7 +92,7 @@ private: sal_uInt32 nOffset; sal_uInt32 dwShift; - com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator; + css::uno::Reference< css::task::XStatusIndicator > xStatusIndicator; void ImplCallback( sal_uInt32 nPercent ); bool ImplWriteHeader( bool bMultiPage ); diff --git a/filter/source/graphicfilter/expm/expm.cxx b/filter/source/graphicfilter/expm/expm.cxx index fca1788fa1a7..ade42797383c 100644 --- a/filter/source/graphicfilter/expm/expm.cxx +++ b/filter/source/graphicfilter/expm/expm.cxx @@ -36,7 +36,7 @@ private: sal_uLong mnWidth, mnHeight; // size in Pixel sal_uInt16 mnColors; - com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator; + css::uno::Reference< css::task::XStatusIndicator > xStatusIndicator; void ImplCallback( sal_uInt16 nPercent ); bool ImplWriteHeader(); diff --git a/filter/source/graphicfilter/icgm/cgm.hxx b/filter/source/graphicfilter/icgm/cgm.hxx index 6d05221c9e8f..50d6e62775c9 100644 --- a/filter/source/graphicfilter/icgm/cgm.hxx +++ b/filter/source/graphicfilter/icgm/cgm.hxx @@ -137,9 +137,9 @@ class CGM ~CGM(); - CGM( sal_uInt32 nMode, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > const & rModel ); + CGM( sal_uInt32 nMode, css::uno::Reference< css::frame::XModel > const & rModel ); GDIMetaFile* mpGDIMetaFile; - sal_uInt32 GetBackGroundColor(); + sal_uInt32 GetBackGroundColor(); bool IsValid() const { return mbStatus; }; bool IsFinished() const { return mbIsFinished; }; bool Write( SvStream& rIStm ); diff --git a/filter/source/graphicfilter/icgm/outact.hxx b/filter/source/graphicfilter/icgm/outact.hxx index c38e8196267c..ecd6179c1fef 100644 --- a/filter/source/graphicfilter/icgm/outact.hxx +++ b/filter/source/graphicfilter/icgm/outact.hxx @@ -34,12 +34,12 @@ #include <chart.hxx> #include <tools/poly.hxx> -typedef struct NodeFrameSet +struct NodeFrameSet { - Point nTopLeft; - Point nBottomRight; - ::com::sun::star::awt::Size nSize; -} NodeFrameSet; + Point nTopLeft; + Point nBottomRight; + css::awt::Size nSize; +}; class CGM; class CGMBitmapDescriptor; @@ -86,32 +86,32 @@ public: virtual void DrawPolyLine( tools::Polygon& ) {} ; virtual void DrawPolybezier( tools::Polygon& ) {} ; virtual void DrawPolyPolygon( tools::PolyPolygon& ) {} ; - virtual void DrawText( ::com::sun::star::awt::Point&, ::com::sun::star::awt::Size&, char*, sal_uInt32, FinalFlag ) {} ; + virtual void DrawText( css::awt::Point&, css::awt::Size&, char*, sal_uInt32, FinalFlag ) {} ; virtual void AppendText( char*, sal_uInt32, FinalFlag ) {} ; virtual void DrawChart(){} ; }; class CGMImpressOutAct : public CGMOutAct { - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPages > maXDrawPages; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > maXDrawPage; + css::uno::Reference< css::drawing::XDrawPages > maXDrawPages; + css::uno::Reference< css::drawing::XDrawPage > maXDrawPage; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > maXMultiServiceFactory; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > maXShape; - bool ImplCreateShape( const OUString& rType ); + css::uno::Reference< css::lang::XMultiServiceFactory > maXMultiServiceFactory; + css::uno::Reference< css::drawing::XShape > maXShape; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > maXPropSet; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > maXShapes; + css::uno::Reference< css::beans::XPropertySet > maXPropSet; + css::uno::Reference< css::drawing::XShapes > maXShapes; sal_uInt32 nFinalTextCount; + bool ImplCreateShape( const OUString& rType ); bool ImplInitPage(); void ImplSetOrientation( FloatPoint& RefPoint, double& Orientation ) ; void ImplSetLineBundle() ; void ImplSetFillBundle() ; - void ImplSetTextBundle( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & ) ; + void ImplSetTextBundle( const css::uno::Reference< css::beans::XPropertySet > & ) ; public: - CGMImpressOutAct( CGM&, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & ) ; + CGMImpressOutAct( CGM&, const css::uno::Reference< css::frame::XModel > & ) ; virtual ~CGMImpressOutAct() {} ; virtual void InsertPage() SAL_OVERRIDE ; virtual void BeginGroup() SAL_OVERRIDE ; @@ -126,7 +126,7 @@ public: virtual void DrawPolyLine( tools::Polygon& ) SAL_OVERRIDE ; virtual void DrawPolybezier( tools::Polygon& ) SAL_OVERRIDE ; virtual void DrawPolyPolygon( tools::PolyPolygon& ) SAL_OVERRIDE ; - virtual void DrawText( ::com::sun::star::awt::Point& TextRectPos, ::com::sun::star::awt::Size& TextRectSize, char* String, sal_uInt32 StringSize, FinalFlag ) SAL_OVERRIDE ; + virtual void DrawText( css::awt::Point& TextRectPos, css::awt::Size& TextRectSize, char* String, sal_uInt32 StringSize, FinalFlag ) SAL_OVERRIDE ; virtual void AppendText( char* String, sal_uInt32 StringSize, FinalFlag ) SAL_OVERRIDE ; virtual void DrawChart() SAL_OVERRIDE; }; diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 639414e6aaf4..7629b86ea630 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -341,7 +341,7 @@ sal_uInt32 EscherPropertyContainer::ImplGetColor( const sal_uInt32 nSOColor, boo } sal_uInt32 EscherPropertyContainer::GetGradientColor( - const ::com::sun::star::awt::Gradient* pGradient, + const css::awt::Gradient* pGradient, sal_uInt32 nStartColor ) { sal_uInt32 nIntensity = 100; @@ -367,7 +367,7 @@ sal_uInt32 EscherPropertyContainer::GetGradientColor( } void EscherPropertyContainer::CreateGradientProperties( - const ::com::sun::star::awt::Gradient & rGradient ) + const css::awt::Gradient & rGradient ) { sal_uInt32 nFillType = ESCHER_FillShadeScale; sal_uInt32 nAngle = 0; @@ -379,8 +379,8 @@ void EscherPropertyContainer::CreateGradientProperties( switch ( rGradient.Style ) { - case ::com::sun::star::awt::GradientStyle_LINEAR : - case ::com::sun::star::awt::GradientStyle_AXIAL : + case css::awt::GradientStyle_LINEAR : + case css::awt::GradientStyle_AXIAL : { nFillType = ESCHER_FillShadeScale; nAngle = (rGradient.Angle * 0x10000) / 10; @@ -388,10 +388,10 @@ void EscherPropertyContainer::CreateGradientProperties( sal::static_int_cast<int>(GradientStyle_LINEAR)) ? 0 : 50; } break; - case ::com::sun::star::awt::GradientStyle_RADIAL : - case ::com::sun::star::awt::GradientStyle_ELLIPTICAL : - case ::com::sun::star::awt::GradientStyle_SQUARE : - case ::com::sun::star::awt::GradientStyle_RECT : + case css::awt::GradientStyle_RADIAL : + case css::awt::GradientStyle_ELLIPTICAL : + case css::awt::GradientStyle_SQUARE : + case css::awt::GradientStyle_RECT : { nFillLR = (rGradient.XOffset * 0x10000) / 100; nFillTB = (rGradient.YOffset * 0x10000) / 100; @@ -403,7 +403,7 @@ void EscherPropertyContainer::CreateGradientProperties( bWriteFillTo = true; } break; - case ::com::sun::star::awt::GradientStyle_MAKE_FIXED_SIZE : break; + case css::awt::GradientStyle_MAKE_FIXED_SIZE : break; } AddOpt( ESCHER_Prop_fillType, nFillType ); AddOpt( ESCHER_Prop_fillAngle, nAngle ); @@ -420,10 +420,10 @@ void EscherPropertyContainer::CreateGradientProperties( } void EscherPropertyContainer::CreateGradientProperties( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet , bool bTransparentGradient) + const css::uno::Reference< css::beans::XPropertySet > & rXPropSet , bool bTransparentGradient) { - ::com::sun::star::uno::Any aAny; - ::com::sun::star::awt::Gradient const * pGradient = NULL; + css::uno::Any aAny; + css::awt::Gradient const * pGradient = NULL; sal_uInt32 nFillType = ESCHER_FillShadeScale; sal_Int32 nAngle = 0; @@ -439,16 +439,16 @@ void EscherPropertyContainer::CreateGradientProperties( { pGradient = static_cast<css::awt::Gradient const *>(aAny.getValue()); - ::com::sun::star::uno::Any aAnyTemp; + css::uno::Any aAnyTemp; const rtl::OUString aPropName( "FillStyle" ); if ( EscherPropertyValueHelper::GetPropertyValue( aAnyTemp, rXPropSet, aPropName ) ) { - ::com::sun::star::drawing::FillStyle eFS; + css::drawing::FillStyle eFS; if ( ! ( aAnyTemp >>= eFS ) ) - eFS = ::com::sun::star::drawing::FillStyle_SOLID; + eFS = css::drawing::FillStyle_SOLID; // solid and transparency - if ( eFS == ::com::sun::star::drawing::FillStyle_SOLID) + if ( eFS == css::drawing::FillStyle_SOLID) { if ( EscherPropertyValueHelper::GetPropertyValue( aAnyTemp, rXPropSet, OUString( "FillColor" ) ) ) @@ -458,7 +458,7 @@ void EscherPropertyContainer::CreateGradientProperties( } } // gradient and transparency. - else if( eFS == ::com::sun::star::drawing::FillStyle_GRADIENT ) + else if( eFS == css::drawing::FillStyle_GRADIENT ) { if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "FillGradient" ) ) ) @@ -478,8 +478,8 @@ void EscherPropertyContainer::CreateGradientProperties( { switch ( pGradient->Style ) { - case ::com::sun::star::awt::GradientStyle_LINEAR : - case ::com::sun::star::awt::GradientStyle_AXIAL : + case css::awt::GradientStyle_LINEAR : + case css::awt::GradientStyle_AXIAL : { nFillType = ESCHER_FillShadeScale; nAngle = pGradient->Angle; @@ -488,7 +488,7 @@ void EscherPropertyContainer::CreateGradientProperties( // Value of the real number = Integral + (Fractional / 65536.0) nAngle = ( nAngle * 0x10000) / 10; - nFillFocus = (pGradient->Style == ::com::sun::star::awt::GradientStyle_LINEAR) ? + nFillFocus = (pGradient->Style == css::awt::GradientStyle_LINEAR) ? ( pGradient->XOffset + pGradient->YOffset )/2 : -50; if( !nFillFocus ) nFirstColor=nFirstColor ^ 1; @@ -496,10 +496,10 @@ void EscherPropertyContainer::CreateGradientProperties( nFirstColor=nFirstColor ^ 1; } break; - case ::com::sun::star::awt::GradientStyle_RADIAL : - case ::com::sun::star::awt::GradientStyle_ELLIPTICAL : - case ::com::sun::star::awt::GradientStyle_SQUARE : - case ::com::sun::star::awt::GradientStyle_RECT : + case css::awt::GradientStyle_RADIAL : + case css::awt::GradientStyle_ELLIPTICAL : + case css::awt::GradientStyle_SQUARE : + case css::awt::GradientStyle_RECT : { // according to the import logic and rect type fill** value nFillLR = (pGradient->XOffset * 0x10000) / 100; @@ -552,8 +552,8 @@ void EscherPropertyContainer::CreateGradientProperties( } void EscherPropertyContainer::CreateFillProperties( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, - bool bEdge , const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape ) + const css::uno::Reference< css::beans::XPropertySet > & rXPropSet, + bool bEdge , const css::uno::Reference< css::drawing::XShape > & rXShape ) { if ( rXShape.is() ) { @@ -570,11 +570,11 @@ void EscherPropertyContainer::CreateFillProperties( } void EscherPropertyContainer::CreateFillProperties( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, + const css::uno::Reference< css::beans::XPropertySet > & rXPropSet, bool bEdge , bool bTransparentGradient) { - ::com::sun::star::uno::Any aAny; + css::uno::Any aAny; AddOpt( ESCHER_Prop_WrapText, ESCHER_WrapNone ); AddOpt( ESCHER_Prop_AnchorText, ESCHER_AnchorMiddle ); const OUString aPropName( "FillStyle" ); @@ -582,41 +582,41 @@ void EscherPropertyContainer::CreateFillProperties( if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, aPropName ) ) { - ::com::sun::star::drawing::FillStyle eFS; + css::drawing::FillStyle eFS; if ( ! ( aAny >>= eFS ) ) - eFS = ::com::sun::star::drawing::FillStyle_SOLID; + eFS = css::drawing::FillStyle_SOLID; sal_uInt32 nFillBackColor = 0; switch( eFS ) { - case ::com::sun::star::drawing::FillStyle_GRADIENT : + case css::drawing::FillStyle_GRADIENT : { CreateGradientProperties( rXPropSet , bTransparentGradient ); AddOpt( ESCHER_Prop_fNoFillHitTest, 0x140014 ); } break; - case ::com::sun::star::drawing::FillStyle_BITMAP : + case css::drawing::FillStyle_BITMAP : { CreateGraphicProperties( rXPropSet, OUString( "FillBitmapURL" ), true ); AddOpt( ESCHER_Prop_fNoFillHitTest, 0x140014 ); AddOpt( ESCHER_Prop_fillBackColor, nFillBackColor ); } break; - case ::com::sun::star::drawing::FillStyle_HATCH : + case css::drawing::FillStyle_HATCH : { CreateGraphicProperties( rXPropSet, OUString( "FillHatch" ), true ); } break; - case ::com::sun::star::drawing::FillStyle_SOLID : + case css::drawing::FillStyle_SOLID : default: { if ( bTransparentGradient ) CreateGradientProperties( rXPropSet , bTransparentGradient ); else { - ::com::sun::star::beans::PropertyState ePropState = EscherPropertyValueHelper::GetPropertyState( + css::beans::PropertyState ePropState = EscherPropertyValueHelper::GetPropertyState( rXPropSet, aPropName ); - if ( ePropState == ::com::sun::star::beans::PropertyState_DIRECT_VALUE ) + if ( ePropState == css::beans::PropertyState_DIRECT_VALUE ) AddOpt( ESCHER_Prop_fillType, ESCHER_FillSolid ); if ( EscherPropertyValueHelper::GetPropertyValue( @@ -631,11 +631,11 @@ void EscherPropertyContainer::CreateFillProperties( } break; } - case ::com::sun::star::drawing::FillStyle_NONE : + case css::drawing::FillStyle_NONE : AddOpt( ESCHER_Prop_fNoFillHitTest, 0x100000 ); break; } - if ( eFS != ::com::sun::star::drawing::FillStyle_NONE ) + if ( eFS != css::drawing::FillStyle_NONE ) { sal_uInt16 nTransparency = ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "FillTransparence" ), true ) ) @@ -838,7 +838,7 @@ void EscherPropertyContainer::CreateTextProperties( } bool EscherPropertyContainer::GetLineArrow( const bool bLineStart, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, + const css::uno::Reference< css::beans::XPropertySet > & rXPropSet, ESCHER_LineEnd& reLineEnd, sal_Int32& rnArrowLength, sal_Int32& rnArrowWidth ) { static const char sLineStart [] = "LineStart"; @@ -851,7 +851,7 @@ bool EscherPropertyContainer::GetLineArrow( const bool bLineStart, bool bIsArrow = false; - ::com::sun::star::uno::Any aAny; + css::uno::Any aAny; if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, sLine ) ) { tools::PolyPolygon aPolyPoly( EscherPropertyContainer::GetPolyPolygon( aAny ) ); @@ -939,10 +939,10 @@ bool EscherPropertyContainer::GetLineArrow( const bool bLineStart, } void EscherPropertyContainer::CreateLineProperties( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, + const css::uno::Reference< css::beans::XPropertySet > & rXPropSet, bool bEdge ) { - ::com::sun::star::uno::Any aAny; + css::uno::Any aAny; sal_uInt32 nLineFlags = 0x80008; ESCHER_LineEnd eLineEnd; @@ -952,10 +952,10 @@ void EscherPropertyContainer::CreateLineProperties( bool bSwapLineEnds = false; if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "CircleKind" ), true ) ) { - ::com::sun::star::drawing::CircleKind eCircleKind; + css::drawing::CircleKind eCircleKind; if ( aAny >>= eCircleKind ) { - if ( eCircleKind == ::com::sun::star::drawing::CircleKind_ARC ) + if ( eCircleKind == css::drawing::CircleKind_ARC ) bSwapLineEnds = true; } } @@ -977,23 +977,23 @@ void EscherPropertyContainer::CreateLineProperties( // support LineCaps if(EscherPropertyValueHelper::GetPropertyValue(aAny, rXPropSet, OUString( "LineCap" ))) { - ::com::sun::star::drawing::LineCap aLineCap(com::sun::star::drawing::LineCap_BUTT); + css::drawing::LineCap aLineCap(css::drawing::LineCap_BUTT); if(aAny >>= aLineCap) { switch (aLineCap) { - default: /* com::sun::star::drawing::LineCap_BUTT */ + default: /* css::drawing::LineCap_BUTT */ { AddOpt(ESCHER_Prop_lineEndCapStyle, ESCHER_LineEndCapFlat); break; } - case com::sun::star::drawing::LineCap_ROUND: + case css::drawing::LineCap_ROUND: { AddOpt(ESCHER_Prop_lineEndCapStyle, ESCHER_LineEndCapRound); break; } - case com::sun::star::drawing::LineCap_SQUARE: + case css::drawing::LineCap_SQUARE: { AddOpt(ESCHER_Prop_lineEndCapStyle, ESCHER_LineEndCapSquare); break; @@ -1004,26 +1004,26 @@ void EscherPropertyContainer::CreateLineProperties( if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "LineStyle" ) ) ) { - ::com::sun::star::drawing::LineStyle eLS; + css::drawing::LineStyle eLS; if ( aAny >>= eLS ) { switch ( eLS ) { - case ::com::sun::star::drawing::LineStyle_NONE : + case css::drawing::LineStyle_NONE : AddOpt( ESCHER_Prop_fNoLineDrawDash, 0x90000 ); // 80000 break; - case ::com::sun::star::drawing::LineStyle_DASH : + case css::drawing::LineStyle_DASH : { if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "LineDash" ) ) ) { ESCHER_LineDashing eDash = ESCHER_LineSolid; - ::com::sun::star::drawing::LineDash const * pLineDash = static_cast<css::drawing::LineDash const *>(aAny.getValue()); + css::drawing::LineDash const * pLineDash = static_cast<css::drawing::LineDash const *>(aAny.getValue()); sal_Int32 nDistance = pLineDash->Distance << 1; switch ( pLineDash->Style ) { - case ::com::sun::star::drawing::DashStyle_ROUND : - case ::com::sun::star::drawing::DashStyle_ROUNDRELATIVE : + case css::drawing::DashStyle_ROUND : + case css::drawing::DashStyle_ROUNDRELATIVE : AddOpt( ESCHER_Prop_lineEndCapStyle, 0 ); // set Style Round break; default : break; @@ -1062,7 +1062,7 @@ void EscherPropertyContainer::CreateLineProperties( AddOpt( ESCHER_Prop_lineDashing, eDash ); } } - case ::com::sun::star::drawing::LineStyle_SOLID : + case css::drawing::LineStyle_SOLID : default: { AddOpt( ESCHER_Prop_fNoLineDrawDash, nLineFlags ); @@ -1086,21 +1086,21 @@ void EscherPropertyContainer::CreateLineProperties( ESCHER_LineJoin eLineJoin = ESCHER_LineJoinMiter; if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "LineJoint" ), true ) ) { - ::com::sun::star::drawing::LineJoint eLJ; + css::drawing::LineJoint eLJ; if ( aAny >>= eLJ ) { switch ( eLJ ) { - case com::sun::star::drawing::LineJoint_NONE : - case com::sun::star::drawing::LineJoint_MIDDLE : - case com::sun::star::drawing::LineJoint_BEVEL : + case css::drawing::LineJoint_NONE : + case css::drawing::LineJoint_MIDDLE : + case css::drawing::LineJoint_BEVEL : eLineJoin = ESCHER_LineJoinBevel; break; default: - case com::sun::star::drawing::LineJoint_MITER : + case css::drawing::LineJoint_MITER : eLineJoin = ESCHER_LineJoinMiter; break; - case com::sun::star::drawing::LineJoint_ROUND : + case css::drawing::LineJoint_ROUND : eLineJoin = ESCHER_LineJoinRound; break; } @@ -1134,13 +1134,13 @@ static Size lcl_SizeToEmu(Size aPrefSize, MapMode aPrefMapMode) return aRetSize; } -void EscherPropertyContainer::ImplCreateGraphicAttributes( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, +void EscherPropertyContainer::ImplCreateGraphicAttributes( const css::uno::Reference< css::beans::XPropertySet > & rXPropSet, sal_uInt32 nBlibId, bool bCreateCroppingAttributes ) { - ::com::sun::star::uno::Any aAny; + css::uno::Any aAny; sal_uInt32 nPicFlags = 0; - ::com::sun::star::drawing::ColorMode eColorMode( ::com::sun::star::drawing::ColorMode_STANDARD ); + css::drawing::ColorMode eColorMode( css::drawing::ColorMode_STANDARD ); sal_Int16 nLuminance = 0; sal_Int32 nContrast = 0; @@ -1155,9 +1155,9 @@ void EscherPropertyContainer::ImplCreateGraphicAttributes( const ::com::sun::sta nContrast = nC; } - if ( eColorMode == ::com::sun::star::drawing::ColorMode_WATERMARK ) + if ( eColorMode == css::drawing::ColorMode_WATERMARK ) { - eColorMode = ::com::sun::star::drawing::ColorMode_STANDARD; + eColorMode = css::drawing::ColorMode_STANDARD; nLuminance += 70; if ( nLuminance > 100 ) nLuminance = 100; @@ -1165,9 +1165,9 @@ void EscherPropertyContainer::ImplCreateGraphicAttributes( const ::com::sun::sta if ( nContrast < -100 ) nContrast = -100; } - if ( eColorMode == ::com::sun::star::drawing::ColorMode_GREYS ) + if ( eColorMode == css::drawing::ColorMode_GREYS ) nPicFlags |= 0x40004; - else if ( eColorMode == ::com::sun::star::drawing::ColorMode_MONO ) + else if ( eColorMode == css::drawing::ColorMode_MONO ) nPicFlags |= 0x60006; if ( nContrast ) @@ -1202,7 +1202,7 @@ void EscherPropertyContainer::ImplCreateGraphicAttributes( const ::com::sun::sta { if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "GraphicCrop" ) ) ) { - ::com::sun::star::text::GraphicCrop aGraphCrop; + css::text::GraphicCrop aGraphCrop; if ( aAny >>= aGraphCrop ) { if ( aGraphCrop.Left ) @@ -1232,13 +1232,13 @@ void EscherPropertyContainer::ImplCreateGraphicAttributes( const ::com::sun::sta } } -bool EscherPropertyContainer::CreateShapeProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape ) +bool EscherPropertyContainer::CreateShapeProperties( const css::uno::Reference< css::drawing::XShape > & rXShape ) { uno::Reference< beans::XPropertySet > aXPropSet( rXShape, uno::UNO_QUERY ); if ( aXPropSet.is() ) { bool bVal = false; - ::com::sun::star::uno::Any aAny; + css::uno::Any aAny; sal_uInt32 nShapeAttr = 0; if (EscherPropertyValueHelper::GetPropertyValue(aAny, aXPropSet, OUString("Visible"), true) && (aAny >>= bVal)) { @@ -1257,7 +1257,7 @@ bool EscherPropertyContainer::CreateShapeProperties( const ::com::sun::star::uno } bool EscherPropertyContainer::CreateOLEGraphicProperties( - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape ) + const css::uno::Reference< css::drawing::XShape > & rXShape ) { bool bRetValue = false; @@ -1277,7 +1277,7 @@ bool EscherPropertyContainer::CreateOLEGraphicProperties( return bRetValue; } -bool EscherPropertyContainer::CreateGraphicProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape, const GraphicObject& rGraphicObj ) +bool EscherPropertyContainer::CreateGraphicProperties( const css::uno::Reference< css::drawing::XShape > & rXShape, const GraphicObject& rGraphicObj ) { bool bRetValue = false; OString aUniqueId( rGraphicObj.GetUniqueID() ); @@ -1288,11 +1288,11 @@ bool EscherPropertyContainer::CreateGraphicProperties( const ::com::sun::star::u if ( pGraphicProvider && pPicOutStrm && pShapeBoundRect && aXPropSet.is() ) { - ::com::sun::star::uno::Any aAny; - std::unique_ptr< ::com::sun::star::awt::Rectangle> pVisArea; + css::uno::Any aAny; + std::unique_ptr< css::awt::Rectangle> pVisArea; if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, OUString("VisibleArea" ) ) ) { - pVisArea.reset(new ::com::sun::star::awt::Rectangle); + pVisArea.reset(new css::awt::Rectangle); aAny >>= (*pVisArea); } Rectangle aRect( Point( 0, 0 ), pShapeBoundRect->GetSize() ); @@ -1309,7 +1309,7 @@ bool EscherPropertyContainer::CreateGraphicProperties( const ::com::sun::star::u } bool EscherPropertyContainer::CreateMediaGraphicProperties( - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape ) + const css::uno::Reference< css::drawing::XShape > & rXShape ) { bool bRetValue = false; if ( rXShape.is() ) @@ -1346,7 +1346,7 @@ bool EscherPropertyContainer::ImplCreateEmbeddedBmp( const OString& rUniqueId ) } bool EscherPropertyContainer::CreateEmbeddedBitmapProperties( - const OUString& rBitmapUrl, ::com::sun::star::drawing::BitmapMode eBitmapMode ) + const OUString& rBitmapUrl, css::drawing::BitmapMode eBitmapMode ) { bool bRetValue = false; OUString aVndUrl( "vnd.sun.star.GraphicObject:" ); @@ -1362,7 +1362,7 @@ bool EscherPropertyContainer::CreateEmbeddedBitmapProperties( if( bRetValue ) { // bitmap mode property - bool bRepeat = eBitmapMode == ::com::sun::star::drawing::BitmapMode_REPEAT; + bool bRepeat = eBitmapMode == css::drawing::BitmapMode_REPEAT; AddOpt( ESCHER_Prop_fillType, bRepeat ? ESCHER_FillTexture : ESCHER_FillPicture ); } } @@ -1373,7 +1373,7 @@ bool EscherPropertyContainer::CreateEmbeddedBitmapProperties( namespace { -GraphicObject lclDrawHatch( const ::com::sun::star::drawing::Hatch& rHatch, const Color& rBackColor, bool bFillBackground, const Rectangle& rRect ) +GraphicObject lclDrawHatch( const css::drawing::Hatch& rHatch, const Color& rBackColor, bool bFillBackground, const Rectangle& rRect ) { // #i121183# For hatch, do no longer create a bitmap with the fixed size of 28x28 pixels. Also // do not create a bitmap in page size, that would explode file sizes (and have no good quality). @@ -1402,7 +1402,7 @@ GraphicObject lclDrawHatch( const ::com::sun::star::drawing::Hatch& rHatch, cons } // namespace -bool EscherPropertyContainer::CreateEmbeddedHatchProperties( const ::com::sun::star::drawing::Hatch& rHatch, const Color& rBackColor, bool bFillBackground ) +bool EscherPropertyContainer::CreateEmbeddedHatchProperties( const css::drawing::Hatch& rHatch, const Color& rBackColor, bool bFillBackground ) { const Rectangle aRect(pShapeBoundRect ? *pShapeBoundRect : Rectangle(Point(0,0), Size(28000, 21000))); GraphicObject aGraphicObject = lclDrawHatch( rHatch, rBackColor, bFillBackground, aRect ); @@ -1415,7 +1415,7 @@ bool EscherPropertyContainer::CreateEmbeddedHatchProperties( const ::com::sun::s bool EscherPropertyContainer::CreateGraphicProperties( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, + const css::uno::Reference< css::beans::XPropertySet > & rXPropSet, const OUString& rSource, const bool bCreateFillBitmap, const bool bCreateCroppingAttributes, const bool bFillBitmapModeAllowed, const bool bOOxmlExport ) { @@ -1427,8 +1427,8 @@ bool EscherPropertyContainer::CreateGraphicProperties( OUString aGraphicUrl; OString aUniqueId; - ::com::sun::star::drawing::BitmapMode eBitmapMode( ::com::sun::star::drawing::BitmapMode_NO_REPEAT ); - ::com::sun::star::uno::Any aAny; + css::drawing::BitmapMode eBitmapMode( css::drawing::BitmapMode_NO_REPEAT ); + css::uno::Any aAny; if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, rSource ) ) { @@ -1444,7 +1444,7 @@ bool EscherPropertyContainer::CreateGraphicProperties( sal_uInt16 nAngle = 0; if ( rSource == "MetaFile" ) { - ::com::sun::star::uno::Sequence<sal_Int8> aSeq = *static_cast<css::uno::Sequence<sal_Int8> const *>(aAny.getValue()); + css::uno::Sequence<sal_Int8> aSeq = *static_cast<css::uno::Sequence<sal_Int8> const *>(aAny.getValue()); const sal_Int8* pAry = aSeq.getArray(); sal_uInt32 nAryLen = aSeq.getLength(); @@ -1466,11 +1466,11 @@ bool EscherPropertyContainer::CreateGraphicProperties( } else if ( rSource == "Bitmap" ) { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >xBitmap( + css::uno::Reference< css::awt::XBitmap >xBitmap( aAny, css::uno::UNO_QUERY); if (xBitmap.is()) { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap > xBmp; + css::uno::Reference< css::awt::XBitmap > xBmp; if ( aAny >>= xBmp ) { BitmapEx aBitmapEx( VCLUnoHelper::GetBitmap( xBmp ) ); @@ -1492,7 +1492,7 @@ bool EscherPropertyContainer::CreateGraphicProperties( } else if ( rSource == "FillHatch" ) { - ::com::sun::star::drawing::Hatch aHatch; + css::drawing::Hatch aHatch; if ( aAny >>= aHatch ) { Color aBackColor; @@ -1509,7 +1509,7 @@ bool EscherPropertyContainer::CreateGraphicProperties( const Rectangle aRect(Point(0, 0), pShapeBoundRect ? pShapeBoundRect->GetSize() : Size(28000, 21000)); aGraphicObject = lclDrawHatch( aHatch, aBackColor, bFillBackground, aRect ); aUniqueId = aGraphicObject.GetUniqueID(); - eBitmapMode = ::com::sun::star::drawing::BitmapMode_REPEAT; + eBitmapMode = css::drawing::BitmapMode_REPEAT; bIsGraphicMtf = aGraphicObject.GetType() == GRAPHIC_GDIMETAFILE; } } @@ -1666,7 +1666,7 @@ bool EscherPropertyContainer::CreateGraphicProperties( AddOpt( ESCHER_Prop_Rotation, ( ( ((sal_Int32)nAngle << 16 ) / 10 ) + 0x8000 ) &~ 0xffff ); } - if ( eBitmapMode == ::com::sun::star::drawing::BitmapMode_REPEAT ) + if ( eBitmapMode == css::drawing::BitmapMode_REPEAT ) { sal_Int32 nSizeX = 0,nSizeY = 0,nOffsetX = 0,nOffsetY = 0,nPosOffsetX = 0,nPosOffsetY = 0; if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, "FillBitmapSizeX", true ) ) @@ -1762,12 +1762,12 @@ bool EscherPropertyContainer::CreateGraphicProperties( return bRetValue; } -tools::PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape ) +tools::PolyPolygon EscherPropertyContainer::GetPolyPolygon( const css::uno::Reference< css::drawing::XShape > & rXShape ) { tools::PolyPolygon aRetPolyPoly; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXPropSet; - ::com::sun::star::uno::Any aAny( rXShape->queryInterface( - cppu::UnoType<com::sun::star::beans::XPropertySet>::get())); + css::uno::Reference< css::beans::XPropertySet > aXPropSet; + css::uno::Any aAny( rXShape->queryInterface( + cppu::UnoType<css::beans::XPropertySet>::get())); OUString sPolyPolygonBezier ( "PolyPolygonBezier" ); OUString sPolyPolygon ( "PolyPolygon" ); @@ -1786,41 +1786,41 @@ tools::PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::st return aRetPolyPoly; } -tools::PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::star::uno::Any& rAny ) +tools::PolyPolygon EscherPropertyContainer::GetPolyPolygon( const css::uno::Any& rAny ) { bool bNoError = true; tools::Polygon aPolygon; tools::PolyPolygon aPolyPolygon; - if ( rAny.getValueType() == cppu::UnoType<com::sun::star::drawing::PolyPolygonBezierCoords>::get()) + if ( rAny.getValueType() == cppu::UnoType<css::drawing::PolyPolygonBezierCoords>::get()) { - ::com::sun::star::drawing::PolyPolygonBezierCoords const * pSourcePolyPolygon + css::drawing::PolyPolygonBezierCoords const * pSourcePolyPolygon = static_cast<css::drawing::PolyPolygonBezierCoords const *>(rAny.getValue()); sal_uInt16 nOuterSequenceCount = (sal_uInt16)pSourcePolyPolygon->Coordinates.getLength(); // get pointer of inner sequences - ::com::sun::star::drawing::PointSequence const * pOuterSequence = pSourcePolyPolygon->Coordinates.getConstArray(); - ::com::sun::star::drawing::FlagSequence const * pOuterFlags = pSourcePolyPolygon->Flags.getConstArray(); + css::drawing::PointSequence const * pOuterSequence = pSourcePolyPolygon->Coordinates.getConstArray(); + css::drawing::FlagSequence const * pOuterFlags = pSourcePolyPolygon->Flags.getConstArray(); bNoError = pOuterSequence && pOuterFlags; if ( bNoError ) { sal_uInt16 a, b, nInnerSequenceCount; - ::com::sun::star::awt::Point const * pArray; + css::awt::Point const * pArray; // this will be a polygon set for ( a = 0; a < nOuterSequenceCount; a++ ) { - ::com::sun::star::drawing::PointSequence const * pInnerSequence = pOuterSequence++; - ::com::sun::star::drawing::FlagSequence const * pInnerFlags = pOuterFlags++; + css::drawing::PointSequence const * pInnerSequence = pOuterSequence++; + css::drawing::FlagSequence const * pInnerFlags = pOuterFlags++; bNoError = pInnerSequence && pInnerFlags; if ( bNoError ) { // get pointer to arrays pArray = pInnerSequence->getConstArray(); - ::com::sun::star::drawing::PolygonFlags const * pFlags = pInnerFlags->getConstArray(); + css::drawing::PolygonFlags const * pFlags = pInnerFlags->getConstArray(); if ( pArray && pFlags ) { @@ -1829,7 +1829,7 @@ tools::PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::st for( b = 0; b < nInnerSequenceCount; b++) { css::drawing::PolygonFlags ePolyFlags = *pFlags++; - ::com::sun::star::awt::Point aPoint( *(pArray++) ); + css::awt::Point aPoint( *(pArray++) ); aPolygon[ b ] = Point( aPoint.X, aPoint.Y ); aPolygon.SetFlags( b, static_cast<PolyFlags>(ePolyFlags) ); @@ -1844,12 +1844,12 @@ tools::PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::st } else if ( rAny.getValueType() == cppu::UnoType<css::drawing::PointSequenceSequence>::get() ) { - ::com::sun::star::drawing::PointSequenceSequence const * pSourcePolyPolygon + css::drawing::PointSequenceSequence const * pSourcePolyPolygon = static_cast<css::drawing::PointSequenceSequence const *>(rAny.getValue()); sal_uInt16 nOuterSequenceCount = (sal_uInt16)pSourcePolyPolygon->getLength(); // get pointer to inner sequences - ::com::sun::star::drawing::PointSequence const * pOuterSequence = pSourcePolyPolygon->getConstArray(); + css::drawing::PointSequence const * pOuterSequence = pSourcePolyPolygon->getConstArray(); bNoError = pOuterSequence != NULL; if ( bNoError ) { @@ -1858,12 +1858,12 @@ tools::PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::st // this will be a polygon set for( a = 0; a < nOuterSequenceCount; a++ ) { - ::com::sun::star::drawing::PointSequence const * pInnerSequence = pOuterSequence++; + css::drawing::PointSequence const * pInnerSequence = pOuterSequence++; bNoError = pInnerSequence != NULL; if ( bNoError ) { // get pointer to arrays - ::com::sun::star::awt::Point const * pArray = + css::awt::Point const * pArray = pInnerSequence->getConstArray(); if ( pArray != NULL ) { @@ -1882,7 +1882,7 @@ tools::PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::st } else if ( rAny.getValueType() == cppu::UnoType<css::drawing::PointSequence>::get() ) { - ::com::sun::star::drawing::PointSequence const * pInnerSequence = + css::drawing::PointSequence const * pInnerSequence = static_cast<css::drawing::PointSequence const *>(rAny.getValue()); bNoError = pInnerSequence != NULL; @@ -1891,7 +1891,7 @@ tools::PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::st sal_uInt16 a, nInnerSequenceCount; // get pointer to arrays - ::com::sun::star::awt::Point const * pArray = pInnerSequence->getConstArray(); + css::awt::Point const * pArray = pInnerSequence->getConstArray(); if ( pArray != NULL ) { nInnerSequenceCount = (sal_uInt16)pInnerSequence->getLength(); @@ -1909,10 +1909,10 @@ tools::PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::st } bool EscherPropertyContainer::CreatePolygonProperties( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, + const css::uno::Reference< css::beans::XPropertySet > & rXPropSet, sal_uInt32 nFlags, bool bBezier, - ::com::sun::star::awt::Rectangle& rGeoRect, + css::awt::Rectangle& rGeoRect, tools::Polygon* pPolygon ) { static const char sPolyPolygonBezier [] = "PolyPolygonBezier"; @@ -1927,7 +1927,7 @@ bool EscherPropertyContainer::CreatePolygonProperties( aPolyPolygon.Insert( *pPolygon ); else { - ::com::sun::star::uno::Any aAny; + css::uno::Any aAny; bRetValue = EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, ( bBezier ) ? OUString(sPolyPolygonBezier) : OUString(sPolyPolygon), true ); if ( bRetValue ) @@ -1943,7 +1943,7 @@ bool EscherPropertyContainer::CreatePolygonProperties( if ( ( aPolyPolygon.Count() == 1 ) && ( aPolyPolygon[ 0 ].GetSize() == 2 ) ) { const tools::Polygon& rPoly = aPolyPolygon[ 0 ]; - rGeoRect = ::com::sun::star::awt::Rectangle( + rGeoRect = css::awt::Rectangle( rPoly[ 0 ].X(), rPoly[ 0 ].Y(), rPoly[ 1 ].X() - rPoly[ 0 ].X(), @@ -1959,7 +1959,7 @@ bool EscherPropertyContainer::CreatePolygonProperties( sal_uInt16 nPolyCount = aPolyPolygon.Count(); sal_uInt32 nTotalPoints(0), nTotalBezPoints(0); Rectangle aRect( aPolyPolygon.GetBoundRect() ); - rGeoRect = ::com::sun::star::awt::Rectangle( aRect.Left(), aRect.Top(), aRect.GetWidth(), aRect.GetHeight() ); + rGeoRect = css::awt::Rectangle( aRect.Left(), aRect.Top(), aRect.GetWidth(), aRect.GetHeight() ); for (sal_uInt16 i = 0; i < nPolyCount; ++i) { @@ -2208,8 +2208,8 @@ bool lcl_GetAngle(tools::Polygon &rPoly,sal_uInt16& rShapeFlags,sal_Int32& nAngl return false; } bool EscherPropertyContainer::CreateConnectorProperties( - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape, - EscherSolverContainer& rSolverContainer, ::com::sun::star::awt::Rectangle& rGeoRect, + const css::uno::Reference< css::drawing::XShape > & rXShape, + EscherSolverContainer& rSolverContainer, css::awt::Rectangle& rGeoRect, sal_uInt16& rShapeType, sal_uInt16& rShapeFlags ) { static const char sEdgeKind [] = "EdgeKind"; @@ -2224,15 +2224,15 @@ bool EscherPropertyContainer::CreateConnectorProperties( if ( rXShape.is() ) { - ::com::sun::star::awt::Point aStartPoint, aEndPoint; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXPropSet; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > aShapeA, aShapeB; - ::com::sun::star::uno::Any aAny( rXShape->queryInterface( cppu::UnoType<com::sun::star::beans::XPropertySet>::get())); + css::awt::Point aStartPoint, aEndPoint; + css::uno::Reference< css::beans::XPropertySet > aXPropSet; + css::uno::Reference< css::drawing::XShape > aShapeA, aShapeB; + css::uno::Any aAny( rXShape->queryInterface( cppu::UnoType<css::beans::XPropertySet>::get())); if ( aAny >>= aXPropSet ) { if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, sEdgeKind, true ) ) { - ::com::sun::star::drawing::ConnectorType eCt; + css::drawing::ConnectorType eCt; aAny >>= eCt; if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, sEdgeStartPoint ) ) { @@ -2242,10 +2242,10 @@ bool EscherPropertyContainer::CreateConnectorProperties( aEndPoint = *static_cast<css::awt::Point const *>(aAny.getValue()); rShapeFlags = SHAPEFLAG_HAVEANCHOR | SHAPEFLAG_HAVESPT | SHAPEFLAG_CONNECTOR; - rGeoRect = ::com::sun::star::awt::Rectangle( aStartPoint.X, aStartPoint.Y, + rGeoRect = css::awt::Rectangle( aStartPoint.X, aStartPoint.Y, ( aEndPoint.X - aStartPoint.X ) + 1, ( aEndPoint.Y - aStartPoint.Y ) + 1 ); // set standard's FLIP in below code - if ( eCt != ::com::sun::star::drawing::ConnectorType_STANDARD) + if ( eCt != css::drawing::ConnectorType_STANDARD) { if ( rGeoRect.Height < 0 ) // justify { @@ -2270,7 +2270,7 @@ bool EscherPropertyContainer::CreateConnectorProperties( rSolverContainer.AddConnector( rXShape, aStartPoint, aShapeA, aEndPoint, aShapeB ); switch ( eCt ) { - case ::com::sun::star::drawing::ConnectorType_CURVE : + case css::drawing::ConnectorType_CURVE : { rShapeType = ESCHER_ShpInst_CurvedConnector3; AddOpt( ESCHER_Prop_cxstyle, ESCHER_cxstyleCurved ); @@ -2279,7 +2279,7 @@ bool EscherPropertyContainer::CreateConnectorProperties( } break; - case ::com::sun::star::drawing::ConnectorType_STANDARD :// Connector 2->5 + case css::drawing::ConnectorType_STANDARD :// Connector 2->5 { if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, sEdgePath ) ) { @@ -2308,8 +2308,8 @@ bool EscherPropertyContainer::CreateConnectorProperties( } break; default: - case ::com::sun::star::drawing::ConnectorType_LINE : - case ::com::sun::star::drawing::ConnectorType_LINES : // Connector 2->5 + case css::drawing::ConnectorType_LINE : + case css::drawing::ConnectorType_LINES : // Connector 2->5 { rShapeType = ESCHER_ShpInst_StraightConnector1; AddOpt( ESCHER_Prop_cxstyle, ESCHER_cxstyleStraight ); @@ -2327,9 +2327,9 @@ bool EscherPropertyContainer::CreateConnectorProperties( } bool EscherPropertyContainer::CreateShadowProperties( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet ) + const css::uno::Reference< css::beans::XPropertySet > & rXPropSet ) { - ::com::sun::star::uno::Any aAny; + css::uno::Any aAny; bool bHasShadow = false; // shadow is possible only if at least a fillcolor, linecolor or graphic is set sal_uInt32 nLineFlags = 0; // default : shape has no line @@ -2367,7 +2367,7 @@ bool EscherPropertyContainer::CreateShadowProperties( return bHasShadow; } -sal_Int32 EscherPropertyContainer::GetValueForEnhancedCustomShapeParameter( const ::com::sun::star::drawing::EnhancedCustomShapeParameter& rParameter, +sal_Int32 EscherPropertyContainer::GetValueForEnhancedCustomShapeParameter( const css::drawing::EnhancedCustomShapeParameter& rParameter, const std::vector< sal_Int32 >& rEquationOrder, bool bAdjustTrans ) { sal_Int32 nValue = 0; @@ -2382,7 +2382,7 @@ sal_Int32 EscherPropertyContainer::GetValueForEnhancedCustomShapeParameter( cons switch( rParameter.Type ) { - case com::sun::star::drawing::EnhancedCustomShapeParameterType::EQUATION : + case css::drawing::EnhancedCustomShapeParameterType::EQUATION : { size_t nIndex = (size_t) nValue; OSL_ASSERT(nIndex < rEquationOrder.size()); @@ -2393,7 +2393,7 @@ sal_Int32 EscherPropertyContainer::GetValueForEnhancedCustomShapeParameter( cons } } break; - case com::sun::star::drawing::EnhancedCustomShapeParameterType::ADJUSTMENT: + case css::drawing::EnhancedCustomShapeParameterType::ADJUSTMENT: { if(bAdjustTrans) { @@ -2403,21 +2403,21 @@ sal_Int32 EscherPropertyContainer::GetValueForEnhancedCustomShapeParameter( cons } } break; - case com::sun::star::drawing::EnhancedCustomShapeParameterType::NORMAL : + case css::drawing::EnhancedCustomShapeParameterType::NORMAL : default: break; /* not sure if it is allowed to set following values (but they are not yet used) - case com::sun::star::drawing::EnhancedCustomShapeParameterType::BOTTOM : - case com::sun::star::drawing::EnhancedCustomShapeParameterType::RIGHT : - case com::sun::star::drawing::EnhancedCustomShapeParameterType::TOP : - case com::sun::star::drawing::EnhancedCustomShapeParameterType::LEFT : + case css::drawing::EnhancedCustomShapeParameterType::BOTTOM : + case css::drawing::EnhancedCustomShapeParameterType::RIGHT : + case css::drawing::EnhancedCustomShapeParameterType::TOP : + case css::drawing::EnhancedCustomShapeParameterType::LEFT : */ } return nValue; } -bool GetValueForEnhancedCustomShapeHandleParameter( sal_Int32& nRetValue, const com::sun::star::drawing::EnhancedCustomShapeParameter& rParameter ) +bool GetValueForEnhancedCustomShapeHandleParameter( sal_Int32& nRetValue, const css::drawing::EnhancedCustomShapeParameter& rParameter ) { bool bSpecial = false; nRetValue = 0; @@ -2432,33 +2432,33 @@ bool GetValueForEnhancedCustomShapeHandleParameter( sal_Int32& nRetValue, const switch( rParameter.Type ) { - case com::sun::star::drawing::EnhancedCustomShapeParameterType::EQUATION : + case css::drawing::EnhancedCustomShapeParameterType::EQUATION : { nRetValue += 3; bSpecial = true; } break; - case com::sun::star::drawing::EnhancedCustomShapeParameterType::ADJUSTMENT : + case css::drawing::EnhancedCustomShapeParameterType::ADJUSTMENT : { nRetValue += 0x100; bSpecial = true; } break; - case com::sun::star::drawing::EnhancedCustomShapeParameterType::TOP : - case com::sun::star::drawing::EnhancedCustomShapeParameterType::LEFT : + case css::drawing::EnhancedCustomShapeParameterType::TOP : + case css::drawing::EnhancedCustomShapeParameterType::LEFT : { nRetValue = 0; bSpecial = true; } break; - case com::sun::star::drawing::EnhancedCustomShapeParameterType::RIGHT : - case com::sun::star::drawing::EnhancedCustomShapeParameterType::BOTTOM : + case css::drawing::EnhancedCustomShapeParameterType::RIGHT : + case css::drawing::EnhancedCustomShapeParameterType::BOTTOM : { nRetValue = 1; bSpecial = true; } break; - case com::sun::star::drawing::EnhancedCustomShapeParameterType::NORMAL : + case css::drawing::EnhancedCustomShapeParameterType::NORMAL : { } @@ -2490,8 +2490,8 @@ void ConvertEnhancedCustomShapeEquation( SdrObjCustomShape* pCustoShape, { std::shared_ptr< EnhancedCustomShape::ExpressionNode > aExpressNode( EnhancedCustomShape::FunctionParser::parseFunction( sEquationSource[ i ], aCustoShape2d ) ); - com::sun::star::drawing::EnhancedCustomShapeParameter aPara( aExpressNode->fillNode( rEquations, NULL, 0 ) ); - if ( aPara.Type != com::sun::star::drawing::EnhancedCustomShapeParameterType::EQUATION ) + css::drawing::EnhancedCustomShapeParameter aPara( aExpressNode->fillNode( rEquations, NULL, 0 ) ); + if ( aPara.Type != css::drawing::EnhancedCustomShapeParameterType::EQUATION ) { EnhancedCustomShapeEquation aEquation; aEquation.nOperation = 0; @@ -2594,7 +2594,7 @@ void EscherPropertyContainer::LookForPolarHandles( const MSO_SPT eShapeType, sal } } -bool EscherPropertyContainer::GetAdjustmentValue( const com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue & rkProp, sal_Int32 nIndex, sal_Int32 nAdjustmentsWhichNeedsToBeConverted, sal_Int32& nValue ) +bool EscherPropertyContainer::GetAdjustmentValue( const css::drawing::EnhancedCustomShapeAdjustmentValue & rkProp, sal_Int32 nIndex, sal_Int32 nAdjustmentsWhichNeedsToBeConverted, sal_Int32& nValue ) { if ( rkProp.State != beans::PropertyState_DIRECT_VALUE ) return false; @@ -2751,7 +2751,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT { double fDepth = 0; double fFraction = 0; - com::sun::star::drawing::EnhancedCustomShapeParameterPair aDepthParaPair; + css::drawing::EnhancedCustomShapeParameterPair aDepthParaPair; if ( ( rrProp.Value >>= aDepthParaPair ) && ( aDepthParaPair.First.Value >>= fDepth ) && ( aDepthParaPair.Second.Value >>= fFraction ) ) { double fForeDepth = fDepth * fFraction; @@ -2886,7 +2886,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT { double fExtrusionAngleX = 0; double fExtrusionAngleY = 0; - com::sun::star::drawing::EnhancedCustomShapeParameterPair aRotateAnglePair; + css::drawing::EnhancedCustomShapeParameterPair aRotateAnglePair; if ( ( rrProp.Value >>= aRotateAnglePair ) && ( aRotateAnglePair.First.Value >>= fExtrusionAngleX ) && ( aRotateAnglePair.Second.Value >>= fExtrusionAngleY ) ) { fExtrusionAngleX *= 65536; @@ -2916,7 +2916,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT { double fSkewAmount = 0; double fSkewAngle = 0; - com::sun::star::drawing::EnhancedCustomShapeParameterPair aSkewParaPair; + css::drawing::EnhancedCustomShapeParameterPair aSkewParaPair; if ( ( rrProp.Value >>= aSkewParaPair ) && ( aSkewParaPair.First.Value >>= fSkewAmount ) && ( aSkewParaPair.Second.Value >>= fSkewAngle ) ) { AddOpt( DFF_Prop_c3DSkewAmount, (sal_Int32)fSkewAmount ); @@ -2958,7 +2958,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT { double fExtrusionOriginX = 0; double fExtrusionOriginY = 0; - com::sun::star::drawing::EnhancedCustomShapeParameterPair aOriginPair; + css::drawing::EnhancedCustomShapeParameterPair aOriginPair; if ( ( rrProp.Value >>= aOriginPair ) && ( aOriginPair.First.Value >>= fExtrusionOriginX ) && ( aOriginPair.Second.Value >>= fExtrusionOriginY ) ) { AddOpt( DFF_Prop_c3DOriginX, (sal_Int32)( fExtrusionOriginX * 65536 ) ); @@ -3100,7 +3100,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT { if ( !bIsDefaultObject ) { - com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair> aGluePoints; + css::uno::Sequence< css::drawing::EnhancedCustomShapeParameterPair> aGluePoints; if ( rrProp.Value >>= aGluePoints ) { // creating the vertices @@ -3142,7 +3142,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT { if ( !bIsDefaultObject ) { - com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeSegment > aSegments; + css::uno::Sequence< css::drawing::EnhancedCustomShapeSegment > aSegments; if ( rrProp.Value >>= aSegments ) { // creating seginfo @@ -3173,74 +3173,74 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT case css::drawing::EnhancedCustomShapeSegmentCommand::MOVETO : nVal = (msopathMoveTo << 13); break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::CURVETO : + case css::drawing::EnhancedCustomShapeSegmentCommand::CURVETO : { nVal |= (msopathCurveTo << 13); } break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::CLOSESUBPATH : + case css::drawing::EnhancedCustomShapeSegmentCommand::CLOSESUBPATH : { nVal = 1; nVal |= (msopathClose << 13); } break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ENDSUBPATH : + case css::drawing::EnhancedCustomShapeSegmentCommand::ENDSUBPATH : { nVal = (msopathEnd << 13); } break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::NOFILL : + case css::drawing::EnhancedCustomShapeSegmentCommand::NOFILL : { nVal = (msopathEscape << 13) | (5 << 8); } break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::NOSTROKE : + case css::drawing::EnhancedCustomShapeSegmentCommand::NOSTROKE : { nVal = (msopathEscape << 13) | (11 << 8); } break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ANGLEELLIPSETO : + case css::drawing::EnhancedCustomShapeSegmentCommand::ANGLEELLIPSETO : { nVal *= 3; nVal |= (msopathEscape << 13) | (1 << 8); } break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ANGLEELLIPSE : + case css::drawing::EnhancedCustomShapeSegmentCommand::ANGLEELLIPSE : { nVal *= 3; nVal |= (msopathEscape << 13) | (2 << 8); } break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ARCTO : + case css::drawing::EnhancedCustomShapeSegmentCommand::ARCTO : { nVal <<= 2; nVal |= (msopathEscape << 13) | (3 << 8); } break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ARC : + case css::drawing::EnhancedCustomShapeSegmentCommand::ARC : { nVal <<= 2; nVal |= (msopathEscape << 13) | (4 << 8); } break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::CLOCKWISEARCTO : + case css::drawing::EnhancedCustomShapeSegmentCommand::CLOCKWISEARCTO : { nVal <<= 2; nVal |= (msopathEscape << 13) | (5 << 8); } break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::CLOCKWISEARC : + case css::drawing::EnhancedCustomShapeSegmentCommand::CLOCKWISEARC : { nVal <<= 2; nVal |= (msopathEscape << 13) | (6 << 8); } break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ELLIPTICALQUADRANTX : + case css::drawing::EnhancedCustomShapeSegmentCommand::ELLIPTICALQUADRANTX : { nVal |= (msopathEscape << 13) | (7 << 8); } break; - case com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ELLIPTICALQUADRANTY : + case css::drawing::EnhancedCustomShapeSegmentCommand::ELLIPTICALQUADRANTY : { nVal |= (msopathEscape << 13) | (8 << 8); } @@ -3282,7 +3282,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT { if ( !bIsDefaultObject ) { - com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeTextFrame > aPathTextFrames; + css::uno::Sequence< css::drawing::EnhancedCustomShapeTextFrame > aPathTextFrames; if ( rrProp.Value >>= aPathTextFrames ) { if ( (sal_uInt16)aPathTextFrames.getLength() ) @@ -3362,14 +3362,14 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT } else if ( rrProp.Name.equals( sTextPathMode ) ) { - com::sun::star::drawing::EnhancedCustomShapeTextPathMode eTextPathMode; + css::drawing::EnhancedCustomShapeTextPathMode eTextPathMode; if ( rrProp.Value >>= eTextPathMode ) { nTextPathFlags |= 0x05000000; nTextPathFlags &=~0x500; // TextPathMode_NORMAL - if ( eTextPathMode == com::sun::star::drawing::EnhancedCustomShapeTextPathMode_PATH ) + if ( eTextPathMode == css::drawing::EnhancedCustomShapeTextPathMode_PATH ) nTextPathFlags |= 0x100; - else if ( eTextPathMode == com::sun::star::drawing::EnhancedCustomShapeTextPathMode_SHAPE ) + else if ( eTextPathMode == css::drawing::EnhancedCustomShapeTextPathMode_SHAPE ) nTextPathFlags |= 0x500; } } @@ -3569,7 +3569,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT if ( rPropVal.Name.equals( sPosition ) ) { - com::sun::star::drawing::EnhancedCustomShapeParameterPair aPosition; + css::drawing::EnhancedCustomShapeParameterPair aPosition; if ( rPropVal.Value >>= aPosition ) { GetValueForEnhancedCustomShapeHandleParameter( nXPosition, aPosition.First ); @@ -3605,7 +3605,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT } else if ( rPropVal.Name.equals( sPolar ) ) { - com::sun::star::drawing::EnhancedCustomShapeParameterPair aPolar; + css::drawing::EnhancedCustomShapeParameterPair aPolar; if ( rPropVal.Value >>= aPolar ) { if ( GetValueForEnhancedCustomShapeHandleParameter( nXMap, aPolar.First ) ) @@ -3620,7 +3620,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT nYRangeMin = (sal_Int32)0xff4c0000; // the range of angles seems to be a not nYRangeMax = (sal_Int32)0x00b40000; // used feature, so we are defaulting this - com::sun::star::drawing::EnhancedCustomShapeParameter aRadiusRangeMinimum; + css::drawing::EnhancedCustomShapeParameter aRadiusRangeMinimum; if ( rPropVal.Value >>= aRadiusRangeMinimum ) { if ( GetValueForEnhancedCustomShapeHandleParameter( nXRangeMin, aRadiusRangeMinimum ) ) @@ -3633,7 +3633,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT nYRangeMin = (sal_Int32)0xff4c0000; // the range of angles seems to be a not nYRangeMax = (sal_Int32)0x00b40000; // used feature, so we are defaulting this - com::sun::star::drawing::EnhancedCustomShapeParameter aRadiusRangeMaximum; + css::drawing::EnhancedCustomShapeParameter aRadiusRangeMaximum; if ( rPropVal.Value >>= aRadiusRangeMaximum ) { if ( GetValueForEnhancedCustomShapeHandleParameter( nXRangeMax, aRadiusRangeMaximum ) ) @@ -3643,7 +3643,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT } else if ( rPropVal.Name.equals( sRangeXMinimum ) ) { - com::sun::star::drawing::EnhancedCustomShapeParameter aXRangeMinimum; + css::drawing::EnhancedCustomShapeParameter aXRangeMinimum; if ( rPropVal.Value >>= aXRangeMinimum ) { if ( GetValueForEnhancedCustomShapeHandleParameter( nXRangeMin, aXRangeMinimum ) ) @@ -3653,7 +3653,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT } else if ( rPropVal.Name.equals( sRangeXMaximum ) ) { - com::sun::star::drawing::EnhancedCustomShapeParameter aXRangeMaximum; + css::drawing::EnhancedCustomShapeParameter aXRangeMaximum; if ( rPropVal.Value >>= aXRangeMaximum ) { if ( GetValueForEnhancedCustomShapeHandleParameter( nXRangeMax, aXRangeMaximum ) ) @@ -3663,7 +3663,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT } else if ( rPropVal.Name.equals( sRangeYMinimum ) ) { - com::sun::star::drawing::EnhancedCustomShapeParameter aYRangeMinimum; + css::drawing::EnhancedCustomShapeParameter aYRangeMinimum; if ( rPropVal.Value >>= aYRangeMinimum ) { if ( GetValueForEnhancedCustomShapeHandleParameter( nYRangeMin, aYRangeMinimum ) ) @@ -3673,7 +3673,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT } else if ( rPropVal.Name.equals( sRangeYMaximum ) ) { - com::sun::star::drawing::EnhancedCustomShapeParameter aYRangeMaximum; + css::drawing::EnhancedCustomShapeParameter aYRangeMaximum; if ( rPropVal.Value >>= aYRangeMaximum ) { if ( GetValueForEnhancedCustomShapeHandleParameter( nYRangeMax, aYRangeMaximum ) ) @@ -3717,7 +3717,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT } if ( bAdjustmentValuesProp ) { - uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue > aAdjustmentSeq; + uno::Sequence< css::drawing::EnhancedCustomShapeAdjustmentValue > aAdjustmentSeq; if ( aAdjustmentValuesProp >>= aAdjustmentSeq ) { if ( bPredefinedHandlesUsed ) @@ -3731,7 +3731,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT } if( bPathCoordinatesProp ) { - com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair > aCoordinates; + css::uno::Sequence< css::drawing::EnhancedCustomShapeParameterPair > aCoordinates; if ( aPathCoordinatesProp >>= aCoordinates ) { // creating the vertices @@ -3817,7 +3817,7 @@ MSO_SPT EscherPropertyContainer::GetCustomShapeType( const uno::Reference< drawi } } } - catch( const ::com::sun::star::uno::Exception& ) + catch( const css::uno::Exception& ) { } } @@ -3826,7 +3826,7 @@ MSO_SPT EscherPropertyContainer::GetCustomShapeType( const uno::Reference< drawi // Implement for form control export -bool EscherPropertyContainer::CreateBlipPropertiesforOLEControl(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape) +bool EscherPropertyContainer::CreateBlipPropertiesforOLEControl(const css::uno::Reference< css::beans::XPropertySet > & rXPropSet, const css::uno::Reference< css::drawing::XShape > & rXShape) { SdrObject* pShape = GetSdrObjectFromXShape( rXShape ); if ( pShape ) @@ -3936,8 +3936,8 @@ sal_uInt32 EscherPersistTable::PtReplaceOrInsert( sal_uInt32 nID, sal_uInt32 nOf } bool EscherPropertyValueHelper::GetPropertyValue( - ::com::sun::star::uno::Any& rAny, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, + css::uno::Any& rAny, + const css::uno::Reference< css::beans::XPropertySet > & rXPropSet, const OUString& rString, bool bTestPropertyAvailability) { @@ -3947,12 +3947,12 @@ bool EscherPropertyValueHelper::GetPropertyValue( bRetValue = false; try { - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > + css::uno::Reference< css::beans::XPropertySetInfo > aXPropSetInfo( rXPropSet->getPropertySetInfo() ); if ( aXPropSetInfo.is() ) bRetValue = aXPropSetInfo->hasPropertyByName( rString ); } - catch( const ::com::sun::star::uno::Exception& ) + catch( const css::uno::Exception& ) { bRetValue = false; } @@ -3965,7 +3965,7 @@ bool EscherPropertyValueHelper::GetPropertyValue( if ( !rAny.hasValue() ) bRetValue = false; } - catch( const ::com::sun::star::uno::Exception& ) + catch( const css::uno::Exception& ) { bRetValue = false; } @@ -3973,19 +3973,19 @@ bool EscherPropertyValueHelper::GetPropertyValue( return bRetValue; } -::com::sun::star::beans::PropertyState EscherPropertyValueHelper::GetPropertyState( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, +css::beans::PropertyState EscherPropertyValueHelper::GetPropertyState( + const css::uno::Reference< css::beans::XPropertySet > & rXPropSet, const OUString& rPropertyName ) { - ::com::sun::star::beans::PropertyState eRetValue = ::com::sun::star::beans::PropertyState_AMBIGUOUS_VALUE; + css::beans::PropertyState eRetValue = css::beans::PropertyState_AMBIGUOUS_VALUE; try { - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState > aXPropState - ( rXPropSet, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::beans::XPropertyState > aXPropState + ( rXPropSet, css::uno::UNO_QUERY ); if ( aXPropState.is() ) eRetValue = aXPropState->getPropertyState( rPropertyName ); } - catch( const ::com::sun::star::uno::Exception& ) + catch( const css::uno::Exception& ) { } return eRetValue; @@ -4229,7 +4229,7 @@ bool EscherGraphicProvider::GetPrefSize( const sal_uInt32 nBlibId, Size& rPrefSi } sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream& rPicOutStrm, const OString& rId, - const Rectangle& /* rBoundRect */, const com::sun::star::awt::Rectangle* pVisArea, + const Rectangle& /* rBoundRect */, const css::awt::Rectangle* pVisArea, const GraphicAttr* pGraphicAttr, const bool bOOxmlExport ) { sal_uInt32 nBlibId = 0; @@ -4322,14 +4322,14 @@ sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream& rPicOutStrm, const OStrin aGIFStream.Write( pString, strlen(pString) ); nErrCode = rFilter.ExportGraphic( aGraphic, OUString(), aGIFStream, rFilter.GetExportFormatNumberForShortName( OUString( "GIF" ) ), NULL ); - com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > aFilterData( 1 ); - com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > aAdditionalChunkSequence( 1 ); + css::uno::Sequence< css::beans::PropertyValue > aFilterData( 1 ); + css::uno::Sequence< css::beans::PropertyValue > aAdditionalChunkSequence( 1 ); sal_uInt32 nGIFSreamLen = aGIFStream.Tell(); - com::sun::star::uno::Sequence< sal_Int8 > aGIFSeq( nGIFSreamLen ); + css::uno::Sequence< sal_Int8 > aGIFSeq( nGIFSreamLen ); sal_Int8* pSeq = aGIFSeq.getArray(); aGIFStream.Seek( STREAM_SEEK_TO_BEGIN ); aGIFStream.Read( pSeq, nGIFSreamLen ); - com::sun::star::beans::PropertyValue aChunkProp, aFilterProp; + css::beans::PropertyValue aChunkProp, aFilterProp; aChunkProp.Name = "msOG"; aChunkProp.Value <<= aGIFSeq; aAdditionalChunkSequence[ 0 ] = aChunkProp; @@ -4485,16 +4485,16 @@ struct EscherConnectorRule struct EscherShapeListEntry { - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > aXShape; + css::uno::Reference< css::drawing::XShape > aXShape; sal_uInt32 n_EscherId; - EscherShapeListEntry( const ::com::sun::star::uno::Reference - < ::com::sun::star::drawing::XShape > & rShape, sal_uInt32 nId ) : + EscherShapeListEntry( const css::uno::Reference + < css::drawing::XShape > & rShape, sal_uInt32 nId ) : aXShape ( rShape ), n_EscherId ( nId ) {} }; -sal_uInt32 EscherConnectorListEntry::GetClosestPoint( const tools::Polygon& rPoly, const ::com::sun::star::awt::Point& rPoint ) +sal_uInt32 EscherConnectorListEntry::GetClosestPoint( const tools::Polygon& rPoly, const css::awt::Point& rPoint ) { sal_uInt16 nCount = rPoly.GetSize(); sal_uInt16 nClosest = nCount; @@ -4523,9 +4523,9 @@ sal_uInt32 EscherConnectorListEntry::GetConnectorRule( bool bFirst ) { sal_uInt32 nRule = 0; - ::com::sun::star::uno::Any aAny; - ::com::sun::star::awt::Point aRefPoint( ( bFirst ) ? maPointA : maPointB ); - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > + css::uno::Any aAny; + css::awt::Point aRefPoint( ( bFirst ) ? maPointA : maPointB ); + css::uno::Reference< css::drawing::XShape > aXShape( ( bFirst ) ? mXConnectToA : mXConnectToB ); OUString aString(aXShape->getShapeType()); @@ -4535,8 +4535,8 @@ sal_uInt32 EscherConnectorListEntry::GetConnectorRule( bool bFirst ) aBuf.remove(nPos, 5); OString aType = aBuf.makeStringAndClear(); - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > - aPropertySet( aXShape, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::beans::XPropertySet > + aPropertySet( aXShape, css::uno::UNO_QUERY ); if ((aType == OString( "drawing.PolyPolygon" )) || (aType == OString( "drawing.PolyLine" ))) { @@ -4544,10 +4544,10 @@ sal_uInt32 EscherConnectorListEntry::GetConnectorRule( bool bFirst ) { if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aPropertySet, "PolyPolygon" ) ) { - ::com::sun::star::drawing::PointSequenceSequence const * pSourcePolyPolygon = + css::drawing::PointSequenceSequence const * pSourcePolyPolygon = static_cast<css::drawing::PointSequenceSequence const *>(aAny.getValue()); sal_Int32 nOuterSequenceCount = pSourcePolyPolygon->getLength(); - ::com::sun::star::drawing::PointSequence const * pOuterSequence = pSourcePolyPolygon->getConstArray(); + css::drawing::PointSequence const * pOuterSequence = pSourcePolyPolygon->getConstArray(); if ( pOuterSequence ) { @@ -4555,10 +4555,10 @@ sal_uInt32 EscherConnectorListEntry::GetConnectorRule( bool bFirst ) sal_uInt32 nDistance = 0xffffffff; for( a = 0; a < nOuterSequenceCount; a++ ) { - ::com::sun::star::drawing::PointSequence const * pInnerSequence = pOuterSequence++; + css::drawing::PointSequence const * pInnerSequence = pOuterSequence++; if ( pInnerSequence ) { - ::com::sun::star::awt::Point const * pArray = pInnerSequence->getConstArray(); + css::awt::Point const * pArray = pInnerSequence->getConstArray(); if ( pArray ) { for ( b = 0; b < pInnerSequence->getLength(); b++, nIndex++, pArray++ ) @@ -4580,20 +4580,20 @@ sal_uInt32 EscherConnectorListEntry::GetConnectorRule( bool bFirst ) else if ((aType == OString( "drawing.OpenBezier" )) || (aType == OString( "drawing.OpenFreeHand" )) || (aType == OString( "drawing.PolyLinePath" )) || (aType == OString( "drawing.ClosedBezier" )) || ( aType == OString( "drawing.ClosedFreeHand" )) || (aType == OString( "drawing.PolyPolygonPath" )) ) { - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > - aPropertySet2( aXShape, ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::beans::XPropertySet > + aPropertySet2( aXShape, css::uno::UNO_QUERY ); if ( aPropertySet2.is() ) { if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aPropertySet2, "PolyPolygonBezier" ) ) { - ::com::sun::star::drawing::PolyPolygonBezierCoords const * pSourcePolyPolygon = + css::drawing::PolyPolygonBezierCoords const * pSourcePolyPolygon = static_cast<css::drawing::PolyPolygonBezierCoords const *>(aAny.getValue()); sal_Int32 nOuterSequenceCount = pSourcePolyPolygon->Coordinates.getLength(); // Zeiger auf innere sequences holen - ::com::sun::star::drawing::PointSequence const * pOuterSequence = + css::drawing::PointSequence const * pOuterSequence = pSourcePolyPolygon->Coordinates.getConstArray(); - ::com::sun::star::drawing::FlagSequence const * pOuterFlags = + css::drawing::FlagSequence const * pOuterFlags = pSourcePolyPolygon->Flags.getConstArray(); if ( pOuterSequence && pOuterFlags ) @@ -4603,12 +4603,12 @@ sal_uInt32 EscherConnectorListEntry::GetConnectorRule( bool bFirst ) for ( a = 0; a < nOuterSequenceCount; a++ ) { - ::com::sun::star::drawing::PointSequence const * pInnerSequence = pOuterSequence++; - ::com::sun::star::drawing::FlagSequence const * pInnerFlags = pOuterFlags++; + css::drawing::PointSequence const * pInnerSequence = pOuterSequence++; + css::drawing::FlagSequence const * pInnerFlags = pOuterFlags++; if ( pInnerSequence && pInnerFlags ) { - ::com::sun::star::awt::Point const * pArray = pInnerSequence->getConstArray(); - ::com::sun::star::drawing::PolygonFlags const * pFlags = pInnerFlags->getConstArray(); + css::awt::Point const * pArray = pInnerSequence->getConstArray(); + css::drawing::PolygonFlags const * pFlags = pInnerFlags->getConstArray(); if ( pArray && pFlags ) { for ( b = 0; b < pInnerSequence->getLength(); b++, pArray++ ) @@ -4660,7 +4660,7 @@ sal_uInt32 EscherConnectorListEntry::GetConnectorRule( bool bFirst ) ( *pGluePointType >>= nGluePointType ) ) ) nGluePointType = GetCustomShapeConnectionTypeDefault( eSpType ); - if ( nGluePointType == com::sun::star::drawing::EnhancedCustomShapeGluePointType::CUSTOM ) + if ( nGluePointType == css::drawing::EnhancedCustomShapeGluePointType::CUSTOM ) { const SdrGluePointList* pList = pCustoShape->GetGluePointList(); if ( pList ) @@ -4680,7 +4680,7 @@ sal_uInt32 EscherConnectorListEntry::GetConnectorRule( bool bFirst ) } } } - else if ( nGluePointType == com::sun::star::drawing::EnhancedCustomShapeGluePointType::SEGMENTS ) + else if ( nGluePointType == css::drawing::EnhancedCustomShapeGluePointType::SEGMENTS ) { SdrObject* pPoly = pCustoShape->DoConvertToPolyObj( true, true ); if ( dynamic_cast<const SdrPathObj* >( pPoly ) != nullptr ) @@ -4717,8 +4717,8 @@ sal_uInt32 EscherConnectorListEntry::GetConnectorRule( bool bFirst ) } if ( bRectangularConnection ) { - ::com::sun::star::awt::Point aPoint( aXShape->getPosition() ); - ::com::sun::star::awt::Size aSize( aXShape->getSize() ); + css::awt::Point aPoint( aXShape->getPosition() ); + css::awt::Size aSize( aXShape->getSize() ); Rectangle aRect( Point( aPoint.X, aPoint.Y ), Size( aSize.Width, aSize.Height ) ); Point aCenter( aRect.Center() ); @@ -4752,23 +4752,23 @@ EscherSolverContainer::~EscherSolverContainer() } } -void EscherSolverContainer::AddShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape, sal_uInt32 nId ) +void EscherSolverContainer::AddShape( const css::uno::Reference< css::drawing::XShape > & rXShape, sal_uInt32 nId ) { maShapeList.push_back( new EscherShapeListEntry( rXShape, nId ) ); } void EscherSolverContainer::AddConnector( - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rConnector, - const ::com::sun::star::awt::Point& rPA, - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rConA, - const ::com::sun::star::awt::Point& rPB, - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rConB + const css::uno::Reference< css::drawing::XShape > & rConnector, + const css::awt::Point& rPA, + css::uno::Reference< css::drawing::XShape > & rConA, + const css::awt::Point& rPB, + css::uno::Reference< css::drawing::XShape > & rConB ) { maConnectorList.push_back( new EscherConnectorListEntry( rConnector, rPA, rConA, rPB, rConB ) ); } -sal_uInt32 EscherSolverContainer::GetShapeId( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape ) const +sal_uInt32 EscherSolverContainer::GetShapeId( const css::uno::Reference< css::drawing::XShape > & rXShape ) const { for ( size_t i = 0, n = maShapeList.size(); i < n; ++i ) { diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx index 60db0e529882..9d43cb9b2061 100644 --- a/filter/source/msfilter/eschesdo.cxx +++ b/filter/source/msfilter/eschesdo.cxx @@ -236,8 +236,8 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, rObj.SetType("drawing.dontknow"); } - const ::com::sun::star::awt::Size aSize100thmm( rObj.GetShapeRef()->getSize() ); - const ::com::sun::star::awt::Point aPoint100thmm( rObj.GetShapeRef()->getPosition() ); + const css::awt::Size aSize100thmm( rObj.GetShapeRef()->getSize() ); + const css::awt::Point aPoint100thmm( rObj.GetShapeRef()->getPosition() ); Rectangle aRect100thmm( Point( aPoint100thmm.X, aPoint100thmm.Y ), Size( aSize100thmm.Width, aSize100thmm.Height ) ); if ( !mpPicStrm ) mpPicStrm = mpEscherEx->QueryPictureStream(); @@ -401,7 +401,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, } mpEscherEx->OpenContainer( ESCHER_SpContainer ); ADD_SHAPE( ESCHER_ShpInst_NotPrimitive, 0xa00 ); // Flags: Connector | HasSpt - ::com::sun::star::awt::Rectangle aNewRect; + css::awt::Rectangle aNewRect; switch ( ePolyKind ) { case POLY_PIE : @@ -435,7 +435,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, else if ( rObj.GetType() == "drawing.Connector" ) { sal_uInt16 nSpType, nSpFlags; - ::com::sun::star::awt::Rectangle aNewRect; + css::awt::Rectangle aNewRect; if ( ! aPropOpt.CreateConnectorProperties( rObj.GetShapeRef(), rSolverContainer, aNewRect, nSpType, nSpFlags ) ) break; @@ -451,7 +451,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, } else if ( rObj.GetType() == "drawing.Line" ) { - ::com::sun::star::awt::Rectangle aNewRect; + css::awt::Rectangle aNewRect; aPropOpt.CreatePolygonProperties( rObj.mXPropSet, ESCHER_CREATEPOLYGON_LINE, false, aNewRect, NULL ); //i27942: Poly/Lines/Bezier do not support text. @@ -476,7 +476,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, } mpEscherEx->OpenContainer( ESCHER_SpContainer ); ADD_SHAPE( ESCHER_ShpInst_NotPrimitive, 0xa00 ); // Flags: Connector | HasSpt - ::com::sun::star::awt::Rectangle aNewRect; + css::awt::Rectangle aNewRect; aPropOpt.CreatePolygonProperties( rObj.mXPropSet, ESCHER_CREATEPOLYGON_POLYPOLYGON, false, aNewRect, NULL ); aPropOpt.CreateFillProperties( rObj.mXPropSet, true ); rObj.SetAngle( 0 ); @@ -487,7 +487,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, mpEscherEx->OpenContainer( ESCHER_SpContainer ); ADD_SHAPE( ESCHER_ShpInst_NotPrimitive, 0xa00 ); // Flags: Connector | HasSpt - ::com::sun::star::awt::Rectangle aNewRect; + css::awt::Rectangle aNewRect; aPropOpt.CreatePolygonProperties( rObj.mXPropSet, ESCHER_CREATEPOLYGON_POLYLINE, false, aNewRect, NULL ); aPropOpt.CreateLineProperties( rObj.mXPropSet, false ); rObj.SetAngle( 0 ); @@ -498,7 +498,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, mpEscherEx->OpenContainer( ESCHER_SpContainer ); ADD_SHAPE( ESCHER_ShpInst_NotPrimitive, 0xa00 ); // Flags: Connector | HasSpt - ::com::sun::star::awt::Rectangle aNewRect; + css::awt::Rectangle aNewRect; aPropOpt.CreatePolygonProperties( rObj.mXPropSet, ESCHER_CREATEPOLYGON_POLYLINE, true, aNewRect, NULL ); aPropOpt.CreateLineProperties( rObj.mXPropSet, false ); rObj.SetAngle( 0 ); @@ -512,7 +512,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, } mpEscherEx->OpenContainer( ESCHER_SpContainer ); ADD_SHAPE( ESCHER_ShpInst_NotPrimitive, 0xa00 ); // Flags: Connector | HasSpt - ::com::sun::star::awt::Rectangle aNewRect; + css::awt::Rectangle aNewRect; aPropOpt.CreatePolygonProperties( rObj.mXPropSet, ESCHER_CREATEPOLYGON_POLYPOLYGON, true, aNewRect, NULL ); aPropOpt.CreateFillProperties( rObj.mXPropSet, true ); rObj.SetAngle( 0 ); @@ -714,8 +714,8 @@ void ImplEESdrWriter::ImplWriteAdditionalText( ImplEESdrObject& rObj, if ( mpHostAppData && mpHostAppData->DontWriteShape() ) break; - const ::com::sun::star::awt::Size aSize100thmm( rObj.GetShapeRef()->getSize() ); - const ::com::sun::star::awt::Point aPoint100thmm( rObj.GetShapeRef()->getPosition() ); + const css::awt::Size aSize100thmm( rObj.GetShapeRef()->getSize() ); + const css::awt::Point aPoint100thmm( rObj.GetShapeRef()->getPosition() ); Rectangle aRect100thmm( Point( aPoint100thmm.X, aPoint100thmm.Y ), Size( aSize100thmm.Width, aSize100thmm.Height ) ); if ( !mpPicStrm ) mpPicStrm = mpEscherEx->QueryPictureStream(); @@ -1155,7 +1155,7 @@ basegfx::B2DRange getUnrotatedGroupBoundRange(const Reference< XShape >& rxShape } } } - catch(::com::sun::star::uno::Exception&) + catch(css::uno::Exception&) { } @@ -1211,7 +1211,7 @@ bool ImplEESdrObject::ImplGetPropertyValue( const sal_Unicode* rString ) if( mAny.hasValue() ) bRetValue = true; } - catch( const ::com::sun::star::uno::Exception& ) + catch( const css::uno::Exception& ) { bRetValue = false; } diff --git a/filter/source/msfilter/eschesdo.hxx b/filter/source/msfilter/eschesdo.hxx index 072424a59423..e0486773bf39 100644 --- a/filter/source/msfilter/eschesdo.hxx +++ b/filter/source/msfilter/eschesdo.hxx @@ -32,25 +32,25 @@ class ImplEscherExSdr; class ImplEESdrObject { - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mXShape; + css::uno::Reference< css::drawing::XShape > mXShape; // XTextRef mXText; // TextRef des globalen Text - ::com::sun::star::uno::Any mAny; + css::uno::Any mAny; Rectangle maRect; OUString mType; - sal_uInt32 mnShapeId; - sal_uInt32 mnTextSize; - sal_Int32 mnAngle; + sal_uInt32 mnShapeId; + sal_uInt32 mnTextSize; + sal_Int32 mnAngle; bool mbValid : 1; bool mbPresObj : 1; bool mbEmptyPresObj : 1; - bool mbOOXML; + bool mbOOXML; void Init( ImplEESdrWriter& rEx ); public: - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > mXPropSet; + css::uno::Reference< css::beans::XPropertySet > mXPropSet; ImplEESdrObject( ImplEscherExSdr& rEx, const SdrObject& rObj, bool bOOXML = false ); - ImplEESdrObject( ImplEESdrWriter& rEx, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rShape ); + ImplEESdrObject( ImplEESdrWriter& rEx, const css::uno::Reference< css::drawing::XShape >& rShape ); ~ImplEESdrObject(); bool ImplGetPropertyValue( const sal_Unicode* pString ); @@ -61,8 +61,8 @@ public: sal_Int32 ImplGetInt32PropertyValue( const OUString& rStr, sal_uInt32 nDef = 0 ) { return ImplGetInt32PropertyValue(rStr.getStr(), nDef); } - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& GetShapeRef() const { return mXShape; } - const ::com::sun::star::uno::Any& GetUsrAny() const { return mAny; } + const css::uno::Reference< css::drawing::XShape >& GetShapeRef() const { return mXShape; } + const css::uno::Any& GetUsrAny() const { return mAny; } const OUString& GetType() const { return mType; } void SetType( const OUString& rS ) { mType = rS; } @@ -84,8 +84,8 @@ public: sal_uInt32 ImplGetText(); bool ImplHasText() const; - bool GetOOXML() const { return mbOOXML;} - void SetOOXML(bool bOOXML); + bool GetOOXML() const { return mbOOXML;} + void SetOOXML(bool bOOXML); }; @@ -112,9 +112,9 @@ protected: MapMode maMapModeSrc; MapMode maMapModeDest; - ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > mXStatusIndicator; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > mXDrawPage; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > mXShapes; + css::uno::Reference< css::task::XStatusIndicator > mXStatusIndicator; + css::uno::Reference< css::drawing::XDrawPage > mXDrawPage; + css::uno::Reference< css::drawing::XShapes > mXShapes; SvStream* mpPicStrm; @@ -135,9 +135,9 @@ protected: sal_uInt16 mnEffectCount; - bool mbIsTitlePossible; - bool mbStatusIndicator; - bool mbStatus; + bool mbIsTitlePossible; + bool mbStatusIndicator; + bool mbStatus; ImplEESdrWriter( EscherEx& rEx ); @@ -158,7 +158,7 @@ protected: ImplEESdrObject& rObj, const Point& rTextRefPoint ); sal_uInt32 ImplEnterAdditionalTextGroup( - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rShape, + const css::uno::Reference< css::drawing::XShape >& rShape, const Rectangle* pBoundRect = NULL ); @@ -185,7 +185,7 @@ public: virtual ~ImplEscherExSdr(); bool ImplInitPage( const SdrPage& rPage ); - bool ImplInitUnoShapes( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes ); + bool ImplInitUnoShapes( const css::uno::Reference< css::drawing::XShapes >& rxShapes ); void ImplWriteCurrentPage(); sal_uInt32 ImplWriteTheShape( ImplEESdrObject& rObj, bool ooxmlExport = false ); diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 344e33c740b8..dccff21f5cef 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -592,7 +592,7 @@ void SvxMSDffManager::SolveSolver( const SvxMSDffSolverContainer& rSolver ) const OUString sPath( "Path" ); const OUString sGluePointType( "GluePointType" ); sal_Int16 nGluePointType = EnhancedCustomShapeGluePointType::SEGMENTS; - com::sun::star::uno::Any* pAny = aGeometryItem.GetPropertyValueByName( sPath, sGluePointType ); + css::uno::Any* pAny = aGeometryItem.GetPropertyValueByName( sPath, sGluePointType ); if ( pAny ) *pAny >>= nGluePointType; else @@ -649,7 +649,7 @@ void SvxMSDffManager::SolveSolver( const SvxMSDffSolverContainer& rSolver ) const OUString sCoordinates( "Coordinates" ); sal_uInt32 k, nPt = nC; - com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeSegment > aSegments; + css::uno::Sequence< css::drawing::EnhancedCustomShapeSegment > aSegments; pAny = aGeometryItem.GetPropertyValueByName( sPath, sSegments ); if ( pAny ) { @@ -709,17 +709,17 @@ void SvxMSDffManager::SolveSolver( const SvxMSDffSolverContainer& rSolver ) pAny = aGeometryItem.GetPropertyValueByName( sPath, sCoordinates ); if ( pAny ) { - com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair > aCoordinates; + css::uno::Sequence< css::drawing::EnhancedCustomShapeParameterPair > aCoordinates; *pAny >>= aCoordinates; if ( nPt < (sal_uInt32)aCoordinates.getLength() ) { nId = 4; - com::sun::star::drawing::EnhancedCustomShapeParameterPair& rPara = aCoordinates[ nPt ]; + css::drawing::EnhancedCustomShapeParameterPair& rPara = aCoordinates[ nPt ]; sal_Int32 nX = 0, nY = 0; if ( ( rPara.First.Value >>= nX ) && ( rPara.Second.Value >>= nY ) ) { const OUString sGluePoints( "GluePoints" ); - com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair > aGluePoints; + css::uno::Sequence< css::drawing::EnhancedCustomShapeParameterPair > aGluePoints; pAny = aGeometryItem.GetPropertyValueByName( sPath, sGluePoints ); if ( pAny ) *pAny >>= aGluePoints; @@ -919,17 +919,17 @@ void DffPropertyReader::ApplyLineAttributes( SfxItemSet& rSet, const MSO_SPT eSh default: /* case mso_lineEndCapFlat */ { // no need to set, it is the default. If this changes, this needs to be activated - // rSet.Put(XLineCapItem(com::sun::star::drawing::LineCap_BUTT)); + // rSet.Put(XLineCapItem(css::drawing::LineCap_BUTT)); break; } case mso_lineEndCapRound: { - rSet.Put(XLineCapItem(com::sun::star::drawing::LineCap_ROUND)); + rSet.Put(XLineCapItem(css::drawing::LineCap_ROUND)); break; } case mso_lineEndCapSquare: { - rSet.Put(XLineCapItem(com::sun::star::drawing::LineCap_SQUARE)); + rSet.Put(XLineCapItem(css::drawing::LineCap_SQUARE)); break; } } @@ -1015,11 +1015,11 @@ void DffPropertyReader::ApplyLineAttributes( SfxItemSet& rSet, const MSO_SPT eSh if ( eShapeType == mso_sptMin ) eLineJointDefault = mso_lineJoinRound; MSO_LineJoin eLineJoint = (MSO_LineJoin)GetPropertyValue( DFF_Prop_lineJoinStyle, eLineJointDefault ); - com::sun::star::drawing::LineJoint eXLineJoint( com::sun::star::drawing::LineJoint_MITER ); + css::drawing::LineJoint eXLineJoint( css::drawing::LineJoint_MITER ); if ( eLineJoint == mso_lineJoinBevel ) - eXLineJoint = com::sun::star::drawing::LineJoint_BEVEL; + eXLineJoint = css::drawing::LineJoint_BEVEL; else if ( eLineJoint == mso_lineJoinRound ) - eXLineJoint = com::sun::star::drawing::LineJoint_ROUND; + eXLineJoint = css::drawing::LineJoint_ROUND; rSet.Put( XLineJointItem( eXLineJoint ) ); if ( nLineFlags & 0x10 ) @@ -1561,7 +1561,7 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt sal_Int32 nCoordHeight= 21600; if ( IsProperty( DFF_Prop_geoLeft ) || IsProperty( DFF_Prop_geoTop ) || IsProperty( DFF_Prop_geoRight ) || IsProperty( DFF_Prop_geoBottom ) ) { - com::sun::star::awt::Rectangle aViewBox; + css::awt::Rectangle aViewBox; const OUString sViewBox( "ViewBox" ); aViewBox.X = GetPropertyValue( DFF_Prop_geoLeft, 0 ); aViewBox.Y = GetPropertyValue( DFF_Prop_geoTop, 0 ); @@ -1710,7 +1710,7 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt double fLightX = (double)((sal_Int32)GetPropertyValue( DFF_Prop_c3DKeyX, 50000 )); double fLightY = (double)((sal_Int32)GetPropertyValue( DFF_Prop_c3DKeyY, 0 )); double fLightZ = (double)((sal_Int32)GetPropertyValue( DFF_Prop_c3DKeyZ, 10000 )); - ::com::sun::star::drawing::Direction3D aExtrusionFirstLightDirection( fLightX, fLightY, fLightZ ); + css::drawing::Direction3D aExtrusionFirstLightDirection( fLightX, fLightY, fLightZ ); const OUString sExtrusionFirstLightDirection( "FirstLightDirection" ); aProp.Name = sExtrusionFirstLightDirection; aProp.Value <<= aExtrusionFirstLightDirection; @@ -1722,7 +1722,7 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt double fLight2X = (double)((sal_Int32)GetPropertyValue( DFF_Prop_c3DFillX, (sal_uInt32)-50000 )); double fLight2Y = (double)((sal_Int32)GetPropertyValue( DFF_Prop_c3DFillY, 0 )); double fLight2Z = (double)((sal_Int32)GetPropertyValue( DFF_Prop_c3DFillZ, 10000 )); - ::com::sun::star::drawing::Direction3D aExtrusionSecondLightDirection( fLight2X, fLight2Y, fLight2Z ); + css::drawing::Direction3D aExtrusionSecondLightDirection( fLight2X, fLight2Y, fLight2Z ); const OUString sExtrusionSecondLightDirection( "SecondLightDirection" ); aProp.Name = sExtrusionSecondLightDirection; aProp.Value <<= aExtrusionSecondLightDirection; @@ -1740,9 +1740,9 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt { const OUString sExtrusionShadeMode( "ShadeMode" ); sal_uInt32 nExtrusionRenderMode = GetPropertyValue( DFF_Prop_c3DRenderMode, 0 ); - com::sun::star::drawing::ShadeMode eExtrusionShadeMode( com::sun::star::drawing::ShadeMode_FLAT ); + css::drawing::ShadeMode eExtrusionShadeMode( css::drawing::ShadeMode_FLAT ); if ( nExtrusionRenderMode == mso_Wireframe ) - eExtrusionShadeMode = com::sun::star::drawing::ShadeMode_DRAFT; + eExtrusionShadeMode = css::drawing::ShadeMode_DRAFT; aProp.Name = sExtrusionShadeMode; aProp.Value <<= eExtrusionShadeMode; @@ -1770,7 +1770,7 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt // "RotationCenter" if ( IsProperty( DFF_Prop_c3DRotationCenterX ) || IsProperty( DFF_Prop_c3DRotationCenterY ) || IsProperty( DFF_Prop_c3DRotationCenterZ ) ) { - ::com::sun::star::drawing::Direction3D aRotationCenter( + css::drawing::Direction3D aRotationCenter( (double)((sal_Int32)GetPropertyValue( DFF_Prop_c3DRotationCenterX, 0 )) / 360.0, (double)((sal_Int32)GetPropertyValue( DFF_Prop_c3DRotationCenterY, 0 )) / 360.0, (double)((sal_Int32)GetPropertyValue( DFF_Prop_c3DRotationCenterZ, 0 )) / 360.0 ); @@ -1830,7 +1830,7 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt double fViewX = (double)((sal_Int32)GetPropertyValue( DFF_Prop_c3DXViewpoint, 1250000 )) / 360.0; double fViewY = (double)((sal_Int32)GetPropertyValue( DFF_Prop_c3DYViewpoint, (sal_uInt32)-1250000 ))/ 360.0; double fViewZ = (double)((sal_Int32)GetPropertyValue( DFF_Prop_c3DZViewpoint, 9000000 )) / 360.0; - ::com::sun::star::drawing::Position3D aExtrusionViewPoint( fViewX, fViewY, fViewZ ); + css::drawing::Position3D aExtrusionViewPoint( fViewX, fViewY, fViewZ ); const OUString sExtrusionViewPoint( "ViewPoint" ); aProp.Name = sExtrusionViewPoint; aProp.Value <<= aExtrusionViewPoint; @@ -2159,7 +2159,7 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt // Path/Coordinates if ( IsProperty( DFF_Prop_pVertices ) ) { - com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair > aCoordinates; + css::uno::Sequence< css::drawing::EnhancedCustomShapeParameterPair > aCoordinates; sal_uInt16 nNumElemVert = 0; sal_uInt16 nElemSizeVert = 8; @@ -2205,7 +2205,7 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt // Path/Segments if ( IsProperty( DFF_Prop_pSegmentInfo ) ) { - com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeSegment > aSegments; + css::uno::Sequence< css::drawing::EnhancedCustomShapeSegment > aSegments; sal_uInt16 i, nTmp; sal_uInt16 nNumElemSeg = 0; @@ -2357,7 +2357,7 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt } if (bImport) { - com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeTextFrame > aTextFrames( nNumElem ); + css::uno::Sequence< css::drawing::EnhancedCustomShapeTextFrame > aTextFrames( nNumElem ); for (sal_uInt16 i = 0; i < nNumElem; ++i) { sal_Int32 nLeft(0), nTop(0), nRight(0), nBottom(0); @@ -2381,7 +2381,7 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt //Path/GluePoints if ( IsProperty( DFF_Prop_connectorPoints ) ) { - com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair > aGluePoints; + css::uno::Sequence< css::drawing::EnhancedCustomShapeParameterPair > aGluePoints; sal_uInt16 nNumElemVert = 0; sal_uInt16 nNumElemMemVert = 0; sal_uInt16 nElemSizeVert = 8; @@ -2528,7 +2528,7 @@ void DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt sal_Int32 nAdjustmentValues = ( i - DFF_Prop_adjustValue ) + 1; if ( nAdjustmentValues ) { - uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue > aAdjustmentSeq( nAdjustmentValues ); + uno::Sequence< css::drawing::EnhancedCustomShapeAdjustmentValue > aAdjustmentSeq( nAdjustmentValues ); while( --nAdjustmentValues >= 0 ) { sal_Int32 nValue = 0; @@ -2712,31 +2712,31 @@ void DffPropertyReader::CheckAndCorrectExcelTextRotation( SvStream& rIn, SfxItem sal_uInt32 nLen = rManager.pSecPropSet->GetPropertyValue( DFF_Prop_metroBlob, 0 ); if ( nLen ) { - ::com::sun::star::uno::Sequence< sal_Int8 > aXMLDataSeq( nLen ); + css::uno::Sequence< sal_Int8 > aXMLDataSeq( nLen ); rIn.Read( aXMLDataSeq.getArray(), nLen ); - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > xInputStream + css::uno::Reference< css::io::XInputStream > xInputStream ( new ::comphelper::SequenceInputStream( aXMLDataSeq ) ); try { - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); - ::com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage + css::uno::Reference< css::uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); + css::uno::Reference< css::embed::XStorage > xStorage ( ::comphelper::OStorageHelper::GetStorageOfFormatFromInputStream( OFOPXML_STORAGE_FORMAT_STRING, xInputStream, xContext, true ) ); if ( xStorage.is() ) { const OUString sDRS( "drs" ); - ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > - xStorageDRS( xStorage->openStorageElement( sDRS, ::com::sun::star::embed::ElementModes::SEEKABLEREAD ) ); + css::uno::Reference< css::embed::XStorage > + xStorageDRS( xStorage->openStorageElement( sDRS, css::embed::ElementModes::SEEKABLEREAD ) ); if ( xStorageDRS.is() ) { const OUString sShapeXML( "shapexml.xml" ); - ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > xShapeXMLStream( xStorageDRS->openStreamElement( sShapeXML, ::com::sun::star::embed::ElementModes::SEEKABLEREAD ) ); + css::uno::Reference< css::io::XStream > xShapeXMLStream( xStorageDRS->openStreamElement( sShapeXML, css::embed::ElementModes::SEEKABLEREAD ) ); if ( xShapeXMLStream.is() ) { - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > xShapeXMLInputStream( xShapeXMLStream->getInputStream() ); + css::uno::Reference< css::io::XInputStream > xShapeXMLInputStream( xShapeXMLStream->getInputStream() ); if ( xShapeXMLInputStream.is() ) { - ::com::sun::star::uno::Sequence< sal_Int8 > aSeq; + css::uno::Sequence< sal_Int8 > aSeq; sal_Int32 nBytesRead = xShapeXMLInputStream->readBytes( aSeq, 0x7fffffff ); if ( nBytesRead ) { // for only one property I spare to use a XML parser at this point, this @@ -2763,7 +2763,7 @@ void DffPropertyReader::CheckAndCorrectExcelTextRotation( SvStream& rIn, SfxItem } } } - catch( com::sun::star::uno::Exception& ) + catch( css::uno::Exception& ) { } } @@ -2771,7 +2771,7 @@ void DffPropertyReader::CheckAndCorrectExcelTextRotation( SvStream& rIn, SfxItem } if ( !bRotateTextWithShape ) { - const com::sun::star::uno::Any* pAny; + const css::uno::Any* pAny; SdrCustomShapeGeometryItem aGeometryItem(static_cast<const SdrCustomShapeGeometryItem&>(rSet.Get( SDRATTR_CUSTOMSHAPE_GEOMETRY ))); const OUString sTextRotateAngle( "TextRotateAngle" ); pAny = aGeometryItem.GetPropertyValueByName( sTextRotateAngle ); @@ -2784,7 +2784,7 @@ void DffPropertyReader::CheckAndCorrectExcelTextRotation( SvStream& rIn, SfxItem if ( rObjData.nSpFlags & SP_FFLIPV ) fExtraTextRotateAngle -= 180.0; - com::sun::star::beans::PropertyValue aTextRotateAngle; + css::beans::PropertyValue aTextRotateAngle; aTextRotateAngle.Name = sTextRotateAngle; aTextRotateAngle.Value <<= fExtraTextRotateAngle; aGeometryItem.SetPropertyValue( aTextRotateAngle ); @@ -4477,8 +4477,8 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r const OUString sPath( "Path" ); const OUString sTextFrames( "TextFrames" ); SdrCustomShapeGeometryItem aGeometryItem( static_cast<const SdrCustomShapeGeometryItem&>(static_cast<SdrObjCustomShape*>(pRet)->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ) ); - com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair> seqCoordinates; - com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue > seqAdjustmentValues; + css::uno::Sequence< css::drawing::EnhancedCustomShapeParameterPair> seqCoordinates; + css::uno::Sequence< css::drawing::EnhancedCustomShapeAdjustmentValue > seqAdjustmentValues; // before clearing the GeometryItem we have to store the current Coordinates const uno::Any* pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sCoordinates ); @@ -4520,7 +4520,7 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r if ( pAny && ( *pAny >>= seqAdjustmentValues ) && seqAdjustmentValues.getLength() > 1 ) { double fNumber; - if ( seqAdjustmentValues[ 0 ].State == com::sun::star::beans::PropertyState_DIRECT_VALUE ) + if ( seqAdjustmentValues[ 0 ].State == css::beans::PropertyState_DIRECT_VALUE ) { seqAdjustmentValues[ 0 ].Value >>= fNumber; nEndAngle = NormAngle360( - (sal_Int32)fNumber * 100 ); @@ -4541,10 +4541,10 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r } nEndAngle = NormAngle360( - (sal_Int32)fNumber * 100 ); seqAdjustmentValues[ 0 ].Value <<= fNumber; - seqAdjustmentValues[ 0 ].State = com::sun::star::beans::PropertyState_DIRECT_VALUE; // so this value will properly be stored + seqAdjustmentValues[ 0 ].State = css::beans::PropertyState_DIRECT_VALUE; // so this value will properly be stored } - if ( seqAdjustmentValues[ 1 ].State == com::sun::star::beans::PropertyState_DIRECT_VALUE ) + if ( seqAdjustmentValues[ 1 ].State == css::beans::PropertyState_DIRECT_VALUE ) { seqAdjustmentValues[ 1 ].Value >>= fNumber; nStartAngle = NormAngle360( - (sal_Int32)fNumber * 100 ); @@ -4553,7 +4553,7 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r { fNumber = 0.0; seqAdjustmentValues[ 1 ].Value <<= fNumber; - seqAdjustmentValues[ 1 ].State = com::sun::star::beans::PropertyState_DIRECT_VALUE; + seqAdjustmentValues[ 1 ].State = css::beans::PropertyState_DIRECT_VALUE; } PropertyValue aPropVal; @@ -4616,7 +4616,7 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r sal_Int32 nTop = (sal_Int32)(( aPolyPieRect.Top() - aPolyBoundRect.Top() ) * fTextFrameScaleY ); sal_Int32 nRight = (sal_Int32)(( aPolyPieRect.Right() - aPolyBoundRect.Left() ) * fTextFrameScaleX ); sal_Int32 nBottom= (sal_Int32)(( aPolyPieRect.Bottom()- aPolyBoundRect.Top() ) * fTextFrameScaleY ); - com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeTextFrame > aTextFrame( 1 ); + css::uno::Sequence< css::drawing::EnhancedCustomShapeTextFrame > aTextFrame( 1 ); EnhancedCustomShape2d::SetEnhancedCustomShapeParameter( aTextFrame[ 0 ].TopLeft.First, nLeft ); EnhancedCustomShape2d::SetEnhancedCustomShapeParameter( aTextFrame[ 0 ].TopLeft.Second, nTop ); EnhancedCustomShape2d::SetEnhancedCustomShapeParameter( aTextFrame[ 0 ].BottomRight.First, nRight ); @@ -6872,7 +6872,7 @@ OUString GetFilterNameFromClassID_Impl( const SvGlobalName& aGlobName ) return OUString(); } -com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > SvxMSDffManager::CheckForConvertToSOObj( sal_uInt32 nConvertFlags, +css::uno::Reference < css::embed::XEmbeddedObject > SvxMSDffManager::CheckForConvertToSOObj( sal_uInt32 nConvertFlags, SotStorage& rSrcStg, const uno::Reference < embed::XStorage >& rDestStorage, const Graphic& rGrf, const Rectangle& rVisArea ) @@ -7236,7 +7236,7 @@ SdrOle2Obj* SvxMSDffManager::CreateSdrOLEFromStorage( return pRet; } -bool SvxMSDffManager::SetPropValue( const uno::Any& rAny, const uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, +bool SvxMSDffManager::SetPropValue( const uno::Any& rAny, const uno::Reference< css::beans::XPropertySet > & rXPropSet, const OUString& rPropName, bool bTestPropertyAvailability ) { bool bRetValue = true; diff --git a/filter/source/msfilter/msoleexp.cxx b/filter/source/msfilter/msoleexp.cxx index 0cb15430a464..2409ed16ec8e 100644 --- a/filter/source/msfilter/msoleexp.cxx +++ b/filter/source/msfilter/msoleexp.cxx @@ -112,7 +112,7 @@ bool UseOldMSExport() return false; } -void SvxMSExportOLEObjects::ExportOLEObject( const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject>& rObj, SotStorage& rDestStg ) +void SvxMSExportOLEObjects::ExportOLEObject( const css::uno::Reference < css::embed::XEmbeddedObject>& rObj, SotStorage& rDestStg ) { svt::EmbeddedObjectRef aObj( rObj, embed::Aspects::MSOLE_CONTENT ); ExportOLEObject( aObj, rDestStg ); diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index dc46f3dc839d..bac0395891ad 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -1664,8 +1664,7 @@ SdrPowerPointImport::~SdrPowerPointImport() } bool PPTConvertOCXControls::ReadOCXStream( tools::SvRef<SotStorage>& rSrc, - com::sun::star::uno::Reference< - com::sun::star::drawing::XShape > *pShapeRef, + css::uno::Reference< css::drawing::XShape > *pShapeRef, bool bFloatingCtrl ) { bool bRes = false; @@ -1674,7 +1673,7 @@ bool PPTConvertOCXControls::ReadOCXStream( tools::SvRef<SotStorage>& rSrc, { if ( 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); } } @@ -1682,42 +1681,40 @@ bool PPTConvertOCXControls::ReadOCXStream( tools::SvRef<SotStorage>& rSrc, } bool PPTConvertOCXControls::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, + const css::uno::Reference< css::form::XFormComponent > &rFComp, + const css::awt::Size& rSize, + css::uno::Reference< css::drawing::XShape > *pShape, bool /*bFloatingCtrl*/) { bool bRetValue = false; try { - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape; + css::uno::Reference< css::drawing::XShape > xShape; - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > & rFormComps = + const css::uno::Reference< css::container::XIndexContainer > & rFormComps = GetFormComps(); - ::com::sun::star::uno::Any aTmp( &rFComp, cppu::UnoType<com::sun::star::form::XFormComponent>::get() ); + css::uno::Any aTmp( &rFComp, cppu::UnoType<css::form::XFormComponent>::get() ); rFormComps->insertByIndex( rFormComps->getCount(), aTmp ); - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rServiceFactory = + const css::uno::Reference< css::lang::XMultiServiceFactory > & rServiceFactory = GetServiceFactory(); if( rServiceFactory.is() ) { - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xCreate = rServiceFactory + css::uno::Reference< css::uno::XInterface > xCreate = rServiceFactory ->createInstance( "com.sun.star.drawing.ControlShape" ); if( xCreate.is() ) { - xShape = ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >(xCreate, ::com::sun::star::uno::UNO_QUERY); + xShape = css::uno::Reference< css::drawing::XShape >(xCreate, css::uno::UNO_QUERY); if ( xShape.is() ) { xShape->setSize(rSize); // set the Control-Model at the Control-Shape - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XControlShape > xControlShape( xShape, - ::com::sun::star::uno::UNO_QUERY ); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > xControlModel( rFComp, - ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::drawing::XControlShape > xControlShape( xShape, + css::uno::UNO_QUERY ); + css::uno::Reference< css::awt::XControlModel > xControlModel( rFComp, + css::uno::UNO_QUERY ); if ( xControlShape.is() && xControlModel.is() ) { xControlShape->setControl( xControlModel ); @@ -1735,18 +1732,18 @@ bool PPTConvertOCXControls::InsertControl( } return bRetValue; }; -const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& PPTConvertOCXControls::GetDrawPage() +const css::uno::Reference< css::drawing::XDrawPage >& PPTConvertOCXControls::GetDrawPage() { if( !xDrawPage.is() && mxModel.is() ) { - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPages > xDrawPages; + css::uno::Reference< css::drawing::XDrawPages > xDrawPages; switch( ePageKind ) { case PPT_SLIDEPAGE : case PPT_NOTEPAGE : { - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPagesSupplier > - xDrawPagesSupplier( mxModel, ::com::sun::star::uno::UNO_QUERY); + css::uno::Reference< css::drawing::XDrawPagesSupplier > + xDrawPagesSupplier( mxModel, css::uno::UNO_QUERY); if ( xDrawPagesSupplier.is() ) xDrawPages = xDrawPagesSupplier->getDrawPages(); } @@ -1754,8 +1751,8 @@ const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& case PPT_MASTERPAGE : { - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XMasterPagesSupplier > - xMasterPagesSupplier( mxModel, ::com::sun::star::uno::UNO_QUERY); + css::uno::Reference< css::drawing::XMasterPagesSupplier > + xMasterPagesSupplier( mxModel, css::uno::UNO_QUERY); if ( xMasterPagesSupplier.is() ) xDrawPages = xMasterPagesSupplier->getMasterPages(); } @@ -1764,7 +1761,7 @@ const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& if ( xDrawPages.is() && xDrawPages->getCount() ) { xDrawPages->getCount(); - ::com::sun::star::uno::Any aAny( xDrawPages->getByIndex( xDrawPages->getCount() - 1 ) ); + css::uno::Any aAny( xDrawPages->getByIndex( xDrawPages->getCount() - 1 ) ); aAny >>= xDrawPage; } } @@ -1896,7 +1893,7 @@ SdrObject* SdrPowerPointImport::ImportOLE( long nOLEId, uno::Reference< io::XInputStream > xIStrm = new utl::OSeekableInputStreamWrapper(*pDest ); uno::Reference< frame::XModel > xModel( pOe->pShell->GetModel() ); PPTConvertOCXControls aPPTConvertOCXControls( this, xIStrm, xModel, eAktPageKind ); - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape; + css::uno::Reference< css::drawing::XShape > xShape; if ( aPPTConvertOCXControls.ReadOCXStream( xObjStor, &xShape ) ) pRet = GetSdrObjectFromXShape( xShape ); @@ -7355,17 +7352,17 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell >& xCell ) xPropSet->setPropertyValue( sHorizontalAdjust , Any( eHA ) ); if ( eDirection == FRMDIR_VERT_TOP_RIGHT ) {//vertical writing - xPropSet->setPropertyValue( sWritingMode , Any( ::com::sun::star::text::WritingMode_TB_RL ) ); + xPropSet->setPropertyValue( sWritingMode , Any( css::text::WritingMode_TB_RL ) ); } SfxItemSet aSet( pObj->GetMergedItemSet() ); drawing::FillStyle eFillStyle(static_cast<const XFillStyleItem&>(pObj->GetMergedItem( XATTR_FILLSTYLE )).GetValue()); - ::com::sun::star::drawing::FillStyle eFS( com::sun::star::drawing::FillStyle_NONE ); + css::drawing::FillStyle eFS( css::drawing::FillStyle_NONE ); switch( eFillStyle ) { case drawing::FillStyle_SOLID : { static const char sFillColor[] = "FillColor"; - eFS = com::sun::star::drawing::FillStyle_SOLID; + eFS = css::drawing::FillStyle_SOLID; Color aFillColor( static_cast<const XFillColorItem&>(pObj->GetMergedItem( XATTR_FILLCOLOR )).GetColorValue() ); sal_Int32 nFillColor( aFillColor.GetColor() ); xPropSet->setPropertyValue( sFillColor, Any( nFillColor ) ); @@ -7373,10 +7370,10 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell >& xCell ) break; case drawing::FillStyle_GRADIENT : { - eFS = com::sun::star::drawing::FillStyle_GRADIENT; + eFS = css::drawing::FillStyle_GRADIENT; XGradient aXGradient(static_cast<const XFillGradientItem&>(pObj->GetMergedItem(XATTR_FILLGRADIENT)).GetGradientValue()); - com::sun::star::awt::Gradient aGradient; + css::awt::Gradient aGradient; aGradient.Style = (awt::GradientStyle) aXGradient.GetGradientStyle(); aGradient.StartColor = (sal_Int32)aXGradient.GetStartColor().GetColor(); aGradient.EndColor = (sal_Int32)aXGradient.GetEndColor().GetColor(); @@ -7393,11 +7390,11 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell >& xCell ) } break; case drawing::FillStyle_HATCH : - eFS = com::sun::star::drawing::FillStyle_HATCH; + eFS = css::drawing::FillStyle_HATCH; break; case drawing::FillStyle_BITMAP : { - eFS = com::sun::star::drawing::FillStyle_BITMAP; + eFS = css::drawing::FillStyle_BITMAP; const XFillBitmapItem aXFillBitmapItem(static_cast<const XFillBitmapItem&>(pObj->GetMergedItem( XATTR_FILLBITMAP ))); OUString aURL( UNO_NAME_GRAPHOBJ_URLPREFIX); @@ -7410,16 +7407,16 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell >& xCell ) const XFillBmpStretchItem aStretchItem(static_cast<const XFillBmpStretchItem&>(pObj->GetMergedItem( XATTR_FILLBMP_STRETCH ))); const XFillBmpTileItem aTileItem(static_cast<const XFillBmpTileItem&>(pObj->GetMergedItem( XATTR_FILLBMP_TILE ))); if( aTileItem.GetValue() ) - xPropSet->setPropertyValue( "FillBitmapMode", Any( com::sun::star::drawing::BitmapMode_REPEAT ) ); + xPropSet->setPropertyValue( "FillBitmapMode", Any( css::drawing::BitmapMode_REPEAT ) ); else if( aStretchItem.GetValue() ) - xPropSet->setPropertyValue( "FillBitmapMode", Any( com::sun::star::drawing::BitmapMode_STRETCH ) ); + xPropSet->setPropertyValue( "FillBitmapMode", Any( css::drawing::BitmapMode_STRETCH ) ); else - xPropSet->setPropertyValue( "FillBitmapMode", Any( com::sun::star::drawing::BitmapMode_NO_REPEAT ) ); + xPropSet->setPropertyValue( "FillBitmapMode", Any( css::drawing::BitmapMode_NO_REPEAT ) ); } break; default: case drawing::FillStyle_NONE : - eFS = com::sun::star::drawing::FillStyle_NONE; + eFS = css::drawing::FillStyle_NONE; break; } @@ -7443,7 +7440,7 @@ void ApplyCellLineAttributes( const SdrObject* pLine, Reference< XTable >& xTabl { SfxItemSet aSet( pLine->GetMergedItemSet() ); drawing::LineStyle eLineStyle(static_cast<const XLineStyleItem&>(pLine->GetMergedItem( XATTR_LINESTYLE )).GetValue()); - com::sun::star::table::BorderLine2 aBorderLine; + css::table::BorderLine2 aBorderLine; switch( eLineStyle ) { case drawing::LineStyle_DASH : diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx index 1a7f0a52f1b9..5a180be82dc9 100644 --- a/filter/source/msfilter/util.cxx +++ b/filter/source/msfilter/util.cxx @@ -20,7 +20,7 @@ namespace msfilter { namespace util { -rtl_TextEncoding getBestTextEncodingFromLocale(const ::com::sun::star::lang::Locale &rLocale) +rtl_TextEncoding getBestTextEncodingFromLocale(const css::lang::Locale &rLocale) { // Obviously not comprehensive, feel free to expand these, they're for ultimate fallbacks // in last-ditch broken-file-format cases to guess the right 8bit encodings @@ -350,7 +350,7 @@ static const ApiPaperSize spPaperSizeTable[] = { MM2MM100( 322 ), MM2MM100( 445 ) } // 68 - A3 extra transverse paper }; -sal_Int32 PaperSizeConv::getMSPaperSizeIndex( const com::sun::star::awt::Size& rSize ) +sal_Int32 PaperSizeConv::getMSPaperSizeIndex( const css::awt::Size& rSize ) { sal_Int32 nElems = SAL_N_ELEMENTS( spPaperSizeTable ); // Need to find the best match for current size diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx index d1b6b780258a..62f419c83529 100644 --- a/filter/source/odfflatxml/OdfFlatXml.cxx +++ b/filter/source/odfflatxml/OdfFlatXml.cxx @@ -225,9 +225,9 @@ odfflatxml_component_getFactory( const sal_Char* pImplementationName, if ((!pImplementationName) || (!pServiceManager)) return NULL; - com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > - xSMGR = static_cast< com::sun::star::lang::XMultiServiceFactory* >(pServiceManager); - com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > xFactory; + css::uno::Reference< css::lang::XMultiServiceFactory > + xSMGR = static_cast< css::lang::XMultiServiceFactory* >(pServiceManager); + css::uno::Reference< css::lang::XSingleServiceFactory > xFactory; OUString sImplName = OUString::createFromAscii(pImplementationName); if (OdfFlatXml::impl_getImplementationName() == sImplName) diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx index f656ab8c8aac..2eeaf7599dae 100644 --- a/filter/source/pdf/impdialog.hxx +++ b/filter/source/pdf/impdialog.hxx @@ -74,7 +74,7 @@ class ImpPDFTabLinksPage; class ImpPDFTabDialog : public SfxTabDialog { private: - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext> mxContext; + css::uno::Reference< css::uno::XComponentContext> mxContext; FilterConfigItem maConfigItem; FilterConfigItem maConfigI18N; @@ -96,23 +96,23 @@ protected: bool mbSelectionPresent; bool mbUseCTLFont; bool mbUseLosslessCompression; - sal_Int32 mnQuality; + sal_Int32 mnQuality; bool mbReduceImageResolution; - sal_Int32 mnMaxImageResolution; + sal_Int32 mnMaxImageResolution; bool mbUseTaggedPDF; - sal_Int32 mnPDFTypeSelection; + sal_Int32 mnPDFTypeSelection; bool mbExportNotes; bool mbViewPDF; bool mbExportNotesPages; bool mbUseTransitionEffects; bool mbIsSkipEmptyPages; bool mbAddStream; - sal_Int32 mnFormsType; + sal_Int32 mnFormsType; bool mbExportFormFields; bool mbAllowDuplicateFieldNames; bool mbExportBookmarks; bool mbExportHiddenSlides; - sal_Int32 mnOpenBookmarkLevels; + sal_Int32 mnOpenBookmarkLevels; bool mbHideViewerToolbar; bool mbHideViewerMenubar; @@ -121,42 +121,42 @@ protected: bool mbCenterWindow; bool mbOpenInFullScreenMode; bool mbDisplayPDFDocumentTitle; - sal_Int32 mnMagnification; - sal_Int32 mnInitialView; - sal_Int32 mnZoom; - sal_Int32 mnInitialPage; + sal_Int32 mnMagnification; + sal_Int32 mnInitialView; + sal_Int32 mnZoom; + sal_Int32 mnInitialPage; - sal_Int32 mnPageLayout; + sal_Int32 mnPageLayout; bool mbFirstPageLeft; bool mbEncrypt; bool mbRestrictPermissions; - com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue > maPreparedOwnerPassword; - sal_Int32 mnPrint; - sal_Int32 mnChangesAllowed; + css::uno::Sequence< css::beans::NamedValue > maPreparedOwnerPassword; + sal_Int32 mnPrint; + sal_Int32 mnChangesAllowed; bool mbCanCopyOrExtract; bool mbCanExtractForAccessibility; - com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder > mxPreparedPasswords; + css::uno::Reference< css::beans::XMaterialHolder > mxPreparedPasswords; bool mbIsRangeChecked; - OUString msPageRange; + OUString msPageRange; bool mbSelectionIsChecked; bool mbExportRelativeFsysLinks; - sal_Int32 mnViewPDFMode; + sal_Int32 mnViewPDFMode; bool mbConvertOOoTargets; bool mbExportBmkToPDFDestination; bool mbSignPDF; - OUString msSignPassword; - OUString msSignLocation; - OUString msSignContact; - OUString msSignReason; - com::sun::star::uno::Reference< com::sun::star::security::XCertificate > maSignCertificate; - OUString msSignTSA; + OUString msSignPassword; + OUString msSignLocation; + OUString msSignContact; + OUString msSignReason; + css::uno::Reference< css::security::XCertificate > maSignCertificate; + OUString msSignTSA; - OUString maWatermarkText; + OUString maWatermarkText; public: @@ -363,10 +363,10 @@ class ImpPDFTabSecurityPage : public SfxTabPage bool mbHaveOwnerPassword; bool mbHaveUserPassword; - com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue > maPreparedOwnerPassword; + css::uno::Sequence< css::beans::NamedValue > maPreparedOwnerPassword; OUString msOwnerPwdTitle; - com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder > mxPreparedPasswords; + css::uno::Reference< css::beans::XMaterialHolder > mxPreparedPasswords; DECL_LINK_TYPED( ClickmaPbSetPwdHdl, Button*, void ); @@ -430,7 +430,7 @@ class ImpPDFTabSigningPage : public SfxTabPage VclPtr<Edit> mpEdSignContactInfo; VclPtr<Edit> mpEdSignReason; VclPtr<ListBox> mpLBSignTSA; - com::sun::star::uno::Reference< com::sun::star::security::XCertificate > maSignCertificate; + css::uno::Reference< css::security::XCertificate > maSignCertificate; DECL_LINK_TYPED( ClickmaPbSignCertSelect, Button*, void ); DECL_LINK_TYPED( ClickmaPbSignCertClear, Button*, void ); diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index 32e06b83e791..fb7469db5427 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -156,7 +156,7 @@ PDFExport::~PDFExport() bool PDFExport::ExportSelection( vcl::PDFWriter& rPDFWriter, - Reference< com::sun::star::view::XRenderable >& rRenderable, + Reference< css::view::XRenderable >& rRenderable, const Any& rSelection, const StringRangeEnumerator& rRangeEnum, Sequence< PropertyValue >& rRenderOptions, @@ -278,7 +278,7 @@ PDFExportStreamDoc::~PDFExportStreamDoc() void PDFExportStreamDoc::write( const Reference< XOutputStream >& xStream ) { - Reference< com::sun::star::frame::XStorable > xStore( m_xSrcDoc, UNO_QUERY ); + Reference< css::frame::XStorable > xStore( m_xSrcDoc, UNO_QUERY ); if( xStore.is() ) { Sequence< beans::PropertyValue > aArgs( 2 + ((m_aPreparedPassword.getLength() > 0) ? 1 : 0) ); @@ -308,7 +308,7 @@ static OUString getMimetypeForDocument( const Reference< XComponentContext >& xC try { // get document service name - Reference< com::sun::star::frame::XStorable > xStore( xDoc, UNO_QUERY ); + Reference< css::frame::XStorable > xStore( xDoc, UNO_QUERY ); Reference< frame::XModuleManager2 > xModuleManager = frame::ModuleManager::create(xContext); if( xStore.is() ) { @@ -918,7 +918,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& mxStatusIndicator->end(); // if during the export the doc locale was set copy it to PDF writer - const com::sun::star::lang::Locale& rLoc( pPDFExtOutDevData->GetDocumentLocale() ); + const css::lang::Locale& rLoc( pPDFExtOutDevData->GetDocumentLocale() ); if( !rLoc.Language.isEmpty() ) pPDFWriter->SetDocumentLocale( rLoc ); diff --git a/filter/source/pdf/pdfexport.hxx b/filter/source/pdf/pdfexport.hxx index 1015322e51e9..b37cf15bb661 100644 --- a/filter/source/pdf/pdfexport.hxx +++ b/filter/source/pdf/pdfexport.hxx @@ -120,7 +120,7 @@ public: ~PDFExport(); bool ExportSelection( vcl::PDFWriter& rPDFWriter, - Reference< com::sun::star::view::XRenderable >& rRenderable, + Reference< css::view::XRenderable >& rRenderable, const Any& rSelection, const StringRangeEnumerator& rRangeEnum, Sequence< PropertyValue >& rRenderOptions, diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx index 9c6478488298..793b9449abe9 100644 --- a/filter/source/pdf/pdffilter.cxx +++ b/filter/source/pdf/pdffilter.cxx @@ -186,7 +186,7 @@ void SAL_CALL PDFFilter::setSourceDocument( const Reference< XComponent >& xDoc -void SAL_CALL PDFFilter::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& ) +void SAL_CALL PDFFilter::initialize( const css::uno::Sequence< css::uno::Any >& ) throw (Exception, RuntimeException, std::exception) { } @@ -228,7 +228,7 @@ sal_Bool SAL_CALL PDFFilter::supportsService( const OUString& rServiceName ) -::com::sun::star::uno::Sequence< OUString > SAL_CALL PDFFilter::getSupportedServiceNames( ) throw (RuntimeException, std::exception) +css::uno::Sequence< OUString > SAL_CALL PDFFilter::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { return PDFFilter_getSupportedServiceNames(); } diff --git a/filter/source/pdf/pdfinteract.cxx b/filter/source/pdf/pdfinteract.cxx index cf68ee1341e5..bb01fc6db46e 100644 --- a/filter/source/pdf/pdfinteract.cxx +++ b/filter/source/pdf/pdfinteract.cxx @@ -91,7 +91,7 @@ sal_Bool SAL_CALL PDFInteractionHandler::supportsService( const OUString& rServi return cppu::supportsService( this, rServiceName ); } -::com::sun::star::uno::Sequence< OUString > SAL_CALL PDFInteractionHandler::getSupportedServiceNames( ) throw (RuntimeException, std::exception) +css::uno::Sequence< OUString > SAL_CALL PDFInteractionHandler::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { return PDFInteractionHandler_getSupportedServiceNames(); } diff --git a/filter/source/placeware/exporter.cxx b/filter/source/placeware/exporter.cxx index 64104a5f216d..0ac63a4f869d 100644 --- a/filter/source/placeware/exporter.cxx +++ b/filter/source/placeware/exporter.cxx @@ -106,7 +106,7 @@ PageEntry::~PageEntry() } -static void encodeFile( osl::File& rSourceFile, Reference< XOutputStream >& xOutputStream ) throw( ::com::sun::star::uno::Exception ) +static void encodeFile( osl::File& rSourceFile, Reference< XOutputStream >& xOutputStream ) throw( css::uno::Exception ) { if( xOutputStream.is() ) { @@ -181,7 +181,7 @@ static OString convertString( const OUString& aInput ) return aRet; } -static void createSlideFile( Reference< XComponent > xDoc, PlacewareZipFile& rZipFile, const OUString& rURL, vector< PageEntry* >& rPageEntries ) throw( ::com::sun::star::uno::Exception, std::exception ) +static void createSlideFile( Reference< XComponent > xDoc, PlacewareZipFile& rZipFile, const OUString& rURL, vector< PageEntry* >& rPageEntries ) throw( css::uno::Exception, std::exception ) { OString aInfo; diff --git a/filter/source/placeware/exporter.hxx b/filter/source/placeware/exporter.hxx index 8d352e61cffd..4c7f2a7a9d72 100644 --- a/filter/source/placeware/exporter.hxx +++ b/filter/source/placeware/exporter.hxx @@ -32,21 +32,21 @@ class PageEntry; class PlaceWareExporter { public: - PlaceWareExporter( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + PlaceWareExporter( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); ~PlaceWareExporter(); - bool doExport( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xDoc, - ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > xOutputStream, - const OUString& rURL, - ::com::sun::star::uno::Reference < ::com::sun::star::uno::XInterface > xHandler, - ::com::sun::star::uno::Reference < ::com::sun::star::task::XStatusIndicator >& rxStatusIndicator ); + bool doExport( css::uno::Reference< css::lang::XComponent > xDoc, + css::uno::Reference < css::io::XOutputStream > xOutputStream, + const OUString& rURL, + css::uno::Reference < css::uno::XInterface > xHandler, + css::uno::Reference < css::task::XStatusIndicator >& rxStatusIndicator ); private: - PageEntry* exportPage( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >&xDrawPage ); + PageEntry* exportPage( css::uno::Reference< css::drawing::XDrawPage >&xDrawPage ); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XGraphicExportFilter > mxGraphicExporter; - ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > mxInteractionHandler; + css::uno::Reference< css::uno::XComponentContext > mxContext; + css::uno::Reference< css::drawing::XGraphicExportFilter > mxGraphicExporter; + css::uno::Reference< css::task::XInteractionHandler > mxInteractionHandler; }; #endif diff --git a/filter/source/placeware/filter.cxx b/filter/source/placeware/filter.cxx index f45b607d799b..b56d403d205c 100644 --- a/filter/source/placeware/filter.cxx +++ b/filter/source/placeware/filter.cxx @@ -43,10 +43,10 @@ namespace pwp { class PlaceWareExportFilter : public cppu::WeakImplHelper < - com::sun::star::document::XFilter, - com::sun::star::document::XExporter, - com::sun::star::lang::XInitialization, - com::sun::star::lang::XServiceInfo + css::document::XFilter, + css::document::XExporter, + css::lang::XInitialization, + css::lang::XServiceInfo > { Reference< XComponent > mxDoc; @@ -80,7 +80,7 @@ PlaceWareExportFilter::PlaceWareExportFilter(const Reference< XComponentContext -sal_Bool SAL_CALL PlaceWareExportFilter::filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) +sal_Bool SAL_CALL PlaceWareExportFilter::filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) throw (RuntimeException, std::exception) { sal_Int32 nLength = aDescriptor.getLength(); @@ -128,8 +128,8 @@ void SAL_CALL PlaceWareExportFilter::cancel( ) // XExporter -void SAL_CALL PlaceWareExportFilter::setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) - throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException, std::exception) +void SAL_CALL PlaceWareExportFilter::setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) + throw (css::lang::IllegalArgumentException, RuntimeException, std::exception) { mxDoc = xDoc; } @@ -137,7 +137,7 @@ void SAL_CALL PlaceWareExportFilter::setSourceDocument( const ::com::sun::star:: // XInitialization -void SAL_CALL PlaceWareExportFilter::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& /* aArguments */ ) +void SAL_CALL PlaceWareExportFilter::initialize( const css::uno::Sequence< css::uno::Any >& /* aArguments */ ) throw (Exception, RuntimeException, std::exception) { } @@ -176,7 +176,7 @@ sal_Bool SAL_CALL PlaceWareExportFilter::supportsService( const OUString& rServi return cppu::supportsService( this, rServiceName ); } -::com::sun::star::uno::Sequence< OUString > SAL_CALL PlaceWareExportFilter::getSupportedServiceNames( ) +css::uno::Sequence< OUString > SAL_CALL PlaceWareExportFilter::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { return PlaceWareExportFilter_getSupportedServiceNames(); diff --git a/filter/source/storagefilterdetect/filterdetect.hxx b/filter/source/storagefilterdetect/filterdetect.hxx index 69f0a8e49405..73d0f9c9069a 100644 --- a/filter/source/storagefilterdetect/filterdetect.hxx +++ b/filter/source/storagefilterdetect/filterdetect.hxx @@ -28,44 +28,44 @@ #include <cppuhelper/implbase.hxx> class StorageFilterDetect : public cppu::WeakImplHelper< - com::sun::star::document::XExtendedFilterDetection, - com::sun::star::lang::XInitialization, - com::sun::star::lang::XServiceInfo> + css::document::XExtendedFilterDetection, + css::lang::XInitialization, + css::lang::XServiceInfo> { - com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> mxCxt; + css::uno::Reference<css::uno::XComponentContext> mxCxt; public: - StorageFilterDetect (const com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext>& xCxt); + StorageFilterDetect (const css::uno::Reference<css::uno::XComponentContext>& xCxt); virtual ~StorageFilterDetect(); // XExtendedFilterDetection - virtual OUString SAL_CALL detect(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rDescriptor) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL detect(css::uno::Sequence<css::beans::PropertyValue>& rDescriptor) + throw( css::uno::RuntimeException, std::exception ) SAL_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) SAL_OVERRIDE; + virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& aArguments) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual com::sun::star::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; OUString StorageFilterDetect_getImplementationName(); bool StorageFilterDetect_supportsService(const OUString& ServiceName); -com::sun::star::uno::Sequence<OUString> StorageFilterDetect_getSupportedServiceNames(); +css::uno::Sequence<OUString> StorageFilterDetect_getSupportedServiceNames(); -com::sun::star::uno::Reference<com::sun::star::uno::XInterface> -StorageFilterDetect_createInstance(const com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext>& rCxt); +css::uno::Reference<css::uno::XInterface> +StorageFilterDetect_createInstance(const css::uno::Reference<css::uno::XComponentContext>& rCxt); #endif diff --git a/filter/source/svg/impsvgdialog.hxx b/filter/source/svg/impsvgdialog.hxx index c10400ef55ba..8d737daa741d 100644 --- a/filter/source/svg/impsvgdialog.hxx +++ b/filter/source/svg/impsvgdialog.hxx @@ -65,11 +65,11 @@ private: public: ImpSVGDialog( vcl::Window* pParent, /*ResMgr& rResMgr,*/ - com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rFilterData ); + css::uno::Sequence< css::beans::PropertyValue >& rFilterData ); virtual ~ImpSVGDialog(); virtual void dispose() SAL_OVERRIDE; - com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > GetFilterData(); + css::uno::Sequence< css::beans::PropertyValue > GetFilterData(); }; #endif // INCLUDED_FILTER_SOURCE_SVG_IMPSVGDIALOG_HXX diff --git a/filter/source/svg/svgdialog.hxx b/filter/source/svg/svgdialog.hxx index 7c87789c2438..7d17095639d6 100644 --- a/filter/source/svg/svgdialog.hxx +++ b/filter/source/svg/svgdialog.hxx @@ -35,68 +35,68 @@ class ResMgr; class SVGDialog : public ::svt::OGenericUnoDialog, public ::comphelper::OPropertyArrayUsageHelper< SVGDialog >, - public ::com::sun::star::beans::XPropertyAccess, - public ::com::sun::star::document::XExporter + public css::beans::XPropertyAccess, + public css::document::XExporter { private: - ::std::unique_ptr< ResMgr > mapResMgr; - com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > maMediaDescriptor; - com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > maFilterData; - com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mxSrcDoc; + ::std::unique_ptr< ResMgr > mapResMgr; + css::uno::Sequence< css::beans::PropertyValue > maMediaDescriptor; + css::uno::Sequence< css::beans::PropertyValue > maFilterData; + css::uno::Reference< css::lang::XComponent > mxSrcDoc; protected: // XInterface - virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& aType ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; virtual void SAL_CALL release() throw () SAL_OVERRIDE; // OGenericUnoDialog - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual VclPtr<Dialog> createDialog( vcl::Window* pParent ) SAL_OVERRIDE; virtual void executedDialog( sal_Int16 nExecutionResult ) SAL_OVERRIDE; - virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; // XPropertyAccess using cppu::OPropertySetHelper::getPropertyValues; - virtual com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues( ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; using cppu::OPropertySetHelper::setPropertyValues; - virtual void SAL_CALL setPropertyValues( const com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps ) throw (com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& aProps ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XExporter - virtual void SAL_CALL setSourceDocument( const com::sun::star::uno::Reference< com::sun::star::lang::XComponent >& xDoc ) throw(com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: - SVGDialog( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext ); + SVGDialog( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~SVGDialog(); }; OUString SVGDialog_getImplementationName () - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( css::uno::RuntimeException ); bool SAL_CALL SVGDialog_supportsService( const OUString& ServiceName ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( css::uno::RuntimeException ); -::com::sun::star::uno::Sequence< OUString > SAL_CALL SVGDialog_getSupportedServiceNames( ) - throw ( ::com::sun::star::uno::RuntimeException ); +css::uno::Sequence< OUString > SAL_CALL SVGDialog_getSupportedServiceNames( ) + throw ( css::uno::RuntimeException ); -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - SAL_CALL SVGDialog_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr) - throw ( ::com::sun::star::uno::Exception ); +css::uno::Reference< css::uno::XInterface > + SAL_CALL SVGDialog_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) + throw ( css::uno::Exception ); #endif // SVGDialog_HXX diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 2bc4a5fbd9eb..fbef0ea27483 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -317,7 +317,7 @@ bool operator==( const TextField & aLhsTextField, const TextField & aRhsTextFiel SVGExport::SVGExport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext, + const css::uno::Reference< css::uno::XComponentContext >& rContext, const Reference< XDocumentHandler >& rxHandler, const Sequence< PropertyValue >& rFilterData ) : SvXMLExport( util::MeasureUnit::MM_100TH, @@ -573,7 +573,7 @@ bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor ) // xSVGExport is set up only to manage the life-time of the object pointed by mpSVGExport, // and in order to prevent that it is destroyed when passed to AnimationExporter. - Reference< XInterface > xSVGExport = static_cast< ::com::sun::star::document::XFilter* >( mpSVGExport ); + Reference< XInterface > xSVGExport = static_cast< css::document::XFilter* >( mpSVGExport ); // create an id for each draw page for( sal_Int32 i = 0; i < mSelectedPages.getLength(); ++i ) @@ -1307,7 +1307,7 @@ bool SVGFilter::implExportTextEmbeddedBitmaps() const Reference< XInterface >& rxShape = it->GetObject(); Reference< XPropertySet > xShapePropSet( rxShape, UNO_QUERY ); - ::com::sun::star::awt::Rectangle aBoundRect; + css::awt::Rectangle aBoundRect; if( xShapePropSet.is() && ( xShapePropSet->getPropertyValue( "BoundRect" ) >>= aBoundRect ) ) { // Origin of the coordinate device must be (0,0). @@ -1708,8 +1708,8 @@ bool SVGFilter::implExportShape( const Reference< XShape >& rxShape, if( !bRet && mpObjects->find( rxShape ) != mpObjects->end() ) { - ::com::sun::star::awt::Rectangle aBoundRect; - const GDIMetaFile& rMtf = (*mpObjects)[ rxShape ].GetRepresentation(); + css::awt::Rectangle aBoundRect; + const GDIMetaFile& rMtf = (*mpObjects)[ rxShape ].GetRepresentation(); xShapePropSet->getPropertyValue( "BoundRect" ) >>= aBoundRect; diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx index a51336513fe5..e1e2a1e9b261 100644 --- a/filter/source/svg/svgfilter.cxx +++ b/filter/source/svg/svgfilter.cxx @@ -304,7 +304,7 @@ void SAL_CALL SVGFilter::setSourceDocument( const Reference< XComponent >& xDoc } void SAL_CALL SVGFilter::setTargetDocument( const Reference< XComponent >& xDoc ) - throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException, std::exception) + throw (css::lang::IllegalArgumentException, RuntimeException, std::exception) { mxDstDoc = xDoc; } diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx index 3dfebdda8c1c..206c42a2b85d 100644 --- a/filter/source/svg/svgfilter.hxx +++ b/filter/source/svg/svgfilter.hxx @@ -98,7 +98,7 @@ class SVGExport : public SvXMLExport public: - SVGExport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext, + SVGExport( const css::uno::Reference< css::uno::XComponentContext >& rContext, const Reference< XDocumentHandler >& rxHandler, const Sequence< PropertyValue >& rFilterData ); diff --git a/filter/source/svg/svgfontexport.cxx b/filter/source/svg/svgfontexport.cxx index 9783797975db..2d62da72117b 100644 --- a/filter/source/svg/svgfontexport.cxx +++ b/filter/source/svg/svgfontexport.cxx @@ -138,12 +138,12 @@ void SVGFontExport::implCollectGlyphs() if( !aText.isEmpty() ) { GlyphSet& rGlyphSet = implGetGlyphSet( pVDev->GetFont() ); - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > xBI( + css::uno::Reference< css::i18n::XBreakIterator > xBI( vcl::unohelper::CreateBreakIterator() ); if( xBI.is() ) { - const ::com::sun::star::lang::Locale& rLocale = Application::GetSettings().GetLanguageTag().getLocale(); + const css::lang::Locale& rLocale = Application::GetSettings().GetLanguageTag().getLocale(); sal_Int32 nCurPos = 0, nLastPos = -1; while( ( nCurPos < aText.getLength() ) && ( nCurPos > nLastPos ) ) @@ -152,7 +152,7 @@ void SVGFontExport::implCollectGlyphs() nLastPos = nCurPos; nCurPos = xBI->nextCharacters( aText, nCurPos, rLocale, - ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL, + css::i18n::CharacterIteratorMode::SKIPCELL, nCount2, nCount2 ); rGlyphSet.insert( aText.copy( nLastPos, nCurPos - nLastPos ) ); diff --git a/filter/source/svg/svgreader.hxx b/filter/source/svg/svgreader.hxx index 61e52a57cc2b..b200c1b9b3b8 100644 --- a/filter/source/svg/svgreader.hxx +++ b/filter/source/svg/svgreader.hxx @@ -21,14 +21,14 @@ namespace svgi class SVGReader { - const ::com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext; - const ::com::sun::star::uno::Reference< com::sun::star::io::XInputStream > m_xInputStream; - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xDocumentHandler; + const css::uno::Reference< css::uno::XComponentContext > m_xContext; + const css::uno::Reference< css::io::XInputStream > m_xInputStream; + const css::uno::Reference< css::xml::sax::XDocumentHandler > m_xDocumentHandler; public: - FILTER_DLLPUBLIC SVGReader( const com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext>& xContext, - const com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& xInputStream, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >& xDocumentHandler ); + FILTER_DLLPUBLIC SVGReader( const css::uno::Reference<css::uno::XComponentContext>& xContext, + const css::uno::Reference< css::io::XInputStream >& xInputStream, + const css::uno::Reference< css::xml::sax::XDocumentHandler >& xDocumentHandler ); FILTER_DLLPUBLIC bool parseAndConvert(); }; diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index db8d1ce508f4..249791e4c440 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -1897,19 +1897,19 @@ void SVGActionWriter::ImplAddLineAttr( const LineInfo &rAttrs, // support for LineCap switch(rAttrs.GetLineCap()) { - default: /* com::sun::star::drawing::LineCap_BUTT */ + default: /* css::drawing::LineCap_BUTT */ { // butt is Svg default, so no need to write until the exporter might write styles. // If this happens, activate here // mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinecap, "butt"); break; } - case com::sun::star::drawing::LineCap_ROUND: + case css::drawing::LineCap_ROUND: { mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinecap, "round"); break; } - case com::sun::star::drawing::LineCap_SQUARE: + case css::drawing::LineCap_SQUARE: { mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinecap, "square"); break; @@ -1988,19 +1988,19 @@ void SVGActionWriter::ImplWriteShape( const SVGShapeDescriptor& rShape, bool bAp // support for LineCap switch(rShape.maLineCap) { - default: /* com::sun::star::drawing::LineCap_BUTT */ + default: /* css::drawing::LineCap_BUTT */ { // butt is Svg default, so no need to write until the exporter might write styles. // If this happens, activate here // mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinecap, "butt"); break; } - case com::sun::star::drawing::LineCap_ROUND: + case css::drawing::LineCap_ROUND: { mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinecap, "round"); break; } - case com::sun::star::drawing::LineCap_SQUARE: + case css::drawing::LineCap_SQUARE: { mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinecap, "square"); break; @@ -2496,8 +2496,8 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText, } else { - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > xBI( vcl::unohelper::CreateBreakIterator() ); - const ::com::sun::star::lang::Locale& rLocale = Application::GetSettings().GetLanguageTag().getLocale(); + css::uno::Reference< css::i18n::XBreakIterator > xBI( vcl::unohelper::CreateBreakIterator() ); + const css::lang::Locale& rLocale = Application::GetSettings().GetLanguageTag().getLocale(); sal_Int32 nCurPos = 0, nLastPos = 0, nX = aPos.X(); // write single glyphs at absolute text positions @@ -2507,7 +2507,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText, nLastPos = nCurPos; nCurPos = xBI->nextCharacters( rText, nCurPos, rLocale, - ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL, + css::i18n::CharacterIteratorMode::SKIPCELL, nCount, nCount ); nCount = nCurPos - nLastPos; @@ -3145,17 +3145,17 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, { default: /* SvtGraphicStroke::capButt */ { - mapCurShape->maLineCap = com::sun::star::drawing::LineCap_BUTT; + mapCurShape->maLineCap = css::drawing::LineCap_BUTT; break; } case SvtGraphicStroke::capRound: { - mapCurShape->maLineCap = com::sun::star::drawing::LineCap_ROUND; + mapCurShape->maLineCap = css::drawing::LineCap_ROUND; break; } case SvtGraphicStroke::capSquare: { - mapCurShape->maLineCap = com::sun::star::drawing::LineCap_SQUARE; + mapCurShape->maLineCap = css::drawing::LineCap_SQUARE; break; } } @@ -3169,7 +3169,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, mapCurShape->mnStrokeWidth = 0; mapCurShape->maDashArray.clear(); mapCurShape->maLineJoin = basegfx::B2DLineJoin::Miter; - mapCurShape->maLineCap = com::sun::star::drawing::LineCap_BUTT; + mapCurShape->maLineCap = css::drawing::LineCap_BUTT; if(aStartArrow.Count()) { diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx index 6251dda69353..8f46efd7bce8 100644 --- a/filter/source/svg/svgwriter.hxx +++ b/filter/source/svg/svgwriter.hxx @@ -98,10 +98,10 @@ private: SvXMLElementExport* mpElemFont; SvXMLElementExport* mpElemPaint; - basegfx::B2DLineJoin maLineJoin; - com::sun::star::drawing::LineCap maLineCap; + basegfx::B2DLineJoin maLineJoin; + css::drawing::LineCap maLineCap; - SVGAttributeWriter(); + SVGAttributeWriter(); static double ImplRound( double fVal, sal_Int32 nDecs = 3 ); @@ -131,10 +131,10 @@ struct SVGShapeDescriptor sal_Int32 mnStrokeWidth; SvtGraphicStroke::DashArray maDashArray; ::std::unique_ptr< Gradient > mapShapeGradient; - OUString maId; + OUString maId; - basegfx::B2DLineJoin maLineJoin; - com::sun::star::drawing::LineCap maLineCap; + basegfx::B2DLineJoin maLineJoin; + css::drawing::LineCap maLineCap; @@ -143,7 +143,7 @@ struct SVGShapeDescriptor maShapeLineColor( Color( COL_TRANSPARENT ) ), mnStrokeWidth( 0 ), maLineJoin(basegfx::B2DLineJoin::Miter), // miter is Svg 'stroke-linejoin' default - maLineCap(com::sun::star::drawing::LineCap_BUTT) // butt is Svg 'stroke-linecap' default + maLineCap(css::drawing::LineCap_BUTT) // butt is Svg 'stroke-linecap' default { } }; @@ -377,7 +377,7 @@ class SVGWriter : public cppu::WeakImplHelper< XSVGWriter > { private: Reference< XComponentContext > mxContext; - Sequence< com::sun::star::beans::PropertyValue > maFilterData; + Sequence< css::beans::PropertyValue > maFilterData; SVGWriter(); public: diff --git a/filter/source/svg/test/odfserializer.cxx b/filter/source/svg/test/odfserializer.cxx index 3bac1ef2c7d3..7675af34251c 100644 --- a/filter/source/svg/test/odfserializer.cxx +++ b/filter/source/svg/test/odfserializer.cxx @@ -31,7 +31,7 @@ namespace svgi { typedef ::cppu::WeakComponentImplHelper< - com::sun::star::xml::sax::XDocumentHandler> ODFSerializerBase; + css::xml::sax::XDocumentHandler> ODFSerializerBase; class ODFSerializer : private cppu::BaseMutex, public ODFSerializerBase, diff --git a/filter/source/svg/test/odfserializer.hxx b/filter/source/svg/test/odfserializer.hxx index 4fd47b5e6474..bff8cb68fa69 100644 --- a/filter/source/svg/test/odfserializer.hxx +++ b/filter/source/svg/test/odfserializer.hxx @@ -27,8 +27,8 @@ namespace svgi { /// Creates a XDocumentHandler that serializes directly to an XOutputStream - ::com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> - createSerializer(const ::com::sun::star::uno::Reference<com::sun::star::io::XOutputStream>& ); + css::uno::Reference< css::xml::sax::XDocumentHandler> + createSerializer(const css::uno::Reference<css::io::XOutputStream>& ); } #endif // INCLUDED_FILTER_SOURCE_SVG_TEST_ODFSERIALIZER_HXX diff --git a/filter/source/svg/test/svg2odf.cxx b/filter/source/svg/test/svg2odf.cxx index 2fe00cf42657..63ca8ba152e4 100644 --- a/filter/source/svg/test/svg2odf.cxx +++ b/filter/source/svg/test/svg2odf.cxx @@ -46,18 +46,18 @@ namespace maFile.open( osl_File_OpenFlag_Create|osl_File_OpenFlag_Write ); } - virtual void SAL_CALL writeBytes( const com::sun::star::uno::Sequence< ::sal_Int8 >& aData ) throw (com::sun::star::io::NotConnectedException,com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL writeBytes( const css::uno::Sequence< ::sal_Int8 >& aData ) throw (css::io::NotConnectedException,css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE { sal_uInt64 nBytesWritten(0); maFile.write(aData.getConstArray(),aData.getLength(),nBytesWritten); } - virtual void SAL_CALL flush() throw (com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL flush() throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE { } - virtual void SAL_CALL closeOutput() throw (com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL closeOutput() throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE { maFile.close(); } diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx index b8a4cb5b6b0e..9dae5b84203e 100644 --- a/filter/source/t602/t602filter.cxx +++ b/filter/source/t602/t602filter.cxx @@ -123,7 +123,7 @@ namespace T602ImportFilter { inistruct ini; -T602ImportFilter::T602ImportFilter(const ::com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory > &r ) +T602ImportFilter::T602ImportFilter(const css::uno::Reference<css::lang::XMultiServiceFactory > &r ) : mxMSF(r) , mpAttrList(NULL) , node(START) @@ -149,7 +149,7 @@ OUString T602ImportFilter::detect( Sequence<PropertyValue>& Descriptor) if (!mxInputStream.is()) return OUString(); - ::com::sun::star::uno::Sequence< sal_Int8 > aData; + css::uno::Sequence< sal_Int8 > aData; const size_t numBytes = 4; size_t numBytesRead = 0; @@ -163,15 +163,15 @@ OUString T602ImportFilter::detect( Sequence<PropertyValue>& Descriptor) } // XFilter -sal_Bool SAL_CALL T602ImportFilter::filter( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) +sal_Bool SAL_CALL T602ImportFilter::filter( const Sequence< css::beans::PropertyValue >& aDescriptor ) throw (RuntimeException, std::exception) { return importImpl ( aDescriptor ); } // XImporter -void SAL_CALL T602ImportFilter::setTargetDocument( const Reference< ::com::sun::star::lang::XComponent >& xDoc ) - throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException, std::exception) +void SAL_CALL T602ImportFilter::setTargetDocument( const Reference< css::lang::XComponent >& xDoc ) + throw (css::lang::IllegalArgumentException, RuntimeException, std::exception) { mxDoc = xDoc; } @@ -230,7 +230,7 @@ void T602ImportFilter::inschr(unsigned char ch) inschrdef(ch); } -bool SAL_CALL T602ImportFilter::importImpl( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) +bool SAL_CALL T602ImportFilter::importImpl( const Sequence< css::beans::PropertyValue >& aDescriptor ) throw (RuntimeException) { Reset602(); @@ -880,7 +880,7 @@ Reference< XInterface > SAL_CALL T602ImportFilter_createInstance( const Referenc return static_cast<cppu::OWeakObject*>(new T602ImportFilter( rSMgr )); } -T602ImportFilterDialog::T602ImportFilterDialog(const ::com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory > &r ) : +T602ImportFilterDialog::T602ImportFilterDialog(const css::uno::Reference<css::lang::XMultiServiceFactory > &r ) : mxMSF( r ), mpResMgr( NULL ) {} T602ImportFilterDialog::~T602ImportFilterDialog() @@ -891,14 +891,14 @@ T602ImportFilterDialog::~T602ImportFilterDialog() // XLocalizable void SAL_CALL T602ImportFilterDialog::setLocale( const Locale& eLocale ) - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { meLocale = eLocale; initLocale(); } Locale SAL_CALL T602ImportFilterDialog::getLocale() - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { return meLocale; } @@ -1097,17 +1097,17 @@ ResMgr* T602ImportFilterDialog::getResMgr() } void SAL_CALL T602ImportFilterDialog::setTitle( const OUString& ) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { } sal_Int16 SAL_CALL T602ImportFilterDialog::execute() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { if (OptionsDlg()) - return com::sun::star::ui::dialogs::ExecutableDialogResults::OK; + return css::ui::dialogs::ExecutableDialogResults::OK; else - return com::sun::star::ui::dialogs::ExecutableDialogResults::CANCEL; + return css::ui::dialogs::ExecutableDialogResults::CANCEL; } OUString T602ImportFilterDialog::getResStr( sal_Int16 resid ) diff --git a/filter/source/t602/t602filter.hxx b/filter/source/t602/t602filter.hxx index 4a4ca759abcb..f12404bb2d2c 100644 --- a/filter/source/t602/t602filter.hxx +++ b/filter/source/t602/t602filter.hxx @@ -54,15 +54,15 @@ typedef enum { typedef enum {START,READCH,EOL,POCMD,EXPCMD,SETCMD,SETCH,WRITE,EEND,QUIT} tnode; OUString getImplementationName() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( css::uno::RuntimeException ); -::com::sun::star::uno::Sequence < OUString > getSupportedServiceNames() - throw ( ::com::sun::star::uno::RuntimeException ); +css::uno::Sequence < OUString > getSupportedServiceNames() + throw ( css::uno::RuntimeException ); -::com::sun::star::uno::Reference < ::com::sun::star::uno::XInterface > SAL_CALL - CreateInstance( const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > &r) - throw ( ::com::sun::star::uno::Exception ); +css::uno::Reference < css::uno::XInterface > SAL_CALL + CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > &r) + throw ( css::uno::Exception ); @@ -90,14 +90,14 @@ struct inistruct }; class T602ImportFilterDialog : public cppu::WeakImplHelper < - com::sun::star::ui::dialogs::XExecutableDialog, - com::sun::star::lang::XLocalizable, - com::sun::star::lang::XServiceInfo, - com::sun::star::beans::XPropertyAccess + css::ui::dialogs::XExecutableDialog, + css::lang::XLocalizable, + css::lang::XServiceInfo, + css::beans::XPropertyAccess > { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMSF; - com::sun::star::lang::Locale meLocale; + css::uno::Reference< css::lang::XMultiServiceFactory > mxMSF; + css::lang::Locale meLocale; ResMgr *mpResMgr; bool OptionsDlg(); ResMgr* getResMgr(); @@ -108,55 +108,55 @@ class T602ImportFilterDialog : public cppu::WeakImplHelper < // XExecutableDialog virtual void SAL_CALL setTitle( const OUString& aTitle ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL execute() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XLocalizable - virtual void SAL_CALL setLocale( const com::sun::star::lang::Locale& eLocale ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual com::sun::star::lang::Locale SAL_CALL getLocale() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLocale( const css::lang::Locale& eLocale ) + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::lang::Locale SAL_CALL getLocale() + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertyAccess - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > - SAL_CALL getPropertyValues() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& aProps ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::beans::PropertyValue > + SAL_CALL getPropertyValues() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< + css::beans::PropertyValue >& aProps ) + throw (css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: - T602ImportFilterDialog(const ::com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory > &r ); + T602ImportFilterDialog(const css::uno::Reference<css::lang::XMultiServiceFactory > &r ); }; class T602ImportFilter : public cppu::WeakImplHelper < - com::sun::star::document::XFilter, - com::sun::star::document::XImporter, - com::sun::star::document::XExtendedFilterDetection, - com::sun::star::lang::XInitialization, - com::sun::star::lang::XServiceInfo + css::document::XFilter, + css::document::XImporter, + css::document::XExtendedFilterDetection, + css::lang::XInitialization, + css::lang::XServiceInfo > { private: -// ::com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xInputStream; - ::com::sun::star::uno::Reference<com::sun::star::xml::sax::XDocumentHandler> mxHandler; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMSF; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mxDoc; - ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > mxInputStream; +// css::uno::Reference<css::io::XInputStream> xInputStream; + css::uno::Reference<css::xml::sax::XDocumentHandler> mxHandler; + css::uno::Reference< css::lang::XMultiServiceFactory > mxMSF; + css::uno::Reference< css::lang::XComponent > mxDoc; + css::uno::Reference < css::io::XInputStream > mxInputStream; OUString msFilterName; SvXMLAttributeList *mpAttrList; @@ -250,66 +250,66 @@ private: void setfnt(fonts fnt,bool mustwrite); void wrtfnt(); - bool SAL_CALL importImpl( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) - throw (::com::sun::star::uno::RuntimeException); + bool SAL_CALL importImpl( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) + throw (css::uno::RuntimeException); public: - T602ImportFilter(const ::com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory > &r ); + T602ImportFilter(const css::uno::Reference<css::lang::XMultiServiceFactory > &r ); virtual ~T602ImportFilter(); // XFilter - virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL cancel( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE {}; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE {}; // XImporter - virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XExtendedTypeDetection virtual OUString SAL_CALL detect( - com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& Descriptor ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::Sequence< css::beans::PropertyValue >& Descriptor ) + throw( css::uno::RuntimeException, std::exception ) SAL_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) SAL_OVERRIDE; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; OUString T602ImportFilter_getImplementationName() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( css::uno::RuntimeException ); bool SAL_CALL T602ImportFilter_supportsService( const OUString& ServiceName ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( css::uno::RuntimeException ); -::com::sun::star::uno::Sequence< OUString > SAL_CALL T602ImportFilter_getSupportedServiceNames( ) - throw ( ::com::sun::star::uno::RuntimeException ); +css::uno::Sequence< OUString > SAL_CALL T602ImportFilter_getSupportedServiceNames( ) + throw ( css::uno::RuntimeException ); -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > -SAL_CALL T602ImportFilter_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr) - throw ( ::com::sun::star::uno::Exception ); +css::uno::Reference< css::uno::XInterface > +SAL_CALL T602ImportFilter_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) + throw ( css::uno::Exception ); OUString T602ImportFilterDialog_getImplementationName() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( css::uno::RuntimeException ); bool SAL_CALL T602ImportFilterDialog_supportsService( const OUString& ServiceName ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( css::uno::RuntimeException ); -::com::sun::star::uno::Sequence< OUString > SAL_CALL T602ImportFilterDialog_getSupportedServiceNames( ) - throw ( ::com::sun::star::uno::RuntimeException ); +css::uno::Sequence< OUString > SAL_CALL T602ImportFilterDialog_getSupportedServiceNames( ) + throw ( css::uno::RuntimeException ); -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > -SAL_CALL T602ImportFilterDialog_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr) - throw ( ::com::sun::star::uno::Exception ); +css::uno::Reference< css::uno::XInterface > +SAL_CALL T602ImportFilterDialog_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) + throw ( css::uno::Exception ); } diff --git a/filter/source/textfilterdetect/filterdetect.cxx b/filter/source/textfilterdetect/filterdetect.cxx index cd3e58dff52c..7d8310390473 100644 --- a/filter/source/textfilterdetect/filterdetect.cxx +++ b/filter/source/textfilterdetect/filterdetect.cxx @@ -233,9 +233,9 @@ uno::Sequence<OUString> SAL_CALL PlainTextFilterDetect::getSupportedServiceNames return PlainTextFilterDetect_getSupportedServiceNames(); } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_comp_filters_PlainTextFilterDetect_get_implementation(::com::sun::star::uno::XComponentContext* component, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_comp_filters_PlainTextFilterDetect_get_implementation(css::uno::XComponentContext* component, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new PlainTextFilterDetect(component)); } diff --git a/filter/source/textfilterdetect/filterdetect.hxx b/filter/source/textfilterdetect/filterdetect.hxx index bfa3ca5440f4..61d80de2de15 100644 --- a/filter/source/textfilterdetect/filterdetect.hxx +++ b/filter/source/textfilterdetect/filterdetect.hxx @@ -28,47 +28,47 @@ #include <cppuhelper/implbase.hxx> class PlainTextFilterDetect : public cppu::WeakImplHelper< - com::sun::star::document::XExtendedFilterDetection, - com::sun::star::lang::XInitialization, - com::sun::star::lang::XServiceInfo> + css::document::XExtendedFilterDetection, + css::lang::XInitialization, + css::lang::XServiceInfo> { - com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> mxCxt; + css::uno::Reference<css::uno::XComponentContext> mxCxt; public: - PlainTextFilterDetect (const com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext>& xCxt); + PlainTextFilterDetect (const css::uno::Reference<css::uno::XComponentContext>& xCxt); virtual ~PlainTextFilterDetect(); // XExtendedFilterDetection - virtual OUString SAL_CALL detect(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& lDescriptor) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL detect(css::uno::Sequence<css::beans::PropertyValue>& lDescriptor) + throw( css::uno::RuntimeException, std::exception ) SAL_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) SAL_OVERRIDE; + virtual void SAL_CALL initialize( const css::uno::Sequence<css::uno::Any>& aArguments) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual com::sun::star::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; OUString PlainTextFilterDetect_getImplementationName(); bool PlainTextFilterDetect_supportsService(const OUString& ServiceName); -com::sun::star::uno::Sequence<OUString> PlainTextFilterDetect_getSupportedServiceNames(); +css::uno::Sequence<OUString> PlainTextFilterDetect_getSupportedServiceNames(); -com::sun::star::uno::Reference<com::sun::star::uno::XInterface> -PlainTextFilterDetect_createInstance(const com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext>& rCxt); +css::uno::Reference<css::uno::XInterface> +PlainTextFilterDetect_createInstance(const css::uno::Reference<css::uno::XComponentContext>& rCxt); #endif diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx index 56db0c1cc2ea..2730f96c3215 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx @@ -64,7 +64,7 @@ using namespace com::sun::star::xml::sax; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::task; -bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) +bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< css::beans::PropertyValue >& aDescriptor ) throw (RuntimeException) { OUString udConvertClass=msUserData[0]; @@ -139,7 +139,7 @@ bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star::be Reference< XStyleFamiliesSupplier > xstylefamiliessupplier(mxDoc, UNO_QUERY); Reference< XStyleLoader > xstyleLoader (xstylefamiliessupplier->getStyleFamilies(), UNO_QUERY); if(xstyleLoader.is()){ - Sequence<com::sun::star::beans::PropertyValue> pValue=xstyleLoader->getStyleLoaderOptions(); + Sequence<css::beans::PropertyValue> pValue=xstyleLoader->getStyleLoaderOptions(); //Load the Styles from the Template URL Supplied in the TypeDetection file if(!comphelper::isFileUrl(msTemplateName)) @@ -184,7 +184,7 @@ bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star::be return true; } -bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) +bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< css::beans::PropertyValue >& aDescriptor ) throw (RuntimeException) { @@ -202,7 +202,7 @@ bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< ::com::sun::star::be xStatusIndicator->start(OUString( "Saving :" ),nProgressRange); // Set up converter bridge. - Reference< com::sun::star::xml::XExportFilter > xConverter(mxContext->getServiceManager()->createInstanceWithContext( udConvertClass, mxContext ), UNO_QUERY); + Reference< css::xml::XExportFilter > xConverter(mxContext->getServiceManager()->createInstanceWithContext( udConvertClass, mxContext ), UNO_QUERY); if(! xConverter.is()){ OSL_FAIL( "xml export sub service missing" ); return false; @@ -301,7 +301,7 @@ bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< ::com::sun::star::be return true; } -sal_Bool SAL_CALL XmlFilterAdaptor::filter( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) +sal_Bool SAL_CALL XmlFilterAdaptor::filter( const Sequence< css::beans::PropertyValue >& aDescriptor ) throw (RuntimeException, std::exception) { return meType == FILTER_EXPORT ? exportImpl ( aDescriptor ) : importImpl ( aDescriptor ); @@ -311,16 +311,16 @@ void SAL_CALL XmlFilterAdaptor::cancel( ) { } // XExporter -void SAL_CALL XmlFilterAdaptor::setSourceDocument( const Reference< ::com::sun::star::lang::XComponent >& xDoc ) - throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException, std::exception) +void SAL_CALL XmlFilterAdaptor::setSourceDocument( const Reference< css::lang::XComponent >& xDoc ) + throw (css::lang::IllegalArgumentException, RuntimeException, std::exception) { meType = FILTER_EXPORT; mxDoc = xDoc; } // XImporter -void SAL_CALL XmlFilterAdaptor::setTargetDocument( const Reference< ::com::sun::star::lang::XComponent >& xDoc ) - throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException, std::exception) +void SAL_CALL XmlFilterAdaptor::setTargetDocument( const Reference< css::lang::XComponent >& xDoc ) + throw (css::lang::IllegalArgumentException, RuntimeException, std::exception) { meType = FILTER_IMPORT; mxDoc = xDoc; diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx index f295afe92a89..67cabf5e46a0 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx @@ -44,39 +44,34 @@ enum FilterType class XmlFilterAdaptor : public cppu::WeakImplHelper < - com::sun::star::document::XFilter, - com::sun::star::document::XExporter, - com::sun::star::document::XImporter, - com::sun::star::lang::XInitialization, - com::sun::star::lang::XServiceInfo + css::document::XFilter, + css::document::XExporter, + css::document::XImporter, + css::lang::XInitialization, + css::lang::XServiceInfo > { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext; - - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mxDoc; - - OUString msFilterName; - - ::com::sun::star::uno::Sequence< OUString > msUserData; - - OUString msTemplateName; - + css::uno::Reference< css::uno::XComponentContext > mxContext; + css::uno::Reference< css::lang::XComponent > mxDoc; + OUString msFilterName; + css::uno::Sequence< OUString > msUserData; + OUString msTemplateName; FilterType meType; - bool SAL_CALL exportImpl( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) - throw (::com::sun::star::uno::RuntimeException); + bool SAL_CALL exportImpl( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) + throw (css::uno::RuntimeException); - bool SAL_CALL importImpl( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) - throw (::com::sun::star::uno::RuntimeException); + bool SAL_CALL importImpl( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) + throw (css::uno::RuntimeException); public: - XmlFilterAdaptor( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rxContext) + XmlFilterAdaptor( const css::uno::Reference< css::uno::XComponentContext > & rxContext) : mxContext(rxContext) , meType(FILTER_IMPORT) { @@ -88,34 +83,34 @@ public: // XFilter - virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL cancel( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XExporter - virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XImporter - virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) + virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -123,40 +118,40 @@ public: virtual OUString SAL_CALL getImplementationName( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; OUString XmlFilterAdaptor_getImplementationName() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( css::uno::RuntimeException ); bool SAL_CALL XmlFilterAdaptor_supportsService( const OUString& ServiceName ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( css::uno::RuntimeException ); -::com::sun::star::uno::Sequence< OUString > SAL_CALL XmlFilterAdaptor_getSupportedServiceNames( ) - throw ( ::com::sun::star::uno::RuntimeException ); +css::uno::Sequence< OUString > SAL_CALL XmlFilterAdaptor_getSupportedServiceNames( ) + throw ( css::uno::RuntimeException ); -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > +css::uno::Reference< css::uno::XInterface > -SAL_CALL XmlFilterAdaptor_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr) +SAL_CALL XmlFilterAdaptor_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) - throw ( ::com::sun::star::uno::Exception ); + throw ( css::uno::Exception ); diff --git a/filter/source/xmlfilterdetect/filterdetect.cxx b/filter/source/xmlfilterdetect/filterdetect.cxx index ea86801f36de..81d639bd6886 100644 --- a/filter/source/xmlfilterdetect/filterdetect.cxx +++ b/filter/source/xmlfilterdetect/filterdetect.cxx @@ -51,13 +51,13 @@ OUString supportedByType( const OUString& clipBoardFormat, const OUString& resu } -OUString SAL_CALL FilterDetect::detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& aArguments ) throw( com::sun::star::uno::RuntimeException, std::exception ) +OUString SAL_CALL FilterDetect::detect( css::uno::Sequence< css::beans::PropertyValue >& aArguments ) throw( css::uno::RuntimeException, std::exception ) { OUString sTypeName; OUString sUrl; Sequence<PropertyValue > lProps ; - com::sun::star::uno::Reference< com::sun::star::io::XInputStream > xInStream; + css::uno::Reference< css::io::XInputStream > xInStream; const PropertyValue * pValue = aArguments.getConstArray(); sal_Int32 nLength; OUString resultString; @@ -84,7 +84,7 @@ OUString SAL_CALL FilterDetect::detect( com::sun::star::uno::Sequence< com::sun: if (!xInStream.is()) { ::ucbhelper::Content aContent( - sUrl, Reference< com::sun::star::ucb::XCommandEnvironment >(), + sUrl, Reference< css::ucb::XCommandEnvironment >(), mxCtx); xInStream = aContent.openStream(); if (!xInStream.is()) diff --git a/filter/source/xsltdialog/typedetectionexport.hxx b/filter/source/xsltdialog/typedetectionexport.hxx index 2f5032e2f512..a77af76c5555 100644 --- a/filter/source/xsltdialog/typedetectionexport.hxx +++ b/filter/source/xsltdialog/typedetectionexport.hxx @@ -28,15 +28,15 @@ class TypeDetectionExporter { public: - TypeDetectionExporter( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& mxContext ); + TypeDetectionExporter( css::uno::Reference< css::uno::XComponentContext >& mxContext ); - void doExport(com::sun::star::uno::Reference < com::sun::star::io::XOutputStream > xOS, const XMLFilterVector& rFilters ); + void doExport(css::uno::Reference < css::io::XOutputStream > xOS, const XMLFilterVector& rFilters ); private: - static void addProperty( com::sun::star::uno::Reference< com::sun::star::xml::sax::XWriter > xWriter, const OUString& rName, const OUString& rValue ); - static void addLocaleProperty( com::sun::star::uno::Reference< com::sun::star::xml::sax::XWriter > xWriter, const OUString& rName, const OUString& rValue ); + static void addProperty( css::uno::Reference< css::xml::sax::XWriter > xWriter, const OUString& rName, const OUString& rValue ); + static void addLocaleProperty( css::uno::Reference< css::xml::sax::XWriter > xWriter, const OUString& rName, const OUString& rValue ); - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext; + css::uno::Reference< css::uno::XComponentContext > mxContext; }; #endif diff --git a/filter/source/xsltdialog/typedetectionimport.hxx b/filter/source/xsltdialog/typedetectionimport.hxx index 10a53e2ff4b0..f0ddd7584563 100644 --- a/filter/source/xsltdialog/typedetectionimport.hxx +++ b/filter/source/xsltdialog/typedetectionimport.hxx @@ -58,30 +58,30 @@ struct Node typedef std::vector< Node* > NodeVector; -class TypeDetectionImporter : public cppu::WeakImplHelper < com::sun::star::xml::sax::XDocumentHandler > +class TypeDetectionImporter : public cppu::WeakImplHelper < css::xml::sax::XDocumentHandler > { public: TypeDetectionImporter(); virtual ~TypeDetectionImporter(); - static void doImport( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, com::sun::star::uno::Reference < com::sun::star::io::XInputStream > xOS, XMLFilterVector& rFilters ); + static void doImport( const css::uno::Reference< css::uno::XComponentContext >& rxContext, css::uno::Reference < css::io::XInputStream > xOS, XMLFilterVector& rFilters ); virtual void SAL_CALL startDocument( ) - throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL endDocument( ) - throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL startElement( const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs ) - throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL startElement( const OUString& aName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs ) + throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL endElement( const OUString& aName ) - throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL characters( const OUString& aChars ) - throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) - throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) - throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator ) - throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) + throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: void fillFilterVector( XMLFilterVector& rFilters ); diff --git a/filter/source/xsltdialog/xmlfiltercommon.hxx b/filter/source/xsltdialog/xmlfiltercommon.hxx index 9db846a8b6e2..e6e01c7bc7d4 100644 --- a/filter/source/xsltdialog/xmlfiltercommon.hxx +++ b/filter/source/xsltdialog/xmlfiltercommon.hxx @@ -33,7 +33,7 @@ extern OUString string_encode( const OUString & rText ); extern OUString string_decode( const OUString & rText ); -bool copyStreams( ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > xIS, ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > xOS ); +bool copyStreams( css::uno::Reference< css::io::XInputStream > xIS, css::uno::Reference< css::io::XOutputStream > xOS ); bool createDirectory( OUString& rURL ); @@ -67,7 +67,7 @@ public: filter_info_impl( const filter_info_impl& rInfo ); bool operator==( const filter_info_impl& ) const; - com::sun::star::uno::Sequence< OUString > getFilterUserData() const; + css::uno::Sequence< OUString > getFilterUserData() const; }; diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx index 5e403c302b87..52da685dd82e 100644 --- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx +++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx @@ -62,7 +62,7 @@ protected: class XMLFilterDialogComponent : public XMLFilterDialogComponentBase, public OComponentHelper, - public ::com::sun::star::ui::dialogs::XExecutableDialog, + public css::ui::dialogs::XExecutableDialog, public XServiceInfo, public XInitialization, public XTerminateListener @@ -83,7 +83,7 @@ protected: virtual Sequence< Type > SAL_CALL getTypes() throw (RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(RuntimeException, std::exception) SAL_OVERRIDE; virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; @@ -104,10 +104,10 @@ protected: virtual void SAL_CALL disposing() SAL_OVERRIDE; private: - com::sun::star::uno::Reference<com::sun::star::awt::XWindow> mxParent; /// parent window - com::sun::star::uno::Reference< XComponentContext > mxContext; + css::uno::Reference<css::awt::XWindow> mxParent; /// parent window + css::uno::Reference< XComponentContext > mxContext; - VclPtr<XMLFilterSettingsDialog> mpDialog; + VclPtr<XMLFilterSettingsDialog> mpDialog; }; @@ -122,7 +122,7 @@ ResMgr* getXSLTDialogResMgr() return pXSLTResMgr; } -XMLFilterDialogComponent::XMLFilterDialogComponent( const com::sun::star::uno::Reference< XComponentContext >& rxContext ) : +XMLFilterDialogComponent::XMLFilterDialogComponent( const css::uno::Reference< XComponentContext >& rxContext ) : OComponentHelper( maMutex ), mxContext( rxContext ), mpDialog( NULL ) @@ -150,9 +150,9 @@ Any SAL_CALL XMLFilterDialogComponent::queryInterface( const Type& aType ) throw Any SAL_CALL XMLFilterDialogComponent::queryAggregation( Type const & rType ) throw (RuntimeException, std::exception) { - if (rType == cppu::UnoType<com::sun::star::ui::dialogs::XExecutableDialog>::get()) + if (rType == cppu::UnoType<css::ui::dialogs::XExecutableDialog>::get()) { - void * p = static_cast< ::com::sun::star::ui::dialogs::XExecutableDialog * >( this ); + void * p = static_cast< css::ui::dialogs::XExecutableDialog * >( this ); return Any( &p, rType ); } else if (rType == cppu::UnoType<XServiceInfo>::get()) @@ -206,7 +206,7 @@ Reference< XInterface > SAL_CALL XMLFilterDialogComponent_createInstance( const return static_cast<OWeakObject*>(new XMLFilterDialogComponent( comphelper::getComponentContext(rSMgr) )); } -OUString SAL_CALL XMLFilterDialogComponent::getImplementationName() throw(com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL XMLFilterDialogComponent::getImplementationName() throw(css::uno::RuntimeException, std::exception) { return XMLFilterDialogComponent_getImplementationName(); } @@ -236,7 +236,7 @@ namespace cppu::UnoType<XServiceInfo>::get(), cppu::UnoType<XInitialization>::get(), cppu::UnoType<XTerminateListener>::get(), - cppu::UnoType<com::sun::star::ui::dialogs::XExecutableDialog>::get()) + cppu::UnoType<css::ui::dialogs::XExecutableDialog>::get()) { } OTypeCollection& getTypeCollection() { return m_aTypes; } @@ -250,7 +250,7 @@ Sequence< Type > XMLFilterDialogComponent::getTypes() throw (RuntimeException, s return theDialogComponentTypes::get().getTypeCollection().getTypes(); } -Sequence< OUString > SAL_CALL XMLFilterDialogComponent::getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException, std::exception) +Sequence< OUString > SAL_CALL XMLFilterDialogComponent::getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) { return XMLFilterDialogComponent_getSupportedServiceNames(); } diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx index ce6ddbac8ecc..fcd24fb43713 100644 --- a/filter/source/xsltdialog/xmlfilterjar.cxx +++ b/filter/source/xsltdialog/xmlfilterjar.cxx @@ -185,7 +185,7 @@ bool XMLFilterJarHelper::savePackage( const OUString& rPackageURL, const XMLFilt if( !pFilter->maImportXSLT.isEmpty() ) addFile( xFilterRoot, xFactory, pFilter->maImportXSLT ); } - catch(const com::sun::star::container::ElementExistException&) + catch(const css::container::ElementExistException&) { // in case of same named import / export XSLT the latter // is ignored diff --git a/filter/source/xsltdialog/xmlfilterjar.hxx b/filter/source/xsltdialog/xmlfilterjar.hxx index 49731b8a2ae1..eed841eaf684 100644 --- a/filter/source/xsltdialog/xmlfilterjar.hxx +++ b/filter/source/xsltdialog/xmlfilterjar.hxx @@ -32,18 +32,18 @@ typedef std::vector< filter_info_impl* > XMLFilterVector; class XMLFilterJarHelper { public: - XMLFilterJarHelper( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext ); + XMLFilterJarHelper( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); bool savePackage( const OUString& rPackageURL, const XMLFilterVector& rFilters ); void openPackage( const OUString& rPackageURL, XMLFilterVector& rFilters ); private: - void addFile( com::sun::star::uno::Reference< com::sun::star::uno::XInterface > xRootFolder, com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > xFactory, const OUString& rSourceFile ) throw( com::sun::star::uno::Exception ); + void addFile( css::uno::Reference< css::uno::XInterface > xRootFolder, css::uno::Reference< css::lang::XSingleServiceFactory > xFactory, const OUString& rSourceFile ) throw( css::uno::Exception ); - bool copyFile( com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess > xIfc, OUString& rURL, const OUString& rTargetURL ); - bool copyFiles( com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess > xIfc, filter_info_impl* pFilter ); + bool copyFile( css::uno::Reference< css::container::XHierarchicalNameAccess > xIfc, OUString& rURL, const OUString& rTargetURL ); + bool copyFiles( css::uno::Reference< css::container::XHierarchicalNameAccess > xIfc, filter_info_impl* pFilter ); - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext; + css::uno::Reference< css::uno::XComponentContext > mxContext; OUString sVndSunStarPackage; OUString sXSLTPath; diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index 1d6858ef0a0d..f514ab47216c 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -877,7 +877,7 @@ void XMLFilterSettingsDialog::onSave() // Open Fileopen-Dialog ::sfx2::FileDialogHelper aDlg( - com::sun::star::ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION, + css::ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION, 0 ); OUString aExtensions( "*.jar" ); @@ -920,7 +920,7 @@ void XMLFilterSettingsDialog::onOpen() // Open Fileopen-Dialog ::sfx2::FileDialogHelper aDlg( - com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 ); + css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 ); OUString aExtensions( "*.jar" ); OUString aFilterName(RESIDSTR(STR_FILTER_PACKAGE)); @@ -1171,7 +1171,7 @@ void XMLFilterSettingsDialog::initFilterList() } } } - catch( const ::com::sun::star::container::NoSuchElementException& ) + catch( const css::container::NoSuchElementException& ) { OSL_FAIL( "Type not found, user error?" ); // TODO: error? } diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx index 99e4cd8667c7..bb8335025954 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx @@ -86,7 +86,7 @@ class XMLFilterSettingsDialog : public ModelessDialog { public: XMLFilterSettingsDialog(vcl::Window* pParent, - const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, Dialog::InitFlag eFlag = Dialog::InitFlag::Default); virtual ~XMLFilterSettingsDialog(); virtual void dispose() SAL_OVERRIDE; @@ -123,10 +123,10 @@ private: private: - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext; - com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > mxFilterContainer; - com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > mxTypeDetection; - com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > mxExtendedTypeDetection; + css::uno::Reference< css::uno::XComponentContext > mxContext; + css::uno::Reference< css::container::XNameContainer > mxFilterContainer; + css::uno::Reference< css::container::XNameContainer > mxTypeDetection; + css::uno::Reference< css::container::XNameContainer > mxExtendedTypeDetection; std::vector< filter_info_impl* > maFilterVector; diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.hxx b/filter/source/xsltdialog/xmlfiltertabdialog.hxx index 1ef0a6a49d9d..a853a1472e96 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltertabdialog.hxx @@ -34,7 +34,7 @@ class XMLFilterTabPageXSLT; class XMLFilterTabDialog: public TabDialog { public: - XMLFilterTabDialog(vcl::Window *pParent, ResMgr& rResMgr, const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, const filter_info_impl* pInfo); + XMLFilterTabDialog(vcl::Window *pParent, ResMgr& rResMgr, const css::uno::Reference< css::uno::XComponentContext >& rxContext, const filter_info_impl* pInfo); virtual ~XMLFilterTabDialog(); virtual void dispose() SAL_OVERRIDE; @@ -43,7 +43,7 @@ public: filter_info_impl* getNewFilterInfo() const { return mpNewInfo;} private: - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext; + css::uno::Reference< css::uno::XComponentContext > mxContext; DECL_STATIC_LINK_TYPED( XMLFilterTabDialog, ActivatePageHdl, TabControl*, void ); DECL_LINK_TYPED(OkHdl, Button*, void); diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx index c05c7ae050b4..8f844c8f1e38 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx +++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx @@ -172,7 +172,7 @@ IMPL_LINK_TYPED ( XMLFilterTabPageXSLT, ClickBrowseHdl_Impl, Button *, pButton, // Open Fileopen-Dialog ::sfx2::FileDialogHelper aDlg( - com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 ); + css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 ); aDlg.SetDisplayDirectory( GetURL( pURLBox ) ); diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx index 6ad0844b935d..c619fe0c73b3 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx @@ -68,16 +68,16 @@ using namespace com::sun::star::xml; using namespace com::sun::star::xml::sax; -class GlobalEventListenerImpl : public ::cppu::WeakImplHelper< com::sun::star::document::XDocumentEventListener > +class GlobalEventListenerImpl : public ::cppu::WeakImplHelper< css::document::XDocumentEventListener > { public: GlobalEventListenerImpl( XMLFilterTestDialog* pDialog ); // XDocumentEventListener - virtual void SAL_CALL documentEventOccured( const com::sun::star::document::DocumentEvent& Event ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL documentEventOccured( const css::document::DocumentEvent& Event ) throw (RuntimeException, std::exception) SAL_OVERRIDE; // lang::XEventListener - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (RuntimeException, std::exception) SAL_OVERRIDE; private: VclPtr<XMLFilterTestDialog> mpDialog; }; @@ -87,7 +87,7 @@ GlobalEventListenerImpl::GlobalEventListenerImpl( XMLFilterTestDialog* pDialog ) { } -void SAL_CALL GlobalEventListenerImpl::documentEventOccured( const com::sun::star::document::DocumentEvent& Event ) throw (RuntimeException, std::exception) +void SAL_CALL GlobalEventListenerImpl::documentEventOccured( const css::document::DocumentEvent& Event ) throw (RuntimeException, std::exception) { ::SolarMutexGuard aGuard; if( Event.EventName == "OnFocus" || Event.EventName == "OnUnload" ) @@ -97,7 +97,7 @@ void SAL_CALL GlobalEventListenerImpl::documentEventOccured( const com::sun::sta } } -void SAL_CALL GlobalEventListenerImpl::disposing( const com::sun::star::lang::EventObject& /* Source */ ) throw (RuntimeException, std::exception) +void SAL_CALL GlobalEventListenerImpl::disposing( const css::lang::EventObject& /* Source */ ) throw (RuntimeException, std::exception) { } @@ -312,7 +312,7 @@ void XMLFilterTestDialog::onExportBrowse() { // Open Fileopen-Dialog ::sfx2::FileDialogHelper aDlg( - com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, + css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 ); Reference< XNameAccess > xFilterContainer( mxContext->getServiceManager()->createInstanceWithContext( "com.sun.star.document.FilterFactory", mxContext ), UNO_QUERY ); @@ -547,7 +547,7 @@ void XMLFilterTestDialog::onImportBrowse() { // Open Fileopen-Dialog ::sfx2::FileDialogHelper aDlg( - com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 ); + css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 ); OUString aFilterName( m_pFilterInfo->maInterfaceName ); OUString aExtensions; diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.hxx b/filter/source/xsltdialog/xmlfiltertestdialog.hxx index 56f99483175f..3a8b119d6753 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.hxx @@ -35,13 +35,13 @@ class XMLFilterTestDialog : public ModalDialog { public: XMLFilterTestDialog(vcl::Window* pParent, - const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext); + const css::uno::Reference< css::uno::XComponentContext >& rxContext); virtual ~XMLFilterTestDialog(); virtual void dispose() SAL_OVERRIDE; void test( const filter_info_impl& rFilterInfo ); - void updateCurrentDocumentButtonState( com::sun::star::uno::Reference< com::sun::star::lang::XComponent > * pRef = NULL ); + void updateCurrentDocumentButtonState( css::uno::Reference< css::lang::XComponent > * pRef = NULL ); private: DECL_LINK_TYPED(ClickHdl_Impl, Button *, void ); @@ -52,16 +52,16 @@ private: void onImportRecentDocument(); void initDialog(); - com::sun::star::uno::Reference< com::sun::star::lang::XComponent > getFrontMostDocument( const OUString& rServiceName ); + css::uno::Reference< css::lang::XComponent > getFrontMostDocument( const OUString& rServiceName ); void import( const OUString& rURL ); static void displayXMLFile( const OUString& rURL ); - void doExport( com::sun::star::uno::Reference< com::sun::star::lang::XComponent > xComp ); + void doExport( css::uno::Reference< css::lang::XComponent > xComp ); private: - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext; - com::sun::star::uno::Reference< com::sun::star::document::XDocumentEventBroadcaster > mxGlobalBroadcaster; - com::sun::star::uno::Reference< com::sun::star::document::XDocumentEventListener > mxGlobalEventListener; - com::sun::star::uno::WeakReference< com::sun::star::lang::XComponent > mxLastFocusModel; + css::uno::Reference< css::uno::XComponentContext > mxContext; + css::uno::Reference< css::document::XDocumentEventBroadcaster > mxGlobalBroadcaster; + css::uno::Reference< css::document::XDocumentEventListener > mxGlobalEventListener; + css::uno::WeakReference< css::lang::XComponent > mxLastFocusModel; OUString m_sImportRecentFile; OUString m_sExportRecentFile; diff --git a/filter/source/xsltfilter/LibXSLTTransformer.hxx b/filter/source/xsltfilter/LibXSLTTransformer.hxx index 89822344d7c5..f998153075b8 100644 --- a/filter/source/xsltfilter/LibXSLTTransformer.hxx +++ b/filter/source/xsltfilter/LibXSLTTransformer.hxx @@ -63,7 +63,7 @@ namespace XSLT * * See Reader below. */ - class LibXSLTTransformer : public WeakImplHelper<com::sun::star::xml::xslt::XXSLTTransformer> + class LibXSLTTransformer : public WeakImplHelper<css::xml::xslt::XXSLTTransformer> { private: static const char* const PARAM_SOURCE_URL; @@ -73,13 +73,13 @@ namespace XSLT static const char* const PARAM_DOCTYPE_PUBLIC; // the UNO ServiceFactory - com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> m_xContext; + css::uno::Reference<css::uno::XComponentContext> m_xContext; - com::sun::star::uno::Reference<XInputStream> m_rInputStream; + css::uno::Reference<XInputStream> m_rInputStream; - com::sun::star::uno::Reference<XOutputStream> m_rOutputStream; + css::uno::Reference<XOutputStream> m_rOutputStream; - typedef ::std::list<com::sun::star::uno::Reference<XStreamListener> > ListenerList; + typedef ::std::list<css::uno::Reference<XStreamListener> > ListenerList; ListenerList m_listeners; @@ -100,26 +100,26 @@ namespace XSLT public: // ctor... - LibXSLTTransformer(const com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> &r); + LibXSLTTransformer(const css::uno::Reference<css::uno::XComponentContext> &r); // XActiveDataSink virtual void SAL_CALL - setInputStream(const com::sun::star::uno::Reference<XInputStream>& inputStream) + setInputStream(const css::uno::Reference<XInputStream>& inputStream) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual com::sun::star::uno::Reference<XInputStream> SAL_CALL + virtual css::uno::Reference<XInputStream> SAL_CALL getInputStream() throw (RuntimeException, std::exception) SAL_OVERRIDE; // XActiveDataSource virtual void SAL_CALL - setOutputStream(const com::sun::star::uno::Reference<XOutputStream>& outputStream) + setOutputStream(const css::uno::Reference<XOutputStream>& outputStream) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual com::sun::star::uno::Reference<XOutputStream> SAL_CALL + virtual css::uno::Reference<XOutputStream> SAL_CALL getOutputStream() throw (RuntimeException, std::exception) SAL_OVERRIDE; // XActiveDataControl virtual void SAL_CALL - addListener(const com::sun::star::uno::Reference<XStreamListener>& listener) + addListener(const css::uno::Reference<XStreamListener>& listener) throw (RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL - removeListener(const com::sun::star::uno::Reference<XStreamListener>& listener) + removeListener(const css::uno::Reference<XStreamListener>& listener) throw (RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL start() throw (RuntimeException, std::exception) SAL_OVERRIDE; @@ -140,7 +140,7 @@ namespace XSLT ::std::map<const char*, OString> SAL_CALL getParameters() { return m_parameters; } - com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> SAL_CALL + css::uno::Reference<css::uno::XComponentContext> SAL_CALL getComponentContext() { return m_xContext; } diff --git a/filter/source/xsltfilter/OleHandler.hxx b/filter/source/xsltfilter/OleHandler.hxx index 8a25db85bdfa..269bf76cecab 100644 --- a/filter/source/xsltfilter/OleHandler.hxx +++ b/filter/source/xsltfilter/OleHandler.hxx @@ -58,28 +58,22 @@ namespace XSLT class OleHandler { public: - OleHandler(const com::sun::star::uno::Reference<XComponentContext>& rxContext){ + OleHandler(const css::uno::Reference<XComponentContext>& rxContext){ m_xContext = rxContext; } - void SAL_CALL - insertByName(const OUString& streamName, const OString& content); - const OString SAL_CALL - getByName(const OUString& streamName); + void SAL_CALL insertByName(const OUString& streamName, const OString& content); + const OString SAL_CALL getByName(const OUString& streamName); private: - com::sun::star::uno::Reference<XComponentContext> m_xContext; - com::sun::star::uno::Reference<XNameContainer> m_storage; - com::sun::star::uno::Reference<XStream> m_rootStream; - void SAL_CALL - ensureCreateRootStorage(); - OString SAL_CALL - encodeSubStorage(const OUString& streamName); - void SAL_CALL - insertSubStorage(const OUString& streamName, const OString& content); - void SAL_CALL - initRootStorageFromBase64(const OString& content); - com::sun::star::uno::Reference<XStream> SAL_CALL - createTempFile(); + css::uno::Reference<XComponentContext> m_xContext; + css::uno::Reference<XNameContainer> m_storage; + css::uno::Reference<XStream> m_rootStream; + + void SAL_CALL ensureCreateRootStorage(); + OString SAL_CALL encodeSubStorage(const OUString& streamName); + void SAL_CALL insertSubStorage(const OUString& streamName, const OString& content); + void SAL_CALL initRootStorageFromBase64(const OString& content); + css::uno::Reference<XStream> SAL_CALL createTempFile(); }; } diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index c9ba40a314ba..b2eca68443ff 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -365,11 +365,11 @@ namespace XSLT while (osl::Condition::result_timeout == result) { if (xInterActionHandler.is()) { Sequence<Any> excArgs(0); - ::com::sun::star::ucb::InteractiveAugmentedIOException exc( + css::ucb::InteractiveAugmentedIOException exc( OUString("Timeout!"), static_cast< OWeakObject * >( this ), InteractionClassification_ERROR, - ::com::sun::star::ucb::IOErrorCode_GENERAL, + css::ucb::IOErrorCode_GENERAL, excArgs); Any r; r <<= exc; |