Author: hdu
Date: Mon Jan 6 14:10:06 2014
New Revision: 1555789
URL: http://svn.apache.org/r1555789
Log:
#i123817# prepare codebase for updating to boost 1.55
Modified:
openoffice/trunk/main/basic/source/comp/parser.cxx
openoffice/trunk/main/basic/source/comp/token.cxx
openoffice/trunk/main/basic/source/inc/token.hxx
openoffice/trunk/main/dbaccess/source/ui/dlg/generalpage.cxx
openoffice/trunk/main/dtrans/source/win32/clipb/WinClipboard.cxx
openoffice/trunk/main/extensions/source/logging/filehandler.cxx
openoffice/trunk/main/extensions/source/propctrlr/composeduiupdate.cxx
openoffice/trunk/main/extensions/source/propctrlr/eformspropertyhandler.cxx
openoffice/trunk/main/extensions/source/propctrlr/propcontroller.cxx
openoffice/trunk/main/extensions/source/propctrlr/propertycomposer.cxx
openoffice/trunk/main/extensions/source/propctrlr/submissionhandler.cxx
openoffice/trunk/main/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
openoffice/trunk/main/sc/source/core/data/documen3.cxx
openoffice/trunk/main/sc/source/core/data/dpsave.cxx
openoffice/trunk/main/sc/source/core/data/table5.cxx
openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleText.cxx
openoffice/trunk/main/sc/source/ui/unoobj/chart2uno.cxx
openoffice/trunk/main/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
openoffice/trunk/main/sd/source/ui/tools/PreviewRenderer.cxx
openoffice/trunk/main/svx/source/form/formcontroller.cxx
openoffice/trunk/main/toolkit/source/helper/formpdfexport.cxx
openoffice/trunk/main/vcl/aqua/source/gdi/salbmp.cxx
Modified: openoffice/trunk/main/basic/source/comp/parser.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/basic/source/comp/parser.cxx?rev=1555789&r1=1555788&r2=1555789&view=diff
==============================================================================
--- openoffice/trunk/main/basic/source/comp/parser.cxx (original)
+++ openoffice/trunk/main/basic/source/comp/parser.cxx Mon Jan 6 14:10:06 2014
@@ -752,7 +752,7 @@ void SbiParser::Option()
{
switch( Next() )
{
- case EXPLICIT:
+ case BASIC_EXPLICIT:
bExplicit = sal_True; break;
case BASE:
if( Next() == NUMBER )
Modified: openoffice/trunk/main/basic/source/comp/token.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/basic/source/comp/token.cxx?rev=1555789&r1=1555788&r2=1555789&view=diff
==============================================================================
--- openoffice/trunk/main/basic/source/comp/token.cxx (original)
+++ openoffice/trunk/main/basic/source/comp/token.cxx Mon Jan 6 14:10:06 2014
@@ -102,7 +102,7 @@ static TokenTable aTokTable_Basic [] = {
{ ERASE, "Erase" },
{ _ERROR_, "Error" },
{ EXIT, "Exit" },
- { EXPLICIT, "Explicit" },
+ { BASIC_EXPLICIT, "Explicit" },
{ FOR, "For" },
{ FUNCTION, "Function" },
{ GET, "Get" },
@@ -272,7 +272,7 @@ TokenTable aTokTable_Java [] = { // Tok
{ ERASE, "Erase" },
{ _ERROR_, "Error" },
{ EXIT, "Exit" },
- { EXPLICIT, "Explicit" },
+ { BASIC_EXPLICIT, "Explicit" },
{ FOR, "For" },
{ FUNCTION, "Function" },
{ GLOBAL, "Global" },
@@ -359,7 +359,7 @@ TokenLabelInfo::TokenLabelInfo( void )
// Token accepted as label by VBA
SbiToken eLabelToken[] = { ACCESS, ALIAS, APPEND, BASE, BINARY,
CLASSMODULE,
- COMPARE, COMPATIBLE, DEFERR, _ERROR_, EXPLICIT, LIB, LINE,
LPRINT, NAME,
+ COMPARE, COMPATIBLE, DEFERR, _ERROR_, BASIC_EXPLICIT, LIB,
LINE, LPRINT, NAME,
TOBJECT, OUTPUT, PROPERTY, RANDOM, READ, STEP, STOP, TEXT,
VBASUPPORT, NIL };
SbiToken* pTok = eLabelToken;
SbiToken eTok;
Modified: openoffice/trunk/main/basic/source/inc/token.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/basic/source/inc/token.hxx?rev=1555789&r1=1555788&r2=1555789&view=diff
==============================================================================
--- openoffice/trunk/main/basic/source/inc/token.hxx (original)
+++ openoffice/trunk/main/basic/source/inc/token.hxx Mon Jan 6 14:10:06 2014
@@ -91,7 +91,7 @@ enum SbiToken {
NUMBER=FIRSTEXTRA, FIXSTRING, SYMBOL, _CDECL_, BYVAL, BYREF,
OUTPUT, RANDOM, APPEND, BINARY, ACCESS,
LOCK, READ, PRESERVE, BASE, ANY, LIB, _OPTIONAL_,
- EXPLICIT, COMPATIBLE, CLASSMODULE, PARAMARRAY, WITHEVENTS,
+ BASIC_EXPLICIT, COMPATIBLE, CLASSMODULE, PARAMARRAY, WITHEVENTS,
// Ab hier kommen JavaScript-Tokens (gleiches enum, damit gleicher Typ)
FIRSTJAVA,
Modified: openoffice/trunk/main/dbaccess/source/ui/dlg/generalpage.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/dlg/generalpage.cxx?rev=1555789&r1=1555788&r2=1555789&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/ui/dlg/generalpage.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/ui/dlg/generalpage.cxx Mon Jan 6
14:10:06 2014
@@ -147,8 +147,8 @@ namespace dbaui
//-------------------------------------------------------------------------
OGeneralPage::~OGeneralPage()
{
- m_pDatasourceType.reset( NULL );
- m_pLB_DocumentList.reset( NULL );
+ m_pDatasourceType.reset();
+ m_pLB_DocumentList.reset();
}
//-------------------------------------------------------------------------
Modified: openoffice/trunk/main/dtrans/source/win32/clipb/WinClipboard.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/dtrans/source/win32/clipb/WinClipboard.cxx?rev=1555789&r1=1555788&r2=1555789&view=diff
==============================================================================
--- openoffice/trunk/main/dtrans/source/win32/clipb/WinClipboard.cxx (original)
+++ openoffice/trunk/main/dtrans/source/win32/clipb/WinClipboard.cxx Mon Jan 6
14:10:06 2014
@@ -278,7 +278,7 @@ void SAL_CALL CWinClipboard::disposing()
m_pImpl->dispose( );
// force destruction of the impl class
- m_pImpl.reset( NULL );
+ m_pImpl.reset();
}
// -------------------------------------------------
Modified: openoffice/trunk/main/extensions/source/logging/filehandler.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/extensions/source/logging/filehandler.cxx?rev=1555789&r1=1555788&r2=1555789&view=diff
==============================================================================
--- openoffice/trunk/main/extensions/source/logging/filehandler.cxx (original)
+++ openoffice/trunk/main/extensions/source/logging/filehandler.cxx Mon Jan 6
14:10:06 2014
@@ -257,7 +257,7 @@ namespace logging
impl_writeString_nothrow( sTail );
}
- m_pFile.reset( NULL );
+ m_pFile.reset();
m_aHandlerHelper.setFormatter( NULL );
}
Modified: openoffice/trunk/main/extensions/source/propctrlr/composeduiupdate.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/extensions/source/propctrlr/composeduiupdate.cxx?rev=1555789&r1=1555788&r2=1555789&view=diff
==============================================================================
--- openoffice/trunk/main/extensions/source/propctrlr/composeduiupdate.cxx
(original)
+++ openoffice/trunk/main/extensions/source/propctrlr/composeduiupdate.cxx Mon
Jan 6 14:10:06 2014
@@ -835,7 +835,7 @@ namespace pcr
{
singleUI->second->dispose();
}
- m_pCollectedUIs.reset( NULL );
+ m_pCollectedUIs.reset();
m_xDelegatorUI.set( NULL );
}
Modified:
openoffice/trunk/main/extensions/source/propctrlr/eformspropertyhandler.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/extensions/source/propctrlr/eformspropertyhandler.cxx?rev=1555789&r1=1555788&r2=1555789&view=diff
==============================================================================
--- openoffice/trunk/main/extensions/source/propctrlr/eformspropertyhandler.cxx
(original)
+++ openoffice/trunk/main/extensions/source/propctrlr/eformspropertyhandler.cxx
Mon Jan 6 14:10:06 2014
@@ -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();
}
//--------------------------------------------------------------------
Modified: openoffice/trunk/main/extensions/source/propctrlr/propcontroller.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/extensions/source/propctrlr/propcontroller.cxx?rev=1555789&r1=1555788&r2=1555789&view=diff
==============================================================================
--- openoffice/trunk/main/extensions/source/propctrlr/propcontroller.cxx
(original)
+++ openoffice/trunk/main/extensions/source/propctrlr/propcontroller.cxx Mon
Jan 6 14:10:06 2014
@@ -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
Modified: openoffice/trunk/main/extensions/source/propctrlr/propertycomposer.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/extensions/source/propctrlr/propertycomposer.cxx?rev=1555789&r1=1555788&r2=1555789&view=diff
==============================================================================
--- openoffice/trunk/main/extensions/source/propctrlr/propertycomposer.cxx
(original)
+++ openoffice/trunk/main/extensions/source/propctrlr/propertycomposer.cxx Mon
Jan 6 14:10:06 2014
@@ -442,7 +442,7 @@ namespace pcr
if ( m_pUIRequestComposer.get() )
m_pUIRequestComposer->dispose();
- m_pUIRequestComposer.reset( NULL );
+ m_pUIRequestComposer.reset();
}
//--------------------------------------------------------------------
Modified:
openoffice/trunk/main/extensions/source/propctrlr/submissionhandler.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/extensions/source/propctrlr/submissionhandler.cxx?rev=1555789&r1=1555788&r2=1555789&view=diff
==============================================================================
--- openoffice/trunk/main/extensions/source/propctrlr/submissionhandler.cxx
(original)
+++ openoffice/trunk/main/extensions/source/propctrlr/submissionhandler.cxx Mon
Jan 6 14:10:06 2014
@@ -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
) )
{
Modified:
openoffice/trunk/main/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx?rev=1555789&r1=1555788&r2=1555789&view=diff
==============================================================================
---
openoffice/trunk/main/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
(original)
+++
openoffice/trunk/main/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
Mon Jan 6 14:10:06 2014
@@ -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();
}
//--------------------------------------------------------------------
Modified: openoffice/trunk/main/sc/source/core/data/documen3.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/core/data/documen3.cxx?rev=1555789&r1=1555788&r2=1555789&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/core/data/documen3.cxx (original)
+++ openoffice/trunk/main/sc/source/core/data/documen3.cxx Mon Jan 6 14:10:06
2014
@@ -1813,7 +1813,7 @@ void ScDocument::SetDocProtection(const
if (pProtect)
pDocProtection.reset(new ScDocProtection(*pProtect));
else
- pDocProtection.reset(NULL);
+ pDocProtection.reset();
}
sal_Bool ScDocument::IsDocProtected() const
Modified: openoffice/trunk/main/sc/source/core/data/dpsave.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/core/data/dpsave.cxx?rev=1555789&r1=1555788&r2=1555789&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/core/data/dpsave.cxx (original)
+++ openoffice/trunk/main/sc/source/core/data/dpsave.cxx Mon Jan 6 14:10:06
2014
@@ -165,7 +165,7 @@ const OUString* ScDPSaveMember::GetLayou
void ScDPSaveMember::RemoveLayoutName()
{
- mpLayoutName.reset(NULL);
+ mpLayoutName.reset();
}
void ScDPSaveMember::WriteToSource( const uno::Reference<uno::XInterface>&
xMember, sal_Int32 nPosition )
@@ -465,7 +465,7 @@ const OUString* ScDPSaveDimension::GetLa
void ScDPSaveDimension::RemoveLayoutName()
{
- mpLayoutName.reset(NULL);
+ mpLayoutName.reset();
}
void ScDPSaveDimension::SetReferenceValue(const
sheet::DataPilotFieldReference* pNew)
Modified: openoffice/trunk/main/sc/source/core/data/table5.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/core/data/table5.cxx?rev=1555789&r1=1555788&r2=1555789&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/core/data/table5.cxx (original)
+++ openoffice/trunk/main/sc/source/core/data/table5.cxx Mon Jan 6 14:10:06
2014
@@ -1031,7 +1031,7 @@ void ScTable::SetProtection(const ScTabl
if (pProtect)
pTabProtection.reset(new ScTableProtection(*pProtect));
else
- pTabProtection.reset(NULL);
+ pTabProtection.reset();
if (IsStreamValid())
SetStreamValid(sal_False);
Modified: openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleText.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleText.cxx?rev=1555789&r1=1555788&r2=1555789&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleText.cxx
(original)
+++ openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleText.cxx Mon Jan
6 14:10:06 2014
@@ -1891,7 +1891,7 @@ SvxTextForwarder* ScAccessibleCsvTextDat
mpTextForwarder.reset( new SvxEditEngineForwarder( *mpEditEngine )
);
}
else
- mpTextForwarder.reset( NULL );
+ mpTextForwarder.reset();
return mpTextForwarder.get();
}
Modified: openoffice/trunk/main/sc/source/ui/unoobj/chart2uno.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/unoobj/chart2uno.cxx?rev=1555789&r1=1555788&r2=1555789&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/unoobj/chart2uno.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/unoobj/chart2uno.cxx Mon Jan 6 14:10:06
2014
@@ -509,7 +509,7 @@ private:
void Chart2Positioner::invalidateGlue()
{
meGlue = GLUETYPE_NA;
- mpPositionMap.reset(NULL);
+ mpPositionMap.reset();
}
void Chart2Positioner::glueState()
@@ -700,7 +700,7 @@ void Chart2Positioner::glueState()
void Chart2Positioner::createPositionMap()
{
if (meGlue == GLUETYPE_NA && mpPositionMap.get())
- mpPositionMap.reset(NULL);
+ mpPositionMap.reset();
if (mpPositionMap.get())
return;
@@ -783,8 +783,8 @@ void Chart2Positioner::createPositionMap
}
nNoGlueRow += nRow2 - nRow1 + 1;
}
- pNewAddress.reset(NULL);
- pNewRowTable.reset(NULL);
+ pNewAddress.reset();
+ pNewRowTable.reset();
bool bFillRowHeader = mbRowHeaders;
bool bFillColumnHeader = mbColHeaders;
@@ -2758,7 +2758,7 @@ void ScChart2DataSequence::StopListening
for (; itr != itrEnd; ++itr)
pRefMgr->removeLinkListener(*itr, m_pExtRefListener.get());
- m_pExtRefListener.reset(NULL);
+ m_pExtRefListener.reset();
}
void ScChart2DataSequence::CopyData(const ScChart2DataSequence& r)
Modified:
openoffice/trunk/main/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx?rev=1555789&r1=1555788&r2=1555789&view=diff
==============================================================================
---
openoffice/trunk/main/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
(original)
+++
openoffice/trunk/main/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
Mon Jan 6 14:10:06 2014
@@ -166,7 +166,7 @@ void SAL_CALL AccessibleSlideSorterView:
comphelper::AccessibleEventNotifier::revokeClientNotifyDisposing(
mnClientId, *this );
mnClientId = 0;
}
- mpImpl.reset(NULL);
+ mpImpl.reset();
}
Modified: openoffice/trunk/main/sd/source/ui/tools/PreviewRenderer.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sd/source/ui/tools/PreviewRenderer.cxx?rev=1555789&r1=1555788&r2=1555789&view=diff
==============================================================================
--- openoffice/trunk/main/sd/source/ui/tools/PreviewRenderer.cxx (original)
+++ openoffice/trunk/main/sd/source/ui/tools/PreviewRenderer.cxx Mon Jan 6
14:10:06 2014
@@ -456,7 +456,7 @@ void PreviewRenderer::ProvideView (DrawD
if (pDocShell != mpDocShellOfView)
{
// Destroy the view that is connected to the current doc shell.
- mpView.reset (NULL);
+ mpView.reset();
// Switch our attention, i.e. listening for DYING events, to
// the new doc shell.
@@ -554,7 +554,7 @@ void PreviewRenderer::Notify(SfxBroadcas
// has to be destroyed as well. The next call to
// ProvideView will create a new one (for another
// doc shell, of course.)
- mpView.reset (NULL);
+ mpView.reset();
mpDocShellOfView = NULL;
}
}
Modified: openoffice/trunk/main/svx/source/form/formcontroller.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/form/formcontroller.cxx?rev=1555789&r1=1555788&r2=1555789&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/form/formcontroller.cxx (original)
+++ openoffice/trunk/main/svx/source/form/formcontroller.cxx Mon Jan 6
14:10:06 2014
@@ -2756,7 +2756,7 @@ void FormController::unload() throw( Run
m_bCanInsert = m_bCanUpdate = m_bCycle = sal_False;
m_bCurrentRecordModified = m_bCurrentRecordNew = m_bLocked = sal_False;
- m_pColumnInfoCache.reset( NULL );
+ m_pColumnInfoCache.reset();
}
//
-----------------------------------------------------------------------------
Modified: openoffice/trunk/main/toolkit/source/helper/formpdfexport.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/toolkit/source/helper/formpdfexport.cxx?rev=1555789&r1=1555788&r2=1555789&view=diff
==============================================================================
--- openoffice/trunk/main/toolkit/source/helper/formpdfexport.cxx (original)
+++ openoffice/trunk/main/toolkit/source/helper/formpdfexport.cxx Mon Jan 6
14:10:06 2014
@@ -283,7 +283,7 @@ namespace toolkitform
void TOOLKIT_DLLPUBLIC describePDFControl( const Reference< XControl >&
_rxControl,
::std::auto_ptr< ::vcl::PDFWriter::AnyWidget >& _rpDescriptor,
::vcl::PDFExtOutDevData& i_pdfExportData ) SAL_THROW(())
{
- _rpDescriptor.reset( NULL );
+ _rpDescriptor.reset();
OSL_ENSURE( _rxControl.is(), "describePDFControl: invalid (NULL)
control!" );
if ( !_rxControl.is() )
return;
Modified: openoffice/trunk/main/vcl/aqua/source/gdi/salbmp.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/gdi/salbmp.cxx?rev=1555789&r1=1555788&r2=1555789&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/aqua/source/gdi/salbmp.cxx (original)
+++ openoffice/trunk/main/vcl/aqua/source/gdi/salbmp.cxx Mon Jan 6 14:10:06
2014
@@ -268,7 +268,7 @@ bool AquaSalBitmap::AllocateUserData()
catch( const std::bad_alloc& )
{
DBG_ERROR( "vcl::AquaSalBitmap::AllocateUserData: bad alloc" );
- maUserBuffer.reset( NULL );
+ maUserBuffer.reset();
mnBytesPerRow = 0;
}
