remove macros in sd

Change-Id: Ie6ffa96599627f0741c01ae3946e704f4839bb14

4 files changed, 73 insertions, 88 deletions

diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index 10b3dac449ca..b5980938681f 100644
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -72,7 +72,6 @@ using namespace ::com::sun::star::task;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::ucb;
-using namespace ::rtl;
 
 namespace {
 
@@ -95,7 +94,7 @@ bool isZipStorageType(const OUString& rTypeName)
 
 }
 
-SdFilterDetect::SdFilterDetect( const REFERENCE < ::com::sun::star::lang::XMultiServiceFactory >&  )
+SdFilterDetect::SdFilterDetect( const Reference < XMultiServiceFactory >&  )
 {
 }
 
@@ -103,17 +102,17 @@ SdFilterDetect::~SdFilterDetect()
 {
 }
 
-::rtl::OUString SAL_CALL SdFilterDetect::detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lDescriptor ) throw( ::com::sun::star::uno::RuntimeException )
+OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDescriptor ) throw( RuntimeException )
 {
-    REFERENCE< XInputStream > xStream;
-    REFERENCE< XContent > xContent;
-    REFERENCE< XInteractionHandler > xInteraction;
+    Reference< XInputStream > xStream;
+    Reference< XContent > xContent;
+    Reference< XInteractionHandler > xInteraction;
     String aURL;
-    ::rtl::OUString sTemp;
+    OUString sTemp;
     OUString aTypeName;            // a name describing the type (from MediaDescriptor, usually from flat detection)
     String aPreselectedFilterName;      // a name describing the filter to use (from MediaDescriptor, usually from UI action)
 
-    ::rtl::OUString aDocumentTitle; // interesting only if set in this method
+    OUString aDocumentTitle; // interesting only if set in this method
 
     // opening as template is done when a parameter tells to do so and a template filter can be detected
     // (otherwise no valid filter would be found) or if the detected filter is a template filter and
@@ -190,13 +189,13 @@ SdFilterDetect::~SdFilterDetect()
     bWasReadOnly = pItem && pItem->GetValue();
 
     const SfxFilter* pFilter = 0;
-    String aPrefix = rtl::OUString("private:factory/");
+    String aPrefix = OUString("private:factory/");
     if( aURL.Match( aPrefix ) == aPrefix.Len() )
     {
         if( SvtModuleOptions().IsImpress() )
         {
             String aPattern( aPrefix );
-            aPattern += rtl::OUString("simpress");
+            aPattern += OUString("simpress");
             if ( aURL.Match( aPattern ) >= aPattern.Len() )
                 pFilter = SfxFilter::GetDefaultFilterFromFactory( aURL );
         }
@@ -204,7 +203,7 @@ SdFilterDetect::~SdFilterDetect()
         if( !pFilter && SvtModuleOptions().IsDraw() )
         {
             String aPattern( aPrefix );
-            aPattern += rtl::OUString("sdraw");
+            aPattern += OUString("sdraw");
             if ( aURL.Match( aPattern ) >= aPattern.Len() )
                 pFilter = SfxFilter::GetDefaultFilterFromFactory( aURL );
         }
@@ -237,7 +236,7 @@ SdFilterDetect::~SdFilterDetect()
                 {
                     // PowerPoint needs to be detected via StreamName, all other storage based formats are our own and can
                     // be detected by the ClipboardId, so except for the PPT filter all filters must have a ClipboardId set
-                    uno::Reference < embed::XStorage > xStorage = aMedium.GetStorage( sal_False );
+                    Reference < embed::XStorage > xStorage = aMedium.GetStorage( sal_False );
 
                     //TODO/LATER: move error handling to central place! (maybe even complete own filters)
                     if ( aMedium.GetLastStorageCreationState() != ERRCODE_NONE )
@@ -252,11 +251,11 @@ SdFilterDetect::~SdFilterDetect()
                             try
                             {
                                 InteractiveAppException xException( empty,
-                                                                REFERENCE< XInterface >(),
+                                                                Reference< XInterface >(),
                                                                 InteractionClassification_ERROR,
                                                                 aMedium.GetError() );
 
-                                REFERENCE< XInteractionRequest > xRequest(
+                                Reference< XInteractionRequest > xRequest(
                                     new ucbhelper::SimpleInteractionRequest( makeAny( xException ),
                                                                           ucbhelper::CONTINUATION_APPROVE ) );
                                 xInteraction->handle( xRequest );
@@ -279,7 +278,7 @@ SdFilterDetect::~SdFilterDetect()
                                 sFilterName = pFilter->GetName();
                             aTypeName = SfxFilter::GetTypeFromStorage( xStorage, pFilter ? pFilter->IsOwnTemplateFormat() : sal_False, &sFilterName );
                         }
-                        catch( const lang::WrappedTargetException& aWrap )
+                        catch( const WrappedTargetException& aWrap )
                         {
                             if (!bDeepDetection)
                                 // Bail out early unless it's a deep detection.
@@ -319,11 +318,11 @@ SdFilterDetect::~SdFilterDetect()
                                 }
                             }
                         }
-                        catch( uno::RuntimeException& )
+                        catch( RuntimeException& )
                         {
                             throw;
                         }
-                        catch( uno::Exception& )
+                        catch( Exception& )
                         {
                             aTypeName = OUString();
                             pFilter = 0;
@@ -334,9 +333,9 @@ SdFilterDetect::~SdFilterDetect()
                             //TODO/LATER: using this method impress is always preferred if no flat detecion has been made
                             // this should been discussed!
                             if ( SvtModuleOptions().IsImpress() )
-                                pFilter = SfxFilterMatcher( rtl::OUString("simpress") ).GetFilter4EA( aTypeName );
+                                pFilter = SfxFilterMatcher( OUString("simpress") ).GetFilter4EA( aTypeName );
                             else if ( SvtModuleOptions().IsDraw() )
-                                pFilter = SfxFilterMatcher( rtl::OUString("sdraw") ).GetFilter4EA( aTypeName );
+                                pFilter = SfxFilterMatcher( OUString("sdraw") ).GetFilter4EA( aTypeName );
                         }
                     }
                 }
@@ -359,7 +358,7 @@ SdFilterDetect::~SdFilterDetect()
                         SotStorageRef aStorage = new SotStorage ( pStm, sal_False );
                         if ( !aStorage->GetError() )
                         {
-                            rtl::OUString aStreamName("PowerPoint Document");
+                            OUString aStreamName("PowerPoint Document");
                             if ( aStorage->IsStream( aStreamName ) && SvtModuleOptions().IsImpress() )
                             {
                                 String aFileName(aMedium.GetName());
@@ -393,8 +392,8 @@ SdFilterDetect::~SdFilterDetect()
                                         *pStm >> n8;
                                         if ( ( n8 & 0xf0 ) == 0 )       // we are supporting binary cgm format only, so
                                         {                               // this is a small test to exclude cgm text
-                                            SfxFilterMatcher aMatch(rtl::OUString("simpress"));
-                                            pFilter = aMatch.GetFilter4FilterName(rtl::OUString("CGM - Computer Graphics Metafile"));
+                                            SfxFilterMatcher aMatch(OUString("simpress"));
+                                            pFilter = aMatch.GetFilter4FilterName(OUString("CGM - Computer Graphics Metafile"));
                                         }
                                     }
                                 }
@@ -417,7 +416,7 @@ SdFilterDetect::~SdFilterDetect()
                                     aFilterConfigItem.WriteInt32( "Resolution" , nBase );
                                 }
 
-                                SfxFilterMatcher aMatch(rtl::OUString("sdraw"));
+                                SfxFilterMatcher aMatch(OUString("sdraw"));
                                 pFilter = aMatch.GetFilter4FilterName( aName );
                             }
                         }
@@ -506,16 +505,16 @@ SdFilterDetect::~SdFilterDetect()
 }
 
 /* XServiceInfo */
-rtl::OUString SAL_CALL SdFilterDetect::getImplementationName() throw( UNORUNTIMEEXCEPTION )
+OUString SAL_CALL SdFilterDetect::getImplementationName() throw( RuntimeException )
 {
     return impl_getStaticImplementationName();
 }
                                                                                                                                 \
 /* XServiceInfo */
-sal_Bool SAL_CALL SdFilterDetect::supportsService( const rtl::OUString& sServiceName ) throw( UNORUNTIMEEXCEPTION )
+sal_Bool SAL_CALL SdFilterDetect::supportsService( const OUString& sServiceName ) throw( RuntimeException )
 {
-    UNOSEQUENCE< rtl::OUString > seqServiceNames = getSupportedServiceNames();
-    const rtl::OUString*         pArray          = seqServiceNames.getConstArray();
+    Sequence< OUString > seqServiceNames = getSupportedServiceNames();
+    const OUString*         pArray          = seqServiceNames.getConstArray();
     for ( sal_Int32 nCounter=0; nCounter<seqServiceNames.getLength(); nCounter++ )
     {
         if ( pArray[nCounter] == sServiceName )
@@ -527,27 +526,27 @@ sal_Bool SAL_CALL SdFilterDetect::supportsService( const rtl::OUString& sService
 }
 
 /* XServiceInfo */
-UNOSEQUENCE< rtl::OUString > SAL_CALL SdFilterDetect::getSupportedServiceNames() throw( UNORUNTIMEEXCEPTION )
+Sequence< OUString > SAL_CALL SdFilterDetect::getSupportedServiceNames() throw( RuntimeException )
 {
     return impl_getStaticSupportedServiceNames();
 }
 
 /* Helper for XServiceInfo */
-UNOSEQUENCE< rtl::OUString > SdFilterDetect::impl_getStaticSupportedServiceNames()
+Sequence< OUString > SdFilterDetect::impl_getStaticSupportedServiceNames()
 {
-    UNOSEQUENCE< rtl::OUString > seqServiceNames( 1 );
+    Sequence< OUString > seqServiceNames( 1 );
     seqServiceNames.getArray() [0] = "com.sun.star.frame.ExtendedTypeDetection"  ;
     return seqServiceNames ;
 }
 
 /* Helper for XServiceInfo */
-rtl::OUString SdFilterDetect::impl_getStaticImplementationName()
+OUString SdFilterDetect::impl_getStaticImplementationName()
 {
-    return rtl::OUString( "com.sun.star.comp.draw.FormatDetector" );
+    return OUString( "com.sun.star.comp.draw.FormatDetector" );
 }
 
 /* Helper for registry */
-UNOREFERENCE< UNOXINTERFACE > SAL_CALL SdFilterDetect::impl_createInstance( const UNOREFERENCE< UNOXMULTISERVICEFACTORY >& xServiceManager ) throw( UNOEXCEPTION )
+Reference< XInterface > SAL_CALL SdFilterDetect::impl_createInstance( const Reference< XMultiServiceFactory >& xServiceManager ) throw( Exception )
 {
     return static_cast< cppu::OWeakObject * >(
         new SdFilterDetect( xServiceManager ) );
diff --git a/sd/source/ui/unoidl/sddetect.hxx b/sd/source/ui/unoidl/sddetect.hxx
index 83d0cbe555ea..2c58ef0b801f 100644
--- a/sd/source/ui/unoidl/sddetect.hxx
+++ b/sd/source/ui/unoidl/sddetect.hxx
@@ -50,14 +50,10 @@ namespace com
 
 #include <sfx2/sfxuno.hxx>
 
-#define REFERENCE ::com::sun::star::uno::Reference
-#define SEQUENCE ::com::sun::star::uno::Sequence
-#define RUNTIME_EXCEPTION ::com::sun::star::uno::RuntimeException
-
-class SdFilterDetect : public ::cppu::WeakImplHelper2< ::com::sun::star::document::XExtendedFilterDetection, ::com::sun::star::lang::XServiceInfo >
+class SdFilterDetect : public ::cppu::WeakImplHelper2< css::document::XExtendedFilterDetection, css::lang::XServiceInfo >
 {
 public:
-                            SdFilterDetect( const REFERENCE < ::com::sun::star::lang::XMultiServiceFactory >& xFactory );
+                            SdFilterDetect( const css::uno::Reference < css::lang::XMultiServiceFactory >& xFactory );
     virtual                 ~SdFilterDetect();
 
     SFX_DECL_XSERVICEINFO_NOFACTORY
@@ -65,7 +61,7 @@ public:
     //----------------------------------------------------------------------------------
     // XExtendedFilterDetect
     //----------------------------------------------------------------------------------
-    virtual ::rtl::OUString SAL_CALL detect( SEQUENCE< ::com::sun::star::beans::PropertyValue >& lDescriptor ) throw( RUNTIME_EXCEPTION );
+    virtual ::rtl::OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException );
 };
 
 #endif
diff --git a/sd/source/ui/unoidl/unomodule.cxx b/sd/source/ui/unoidl/unomodule.cxx
index d41d901262a3..7abf2d499bc8 100644
--- a/sd/source/ui/unoidl/unomodule.cxx
+++ b/sd/source/ui/unoidl/unomodule.cxx
@@ -31,14 +31,14 @@
 
 using namespace ::com::sun::star;
 
-::rtl::OUString SAL_CALL SdUnoModule_getImplementationName() throw( uno::RuntimeException )
+OUString SAL_CALL SdUnoModule_getImplementationName() throw( uno::RuntimeException )
 {
-    return rtl::OUString( "com.sun.star.comp.Draw.DrawingModule" );
+    return OUString( "com.sun.star.comp.Draw.DrawingModule" );
 }
 
-uno::Sequence< rtl::OUString > SAL_CALL SdUnoModule_getSupportedServiceNames() throw( uno::RuntimeException )
+uno::Sequence< OUString > SAL_CALL SdUnoModule_getSupportedServiceNames() throw( uno::RuntimeException )
 {
-    uno::Sequence< rtl::OUString > aSeq( 1 );
+    uno::Sequence< OUString > aSeq( 1 );
     aSeq[0] = "com.sun.star.drawing.ModuleDispatcher";
     return aSeq;
 }
@@ -51,55 +51,55 @@ uno::Reference< uno::XInterface > SAL_CALL SdUnoModule_createInstance(
 }
 
     // XNotifyingDispatch
-void SAL_CALL SdUnoModule::dispatchWithNotification( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchResultListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
+void SAL_CALL SdUnoModule::dispatchWithNotification( const util::URL& aURL, const uno::Sequence< beans::PropertyValue >& aArgs, const uno::Reference< frame::XDispatchResultListener >& xListener ) throw (uno::RuntimeException)
 {
     // there is no guarantee, that we are holded alive during this method!
     // May the outside dispatch container will be updated by a CONTEXT_CHANGED
     // asynchronous ...
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xThis(static_cast< ::com::sun::star::frame::XNotifyingDispatch* >(this));
+    uno::Reference< uno::XInterface > xThis(static_cast< frame::XNotifyingDispatch* >(this));
 
     SolarMutexGuard aGuard;
     SdDLL::Init();
     const SfxSlot* pSlot = SD_MOD()->GetInterface()->GetSlot( aURL.Complete );
 
-    sal_Int16 aState = ::com::sun::star::frame::DispatchResultState::DONTKNOW;
+    sal_Int16 aState = frame::DispatchResultState::DONTKNOW;
     if ( !pSlot )
-        aState = ::com::sun::star::frame::DispatchResultState::FAILURE;
+        aState = frame::DispatchResultState::FAILURE;
     else
     {
         SfxRequest aReq( pSlot, aArgs, SFX_CALLMODE_SYNCHRON, SD_MOD()->GetPool() );
         const SfxPoolItem* pResult = SD_MOD()->ExecuteSlot( aReq );
         if ( pResult )
-            aState = ::com::sun::star::frame::DispatchResultState::SUCCESS;
+            aState = frame::DispatchResultState::SUCCESS;
         else
-            aState = ::com::sun::star::frame::DispatchResultState::FAILURE;
+            aState = frame::DispatchResultState::FAILURE;
     }
 
     if ( xListener.is() )
     {
         xListener->dispatchFinished(
-            ::com::sun::star::frame::DispatchResultEvent(
-                    xThis, aState, ::com::sun::star::uno::Any()));
+            frame::DispatchResultEvent(
+                    xThis, aState, uno::Any()));
     }
 }
     // XDispatch
-void SAL_CALL SdUnoModule::dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw( ::com::sun::star::uno::RuntimeException )
+void SAL_CALL SdUnoModule::dispatch( const util::URL& aURL, const uno::Sequence< beans::PropertyValue >& aArgs ) throw( uno::RuntimeException )
 {
-    dispatchWithNotification(aURL, aArgs, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchResultListener >());
+    dispatchWithNotification(aURL, aArgs, uno::Reference< frame::XDispatchResultListener >());
 }
 
-void SAL_CALL SdUnoModule::addStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > &, const ::com::sun::star::util::URL&) throw( ::com::sun::star::uno::RuntimeException )
+void SAL_CALL SdUnoModule::addStatusListener(const uno::Reference< frame::XStatusListener > &, const util::URL&) throw( uno::RuntimeException )
 {
 }
 
-void SAL_CALL SdUnoModule::removeStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > &, const ::com::sun::star::util::URL&) throw( ::com::sun::star::uno::RuntimeException )
+void SAL_CALL SdUnoModule::removeStatusListener(const uno::Reference< frame::XStatusListener > &, const util::URL&) throw( uno::RuntimeException )
 {
 }
 
-SEQUENCE< REFERENCE< XDISPATCH > > SAL_CALL SdUnoModule::queryDispatches( const SEQUENCE< DISPATCHDESCRIPTOR >& seqDescripts ) throw( ::com::sun::star::uno::RuntimeException )
+uno::Sequence< uno::Reference< frame::XDispatch > > SAL_CALL SdUnoModule::queryDispatches( const uno::Sequence< frame::DispatchDescriptor >& seqDescripts ) throw( uno::RuntimeException )
 {
     sal_Int32 nCount = seqDescripts.getLength();
-    SEQUENCE< REFERENCE< XDISPATCH > > lDispatcher( nCount );
+    uno::Sequence< uno::Reference< frame::XDispatch > > lDispatcher( nCount );
 
     for( sal_Int32 i=0; i<nCount; ++i )
     {
@@ -112,13 +112,13 @@ SEQUENCE< REFERENCE< XDISPATCH > > SAL_CALL SdUnoModule::queryDispatches( const
 }
 
 // XDispatchProvider
-REFERENCE< XDISPATCH > SAL_CALL SdUnoModule::queryDispatch( const UNOURL& aURL, const rtl::OUString&, sal_Int32 ) throw( RUNTIMEEXCEPTION )
+uno::Reference< frame::XDispatch > SAL_CALL SdUnoModule::queryDispatch( const util::URL& aURL, const OUString&, sal_Int32 ) throw( uno::RuntimeException )
 {
     SolarMutexGuard aGuard;
     SdDLL::Init();
     const SfxSlot* pSlot = SD_MOD()->GetInterface()->GetSlot( aURL.Complete );
 
-    REFERENCE< XDISPATCH > xSlot;
+    uno::Reference< frame::XDispatch > xSlot;
     if ( pSlot )
         xSlot = this;
 
@@ -126,15 +126,15 @@ REFERENCE< XDISPATCH > SAL_CALL SdUnoModule::queryDispatch( const UNOURL& aURL,
 }
 
 // XServiceInfo
-::rtl::OUString SAL_CALL SdUnoModule::getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException)
+OUString SAL_CALL SdUnoModule::getImplementationName(  ) throw(uno::RuntimeException)
 {
     return SdUnoModule_getImplementationName();
 }
 
-sal_Bool SAL_CALL SdUnoModule::supportsService( const ::rtl::OUString& sServiceName ) throw(::com::sun::star::uno::RuntimeException)
+sal_Bool SAL_CALL SdUnoModule::supportsService( const OUString& sServiceName ) throw(uno::RuntimeException)
 {
-    UNOSEQUENCE< rtl::OUString > seqServiceNames = getSupportedServiceNames();
-    const rtl::OUString*         pArray          = seqServiceNames.getConstArray();
+    uno::Sequence< OUString > seqServiceNames = getSupportedServiceNames();
+    const OUString*           pArray          = seqServiceNames.getConstArray();
     for ( sal_Int32 nCounter=0; nCounter<seqServiceNames.getLength(); nCounter++ )
     {
         if ( pArray[nCounter] == sServiceName )
@@ -145,7 +145,7 @@ sal_Bool SAL_CALL SdUnoModule::supportsService( const ::rtl::OUString& sServiceN
     return sal_False ;
 }
 
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL SdUnoModule::getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException)
+uno::Sequence< OUString > SAL_CALL SdUnoModule::getSupportedServiceNames(  ) throw(uno::RuntimeException)
 {
     return SdUnoModule_getSupportedServiceNames();
 }
diff --git a/sd/source/ui/unoidl/unomodule.hxx b/sd/source/ui/unoidl/unomodule.hxx
index 322e72dc2514..19bf68f23a68 100644
--- a/sd/source/ui/unoidl/unomodule.hxx
+++ b/sd/source/ui/unoidl/unomodule.hxx
@@ -48,42 +48,32 @@ namespace com
     }
 }
 
-#define REFERENCE               ::com::sun::star::uno::Reference
-#define SEQUENCE                ::com::sun::star::uno::Sequence
-#define RUNTIMEEXCEPTION        ::com::sun::star::uno::RuntimeException
-#define REFERENCE               ::com::sun::star::uno::Reference
-#define SEQUENCE                ::com::sun::star::uno::Sequence
-#define XDISPATCH               ::com::sun::star::frame::XDispatch
-#define XNOTIFYINGDISPATCH      ::com::sun::star::frame::XNotifyingDispatch
-#define UNOURL                  ::com::sun::star::util::URL
-#define DISPATCHDESCRIPTOR      ::com::sun::star::frame::DispatchDescriptor
-
-class SdUnoModule : public ::cppu::WeakImplHelper3< ::com::sun::star::frame::XDispatchProvider, ::com::sun::star::frame::XNotifyingDispatch, ::com::sun::star::lang::XServiceInfo >
+class SdUnoModule : public ::cppu::WeakImplHelper3< css::frame::XDispatchProvider, css::frame::XNotifyingDispatch, css::lang::XServiceInfo >
 {
-    REFERENCE < ::com::sun::star::lang::XMultiServiceFactory > m_xFactory;
+    css::uno::Reference < css::lang::XMultiServiceFactory > m_xFactory;
 
 public:
-                            SdUnoModule( const REFERENCE < ::com::sun::star::lang::XMultiServiceFactory >& xFactory )
+                            SdUnoModule( const css::uno::Reference < css::lang::XMultiServiceFactory >& xFactory )
                                 : m_xFactory( xFactory )
                             {}
 
     // XnotifyingDispatch
-    virtual void SAL_CALL dispatchWithNotification( const ::com::sun::star::util::URL& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchResultListener >& Listener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL dispatchWithNotification( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments, const css::uno::Reference< css::frame::XDispatchResultListener >& Listener ) throw (css::uno::RuntimeException);
 
     // XDispatch
-    virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL addStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xControl, const ::com::sun::star::util::URL& aURL) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL removeStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xControl, const ::com::sun::star::util::URL& aURL) throw( ::com::sun::star::uno::RuntimeException );
+    virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw( css::uno::RuntimeException );
+    virtual void SAL_CALL addStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( css::uno::RuntimeException );
+    virtual void SAL_CALL removeStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( css::uno::RuntimeException );
 
     // XDispatchProvider
-    virtual SEQUENCE< REFERENCE< XDISPATCH > > SAL_CALL queryDispatches( const SEQUENCE< DISPATCHDESCRIPTOR >& seqDescriptor ) throw( RUNTIMEEXCEPTION ) ;
-    virtual REFERENCE< XDISPATCH > SAL_CALL queryDispatch(  const   UNOURL &            aURL            ,
+    virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& seqDescriptor ) throw( css::uno::RuntimeException ) ;
+    virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch(  const   css::util::URL &            aURL            ,
                                                             const   ::rtl::OUString &   sTargetFrameName,
-                                                                    sal_Int32   eSearchFlags    ) throw( RUNTIMEEXCEPTION ) ;
+                                                                    sal_Int32   eSearchFlags    ) throw( css::uno::RuntimeException ) ;
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(css::uno::RuntimeException);
+    virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException);
 };
 
 #endif