diff options
Diffstat (limited to 'vcl/unx/gtk/fpicker')
| -rw-r--r-- | vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 52 | ||||
| -rw-r--r-- | vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx | 29 | ||||
| -rw-r--r-- | vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx | 7 | ||||
| -rw-r--r-- | vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx | 8 | ||||
| -rw-r--r-- | vcl/unx/gtk/fpicker/eventnotification.hxx | 2 | ||||
| -rw-r--r-- | vcl/unx/gtk/fpicker/resourceprovider.cxx | 1 |
6 files changed, 0 insertions, 99 deletions
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index 2365565ce614..1f3dfb65980c 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -50,10 +50,8 @@ #include "gtk/fpicker/SalGtkFilePicker.hxx" - // namespace directives - using namespace ::com::sun::star; using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star::ui::dialogs::TemplateDescription; @@ -312,10 +310,8 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext gtk_file_chooser_set_preview_widget_active( GTK_FILE_CHOOSER( m_pDialog ), true); } - // XFilePickerNotifier - void SAL_CALL SalGtkFilePicker::addFilePickerListener( const uno::Reference<XFilePickerListener>& xListener ) throw( uno::RuntimeException, std::exception ) { @@ -334,10 +330,8 @@ void SAL_CALL SalGtkFilePicker::removeFilePickerListener( const uno::Reference<X m_xListener.clear(); } - // XEventListener - void SAL_CALL SalGtkFilePicker::disposing( const lang::EventObject& aEvent ) throw( uno::RuntimeException ) { // no member access => no mutex needed @@ -348,10 +342,8 @@ void SAL_CALL SalGtkFilePicker::disposing( const lang::EventObject& aEvent ) thr removeFilePickerListener( xFilePickerListener ); } - // FilePicker Event functions - void SalGtkFilePicker::impl_fileSelectionChanged( FilePickerEvent aEvent ) { OSL_TRACE( "file selection changed"); @@ -370,8 +362,6 @@ void SalGtkFilePicker::impl_controlStateChanged( FilePickerEvent aEvent ) if (m_xListener.is()) m_xListener->controlStateChanged( aEvent ); } - - struct FilterEntry { protected: @@ -406,22 +396,17 @@ public: const UnoFilterEntry* endSubFilters() const { return m_aSubFilters.getConstArray() + m_aSubFilters.getLength(); } }; - - - FilterEntry::FilterEntry( const OUString& _rTitle, const UnoFilterList& _rSubFilters ) :m_sTitle( _rTitle ) ,m_aSubFilters( _rSubFilters ) { } - bool FilterEntry::hasSubFilters() const { return( 0 < m_aSubFilters.getLength() ); } - sal_Int32 FilterEntry::getSubFilters( UnoFilterList& _rSubFilterList ) { _rSubFilterList = m_aSubFilters; @@ -504,7 +489,6 @@ dialog_remove_buttons( GtkDialog *pDialog ) g_list_free( pChildren ); } - namespace { struct FilterTitleMatch : public ::std::unary_function< FilterEntry, bool > @@ -515,7 +499,6 @@ namespace { public: FilterTitleMatch( const OUString& _rTitle ) : rTitle( _rTitle ) { } - bool operator () ( const FilterEntry& _rEntry ) { bool bMatch; @@ -542,8 +525,6 @@ namespace { }; } - - bool SalGtkFilePicker::FilterNameExists( const OUString& rTitle ) { bool bRet = false; @@ -559,7 +540,6 @@ bool SalGtkFilePicker::FilterNameExists( const OUString& rTitle ) return bRet; } - bool SalGtkFilePicker::FilterNameExists( const UnoFilterList& _rGroupedFilters ) { bool bRet = false; @@ -581,7 +561,6 @@ bool SalGtkFilePicker::FilterNameExists( const UnoFilterList& _rGroupedFilters ) return bRet; } - void SalGtkFilePicker::ensureFilterList( const OUString& _rInitialCurrentFilter ) { if( !m_pFilterList ) @@ -594,11 +573,6 @@ void SalGtkFilePicker::ensureFilterList( const OUString& _rInitialCurrentFilter } } - - - - - void SAL_CALL SalGtkFilePicker::appendFilter( const OUString& aTitle, const OUString& aFilter ) throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { @@ -616,10 +590,6 @@ void SAL_CALL SalGtkFilePicker::appendFilter( const OUString& aTitle, const OUSt m_pFilterList->insert( m_pFilterList->end(), FilterEntry( aTitle, aFilter ) ); } - - - - void SAL_CALL SalGtkFilePicker::setCurrentFilter( const OUString& aTitle ) throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { @@ -642,10 +612,6 @@ void SAL_CALL SalGtkFilePicker::setCurrentFilter( const OUString& aTitle ) // TODO m_pImpl->setCurrentFilter( aTitle ); } - - - - void SalGtkFilePicker::updateCurrentFilterFromName(const gchar* filtername) { OUString aFilterName(filtername, strlen(filtername), RTL_TEXTENCODING_UTF8); @@ -703,10 +669,8 @@ OUString SAL_CALL SalGtkFilePicker::getCurrentFilter() throw( uno::RuntimeExcept return m_aCurrentFilter; } - // XFilterGroupManager functions - void SAL_CALL SalGtkFilePicker::appendFilterGroup( const OUString& /*sGroupTitle*/, const uno::Sequence<beans::StringPair>& aFilters ) throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { @@ -735,10 +699,8 @@ void SAL_CALL SalGtkFilePicker::appendFilterGroup( const OUString& /*sGroupTitle } - // XFilePicker functions - void SAL_CALL SalGtkFilePicker::setMultiSelectionMode( sal_Bool bMode ) throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -956,10 +918,8 @@ uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw( uno return aSelectedFiles; } - // XExecutableDialog functions - void SAL_CALL SalGtkFilePicker::setTitle( const OUString& rTitle ) throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -1128,8 +1088,6 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException, std return retVal; } - - // cf. offapi/com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.idl GtkWidget *SalGtkFilePicker::getWidget( sal_Int16 nControlId, GType *pType ) { @@ -1181,9 +1139,6 @@ GtkWidget *SalGtkFilePicker::getWidget( sal_Int16 nControlId, GType *pType ) return pWidget; } - - - // XFilePickerControlAccess functions static void HackWidthToFirst(GtkComboBox *pWidget) @@ -1469,10 +1424,8 @@ OUString SAL_CALL SalGtkFilePicker::getLabel( sal_Int16 nControlId ) return OStringToOUString( aTxt, RTL_TEXTENCODING_UTF8 ); } - // XFilePreview functions - uno::Sequence<sal_Int16> SAL_CALL SalGtkFilePicker::getSupportedImageFormats() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -1655,10 +1608,8 @@ sal_Bool SAL_CALL SalGtkFilePicker::getShowState() throw( uno::RuntimeException, return mbPreviewState; } - // XInitialization - void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArguments ) throw( uno::Exception, uno::RuntimeException, std::exception ) { @@ -1820,10 +1771,8 @@ void SalGtkFilePicker::preview_toggled_cb( GObject *cb, SalGtkFilePicker* pobjFP pobjFP->setShowState( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( cb ) ) ); } - // XCancellable - void SAL_CALL SalGtkFilePicker::cancel() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -1833,7 +1782,6 @@ void SAL_CALL SalGtkFilePicker::cancel() throw( uno::RuntimeException, std::exce // TODO m_pImpl->cancel(); } - // Misc void SalGtkFilePicker::SetCurFilter( const OUString& rFilter ) diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx index 94634ca7dd7a..b4f4dbd09ac5 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx @@ -33,10 +33,8 @@ #include "gtk/fpicker/SalGtkPicker.hxx" - // Implementation class for the XFilePicker Interface - struct FilterEntry; struct ElementEntry_Impl; @@ -45,11 +43,8 @@ typedef ::std::list < ElementEntry_Impl > ElementList; typedef ::com::sun::star::beans::StringPair UnoFilterEntry; typedef ::com::sun::star::uno::Sequence< UnoFilterEntry > UnoFilterList; // can be transported more effectively - - // class declaration - typedef cppu::WeakComponentImplHelper5< ::com::sun::star::ui::dialogs::XFilePickerControlAccess, ::com::sun::star::ui::dialogs::XFilePreview, @@ -65,29 +60,23 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base // constructor SalGtkFilePicker( const ::com::sun::star::uno::Reference< ::com::sun::star::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 ) SAL_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 ) SAL_OVERRIDE; - // XExecutableDialog functions - virtual void SAL_CALL setTitle( const OUString& aTitle ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL execute() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XFilePicker functions - virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -104,17 +93,13 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XFilePicker2 functions - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedFiles() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_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 ) SAL_OVERRIDE; @@ -124,17 +109,13 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base virtual OUString SAL_CALL getCurrentFilter( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_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) SAL_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) SAL_OVERRIDE; @@ -150,10 +131,8 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XFilePreview - virtual ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -175,32 +154,24 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base virtual sal_Bool SAL_CALL getShowState( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_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) SAL_OVERRIDE; - // XCancellable - virtual void SAL_CALL cancel( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XEventListener - using cppu::WeakComponentImplHelperBase::disposing; virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException); - // FilePicker Event functions - private: // prevent copy and assignment SalGtkFilePicker( const SalGtkFilePicker& ); diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx index b30334408c5c..a77d1c9512f2 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx @@ -47,7 +47,6 @@ using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; - // constructor SalGtkFolderPicker::SalGtkFolderPicker( const uno::Reference< uno::XComponentContext >& xContext ) : @@ -65,10 +64,8 @@ SalGtkFolderPicker::SalGtkFolderPicker( const uno::Reference< uno::XComponentCon gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER( m_pDialog ), false ); } - // XEventListener - void SAL_CALL SalGtkFolderPicker::disposing( const lang::EventObject& ) throw( uno::RuntimeException ) { @@ -128,10 +125,8 @@ void SAL_CALL SalGtkFolderPicker::setDescription( const OUString& /*rDescription { } - // XExecutableDialog functions - void SAL_CALL SalGtkFolderPicker::setTitle( const OUString& aTitle ) throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -177,10 +172,8 @@ sal_Int16 SAL_CALL SalGtkFolderPicker::execute() throw( uno::RuntimeException, s return retVal; } - // XCancellable - void SAL_CALL SalGtkFolderPicker::cancel() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx index a7081c382be4..1acdd66c4abf 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx @@ -37,20 +37,16 @@ class SalGtkFolderPicker : // constructor SalGtkFolderPicker( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xServiceMgr ); - // XExecutableDialog functions - virtual void SAL_CALL setTitle( const OUString& aTitle ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL execute( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XFolderPicker functions - virtual void SAL_CALL setDisplayDirectory( const OUString& rDirectory ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -63,17 +59,13 @@ class SalGtkFolderPicker : virtual void SAL_CALL setDescription( const OUString& rDescription ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XCancellable - virtual void SAL_CALL cancel( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException); diff --git a/vcl/unx/gtk/fpicker/eventnotification.hxx b/vcl/unx/gtk/fpicker/eventnotification.hxx index 209343526218..50ad540887be 100644 --- a/vcl/unx/gtk/fpicker/eventnotification.hxx +++ b/vcl/unx/gtk/fpicker/eventnotification.hxx @@ -23,7 +23,6 @@ #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/uno/Reference.hxx> - // encapsulate a filepicker event // notification, because there are // two types of filepicker notifications @@ -31,7 +30,6 @@ // this is an application of the // "command" pattern see GoF - class CEventNotification { public: diff --git a/vcl/unx/gtk/fpicker/resourceprovider.cxx b/vcl/unx/gtk/fpicker/resourceprovider.cxx index f4e144a9b118..9727a9cf9654 100644 --- a/vcl/unx/gtk/fpicker/resourceprovider.cxx +++ b/vcl/unx/gtk/fpicker/resourceprovider.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds; using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds; - // translate control ids to resource ids static const struct |