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 | |
| 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')
52 files changed, 0 insertions, 1187 deletions
diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx index f570c63114bb..e2ebc2777c53 100644 --- a/fpicker/source/office/OfficeControlAccess.cxx +++ b/fpicker/source/office/OfficeControlAccess.cxx @@ -59,7 +59,6 @@ namespace svt #define PROPERTY_FLAG_CHECKED 0x00000080 - struct ControlDescription { const sal_Char* pControlName; @@ -122,7 +121,6 @@ namespace svt }; - struct ControlProperty { const sal_Char* pPropertyName; diff --git a/fpicker/source/office/OfficeControlAccess.hxx b/fpicker/source/office/OfficeControlAccess.hxx index dfe51fc8fac8..c0995cda6c5f 100644 --- a/fpicker/source/office/OfficeControlAccess.hxx +++ b/fpicker/source/office/OfficeControlAccess.hxx @@ -30,7 +30,6 @@ namespace svt { - namespace InternalFilePickerElementIds { static const sal_Int16 PUSHBUTTON_HELP = (sal_Int16)0x1000; diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx index 170bf409fc5c..bc17bd168b39 100644 --- a/fpicker/source/office/OfficeFilePicker.cxx +++ b/fpicker/source/office/OfficeFilePicker.cxx @@ -53,7 +53,6 @@ using namespace ::com::sun::star::awt; using namespace ::utl; - struct FilterEntry { protected: @@ -87,8 +86,6 @@ public: }; - - FilterEntry::FilterEntry( const OUString& _rTitle, const UnoFilterList& _rSubFilters ) :m_sTitle( _rTitle ) ,m_aSubFilters( _rSubFilters ) @@ -229,7 +226,6 @@ IMPL_LINK_TYPED( SvtFilePicker, DialogClosedHdl, Dialog&, rDlg, void ) // SvtFilePicker - WinBits SvtFilePicker::getWinBits( WinBits& rExtraBits ) { // set the winbits for creating the filedialog @@ -489,7 +485,6 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER3( SvtRemoteFilePicker, SvtFilePicker, OCommonPic // XExecutableDialog functions - void SAL_CALL SvtFilePicker::setTitle( const OUString& _rTitle ) throw (RuntimeException, std::exception) { OCommonPicker::setTitle( _rTitle ); @@ -505,7 +500,6 @@ sal_Int16 SAL_CALL SvtFilePicker::execute( ) throw (RuntimeException, std::exce // XAsynchronousExecutableDialog functions - void SAL_CALL SvtFilePicker::setDialogTitle( const OUString& _rTitle ) throw (RuntimeException, std::exception) { setTitle( _rTitle ); @@ -659,7 +653,6 @@ void SAL_CALL SvtFilePicker::setValue( sal_Int16 nElementID, } - Any SAL_CALL SvtFilePicker::getValue( sal_Int16 nElementID, sal_Int16 nControlAction ) throw( RuntimeException, std::exception ) { @@ -695,7 +688,6 @@ Any SAL_CALL SvtFilePicker::getValue( sal_Int16 nElementID, sal_Int16 nControlAc } - void SAL_CALL SvtFilePicker::setLabel( sal_Int16 nLabelID, const OUString& rValue ) throw ( RuntimeException, std::exception ) { @@ -1022,7 +1014,6 @@ OUString SAL_CALL SvtFilePicker::getCurrentFilter() } - // XInitialization functions @@ -1102,7 +1093,6 @@ bool SvtFilePicker::implHandleInitializationArgument( const OUString& _rName, co } - return OCommonPicker::implHandleInitializationArgument( _rName, _rValue ); } diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx index da1d91e1b87e..d049ffa01454 100644 --- a/fpicker/source/office/OfficeFilePicker.hxx +++ b/fpicker/source/office/OfficeFilePicker.hxx @@ -163,7 +163,6 @@ public: 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; - // these methods are here because they're ambiguous virtual void SAL_CALL cancel() throw( css::uno::RuntimeException, std::exception ) override diff --git a/fpicker/source/office/asyncfilepicker.hxx b/fpicker/source/office/asyncfilepicker.hxx index 981cc5263b75..d25710f3e203 100644 --- a/fpicker/source/office/asyncfilepicker.hxx +++ b/fpicker/source/office/asyncfilepicker.hxx @@ -34,8 +34,6 @@ namespace svt { - - //= AsyncPickerAction class AsyncPickerAction : public salhelper::SimpleReferenceObject diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx index c856bda72267..2b2b6613da3a 100644 --- a/fpicker/source/office/commonpicker.cxx +++ b/fpicker/source/office/commonpicker.cxx @@ -195,7 +195,6 @@ namespace svt } - bool OCommonPicker::createPicker() { if ( !m_pDlg ) diff --git a/fpicker/source/office/fpinteraction.cxx b/fpicker/source/office/fpinteraction.cxx index ccf6edec5a55..0ed85f4f9904 100644 --- a/fpicker/source/office/fpinteraction.cxx +++ b/fpicker/source/office/fpinteraction.cxx @@ -115,8 +115,6 @@ namespace svt } - - void OFilePickerInteractionHandler::resetUseState() { m_bUsed = false; diff --git a/fpicker/source/office/fpinteraction.hxx b/fpicker/source/office/fpinteraction.hxx index 5002c532aef0..2524082cf14e 100644 --- a/fpicker/source/office/fpinteraction.hxx +++ b/fpicker/source/office/fpinteraction.hxx @@ -28,7 +28,6 @@ namespace svt { - //= OFilePickerInteractionHandler typedef ::cppu::WeakImplHelper < css::task::XInteractionHandler diff --git a/fpicker/source/office/fpsmartcontent.hxx b/fpicker/source/office/fpsmartcontent.hxx index d25cdd8a01c0..e20acb0089fa 100644 --- a/fpicker/source/office/fpsmartcontent.hxx +++ b/fpicker/source/office/fpsmartcontent.hxx @@ -31,7 +31,6 @@ namespace svt { - //= SmartContent /** a "smart content" which basically wraps an UCB content, but caches some information diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 14bff94687de..6ca8d57b5865 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -325,7 +325,6 @@ SvtFileDialog::SvtFileDialog } - SvtFileDialog::SvtFileDialog ( vcl::Window* _pParent, WinBits nBits ) :SvtFileDialog_Base( _pParent, "ExplorerFileDialog", "fps/ui/explorerfiledialog.ui" ) ,_pCbReadOnly( nullptr ) @@ -1224,14 +1223,12 @@ void SvtFileDialog::OpenHdl_Impl(void* pVoid) } - void SvtFileDialog::EnableAutocompletion( bool _bEnable ) { _pImp->_pEdFileName->EnableAutocompletion( _bEnable ); } - IMPL_LINK_NOARG_TYPED( SvtFileDialog, FilterSelectHdl_Impl, ListBox&, void ) { OUString sSelectedFilterDisplayName; @@ -1317,14 +1314,12 @@ IMPL_LINK_NOARG_TYPED( SvtFileDialog, FileNameGetFocusHdl_Impl, Control&, void ) } - IMPL_LINK_NOARG_TYPED( SvtFileDialog, FileNameModifiedHdl_Impl, Edit&, void ) { FileNameGetFocusHdl_Impl( *_pImp->_pEdFileName ); } - IMPL_LINK_NOARG_TYPED( SvtFileDialog, URLBoxModifiedHdl_Impl, SvtURLBox*, void ) { OUString aPath = _pImp->_pEdCurrentPath->GetURL(); @@ -1332,7 +1327,6 @@ IMPL_LINK_NOARG_TYPED( SvtFileDialog, URLBoxModifiedHdl_Impl, SvtURLBox*, void ) } - IMPL_LINK_NOARG_TYPED( SvtFileDialog, ConnectToServerPressed_Hdl, Button*, void ) { _pFileView->EndInplaceEditing( false ); @@ -1356,7 +1350,6 @@ IMPL_LINK_NOARG_TYPED( SvtFileDialog, ConnectToServerPressed_Hdl, Button*, void } - IMPL_LINK_NOARG_TYPED ( SvtFileDialog, AddPlacePressed_Hdl, Button*, void ) { // Maybe open the PlacesDialog would have been a better idea @@ -1369,14 +1362,12 @@ IMPL_LINK_NOARG_TYPED ( SvtFileDialog, AddPlacePressed_Hdl, Button*, void ) } - IMPL_LINK_NOARG_TYPED ( SvtFileDialog, RemovePlacePressed_Hdl, Button*, void ) { _pImp->_pPlaces->RemoveSelectedPlace(); } - SvtFileDialogFilter_Impl* SvtFileDialog::FindFilter_Impl ( const OUString& _rFilter, @@ -1437,7 +1428,6 @@ SvtFileDialogFilter_Impl* SvtFileDialog::FindFilter_Impl } - void SvtFileDialog::ExecuteFilter() { _pImp->m_bNeedDelayedFilterExecute = false; @@ -1445,7 +1435,6 @@ void SvtFileDialog::ExecuteFilter() } - void SvtFileDialog::OpenMultiSelection_Impl() /* [Description] @@ -1464,7 +1453,6 @@ void SvtFileDialog::OpenMultiSelection_Impl() } - void SvtFileDialog::UpdateControls( const OUString& rURL ) { _pImp->_pEdFileName->SetBaseURL( rURL ); @@ -1517,7 +1505,6 @@ void SvtFileDialog::UpdateControls( const OUString& rURL ) } - IMPL_LINK_TYPED( SvtFileDialog, SelectHdl_Impl, SvTreeListBox*, pBox, void ) { SvTreeListEntry* pEntry = pBox->FirstSelected(); @@ -1569,7 +1556,6 @@ IMPL_LINK_TYPED( SvtFileDialog, SelectHdl_Impl, SvTreeListBox*, pBox, void ) } - IMPL_LINK_NOARG_TYPED(SvtFileDialog, DblClickHdl_Impl, SvTreeListBox*, bool) { _pImp->_bDoubleClick = true; @@ -1580,14 +1566,12 @@ IMPL_LINK_NOARG_TYPED(SvtFileDialog, DblClickHdl_Impl, SvTreeListBox*, bool) } - IMPL_LINK_NOARG_TYPED(SvtFileDialog, EntrySelectHdl_Impl, ComboBox&, void) { FileSelect(); } - IMPL_LINK_TYPED( SvtFileDialog, OpenDoneHdl_Impl, SvtFileView*, pView, void ) { OUString sCurrentFolder( pView->GetViewURL() ); @@ -1609,7 +1593,6 @@ IMPL_LINK_TYPED( SvtFileDialog, OpenDoneHdl_Impl, SvtFileView*, pView, void ) } - IMPL_LINK_NOARG_TYPED(SvtFileDialog, AutoExtensionHdl_Impl, Button*, void) { if ( _pFileNotifier ) @@ -1621,7 +1604,6 @@ IMPL_LINK_NOARG_TYPED(SvtFileDialog, AutoExtensionHdl_Impl, Button*, void) } - IMPL_LINK_TYPED( SvtFileDialog, ClickHdl_Impl, Button*, pCheckBox, void ) { if ( ! _pFileNotifier ) @@ -1647,7 +1629,6 @@ IMPL_LINK_TYPED( SvtFileDialog, ClickHdl_Impl, Button*, pCheckBox, void ) } - IMPL_LINK_NOARG_TYPED(SvtFileDialog, PlayButtonHdl_Impl, Button*, void) { if ( _pFileNotifier ) @@ -1656,7 +1637,6 @@ IMPL_LINK_NOARG_TYPED(SvtFileDialog, PlayButtonHdl_Impl, Button*, void) } - bool SvtFileDialog::Notify( NotifyEvent& rNEvt ) /* [Description] @@ -1689,7 +1669,6 @@ bool SvtFileDialog::Notify( NotifyEvent& rNEvt ) } - class SvtDefModalDialogParent_Impl { private: @@ -1916,7 +1895,6 @@ void SvtFileDialog::EnableControl( Control* _pControl, bool _bEnable ) } - short SvtFileDialog::PrepareExecute() { OUString aEnvValue; @@ -2122,7 +2100,6 @@ void SvtFileDialog::executeAsync( ::svt::AsyncPickerAction::Action _eAction, } - void SvtFileDialog::FileSelect() { if ( _pFileNotifier ) @@ -2130,7 +2107,6 @@ void SvtFileDialog::FileSelect() } - void SvtFileDialog::FilterSelect() { if ( _pFileNotifier ) @@ -2139,7 +2115,6 @@ void SvtFileDialog::FilterSelect() } - void SvtFileDialog::SetStandardDir( const OUString& rStdDir ) /* [Description] @@ -2160,7 +2135,6 @@ void SvtFileDialog::SetBlackList( const css::uno::Sequence< OUString >& rBlackLi } - const css::uno::Sequence< OUString >& SvtFileDialog::GetBlackList() const { return _pImp->GetBlackList(); @@ -2179,7 +2153,6 @@ const OUString& SvtFileDialog::GetStandardDir() const } - void SvtFileDialog::PrevLevel_Impl() { _pFileView->EndInplaceEditing( false ); @@ -2189,7 +2162,6 @@ void SvtFileDialog::PrevLevel_Impl() } - void SvtFileDialog::OpenURL_Impl( const OUString& _rURL ) { _pFileView->EndInplaceEditing( false ); @@ -2210,7 +2182,6 @@ SvtFileDialogFilter_Impl* SvtFileDialog::implAddFilter( const OUString& _rFilter } - void SvtFileDialog::AddFilter( const OUString& _rFilter, const OUString& _rType ) { SAL_WARN_IF( IsInExecute(), "fpicker.office", "SvtFileDialog::AddFilter: currently executing!" ); @@ -2249,7 +2220,6 @@ void SvtFileDialog::SetCurFilter( const OUString& rFilter ) } - OUString SvtFileDialog::GetCurFilter() const { OUString aFilter; @@ -2267,14 +2237,12 @@ OUString SvtFileDialog::getCurFilter( ) const } - sal_uInt16 SvtFileDialog::GetFilterCount() const { return _pImp->m_aFilter.size(); } - const OUString& SvtFileDialog::GetFilterName( sal_uInt16 nPos ) const { assert( nPos < GetFilterCount() && "invalid index" ); @@ -2282,7 +2250,6 @@ const OUString& SvtFileDialog::GetFilterName( sal_uInt16 nPos ) const } - void SvtFileDialog::InitSize() { if ( _pImp->_aIniKey.isEmpty() ) @@ -2303,7 +2270,6 @@ void SvtFileDialog::InitSize() } - std::vector<OUString> SvtFileDialog::GetPathList() const { std::vector<OUString> aList; diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx index 75aab4de3ee0..c360d522df94 100644 --- a/fpicker/source/office/iodlg.hxx +++ b/fpicker/source/office/iodlg.hxx @@ -290,28 +290,24 @@ private: }; - inline void SvtFileDialog::SetPath( const OUString& rNewURL ) { _aPath = rNewURL; } - inline void SvtFileDialog::SetHasFilename( bool bHasFilename ) { m_bHasFilename = bHasFilename; } - inline const OUString& SvtFileDialog::GetPath() { return _aPath; } - inline void SvtFileDialog::SetDefaultExt( const OUString& rExt ) { _aDefExt = rExt; diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx index 3a3b305e5232..c33867e2f9be 100644 --- a/fpicker/source/office/iodlgimp.cxx +++ b/fpicker/source/office/iodlgimp.cxx @@ -77,7 +77,6 @@ SvtFileDialogFilter_Impl::SvtFileDialogFilter_Impl( const OUString& rName, const } - SvtFileDialogFilter_Impl::~SvtFileDialogFilter_Impl() { } @@ -86,11 +85,9 @@ SvtFileDialogFilter_Impl::~SvtFileDialogFilter_Impl() // SvtFileDialogFilterList_Impl - //= SvtFileDialogURLSelector - SvtFileDialogURLSelector::SvtFileDialogURLSelector( vcl::Window* _pParent, SvtFileDialog* _pDlg, WinBits nBits, sal_uInt16 _nButtonId ) :MenuButton ( _pParent, nBits ) ,m_pDlg ( _pDlg ) @@ -129,7 +126,6 @@ void SvtFileDialogURLSelector::Activate() //= SvtUpButton_Impl - SvtUpButton_Impl::SvtUpButton_Impl( vcl::Window *pParent, SvtFileDialog* pDlg, WinBits nBits ) :SvtFileDialogURLSelector( pParent, pDlg, nBits, IMG_FILEDLG_BTN_UP ) { @@ -244,7 +240,6 @@ SvtExpFileDlg_Impl::SvtExpFileDlg_Impl( WinBits ) : } - SvtExpFileDlg_Impl::~SvtExpFileDlg_Impl() { _pBtnUp.disposeAndClear(); @@ -253,7 +248,6 @@ SvtExpFileDlg_Impl::~SvtExpFileDlg_Impl() } - void SvtExpFileDlg_Impl::SetStandardDir( const OUString& _rDir ) { _aStdDir = _rDir; @@ -304,7 +298,6 @@ void SvtExpFileDlg_Impl::InsertFilterListEntry( const SvtFileDialogFilter_Impl* } - void SvtExpFileDlg_Impl::InitFilterList( ) { // clear the current list diff --git a/fpicker/source/office/pickercallbacks.hxx b/fpicker/source/office/pickercallbacks.hxx index 84e2ba7e6fd2..115d6fb83017 100644 --- a/fpicker/source/office/pickercallbacks.hxx +++ b/fpicker/source/office/pickercallbacks.hxx @@ -30,7 +30,6 @@ namespace svt { - class IFilePickerController { public: diff --git a/fpicker/source/win32/filepicker/FPentry.cxx b/fpicker/source/win32/filepicker/FPentry.cxx index 2ee969cb63da..99fe074e7a20 100644 --- a/fpicker/source/win32/filepicker/FPentry.cxx +++ b/fpicker/source/win32/filepicker/FPentry.cxx @@ -47,9 +47,6 @@ using ::com::sun::star::ui::dialogs::XFilePicker; using ::com::sun::star::ui::dialogs::XFilePicker2; - - - static Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& rServiceManager ) { diff --git a/fpicker/source/win32/filepicker/FileOpenDlg.cxx b/fpicker/source/win32/filepicker/FileOpenDlg.cxx index 924687980bd2..cb57f276b0b5 100644 --- a/fpicker/source/win32/filepicker/FileOpenDlg.cxx +++ b/fpicker/source/win32/filepicker/FileOpenDlg.cxx @@ -66,9 +66,6 @@ namespace /* private */ }; - - - CFileOpenDialog::CFileOpenDialog( bool bFileOpenDialog, sal_uInt32 dwFlags, @@ -127,17 +124,11 @@ CFileOpenDialog::CFileOpenDialog( } - - - CFileOpenDialog::~CFileOpenDialog() { } - - - void SAL_CALL CFileOpenDialog::setTitle(const OUString& aTitle) { m_dialogTitle = aTitle; @@ -145,9 +136,6 @@ void SAL_CALL CFileOpenDialog::setTitle(const OUString& aTitle) } - - - void CFileOpenDialog::setFilter(const OUString& aFilter) { // Format is like @@ -160,9 +148,6 @@ void CFileOpenDialog::setFilter(const OUString& aFilter) } - - - bool CFileOpenDialog::setFilterIndex(sal_uInt32 aIndex) { OSL_ASSERT(aIndex > 0); @@ -171,18 +156,12 @@ bool CFileOpenDialog::setFilterIndex(sal_uInt32 aIndex) } - - - sal_uInt32 CFileOpenDialog::getSelectedFilterIndex() const { return m_ofn.nFilterIndex; } - - - void SAL_CALL CFileOpenDialog::setDefaultName(const OUString& aName) { m_fileNameBuffer.setLength(0); @@ -191,9 +170,6 @@ void SAL_CALL CFileOpenDialog::setDefaultName(const OUString& aName) } - - - void SAL_CALL CFileOpenDialog::setDisplayDirectory(const OUString& aDirectory) { m_displayDirectory = aDirectory; @@ -201,18 +177,12 @@ void SAL_CALL CFileOpenDialog::setDisplayDirectory(const OUString& aDirectory) } - - - OUString SAL_CALL CFileOpenDialog::getLastDisplayDirectory() const { return m_displayDirectory; } - - - OUString SAL_CALL CFileOpenDialog::getFullFileName() const { return OUString(m_fileNameBuffer.getStr(), @@ -220,18 +190,12 @@ OUString SAL_CALL CFileOpenDialog::getFullFileName() const } - - - OUString SAL_CALL CFileOpenDialog::getFileName() const { return OUString(m_fileTitleBuffer.getStr()); } - - - OUString CFileOpenDialog::getFileExtension() { if (m_ofn.nFileExtension) @@ -242,9 +206,6 @@ OUString CFileOpenDialog::getFileExtension() } - - - void CFileOpenDialog::setDefaultFileExtension(const OUString& aExtension) { m_defaultExtension = aExtension; @@ -252,9 +213,6 @@ void CFileOpenDialog::setDefaultFileExtension(const OUString& aExtension) } - - - void SAL_CALL CFileOpenDialog::setMultiSelectionMode(bool bMode) { if (bMode) @@ -264,18 +222,12 @@ void SAL_CALL CFileOpenDialog::setMultiSelectionMode(bool bMode) } - - - bool SAL_CALL CFileOpenDialog::getMultiSelectionMode() const { return ((m_ofn.Flags & OFN_ALLOWMULTISELECT) > 0); } - - - sal_Int16 SAL_CALL CFileOpenDialog::doModal() { sal_Int16 nRC = -1; @@ -305,27 +257,18 @@ sal_Int16 SAL_CALL CFileOpenDialog::doModal() } - - - sal_uInt32 SAL_CALL CFileOpenDialog::getLastDialogError() const { return CommDlgExtendedError(); } - - - bool SAL_CALL CFileOpenDialog::preModal() { return sal_True; } - - - void SAL_CALL CFileOpenDialog::postModal(sal_Int16 nDialogResult) { OSL_ASSERT((-1 <= nDialogResult) && (nDialogResult <= 1)); @@ -340,9 +283,6 @@ void SAL_CALL CFileOpenDialog::postModal(sal_Int16 nDialogResult) } - - - OUString SAL_CALL CFileOpenDialog::getCurrentFilePath() const { OSL_ASSERT(IsWindow(m_hwndFileOpenDlg)); @@ -362,9 +302,6 @@ OUString SAL_CALL CFileOpenDialog::getCurrentFilePath() const } - - - OUString SAL_CALL CFileOpenDialog::getCurrentFolderPath() const { OSL_ASSERT(IsWindow(m_hwndFileOpenDlg)); @@ -384,9 +321,6 @@ OUString SAL_CALL CFileOpenDialog::getCurrentFolderPath() const } - - - OUString SAL_CALL CFileOpenDialog::getCurrentFileName() const { OSL_ASSERT(IsWindow(m_hwndFileOpenDlg)); @@ -406,77 +340,50 @@ OUString SAL_CALL CFileOpenDialog::getCurrentFileName() const } - - - sal_uInt32 SAL_CALL CFileOpenDialog::onShareViolation(const OUString&) { return 0; } - - - sal_uInt32 SAL_CALL CFileOpenDialog::onFileOk() { return 0; } - - - void SAL_CALL CFileOpenDialog::onSelChanged(HWND) { } - - - void SAL_CALL CFileOpenDialog::onHelp() { } - - - void SAL_CALL CFileOpenDialog::onInitDone() { centerPositionToParent(); } - - - void SAL_CALL CFileOpenDialog::onFolderChanged() { } - - - void SAL_CALL CFileOpenDialog::onTypeChanged(sal_uInt32) { } - - - sal_uInt32 SAL_CALL CFileOpenDialog::onCtrlCommand(HWND, sal_uInt16, sal_uInt16) { return 0; } - - - sal_uInt32 SAL_CALL CFileOpenDialog::onWMNotify( HWND, LPOFNOTIFY lpOfNotify ) { switch(lpOfNotify->hdr.code) @@ -513,9 +420,6 @@ sal_uInt32 SAL_CALL CFileOpenDialog::onWMNotify( HWND, LPOFNOTIFY lpOfNotify ) } - - - void SAL_CALL CFileOpenDialog::handleInitDialog(HWND hwndDlg, HWND hwndChild) { m_hwndFileOpenDlg = hwndDlg; @@ -528,9 +432,6 @@ void SAL_CALL CFileOpenDialog::handleInitDialog(HWND hwndDlg, HWND hwndChild) } - - - UINT_PTR CALLBACK CFileOpenDialog::ofnHookProc( HWND hChildDlg, UINT uiMsg, WPARAM wParam, LPARAM lParam) { @@ -579,9 +480,6 @@ UINT_PTR CALLBACK CFileOpenDialog::ofnHookProc( } - - - LRESULT CALLBACK CFileOpenDialog::BaseDlgProc( HWND hWnd, UINT wMessage, WPARAM wParam, LPARAM lParam) { @@ -608,9 +506,6 @@ LRESULT CALLBACK CFileOpenDialog::BaseDlgProc( } - - - CFileOpenDialog* SAL_CALL CFileOpenDialog::getCurrentInstance(HWND hwnd) { OSL_ASSERT(IsWindow( hwnd)); @@ -619,9 +514,6 @@ CFileOpenDialog* SAL_CALL CFileOpenDialog::getCurrentInstance(HWND hwnd) } - - - void SAL_CALL CFileOpenDialog::centerPositionToParent() const { OSL_PRECOND(IsWindow(m_hwndFileOpenDlg), "no dialog window, call method only after or in onInitDone"); diff --git a/fpicker/source/win32/filepicker/FileOpenDlg.hxx b/fpicker/source/win32/filepicker/FileOpenDlg.hxx index 8f532b363890..6d2d6553e50d 100644 --- a/fpicker/source/win32/filepicker/FileOpenDlg.hxx +++ b/fpicker/source/win32/filepicker/FileOpenDlg.hxx @@ -113,7 +113,6 @@ typedef _LPOPENFILENAMEA _LPOPENFILENAME; #endif // (_WIN32_WINNT >= 0x0500) - // A simple wrapper class around the Win32 GetOpenFileName API. // This class is not thread-safe and only one instance at a // time is allowed diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx index 729142919e27..bd6083ffca59 100644 --- a/fpicker/source/win32/filepicker/FilePicker.cxx +++ b/fpicker/source/win32/filepicker/FilePicker.cxx @@ -64,9 +64,6 @@ namespace } - - - CFilePicker::CFilePicker( const uno::Reference<lang::XMultiServiceFactory>& xServiceMgr) : CFilePicker_Base(m_rbHelperMtx), m_xServiceMgr(xServiceMgr), @@ -102,9 +99,6 @@ void SAL_CALL CFilePicker::addFilePickerListener(const uno::Reference<XFilePicke } - - - void SAL_CALL CFilePicker::removeFilePickerListener(const uno::Reference<XFilePickerListener>& xListener ) throw(uno::RuntimeException) { @@ -129,9 +123,6 @@ void SAL_CALL CFilePicker::disposing(const lang::EventObject& aEvent) throw(uno: } - - - void SAL_CALL CFilePicker::fileSelectionChanged(FilePickerEvent aEvent) { aEvent.Source.set(static_cast<XFilePickerNotifier*>(this)); @@ -140,9 +131,6 @@ void SAL_CALL CFilePicker::fileSelectionChanged(FilePickerEvent aEvent) } - - - void SAL_CALL CFilePicker::directoryChanged(FilePickerEvent aEvent) { aEvent.Source.set(static_cast<XFilePickerNotifier*>(this)); @@ -151,9 +139,6 @@ void SAL_CALL CFilePicker::directoryChanged(FilePickerEvent aEvent) } - - - void SAL_CALL CFilePicker::controlStateChanged(FilePickerEvent aEvent) { aEvent.Source.set(static_cast<XFilePickerNotifier*>(this)); @@ -162,9 +147,6 @@ void SAL_CALL CFilePicker::controlStateChanged(FilePickerEvent aEvent) } - - - void SAL_CALL CFilePicker::dialogSizeChanged() { m_aAsyncEventNotifier.notifyEvent( @@ -218,36 +200,24 @@ OUString SAL_CALL CFilePicker::helpRequested(FilePickerEvent aEvent) const } - - - bool CFilePicker::startupEventNotification(bool bStartupSuspended) { return m_aAsyncEventNotifier.startup(bStartupSuspended); } - - - void CFilePicker::shutdownEventNotification() { m_aAsyncEventNotifier.shutdown(); } - - - void CFilePicker::suspendEventNotification() { m_aAsyncEventNotifier.suspend(); } - - - void CFilePicker::resumeEventNotification() { m_aAsyncEventNotifier.resume(); @@ -265,9 +235,6 @@ void SAL_CALL CFilePicker::setMultiSelectionMode(sal_Bool bMode) throw(uno::Runt } - - - void SAL_CALL CFilePicker::setTitle(const OUString& aTitle) throw(uno::RuntimeException) { OSL_ASSERT(0 != m_pImpl.get()); @@ -276,9 +243,6 @@ void SAL_CALL CFilePicker::setTitle(const OUString& aTitle) throw(uno::RuntimeEx } - - - void SAL_CALL CFilePicker::appendFilter(const OUString& aTitle, const OUString& aFilter) throw(lang::IllegalArgumentException, uno::RuntimeException) { @@ -288,9 +252,6 @@ void SAL_CALL CFilePicker::appendFilter(const OUString& aTitle, const OUString& } - - - void SAL_CALL CFilePicker::setCurrentFilter(const OUString& aTitle) throw(lang::IllegalArgumentException, uno::RuntimeException) { @@ -300,9 +261,6 @@ void SAL_CALL CFilePicker::setCurrentFilter(const OUString& aTitle) } - - - OUString SAL_CALL CFilePicker::getCurrentFilter() throw(uno::RuntimeException) { OSL_ASSERT(0 != m_pImpl.get()); @@ -311,9 +269,6 @@ OUString SAL_CALL CFilePicker::getCurrentFilter() throw(uno::RuntimeException) } - - - void SAL_CALL CFilePicker::appendFilterGroup(const OUString& sGroupTitle, const uno::Sequence<beans::StringPair>& aFilters) throw (lang::IllegalArgumentException, uno::RuntimeException) { @@ -323,9 +278,6 @@ void SAL_CALL CFilePicker::appendFilterGroup(const OUString& sGroupTitle, const } - - - void SAL_CALL CFilePicker::setDefaultName(const OUString& aName) throw(uno::RuntimeException) { @@ -335,9 +287,6 @@ void SAL_CALL CFilePicker::setDefaultName(const OUString& aName) } - - - void SAL_CALL CFilePicker::setDisplayDirectory(const OUString& aDirectory) throw(lang::IllegalArgumentException, uno::RuntimeException) { @@ -347,9 +296,6 @@ void SAL_CALL CFilePicker::setDisplayDirectory(const OUString& aDirectory) } - - - OUString SAL_CALL CFilePicker::getDisplayDirectory() throw(uno::RuntimeException) { OSL_ASSERT(0 != m_pImpl.get()); @@ -358,9 +304,6 @@ OUString SAL_CALL CFilePicker::getDisplayDirectory() throw(uno::RuntimeException } - - - uno::Sequence<OUString> SAL_CALL CFilePicker::getFiles() throw(uno::RuntimeException) { OSL_ASSERT(0 != m_pImpl.get()); @@ -369,8 +312,6 @@ uno::Sequence<OUString> SAL_CALL CFilePicker::getFiles() throw(uno::RuntimeExcep } - - uno::Sequence< OUString > SAL_CALL CFilePicker::getSelectedFiles() throw (uno::RuntimeException, std::exception) { OSL_ASSERT(0 != m_pImpl.get()); @@ -409,9 +350,6 @@ uno::Sequence< OUString > SAL_CALL CFilePicker::getSelectedFiles() throw (uno::R } - - - sal_Int16 SAL_CALL CFilePicker::execute() throw(uno::RuntimeException) { OSL_ASSERT(0 != m_pImpl.get()); @@ -454,9 +392,6 @@ void SAL_CALL CFilePicker::setValue(sal_Int16 aControlId, sal_Int16 aControlActi } - - - uno::Any SAL_CALL CFilePicker::getValue(sal_Int16 aControlId, sal_Int16 aControlAction) throw(uno::RuntimeException) { @@ -467,9 +402,6 @@ uno::Any SAL_CALL CFilePicker::getValue(sal_Int16 aControlId, sal_Int16 aControl } - - - void SAL_CALL CFilePicker::enableControl(sal_Int16 aControlId, sal_Bool bEnable) throw(uno::RuntimeException) { @@ -480,9 +412,6 @@ throw(uno::RuntimeException) } - - - void SAL_CALL CFilePicker::setLabel(sal_Int16 aControlId, const OUString& aLabel) throw (uno::RuntimeException) { @@ -493,9 +422,6 @@ void SAL_CALL CFilePicker::setLabel(sal_Int16 aControlId, const OUString& aLabel } - - - OUString SAL_CALL CFilePicker::getLabel(sal_Int16 aControlId) throw (uno::RuntimeException) { @@ -506,9 +432,6 @@ OUString SAL_CALL CFilePicker::getLabel(sal_Int16 aControlId) } - - - uno::Sequence<sal_Int16> SAL_CALL CFilePicker::getSupportedImageFormats() throw (uno::RuntimeException) { OSL_ASSERT(0 != m_pImpl.get()); @@ -518,9 +441,6 @@ uno::Sequence<sal_Int16> SAL_CALL CFilePicker::getSupportedImageFormats() throw } - - - sal_Int32 SAL_CALL CFilePicker::getTargetColorDepth() throw (uno::RuntimeException) { OSL_ASSERT(0 != m_pImpl.get()); @@ -530,9 +450,6 @@ sal_Int32 SAL_CALL CFilePicker::getTargetColorDepth() throw (uno::RuntimeExcepti } - - - sal_Int32 SAL_CALL CFilePicker::getAvailableWidth() throw (uno::RuntimeException) { OSL_ASSERT(0 != m_pImpl.get()); @@ -542,9 +459,6 @@ sal_Int32 SAL_CALL CFilePicker::getAvailableWidth() throw (uno::RuntimeException } - - - sal_Int32 SAL_CALL CFilePicker::getAvailableHeight() throw (uno::RuntimeException) { OSL_ASSERT(0 != m_pImpl.get()); @@ -554,9 +468,6 @@ sal_Int32 SAL_CALL CFilePicker::getAvailableHeight() throw (uno::RuntimeExceptio } - - - void SAL_CALL CFilePicker::setImage(sal_Int16 aImageFormat, const uno::Any& aImage) throw (lang::IllegalArgumentException, uno::RuntimeException) { @@ -567,9 +478,6 @@ void SAL_CALL CFilePicker::setImage(sal_Int16 aImageFormat, const uno::Any& aIma } - - - sal_Bool SAL_CALL CFilePicker::setShowState(sal_Bool bShowState) throw (uno::RuntimeException) { OSL_ASSERT(0 != m_pImpl.get()); @@ -579,9 +487,6 @@ sal_Bool SAL_CALL CFilePicker::setShowState(sal_Bool bShowState) throw (uno::Run } - - - sal_Bool SAL_CALL CFilePicker::getShowState() throw (uno::RuntimeException) { OSL_ASSERT(0 != m_pImpl.get()); @@ -591,9 +496,6 @@ sal_Bool SAL_CALL CFilePicker::getShowState() throw (uno::RuntimeException) } - - - void SAL_CALL CFilePicker::initialize(const uno::Sequence<uno::Any>& aArguments) throw( uno::Exception, uno::RuntimeException) { @@ -692,9 +594,6 @@ void SAL_CALL CFilePicker::initialize(const uno::Sequence<uno::Any>& aArguments) } - - - void SAL_CALL CFilePicker::cancel() throw(uno::RuntimeException) { diff --git a/fpicker/source/win32/filepicker/FilterContainer.cxx b/fpicker/source/win32/filepicker/FilterContainer.cxx index 21a6e0e181a8..a76afac50cc8 100644 --- a/fpicker/source/win32/filepicker/FilterContainer.cxx +++ b/fpicker/source/win32/filepicker/FilterContainer.cxx @@ -35,8 +35,6 @@ // namespace directives - - // ctor @@ -139,9 +137,6 @@ sal_Bool SAL_CALL CFilterContainer::getFilter( const OUString& aName, OUString& } - - - sal_Bool SAL_CALL CFilterContainer::getFilter( sal_Int32 aIndex, OUString& theFilter ) const { sal_Bool bRet = sal_True; @@ -160,9 +155,6 @@ sal_Bool SAL_CALL CFilterContainer::getFilter( sal_Int32 aIndex, OUString& theFi } - - - sal_Int32 SAL_CALL CFilterContainer::getFilterPos( const OUString& aName ) const { return getFilterTagPos( aName ); @@ -229,9 +221,6 @@ OUString SAL_CALL CFilterContainer::getCurrentFilter() const } - - - // calculates the length of a '\0' separated filter, that means // length of the name + '\0' + length of the filter string + // a trailing '\0' @@ -262,9 +251,6 @@ static sal_uInt32 _getTotalFilterLength( CFilterContainer& aFilterContainer ) } - - - inline void _wcsmemcpy( sal_Unicode* pDest, const sal_Unicode* pSrc, sal_uInt32 nLength ) { diff --git a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx b/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx index 56ac6b1d54a1..ae08d3633c2d 100644 --- a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx +++ b/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx @@ -36,7 +36,6 @@ namespace vista{ // types, const etcpp. - /** todo document me */ class IVistaFilePickerInternalNotify diff --git a/fpicker/source/win32/filepicker/PreviewCtrl.cxx b/fpicker/source/win32/filepicker/PreviewCtrl.cxx index c3a30520b56d..0fbb50cbd91f 100644 --- a/fpicker/source/win32/filepicker/PreviewCtrl.cxx +++ b/fpicker/source/win32/filepicker/PreviewCtrl.cxx @@ -61,9 +61,6 @@ namespace // private }; - - - inline sal_Int32 SubDiv( sal_Int32 nNumber, sal_Int32 nMinuend, sal_Int32 nDenominator ) { @@ -81,9 +78,6 @@ namespace // private } - - - inline sal_uInt32 _getWidthRect( const RECT& aRect ) { @@ -91,9 +85,6 @@ namespace // private } - - - inline sal_uInt32 _getHeightRect( const RECT& aRect ) { @@ -183,7 +174,6 @@ namespace // private } // end namespace - // to ensure only one instance (singleton) @@ -219,9 +209,6 @@ CFilePreview* CFilePreview::createInstance( } - - - CFilePreview::CFilePreview( HWND aParent, POINT ulCorner, @@ -273,9 +260,6 @@ CFilePreview::CFilePreview( } - - - CFilePreview::~CFilePreview( ) { // unregister preview window class @@ -366,9 +350,6 @@ sal_Bool SAL_CALL CFilePreview::getPos( POINT& ulCorner ) const } - - - void SAL_CALL CFilePreview::enable( sal_Bool bEnable ) { m_bEnabled = bEnable; @@ -426,9 +407,6 @@ sal_Bool SAL_CALL CFilePreview::update( const OUString& aFileName ) } - - - void SAL_CALL CFilePreview::onPaint( HWND hWnd, HDC hDC ) { OSL_PRECOND( IsWindow( m_hwnd ), "Preview window not initialized" ); @@ -479,9 +457,6 @@ void SAL_CALL CFilePreview::onPaint( HWND hWnd, HDC hDC ) } - - - sal_Bool CFilePreview::loadFile( const OUString& aFileName ) { HANDLE hFile = 0; @@ -550,9 +525,6 @@ CLEANUP_AND_EXIT: } - - - LRESULT CALLBACK CFilePreview::WndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) { @@ -591,5 +563,4 @@ LRESULT CALLBACK CFilePreview::WndProc( } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx index 47f649c548e8..3588c0560380 100644 --- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx @@ -324,9 +324,6 @@ void SAL_CALL VistaFilePicker::setValue( ::sal_Int16 nControlId , } - - - css::uno::Any SAL_CALL VistaFilePicker::getValue(::sal_Int16 nControlId , ::sal_Int16 nControlAction) throw(css::uno::RuntimeException) @@ -342,9 +339,6 @@ css::uno::Any SAL_CALL VistaFilePicker::getValue(::sal_Int16 nControlId , } - - - void SAL_CALL VistaFilePicker::enableControl(::sal_Int16 nControlId, sal_Bool bEnable ) throw(css::uno::RuntimeException) @@ -358,9 +352,6 @@ void SAL_CALL VistaFilePicker::enableControl(::sal_Int16 nControlId, } - - - void SAL_CALL VistaFilePicker::setLabel( ::sal_Int16 nControlId, const OUString& sLabel ) throw (css::uno::RuntimeException) @@ -374,9 +365,6 @@ void SAL_CALL VistaFilePicker::setLabel( ::sal_Int16 nControlId, } - - - OUString SAL_CALL VistaFilePicker::getLabel(::sal_Int16 nControlId) throw (css::uno::RuntimeException) { @@ -390,9 +378,6 @@ OUString SAL_CALL VistaFilePicker::getLabel(::sal_Int16 nControlId) } - - - css::uno::Sequence< ::sal_Int16 > SAL_CALL VistaFilePicker::getSupportedImageFormats() throw (css::uno::RuntimeException) { @@ -400,9 +385,6 @@ css::uno::Sequence< ::sal_Int16 > SAL_CALL VistaFilePicker::getSupportedImageFor } - - - sal_Int32 SAL_CALL VistaFilePicker::getTargetColorDepth() throw (css::uno::RuntimeException) { @@ -410,9 +392,6 @@ sal_Int32 SAL_CALL VistaFilePicker::getTargetColorDepth() } - - - sal_Int32 SAL_CALL VistaFilePicker::getAvailableWidth() throw (css::uno::RuntimeException) { @@ -420,9 +399,6 @@ sal_Int32 SAL_CALL VistaFilePicker::getAvailableWidth() } - - - sal_Int32 SAL_CALL VistaFilePicker::getAvailableHeight() throw (css::uno::RuntimeException) { @@ -430,9 +406,6 @@ sal_Int32 SAL_CALL VistaFilePicker::getAvailableHeight() } - - - void SAL_CALL VistaFilePicker::setImage( sal_Int16 /*nImageFormat*/, const css::uno::Any& /*aImage */) throw (css::lang::IllegalArgumentException, @@ -441,9 +414,6 @@ void SAL_CALL VistaFilePicker::setImage( sal_Int16 /*nImageFormat*/, } - - - sal_Bool SAL_CALL VistaFilePicker::setShowState(sal_Bool /*bShowState*/) throw (css::uno::RuntimeException) { @@ -451,9 +421,6 @@ sal_Bool SAL_CALL VistaFilePicker::setShowState(sal_Bool /*bShowState*/) } - - - sal_Bool SAL_CALL VistaFilePicker::getShowState() throw (css::uno::RuntimeException) { @@ -461,9 +428,6 @@ sal_Bool SAL_CALL VistaFilePicker::getShowState() } - - - void SAL_CALL VistaFilePicker::initialize(const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException) @@ -585,9 +549,6 @@ void SAL_CALL VistaFilePicker::initialize(const css::uno::Sequence< css::uno::An } - - - void SAL_CALL VistaFilePicker::cancel() throw(css::uno::RuntimeException) { diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx index bb63b55b0050..e07c34e2a84c 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx @@ -48,7 +48,6 @@ namespace vista{ // types, const etcpp. - /** todo document me */ class VistaFilePickerEventHandler : public ::cppu::BaseMutex @@ -127,7 +126,6 @@ class VistaFilePickerEventHandler : public ::cppu::BaseMutex // native interface - /** start listening for file picker events on the given file open dialog COM object. * * The broadcaster will be cached internally so deregistration will be easy. diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx index 7194bc9ed6bb..9e24e9e352ed 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx @@ -81,7 +81,6 @@ namespace vista{ // types, const etcpp. - static const ::sal_Int16 INVALID_CONTROL_ID = -1; static const ::sal_Int16 INVALID_CONTROL_ACTION = -1; diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx index f6714cad191e..5a82692af2f2 100644 --- a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx +++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx @@ -145,9 +145,6 @@ OUString CWinFileOpenImpl::getDisplayDirectory() throw(uno::RuntimeException) } - - - void SAL_CALL CWinFileOpenImpl::setDefaultName(const OUString& aName) throw( IllegalArgumentException, uno::RuntimeException ) { @@ -261,9 +258,6 @@ OUString SAL_CALL CWinFileOpenImpl::getCurrentFilter() throw(uno::RuntimeExcepti } - - - inline void SAL_CALL CWinFileOpenImpl::appendFilterGroupSeparator() { m_filterContainer->addFilter(FILTER_SEPARATOR, ALL_FILES_WILDCARD, ALLOW_DUPLICATES); @@ -347,9 +341,6 @@ void SAL_CALL CWinFileOpenImpl::enableControl(sal_Int16 ControlID, sal_Bool bEna } - - - void SAL_CALL CWinFileOpenImpl::setLabel( sal_Int16 aControlId, const OUString& aLabel ) throw (uno::RuntimeException) { @@ -359,9 +350,6 @@ void SAL_CALL CWinFileOpenImpl::setLabel( sal_Int16 aControlId, const OUString& } - - - OUString SAL_CALL CWinFileOpenImpl::getLabel( sal_Int16 aControlId ) throw (uno::RuntimeException) { @@ -373,9 +361,6 @@ OUString SAL_CALL CWinFileOpenImpl::getLabel( sal_Int16 aControlId ) } - - - uno::Sequence<sal_Int16> SAL_CALL CWinFileOpenImpl::getSupportedImageFormats() throw (uno::RuntimeException) { @@ -383,9 +368,6 @@ uno::Sequence<sal_Int16> SAL_CALL CWinFileOpenImpl::getSupportedImageFormats() } - - - sal_Int32 SAL_CALL CWinFileOpenImpl::getTargetColorDepth() throw (uno::RuntimeException) { @@ -393,9 +375,6 @@ sal_Int32 SAL_CALL CWinFileOpenImpl::getTargetColorDepth() } - - - sal_Int32 SAL_CALL CWinFileOpenImpl::getAvailableWidth() throw (uno::RuntimeException) { @@ -403,9 +382,6 @@ sal_Int32 SAL_CALL CWinFileOpenImpl::getAvailableWidth() } - - - sal_Int32 SAL_CALL CWinFileOpenImpl::getAvailableHeight() throw (uno::RuntimeException) { @@ -413,9 +389,6 @@ sal_Int32 SAL_CALL CWinFileOpenImpl::getAvailableHeight() } - - - void SAL_CALL CWinFileOpenImpl::setImage(sal_Int16 aImageFormat, const uno::Any& aImage) throw (IllegalArgumentException, uno::RuntimeException) { @@ -423,9 +396,6 @@ void SAL_CALL CWinFileOpenImpl::setImage(sal_Int16 aImageFormat, const uno::Any& } - - - sal_Bool SAL_CALL CWinFileOpenImpl::setShowState(sal_Bool bShowState) throw (uno::RuntimeException) { @@ -433,9 +403,6 @@ sal_Bool SAL_CALL CWinFileOpenImpl::setShowState(sal_Bool bShowState) } - - - sal_Bool SAL_CALL CWinFileOpenImpl::getShowState() throw (uno::RuntimeException) { @@ -443,9 +410,6 @@ sal_Bool SAL_CALL CWinFileOpenImpl::getShowState() } - - - void SAL_CALL CWinFileOpenImpl::cancel() { if (IsWindow(m_hwndFileOpenDlg)) @@ -478,9 +442,6 @@ sal_Int16 SAL_CALL CWinFileOpenImpl::getFocused() } - - - inline sal_Bool SAL_CALL CWinFileOpenImpl::IsCustomControlHelpRequested(LPHELPINFO lphi) const { return ((lphi->iCtrlId != IDOK) && (lphi->iCtrlId != IDCANCEL) && (lphi->iCtrlId < ctlFirst)); @@ -560,9 +521,6 @@ LRESULT CALLBACK CWinFileOpenImpl::SubClassFunc( } - - - void SAL_CALL CWinFileOpenImpl::InitControlLabel(HWND hWnd) { @@ -596,9 +554,6 @@ void SAL_CALL CWinFileOpenImpl::InitCustomControlContainer(HWND hCustomControl) } - - - void SAL_CALL CWinFileOpenImpl::CacheControlState(HWND hWnd) { OSL_ASSERT(m_FilePickerState && m_NonExecuteFilePickerState); @@ -606,9 +561,6 @@ void SAL_CALL CWinFileOpenImpl::CacheControlState(HWND hWnd) } - - - BOOL CALLBACK CWinFileOpenImpl::EnumChildWndProc(HWND hWnd, LPARAM lParam) { EnumParam* enumParam = (EnumParam*)lParam; @@ -638,9 +590,6 @@ BOOL CALLBACK CWinFileOpenImpl::EnumChildWndProc(HWND hWnd, LPARAM lParam) } - - - sal_uInt32 SAL_CALL CWinFileOpenImpl::onFileOk() { m_NonExecuteFilePickerState->reset(); @@ -656,9 +605,6 @@ sal_uInt32 SAL_CALL CWinFileOpenImpl::onFileOk() } - - - void SAL_CALL CWinFileOpenImpl::onSelChanged(HWND) { // the windows file open dialog sends an initial @@ -793,9 +739,6 @@ void SAL_CALL CWinFileOpenImpl::onInitDone() } - - - void SAL_CALL CWinFileOpenImpl::onFolderChanged() { FilePickerEvent evt; @@ -803,9 +746,6 @@ void SAL_CALL CWinFileOpenImpl::onFolderChanged() } - - - void SAL_CALL CWinFileOpenImpl::onTypeChanged(sal_uInt32) { SetDefaultExtension(); @@ -835,9 +775,6 @@ sal_uInt32 SAL_CALL CWinFileOpenImpl::onCtrlCommand( } - - - void CWinFileOpenImpl::onWMSize() { m_Preview->notifyParentSizeChanged(); @@ -846,27 +783,18 @@ void CWinFileOpenImpl::onWMSize() } - - - void CWinFileOpenImpl::onWMShow(sal_Bool bShow) { m_Preview->notifyParentShow(bShow); } - - - void CWinFileOpenImpl::onWMWindowPosChanged() { m_Preview->notifyParentWindowPosChanged(); } - - - void CWinFileOpenImpl::onCustomControlHelpRequest(LPHELPINFO lphi) { FilePickerEvent evt; @@ -884,9 +812,6 @@ void CWinFileOpenImpl::onCustomControlHelpRequest(LPHELPINFO lphi) } - - - void SAL_CALL CWinFileOpenImpl::onInitDialog(HWND hwndDlg) { // subclass the dialog window @@ -925,9 +850,6 @@ void CWinFileOpenImpl::postModal(sal_Int16 nDialogResult) } - - - void SAL_CALL CWinFileOpenImpl::SetDefaultExtension() { HWND hwndChkSaveWithExt = GetDlgItem(m_hwndFileOpenDlgChild, 100); @@ -975,9 +897,6 @@ void SAL_CALL CWinFileOpenImpl::SetDefaultExtension() } - - - void SAL_CALL CWinFileOpenImpl::InitialSetDefaultName() { // manually setting the file name that appears diff --git a/fpicker/source/win32/filepicker/asynceventnotifier.cxx b/fpicker/source/win32/filepicker/asynceventnotifier.cxx index 8ec54626006f..08b61f8a181c 100644 --- a/fpicker/source/win32/filepicker/asynceventnotifier.cxx +++ b/fpicker/source/win32/filepicker/asynceventnotifier.cxx @@ -28,16 +28,10 @@ #include "SolarMutex.hxx" - - - using namespace com::sun::star; using ::com::sun::star::ui::dialogs::XFilePickerListener; - - - CAsyncEventNotifier::CAsyncEventNotifier(cppu::OBroadcastHelper& rBroadcastHelper) : m_hThread(0), m_bRun(false), @@ -60,9 +54,6 @@ CAsyncEventNotifier::CAsyncEventNotifier(cppu::OBroadcastHelper& rBroadcastHelpe } - - - CAsyncEventNotifier::~CAsyncEventNotifier() { OSL_ENSURE(0 == m_hThread,"Thread not stopped, destroying this instance leads to desaster"); @@ -72,9 +63,6 @@ CAsyncEventNotifier::~CAsyncEventNotifier() } - - - void SAL_CALL CAsyncEventNotifier::addListener(const uno::Type& aType , const uno::Reference< uno::XInterface >& xListener) { @@ -88,9 +76,6 @@ void SAL_CALL CAsyncEventNotifier::addListener(const uno::Type& } - - - void SAL_CALL CAsyncEventNotifier::removeListener(const uno::Type& aType , const uno::Reference< uno::XInterface >& xListener) { @@ -101,9 +86,6 @@ void SAL_CALL CAsyncEventNotifier::removeListener(const uno::Type& } - - - bool SAL_CALL CAsyncEventNotifier::startup(bool bCreateSuspended) { osl::MutexGuard aGuard(m_Mutex); @@ -133,9 +115,6 @@ bool SAL_CALL CAsyncEventNotifier::startup(bool bCreateSuspended) } - - - void SAL_CALL CAsyncEventNotifier::shutdown() { OSL_PRECOND(GetCurrentThreadId() != m_ThreadId, @@ -171,27 +150,18 @@ void SAL_CALL CAsyncEventNotifier::shutdown() } - - - void CAsyncEventNotifier::suspend() { ResetEvent(m_ResumeNotifying); } - - - void CAsyncEventNotifier::resume() { SetEvent(m_ResumeNotifying); } - - - void SAL_CALL CAsyncEventNotifier::notifyEvent(CEventNotification* EventNotification) { osl::MutexGuard aGuard(m_Mutex); @@ -206,9 +176,6 @@ void SAL_CALL CAsyncEventNotifier::notifyEvent(CEventNotification* EventNotifica } - - - size_t SAL_CALL CAsyncEventNotifier::getEventListSize() { osl::MutexGuard aGuard(m_Mutex); @@ -216,9 +183,6 @@ size_t SAL_CALL CAsyncEventNotifier::getEventListSize() } - - - void SAL_CALL CAsyncEventNotifier::resetNotifyEvent() { osl::MutexGuard aGuard(m_Mutex); @@ -227,9 +191,6 @@ void SAL_CALL CAsyncEventNotifier::resetNotifyEvent() } - - - CEventNotification* SAL_CALL CAsyncEventNotifier::getNextEventRecord() { osl::MutexGuard aGuard(m_Mutex); @@ -237,9 +198,6 @@ CEventNotification* SAL_CALL CAsyncEventNotifier::getNextEventRecord() } - - - void SAL_CALL CAsyncEventNotifier::removeNextEventRecord() { osl::MutexGuard aGuard(m_Mutex); @@ -247,9 +205,6 @@ void SAL_CALL CAsyncEventNotifier::removeNextEventRecord() } - - - void SAL_CALL CAsyncEventNotifier::run() { while (m_bRun) @@ -293,9 +248,6 @@ void SAL_CALL CAsyncEventNotifier::run() } - - - unsigned int WINAPI CAsyncEventNotifier::ThreadProc(LPVOID pParam) { osl_setThreadName("fpicker CAsyncEventNotifier::run()"); diff --git a/fpicker/source/win32/filepicker/asynceventnotifier.hxx b/fpicker/source/win32/filepicker/asynceventnotifier.hxx index 335608d2645d..45cf6920e097 100644 --- a/fpicker/source/win32/filepicker/asynceventnotifier.hxx +++ b/fpicker/source/win32/filepicker/asynceventnotifier.hxx @@ -37,9 +37,6 @@ #include "eventnotification.hxx" - - - class CAsyncEventNotifier { public: diff --git a/fpicker/source/win32/filepicker/controlaccess.cxx b/fpicker/source/win32/filepicker/controlaccess.cxx index 79bacd63d709..4dc8950566d1 100644 --- a/fpicker/source/win32/filepicker/controlaccess.cxx +++ b/fpicker/source/win32/filepicker/controlaccess.cxx @@ -30,11 +30,9 @@ // which contains function pointer to control action functions - // namespace directives - namespace // private { @@ -108,9 +106,6 @@ namespace // private }; - - - CTRL_SETVALUE_FUNCTION_T SAL_CALL GetCtrlSetValueFunction( CTRL_SETVALUE_FUNCTION_T* aCtrlSetValueFunctionTable, size_t aTableSize, sal_Int16 aCtrlAction ) { @@ -123,9 +118,6 @@ namespace // private } - - - CTRL_GETVALUE_FUNCTION_T SAL_CALL GetCtrlGetValueFunction( CTRL_GETVALUE_FUNCTION_T* aCtrlGetValueFunctionTable, size_t aTableSize, sal_Int16 aCtrlAction ) { @@ -138,9 +130,6 @@ namespace // private } - - - inline _ENTRY SAL_CALL GetCtrlClassSetValueFunctionTable( CTRL_CLASS aCtrlClass ) { @@ -148,9 +137,6 @@ namespace // private } - - - inline _ENTRY SAL_CALL GetCtrlClassGetValueFunctionTable( CTRL_CLASS aCtrlClass ) { @@ -174,9 +160,6 @@ namespace // private }; // end namespace - - - CTRL_SETVALUE_FUNCTION_T SAL_CALL GetCtrlSetValueFunction( CTRL_CLASS aCtrlClass, sal_Int16 aCtrlAction ) { _ENTRY aEntry = @@ -189,9 +172,6 @@ CTRL_SETVALUE_FUNCTION_T SAL_CALL GetCtrlSetValueFunction( CTRL_CLASS aCtrlClass } - - - CTRL_GETVALUE_FUNCTION_T SAL_CALL GetCtrlGetValueFunction( CTRL_CLASS aCtrlClass, sal_Int16 aCtrlAction ) { _ENTRY aEntry = @@ -204,9 +184,6 @@ CTRL_GETVALUE_FUNCTION_T SAL_CALL GetCtrlGetValueFunction( CTRL_CLASS aCtrlClass } - - - CTRL_CLASS SAL_CALL GetCtrlClass( HWND hwndCtrl ) { CTRL_CLASS aCtrlClass = UNKNOWN; @@ -235,9 +212,6 @@ CTRL_CLASS SAL_CALL GetCtrlClass( HWND hwndCtrl ) } - - - int SAL_CALL CommonFilePickerCtrlIdToWinFileOpenCtrlId( sal_Int16 aControlId ) { if ( aControlId < 0 || aControlId > SIZE_WINDOWS_FILEOPEN_CTRL_IDS ) diff --git a/fpicker/source/win32/filepicker/controlcommand.cxx b/fpicker/source/win32/filepicker/controlcommand.cxx index c68f9a842985..4dc0e5aa8bea 100644 --- a/fpicker/source/win32/filepicker/controlcommand.cxx +++ b/fpicker/source/win32/filepicker/controlcommand.cxx @@ -32,17 +32,11 @@ CControlCommand::CControlCommand( sal_Int16 aControlId ) : } - - - CControlCommand::~CControlCommand( ) { } - - - CControlCommandResult* SAL_CALL CControlCommand::handleRequest( CControlCommandRequest* pRequest ) { // if the command does not support handleRequest, it should at least @@ -68,37 +62,24 @@ CControlCommandResult* SAL_CALL CControlCommand::handleRequest( CControlCommandR } - - - CControlCommand* SAL_CALL CControlCommand::getNextCommand( ) const { return m_NextCommand; } - - - void SAL_CALL CControlCommand::setNextCommand( CControlCommand* nextCommand ) { m_NextCommand = nextCommand; } - - - sal_Int16 SAL_CALL CControlCommand::getControlId( ) const { return m_aControlId; } - - - - CValueControlCommand::CValueControlCommand( sal_Int16 aControlId, sal_Int16 aControlAction, @@ -110,9 +91,6 @@ CValueControlCommand::CValueControlCommand( } - - - void SAL_CALL CValueControlCommand::exec( CFilePickerState* aFilePickerState ) { OSL_ENSURE( aFilePickerState, "empty reference" ); @@ -124,9 +102,6 @@ void SAL_CALL CValueControlCommand::exec( CFilePickerState* aFilePickerState ) } - - - CControlCommandResult* SAL_CALL CValueControlCommand::handleRequest( CControlCommandRequest* aRequest ) { CValueControlCommandRequest* value_request = @@ -158,28 +133,18 @@ CControlCommandResult* SAL_CALL CValueControlCommand::handleRequest( CControlCom } - - - sal_Int16 SAL_CALL CValueControlCommand::getControlAction( ) const { return m_aControlAction; } - - - css::uno::Any SAL_CALL CValueControlCommand::getValue( ) const { return m_aValue; } - - - - CLabelControlCommand::CLabelControlCommand( sal_Int16 aControlId, const OUString& aLabel ) : @@ -189,9 +154,6 @@ CLabelControlCommand::CLabelControlCommand( } - - - void SAL_CALL CLabelControlCommand::exec( CFilePickerState* aFilePickerState ) { OSL_ENSURE( aFilePickerState, "empty reference" ); @@ -200,9 +162,6 @@ void SAL_CALL CLabelControlCommand::exec( CFilePickerState* aFilePickerState ) } - - - CControlCommandResult* SAL_CALL CLabelControlCommand::handleRequest( CControlCommandRequest* aRequest ) { OSL_ENSURE( aRequest, "invalid parameter" ); @@ -235,18 +194,12 @@ CControlCommandResult* SAL_CALL CLabelControlCommand::handleRequest( CControlCom } - - - OUString SAL_CALL CLabelControlCommand::getLabel( ) const { return m_aLabel; } - - - CEnableControlCommand::CEnableControlCommand( sal_Int16 aControlId, sal_Bool bEnable ) : @@ -256,9 +209,6 @@ CEnableControlCommand::CEnableControlCommand( } - - - void SAL_CALL CEnableControlCommand::exec( CFilePickerState* aFilePickerState ) { OSL_ENSURE( aFilePickerState, "empty reference" ); diff --git a/fpicker/source/win32/filepicker/controlcommand.hxx b/fpicker/source/win32/filepicker/controlcommand.hxx index 497286344b22..30a4e0314d72 100644 --- a/fpicker/source/win32/filepicker/controlcommand.hxx +++ b/fpicker/source/win32/filepicker/controlcommand.hxx @@ -25,9 +25,6 @@ #include <rtl/ustring.hxx> - - - class CFilePickerState; class CControlCommandRequest; class CControlCommandResult; @@ -62,9 +59,6 @@ private: }; - - - class CValueControlCommand : public CControlCommand { public: @@ -87,9 +81,6 @@ private: }; - - - class CLabelControlCommand : public CControlCommand { public: @@ -108,9 +99,6 @@ private: }; - - - class CEnableControlCommand : public CControlCommand { public: diff --git a/fpicker/source/win32/filepicker/controlcommandrequest.hxx b/fpicker/source/win32/filepicker/controlcommandrequest.hxx index 6fc95a3027ee..5a7f350061e8 100644 --- a/fpicker/source/win32/filepicker/controlcommandrequest.hxx +++ b/fpicker/source/win32/filepicker/controlcommandrequest.hxx @@ -48,9 +48,6 @@ private: }; - - - class CValueControlCommandRequest : public CControlCommandRequest { public: diff --git a/fpicker/source/win32/filepicker/controlcommandresult.hxx b/fpicker/source/win32/filepicker/controlcommandresult.hxx index cdc09ec8c626..94fa8d6cb4b9 100644 --- a/fpicker/source/win32/filepicker/controlcommandresult.hxx +++ b/fpicker/source/win32/filepicker/controlcommandresult.hxx @@ -50,9 +50,6 @@ private: }; - - - class CValueCommandResult : public CControlCommandResult { public: @@ -72,9 +69,6 @@ private: }; - - - class CLabelCommandResult : public CControlCommandResult { public: diff --git a/fpicker/source/win32/filepicker/customcontrol.cxx b/fpicker/source/win32/filepicker/customcontrol.cxx index 3acba156b608..1e57e63d4b04 100644 --- a/fpicker/source/win32/filepicker/customcontrol.cxx +++ b/fpicker/source/win32/filepicker/customcontrol.cxx @@ -20,35 +20,23 @@ #include "customcontrol.hxx" - - - CCustomControl::~CCustomControl() { } - - - void SAL_CALL CCustomControl::AddControl(CCustomControl*) { // will be implemented by custom control containers } - - - void SAL_CALL CCustomControl::RemoveControl(CCustomControl*) { // will be implemented by custom control containers } - - - void SAL_CALL CCustomControl::RemoveAllControls() { // will be implemented by custom control containers diff --git a/fpicker/source/win32/filepicker/customcontrol.hxx b/fpicker/source/win32/filepicker/customcontrol.hxx index e209172a18ea..a85ab928c8d4 100644 --- a/fpicker/source/win32/filepicker/customcontrol.hxx +++ b/fpicker/source/win32/filepicker/customcontrol.hxx @@ -31,9 +31,6 @@ #endif - - - class CCustomControl { public: diff --git a/fpicker/source/win32/filepicker/customcontrolfactory.cxx b/fpicker/source/win32/filepicker/customcontrolfactory.cxx index 3ec33606134e..a02252f3e9a5 100644 --- a/fpicker/source/win32/filepicker/customcontrolfactory.cxx +++ b/fpicker/source/win32/filepicker/customcontrolfactory.cxx @@ -25,9 +25,6 @@ #include <osl/diagnose.h> - - - CCustomControl* CCustomControlFactory::CreateCustomControl(HWND aControlHandle, HWND aParentHandle) { OSL_PRECOND(IsWindow(aControlHandle),"Invalid control handle"); @@ -67,9 +64,6 @@ CCustomControl* CCustomControlFactory::CreateCustomControl(HWND aControlHandle, } - - - CCustomControl* CCustomControlFactory::CreateCustomControlContainer() { return new CCustomControlContainer(); diff --git a/fpicker/source/win32/filepicker/dialogcustomcontrols.cxx b/fpicker/source/win32/filepicker/dialogcustomcontrols.cxx index 5a3861002eab..65d7686c8553 100644 --- a/fpicker/source/win32/filepicker/dialogcustomcontrols.cxx +++ b/fpicker/source/win32/filepicker/dialogcustomcontrols.cxx @@ -21,9 +21,6 @@ #include <osl/diagnose.h> - - - CDialogCustomControlBase::CDialogCustomControlBase(HWND aControlHandle, HWND aParentHandle) : m_CustomControlHandle(aControlHandle), m_ParentHandle(aParentHandle) @@ -31,9 +28,6 @@ CDialogCustomControlBase::CDialogCustomControlBase(HWND aControlHandle, HWND aPa } - - - void SAL_CALL CDialogCustomControlBase::SetFont(HFONT hFont) { SendMessage( @@ -44,9 +38,6 @@ void SAL_CALL CDialogCustomControlBase::SetFont(HFONT hFont) } - - - void SAL_CALL CDialogCustomControlBase::AlignToBuddy(HWND aBuddyHandle) { OSL_PRECOND(IsWindow(aBuddyHandle),"Invalid buddy window handle"); @@ -80,35 +71,23 @@ void SAL_CALL CDialogCustomControlBase::AlignToBuddy(HWND aBuddyHandle) } - - - CDummyCustomControl::CDummyCustomControl(HWND, HWND) { } - - - void SAL_CALL CDummyCustomControl::Align() { // do nothing } - - - void SAL_CALL CDummyCustomControl::SetFont(HFONT) { // do nothing } - - - CStaticCustomControl::CStaticCustomControl(HWND aControlHandle, HWND aParentHandle) : CDialogCustomControlBase(aControlHandle,aParentHandle) { @@ -125,9 +104,6 @@ void SAL_CALL CStaticCustomControl::Align() } - - - CPushButtonCustomControl::CPushButtonCustomControl(HWND aControlHandle, HWND aParentHandle) : CDialogCustomControlBase(aControlHandle,aParentHandle) { @@ -144,9 +120,6 @@ void SAL_CALL CPushButtonCustomControl::Align() } - - - CComboboxCustomControl::CComboboxCustomControl(HWND aControlHandle, HWND aParentHandle) : CDialogCustomControlBase(aControlHandle,aParentHandle) { @@ -163,9 +136,6 @@ void SAL_CALL CComboboxCustomControl::Align() } - - - CCheckboxCustomControl::CCheckboxCustomControl(HWND aControlHandle, HWND aParentHandle) : CDialogCustomControlBase(aControlHandle,aParentHandle) { diff --git a/fpicker/source/win32/filepicker/dialogcustomcontrols.hxx b/fpicker/source/win32/filepicker/dialogcustomcontrols.hxx index a9f2d1a50a22..e6dcb732c184 100644 --- a/fpicker/source/win32/filepicker/dialogcustomcontrols.hxx +++ b/fpicker/source/win32/filepicker/dialogcustomcontrols.hxx @@ -31,9 +31,6 @@ #endif - - - class CDummyCustomControl : public CCustomControl { public: @@ -44,9 +41,6 @@ public: }; - - - class CDialogCustomControlBase : public CCustomControl { protected: @@ -65,9 +59,6 @@ protected: }; - - - class CStaticCustomControl : public CDialogCustomControlBase { public: @@ -77,9 +68,6 @@ public: }; - - - class CPushButtonCustomControl : public CDialogCustomControlBase { public: @@ -89,9 +77,6 @@ public: }; - - - class CComboboxCustomControl : public CDialogCustomControlBase { public: @@ -101,9 +86,6 @@ public: }; - - - class CCheckboxCustomControl : public CDialogCustomControlBase { public: diff --git a/fpicker/source/win32/filepicker/dibpreview.cxx b/fpicker/source/win32/filepicker/dibpreview.cxx index 48d24cf54eb2..406292924458 100644 --- a/fpicker/source/win32/filepicker/dibpreview.cxx +++ b/fpicker/source/win32/filepicker/dibpreview.cxx @@ -29,18 +29,12 @@ #include <string> - - - using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::RuntimeException; using ::com::sun::star::uno::Any; using ::com::sun::star::lang::IllegalArgumentException; - - - namespace /* private */ { const LPCTSTR CURRENT_INSTANCE = TEXT("CurrInst"); @@ -57,9 +51,6 @@ ATOM CDIBPreview::s_ClassAtom = 0; sal_Int32 CDIBPreview::s_RegisterDibPreviewWndCount = 0; - - - CDIBPreview::CDIBPreview(HINSTANCE instance,HWND parent,sal_Bool bShowWindow) : m_Instance(instance) { @@ -93,9 +84,6 @@ CDIBPreview::CDIBPreview(HINSTANCE instance,HWND parent,sal_Bool bShowWindow) : } - - - CDIBPreview::~CDIBPreview( ) { // remember: we don't have to destroy the @@ -107,9 +95,6 @@ CDIBPreview::~CDIBPreview( ) } - - - sal_Int32 SAL_CALL CDIBPreview::getTargetColorDepth() throw (RuntimeException) { HDC hdc = GetDC(m_Hwnd); @@ -122,9 +107,6 @@ sal_Int32 SAL_CALL CDIBPreview::getTargetColorDepth() throw (RuntimeException) } - - - sal_Int32 SAL_CALL CDIBPreview::getAvailableWidth() throw (RuntimeException) { RECT rect; @@ -139,9 +121,6 @@ sal_Int32 SAL_CALL CDIBPreview::getAvailableWidth() throw (RuntimeException) } - - - sal_Int32 SAL_CALL CDIBPreview::getAvailableHeight() throw (RuntimeException) { RECT rect; @@ -156,9 +135,6 @@ sal_Int32 SAL_CALL CDIBPreview::getAvailableHeight() throw (RuntimeException) } - - - void SAL_CALL CDIBPreview::setImage(sal_Int16 aImageFormat, const Any& aImage) throw (IllegalArgumentException, RuntimeException) { @@ -179,9 +155,6 @@ void SAL_CALL CDIBPreview::setImage(sal_Int16 aImageFormat, const Any& aImage) } - - - sal_Bool SAL_CALL CDIBPreview::setShowState(sal_Bool bShowState) throw (RuntimeException) { PreviewBase::setShowState(bShowState); @@ -190,27 +163,18 @@ sal_Bool SAL_CALL CDIBPreview::setShowState(sal_Bool bShowState) throw (RuntimeE } - - - sal_Bool SAL_CALL CDIBPreview::getShowState() throw (RuntimeException) { return (sal_Bool)IsWindowVisible(m_Hwnd); } - - - HWND SAL_CALL CDIBPreview::getWindowHandle() const { return m_Hwnd; } - - - void SAL_CALL CDIBPreview::onPaint(HWND hWnd, HDC hDC) { osl::MutexGuard aGuard(m_PaintLock); @@ -294,9 +258,6 @@ void SAL_CALL CDIBPreview::onPaint(HWND hWnd, HDC hDC) } - - - LRESULT CALLBACK CDIBPreview::WndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -362,9 +323,6 @@ LRESULT CALLBACK CDIBPreview::WndProc( } - - - ATOM SAL_CALL CDIBPreview::RegisterDibPreviewWindowClass() { osl::MutexGuard aGuard( s_Mutex ); @@ -405,9 +363,6 @@ ATOM SAL_CALL CDIBPreview::RegisterDibPreviewWindowClass() } - - - void SAL_CALL CDIBPreview::UnregisterDibPreviewWindowClass() { osl::MutexGuard aGuard( s_Mutex ); diff --git a/fpicker/source/win32/filepicker/filepickereventnotification.cxx b/fpicker/source/win32/filepicker/filepickereventnotification.cxx index e62a3c4beb03..a93fa5a0ce76 100644 --- a/fpicker/source/win32/filepicker/filepickereventnotification.cxx +++ b/fpicker/source/win32/filepicker/filepickereventnotification.cxx @@ -38,9 +38,6 @@ CFilePickerEventNotification::CFilePickerEventNotification(EventListenerMethod_t } - - - void SAL_CALL CFilePickerEventNotification::notifyEventListener( Reference< XInterface > xListener ) { Reference<XFilePickerListener> xFilePickerListener(xListener,UNO_QUERY); @@ -49,10 +46,6 @@ void SAL_CALL CFilePickerEventNotification::notifyEventListener( Reference< XInt } - - - - // A FilePicker event with parameter diff --git a/fpicker/source/win32/filepicker/filepickerstate.cxx b/fpicker/source/win32/filepicker/filepickerstate.cxx index 91e3e5ece9b0..54863f2175f2 100644 --- a/fpicker/source/win32/filepicker/filepickerstate.cxx +++ b/fpicker/source/win32/filepicker/filepickerstate.cxx @@ -35,8 +35,6 @@ #include "../misc/WinImplHelper.hxx" - - using com::sun::star::uno::Any; using com::sun::star::uno::Sequence; using com::sun::star::uno::Reference; @@ -47,9 +45,6 @@ using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds; using namespace ::com::sun::star::ui::dialogs::ListboxControlActions; - - - const sal_Int32 MAX_LABEL = 256; const sal_Int16 LISTBOX_LABEL_OFFSET = 100; @@ -62,27 +57,18 @@ CFilePickerState::~CFilePickerState( ) } - - - CNonExecuteFilePickerState::CNonExecuteFilePickerState( ) : m_FirstControlCommand( NULL ) { } - - - CNonExecuteFilePickerState::~CNonExecuteFilePickerState( ) { reset( ); } - - - void SAL_CALL CNonExecuteFilePickerState::setValue( sal_Int16 aControlId, sal_Int16 aControlAction, const Any& aValue ) { CValueControlCommand* value_command = new CValueControlCommand( @@ -92,9 +78,6 @@ void SAL_CALL CNonExecuteFilePickerState::setValue( sal_Int16 aControlId, sal_In } - - - Any SAL_CALL CNonExecuteFilePickerState::getValue( sal_Int16 aControlId, sal_Int16 aControlAction ) { CValueControlCommandRequest value_request( aControlId, aControlAction ); @@ -135,9 +118,6 @@ Any SAL_CALL CNonExecuteFilePickerState::getValue( sal_Int16 aControlId, sal_Int } - - - void SAL_CALL CNonExecuteFilePickerState::enableControl( sal_Int16 aControlId, sal_Bool bEnable ) { CEnableControlCommand* enable_command = new CEnableControlCommand( @@ -147,9 +127,6 @@ void SAL_CALL CNonExecuteFilePickerState::enableControl( sal_Int16 aControlId, s } - - - void SAL_CALL CNonExecuteFilePickerState::setLabel( sal_Int16 aControlId, const OUString& aLabel ) { CLabelControlCommand* label_command = new CLabelControlCommand( @@ -159,9 +136,6 @@ void SAL_CALL CNonExecuteFilePickerState::setLabel( sal_Int16 aControlId, const } - - - OUString SAL_CALL CNonExecuteFilePickerState::getLabel( sal_Int16 aControlId ) { CControlCommandRequest label_request( aControlId ); @@ -203,8 +177,6 @@ OUString MatchFixBrokenPath(const OUString& path) } - - static OUString trimTrailingSpaces(const OUString& rString) { OUString aResult(rString); @@ -281,9 +253,6 @@ Sequence< OUString > SAL_CALL CNonExecuteFilePickerState::getFiles( CFileOpenDia } - - - OUString SAL_CALL CNonExecuteFilePickerState::getDisplayDirectory( CFileOpenDialog* aFileOpenDialog ) { OSL_PRECOND( aFileOpenDialog, "invalid parameter" ); @@ -300,9 +269,6 @@ OUString SAL_CALL CNonExecuteFilePickerState::getDisplayDirectory( CFileOpenDial } - - - void SAL_CALL CNonExecuteFilePickerState::reset( ) { CControlCommand* nextCommand; @@ -319,9 +285,6 @@ void SAL_CALL CNonExecuteFilePickerState::reset( ) } - - - CControlCommand* SAL_CALL CNonExecuteFilePickerState::getControlCommand( ) const { return m_FirstControlCommand; @@ -353,20 +316,12 @@ void SAL_CALL CNonExecuteFilePickerState::addControlCommand( CControlCommand* aC } - - - - - CExecuteFilePickerState::CExecuteFilePickerState( HWND hwndDlg ) : m_hwndDlg( hwndDlg ) { } - - - void SAL_CALL CExecuteFilePickerState::setValue( sal_Int16 aControlId, sal_Int16 aControlAction, const Any& aValue ) { // we do not support SET_HELP_URL/GET_HELP_URL @@ -406,9 +361,6 @@ void SAL_CALL CExecuteFilePickerState::setValue( sal_Int16 aControlId, sal_Int16 } - - - Any SAL_CALL CExecuteFilePickerState::getValue( sal_Int16 aControlId, sal_Int16 aControlAction ) { // we do not support SET_HELP_URL/GET_HELP_URL @@ -445,9 +397,6 @@ Any SAL_CALL CExecuteFilePickerState::getValue( sal_Int16 aControlId, sal_Int16 } - - - void SAL_CALL CExecuteFilePickerState::enableControl( sal_Int16 aControlId, sal_Bool bEnable ) { HWND hwndCtrl = GetHwndDlgItem( aControlId ); @@ -458,9 +407,6 @@ void SAL_CALL CExecuteFilePickerState::enableControl( sal_Int16 aControlId, sal_ } - - - void SAL_CALL CExecuteFilePickerState::setLabel( sal_Int16 aControlId, const OUString& aLabel ) { HWND hwndCtrl = GetHwndDlgItem( aControlId ); @@ -478,9 +424,6 @@ void SAL_CALL CExecuteFilePickerState::setLabel( sal_Int16 aControlId, const OUS } - - - OUString SAL_CALL CExecuteFilePickerState::getLabel( sal_Int16 aControlId ) { HWND hwndCtrl = GetHwndDlgItem( aControlId ); @@ -503,9 +446,6 @@ OUString SAL_CALL CExecuteFilePickerState::getLabel( sal_Int16 aControlId ) } - - - Sequence< OUString > SAL_CALL CExecuteFilePickerState::getFiles( CFileOpenDialog* aFileOpenDialog ) { SAL_WARN_IF( !aFileOpenDialog, "fpicker", "invalid parameter" ); @@ -539,9 +479,6 @@ Sequence< OUString > SAL_CALL CExecuteFilePickerState::getFiles( CFileOpenDialog } - - - OUString SAL_CALL CExecuteFilePickerState::getDisplayDirectory( CFileOpenDialog* aFileOpenDialog ) { SAL_WARN_IF( !aFileOpenDialog, "fpicker", "invalid parameter" ); @@ -558,9 +495,6 @@ OUString SAL_CALL CExecuteFilePickerState::getDisplayDirectory( CFileOpenDialog* } - - - void SAL_CALL CExecuteFilePickerState::initFilePickerControls( CControlCommand* firstControlCommand ) { CControlCommand* aControlCommand = firstControlCommand; @@ -573,9 +507,6 @@ void SAL_CALL CExecuteFilePickerState::initFilePickerControls( CControlCommand* } - - - void SAL_CALL CExecuteFilePickerState::cacheControlState( HWND hwndControl, CFilePickerState* aNonExecFilePickerState ) { OSL_ENSURE( hwndControl && aNonExecFilePickerState, "invalid parameters" ); @@ -631,18 +562,12 @@ void SAL_CALL CExecuteFilePickerState::cacheControlState( HWND hwndControl, CFil } - - - void SAL_CALL CExecuteFilePickerState::setHwnd( HWND hwndDlg ) { m_hwndDlg = hwndDlg; } - - - inline sal_Bool SAL_CALL CExecuteFilePickerState::IsListboxControl( HWND hwndControl ) const { OSL_PRECOND( IsWindow( hwndControl ), "invalid parameter" ); @@ -665,9 +590,6 @@ inline sal_Int16 SAL_CALL CExecuteFilePickerState::ListboxIdToListboxLabelId( sa } - - - inline HWND SAL_CALL CExecuteFilePickerState::GetListboxLabelItem( sal_Int16 aControlId ) const { sal_Int16 aLabelId = ListboxIdToListboxLabelId( aControlId ); @@ -679,9 +601,6 @@ inline HWND SAL_CALL CExecuteFilePickerState::GetListboxLabelItem( sal_Int16 aCo } - - - HWND SAL_CALL CExecuteFilePickerState::GetHwndDlgItem( sal_Int16 aControlId, sal_Bool bIncludeStdCtrls ) const { OSL_ENSURE( IsWindow( m_hwndDlg ), "no valid parent window set before" ); diff --git a/fpicker/source/win32/filepicker/filepickerstate.hxx b/fpicker/source/win32/filepicker/filepickerstate.hxx index 24e6ba1edf77..1cfd76ba19a4 100644 --- a/fpicker/source/win32/filepicker/filepickerstate.hxx +++ b/fpicker/source/win32/filepicker/filepickerstate.hxx @@ -36,8 +36,6 @@ #endif - - class CControlCommand; class CFileOpenDialog; diff --git a/fpicker/source/win32/filepicker/getfilenamewrapper.cxx b/fpicker/source/win32/filepicker/getfilenamewrapper.cxx index 37cd420446d4..d7cecfbbab40 100644 --- a/fpicker/source/win32/filepicker/getfilenamewrapper.cxx +++ b/fpicker/source/win32/filepicker/getfilenamewrapper.cxx @@ -109,9 +109,6 @@ namespace /* private */ }; - - - struct GetFileNameParam { GetFileNameParam(bool bOpen, LPOPENFILENAME lpofn) : @@ -128,9 +125,6 @@ namespace /* private */ }; - - - unsigned __stdcall ThreadProc(void* pParam) { osl_setThreadName("fpicker GetOpenFileName"); @@ -200,19 +194,12 @@ namespace /* private */ } // namespace private - - - - CGetFileNameWrapper::CGetFileNameWrapper() : m_ExtendedDialogError(0) { } - - - bool CGetFileNameWrapper::getOpenFileName(LPOPENFILENAME lpofn) { OSL_PRECOND(lpofn,"invalid parameter"); @@ -241,9 +228,6 @@ bool CGetFileNameWrapper::getOpenFileName(LPOPENFILENAME lpofn) } - - - bool CGetFileNameWrapper::getSaveFileName(LPOPENFILENAME lpofn) { OSL_PRECOND(lpofn,"invalid parameter"); @@ -267,9 +251,6 @@ bool CGetFileNameWrapper::getSaveFileName(LPOPENFILENAME lpofn) } - - - int CGetFileNameWrapper::commDlgExtendedError( ) { return m_ExtendedDialogError; diff --git a/fpicker/source/win32/filepicker/helppopupwindow.cxx b/fpicker/source/win32/filepicker/helppopupwindow.cxx index 237433a9a6eb..3eedd9356e53 100644 --- a/fpicker/source/win32/filepicker/helppopupwindow.cxx +++ b/fpicker/source/win32/filepicker/helppopupwindow.cxx @@ -22,15 +22,9 @@ #include <osl/diagnose.h> - - - using osl::Mutex; - - - namespace /* private */ { @@ -63,9 +57,6 @@ ATOM CHelpPopupWindow::s_ClassAtom = 0; sal_Int32 CHelpPopupWindow::s_RegisterWndClassCount = 0; - - - CHelpPopupWindow::CHelpPopupWindow( HINSTANCE hInstance, HWND hwndParent ) : @@ -89,9 +80,6 @@ CHelpPopupWindow::CHelpPopupWindow( } - - - CHelpPopupWindow::~CHelpPopupWindow( ) { // remember: we don't have to destroy the @@ -106,18 +94,12 @@ CHelpPopupWindow::~CHelpPopupWindow( ) } - - - void SAL_CALL CHelpPopupWindow::setText( const OUString& aHelpText ) { m_HelpText = aHelpText; } - - - void SAL_CALL CHelpPopupWindow::show( sal_Int32 x, sal_Int32 y ) { OSL_ENSURE( NULL == m_hwnd, "method should not be called twice in sequence" ); @@ -154,9 +136,6 @@ void SAL_CALL CHelpPopupWindow::show( sal_Int32 x, sal_Int32 y ) } - - - HWND SAL_CALL CHelpPopupWindow::setParent( HWND hwndNewParent ) { HWND oldParent = m_hwndParent; @@ -216,9 +195,6 @@ void SAL_CALL CHelpPopupWindow::calcWindowRect( LPRECT lprect ) } - - - void SAL_CALL CHelpPopupWindow::adjustWindowSize( sal_Int32* cx_new, sal_Int32* cy_new ) { OSL_ASSERT( cx_new && cy_new ); @@ -241,9 +217,6 @@ void SAL_CALL CHelpPopupWindow::adjustWindowSize( sal_Int32* cx_new, sal_Int32* } - - - void SAL_CALL CHelpPopupWindow::adjustWindowPos( sal_Int32 x, sal_Int32 y, sal_Int32 cx, sal_Int32 cy ) { @@ -290,9 +263,6 @@ void SAL_CALL CHelpPopupWindow::adjustWindowPos( } - - - void SAL_CALL CHelpPopupWindow::onPaint( HWND hWnd, HDC hdc ) { RECT rc; @@ -410,18 +380,12 @@ void SAL_CALL CHelpPopupWindow::onPaint( HWND hWnd, HDC hdc ) } - - - void SAL_CALL CHelpPopupWindow::onNcDestroy() { m_hwnd = NULL; } - - - void SAL_CALL CHelpPopupWindow::onCreate( HWND hwnd ) { m_hwnd = hwnd; @@ -449,9 +413,6 @@ void SAL_CALL CHelpPopupWindow::onCreate( HWND hwnd ) } - - - LRESULT CALLBACK CHelpPopupWindow::WndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) { @@ -523,9 +484,6 @@ LRESULT CALLBACK CHelpPopupWindow::WndProc( } - - - ATOM SAL_CALL CHelpPopupWindow::RegisterWindowClass( ) { osl::MutexGuard aGuard( s_Mutex ); @@ -563,9 +521,6 @@ ATOM SAL_CALL CHelpPopupWindow::RegisterWindowClass( ) } - - - void SAL_CALL CHelpPopupWindow::UnregisterWindowClass( ) { osl::MutexGuard aGuard( s_Mutex ); diff --git a/fpicker/source/win32/filepicker/previewadapter.cxx b/fpicker/source/win32/filepicker/previewadapter.cxx index 981fde0ff882..6cb7bcfbae80 100644 --- a/fpicker/source/win32/filepicker/previewadapter.cxx +++ b/fpicker/source/win32/filepicker/previewadapter.cxx @@ -30,9 +30,6 @@ #include <stdexcept> - - - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -98,9 +95,6 @@ private: }; - - - CPreviewAdapterImpl::CPreviewAdapterImpl(HINSTANCE instance) : m_Instance(instance), m_Preview(new PreviewBase()), // create dummy preview (NULL-Object pattern) @@ -110,44 +104,29 @@ CPreviewAdapterImpl::CPreviewAdapterImpl(HINSTANCE instance) : } - - - CPreviewAdapterImpl::~CPreviewAdapterImpl() { } - - - sal_Int32 SAL_CALL CPreviewAdapterImpl::getTargetColorDepth() { return m_Preview->getTargetColorDepth(); } - - - sal_Int32 SAL_CALL CPreviewAdapterImpl::getAvailableWidth() { return m_Preview->getAvailableWidth(); } - - - sal_Int32 SAL_CALL CPreviewAdapterImpl::getAvailableHeight() { return m_Preview->getAvailableHeight(); } - - - void SAL_CALL CPreviewAdapterImpl::setImage( sal_Int16 aImageFormat, const Any& aImage ) throw (IllegalArgumentException,RuntimeException) { @@ -155,9 +134,6 @@ void SAL_CALL CPreviewAdapterImpl::setImage( sal_Int16 aImageFormat, const Any& } - - - sal_Bool SAL_CALL CPreviewAdapterImpl::setShowState( sal_Bool bShowState ) { sal_Bool bRet = m_Preview->setShowState(bShowState); @@ -166,18 +142,12 @@ sal_Bool SAL_CALL CPreviewAdapterImpl::setShowState( sal_Bool bShowState ) } - - - sal_Bool SAL_CALL CPreviewAdapterImpl::getShowState() { return m_Preview->getShowState(); } - - - void SAL_CALL CPreviewAdapterImpl::setParent(HWND parent) { OSL_PRECOND(IsWindow(parent),"Invalid FileDialog handle"); @@ -187,18 +157,12 @@ void SAL_CALL CPreviewAdapterImpl::setParent(HWND parent) } - - - HWND SAL_CALL CPreviewAdapterImpl::getParent() { return m_FileDialog; } - - - void SAL_CALL CPreviewAdapterImpl::calcRightMargin() { // Calculate the right reference margin @@ -228,34 +192,22 @@ void SAL_CALL CPreviewAdapterImpl::calcRightMargin() } - - - void SAL_CALL CPreviewAdapterImpl::notifyParentShow(sal_Bool) { } - - - void SAL_CALL CPreviewAdapterImpl::notifyParentSizeChanged() { rearrangeLayout(); } - - - void SAL_CALL CPreviewAdapterImpl::notifyParentWindowPosChanged() { } - - - void SAL_CALL CPreviewAdapterImpl::rearrangeLayout() { // try to get a handle to the filelistbox @@ -348,9 +300,6 @@ void SAL_CALL CPreviewAdapterImpl::rearrangeLayout() } - - - void SAL_CALL CPreviewAdapterImpl::initializeActivePreview() throw(std::runtime_error) { sal_Bool bShowState = m_Preview->getImaginaryShowState(); @@ -370,9 +319,6 @@ void SAL_CALL CPreviewAdapterImpl::initializeActivePreview() throw(std::runtime_ } - - - HWND SAL_CALL CPreviewAdapterImpl::findFileListbox() const { // try to get a handle to the filelistbox @@ -390,15 +336,10 @@ HWND SAL_CALL CPreviewAdapterImpl::findFileListbox() const } - - - - // Implementation for Windows 95/NT/ME/2000/XP // because: - class CWin95NTPreviewAdapterImpl : public CPreviewAdapterImpl { public: @@ -408,18 +349,12 @@ public: }; - - - CWin95NTPreviewAdapterImpl::CWin95NTPreviewAdapterImpl(HINSTANCE instance) : CPreviewAdapterImpl(instance) { } - - - void SAL_CALL CWin95NTPreviewAdapterImpl::notifyParentShow(sal_Bool bShow) { try @@ -436,10 +371,6 @@ void SAL_CALL CWin95NTPreviewAdapterImpl::notifyParentShow(sal_Bool bShow) } - - - - // ctor @@ -449,17 +380,11 @@ CPreviewAdapter::CPreviewAdapter(HINSTANCE instance) } - - - CPreviewAdapter::~CPreviewAdapter() { } - - - Sequence<sal_Int16> SAL_CALL CPreviewAdapter::getSupportedImageFormats() { css::uno::Sequence<sal_Int16> imgFormats(1); @@ -468,36 +393,24 @@ Sequence<sal_Int16> SAL_CALL CPreviewAdapter::getSupportedImageFormats() } - - - sal_Int32 SAL_CALL CPreviewAdapter::getTargetColorDepth() { return m_pImpl->getTargetColorDepth(); } - - - sal_Int32 SAL_CALL CPreviewAdapter::getAvailableWidth() { return m_pImpl->getAvailableWidth(); } - - - sal_Int32 SAL_CALL CPreviewAdapter::getAvailableHeight() { return m_pImpl->getAvailableHeight(); } - - - void SAL_CALL CPreviewAdapter::setImage( sal_Int16 aImageFormat, const Any& aImage ) throw (IllegalArgumentException, RuntimeException) { @@ -505,54 +418,36 @@ void SAL_CALL CPreviewAdapter::setImage( sal_Int16 aImageFormat, const Any& aIma } - - - sal_Bool SAL_CALL CPreviewAdapter::setShowState( sal_Bool bShowState ) { return m_pImpl->setShowState(bShowState); } - - - sal_Bool SAL_CALL CPreviewAdapter::getShowState() { return m_pImpl->getShowState(); } - - - void SAL_CALL CPreviewAdapter::setParent(HWND parent) { m_pImpl->setParent(parent); } - - - void SAL_CALL CPreviewAdapter::notifyParentShow(bool bShow) { m_pImpl->notifyParentShow(bShow); } - - - void SAL_CALL CPreviewAdapter::notifyParentSizeChanged() { m_pImpl->notifyParentSizeChanged(); } - - - void SAL_CALL CPreviewAdapter::notifyParentWindowPosChanged() { m_pImpl->notifyParentWindowPosChanged(); diff --git a/fpicker/source/win32/filepicker/previewbase.cxx b/fpicker/source/win32/filepicker/previewbase.cxx index 1e8ecea46114..00543c97ceb4 100644 --- a/fpicker/source/win32/filepicker/previewbase.cxx +++ b/fpicker/source/win32/filepicker/previewbase.cxx @@ -25,10 +25,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; - - - - PreviewBase::PreviewBase() : m_ImageFormat(css::ui::dialogs::FilePreviewImageFormats::BITMAP), m_bShowState(sal_False) @@ -36,44 +32,29 @@ PreviewBase::PreviewBase() : } - - - PreviewBase::~PreviewBase() { } - - - sal_Int32 SAL_CALL PreviewBase::getTargetColorDepth() throw (RuntimeException) { return 0; } - - - sal_Int32 SAL_CALL PreviewBase::getAvailableWidth() throw (RuntimeException) { return 0; } - - - sal_Int32 SAL_CALL PreviewBase::getAvailableHeight() throw (RuntimeException) { return 0; } - - - void SAL_CALL PreviewBase::setImage( sal_Int16 aImageFormat, const css::uno::Any& aImage ) throw (IllegalArgumentException, RuntimeException) { @@ -91,9 +72,6 @@ void SAL_CALL PreviewBase::setImage( sal_Int16 aImageFormat, const css::uno::Any } - - - void SAL_CALL PreviewBase::getImage(sal_Int16& aImageFormat,css::uno::Any& aImage) { aImageFormat = m_ImageFormat; @@ -101,9 +79,6 @@ void SAL_CALL PreviewBase::getImage(sal_Int16& aImageFormat,css::uno::Any& aImag } - - - sal_Bool SAL_CALL PreviewBase::setShowState( sal_Bool bShowState ) throw (RuntimeException) { m_bShowState = bShowState; @@ -111,27 +86,18 @@ sal_Bool SAL_CALL PreviewBase::setShowState( sal_Bool bShowState ) throw (Runtim } - - - sal_Bool SAL_CALL PreviewBase::getShowState() throw (RuntimeException) { return sal_False; } - - - sal_Bool SAL_CALL PreviewBase::getImaginaryShowState() const { return m_bShowState; } - - - HWND SAL_CALL PreviewBase::getWindowHandle() const { return 0; diff --git a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx index 5c51f5a2c14c..be75362f73d9 100644 --- a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx +++ b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx @@ -233,7 +233,6 @@ void SAL_CALL FilePickerListener::dialogSizeChanged( ) // main - int SAL_CALL main(int nArgc, char* Argv[], char* Env[] ) { printf("Starting test of FPS-Service\n"); 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 ); diff --git a/fpicker/source/win32/misc/WinImplHelper.cxx b/fpicker/source/win32/misc/WinImplHelper.cxx index 28957e17eed5..84c51419d919 100644 --- a/fpicker/source/win32/misc/WinImplHelper.cxx +++ b/fpicker/source/win32/misc/WinImplHelper.cxx @@ -38,9 +38,6 @@ using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Sequence; - - - const OUString TILDE( "~" ); const sal_Unicode TILDE_SIGN = L'~'; const OUString AMPERSAND( "&" ); @@ -60,7 +57,6 @@ const sal_Unicode AMPERSAND_SIGN = L'&'; // Windows ME VER_PLATFORM_WIN32_WINDOWS 4 90 - // determine if we are running under Vista or newer OS @@ -88,9 +84,6 @@ bool SAL_CALL IsWindowsVistaOrNewer() } - - - void SAL_CALL ListboxAddString( HWND hwnd, const OUString& aString ) { LRESULT rc = SendMessageW( @@ -100,9 +93,6 @@ void SAL_CALL ListboxAddString( HWND hwnd, const OUString& aString ) } - - - OUString SAL_CALL ListboxGetString( HWND hwnd, sal_Int32 aPosition ) { OSL_ASSERT( IsWindow( hwnd ) ); @@ -135,9 +125,6 @@ OUString SAL_CALL ListboxGetString( HWND hwnd, sal_Int32 aPosition ) } - - - void SAL_CALL ListboxAddItem( HWND hwnd, const Any& aItem, const Reference< XInterface >& rXInterface, sal_Int16 aArgPos ) throw( IllegalArgumentException ) { @@ -157,9 +144,6 @@ void SAL_CALL ListboxAddItem( HWND hwnd, const Any& aItem, const Reference< XInt } - - - void SAL_CALL ListboxAddItems( HWND hwnd, const Any& aItemList, const Reference< XInterface >& rXInterface, sal_Int16 aArgPos ) throw( IllegalArgumentException ) { @@ -183,9 +167,6 @@ void SAL_CALL ListboxAddItems( HWND hwnd, const Any& aItemList, const Reference< } - - - void SAL_CALL ListboxDeleteItem( HWND hwnd, const Any& aPosition, const Reference< XInterface >& rXInterface, sal_Int16 aArgPos ) throw( IllegalArgumentException ) { @@ -215,9 +196,6 @@ void SAL_CALL ListboxDeleteItem( HWND hwnd, const Any& aPosition, const Referenc } - - - void SAL_CALL ListboxDeleteItems( HWND hwnd, const Any&, const Reference< XInterface >&, sal_Int16 ) throw( IllegalArgumentException ) { @@ -235,9 +213,6 @@ void SAL_CALL ListboxDeleteItems( HWND hwnd, const Any&, const Reference< XInter } - - - void SAL_CALL ListboxSetSelectedItem( HWND hwnd, const Any& aPosition, const Reference< XInterface >& rXInterface, sal_Int16 aArgPos ) throw( IllegalArgumentException ) { @@ -271,9 +246,6 @@ void SAL_CALL ListboxSetSelectedItem( HWND hwnd, const Any& aPosition, const Ref } - - - Any SAL_CALL ListboxGetItems( HWND hwnd ) { OSL_ASSERT( IsWindow( hwnd ) ); @@ -299,9 +271,6 @@ Any SAL_CALL ListboxGetItems( HWND hwnd ) } - - - Any SAL_CALL ListboxGetSelectedItem( HWND hwnd ) { OSL_ASSERT( IsWindow( hwnd ) ); @@ -315,9 +284,6 @@ Any SAL_CALL ListboxGetSelectedItem( HWND hwnd ) } - - - Any SAL_CALL ListboxGetSelectedItemIndex( HWND hwnd ) { OSL_ASSERT( IsWindow( hwnd ) ); @@ -331,9 +297,6 @@ Any SAL_CALL ListboxGetSelectedItemIndex( HWND hwnd ) } - - - Any SAL_CALL CheckboxGetState( HWND hwnd ) { OSL_ASSERT( IsWindow( hwnd ) ); @@ -346,9 +309,6 @@ Any SAL_CALL CheckboxGetState( HWND hwnd ) } - - - void SAL_CALL CheckboxSetState( HWND hwnd, const css::uno::Any& aState, const Reference< XInterface >& rXInterface, sal_Int16 aArgPos ) throw( IllegalArgumentException ) @@ -368,9 +328,6 @@ void SAL_CALL CheckboxSetState( } - - - sal_uInt32 SAL_CALL _wcslenex( const sal_Unicode* pStr ) { if ( !pStr ) @@ -388,9 +345,6 @@ sal_uInt32 SAL_CALL _wcslenex( const sal_Unicode* pStr ) } - - - void Replace( const OUString& aLabel, sal_Unicode OldChar, sal_Unicode NewChar, OUStringBuffer& aBuffer ) { OSL_ASSERT( aLabel.getLength( ) ); diff --git a/fpicker/source/win32/misc/resourceprovider.cxx b/fpicker/source/win32/misc/resourceprovider.cxx index 2c00fc2244dc..55abde0239e6 100644 --- a/fpicker/source/win32/misc/resourceprovider.cxx +++ b/fpicker/source/win32/misc/resourceprovider.cxx @@ -37,9 +37,6 @@ using namespace ::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds; using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds; - - - #define FOLDERPICKER_TITLE 500 #define FOLDER_PICKER_DEF_DESCRIPTION 501 @@ -72,9 +69,6 @@ _Entry CtrlIdToResIdTable[] = { const sal_Int32 SIZE_TABLE = SAL_N_ELEMENTS( CtrlIdToResIdTable ); - - - sal_Int16 CtrlIdToResId( sal_Int32 aControlId ) { sal_Int16 aResId = -1; @@ -92,17 +86,11 @@ sal_Int16 CtrlIdToResId( sal_Int32 aControlId ) } - - - class CResourceProvider_Impl { public: - - - CResourceProvider_Impl( ) { const SolarMutexGuard aGuard; @@ -111,18 +99,12 @@ public: } - - - ~CResourceProvider_Impl( ) { delete m_ResMgr; } - - - OUString getResString( sal_Int16 aId ) { OUString aResOUString; @@ -149,27 +131,18 @@ public: }; - - - CResourceProvider::CResourceProvider( ) : m_pImpl( new CResourceProvider_Impl() ) { } - - - CResourceProvider::~CResourceProvider( ) { delete m_pImpl; } - - - OUString CResourceProvider::getResString( sal_Int16 aId ) { return m_pImpl->getResString( aId ); diff --git a/fpicker/test/svdem.cxx b/fpicker/test/svdem.cxx index b35c194d035a..fd2ee7c1d5a2 100644 --- a/fpicker/test/svdem.cxx +++ b/fpicker/test/svdem.cxx @@ -79,7 +79,6 @@ SAL_IMPLEMENT_MAIN() } - class MyWin : public WorkWindow { public: @@ -101,7 +100,6 @@ private: }; - void Main() { MyWin aMainWin( NULL, WB_APP | WB_STDWORK ); @@ -112,7 +110,6 @@ void Main() } - MyWin::MyWin( vcl::Window* pParent, WinBits nWinStyle ) :WorkWindow( pParent, nWinStyle ) ,aOKBtn(this) @@ -123,56 +120,48 @@ MyWin::MyWin( vcl::Window* pParent, WinBits nWinStyle ) } - void MyWin::MouseMove( const MouseEvent& rMEvt ) { WorkWindow::MouseMove( rMEvt ); } - void MyWin::MouseButtonDown( const MouseEvent& rMEvt ) { WorkWindow::MouseButtonDown( rMEvt ); } - void MyWin::MouseButtonUp( const MouseEvent& rMEvt ) { WorkWindow::MouseButtonUp( rMEvt ); } - void MyWin::KeyInput( const KeyEvent& rKEvt ) { WorkWindow::KeyInput( rKEvt ); } - void MyWin::KeyUp( const KeyEvent& rKEvt ) { WorkWindow::KeyUp( rKEvt ); } - void MyWin::Paint( const Rectangle& rRect ) { WorkWindow::Paint( rRect ); } - void MyWin::Resize() { WorkWindow::Resize(); } - IMPL_LINK_TYPED( MyWin, Test, PushButton*, pBtn, void ) { printf("Test\n"); |