diff options
author | Tor Lillqvist <tml@collabora.com> | 2016-09-12 23:08:14 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2016-09-12 23:29:32 +0300 |
commit | 01755200f6c01afc5c5970141501aea084e8b770 (patch) | |
tree | 188839c69a1b40be80c1e4e841a270f4ffdcc24f /fpicker/source/aqua | |
parent | 5177666536f65915c3ca07090a4b561b57ae6f63 (diff) |
Bin some noise comments and superfluous vertical whitespace
Change-Id: I3c19457bb29cd1392f14598fc8798aed4b1a1a7f
Diffstat (limited to 'fpicker/source/aqua')
-rw-r--r-- | fpicker/source/aqua/SalAquaFilePicker.mm | 42 | ||||
-rw-r--r-- | fpicker/source/aqua/SalAquaFolderPicker.mm | 24 | ||||
-rw-r--r-- | fpicker/source/aqua/SalAquaPicker.mm | 5 | ||||
-rw-r--r-- | fpicker/source/aqua/resourceprovider.mm | 44 |
4 files changed, 2 insertions, 113 deletions
diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm index 5ef1b40e0594..5240db3d65ca 100644 --- a/fpicker/source/aqua/SalAquaFilePicker.mm +++ b/fpicker/source/aqua/SalAquaFilePicker.mm @@ -51,9 +51,6 @@ #pragma mark DEFINES -// namespace directives - - using namespace ::com::sun::star; using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star::ui::dialogs::TemplateDescription; @@ -63,10 +60,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::uno; - -// helper functions - - namespace { uno::Sequence<rtl::OUString> SAL_CALL FilePicker_getSupportedServiceNames() @@ -81,9 +74,6 @@ namespace #pragma mark Constructor -// constructor - - SalAquaFilePicker::SalAquaFilePicker() : SalAquaFilePicker_Base( m_rbHelperMtx ) , m_pFilterHelper( nullptr ) @@ -103,9 +93,6 @@ SalAquaFilePicker::~SalAquaFilePicker() #pragma mark XFilePickerNotifier -// XFilePickerNotifier - - void SAL_CALL SalAquaFilePicker::addFilePickerListener( const uno::Reference<XFilePickerListener>& xListener ) throw( uno::RuntimeException ) { @@ -122,8 +109,6 @@ void SAL_CALL SalAquaFilePicker::removeFilePickerListener( const uno::Reference< #pragma mark XAsynchronousExecutableDialog -// XExecutableDialog functions - void SAL_CALL SalAquaFilePicker::setTitle( const rtl::OUString& aTitle ) throw( uno::RuntimeException ) { SolarMutexGuard aGuard; @@ -215,9 +200,6 @@ sal_Int16 SAL_CALL SalAquaFilePicker::execute() throw( uno::RuntimeException ) #pragma mark XFilePicker -// XFilePicker functions - - void SAL_CALL SalAquaFilePicker::setMultiSelectionMode( sal_Bool /* bMode */ ) throw( uno::RuntimeException ) { SolarMutexGuard aGuard; @@ -327,9 +309,6 @@ uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getSelectedFiles() thro #pragma mark XFilterManager -// XFilterManager functions - - void SAL_CALL SalAquaFilePicker::appendFilter( const rtl::OUString& aTitle, const rtl::OUString& aFilter ) throw( lang::IllegalArgumentException, uno::RuntimeException ) { @@ -363,9 +342,6 @@ rtl::OUString SAL_CALL SalAquaFilePicker::getCurrentFilter() throw( uno::Runtime #pragma mark XFilterGroupManager -// XFilterGroupManager functions - - void SAL_CALL SalAquaFilePicker::appendFilterGroup( const rtl::OUString& sGroupTitle, const uno::Sequence<beans::StringPair>& aFilters ) throw( lang::IllegalArgumentException, uno::RuntimeException ) { @@ -378,9 +354,6 @@ throw( lang::IllegalArgumentException, uno::RuntimeException ) #pragma mark XFilePickerControlAccess -// XFilePickerControlAccess functions - - void SAL_CALL SalAquaFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const uno::Any& rValue ) throw( uno::RuntimeException ) { @@ -424,9 +397,6 @@ throw( uno::RuntimeException ) #pragma mark XInitialization -// XInitialization - - void SAL_CALL SalAquaFilePicker::initialize( const uno::Sequence<uno::Any>& aArguments ) throw( uno::Exception, uno::RuntimeException ) { @@ -502,9 +472,6 @@ throw( uno::Exception, uno::RuntimeException ) #pragma mark XCancellable -// XCancellable - - void SAL_CALL SalAquaFilePicker::cancel() throw( uno::RuntimeException ) { SolarMutexGuard aGuard; @@ -516,9 +483,6 @@ void SAL_CALL SalAquaFilePicker::cancel() throw( uno::RuntimeException ) #pragma mark XEventListener -// XEventListener - - void SAL_CALL SalAquaFilePicker::disposing( const lang::EventObject& aEvent ) throw( uno::RuntimeException ) { SolarMutexGuard aGuard; @@ -531,9 +495,6 @@ void SAL_CALL SalAquaFilePicker::disposing( const lang::EventObject& aEvent ) th #pragma mark XServiceInfo -// XServiceInfo - - rtl::OUString SAL_CALL SalAquaFilePicker::getImplementationName() throw( uno::RuntimeException ) { @@ -556,9 +517,6 @@ throw( uno::RuntimeException ) #pragma mark Misc/Private -// FilePicker Event functions - - void SAL_CALL SalAquaFilePicker::fileSelectionChanged( FilePickerEvent aEvent ) { if (m_xListener.is()) diff --git a/fpicker/source/aqua/SalAquaFolderPicker.mm b/fpicker/source/aqua/SalAquaFolderPicker.mm index 0de50e03b8f2..24c1817c2084 100644 --- a/fpicker/source/aqua/SalAquaFolderPicker.mm +++ b/fpicker/source/aqua/SalAquaFolderPicker.mm @@ -42,18 +42,11 @@ #pragma mark DEFINES -// namespace directives - - using namespace ::com::sun::star; using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; - -// helper functions - - namespace { // controlling event notifications @@ -66,18 +59,13 @@ namespace } } - -// constructor - SalAquaFolderPicker::SalAquaFolderPicker( const uno::Reference<lang::XMultiServiceFactory>& xServiceMgr ) : m_xServiceMgr( xServiceMgr ) { m_nDialogType = NAVIGATIONSERVICES_DIRECTORY; } - -// XExecutableDialog functions - +// XExecutableDialog void SAL_CALL SalAquaFolderPicker::setTitle( const rtl::OUString& aTitle ) throw( uno::RuntimeException ) { @@ -120,9 +108,7 @@ sal_Int16 SAL_CALL SalAquaFolderPicker::execute() throw( uno::RuntimeException ) return retVal; } - -// XFolderPicker functions - +// XFolderPicker void SAL_CALL SalAquaFolderPicker::setDisplayDirectory( const rtl::OUString& aDirectory ) throw( lang::IllegalArgumentException, uno::RuntimeException ) @@ -174,10 +160,8 @@ void SAL_CALL SalAquaFolderPicker::setDescription( const rtl::OUString& rDescrip [m_pDialog setMessage:[NSString stringWithOUString:rDescription]]; } - // XServiceInfo - rtl::OUString SAL_CALL SalAquaFolderPicker::getImplementationName() throw( uno::RuntimeException ) { @@ -198,10 +182,8 @@ uno::Sequence<rtl::OUString> SAL_CALL SalAquaFolderPicker::getSupportedServiceNa return FolderPicker_getSupportedServiceNames(); } - // XCancellable - void SAL_CALL SalAquaFolderPicker::cancel() throw( uno::RuntimeException ) { SolarMutexGuard aGuard; @@ -209,10 +191,8 @@ void SAL_CALL SalAquaFolderPicker::cancel() throw( uno::RuntimeException ) [m_pDialog cancel:nil]; } - // XEventListener - void SAL_CALL SalAquaFolderPicker::disposing( const lang::EventObject& ) throw( uno::RuntimeException ) { diff --git a/fpicker/source/aqua/SalAquaPicker.mm b/fpicker/source/aqua/SalAquaPicker.mm index 602850954e25..4452f6506968 100644 --- a/fpicker/source/aqua/SalAquaPicker.mm +++ b/fpicker/source/aqua/SalAquaPicker.mm @@ -40,15 +40,10 @@ #pragma mark DEFINES #define kSetHideExtensionStateKey @"NSNavLastUserSetHideExtensionButtonState" - -// namespace directives - - using namespace ::com::sun::star; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; -// constructor SalAquaPicker::SalAquaPicker() : m_pDialog(nullptr) , m_pControlHelper(new ControlHelper()) diff --git a/fpicker/source/aqua/resourceprovider.mm b/fpicker/source/aqua/resourceprovider.mm index e687809f768b..f7531cc34bb5 100644 --- a/fpicker/source/aqua/resourceprovider.mm +++ b/fpicker/source/aqua/resourceprovider.mm @@ -31,25 +31,15 @@ #include "resourceprovider.hxx" - -// namespace directives - - using rtl::OUString; using namespace ::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds; using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds; - - - - static const char* RES_NAME = "fps_office"; static const char* OTHER_RES_NAME = "svt"; - // we have to translate control ids to resource ids - struct Entry { sal_Int32 ctrlId; @@ -80,14 +70,9 @@ Entry OtherCtrlIdToResIdTable[] = { { FILE_PICKER_FILE_TYPE, STR_FILEDLG_TYPE } }; - const sal_Int32 SIZE_TABLE = SAL_N_ELEMENTS( CtrlIdToResIdTable ); const sal_Int32 OTHER_SIZE_TABLE = SAL_N_ELEMENTS( OtherCtrlIdToResIdTable ); - - - - sal_Int16 CtrlIdToResId( sal_Int32 aControlId ) { sal_Int16 aResId = -1; @@ -120,38 +105,21 @@ sal_Int16 OtherCtrlIdToResId( sal_Int32 aControlId ) return aResId; } - - - - class CResourceProvider_Impl { public: - - - - - CResourceProvider_Impl( ) { m_ResMgr = ResMgr::CreateResMgr( RES_NAME ); m_OtherResMgr = ResMgr::CreateResMgr( OTHER_RES_NAME ); } - - - - ~CResourceProvider_Impl( ) { delete m_ResMgr; delete m_OtherResMgr; } - - - - NSString* getResString( sal_Int16 aId ) { OUString aResString; @@ -186,28 +154,16 @@ public: ResMgr* m_OtherResMgr; }; - - - - CResourceProvider::CResourceProvider( ) : m_pImpl( new CResourceProvider_Impl() ) { } - - - - CResourceProvider::~CResourceProvider( ) { delete m_pImpl; } - - - - NSString* CResourceProvider::getResString( sal_Int32 aId ) { NSString* sImmutable = m_pImpl->getResString( aId ); |