diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /unoxml | |
parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) |
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).
Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'unoxml')
47 files changed, 225 insertions, 265 deletions
diff --git a/unoxml/source/dom/attr.cxx b/unoxml/source/dom/attr.cxx index dc2ef6eadc19..dfa15b1f16be 100644 --- a/unoxml/source/dom/attr.cxx +++ b/unoxml/source/dom/attr.cxx @@ -98,7 +98,7 @@ namespace DOM ::osl::MutexGuard const g(m_rMutex); if ((0 == m_aNodePtr) || (0 == m_aAttrPtr)) { - return ::rtl::OUString(); + return OUString(); } OUString const aName((char*)m_aAttrPtr->name, strlen((char*)m_aAttrPtr->name), RTL_TEXTENCODING_UTF8); @@ -148,10 +148,10 @@ namespace DOM ::osl::MutexGuard const g(m_rMutex); if ((0 == m_aNodePtr) || (0 == m_aAttrPtr)) { - return ::rtl::OUString(); + return OUString(); } if (0 == m_aAttrPtr->children) { - return ::rtl::OUString(); + return OUString(); } char const*const pContent((m_aAttrPtr->children) ? reinterpret_cast<char const*>(m_aAttrPtr->children->content) @@ -232,11 +232,11 @@ namespace DOM { ::osl::MutexGuard const g(m_rMutex); - if (!m_aNodePtr) { return ::rtl::OUString(); } + if (!m_aNodePtr) { return OUString(); } if (m_pNamespace.get()) { OSL_ASSERT(!m_aNodePtr->parent); - OUString const ret(::rtl::OStringToOUString( + OUString const ret(OStringToOUString( m_pNamespace->second, RTL_TEXTENCODING_UTF8)); return ret; } else { @@ -249,11 +249,11 @@ namespace DOM { ::osl::MutexGuard const g(m_rMutex); - if (!m_aNodePtr) { return ::rtl::OUString(); } + if (!m_aNodePtr) { return OUString(); } if (m_pNamespace.get()) { OSL_ASSERT(!m_aNodePtr->parent); - OUString const ret(::rtl::OStringToOUString( + OUString const ret(OStringToOUString( m_pNamespace->first, RTL_TEXTENCODING_UTF8)); return ret; } else { diff --git a/unoxml/source/dom/attr.hxx b/unoxml/source/dom/attr.hxx index d4bc835f33e5..9a472b9e6b97 100644 --- a/unoxml/source/dom/attr.hxx +++ b/unoxml/source/dom/attr.hxx @@ -32,13 +32,12 @@ #include <node.hxx> -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; namespace DOM { - typedef ::std::pair< ::rtl::OString, ::rtl::OString > stringpair_t; + typedef ::std::pair< OString, OString > stringpair_t; typedef ::cppu::ImplInheritanceHelper1< CNode, XAttr > CAttr_Base; diff --git a/unoxml/source/dom/attributesmap.hxx b/unoxml/source/dom/attributesmap.hxx index f57cddd3e11e..17afdacfefc9 100644 --- a/unoxml/source/dom/attributesmap.hxx +++ b/unoxml/source/dom/attributesmap.hxx @@ -30,7 +30,6 @@ #include <cppuhelper/implbase1.hxx> -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; diff --git a/unoxml/source/dom/cdatasection.hxx b/unoxml/source/dom/cdatasection.hxx index 7fb8a2da4499..620296515b7c 100644 --- a/unoxml/source/dom/cdatasection.hxx +++ b/unoxml/source/dom/cdatasection.hxx @@ -26,7 +26,6 @@ #include <text.hxx> -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; diff --git a/unoxml/source/dom/characterdata.cxx b/unoxml/source/dom/characterdata.cxx index eab4ae99d74d..e2b4ba97fa49 100644 --- a/unoxml/source/dom/characterdata.cxx +++ b/unoxml/source/dom/characterdata.cxx @@ -85,7 +85,7 @@ namespace DOM ::boost::shared_ptr<xmlChar const> const pContent( xmlNodeGetContent(m_aNodePtr), xmlFree); OString aData(reinterpret_cast<sal_Char const*>(pContent.get())); - OUString tmp(rtl::OStringToOUString(aData, RTL_TEXTENCODING_UTF8)); + OUString tmp(OStringToOUString(aData, RTL_TEXTENCODING_UTF8)); if (offset > tmp.getLength() || offset < 0 || count < 0) { DOMException e; e.Code = DOMExceptionType_INDEX_SIZE_ERR; @@ -156,7 +156,7 @@ namespace DOM ::boost::shared_ptr<xmlChar const> const pContent( xmlNodeGetContent(m_aNodePtr), xmlFree); OString aData(reinterpret_cast<sal_Char const*>(pContent.get())); - OUString tmp(rtl::OStringToOUString(aData, RTL_TEXTENCODING_UTF8)); + OUString tmp(OStringToOUString(aData, RTL_TEXTENCODING_UTF8)); if (offset > tmp.getLength() || offset < 0) { DOMException e; e.Code = DOMExceptionType_INDEX_SIZE_ERR; @@ -191,7 +191,7 @@ namespace DOM ::boost::shared_ptr<xmlChar const> const pContent( xmlNodeGetContent(m_aNodePtr), xmlFree); OString aData(reinterpret_cast<sal_Char const*>(pContent.get())); - OUString tmp(rtl::OStringToOUString(aData, RTL_TEXTENCODING_UTF8)); + OUString tmp(OStringToOUString(aData, RTL_TEXTENCODING_UTF8)); if (offset > tmp.getLength() || offset < 0 || count < 0){ DOMException e; e.Code = DOMExceptionType_INDEX_SIZE_ERR; @@ -246,7 +246,7 @@ namespace DOM ::boost::shared_ptr<xmlChar const> const pContent( xmlNodeGetContent(m_aNodePtr), xmlFree); OString aData(reinterpret_cast<sal_Char const*>(pContent.get())); - OUString tmp(rtl::OStringToOUString(aData, RTL_TEXTENCODING_UTF8)); + OUString tmp(OStringToOUString(aData, RTL_TEXTENCODING_UTF8)); if (offset > tmp.getLength() || offset < 0 || count < 0) { DOMException e; e.Code = DOMExceptionType_INDEX_SIZE_ERR; diff --git a/unoxml/source/dom/characterdata.hxx b/unoxml/source/dom/characterdata.hxx index 7f2664732fa0..3debdd94d2ff 100644 --- a/unoxml/source/dom/characterdata.hxx +++ b/unoxml/source/dom/characterdata.hxx @@ -33,7 +33,6 @@ #include <node.hxx> -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; diff --git a/unoxml/source/dom/childlist.hxx b/unoxml/source/dom/childlist.hxx index abdc1df8e373..baf91caf888c 100644 --- a/unoxml/source/dom/childlist.hxx +++ b/unoxml/source/dom/childlist.hxx @@ -30,7 +30,6 @@ #include <cppuhelper/implbase1.hxx> -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; diff --git a/unoxml/source/dom/comment.hxx b/unoxml/source/dom/comment.hxx index 5edeaf14ed30..df095b223948 100644 --- a/unoxml/source/dom/comment.hxx +++ b/unoxml/source/dom/comment.hxx @@ -26,7 +26,6 @@ #include <characterdata.hxx> -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; diff --git a/unoxml/source/dom/document.cxx b/unoxml/source/dom/document.cxx index 8dbb0ddd4311..0c69dfb64cee 100644 --- a/unoxml/source/dom/document.cxx +++ b/unoxml/source/dom/document.cxx @@ -481,7 +481,7 @@ namespace DOM ::osl::MutexGuard const g(m_Mutex); OString const oData( - ::rtl::OUStringToOString(data, RTL_TEXTENCODING_UTF8)); + OUStringToOString(data, RTL_TEXTENCODING_UTF8)); xmlChar const*const pData = reinterpret_cast<xmlChar const*>(oData.getStr()); xmlNodePtr const pText = @@ -1020,7 +1020,7 @@ namespace DOM void SAL_CALL CDocument::fastSerialize( const Reference< XFastDocumentHandler >& i_xHandler, const Reference< XFastTokenHandler >& i_xTokenHandler, const Sequence< beans::StringPair >& i_rNamespaces, - const Sequence< beans::Pair< rtl::OUString, sal_Int32 > >& i_rRegisterNamespaces ) + const Sequence< beans::Pair< OUString, sal_Int32 > >& i_rRegisterNamespaces ) throw (SAXException, RuntimeException) { ::osl::MutexGuard const g(m_Mutex); diff --git a/unoxml/source/dom/document.hxx b/unoxml/source/dom/document.hxx index f2c9a761cebb..97c08cfafc2c 100644 --- a/unoxml/source/dom/document.hxx +++ b/unoxml/source/dom/document.hxx @@ -50,7 +50,6 @@ using namespace std; -using ::rtl::OUString; using namespace com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::xml::sax; @@ -382,7 +381,7 @@ namespace DOM virtual void SAL_CALL fastSerialize( const Reference< XFastDocumentHandler >& handler, const Reference< XFastTokenHandler >& tokenHandler, const Sequence< beans::StringPair >& i_rNamespaces, - const Sequence< beans::Pair< rtl::OUString, sal_Int32 > >& namespaces ) + const Sequence< beans::Pair< OUString, sal_Int32 > >& namespaces ) throw (SAXException, RuntimeException); }; } diff --git a/unoxml/source/dom/documentbuilder.cxx b/unoxml/source/dom/documentbuilder.cxx index cbfe97a7eb71..8d434e74bf19 100644 --- a/unoxml/source/dom/documentbuilder.cxx +++ b/unoxml/source/dom/documentbuilder.cxx @@ -45,8 +45,6 @@ #include <document.hxx> -using ::rtl::OUStringBuffer; -using ::rtl::OString; using ::com::sun::star::xml::sax::InputSource; using namespace ucbhelper; using namespace ::com::sun::star::ucb; diff --git a/unoxml/source/dom/documentbuilder.hxx b/unoxml/source/dom/documentbuilder.hxx index 02bc8cf753b0..f1c5daf2ae91 100644 --- a/unoxml/source/dom/documentbuilder.hxx +++ b/unoxml/source/dom/documentbuilder.hxx @@ -40,7 +40,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::xml::dom; diff --git a/unoxml/source/dom/documentfragment.hxx b/unoxml/source/dom/documentfragment.hxx index 852e437ac448..d3f3ca941766 100644 --- a/unoxml/source/dom/documentfragment.hxx +++ b/unoxml/source/dom/documentfragment.hxx @@ -26,7 +26,6 @@ #include <node.hxx> -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; diff --git a/unoxml/source/dom/documenttype.hxx b/unoxml/source/dom/documenttype.hxx index 8c03f6dfaced..17ca8fb942da 100644 --- a/unoxml/source/dom/documenttype.hxx +++ b/unoxml/source/dom/documenttype.hxx @@ -32,7 +32,6 @@ #include <node.hxx> -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; diff --git a/unoxml/source/dom/domimplementation.hxx b/unoxml/source/dom/domimplementation.hxx index 9d8d2b338bed..29bade3aa45d 100644 --- a/unoxml/source/dom/domimplementation.hxx +++ b/unoxml/source/dom/domimplementation.hxx @@ -30,7 +30,6 @@ #include <cppuhelper/implbase1.hxx> -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; diff --git a/unoxml/source/dom/element.cxx b/unoxml/source/dom/element.cxx index 43624b5a8829..0149ca972768 100644 --- a/unoxml/source/dom/element.cxx +++ b/unoxml/source/dom/element.cxx @@ -231,7 +231,7 @@ namespace DOM ::osl::MutexGuard const g(m_rMutex); if (0 == m_aNodePtr) { - return ::rtl::OUString(); + return OUString(); } // search properties OString o1 = OUStringToOString(name, RTL_TEXTENCODING_UTF8); @@ -311,7 +311,7 @@ namespace DOM ::osl::MutexGuard const g(m_rMutex); if (0 == m_aNodePtr) { - return ::rtl::OUString(); + return OUString(); } OString o1 = OUStringToOString(localName, RTL_TEXTENCODING_UTF8); xmlChar const*const pName = @@ -322,7 +322,7 @@ namespace DOM ::boost::shared_ptr<xmlChar const> const pValue( xmlGetNsProp(m_aNodePtr, pName, pNS), xmlFree); if (0 == pValue) { - return ::rtl::OUString(); + return OUString(); } OUString const ret(reinterpret_cast<sal_Char const*>(pValue.get()), strlen(reinterpret_cast<char const*>(pValue.get())), @@ -372,7 +372,7 @@ namespace DOM ::osl::MutexGuard const g(m_rMutex); if (0 == m_aNodePtr) { - return ::rtl::OUString(); + return OUString(); } OUString const ret((sal_Char*)m_aNodePtr->name, strlen((char*)m_aNodePtr->name), RTL_TEXTENCODING_UTF8); @@ -501,7 +501,7 @@ namespace DOM Reference< XAttr > aAttr; if (!oldAttr->getNamespaceURI().isEmpty()) { - ::rtl::OUStringBuffer qname(oldAttr->getPrefix()); + OUStringBuffer qname(oldAttr->getPrefix()); if (0 != qname.getLength()) { qname.append(sal_Unicode(':')); } diff --git a/unoxml/source/dom/element.hxx b/unoxml/source/dom/element.hxx index 11c1718e373f..26baa2ffc53c 100644 --- a/unoxml/source/dom/element.hxx +++ b/unoxml/source/dom/element.hxx @@ -31,7 +31,6 @@ #include <node.hxx> -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; diff --git a/unoxml/source/dom/elementlist.cxx b/unoxml/source/dom/elementlist.cxx index 090d873f1951..10c2144d04db 100644 --- a/unoxml/source/dom/elementlist.cxx +++ b/unoxml/source/dom/elementlist.cxx @@ -28,10 +28,10 @@ namespace DOM { - static xmlChar* lcl_initXmlString(::rtl::OUString const& rString) + static xmlChar* lcl_initXmlString(OUString const& rString) { - ::rtl::OString const os = - ::rtl::OUStringToOString(rString, RTL_TEXTENCODING_UTF8); + OString const os = + OUStringToOString(rString, RTL_TEXTENCODING_UTF8); xmlChar *const pRet = new xmlChar[os.getLength() + 1]; strcpy(reinterpret_cast<char*>(pRet), os.getStr()); return pRet; diff --git a/unoxml/source/dom/elementlist.hxx b/unoxml/source/dom/elementlist.hxx index b89965b8e5a8..5bfc422f806f 100644 --- a/unoxml/source/dom/elementlist.hxx +++ b/unoxml/source/dom/elementlist.hxx @@ -39,7 +39,6 @@ #include <cppuhelper/implbase2.hxx> -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; using namespace com::sun::star::xml::dom::events; diff --git a/unoxml/source/dom/entitiesmap.hxx b/unoxml/source/dom/entitiesmap.hxx index edc909d563ef..0e857ed3e4fe 100644 --- a/unoxml/source/dom/entitiesmap.hxx +++ b/unoxml/source/dom/entitiesmap.hxx @@ -30,7 +30,6 @@ #include <cppuhelper/implbase1.hxx> -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; diff --git a/unoxml/source/dom/entity.hxx b/unoxml/source/dom/entity.hxx index 8c9f8b433f76..64fd0feb5518 100644 --- a/unoxml/source/dom/entity.hxx +++ b/unoxml/source/dom/entity.hxx @@ -31,7 +31,6 @@ #include <node.hxx> -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; diff --git a/unoxml/source/dom/entityreference.hxx b/unoxml/source/dom/entityreference.hxx index af8fab51ca0a..6368195e8659 100644 --- a/unoxml/source/dom/entityreference.hxx +++ b/unoxml/source/dom/entityreference.hxx @@ -28,7 +28,6 @@ #include <node.hxx> -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; diff --git a/unoxml/source/dom/node.cxx b/unoxml/source/dom/node.cxx index 3fcb3dacfdc7..a071247a1a2b 100644 --- a/unoxml/source/dom/node.cxx +++ b/unoxml/source/dom/node.cxx @@ -469,7 +469,7 @@ namespace DOM throw (RuntimeException) { // see CElement/CAttr - return ::rtl::OUString(); + return OUString(); } diff --git a/unoxml/source/dom/node.hxx b/unoxml/source/dom/node.hxx index 3fe3ab62b99f..b7e29544300a 100644 --- a/unoxml/source/dom/node.hxx +++ b/unoxml/source/dom/node.hxx @@ -46,8 +46,6 @@ #include <boost/unordered_map.hpp> -using ::rtl::OUString; -using ::rtl::OString; using namespace sax_fastparser; using namespace com::sun::star::uno; using namespace com::sun::star::xml::sax; @@ -82,7 +80,7 @@ namespace DOM typedef std::vector< std::vector<Namespace> > NamespaceVectorType; typedef boost::unordered_map< OUString, sal_Int32, - rtl::OUStringHash > NamespaceMapType; + OUStringHash > NamespaceMapType; /// outer vector: xml context; inner vector: current NS NamespaceVectorType maNamespaces; diff --git a/unoxml/source/dom/notation.hxx b/unoxml/source/dom/notation.hxx index e1965f423344..5aa1c0e2ced4 100644 --- a/unoxml/source/dom/notation.hxx +++ b/unoxml/source/dom/notation.hxx @@ -28,7 +28,6 @@ #include <node.hxx> -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; diff --git a/unoxml/source/dom/notationsmap.hxx b/unoxml/source/dom/notationsmap.hxx index f8d234315f47..8a594a3bbbef 100644 --- a/unoxml/source/dom/notationsmap.hxx +++ b/unoxml/source/dom/notationsmap.hxx @@ -30,7 +30,6 @@ #include <cppuhelper/implbase1.hxx> -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; diff --git a/unoxml/source/dom/processinginstruction.cxx b/unoxml/source/dom/processinginstruction.cxx index 9d1edd605aa6..99790e159c7c 100644 --- a/unoxml/source/dom/processinginstruction.cxx +++ b/unoxml/source/dom/processinginstruction.cxx @@ -52,13 +52,13 @@ namespace DOM ::osl::MutexGuard const g(m_rMutex); if (0 == m_aNodePtr) { - return ::rtl::OUString(); + return OUString(); } char const*const pContent( reinterpret_cast<char const*>(m_aNodePtr->content)); if (0 == pContent) { - return ::rtl::OUString(); + return OUString(); } OUString const ret(pContent, strlen(pContent), RTL_TEXTENCODING_UTF8); return ret; @@ -73,13 +73,13 @@ namespace DOM ::osl::MutexGuard const g(m_rMutex); if (0 == m_aNodePtr) { - return ::rtl::OUString(); + return OUString(); } char const*const pName( reinterpret_cast<char const*>(m_aNodePtr->name)); if (0 == pName) { - return ::rtl::OUString(); + return OUString(); } OUString const ret(pName, strlen(pName), RTL_TEXTENCODING_UTF8); return ret; @@ -98,7 +98,7 @@ namespace DOM } OString const data( - ::rtl::OUStringToOString(rData, RTL_TEXTENCODING_UTF8)); + OUStringToOString(rData, RTL_TEXTENCODING_UTF8)); xmlChar const*const pData( reinterpret_cast<xmlChar const*>(data.getStr()) ); xmlFree(m_aNodePtr->content); @@ -111,7 +111,7 @@ namespace DOM ::osl::MutexGuard const g(m_rMutex); if (0 == m_aNodePtr) { - return ::rtl::OUString(); + return OUString(); } sal_Char const*const pName = diff --git a/unoxml/source/dom/processinginstruction.hxx b/unoxml/source/dom/processinginstruction.hxx index 3501b99c6cd0..96141e6162e3 100644 --- a/unoxml/source/dom/processinginstruction.hxx +++ b/unoxml/source/dom/processinginstruction.hxx @@ -28,7 +28,6 @@ #include <node.hxx> -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; diff --git a/unoxml/source/dom/saxbuilder.hxx b/unoxml/source/dom/saxbuilder.hxx index 9945548cf998..79956a2a1e1c 100644 --- a/unoxml/source/dom/saxbuilder.hxx +++ b/unoxml/source/dom/saxbuilder.hxx @@ -41,7 +41,6 @@ #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; using namespace com::sun::star::xml::sax; diff --git a/unoxml/source/dom/text.hxx b/unoxml/source/dom/text.hxx index fbb64bceb2d2..35d8c6b9802c 100644 --- a/unoxml/source/dom/text.hxx +++ b/unoxml/source/dom/text.hxx @@ -33,7 +33,6 @@ #include <characterdata.hxx> -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; diff --git a/unoxml/source/events/eventdispatcher.hxx b/unoxml/source/events/eventdispatcher.hxx index cb2170199cc4..065be2d9c8d8 100644 --- a/unoxml/source/events/eventdispatcher.hxx +++ b/unoxml/source/events/eventdispatcher.hxx @@ -45,7 +45,7 @@ class CDocument; namespace events { typedef std::multimap< xmlNodePtr, Reference< com::sun::star::xml::dom::events::XEventListener> > ListenerMap; -typedef std::map< ::rtl::OUString, ListenerMap*> TypeListenerMap; +typedef std::map< OUString, ListenerMap*> TypeListenerMap; typedef std::vector<ListenerMap::value_type> ListenerPairVector; class CEventDispatcher @@ -57,20 +57,20 @@ private: public: void addListener( xmlNodePtr pNode, - ::rtl::OUString aType, + OUString aType, const Reference<com::sun::star::xml::dom::events::XEventListener>& aListener, sal_Bool bCapture); void removeListener( xmlNodePtr pNode, - ::rtl::OUString aType, + OUString aType, const Reference<com::sun::star::xml::dom::events::XEventListener>& aListener, sal_Bool bCapture); static void callListeners( TypeListenerMap const& rTMap, xmlNodePtr const pNode, - ::rtl::OUString aType, + OUString aType, const Reference< XEvent >& xEvent); bool dispatchEvent( diff --git a/unoxml/source/events/mouseevent.hxx b/unoxml/source/events/mouseevent.hxx index 65be5507d7f1..92296c0fb1b3 100644 --- a/unoxml/source/events/mouseevent.hxx +++ b/unoxml/source/events/mouseevent.hxx @@ -27,9 +27,6 @@ #include "uievent.hxx" - -using ::rtl::OUString; - namespace DOM { namespace events { typedef ::cppu::ImplInheritanceHelper1< CUIEvent, XMouseEvent > diff --git a/unoxml/source/events/mutationevent.hxx b/unoxml/source/events/mutationevent.hxx index f3604a94ed5d..8687233f6d37 100644 --- a/unoxml/source/events/mutationevent.hxx +++ b/unoxml/source/events/mutationevent.hxx @@ -32,9 +32,6 @@ #include "event.hxx" - -using ::rtl::OUString; - namespace DOM { namespace events { typedef ::cppu::ImplInheritanceHelper1< CEvent, XMutationEvent > diff --git a/unoxml/source/events/testlistener.hxx b/unoxml/source/events/testlistener.hxx index b9b3de599615..5d5b1e4f4fe5 100644 --- a/unoxml/source/events/testlistener.hxx +++ b/unoxml/source/events/testlistener.hxx @@ -37,7 +37,6 @@ #include <cppuhelper/implbase3.hxx> -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; using namespace com::sun::star::xml::dom::events; diff --git a/unoxml/source/events/uievent.hxx b/unoxml/source/events/uievent.hxx index ef0bfe88176b..1f9f70fad169 100644 --- a/unoxml/source/events/uievent.hxx +++ b/unoxml/source/events/uievent.hxx @@ -31,7 +31,6 @@ #include "event.hxx" -using ::rtl::OUString; using namespace com::sun::star::xml::dom::views; namespace DOM { namespace events { diff --git a/unoxml/source/rdf/CBlankNode.cxx b/unoxml/source/rdf/CBlankNode.cxx index 1ddbbbce8900..f4540cfd1d0f 100644 --- a/unoxml/source/rdf/CBlankNode.cxx +++ b/unoxml/source/rdf/CBlankNode.cxx @@ -41,15 +41,15 @@ public: virtual ~CBlankNode() {} // ::com::sun::star::lang::XServiceInfo: - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService(const ::rtl::OUString & ServiceName) throw (css::uno::RuntimeException); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (css::uno::RuntimeException); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); // ::com::sun::star::lang::XInitialization: virtual void SAL_CALL initialize(const css::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception); // ::com::sun::star::rdf::XNode: - virtual ::rtl::OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException); private: CBlankNode(const CBlankNode &); // not defined @@ -57,7 +57,7 @@ private: css::uno::Reference< css::uno::XComponentContext > m_xContext; - ::rtl::OUString m_NodeID; + OUString m_NodeID; }; CBlankNode::CBlankNode(css::uno::Reference< css::uno::XComponentContext > const & context) : @@ -65,14 +65,14 @@ CBlankNode::CBlankNode(css::uno::Reference< css::uno::XComponentContext > const {} // com.sun.star.uno.XServiceInfo: -::rtl::OUString SAL_CALL CBlankNode::getImplementationName() throw (css::uno::RuntimeException) +OUString SAL_CALL CBlankNode::getImplementationName() throw (css::uno::RuntimeException) { return comp_CBlankNode::_getImplementationName(); } -::sal_Bool SAL_CALL CBlankNode::supportsService(::rtl::OUString const & serviceName) throw (css::uno::RuntimeException) +::sal_Bool SAL_CALL CBlankNode::supportsService(OUString const & serviceName) throw (css::uno::RuntimeException) { - css::uno::Sequence< ::rtl::OUString > serviceNames = comp_CBlankNode::_getSupportedServiceNames(); + css::uno::Sequence< OUString > serviceNames = comp_CBlankNode::_getSupportedServiceNames(); for (::sal_Int32 i = 0; i < serviceNames.getLength(); ++i) { if (serviceNames[i] == serviceName) return sal_True; @@ -80,7 +80,7 @@ CBlankNode::CBlankNode(css::uno::Reference< css::uno::XComponentContext > const return sal_False; } -css::uno::Sequence< ::rtl::OUString > SAL_CALL CBlankNode::getSupportedServiceNames() throw (css::uno::RuntimeException) +css::uno::Sequence< OUString > SAL_CALL CBlankNode::getSupportedServiceNames() throw (css::uno::RuntimeException) { return comp_CBlankNode::_getSupportedServiceNames(); } @@ -90,14 +90,14 @@ void SAL_CALL CBlankNode::initialize(const css::uno::Sequence< ::com::sun::star: { if (aArguments.getLength() != 1) { throw css::lang::IllegalArgumentException( - ::rtl::OUString("CBlankNode::initialize: " + OUString("CBlankNode::initialize: " "must give exactly 1 argument"), *this, 1); } - ::rtl::OUString arg; + OUString arg; if (!(aArguments[0] >>= arg)) { throw css::lang::IllegalArgumentException( - ::rtl::OUString("CBlankNode::initialize: " + OUString("CBlankNode::initialize: " "argument must be string"), *this, 0); } @@ -106,13 +106,13 @@ void SAL_CALL CBlankNode::initialize(const css::uno::Sequence< ::com::sun::star: m_NodeID = arg; } else { throw css::lang::IllegalArgumentException( - ::rtl::OUString("CBlankNode::initialize: " + OUString("CBlankNode::initialize: " "argument is not valid blank node ID"), *this, 0); } } // ::com::sun::star::rdf::XNode: -::rtl::OUString SAL_CALL CBlankNode::getStringValue() throw (css::uno::RuntimeException) +OUString SAL_CALL CBlankNode::getStringValue() throw (css::uno::RuntimeException) { return m_NodeID; } @@ -124,8 +124,8 @@ void SAL_CALL CBlankNode::initialize(const css::uno::Sequence< ::com::sun::star: // component helper namespace namespace comp_CBlankNode { -::rtl::OUString SAL_CALL _getImplementationName() { - return ::rtl::OUString( "CBlankNode"); +OUString SAL_CALL _getImplementationName() { + return OUString( "CBlankNode"); } css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames() diff --git a/unoxml/source/rdf/CLiteral.cxx b/unoxml/source/rdf/CLiteral.cxx index 272f6d207cd9..14c3fca88d95 100644 --- a/unoxml/source/rdf/CLiteral.cxx +++ b/unoxml/source/rdf/CLiteral.cxx @@ -43,19 +43,19 @@ public: virtual ~CLiteral() {} // ::com::sun::star::lang::XServiceInfo: - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService(const ::rtl::OUString & ServiceName) throw (css::uno::RuntimeException); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (css::uno::RuntimeException); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); // ::com::sun::star::lang::XInitialization: virtual void SAL_CALL initialize(const css::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception); // ::com::sun::star::rdf::XNode: - virtual ::rtl::OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException); // ::com::sun::star::rdf::XLiteral: - virtual ::rtl::OUString SAL_CALL getValue() throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getLanguage() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getValue() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getLanguage() throw (css::uno::RuntimeException); virtual css::uno::Reference< css::rdf::XURI > SAL_CALL getDatatype() throw (css::uno::RuntimeException); private: @@ -64,8 +64,8 @@ private: css::uno::Reference< css::uno::XComponentContext > m_xContext; - ::rtl::OUString m_Value; - ::rtl::OUString m_Language; + OUString m_Value; + OUString m_Language; css::uno::Reference< css::rdf::XURI > m_xDatatype; }; @@ -74,14 +74,14 @@ CLiteral::CLiteral(css::uno::Reference< css::uno::XComponentContext > const & co {} // com.sun.star.uno.XServiceInfo: -::rtl::OUString SAL_CALL CLiteral::getImplementationName() throw (css::uno::RuntimeException) +OUString SAL_CALL CLiteral::getImplementationName() throw (css::uno::RuntimeException) { return comp_CLiteral::_getImplementationName(); } -::sal_Bool SAL_CALL CLiteral::supportsService(::rtl::OUString const & serviceName) throw (css::uno::RuntimeException) +::sal_Bool SAL_CALL CLiteral::supportsService(OUString const & serviceName) throw (css::uno::RuntimeException) { - css::uno::Sequence< ::rtl::OUString > serviceNames = comp_CLiteral::_getSupportedServiceNames(); + css::uno::Sequence< OUString > serviceNames = comp_CLiteral::_getSupportedServiceNames(); for (::sal_Int32 i = 0; i < serviceNames.getLength(); ++i) { if (serviceNames[i] == serviceName) return sal_True; @@ -89,7 +89,7 @@ CLiteral::CLiteral(css::uno::Reference< css::uno::XComponentContext > const & co return sal_False; } -css::uno::Sequence< ::rtl::OUString > SAL_CALL CLiteral::getSupportedServiceNames() throw (css::uno::RuntimeException) +css::uno::Sequence< OUString > SAL_CALL CLiteral::getSupportedServiceNames() throw (css::uno::RuntimeException) { return comp_CLiteral::_getSupportedServiceNames(); } @@ -100,14 +100,14 @@ void SAL_CALL CLiteral::initialize(const css::uno::Sequence< ::com::sun::star::u const sal_Int32 len( aArguments.getLength() ); if (len < 1 || len > 2) { throw css::lang::IllegalArgumentException( - ::rtl::OUString("CLiteral::initialize: " + OUString("CLiteral::initialize: " "must give 1 or 2 argument(s)"), *this, 2); } - ::rtl::OUString arg0; + OUString arg0; if (!(aArguments[0] >>= arg0)) { throw css::lang::IllegalArgumentException( - ::rtl::OUString("CLiteral::initialize: " + OUString("CLiteral::initialize: " "argument must be string"), *this, 0); } //FIXME: what is legal? @@ -115,19 +115,19 @@ void SAL_CALL CLiteral::initialize(const css::uno::Sequence< ::com::sun::star::u m_Value = arg0; } else { throw css::lang::IllegalArgumentException( - ::rtl::OUString("CLiteral::initialize: " + OUString("CLiteral::initialize: " "argument is not valid literal value"), *this, 0); } if (len > 1) { - ::rtl::OUString arg1; + OUString arg1; css::uno::Reference< css::rdf::XURI > xURI; if ((aArguments[1] >>= arg1)) { if (!arg1.isEmpty()) { m_Language = arg1; } else { throw css::lang::IllegalArgumentException( - ::rtl::OUString("CLiteral::initialize: " + OUString("CLiteral::initialize: " "argument is not valid language"), *this, 1); } } else if ((aArguments[1] >>= xURI)) { @@ -135,27 +135,27 @@ void SAL_CALL CLiteral::initialize(const css::uno::Sequence< ::com::sun::star::u m_xDatatype = xURI; } else { throw css::lang::IllegalArgumentException( - ::rtl::OUString("CLiteral::initialize: " + OUString("CLiteral::initialize: " "argument is null"), *this, 1); } } else { throw css::lang::IllegalArgumentException( - ::rtl::OUString("CLiteral::initialize: " + OUString("CLiteral::initialize: " "argument must be string or URI"), *this, 1); } } } // ::com::sun::star::rdf::XNode: -::rtl::OUString SAL_CALL CLiteral::getStringValue() throw (css::uno::RuntimeException) +OUString SAL_CALL CLiteral::getStringValue() throw (css::uno::RuntimeException) { if (!m_Language.isEmpty()) { - ::rtl::OUStringBuffer buf(m_Value); + OUStringBuffer buf(m_Value); buf.appendAscii("@"); buf.append(m_Language); return buf.makeStringAndClear(); } else if (m_xDatatype.is()) { - ::rtl::OUStringBuffer buf(m_Value); + OUStringBuffer buf(m_Value); buf.appendAscii("^^"); buf.append(m_xDatatype->getStringValue()); return buf.makeStringAndClear(); @@ -165,12 +165,12 @@ void SAL_CALL CLiteral::initialize(const css::uno::Sequence< ::com::sun::star::u } // ::com::sun::star::rdf::XLiteral: -::rtl::OUString SAL_CALL CLiteral::getValue() throw (css::uno::RuntimeException) +OUString SAL_CALL CLiteral::getValue() throw (css::uno::RuntimeException) { return m_Value; } -::rtl::OUString SAL_CALL CLiteral::getLanguage() throw (css::uno::RuntimeException) +OUString SAL_CALL CLiteral::getLanguage() throw (css::uno::RuntimeException) { return m_Language; } @@ -187,8 +187,8 @@ css::uno::Reference< css::rdf::XURI > SAL_CALL CLiteral::getDatatype() throw (cs // component helper namespace namespace comp_CLiteral { -::rtl::OUString SAL_CALL _getImplementationName() { - return ::rtl::OUString( "CLiteral"); +OUString SAL_CALL _getImplementationName() { + return OUString( "CLiteral"); } css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames() diff --git a/unoxml/source/rdf/CNodes.hxx b/unoxml/source/rdf/CNodes.hxx index 87e1344c7282..37ea5283fb2e 100644 --- a/unoxml/source/rdf/CNodes.hxx +++ b/unoxml/source/rdf/CNodes.hxx @@ -28,8 +28,8 @@ namespace comp_CBlankNode { // component and service helper functions: -::rtl::OUString SAL_CALL _getImplementationName(); -css::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames(); +OUString SAL_CALL _getImplementationName(); +css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames(); css::uno::Reference< css::uno::XInterface > SAL_CALL _create( css::uno::Reference< css::uno::XComponentContext > const & context ); } // closing component helper namespace @@ -39,8 +39,8 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL _create( css::uno::Referenc namespace comp_CURI { // component and service helper functions: -::rtl::OUString SAL_CALL _getImplementationName(); -css::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames(); +OUString SAL_CALL _getImplementationName(); +css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames(); css::uno::Reference< css::uno::XInterface > SAL_CALL _create( css::uno::Reference< css::uno::XComponentContext > const & context ); } // closing component helper namespace @@ -50,8 +50,8 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL _create( css::uno::Referenc namespace comp_CLiteral { // component and service helper functions: -::rtl::OUString SAL_CALL _getImplementationName(); -css::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames(); +OUString SAL_CALL _getImplementationName(); +css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames(); css::uno::Reference< css::uno::XInterface > SAL_CALL _create( css::uno::Reference< css::uno::XComponentContext > const & context ); } // closing component helper namespace diff --git a/unoxml/source/rdf/CURI.cxx b/unoxml/source/rdf/CURI.cxx index c275b6861b3f..e7aa311ebb75 100644 --- a/unoxml/source/rdf/CURI.cxx +++ b/unoxml/source/rdf/CURI.cxx @@ -42,19 +42,19 @@ public: virtual ~CURI() {} // ::com::sun::star::lang::XServiceInfo: - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService(const ::rtl::OUString & ServiceName) throw (css::uno::RuntimeException); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (css::uno::RuntimeException); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); // ::com::sun::star::lang::XInitialization: virtual void SAL_CALL initialize(const css::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception); // ::com::sun::star::rdf::XNode: - virtual ::rtl::OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException); // ::com::sun::star::rdf::XURI: - virtual ::rtl::OUString SAL_CALL getLocalName() throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getNamespace() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getLocalName() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getNamespace() throw (css::uno::RuntimeException); private: CURI(const CURI &); // not defined @@ -65,8 +65,8 @@ private: css::uno::Reference< css::uno::XComponentContext > m_xContext; - ::rtl::OUString m_Namespace; - ::rtl::OUString m_LocalName; + OUString m_Namespace; + OUString m_LocalName; }; CURI::CURI(css::uno::Reference< css::uno::XComponentContext > const & context) : @@ -74,14 +74,14 @@ CURI::CURI(css::uno::Reference< css::uno::XComponentContext > const & context) : {} // com.sun.star.uno.XServiceInfo: -::rtl::OUString SAL_CALL CURI::getImplementationName() throw (css::uno::RuntimeException) +OUString SAL_CALL CURI::getImplementationName() throw (css::uno::RuntimeException) { return comp_CURI::_getImplementationName(); } -::sal_Bool SAL_CALL CURI::supportsService(::rtl::OUString const & serviceName) throw (css::uno::RuntimeException) +::sal_Bool SAL_CALL CURI::supportsService(OUString const & serviceName) throw (css::uno::RuntimeException) { - css::uno::Sequence< ::rtl::OUString > serviceNames = comp_CURI::_getSupportedServiceNames(); + css::uno::Sequence< OUString > serviceNames = comp_CURI::_getSupportedServiceNames(); for (::sal_Int32 i = 0; i < serviceNames.getLength(); ++i) { if (serviceNames[i] == serviceName) return sal_True; @@ -89,7 +89,7 @@ CURI::CURI(css::uno::Reference< css::uno::XComponentContext > const & context) : return sal_False; } -css::uno::Sequence< ::rtl::OUString > SAL_CALL CURI::getSupportedServiceNames() throw (css::uno::RuntimeException) +css::uno::Sequence< OUString > SAL_CALL CURI::getSupportedServiceNames() throw (css::uno::RuntimeException) { return comp_CURI::_getSupportedServiceNames(); } @@ -708,11 +708,11 @@ void SAL_CALL CURI::initFromConstant(const sal_Int16 i_Constant) default: throw css::lang::IllegalArgumentException( - ::rtl::OUString("CURI::initialize: " + OUString("CURI::initialize: " "invalid URIs constant argument"), *this, 0); } - m_Namespace = ::rtl::OUString::createFromAscii(ns).intern(); - m_LocalName = ::rtl::OUString::createFromAscii(ln).intern(); + m_Namespace = OUString::createFromAscii(ns).intern(); + m_LocalName = OUString::createFromAscii(ln).intern(); return; } @@ -722,18 +722,18 @@ void SAL_CALL CURI::initialize(const css::uno::Sequence< ::com::sun::star::uno:: sal_Int32 len = aArguments.getLength(); if ((len < 1) || (len > 2)) { throw css::lang::IllegalArgumentException( - ::rtl::OUString("CURI::initialize: " + OUString("CURI::initialize: " "must give 1 or 2 argument(s)"), *this, 2); } sal_Int16 arg(0); - ::rtl::OUString arg0; - ::rtl::OUString arg1; + OUString arg0; + OUString arg1; if ((aArguments[0] >>= arg)) { // integer argument: constant from rdf::URIs if (len != 1) { throw css::lang::IllegalArgumentException( - ::rtl::OUString("CURI::initialize: " + OUString("CURI::initialize: " "must give 1 int argument"), *this, 1); } initFromConstant(arg); @@ -741,13 +741,13 @@ void SAL_CALL CURI::initialize(const css::uno::Sequence< ::com::sun::star::uno:: } if (!(aArguments[0] >>= arg0)) { throw css::lang::IllegalArgumentException( - ::rtl::OUString("CURI::initialize: " + OUString("CURI::initialize: " "argument must be string or short"), *this, 0); } if (len > 1) { if (!(aArguments[1] >>= arg1)) { throw css::lang::IllegalArgumentException( - ::rtl::OUString("CURI::initialize: " + OUString("CURI::initialize: " "argument must be string"), *this, 1); } // just append the parameters and then split them again; seems simplest @@ -768,7 +768,7 @@ void SAL_CALL CURI::initialize(const css::uno::Sequence< ::com::sun::star::uno:: } } else { throw css::lang::IllegalArgumentException( - ::rtl::OUString("CURI::initialize: " + OUString("CURI::initialize: " "argument not splittable: no separator [#/:]"), *this, 0); } @@ -777,7 +777,7 @@ void SAL_CALL CURI::initialize(const css::uno::Sequence< ::com::sun::star::uno:: m_Namespace = arg0; } else { throw css::lang::IllegalArgumentException( - ::rtl::OUString("CURI::initialize: " + OUString("CURI::initialize: " "argument is not valid namespace"), *this, 0); } //FIXME: what is legal? @@ -785,24 +785,24 @@ void SAL_CALL CURI::initialize(const css::uno::Sequence< ::com::sun::star::uno:: m_LocalName = arg1; } else { throw css::lang::IllegalArgumentException( - ::rtl::OUString("CURI::initialize: " + OUString("CURI::initialize: " "argument is not valid local name"), *this, 1); } } // ::com::sun::star::rdf::XNode: -::rtl::OUString SAL_CALL CURI::getStringValue() throw (css::uno::RuntimeException) +OUString SAL_CALL CURI::getStringValue() throw (css::uno::RuntimeException) { return m_Namespace + m_LocalName; } // ::com::sun::star::rdf::XURI: -::rtl::OUString SAL_CALL CURI::getNamespace() throw (css::uno::RuntimeException) +OUString SAL_CALL CURI::getNamespace() throw (css::uno::RuntimeException) { return m_Namespace; } -::rtl::OUString SAL_CALL CURI::getLocalName() throw (css::uno::RuntimeException) +OUString SAL_CALL CURI::getLocalName() throw (css::uno::RuntimeException) { return m_LocalName; } @@ -814,8 +814,8 @@ void SAL_CALL CURI::initialize(const css::uno::Sequence< ::com::sun::star::uno:: // component helper namespace namespace comp_CURI { -::rtl::OUString SAL_CALL _getImplementationName() { - return ::rtl::OUString( +OUString SAL_CALL _getImplementationName() { + return OUString( "CURI"); } diff --git a/unoxml/source/rdf/librdf_repository.cxx b/unoxml/source/rdf/librdf_repository.cxx index be3e81f9dc12..eb1bb94c7b1a 100644 --- a/unoxml/source/rdf/librdf_repository.cxx +++ b/unoxml/source/rdf/librdf_repository.cxx @@ -85,7 +85,7 @@ class librdf_Repository; using namespace ::com::sun::star; -typedef std::map< ::rtl::OUString, ::rtl::Reference<librdf_NamedGraph> > +typedef std::map< OUString, ::rtl::Reference<librdf_NamedGraph> > NamedGraphMap_t; const char s_sparql [] = "sparql"; @@ -233,11 +233,11 @@ public: virtual ~librdf_Repository(); // ::com::sun::star::lang::XServiceInfo: - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (uno::RuntimeException); virtual ::sal_Bool SAL_CALL supportsService( - const ::rtl::OUString & ServiceName) throw (uno::RuntimeException); - virtual uno::Sequence< ::rtl::OUString > SAL_CALL + const OUString & ServiceName) throw (uno::RuntimeException); + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException); // ::com::sun::star::rdf::XRepository: @@ -281,14 +281,14 @@ public: throw (uno::RuntimeException, rdf::RepositoryException); virtual uno::Reference< rdf::XQuerySelectResult > SAL_CALL - querySelect(const ::rtl::OUString & i_rQuery) + querySelect(const OUString & i_rQuery) throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException); virtual uno::Reference< container::XEnumeration > SAL_CALL - queryConstruct(const ::rtl::OUString & i_rQuery) + queryConstruct(const OUString & i_rQuery) throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException); - virtual ::sal_Bool SAL_CALL queryAsk(const ::rtl::OUString & i_rQuery) + virtual ::sal_Bool SAL_CALL queryAsk(const OUString & i_rQuery) throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException); @@ -297,7 +297,7 @@ public: const uno::Reference< rdf::XResource > & i_xSubject, const uno::Sequence< uno::Reference< rdf::XURI > > & i_rPredicates, const uno::Reference< rdf::XMetadatable > & i_xObject, - const ::rtl::OUString & i_rRDFaContent, + const OUString & i_rRDFaContent, const uno::Reference< rdf::XURI > & i_xRDFaDatatype) throw (uno::RuntimeException, lang::IllegalArgumentException, rdf::RepositoryException); @@ -386,7 +386,7 @@ private: librdf_TypeConverter m_TypeConverter; /// set of xml:ids of elements with xhtml:content - ::std::set< ::rtl::OUString > m_RDFaXHTMLContentSet; + ::std::set< OUString > m_RDFaXHTMLContentSet; }; @@ -512,7 +512,7 @@ public: ::osl::Mutex & i_rMutex, boost::shared_ptr<librdf_query> const& i_pQuery, boost::shared_ptr<librdf_query_results> const& i_pQueryResult, - uno::Sequence< ::rtl::OUString > const& i_rBindingNames ) + uno::Sequence< OUString > const& i_rBindingNames ) : m_xRep(i_pRepository) , m_rMutex(i_rMutex) , m_pQuery(i_pQuery) @@ -530,7 +530,7 @@ public: lang::WrappedTargetException); // ::com::sun::star::rdf::XQuerySelectResult: - virtual uno::Sequence< ::rtl::OUString > SAL_CALL getBindingNames() + virtual uno::Sequence< OUString > SAL_CALL getBindingNames() throw (uno::RuntimeException); private: @@ -545,7 +545,7 @@ private: // queries must be freed only after all the results are completely read boost::shared_ptr<librdf_query> m_pQuery; boost::shared_ptr<librdf_query_results> m_pQueryResult; - uno::Sequence< ::rtl::OUString > m_BindingNames; + uno::Sequence< OUString > m_BindingNames; }; @@ -609,7 +609,7 @@ throw (uno::RuntimeException, container::NoSuchElementException, } // ::com::sun::star::rdf::XQuerySelectResult: -uno::Sequence< ::rtl::OUString > SAL_CALL +uno::Sequence< OUString > SAL_CALL librdf_QuerySelectResult::getBindingNames() throw (uno::RuntimeException) { return m_BindingNames; @@ -636,13 +636,13 @@ public: virtual ~librdf_NamedGraph() {} // ::com::sun::star::rdf::XNode: - virtual ::rtl::OUString SAL_CALL getStringValue() + virtual OUString SAL_CALL getStringValue() throw (uno::RuntimeException); // ::com::sun::star::rdf::XURI: - virtual ::rtl::OUString SAL_CALL getNamespace() + virtual OUString SAL_CALL getNamespace() throw (uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getLocalName() + virtual OUString SAL_CALL getLocalName() throw (uno::RuntimeException); // ::com::sun::star::rdf::XNamedGraph: @@ -680,20 +680,20 @@ private: // ::com::sun::star::rdf::XNode: -::rtl::OUString SAL_CALL librdf_NamedGraph::getStringValue() +OUString SAL_CALL librdf_NamedGraph::getStringValue() throw (uno::RuntimeException) { return m_xName->getStringValue(); } // ::com::sun::star::rdf::XURI: -::rtl::OUString SAL_CALL librdf_NamedGraph::getNamespace() +OUString SAL_CALL librdf_NamedGraph::getNamespace() throw (uno::RuntimeException) { return m_xName->getNamespace(); } -::rtl::OUString SAL_CALL librdf_NamedGraph::getLocalName() +OUString SAL_CALL librdf_NamedGraph::getLocalName() throw (uno::RuntimeException) { return m_xName->getLocalName(); @@ -811,16 +811,16 @@ librdf_Repository::~librdf_Repository() } // com.sun.star.uno.XServiceInfo: -::rtl::OUString SAL_CALL librdf_Repository::getImplementationName() +OUString SAL_CALL librdf_Repository::getImplementationName() throw (uno::RuntimeException) { return comp_librdf_Repository::_getImplementationName(); } ::sal_Bool SAL_CALL librdf_Repository::supportsService( - ::rtl::OUString const & serviceName) throw (uno::RuntimeException) + OUString const & serviceName) throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > serviceNames + uno::Sequence< OUString > serviceNames = comp_librdf_Repository::_getSupportedServiceNames(); for (::sal_Int32 i = 0; i < serviceNames.getLength(); ++i) { if (serviceNames[i] == serviceName) @@ -829,7 +829,7 @@ throw (uno::RuntimeException) return sal_False; } -uno::Sequence< ::rtl::OUString > SAL_CALL +uno::Sequence< OUString > SAL_CALL librdf_Repository::getSupportedServiceNames() throw (uno::RuntimeException) { return comp_librdf_Repository::_getSupportedServiceNames(); @@ -854,7 +854,7 @@ throw (uno::RuntimeException) "librdf_Repository::createBlankNode: " "librdf_node_get_blank_identifier failed", *this); } - const ::rtl::OUString nodeID(::rtl::OUString::createFromAscii( + const OUString nodeID(OUString::createFromAscii( reinterpret_cast<const char *>(id))); try { return rdf::BlankNode::create(m_xContext, nodeID); @@ -906,19 +906,19 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, "librdf_Repository::importGraph: base URI is null", *this, 3); } OSL_ENSURE(i_xBaseURI.is(), "no base uri"); - const ::rtl::OUString baseURIU( i_xBaseURI->getStringValue() ); + const OUString baseURIU( i_xBaseURI->getStringValue() ); if (baseURIU.indexOf('#') >= 0) { throw lang::IllegalArgumentException( "librdf_Repository::importGraph: base URI is not absolute", *this, 3); } - const ::rtl::OUString contextU( i_xGraphName->getStringValue() ); + const OUString contextU( i_xGraphName->getStringValue() ); if (m_NamedGraphs.find(contextU) != m_NamedGraphs.end()) { throw container::ElementExistException( "librdf_Repository::importGraph: graph with given URI exists", *this); } - const ::rtl::OString context( - ::rtl::OUStringToOString(contextU, RTL_TEXTENCODING_UTF8) ); + const OString context( + OUStringToOString(contextU, RTL_TEXTENCODING_UTF8) ); const boost::shared_ptr<librdf_node> pContext( librdf_new_node_from_uri_string(m_pWorld.get(), @@ -929,8 +929,8 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, "librdf_Repository::importGraph: librdf_new_node_from_uri_string failed", *this); } - const ::rtl::OString baseURI( - ::rtl::OUStringToOString(baseURIU, RTL_TEXTENCODING_UTF8) ); + const OString baseURI( + OUStringToOString(baseURIU, RTL_TEXTENCODING_UTF8) ); const boost::shared_ptr<librdf_uri> pBaseURI( librdf_new_uri(m_pWorld.get(), reinterpret_cast<const unsigned char*> (baseURI.getStr())), @@ -1007,7 +1007,7 @@ void addChaffWhenEncryptedStorage(const uno::Reference< io::XOutputStream > &rSt reinterpret_cast<sal_Int8*>(pBuffer), preamblelen); rStream->writeBytes(buf); - rtl::OStringBuffer aComment; + OStringBuffer aComment; aComment.append("<!--"); aComment.append(comphelper::xml::makeXMLChaff()); aComment.append("-->"); @@ -1055,21 +1055,21 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, "base URI is null", *this, 3); } OSL_ENSURE(i_xBaseURI.is(), "no base uri"); - const ::rtl::OUString baseURIU( i_xBaseURI->getStringValue() ); + const OUString baseURIU( i_xBaseURI->getStringValue() ); if (baseURIU.indexOf('#') >= 0) { throw lang::IllegalArgumentException( "librdf_Repository::exportGraph: " "base URI is not absolute", *this, 3); } - const ::rtl::OUString contextU( i_xGraphName->getStringValue() ); + const OUString contextU( i_xGraphName->getStringValue() ); if (m_NamedGraphs.find(contextU) == m_NamedGraphs.end()) { throw container::NoSuchElementException( "librdf_Repository::exportGraph: " "no graph with given URI exists", *this); } - const ::rtl::OString context( - ::rtl::OUStringToOString(contextU, RTL_TEXTENCODING_UTF8) ); + const OString context( + OUStringToOString(contextU, RTL_TEXTENCODING_UTF8) ); const boost::shared_ptr<librdf_node> pContext( librdf_new_node_from_uri_string(m_pWorld.get(), @@ -1080,8 +1080,8 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, "librdf_Repository::exportGraph: " "librdf_new_node_from_uri_string failed", *this); } - const ::rtl::OString baseURI( - ::rtl::OUStringToOString(baseURIU, RTL_TEXTENCODING_UTF8) ); + const OString baseURI( + OUStringToOString(baseURIU, RTL_TEXTENCODING_UTF8) ); const boost::shared_ptr<librdf_uri> pBaseURI( librdf_new_uri(m_pWorld.get(), reinterpret_cast<const unsigned char*> (baseURI.getStr())), @@ -1215,7 +1215,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, // NB: librdf does not have a concept of graphs as such; // a librdf named graph exists iff the model contains a statement with // the graph name as context - const ::rtl::OUString contextU( i_xGraphName->getStringValue() ); + const OUString contextU( i_xGraphName->getStringValue() ); if (m_NamedGraphs.find(contextU) != m_NamedGraphs.end()) { throw container::ElementExistException( "librdf_Repository::createGraph: graph with given URI exists", *this); @@ -1282,12 +1282,12 @@ throw (uno::RuntimeException, rdf::RepositoryException) uno::Reference< rdf::XQuerySelectResult > SAL_CALL -librdf_Repository::querySelect(const ::rtl::OUString & i_rQuery) +librdf_Repository::querySelect(const OUString & i_rQuery) throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException) { ::osl::MutexGuard g(m_aMutex); - const ::rtl::OString query( - ::rtl::OUStringToOString(i_rQuery, RTL_TEXTENCODING_UTF8) ); + const OString query( + OUStringToOString(i_rQuery, RTL_TEXTENCODING_UTF8) ); const boost::shared_ptr<librdf_query> pQuery( librdf_new_query(m_pWorld.get(), s_sparql, NULL, reinterpret_cast<const unsigned char*> (query.getStr()), NULL), @@ -1308,7 +1308,7 @@ throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException) const int count( librdf_query_results_get_bindings_count(pResults.get()) ); if (count >= 0) { - uno::Sequence< ::rtl::OUString > names(count); + uno::Sequence< OUString > names(count); for (int i = 0; i < count; ++i) { const char* name( librdf_query_results_get_binding_name( pResults.get(), i) ); @@ -1317,7 +1317,7 @@ throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException) "librdf_Repository::querySelect: binding is null", *this); } - names[i] = ::rtl::OUString::createFromAscii(name); + names[i] = OUString::createFromAscii(name); } return new librdf_QuerySelectResult(this, m_aMutex, @@ -1331,12 +1331,12 @@ throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException) } uno::Reference< container::XEnumeration > SAL_CALL -librdf_Repository::queryConstruct(const ::rtl::OUString & i_rQuery) +librdf_Repository::queryConstruct(const OUString & i_rQuery) throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException) { ::osl::MutexGuard g(m_aMutex); - const ::rtl::OString query( - ::rtl::OUStringToOString(i_rQuery, RTL_TEXTENCODING_UTF8) ); + const OString query( + OUStringToOString(i_rQuery, RTL_TEXTENCODING_UTF8) ); const boost::shared_ptr<librdf_query> pQuery( librdf_new_query(m_pWorld.get(), s_sparql, NULL, reinterpret_cast<const unsigned char*> (query.getStr()), NULL), @@ -1368,13 +1368,13 @@ throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException) } ::sal_Bool SAL_CALL -librdf_Repository::queryAsk(const ::rtl::OUString & i_rQuery) +librdf_Repository::queryAsk(const OUString & i_rQuery) throw (uno::RuntimeException, rdf::QueryException, rdf::RepositoryException) { ::osl::MutexGuard g(m_aMutex); - const ::rtl::OString query( - ::rtl::OUStringToOString(i_rQuery, RTL_TEXTENCODING_UTF8) ); + const OString query( + OUStringToOString(i_rQuery, RTL_TEXTENCODING_UTF8) ); const boost::shared_ptr<librdf_query> pQuery( librdf_new_query(m_pWorld.get(), s_sparql, NULL, reinterpret_cast<const unsigned char*> (query.getStr()), NULL), @@ -1401,16 +1401,16 @@ void SAL_CALL librdf_Repository::setStatementRDFa( const uno::Reference< rdf::XResource > & i_xSubject, const uno::Sequence< uno::Reference< rdf::XURI > > & i_rPredicates, const uno::Reference< rdf::XMetadatable > & i_xObject, - const ::rtl::OUString & i_rRDFaContent, + const OUString & i_rRDFaContent, const uno::Reference< rdf::XURI > & i_xRDFaDatatype) throw (uno::RuntimeException, lang::IllegalArgumentException, rdf::RepositoryException) { - static const ::rtl::OUString s_cell("com.sun.star.table.Cell"); - static const ::rtl::OUString s_cellprops("com.sun.star.text.CellProperties"); // for writer - static const ::rtl::OUString s_paragraph("com.sun.star.text.Paragraph"); - static const ::rtl::OUString s_bookmark("com.sun.star.text.Bookmark"); - static const ::rtl::OUString s_meta("com.sun.star.text.InContentMetadata"); + static const OUString s_cell("com.sun.star.table.Cell"); + static const OUString s_cellprops("com.sun.star.text.CellProperties"); // for writer + static const OUString s_paragraph("com.sun.star.text.Paragraph"); + static const OUString s_bookmark("com.sun.star.text.Bookmark"); + static const OUString s_meta("com.sun.star.text.InContentMetadata"); if (!i_xSubject.is()) { throw lang::IllegalArgumentException( @@ -1461,11 +1461,11 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, "librdf_Repository::setStatementRDFa: " "ensureMetadataReference did not", *this); } - ::rtl::OUString const sXmlId(mdref.First + "#" + mdref.Second); + OUString const sXmlId(mdref.First + "#" + mdref.Second); uno::Reference<rdf::XURI> xXmlId; try { xXmlId.set( rdf::URI::create(m_xContext, - ::rtl::OUString::createFromAscii(s_nsOOo) + sXmlId), + OUString::createFromAscii(s_nsOOo) + sXmlId), uno::UNO_QUERY_THROW); } catch (const lang::IllegalArgumentException & iae) { throw lang::WrappedTargetRuntimeException( @@ -1474,7 +1474,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, } ::osl::MutexGuard g(m_aMutex); - ::rtl::OUString const content( (i_rRDFaContent.isEmpty()) + OUString const content( (i_rRDFaContent.isEmpty()) ? xTextRange->getString() : i_rRDFaContent ); uno::Reference<rdf::XNode> xContent; @@ -1522,7 +1522,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, uno::Reference<rdf::XURI> xXmlId; try { xXmlId.set( rdf::URI::create(m_xContext, - ::rtl::OUString::createFromAscii(s_nsOOo) + OUString::createFromAscii(s_nsOOo) + mdref.First + "#" + mdref.Second), uno::UNO_QUERY_THROW); @@ -1549,11 +1549,11 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, if ((mdref.First.isEmpty()) || (mdref.Second.isEmpty())) { return beans::Pair< uno::Sequence<rdf::Statement>, sal_Bool >(); } - ::rtl::OUString const sXmlId(mdref.First + "#" + mdref.Second); + OUString const sXmlId(mdref.First + "#" + mdref.Second); uno::Reference<rdf::XURI> xXmlId; try { xXmlId.set( rdf::URI::create(m_xContext, - ::rtl::OUString::createFromAscii(s_nsOOo) + sXmlId), + OUString::createFromAscii(s_nsOOo) + sXmlId), uno::UNO_QUERY_THROW); } catch (const lang::IllegalArgumentException & iae) { throw lang::WrappedTargetRuntimeException( @@ -1666,15 +1666,15 @@ const NamedGraphMap_t::iterator SAL_CALL librdf_Repository::clearGraph( "librdf_Repository::clearGraph: URI is null", *this, 0); } ::osl::MutexGuard g(m_aMutex); - const ::rtl::OUString contextU( i_xGraphName->getStringValue() ); + const OUString contextU( i_xGraphName->getStringValue() ); const NamedGraphMap_t::iterator iter( m_NamedGraphs.find(contextU) ); if (!i_Internal && iter == m_NamedGraphs.end()) { throw container::NoSuchElementException( "librdf_Repository::clearGraph: " "no graph with given URI exists", *this); } - const ::rtl::OString context( - ::rtl::OUStringToOString(contextU, RTL_TEXTENCODING_UTF8) ); + const OString context( + OUStringToOString(contextU, RTL_TEXTENCODING_UTF8) ); const boost::shared_ptr<librdf_node> pContext( librdf_new_node_from_uri_string(m_pWorld.get(), @@ -1718,14 +1718,14 @@ void librdf_Repository::addStatementGraph( } ::osl::MutexGuard g(m_aMutex); - const ::rtl::OUString contextU( i_xGraphName->getStringValue() ); + const OUString contextU( i_xGraphName->getStringValue() ); if (!i_Internal && (m_NamedGraphs.find(contextU) == m_NamedGraphs.end())) { throw container::NoSuchElementException( "librdf_Repository::addStatement: " "no graph with given URI exists", *this); } - const ::rtl::OString context( - ::rtl::OUStringToOString(contextU, RTL_TEXTENCODING_UTF8) ); + const OString context( + OUStringToOString(contextU, RTL_TEXTENCODING_UTF8) ); const boost::shared_ptr<librdf_node> pContext( librdf_new_node_from_uri_string(m_pWorld.get(), @@ -1778,14 +1778,14 @@ void librdf_Repository::removeStatementsGraph( } ::osl::MutexGuard g(m_aMutex); - const ::rtl::OUString contextU( i_xGraphName->getStringValue() ); + const OUString contextU( i_xGraphName->getStringValue() ); if (m_NamedGraphs.find(contextU) == m_NamedGraphs.end()) { throw container::NoSuchElementException( "librdf_Repository::removeStatements: " "no graph with given URI exists", *this); } - const ::rtl::OString context( - ::rtl::OUStringToOString(contextU, RTL_TEXTENCODING_UTF8) ); + const OString context( + OUStringToOString(contextU, RTL_TEXTENCODING_UTF8) ); const boost::shared_ptr<librdf_node> pContext( librdf_new_node_from_uri_string(m_pWorld.get(), @@ -1854,14 +1854,14 @@ librdf_Repository::getStatementsGraph( } ::osl::MutexGuard g(m_aMutex); - const ::rtl::OUString contextU( i_xGraphName->getStringValue() ); + const OUString contextU( i_xGraphName->getStringValue() ); if (!i_Internal && (m_NamedGraphs.find(contextU) == m_NamedGraphs.end())) { throw container::NoSuchElementException( "librdf_Repository::getStatements: " "no graph with given URI exists", *this); } - const ::rtl::OString context( - ::rtl::OUStringToOString(contextU, RTL_TEXTENCODING_UTF8) ); + const OString context( + OUStringToOString(contextU, RTL_TEXTENCODING_UTF8) ); const boost::shared_ptr<librdf_node> pContext( librdf_new_node_from_uri_string(m_pWorld.get(), @@ -1961,8 +1961,8 @@ librdf_model *librdf_TypeConverter::createModel( librdf_uri* librdf_TypeConverter::mkURI( librdf_world* i_pWorld, const uno::Reference< rdf::XURI > & i_xURI) const { - const ::rtl::OString uri( - ::rtl::OUStringToOString(i_xURI->getStringValue(), + const OString uri( + OUStringToOString(i_xURI->getStringValue(), RTL_TEXTENCODING_UTF8) ); librdf_uri *pURI( librdf_new_uri(i_pWorld, reinterpret_cast<const unsigned char *>(uri.getStr()))); @@ -1980,8 +1980,8 @@ librdf_node* librdf_TypeConverter::mkResource( librdf_world* i_pWorld, if (!i_xResource.is()) return 0; uno::Reference< rdf::XBlankNode > xBlankNode(i_xResource, uno::UNO_QUERY); if (xBlankNode.is()) { - const ::rtl::OString label( - ::rtl::OUStringToOString(xBlankNode->getStringValue(), + const OString label( + OUStringToOString(xBlankNode->getStringValue(), RTL_TEXTENCODING_UTF8) ); librdf_node *pNode( librdf_new_node_from_blank_identifier(i_pWorld, @@ -1993,8 +1993,8 @@ librdf_node* librdf_TypeConverter::mkResource( librdf_world* i_pWorld, } return pNode; } else { // assumption: everything else is URI - const ::rtl::OString uri( - ::rtl::OUStringToOString(i_xResource->getStringValue(), + const OString uri( + OUStringToOString(i_xResource->getStringValue(), RTL_TEXTENCODING_UTF8) ); librdf_node *pNode( librdf_new_node_from_uri_string(i_pWorld, @@ -2021,11 +2021,11 @@ librdf_node* librdf_TypeConverter::mkNode( librdf_world* i_pWorld, OSL_ENSURE(xLiteral.is(), "mkNode: someone invented a new rdf.XNode and did not tell me"); if (!xLiteral.is()) return 0; - const ::rtl::OString val( - ::rtl::OUStringToOString(xLiteral->getValue(), + const OString val( + OUStringToOString(xLiteral->getValue(), RTL_TEXTENCODING_UTF8) ); - const ::rtl::OString lang( - ::rtl::OUStringToOString(xLiteral->getLanguage(), + const OString lang( + OUStringToOString(xLiteral->getLanguage(), RTL_TEXTENCODING_UTF8) ); const uno::Reference< rdf::XURI > xType(xLiteral->getDatatype()); librdf_node * ret(0); @@ -2102,8 +2102,8 @@ librdf_TypeConverter::convertToXURI(librdf_uri* i_pURI) const "librdf_TypeConverter::convertToXURI: " "librdf_uri_as_string failed", m_rRep); } - ::rtl::OUString uriU( ::rtl::OStringToOUString( - ::rtl::OString(reinterpret_cast<const sal_Char*>(uri)), + OUString uriU( OStringToOUString( + OString(reinterpret_cast<const sal_Char*>(uri)), RTL_TEXTENCODING_UTF8) ); try { return rdf::URI::create(m_xContext, uriU); @@ -2143,8 +2143,8 @@ librdf_TypeConverter::convertToXResource(librdf_node* i_pNode) const "librdf_TypeConverter::convertToXResource: " "blank node has no label", m_rRep); } - ::rtl::OUString labelU( ::rtl::OStringToOUString( - ::rtl::OString(reinterpret_cast<const sal_Char*>(label)), + OUString labelU( OStringToOUString( + OString(reinterpret_cast<const sal_Char*>(label)), RTL_TEXTENCODING_UTF8) ); try { return uno::Reference<rdf::XResource>( @@ -2178,12 +2178,12 @@ librdf_TypeConverter::convertToXNode(librdf_node* i_pNode) const librdf_uri* pType( librdf_node_get_literal_value_datatype_uri(i_pNode) ); OSL_ENSURE(!lang || !pType, "convertToXNode: invalid literal"); - const ::rtl::OUString valueU( ::rtl::OStringToOUString( - ::rtl::OString(reinterpret_cast<const sal_Char*>(value)), + const OUString valueU( OStringToOUString( + OString(reinterpret_cast<const sal_Char*>(value)), RTL_TEXTENCODING_UTF8) ); if (lang) { - const ::rtl::OUString langU( ::rtl::OStringToOUString( - ::rtl::OString(reinterpret_cast<const sal_Char*>(lang)), + const OUString langU( OStringToOUString( + OString(reinterpret_cast<const sal_Char*>(lang)), RTL_TEXTENCODING_UTF8) ); return uno::Reference<rdf::XNode>( rdf::Literal::createWithLanguage(m_xContext, valueU, langU), @@ -2222,13 +2222,13 @@ librdf_TypeConverter::convertToStatement(librdf_statement* i_pStmt, // component helper namespace namespace comp_librdf_Repository { -::rtl::OUString SAL_CALL _getImplementationName() { - return rtl::OUString("librdf_Repository"); +OUString SAL_CALL _getImplementationName() { + return OUString("librdf_Repository"); } -uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames() { - uno::Sequence< ::rtl::OUString > s(1); + uno::Sequence< OUString > s(1); s[0] = "com.sun.star.rdf.Repository"; return s; } diff --git a/unoxml/source/rdf/librdf_repository.hxx b/unoxml/source/rdf/librdf_repository.hxx index 5cfe623b8999..c3effbabaf71 100644 --- a/unoxml/source/rdf/librdf_repository.hxx +++ b/unoxml/source/rdf/librdf_repository.hxx @@ -28,8 +28,8 @@ namespace comp_librdf_Repository { // component and service helper functions: -::rtl::OUString SAL_CALL _getImplementationName(); -css::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames(); +OUString SAL_CALL _getImplementationName(); +css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames(); css::uno::Reference< css::uno::XInterface > SAL_CALL _create( css::uno::Reference< css::uno::XComponentContext > const & context ); } // closing component helper namespace diff --git a/unoxml/source/service/services.cxx b/unoxml/source/service/services.cxx index d568446b7d33..bc60fa5bc7bc 100644 --- a/unoxml/source/service/services.cxx +++ b/unoxml/source/service/services.cxx @@ -37,7 +37,6 @@ using namespace ::DOM; using namespace ::DOM::events; using namespace ::XPath; -using ::rtl::OUString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::registry; diff --git a/unoxml/source/xpath/nodelist.hxx b/unoxml/source/xpath/nodelist.hxx index 2f800528f26e..3fcdee8aa9f4 100644 --- a/unoxml/source/xpath/nodelist.hxx +++ b/unoxml/source/xpath/nodelist.hxx @@ -35,8 +35,6 @@ #include <boost/shared_ptr.hpp> - -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; using namespace com::sun::star::xml::xpath; diff --git a/unoxml/source/xpath/xpathapi.cxx b/unoxml/source/xpath/xpathapi.cxx index c9d7e64cd709..6a50933e47c5 100644 --- a/unoxml/source/xpath/xpathapi.cxx +++ b/unoxml/source/xpath/xpathapi.cxx @@ -265,7 +265,7 @@ namespace XPath static OUString make_error_message(xmlErrorPtr pError) { - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; if (pError->message) { buf.appendAscii(pError->message); } @@ -300,7 +300,7 @@ namespace XPath vsnprintf(str, sizeof(str), format, args); va_end(args); - ::rtl::OUStringBuffer buf( + OUStringBuffer buf( "libxml2 error:\n"); buf.appendAscii(str); OString msg = OUStringToOString(buf.makeStringAndClear(), @@ -311,7 +311,7 @@ namespace XPath static void structured_error_func(void * userData, xmlErrorPtr error) { (void) userData; - ::rtl::OUStringBuffer buf( + OUStringBuffer buf( "libxml2 error:\n"); if (error) { buf.append(make_error_message(error)); diff --git a/unoxml/source/xpath/xpathapi.hxx b/unoxml/source/xpath/xpathapi.hxx index 89d00bd6067d..3e20adbd2e58 100644 --- a/unoxml/source/xpath/xpathapi.hxx +++ b/unoxml/source/xpath/xpathapi.hxx @@ -43,8 +43,6 @@ #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> - -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; using namespace com::sun::star::xml::xpath; diff --git a/unoxml/source/xpath/xpathobject.hxx b/unoxml/source/xpath/xpathobject.hxx index f27a2bd23a27..57d181bd92f6 100644 --- a/unoxml/source/xpath/xpathobject.hxx +++ b/unoxml/source/xpath/xpathobject.hxx @@ -34,8 +34,6 @@ #include <com/sun/star/xml/dom/XNodeList.hpp> #include <com/sun/star/xml/xpath/XXPathObject.hpp> - -using ::rtl::OUString; using namespace com::sun::star::uno; using namespace com::sun::star::xml::dom; using namespace com::sun::star::xml::xpath; diff --git a/unoxml/test/domtest.cxx b/unoxml/test/domtest.cxx index abd32f8fea02..f61831e689b2 100644 --- a/unoxml/test/domtest.cxx +++ b/unoxml/test/domtest.cxx @@ -124,7 +124,7 @@ struct DocumentHandler Element & 0xFFFF, Element & 0xFFFF0000); } - virtual void SAL_CALL startUnknownElement( const ::rtl::OUString& Namespace, const ::rtl::OUString& Name, const uno::Reference< xml::sax::XFastAttributeList >& Attribs ) throw (xml::sax::SAXException, uno::RuntimeException) + virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const uno::Reference< xml::sax::XFastAttributeList >& Attribs ) throw (xml::sax::SAXException, uno::RuntimeException) { } @@ -132,7 +132,7 @@ struct DocumentHandler { } - virtual void SAL_CALL endUnknownElement( const ::rtl::OUString& Namespace, const ::rtl::OUString& Name ) throw (xml::sax::SAXException, uno::RuntimeException) + virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (xml::sax::SAXException, uno::RuntimeException) { } @@ -141,12 +141,12 @@ struct DocumentHandler return this; } - virtual uno::Reference< xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const ::rtl::OUString& Namespace, const ::rtl::OUString& Name, const uno::Reference< xml::sax::XFastAttributeList >& Attribs ) throw (xml::sax::SAXException, uno::RuntimeException) + virtual uno::Reference< xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const uno::Reference< xml::sax::XFastAttributeList >& Attribs ) throw (xml::sax::SAXException, uno::RuntimeException) { return this; } - virtual void SAL_CALL characters( const ::rtl::OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException) + virtual void SAL_CALL characters( const OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException) { } @@ -167,18 +167,18 @@ struct DocumentHandler struct TokenHandler : public ::cppu::WeakImplHelper1< xml::sax::XFastTokenHandler > { - virtual ::sal_Int32 SAL_CALL getToken( const ::rtl::OUString& Identifier ) throw (uno::RuntimeException) + virtual ::sal_Int32 SAL_CALL getToken( const OUString& Identifier ) throw (uno::RuntimeException) { CPPUNIT_ASSERT_MESSAGE( "TokenHandler::getToken() unexpected call", false ); return -1; } - virtual ::rtl::OUString SAL_CALL getIdentifier( ::sal_Int32 Token ) throw (uno::RuntimeException) + virtual OUString SAL_CALL getIdentifier( ::sal_Int32 Token ) throw (uno::RuntimeException) { CPPUNIT_ASSERT_MESSAGE( "TokenHandler::getIdentifier() unexpected call", false ); - return rtl::OUString(); + return OUString(); } virtual ::sal_Int32 SAL_CALL getTokenFromUTF8( const uno::Sequence< ::sal_Int8 >& Identifier ) throw (uno::RuntimeException) @@ -282,7 +282,7 @@ struct SerializerTest : public CppUnit::TestFixture rtl::Reference<SequenceInputStream> mxInStream; rtl::Reference<DocumentHandler> mxHandler; rtl::Reference<TokenHandler> mxTokHandler; - uno::Sequence< beans::Pair< rtl::OUString, sal_Int32 > > maRegisteredNamespaces; + uno::Sequence< beans::Pair< OUString, sal_Int32 > > maRegisteredNamespaces; bool mbUnoInitialized; void setUp() @@ -293,12 +293,12 @@ struct SerializerTest : public CppUnit::TestFixture const char* pArgs( getForwardString() ); CPPUNIT_ASSERT_MESSAGE("Test file parameter", pArgs); - const rtl::OUString sBaseDir=rtl::OUString::createFromAscii(pArgs); + const OUString sBaseDir=OUString::createFromAscii(pArgs); // bootstrap UNO try { - ::rtl::OUString aIniUrl; + OUString aIniUrl; CPPUNIT_ASSERT_MESSAGE( "Converting ini file to URL", osl_getFileURLFromSystemPath( @@ -330,10 +330,10 @@ struct SerializerTest : public CppUnit::TestFixture maRegisteredNamespaces.realloc(2); maRegisteredNamespaces[0] = beans::make_Pair( - rtl::OUString( "urn:oasis:names:tc:opendocument:xmlns:office:1.0" ), + OUString( "urn:oasis:names:tc:opendocument:xmlns:office:1.0" ), xml::sax::FastToken::NAMESPACE); maRegisteredNamespaces[1] = beans::make_Pair( - rtl::OUString( "http://www.w3.org/1999/xlink" ), + OUString( "http://www.w3.org/1999/xlink" ), 2*xml::sax::FastToken::NAMESPACE); } |