diff options
Diffstat (limited to 'vcl/unx/gtk/fpicker')
-rw-r--r-- | vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 3 | ||||
-rw-r--r-- | vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx | 102 | ||||
-rw-r--r-- | vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx | 21 | ||||
-rw-r--r-- | vcl/unx/gtk/fpicker/SalGtkPicker.cxx | 8 | ||||
-rw-r--r-- | vcl/unx/gtk/fpicker/SalGtkPicker.hxx | 62 | ||||
-rw-r--r-- | vcl/unx/gtk/fpicker/eventnotification.hxx | 2 |
6 files changed, 98 insertions, 100 deletions
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index 79b9b58859a2..9798639e58f9 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -1984,8 +1984,7 @@ SalGtkFilePicker::~SalGtkFilePicker() using namespace ::com::sun::star; uno::Reference< ui::dialogs::XFilePicker2 > -GtkInstance::createFilePicker( const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > &xMSF ) +GtkInstance::createFilePicker( const css::uno::Reference< css::uno::XComponentContext > &xMSF ) { return uno::Reference< ui::dialogs::XFilePicker2 >( new SalGtkFilePicker( xMSF ) ); diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx index c825439f1b55..e602baaff29f 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx @@ -44,10 +44,10 @@ typedef ::std::list < ElementEntry_Impl > ElementList; // class declaration typedef cppu::WeakComponentImplHelper< - ::com::sun::star::ui::dialogs::XFilePickerControlAccess, - ::com::sun::star::ui::dialogs::XFilePreview, - ::com::sun::star::ui::dialogs::XFilePicker3, - ::com::sun::star::lang::XInitialization + css::ui::dialogs::XFilePickerControlAccess, + css::ui::dialogs::XFilePreview, + css::ui::dialogs::XFilePicker3, + css::lang::XInitialization > SalGtkFilePicker_Base; class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base @@ -55,111 +55,111 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base public: // constructor - SalGtkFilePicker( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xServiceMgr ); + SalGtkFilePicker( const css::uno::Reference< css::uno::XComponentContext >& xServiceMgr ); // XFilePickerNotifier - virtual void SAL_CALL addFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) + throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) + throw( css::uno::RuntimeException, std::exception ) override; // XExecutableDialog functions virtual void SAL_CALL setTitle( const OUString& aTitle ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Int16 SAL_CALL execute() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XFilePicker functions virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setDefaultName( const OUString& aName ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory ) - throw( com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getDisplayDirectory( ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles( ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getFiles( ) + throw( css::uno::RuntimeException, std::exception ) override; // XFilePicker2 functions - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedFiles() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSelectedFiles() + throw (css::uno::RuntimeException, std::exception) override; // XFilterManager functions virtual void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter ) - throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setCurrentFilter( const OUString& aTitle ) - throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getCurrentFilter( ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XFilterGroupManager functions - virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aFilters ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const css::uno::Sequence< css::beans::StringPair >& aFilters ) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; // XFilePickerControlAccess functions - virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const ::com::sun::star::uno::Any& aValue ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const css::uno::Any& aValue ) + throw (css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getValue( sal_Int16 aControlId, sal_Int16 aControlAction ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getValue( sal_Int16 aControlId, sal_Int16 aControlAction ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable ) - throw(::com::sun::star::uno::RuntimeException, std::exception ) override; + throw(css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString& aLabel ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XFilePreview - virtual ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats( ) + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getTargetColorDepth( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getAvailableWidth( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getAvailableHeight( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setImage( sal_Int16 aImageFormat, const ::com::sun::star::uno::Any& aImage ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setImage( sal_Int16 aImageFormat, const css::uno::Any& aImage ) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL setShowState( sal_Bool bShowState ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL getShowState( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) - throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) + throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XCancellable virtual void SAL_CALL cancel( ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // FilePicker Event functions @@ -172,12 +172,12 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base void ensureFilterList( const OUString& _rInitialCurrentFilter ); - void impl_fileSelectionChanged( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent ); - void impl_directoryChanged( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent ); - void impl_controlStateChanged( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent ); + void impl_fileSelectionChanged( css::ui::dialogs::FilePickerEvent aEvent ); + void impl_directoryChanged( css::ui::dialogs::FilePickerEvent aEvent ); + void impl_controlStateChanged( css::ui::dialogs::FilePickerEvent aEvent ); private: - ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener > + css::uno::Reference< css::ui::dialogs::XFilePickerListener > m_xListener; OUString msPlayLabel; FilterList *m_pFilterList; @@ -245,14 +245,14 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base void implChangeType( GtkTreeSelection *selection ); GtkFileFilter * implAddFilter( const OUString& rFilter, const OUString& rType ); void implAddFilterGroup( const OUString& rFilter, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair>& _rFilters ); + const css::uno::Sequence< css::beans::StringPair>& _rFilters ); void updateCurrentFilterFromName(const gchar* filtername); void unselect_type(); void InitialMapping(); void HandleSetListValue(GtkComboBox *pWidget, sal_Int16 nControlAction, - const ::com::sun::star::uno::Any& rValue); - static ::com::sun::star::uno::Any HandleGetListValue(GtkComboBox *pWidget, sal_Int16 nControlAction); + const css::uno::Any& rValue); + static css::uno::Any HandleGetListValue(GtkComboBox *pWidget, sal_Int16 nControlAction); static void expander_changed_cb( GtkExpander *expander, SalGtkFilePicker *pobjFP ); static void preview_toggled_cb( GObject *cb, SalGtkFilePicker *pobjFP ); diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx index d2e7ab749cb7..9e2955796c8e 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx @@ -28,41 +28,40 @@ #include "gtk/fpicker/SalGtkPicker.hxx" class SalGtkFolderPicker : - public SalGtkPicker, - public cppu::WeakImplHelper< - ::com::sun::star::ui::dialogs::XFolderPicker2 > + public SalGtkPicker, + public cppu::WeakImplHelper< css::ui::dialogs::XFolderPicker2 > { public: // constructor - SalGtkFolderPicker( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xServiceMgr ); + SalGtkFolderPicker( const css::uno::Reference< css::uno::XComponentContext >& xServiceMgr ); // XExecutableDialog functions virtual void SAL_CALL setTitle( const OUString& aTitle ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Int16 SAL_CALL execute( ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XFolderPicker functions virtual void SAL_CALL setDisplayDirectory( const OUString& rDirectory ) - throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getDisplayDirectory( ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getDirectory( ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setDescription( const OUString& rDescription ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XCancellable virtual void SAL_CALL cancel( ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; private: SalGtkFolderPicker( const SalGtkFolderPicker& ) = delete; diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx index 701cd627c364..26b2740bb79f 100644 --- a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx @@ -154,13 +154,13 @@ void SAL_CALL RunDialog::windowOpened(const css::lang::EventObject& e) g_timeout_add_full(G_PRIORITY_HIGH_IDLE, 0, reinterpret_cast<GSourceFunc>(canceldialog), this, nullptr); } -void SAL_CALL RunDialog::queryTermination( const ::com::sun::star::lang::EventObject& ) - throw(::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL RunDialog::queryTermination( const css::lang::EventObject& ) + throw(css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) { } -void SAL_CALL RunDialog::notifyTermination( const ::com::sun::star::lang::EventObject& ) - throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL RunDialog::notifyTermination( const css::lang::EventObject& ) + throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard g; diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx index 17a32b5f46e0..be74e669e979 100644 --- a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx @@ -43,25 +43,25 @@ class SalGtkPicker { public: - SalGtkPicker( const ::com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext>& xContext ); + SalGtkPicker( const css::uno::Reference<css::uno::XComponentContext>& xContext ); virtual ~SalGtkPicker(); protected: osl::Mutex m_rbHelperMtx; GtkWidget *m_pDialog; protected: void SAL_CALL implsetTitle( const OUString& aTitle ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( css::uno::RuntimeException ); void SAL_CALL implsetDisplayDirectory( const OUString& rDirectory ) - throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException ); + throw( css::lang::IllegalArgumentException, css::uno::RuntimeException ); OUString SAL_CALL implgetDisplayDirectory( ) - throw( com::sun::star::uno::RuntimeException ); + throw( css::uno::RuntimeException ); OUString uritounicode(const gchar *pIn); OString unicodetouri(const OUString &rURL); // to instantiate own services - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; static OUString getResString( sal_Int32 aId ); }; @@ -73,44 +73,44 @@ class SalGtkPicker //https://bugzilla.redhat.com/show_bug.cgi?id=441108 class RunDialog : public cppu::WeakComponentImplHelper< - ::com::sun::star::awt::XTopWindowListener, - ::com::sun::star::frame::XTerminateListener > + css::awt::XTopWindowListener, + css::frame::XTerminateListener > { private: osl::Mutex maLock; GtkWidget *mpDialog; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XExtendedToolkit> mxToolkit; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDesktop > mxDesktop; + css::uno::Reference< css::awt::XExtendedToolkit> mxToolkit; + css::uno::Reference< css::frame::XDesktop > mxDesktop; public: // XTopWindowListener using cppu::WeakComponentImplHelperBase::disposing; - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override {} - virtual void SAL_CALL windowOpened( const ::com::sun::star::lang::EventObject& e ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowClosing( const ::com::sun::star::lang::EventObject& ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override {} - virtual void SAL_CALL windowClosed( const ::com::sun::star::lang::EventObject& ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override {} - virtual void SAL_CALL windowMinimized( const ::com::sun::star::lang::EventObject& ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override {} - virtual void SAL_CALL windowNormalized( const ::com::sun::star::lang::EventObject& ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override {} - virtual void SAL_CALL windowActivated( const ::com::sun::star::lang::EventObject& ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override {} - virtual void SAL_CALL windowDeactivated( const ::com::sun::star::lang::EventObject& ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override {} + virtual void SAL_CALL disposing( const css::lang::EventObject& ) + throw(css::uno::RuntimeException, std::exception) override {} + virtual void SAL_CALL windowOpened( const css::lang::EventObject& e ) + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowClosing( const css::lang::EventObject& ) + throw (css::uno::RuntimeException, std::exception) override {} + virtual void SAL_CALL windowClosed( const css::lang::EventObject& ) + throw (css::uno::RuntimeException, std::exception) override {} + virtual void SAL_CALL windowMinimized( const css::lang::EventObject& ) + throw (css::uno::RuntimeException, std::exception) override {} + virtual void SAL_CALL windowNormalized( const css::lang::EventObject& ) + throw (css::uno::RuntimeException, std::exception) override {} + virtual void SAL_CALL windowActivated( const css::lang::EventObject& ) + throw (css::uno::RuntimeException, std::exception) override {} + virtual void SAL_CALL windowDeactivated( const css::lang::EventObject& ) + throw (css::uno::RuntimeException, std::exception) override {} // XTerminateListener - virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& aEvent ) - throw(::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& aEvent ) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL queryTermination( const css::lang::EventObject& aEvent ) + throw(css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL notifyTermination( const css::lang::EventObject& aEvent ) + throw(css::uno::RuntimeException, std::exception) override; public: RunDialog(GtkWidget *pDialog, - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XExtendedToolkit > &rToolkit, - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDesktop > &rDesktop + css::uno::Reference< css::awt::XExtendedToolkit > &rToolkit, + css::uno::Reference< css::frame::XDesktop > &rDesktop ); virtual ~RunDialog(); gint run(); diff --git a/vcl/unx/gtk/fpicker/eventnotification.hxx b/vcl/unx/gtk/fpicker/eventnotification.hxx index 0697e2599ffe..88a472e0e8ce 100644 --- a/vcl/unx/gtk/fpicker/eventnotification.hxx +++ b/vcl/unx/gtk/fpicker/eventnotification.hxx @@ -35,7 +35,7 @@ class CEventNotification public: virtual ~CEventNotification() { }; - virtual void SAL_CALL notifyEventListener( com::sun::star::uno::Reference< com::sun::star::uno::XInterface > xListener ) = 0; + virtual void SAL_CALL notifyEventListener( css::uno::Reference< css::uno::XInterface > xListener ) = 0; }; #endif |