inline use-once typedefs

Change-Id: I5c3ffc03c26b3428f1f336e6ecba7838a1cf1157
Reviewed-on: https://gerrit.libreoffice.org/46764
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

3 files changed, 3 insertions, 6 deletions

diff --git a/include/canvas/base/canvasbase.hxx b/include/canvas/base/canvasbase.hxx
index 4d2406a18805..a36af3b71ff3 100644
--- a/include/canvas/base/canvasbase.hxx
+++ b/include/canvas/base/canvasbase.hxx
@@ -99,7 +99,6 @@ namespace canvas
     {
     public:
         typedef Base            BaseType;
-        typedef CanvasHelper    HelperType;
         typedef Mutex           MutexType;
         typedef UnambiguousBase UnambiguousBaseType;
 
@@ -429,7 +428,7 @@ namespace canvas
     protected:
         ~CanvasBase() {} // we're a ref-counted UNO class. _We_ destroy ourselves.
 
-        HelperType          maCanvasHelper;
+        CanvasHelper        maCanvasHelper;
         mutable bool        mbSurfaceDirty;
 
     private:
diff --git a/include/canvas/base/canvascustomspritebase.hxx b/include/canvas/base/canvascustomspritebase.hxx
index 1ad63f6f8ca5..9990b37be6e3 100644
--- a/include/canvas/base/canvascustomspritebase.hxx
+++ b/include/canvas/base/canvascustomspritebase.hxx
@@ -76,7 +76,6 @@ namespace canvas
     {
     public:
         typedef IntegerBitmapBase< BitmapCanvasBase2<Base, CanvasHelper, Mutex, UnambiguousBase> > BaseType;
-        typedef SpriteHelper                                                    SpriteHelperType;
 
         CanvasCustomSpriteBase() :
             maSpriteHelper()
@@ -255,7 +254,7 @@ namespace canvas
         }
 
     protected:
-        SpriteHelperType maSpriteHelper;
+        SpriteHelper maSpriteHelper;
     };
 }
 
diff --git a/include/canvas/base/graphicdevicebase.hxx b/include/canvas/base/graphicdevicebase.hxx
index e5efe9bb4f0b..ca36c896e04e 100644
--- a/include/canvas/base/graphicdevicebase.hxx
+++ b/include/canvas/base/graphicdevicebase.hxx
@@ -106,7 +106,6 @@ namespace canvas
     {
     public:
         typedef Base              BaseType;
-        typedef DeviceHelper      DeviceHelperType;
         typedef Mutex             MutexType;
         typedef UnambiguousBase   UnambiguousBaseType;
         typedef GraphicDeviceBase ThisType;
@@ -334,7 +333,7 @@ namespace canvas
             rAny >>= mbDumpScreenContent;
         }
 
-        DeviceHelperType  maDeviceHelper;
+        DeviceHelper      maDeviceHelper;
         PropertySetHelper maPropHelper;
         bool              mbDumpScreenContent;