[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - basic/source boost/makefile.mk boost/prj dbaccess/source dtrans/source extensions/source external_deps.lst sc/source sd/source svx/source toolkit/source vcl/aqua
Herbert Dürr
hdu at apache.org
Mon Jan 6 08:09:39 PST 2014
basic/source/comp/parser.cxx | 2
basic/source/comp/token.cxx | 6 +-
basic/source/inc/token.hxx | 2
boost/makefile.mk | 24 +++++------
boost/prj/d.lst | 22 ++++++++++
dbaccess/source/filter/xml/xmlservices.cxx | 5 +-
dbaccess/source/ui/dlg/generalpage.cxx | 4 -
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
external_deps.lst | 8 +--
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 | 10 ++--
sd/source/ui/accessibility/AccessibleSlideSorterView.cxx | 2
sd/source/ui/tools/PreviewRenderer.cxx | 4 -
svx/source/form/formcontroller.cxx | 2
toolkit/source/helper/formpdfexport.cxx | 2
vcl/aqua/source/gdi/salbmp.cxx | 2
26 files changed, 71 insertions(+), 50 deletions(-)
New commits:
commit 7fc467773e73586e5fb457eab043cb1823207900
Author: Herbert Dürr <hdu at apache.org>
Date: Mon Jan 6 15:58:21 2014 +0000
#i123964# reshuffle DLLEXPORT in dbaccess module
to fix the build with MSVC2008
diff --git a/dbaccess/source/filter/xml/xmlservices.cxx b/dbaccess/source/filter/xml/xmlservices.cxx
index 8165fb4..80d7626 100644
--- a/dbaccess/source/filter/xml/xmlservices.cxx
+++ b/dbaccess/source/filter/xml/xmlservices.cxx
@@ -65,7 +65,7 @@ extern "C" void SAL_CALL createRegistryInfo_dbaxml()
//---------------------------------------------------------------------------------------
-extern "C" void DBACCESS_DLLPUBLIC component_getImplementationEnvironment(
+extern "C" DBACCESS_DLLPUBLIC void component_getImplementationEnvironment(
const sal_Char **ppEnvTypeName,
uno_Environment **
)
@@ -75,7 +75,8 @@ extern "C" void DBACCESS_DLLPUBLIC component_getImplementationEnvironment(
}
//---------------------------------------------------------------------------------------
-extern "C" void* DBACCESS_DLLPUBLIC component_getFactory(
+
+extern "C" DBACCESS_DLLPUBLIC void* component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/)
commit 04d077d34bd6ed991a279ea5921a8afbcd3993f2
Author: Herbert Dürr <hdu at apache.org>
Date: Mon Jan 6 14:11:28 2014 +0000
#i123817# update boost library to version 1.55
diff --git a/boost/makefile.mk b/boost/makefile.mk
index f77f15a..309d0a8 100644
--- a/boost/makefile.mk
+++ b/boost/makefile.mk
@@ -34,24 +34,18 @@ TARGET=ooo_boost
.INCLUDE : settings.mk
-# force patched boost for sunpro CC
-# to workaround opt bug when compiling with -xO3
-.IF "$(SYSTEM_BOOST)" == "YES" && ("$(OS)"!="SOLARIS" || "$(COM)"=="GCC")
+.IF "$(SYSTEM_BOOST)" == "YES"
+
all:
@echo "An already available installation of boost should exist on your system."
@echo "Therefore the version provided here does not need to be built in addition."
-.ELSE # "$(SYSTEM_BOOST)" == "YES" && ("$(OS)"!="SOLARIS" || "$(COM)"=="GCC")
+
+.ELSE # "$(SYSTEM_BOOST)" == "YES"
# --- Files --------------------------------------------------------
-TARFILE_NAME=boost_1_48_0
-TARFILE_MD5=d1e9a7a7f532bb031a3c175d86688d95
-PATCH_FILES=\
- $(TARFILE_NAME).patch \
- boost_freebsd.patch
-.IF "$(GUI)"=="OS2"
-PATCH_FILES+=boost-os2.patch
-.ENDIF
+TARFILE_NAME=boost_1_55_0
+TARFILE_MD5=d6eef4b4cacb2183f2bf265a5a03a354
CONFIGURE_DIR=
CONFIGURE_ACTION=
@@ -93,6 +87,7 @@ $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/concept $(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/concept_check $(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/config $(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/container $(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/date_time $(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/detail $(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/dynamic_bitset $(INCCOM)$/$(PRJNAME)
@@ -128,6 +123,7 @@ $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/optional $(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/parameter $(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/pending $(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/predef $(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/phoenix $(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/polygon $(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/pool $(INCCOM)$/$(PRJNAME)
@@ -167,4 +163,6 @@ $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
normalize: $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
$(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : normalize
-.ENDIF # "$(SYSTEM_BOOST)" == "YES" && ("$(OS)"!="SOLARIS" || "$(COM)"=="GCC")
+
+.ENDIF # "$(SYSTEM_BOOST)" == "YES"
+
diff --git a/boost/prj/d.lst b/boost/prj/d.lst
index 898b926..0b21f94 100644
--- a/boost/prj/d.lst
+++ b/boost/prj/d.lst
@@ -314,6 +314,7 @@ mkdir: %_DEST%\inc%_EXT%\boost\math\special_functions\detail
mkdir: %_DEST%\inc%_EXT%\boost\math\tools
mkdir: %_DEST%\inc%_EXT%\boost\math\tools\detail
mkdir: %_DEST%\inc%_EXT%\boost\move
+mkdir: %_DEST%\inc%_EXT%\boost\move\detail
mkdir: %_DEST%\inc%_EXT%\boost\mpi
mkdir: %_DEST%\inc%_EXT%\boost\mpi\collectives
mkdir: %_DEST%\inc%_EXT%\boost\mpi\detail
@@ -430,6 +431,15 @@ mkdir: %_DEST%\inc%_EXT%\boost\polygon
mkdir: %_DEST%\inc%_EXT%\boost\polygon\detail
mkdir: %_DEST%\inc%_EXT%\boost\pool
mkdir: %_DEST%\inc%_EXT%\boost\pool\detail
+mkdir: %_DEST%\inc%_EXT%\boost\predef
+mkdir: %_DEST%\inc%_EXT%\boost\predef\architecture
+mkdir: %_DEST%\inc%_EXT%\boost\predef\architecture\x86
+mkdir: %_DEST%\inc%_EXT%\boost\predef\detail
+mkdir: %_DEST%\inc%_EXT%\boost\predef\library
+mkdir: %_DEST%\inc%_EXT%\boost\predef\library\c
+mkdir: %_DEST%\inc%_EXT%\boost\predef\os
+mkdir: %_DEST%\inc%_EXT%\boost\predef\os\bsd
+mkdir: %_DEST%\inc%_EXT%\boost\predef\other
mkdir: %_DEST%\inc%_EXT%\boost\preprocessor
mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\arithmetic
mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\arithmetic\detail
@@ -466,6 +476,7 @@ mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\seq\detail
mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\slot
mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\slot\detail
mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\tuple
+mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\variadic
mkdir: %_DEST%\inc%_EXT%\boost\program_options
mkdir: %_DEST%\inc%_EXT%\boost\program_options\detail
mkdir: %_DEST%\inc%_EXT%\boost\property_map
@@ -1038,6 +1049,7 @@ mkdir: %_DEST%\inc%_EXT%\boost\xpressive\traits\detail
..\%__SRC%\inc\boost\math\tools\* %_DEST%\inc%_EXT%\boost\math\tools
..\%__SRC%\inc\boost\math\tools\detail\* %_DEST%\inc%_EXT%\boost\math\tools\detail
..\%__SRC%\inc\boost\move\* %_DEST%\inc%_EXT%\boost\move
+..\%__SRC%\inc\boost\move\detail\* %_DEST%\inc%_EXT%\boost\move\detail
..\%__SRC%\inc\boost\mpi\* %_DEST%\inc%_EXT%\boost\mpi
..\%__SRC%\inc\boost\mpi\collectives\* %_DEST%\inc%_EXT%\boost\mpi\collectives
..\%__SRC%\inc\boost\mpi\detail\* %_DEST%\inc%_EXT%\boost\mpi\detail
@@ -1149,6 +1161,15 @@ mkdir: %_DEST%\inc%_EXT%\boost\xpressive\traits\detail
..\%__SRC%\inc\boost\polygon\detail\* %_DEST%\inc%_EXT%\boost\polygon\detail
..\%__SRC%\inc\boost\pool\* %_DEST%\inc%_EXT%\boost\pool
..\%__SRC%\inc\boost\pool\detail\* %_DEST%\inc%_EXT%\boost\pool\detail
+..\%__SRC%\inc\boost\predef\* %_DEST%\inc%_EXT%\boost\predef
+..\%__SRC%\inc\boost\predef\architecture\* %_DEST%\inc%_EXT%\boost\predef\architecture
+..\%__SRC%\inc\boost\predef\architecture\x86\* %_DEST%\inc%_EXT%\boost\predef\architecture\x86
+..\%__SRC%\inc\boost\predef\detail\* %_DEST%\inc%_EXT%\boost\predef\detail
+..\%__SRC%\inc\boost\predef\library\* %_DEST%\inc%_EXT%\boost\predef\library
+..\%__SRC%\inc\boost\predef\library\c\* %_DEST%\inc%_EXT%\boost\predef\library\c
+..\%__SRC%\inc\boost\predef\os\* %_DEST%\inc%_EXT%\boost\predef\os
+..\%__SRC%\inc\boost\predef\os\bsd\* %_DEST%\inc%_EXT%\boost\predef\os\bsd
+..\%__SRC%\inc\boost\predef\other\* %_DEST%\inc%_EXT%\boost\predef\other
..\%__SRC%\inc\boost\preprocessor\arithmetic\* %_DEST%\inc%_EXT%\boost\preprocessor\arithmetic
..\%__SRC%\inc\boost\preprocessor\arithmetic\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\arithmetic\detail
..\%__SRC%\inc\boost\preprocessor\array\* %_DEST%\inc%_EXT%\boost\preprocessor\array
@@ -1185,6 +1206,7 @@ mkdir: %_DEST%\inc%_EXT%\boost\xpressive\traits\detail
..\%__SRC%\inc\boost\preprocessor\slot\* %_DEST%\inc%_EXT%\boost\preprocessor\slot
..\%__SRC%\inc\boost\preprocessor\slot\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\slot\detail
..\%__SRC%\inc\boost\preprocessor\tuple\* %_DEST%\inc%_EXT%\boost\preprocessor\tuple
+..\%__SRC%\inc\boost\preprocessor\variadic\* %_DEST%\inc%_EXT%\boost\preprocessor\variadic
..\%__SRC%\inc\boost\program_options\* %_DEST%\inc%_EXT%\boost\program_options
..\%__SRC%\inc\boost\program_options\detail\* %_DEST%\inc%_EXT%\boost\program_options\detail
..\%__SRC%\inc\boost\property_map\* %_DEST%\inc%_EXT%\boost\property_map
diff --git a/external_deps.lst b/external_deps.lst
index 2aaafd4..9931b57 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -204,10 +204,10 @@ if (SYSTEM_PYTHON != YES)
URL1 = http://www.python.org/ftp/python/2.7.5/Python-2.7.5.tar.bz2
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
-if (SYSTEM_BOOST!=YES || (OS==SOLARIS && COM!=GCC))
- MD5 = d1e9a7a7f532bb031a3c175d86688d95
- name = boost_1_48_0.tar.bz2
- URL1 = http://sourceforge.net/projects/boost/files/boost/1.48.0/boost_1_48_0.tar.bz2/download
+if (SYSTEM_BOOST != YES)
+ MD5 = d6eef4b4cacb2183f2bf265a5a03a354
+ name = boost_1_55_0.tar.bz2
+ URL1 = http://sourceforge.net/projects/boost/files/boost/1.55.0/boost_1_55_0.tar.bz2/download
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_VIGRA != YES)
commit c31988351c10e9f3fd783730d95da34efd52c153
Author: Herbert Dürr <hdu at apache.org>
Date: Mon Jan 6 14:10:06 2014 +0000
#i123817# prepare codebase for updating to boost 1.55
diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx
index d9b8512..85c4920 100644
--- a/basic/source/comp/parser.cxx
+++ b/basic/source/comp/parser.cxx
@@ -752,7 +752,7 @@ void SbiParser::Option()
{
switch( Next() )
{
- case EXPLICIT:
+ case BASIC_EXPLICIT:
bExplicit = sal_True; break;
case BASE:
if( Next() == NUMBER )
diff --git a/basic/source/comp/token.cxx b/basic/source/comp/token.cxx
index 6d45b5a..bf8c5ef 100644
--- a/basic/source/comp/token.cxx
+++ b/basic/source/comp/token.cxx
@@ -102,7 +102,7 @@ static TokenTable aTokTable_Basic [] = { // Token-Tabelle:
{ ERASE, "Erase" },
{ _ERROR_, "Error" },
{ EXIT, "Exit" },
- { EXPLICIT, "Explicit" },
+ { BASIC_EXPLICIT, "Explicit" },
{ FOR, "For" },
{ FUNCTION, "Function" },
{ GET, "Get" },
@@ -272,7 +272,7 @@ TokenTable aTokTable_Java [] = { // Token-Tabelle:
{ 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;
diff --git a/basic/source/inc/token.hxx b/basic/source/inc/token.hxx
index ffb8eaf..0a7847e 100644
--- a/basic/source/inc/token.hxx
+++ b/basic/source/inc/token.hxx
@@ -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,
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index 4855457..117db27 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -147,8 +147,8 @@ namespace dbaui
//-------------------------------------------------------------------------
OGeneralPage::~OGeneralPage()
{
- m_pDatasourceType.reset( NULL );
- m_pLB_DocumentList.reset( NULL );
+ m_pDatasourceType.reset();
+ m_pLB_DocumentList.reset();
}
//-------------------------------------------------------------------------
diff --git a/dtrans/source/win32/clipb/WinClipboard.cxx b/dtrans/source/win32/clipb/WinClipboard.cxx
index 3ea3311..e272b16 100644
--- a/dtrans/source/win32/clipb/WinClipboard.cxx
+++ b/dtrans/source/win32/clipb/WinClipboard.cxx
@@ -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();
}
// -------------------------------------------------
diff --git a/extensions/source/logging/filehandler.cxx b/extensions/source/logging/filehandler.cxx
index 86efbb5..bcedcca 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 068204f..d6e3b8d0 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 2aba960..3263f4c3 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 1c52b77..6fb7c74 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 772fdf1..ef12dd9 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 98f899e..2ee6a99 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 fb5e8b6..4e97ca5 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();
}
//--------------------------------------------------------------------
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 487eb94..739028c 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -1813,7 +1813,7 @@ void ScDocument::SetDocProtection(const ScDocProtection* pProtect)
if (pProtect)
pDocProtection.reset(new ScDocProtection(*pProtect));
else
- pDocProtection.reset(NULL);
+ pDocProtection.reset();
}
sal_Bool ScDocument::IsDocProtected() const
diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx
index 0f444da..707031d 100644
--- a/sc/source/core/data/dpsave.cxx
+++ b/sc/source/core/data/dpsave.cxx
@@ -165,7 +165,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 )
@@ -465,7 +465,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 43445b6..3d16680 100644
--- a/sc/source/core/data/table5.cxx
+++ b/sc/source/core/data/table5.cxx
@@ -1031,7 +1031,7 @@ void ScTable::SetProtection(const ScTableProtection* pProtect)
if (pProtect)
pTabProtection.reset(new ScTableProtection(*pProtect));
else
- pTabProtection.reset(NULL);
+ pTabProtection.reset();
if (IsStreamValid())
SetStreamValid(sal_False);
diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx
index cb33b7d..840084d 100644
--- a/sc/source/ui/Accessibility/AccessibleText.cxx
+++ b/sc/source/ui/Accessibility/AccessibleText.cxx
@@ -1891,7 +1891,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 dc82298..a9e8c1e 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -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::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 d566c89..16c5233 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
@@ -166,7 +166,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 2c85e50..d9cdeaa 100644
--- a/sd/source/ui/tools/PreviewRenderer.cxx
+++ b/sd/source/ui/tools/PreviewRenderer.cxx
@@ -456,7 +456,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.
@@ -554,7 +554,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/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index ce7ec6c..10a090a 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -2756,7 +2756,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 164c59d..89834c8 100644
--- a/toolkit/source/helper/formpdfexport.cxx
+++ b/toolkit/source/helper/formpdfexport.cxx
@@ -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;
diff --git a/vcl/aqua/source/gdi/salbmp.cxx b/vcl/aqua/source/gdi/salbmp.cxx
index 7020537..834eeab 100644
--- a/vcl/aqua/source/gdi/salbmp.cxx
+++ b/vcl/aqua/source/gdi/salbmp.cxx
@@ -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;
}
More information about the Libreoffice-commits
mailing list