diff options
author | Noel Grandin <noel@peralex.com> | 2015-10-26 08:52:21 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-10-28 06:31:38 +0000 |
commit | 10e4396dc7c96061750208c32f29c372737f63d2 (patch) | |
tree | b907d092b111ebd78e8cf9f679d8ce83aa667382 /sax/source | |
parent | d95a27f944c8a28d0368f248028ddf395fe1c57e (diff) |
com::sun::star->css in sal,sax
Change-Id: I24e202b1f8071fe918e4e164b5fa1c08a561cb24
Reviewed-on: https://gerrit.libreoffice.org/19626
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sax/source')
-rw-r--r-- | sax/source/expatwrap/attrlistimpl.hxx | 20 | ||||
-rw-r--r-- | sax/source/expatwrap/sax_expat.cxx | 10 | ||||
-rw-r--r-- | sax/source/fastparser/fastparser.cxx | 36 | ||||
-rw-r--r-- | sax/source/tools/converter.cxx | 40 | ||||
-rw-r--r-- | sax/source/tools/fastattribs.cxx | 2 | ||||
-rw-r--r-- | sax/source/tools/fastserializer.cxx | 2 | ||||
-rw-r--r-- | sax/source/tools/fastserializer.hxx | 10 | ||||
-rw-r--r-- | sax/source/tools/fshelper.cxx | 2 |
8 files changed, 61 insertions, 61 deletions
diff --git a/sax/source/expatwrap/attrlistimpl.hxx b/sax/source/expatwrap/attrlistimpl.hxx index 6a476385a81b..f5d283f92ccc 100644 --- a/sax/source/expatwrap/attrlistimpl.hxx +++ b/sax/source/expatwrap/attrlistimpl.hxx @@ -34,8 +34,8 @@ struct AttributeList_impl; //FIXME class AttributeList : public ::cppu::WeakImplHelper< - ::com::sun::star::xml::sax::XAttributeList, - ::com::sun::star::util::XCloneable > + css::xml::sax::XAttributeList, + css::util::XCloneable > { public: AttributeList(); @@ -48,21 +48,21 @@ public: public: // XAttributeList virtual sal_Int16 SAL_CALL getLength() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getTypeByName(const OUString& aName) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getValueByName(const OUString& aName) - throw( ::com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::uno::RuntimeException, std::exception) override; // XCloneable - virtual ::com::sun::star::uno::Reference< XCloneable > SAL_CALL - createClone() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< XCloneable > SAL_CALL + createClone() throw(css::uno::RuntimeException, std::exception) override; private: struct AttributeList_impl *m_pImpl; diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx index 5ca04d8f8e71..42c610dda54e 100644 --- a/sax/source/expatwrap/sax_expat.cxx +++ b/sax/source/expatwrap/sax_expat.cxx @@ -80,12 +80,12 @@ namespace { pThis->rDocumentLocator->getColumnNumber()\ ) );\ }\ - catch( const com::sun::star::uno::RuntimeException &e ) {\ + catch( const css::uno::RuntimeException &e ) {\ pThis->bExceptionWasThrown = true; \ pThis->bRTExceptionWasThrown = true; \ pImpl->rtexception = e; \ }\ - catch( const com::sun::star::uno::Exception &e ) {\ + catch( const css::uno::Exception &e ) {\ pThis->bExceptionWasThrown = true; \ pThis->bRTExceptionWasThrown = true; \ pImpl->rtexception = WrappedTargetRuntimeException("Non-runtime UNO exception caught during parse", e.Context, makeAny(e)); \ @@ -107,7 +107,7 @@ public: SaxExpatParser(); virtual ~SaxExpatParser(); - // ::com::sun::star::lang::XInitialization: + // css::lang::XInitialization: virtual void SAL_CALL initialize(css::uno::Sequence<css::uno::Any> const& rArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception) override; @@ -317,7 +317,7 @@ extern "C" // LocatorImpl class LocatorImpl : - public WeakImplHelper< XLocator, com::sun::star::io::XSeekable > + public WeakImplHelper< XLocator, css::io::XSeekable > // should use a different interface for stream positions! { public: @@ -386,7 +386,7 @@ SaxExpatParser::~SaxExpatParser() delete m_pImpl; } -// ::com::sun::star::lang::XInitialization: +// css::lang::XInitialization: void SAL_CALL SaxExpatParser::initialize(css::uno::Sequence< css::uno::Any > const& rArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception) diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx index 15edc08ee3f7..824225ea79b4 100644 --- a/sax/source/fastparser/fastparser.cxx +++ b/sax/source/fastparser/fastparser.cxx @@ -116,12 +116,12 @@ struct SaxContext struct ParserData { - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastDocumentHandler > mxDocumentHandler; - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastTokenHandler > mxTokenHandler; - FastTokenHandlerBase *mpTokenHandler; - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XErrorHandler > mxErrorHandler; - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XEntityResolver > mxEntityResolver; - ::com::sun::star::lang::Locale maLocale; + css::uno::Reference< css::xml::sax::XFastDocumentHandler > mxDocumentHandler; + css::uno::Reference< css::xml::sax::XFastTokenHandler > mxTokenHandler; + FastTokenHandlerBase* mpTokenHandler; + css::uno::Reference< css::xml::sax::XErrorHandler > mxErrorHandler; + css::uno::Reference< css::xml::sax::XEntityResolver > mxEntityResolver; + css::lang::Locale maLocale; ParserData(); ~ParserData(); @@ -162,14 +162,14 @@ struct Entity : public ParserData // Allow to disable threading for small documents: bool mbEnableThreads; - ::com::sun::star::xml::sax::InputSource maStructSource; + css::xml::sax::InputSource maStructSource; xmlParserCtxtPtr mpParser; ::sax_expatwrap::XMLFile2UTFConverter maConverter; // Exceptions cannot be thrown through the C-XmlParser (possible // resource leaks), therefore any exception thrown by a UNO callback // must be saved somewhere until the C-XmlParser is stopped. - ::com::sun::star::uno::Any maSavedException; + css::uno::Any maSavedException; void saveException( const Any & e ); void throwException( const ::rtl::Reference< FastLocatorImpl > &xDocumentLocator, bool mbDuringParse ); @@ -204,14 +204,14 @@ public: ~FastSaxParserImpl(); // XFastParser - void parseStream( const ::com::sun::star::xml::sax::InputSource& aInputSource ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); - void setFastDocumentHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastDocumentHandler >& Handler ) throw (::com::sun::star::uno::RuntimeException); - void setTokenHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastTokenHandler >& Handler ) throw (::com::sun::star::uno::RuntimeException); - void registerNamespace( const OUString& NamespaceURL, sal_Int32 NamespaceToken ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - OUString getNamespaceURL( const OUString& rPrefix ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - void setErrorHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XErrorHandler >& Handler ) throw (::com::sun::star::uno::RuntimeException); - void setEntityResolver( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XEntityResolver >& Resolver ) throw (::com::sun::star::uno::RuntimeException); - void setLocale( const ::com::sun::star::lang::Locale& rLocale ) throw (::com::sun::star::uno::RuntimeException); + void parseStream( const css::xml::sax::InputSource& aInputSource ) throw (css::xml::sax::SAXException, css::io::IOException, css::uno::RuntimeException, std::exception); + void setFastDocumentHandler( const css::uno::Reference< css::xml::sax::XFastDocumentHandler >& Handler ) throw (css::uno::RuntimeException); + void setTokenHandler( const css::uno::Reference< css::xml::sax::XFastTokenHandler >& Handler ) throw (css::uno::RuntimeException); + void registerNamespace( const OUString& NamespaceURL, sal_Int32 NamespaceToken ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); + OUString getNamespaceURL( const OUString& rPrefix ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException); + void setErrorHandler( const css::uno::Reference< css::xml::sax::XErrorHandler >& Handler ) throw (css::uno::RuntimeException); + void setEntityResolver( const css::uno::Reference< css::xml::sax::XEntityResolver >& Resolver ) throw (css::uno::RuntimeException); + void setLocale( const css::lang::Locale& rLocale ) throw (css::uno::RuntimeException); // called by the C callbacks of the expat parser void callbackStartElement( const xmlChar *localName , const xmlChar* prefix, const xmlChar* URI, @@ -241,8 +241,8 @@ private: void sendPendingCharacters(); sal_Int32 GetToken( const xmlChar* pName, sal_Int32 nameLen ); - sal_Int32 GetTokenWithPrefix( const xmlChar* pPrefix, int prefixLen, const xmlChar* pName, int nameLen ) throw (::com::sun::star::xml::sax::SAXException); - OUString GetNamespaceURL( const OString& rPrefix ) throw (::com::sun::star::xml::sax::SAXException); + sal_Int32 GetTokenWithPrefix( const xmlChar* pPrefix, int prefixLen, const xmlChar* pName, int nameLen ) throw (css::xml::sax::SAXException); + OUString GetNamespaceURL( const OString& rPrefix ) throw (css::xml::sax::SAXException); sal_Int32 GetNamespaceToken( const OUString& rNamespaceURL ); sal_Int32 GetTokenWithContextNamespace( sal_Int32 nNamespaceToken, const xmlChar* pName, int nNameLen ); void DefineNamespace( const OString& rPrefix, const OUString& namespaceURL ); diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx index ab8e43bc74ec..911da6ff79f7 100644 --- a/sax/source/tools/converter.cxx +++ b/sax/source/tools/converter.cxx @@ -1297,7 +1297,7 @@ void Converter::convertDate( static void convertTime( OUStringBuffer& i_rBuffer, - const com::sun::star::util::DateTime& i_rDateTime) + const css::util::DateTime& i_rDateTime) { if (i_rDateTime.Hours < 10) { i_rBuffer.append('0'); @@ -1326,7 +1326,7 @@ static void convertTime( static void convertTimeZone( OUStringBuffer& i_rBuffer, - const com::sun::star::util::DateTime& i_rDateTime, + const css::util::DateTime& i_rDateTime, sal_Int16 const* pTimeZoneOffset) { if (pTimeZoneOffset) @@ -1342,7 +1342,7 @@ static void convertTimeZone( /** convert util::DateTime to ISO "time" or "dateTime" string */ void Converter::convertTimeOrDateTime( OUStringBuffer& i_rBuffer, - const com::sun::star::util::DateTime& i_rDateTime, + const css::util::DateTime& i_rDateTime, sal_Int16 const* pTimeZoneOffset) { if (i_rDateTime.Year == 0 || @@ -1361,7 +1361,7 @@ void Converter::convertTimeOrDateTime( /** convert util::DateTime to ISO "date" or "dateTime" string */ void Converter::convertDateTime( OUStringBuffer& i_rBuffer, - const com::sun::star::util::DateTime& i_rDateTime, + const css::util::DateTime& i_rDateTime, sal_Int16 const*const pTimeZoneOffset, bool i_bAddTimeIf0AM ) { @@ -2530,7 +2530,7 @@ sal_Int16 Converter::GetUnitFromString(const OUString& rString, sal_Int16 nDefau bool Converter::convertAny(OUStringBuffer& rsValue, OUStringBuffer& rsType , - const com::sun::star::uno::Any& rValue) + const css::uno::Any& rValue) { bool bConverted = false; @@ -2539,11 +2539,11 @@ bool Converter::convertAny(OUStringBuffer& rsValue, switch (rValue.getValueTypeClass()) { - case com::sun::star::uno::TypeClass_BYTE : - case com::sun::star::uno::TypeClass_SHORT : - case com::sun::star::uno::TypeClass_UNSIGNED_SHORT : - case com::sun::star::uno::TypeClass_LONG : - case com::sun::star::uno::TypeClass_UNSIGNED_LONG : + case css::uno::TypeClass_BYTE : + case css::uno::TypeClass_SHORT : + case css::uno::TypeClass_UNSIGNED_SHORT : + case css::uno::TypeClass_LONG : + case css::uno::TypeClass_UNSIGNED_LONG : { sal_Int32 nTempValue = 0; if (rValue >>= nTempValue) @@ -2555,7 +2555,7 @@ bool Converter::convertAny(OUStringBuffer& rsValue, } break; - case com::sun::star::uno::TypeClass_BOOLEAN : + case css::uno::TypeClass_BOOLEAN : { bool bTempValue = false; if (rValue >>= bTempValue) @@ -2567,8 +2567,8 @@ bool Converter::convertAny(OUStringBuffer& rsValue, } break; - case com::sun::star::uno::TypeClass_FLOAT : - case com::sun::star::uno::TypeClass_DOUBLE : + case css::uno::TypeClass_FLOAT : + case css::uno::TypeClass_DOUBLE : { double fTempValue = 0.0; if (rValue >>= fTempValue) @@ -2580,7 +2580,7 @@ bool Converter::convertAny(OUStringBuffer& rsValue, } break; - case com::sun::star::uno::TypeClass_STRING : + case css::uno::TypeClass_STRING : { OUString sTempValue; if (rValue >>= sTempValue) @@ -2592,17 +2592,17 @@ bool Converter::convertAny(OUStringBuffer& rsValue, } break; - case com::sun::star::uno::TypeClass_STRUCT : + case css::uno::TypeClass_STRUCT : { - com::sun::star::util::Date aDate ; - com::sun::star::util::Time aTime ; - com::sun::star::util::DateTime aDateTime; + css::util::Date aDate ; + css::util::Time aTime ; + css::util::DateTime aDateTime; if (rValue >>= aDate) { rsType.append("date"); bConverted = true; - com::sun::star::util::DateTime aTempValue; + css::util::DateTime aTempValue; aTempValue.Day = aDate.Day; aTempValue.Month = aDate.Month; aTempValue.Year = aDate.Year; @@ -2617,7 +2617,7 @@ bool Converter::convertAny(OUStringBuffer& rsValue, { rsType.append("time"); bConverted = true; - com::sun::star::util::Duration aTempValue; + css::util::Duration aTempValue; aTempValue.Days = 0; aTempValue.Months = 0; aTempValue.Years = 0; diff --git a/sax/source/tools/fastattribs.cxx b/sax/source/tools/fastattribs.cxx index cb97acccf21c..0d1aa9ddc96b 100644 --- a/sax/source/tools/fastattribs.cxx +++ b/sax/source/tools/fastattribs.cxx @@ -52,7 +52,7 @@ void UnknownAttribute::FillAttribute( Attribute* pAttrib ) const } } -FastAttributeList::FastAttributeList( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastTokenHandler >& xTokenHandler, +FastAttributeList::FastAttributeList( const css::uno::Reference< css::xml::sax::XFastTokenHandler >& xTokenHandler, sax_fastparser::FastTokenHandlerBase *pTokenHandler) : mxTokenHandler( xTokenHandler ), mpTokenHandler( pTokenHandler ) diff --git a/sax/source/tools/fastserializer.cxx b/sax/source/tools/fastserializer.cxx index 0d0eb717c75f..56d2fe82b1b6 100644 --- a/sax/source/tools/fastserializer.cxx +++ b/sax/source/tools/fastserializer.cxx @@ -268,7 +268,7 @@ namespace sax_fastparser { writeBytes(sSlashAndClosingBracket, N_CHARS(sSlashAndClosingBracket)); } - ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > FastSaxSerializer::getOutputStream() + css::uno::Reference< css::io::XOutputStream > FastSaxSerializer::getOutputStream() { return maCachedOutputStream.getOutputStream(); } diff --git a/sax/source/tools/fastserializer.hxx b/sax/source/tools/fastserializer.hxx index cbcf4b2a6c34..a45da2ecae0d 100644 --- a/sax/source/tools/fastserializer.hxx +++ b/sax/source/tools/fastserializer.hxx @@ -44,14 +44,14 @@ typedef std::vector<TokenValue> TokenValueList; /// Receives notification of sax document events to write into an XOutputStream. class FastSaxSerializer { - typedef ::com::sun::star::uno::Sequence< ::sal_Int8 > Int8Sequence; - typedef ::com::sun::star::uno::Sequence< ::sal_Int32 > Int32Sequence; + typedef css::uno::Sequence< ::sal_Int8 > Int8Sequence; + typedef css::uno::Sequence< ::sal_Int32 > Int32Sequence; public: FastSaxSerializer( const css::uno::Reference< css::io::XOutputStream >& xOutputStream ); ~FastSaxSerializer(); - ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > getOutputStream(); + css::uno::Reference< css::io::XOutputStream > getOutputStream(); /// called by FSHelper to put data in for writeTokenValueList TokenValueList& getTokenValueList() { return maTokenValues; } @@ -158,7 +158,7 @@ private: * to ensure correct order of ForSort methods. */ CachedOutputStream maCachedOutputStream; - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastTokenHandler > mxFastTokenHandler; + css::uno::Reference< css::xml::sax::XFastTokenHandler > mxFastTokenHandler; class ForMerge : public ForMergeBase { @@ -241,7 +241,7 @@ private: The latter in the case that we are inside a mark(). */ - void writeBytes( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aData ); + void writeBytes( const css::uno::Sequence< ::sal_Int8 >& aData ); void writeBytes( const char* pStr, size_t nLen ); }; diff --git a/sax/source/tools/fshelper.cxx b/sax/source/tools/fshelper.cxx index 1ba11cc40811..e2150d47e12d 100644 --- a/sax/source/tools/fshelper.cxx +++ b/sax/source/tools/fshelper.cxx @@ -148,7 +148,7 @@ FastSerializerHelper* FastSerializerHelper::writeId(sal_Int32 tokenId) return this; } -::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > FastSerializerHelper::getOutputStream() +css::uno::Reference< css::io::XOutputStream > FastSerializerHelper::getOutputStream() { return mpSerializer->getOutputStream(); } |