editeng/source/misc/SvXMLAutoCorrectImport.cxx | 4 +-- editeng/source/misc/SvXMLAutoCorrectImport.hxx | 24 +++++++++---------- editeng/source/misc/SvXMLAutoCorrectTokenHandler.cxx | 6 ++-- editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx | 2 - 4 files changed, 18 insertions(+), 18 deletions(-)
New commits: commit 509b1adcef374cbf67817250547c69339dfee3d7 Author: Tor Lillqvist <t...@collabora.com> Date: Sun Sep 13 09:32:42 2015 +0300 Also get rid of :: prefix for css Change-Id: Ie767abc36047ba614b3ac39991b3290bc19859b1 diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.cxx b/editeng/source/misc/SvXMLAutoCorrectImport.cxx index d2c14a2..776b05c 100644 --- a/editeng/source/misc/SvXMLAutoCorrectImport.cxx +++ b/editeng/source/misc/SvXMLAutoCorrectImport.cxx @@ -20,8 +20,8 @@ #include <SvXMLAutoCorrectImport.hxx> #include <SvXMLAutoCorrectTokenHandler.hxx> -using namespace ::css; -using namespace ::css::xml::sax; +using namespace css; +using namespace css::xml::sax; SvXMLAutoCorrectImport::SvXMLAutoCorrectImport( const uno::Reference< uno::XComponentContext > xContext, diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.hxx b/editeng/source/misc/SvXMLAutoCorrectImport.hxx index 0965f67..25be458 100644 --- a/editeng/source/misc/SvXMLAutoCorrectImport.hxx +++ b/editeng/source/misc/SvXMLAutoCorrectImport.hxx @@ -31,7 +31,7 @@ protected: // This method is called after the namespace map has been updated, but // before a context for the current element has been pushed. virtual SvXMLImportContext *CreateFastContext( sal_Int32 Element, - const ::css::uno::Reference< ::css::xml::sax::XFastAttributeList > & xAttrList ) SAL_OVERRIDE; + const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) SAL_OVERRIDE; public: SvxAutocorrWordList *pAutocorr_List; @@ -39,10 +39,10 @@ public: css::uno::Reference < css::embed::XStorage > xStorage; SvXMLAutoCorrectImport( - const ::css::uno::Reference< ::css::uno::XComponentContext > xContext, + const css::uno::Reference< css::uno::XComponentContext > xContext, SvxAutocorrWordList *pNewAutocorr_List, SvxAutoCorrect &rNewAutoCorrect, - const ::css::uno::Reference < css::embed::XStorage >& rNewStorage); + const css::uno::Reference < css::embed::XStorage >& rNewStorage); virtual ~SvXMLAutoCorrectImport() throw (); }; @@ -53,10 +53,10 @@ private: SvXMLAutoCorrectImport & rLocalRef; public: SvXMLWordListContext ( SvXMLAutoCorrectImport& rImport, sal_Int32 Element, - const ::css::uno::Reference< ::css::xml::sax::XFastAttributeList > & xAttrList ); + const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ); virtual css::uno::Reference<XFastContextHandler> SAL_CALL createFastChildContext( sal_Int32 Element, - const ::css::uno::Reference< ::css::xml::sax::XFastAttributeList > & xAttrList ) + const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual ~SvXMLWordListContext(); @@ -68,7 +68,7 @@ private: SvXMLAutoCorrectImport & rLocalRef; public: SvXMLWordContext ( SvXMLAutoCorrectImport& rImport, sal_Int32 Element, - const ::css::uno::Reference< ::css::xml::sax::XFastAttributeList > & xAttrList ); + const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ); virtual ~SvXMLWordContext(); }; @@ -80,13 +80,13 @@ protected: // This method is called after the namespace map has been updated, but // before a context for the current element has been pushed. - virtual SvXMLImportContext *CreateFastContext( sal_Int32 Element, const ::css::uno::Reference< - ::css::xml::sax::XFastAttributeList > & xAttrList ) SAL_OVERRIDE; + virtual SvXMLImportContext *CreateFastContext( sal_Int32 Element, const css::uno::Reference< + css::xml::sax::XFastAttributeList > & xAttrList ) SAL_OVERRIDE; public: SvStringsISortDtor &rList; SvXMLExceptionListImport( - const ::css::uno::Reference< ::css::uno::XComponentContext > xContext, + const css::uno::Reference< css::uno::XComponentContext > xContext, SvStringsISortDtor & rNewList ); virtual ~SvXMLExceptionListImport() throw (); @@ -98,10 +98,10 @@ private: SvXMLExceptionListImport & rLocalRef; public: SvXMLExceptionListContext ( SvXMLExceptionListImport& rImport, sal_Int32 Element, - const ::css::uno::Reference< ::css::xml::sax::XFastAttributeList > & xAttrList ); + const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ); virtual css::uno::Reference<XFastContextHandler> SAL_CALL createFastChildContext( sal_Int32 Element, - const ::css::uno::Reference< ::css::xml::sax::XFastAttributeList > & xAttrList ) + const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; virtual ~SvXMLExceptionListContext(); @@ -113,7 +113,7 @@ private: SvXMLExceptionListImport & rLocalRef; public: SvXMLExceptionContext ( SvXMLExceptionListImport& rImport, sal_Int32 Element, - const ::css::uno::Reference< ::css::xml::sax::XFastAttributeList > & xAttrList ); + const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ); virtual ~SvXMLExceptionContext(); }; diff --git a/editeng/source/misc/SvXMLAutoCorrectTokenHandler.cxx b/editeng/source/misc/SvXMLAutoCorrectTokenHandler.cxx index cafd5c0..caafb84 100644 --- a/editeng/source/misc/SvXMLAutoCorrectTokenHandler.cxx +++ b/editeng/source/misc/SvXMLAutoCorrectTokenHandler.cxx @@ -23,7 +23,7 @@ #endif #endif -using namespace ::css::uno; +using namespace css::uno; using namespace ::xmloff::token; SvXMLAutoCorrectTokenHandler::SvXMLAutoCorrectTokenHandler() @@ -35,13 +35,13 @@ SvXMLAutoCorrectTokenHandler::~SvXMLAutoCorrectTokenHandler() } sal_Int32 SAL_CALL SvXMLAutoCorrectTokenHandler::getTokenFromUTF8( const Sequence< sal_Int8 >& Identifier ) - throw (::css::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return getTokenDirect( reinterpret_cast< const char* >( Identifier.getConstArray() ), Identifier.getLength() ); } Sequence< sal_Int8 > SAL_CALL SvXMLAutoCorrectTokenHandler::getUTF8Identifier( sal_Int32 ) - throw (::css::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return Sequence< sal_Int8 >(); } diff --git a/editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx b/editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx index 95c626d..53456d1 100644 --- a/editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx +++ b/editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx @@ -18,7 +18,7 @@ #include <com/sun/star/xml/sax/FastToken.hpp> #include <sax/fastattribs.hxx> -using namespace ::css::xml::sax; +using namespace css::xml::sax; using namespace ::xmloff::token; enum SvXMLAutoCorrectToken : sal_Int32 _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits