sal,rsc,oox: inline some use-once typedefs

Change-Id: I91bebe06c5c5f3ebe5fbeec83dcf3f5bdf563201

oox/inc/drawingml/textfield.hxx

@@ -53,8 +53,6 @@ private:
     OUString msUuid;
 };
 
-typedef std::shared_ptr< TextField > TextFieldPtr;
-
 } }
 
 #endif

oox/source/drawingml/diagram/constraintlistcontext.cxx

@@ -49,7 +49,7 @@ ConstraintListContext::onCreateContext( ::sal_Int32 aElement,
     {
     case DGM_TOKEN( constr ):
     {
-        ConstraintAtomPtr pNode( new ConstraintAtom() );
+        boost::shared_ptr< ConstraintAtom > pNode( new ConstraintAtom() );
         mpNode->addChild( pNode );
 
         pNode->setFor( rAttribs.getToken( XML_for, XML_none ) );

oox/source/drawingml/diagram/diagramlayoutatoms.hxx

@@ -147,8 +147,6 @@ private:
     sal_Int32 mnOperator;
 };
 
-typedef boost::shared_ptr< ConstraintAtom > ConstraintAtomPtr;
-
 class AlgAtom
     : public LayoutAtom
 {

oox/source/drawingml/textbodycontext.cxx

@@ -73,7 +73,7 @@ ContextHandlerRef TextParagraphContext::onCreateContext( sal_Int32 aElementToken
         }
         case A_TOKEN( fld ):    // "CT_TextField" Text Field.
         {
-            TextFieldPtr pField( new TextField );
+            std::shared_ptr< TextField > pField( new TextField );
             mrParagraph.addRun( pField );
             return new TextFieldContext( *this, rAttribs, *pField );
         }

oox/source/helper/propertymap.cxx

@@ -92,14 +92,12 @@ using ::com::sun::star::drawing::TextVerticalAdjust;
 
 namespace {
 
-typedef ::cppu::WeakImplHelper2< XPropertySet, XPropertySetInfo > GenericPropertySetBase;
-
 /** This class implements a generic XPropertySet.
 
     Properties of all names and types can be set and later retrieved.
     TODO: move this to comphelper or better find an existing implementation
  */
-class GenericPropertySet : public GenericPropertySetBase
+class GenericPropertySet : public ::cppu::WeakImplHelper2< XPropertySet, XPropertySetInfo >
 {
 public:
     explicit            GenericPropertySet( const PropertyMap& rPropMap );

oox/source/ole/olestorage.cxx

@@ -48,12 +48,10 @@ using namespace ::com::sun::star::uno;
 
 namespace {
 
-typedef ::cppu::WeakImplHelper2< XSeekable, XOutputStream > OleOutputStreamBase;
-
 /** Implementation of an OLE storage output stream that inserts itself into the
     storage when it is closed.
  */
-class OleOutputStream : public OleOutputStreamBase
+class OleOutputStream : public ::cppu::WeakImplHelper2< XSeekable, XOutputStream >
 {
 public:
     explicit            OleOutputStream(

rsc/inc/rscdb.hxx

@@ -53,9 +53,6 @@ struct WriteRcContext
     RscCmdLine*         pCmdLine;
 };
 
-// Liste die alle Basistypen enthaelt
-typedef ::std::vector< RscTop* > RscBaseList;
-
 // Tabelle fuer Systemabhaengige Resourcen
 struct RscSysEntry
 {
@@ -66,8 +63,6 @@ struct RscSysEntry
     sal_uInt32      nRefId;
 };
 
-typedef ::std::vector< RscSysEntry* > RscSysList;
-
 class RscTypCont
 {
     rtl_TextEncoding    nSourceCharSet;
@@ -84,8 +79,10 @@ class RscTypCont
     RscTop  *           pRoot;              // Zeiger auf die Wurzel vom Typenbaum
     RSCINST             aVersion;           // Versionskontrollinstanz
 
-    RscBaseList         aBaseLst;           // Liste der einfachen Resourceklasse
-    RscSysList          aSysLst;            // Liste der Systemresourcen
+    ::std::vector< RscTop* >
+                        aBaseLst;           // Liste der einfachen Resourceklasse
+    ::std::vector< RscSysEntry* >
+                        aSysLst;            // Liste der Systemresourcen
 
     Atom                nWinBitVarId;       // Name der Winbitvariablen
     Atom                nBorderId;

rsc/inc/rscdef.hxx

@@ -222,7 +222,6 @@ public:
     bool            IsIncFile(){  return bIncFile; };
 };
 
-typedef UniqueIndex<RscFile> RscSubFileTab;
 #define NOFILE_INDEX UNIQUEINDEX_ENTRY_NOTFOUND
 
 class RscDefTree
@@ -238,7 +237,7 @@ public:
     void        Remove( RscDefine * pDef );
 };
 
-class RscFileTab : public RscSubFileTab
+class RscFileTab : public UniqueIndex<RscFile>
 {
     RscDefTree aDefTree;
     sal_uLong       Find(const OString& rName);

sal/qa/osl/process/osl_process.cxx

@@ -94,8 +94,6 @@ inline ::rtl::OUString getExecutablePath()
 //rtl::OUString CWD = getExecutablePath();
 
 typedef std::vector<OString> string_container_t;
-typedef string_container_t::const_iterator string_container_const_iter_t;
-typedef string_container_t::iterator       string_container_iter_t;
 
 class exclude : public std::unary_function<OString, bool>
 {
@@ -103,8 +101,8 @@ public:
 
     exclude(const string_container_t& exclude_list)
     {
-        string_container_const_iter_t iter     = exclude_list.begin();
-        string_container_const_iter_t iter_end = exclude_list.end();
+        string_container_t::const_iterator iter     = exclude_list.begin();
+        string_container_t::const_iterator iter_end = exclude_list.end();
         for (/**/; iter != iter_end; ++iter)
             exclude_list_.push_back(env_var_name(*iter));
     }
@@ -307,7 +305,7 @@ public:
         //are different to the parent environment (they come first)
         //and the variables that should be equal between parent
         //and child environment
-        string_container_iter_t iter_logical_end =
+        string_container_t::iterator iter_logical_end =
             std::stable_partition(child_env.begin(), child_env.end(), exclude(different_env_vars));
 
         string_container_t different_child_env_vars(child_env.begin(), iter_logical_end);