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

Change-Id: I91bebe06c5c5f3ebe5fbeec83dcf3f5bdf563201

6 files changed, 4 insertions, 12 deletions

diff --git a/oox/inc/drawingml/textfield.hxx b/oox/inc/drawingml/textfield.hxx
index 9fd0d641a725..b6a779055f5a 100644
--- a/oox/inc/drawingml/textfield.hxx
+++ b/oox/inc/drawingml/textfield.hxx
@@ -53,8 +53,6 @@ private:
     OUString msUuid;
 };
 
-typedef std::shared_ptr< TextField > TextFieldPtr;
-
 } }
 
 #endif
diff --git a/oox/source/drawingml/diagram/constraintlistcontext.cxx b/oox/source/drawingml/diagram/constraintlistcontext.cxx
index 99d5614c2fc8..177a6aa4c556 100644
--- a/oox/source/drawingml/diagram/constraintlistcontext.cxx
+++ b/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 ) );
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
index 873d63497556..5d20256caf6e 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
@@ -147,8 +147,6 @@ private:
     sal_Int32 mnOperator;
 };
 
-typedef boost::shared_ptr< ConstraintAtom > ConstraintAtomPtr;
-
 class AlgAtom
     : public LayoutAtom
 {
diff --git a/oox/source/drawingml/textbodycontext.cxx b/oox/source/drawingml/textbodycontext.cxx
index baf6b0e538ba..2fca12d07445 100644
--- a/oox/source/drawingml/textbodycontext.cxx
+++ b/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 );
         }
diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx
index efa47dfffdec..22e8e6f03d1d 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/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 );
diff --git a/oox/source/ole/olestorage.cxx b/oox/source/ole/olestorage.cxx
index 296898c63433..2a961cb4ddae 100644
--- a/oox/source/ole/olestorage.cxx
+++ b/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(