summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorHerbert Dürr <hdu@apache.org>2014-01-06 14:10:06 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-01-06 16:32:20 +0000
commit9e77ddcd19d328c54ed0fb3ebb83f585b85f0249 (patch)
tree41843d922d70b433a0e5647b0fdcdb406fa6be0e /extensions
parent01329972d89ddfd30d197b7947c571fdb83b0cf8 (diff)
Resolves: #i123817# prepare codebase for updating to boost 1.55
(cherry picked from commit c31988351c10e9f3fd783730d95da34efd52c153) Conflicts: basic/source/comp/parser.cxx basic/source/comp/token.cxx dbaccess/source/ui/dlg/generalpage.cxx sc/source/ui/unoobj/chart2uno.cxx vcl/quartz/salbmp.cxx Change-Id: Ic9580f2d4a44959cb3e38906eb4153b2c2a54899
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 e600315d6321..d2dc622dcf1a 100644
--- a/extensions/source/logging/filehandler.cxx
+++ b/extensions/source/logging/filehandler.cxx
@@ -247,7 +247,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 87a174b958c6..1a32827c1e76 100644
--- a/extensions/source/propctrlr/composeduiupdate.cxx
+++ b/extensions/source/propctrlr/composeduiupdate.cxx
@@ -825,7 +825,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 8d1417fa0b8a..4eb799677624 100644
--- a/extensions/source/propctrlr/eformspropertyhandler.cxx
+++ b/extensions/source/propctrlr/eformspropertyhandler.cxx
@@ -281,7 +281,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 099278184fa4..6e8423291258 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -895,7 +895,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 2fe8c5663854..cbc14a316bde 100644
--- a/extensions/source/propctrlr/propertycomposer.cxx
+++ b/extensions/source/propctrlr/propertycomposer.cxx
@@ -434,7 +434,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 c2d20037bd4f..bdb8a10612ac 100644
--- a/extensions/source/propctrlr/submissionhandler.cxx
+++ b/extensions/source/propctrlr/submissionhandler.cxx
@@ -250,7 +250,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 54ce977fd3d1..edf7f6ee3e46 100644
--- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
+++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
@@ -168,7 +168,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();
}
//--------------------------------------------------------------------