com::sun::star->css in remotebridges,reportdesign

Change-Id: Id210cbc3481a8a31e6fc0ba2028346fc585c8744
Reviewed-on: https://gerrit.libreoffice.org/19597
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

10 files changed, 456 insertions, 464 deletions

diff --git a/reportdesign/inc/PropertyForward.hxx b/reportdesign/inc/PropertyForward.hxx
index a8668cb18b9f..722a7aed55c7 100644
--- a/reportdesign/inc/PropertyForward.hxx
+++ b/reportdesign/inc/PropertyForward.hxx
@@ -32,7 +32,7 @@
 namespace rptui
 {
 
-    typedef ::cppu::WeakComponentImplHelper<   ::com::sun::star::beans::XPropertyChangeListener
+    typedef ::cppu::WeakComponentImplHelper<   css::beans::XPropertyChangeListener
                                     >   OPropertyForward_Base;
 
     /** \class OPropertyMediator
@@ -43,12 +43,12 @@ namespace rptui
     class REPORTDESIGN_DLLPUBLIC OPropertyMediator : public ::cppu::BaseMutex
                             ,public OPropertyForward_Base
     {
-        TPropertyNamePair                                                               m_aNameMap;
-        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>        m_xSource;
-        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo>    m_xSourceInfo;
-        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>        m_xDest;
-        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo>    m_xDestInfo;
-        bool                                                                        m_bInChange;
+        TPropertyNamePair                                     m_aNameMap;
+        css::uno::Reference< css::beans::XPropertySet>        m_xSource;
+        css::uno::Reference< css::beans::XPropertySetInfo>    m_xSourceInfo;
+        css::uno::Reference< css::beans::XPropertySet>        m_xDest;
+        css::uno::Reference< css::beans::XPropertySetInfo>    m_xDestInfo;
+        bool                                                  m_bInChange;
         OPropertyMediator(OPropertyMediator&) = delete;
         void operator =(OPropertyMediator&) = delete;
     protected:
@@ -58,16 +58,16 @@ namespace rptui
         */
         virtual void SAL_CALL disposing() override;
     public:
-        OPropertyMediator(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xSource
-                        ,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xDest
+        OPropertyMediator(const css::uno::Reference< css::beans::XPropertySet>& _xSource
+                        ,const css::uno::Reference< css::beans::XPropertySet>& _xDest
                         ,const TPropertyNamePair& _aNameMap
                         ,bool _bReverse = false);
 
-        // ::com::sun::star::beans::XPropertyChangeListener
-        virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+        // css::beans::XPropertyChangeListener
+        virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw(css::uno::RuntimeException, std::exception) override;
 
-        // ::com::sun::star::lang::XEventListener
-        virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& _rSource ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        // css::lang::XEventListener
+        virtual void SAL_CALL disposing( const css::lang::EventObject& _rSource ) throw (css::uno::RuntimeException, std::exception) override;
 
         /** stop the listening mode.
          */
diff --git a/reportdesign/inc/ReportDefinition.hxx b/reportdesign/inc/ReportDefinition.hxx
index 9dc7148da01a..36d325f2e339 100644
--- a/reportdesign/inc/ReportDefinition.hxx
+++ b/reportdesign/inc/ReportDefinition.hxx
@@ -59,22 +59,22 @@ namespace utl
 namespace reportdesign
 {
     class OReportComponentProperties;
-    typedef cppu::PartialWeakComponentImplHelper<   ::com::sun::star::report::XReportDefinition
-                                                    ,   ::com::sun::star::document::XEventBroadcaster
-                                                    ,   ::com::sun::star::lang::XServiceInfo
-                                                    ,   ::com::sun::star::frame::XModule
-                                                    ,   ::com::sun::star::lang::XUnoTunnel
-                                                    ,   ::com::sun::star::util::XNumberFormatsSupplier
-                                                    ,   ::com::sun::star::frame::XTitle
-                                                    ,   ::com::sun::star::frame::XTitleChangeBroadcaster
-                                                    ,   ::com::sun::star::frame::XUntitledNumbers
-                                                    ,   ::com::sun::star::document::XDocumentPropertiesSupplier
-                                                    ,   ::com::sun::star::datatransfer::XTransferable
-                                                    ,   ::com::sun::star::document::XUndoManagerSupplier
+    typedef cppu::PartialWeakComponentImplHelper<   css::report::XReportDefinition
+                                                    ,   css::document::XEventBroadcaster
+                                                    ,   css::lang::XServiceInfo
+                                                    ,   css::frame::XModule
+                                                    ,   css::lang::XUnoTunnel
+                                                    ,   css::util::XNumberFormatsSupplier
+                                                    ,   css::frame::XTitle
+                                                    ,   css::frame::XTitleChangeBroadcaster
+                                                    ,   css::frame::XUntitledNumbers
+                                                    ,   css::document::XDocumentPropertiesSupplier
+                                                    ,   css::datatransfer::XTransferable
+                                                    ,   css::document::XUndoManagerSupplier
                                                     ,   SvxUnoDrawMSFactory
                                                     >   ReportDefinitionBase;
 
-    typedef ::cppu::PropertySetMixin< ::com::sun::star::report::XReportDefinition > ReportDefinitionPropertySet;
+    typedef ::cppu::PropertySetMixin< css::report::XReportDefinition > ReportDefinitionPropertySet;
 
     struct OReportDefinitionImpl;
     /** \class OReportDefinition Defines the implementation of a \interface com:::sun::star::report::XReportDefinition
@@ -97,7 +97,7 @@ namespace reportdesign
         void setSection(     const OUString& _sProperty
                             ,const bool& _bOn
                             ,const OUString& _sName
-                            ,::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _member);
+                            ,css::uno::Reference< css::report::XSection>& _member);
 
         template <typename T> void set(  const OUString& _sProperty
                                         ,const T& _Value
@@ -106,7 +106,7 @@ namespace reportdesign
             BoundListeners l;
             {
                 ::osl::MutexGuard aGuard(m_aMutex);
-                prepareSet(_sProperty, ::com::sun::star::uno::makeAny(_member), ::com::sun::star::uno::makeAny(_Value), &l);
+                prepareSet(_sProperty, css::uno::makeAny(_member), css::uno::makeAny(_Value), &l);
                 _member = _Value;
             }
             l.notify();
@@ -119,7 +119,7 @@ namespace reportdesign
             BoundListeners l;
             {
                 ::osl::MutexGuard aGuard(m_aMutex);
-                prepareSet(_sProperty, ::com::sun::star::uno::makeAny(_member), ::com::sun::star::uno::makeAny(_Value), &l);
+                prepareSet(_sProperty, css::uno::makeAny(_member), css::uno::makeAny(_Value), &l);
                 _member = _Value;
             }
             l.notify();
@@ -128,37 +128,30 @@ namespace reportdesign
         /// write a single XML stream into the package
         bool WriteThroughComponent(
             /// the component we export
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::lang::XComponent> & xComponent,
+            const css::uno::Reference< css::lang::XComponent> & xComponent,
             const sal_Char* pStreamName,        /// the stream name
             const sal_Char* pServiceName,       /// service name of the component
             /// the argument (XInitialization)
-            const ::com::sun::star::uno::Sequence<
-                ::com::sun::star::uno::Any> & rArguments,
+            const css::uno::Sequence< css::uno::Any> & rArguments,
             /// output descriptor
-            const ::com::sun::star::uno::Sequence<
-                ::com::sun::star::beans::PropertyValue> & rMediaDesc,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _xStorageToSaveTo);
+            const css::uno::Sequence< css::beans::PropertyValue> & rMediaDesc,
+            const css::uno::Reference< css::embed::XStorage >& _xStorageToSaveTo);
 
         /// write a single output stream
         /// (to be called either directly or by WriteThroughComponent(...))
         bool WriteThroughComponent(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::io::XOutputStream> & xOutputStream,
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::lang::XComponent> & xComponent,
+            const css::uno::Reference< css::io::XOutputStream> & xOutputStream,
+            const css::uno::Reference< css::lang::XComponent> & xComponent,
             const sal_Char* pServiceName,
-            const ::com::sun::star::uno::Sequence<
-                ::com::sun::star::uno::Any> & rArguments,
-            const ::com::sun::star::uno::Sequence<
-                ::com::sun::star::beans::PropertyValue> & rMediaDesc);
+            const css::uno::Sequence< css::uno::Any> & rArguments,
+            const css::uno::Sequence< css::beans::PropertyValue> & rMediaDesc);
 
         void notifyEvent(const OUString& _sEventName);
         void init();
         void fillArgs(utl::MediaDescriptor& _aDescriptor);
 
-        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitle >             impl_getTitleHelper_throw();
-        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XUntitledNumbers >   impl_getUntitledHelper_throw();
+        css::uno::Reference< css::frame::XTitle >             impl_getTitleHelper_throw();
+        css::uno::Reference< css::frame::XUntitledNumbers >   impl_getUntitledHelper_throw();
 
         /** loads the report definition from the given storage
             @precond
@@ -166,8 +159,8 @@ namespace reportdesign
             @throws
         */
         void impl_loadFromStorage_nolck_throw(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _rxStorage,
-            const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rArguments
+            const css::uno::Reference< css::embed::XStorage >& _rxStorage,
+            const css::uno::Sequence< css::beans::PropertyValue >& _rArguments
         );
 
     protected:
@@ -177,17 +170,17 @@ namespace reportdesign
         */
         virtual void SAL_CALL disposing() override;
     public:
-        explicit OReportDefinition(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & _xContext);
-        explicit OReportDefinition(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & _xContext
-                                  ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & _xFactory
-                                  ,::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _xShape);
+        explicit OReportDefinition(css::uno::Reference< css::uno::XComponentContext > const & _xContext);
+        explicit OReportDefinition(css::uno::Reference< css::uno::XComponentContext > const & _xContext
+                                  ,const css::uno::Reference< css::lang::XMultiServiceFactory > & _xFactory
+                                  ,css::uno::Reference< css::drawing::XShape >& _xShape);
 
-        static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException );
-        static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException );
-        static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
-            create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext);
+        static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+        static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+        static css::uno::Reference< css::uno::XInterface > SAL_CALL
+            create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
 
-        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getContext();
+        css::uno::Reference< css::uno::XComponentContext > getContext();
 
         /** return the SdrModel of the real model
         *
@@ -195,63 +188,63 @@ namespace reportdesign
         */
         std::shared_ptr<rptui::OReportModel> getSdrModel() const;
 
-        static std::shared_ptr<rptui::OReportModel> getSdrModel(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& _xReportDefinition);
+        static std::shared_ptr<rptui::OReportModel> getSdrModel(const css::uno::Reference< css::report::XReportDefinition >& _xReportDefinition);
     private:
         DECLARE_XINTERFACE( )
         DECLARE_XTYPEPROVIDER( )
-        // ::com::sun::star::lang::XServiceInfo
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-
-        // com::sun::star::beans::XPropertySet
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        // css::lang::XServiceInfo
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(css::uno::RuntimeException, std::exception) override;
+
+        // css::beans::XPropertySet
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
 
         // XReportDefinition
-        virtual OUString SAL_CALL getMimeType() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setMimeType( const OUString& _mimetype ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getCaption() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setCaption( const OUString& _caption ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int16 SAL_CALL getGroupKeepTogether() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setGroupKeepTogether( ::sal_Int16 _groupkeeptogether ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int16 SAL_CALL getPageHeaderOption() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setPageHeaderOption( ::sal_Int16 _pageheaderoption ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int16 SAL_CALL getPageFooterOption() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setPageFooterOption( ::sal_Int16 _pagefooteroption ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getCommand() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setCommand( const OUString& _command ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getCommandType() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setCommandType( ::sal_Int32 _commandtype ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getFilter() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setFilter( const OUString& _filter ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getEscapeProcessing() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setEscapeProcessing( sal_Bool _escapeprocessing ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getActiveConnection() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setActiveConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _activeconnection ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getDataSourceName() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setDataSourceName( const OUString& _datasourcename ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getReportHeaderOn() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setReportHeaderOn( sal_Bool _reportheaderon ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getReportFooterOn() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setReportFooterOn( sal_Bool _reportfooteron ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getPageHeaderOn() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setPageHeaderOn( sal_Bool _pageheaderon ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL getPageFooterOn() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setPageFooterOn( sal_Bool _pagefooteron ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroups > SAL_CALL getGroups() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > SAL_CALL getReportHeader() throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > SAL_CALL getPageHeader() throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > SAL_CALL getDetail() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > SAL_CALL getPageFooter() throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > SAL_CALL getReportFooter() throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventBroadcaster > SAL_CALL getEventBroadcaster(  ) throw (::com::sun::star::lang::DisposedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableMimeTypes(  ) throw (::com::sun::star::lang::DisposedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getMimeType() throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setMimeType( const OUString& _mimetype ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual ::sal_Int16 SAL_CALL getGroupKeepTogether() throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setGroupKeepTogether( ::sal_Int16 _groupkeeptogether ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual ::sal_Int16 SAL_CALL getPageHeaderOption() throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setPageHeaderOption( ::sal_Int16 _pageheaderoption ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual ::sal_Int16 SAL_CALL getPageFooterOption() throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setPageFooterOption( ::sal_Int16 _pagefooteroption ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getCommand() throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setCommand( const OUString& _command ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual ::sal_Int32 SAL_CALL getCommandType() throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setCommandType( ::sal_Int32 _commandtype ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getFilter() throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setFilter( const OUString& _filter ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL getEscapeProcessing() throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setEscapeProcessing( sal_Bool _escapeprocessing ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getActiveConnection() throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setActiveConnection( const css::uno::Reference< css::sdbc::XConnection >& _activeconnection ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getDataSourceName() throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setDataSourceName( const OUString& _datasourcename ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL getReportHeaderOn() throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setReportHeaderOn( sal_Bool _reportheaderon ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL getReportFooterOn() throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setReportFooterOn( sal_Bool _reportfooteron ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL getPageHeaderOn() throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setPageHeaderOn( sal_Bool _pageheaderon ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL getPageFooterOn() throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setPageFooterOn( sal_Bool _pagefooteron ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::report::XGroups > SAL_CALL getGroups() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::report::XSection > SAL_CALL getReportHeader() throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::report::XSection > SAL_CALL getPageHeader() throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::report::XSection > SAL_CALL getDetail() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::report::XSection > SAL_CALL getPageFooter() throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::report::XSection > SAL_CALL getReportFooter() throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::document::XEventBroadcaster > SAL_CALL getEventBroadcaster(  ) throw (css::lang::DisposedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getAvailableMimeTypes(  ) throw (css::lang::DisposedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
 
         // XReportComponent
         REPORTCOMPONENT_HEADER()
@@ -260,147 +253,147 @@ namespace reportdesign
         SHAPE_HEADER()
 
         // XShapeDescriptor
-        virtual OUString SAL_CALL getShapeType(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getShapeType(  ) throw (css::uno::RuntimeException, std::exception) override;
 
         //XFunctionsSupplier
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctions > SAL_CALL getFunctions() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::report::XFunctions > SAL_CALL getFunctions() throw (css::uno::RuntimeException, std::exception) override;
 
         // XCloneable
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) throw (css::uno::RuntimeException, std::exception) override;
 
         // XComponent
-        virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override
         {
             cppu::WeakComponentImplHelperBase::addEventListener(aListener);
         }
-        virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw(css::uno::RuntimeException, std::exception) override
         {
             cppu::WeakComponentImplHelperBase::removeEventListener(aListener);
         }
 
         // XChild
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
 
         // XCloseBroadcaster
-        virtual void SAL_CALL addCloseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeCloseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addCloseListener( const css::uno::Reference< css::util::XCloseListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL removeCloseListener( const css::uno::Reference< css::util::XCloseListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
 
         // XCloseable
-        virtual void SAL_CALL close( sal_Bool DeliverOwnership ) throw (::com::sun::star::util::CloseVetoException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL close( sal_Bool DeliverOwnership ) throw (css::util::CloseVetoException, css::uno::RuntimeException, std::exception) override;
 
         // XModel
-        virtual sal_Bool SAL_CALL attachResource( const OUString& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getURL(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getArgs(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL connectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& Controller ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL disconnectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& Controller ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL lockControllers(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL unlockControllers(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL hasControllersLocked(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > SAL_CALL getCurrentController(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setCurrentController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& Controller ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getCurrentSelection(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL attachResource( const OUString& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getURL(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getArgs(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL connectController( const css::uno::Reference< css::frame::XController >& Controller ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL disconnectController( const css::uno::Reference< css::frame::XController >& Controller ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL lockControllers(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL unlockControllers(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL hasControllersLocked(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::frame::XController > SAL_CALL getCurrentController(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setCurrentController( const css::uno::Reference< css::frame::XController >& Controller ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getCurrentSelection(  ) throw (css::uno::RuntimeException, std::exception) override;
 
         // XStorageBasedDocument
-        virtual void SAL_CALL loadFromStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescriptor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::frame::DoubleInitializationException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL storeToStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescriptor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL switchToStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > SAL_CALL getDocumentStorage(  ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL addStorageChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XStorageChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeStorageChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XStorageChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL loadFromStorage( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescriptor ) throw (css::lang::IllegalArgumentException, css::frame::DoubleInitializationException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL storeToStorage( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescriptor ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL switchToStorage( const css::uno::Reference< css::embed::XStorage >& xStorage ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getDocumentStorage(  ) throw (css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addStorageChangeListener( const css::uno::Reference< css::document::XStorageChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL removeStorageChangeListener( const css::uno::Reference< css::document::XStorageChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
 
         // XViewDataSupplier
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getViewData(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setViewData( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& Data ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getViewData(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setViewData( const css::uno::Reference< css::container::XIndexAccess >& Data ) throw (css::uno::RuntimeException, std::exception) override;
 
         // XLoadable
-        virtual void SAL_CALL initNew(  ) throw (::com::sun::star::frame::DoubleInitializationException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL load( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments ) throw (::com::sun::star::frame::DoubleInitializationException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL initNew(  ) throw (css::frame::DoubleInitializationException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL load( const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw (css::frame::DoubleInitializationException, css::io::IOException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
 
         // XVisualObject
-        virtual void SAL_CALL setVisualAreaSize( ::sal_Int64 nAspect, const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::awt::Size SAL_CALL getVisualAreaSize( ::sal_Int64 nAspect ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::sal_Int32 SAL_CALL getMapUnit( ::sal_Int64 nAspect ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setVisualAreaSize( ::sal_Int64 nAspect, const css::awt::Size& aSize ) throw (css::lang::IllegalArgumentException, css::embed::WrongStateException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual css::awt::Size SAL_CALL getVisualAreaSize( ::sal_Int64 nAspect ) throw (css::lang::IllegalArgumentException, css::embed::WrongStateException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual css::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect ) throw (css::lang::IllegalArgumentException, css::embed::WrongStateException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual ::sal_Int32 SAL_CALL getMapUnit( ::sal_Int64 nAspect ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
 
         // XModifiable2
-        virtual sal_Bool SAL_CALL disableSetModified(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL enableSetModified(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isSetModifiedEnabled(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL disableSetModified(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL enableSetModified(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL isSetModifiedEnabled(  ) throw (css::uno::RuntimeException, std::exception) override;
 
         // XModifiable
-        virtual sal_Bool SAL_CALL isModified(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setModified( sal_Bool bModified ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL isModified(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setModified( sal_Bool bModified ) throw (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override;
 
         // XModifyBroadcaster
-        virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
 
         // document::XEventBroadcaster
-        virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addEventListener( const css::uno::Reference< css::document::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::document::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
 
         // XUIConfigurationManagerSupplier
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > SAL_CALL getUIConfigurationManager(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::ui::XUIConfigurationManager > SAL_CALL getUIConfigurationManager(  ) throw (css::uno::RuntimeException, std::exception) override;
 
         // XDocumentSubStorageSupplier
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > SAL_CALL getDocumentSubStorage( const OUString& aStorageName, sal_Int32 nMode ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getDocumentSubStoragesNames(  ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getDocumentSubStorage( const OUString& aStorageName, sal_Int32 nMode ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getDocumentSubStoragesNames(  ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
 
-        // com::sun::star::lang::XUnoTunnel
-        virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-        static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
+        // css::lang::XUnoTunnel
+        virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+        static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
 
         // SvxUnoDrawMSFactory
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
-        ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+        css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
 
         // XStyleFamiliesSupplier
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getStyleFamilies(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getStyleFamilies(  ) throw (css::uno::RuntimeException, std::exception) override;
 
         // XModule
-        virtual void SAL_CALL setIdentifier( const OUString& Identifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getIdentifier(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setIdentifier( const OUString& Identifier ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getIdentifier(  ) throw (css::uno::RuntimeException, std::exception) override;
 
         // XNumberFormatsSupplier
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getNumberFormatSettings(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats > SAL_CALL getNumberFormats(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getNumberFormatSettings(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::util::XNumberFormats > SAL_CALL getNumberFormats(  ) throw (css::uno::RuntimeException, std::exception) override;
 
         // XTitle
-        virtual OUString SAL_CALL getTitle(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL setTitle( const OUString& sTitle ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getTitle(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setTitle( const OUString& sTitle ) throw (css::uno::RuntimeException, std::exception) override;
 
         // XTitleChangeBroadcaster
-        virtual void SAL_CALL addTitleChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitleChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeTitleChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitleChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL addTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL removeTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
 
         // XUntitledNumbers
-        virtual ::sal_Int32 SAL_CALL leaseNumber( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xComponent ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL releaseNumber( ::sal_Int32 nNumber ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL releaseNumberForComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xComponent ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual OUString SAL_CALL getUntitledPrefix(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual ::sal_Int32 SAL_CALL leaseNumber( const css::uno::Reference< css::uno::XInterface >& xComponent ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL releaseNumber( ::sal_Int32 nNumber ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL releaseNumberForComponent( const css::uno::Reference< css::uno::XInterface >& xComponent ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getUntitledPrefix(  ) throw (css::uno::RuntimeException, std::exception) override;
 
         // XDocumentPropertiesSupplier
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties > SAL_CALL getDocumentProperties(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::document::XDocumentProperties > SAL_CALL getDocumentProperties(  ) throw (css::uno::RuntimeException, std::exception) override;
 
         // XTransferable
-        virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw (::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) throw (css::datatransfer::UnsupportedFlavorException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) throw (css::uno::RuntimeException, std::exception) override;
 
         // XUndoManagerSupplier
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > SAL_CALL getUndoManager(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::document::XUndoManager > SAL_CALL getUndoManager(  ) throw (css::uno::RuntimeException, std::exception) override;
 
         // comphelper::IEmbeddedHelper
-        virtual com::sun::star::uno::Reference < com::sun::star::embed::XStorage > getStorage() const override;
+        virtual css::uno::Reference < css::embed::XStorage > getStorage() const override;
         virtual ::comphelper::EmbeddedObjectContainer& getEmbeddedObjectContainer() const override;
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > getInteractionHandler() const override;
+        virtual css::uno::Reference< css::task::XInteractionHandler > getInteractionHandler() const override;
         virtual bool isEnableSetModified() const override;
 
-        ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager2 > getUIConfigurationManager2(  ) throw (::com::sun::star::uno::RuntimeException);
+        css::uno::Reference< css::ui::XUIConfigurationManager2 > getUIConfigurationManager2(  ) throw (css::uno::RuntimeException);
       };
 
 } // namespace reportdesign
diff --git a/reportdesign/inc/ReportHelperDefines.hxx b/reportdesign/inc/ReportHelperDefines.hxx
index 83aed870bbac..fdff014666a1 100644
--- a/reportdesign/inc/ReportHelperDefines.hxx
+++ b/reportdesign/inc/ReportHelperDefines.hxx
@@ -20,166 +20,166 @@
 #define INCLUDED_REPORTDESIGN_INC_REPORTHELPERDEFINES_HXX
 
 #define REPORTCONTROLMODEL_HEADER()  \
-    virtual OUString SAL_CALL getDataField() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, std::exception) override; \
-    virtual void SAL_CALL setDataField(const OUString & the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException, std::exception) override; \
-    virtual sal_Bool SAL_CALL getPrintWhenGroupChange() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, std::exception) override; \
-    virtual void SAL_CALL setPrintWhenGroupChange(sal_Bool the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, std::exception) override; \
-    virtual OUString SAL_CALL getConditionalPrintExpression() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, std::exception) override; \
-    virtual void SAL_CALL setConditionalPrintExpression(const OUString & the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, std::exception) override; \
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XFormatCondition > SAL_CALL createFormatCondition() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception, std::exception) override;
+    virtual OUString SAL_CALL getDataField() throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; \
+    virtual void SAL_CALL setDataField(const OUString & the_value) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::beans::UnknownPropertyException, std::exception) override; \
+    virtual sal_Bool SAL_CALL getPrintWhenGroupChange() throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; \
+    virtual void SAL_CALL setPrintWhenGroupChange(sal_Bool the_value) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; \
+    virtual OUString SAL_CALL getConditionalPrintExpression() throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; \
+    virtual void SAL_CALL setConditionalPrintExpression(const OUString & the_value) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; \
+    virtual css::uno::Reference< css::report::XFormatCondition > SAL_CALL createFormatCondition() throw (css::uno::RuntimeException, css::uno::Exception, std::exception) override;
 
 #define SHAPE_HEADER()  \
-    virtual ::com::sun::star::awt::Point SAL_CALL getPosition() throw (::com::sun::star::uno::RuntimeException, std::exception) override; \
-    virtual void SAL_CALL setPosition(const ::com::sun::star::awt::Point & aPosition) throw (::com::sun::star::uno::RuntimeException, std::exception) override; \
-    virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw (::com::sun::star::uno::RuntimeException, std::exception) override; \
-    virtual void SAL_CALL setSize(const ::com::sun::star::awt::Size & aSize) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::PropertyVetoException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getPosition() throw (css::uno::RuntimeException, std::exception) override; \
+    virtual void SAL_CALL setPosition(const css::awt::Point & aPosition) throw (css::uno::RuntimeException, std::exception) override; \
+    virtual css::awt::Size SAL_CALL getSize() throw (css::uno::RuntimeException, std::exception) override; \
+    virtual void SAL_CALL setSize(const css::awt::Size & aSize) throw (css::uno::RuntimeException, css::beans::PropertyVetoException, std::exception) override;
 
 #define REPORTCOMPONENT_HEADER()  \
-    virtual OUString SAL_CALL getName() throw (::com::sun::star::uno::RuntimeException, std::exception) override; \
-    virtual void SAL_CALL setName(const OUString & the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::PropertyVetoException, std::exception) override; \
-    virtual ::sal_Int32 SAL_CALL getHeight() throw (::com::sun::star::uno::RuntimeException, std::exception) override; \
-    virtual void SAL_CALL setHeight(::sal_Int32 the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::PropertyVetoException, std::exception) override; \
-    virtual ::sal_Int32 SAL_CALL getPositionX() throw (::com::sun::star::uno::RuntimeException, std::exception) override; \
-    virtual void SAL_CALL setPositionX(::sal_Int32 the_value) throw (::com::sun::star::uno::RuntimeException, std::exception) override; \
-    virtual ::sal_Int32 SAL_CALL getPositionY() throw (::com::sun::star::uno::RuntimeException, std::exception) override; \
-    virtual void SAL_CALL setPositionY(::sal_Int32 the_value) throw (::com::sun::star::uno::RuntimeException, std::exception) override; \
-    virtual ::sal_Int32 SAL_CALL getWidth() throw (::com::sun::star::uno::RuntimeException, std::exception) override; \
-    virtual void SAL_CALL setWidth(::sal_Int32 the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::PropertyVetoException, std::exception) override; \
-    virtual ::sal_Int16 SAL_CALL getControlBorder() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, std::exception) override; \
-    virtual void SAL_CALL setControlBorder(::sal_Int16 the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException, std::exception) override; \
-    virtual ::sal_Int32 SAL_CALL getControlBorderColor() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, std::exception) override; \
-    virtual void SAL_CALL setControlBorderColor(::sal_Int32 the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException, std::exception) override; \
-    virtual sal_Bool SAL_CALL getPrintRepeatedValues() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, std::exception) override; \
-    virtual void SAL_CALL setPrintRepeatedValues(sal_Bool the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, std::exception) override; \
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getMasterFields() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; \
-    virtual void SAL_CALL setMasterFields( const ::com::sun::star::uno::Sequence< OUString >& _masterfields ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; \
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getDetailFields() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; \
-    virtual void SAL_CALL setDetailFields( const ::com::sun::star::uno::Sequence< OUString >& _detailfields ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; \
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > SAL_CALL getSection() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override; \
+    virtual void SAL_CALL setName(const OUString & the_value) throw (css::uno::RuntimeException, css::beans::PropertyVetoException, std::exception) override; \
+    virtual ::sal_Int32 SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception) override; \
+    virtual void SAL_CALL setHeight(::sal_Int32 the_value) throw (css::uno::RuntimeException, css::beans::PropertyVetoException, std::exception) override; \
+    virtual ::sal_Int32 SAL_CALL getPositionX() throw (css::uno::RuntimeException, std::exception) override; \
+    virtual void SAL_CALL setPositionX(::sal_Int32 the_value) throw (css::uno::RuntimeException, std::exception) override; \
+    virtual ::sal_Int32 SAL_CALL getPositionY() throw (css::uno::RuntimeException, std::exception) override; \
+    virtual void SAL_CALL setPositionY(::sal_Int32 the_value) throw (css::uno::RuntimeException, std::exception) override; \
+    virtual ::sal_Int32 SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) override; \
+    virtual void SAL_CALL setWidth(::sal_Int32 the_value) throw (css::uno::RuntimeException, css::beans::PropertyVetoException, std::exception) override; \
+    virtual ::sal_Int16 SAL_CALL getControlBorder() throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; \
+    virtual void SAL_CALL setControlBorder(::sal_Int16 the_value) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::beans::UnknownPropertyException, std::exception) override; \
+    virtual ::sal_Int32 SAL_CALL getControlBorderColor() throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; \
+    virtual void SAL_CALL setControlBorderColor(::sal_Int32 the_value) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::beans::UnknownPropertyException, std::exception) override; \
+    virtual sal_Bool SAL_CALL getPrintRepeatedValues() throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; \
+    virtual void SAL_CALL setPrintRepeatedValues(sal_Bool the_value) throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, std::exception) override; \
+    virtual css::uno::Sequence< OUString > SAL_CALL getMasterFields() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; \
+    virtual void SAL_CALL setMasterFields( const css::uno::Sequence< OUString >& _masterfields ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; \
+    virtual css::uno::Sequence< OUString > SAL_CALL getDetailFields() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; \
+    virtual void SAL_CALL setDetailFields( const css::uno::Sequence< OUString >& _detailfields ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; \
+    virtual css::uno::Reference< css::report::XSection > SAL_CALL getSection() throw (css::uno::RuntimeException, std::exception) override;
 
 #define REPORTCONTROLFORMAT_HEADER()  \
-    virtual ::sal_Int32 SAL_CALL getControlBackground() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setControlBackground( ::sal_Int32 _controlbackground ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual sal_Bool SAL_CALL getControlBackgroundTransparent() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setControlBackgroundTransparent( sal_Bool _controlbackgroundtransparent ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int16 SAL_CALL getParaAdjust() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setParaAdjust( ::sal_Int16 _paraadjust ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual ::com::sun::star::awt::FontDescriptor SAL_CALL getFontDescriptor() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setFontDescriptor( const ::com::sun::star::awt::FontDescriptor& _fontdescriptor ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual ::com::sun::star::awt::FontDescriptor SAL_CALL getFontDescriptorAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setFontDescriptorAsian( const ::com::sun::star::awt::FontDescriptor& _fontdescriptor ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual ::com::sun::star::awt::FontDescriptor SAL_CALL getFontDescriptorComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setFontDescriptorComplex( const ::com::sun::star::awt::FontDescriptor& _fontdescriptor ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int16 SAL_CALL getControlTextEmphasis() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setControlTextEmphasis( ::sal_Int16 _controltextemphasis ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int16 SAL_CALL getCharEmphasis() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharEmphasis( ::sal_Int16 _charemphasis ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual sal_Bool SAL_CALL getCharCombineIsOn() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharCombineIsOn( sal_Bool _charcombineison ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual OUString SAL_CALL getCharCombinePrefix() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharCombinePrefix( const OUString& _charcombineprefix ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual OUString SAL_CALL getCharCombineSuffix() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharCombineSuffix( const OUString& _charcombinesuffix ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual sal_Bool SAL_CALL getCharHidden() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharHidden( sal_Bool _charhidden ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual sal_Bool SAL_CALL getCharShadowed() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharShadowed( sal_Bool _charshadowed ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual sal_Bool SAL_CALL getCharContoured() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharContoured( sal_Bool _charcontoured ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int16 SAL_CALL getCharCaseMap() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharCaseMap( ::sal_Int16 _charcasemap ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual ::com::sun::star::lang::Locale SAL_CALL getCharLocale() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharLocale( const ::com::sun::star::lang::Locale& _charlocale ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int16 SAL_CALL getCharEscapement() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharEscapement( ::sal_Int16 _charescapement ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int8 SAL_CALL getCharEscapementHeight() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharEscapementHeight( ::sal_Int8 _charescapementheight ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual sal_Bool SAL_CALL getCharAutoKerning() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharAutoKerning( sal_Bool _charautokerning ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int16 SAL_CALL getCharKerning() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharKerning( ::sal_Int16 _charkerning ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual sal_Bool SAL_CALL getCharFlash() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharFlash( sal_Bool _charflash ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int16 SAL_CALL getCharRelief() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharRelief( ::sal_Int16 _charrelief ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual OUString SAL_CALL getCharFontName() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharFontName( const OUString& _charfontname ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual OUString SAL_CALL getCharFontStyleName() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharFontStyleName( const OUString& _charfontstylename ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int16 SAL_CALL getCharFontFamily() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharFontFamily( ::sal_Int16 _charfontfamily ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int16 SAL_CALL getCharFontCharSet() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharFontCharSet( ::sal_Int16 _charfontcharset ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int16 SAL_CALL getCharFontPitch() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharFontPitch( ::sal_Int16 _charfontpitch ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int32 SAL_CALL getCharColor() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharColor( ::sal_Int32 _charcolor ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int32 SAL_CALL getCharUnderlineColor() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharUnderlineColor( ::sal_Int32 _charunderlinecolor ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual float SAL_CALL getCharHeight() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharHeight( float _charheight ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int16 SAL_CALL getCharUnderline() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharUnderline( ::sal_Int16 _charunderline ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual float SAL_CALL getCharWeight() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharWeight( float _charweight ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual ::com::sun::star::awt::FontSlant SAL_CALL getCharPosture() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharPosture( ::com::sun::star::awt::FontSlant _charposture ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int16 SAL_CALL getCharStrikeout() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharStrikeout( ::sal_Int16 _charstrikeout ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual sal_Bool SAL_CALL getCharWordMode() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharWordMode( sal_Bool _charwordmode ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int16 SAL_CALL getCharRotation() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharRotation( ::sal_Int16 _charrotation ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int16 SAL_CALL getCharScaleWidth() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharScaleWidth( ::sal_Int16 _charscalewidth ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual ::com::sun::star::style::VerticalAlignment SAL_CALL getVerticalAlign() throw (::com::sun::star::beans::UnknownPropertyException,::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setVerticalAlign( ::com::sun::star::style::VerticalAlignment _paravertalignment ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual OUString SAL_CALL getHyperLinkURL() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setHyperLinkURL( const OUString& _hyperlinkurl ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual OUString SAL_CALL getHyperLinkTarget() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setHyperLinkTarget( const OUString& _hyperlinktarget ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual OUString SAL_CALL getHyperLinkName() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setHyperLinkName( const OUString& _hyperlinkname ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual OUString SAL_CALL getVisitedCharStyleName() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setVisitedCharStyleName( const OUString& _visitedcharstylename ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual OUString SAL_CALL getUnvisitedCharStyleName() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setUnvisitedCharStyleName( const OUString& _unvisitedcharstylename ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual float SAL_CALL getCharHeightAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharHeightAsian( float _charheightasian ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual float SAL_CALL getCharWeightAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharWeightAsian( float _charweightasian ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual OUString SAL_CALL getCharFontNameAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharFontNameAsian( const OUString& _charfontnameasian ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual OUString SAL_CALL getCharFontStyleNameAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharFontStyleNameAsian( const OUString& _charfontstylenameasian ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int16 SAL_CALL getCharFontFamilyAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharFontFamilyAsian( ::sal_Int16 _charfontfamilyasian ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int16 SAL_CALL getCharFontCharSetAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharFontCharSetAsian( ::sal_Int16 _charfontcharsetasian ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int16 SAL_CALL getCharFontPitchAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharFontPitchAsian( ::sal_Int16 _charfontpitchasian ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual ::com::sun::star::awt::FontSlant SAL_CALL getCharPostureAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharPostureAsian( ::com::sun::star::awt::FontSlant _charpostureasian ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual ::com::sun::star::lang::Locale SAL_CALL getCharLocaleAsian() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharLocaleAsian( const ::com::sun::star::lang::Locale& _charlocaleasian ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual float SAL_CALL getCharHeightComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharHeightComplex( float _charheightcomplex ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual float SAL_CALL getCharWeightComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharWeightComplex( float _charweightcomplex ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual OUString SAL_CALL getCharFontNameComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharFontNameComplex( const OUString& _charfontnamecomplex ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual OUString SAL_CALL getCharFontStyleNameComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharFontStyleNameComplex( const OUString& _charfontstylenamecomplex ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int16 SAL_CALL getCharFontFamilyComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharFontFamilyComplex( ::sal_Int16 _charfontfamilycomplex ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int16 SAL_CALL getCharFontCharSetComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharFontCharSetComplex( ::sal_Int16 _charfontcharsetcomplex ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual ::sal_Int16 SAL_CALL getCharFontPitchComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharFontPitchComplex( ::sal_Int16 _charfontpitchcomplex ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual ::com::sun::star::awt::FontSlant SAL_CALL getCharPostureComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharPostureComplex( ::com::sun::star::awt::FontSlant _charposturecomplex ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual ::com::sun::star::lang::Locale SAL_CALL getCharLocaleComplex() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;\
-    virtual void SAL_CALL setCharLocaleComplex( const ::com::sun::star::lang::Locale& _charlocalecomplex ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getControlBackground() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setControlBackground( ::sal_Int32 _controlbackground ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual sal_Bool SAL_CALL getControlBackgroundTransparent() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setControlBackgroundTransparent( sal_Bool _controlbackgroundtransparent ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual ::sal_Int16 SAL_CALL getParaAdjust() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setParaAdjust( ::sal_Int16 _paraadjust ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual css::awt::FontDescriptor SAL_CALL getFontDescriptor() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setFontDescriptor( const css::awt::FontDescriptor& _fontdescriptor ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual css::awt::FontDescriptor SAL_CALL getFontDescriptorAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setFontDescriptorAsian( const css::awt::FontDescriptor& _fontdescriptor ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual css::awt::FontDescriptor SAL_CALL getFontDescriptorComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setFontDescriptorComplex( const css::awt::FontDescriptor& _fontdescriptor ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual ::sal_Int16 SAL_CALL getControlTextEmphasis() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setControlTextEmphasis( ::sal_Int16 _controltextemphasis ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual ::sal_Int16 SAL_CALL getCharEmphasis() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharEmphasis( ::sal_Int16 _charemphasis ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual sal_Bool SAL_CALL getCharCombineIsOn() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharCombineIsOn( sal_Bool _charcombineison ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual OUString SAL_CALL getCharCombinePrefix() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharCombinePrefix( const OUString& _charcombineprefix ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual OUString SAL_CALL getCharCombineSuffix() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharCombineSuffix( const OUString& _charcombinesuffix ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual sal_Bool SAL_CALL getCharHidden() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharHidden( sal_Bool _charhidden ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual sal_Bool SAL_CALL getCharShadowed() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharShadowed( sal_Bool _charshadowed ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual sal_Bool SAL_CALL getCharContoured() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharContoured( sal_Bool _charcontoured ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual ::sal_Int16 SAL_CALL getCharCaseMap() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharCaseMap( ::sal_Int16 _charcasemap ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual css::lang::Locale SAL_CALL getCharLocale() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharLocale( const css::lang::Locale& _charlocale ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual ::sal_Int16 SAL_CALL getCharEscapement() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharEscapement( ::sal_Int16 _charescapement ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual ::sal_Int8 SAL_CALL getCharEscapementHeight() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharEscapementHeight( ::sal_Int8 _charescapementheight ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual sal_Bool SAL_CALL getCharAutoKerning() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharAutoKerning( sal_Bool _charautokerning ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual ::sal_Int16 SAL_CALL getCharKerning() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharKerning( ::sal_Int16 _charkerning ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual sal_Bool SAL_CALL getCharFlash() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharFlash( sal_Bool _charflash ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual ::sal_Int16 SAL_CALL getCharRelief() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharRelief( ::sal_Int16 _charrelief ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual OUString SAL_CALL getCharFontName() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharFontName( const OUString& _charfontname ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual OUString SAL_CALL getCharFontStyleName() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharFontStyleName( const OUString& _charfontstylename ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual ::sal_Int16 SAL_CALL getCharFontFamily() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharFontFamily( ::sal_Int16 _charfontfamily ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual ::sal_Int16 SAL_CALL getCharFontCharSet() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharFontCharSet( ::sal_Int16 _charfontcharset ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual ::sal_Int16 SAL_CALL getCharFontPitch() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharFontPitch( ::sal_Int16 _charfontpitch ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual ::sal_Int32 SAL_CALL getCharColor() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharColor( ::sal_Int32 _charcolor ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual ::sal_Int32 SAL_CALL getCharUnderlineColor() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharUnderlineColor( ::sal_Int32 _charunderlinecolor ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual float SAL_CALL getCharHeight() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharHeight( float _charheight ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual ::sal_Int16 SAL_CALL getCharUnderline() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharUnderline( ::sal_Int16 _charunderline ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual float SAL_CALL getCharWeight() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharWeight( float _charweight ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual css::awt::FontSlant SAL_CALL getCharPosture() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharPosture( css::awt::FontSlant _charposture ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual ::sal_Int16 SAL_CALL getCharStrikeout() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharStrikeout( ::sal_Int16 _charstrikeout ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual sal_Bool SAL_CALL getCharWordMode() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharWordMode( sal_Bool _charwordmode ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual ::sal_Int16 SAL_CALL getCharRotation() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharRotation( ::sal_Int16 _charrotation ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual ::sal_Int16 SAL_CALL getCharScaleWidth() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharScaleWidth( ::sal_Int16 _charscalewidth ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual css::style::VerticalAlignment SAL_CALL getVerticalAlign() throw (css::beans::UnknownPropertyException,css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setVerticalAlign( css::style::VerticalAlignment _paravertalignment ) throw (css::lang::IllegalArgumentException, css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual OUString SAL_CALL getHyperLinkURL() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setHyperLinkURL( const OUString& _hyperlinkurl ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual OUString SAL_CALL getHyperLinkTarget() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setHyperLinkTarget( const OUString& _hyperlinktarget ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual OUString SAL_CALL getHyperLinkName() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setHyperLinkName( const OUString& _hyperlinkname ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual OUString SAL_CALL getVisitedCharStyleName() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setVisitedCharStyleName( const OUString& _visitedcharstylename ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual OUString SAL_CALL getUnvisitedCharStyleName() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setUnvisitedCharStyleName( const OUString& _unvisitedcharstylename ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual float SAL_CALL getCharHeightAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharHeightAsian( float _charheightasian ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual float SAL_CALL getCharWeightAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharWeightAsian( float _charweightasian ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual OUString SAL_CALL getCharFontNameAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharFontNameAsian( const OUString& _charfontnameasian ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual OUString SAL_CALL getCharFontStyleNameAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharFontStyleNameAsian( const OUString& _charfontstylenameasian ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual ::sal_Int16 SAL_CALL getCharFontFamilyAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharFontFamilyAsian( ::sal_Int16 _charfontfamilyasian ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual ::sal_Int16 SAL_CALL getCharFontCharSetAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharFontCharSetAsian( ::sal_Int16 _charfontcharsetasian ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual ::sal_Int16 SAL_CALL getCharFontPitchAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharFontPitchAsian( ::sal_Int16 _charfontpitchasian ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual css::awt::FontSlant SAL_CALL getCharPostureAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharPostureAsian( css::awt::FontSlant _charpostureasian ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual css::lang::Locale SAL_CALL getCharLocaleAsian() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharLocaleAsian( const css::lang::Locale& _charlocaleasian ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual float SAL_CALL getCharHeightComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharHeightComplex( float _charheightcomplex ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual float SAL_CALL getCharWeightComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharWeightComplex( float _charweightcomplex ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual OUString SAL_CALL getCharFontNameComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharFontNameComplex( const OUString& _charfontnamecomplex ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual OUString SAL_CALL getCharFontStyleNameComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharFontStyleNameComplex( const OUString& _charfontstylenamecomplex ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual ::sal_Int16 SAL_CALL getCharFontFamilyComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharFontFamilyComplex( ::sal_Int16 _charfontfamilycomplex ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual ::sal_Int16 SAL_CALL getCharFontCharSetComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharFontCharSetComplex( ::sal_Int16 _charfontcharsetcomplex ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual ::sal_Int16 SAL_CALL getCharFontPitchComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharFontPitchComplex( ::sal_Int16 _charfontpitchcomplex ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual css::awt::FontSlant SAL_CALL getCharPostureComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharPostureComplex( css::awt::FontSlant _charposturecomplex ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual css::lang::Locale SAL_CALL getCharLocaleComplex() throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;\
+    virtual void SAL_CALL setCharLocaleComplex( const css::lang::Locale& _charlocalecomplex ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
 
 
 
diff --git a/reportdesign/inc/ReportVisitor.hxx b/reportdesign/inc/ReportVisitor.hxx
index 117eff296dc3..3752b52c35d4 100644
--- a/reportdesign/inc/ReportVisitor.hxx
+++ b/reportdesign/inc/ReportVisitor.hxx
@@ -28,20 +28,20 @@ namespace reportdesign
     class SAL_NO_VTABLE ITraverseReport
     {
     public:
-        virtual void traverseReport(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReport) = 0;
-        virtual void traverseReportFunctions(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctions>& _xFunctions) = 0;
-        virtual void traverseReportHeader(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) = 0;
-        virtual void traverseReportFooter(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) = 0;
-        virtual void traversePageHeader(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) = 0;
-        virtual void traversePageFooter(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) = 0;
+        virtual void traverseReport(const css::uno::Reference< css::report::XReportDefinition>& _xReport) = 0;
+        virtual void traverseReportFunctions(const css::uno::Reference< css::report::XFunctions>& _xFunctions) = 0;
+        virtual void traverseReportHeader(const css::uno::Reference< css::report::XSection>& _xSection) = 0;
+        virtual void traverseReportFooter(const css::uno::Reference< css::report::XSection>& _xSection) = 0;
+        virtual void traversePageHeader(const css::uno::Reference< css::report::XSection>& _xSection) = 0;
+        virtual void traversePageFooter(const css::uno::Reference< css::report::XSection>& _xSection) = 0;
 
-        virtual void traverseGroups(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroups>& _xGroups) = 0;
-        virtual void traverseGroup(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup>& _xGroup) = 0;
-        virtual void traverseGroupFunctions(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctions>& _xFunctions) = 0;
-        virtual void traverseGroupHeader(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) = 0;
-        virtual void traverseGroupFooter(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) = 0;
+        virtual void traverseGroups(const css::uno::Reference< css::report::XGroups>& _xGroups) = 0;
+        virtual void traverseGroup(const css::uno::Reference< css::report::XGroup>& _xGroup) = 0;
+        virtual void traverseGroupFunctions(const css::uno::Reference< css::report::XFunctions>& _xFunctions) = 0;
+        virtual void traverseGroupHeader(const css::uno::Reference< css::report::XSection>& _xSection) = 0;
+        virtual void traverseGroupFooter(const css::uno::Reference< css::report::XSection>& _xSection) = 0;
 
-        virtual void traverseDetail(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) = 0;
+        virtual void traverseDetail(const css::uno::Reference< css::report::XSection>& _xSection) = 0;
 
     protected:
         ~ITraverseReport() {}
@@ -52,8 +52,8 @@ namespace reportdesign
         ITraverseReport*                                                                m_pTraverseReport;
     public:
         OReportVisitor(ITraverseReport* _pTraverseReport);
-        void start(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReportDefinition);
-        void start(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup>& _xGroup);
+        void start(const css::uno::Reference< css::report::XReportDefinition>& _xReportDefinition);
+        void start(const css::uno::Reference< css::report::XGroup>& _xGroup);
     };
 
 } // namespace reportdesign
diff --git a/reportdesign/inc/RptDef.hxx b/reportdesign/inc/RptDef.hxx
index e964353bc284..869bae875cf7 100644
--- a/reportdesign/inc/RptDef.hxx
+++ b/reportdesign/inc/RptDef.hxx
@@ -80,11 +80,11 @@ namespace ControlModification
     static const ::sal_Int32 HEIGHT_GREATEST    = (sal_Int32)10;
 }
 
-class AnyConverter : public ::std::binary_function< OUString,::com::sun::star::uno::Any,::com::sun::star::uno::Any >
+class AnyConverter : public ::std::binary_function< OUString,css::uno::Any,css::uno::Any >
 {
 public:
     virtual ~AnyConverter(){}
-    virtual ::com::sun::star::uno::Any operator() (const OUString& /*_sPropertyName*/,const ::com::sun::star::uno::Any& lhs) const
+    virtual css::uno::Any operator() (const OUString& /*_sPropertyName*/,const css::uno::Any& lhs) const
     {
         return lhs;
     }
@@ -95,12 +95,12 @@ typedef std::map<OUString, TPropertyConverter> TPropertyNamePair;
     @param  _nObjectId  the object id
 */
 REPORTDESIGN_DLLPUBLIC const TPropertyNamePair& getPropertyNameMap(sal_uInt16 _nObjectId);
-REPORTDESIGN_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle> getUsedStyle(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReport);
+REPORTDESIGN_DLLPUBLIC css::uno::Reference< css::style::XStyle> getUsedStyle(const css::uno::Reference< css::report::XReportDefinition>& _xReport);
 
-template < typename T> T getStyleProperty(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReport,const OUString& _sPropertyName)
+template < typename T> T getStyleProperty(const css::uno::Reference< css::report::XReportDefinition>& _xReport,const OUString& _sPropertyName)
 {
     T nReturn = T();
-    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xProp(getUsedStyle(_xReport),::com::sun::star::uno::UNO_QUERY_THROW);
+    css::uno::Reference< css::beans::XPropertySet> xProp(getUsedStyle(_xReport),css::uno::UNO_QUERY_THROW);
     xProp->getPropertyValue(_sPropertyName) >>= nReturn;
     return nReturn;
 }
diff --git a/reportdesign/inc/RptModel.hxx b/reportdesign/inc/RptModel.hxx
index a87e7f4899a8..2d65adc5ec15 100644
--- a/reportdesign/inc/RptModel.hxx
+++ b/reportdesign/inc/RptModel.hxx
@@ -47,7 +47,7 @@ private:
     ::dbaui::DBSubComponentController*  m_pController;
     ::reportdesign::OReportDefinition*  m_pReportDefinition;
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoModel() override;
+    virtual css::uno::Reference< css::uno::XInterface > createUnoModel() override;
 
     OReportModel( const OReportModel& ) = delete;
     void operator=(const OReportModel& rSrcModel) = delete;
@@ -71,20 +71,20 @@ public:
     inline void attachController( dbaui::DBSubComponentController& _rController ) { m_pController = &_rController; }
     void detachController();
 
-    OReportPage* createNewPage(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection);
+    OReportPage* createNewPage(const css::uno::Reference< css::report::XSection >& _xSection);
 
     /** returns the page which belongs to a section
     *
     * @param _xSection
     * @return The page or <NULL/> when no page could be found.
     */
-    OReportPage* getPage(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection);
+    OReportPage* getPage(const css::uno::Reference< css::report::XSection >& _xSection);
 
     /// returns the XReportDefinition which the OReportModel belongs to
-    ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >
+    css::uno::Reference< css::report::XReportDefinition >
                 getReportDefinition() const;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createShape(const OUString& aServiceSpecifier,::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _rShape,sal_Int32 nOrientation = -1);
+    css::uno::Reference< css::uno::XInterface > createShape(const OUString& aServiceSpecifier,css::uno::Reference< css::drawing::XShape >& _rShape,sal_Int32 nOrientation = -1);
 };
 }
 
diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx
index fe153aae23a0..6c2fcb332fea 100644
--- a/reportdesign/inc/RptObject.hxx
+++ b/reportdesign/inc/RptObject.hxx
@@ -72,17 +72,16 @@ public:
     typedef rtl::Reference<OPropertyMediator> TMediator;
 
 protected:
-    mutable TMediator                                                                           m_xMediator;
-    mutable ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener> m_xPropertyChangeListener;
-    //mutable ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener>
-    mutable ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>       m_xReportComponent;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener>          m_xContainerListener;
-    ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>                       m_xSection;
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >                       m_xKeepShapeAlive;
+    mutable TMediator                                                 m_xMediator;
+    mutable css::uno::Reference< css::beans::XPropertyChangeListener> m_xPropertyChangeListener;
+    mutable css::uno::Reference< css::report::XReportComponent>       m_xReportComponent;
+    css::uno::Reference< css::container::XContainerListener>          m_xContainerListener;
+    css::uno::Reference< css::report::XSection>                       m_xSection;
+    css::uno::Reference< css::uno::XInterface >                       m_xKeepShapeAlive;
     OUString m_sComponentName;
     bool        m_bIsListening;
 
-    OObjectBase(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent);
+    OObjectBase(const css::uno::Reference< css::report::XReportComponent>& _xComponent);
     OObjectBase(const OUString& _sComponentName);
 
     virtual ~OObjectBase();
@@ -95,33 +94,33 @@ protected:
 
     /** called by instances of derived classes to implement their overriding of getUnoShape
     */
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
+    css::uno::Reference< css::uno::XInterface >
             getUnoShapeOf( SdrObject& _rSdrObject );
 
 private:
     static void    ensureSdrObjectOwnership(
-                    const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxShape );
+                    const css::uno::Reference< css::uno::XInterface >& _rxShape );
 
 public:
     void StartListening();
     void EndListening(bool bRemoveListener = true);
     // PropertyChangeListener
-    virtual void _propertyChange( const  ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException);
+    virtual void _propertyChange( const  css::beans::PropertyChangeEvent& evt ) throw(css::uno::RuntimeException);
     virtual void initializeOle() {}
 
     bool        supportsService( const OUString& _sServiceName ) const;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> getReportComponent() const { return m_xReportComponent;}
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getAwtComponent();
-    ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> getSection() const;
+    css::uno::Reference< css::report::XReportComponent> getReportComponent() const { return m_xReportComponent;}
+    virtual css::uno::Reference< css::beans::XPropertySet> getAwtComponent();
+    css::uno::Reference< css::report::XSection> getSection() const;
     inline const OUString getServiceName() const { return m_sComponentName; }
 
     /** releases the reference to our UNO shape (m_xKeepShapeAlive)
     */
     void    releaseUnoShape() { m_xKeepShapeAlive.clear(); }
 
-    static SdrObject* createObject(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent);
-    static sal_uInt16 getObjectType(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent);
+    static SdrObject* createObject(const css::uno::Reference< css::report::XReportComponent>& _xComponent);
+    static sal_uInt16 getObjectType(const css::uno::Reference< css::report::XReportComponent>& _xComponent);
 };
 
 // OCustomShape
@@ -132,13 +131,13 @@ class REPORTDESIGN_DLLPUBLIC OCustomShape: public SdrObjCustomShape , public OOb
     friend class DlgEdFactory;
 
 public:
-    static OCustomShape* Create( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent )
+    static OCustomShape* Create( const css::uno::Reference< css::report::XReportComponent>& _xComponent )
     {
         return new OCustomShape( _xComponent );
     }
 
 protected:
-    OCustomShape(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent);
+    OCustomShape(const css::uno::Reference< css::report::XReportComponent>& _xComponent);
     OCustomShape(const OUString& _sComponentName);
 
     virtual void NbcMove( const Size& rSize ) override;
@@ -153,14 +152,14 @@ public:
 
     virtual ~OCustomShape();
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getAwtComponent() override;
+    virtual css::uno::Reference< css::beans::XPropertySet> getAwtComponent() override;
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getUnoShape() override;
+    virtual css::uno::Reference< css::uno::XInterface > getUnoShape() override;
     virtual sal_uInt16 GetObjIdentifier() const override;
     virtual sal_uInt32 GetObjInventor() const override;
 
 private:
-    virtual void impl_setUnoShape( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxUnoShape ) override;
+    virtual void impl_setUnoShape( const css::uno::Reference< css::uno::XInterface >& rxUnoShape ) override;
 };
 
 
@@ -173,16 +172,16 @@ class REPORTDESIGN_DLLPUBLIC OOle2Obj: public SdrOle2Obj , public OObjectBase
 
     sal_uInt16 m_nType;
     bool    m_bOnlyOnce;
-    void impl_createDataProvider_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>& _xModel);
-    virtual void impl_setUnoShape( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxUnoShape ) override;
+    void impl_createDataProvider_nothrow( const css::uno::Reference< css::frame::XModel>& _xModel);
+    virtual void impl_setUnoShape( const css::uno::Reference< css::uno::XInterface >& rxUnoShape ) override;
 
 public:
-    static OOle2Obj* Create( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent,sal_uInt16 _nType )
+    static OOle2Obj* Create( const css::uno::Reference< css::report::XReportComponent>& _xComponent,sal_uInt16 _nType )
     {
         return new OOle2Obj( _xComponent,_nType );
     }
 protected:
-    OOle2Obj(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent,sal_uInt16 _nType);
+    OOle2Obj(const css::uno::Reference< css::report::XReportComponent>& _xComponent,sal_uInt16 _nType);
     OOle2Obj(const OUString& _sComponentName,sal_uInt16 _nType);
 
 
@@ -198,9 +197,9 @@ public:
 
     virtual ~OOle2Obj();
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getAwtComponent() override;
+    virtual css::uno::Reference< css::beans::XPropertySet> getAwtComponent() override;
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getUnoShape() override;
+    virtual css::uno::Reference< css::uno::XInterface > getUnoShape() override;
     virtual sal_uInt16 GetObjIdentifier() const override;
     virtual sal_uInt32 GetObjInventor() const override;
     // Clone() should make a complete copy of the object.
@@ -209,7 +208,7 @@ public:
 
     OOle2Obj& operator=(const OOle2Obj& rObj);
 
-    void initializeChart( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>& _xModel);
+    void initializeChart( const css::uno::Reference< css::frame::XModel>& _xModel);
 };
 
 
@@ -226,7 +225,7 @@ protected:
     OUnoObject(const OUString& _sComponentName
                 ,const OUString& rModelName
                 ,sal_uInt16   _nObjectType);
-    OUnoObject(  const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent
+    OUnoObject(  const css::uno::Reference< css::report::XReportComponent>& _xComponent
                 ,const OUString& rModelName
                 ,sal_uInt16   _nObjectType);
 
@@ -242,18 +241,18 @@ protected:
 public:
     TYPEINFO_OVERRIDE();
 
-    virtual void _propertyChange( const  ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException) override;
+    virtual void _propertyChange( const  css::beans::PropertyChangeEvent& evt ) throw(css::uno::RuntimeException) override;
 
     /** creates the m_xMediator when it doesn't already exist.
         @param  _bReverse   when set to <TRUE/> then the properties from the uno control will be copied into report control
     */
     void CreateMediator(bool _bReverse = false);
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getAwtComponent() override;
+    virtual css::uno::Reference< css::beans::XPropertySet> getAwtComponent() override;
 
     static OUString GetDefaultName(const OUnoObject* _pObj);
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getUnoShape() override;
+    virtual css::uno::Reference< css::uno::XInterface > getUnoShape() override;
     virtual sal_uInt16 GetObjIdentifier() const override;
     virtual sal_uInt32 GetObjInventor() const override;
     virtual OUnoObject* Clone() const override;
@@ -261,7 +260,7 @@ public:
     OUnoObject& operator=(const OUnoObject& rObj);
 
 private:
-    virtual void impl_setUnoShape( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxUnoShape ) override;
+    virtual void impl_setUnoShape( const css::uno::Reference< css::uno::XInterface >& rxUnoShape ) override;
     void    impl_setReportComponent_nothrow();
     void    impl_initializeModel_nothrow();
 };
diff --git a/reportdesign/inc/RptPage.hxx b/reportdesign/inc/RptPage.hxx
index 0a59e94dbd7b..7dc4dee86e30 100644
--- a/reportdesign/inc/RptPage.hxx
+++ b/reportdesign/inc/RptPage.hxx
@@ -37,7 +37,7 @@ class REPORTDESIGN_DLLPUBLIC OReportPage : public SdrPage
     OReportPage& operator=(const OReportPage&) = delete;
 
     OReportModel&           rModel;
-    ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > m_xSection;
+    css::uno::Reference< css::report::XSection > m_xSection;
     bool                    m_bSpecialInsertMode;
     std::vector<SdrObject*> m_aTemporaryObjectList;
 
@@ -50,12 +50,12 @@ class REPORTDESIGN_DLLPUBLIC OReportPage : public SdrPage
     virtual ~OReportPage();
 
 protected:
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage() override;
+    virtual css::uno::Reference< css::uno::XInterface > createUnoPage() override;
 public:
     TYPEINFO_OVERRIDE();
 
     OReportPage( OReportModel& rModel
-                ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection
+                ,const css::uno::Reference< css::report::XSection >& _xSection
                 ,bool bMasterPage = false );
 
 
@@ -68,12 +68,12 @@ public:
     /** returns the index inside the object list which belongs to the report component.
         @param  _xObject    the report component
     */
-    sal_uLong getIndexOf(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent >& _xObject);
+    sal_uLong getIndexOf(const css::uno::Reference< css::report::XReportComponent >& _xObject);
 
     /** removes the SdrObject which belongs to the report component.
         @param  _xObject    the report component
     */
-    void removeSdrObject(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent >& _xObject);
+    void removeSdrObject(const css::uno::Reference< css::report::XReportComponent >& _xObject);
 
     void setSpecialMode() {m_bSpecialInsertMode = true;}
     bool getSpecialMode() {return m_bSpecialInsertMode;}
@@ -83,9 +83,9 @@ public:
     /** insert a new SdrObject which belongs to the report component.
         @param  _xObject    the report component
     */
-    void insertObject(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent >& _xObject);
+    void insertObject(const css::uno::Reference< css::report::XReportComponent >& _xObject);
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getSection() const { return m_xSection;}
+    css::uno::Reference< css::report::XSection > getSection() const { return m_xSection;}
 };
 }
 #endif // INCLUDED_REPORTDESIGN_INC_RPTPAGE_HXX
diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx
index bfb19abcd7cf..f19eed0124b9 100644
--- a/reportdesign/inc/UndoActions.hxx
+++ b/reportdesign/inc/UndoActions.hxx
@@ -60,22 +60,22 @@ namespace rptui
     */
     class REPORTDESIGN_DLLPUBLIC OGroupHelper
     {
-        ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup > m_xGroup;
+        css::uno::Reference< css::report::XGroup > m_xGroup;
         OGroupHelper(const OGroupHelper&) = delete;
         OGroupHelper& operator=(const OGroupHelper&) = delete;
     public:
-        OGroupHelper(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup >& _xGroup)
+        OGroupHelper(const css::uno::Reference< css::report::XGroup >& _xGroup)
             :m_xGroup(_xGroup)
         {
         }
-        inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >   getHeader() { return m_xGroup->getHeader(); }
-        inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >   getFooter() { return m_xGroup->getFooter(); }
-        inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup >     getGroup() { return m_xGroup; }
+        inline css::uno::Reference< css::report::XSection >   getHeader() { return m_xGroup->getHeader(); }
+        inline css::uno::Reference< css::report::XSection >   getFooter() { return m_xGroup->getFooter(); }
+        inline css::uno::Reference< css::report::XGroup >     getGroup() { return m_xGroup; }
 
         inline bool getHeaderOn() { return m_xGroup->getHeaderOn(); }
         inline bool getFooterOn() { return m_xGroup->getFooterOn(); }
 
-        static ::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> , OGroupHelper> getMemberFunction(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection);
+        static ::std::mem_fun_t< css::uno::Reference< css::report::XSection> , OGroupHelper> getMemberFunction(const css::uno::Reference< css::report::XSection >& _xSection);
 
     };
 
@@ -83,24 +83,24 @@ namespace rptui
     */
     class REPORTDESIGN_DLLPUBLIC OReportHelper
     {
-        ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition > m_xReport;
+        css::uno::Reference< css::report::XReportDefinition > m_xReport;
     public:
-        OReportHelper(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& _xReport)
+        OReportHelper(const css::uno::Reference< css::report::XReportDefinition >& _xReport)
             :m_xReport(_xReport)
         {
         }
-        inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getReportHeader() { return m_xReport->getReportHeader(); }
-        inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getReportFooter() { return m_xReport->getReportFooter(); }
-        inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getPageHeader()   { return m_xReport->getPageHeader(); }
-        inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getPageFooter()   { return m_xReport->getPageFooter(); }
-        inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getDetail()       { return m_xReport->getDetail(); }
+        inline css::uno::Reference< css::report::XSection > getReportHeader() { return m_xReport->getReportHeader(); }
+        inline css::uno::Reference< css::report::XSection > getReportFooter() { return m_xReport->getReportFooter(); }
+        inline css::uno::Reference< css::report::XSection > getPageHeader()   { return m_xReport->getPageHeader(); }
+        inline css::uno::Reference< css::report::XSection > getPageFooter()   { return m_xReport->getPageFooter(); }
+        inline css::uno::Reference< css::report::XSection > getDetail()       { return m_xReport->getDetail(); }
 
         inline bool getReportHeaderOn() { return m_xReport->getReportHeaderOn(); }
         inline bool getReportFooterOn() { return m_xReport->getReportFooterOn(); }
         inline bool getPageHeaderOn() { return m_xReport->getPageHeaderOn(); }
         inline bool getPageFooterOn() { return m_xReport->getPageFooterOn(); }
 
-        static ::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> , OReportHelper> getMemberFunction(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection);
+        static ::std::mem_fun_t< css::uno::Reference< css::report::XSection> , OReportHelper> getMemberFunction(const css::uno::Reference< css::report::XSection >& _xSection);
     };
 
 
@@ -172,21 +172,21 @@ namespace rptui
         OUndoContainerAction(OUndoContainerAction&) = delete;
         void operator =(OUndoContainerAction&) = delete;
     protected:
-        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
+        css::uno::Reference< css::uno::XInterface >
                         m_xElement;     // object not owned by the action
-        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
+        css::uno::Reference< css::uno::XInterface >
                         m_xOwnElement;  // object owned by the action
-        ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >
+        css::uno::Reference< css::container::XIndexContainer >
                         m_xContainer;
-        ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >
+        css::uno::Reference< css::report::XSection >
                         m_xSection;
         Action          m_eAction;
 
     public:
         OUndoContainerAction(SdrModel& rMod
                             ,Action _eAction
-                            ,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rContainer
-                            ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& xElem
+                            ,const css::uno::Reference< css::container::XIndexContainer >& rContainer
+                            ,const css::uno::Reference< css::uno::XInterface>& xElem
                             ,sal_uInt16 _nCommentId);
         virtual ~OUndoContainerAction();
 
@@ -204,15 +204,15 @@ namespace rptui
     class REPORTDESIGN_DLLPUBLIC OUndoReportSectionAction : public OUndoContainerAction
     {
         OReportHelper                               m_aReportHelper;
-        ::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >
+        ::std::mem_fun_t< css::uno::Reference< css::report::XSection >
                                     ,OReportHelper> m_pMemberFunction;
     public:
         OUndoReportSectionAction(SdrModel& rMod
                             ,Action _eAction
-                            ,::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >
+                            ,::std::mem_fun_t< css::uno::Reference< css::report::XSection >
                                 ,OReportHelper> _pMemberFunction
-                            ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& _xReport
-                            ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& xElem
+                            ,const css::uno::Reference< css::report::XReportDefinition >& _xReport
+                            ,const css::uno::Reference< css::uno::XInterface>& xElem
                             ,sal_uInt16 _nCommentId);
 
     protected:
@@ -225,15 +225,15 @@ namespace rptui
     class REPORTDESIGN_DLLPUBLIC OUndoGroupSectionAction : public OUndoContainerAction
     {
         OGroupHelper                                m_aGroupHelper;
-        ::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >
+        ::std::mem_fun_t< css::uno::Reference< css::report::XSection >
                                     ,OGroupHelper> m_pMemberFunction;
     public:
         OUndoGroupSectionAction(SdrModel& rMod
                             ,Action _eAction
-                            ,::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >
+                            ,::std::mem_fun_t< css::uno::Reference< css::report::XSection >
                                             ,OGroupHelper> _pMemberFunction
-                            ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup >& _xGroup
-                            ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& xElem
+                            ,const css::uno::Reference< css::report::XGroup >& _xGroup
+                            ,const css::uno::Reference< css::uno::XInterface>& xElem
                             ,sal_uInt16 _nCommentId);
 
     protected:
@@ -244,10 +244,10 @@ namespace rptui
     // ORptUndoPropertyAction
     class REPORTDESIGN_DLLPUBLIC ORptUndoPropertyAction: public OCommentUndoAction
     {
-        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xObj;
-        OUString                     m_aPropertyName;
-        ::com::sun::star::uno::Any          m_aNewValue;
-        ::com::sun::star::uno::Any          m_aOldValue;
+        css::uno::Reference< css::beans::XPropertySet> m_xObj;
+        OUString               m_aPropertyName;
+        css::uno::Any          m_aNewValue;
+        css::uno::Any          m_aOldValue;
 
         /** sets either the old value or the new value again at the property set.
          *
@@ -255,10 +255,10 @@ namespace rptui
          */
         void setProperty(bool _bOld);
     protected:
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getObject();
+        virtual css::uno::Reference< css::beans::XPropertySet> getObject();
 
     public:
-        ORptUndoPropertyAction(SdrModel& rMod, const ::com::sun::star::beans::PropertyChangeEvent& evt);
+        ORptUndoPropertyAction(SdrModel& rMod, const css::beans::PropertyChangeEvent& evt);
 
         virtual void Undo() override;
         virtual void Redo() override;
@@ -272,16 +272,16 @@ namespace rptui
     class REPORTDESIGN_DLLPUBLIC OUndoPropertyReportSectionAction : public ORptUndoPropertyAction
     {
         OReportHelper                               m_aReportHelper;
-        ::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >
+        ::std::mem_fun_t< css::uno::Reference< css::report::XSection >
                                     ,OReportHelper> m_pMemberFunction;
     protected:
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getObject() override;
+        virtual css::uno::Reference< css::beans::XPropertySet> getObject() override;
     public:
         OUndoPropertyReportSectionAction(SdrModel& rMod
-                            ,const ::com::sun::star::beans::PropertyChangeEvent& evt
-                            ,::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >
+                            ,const css::beans::PropertyChangeEvent& evt
+                            ,::std::mem_fun_t< css::uno::Reference< css::report::XSection >
                                 ,OReportHelper> _pMemberFunction
-                            ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& _xReport
+                            ,const css::uno::Reference< css::report::XReportDefinition >& _xReport
                             );
     };
 
@@ -291,16 +291,16 @@ namespace rptui
     class REPORTDESIGN_DLLPUBLIC OUndoPropertyGroupSectionAction : public ORptUndoPropertyAction
     {
         OGroupHelper                                m_aGroupHelper;
-        ::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >
+        ::std::mem_fun_t< css::uno::Reference< css::report::XSection >
                                     ,OGroupHelper> m_pMemberFunction;
     protected:
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getObject() override;
+        virtual css::uno::Reference< css::beans::XPropertySet> getObject() override;
     public:
         OUndoPropertyGroupSectionAction(SdrModel& rMod
-                            ,const ::com::sun::star::beans::PropertyChangeEvent& evt
-                            ,::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >
+                            ,const css::beans::PropertyChangeEvent& evt
+                            ,::std::mem_fun_t< css::uno::Reference< css::report::XSection >
                                             ,OGroupHelper> _pMemberFunction
-                            ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup >& _xGroup
+                            ,const css::uno::Reference< css::report::XGroup >& _xGroup
                             );
     };
 
diff --git a/reportdesign/inc/UndoEnv.hxx b/reportdesign/inc/UndoEnv.hxx
index 5d0a853ec164..d7cf5e5173b9 100644
--- a/reportdesign/inc/UndoEnv.hxx
+++ b/reportdesign/inc/UndoEnv.hxx
@@ -34,9 +34,9 @@ namespace rptui
 
 
     class REPORTDESIGN_DLLPUBLIC OXUndoEnvironment
-        : public ::cppu::WeakImplHelper<   ::com::sun::star::beans::XPropertyChangeListener
-                                        ,   ::com::sun::star::container::XContainerListener
-                                        ,   ::com::sun::star::util::XModifyListener
+        : public ::cppu::WeakImplHelper<   css::beans::XPropertyChangeListener
+                                        ,   css::container::XContainerListener
+                                        ,   css::util::XModifyListener
                                         >
         , public SfxListener
     {
@@ -97,11 +97,11 @@ namespace rptui
         struct Accessor { friend class OReportModel; private: Accessor() { } };
         void Clear(const Accessor& _r);
 
-        void AddElement(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Element);
-        void RemoveElement(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Element);
+        void AddElement(const css::uno::Reference< css::uno::XInterface>& Element);
+        void RemoveElement(const css::uno::Reference< css::uno::XInterface>& Element);
 
-        void AddSection( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection);
-        void RemoveSection( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection );
+        void AddSection( const css::uno::Reference< css::report::XSection>& _xSection);
+        void RemoveSection( const css::uno::Reference< css::report::XSection>& _xSection );
         /** removes the section from the page out of the undo env
         *
         * \param _pPage
@@ -110,33 +110,33 @@ namespace rptui
 
     protected:
         // XEventListener
-        virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw( css::uno::RuntimeException, std::exception ) override;
 
         // XPropertyChangeListener
-        virtual void SAL_CALL propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException, std::exception) override;
 
         // XContainerListener
-        virtual void SAL_CALL elementInserted(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL elementReplaced(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual void SAL_CALL elementRemoved(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override;
 
         // XModifyListener
-        virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
 
         void ModeChanged();
 
         virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
 
     private:
-        void TogglePropertyListening(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Element);
+        void TogglePropertyListening(const css::uno::Reference< css::uno::XInterface>& Element);
 
         void    implSetModified();
 
-        void    switchListening( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _rxContainer, bool _bStartListening );
-        void    switchListening( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxObject, bool _bStartListening );
+        void    switchListening( const css::uno::Reference< css::container::XIndexAccess >& _rxContainer, bool _bStartListening );
+        void    switchListening( const css::uno::Reference< css::uno::XInterface >& _rxObject, bool _bStartListening );
 
-        ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::container::XChild> >::const_iterator
-            getSection(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XChild>& _xContainer) const;
+        ::std::vector< css::uno::Reference< css::container::XChild> >::const_iterator
+            getSection(const css::uno::Reference< css::container::XChild>& _xContainer) const;
     };
 
 }