summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorHerbert Dürr <hdu@apache.org>2014-01-06 14:10:06 +0000
committerHerbert Dürr <hdu@apache.org>2014-01-06 14:10:06 +0000
commitc31988351c10e9f3fd783730d95da34efd52c153 (patch)
tree03d146162a361043f12e1448245e4e93c31b61a9 /extensions
parent631b6b53afe97f22405f5239e7d13422622f980b (diff)
#i123817# prepare codebase for updating to boost 1.55
Notes
Notes: merged as: 9e77ddcd19d328c54ed0fb3ebb83f585b85f0249
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/logging/filehandler.cxx2
-rw-r--r--extensions/source/propctrlr/composeduiupdate.cxx2
-rw-r--r--extensions/source/propctrlr/eformspropertyhandler.cxx2
-rw-r--r--extensions/source/propctrlr/propcontroller.cxx2
-rw-r--r--extensions/source/propctrlr/propertycomposer.cxx2
-rw-r--r--extensions/source/propctrlr/submissionhandler.cxx2
-rw-r--r--extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx2
7 files changed, 7 insertions, 7 deletions
diff --git a/extensions/source/logging/filehandler.cxx b/extensions/source/logging/filehandler.cxx
index 86efbb571392..bcedcca15052 100644
--- a/extensions/source/logging/filehandler.cxx
+++ b/extensions/source/logging/filehandler.cxx
@@ -257,7 +257,7 @@ namespace logging
impl_writeString_nothrow( sTail );
}
- m_pFile.reset( NULL );
+ m_pFile.reset();
m_aHandlerHelper.setFormatter( NULL );
}
diff --git a/extensions/source/propctrlr/composeduiupdate.cxx b/extensions/source/propctrlr/composeduiupdate.cxx
index 068204f9baba..d6e3b8d0baf6 100644
--- a/extensions/source/propctrlr/composeduiupdate.cxx
+++ b/extensions/source/propctrlr/composeduiupdate.cxx
@@ -835,7 +835,7 @@ namespace pcr
{
singleUI->second->dispose();
}
- m_pCollectedUIs.reset( NULL );
+ m_pCollectedUIs.reset();
m_xDelegatorUI.set( NULL );
}
diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx
index 2aba960c1332..3263f4c32f90 100644
--- a/extensions/source/propctrlr/eformspropertyhandler.cxx
+++ b/extensions/source/propctrlr/eformspropertyhandler.cxx
@@ -289,7 +289,7 @@ namespace pcr
if ( EFormsHelper::isEForm( xDocument ) )
m_pHelper.reset( new EFormsHelper( m_aMutex, m_xComponent, xDocument ) );
else
- m_pHelper.reset( NULL );
+ m_pHelper.reset();
}
//--------------------------------------------------------------------
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index 1c52b779cf88..6fb7c747aeb8 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -917,7 +917,7 @@ namespace pcr
// handlers are obsolete, so is our "composer" for their UI requests
if ( m_pUIRequestComposer.get() )
m_pUIRequestComposer->dispose();
- m_pUIRequestComposer.reset( NULL );
+ m_pUIRequestComposer.reset();
// clean up the property handlers
PropertyHandlerArray aAllHandlers; // will contain every handler exactly once
diff --git a/extensions/source/propctrlr/propertycomposer.cxx b/extensions/source/propctrlr/propertycomposer.cxx
index 772fdf183213..ef12dd940799 100644
--- a/extensions/source/propctrlr/propertycomposer.cxx
+++ b/extensions/source/propctrlr/propertycomposer.cxx
@@ -442,7 +442,7 @@ namespace pcr
if ( m_pUIRequestComposer.get() )
m_pUIRequestComposer->dispose();
- m_pUIRequestComposer.reset( NULL );
+ m_pUIRequestComposer.reset();
}
//--------------------------------------------------------------------
diff --git a/extensions/source/propctrlr/submissionhandler.cxx b/extensions/source/propctrlr/submissionhandler.cxx
index 98f899e43a8c..2ee6a998a222 100644
--- a/extensions/source/propctrlr/submissionhandler.cxx
+++ b/extensions/source/propctrlr/submissionhandler.cxx
@@ -258,7 +258,7 @@ namespace pcr
Reference< frame::XModel > xDocument( impl_getContextDocument_nothrow() );
DBG_ASSERT( xDocument.is(), "SubmissionPropertyHandler::onNewComponent: no document!" );
- m_pHelper.reset( NULL );
+ m_pHelper.reset();
if ( SubmissionHelper::canTriggerSubmissions( m_xComponent, xDocument ) )
{
diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
index fb5e8b670025..4e97ca5d1375 100644
--- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
+++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
@@ -175,7 +175,7 @@ namespace pcr
if ( EFormsHelper::isEForm( xDocument ) )
m_pHelper.reset( new XSDValidationHelper( m_aMutex, m_xComponent, xDocument ) );
else
- m_pHelper.reset( NULL );
+ m_pHelper.reset();
}
//--------------------------------------------------------------------