diff options
-rw-r--r-- | fpicker/source/office/OfficeControlAccess.cxx | 2 | ||||
-rw-r--r-- | fpicker/source/office/OfficeFilePicker.cxx | 4 | ||||
-rw-r--r-- | fpicker/source/office/OfficeFolderPicker.cxx | 2 | ||||
-rw-r--r-- | fpicker/source/office/RemoteFilesDialog.cxx | 2 | ||||
-rw-r--r-- | fpicker/source/office/commonpicker.cxx | 4 | ||||
-rw-r--r-- | fpicker/source/office/iodlg.cxx | 6 | ||||
-rw-r--r-- | framework/source/dispatch/servicehandler.cxx | 2 | ||||
-rw-r--r-- | framework/source/uielement/headermenucontroller.cxx | 2 | ||||
-rw-r--r-- | framework/source/uielement/langselectionmenucontroller.cxx | 2 |
9 files changed, 13 insertions, 13 deletions
diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx index f2116e7ec79f..63cde88c4b4d 100644 --- a/fpicker/source/office/OfficeControlAccess.cxx +++ b/fpicker/source/office/OfficeControlAccess.cxx @@ -399,7 +399,7 @@ namespace svt { Any aRet; - Control* pControl = m_pFilePickerController->getControl( _nControlId, false ); + Control* pControl = m_pFilePickerController->getControl( _nControlId ); DBG_ASSERT( pControl, "OControlAccess::GetValue: don't have this control in the current mode!" ); if ( pControl ) { diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx index 3e2d345f2d9f..f52cdfe112ac 100644 --- a/fpicker/source/office/OfficeFilePicker.cxx +++ b/fpicker/source/office/OfficeFilePicker.cxx @@ -449,7 +449,7 @@ sal_Int16 SvtFilePicker::implExecutePicker( ) prepareExecute(); - getDialog()->EnableAutocompletion( true ); + getDialog()->EnableAutocompletion(); // now we are ready to execute the dialog sal_Int16 nRet = getDialog()->Execute(); @@ -530,7 +530,7 @@ void SAL_CALL SvtFilePicker::startExecuteModal( const Reference< ::com::sun::sta m_xDlgClosedListener = xListener; prepareDialog(); prepareExecute(); - getDialog()->EnableAutocompletion( true ); + getDialog()->EnableAutocompletion(); getDialog()->StartExecuteModal( LINK( this, SvtFilePicker, DialogClosedHdl ) ); } diff --git a/fpicker/source/office/OfficeFolderPicker.cxx b/fpicker/source/office/OfficeFolderPicker.cxx index 33a3e53d2245..6fbb6424ec05 100644 --- a/fpicker/source/office/OfficeFolderPicker.cxx +++ b/fpicker/source/office/OfficeFolderPicker.cxx @@ -65,7 +65,7 @@ void SAL_CALL SvtFolderPicker::startExecuteModal( const Reference< ::com::sun::s m_xListener = xListener; prepareDialog(); prepareExecute(); - getDialog()->EnableAutocompletion( true ); + getDialog()->EnableAutocompletion(); getDialog()->StartExecuteModal( LINK( this, SvtFolderPicker, DialogClosedHdl ) ); } diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index 98ef36f43cac..cce10e66d1c0 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -1102,7 +1102,7 @@ IMPL_LINK_NOARG ( RemoteFilesDialog, CancelHdl ) } else { - EndDialog( RET_CANCEL ); + EndDialog(); } return 1; } diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx index 804850696577..451231e362e9 100644 --- a/fpicker/source/office/commonpicker.cxx +++ b/fpicker/source/office/commonpicker.cxx @@ -120,7 +120,7 @@ namespace svt { ::osl::MutexGuard aOwnGuard( m_aMutex ); if ( m_bExecuting && m_pDlg ) - m_pDlg->EndDialog( RET_CANCEL ); + m_pDlg->EndDialog(); } m_pDlg.disposeAndClear(); @@ -404,7 +404,7 @@ namespace svt OSL_ENSURE( getDialog(), "OCommonPicker::OnCancelPicker: executing, but no dialog!" ); if ( getDialog() ) - getDialog()->EndDialog( RET_CANCEL ); + getDialog()->EndDialog(); return 0L; } diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 6d1e1a1fc106..123f96f39d4b 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -823,7 +823,7 @@ IMPL_LINK_NOARG(SvtFileDialog, CancelHdl_Impl) } else { - EndDialog( RET_CANCEL ); + EndDialog(); } return 1L; } @@ -2502,7 +2502,7 @@ Control* SvtFileDialog::getControl( sal_Int16 _nControlId, bool _bLabelControl ) void SvtFileDialog::enableControl( sal_Int16 _nControlId, bool _bEnable ) { - Control* pControl = getControl( _nControlId, false ); + Control* pControl = getControl( _nControlId ); if ( pControl ) EnableControl( pControl, _bEnable ); Control* pLabel = getControl( _nControlId, true ); @@ -2550,7 +2550,7 @@ void SvtFileDialog::AddControls_Impl( ) if ( _nExtraBits & SFX_EXTRA_AUTOEXTENSION ) { _pImp->_pCbAutoExtension->SetText( SvtResId( STR_SVT_FILEPICKER_AUTO_EXTENSION ) ); - _pImp->_pCbAutoExtension->Check( true ); + _pImp->_pCbAutoExtension->Check(); _pImp->_pCbAutoExtension->SetClickHdl( LINK( this, SvtFileDialog, AutoExtensionHdl_Impl ) ); _pImp->_pCbAutoExtension->Show(); } diff --git a/framework/source/dispatch/servicehandler.cxx b/framework/source/dispatch/servicehandler.cxx index 8ef3913c76e3..3f700bc4e1e3 100644 --- a/framework/source/dispatch/servicehandler.cxx +++ b/framework/source/dispatch/servicehandler.cxx @@ -186,7 +186,7 @@ css::uno::Reference< css::uno::XInterface > ServiceHandler::implts_dispatch( con OUString sServiceName; OUString sArguments; - sal_Int32 nArgStart = sServiceAndArguments.indexOf('?',0); + sal_Int32 nArgStart = sServiceAndArguments.indexOf('?'); if (nArgStart!=-1) { sServiceName = sServiceAndArguments.copy(0,nArgStart); diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx index abbcac413c21..0c57b6691164 100644 --- a/framework/source/uielement/headermenucontroller.cxx +++ b/framework/source/uielement/headermenucontroller.cxx @@ -144,7 +144,7 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra pVCLPopupMenu->SetItemCommand( nId, aCommand ); if ( bHeaderIsOn ) - pVCLPopupMenu->CheckItem( nId, true ); + pVCLPopupMenu->CheckItem( nId ); ++nId; // Check if all entries have the same state diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx index 17b689d1aad1..5d89a000994f 100644 --- a/framework/source/uielement/langselectionmenucontroller.cxx +++ b/framework/source/uielement/langselectionmenucontroller.cxx @@ -217,7 +217,7 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup if (rStr == m_aCurLang && eMode == MODE_SetLanguageSelectionMenu ) { //make a sign for the current language - pPopupMenu->CheckItem( nItemId, true ); + pPopupMenu->CheckItem( nItemId ); } ++nItemId; } |