summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/browser/genericcontroller.cxx
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/browser/genericcontroller.cxx
parentb58d56c5109f4cf6cacfc8e9c424b179a65bf1f1 (diff)
loplugin:nullptr (automatic rewrite)
Change-Id: I2bba104b1bff30910864e45b5b032533099742ff
Diffstat (limited to 'dbaccess/source/ui/browser/genericcontroller.cxx')
-rw-r--r--dbaccess/source/ui/browser/genericcontroller.cxx22
1 files changed, 11 insertions, 11 deletions
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index 6f2b3526f2e6..29efea37a09c 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -158,7 +158,7 @@ struct OGenericUnoController_Data
// OGenericUnoController
OGenericUnoController::OGenericUnoController(const Reference< XComponentContext >& _rM)
:OGenericUnoController_Base( getMutex() )
- ,m_pView(NULL)
+ ,m_pView(nullptr)
#ifdef DBG_UTIL
,m_bDescribingSupportedFeatures( false )
#endif
@@ -313,7 +313,7 @@ void SAL_CALL OGenericUnoController::initialize( const Sequence< Any >& aArgumen
catch(Exception&)
{
// no one clears my view if I won't
- m_pView = NULL;
+ m_pView = nullptr;
throw;
}
}
@@ -370,7 +370,7 @@ Reference< XWindow > SAL_CALL OGenericUnoController::getComponentWindow() throw
Reference<XSidebarProvider> SAL_CALL OGenericUnoController::getSidebar() throw (RuntimeException, std::exception)
{
- return NULL;
+ return nullptr;
}
OUString SAL_CALL OGenericUnoController::getViewControllerName() throw (css::uno::RuntimeException, std::exception)
@@ -606,7 +606,7 @@ void OGenericUnoController::InvalidateFeature(sal_uInt16 _nId, const Reference<
void OGenericUnoController::InvalidateAll()
{
- ImplInvalidateFeature( ALL_FEATURES, NULL, true );
+ ImplInvalidateFeature( ALL_FEATURES, nullptr, true );
}
void OGenericUnoController::InvalidateAll_Impl()
@@ -617,7 +617,7 @@ void OGenericUnoController::InvalidateAll_Impl()
aIter != m_aSupportedFeatures.end();
++aIter
)
- ImplBroadcastFeatureState( aIter->first, NULL, true );
+ ImplBroadcastFeatureState( aIter->first, nullptr, true );
{
::osl::MutexGuard aGuard( m_aFeatureMutex);
@@ -794,7 +794,7 @@ void OGenericUnoController::disposing()
m_arrStatusListener.clear();
}
- m_xDatabaseContext = NULL;
+ m_xDatabaseContext = nullptr;
{
::osl::MutexGuard aGuard( m_aFeatureMutex);
m_aAsyncInvalidateAll.CancelCall();
@@ -806,10 +806,10 @@ void OGenericUnoController::disposing()
// check out from all the objects we are listening
// the frame
stopFrameListening( m_aCurrentFrame.getFrame() );
- m_aCurrentFrame.attachFrame( NULL );
+ m_aCurrentFrame.attachFrame( nullptr );
- m_xMasterDispatcher = NULL;
- m_xSlaveDispatcher = NULL;
+ m_xMasterDispatcher = nullptr;
+ m_xSlaveDispatcher = nullptr;
m_xTitleHelper.clear();
m_xUrlTransformer.clear();
m_aInitParameters.clear();
@@ -979,7 +979,7 @@ void OGenericUnoController::setView( const VclPtr<ODataView> &i_rView )
void OGenericUnoController::clearView()
{
- m_pView = NULL;
+ m_pView = nullptr;
}
void OGenericUnoController::showError(const SQLExceptionInfo& _rInfo)
@@ -1106,7 +1106,7 @@ namespace
{
OUString lcl_getModuleHelpModuleName( const Reference< XFrame >& _rxFrame )
{
- const sal_Char* pReturn = NULL;
+ const sal_Char* pReturn = nullptr;
try
{