include: convert type scope="foo"> here too

sed -i 's,<type scope="\([^"]*\)">\([^<]\+\)</type>,\1::\2,g'

Change-Id: I7eb32acd44132de79cc7ac1e7f78b43bb4814d14

include/comphelper/componentbase.hxx

@@ -37,7 +37,7 @@ namespace comphelper
         /** creates a ComponentBase instance
 
             The instance is not initialized. As a consequence, every ComponentMethodGuard instantiated for
-            this component will throw a <type scope="com::sun::star::lang">NotInitializedException</type>,
+            this component will throw a com::sun::star::lang::NotInitializedException,
             until ->setInitialized() is called.
         */
         ComponentBase( ::cppu::OBroadcastHelper& _rBHelper )

include/comphelper/componentcontext.hxx

@@ -52,7 +52,7 @@ namespace comphelper
 
         /** constructs an instance
             @param _rxLegacyFactory
-                the legacy service factor to obtain the <type scope="com::sun::star::uno">XComponentContext</type> from
+                the legacy service factor to obtain the com::sun::star::uno::XComponentContext from
             @throws ::com::sun::star::uno::RuntimeException
                 if the given factory or does not have a DefaultContext property to obtain
                 a component context

include/comphelper/enumhelper.hxx

@@ -51,8 +51,8 @@ struct OEnumerationLock
 //==================================================================
 //= OEnumerationByName
 //==================================================================
-/** provides an <type scope="com.sun.star.container">XEnumeration</type> access based
-    on an object implementing the <type scope="com.sun.star.container">XNameAccess</type> interface
+/** provides an com.sun.star.container::XEnumeration access based
+    on an object implementing the com.sun.star.container::XNameAccess interface
 */
 class COMPHELPER_DLLPUBLIC OEnumerationByName : private OEnumerationLock
                          , public ::cppu::WeakImplHelper2< starcontainer::XEnumeration ,
@@ -83,8 +83,8 @@ private:
 //==================================================================
 //= OEnumerationByIndex
 //==================================================================
-/** provides an <type scope="com.sun.star.container">XEnumeration</type> access based
-    on an object implementing the <type scope="com.sun.star.container">XNameAccess</type> interface
+/** provides an com.sun.star.container::XEnumeration access based
+    on an object implementing the com.sun.star.container::XNameAccess interface
 */
 class COMPHELPER_DLLPUBLIC OEnumerationByIndex : private OEnumerationLock
                           , public ::cppu::WeakImplHelper2< starcontainer::XEnumeration ,
@@ -112,7 +112,7 @@ private:
 //==================================================================
 //= OAnyEnumeration
 //==================================================================
-/** provides an <type scope="com.sun.star.container">XEnumeration</type>
+/** provides an com.sun.star.container::XEnumeration
     for an outside set vector of Any's.
 
 */

include/comphelper/interaction.hxx

@@ -131,7 +131,7 @@ namespace comphelper
     //=========================================================================
     typedef ::cppu::WeakImplHelper1 <   ::com::sun::star::task::XInteractionRequest
                                     >   OInteractionRequest_Base;
-    /** implements an interaction request (<type scope="com.sun.star.task">XInteractionRequest</type>)<p/>
+    /** implements an interaction request (com.sun.star.task::XInteractionRequest)<p/>
         at run time, you can freely add any interaction continuation objects
     */
     class COMPHELPER_DLLPUBLIC OInteractionRequest : public OInteractionRequest_Base

include/comphelper/listenernotification.hxx

@@ -160,9 +160,9 @@ namespace comphelper
         This class is not threadsafe!
 
         @param LISTENER
-            the listener class to call, e.g. <type scope="com::sun::star::lang">XEventListener</type>
+            the listener class to call, e.g. com::sun::star::lang::XEventListener
         @param EVENT
-            the event type to notify, e.g. <type scope="com::sun::star::lang">EventObject</type>
+            the event type to notify, e.g. com::sun::star::lang::EventObject
     */
     template< class LISTENER, class EVENT >
     class OSimpleListenerContainer : protected OListenerContainer

include/comphelper/logging.hxx

@@ -67,7 +67,7 @@ namespace comphelper
     class EventLogger_Impl;
     typedef ::boost::optional< OUString >    OptionalString;
 
-    /** encapsulates an <type scope="com::sun::star::logging">XLogger</type>
+    /** encapsulates an com::sun::star::logging::XLogger
 
         The class silences several (unlikely) errors which could potentially happen
         when working with a logger. Additionally, it provides some convenience methods

include/comphelper/mediadescriptor.hxx

@@ -30,7 +30,7 @@ namespace com { namespace sun { namespace star { namespace io {
 
 namespace comphelper{
 
-/** @short  can be used to work with a <type scope="::com::sun::star::document">MediaDescriptor</type>
+/** @short  can be used to work with a ::com::sun::star::document::MediaDescriptor
             struct.
 
     @descr  It wraps a ::boost::unordered_map around the Sequence< css::beans::PropertyValue >, which

include/comphelper/officeresourcebundle.hxx

@@ -36,7 +36,7 @@ namespace comphelper
     //= OfficeResourceBundle
     //====================================================================
     class ResourceBundle_Impl;
-    /** wraps the <type scope="com::sun::star::resource">OfficeResourceAccess</type> service
+    /** wraps the com::sun::star::resource::OfficeResourceAccess service
     */
     class COMPHELPER_DLLPUBLIC OfficeResourceBundle
     {

include/comphelper/propertycontainerhelper.hxx

@@ -38,7 +38,7 @@ struct COMPHELPER_DLLPUBLIC PropertyDescription
     enum LocationType
     {
         ltDerivedClassRealType,     // within the derived class, it's a "real" (non-Any) type
-        ltDerivedClassAnyType,      // within the derived class, it's a <type scope="com.sun.star.uno">Any</type>
+        ltDerivedClassAnyType,      // within the derived class, it's a com.sun.star.uno::Any
         ltHoldMyself                // within m_aHoldProperties
     };
     // the location of an object holding a property value :

include/comphelper/sequenceashashmap.hxx

@@ -99,7 +99,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase
             @param  aSource
                     contains the new items for this map.
 
-            @throw  An <type scope="com::sun::star::beans">IllegalTypeException</type>
+            @throw  An com::sun::star::beans::IllegalTypeException
                     is thrown, if the given any does not contain a suitable sequence ...
                     but not if its a VOID Any!
          */
@@ -114,7 +114,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase
             @param  lSource
                     contains the new items for this map.
 
-            @throw  An <type scope="com::sun::star::beans">IllegalTypeException</type>
+            @throw  An com::sun::star::beans::IllegalTypeException
                     is thrown, if the given any sequence
                     uses wrong types for its items. VOID Any will be ignored!
          */

include/comphelper/sequenceasvector.hxx

@@ -108,7 +108,7 @@ class SequenceAsVector : public ::std::vector< TElementType >
             @param      aSource
                         this any must contain a suitable sequence. :-)
 
-            @throw      A <type scope="com::sun::star::beans">IllegalTypeException</type>
+            @throw      A com::sun::star::beans::IllegalTypeException
                         if an unsupported element inside this Any
                         is given. An empty Any reset this instance!
          */
@@ -147,7 +147,7 @@ class SequenceAsVector : public ::std::vector< TElementType >
             @param      aSource
                         this any must contain a suitable sequence. :-)
 
-            @throw      A <type scope="com::sun::star::beans">IllegalTypeException</type>
+            @throw      A com::sun::star::beans::IllegalTypeException
                         if an unsupported element inside this Any
                         is given. An empty Any reset this instance!
          */

include/comphelper/streamsection.hxx

@@ -51,13 +51,13 @@ class COMPHELPER_DLLPUBLIC OStreamSection
 public:
     /** starts reading of a "skippable" section of data within the given input stream<BR>
         @param      _rxInput    the stream to read from. Must support the
-                                <type scope="com::sun::star::io">XMarkableStream</type> interface
+                                com::sun::star::io::XMarkableStream interface
     */
     OStreamSection(const staruno::Reference< stario::XDataInputStream >& _rxInput);
 
     /** starts writing of a "skippable" section of data into the given output stream
         @param      _rxOutput           the stream the stream to write to. Must support the
-                                        <type scope="com::sun::star::io">XMarkableStream</type> interface
+                                        com::sun::star::io::XMarkableStream interface
         @param      _nPresumedLength    estimation for the length of the upcoming section. If greater 0, this
                                         value will be written as section length and corrected (in the dtor) only if
                                         needed. If you know how much bytes you are about to write, you may

include/comphelper/types.hxx

@@ -135,7 +135,7 @@ namespace comphelper
     */
     COMPHELPER_DLLPUBLIC starawt::FontDescriptor    getDefaultFont();
 
-    /** examine a sequence for the <type scope="com.sun.star.uno">Type</type> of it's elements.
+    /** examine a sequence for the com.sun.star.uno::Type of it's elements.
     */
     COMPHELPER_DLLPUBLIC staruno::Type getSequenceElementType(const staruno::Type& _rSequenceType);
 

include/connectivity/dbtools.hxx

@@ -222,9 +222,9 @@ namespace dbtools
     /** get fields for a result set given by a "command descriptor"
 
         <p>A command descriptor here means:
-        <ul><li>a SDB-level connection (<type scope="com.sun.star.sdb">Connection</type></li>
+        <ul><li>a SDB-level connection (com.sun.star.sdb::Connection</li>
             <li>a string specifying the name of an object relative to the connection</li>
-            <li>a <type scope="com.sun.star.sdb">CommandType</type> value specifying the type
+            <li>a com.sun.star.sdb::CommandType value specifying the type
                 of the object</type></li>
         </ul>
         </p>
@@ -272,9 +272,9 @@ namespace dbtools
     /** get fields for a result set given by a "command descriptor"
 
         <p>A command descriptor here means:
-        <ul><li>a SDB-level connection (<type scope="com.sun.star.sdb">Connection</type></li>
+        <ul><li>a SDB-level connection (com.sun.star.sdb::Connection</li>
             <li>a string specifying the name of an object relative to the connection</li>
-            <li>a <type scope="com.sun.star.sdb">CommandType</type> value specifying the type
+            <li>a com.sun.star.sdb::CommandType value specifying the type
                 of the object</type></li>
         </ul>
         </p>
@@ -409,10 +409,10 @@ namespace dbtools
         const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext = ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>()
     );
 
-    /** create an <type scope="com::sun::star::sdb">XSingleSelectQueryComposer</type> which represents
+    /** create an com::sun::star::sdb::XSingleSelectQueryComposer which represents
         the current settings (Command/CommandType/Filter/Order) of the given rowset.
 
-        As such an instance can be obtained from a <type scope="com::sun::star::sdb">Connection</type>
+        As such an instance can be obtained from a com::sun::star::sdb::Connection
         only the function searches for the connection the RowSet is using via connectRowset.
         This implies that a connection will be set on the RowSet if needed.
         (need to changes this sometimes ...)
@@ -564,7 +564,7 @@ namespace dbtools
 
 
     /** ask the user for parameters if the prepared statement needs some and sets them in the prepared statement
-        @param _xConnection     the connection must be able to create <type scope="com::sun::star::sdb">SingleSelectQueryComposer</type>s
+        @param _xConnection     the connection must be able to create com::sun::star::sdb::SingleSelectQueryComposers
         @param _xPreparedStmt   the prepared statement where the parameters could be set when needed
         @param _aParametersSet  contains which parameters have to asked for and which already have set.
     */

include/connectivity/sqlerror.hxx

@@ -41,7 +41,7 @@ namespace connectivity
     */
     typedef ::sal_Int32 ErrorCode;
 
-    /** error condition values as defined in <type scope="com::sun::star::sdb">ErrorCondition</type>
+    /** error condition values as defined in com::sun::star::sdb::ErrorCondition
     */
     typedef ::sal_Int32 ErrorCondition;
 
@@ -96,7 +96,7 @@ namespace connectivity
             In a non-product build, assertions will fire if the number of placeholders in the
             message's resource string does not match the number of passed parameter values.
 
-            As specified in the <type scope="com::sun::star::sdb">ErrorCondition</type> type,
+            As specified in the com::sun::star::sdb::ErrorCondition type,
             error messages thrown by core components of OpenOffice.org Base will contain
             a standardized prefix &quot;[OOoBase]&quot; in every message.
 
@@ -136,7 +136,7 @@ namespace connectivity
 
         /** returns the prefix which is used for OpenOffice.org Base's error messages
 
-            As specified in the <type scope="com::sun::star::sdb">ErrorCondition</type> type,
+            As specified in the com::sun::star::sdb::ErrorCondition type,
             error messages thrown by core components of OpenOffice.org Base will
             contain a standardized prefix in every message. <code>getBaseErrorMessagePrefix</code>
             returns this prefix, so clients of such error messages might decide to strip this
@@ -223,7 +223,7 @@ namespace connectivity
                         ) const;
 
         /** raises a typed exception, that is, a UNO exception which is derived from
-            <type scope="com::sun::star::sdbc">SQLException</type>
+            com::sun::star::sdbc::SQLException
 
             @param  _eCondition
                 the ErrorCondition which hit you
@@ -234,7 +234,7 @@ namespace connectivity
 
             @param _rExceptionType
                 the type of the exception to throw. This type <em>must</em> specify
-                an exception class derived from <type scope="com::sun::star::sdbc">SQLException</type>.
+                an exception class derived from com::sun::star::sdbc::SQLException.
 
             @param _rParamValue1
                 a runtime-dependent value which should be filled into the error message
@@ -253,7 +253,7 @@ namespace connectivity
 
             @throws ::std::bad_cast
                 if <arg>_rExceptionType</arg> does not specify an exception class derived from
-                <type scope="com::sun::star::sdbc">SQLException</type>.
+                com::sun::star::sdbc::SQLException.
 
             @see getErrorMessage
             @see getErrorCode

include/svtools/genericunodialog.hxx

@@ -62,7 +62,7 @@ namespace svt
                                     ,   com::sun::star::lang::XInitialization
                                     >   OGenericUnoDialogBase;
 
-    /** abstract base class for implementing UNO objects representing dialogs (<type scope="com.sun.star.awt">XDialog</type>)
+    /** abstract base class for implementing UNO objects representing dialogs (com.sun.star.awt::XDialog)
     */
     class SVT_DLLPUBLIC OGenericUnoDialog
             :public OGenericUnoDialogBase
@@ -135,10 +135,10 @@ namespace svt
         virtual void executedDialog(sal_Int16 /*_nExecutionResult*/) { }
 
         /** smaller form of <method>initialize</method>.<p/>
-            The <method>initialize</method> method is called with a sequence of <type scope="com.sun.star.uno">Any</type>'s,
+            The <method>initialize</method> method is called with a sequence of com.sun.star.uno::Any's,
             which is split up into the single elements, which are passed to implInitialize. The default implementation
-            tries to exract an <type scope="com.sun.star.beans">PropertyValue</type> from the value an pass it to the
-            <type scope="com.sun.star.beans">XPropertySet</type> interface of the object.
+            tries to exract an com.sun.star.beans::PropertyValue from the value an pass it to the
+            com.sun.star.beans::XPropertySet interface of the object.
         */
         virtual void implInitialize(const com::sun::star::uno::Any& _rValue);
 

include/svtools/imageresourceaccess.hxx

@@ -52,7 +52,7 @@ namespace svt
             an SvStream for this image.
 
             This method works for arbitrary URLs denoting an image, since the
-            <type scope="com::sun::star::graphics">GraphicsProvider</type> service is used
+            com::sun::star::graphics::GraphicsProvider service is used
             to resolve the URL. However, obtaining the stream is expensive (since
             the image must be copied), so you are strongly encouraged to only use it
             when you know that the image is small enough.
@@ -63,7 +63,7 @@ namespace svt
                 );
 
         /** for a given URL of an image within a resource ( or an image specified by a vnd.sun.star.GraphicObject scheme URL ), this method retrieves
-            an <type scope="com::sun::star::io">XInputStream</type> for this image.
+            an com::sun::star::io::XInputStream for this image.
         */
         SVT_DLLPUBLIC static  ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
                 getImageXStream(

include/svx/dataaccessdescriptor.hxx

@@ -59,7 +59,7 @@ namespace svx
     //====================================================================
     //= ODataAccessDescriptor
     //====================================================================
-    /** class encapsulating the <type scope="com::sun::star::sdb">DataAccessDescriptor</type> service.
+    /** class encapsulating the com::sun::star::sdb::DataAccessDescriptor service.
     */
     class SVX_DLLPUBLIC ODataAccessDescriptor
     {

include/toolkit/controls/geometrycontrolmodel.hxx

@@ -209,7 +209,7 @@ namespace com { namespace sun { namespace star {
     //====================================================================
     //= OCommonGeometryControlModel
     //====================================================================
-    /** allows to extend an arbitrary <type scope="com.sun.star.awt">UnoControlModel</type> with geometry
+    /** allows to extend an arbitrary com.sun.star.awt::UnoControlModel with geometry
         information.
     */
     class OCommonGeometryControlModel
@@ -224,7 +224,7 @@ namespace com { namespace sun { namespace star {
         /** instantiate the model
 
             @param _rxAgg
-                the instance to aggregate. Must support the <type scope="com.sun.star.awt">UnoControlModel</type>
+                the instance to aggregate. Must support the com.sun.star.awt::UnoControlModel
                 (this is not checked here)
         */
         OCommonGeometryControlModel(

include/unotools/componentresmodule.hxx

@@ -38,7 +38,7 @@ namespace utl
     //====================================================================
     //= OComponentResourceModule
     //====================================================================
-    /** extends the <type scope="comphelper">OModule</type> implementation with
+    /** extends the comphelper::OModule implementation with
         simply resource access
     */
     class UNOTOOLS_DLLPUBLIC OComponentResourceModule : public ::comphelper::OModule

include/unotools/desktopterminationobserver.hxx

@@ -29,7 +29,7 @@ namespace utl
     //====================================================================
     //= ITerminationListener
     //====================================================================
-    /** non-UNO version of the <type scope="com.sun.star.frame">XTerminateListener</type>
+    /** non-UNO version of the com.sun.star.frame::XTerminateListener
     */
     class ITerminationListener
     {

include/unotools/streamsection.hxx

@@ -50,13 +50,13 @@ class OStreamSection
 public:
     /** starts reading of a "skippable" section of data within the given input stream<BR>
         @param      _rxInput    the stream to read from. Must support the
-                                <type scope="com::sun::star::io">XMarkableStream</type> interface
+                                com::sun::star::io::XMarkableStream interface
     */
     OStreamSection(const staruno::Reference< stario::XDataInputStream >& _rxInput);
 
     /** starts writing of a "skippable" section of data into the given output stream
         @param      _rxOutput           the stream the stream to write to. Must support the
-                                        <type scope="com::sun::star::io">XMarkableStream</type> interface
+                                        com::sun::star::io::XMarkableStream interface
         @param      _nPresumedLength    estimation for the length of the upcoming section. If greater 0, this
                                         value will be written as section length and corrected (in the dtor) only if
                                         needed. If you know how much bytes you are about to write, you may

include/unotools/streamwrap.hxx

@@ -42,7 +42,7 @@ namespace utl
 typedef ::cppu::WeakImplHelper1 <   stario::XInputStream
                                 > InputStreamWrapper_Base;
 // needed for some compilers
-/// helper class for wrapping an SvStream into an <type scope="com.sun.star.io">XInputStream</type>
+/// helper class for wrapping an SvStream into an com.sun.star.io::XInputStream
 class UNOTOOLS_DLLPUBLIC OInputStreamWrapper : public InputStreamWrapper_Base
 {
 protected:
@@ -78,8 +78,8 @@ protected:
 //==================================================================
 typedef ::cppu::ImplHelper1 <   ::com::sun::star::io::XSeekable
                             >   OSeekableInputStreamWrapper_Base;
-/** helper class for wrapping an SvStream into an <type scope="com.sun.star.io">XInputStream</type>
-    which is seekable (i.e. supports the <type scope="com.sun.star.io">XSeekable</type> interface).
+/** helper class for wrapping an SvStream into an com.sun.star.io::XInputStream
+    which is seekable (i.e. supports the com.sun.star.io::XSeekable interface).
 */
 class UNOTOOLS_DLLPUBLIC OSeekableInputStreamWrapper : public ::cppu::ImplInheritanceHelper1 < OInputStreamWrapper, com::sun::star::io::XSeekable >
 {
@@ -125,8 +125,8 @@ protected:
 //==================================================================
 typedef ::cppu::ImplHelper1 <   ::com::sun::star::io::XSeekable
                             >   OSeekableOutputStreamWrapper_Base;
-/** helper class for wrapping an SvStream into an <type scope="com.sun.star.io">XOutputStream</type>
-    which is seekable (i.e. supports the <type scope="com.sun.star.io">XSeekable</type> interface).
+/** helper class for wrapping an SvStream into an com.sun.star.io::XOutputStream
+    which is seekable (i.e. supports the com.sun.star.io::XSeekable interface).
 */
 class OSeekableOutputStreamWrapper
                 :public OOutputStreamWrapper

include/xmloff/formlayerexport.hxx

@@ -110,7 +110,7 @@ namespace xmloff
             <p>This method will collect all form layer related data of the given draw page</p>
 
             @param _rxDrawPage
-                the draw page to examine. The object will be queried for a <type scope="com.sun.star.form">XFormsSupplier</type>
+                the draw page to examine. The object will be queried for a com.sun.star.form::XFormsSupplier
                 interface to obtain the forms container.
         */
         void examineForms(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& _rxDrawPage);
@@ -131,7 +131,7 @@ namespace xmloff
             you have to start the Forms element yourself.</p>
 
             @param  _rxDrawPage
-                the draw page to examine. The object will be queried for a <type scope="com.sun.star.form">XFormsSupplier</type>
+                the draw page to examine. The object will be queried for a com.sun.star.form::XFormsSupplier
                 interface to obtain the forms container.
         */
         void exportForms(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& _rxDrawPage);