framework: cleanup macros

Change-Id: I955210208e148dff6a1ca5ad6f1a91db2496ca7b

5 files changed, 102 insertions, 137 deletions

diff --git a/framework/inc/classes/menumanager.hxx b/framework/inc/classes/menumanager.hxx
index a6112a1f801c..fb3b2759929c 100644
--- a/framework/inc/classes/menumanager.hxx
+++ b/framework/inc/classes/menumanager.hxx
@@ -20,9 +20,6 @@
 #ifndef __FRAMEWORK_CLASSES_MENUMANAGER_HXX_
 #define __FRAMEWORK_CLASSES_MENUMANAGER_HXX_
 
-/** Attention: stl headers must(!) be included at first. Otherwhise it can make trouble
-               with solaris headers ...
-*/
 #include <vector>
 
 #include <com/sun/star/frame/XFrame.hpp>
@@ -38,16 +35,6 @@
 #include <threadhelp/threadhelpbase.hxx>
 #include <macros/debug.hxx>
 
-#define REFERENCE                                       ::com::sun::star::uno::Reference
-#define XFRAME                                          ::com::sun::star::frame::XFrame
-#define XDISPATCH                                       ::com::sun::star::frame::XDispatch
-#define XDISPATCHPROVIDER                               ::com::sun::star::frame::XDispatchProvider
-#define XSTATUSLISTENER                                 ::com::sun::star::frame::XStatusListener
-#define XEVENTLISTENER                                  ::com::sun::star::lang::XEventListener
-#define FEATURSTATEEVENT                                ::com::sun::star::frame::FeatureStateEvent
-#define RUNTIMEEXCEPTION                                ::com::sun::star::uno::RuntimeException
-#define EVENTOBJECT                                     ::com::sun::star::lang::EventObject
-
 namespace framework
 {
 
@@ -55,12 +42,12 @@ class BmkMenu;
 class AddonMenu;
 class AddonPopupMenu;
 class MenuManager : public ThreadHelpBase           ,
-                    public ::cppu::WeakImplHelper1< ::com::sun::star::frame::XStatusListener >
+                    public ::cppu::WeakImplHelper1< css::frame::XStatusListener >
 {
     public:
         MenuManager(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
-            REFERENCE< XFRAME >& rFrame,
+            const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+            css::uno::Reference< css::frame::XFrame >& rFrame,
             Menu* pMenu,
             sal_Bool bDelete,
             sal_Bool bDeleteChildren );
@@ -68,10 +55,10 @@ class MenuManager : public ThreadHelpBase           ,
         virtual ~MenuManager();
 
         // XStatusListener
-        virtual void SAL_CALL statusChanged( const FEATURSTATEEVENT& Event ) throw ( RUNTIMEEXCEPTION );
+        virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException );
 
         // XEventListener
-        virtual void SAL_CALL disposing( const EVENTOBJECT& Source ) throw ( RUNTIMEEXCEPTION );
+        virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException );
 
         DECL_LINK( Select, Menu * );
 
@@ -79,11 +66,11 @@ class MenuManager : public ThreadHelpBase           ,
 
         void    RemoveListener();
 
-        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& getContext();
+        const css::uno::Reference< css::uno::XComponentContext >& getContext();
 
-        static void UpdateSpecialWindowMenu( Menu* pMenu ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext,IMutex& _rMutex);
+        static void UpdateSpecialWindowMenu( Menu* pMenu ,const css::uno::Reference< css::uno::XComponentContext >& xContext,IMutex& _rMutex);
         static void FillMenuImages(
-            ::com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& xFrame,
+            css::uno::Reference< css::frame::XFrame >& xFrame,
             Menu* _pMenu,
             sal_Bool bShowMenuImages
         );
@@ -96,7 +83,7 @@ class MenuManager : public ThreadHelpBase           ,
     private:
         void UpdateSpecialFileMenu( Menu* pMenu );
         void UpdateSpecialWindowMenu( Menu* pMenu );
-        void ClearMenuDispatch(const EVENTOBJECT& Source = EVENTOBJECT(),bool _bRemoveOnly = true);
+        void ClearMenuDispatch(const css::lang::EventObject& Source = css::lang::EventObject(),bool _bRemoveOnly = true);
         void SetHdl();
         void AddMenu(PopupMenu* _pPopupMenu,const ::rtl::OUString& _sItemCommand,sal_uInt16 _nItemId,sal_Bool _bDelete,sal_Bool _bDeleteChildren);
         sal_uInt16 FillItemCommand(::rtl::OUString& _rItemCommand, Menu* _pMenu,sal_uInt16 _nIndex) const;
@@ -104,7 +91,7 @@ class MenuManager : public ThreadHelpBase           ,
 
         struct MenuItemHandler
         {
-            MenuItemHandler( sal_uInt16 aItemId, MenuManager* pManager, REFERENCE< XDISPATCH >& rDispatch ) :
+            MenuItemHandler( sal_uInt16 aItemId, MenuManager* pManager, css::uno::Reference< css::frame::XDispatch >& rDispatch ) :
                 nItemId( aItemId ), pSubMenuManager( pManager ), xMenuItemDispatch( rDispatch ) {}
 
             sal_uInt16                  nItemId;
@@ -114,11 +101,11 @@ class MenuManager : public ThreadHelpBase           ,
             ::rtl::OUString         aPassword;
             ::rtl::OUString         aTitle;
             MenuManager*            pSubMenuManager;
-            REFERENCE< XDISPATCH >  xMenuItemDispatch;
+            css::uno::Reference< css::frame::XDispatch >  xMenuItemDispatch;
         };
 
         void             CreatePicklistArguments(
-                            ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgsList,
+                            css::uno::Sequence< css::beans::PropertyValue >& aArgsList,
                             const MenuItemHandler* );
 
         MenuItemHandler* GetMenuItemHandler( sal_uInt16 nItemId );
@@ -131,11 +118,11 @@ class MenuManager : public ThreadHelpBase           ,
         sal_Bool                            m_bShowMenuImages;
         ::rtl::OUString                     m_aMenuItemCommand;
         Menu*                               m_pVCLMenu;
-        REFERENCE< XFRAME >                 m_xFrame;
+        css::uno::Reference< css::frame::XFrame >                 m_xFrame;
         ::std::vector< MenuItemHandler* >   m_aMenuItemHandlerVector;
 
-        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >      m_xContext;
-        ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >       m_xURLTransformer;
+        css::uno::Reference< css::uno::XComponentContext >      m_xContext;
+        css::uno::Reference< css::util::XURLTransformer >       m_xURLTransformer;
 };
 
 } // namespace
diff --git a/framework/inc/dispatch/menudispatcher.hxx b/framework/inc/dispatch/menudispatcher.hxx
index 50f7c1c6de03..e0b30691d645 100644
--- a/framework/inc/dispatch/menudispatcher.hxx
+++ b/framework/inc/dispatch/menudispatcher.hxx
@@ -193,7 +193,7 @@ class MenuDispatcher   :   // interfaces
             @onerror    -
         *//*-*****************************************************************************************************/
 
-        void SAL_CALL disposing( const EVENTOBJECT& aEvent ) throw( css::uno::RuntimeException );
+        void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException );
 
     //-------------------------------------------------------------------------------------------------------------
     //  protected methods
diff --git a/framework/inc/macros/debug/targeting.hxx b/framework/inc/macros/debug/targeting.hxx
index 0c168985a560..a7facdecd801 100644
--- a/framework/inc/macros/debug/targeting.hxx
+++ b/framework/inc/macros/debug/targeting.hxx
@@ -144,11 +144,11 @@
                     sBufferParam.append( "::findFrame() at \""  );                                                      \
                     sBufferParam.append( U2B( SFRAMENAME )      );                                                      \
                     sBufferParam.append( "\" "                  );                                                      \
-                    if( XFRAME.is() == sal_True )                                                                       \
+                    if( css::frame::XFRAME.is() == sal_True )                                                                       \
                     {                                                                                                   \
                         sBufferParam.append( "return with valid frame.\n"       );                                      \
                         sBufferSteps.append( "OK ["                             );                                      \
-                        sBufferSteps.append( U2B( XFRAME->getName() )           );                                      \
+                        sBufferSteps.append( U2B( css::frame::XFRAME->getName() )           );                                      \
                         sBufferSteps.append( "]\n"                              );                                      \
                     }                                                                                                   \
                     else                                                                                                \
diff --git a/framework/inc/services/logindialog.hxx b/framework/inc/services/logindialog.hxx
index b9a620fae235..1a45c6b6c127 100644
--- a/framework/inc/services/logindialog.hxx
+++ b/framework/inc/services/logindialog.hxx
@@ -49,27 +49,6 @@
 
 namespace framework{
 
-#define ANY                                 ::com::sun::star::uno::Any
-#define EXCEPTION                           ::com::sun::star::uno::Exception
-#define ILLEGALARGUMENTEXCEPTION            ::com::sun::star::lang::IllegalArgumentException
-#define IPROPERTYARRAYHELPER                ::cppu::IPropertyArrayHelper
-#define OBROADCASTHELPER                    ::cppu::OBroadcastHelper
-#define OPROPERTYSETHELPER                  ::cppu::OPropertySetHelper
-#define OWEAKOBJECT                         ::cppu::OWeakObject
-#define PROPERTY                            ::com::sun::star::beans::Property
-#define REFERENCE                           ::com::sun::star::uno::Reference
-#define RUNTIMEEXCEPTION                    ::com::sun::star::uno::RuntimeException
-#define SEQUENCE                            ::com::sun::star::uno::Sequence
-#define XDIALOG                             ::com::sun::star::awt::XDialog
-#define XMULTISERVICEFACTORY                ::com::sun::star::lang::XMultiServiceFactory
-#define XPROPERTYSETINFO                    ::com::sun::star::beans::XPropertySetInfo
-#define XSERVICEINFO                        ::com::sun::star::lang::XServiceInfo
-#define XTYPEPROVIDER                       ::com::sun::star::lang::XTypeProvider
-#define PROPERTYVALUE                       ::com::sun::star::beans::PropertyValue
-#define LOCALE                              ::com::sun::star::lang::Locale
-#define XFLUSHABLE                          ::com::sun::star::util::XFlushable
-#define XFLUSHLISTENER                      ::com::sun::star::util::XFlushListener
-
 #ifdef WNT
     #define ININAME                             DECLARE_ASCII("login.ini")
 #elif defined UNIX
@@ -105,13 +84,13 @@ struct tIMPL_DialogData
 {
     ::rtl::OUString         sUserName               ;
     ::rtl::OUString         sPassword               ;
-    SEQUENCE< ::rtl::OUString > seqServerList       ;
+    css::uno::Sequence< ::rtl::OUString > seqServerList;
     sal_Int32               nActiveServer           ;
     ::rtl::OUString         sConnectionType         ;
-    LOCALE                  aLanguage               ;
+    css::lang::Locale       aLanguage               ;
     sal_Int32               nPortHttp               ;
     sal_Int32               nPortHttps              ;
-    ANY                     aParentWindow           ;
+    css::uno::Any           aParentWindow           ;
     ::rtl::OUString         sSecurityProxy          ;
     ::rtl::OUString         sUseProxy               ;
     ::rtl::OUString         sDialog                 ;
@@ -121,7 +100,7 @@ struct tIMPL_DialogData
     tIMPL_DialogData()
         :   sUserName               ( ::rtl::OUString()                     )
         ,   sPassword               ( ::rtl::OUString()                     )
-        ,   seqServerList           ( SEQUENCE< ::rtl::OUString >()         )
+        ,   seqServerList           ( css::uno::Sequence< ::rtl::OUString >() )
         ,   nActiveServer           ( 1                                     )
         ,   sConnectionType         ( ::rtl::OUString()                     )
         ,   aLanguage               ( ::rtl::OUString(), ::rtl::OUString(), ::rtl::OUString() )
@@ -205,7 +184,7 @@ class cIMPL_Dialog  :   public ModalDialog
             @onerror    -
         *//*-*****************************************************************************************************/
 
-        cIMPL_Dialog( ::com::sun::star::lang::Locale aLocale, Window* pParent );
+        cIMPL_Dialog( css::lang::Locale aLocale, Window* pParent );
 
         /*-****************************************************************************************************//**
             @short      default dtor
@@ -296,7 +275,7 @@ class cIMPL_Dialog  :   public ModalDialog
         *//*-*****************************************************************************************************/
 
         static ResId impl_getResId( sal_uInt16      nId         ,
-                                    ::com::sun::star::lang::Locale  aLocale );
+                                    css::lang::Locale  aLocale );
 
     //-------------------------------------------------------------------------------------------------------------
     //  private member
@@ -353,14 +332,14 @@ class cIMPL_Dialog  :   public ModalDialog
                 OWeakObject
 *//*-*************************************************************************************************************/
 
-class LoginDialog   :   public XTYPEPROVIDER                ,
-                        public XSERVICEINFO                 ,
-                        public XDIALOG                      ,
-                        public XFLUSHABLE                   ,
+class LoginDialog   :   public css::lang::XTypeProvider     ,
+                        public css::lang::XServiceInfo      ,
+                        public css::awt::XDialog            ,
+                        public css::util::XFlushable        ,
                         private ThreadHelpBase              ,   // Order of baseclasses is necessary for right initialization!
-                        public OBROADCASTHELPER             ,
-                        public OPROPERTYSETHELPER           ,
-                        public OWEAKOBJECT
+                        public ::cppu::OBroadcastHelper     ,
+                        public ::cppu::OPropertySetHelper   ,
+                        public ::cppu::OWeakObject
 {
     //-------------------------------------------------------------------------------------------------------------
     //  public methods
@@ -384,7 +363,7 @@ class LoginDialog   :   public XTYPEPROVIDER                ,
             @onerror    -
         *//*-*****************************************************************************************************/
 
-         LoginDialog( const REFERENCE< XMULTISERVICEFACTORY >& sFactory );
+         LoginDialog( const css::uno::Reference< css::lang::XMultiServiceFactory >& sFactory );
 
         /*-****************************************************************************************************//**
             @short      -
@@ -426,9 +405,9 @@ class LoginDialog   :   public XTYPEPROVIDER                ,
             @onerror    -
         *//*-*****************************************************************************************************/
 
-        virtual void SAL_CALL flush() throw( RUNTIMEEXCEPTION );
-        virtual void SAL_CALL addFlushListener( const REFERENCE< XFLUSHLISTENER >& xListener ) throw( RUNTIMEEXCEPTION );
-        virtual void SAL_CALL removeFlushListener( const REFERENCE< XFLUSHLISTENER >& xListener ) throw( RUNTIMEEXCEPTION );
+        virtual void SAL_CALL flush() throw( css::uno::RuntimeException );
+        virtual void SAL_CALL addFlushListener( const css::uno::Reference< css::util::XFlushListener >& xListener ) throw( css::uno::RuntimeException );
+        virtual void SAL_CALL removeFlushListener( const css::uno::Reference< css::util::XFlushListener >& xListener ) throw( css::uno::RuntimeException );
 
         //---------------------------------------------------------------------------------------------------------
         //  XDialog
@@ -446,7 +425,7 @@ class LoginDialog   :   public XTYPEPROVIDER                ,
             @onerror    -
         *//*-*****************************************************************************************************/
 
-        virtual void SAL_CALL setTitle( const ::rtl::OUString& sTitle ) throw( RUNTIMEEXCEPTION );
+        virtual void SAL_CALL setTitle( const ::rtl::OUString& sTitle ) throw( css::uno::RuntimeException );
 
         /*-****************************************************************************************************//**
             @short      return the current title of this dialog
@@ -460,7 +439,7 @@ class LoginDialog   :   public XTYPEPROVIDER                ,
             @onerror    -
         *//*-*****************************************************************************************************/
 
-        virtual ::rtl::OUString SAL_CALL getTitle() throw( RUNTIMEEXCEPTION );
+        virtual ::rtl::OUString SAL_CALL getTitle() throw( css::uno::RuntimeException );
 
         /*-****************************************************************************************************//**
             @short      show the dialog and return user reaction
@@ -477,7 +456,7 @@ class LoginDialog   :   public XTYPEPROVIDER                ,
             @onerror    We return 0(sal_False).
         *//*-*****************************************************************************************************/
 
-        virtual sal_Int16 SAL_CALL execute() throw( RUNTIMEEXCEPTION );
+        virtual sal_Int16 SAL_CALL execute() throw( css::uno::RuntimeException );
 
         /*-****************************************************************************************************//**
             @short      not implemented yet!
@@ -491,7 +470,7 @@ class LoginDialog   :   public XTYPEPROVIDER                ,
             @onerror    -
         *//*-*****************************************************************************************************/
 
-        virtual void SAL_CALL endExecute() throw( RUNTIMEEXCEPTION );
+        virtual void SAL_CALL endExecute() throw( css::uno::RuntimeException );
 
     //-------------------------------------------------------------------------------------------------------------
     //  protected methods
@@ -525,10 +504,10 @@ class LoginDialog   :   public XTYPEPROVIDER                ,
             @onerror    IllegalArgumentException, if you call this with an invalid argument
         *//*-*****************************************************************************************************/
 
-        virtual sal_Bool SAL_CALL convertFastPropertyValue(         ANY&        aConvertedValue ,
-                                                                      ANY&      aOldValue       ,
-                                                                    sal_Int32   nHandle         ,
-                                                            const   ANY&        aValue          ) throw( ILLEGALARGUMENTEXCEPTION );
+        virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any&          aConvertedValue ,
+                                                            css::uno::Any&          aOldValue       ,
+                                                            sal_Int32               nHandle         ,
+                                                            const css::uno::Any&    aValue          ) throw( css::lang::IllegalArgumentException );
 
         /*-****************************************************************************************************//**
             @short      set value of a transient property
@@ -546,8 +525,8 @@ class LoginDialog   :   public XTYPEPROVIDER                ,
             @onerror    An exception is thrown.
         *//*-*****************************************************************************************************/
 
-        virtual void SAL_CALL setFastPropertyValue_NoBroadcast(         sal_Int32   nHandle ,
-                                                                  const ANY&        aValue  ) throw( EXCEPTION );
+        virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32                   nHandle ,
+                                                                const css::uno::Any&        aValue  ) throw( css::uno::Exception );
 
         /*-****************************************************************************************************//**
             @short      get value of a transient property
@@ -563,8 +542,8 @@ class LoginDialog   :   public XTYPEPROVIDER                ,
             @onerror    -
         *//*-*****************************************************************************************************/
 
-        virtual void SAL_CALL getFastPropertyValue( ANY&        aValue  ,
-                                                      sal_Int32 nHandle ) const;
+        virtual void SAL_CALL getFastPropertyValue( css::uno::Any&      aValue  ,
+                                                    sal_Int32           nHandle ) const;
 
         /*-****************************************************************************************************//**
             @short      return structure and information about transient properties
@@ -579,7 +558,7 @@ class LoginDialog   :   public XTYPEPROVIDER                ,
             @onerror    -
         *//*-*****************************************************************************************************/
 
-        virtual IPROPERTYARRAYHELPER& SAL_CALL getInfoHelper();
+        virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
 
         /*-****************************************************************************************************//**
             @short      return propertysetinfo
@@ -596,7 +575,7 @@ class LoginDialog   :   public XTYPEPROVIDER                ,
             @onerror    -
         *//*-*****************************************************************************************************/
 
-        virtual REFERENCE< XPROPERTYSETINFO > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException);
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (css::uno::RuntimeException);
 
     //-------------------------------------------------------------------------------------------------------------
     //  private methods
@@ -616,7 +595,7 @@ class LoginDialog   :   public XTYPEPROVIDER                ,
             @onerror    -
         *//*-*****************************************************************************************************/
 
-        const SEQUENCE< PROPERTY > impl_getStaticPropertyDescriptor();
+        const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescriptor();
 
         /*-****************************************************************************************************//**
             @short      helper method to check if a property will change his value
@@ -630,30 +609,30 @@ class LoginDialog   :   public XTYPEPROVIDER                ,
             @onerror    -
         *//*-*****************************************************************************************************/
 
-        sal_Bool impl_tryToChangeProperty(  const   ::rtl::OUString&        sProperty       ,
-                                            const   ANY&                    aValue          ,
-                                                    ANY&                    aOldValue       ,
-                                                    ANY&                    aConvertedValue ) throw( ILLEGALARGUMENTEXCEPTION );
+        sal_Bool impl_tryToChangeProperty(  const   ::rtl::OUString&                  sProperty       ,
+                                            const   css::uno::Any&                    aValue          ,
+                                                    css::uno::Any&                    aOldValue       ,
+                                                    css::uno::Any&                    aConvertedValue ) throw( css::lang::IllegalArgumentException );
 
-        sal_Bool impl_tryToChangeProperty(  const   SEQUENCE< ::rtl::OUString >& seqProperty,
-                                            const   ANY&                    aValue          ,
-                                                    ANY&                    aOldValue       ,
-                                                    ANY&                    aConvertedValue ) throw( ILLEGALARGUMENTEXCEPTION );
+        sal_Bool impl_tryToChangeProperty(  const   css::uno::Sequence< ::rtl::OUString >& seqProperty,
+                                            const   css::uno::Any&                    aValue          ,
+                                                    css::uno::Any&                    aOldValue       ,
+                                                    css::uno::Any&                    aConvertedValue ) throw( css::lang::IllegalArgumentException );
 
-        sal_Bool impl_tryToChangeProperty(  const   sal_Int32&              nProperty       ,
-                                            const   ANY&                    aValue          ,
-                                                    ANY&                    aOldValue       ,
-                                                    ANY&                    aConvertedValue ) throw( ILLEGALARGUMENTEXCEPTION );
+        sal_Bool impl_tryToChangeProperty(  const   sal_Int32&                        nProperty       ,
+                                            const   css::uno::Any&                    aValue          ,
+                                                    css::uno::Any&                    aOldValue       ,
+                                                    css::uno::Any&                    aConvertedValue ) throw( css::lang::IllegalArgumentException );
 
-        sal_Bool impl_tryToChangeProperty(  const   LOCALE&                 aProperty       ,
-                                            const   ANY&                    aValue          ,
-                                                    ANY&                    aOldValue       ,
-                                                    ANY&                    aConvertedValue ) throw( ILLEGALARGUMENTEXCEPTION );
+        sal_Bool impl_tryToChangeProperty(  const   css::lang::Locale&                aProperty       ,
+                                            const   css::uno::Any&                    aValue          ,
+                                                    css::uno::Any&                    aOldValue       ,
+                                                    css::uno::Any&                    aConvertedValue ) throw( css::lang::IllegalArgumentException );
 
-        sal_Bool impl_tryToChangeProperty(  const   ANY&                    aProperty       ,
-                                            const   ANY&                    aValue          ,
-                                                    ANY&                    aOldValue       ,
-                                                    ANY&                    aConvertedValue ) throw( ILLEGALARGUMENTEXCEPTION );
+        sal_Bool impl_tryToChangeProperty(  const   css::uno::Any&                    aProperty       ,
+                                            const   css::uno::Any&                    aValue          ,
+                                                    css::uno::Any&                    aOldValue       ,
+                                                    css::uno::Any&                    aConvertedValue ) throw( css::lang::IllegalArgumentException );
 
         /*-****************************************************************************************************//**
             @short      search and open profile
@@ -709,9 +688,9 @@ class LoginDialog   :   public XTYPEPROVIDER                ,
             @onerror    -
         *//*-*****************************************************************************************************/
 
-        void impl_addServerToHistory(           SEQUENCE< ::rtl::OUString >& seqHistory,
-                                                sal_Int32&              nActiveServer   ,
-                                        const   ::rtl::OUString&        sServer         );
+        void impl_addServerToHistory( css::uno::Sequence< ::rtl::OUString >&    seqHistory,
+                                      sal_Int32&                                nActiveServer   ,
+                                      const ::rtl::OUString&                    sServer         );
 
         /*-****************************************************************************************************//**
             @short      helper methods to read/write  properties from/to ini file
@@ -729,9 +708,9 @@ class LoginDialog   :   public XTYPEPROVIDER                ,
 
         void                    impl_writeUserName              (   const   ::rtl::OUString&        sUserName       );
         void                    impl_writeActiveServer          (           sal_Int32               nActiveServer   );
-        void                    impl_writeServerHistory         (   const   SEQUENCE< ::rtl::OUString >& lHistory   );
+        void                    impl_writeServerHistory         (   const   css::uno::Sequence< ::rtl::OUString >& lHistory   );
         void                    impl_writeConnectionType        (   const   ::rtl::OUString&        sConnectionType );
-        void                    impl_writeLanguage              (   const   LOCALE&                 aLanguage       );
+        void                    impl_writeLanguage              (   const   css::lang::Locale&      aLanguage       );
         void                    impl_writePortHttp              (           sal_Int32               nPort           );
         void                    impl_writePortHttps             (           sal_Int32               nPort           );
         void                    impl_writeSecurityProxy         (   const   ::rtl::OUString&        sSecurityProxy  );
@@ -740,9 +719,9 @@ class LoginDialog   :   public XTYPEPROVIDER                ,
 
         ::rtl::OUString         impl_readUserName               (                                                   );
         sal_Int32               impl_readActiveServer           (                                                   );
-        SEQUENCE< ::rtl::OUString > impl_readServerHistory      (                                                   );
+        css::uno::Sequence< ::rtl::OUString > impl_readServerHistory (                                              );
         ::rtl::OUString         impl_readConnectionType         (                                                   );
-        LOCALE                  impl_readLanguage               (                                                   );
+        css::lang::Locale       impl_readLanguage               (                                                   );
         sal_Int32               impl_readPortHttp               (                                                   );
         sal_Int32               impl_readPortHttps              (                                                   );
         ::rtl::OUString         impl_readSecurityProxy          (                                                   );
@@ -772,7 +751,7 @@ class LoginDialog   :   public XTYPEPROVIDER                ,
 
     private:
 
-        sal_Bool impldbg_checkParameter_LoginDialog (   const   REFERENCE< XMULTISERVICEFACTORY >&  xFactory    );
+        sal_Bool impldbg_checkParameter_LoginDialog (   const   css::uno::Reference< css::lang::XMultiServiceFactory >&  xFactory    );
         sal_Bool impldbg_checkParameter_setTitle    (   const   ::rtl::OUString&                    sTitle      );
 
     #endif  // #ifdef ENABLE_ASSERTIONS
@@ -784,7 +763,7 @@ class LoginDialog   :   public XTYPEPROVIDER                ,
 
     private:
 
-        REFERENCE< XMULTISERVICEFACTORY >       m_xFactory          ;   /// reference to factory, which has created this instance
+        css::uno::Reference< css::lang::XMultiServiceFactory >       m_xFactory          ;   /// reference to factory, which has created this instance
         ::rtl::OUString                         m_sININame          ;   /// full qualified path to profile UNC-notation
         Config*                                 m_pINIManager       ;   /// manager for full access to ini file
         sal_Bool                                m_bInExecuteMode    ;   /// protection against setting of properties during showing of dialog
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index 853bde68ecc6..fea88de034c9 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -63,8 +63,7 @@ using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::container;
 
-
-class StringLength : public ::cppu::WeakImplHelper1< ::com::sun::star::util::XStringWidth >
+class StringLength : public ::cppu::WeakImplHelper1< XStringWidth >
 {
     public:
         StringLength() {}
@@ -72,7 +71,7 @@ class StringLength : public ::cppu::WeakImplHelper1< ::com::sun::star::util::XSt
 
         // XStringWidth
         sal_Int32 SAL_CALL queryStringWidth( const OUString& aString )
-            throw (::com::sun::star::uno::RuntimeException)
+            throw (RuntimeException)
         {
             return aString.getLength();
         }
@@ -105,8 +104,8 @@ namespace framework
 const char UNO_COMMAND[] = ".uno:";
 
 MenuManager::MenuManager(
-    const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
-    REFERENCE< XFRAME >& rFrame, Menu* pMenu, sal_Bool bDelete, sal_Bool bDeleteChildren )
+    const Reference< XComponentContext >& rxContext,
+    Reference< XFrame >& rFrame, Menu* pMenu, sal_Bool bDelete, sal_Bool bDeleteChildren )
 :
     ThreadHelpBase( &Application::GetSolarMutex() ),
     m_xContext(rxContext)
@@ -253,7 +252,7 @@ MenuManager::MenuManager(
                     }
                 }
 
-                REFERENCE< XDISPATCH > aXDispatchRef;
+                Reference< XDispatch > aXDispatchRef;
                 m_aMenuItemHandlerVector.push_back( new MenuItemHandler( nItemId, NULL, aXDispatchRef ));
 
             }
@@ -285,7 +284,7 @@ MenuManager::~MenuManager()
         MenuItemHandler* pItemHandler = *p;
         pItemHandler->xMenuItemDispatch.clear();
         if ( pItemHandler->pSubMenuManager )
-            (static_cast< ::com::sun::star::uno::XInterface* >((OWeakObject*)pItemHandler->pSubMenuManager))->release();
+            (static_cast< XInterface* >((OWeakObject*)pItemHandler->pSubMenuManager))->release();
         delete pItemHandler;
     }
 
@@ -310,7 +309,7 @@ MenuManager::MenuItemHandler* MenuManager::GetMenuItemHandler( sal_uInt16 nItemI
 }
 
 
-void SAL_CALL MenuManager::statusChanged( const FEATURSTATEEVENT& Event )
+void SAL_CALL MenuManager::statusChanged( const FeatureStateEvent& Event )
 throw ( RuntimeException )
 {
     OUString aFeatureURL = Event.FeatureURL.Complete;
@@ -358,15 +357,15 @@ throw ( RuntimeException )
 
             m_xURLTransformer->parseStrict( aTargetURL );
 
-            REFERENCE< XDISPATCHPROVIDER > xDispatchProvider( m_xFrame, UNO_QUERY );
-            REFERENCE< XDISPATCH > xMenuItemDispatch = xDispatchProvider->queryDispatch(
+            Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
+            Reference< XDispatch > xMenuItemDispatch = xDispatchProvider->queryDispatch(
                                                             aTargetURL, OUString(), 0 );
 
             if ( xMenuItemDispatch.is() )
             {
                 pStatusChangedMenu->xMenuItemDispatch   = xMenuItemDispatch;
                 pStatusChangedMenu->aMenuItemURL        = aTargetURL.Complete;
-                xMenuItemDispatch->addStatusListener( (static_cast< XSTATUSLISTENER* >(this)), aTargetURL );
+                xMenuItemDispatch->addStatusListener( (static_cast< XStatusListener* >(this)), aTargetURL );
             }
         }
     }
@@ -379,7 +378,7 @@ void MenuManager::RemoveListener()
     ClearMenuDispatch();
 }
 
-void MenuManager::ClearMenuDispatch(const EVENTOBJECT& Source,bool _bRemoveOnly)
+void MenuManager::ClearMenuDispatch(const EventObject& Source,bool _bRemoveOnly)
 {
     // disposing called from parent dispatcher
     // remove all listener to prepare shutdown
@@ -395,7 +394,7 @@ void MenuManager::ClearMenuDispatch(const EVENTOBJECT& Source,bool _bRemoveOnly)
             m_xURLTransformer->parseStrict( aTargetURL );
 
             pItemHandler->xMenuItemDispatch->removeStatusListener(
-                (static_cast< XSTATUSLISTENER* >(this)), aTargetURL );
+                (static_cast< XStatusListener* >(this)), aTargetURL );
         }
 
         pItemHandler->xMenuItemDispatch.clear();
@@ -410,7 +409,7 @@ void MenuManager::ClearMenuDispatch(const EVENTOBJECT& Source,bool _bRemoveOnly)
 }
 
 
-void SAL_CALL MenuManager::disposing( const EVENTOBJECT& Source ) throw ( RUNTIMEEXCEPTION )
+void SAL_CALL MenuManager::disposing( const EventObject& Source ) throw ( RuntimeException )
 {
     if ( Source.Source == m_xFrame )
     {
@@ -443,7 +442,7 @@ void SAL_CALL MenuManager::disposing( const EVENTOBJECT& Source ) throw ( RUNTIM
 
                 m_xURLTransformer->parseStrict( aTargetURL );
 
-                pMenuItemDisposing->xMenuItemDispatch->removeStatusListener((static_cast< XSTATUSLISTENER* >(this)), aTargetURL );
+                pMenuItemDisposing->xMenuItemDispatch->removeStatusListener((static_cast< XStatusListener* >(this)), aTargetURL );
                 pMenuItemDisposing->xMenuItemDispatch.clear();
             }
         }
@@ -466,7 +465,7 @@ void MenuManager::UpdateSpecialFileMenu( Menu* pMenu )
     {
         Sequence< PropertyValue > aPickListEntry = aHistoryList[i];
 
-        REFERENCE< XDISPATCH > aXDispatchRef;
+        Reference< XDispatch > aXDispatchRef;
         MenuItemHandler* pNewMenuItemHandler = new MenuItemHandler(
                                                     nPickItemId++,
                                                     NULL,
@@ -492,9 +491,9 @@ void MenuManager::UpdateSpecialFileMenu( Menu* pMenu )
     if ( !aNewPickVector.empty() )
     {
         URL aTargetURL;
-        REFERENCE< XDISPATCHPROVIDER > xDispatchProvider( m_xFrame, UNO_QUERY );
+        Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
 
-        REFERENCE< XDISPATCH > xMenuItemDispatch;
+        Reference< XDispatch > xMenuItemDispatch;
 
         static const OUString s_sDefault("_default");
         // query for dispatcher
@@ -776,7 +775,7 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu )
 
             ResetableGuard aGuard( m_aLock );
 
-            REFERENCE< XDISPATCHPROVIDER > xDispatchProvider( m_xFrame, UNO_QUERY );
+            Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
             if ( xDispatchProvider.is() )
             {
                 std::vector< MenuItemHandler* >::iterator p;
@@ -805,7 +804,7 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu )
 
                             m_xURLTransformer->parseStrict( aTargetURL );
 
-                            REFERENCE< XDISPATCH > xMenuItemDispatch;
+                            Reference< XDispatch > xMenuItemDispatch;
                             if ( m_bIsBookmarkMenu )
                                 xMenuItemDispatch = xDispatchProvider->queryDispatch( aTargetURL, pMenuItemHandler->aTargetFrame, 0 );
                             else
@@ -815,7 +814,7 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu )
                             {
                                 pMenuItemHandler->xMenuItemDispatch = xMenuItemDispatch;
                                 pMenuItemHandler->aMenuItemURL      = aTargetURL.Complete;
-                                xMenuItemDispatch->addStatusListener( (static_cast< XSTATUSLISTENER* >(this)), aTargetURL );
+                                xMenuItemDispatch->addStatusListener( (static_cast< XStatusListener* >(this)), aTargetURL );
                             }
                             else
                                 pMenu->EnableItem( pMenuItemHandler->nItemId, sal_False );
@@ -843,7 +842,7 @@ IMPL_LINK( MenuManager, Select, Menu *, pMenu )
 {
     URL                     aTargetURL;
     Sequence<PropertyValue> aArgs;
-    REFERENCE< XDISPATCH >  xDispatch;
+    Reference< XDispatch >  xDispatch;
 
     {
         ResetableGuard aGuard( m_aLock );
@@ -918,7 +917,7 @@ IMPL_LINK_NOARG(MenuManager, Highlight)
     return 0;
 }
 
-const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& MenuManager::getContext()
+const Reference< XComponentContext >& MenuManager::getContext()
 {
     return m_xContext;
 }
@@ -930,7 +929,7 @@ void MenuManager::AddMenu(PopupMenu* _pPopupMenu,const OUString& _sItemCommand,s
     // store menu item command as we later have to know which menu is active (see Activate handler)
     pSubMenuManager->m_aMenuItemCommand = _sItemCommand;
 
-    REFERENCE< XDISPATCH > aXDispatchRef;
+    Reference< XDispatch > aXDispatchRef;
     MenuItemHandler* pMenuItemHandler = new MenuItemHandler(
                                                 _nItemId,
                                                 pSubMenuManager,