refactor out some com::sun::star typedefs

which mostly serve to make the code harder to read

Change-Id: Ia2a83fee9f850ab6f0bea6305ce8600d6b785fe8

2 files changed, 6 insertions, 11 deletions

diff --git a/svtools/source/table/cellvalueconversion.cxx b/svtools/source/table/cellvalueconversion.cxx
index 6669ad1203b3..65cef2e8f7e3 100644
--- a/svtools/source/table/cellvalueconversion.cxx
+++ b/svtools/source/table/cellvalueconversion.cxx
@@ -55,9 +55,6 @@ namespace svt
 
     namespace NumberFormat = ::com::sun::star::util::NumberFormat;
 
-    typedef ::com::sun::star::util::Time UnoTime;
-    typedef ::com::sun::star::util::Date UnoDate;
-
 
     //= helper
 
@@ -255,7 +252,7 @@ namespace svt
             ::rtl::math::setNan( &returnValue );
 
             // extract
-            UnoDate aDateValue;
+            css::util::Date aDateValue;
             ENSURE_OR_RETURN( i_value >>= aDateValue, "allowed for Date values only", returnValue );
 
             // convert
@@ -285,7 +282,7 @@ namespace svt
             ::rtl::math::setNan( &returnValue );
 
             // extract
-            UnoTime aTimeValue;
+            css::util::Time aTimeValue;
             ENSURE_OR_RETURN( i_value >>= aTimeValue, "allowed for tools::Time values only", returnValue );
 
             // convert
@@ -322,7 +319,7 @@ namespace svt
                     NumberFormatsSupplier::createWithLocale( xContext, aLocale );
 
                 // ensure a NullDate we will assume later on
-                UnoDate const aNullDate( 1, 1, 1900 );
+                css::util::Date const aNullDate( 1, 1, 1900 );
                 Reference< XPropertySet > const xFormatSettings( xSupplier->getNumberFormatSettings(), UNO_SET_THROW );
                 xFormatSettings->setPropertyValue( "NullDate", makeAny( aNullDate ) );
 
@@ -357,11 +354,11 @@ namespace svt
                 {
                     o_formatter.reset( new DateTimeNormalization( io_data.xNumberFormatter ) );
                 }
-                else if ( sTypeName.equals( ::cppu::UnoType< UnoDate >::get().getTypeName() ) )
+                else if ( sTypeName.equals( ::cppu::UnoType< css::util::Date >::get().getTypeName() ) )
                 {
                     o_formatter.reset( new DateNormalization( io_data.xNumberFormatter ) );
                 }
-                else if ( sTypeName.equals( ::cppu::UnoType< UnoTime >::get().getTypeName() ) )
+                else if ( sTypeName.equals( ::cppu::UnoType< css::util::Time >::get().getTypeName() ) )
                 {
                     o_formatter.reset( new TimeNormalization( io_data.xNumberFormatter ) );
                 }
diff --git a/svtools/source/uno/svtxgridcontrol.cxx b/svtools/source/uno/svtxgridcontrol.cxx
index aa8908b1e493..b650903eb148 100644
--- a/svtools/source/uno/svtxgridcontrol.cxx
+++ b/svtools/source/uno/svtxgridcontrol.cxx
@@ -73,8 +73,6 @@ namespace AccessibleStateType = ::com::sun::star::accessibility::AccessibleState
 
 using namespace ::svt::table;
 
-typedef ::com::sun::star::util::Color   UnoColor;
-
 
 SVTXGridControl::SVTXGridControl()
     :m_xTableModel( new UnoControlTableModel() )
@@ -547,7 +545,7 @@ Any SVTXGridControl::getProperty( const OUString& PropertyName ) throw(RuntimeEx
             aPropertyValue.clear();
         else
         {
-            Sequence< UnoColor > aAPIColors( aColors->size() );
+            Sequence< css::util::Color > aAPIColors( aColors->size() );
             for ( size_t i=0; i<aColors->size(); ++i )
             {
                 aAPIColors[i] = aColors->at(i).GetColor();