View | Details | Raw Unified | Return to issue 123817
Collapse All | Expand All

(-)main/boost/makefile.mk (-13 / +11 lines)
Lines 34-57 TARGET=ooo_boost Link Here
34
34
35
.INCLUDE :	settings.mk
35
.INCLUDE :	settings.mk
36
36
37
# force patched boost for sunpro CC
37
.IF "$(SYSTEM_BOOST)" == "YES"
38
# to workaround opt bug when compiling with -xO3
38
39
.IF "$(SYSTEM_BOOST)" == "YES" && ("$(OS)"!="SOLARIS" || "$(COM)"=="GCC")
40
all:
39
all:
41
	@echo "Therefore the version provided here does not need to be built in addition."
40
	@echo "Therefore the version provided here does not need to be built in addition."
42
.ELSE			# "$(SYSTEM_BOOST)" == "YES" && ("$(OS)"!="SOLARIS" || "$(COM)"=="GCC")
41
42
.ELSE # "$(SYSTEM_BOOST)" == "YES"
43
43
44
# --- Files --------------------------------------------------------
44
# --- Files --------------------------------------------------------
45
45
46
TARFILE_NAME=boost_1_48_0
46
TARFILE_NAME=boost_1_55_0
47
TARFILE_MD5=d1e9a7a7f532bb031a3c175d86688d95
47
TARFILE_MD5=d6eef4b4cacb2183f2bf265a5a03a354
48
PATCH_FILES=\
49
	$(TARFILE_NAME).patch \
50
	boost_freebsd.patch
51
.IF "$(GUI)"=="OS2"
52
PATCH_FILES+=boost-os2.patch
53
.ENDIF
54
48
55
CONFIGURE_DIR=
49
CONFIGURE_DIR=
56
CONFIGURE_ACTION=
50
CONFIGURE_ACTION=
Lines 93-98 $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE) Link Here
93
    @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/concept $(INCCOM)$/$(PRJNAME)
87
    @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/concept $(INCCOM)$/$(PRJNAME)
94
    @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/concept_check $(INCCOM)$/$(PRJNAME)
88
    @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/concept_check $(INCCOM)$/$(PRJNAME)
95
    @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/config $(INCCOM)$/$(PRJNAME)
89
    @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/config $(INCCOM)$/$(PRJNAME)
90
    @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/container $(INCCOM)$/$(PRJNAME)
96
    @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/date_time $(INCCOM)$/$(PRJNAME)
91
    @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/date_time $(INCCOM)$/$(PRJNAME)
97
    @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/detail $(INCCOM)$/$(PRJNAME)
92
    @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/detail $(INCCOM)$/$(PRJNAME)
98
    @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/dynamic_bitset $(INCCOM)$/$(PRJNAME)
93
    @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/dynamic_bitset $(INCCOM)$/$(PRJNAME)
Lines 128-133 $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE) Link Here
128
    @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/optional $(INCCOM)$/$(PRJNAME)
123
    @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/optional $(INCCOM)$/$(PRJNAME)
129
    @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/parameter $(INCCOM)$/$(PRJNAME)
124
    @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/parameter $(INCCOM)$/$(PRJNAME)
130
    @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/pending $(INCCOM)$/$(PRJNAME)
125
    @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/pending $(INCCOM)$/$(PRJNAME)
126
    @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/predef $(INCCOM)$/$(PRJNAME)
131
    @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/phoenix $(INCCOM)$/$(PRJNAME)
127
    @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/phoenix $(INCCOM)$/$(PRJNAME)
132
    @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/polygon $(INCCOM)$/$(PRJNAME)
128
    @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/polygon $(INCCOM)$/$(PRJNAME)
133
    @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/pool $(INCCOM)$/$(PRJNAME)
129
    @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/pool $(INCCOM)$/$(PRJNAME)
Lines 167-170 $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE) Link Here
167
normalize: $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
163
normalize: $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
168
164
169
$(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : normalize
165
$(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : normalize
170
.ENDIF			# "$(SYSTEM_BOOST)" == "YES" && ("$(OS)"!="SOLARIS" || "$(COM)"=="GCC")
166
167
.ENDIF # "$(SYSTEM_BOOST)" == "YES"
168
(-)main/boost/prj/d.lst (+18 lines)
Lines 314-319 mkdir: %_DEST%\inc%_EXT%\boost\math\special_functions\detail Link Here
314
mkdir: %_DEST%\inc%_EXT%\boost\math\tools
314
mkdir: %_DEST%\inc%_EXT%\boost\math\tools
315
mkdir: %_DEST%\inc%_EXT%\boost\math\tools\detail
315
mkdir: %_DEST%\inc%_EXT%\boost\math\tools\detail
316
mkdir: %_DEST%\inc%_EXT%\boost\move
316
mkdir: %_DEST%\inc%_EXT%\boost\move
317
mkdir: %_DEST%\inc%_EXT%\boost\move\detail
317
mkdir: %_DEST%\inc%_EXT%\boost\mpi
318
mkdir: %_DEST%\inc%_EXT%\boost\mpi
318
mkdir: %_DEST%\inc%_EXT%\boost\mpi\collectives
319
mkdir: %_DEST%\inc%_EXT%\boost\mpi\collectives
319
mkdir: %_DEST%\inc%_EXT%\boost\mpi\detail
320
mkdir: %_DEST%\inc%_EXT%\boost\mpi\detail
Lines 430-435 mkdir: %_DEST%\inc%_EXT%\boost\polygon Link Here
430
mkdir: %_DEST%\inc%_EXT%\boost\polygon\detail
431
mkdir: %_DEST%\inc%_EXT%\boost\polygon\detail
431
mkdir: %_DEST%\inc%_EXT%\boost\pool
432
mkdir: %_DEST%\inc%_EXT%\boost\pool
432
mkdir: %_DEST%\inc%_EXT%\boost\pool\detail
433
mkdir: %_DEST%\inc%_EXT%\boost\pool\detail
434
mkdir: %_DEST%\inc%_EXT%\boost\predef
435
mkdir: %_DEST%\inc%_EXT%\boost\predef\detail
436
mkdir: %_DEST%\inc%_EXT%\boost\predef\library
437
mkdir: %_DEST%\inc%_EXT%\boost\predef\library\c
438
mkdir: %_DEST%\inc%_EXT%\boost\predef\os
439
mkdir: %_DEST%\inc%_EXT%\boost\predef\os\bsd
440
mkdir: %_DEST%\inc%_EXT%\boost\predef\other
433
mkdir: %_DEST%\inc%_EXT%\boost\preprocessor
441
mkdir: %_DEST%\inc%_EXT%\boost\preprocessor
434
mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\arithmetic
442
mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\arithmetic
435
mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\arithmetic\detail
443
mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\arithmetic\detail
Lines 466-471 mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\seq\detail Link Here
466
mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\slot
474
mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\slot
467
mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\slot\detail
475
mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\slot\detail
468
mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\tuple
476
mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\tuple
477
mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\variadic
469
mkdir: %_DEST%\inc%_EXT%\boost\program_options
478
mkdir: %_DEST%\inc%_EXT%\boost\program_options
470
mkdir: %_DEST%\inc%_EXT%\boost\program_options\detail
479
mkdir: %_DEST%\inc%_EXT%\boost\program_options\detail
471
mkdir: %_DEST%\inc%_EXT%\boost\property_map
480
mkdir: %_DEST%\inc%_EXT%\boost\property_map
Lines 1038-1043 mkdir: %_DEST%\inc%_EXT%\boost\xpressive\traits\detail Link Here
1038
..\%__SRC%\inc\boost\math\tools\* %_DEST%\inc%_EXT%\boost\math\tools
1047
..\%__SRC%\inc\boost\math\tools\* %_DEST%\inc%_EXT%\boost\math\tools
1039
..\%__SRC%\inc\boost\math\tools\detail\* %_DEST%\inc%_EXT%\boost\math\tools\detail
1048
..\%__SRC%\inc\boost\math\tools\detail\* %_DEST%\inc%_EXT%\boost\math\tools\detail
1040
..\%__SRC%\inc\boost\move\* %_DEST%\inc%_EXT%\boost\move
1049
..\%__SRC%\inc\boost\move\* %_DEST%\inc%_EXT%\boost\move
1050
..\%__SRC%\inc\boost\move\detail\* %_DEST%\inc%_EXT%\boost\move\detail
1041
..\%__SRC%\inc\boost\mpi\* %_DEST%\inc%_EXT%\boost\mpi
1051
..\%__SRC%\inc\boost\mpi\* %_DEST%\inc%_EXT%\boost\mpi
1042
..\%__SRC%\inc\boost\mpi\collectives\* %_DEST%\inc%_EXT%\boost\mpi\collectives
1052
..\%__SRC%\inc\boost\mpi\collectives\* %_DEST%\inc%_EXT%\boost\mpi\collectives
1043
..\%__SRC%\inc\boost\mpi\detail\* %_DEST%\inc%_EXT%\boost\mpi\detail
1053
..\%__SRC%\inc\boost\mpi\detail\* %_DEST%\inc%_EXT%\boost\mpi\detail
Lines 1149-1154 mkdir: %_DEST%\inc%_EXT%\boost\xpressive\traits\detail Link Here
1149
..\%__SRC%\inc\boost\polygon\detail\* %_DEST%\inc%_EXT%\boost\polygon\detail
1159
..\%__SRC%\inc\boost\polygon\detail\* %_DEST%\inc%_EXT%\boost\polygon\detail
1150
..\%__SRC%\inc\boost\pool\* %_DEST%\inc%_EXT%\boost\pool
1160
..\%__SRC%\inc\boost\pool\* %_DEST%\inc%_EXT%\boost\pool
1151
..\%__SRC%\inc\boost\pool\detail\* %_DEST%\inc%_EXT%\boost\pool\detail
1161
..\%__SRC%\inc\boost\pool\detail\* %_DEST%\inc%_EXT%\boost\pool\detail
1162
..\%__SRC%\inc\boost\predef\* %_DEST%\inc%_EXT%\boost\predef
1163
..\%__SRC%\inc\boost\predef\detail\* %_DEST%\inc%_EXT%\boost\predef\detail
1164
..\%__SRC%\inc\boost\predef\library\* %_DEST%\inc%_EXT%\boost\predef\library
1165
..\%__SRC%\inc\boost\predef\library\c\* %_DEST%\inc%_EXT%\boost\predef\library\c
1166
..\%__SRC%\inc\boost\predef\os\* %_DEST%\inc%_EXT%\boost\predef\os
1167
..\%__SRC%\inc\boost\predef\os\bsd\* %_DEST%\inc%_EXT%\boost\predef\os\bsd
1168
..\%__SRC%\inc\boost\predef\other\* %_DEST%\inc%_EXT%\boost\predef\other
1152
..\%__SRC%\inc\boost\preprocessor\arithmetic\* %_DEST%\inc%_EXT%\boost\preprocessor\arithmetic
1169
..\%__SRC%\inc\boost\preprocessor\arithmetic\* %_DEST%\inc%_EXT%\boost\preprocessor\arithmetic
1153
..\%__SRC%\inc\boost\preprocessor\arithmetic\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\arithmetic\detail
1170
..\%__SRC%\inc\boost\preprocessor\arithmetic\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\arithmetic\detail
1154
..\%__SRC%\inc\boost\preprocessor\array\* %_DEST%\inc%_EXT%\boost\preprocessor\array
1171
..\%__SRC%\inc\boost\preprocessor\array\* %_DEST%\inc%_EXT%\boost\preprocessor\array
Lines 1185-1190 mkdir: %_DEST%\inc%_EXT%\boost\xpressive\traits\detail Link Here
1185
..\%__SRC%\inc\boost\preprocessor\slot\* %_DEST%\inc%_EXT%\boost\preprocessor\slot
1202
..\%__SRC%\inc\boost\preprocessor\slot\* %_DEST%\inc%_EXT%\boost\preprocessor\slot
1186
..\%__SRC%\inc\boost\preprocessor\slot\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\slot\detail
1203
..\%__SRC%\inc\boost\preprocessor\slot\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\slot\detail
1187
..\%__SRC%\inc\boost\preprocessor\tuple\* %_DEST%\inc%_EXT%\boost\preprocessor\tuple
1204
..\%__SRC%\inc\boost\preprocessor\tuple\* %_DEST%\inc%_EXT%\boost\preprocessor\tuple
1205
..\%__SRC%\inc\boost\preprocessor\variadic\* %_DEST%\inc%_EXT%\boost\preprocessor\variadic
1188
..\%__SRC%\inc\boost\program_options\* %_DEST%\inc%_EXT%\boost\program_options
1206
..\%__SRC%\inc\boost\program_options\* %_DEST%\inc%_EXT%\boost\program_options
1189
..\%__SRC%\inc\boost\program_options\detail\* %_DEST%\inc%_EXT%\boost\program_options\detail
1207
..\%__SRC%\inc\boost\program_options\detail\* %_DEST%\inc%_EXT%\boost\program_options\detail
1190
..\%__SRC%\inc\boost\property_map\* %_DEST%\inc%_EXT%\boost\property_map
1208
..\%__SRC%\inc\boost\property_map\* %_DEST%\inc%_EXT%\boost\property_map
(-)main/external_deps.lst (-4 / +4 lines)
Lines 204-213 if (SYSTEM_PYTHON != YES) Link Here
204
    URL1 = http://www.python.org/ftp/python/2.7.5/Python-2.7.5.tar.bz2
204
    URL1 = http://www.python.org/ftp/python/2.7.5/Python-2.7.5.tar.bz2
205
    URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
205
    URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
206
206
207
if (SYSTEM_BOOST!=YES || (OS==SOLARIS && COM!=GCC))
207
if (SYSTEM_BOOST != YES)
208
    MD5 = d1e9a7a7f532bb031a3c175d86688d95
208
    MD5 = d6eef4b4cacb2183f2bf265a5a03a354
209
    name = boost_1_48_0.tar.bz2
209
    name = boost_1_55_0.tar.bz2
210
    URL1 = http://sourceforge.net/projects/boost/files/boost/1.48.0/boost_1_48_0.tar.bz2/download
210
    URL1 = http://sourceforge.net/projects/boost/files/boost/1.55.0/boost_1_55_0.tar.bz2/download
211
    URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
211
    URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
212
212
213
if (SYSTEM_VIGRA != YES)
213
if (SYSTEM_VIGRA != YES)
(-)main/dbaccess/source/ui/dlg/generalpage.cxx (-2 / +2 lines)
Lines 147-154 namespace dbaui Link Here
147
    //-------------------------------------------------------------------------
147
    //-------------------------------------------------------------------------
148
    OGeneralPage::~OGeneralPage()
148
    OGeneralPage::~OGeneralPage()
149
    {
149
    {
150
        m_pDatasourceType.reset( NULL );
150
        m_pDatasourceType.reset();
151
        m_pLB_DocumentList.reset( NULL );
151
        m_pLB_DocumentList.reset();
152
    }
152
    }
153
153
154
    //-------------------------------------------------------------------------
154
    //-------------------------------------------------------------------------
(-)main/dtrans/source/win32/clipb/WinClipboard.cxx (-1 / +1 lines)
Lines 278-284 void SAL_CALL CWinClipboard::disposing() Link Here
278
	m_pImpl->dispose( );
278
	m_pImpl->dispose( );
279
279
280
	// force destruction of the impl class
280
	// force destruction of the impl class
281
	m_pImpl.reset( NULL );
281
	m_pImpl.reset();
282
}
282
}
283
283
284
// -------------------------------------------------
284
// -------------------------------------------------
(-)main/extensions/source/logging/filehandler.cxx (-1 / +1 lines)
Lines 257-263 namespace logging Link Here
257
                impl_writeString_nothrow( sTail );
257
                impl_writeString_nothrow( sTail );
258
        }
258
        }
259
259
260
        m_pFile.reset( NULL );
260
        m_pFile.reset();
261
        m_aHandlerHelper.setFormatter( NULL );
261
        m_aHandlerHelper.setFormatter( NULL );
262
    }
262
    }
263
263
(-)main/extensions/source/propctrlr/composeduiupdate.cxx (-1 / +1 lines)
Lines 835-841 namespace pcr Link Here
835
        {
835
        {
836
            singleUI->second->dispose();
836
            singleUI->second->dispose();
837
        }
837
        }
838
        m_pCollectedUIs.reset( NULL );
838
        m_pCollectedUIs.reset();
839
        m_xDelegatorUI.set( NULL );
839
        m_xDelegatorUI.set( NULL );
840
    }
840
    }
841
841
(-)main/extensions/source/propctrlr/eformspropertyhandler.cxx (-1 / +1 lines)
Lines 289-295 namespace pcr Link Here
289
        if ( EFormsHelper::isEForm( xDocument ) )
289
        if ( EFormsHelper::isEForm( xDocument ) )
290
            m_pHelper.reset( new EFormsHelper( m_aMutex, m_xComponent, xDocument ) );
290
            m_pHelper.reset( new EFormsHelper( m_aMutex, m_xComponent, xDocument ) );
291
        else
291
        else
292
            m_pHelper.reset( NULL );
292
            m_pHelper.reset();
293
    }
293
    }
294
294
295
    //--------------------------------------------------------------------
295
    //--------------------------------------------------------------------
(-)main/extensions/source/propctrlr/propcontroller.cxx (-1 / +1 lines)
Lines 917-923 namespace pcr Link Here
917
        // handlers are obsolete, so is our "composer" for their UI requests
917
        // handlers are obsolete, so is our "composer" for their UI requests
918
        if ( m_pUIRequestComposer.get() )
918
        if ( m_pUIRequestComposer.get() )
919
            m_pUIRequestComposer->dispose();
919
            m_pUIRequestComposer->dispose();
920
        m_pUIRequestComposer.reset( NULL );
920
        m_pUIRequestComposer.reset();
921
921
922
        // clean up the property handlers
922
        // clean up the property handlers
923
        PropertyHandlerArray aAllHandlers;  // will contain every handler exactly once
923
        PropertyHandlerArray aAllHandlers;  // will contain every handler exactly once
(-)main/extensions/source/propctrlr/propertycomposer.cxx (-1 / +1 lines)
Lines 442-448 namespace pcr Link Here
442
442
443
        if ( m_pUIRequestComposer.get() )
443
        if ( m_pUIRequestComposer.get() )
444
            m_pUIRequestComposer->dispose();
444
            m_pUIRequestComposer->dispose();
445
        m_pUIRequestComposer.reset( NULL );
445
        m_pUIRequestComposer.reset();
446
    }
446
    }
447
447
448
    //--------------------------------------------------------------------
448
    //--------------------------------------------------------------------
(-)main/extensions/source/propctrlr/submissionhandler.cxx (-1 / +1 lines)
Lines 258-264 namespace pcr Link Here
258
        Reference< frame::XModel > xDocument( impl_getContextDocument_nothrow() );
258
        Reference< frame::XModel > xDocument( impl_getContextDocument_nothrow() );
259
        DBG_ASSERT( xDocument.is(), "SubmissionPropertyHandler::onNewComponent: no document!" );
259
        DBG_ASSERT( xDocument.is(), "SubmissionPropertyHandler::onNewComponent: no document!" );
260
260
261
        m_pHelper.reset( NULL );
261
        m_pHelper.reset();
262
262
263
        if ( SubmissionHelper::canTriggerSubmissions( m_xComponent, xDocument ) )
263
        if ( SubmissionHelper::canTriggerSubmissions( m_xComponent, xDocument ) )
264
        {
264
        {
(-)main/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx (-1 / +1 lines)
Lines 175-181 namespace pcr Link Here
175
        if ( EFormsHelper::isEForm( xDocument ) )
175
        if ( EFormsHelper::isEForm( xDocument ) )
176
            m_pHelper.reset( new XSDValidationHelper( m_aMutex, m_xComponent, xDocument ) );
176
            m_pHelper.reset( new XSDValidationHelper( m_aMutex, m_xComponent, xDocument ) );
177
        else
177
        else
178
            m_pHelper.reset( NULL );
178
            m_pHelper.reset();
179
    }
179
    }
180
180
181
    //--------------------------------------------------------------------
181
    //--------------------------------------------------------------------
(-)main/sc/source/core/data/documen3.cxx (-1 / +1 lines)
Lines 1813-1819 void ScDocument::SetDocProtection(const ScDocProtection* pProtect) Link Here
1813
    if (pProtect)
1813
    if (pProtect)
1814
        pDocProtection.reset(new ScDocProtection(*pProtect));
1814
        pDocProtection.reset(new ScDocProtection(*pProtect));
1815
    else
1815
    else
1816
        pDocProtection.reset(NULL);
1816
        pDocProtection.reset();
1817
}
1817
}
1818
1818
1819
sal_Bool ScDocument::IsDocProtected() const
1819
sal_Bool ScDocument::IsDocProtected() const
(-)main/sc/source/core/data/dpsave.cxx (-2 / +2 lines)
Lines 165-171 const OUString* ScDPSaveMember::GetLayoutName() const Link Here
165
165
166
void ScDPSaveMember::RemoveLayoutName()
166
void ScDPSaveMember::RemoveLayoutName()
167
{
167
{
168
    mpLayoutName.reset(NULL);
168
    mpLayoutName.reset();
169
}
169
}
170
170
171
void ScDPSaveMember::WriteToSource( const uno::Reference<uno::XInterface>& xMember, sal_Int32 nPosition )
171
void ScDPSaveMember::WriteToSource( const uno::Reference<uno::XInterface>& xMember, sal_Int32 nPosition )
Lines 465-471 const OUString* ScDPSaveDimension::GetLayoutName() const Link Here
465
465
466
void ScDPSaveDimension::RemoveLayoutName()
466
void ScDPSaveDimension::RemoveLayoutName()
467
{
467
{
468
    mpLayoutName.reset(NULL);
468
    mpLayoutName.reset();
469
}
469
}
470
470
471
void ScDPSaveDimension::SetReferenceValue(const sheet::DataPilotFieldReference* pNew)
471
void ScDPSaveDimension::SetReferenceValue(const sheet::DataPilotFieldReference* pNew)
(-)main/sc/source/core/data/table5.cxx (-1 / +1 lines)
Lines 1031-1037 void ScTable::SetProtection(const ScTableProtection* pProtect) Link Here
1031
    if (pProtect)
1031
    if (pProtect)
1032
        pTabProtection.reset(new ScTableProtection(*pProtect));
1032
        pTabProtection.reset(new ScTableProtection(*pProtect));
1033
    else
1033
    else
1034
        pTabProtection.reset(NULL);
1034
        pTabProtection.reset();
1035
1035
1036
    if (IsStreamValid())
1036
    if (IsStreamValid())
1037
        SetStreamValid(sal_False);
1037
        SetStreamValid(sal_False);
(-)main/sc/source/ui/Accessibility/AccessibleText.cxx (-1 / +1 lines)
Lines 1891-1897 SvxTextForwarder* ScAccessibleCsvTextData::GetTextForwarder() Link Here
1891
            mpTextForwarder.reset( new SvxEditEngineForwarder( *mpEditEngine ) );
1891
            mpTextForwarder.reset( new SvxEditEngineForwarder( *mpEditEngine ) );
1892
    }
1892
    }
1893
    else
1893
    else
1894
        mpTextForwarder.reset( NULL );
1894
        mpTextForwarder.reset();
1895
    return mpTextForwarder.get();
1895
    return mpTextForwarder.get();
1896
}
1896
}
1897
1897
(-)main/sc/source/ui/unoobj/chart2uno.cxx (-5 / +5 lines)
Lines 509-515 private: Link Here
509
void Chart2Positioner::invalidateGlue()
509
void Chart2Positioner::invalidateGlue()
510
{
510
{
511
    meGlue = GLUETYPE_NA;
511
    meGlue = GLUETYPE_NA;
512
    mpPositionMap.reset(NULL);
512
    mpPositionMap.reset();
513
}
513
}
514
514
515
void Chart2Positioner::glueState()
515
void Chart2Positioner::glueState()
Lines 700-706 void Chart2Positioner::glueState() Link Here
700
void Chart2Positioner::createPositionMap()
700
void Chart2Positioner::createPositionMap()
701
{
701
{
702
    if (meGlue == GLUETYPE_NA && mpPositionMap.get())
702
    if (meGlue == GLUETYPE_NA && mpPositionMap.get())
703
        mpPositionMap.reset(NULL);
703
        mpPositionMap.reset();
704
704
705
    if (mpPositionMap.get())
705
    if (mpPositionMap.get())
706
        return;
706
        return;
Lines 783-790 void Chart2Positioner::createPositionMap() Link Here
783
        }
783
        }
784
        nNoGlueRow += nRow2 - nRow1 + 1;
784
        nNoGlueRow += nRow2 - nRow1 + 1;
785
    }
785
    }
786
    pNewAddress.reset(NULL);
786
    pNewAddress.reset();
787
    pNewRowTable.reset(NULL);
787
    pNewRowTable.reset();
788
788
789
    bool bFillRowHeader = mbRowHeaders;
789
    bool bFillRowHeader = mbRowHeaders;
790
    bool bFillColumnHeader = mbColHeaders;
790
    bool bFillColumnHeader = mbColHeaders;
Lines 2758-2764 void ScChart2DataSequence::StopListeningToAllExternalRefs() Link Here
2758
    for (; itr != itrEnd; ++itr)
2758
    for (; itr != itrEnd; ++itr)
2759
        pRefMgr->removeLinkListener(*itr, m_pExtRefListener.get());
2759
        pRefMgr->removeLinkListener(*itr, m_pExtRefListener.get());
2760
2760
2761
    m_pExtRefListener.reset(NULL);
2761
    m_pExtRefListener.reset();
2762
}
2762
}
2763
2763
2764
void ScChart2DataSequence::CopyData(const ScChart2DataSequence& r)
2764
void ScChart2DataSequence::CopyData(const ScChart2DataSequence& r)
(-)main/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx (-1 / +1 lines)
Lines 166-172 void SAL_CALL AccessibleSlideSorterView::disposing (void) Link Here
166
        comphelper::AccessibleEventNotifier::revokeClientNotifyDisposing( mnClientId, *this );
166
        comphelper::AccessibleEventNotifier::revokeClientNotifyDisposing( mnClientId, *this );
167
        mnClientId = 0;
167
        mnClientId = 0;
168
    }
168
    }
169
    mpImpl.reset(NULL);
169
    mpImpl.reset();
170
}
170
}
171
171
172
172
(-)main/sd/source/ui/tools/PreviewRenderer.cxx (-2 / +2 lines)
Lines 456-462 void PreviewRenderer::ProvideView (DrawDocShell* pDocShell) Link Here
456
    if (pDocShell != mpDocShellOfView)
456
    if (pDocShell != mpDocShellOfView)
457
    {
457
    {
458
        // Destroy the view that is connected to the current doc shell.
458
        // Destroy the view that is connected to the current doc shell.
459
        mpView.reset (NULL);
459
        mpView.reset();
460
460
461
        // Switch our attention, i.e. listening for DYING events, to
461
        // Switch our attention, i.e. listening for DYING events, to
462
        // the new doc shell.
462
        // the new doc shell.
Lines 554-560 void PreviewRenderer::Notify(SfxBroadcaster&, const SfxHint& rHint) Link Here
554
            // has to be destroyed as well.  The next call to
554
            // has to be destroyed as well.  The next call to
555
            // ProvideView will create a new one (for another
555
            // ProvideView will create a new one (for another
556
            // doc shell, of course.)
556
            // doc shell, of course.)
557
            mpView.reset (NULL);
557
            mpView.reset();
558
            mpDocShellOfView = NULL;
558
            mpDocShellOfView = NULL;
559
        }
559
        }
560
    }
560
    }
(-)main/svx/source/form/formcontroller.cxx (-1 / +1 lines)
Lines 2756-2762 void FormController::unload() throw( RuntimeException ) Link Here
2756
    m_bCanInsert = m_bCanUpdate = m_bCycle = sal_False;
2756
    m_bCanInsert = m_bCanUpdate = m_bCycle = sal_False;
2757
    m_bCurrentRecordModified = m_bCurrentRecordNew = m_bLocked = sal_False;
2757
    m_bCurrentRecordModified = m_bCurrentRecordNew = m_bLocked = sal_False;
2758
2758
2759
    m_pColumnInfoCache.reset( NULL );
2759
    m_pColumnInfoCache.reset();
2760
}
2760
}
2761
2761
2762
// -----------------------------------------------------------------------------
2762
// -----------------------------------------------------------------------------
(-)main/toolkit/source/helper/formpdfexport.cxx (-1 / +1 lines)
Lines 283-289 namespace toolkitform Link Here
283
    void TOOLKIT_DLLPUBLIC describePDFControl( const Reference< XControl >& _rxControl,
283
    void TOOLKIT_DLLPUBLIC describePDFControl( const Reference< XControl >& _rxControl,
284
        ::std::auto_ptr< ::vcl::PDFWriter::AnyWidget >& _rpDescriptor, ::vcl::PDFExtOutDevData& i_pdfExportData ) SAL_THROW(())
284
        ::std::auto_ptr< ::vcl::PDFWriter::AnyWidget >& _rpDescriptor, ::vcl::PDFExtOutDevData& i_pdfExportData ) SAL_THROW(())
285
    {
285
    {
286
        _rpDescriptor.reset( NULL );
286
        _rpDescriptor.reset();
287
        OSL_ENSURE( _rxControl.is(), "describePDFControl: invalid (NULL) control!" );
287
        OSL_ENSURE( _rxControl.is(), "describePDFControl: invalid (NULL) control!" );
288
        if ( !_rxControl.is() )
288
        if ( !_rxControl.is() )
289
            return;
289
            return;
(-)main/vcl/aqua/source/gdi/salbmp.cxx (-1 / +1 lines)
Lines 268-274 bool AquaSalBitmap::AllocateUserData() Link Here
268
    catch( const std::bad_alloc& )
268
    catch( const std::bad_alloc& )
269
    {
269
    {
270
        DBG_ERROR( "vcl::AquaSalBitmap::AllocateUserData: bad alloc" );
270
        DBG_ERROR( "vcl::AquaSalBitmap::AllocateUserData: bad alloc" );
271
        maUserBuffer.reset( NULL );
271
        maUserBuffer.reset();
272
        mnBytesPerRow = 0;
272
        mnBytesPerRow = 0;
273
    }
273
    }
274
	
274
	

Return to issue 123817