diff options
author | Tor Lillqvist <tml@collabora.com> | 2015-04-30 05:32:26 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2015-04-30 06:14:12 +0300 |
commit | d1ca0f4ed0e30394ce6759a20d4896651dd43051 (patch) | |
tree | af9def17a770c6399e18965c9fb9f3bb4b91b702 /fpicker | |
parent | 0d341d28f73603670e3b8c639c583229d3c723a6 (diff) |
Bin some pointless comments and reduce some vertical whitespace
Bin pointless '// predeclarations' or '// forward declarations' comments. If
a programmer doesn't know what a forward declaration is, well, why read C++
source code?
Also bin some pointless '// end of namespace foo' comments after namespace
blocks just a handful of lines long, and some superfluous vertical whitespace.
Change-Id: I2a31c5d73d9b4de8825fb8eb9e7559dbd7303ef9
Diffstat (limited to 'fpicker')
-rw-r--r-- | fpicker/source/aqua/SalAquaFilePicker.hxx | 32 | ||||
-rw-r--r-- | fpicker/source/win32/filepicker/FilePicker.hxx | 35 | ||||
-rw-r--r-- | fpicker/source/win32/filepicker/WinFileOpenImpl.hxx | 19 | ||||
-rw-r--r-- | fpicker/source/win32/filepicker/customcontrolfactory.hxx | 8 | ||||
-rw-r--r-- | fpicker/source/win32/filepicker/previewadapter.hxx | 4 |
5 files changed, 0 insertions, 98 deletions
diff --git a/fpicker/source/aqua/SalAquaFilePicker.hxx b/fpicker/source/aqua/SalAquaFilePicker.hxx index 2f0d39d6f2d7..db68ae49a680 100644 --- a/fpicker/source/aqua/SalAquaFilePicker.hxx +++ b/fpicker/source/aqua/SalAquaFilePicker.hxx @@ -33,18 +33,8 @@ #include "FilterHelper.hxx" #include "AquaFilePickerDelegate.hxx" - // Implementation class for the XFilePicker Interface - - -// forward declarations - - - -// class declaration - - typedef ::cppu::WeakComponentImplHelper4 < ::com::sun::star::ui::dialogs::XFilePicker3, ::com::sun::star::ui::dialogs::XFilePickerControlAccess, @@ -60,29 +50,23 @@ public: // constructor SalAquaFilePicker(); - // 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 ) 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 ) SAL_OVERRIDE; - // XExecutableDialog functions - virtual void SAL_CALL setTitle( const OUString& aTitle ) throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL execute( ) throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; - // XFilePicker functions - virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; @@ -99,10 +83,8 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles( ) throw( ::com::sun::star::uno::RuntimeException ) 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 ) SAL_OVERRIDE; @@ -112,17 +94,13 @@ public: virtual OUString SAL_CALL getCurrentFilter( ) throw( ::com::sun::star::uno::RuntimeException ) 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) 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) SAL_OVERRIDE; @@ -138,32 +116,24 @@ public: virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (::com::sun::star::uno::RuntimeException) 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) SAL_OVERRIDE; - // XCancellable - virtual void SAL_CALL cancel( ) throw( ::com::sun::star::uno::RuntimeException ) 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); - // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; @@ -173,10 +143,8 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; - // FilePicker Event functions - void SAL_CALL fileSelectionChanged( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent ); void SAL_CALL directoryChanged( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent ); // OUString SAL_CALL helpRequested( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent ) const; diff --git a/fpicker/source/win32/filepicker/FilePicker.hxx b/fpicker/source/win32/filepicker/FilePicker.hxx index bd6fc8f758ec..befe27d40ac1 100644 --- a/fpicker/source/win32/filepicker/FilePicker.hxx +++ b/fpicker/source/win32/filepicker/FilePicker.hxx @@ -34,20 +34,10 @@ #include <memory> - // Implementation class for the XFilePicker Interface - - -// forward declarations - - class CWinFileOpenImpl; - -// class declaration - - class CFilePickerDummy { protected: @@ -72,29 +62,23 @@ public: // ctor CFilePicker( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& 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 ); virtual void SAL_CALL removeFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException ); - // XExecutableDialog functions - virtual void SAL_CALL setTitle( const OUString& aTitle ) throw( ::com::sun::star::uno::RuntimeException ); virtual sal_Int16 SAL_CALL execute( ) throw( ::com::sun::star::uno::RuntimeException ); - // XFilePicker functions - virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) throw( ::com::sun::star::uno::RuntimeException ); @@ -110,16 +94,13 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles( ) throw( ::com::sun::star::uno::RuntimeException ); - // XFilePicker2 functions virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedFiles( ) throw (::com::sun::star::uno::RuntimeException); - // XFilterManager functions - virtual void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); @@ -129,17 +110,13 @@ public: virtual OUString SAL_CALL getCurrentFilter( ) throw( ::com::sun::star::uno::RuntimeException ); - // 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); - // XFilePickerControlAccess functions - virtual void SAL_CALL setValue( sal_Int16 aControlId, sal_Int16 aControlAction, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::uno::RuntimeException); @@ -155,10 +132,8 @@ public: virtual OUString SAL_CALL getLabel( sal_Int16 aControlId ) throw (::com::sun::star::uno::RuntimeException); - // XFilePreview - virtual ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getTargetColorDepth( ) throw (::com::sun::star::uno::RuntimeException); @@ -173,31 +148,23 @@ public: virtual sal_Bool SAL_CALL getShowState( ) throw (::com::sun::star::uno::RuntimeException); - // 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); - // XCancellable - virtual void SAL_CALL cancel( ) throw(::com::sun::star::uno::RuntimeException); - // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException); - // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); @@ -207,10 +174,8 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); - // FilePicker Event functions - void SAL_CALL fileSelectionChanged( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent ); void SAL_CALL directoryChanged( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent ); OUString SAL_CALL helpRequested( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent ) const; diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx index 8c2f6ce3e6c4..fd17c3fe362e 100644 --- a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx +++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx @@ -37,7 +37,6 @@ #include <vector> #include <osl/conditn.hxx> -// forward declaration class CFilePicker; class CFilePickerState; class CExecuteFilePickerState; @@ -55,16 +54,12 @@ public: virtual ~CWinFileOpenImpl( ); - // XExecutableDialog - virtual sal_Int16 SAL_CALL execute( ) throw( ::com::sun::star::uno::RuntimeException ); - // XFilePicker - virtual void SAL_CALL setDefaultName( const OUString& aName ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); @@ -76,10 +71,8 @@ public: virtual OUString SAL_CALL getDisplayDirectory( ) throw ( ::com::sun::star::uno::RuntimeException ); - // XFilterManager - virtual void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); @@ -89,17 +82,13 @@ public: virtual OUString SAL_CALL getCurrentFilter( ) throw( ::com::sun::star::uno::RuntimeException ); - // XFilterGroupManager - 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); - // XFilePickerControlAccess - virtual void SAL_CALL setValue( sal_Int16 aControlId, sal_Int16 aControlAction, const ::com::sun::star::uno::Any& aValue ) throw( ::com::sun::star::uno::RuntimeException ); @@ -115,10 +104,8 @@ public: virtual OUString SAL_CALL getLabel( sal_Int16 aControlId ) throw ( ::com::sun::star::uno::RuntimeException); - // XFilePreview - virtual ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats( ) throw (::com::sun::star::uno::RuntimeException); @@ -140,16 +127,12 @@ public: virtual sal_Bool SAL_CALL getShowState( ) throw (::com::sun::star::uno::RuntimeException); - // XCancelable - virtual void SAL_CALL cancel( ); - // Implementation details - protected: sal_Int16 SAL_CALL getFocused( ); @@ -169,7 +152,6 @@ protected: virtual sal_uInt32 SAL_CALL onCtrlCommand( HWND hwndDlg, sal_uInt16 ctrlId, sal_uInt16 notifyCode ); - void onWMSize(); void onWMShow(sal_Bool bShow); void onWMWindowPosChanged(); @@ -212,7 +194,6 @@ private: CResourceProvider m_ResProvider; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/win32/filepicker/customcontrolfactory.hxx b/fpicker/source/win32/filepicker/customcontrolfactory.hxx index 742cc7a6e3ba..868d21e720dc 100644 --- a/fpicker/source/win32/filepicker/customcontrolfactory.hxx +++ b/fpicker/source/win32/filepicker/customcontrolfactory.hxx @@ -28,16 +28,8 @@ #pragma warning(pop) #endif - -// forward declaration - - class CCustomControl; - - - - class CCustomControlFactory { public: diff --git a/fpicker/source/win32/filepicker/previewadapter.hxx b/fpicker/source/win32/filepicker/previewadapter.hxx index dc40889b1939..9c813eb63ca5 100644 --- a/fpicker/source/win32/filepicker/previewadapter.hxx +++ b/fpicker/source/win32/filepicker/previewadapter.hxx @@ -35,10 +35,8 @@ #endif #include <memory> -// forward declaration class CPreviewAdapterImpl; - // A kind of a facade for the preview class. // We want to hide the fact that the preview // window may only become visible if there is @@ -47,7 +45,6 @@ class CPreviewAdapterImpl; // the preview active with a valid parent // window the preview may not be visible - class CPreviewAdapter { public: @@ -95,7 +92,6 @@ private: CPreviewAdapter& operator=(const CPreviewAdapter&); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |