New loplugin:dynexcspec: Add @throws documentation, framework

Change-Id: I19a4517449be3defe97fe0d78dd1a16b08b79247

42 files changed, 206 insertions, 31 deletions

diff --git a/framework/inc/classes/actiontriggerpropertyset.hxx b/framework/inc/classes/actiontriggerpropertyset.hxx
index 7b190399745d..6d472b64338e 100644
--- a/framework/inc/classes/actiontriggerpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerpropertyset.hxx
@@ -89,16 +89,19 @@ class ActionTriggerPropertySet :  private cppu::BaseMutex,
 
         //  helper
 
+        /// @throws css::lang::IllegalArgumentException
         bool impl_tryToChangeProperty(  const   OUString&            aCurrentValue   ,
                                         const   css::uno::Any&       aNewValue       ,
                                             css::uno::Any&           aOldValue       ,
                                             css::uno::Any&           aConvertedValue ) throw( css::lang::IllegalArgumentException );
 
+        /// @throws css::lang::IllegalArgumentException
         bool impl_tryToChangeProperty(  const   css::uno::Reference< css::awt::XBitmap >&  xBitmap,
                                         const   css::uno::Any&   aNewValue       ,
                                             css::uno::Any&           aOldValue       ,
                                             css::uno::Any&           aConvertedValue ) throw( css::lang::IllegalArgumentException );
 
+        /// @throws css::lang::IllegalArgumentException
         bool impl_tryToChangeProperty(  const   css::uno::Reference< css::uno::XInterface >& xInterface,
                                         const   css::uno::Any&   aNewValue       ,
                                             css::uno::Any&           aOldValue       ,
diff --git a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
index 4c6696a7dbf7..6b265635a927 100644
--- a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
@@ -87,6 +87,8 @@ class ActionTriggerSeparatorPropertySet :   private cppu::BaseMutex,
 
         //  helper
 
+        /// @throws css::lang::IllegalArgumentException
+        /// @throws css::uno::RuntimeException
         bool impl_tryToChangeProperty(  sal_Int16                           aCurrentValue   ,
                                             const   css::uno::Any&   aNewValue       ,
                                             css::uno::Any&           aOldValue       ,
diff --git a/framework/inc/dispatch/mailtodispatcher.hxx b/framework/inc/dispatch/mailtodispatcher.hxx
index f1dbabbde40f..8ab0e242c76a 100644
--- a/framework/inc/dispatch/mailtodispatcher.hxx
+++ b/framework/inc/dispatch/mailtodispatcher.hxx
@@ -67,7 +67,11 @@ class MailToDispatcher : public  ::cppu::WeakImplHelper<
         virtual ~MailToDispatcher(                                                                     ) override;
 
         // XInterface, XTypeProvider, XServiceInfo
-        DECLARE_XSERVICEINFO
+        DECLARE_XSERVICEINFO_NOFACTORY
+        /* Helper for registry */
+        /// @throws css::uno::Exception
+        static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+        static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
         // XDispatchProvider
         virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL                       queryDispatch  ( const css::util::URL&                                       aURL        ,
@@ -90,7 +94,7 @@ class MailToDispatcher : public  ::cppu::WeakImplHelper<
 
     /* internal */
     private:
-
+        /// @throws css::uno::RuntimeException
         bool implts_dispatch( const css::util::URL&                                  aURL       ,
                                   const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException );
 
diff --git a/framework/inc/dispatch/oxt_handler.hxx b/framework/inc/dispatch/oxt_handler.hxx
index c3cfddb3b601..99c5cfba9905 100644
--- a/framework/inc/dispatch/oxt_handler.hxx
+++ b/framework/inc/dispatch/oxt_handler.hxx
@@ -63,7 +63,11 @@ class Oxt_Handler  :    public  ::cppu::WeakImplHelper<
 
         //  XInterface, XTypeProvider, XServiceInfo
 
-        DECLARE_XSERVICEINFO
+        DECLARE_XSERVICEINFO_NOFACTORY
+        /* Helper for registry */
+        /// @throws css::uno::Exception
+        static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+        static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
         //  XNotifyingDispatch
 
diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx
index 3c3d1512e05c..25a6bb5f4d81 100644
--- a/framework/inc/dispatch/popupmenudispatcher.hxx
+++ b/framework/inc/dispatch/popupmenudispatcher.hxx
@@ -82,7 +82,11 @@ class PopupMenuDispatcher :     public  ::cppu::WeakImplHelper<
         PopupMenuDispatcher( const css::uno::Reference< css::uno::XComponentContext >& xContext );
 
         // XInterface, XTypeProvider, XServiceInfo
-        DECLARE_XSERVICEINFO
+        DECLARE_XSERVICEINFO_NOFACTORY
+        /* Helper for registry */
+        /// @throws css::uno::Exception
+        static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+        static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
         // XInitialization
         virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& lArguments ) throw( css::uno::Exception       ,
diff --git a/framework/inc/dispatch/servicehandler.hxx b/framework/inc/dispatch/servicehandler.hxx
index ea3a66d23589..cbec0bd46417 100644
--- a/framework/inc/dispatch/servicehandler.hxx
+++ b/framework/inc/dispatch/servicehandler.hxx
@@ -71,7 +71,11 @@ class ServiceHandler : public  ::cppu::WeakImplHelper<
         virtual ~ServiceHandler(                                                                        ) override;
 
         // XInterface, XTypeProvider, XServiceInfo
-        DECLARE_XSERVICEINFO
+        DECLARE_XSERVICEINFO_NOFACTORY
+        /* Helper for registry */
+        /// @throws css::uno::Exception
+        static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+        static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
         // XDispatchProvider
         virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL                       queryDispatch  ( const css::util::URL&                                       aURL        ,
@@ -94,7 +98,7 @@ class ServiceHandler : public  ::cppu::WeakImplHelper<
 
     /* internal */
     private:
-
+        /// @throws css::uno::RuntimeException
         css::uno::Reference< css::uno::XInterface > implts_dispatch( const css::util::URL&                                  aURL       ,
                                                                      const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException );
 
diff --git a/framework/inc/dispatch/systemexec.hxx b/framework/inc/dispatch/systemexec.hxx
index fe87a90e35dd..143c284e2602 100644
--- a/framework/inc/dispatch/systemexec.hxx
+++ b/framework/inc/dispatch/systemexec.hxx
@@ -69,7 +69,11 @@ class SystemExec :     public  ::cppu::WeakImplHelper<
         virtual ~SystemExec(                                                                     ) override;
 
         // XInterface, XTypeProvider, XServiceInfo
-        DECLARE_XSERVICEINFO
+        DECLARE_XSERVICEINFO_NOFACTORY
+        /* Helper for registry */
+        /// @throws css::uno::Exception
+        static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+        static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
         // XDispatchProvider
         virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL                       queryDispatch  ( const css::util::URL&                                       aURL        ,
diff --git a/framework/inc/jobs/helponstartup.hxx b/framework/inc/jobs/helponstartup.hxx
index e26bb74ed410..b1389ab50727 100644
--- a/framework/inc/jobs/helponstartup.hxx
+++ b/framework/inc/jobs/helponstartup.hxx
@@ -93,7 +93,11 @@ class HelpOnStartup : public ::cppu::WeakImplHelper< css::lang::XServiceInfo,css
     public:
 
         // css.lang.XServiceInfo
-        DECLARE_XSERVICEINFO
+        DECLARE_XSERVICEINFO_NOFACTORY
+        /* Helper for registry */
+        /// @throws css::uno::Exception
+        static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+        static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
         // css.task.XJob
         virtual css::uno::Any SAL_CALL execute(const css::uno::Sequence< css::beans::NamedValue >& lArguments)
diff --git a/framework/inc/jobs/shelljob.hxx b/framework/inc/jobs/shelljob.hxx
index 162eca14c3e8..13658a1c791e 100644
--- a/framework/inc/jobs/shelljob.hxx
+++ b/framework/inc/jobs/shelljob.hxx
@@ -77,7 +77,11 @@ class ShellJob : public ::cppu::WeakImplHelper< css::lang::XServiceInfo,css::tas
     public:
 
         // css.lang.XServiceInfo
-        DECLARE_XSERVICEINFO
+        DECLARE_XSERVICEINFO_NOFACTORY
+        /* Helper for registry */
+        /// @throws css::uno::Exception
+        static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+        static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
         // css.task.XJob
         virtual css::uno::Any SAL_CALL execute(const css::uno::Sequence< css::beans::NamedValue >& lArguments)
diff --git a/framework/inc/macros/xserviceinfo.hxx b/framework/inc/macros/xserviceinfo.hxx
index 0e39eb7686bb..a8d8b935d23d 100644
--- a/framework/inc/macros/xserviceinfo.hxx
+++ b/framework/inc/macros/xserviceinfo.hxx
@@ -42,7 +42,6 @@ namespace framework{
     macros for declaration and definition of XServiceInfo
     Please use follow public macros only!
 
-    1)  DECLARE_XSERVICEINFO                                                                                => use it to declare XServiceInfo in your header
     2)  DEFINE_XSERVICEINFO_MULTISERVICE( CLASS, XINTERFACECAST, SERVICENAME, IMPLEMENTATIONNAME )          => use it to define XServiceInfo for multi service mode
     3)  DEFINE_XSERVICEINFO_ONEINSTANCESERVICE( CLASS, XINTERFACECAST, SERVICENAME, IMPLEMENTATIONNAME )    => use it to define XServiceInfo for one instance service mode
     4)  DEFINE_INIT_SERVICE( CLASS )                                                                        => use it to implement your own impl_initService() method, which is necessary for initializing object by using his own reference!
@@ -151,12 +150,6 @@ namespace framework{
     /* Helper for initialization of service by using own reference! */                                                                                                                                            \
     void                                                    SAL_CALL impl_initService                   (                                   );                                                                    \
 
-#define DECLARE_XSERVICEINFO                                                                                                                                                                                                            \
-    DECLARE_XSERVICEINFO_NOFACTORY \
-    /* Helper for registry */                                                                                                                                                                                                           \
-    static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );          \
-    static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );                                       \
-
 #define DEFINE_XSERVICEINFO_MULTISERVICE( CLASS, XINTERFACECAST, SERVICENAME, IMPLEMENTATIONNAME )              \
     PRIVATE_DEFINE_XSERVICEINFO_OLDSTYLE( CLASS, XINTERFACECAST, SERVICENAME, IMPLEMENTATIONNAME )              \
     PRIVATE_DEFINE_SINGLEFACTORY( CLASS )
diff --git a/framework/inc/recording/dispatchrecorder.hxx b/framework/inc/recording/dispatchrecorder.hxx
index 94e0882b361e..8d5b68365ca7 100644
--- a/framework/inc/recording/dispatchrecorder.hxx
+++ b/framework/inc/recording/dispatchrecorder.hxx
@@ -62,7 +62,11 @@ class DispatchRecorder
         virtual ~DispatchRecorder() override;
 
         // XInterface, XTypeProvider, XServiceInfo
-        DECLARE_XSERVICEINFO
+        DECLARE_XSERVICEINFO_NOFACTORY
+        /* Helper for registry */
+        /// @throws css::uno::Exception
+        static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+        static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
         // XDispatchRecorder
         virtual void SAL_CALL            startRecording         ( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException, std::exception ) override;
diff --git a/framework/inc/recording/dispatchrecordersupplier.hxx b/framework/inc/recording/dispatchrecordersupplier.hxx
index c00e877ed8c0..b194cc24e810 100644
--- a/framework/inc/recording/dispatchrecordersupplier.hxx
+++ b/framework/inc/recording/dispatchrecordersupplier.hxx
@@ -66,7 +66,11 @@ class DispatchRecorderSupplier  :   public  ::cppu::WeakImplHelper<
 
         // XInterface, XTypeProvider, XServiceInfo
 
-        DECLARE_XSERVICEINFO
+        DECLARE_XSERVICEINFO_NOFACTORY
+        /* Helper for registry */
+        /// @throws css::uno::Exception
+        static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+        static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
         // XDispatchRecorderSupplier
 
diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx
index 2c88e32c501f..9df5666b4fbe 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -301,6 +301,7 @@ class Desktop : private cppu::BaseMutex,
 
         // we need this wrapped terminate()-call to terminate even the QuickStarter
         // non-virtual and non-UNO for now
+        /// @throws css::uno::RuntimeException
         bool SAL_CALL terminateQuickstarterToo()
             throw( css::uno::RuntimeException );
 
diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx
index 85cde4bdb26a..ca122c39923c 100644
--- a/framework/inc/services/layoutmanager.hxx
+++ b/framework/inc/services/layoutmanager.hxx
@@ -235,9 +235,11 @@ namespace framework
             void        implts_backupProgressBarWrapper();
             void        implts_setOffset( const sal_Int32 nBottomOffset );
 
+            /// @throws css::uno::RuntimeException
             void    implts_setInplaceMenuBar(
                         const css::uno::Reference< css::container::XIndexAccess >& xMergedMenuBar )
                             throw (css::uno::RuntimeException, std::exception);
+            /// @throws css::uno::RuntimeException
             void    implts_resetInplaceMenuBar()
                             throw (css::uno::RuntimeException);
 
diff --git a/framework/inc/services/mediatypedetectionhelper.hxx b/framework/inc/services/mediatypedetectionhelper.hxx
index 7c5af808c924..9d59ad4e08e9 100644
--- a/framework/inc/services/mediatypedetectionhelper.hxx
+++ b/framework/inc/services/mediatypedetectionhelper.hxx
@@ -69,7 +69,11 @@ class MediaTypeDetectionHelper  :   public ::cppu::WeakImplHelper< css::util::XS
 
         //  XInterface, XTypeProvider, XServiceInfo
 
-        DECLARE_XSERVICEINFO
+        DECLARE_XSERVICEINFO_NOFACTORY
+        /* Helper for registry */
+        /// @throws css::uno::Exception
+        static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+        static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
         //  XStringMapping
 
diff --git a/framework/inc/services/uriabbreviation.hxx b/framework/inc/services/uriabbreviation.hxx
index 9357a6255fbc..815ebdb0f100 100644
--- a/framework/inc/services/uriabbreviation.hxx
+++ b/framework/inc/services/uriabbreviation.hxx
@@ -39,7 +39,11 @@ class UriAbbreviation:    public ::cppu::WeakImplHelper< css::util::XStringAbbre
 public:
     explicit UriAbbreviation(css::uno::Reference< css::uno::XComponentContext > const & context);
 
-    DECLARE_XSERVICEINFO
+    DECLARE_XSERVICEINFO_NOFACTORY
+    /* Helper for registry */
+    /// @throws css::uno::Exception
+    static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+    static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
     // css::util::XStringAbbreviation:
     virtual OUString SAL_CALL abbreviateString(const css::uno::Reference< css::util::XStringWidth > & xStringWidth, ::sal_Int32 nWidth, const OUString & aString) throw (css::uno::RuntimeException, std::exception) override;
diff --git a/framework/inc/tabwin/tabwinfactory.hxx b/framework/inc/tabwin/tabwinfactory.hxx
index daf06bc229b3..81c89d7907e6 100644
--- a/framework/inc/tabwin/tabwinfactory.hxx
+++ b/framework/inc/tabwin/tabwinfactory.hxx
@@ -46,7 +46,11 @@ class TabWinFactory :  public ::cppu::WeakImplHelper< css::lang::XSingleComponen
         virtual ~TabWinFactory() override;
 
         //  XInterface, XTypeProvider, XServiceInfo
-        DECLARE_XSERVICEINFO
+        DECLARE_XSERVICEINFO_NOFACTORY
+        /* Helper for registry */
+        /// @throws css::uno::Exception
+        static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+        static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
         // XSingleComponentFactory
         virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithContext( const css::uno::Reference< css::uno::XComponentContext >& Context ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
diff --git a/framework/inc/threadhelp/transactionmanager.hxx b/framework/inc/threadhelp/transactionmanager.hxx
index a4a6e9db5ea2..1440816330b5 100644
--- a/framework/inc/threadhelp/transactionmanager.hxx
+++ b/framework/inc/threadhelp/transactionmanager.hxx
@@ -108,7 +108,11 @@ class FWI_DLLPUBLIC TransactionManager
         TransactionManager&        operator=(const TransactionManager&) = delete;
         void               setWorkingMode               ( EWorkingMode eMode                           );
         EWorkingMode       getWorkingMode               (                                              ) const;
+        /// @throws css::uno::RuntimeException
+        /// @throws css::lang::DisposedException
         void               registerTransaction          ( EExceptionMode eMode ) throw( css::uno::RuntimeException, css::lang::DisposedException );
+        /// @throws css::uno::RuntimeException
+        /// @throws css::lang::DisposedException
         void               unregisterTransaction        (                                              ) throw( css::uno::RuntimeException, css::lang::DisposedException );
 
     private:
diff --git a/framework/inc/uiconfiguration/imagemanager.hxx b/framework/inc/uiconfiguration/imagemanager.hxx
index 812a69d28d57..b44194285639 100644
--- a/framework/inc/uiconfiguration/imagemanager.hxx
+++ b/framework/inc/uiconfiguration/imagemanager.hxx
@@ -105,6 +105,7 @@ namespace framework
             virtual sal_Bool SAL_CALL isReadOnly() throw (css::uno::RuntimeException, std::exception) override;
 
             // Non-UNO methods
+            /// @throws css::uno::RuntimeException
             void setStorage( const css::uno::Reference< css::embed::XStorage >& Storage ) throw (css::uno::RuntimeException);
 
         private:
diff --git a/framework/inc/uielement/fontmenucontroller.hxx b/framework/inc/uielement/fontmenucontroller.hxx
index a303a54947e8..6f2a2cba1fc8 100644
--- a/framework/inc/uielement/fontmenucontroller.hxx
+++ b/framework/inc/uielement/fontmenucontroller.hxx
@@ -48,7 +48,11 @@ namespace framework
             virtual ~FontMenuController() override;
 
             // XServiceInfo
-            DECLARE_XSERVICEINFO
+            DECLARE_XSERVICEINFO_NOFACTORY
+            /* Helper for registry */
+            /// @throws css::uno::Exception
+            static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+            static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
             // XPopupMenuController
             virtual void SAL_CALL updatePopupMenu() throw (css::uno::RuntimeException, std::exception) override;
diff --git a/framework/inc/uielement/fontsizemenucontroller.hxx b/framework/inc/uielement/fontsizemenucontroller.hxx
index af4e3ca44001..942b5e63d68e 100644
--- a/framework/inc/uielement/fontsizemenucontroller.hxx
+++ b/framework/inc/uielement/fontsizemenucontroller.hxx
@@ -51,7 +51,11 @@ namespace framework
             virtual ~FontSizeMenuController() override;
 
             // XServiceInfo
-            DECLARE_XSERVICEINFO
+            DECLARE_XSERVICEINFO_NOFACTORY
+            /* Helper for registry */
+            /// @throws css::uno::Exception
+            static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+            static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
             // XPopupMenuController
             virtual void SAL_CALL updatePopupMenu() throw (css::uno::RuntimeException, std::exception) override;
diff --git a/framework/inc/uielement/footermenucontroller.hxx b/framework/inc/uielement/footermenucontroller.hxx
index cbdf3e003f7b..eac91df289fd 100644
--- a/framework/inc/uielement/footermenucontroller.hxx
+++ b/framework/inc/uielement/footermenucontroller.hxx
@@ -38,6 +38,7 @@ namespace framework
             static css::uno::Sequence< OUString >                   SAL_CALL impl_getStaticSupportedServiceNames(                                                                               );
             static OUString                                         SAL_CALL impl_getStaticImplementationName   (                                                                               );
             /* Helper for registry */
+            /// @throws css::uno::Exception
             static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
             static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
     };
diff --git a/framework/inc/uielement/headermenucontroller.hxx b/framework/inc/uielement/headermenucontroller.hxx
index a32162665139..b532ce3d3c57 100644
--- a/framework/inc/uielement/headermenucontroller.hxx
+++ b/framework/inc/uielement/headermenucontroller.hxx
@@ -50,7 +50,11 @@ namespace framework
             virtual ~HeaderMenuController() override;
 
             // XServiceInfo
-            DECLARE_XSERVICEINFO
+            DECLARE_XSERVICEINFO_NOFACTORY
+            /* Helper for registry */
+            /// @throws css::uno::Exception
+            static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+            static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
             // XPopupMenuController
             virtual void SAL_CALL updatePopupMenu() throw (css::uno::RuntimeException, std::exception) override;
diff --git a/framework/inc/uielement/langselectionmenucontroller.hxx b/framework/inc/uielement/langselectionmenucontroller.hxx
index 97e86e86972a..09a144d938a7 100644
--- a/framework/inc/uielement/langselectionmenucontroller.hxx
+++ b/framework/inc/uielement/langselectionmenucontroller.hxx
@@ -51,7 +51,11 @@ namespace framework
             virtual ~LanguageSelectionMenuController() override;
 
             // XServiceInfo
-            DECLARE_XSERVICEINFO
+            DECLARE_XSERVICEINFO_NOFACTORY
+            /* Helper for registry */
+            /// @throws css::uno::Exception
+            static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+            static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
             // XPopupMenuController
             virtual void SAL_CALL updatePopupMenu() throw (css::uno::RuntimeException, std::exception) override;
diff --git a/framework/inc/uielement/macrosmenucontroller.hxx b/framework/inc/uielement/macrosmenucontroller.hxx
index 263d0d3905fb..aa73ef550f8c 100644
--- a/framework/inc/uielement/macrosmenucontroller.hxx
+++ b/framework/inc/uielement/macrosmenucontroller.hxx
@@ -51,7 +51,11 @@ namespace framework
             virtual ~MacrosMenuController() override;
 
             // XServiceInfo
-            DECLARE_XSERVICEINFO
+            DECLARE_XSERVICEINFO_NOFACTORY
+            /* Helper for registry */
+            /// @throws css::uno::Exception
+            static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+            static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
             // XStatusListener
             virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx
index 94e18493b41c..fd8315fea038 100644
--- a/framework/inc/uielement/newmenucontroller.hxx
+++ b/framework/inc/uielement/newmenucontroller.hxx
@@ -55,7 +55,11 @@ namespace framework
             virtual ~NewMenuController() override;
 
             // XServiceInfo
-            DECLARE_XSERVICEINFO
+            DECLARE_XSERVICEINFO_NOFACTORY
+            /* Helper for registry */
+            /// @throws css::uno::Exception
+            static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+            static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
             // XInitialization
             virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
diff --git a/framework/inc/uielement/notebookbarmenucontroller.hxx b/framework/inc/uielement/notebookbarmenucontroller.hxx
index 287ba31b9ac1..24a855b7c065 100644
--- a/framework/inc/uielement/notebookbarmenucontroller.hxx
+++ b/framework/inc/uielement/notebookbarmenucontroller.hxx
@@ -50,7 +50,11 @@ namespace framework
             virtual ~NotebookbarMenuController() override;
 
             // XServiceInfo
-            DECLARE_XSERVICEINFO
+            DECLARE_XSERVICEINFO_NOFACTORY
+            /* Helper for registry */
+            /// @throws css::uno::Exception
+            static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+            static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
             // XPopupMenuController
             virtual void SAL_CALL setPopupMenu( const css::uno::Reference< css::awt::XPopupMenu >& PopupMenu ) throw (css::uno::RuntimeException, std::exception) override;
diff --git a/framework/inc/uielement/progressbarwrapper.hxx b/framework/inc/uielement/progressbarwrapper.hxx
index e5e81d7149a4..02f24cb6bdab 100644
--- a/framework/inc/uielement/progressbarwrapper.hxx
+++ b/framework/inc/uielement/progressbarwrapper.hxx
@@ -46,10 +46,15 @@ class ProgressBarWrapper : public UIElementWrapperBase
         css::uno::Reference< css::awt::XWindow > getStatusBar() const;
 
         // wrapped methods of css::task::XStatusIndicator
+        /// @throws css::uno::RuntimeException
         void start( const OUString& Text, ::sal_Int32 Range ) throw (css::uno::RuntimeException, std::exception);
+        /// @throws css::uno::RuntimeException
         void end() throw (css::uno::RuntimeException, std::exception);
+        /// @throws css::uno::RuntimeException
         void setText( const OUString& Text ) throw (css::uno::RuntimeException, std::exception);
+        /// @throws css::uno::RuntimeException
         void setValue( ::sal_Int32 Value ) throw (css::uno::RuntimeException, std::exception);
+        /// @throws css::uno::RuntimeException
         void reset() throw (css::uno::RuntimeException, std::exception);
 
         // UNO interfaces
diff --git a/framework/inc/uielement/toolbarmodemenucontroller.hxx b/framework/inc/uielement/toolbarmodemenucontroller.hxx
index 3496b2cbe675..60fa176a7c28 100644
--- a/framework/inc/uielement/toolbarmodemenucontroller.hxx
+++ b/framework/inc/uielement/toolbarmodemenucontroller.hxx
@@ -50,7 +50,11 @@ namespace framework
             virtual ~ToolbarModeMenuController() override;
 
             // XServiceInfo
-            DECLARE_XSERVICEINFO
+            DECLARE_XSERVICEINFO_NOFACTORY
+            /* Helper for registry */
+            /// @throws css::uno::Exception
+            static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+            static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
             // XPopupMenuController
             virtual void SAL_CALL setPopupMenu( const css::uno::Reference< css::awt::XPopupMenu >& PopupMenu ) throw (css::uno::RuntimeException, std::exception) override;
diff --git a/framework/inc/uielement/toolbarsmenucontroller.hxx b/framework/inc/uielement/toolbarsmenucontroller.hxx
index 370e35bbf9f3..f88e98cc2ead 100644
--- a/framework/inc/uielement/toolbarsmenucontroller.hxx
+++ b/framework/inc/uielement/toolbarsmenucontroller.hxx
@@ -55,7 +55,11 @@ namespace framework
             virtual ~ToolbarsMenuController() override;
 
             // XServiceInfo
-            DECLARE_XSERVICEINFO
+            DECLARE_XSERVICEINFO_NOFACTORY
+            /* Helper for registry */
+            /// @throws css::uno::Exception
+            static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+            static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 
             // XPopupMenuController
             virtual void SAL_CALL setPopupMenu( const css::uno::Reference< css::awt::XPopupMenu >& PopupMenu ) throw (css::uno::RuntimeException, std::exception) override;
diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx
index 7ce55021020a..76623815fbaa 100644
--- a/framework/inc/xml/imagesdocumenthandler.hxx
+++ b/framework/inc/xml/imagesdocumenthandler.hxx
@@ -139,23 +139,33 @@ class OWriteImagesDocumentHandler final
                 rWriteDocumentHandler);
         ~OWriteImagesDocumentHandler();
 
+        /// @throws css::xml::sax::SAXException
+        /// @throws css::uno::RuntimeException
         void WriteImagesDocument() throw
             ( css::xml::sax::SAXException,
               css::uno::RuntimeException );
 
     private:
+        /// @throws css::xml::sax::SAXException
+        /// @throws css::uno::RuntimeException
         void WriteImageList( const ImageListItemDescriptor* ) throw
             ( css::xml::sax::SAXException,
               css::uno::RuntimeException );
 
+        /// @throws css::xml::sax::SAXException
+        /// @throws css::uno::RuntimeException
         void WriteExternalImageList( const ExternalImageItemListDescriptor* ) throw
             ( css::xml::sax::SAXException,
               css::uno::RuntimeException );
 
+        /// @throws css::xml::sax::SAXException
+        /// @throws css::uno::RuntimeException
         void WriteImage( const ImageItemDescriptor* ) throw
             ( css::xml::sax::SAXException,
               css::uno::RuntimeException );
 
+        /// @throws css::xml::sax::SAXException
+        /// @throws css::uno::RuntimeException
         void WriteExternalImage( const ExternalImageItemDescriptor* ) throw
             ( css::xml::sax::SAXException,
               css::uno::RuntimeException );
diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx
index 1c94bc58b566..d80b4b4d9dac 100644
--- a/framework/inc/xml/menudocumenthandler.hxx
+++ b/framework/inc/xml/menudocumenthandler.hxx
@@ -259,9 +259,13 @@ class FWE_DLLPUBLIC OWriteMenuDocumentHandler final
             bool bIsMenuBar );
         ~OWriteMenuDocumentHandler();
 
+        /// @throws css::xml::sax::SAXException
+        /// @throws css::uno::RuntimeException
         void WriteMenuDocument() throw
             ( css::xml::sax::SAXException, css::uno::RuntimeException );
     private:
+        /// @throws css::xml::sax::SAXException
+        /// @throws css::uno::RuntimeException
         void WriteMenu( const css::uno::Reference< css::container::XIndexAccess >& rSubMenuContainer ) throw
             ( css::xml::sax::SAXException, css::uno::RuntimeException );
 
diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx
index 8a2945a8c2ea..d5085f2cc105 100644
--- a/framework/inc/xml/statusbardocumenthandler.hxx
+++ b/framework/inc/xml/statusbardocumenthandler.hxx
@@ -125,11 +125,15 @@ class FWE_DLLPUBLIC OWriteStatusBarDocumentHandler final
             const css::uno::Reference< css::xml::sax::XDocumentHandler >& rWriteDocHandler );
         ~OWriteStatusBarDocumentHandler();
 
+        /// @throws css::xml::sax::SAXException
+        /// @throws css::uno::RuntimeException
         void WriteStatusBarDocument() throw
             ( css::xml::sax::SAXException,
               css::uno::RuntimeException );
 
     private:
+        /// @throws css::xml::sax::SAXException
+        /// @throws css::uno::RuntimeException
         void WriteStatusBarItem(
             const OUString& rCommandURL,
             const OUString& rHelpURL,
diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx
index bf57db4be94f..3e402b86072e 100644
--- a/framework/inc/xml/toolboxdocumenthandler.hxx
+++ b/framework/inc/xml/toolboxdocumenthandler.hxx
@@ -144,24 +144,34 @@ class FWE_DLLPUBLIC OWriteToolBoxDocumentHandler final
                 css::uno::Reference< css::xml::sax::XDocumentHandler >& rDocumentHandler );
             ~OWriteToolBoxDocumentHandler();
 
+        /// @throws css::xml::sax::SAXException
+        /// @throws css::uno::RuntimeException
         void WriteToolBoxDocument() throw
             ( css::xml::sax::SAXException,
               css::uno::RuntimeException );
 
     private:
+        /// @throws css::xml::sax::SAXException
+        /// @throws css::uno::RuntimeException
         void WriteToolBoxItem( const OUString& aCommandURL, const OUString& aLabel, const OUString& aHelpURL,
                                sal_Int16 nStyle, bool bVisible ) throw
             ( css::xml::sax::SAXException,
               css::uno::RuntimeException );
 
+        /// @throws css::xml::sax::SAXException
+        /// @throws css::uno::RuntimeException
         void WriteToolBoxSpace() throw
             ( css::xml::sax::SAXException,
               css::uno::RuntimeException );
 
+        /// @throws css::xml::sax::SAXException
+        /// @throws css::uno::RuntimeException
         void WriteToolBoxBreak() throw
             ( css::xml::sax::SAXException,
               css::uno::RuntimeException );
 
+        /// @throws css::xml::sax::SAXException
+        /// @throws css::uno::RuntimeException
         void WriteToolBoxSeparator() throw
             ( css::xml::sax::SAXException,
               css::uno::RuntimeException );
diff --git a/framework/inc/xml/xmlnamespaces.hxx b/framework/inc/xml/xmlnamespaces.hxx
index c7c7f2864769..bc075417fea1 100644
--- a/framework/inc/xml/xmlnamespaces.hxx
+++ b/framework/inc/xml/xmlnamespaces.hxx
@@ -35,17 +35,21 @@ class FWE_DLLPUBLIC XMLNamespaces final
         XMLNamespaces( const XMLNamespaces& );
         ~XMLNamespaces();
 
+        /// @throws css::xml::sax::SAXException
         void addNamespace( const OUString& aName, const OUString& aValue )
             throw(  css::xml::sax::SAXException );
 
+        /// @throws css::xml::sax::SAXException
         OUString applyNSToAttributeName( const OUString& ) const
             throw(  css::xml::sax::SAXException, std::exception );
+        /// @throws css::xml::sax::SAXException
         OUString applyNSToElementName( const OUString& ) const
             throw(  css::xml::sax::SAXException, std::exception );
 
     private:
         typedef ::std::map< OUString, OUString > NamespaceMap;
 
+        /// @throws css::xml::sax::SAXException
         OUString getNamespaceValue( const OUString& aNamespace ) const
             throw( css::xml::sax::SAXException );
 
diff --git a/framework/source/fwe/helper/actiontriggerhelper.cxx b/framework/source/fwe/helper/actiontriggerhelper.cxx
index d3873f5da4a0..7fd256c133ee 100644
--- a/framework/source/fwe/helper/actiontriggerhelper.cxx
+++ b/framework/source/fwe/helper/actiontriggerhelper.cxx
@@ -236,6 +236,7 @@ void InsertSubMenuItems( Menu* pSubMenu, sal_uInt16& nItemId, const Reference< X
 
 // implementation helper ( ActionTrigger => menu )
 
+/// @throws RuntimeException
 Reference< XPropertySet > CreateActionTrigger( sal_uInt16 nItemId, const Menu* pMenu, const Reference< XIndexContainer >& rActionTriggerContainer ) throw ( RuntimeException )
 {
     Reference< XPropertySet > xPropSet;
@@ -282,6 +283,7 @@ Reference< XPropertySet > CreateActionTrigger( sal_uInt16 nItemId, const Menu* p
     return xPropSet;
 }
 
+/// @throws RuntimeException
 Reference< XPropertySet > CreateActionTriggerSeparator( const Reference< XIndexContainer >& rActionTriggerContainer ) throw ( RuntimeException )
 {
     Reference< XMultiServiceFactory > xMultiServiceFactory( rActionTriggerContainer, UNO_QUERY );
@@ -295,6 +297,7 @@ Reference< XPropertySet > CreateActionTriggerSeparator( const Reference< XIndexC
     return Reference< XPropertySet >();
 }
 
+/// @throws RuntimeException
 Reference< XIndexContainer > CreateActionTriggerContainer( const Reference< XIndexContainer >& rActionTriggerContainer ) throw ( RuntimeException )
 {
     Reference< XMultiServiceFactory > xMultiServiceFactory( rActionTriggerContainer, UNO_QUERY );
diff --git a/framework/source/inc/dispatch/dispatchdisabler.hxx b/framework/source/inc/dispatch/dispatchdisabler.hxx
index 7948ff856471..92cb24166a02 100644
--- a/framework/source/inc/dispatch/dispatchdisabler.hxx
+++ b/framework/source/inc/dispatch/dispatchdisabler.hxx
@@ -106,7 +106,11 @@ public:
         throw (::css::container::NoSuchElementException, ::css::lang::WrappedTargetException,
                ::css::uno::RuntimeException, ::std::exception) override;
 
-    DECLARE_XSERVICEINFO
+    DECLARE_XSERVICEINFO_NOFACTORY
+    /* Helper for registry */
+    /// @throws css::uno::Exception
+    static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+    static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
 };
 
 } // namespace framework
diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx
index 24ca05fec03e..bf6dfc1ff32d 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -213,6 +213,9 @@ public:
      */
     ~LoadEnv();
 
+    /// @throws css::lang::IllegalArgumentException
+    /// @throws css::io::IOException
+    /// @throws css::uno::RuntimeException
     static css::uno::Reference< css::lang::XComponent > loadComponentFromURL(const css::uno::Reference< css::frame::XComponentLoader >&    xLoader,
                                                                              const css::uno::Reference< css::uno::XComponentContext >&     xContext,
                                                                              const OUString&                                        sURL   ,
diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx
index 64963abf1945..e4440da6e30b 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -356,9 +356,11 @@ public:
 private:
     virtual void SAL_CALL disposing() final override;
 
+    /// @throws css::uno::RuntimeException
     OUString getStringProperty(const OUString& p1)
         throw(css::uno::RuntimeException);
 
+    /// @throws css::uno::RuntimeException
     void setStringProperty(const OUString& p1, const OUString& p2)
         throw(css::uno::RuntimeException);
 
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index 9eac3e48156a..861c973a3f1d 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -175,10 +175,15 @@ protected:
     OUString   GetHomeVariableValue() const;
 
     // XStringSubstitution implementation methods
+    /// @throws css::container::NoSuchElementException
+    /// @throws css::uno::RuntimeException
     OUString impl_substituteVariable( const OUString& aText, bool bSustRequired )
         throw (css::container::NoSuchElementException, css::uno::RuntimeException);
+    /// @throws css::uno::RuntimeException
     OUString impl_reSubstituteVariables( const OUString& aText )
         throw (css::uno::RuntimeException);
+    /// @throws css::container::NoSuchElementException
+    /// @throws css::uno::RuntimeException
     OUString const & impl_getSubstituteVariableValue( const OUString& variable )
         throw (css::container::NoSuchElementException, css::uno::RuntimeException);
 
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx
index ec2cf9bb950e..7b439045b17e 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.hxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx
@@ -94,33 +94,62 @@ namespace framework
 
             void dispose();
             void initialize( const css::uno::Sequence< css::uno::Any >& aArguments );
+            /// @throws css::uno::RuntimeException
             void addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException);
+            /// @throws css::uno::RuntimeException
             void removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException);
 
             // XImageManager
+            /// @throws css::uno::RuntimeException
+            /// @throws css::lang::IllegalAccessException
             void reset() throw (css::uno::RuntimeException, css::lang::IllegalAccessException);
+            /// @throws css::uno::RuntimeException
             css::uno::Sequence< OUString > getAllImageNames( ::sal_Int16 nImageType ) throw (css::uno::RuntimeException);
+            /// @throws css::lang::IllegalArgumentException
+            /// @throws css::uno::RuntimeException
             bool hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
+            /// @throws css::lang::IllegalArgumentException
+            /// @throws css::uno::RuntimeException
             css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > > getImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
+            /// @throws css::lang::IllegalArgumentException
+            /// @throws css::lang::IllegalAccessException
+            /// @throws css::uno::RuntimeException
             void replaceImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence, const css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > >& aGraphicsSequence ) throw (css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception);
+            /// @throws css::lang::IllegalArgumentException
+            /// @throws css::lang::IllegalAccessException
+            /// @throws css::uno::RuntimeException
             void removeImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aResourceURLSequence ) throw (css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException);
+            /// @throws css::container::ElementExistException
+            /// @throws css::lang::IllegalArgumentException
+            /// @throws css::lang::IllegalAccessException
+            /// @throws css::uno::RuntimeException
             void insertImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence, const css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > >& aGraphicSequence ) throw (css::container::ElementExistException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException);
 
             // XUIConfiguration
+            /// @throws css::uno::RuntimeException
             void addConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException);
+            /// @throws css::uno::RuntimeException
             void removeConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException);
 
             // XUIConfigurationPersistence
+            /// @throws css::uno::Exception
+            /// @throws css::uno::RuntimeException
             void reload() throw (css::uno::Exception, css::uno::RuntimeException, std::exception);
+            /// @throws css::uno::Exception
+            /// @throws css::uno::RuntimeException
             void store()
                 throw (css::uno::Exception,
                        css::uno::RuntimeException,
                        std::exception);
+            /// @throws css::uno::Exception
+            /// @throws css::uno::RuntimeException
             void storeToStorage( const css::uno::Reference< css::embed::XStorage >& Storage )
                 throw (css::uno::Exception,
                        css::uno::RuntimeException,
                        std::exception);
+            /// @throws css::uno::RuntimeException
             bool isModified() throw (css::uno::RuntimeException);
+            /// @throws css::uno::RuntimeException
             bool isReadOnly() throw (css::uno::RuntimeException);
 
             void clear();
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index 180842d1c1d7..93319bff9533 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -104,6 +104,7 @@ private:
     OUString        m_aGuessedTextLang;     // the 'guessed' language for the selection, "" if none could be guessed
     LanguageGuessingHelper      m_aLangGuessHelper;
 
+    /// @throws css::uno::RuntimeException
     void LangMenu( const css::awt::Point& aPos ) throw (css::uno::RuntimeException, std::exception);
 };