diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 18:16:42 +1100 |
---|---|---|
committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 08:18:05 +0000 |
commit | a238b1f8d304bf1e2ffb357937f3ec888ee8ac89 (patch) | |
tree | 083c0582d4bf80e313ed256ca476ba8f69c7f7a6 /fpicker/source/win32/folderpicker | |
parent | 538f276ae0414ea34ede6090b5f56e8fecd6fc65 (diff) |
Remove excess newlines
A ridiculously fast way of doing this is:
for i in $(pcregrep -l -M -r --include='.*[hc]xx$' \
--exclude-dir=workdir --exclude-dir=instdir '^
{3,}' .)
do
perl -0777 -i -pe 's/^
{3,}/
/gm' $i
done
Change-Id: Iebb93eccbee9e4fc5c4380474ba595858a27ac2c
Reviewed-on: https://gerrit.libreoffice.org/22224
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'fpicker/source/win32/folderpicker')
-rw-r--r-- | fpicker/source/win32/folderpicker/FolderPicker.cxx | 21 | ||||
-rw-r--r-- | fpicker/source/win32/folderpicker/MtaFop.cxx | 66 | ||||
-rw-r--r-- | fpicker/source/win32/folderpicker/WinFOPImpl.cxx | 12 | ||||
-rw-r--r-- | fpicker/source/win32/folderpicker/workbench/Test_fops.cxx | 1 |
4 files changed, 0 insertions, 100 deletions
diff --git a/fpicker/source/win32/folderpicker/FolderPicker.cxx b/fpicker/source/win32/folderpicker/FolderPicker.cxx index 48e35296c692..d9666ce8f37e 100644 --- a/fpicker/source/win32/folderpicker/FolderPicker.cxx +++ b/fpicker/source/win32/folderpicker/FolderPicker.cxx @@ -57,9 +57,6 @@ namespace } - - - CFolderPicker::CFolderPicker( const Reference< XMultiServiceFactory >& xServiceMgr ) : m_xServiceMgr( xServiceMgr ) { @@ -67,9 +64,6 @@ CFolderPicker::CFolderPicker( const Reference< XMultiServiceFactory >& xServiceM } - - - void SAL_CALL CFolderPicker::setTitle( const OUString& aTitle ) throw( RuntimeException ) { OSL_ASSERT( m_pFolderPickerImpl.get( ) ); @@ -78,9 +72,6 @@ void SAL_CALL CFolderPicker::setTitle( const OUString& aTitle ) throw( RuntimeEx } - - - void SAL_CALL CFolderPicker::setDisplayDirectory( const OUString& aDirectory ) throw( IllegalArgumentException, RuntimeException ) { @@ -90,9 +81,6 @@ void SAL_CALL CFolderPicker::setDisplayDirectory( const OUString& aDirectory ) } - - - OUString SAL_CALL CFolderPicker::getDisplayDirectory( ) throw( RuntimeException ) { @@ -102,9 +90,6 @@ OUString SAL_CALL CFolderPicker::getDisplayDirectory( ) } - - - OUString SAL_CALL CFolderPicker::getDirectory( ) throw( RuntimeException ) { OSL_ASSERT( m_pFolderPickerImpl.get( ) ); @@ -113,9 +98,6 @@ OUString SAL_CALL CFolderPicker::getDirectory( ) throw( RuntimeException ) } - - - void SAL_CALL CFolderPicker::setDescription( const OUString& aDescription ) throw( RuntimeException ) { OSL_ASSERT( m_pFolderPickerImpl.get( ) ); @@ -124,9 +106,6 @@ void SAL_CALL CFolderPicker::setDescription( const OUString& aDescription ) thro } - - - sal_Int16 SAL_CALL CFolderPicker::execute( ) throw( RuntimeException ) { diff --git a/fpicker/source/win32/folderpicker/MtaFop.cxx b/fpicker/source/win32/folderpicker/MtaFop.cxx index 4be8a3ee1dd0..78b144bdbf5a 100644 --- a/fpicker/source/win32/folderpicker/MtaFop.cxx +++ b/fpicker/source/win32/folderpicker/MtaFop.cxx @@ -224,9 +224,6 @@ CMtaFolderPicker::~CMtaFolderPicker( ) } - - - sal_Bool CMtaFolderPicker::browseForFolder( ) { sal_Bool bRet = sal_False; @@ -308,54 +305,36 @@ sal_Bool CMtaFolderPicker::browseForFolder( ) } - - - void SAL_CALL CMtaFolderPicker::setDisplayDirectory( const OUString& aDirectory ) { m_displayDir = aDirectory; } - - - OUString SAL_CALL CMtaFolderPicker::getDisplayDirectory( ) { return m_displayDir; } - - - OUString SAL_CALL CMtaFolderPicker::getDirectory( ) { return m_SelectedDir; } - - - void SAL_CALL CMtaFolderPicker::setDescription( const OUString& aDescription ) { m_Description = aDescription; } - - - void SAL_CALL CMtaFolderPicker::setTitle( const OUString& aTitle ) { m_dialogTitle = aTitle; } - - - OUString SAL_CALL CMtaFolderPicker::getTitle( ) { return m_dialogTitle; @@ -380,9 +359,6 @@ void SAL_CALL CMtaFolderPicker::cancel( ) } - - - sal_Bool SAL_CALL CMtaFolderPicker::onBrowseForFolder( ) { sal_Bool bRet; @@ -408,9 +384,6 @@ sal_Bool SAL_CALL CMtaFolderPicker::onBrowseForFolder( ) } - - - void SAL_CALL CMtaFolderPicker::releaseItemIdList( LPITEMIDLIST lpItemIdList ) { sal::systools::COMReference<IMalloc> pIMalloc; @@ -423,9 +396,6 @@ void SAL_CALL CMtaFolderPicker::releaseItemIdList( LPITEMIDLIST lpItemIdList ) } - - - LPITEMIDLIST SAL_CALL CMtaFolderPicker::getItemIdListFromPath( const OUString& aDirectory ) { // parameter checking @@ -452,9 +422,6 @@ LPITEMIDLIST SAL_CALL CMtaFolderPicker::getItemIdListFromPath( const OUString& a } - - - OUString SAL_CALL CMtaFolderPicker::getPathFromItemIdList( LPCITEMIDLIST lpItemIdList ) { OUString path; @@ -470,9 +437,6 @@ OUString SAL_CALL CMtaFolderPicker::getPathFromItemIdList( LPCITEMIDLIST lpItemI } - - - void SAL_CALL CMtaFolderPicker::enableOk( sal_Bool bEnable ) { OSL_ASSERT( IsWindow( m_hwnd ) ); @@ -485,9 +449,6 @@ void SAL_CALL CMtaFolderPicker::enableOk( sal_Bool bEnable ) } - - - void SAL_CALL CMtaFolderPicker::setSelection( const OUString& aDirectory ) { OSL_ASSERT( IsWindow( m_hwnd ) ); @@ -500,9 +461,6 @@ void SAL_CALL CMtaFolderPicker::setSelection( const OUString& aDirectory ) } - - - void SAL_CALL CMtaFolderPicker::setStatusText( const OUString& aStatusText ) { OSL_ASSERT( IsWindow( m_hwnd ) ); @@ -515,9 +473,6 @@ void SAL_CALL CMtaFolderPicker::setStatusText( const OUString& aStatusText ) } - - - void SAL_CALL CMtaFolderPicker::onInitialized( ) { LPITEMIDLIST lpiidDisplayDir = getItemIdListFromPath( m_displayDir ); @@ -535,9 +490,6 @@ void SAL_CALL CMtaFolderPicker::onInitialized( ) } - - - sal_uInt32 CMtaFolderPicker::onValidateFailed() { // to be overwritten by subclasses @@ -545,9 +497,6 @@ sal_uInt32 CMtaFolderPicker::onValidateFailed() } - - - int CALLBACK CMtaFolderPicker::FolderPickerCallback( HWND hwnd, UINT uMsg, LPARAM lParam, LPARAM lpData ) { CMtaFolderPicker* pImpl = reinterpret_cast< CMtaFolderPicker* >( lpData ); @@ -656,9 +605,6 @@ LRESULT CALLBACK CMtaFolderPicker::StaWndProc( HWND hWnd, UINT uMsg, WPARAM wPar } - - - sal_Bool SAL_CALL CMtaFolderPicker::createStaRequestWindow( ) { bool bIsWnd = false; @@ -687,9 +633,6 @@ sal_Bool SAL_CALL CMtaFolderPicker::createStaRequestWindow( ) } - - - unsigned int CMtaFolderPicker::run( ) { OSL_ASSERT( m_hEvtThrdReady ); @@ -731,9 +674,6 @@ unsigned int CMtaFolderPicker::run( ) } - - - unsigned int WINAPI CMtaFolderPicker::StaThreadProc( LPVOID pParam ) { osl_setThreadName("fpicker CMtaFolderPicker::run()"); @@ -754,9 +694,6 @@ unsigned int WINAPI CMtaFolderPicker::StaThreadProc( LPVOID pParam ) } - - - ATOM SAL_CALL CMtaFolderPicker::RegisterStaRequestWindowClass( ) { osl::MutexGuard aGuard( s_Mutex ); @@ -794,9 +731,6 @@ ATOM SAL_CALL CMtaFolderPicker::RegisterStaRequestWindowClass( ) } - - - void SAL_CALL CMtaFolderPicker::UnregisterStaRequestWindowClass( ) { osl::MutexGuard aGuard( s_Mutex ); diff --git a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx index 481fc1f82354..7bfc506a2dc8 100644 --- a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx +++ b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx @@ -38,9 +38,6 @@ using namespace com::sun::star::ui::dialogs; using osl::FileBase; - - - const OUString BACKSLASH( "\\" ); @@ -113,9 +110,6 @@ OUString CWinFolderPickerImpl::getDisplayDirectory( ) } - - - OUString SAL_CALL CWinFolderPickerImpl::getDirectory( ) throw( RuntimeException ) { OUString sysDir = CMtaFolderPicker::getDirectory( ); @@ -128,9 +122,6 @@ OUString SAL_CALL CWinFolderPickerImpl::getDirectory( ) throw( RuntimeException } - - - sal_Int16 SAL_CALL CWinFolderPickerImpl::execute( ) throw( RuntimeException ) { return m_nLastDlgResult = CMtaFolderPicker::browseForFolder( ) ? @@ -139,9 +130,6 @@ sal_Int16 SAL_CALL CWinFolderPickerImpl::execute( ) throw( RuntimeException ) } - - - void CWinFolderPickerImpl::onSelChanged( const OUString& aNewPath ) { setStatusText( aNewPath ); diff --git a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx index a635a467415f..f91b6cc6d78b 100644 --- a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx +++ b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx @@ -61,7 +61,6 @@ Reference< XMultiServiceFactory > g_xFactory; // main - int SAL_CALL main(int /*nArgc*/, char* /*Argv[]*/, char* /*Env[]*/ ) { CoInitializeEx( NULL, COINIT_MULTITHREADED ); |