mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:nullptr (automatic rewrite)

Browse Source 
Change-Id: I7f32320f38be2bb4f62b57e856e93cff708d5ee0
This commit is contained in:
Stephan Bergmann
2015-11-10 10:16:02 +01:00
parent e5b721a14c
commit 88b5e5fd3a
11 changed files with 103 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fpicker/source/office/OfficeControlAccess.cxx
View File

@@ -236,7 +236,7 @@ namespace svt
Control* OControlAccess::implGetControl( const OUString& _rControlName, sal_Int16* _pId, sal_Int32* _pPropertyMask ) const
{
Control* pControl = NULL;
Control* pControl = nullptr;
ControlDescription tmpDesc;
OString aControlName = OUStringToOString( _rControlName, RTL_TEXTENCODING_UTF8 );
tmpDesc.pControlName = aControlName.getStr();

2
fpicker/source/office/OfficeControlAccess.hxx
View File

@@ -91,7 +91,7 @@ namespace svt
Control* _pControl, sal_Int16 _nProperty, const css::uno::Any& _rValue,
bool _bIgnoreIllegalArgument = true );
Control* implGetControl( const OUString& _rControlName, sal_Int16* _pId = NULL, sal_Int32* _pPropertyMask = NULL ) const;
Control* implGetControl( const OUString& _rControlName, sal_Int16* _pId = nullptr, sal_Int32* _pPropertyMask = nullptr ) const;
/** implements the various methods for retrieving properties from controls

6
fpicker/source/office/OfficeFilePicker.cxx
View File

@@ -417,8 +417,8 @@ void SvtFilePicker::ensureFilterList( const OUString& _rInitialCurrentFilter )
SvtFilePicker::SvtFilePicker( const Reference < XMultiServiceFactory >& xFactory )
:OCommonPicker( xFactory )
,m_pFilterList ( NULL )
,m_pElemList ( NULL )
,m_pFilterList ( nullptr )
,m_pElemList ( nullptr )
,m_bMultiSelection ( false )
,m_nServiceType ( TemplateDescription::FILEOPEN_SIMPLE )
{
@@ -448,7 +448,7 @@ sal_Int16 SvtFilePicker::implExecutePicker( )
// the execution of the dialog yields, so it is possible the at this point the window or the dialog is closed
if ( getDialog() )
getDialog()->SetFileCallback( NULL );
getDialog()->SetFileCallback( nullptr );
return nRet;
}

4
fpicker/source/office/PlacesListBox.cxx
View File

@@ -20,7 +20,7 @@
PlacesListBox_Impl::PlacesListBox_Impl( PlacesListBox* pParent, const OUString& rTitle ) :
SvHeaderTabListBox( pParent, WB_TABSTOP | WB_NOINITIALSELECTION ),
mpHeaderBar( NULL ),
mpHeaderBar( nullptr ),
mpParent( pParent )
{
Size aBoxSize = pParent->GetSizePixel( );
@@ -63,7 +63,7 @@ PlacesListBox::PlacesListBox( vcl::Window* pParent, SvtFileDialog* pFileDlg, con
Control( pParent, nBits ),
maPlaces( ),
mpDlg( pFileDlg ),
mpImpl( NULL ),
mpImpl( nullptr ),
mpAddBtn( ),
mpDelBtn( ),
mnNbEditables( 0 ),

2
fpicker/source/office/QueryFolderName.hxx
View File

@@ -37,7 +37,7 @@ private:
public:
QueryFolderNameDialog(vcl::Window* _pParent, const OUString& rTitle,
const OUString& rDefaultText, OUString* pGroupName = NULL);
const OUString& rDefaultText, OUString* pGroupName = nullptr);
virtual ~QueryFolderNameDialog();
virtual void dispose() override;
OUString GetName() const { return m_pNameEdit->GetText(); }

42
fpicker/source/office/RemoteFilesDialog.cxx
View File

@@ -30,9 +30,9 @@ class FileViewContainer : public vcl::Window
public:
FileViewContainer( vcl::Window *pParent )
: Window( pParent, WB_TABSTOP )
, m_pFileView( NULL )
, m_pTreeView( NULL )
, m_pSplitter( NULL )
, m_pFileView( nullptr )
, m_pTreeView( nullptr )
, m_pSplitter( nullptr )
, m_nCurrentFocus( 0 )
{
}
@@ -173,12 +173,12 @@ RemoteFilesDialog::RemoteFilesDialog( vcl::Window* pParent, WinBits nBits )
, m_xMasterPasswd( PasswordContainer::create( m_xContext ) )
, m_nWidth( 0 )
, m_nHeight( 0 )
, m_pCurrentAsyncAction( NULL )
, m_pFileNotifier( NULL )
, m_pSplitter( NULL )
, m_pFileView( NULL )
, m_pContainer( NULL )
, m_pAddMenu( NULL )
, m_pCurrentAsyncAction( nullptr )
, m_pFileNotifier( nullptr )
, m_pSplitter( nullptr )
, m_pFileView( nullptr )
, m_pContainer( nullptr )
, m_pAddMenu( nullptr )
{
get( m_pCancel_btn, "cancel" );
get( m_pAddService_btn, "add_service_btn" );
@@ -372,7 +372,7 @@ short RemoteFilesDialog::Execute()
if( !m_bIsConnected )
{
m_pServices_lb->SetNoSelection();
m_pAddService_btn->SetPopupMenu( NULL );
m_pAddService_btn->SetPopupMenu( nullptr );
}
short nRet = SvtFileDialog_Base::Execute();
@@ -501,7 +501,7 @@ void RemoteFilesDialog::FillServicesListbox()
m_pAddService_btn->SetPopupMenu( m_pAddMenu );
}
else
m_pAddService_btn->SetPopupMenu( NULL );
m_pAddService_btn->SetPopupMenu( nullptr );
EnableControls();
}
@@ -703,7 +703,7 @@ void RemoteFilesDialog::SavePassword( const OUString& rURL, const OUString& rUse
)
{
Reference< XInteractionHandler > xInteractionHandler(
InteractionHandler::createWithParent( m_xContext, 0 ),
InteractionHandler::createWithParent( m_xContext, nullptr ),
UNO_QUERY );
Sequence< OUString > aPasswd( 1 );
@@ -841,7 +841,7 @@ IMPL_LINK_TYPED ( RemoteFilesDialog, EditServiceMenuHdl, MenuButton *, pButton,
OUString sUrl( m_aServices[nPos]->GetUrl() );
Reference< XInteractionHandler > xInteractionHandler(
InteractionHandler::createWithParent( m_xContext, 0 ),
InteractionHandler::createWithParent( m_xContext, nullptr ),
UNO_QUERY );
UrlRecord aURLEntries = m_xMasterPasswd->find( sUrl, xInteractionHandler );
@@ -861,7 +861,7 @@ IMPL_LINK_TYPED ( RemoteFilesDialog, EditServiceMenuHdl, MenuButton *, pButton,
m_pServices_lb->RemoveEntry( nSelected );
m_pServices_lb->SetNoSelection();
m_pAddService_btn->SetPopupMenu( NULL );
m_pAddService_btn->SetPopupMenu( nullptr );
m_bIsUpdated = true;
@@ -883,7 +883,7 @@ IMPL_LINK_TYPED ( RemoteFilesDialog, EditServiceMenuHdl, MenuButton *, pButton,
OUString sUrl( m_aServices[nPos]->GetUrl() );
Reference< XInteractionHandler > xInteractionHandler(
InteractionHandler::createWithParent( m_xContext, 0 ),
InteractionHandler::createWithParent( m_xContext, nullptr ),
UNO_QUERY );
UrlRecord aURLEntries = m_xMasterPasswd->find( sUrl, xInteractionHandler );
@@ -1291,7 +1291,7 @@ void RemoteFilesDialog::onAsyncOperationStarted()
void RemoteFilesDialog::onAsyncOperationFinished()
{
m_pCurrentAsyncAction = NULL;
m_pCurrentAsyncAction = nullptr;
EnableControls();
}
@@ -1306,7 +1306,7 @@ void RemoteFilesDialog::UpdateControls( const OUString& rURL )
m_pPath->SetRootName( m_sRootLabel );
m_pTreeView->Clear();
SvTreeListEntry* pRoot = m_pTreeView->InsertEntry( m_sRootLabel, NULL, true );
SvTreeListEntry* pRoot = m_pTreeView->InsertEntry( m_sRootLabel, nullptr, true );
OUString* sData = new OUString( rURL );
pRoot->SetUserData( static_cast< void* >( sData ) );
@@ -1368,7 +1368,7 @@ std::vector<OUString> RemoteFilesDialog::GetPathList() const
{
std::vector<OUString> aList;
sal_uLong nCount = m_pFileView->GetSelectionCount();
SvTreeListEntry* pEntry = nCount ? m_pFileView->FirstSelected() : NULL;
SvTreeListEntry* pEntry = nCount ? m_pFileView->FirstSelected() : nullptr;
while( pEntry )
{
@@ -1393,7 +1393,7 @@ bool RemoteFilesDialog::ContentIsFolder( const OUString& rURL )
try
{
Reference< XInteractionHandler > xInteractionHandler(
InteractionHandler::createWithParent( m_xContext, 0 ), UNO_QUERY_THROW );
InteractionHandler::createWithParent( m_xContext, nullptr ), UNO_QUERY_THROW );
Reference< XCommandEnvironment > xEnv = new ::ucbhelper::CommandEnvironment( xInteractionHandler, Reference< XProgressHandler >() );
::ucbhelper::Content aContent( rURL, xEnv, m_xContext );
@@ -1412,7 +1412,7 @@ bool RemoteFilesDialog::ContentIsDocument( const OUString& rURL )
try
{
Reference< XInteractionHandler > xInteractionHandler(
InteractionHandler::createWithParent( m_xContext, 0 ), UNO_QUERY_THROW );
InteractionHandler::createWithParent( m_xContext, nullptr ), UNO_QUERY_THROW );
Reference< XCommandEnvironment > xEnv = new ::ucbhelper::CommandEnvironment( xInteractionHandler, Reference< XProgressHandler >() );
::ucbhelper::Content aContent( rURL, xEnv, m_xContext );
@@ -1457,7 +1457,7 @@ bool RemoteFilesDialog::getShowState()
Control* RemoteFilesDialog::getControl( sal_Int16, bool) const
{
return NULL;
return nullptr;
}
void RemoteFilesDialog::enableControl( sal_Int16, bool )
{

14
fpicker/source/office/commonpicker.cxx
View File

@@ -50,8 +50,8 @@ namespace svt
:OCommonPicker_Base( m_aMutex )
,OPropertyContainer( GetBroadcastHelper() )
,m_xORB( _rxFactory )
,m_pDlg( NULL )
,m_nCancelEvent( 0 )
,m_pDlg( nullptr )
,m_nCancelEvent( nullptr )
,m_bExecuting( false )
{
// the two properties we have
@@ -124,8 +124,8 @@ namespace svt
}
m_pDlg.disposeAndClear();
m_xWindow = NULL;
m_xDialogParent = NULL;
m_xWindow = nullptr;
m_xDialogParent = nullptr;
}
@@ -153,8 +153,8 @@ namespace svt
else
m_pDlg.clear();
m_xWindow = NULL;
m_xDialogParent = NULL;
m_xWindow = nullptr;
m_xDialogParent = nullptr;
}
else
{
@@ -394,7 +394,7 @@ namespace svt
// By definition, the solar mutex is locked when we arrive here. Note that this
// is important, as for instance the consistency of m_pDlg depends on this mutex.
::osl::MutexGuard aGuard( m_aMutex );
m_nCancelEvent = 0;
m_nCancelEvent = nullptr;
if ( !m_bExecuting )
// nothing to do. This may be because the dialog was canceled after our cancel method

8
fpicker/source/office/fps_office.cxx
View File

@@ -31,21 +31,21 @@ static const cppu::ImplementationEntry g_entries[] =
SvtRemoteFilePicker::impl_createInstance,
SvtRemoteFilePicker::impl_getStaticImplementationName,
SvtRemoteFilePicker::impl_getStaticSupportedServiceNames,
cppu::createSingleComponentFactory, 0, 0
cppu::createSingleComponentFactory, nullptr, 0
},
{
SvtFilePicker::impl_createInstance,
SvtFilePicker::impl_getStaticImplementationName,
SvtFilePicker::impl_getStaticSupportedServiceNames,
cppu::createSingleComponentFactory, 0, 0
cppu::createSingleComponentFactory, nullptr, 0
},
{
SvtFolderPicker::impl_createInstance,
SvtFolderPicker::impl_getStaticImplementationName,
SvtFolderPicker::impl_getStaticSupportedServiceNames,
cppu::createSingleComponentFactory, 0, 0
cppu::createSingleComponentFactory, nullptr, 0
},
{ 0, 0, 0, 0, 0, 0 }
{ nullptr, nullptr, nullptr, nullptr, nullptr, 0 }
};
extern "C"

18
fpicker/source/office/fpsmartcontent.cxx
View File

@@ -47,17 +47,17 @@ namespace svt
SmartContent::SmartContent()
:m_pContent( NULL )
:m_pContent( nullptr )
,m_eState( NOT_BOUND )
,m_pOwnInteraction( NULL )
,m_pOwnInteraction( nullptr )
{
}
SmartContent::SmartContent( const OUString& _rInitialURL )
:m_pContent( NULL )
:m_pContent( nullptr )
,m_eState( NOT_BOUND )
,m_pOwnInteraction( NULL )
,m_pOwnInteraction( nullptr )
{
bindTo( _rInitialURL );
}
@@ -84,7 +84,7 @@ namespace svt
{
Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext();
Reference< XInteractionHandler > xGlobalInteractionHandler(
InteractionHandler::createWithParent(xContext, 0), UNO_QUERY_THROW );
InteractionHandler::createWithParent(xContext, nullptr), UNO_QUERY_THROW );
m_pOwnInteraction = new ::svt::OFilePickerInteractionHandler(xGlobalInteractionHandler);
m_pOwnInteraction->enableInterceptions(eInterceptions);
@@ -98,12 +98,12 @@ namespace svt
{
// Don't free the memory here! It will be done by the next
// call automatically - releasing of the uno reference ...
m_pOwnInteraction = NULL;
m_pOwnInteraction = nullptr;
m_xOwnInteraction.clear();
Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext();
Reference< XInteractionHandler > xGlobalInteractionHandler(
InteractionHandler::createWithParent(xContext, 0), UNO_QUERY_THROW );
InteractionHandler::createWithParent(xContext, nullptr), UNO_QUERY_THROW );
m_xCmdEnv = new ucbhelper::CommandEnvironment( xGlobalInteractionHandler, Reference< XProgressHandler >() );
}
@@ -111,7 +111,7 @@ namespace svt
::svt::OFilePickerInteractionHandler* SmartContent::getOwnInteractionHandler() const
{
if (!m_xOwnInteraction.is())
return NULL;
return nullptr;
return m_pOwnInteraction;
}
@@ -132,7 +132,7 @@ namespace svt
{
// Don't free the memory here! It will be done by the next
// call automatically - releasing of the uno reference ...
m_pOwnInteraction = NULL;
m_pOwnInteraction = nullptr;
m_xOwnInteraction.clear();
m_xCmdEnv.clear();

60
fpicker/source/office/iodlg.cxx
View File

@@ -305,15 +305,15 @@ SvtFileDialog::SvtFileDialog
) :
SvtFileDialog_Base( _pParent, "ExplorerFileDialog", "fps/ui/explorerfiledialog.ui" )
,_pCbReadOnly( NULL )
,_pCbLinkBox( NULL)
,_pCbPreviewBox( NULL )
,_pCbSelection( NULL )
,_pPbPlay( NULL )
,_pPrevWin( NULL )
,_pPrevBmp( NULL )
,_pFileView( NULL )
,_pFileNotifier( NULL )
,_pCbReadOnly( nullptr )
,_pCbLinkBox( nullptr)
,_pCbPreviewBox( nullptr )
,_pCbSelection( nullptr )
,_pPbPlay( nullptr )
,_pPrevWin( nullptr )
,_pPrevBmp( nullptr )
,_pFileView( nullptr )
,_pFileNotifier( nullptr )
,_pImp( new SvtExpFileDlg_Impl( nBits ) )
,_nExtraBits( nExtraBits )
,_bIsInExecute( false )
@@ -328,15 +328,15 @@ SvtFileDialog::SvtFileDialog
SvtFileDialog::SvtFileDialog ( vcl::Window* _pParent, WinBits nBits )
:SvtFileDialog_Base( _pParent, "ExplorerFileDialog", "fps/ui/explorerfiledialog.ui" )
,_pCbReadOnly( NULL )
,_pCbLinkBox( NULL)
,_pCbPreviewBox( NULL )
,_pCbSelection( NULL )
,_pPbPlay( NULL )
,_pPrevWin( NULL )
,_pPrevBmp( NULL )
,_pFileView( NULL )
,_pFileNotifier( NULL )
,_pCbReadOnly( nullptr )
,_pCbLinkBox( nullptr)
,_pCbPreviewBox( nullptr )
,_pCbSelection( nullptr )
,_pPbPlay( nullptr )
,_pPrevWin( nullptr )
,_pPrevBmp( nullptr )
,_pFileView( nullptr )
,_pFileNotifier( nullptr )
,_pImp( new SvtExpFileDlg_Impl( nBits ) )
,_nExtraBits( 0L )
,_bIsInExecute( false )
@@ -368,9 +368,9 @@ class CustomContainer : public vcl::Window
public:
CustomContainer(vcl::Window *pParent)
: Window(pParent)
, _pImp(NULL)
, _pFileView(NULL)
, _pSplitter(NULL)
, _pImp(nullptr)
, _pFileView(nullptr)
, _pSplitter(nullptr)
, m_nCurrentFocus(FocusState::Prev)
{
}
@@ -1392,7 +1392,7 @@ SvtFileDialogFilter_Impl* SvtFileDialog::FindFilter_Impl
*/
{
SvtFileDialogFilter_Impl* pFoundFilter = NULL;
SvtFileDialogFilter_Impl* pFoundFilter = nullptr;
SvtFileDialogFilterList_Impl& rList = _pImp->m_aFilter;
sal_uInt16 nFilter = rList.size();
@@ -1455,7 +1455,7 @@ void SvtFileDialog::OpenMultiSelection_Impl()
{
sal_uLong nCount = _pFileView->GetSelectionCount();
SvTreeListEntry* pEntry = nCount ? _pFileView->FirstSelected() : NULL;
SvTreeListEntry* pEntry = nCount ? _pFileView->FirstSelected() : nullptr;
if ( nCount && pEntry )
_aPath = SvtFileView::GetURL( pEntry );
@@ -1573,7 +1573,7 @@ IMPL_LINK_TYPED( SvtFileDialog, SelectHdl_Impl, SvTreeListBox*, pBox, void )
IMPL_LINK_NOARG_TYPED(SvtFileDialog, DblClickHdl_Impl, SvTreeListBox*, bool)
{
_pImp->_bDoubleClick = true;
OpenHdl_Impl( NULL );
OpenHdl_Impl( nullptr );
_pImp->_bDoubleClick = false;
return false;
@@ -1822,7 +1822,7 @@ void SvtFileDialog::onAsyncOperationStarted()
void SvtFileDialog::onAsyncOperationFinished()
{
EnableUI( true );
m_pCurrentAsyncAction = NULL;
m_pCurrentAsyncAction = nullptr;
if ( !m_bInExecuteAsync )
_pImp->_pEdFileName->GrabFocus();
// (if m_bInExecuteAsync is true, then the operation was finished within the minimum wait time,
@@ -1862,13 +1862,13 @@ void SvtFileDialog::displayIOException( const OUString& _rURL, IOErrorCode _eCod
aException.Classification = InteractionClassification_ERROR;
// let and interaction handler handle this exception
::comphelper::OInteractionRequest* pRequest = NULL;
::comphelper::OInteractionRequest* pRequest = nullptr;
Reference< css::task::XInteractionRequest > xRequest = pRequest =
new ::comphelper::OInteractionRequest( makeAny( aException ) );
pRequest->addContinuation( new ::comphelper::OInteractionAbort( ) );
Reference< XInteractionHandler2 > xHandler(
InteractionHandler::createWithParent( ::comphelper::getProcessComponentContext(), 0 ) );
InteractionHandler::createWithParent( ::comphelper::getProcessComponentContext(), nullptr ) );
xHandler->handle( xRequest );
}
catch( const Exception& )
@@ -2308,7 +2308,7 @@ std::vector<OUString> SvtFileDialog::GetPathList() const
{
std::vector<OUString> aList;
sal_uLong nCount = _pFileView->GetSelectionCount();
SvTreeListEntry* pEntry = nCount ? _pFileView->FirstSelected() : NULL;
SvTreeListEntry* pEntry = nCount ? _pFileView->FirstSelected() : nullptr;
if ( ! pEntry )
{
@@ -2437,12 +2437,12 @@ void SvtFileDialog::Resize()
Control* SvtFileDialog::getControl( sal_Int16 _nControlId, bool _bLabelControl ) const
{
Control* pReturn = NULL;
Control* pReturn = nullptr;
switch ( _nControlId )
{
case CONTROL_FILEVIEW:
pReturn = _bLabelControl ? NULL : static_cast< Control* >( _pFileView );
pReturn = _bLabelControl ? nullptr : static_cast< Control* >( _pFileView );
break;
case EDIT_FILEURL:

48
fpicker/source/office/iodlgimp.cxx
View File

@@ -209,36 +209,36 @@ Size SvtUpButton_Impl::GetOptimalSize() const
// SvtExpFileDlg_Impl
SvtExpFileDlg_Impl::SvtExpFileDlg_Impl( WinBits ) :
_pCurFilter ( NULL ),
_pUserFilter ( NULL ),
_pFtFileName ( NULL ),
_pEdFileName ( NULL ),
_pFtFileVersion ( NULL ),
_pLbFileVersion ( NULL ),
_pFtTemplates ( NULL ),
_pLbTemplates ( NULL ),
_pFtImageTemplates ( NULL ),
_pLbImageTemplates ( NULL ),
_pFtFileType ( NULL ),
_pLbFilter ( NULL ),
_pBtnFileOpen ( NULL ),
_pBtnCancel ( NULL ),
_pBtnHelp ( NULL ),
_pBtnUp ( NULL ),
_pBtnNewFolder ( NULL ),
_pCbPassword ( NULL ),
_pEdCurrentPath ( NULL ),
_pCbAutoExtension ( NULL ),
_pCbOptions ( NULL ),
_pPlaces ( NULL ),
_pBtnConnectToServer( NULL ),
_pCurFilter ( nullptr ),
_pUserFilter ( nullptr ),
_pFtFileName ( nullptr ),
_pEdFileName ( nullptr ),
_pFtFileVersion ( nullptr ),
_pLbFileVersion ( nullptr ),
_pFtTemplates ( nullptr ),
_pLbTemplates ( nullptr ),
_pFtImageTemplates ( nullptr ),
_pLbImageTemplates ( nullptr ),
_pFtFileType ( nullptr ),
_pLbFilter ( nullptr ),
_pBtnFileOpen ( nullptr ),
_pBtnCancel ( nullptr ),
_pBtnHelp ( nullptr ),
_pBtnUp ( nullptr ),
_pBtnNewFolder ( nullptr ),
_pCbPassword ( nullptr ),
_pEdCurrentPath ( nullptr ),
_pCbAutoExtension ( nullptr ),
_pCbOptions ( nullptr ),
_pPlaces ( nullptr ),
_pBtnConnectToServer( nullptr ),
_eMode ( FILEDLG_MODE_OPEN ),
_eDlgType ( FILEDLG_TYPE_FILEDLG ),
_nState ( FILEDLG_STATE_REMOTE ),
_nStyle ( 0 ),
_bDoubleClick ( false ),
m_bNeedDelayedFilterExecute ( false ),
_pDefaultFilter ( NULL ),
_pDefaultFilter ( nullptr ),
_bMultiSelection ( false ),
_bFolderHasOpened ( false )
{