[Libreoffice-commits] core.git: basic/source dtrans/source extensions/source sc/source sd/source svx/source toolkit/source vcl/quartz
Herbert Dürr
hdu at apache.org
Mon Jan 6 08:32:42 PST 2014
basic/source/comp/parser.cxx | 2 -
basic/source/comp/token.cxx | 4 +-
basic/source/inc/token.hxx | 2 -
dtrans/source/win32/clipb/WinClipboard.cxx | 2 -
extensions/source/logging/filehandler.cxx | 2 -
extensions/source/propctrlr/composeduiupdate.cxx | 2 -
extensions/source/propctrlr/eformspropertyhandler.cxx | 2 -
extensions/source/propctrlr/propcontroller.cxx | 2 -
extensions/source/propctrlr/propertycomposer.cxx | 2 -
extensions/source/propctrlr/submissionhandler.cxx | 2 -
extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx | 2 -
sc/source/core/data/documen3.cxx | 2 -
sc/source/core/data/dpsave.cxx | 4 +-
sc/source/core/data/table5.cxx | 2 -
sc/source/ui/Accessibility/AccessibleText.cxx | 2 -
sc/source/ui/unoobj/chart2uno.cxx | 6 +--
sd/source/ui/accessibility/AccessibleSlideSorterView.cxx | 2 -
sd/source/ui/tools/PreviewRenderer.cxx | 4 +-
svx/source/dialog/svxruler.cxx | 18 +++++------
svx/source/form/formcontroller.cxx | 2 -
toolkit/source/helper/formpdfexport.cxx | 2 -
vcl/quartz/salbmp.cxx | 2 -
22 files changed, 35 insertions(+), 35 deletions(-)
New commits:
commit 9e77ddcd19d328c54ed0fb3ebb83f585b85f0249
Author: Herbert Dürr <hdu at apache.org>
Date: Mon Jan 6 14:10:06 2014 +0000
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
diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx
index da4420b..a132e89 100644
--- a/basic/source/comp/parser.cxx
+++ b/basic/source/comp/parser.cxx
@@ -758,7 +758,7 @@ void SbiParser::Option()
{
switch( Next() )
{
- case EXPLICIT:
+ case BASIC_EXPLICIT:
bExplicit = true; break;
case BASE:
if( Next() == NUMBER )
diff --git a/basic/source/comp/token.cxx b/basic/source/comp/token.cxx
index bc0519d..d283f2e 100644
--- a/basic/source/comp/token.cxx
+++ b/basic/source/comp/token.cxx
@@ -96,7 +96,7 @@ static const TokenTable aTokTable_Basic [] = {
{ ERASE, "Erase" },
{ _ERROR_, "Error" },
{ EXIT, "Exit" },
- { EXPLICIT, "Explicit" },
+ { BASIC_EXPLICIT, "Explicit" },
{ FOR, "For" },
{ FUNCTION, "Function" },
{ GET, "Get" },
@@ -192,7 +192,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;
diff --git a/basic/source/inc/token.hxx b/basic/source/inc/token.hxx
index cb40559..0b6482a 100644
--- a/basic/source/inc/token.hxx
+++ b/basic/source/inc/token.hxx
@@ -89,7 +89,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,
// from here there are JavaScript-tokens (same enum so that same type)
FIRSTJAVA,
diff --git a/dtrans/source/win32/clipb/WinClipboard.cxx b/dtrans/source/win32/clipb/WinClipboard.cxx
index cd08ec6..59bc8be 100644
--- a/dtrans/source/win32/clipb/WinClipboard.cxx
+++ b/dtrans/source/win32/clipb/WinClipboard.cxx
@@ -265,7 +265,7 @@ void SAL_CALL CWinClipboard::disposing()
m_pImpl->dispose( );
// force destruction of the impl class
- m_pImpl.reset( NULL );
+ m_pImpl.reset();
}
// -------------------------------------------------
diff --git a/extensions/source/logging/filehandler.cxx b/extensions/source/logging/filehandler.cxx
index e600315..d2dc622 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 87a174b..1a32827 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 8d1417f..4eb7996 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 0992781..6e84232 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 2fe8c56..cbc14a3 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 c2d2003..bdb8a10 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 54ce977..edf7f6e 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();
}
//--------------------------------------------------------------------
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 0b68138..2fda595 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -1810,7 +1810,7 @@ void ScDocument::SetDocProtection(const ScDocProtection* pProtect)
if (pProtect)
pDocProtection.reset(new ScDocProtection(*pProtect));
else
- pDocProtection.reset(NULL);
+ pDocProtection.reset();
}
bool ScDocument::IsDocProtected() const
diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx
index c0328ce..420baa3 100644
--- a/sc/source/core/data/dpsave.cxx
+++ b/sc/source/core/data/dpsave.cxx
@@ -137,7 +137,7 @@ const OUString* ScDPSaveMember::GetLayoutName() const
void ScDPSaveMember::RemoveLayoutName()
{
- mpLayoutName.reset(NULL);
+ mpLayoutName.reset();
}
void ScDPSaveMember::WriteToSource( const uno::Reference<uno::XInterface>& xMember, sal_Int32 nPosition )
@@ -447,7 +447,7 @@ const OUString* ScDPSaveDimension::GetLayoutName() const
void ScDPSaveDimension::RemoveLayoutName()
{
- mpLayoutName.reset(NULL);
+ mpLayoutName.reset();
}
void ScDPSaveDimension::SetReferenceValue(const sheet::DataPilotFieldReference* pNew)
diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx
index 8c8d6bf..e3545f7 100644
--- a/sc/source/core/data/table5.cxx
+++ b/sc/source/core/data/table5.cxx
@@ -1059,7 +1059,7 @@ void ScTable::SetProtection(const ScTableProtection* pProtect)
if (pProtect)
pTabProtection.reset(new ScTableProtection(*pProtect));
else
- pTabProtection.reset(NULL);
+ pTabProtection.reset();
if (IsStreamValid())
SetStreamValid(false);
diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx
index 7907bb6..c852311 100644
--- a/sc/source/ui/Accessibility/AccessibleText.cxx
+++ b/sc/source/ui/Accessibility/AccessibleText.cxx
@@ -1757,7 +1757,7 @@ SvxTextForwarder* ScAccessibleCsvTextData::GetTextForwarder()
mpTextForwarder.reset( new SvxEditEngineForwarder( *mpEditEngine ) );
}
else
- mpTextForwarder.reset( NULL );
+ mpTextForwarder.reset();
return mpTextForwarder.get();
}
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index c1d20ed..53e6fc1 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -499,7 +499,7 @@ private:
void Chart2Positioner::invalidateGlue()
{
meGlue = GLUETYPE_NA;
- mpPositionMap.reset(NULL);
+ mpPositionMap.reset();
}
void Chart2Positioner::glueState()
@@ -708,7 +708,7 @@ void Chart2Positioner::calcGlueState(SCCOL nColSize, SCROW nRowSize)
void Chart2Positioner::createPositionMap()
{
if (meGlue == GLUETYPE_NA && mpPositionMap.get())
- mpPositionMap.reset(NULL);
+ mpPositionMap.reset();
if (mpPositionMap.get())
return;
@@ -2771,7 +2771,7 @@ void ScChart2DataSequence::StopListeningToAllExternalRefs()
for (; itr != itrEnd; ++itr)
pRefMgr->removeLinkListener(*itr, m_pExtRefListener.get());
- m_pExtRefListener.reset(NULL);
+ m_pExtRefListener.reset();
}
void ScChart2DataSequence::CopyData(const ScChart2DataSequence& r)
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
index 30f7fde..02ca215 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
@@ -171,7 +171,7 @@ void SAL_CALL AccessibleSlideSorterView::disposing (void)
comphelper::AccessibleEventNotifier::revokeClientNotifyDisposing( mnClientId, *this );
mnClientId = 0;
}
- mpImpl.reset(NULL);
+ mpImpl.reset();
}
diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx
index aa40d46..21642e5 100644
--- a/sd/source/ui/tools/PreviewRenderer.cxx
+++ b/sd/source/ui/tools/PreviewRenderer.cxx
@@ -441,7 +441,7 @@ void PreviewRenderer::ProvideView (DrawDocShell* pDocShell)
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.
@@ -543,7 +543,7 @@ void PreviewRenderer::Notify(SfxBroadcaster&, const SfxHint& rHint)
// 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;
}
}
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 4d027bb..7c75ca0 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -674,7 +674,7 @@ void SvxRuler::UpdateFrame(const SvxLongLRSpaceItem *pItem) // new value LRSpace
if(pItem)
mpLRSpaceItem.reset(new SvxLongLRSpaceItem(*pItem));
else
- mpLRSpaceItem.reset(NULL);
+ mpLRSpaceItem.reset();
StartListening_Impl();
}
}
@@ -687,7 +687,7 @@ void SvxRuler::UpdateFrameMinMax(const SfxRectangleItem *pItem) // value for Min
if(pItem)
mpMinMaxItem.reset(new SfxRectangleItem(*pItem));
else
- mpMinMaxItem.reset(NULL);
+ mpMinMaxItem.reset();
}
}
@@ -700,7 +700,7 @@ void SvxRuler::UpdateFrame(const SvxLongULSpaceItem *pItem) // new value
if(pItem)
mpULSpaceItem.reset(new SvxLongULSpaceItem(*pItem));
else
- mpULSpaceItem.reset(NULL);
+ mpULSpaceItem.reset();
StartListening_Impl();
}
}
@@ -746,7 +746,7 @@ void SvxRuler::Update(
//if mpColumnItem is already set with one of the ids then a NULL pItem argument
//must not delete it
{
- mpColumnItem.reset(NULL);
+ mpColumnItem.reset();
mpRulerImpl->bIsTableRows = sal_False;
}
StartListening_Impl();
@@ -908,7 +908,7 @@ void SvxRuler::UpdatePara(const SvxLRSpaceItem *pItem) // new value of paragraph
if(pItem)
mpParaItem.reset(new SvxLRSpaceItem(*pItem));
else
- mpParaItem.reset(NULL);
+ mpParaItem.reset();
StartListening_Impl();
}
}
@@ -921,7 +921,7 @@ void SvxRuler::UpdateParaBorder(const SvxLRSpaceItem * pItem )
if(pItem)
mpParaBorderItem.reset(new SvxLRSpaceItem(*pItem));
else
- mpParaBorderItem.reset(NULL);
+ mpParaBorderItem.reset();
StartListening_Impl();
}
}
@@ -989,7 +989,7 @@ void SvxRuler::Update(const SvxPagePosSizeItem *pItem) // new value of page attr
if(pItem)
mpPagePosItem.reset(new SvxPagePosSizeItem(*pItem));
else
- mpPagePosItem.reset(NULL);
+ mpPagePosItem.reset();
StartListening_Impl();
}
}
@@ -1185,7 +1185,7 @@ void SvxRuler::Update(const SvxTabStopItem *pItem) // new value for tabs
}
else
{
- mpTabStopItem.reset(NULL);
+ mpTabStopItem.reset();
}
StartListening_Impl();
}
@@ -1199,7 +1199,7 @@ void SvxRuler::Update(const SvxObjectItem *pItem) // new value for objects
if(pItem)
mpObjectItem.reset(new SvxObjectItem(*pItem));
else
- mpObjectItem.reset(NULL);
+ mpObjectItem.reset();
StartListening_Impl();
}
}
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 68a7a36..810838a 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -2731,7 +2731,7 @@ void FormController::unload() throw( RuntimeException )
m_bCanInsert = m_bCanUpdate = m_bCycle = sal_False;
m_bCurrentRecordModified = m_bCurrentRecordNew = m_bLocked = sal_False;
- m_pColumnInfoCache.reset( NULL );
+ m_pColumnInfoCache.reset();
}
// -----------------------------------------------------------------------------
diff --git a/toolkit/source/helper/formpdfexport.cxx b/toolkit/source/helper/formpdfexport.cxx
index 2ad6900..8fc3b96 100644
--- a/toolkit/source/helper/formpdfexport.cxx
+++ b/toolkit/source/helper/formpdfexport.cxx
@@ -257,7 +257,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;
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index 933bd2b..d3246df 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -280,7 +280,7 @@ bool QuartzSalBitmap::AllocateUserData()
catch( const std::bad_alloc& )
{
OSL_FAIL( "vcl::QuartzSalBitmap::AllocateUserData: bad alloc" );
- maUserBuffer.reset( static_cast<sal_uInt8*>(NULL) );
+ maUserBuffer.reset();
mnBytesPerRow = 0;
}
More information about the Libreoffice-commits
mailing list