more removal of com::sun::star typedefs

Change-Id: Ia73f1b4f1dcfa3f0936359e744afe76e02dcd2eb

3 files changed, 11 insertions, 15 deletions

diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index 0a47d3bd7e16..23bda2b9b629 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -277,7 +277,7 @@ void BibToolBar::InitListener()
 
             xTrans->parseStrict( aURL );
 
-            BibToolBarListenerRef xListener;
+            css::uno::Reference< css::frame::XStatusListener> xListener;
             if(nId==TBC_LB_SOURCE)
             {
                 xListener=new BibTBListBoxListener(this,aURL.Complete,nId);
@@ -517,8 +517,8 @@ void    BibToolBar::statusChanged(const frame::FeatureStateEvent& rEvent)
 {
     for(size_t i = 0; i < aListenerArr.size(); i++)
     {
-        BibToolBarListenerRef* pListener = &aListenerArr[i];
-        (*pListener)->statusChanged(rEvent);
+        css::uno::Reference< css::frame::XStatusListener>& rListener = aListenerArr[i];
+        rListener->statusChanged(rEvent);
     }
 }
 
diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx
index f195608ec797..164eee6f4d10 100644
--- a/extensions/source/bibliography/toolbar.hxx
+++ b/extensions/source/bibliography/toolbar.hxx
@@ -101,8 +101,7 @@ public:
 };
 
 
-typedef css::uno::Reference< css::frame::XStatusListener> BibToolBarListenerRef;
-typedef std::vector<BibToolBarListenerRef> BibToolBarListenerArr;
+typedef std::vector< css::uno::Reference< css::frame::XStatusListener> > BibToolBarListenerArr;
 
 class BibToolBar:   public ToolBox
 {
diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx
index 3ade3666656f..8c05b4cecdf3 100644
--- a/extensions/source/propctrlr/formgeometryhandler.cxx
+++ b/extensions/source/propctrlr/formgeometryhandler.cxx
@@ -93,9 +93,6 @@ namespace pcr
 
     namespace MeasureUnit = css::util::MeasureUnit;
 
-    typedef css::awt::Point    AwtPoint;
-    typedef css::awt::Size     AwtSize;
-
     #define ANCHOR_TO_SHEET 0
     #define ANCHOR_TO_CELL  1
 
@@ -393,7 +390,7 @@ namespace pcr
                 sal_Int32 nPosition(0);
                 OSL_VERIFY( _rValue >>= nPosition );
 
-                AwtPoint aPos( m_xAssociatedShape->getPosition() );
+                css::awt::Point aPos( m_xAssociatedShape->getPosition() );
                 if ( nPropId == PROPERTY_ID_POSITIONX )
                     aPos.X = nPosition;
                 else
@@ -408,7 +405,7 @@ namespace pcr
                 sal_Int32 nSize(0);
                 OSL_VERIFY( _rValue >>= nSize );
 
-                AwtSize aSize( m_xAssociatedShape->getSize() );
+                css::awt::Size aSize( m_xAssociatedShape->getSize() );
                 if ( nPropId == PROPERTY_ID_WIDTH )
                     aSize.Width = nSize;
                 else
@@ -617,7 +614,7 @@ namespace pcr
     namespace
     {
         static sal_Int32 lcl_getLowerBoundRowOrColumn( const Reference< XIndexAccess >& _rxRowsOrColumns, const bool _bRows,
-            const AwtPoint& _rRelativePosition )
+            const css::awt::Point& _rRelativePosition )
         {
             sal_Int32 nAccumulated = 0;
 
@@ -665,7 +662,7 @@ namespace pcr
                     "FormGeometryHandler::impl_setSheetAnchorType_nothrow: sheet not found!" );
                 if ( xSheet.is() )
                 {
-                    AwtPoint aPreservePosition( m_xAssociatedShape->getPosition() );
+                    css::awt::Point aPreservePosition( m_xAssociatedShape->getPosition() );
                     m_xShapeProperties->setPropertyValue( PROPERTY_ANCHOR, makeAny( xSheet ) );
                     m_xAssociatedShape->setPosition( aPreservePosition );
                 }
@@ -681,7 +678,7 @@ namespace pcr
                 OSL_ENSURE( xCurrentAnchor.is(), "FormGeometryHandler::impl_setSheetAnchorType_nothrow: only to be called when currently anchored to a sheet!" );
 
                 // get the current position
-                AwtPoint aRelativePosition( m_xAssociatedShape->getPosition() );
+                css::awt::Point aRelativePosition( m_xAssociatedShape->getPosition() );
 
                 Reference< XTableColumns > xCols( xColsRows->getColumns(), UNO_SET_THROW );
                 sal_Int32 nNewAnchorCol = lcl_getLowerBoundRowOrColumn( xCols.get(), false, aRelativePosition );
@@ -733,13 +730,13 @@ namespace pcr
 
         if ( _event.PropertyName == "Position" )
         {
-            AwtPoint aPos = m_xShape->getPosition();
+            css::awt::Point aPos = m_xShape->getPosition();
             aEventTranslations.push_back( EventTranslation( PROPERTY_POSITIONX, makeAny( aPos.X ) ) );
             aEventTranslations.push_back( EventTranslation( PROPERTY_POSITIONY, makeAny( aPos.Y ) ) );
         }
         else if ( _event.PropertyName == "Size" )
         {
-            AwtSize aSize = m_xShape->getSize();
+            css::awt::Size aSize = m_xShape->getSize();
             aEventTranslations.push_back( EventTranslation( PROPERTY_WIDTH, makeAny( aSize.Width ) ) );
             aEventTranslations.push_back( EventTranslation( PROPERTY_HEIGHT, makeAny( aSize.Height ) ) );
         }