idl,framework,forms: inline some use-once typedefs

Change-Id: Icb4908c274ec0778af7ed9fe2d935bf6723fedfb

forms/source/component/GroupManager.hxx

@@ -131,15 +131,12 @@ public:
     const OGroupComp&   GetGroupComponent() const { return m_aGroupComp; }
 };
 
-typedef std::vector<OGroupCompAcc> OGroupCompAccArr;
-
-
 class OGroup
 {
-    OGroupCompArr       m_aCompArray;
-    OGroupCompAccArr    m_aCompAccArray;
+    OGroupCompArr              m_aCompArray;
+    std::vector<OGroupCompAcc> m_aCompAccArray;
 
-    OUString m_aGroupName;
+    OUString    m_aGroupName;
     sal_uInt16  m_nInsertPos; // The insertion position of the GroupComps is determind by the Group
 
     friend class OGroupLess;

forms/source/xforms/submission/serialization.hxx

@@ -35,13 +35,11 @@
 Serialize an XObject
 */
 
-typedef std::map<OUString, OUString> PropMap;
-
 class CSerialization
 {
 protected:
     css::uno::Reference< css::xml::dom::XDocumentFragment > m_aFragment;
-    PropMap m_properties;
+    std::map<OUString, OUString> m_properties;
 
 public:
     virtual ~CSerialization() {}

fpicker/source/win32/folderpicker/MtaFop.cxx

@@ -39,9 +39,6 @@ const sal_Bool MANUAL_RESET     = sal_True;
 const sal_Bool AUTO_RESET       = sal_False;
 const sal_Bool INIT_NONSIGNALED = sal_False;
 
-typedef sal::systools::COMReference<IMalloc> IMallocPtr;
-typedef sal::systools::COMReference<IShellFolder> IShellFolderPtr;
-
 namespace
 {
     const char* FOLDERPICKER_SRV_DLL_NAME = "fps.dll";
@@ -416,7 +413,7 @@ sal_Bool SAL_CALL CMtaFolderPicker::onBrowseForFolder( )
 
 void SAL_CALL CMtaFolderPicker::releaseItemIdList( LPITEMIDLIST lpItemIdList )
 {
-    IMallocPtr pIMalloc;
+    sal::systools::COMReference<IMalloc> pIMalloc;
     SHGetMalloc(&pIMalloc);
     if (pIMalloc.is())
     {
@@ -437,7 +434,7 @@ LPITEMIDLIST SAL_CALL CMtaFolderPicker::getItemIdListFromPath( const OUString& a
 
     LPITEMIDLIST lpItemIdList(NULL);
 
-    IShellFolderPtr pIShellFolder;
+    sal::systools::COMReference<IShellFolder> pIShellFolder;
     SHGetDesktopFolder(&pIShellFolder);
 
     if (pIShellFolder.is())

framework/inc/classes/filtercachedata.hxx

@@ -355,17 +355,6 @@ class PerformanceHash   :   public  std::unordered_map< OUString,
 {
 };
 
-// Define easy usable types
-
-typedef SetNodeHash< FileType >                                     FileTypeHash;
-typedef SetNodeHash< Filter >                                       FilterHash;
-typedef SetNodeHash< Detector >                                     DetectorHash;
-typedef SetNodeHash< Loader >                                       LoaderHash;
-typedef SetNodeHash< ContentHandler >                               ContentHandlerHash;
-typedef OUStringHashMap                                             PreferredHash;
-typedef OUStringList                                                OrderList;
-
-
 
 // Use private static data container to hold all values of configuration!
 
@@ -398,16 +387,16 @@ class DataContainer
 
         DataContainer();
 
-        FileTypeHash            m_aTypeCache;               /// hold all information about registered file types
-        FilterHash              m_aFilterCache;             /// hold all information about registered filters
-        DetectorHash            m_aDetectorCache;           /// hold all information about registered detect services
-        LoaderHash              m_aLoaderCache;             /// hold all information about registered loader services
-        ContentHandlerHash      m_aContentHandlerCache;     /// hold all information about registered content handler services
+        SetNodeHash< FileType > m_aTypeCache;               /// hold all information about registered file types
+        SetNodeHash< Filter >   m_aFilterCache;             /// hold all information about registered filters
+        SetNodeHash< Detector > m_aDetectorCache;           /// hold all information about registered detect services
+        SetNodeHash< Loader >   m_aLoaderCache;             /// hold all information about registered loader services
+        SetNodeHash< ContentHandler > m_aContentHandlerCache;     /// hold all information about registered content handler services
         PerformanceHash         m_aFastFilterCache;         /// hold all registered filter for a special file type
         PerformanceHash         m_aFastDetectorCache;       /// hold all registered detect services for a special file type
         PerformanceHash         m_aFastLoaderCache;         /// hold all registered loader services for a special file type
         PerformanceHash         m_aFastContentHandlerCache; /// hold all registered content handler services for a special file type
-        PreferredHash           m_aPreferredTypesCache;     /// assignment of extensions to preferred types for it
+        OUStringHashMap         m_aPreferredTypesCache;     /// assignment of extensions to preferred types for it
         Loader                  m_aGenericLoader;           /// information about our default frame loader
         OUString                m_sLocale;                  /// current set locale of configuration to handle right UIName from set of all UINames!
         bool                    m_bTypesModified;

framework/inc/recording/dispatchrecorder.hxx

@@ -45,8 +45,6 @@
 
 namespace framework{
 
-typedef ::std::vector < com::sun::star::frame::DispatchStatement > DispatchStatementList;
-
 class DispatchRecorder
     : public  ::cppu::WeakImplHelper3<
                 css::lang::XServiceInfo
@@ -55,7 +53,7 @@ class DispatchRecorder
 {
     // private member
     private:
-        DispatchStatementList                                  m_aStatements;
+        ::std::vector < css::frame::DispatchStatement >        m_aStatements;
         sal_Int32                                              m_nRecordingID;
         css::uno::Reference< css::script::XTypeConverter >     m_xConverter;
 

i18nlangtag/source/languagetag/simple-langtag.cxx

@@ -22,7 +22,6 @@
 
 namespace {
 
-typedef int lt_bool_t;
 typedef void* lt_pointer_t;
 
 struct lt_error_t {
@@ -326,7 +325,7 @@ static void lt_tag_unref(lt_tag_t *tag)
     any i-* irregular and x-* privateuse. Subtags are not checked for validity
     (alpha, digit, registered, ...).
  */
-static lt_bool_t lt_tag_parse(lt_tag_t *tag,
+static int lt_tag_parse(lt_tag_t *tag,
                               const char *tag_string,
                               lt_error_t **error)
 {

idl/inc/basobj.hxx

@@ -100,12 +100,10 @@ public:
 
 class SvMetaNameMemberList : public SvRefMemberList<SvMetaName *> {};
 
-class SvMetaReference;
-typedef tools::SvRef<SvMetaReference> SvMetaReferenceRef;
 class SvMetaReference : public SvMetaName
 {
 protected:
-    SvMetaReferenceRef  aRef;
+    tools::SvRef<SvMetaReference>  aRef;
 public:
             TYPEINFO_OVERRIDE();
             SvMetaReference();

idl/inc/module.hxx

@@ -65,7 +65,6 @@ public:
 
     void                WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm );
 };
-typedef tools::SvRef<SvMetaModule> SvMetaModuleRef;
 
 class SvMetaModuleMemberList : public SvRefMemberList<SvMetaModule *> {};
 

idl/inc/object.hxx

@@ -62,8 +62,6 @@ public:
                     { return xClass; }
 };
 
-typedef tools::SvRef<SvClassElement> SvClassElementRef;
-
 class SvClassElementMemberList : public SvRefMemberList<SvClassElement *> {};
 
 class SvMetaClassMemberList : public SvRefMemberList<SvMetaClass *> {};

idl/inc/types.hxx

@@ -190,7 +190,6 @@ public:
 
     virtual bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
 };
-typedef tools::SvRef<SvMetaEnumValue> SvMetaEnumValueRef;
 
 class SvMetaEnumValueMemberList : public SvRefMemberList<SvMetaEnumValue *> {};
 
@@ -211,7 +210,6 @@ public:
 
     virtual bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
 };
-typedef tools::SvRef<SvMetaTypeEnum> SvMetaTypeEnumRef;
 
 class SvMetaTypeEnumMemberList : public SvRefMemberList<SvMetaTypeEnum *> {};
 

idl/source/objects/module.cxx

@@ -97,7 +97,7 @@ void SvMetaModule::ReadContextSvIdl( SvIdlDataBase & rBase,
     }
     else if( rInStm.GetToken().Is( SvHash_enum() ) )
     {
-        SvMetaTypeEnumRef aEnum = new SvMetaTypeEnum();
+        tools::SvRef<SvMetaTypeEnum> aEnum = new SvMetaTypeEnum();
 
         if( aEnum->ReadSvIdl( rBase, rInStm ) )
         {

idl/source/objects/object.cxx

@@ -58,7 +58,7 @@ void SvMetaClass::ReadContextSvIdl( SvIdlDataBase & rBase,
         SvMetaClass * pClass = rBase.ReadKnownClass( rInStm );
         if( pClass )
         {
-            SvClassElementRef xEle = new SvClassElement();
+            tools::SvRef<SvClassElement> xEle = new SvClassElement();
             xEle->SetClass( pClass );
             aClassList.push_back( xEle );
 

idl/source/objects/types.cxx

@@ -704,7 +704,7 @@ void SvMetaTypeEnum::ReadContextSvIdl( SvIdlDataBase & rBase,
 {
     sal_uInt32 nTokPos = rInStm.Tell();
 
-    SvMetaEnumValueRef aEnumVal = new SvMetaEnumValue();
+    tools::SvRef<SvMetaEnumValue> aEnumVal = new SvMetaEnumValue();
     bool bOk = aEnumVal->ReadSvIdl( rBase, rInStm );
     if( bOk )
     {

idl/source/prj/database.cxx

@@ -587,7 +587,7 @@ bool SvIdlWorkingBase::ReadSvIdl( SvTokenStream & rInStm, bool bImported, const
         // only one import at the very beginning
         if( pTok->Is( SvHash_module() ) )
         {
-            SvMetaModuleRef aModule = new SvMetaModule( bImported );
+            tools::SvRef<SvMetaModule> aModule = new SvMetaModule( bImported );
             if( aModule->ReadSvIdl( *this, rInStm ) )
                 GetModuleList().push_back( aModule );
             else