summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/uno
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-10 10:13:39 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-10 10:31:22 +0100
commit89c4edc13f203db1641c63e22774262bbe61f36f (patch)
tree0aa28439045c19140ff51cd6cf1593d8cf515d89 /dbaccess/source/ui/uno
parentb58d56c5109f4cf6cacfc8e9c424b179a65bf1f1 (diff)
loplugin:nullptr (automatic rewrite)
Change-Id: I2bba104b1bff30910864e45b5b032533099742ff
Diffstat (limited to 'dbaccess/source/ui/uno')
-rw-r--r--dbaccess/source/ui/uno/ColumnControl.cxx4
-rw-r--r--dbaccess/source/ui/uno/ColumnPeer.cxx4
-rw-r--r--dbaccess/source/ui/uno/composerdialogs.cxx2
-rw-r--r--dbaccess/source/ui/uno/copytablewizard.cxx2
-rw-r--r--dbaccess/source/ui/uno/dbinteraction.cxx4
-rw-r--r--dbaccess/source/ui/uno/unoDirectSql.cxx4
-rw-r--r--dbaccess/source/ui/uno/unoadmin.cxx10
7 files changed, 15 insertions, 15 deletions
diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx b/dbaccess/source/ui/uno/ColumnControl.cxx
index 726672a7fd2e..8a19477eebed 100644
--- a/dbaccess/source/ui/uno/ColumnControl.cxx
+++ b/dbaccess/source/ui/uno/ColumnControl.cxx
@@ -65,7 +65,7 @@ void SAL_CALL OColumnControl::createPeer(const Reference< XToolkit >& /*rToolkit
{
mbCreatingPeer = true;
- vcl::Window* pParentWin = NULL;
+ vcl::Window* pParentWin = nullptr;
if (rParentPeer.is())
{
VCLXWindow* pParent = VCLXWindow::GetImplementation(rParentPeer);
@@ -74,7 +74,7 @@ void SAL_CALL OColumnControl::createPeer(const Reference< XToolkit >& /*rToolkit
}
OColumnPeer* pPeer = new OColumnPeer( pParentWin, m_xContext );
- OSL_ENSURE(pPeer != NULL, "FmXGridControl::createPeer : imp_CreatePeer didn't return a peer !");
+ OSL_ENSURE(pPeer != nullptr, "FmXGridControl::createPeer : imp_CreatePeer didn't return a peer !");
setPeer( pPeer );
UnoControlComponentInfos aComponentInfos(maComponentInfos);
diff --git a/dbaccess/source/ui/uno/ColumnPeer.cxx b/dbaccess/source/ui/uno/ColumnPeer.cxx
index 7a32f0b175f6..5d0ac17d3c4e 100644
--- a/dbaccess/source/ui/uno/ColumnPeer.cxx
+++ b/dbaccess/source/ui/uno/ColumnPeer.cxx
@@ -32,7 +32,7 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::sdbc;
OColumnPeer::OColumnPeer(vcl::Window* _pParent,const Reference<XComponentContext>& _rxContext)
- :m_pActFieldDescr(NULL)
+ :m_pActFieldDescr(nullptr)
{
osl_atomic_increment( &m_refCount );
{
@@ -61,7 +61,7 @@ void OColumnPeer::setColumn(const Reference< XPropertySet>& _xColumn)
if ( m_pActFieldDescr )
{
delete m_pActFieldDescr;
- m_pActFieldDescr = NULL;
+ m_pActFieldDescr = nullptr;
}
if ( _xColumn.is() )
{
diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx b/dbaccess/source/ui/uno/composerdialogs.cxx
index d60cddcd9a35..c18655155efd 100644
--- a/dbaccess/source/ui/uno/composerdialogs.cxx
+++ b/dbaccess/source/ui/uno/composerdialogs.cxx
@@ -119,7 +119,7 @@ namespace dbaui
if ( !xConnection.is() || !xColumns.is() || !m_xComposer.is() )
// can't create the dialog if I have improper settings
- return NULL;
+ return nullptr;
return createComposerDialog( _pParent, xConnection, xColumns );
}
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx
index 0a463f08dfc6..8fd501275a64 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -1476,7 +1476,7 @@ void SAL_CALL CopyTableWizard::initialize( const Sequence< Any >& _rArguments )
);
}
if ( !m_xInteractionHandler.is() )
- m_xInteractionHandler.set( InteractionHandler::createWithParent(m_xContext, 0), UNO_QUERY );
+ m_xInteractionHandler.set( InteractionHandler::createWithParent(m_xContext, nullptr), UNO_QUERY );
Reference< XInteractionHandler > xSourceDocHandler;
Reference< XPropertySet > xSourceDescriptor( impl_ensureDataAccessDescriptor_throw( _rArguments, 0, m_xSourceConnection, xSourceDocHandler ) );
diff --git a/dbaccess/source/ui/uno/dbinteraction.cxx b/dbaccess/source/ui/uno/dbinteraction.cxx
index 1cf3748e6ca7..35f8a599f7ee 100644
--- a/dbaccess/source/ui/uno/dbinteraction.cxx
+++ b/dbaccess/source/ui/uno/dbinteraction.cxx
@@ -238,7 +238,7 @@ namespace dbaui
if ( -1 != nApprovePos )
{
// ask whether it should be saved
- nRet = ExecuteQuerySaveDocument(NULL,_rDocuRequest.Name);
+ nRet = ExecuteQuerySaveDocument(nullptr,_rDocuRequest.Name);
}
if ( RET_CANCEL == nRet )
@@ -292,7 +292,7 @@ namespace dbaui
if ( m_xContext.is() )
{
Reference< XInteractionHandler2 > xFallbackHandler(
- InteractionHandler::createWithParent(m_xContext, 0) );
+ InteractionHandler::createWithParent(m_xContext, nullptr) );
xFallbackHandler->handle( _rxRequest );
return true;
}
diff --git a/dbaccess/source/ui/uno/unoDirectSql.cxx b/dbaccess/source/ui/uno/unoDirectSql.cxx
index 796e7f4d4dfc..52a32ba81d79 100644
--- a/dbaccess/source/ui/uno/unoDirectSql.cxx
+++ b/dbaccess/source/ui/uno/unoDirectSql.cxx
@@ -88,7 +88,7 @@ namespace dbaui
{
// the connection the row set is working with
ODatasourceConnector aDSConnector(m_aContext, _pParent);
- xConnection = aDSConnector.connect( m_sInitialSelection, NULL );
+ xConnection = aDSConnector.connect( m_sInitialSelection, nullptr );
}
catch( const Exception& )
{
@@ -97,7 +97,7 @@ namespace dbaui
}
if ( !xConnection.is() )
// can't create the dialog if I have improper settings
- return NULL;
+ return nullptr;
return VclPtr<DirectSQLDialog>::Create( _pParent, xConnection );
}
diff --git a/dbaccess/source/ui/uno/unoadmin.cxx b/dbaccess/source/ui/uno/unoadmin.cxx
index 7653ec7d03d0..6d4c2819cce6 100644
--- a/dbaccess/source/ui/uno/unoadmin.cxx
+++ b/dbaccess/source/ui/uno/unoadmin.cxx
@@ -43,10 +43,10 @@ namespace dbaui
ODatabaseAdministrationDialog::ODatabaseAdministrationDialog(const Reference< XComponentContext >& _rxORB)
:ODatabaseAdministrationDialogBase(_rxORB)
- ,m_pDatasourceItems(NULL)
- ,m_pItemPool(NULL)
- ,m_pItemPoolDefaults(NULL)
- ,m_pCollection(NULL)
+ ,m_pDatasourceItems(nullptr)
+ ,m_pItemPool(nullptr)
+ ,m_pItemPoolDefaults(nullptr)
+ ,m_pCollection(nullptr)
{
m_pCollection = new ::dbaccess::ODsnTypeCollection(_rxORB);
@@ -65,7 +65,7 @@ ODatabaseAdministrationDialog::~ODatabaseAdministrationDialog()
}
delete m_pCollection;
- m_pCollection = NULL;
+ m_pCollection = nullptr;
}