From 669b9cd5b8924a121114540adac91cd7e2f8b0ad Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 30 Oct 2015 10:16:38 +0200 Subject: com::sun::star->css in svtools Change-Id: I95fd8317ab1142068e0c7b50fc62643fe9f95dc2 Reviewed-on: https://gerrit.libreoffice.org/19683 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- svtools/source/uno/wizard/unowizard.cxx | 52 +++++++++++----------- svtools/source/uno/wizard/wizardpagecontroller.cxx | 30 ++++++------- svtools/source/uno/wizard/wizardpagecontroller.hxx | 8 ++-- svtools/source/uno/wizard/wizardshell.cxx | 32 ++++++------- svtools/source/uno/wizard/wizardshell.hxx | 8 ++-- 5 files changed, 65 insertions(+), 65 deletions(-) (limited to 'svtools/source/uno/wizard') diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx index 0a248a05cce6..ba07e6145c45 100644 --- a/svtools/source/uno/wizard/unowizard.cxx +++ b/svtools/source/uno/wizard/unowizard.cxx @@ -42,32 +42,32 @@ using namespace ::svt::uno; namespace { - using ::com::sun::star::uno::Reference; - using ::com::sun::star::uno::XInterface; - using ::com::sun::star::uno::UNO_QUERY; - using ::com::sun::star::uno::UNO_QUERY_THROW; - using ::com::sun::star::uno::UNO_SET_THROW; - using ::com::sun::star::uno::Exception; - using ::com::sun::star::uno::RuntimeException; - using ::com::sun::star::uno::Any; - using ::com::sun::star::uno::makeAny; - using ::com::sun::star::uno::Sequence; - using ::com::sun::star::uno::Type; - using ::com::sun::star::lang::XServiceInfo; - using ::com::sun::star::ui::dialogs::XWizard; - using ::com::sun::star::lang::XInitialization; - using ::com::sun::star::beans::XPropertySetInfo; - using ::com::sun::star::uno::XComponentContext; - using ::com::sun::star::beans::Property; - using ::com::sun::star::lang::IllegalArgumentException; - using ::com::sun::star::ucb::AlreadyInitializedException; - using ::com::sun::star::ui::dialogs::XWizardController; - using ::com::sun::star::ui::dialogs::XWizardPage; - using ::com::sun::star::container::NoSuchElementException; - using ::com::sun::star::util::InvalidStateException; - using ::com::sun::star::awt::XWindow; - - namespace WizardButton = ::com::sun::star::ui::dialogs::WizardButton; + using css::uno::Reference; + using css::uno::XInterface; + using css::uno::UNO_QUERY; + using css::uno::UNO_QUERY_THROW; + using css::uno::UNO_SET_THROW; + using css::uno::Exception; + using css::uno::RuntimeException; + using css::uno::Any; + using css::uno::makeAny; + using css::uno::Sequence; + using css::uno::Type; + using css::lang::XServiceInfo; + using css::ui::dialogs::XWizard; + using css::lang::XInitialization; + using css::beans::XPropertySetInfo; + using css::uno::XComponentContext; + using css::beans::Property; + using css::lang::IllegalArgumentException; + using css::ucb::AlreadyInitializedException; + using css::ui::dialogs::XWizardController; + using css::ui::dialogs::XWizardPage; + using css::container::NoSuchElementException; + using css::util::InvalidStateException; + using css::awt::XWindow; + + namespace WizardButton = css::ui::dialogs::WizardButton; namespace diff --git a/svtools/source/uno/wizard/wizardpagecontroller.cxx b/svtools/source/uno/wizard/wizardpagecontroller.cxx index f8f94b58ba6d..3951c93d8cee 100644 --- a/svtools/source/uno/wizard/wizardpagecontroller.cxx +++ b/svtools/source/uno/wizard/wizardpagecontroller.cxx @@ -32,21 +32,21 @@ namespace svt { namespace uno { - using ::com::sun::star::uno::Reference; - using ::com::sun::star::uno::XInterface; - using ::com::sun::star::uno::UNO_QUERY; - using ::com::sun::star::uno::UNO_QUERY_THROW; - using ::com::sun::star::uno::UNO_SET_THROW; - using ::com::sun::star::uno::Exception; - using ::com::sun::star::uno::RuntimeException; - using ::com::sun::star::uno::Any; - using ::com::sun::star::uno::makeAny; - using ::com::sun::star::uno::Sequence; - using ::com::sun::star::uno::Type; - using ::com::sun::star::ui::dialogs::XWizardController; - using ::com::sun::star::awt::XWindow; - using ::com::sun::star::lang::XComponent; - using ::com::sun::star::awt::XControl; + using css::uno::Reference; + using css::uno::XInterface; + using css::uno::UNO_QUERY; + using css::uno::UNO_QUERY_THROW; + using css::uno::UNO_SET_THROW; + using css::uno::Exception; + using css::uno::RuntimeException; + using css::uno::Any; + using css::uno::makeAny; + using css::uno::Sequence; + using css::uno::Type; + using css::ui::dialogs::XWizardController; + using css::awt::XWindow; + using css::lang::XComponent; + using css::awt::XControl; using namespace ::com::sun::star; diff --git a/svtools/source/uno/wizard/wizardpagecontroller.hxx b/svtools/source/uno/wizard/wizardpagecontroller.hxx index 3eb76c49ad33..f38d4a50b1bc 100644 --- a/svtools/source/uno/wizard/wizardpagecontroller.hxx +++ b/svtools/source/uno/wizard/wizardpagecontroller.hxx @@ -39,7 +39,7 @@ namespace svt { namespace uno public: WizardPageController( WizardShell& i_rParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizardController >& i_rController, + const css::uno::Reference< css::ui::dialogs::XWizardController >& i_rController, const sal_Int16 i_nPageId ); virtual ~WizardPageController(); @@ -49,13 +49,13 @@ namespace svt { namespace uno virtual bool commitPage( WizardTypes::CommitPageReason _eReason ) override; virtual bool canAdvance() const override; - const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizardPage >& + const css::uno::Reference< css::ui::dialogs::XWizardPage >& getWizardPage() const { return m_xWizardPage; } TabPage* getTabPage() const; private: - const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizardController > m_xController; - ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizardPage > m_xWizardPage; + const css::uno::Reference< css::ui::dialogs::XWizardController > m_xController; + css::uno::Reference< css::ui::dialogs::XWizardPage > m_xWizardPage; const sal_Int16 m_nPageId; }; diff --git a/svtools/source/uno/wizard/wizardshell.cxx b/svtools/source/uno/wizard/wizardshell.cxx index c8388b91d5a2..744a9c41b818 100644 --- a/svtools/source/uno/wizard/wizardshell.cxx +++ b/svtools/source/uno/wizard/wizardshell.cxx @@ -32,22 +32,22 @@ namespace svt { namespace uno { - using ::com::sun::star::uno::Reference; - using ::com::sun::star::uno::XInterface; - using ::com::sun::star::uno::UNO_QUERY; - using ::com::sun::star::uno::UNO_QUERY_THROW; - using ::com::sun::star::uno::UNO_SET_THROW; - using ::com::sun::star::uno::Exception; - using ::com::sun::star::uno::RuntimeException; - using ::com::sun::star::uno::Any; - using ::com::sun::star::uno::makeAny; - using ::com::sun::star::uno::Sequence; - using ::com::sun::star::uno::Type; - using ::com::sun::star::ui::dialogs::XWizardController; - using ::com::sun::star::ui::dialogs::XWizard; - using ::com::sun::star::ui::dialogs::XWizardPage; - - namespace WizardTravelType = ::com::sun::star::ui::dialogs::WizardTravelType; + using css::uno::Reference; + using css::uno::XInterface; + using css::uno::UNO_QUERY; + using css::uno::UNO_QUERY_THROW; + using css::uno::UNO_SET_THROW; + using css::uno::Exception; + using css::uno::RuntimeException; + using css::uno::Any; + using css::uno::makeAny; + using css::uno::Sequence; + using css::uno::Type; + using css::ui::dialogs::XWizardController; + using css::ui::dialogs::XWizard; + using css::ui::dialogs::XWizardPage; + + namespace WizardTravelType = css::ui::dialogs::WizardTravelType; namespace diff --git a/svtools/source/uno/wizard/wizardshell.hxx b/svtools/source/uno/wizard/wizardshell.hxx index ca9c4698a6ab..dd1442e16a8d 100644 --- a/svtools/source/uno/wizard/wizardshell.hxx +++ b/svtools/source/uno/wizard/wizardshell.hxx @@ -43,8 +43,8 @@ namespace svt { namespace uno public: WizardShell( vcl::Window* _pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizardController >& i_rController, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_Int16 > >& i_rPaths + const css::uno::Reference< css::ui::dialogs::XWizardController >& i_rController, + const css::uno::Sequence< css::uno::Sequence< sal_Int16 > >& i_rPaths ); // Dialog overridables @@ -79,7 +79,7 @@ namespace svt { namespace uno WizardShell_Base::activatePath( PathId( i_nPathID ), i_bFinal ); } - ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizardPage > + css::uno::Reference< css::ui::dialogs::XWizardPage > getCurrentWizardPage() const; sal_Int16 getCurrentPage() const @@ -117,7 +117,7 @@ namespace svt { namespace uno private: typedef ::std::map< VclPtr, PWizardPageController > Page2ControllerMap; - const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizardController > m_xController; + const css::uno::Reference< css::ui::dialogs::XWizardController > m_xController; const sal_Int16 m_nFirstPageID; Page2ControllerMap m_aPageControllers; }; -- cgit