[Libreoffice-commits] .: binfilter/bf_forms
binfilter/bf_forms/source/component/Image.hxx |2 -- 1 file changed, 2 deletions(-) New commits: commit 4630cdd4990593733872a264e8abf031fa144e1f Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jun 7 09:24:45 2012 +0200 Disentangle disposing using Change-Id: I4ad806521063c9e6699488cdb52cec349fe9dfe6 diff --git a/binfilter/bf_forms/source/component/Image.hxx b/binfilter/bf_forms/source/component/Image.hxx index 09d86fa..2863013 100644 --- a/binfilter/bf_forms/source/component/Image.hxx +++ b/binfilter/bf_forms/source/component/Image.hxx @@ -185,8 +185,6 @@ public: // ::com::sun::star::beans::XPropertyChangeListener virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent ) throw(::com::sun::star::uno::RuntimeException); -using OControl::disposing; - protected: ::com::sun::star::uno::Reference ::com::sun::star::frame::XModel getXModel(const InterfaceRef xIface) const; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_forms binfilter/bf_sc binfilter/bf_sfx2 binfilter/bf_sw binfilter/bf_xmloff binfilter/inc
binfilter/bf_forms/source/component/forms_FormattedField.cxx |4 +--
binfilter/bf_sc/source/filter/xml/XMLExportIterator.hxx| 12
+-
binfilter/bf_sc/source/filter/xml/sc_xmlstyle.cxx |2 -
binfilter/bf_sfx2/source/appl/imestatuswindow.hxx |7 +
binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx|6 ++---
binfilter/bf_xmloff/source/chart/PropertyMap.hxx |2 -
binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx|2 -
binfilter/bf_xmloff/source/forms/xmloff_controlpropertymap.cxx |2 -
binfilter/bf_xmloff/source/style/xmloff_PageMasterStyleMap.cxx |2 -
binfilter/bf_xmloff/source/text/xmloff_txtprmap.cxx|4 +--
binfilter/inc/bf_sch/schopt.hxx|2 -
11 files changed, 21 insertions(+), 24 deletions(-)
New commits:
commit 042f74a90557ab312ce6e7d7925204ba531adbe9
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Mar 29 12:00:29 2012 +0200
GCC 4.7 -Werror=deprecated, -Werror=narrowing
diff --git a/binfilter/bf_forms/source/component/forms_FormattedField.cxx
b/binfilter/bf_forms/source/component/forms_FormattedField.cxx
index 2edab09..be08344 100644
--- a/binfilter/bf_forms/source/component/forms_FormattedField.cxx
+++ b/binfilter/bf_forms/source/component/forms_FormattedField.cxx
@@ -97,8 +97,8 @@ public:
StandardFormatsSupplier(const ReferenceXMultiServiceFactory
_rxFactory,LanguageType _eSysLanguage);
operator ReferenceXNumberFormatsSupplier ();
-SvNumberFormatsSupplierObj::operator new;
-SvNumberFormatsSupplierObj::operator delete;
+using SvNumberFormatsSupplierObj::operator new;
+using SvNumberFormatsSupplierObj::operator delete;
protected:
~StandardFormatsSupplier() { if (m_pMyPrivateFormatter) delete
m_pMyPrivateFormatter; }
diff --git a/binfilter/bf_sc/source/filter/xml/XMLExportIterator.hxx
b/binfilter/bf_sc/source/filter/xml/XMLExportIterator.hxx
index d6a0f07..000fb60 100644
--- a/binfilter/bf_sc/source/filter/xml/XMLExportIterator.hxx
+++ b/binfilter/bf_sc/source/filter/xml/XMLExportIterator.hxx
@@ -96,7 +96,7 @@ public:
ScMyShapesContainer();
virtual ~ScMyShapesContainer();
-ScMyIteratorBase::UpdateAddress;
+using ScMyIteratorBase::UpdateAddress;
voidAddNewShape(const ScMyShape aShape);
sal_BoolHasShapes() { return !aShapeList.empty(); }
const ScMyShapeList*GetShapes() { return aShapeList; }
@@ -127,7 +127,7 @@ public:
virtual ~ScMyMergedRangesContainer();
voidAddRange(const
::com::sun::star::table::CellRangeAddress aMergedRange);
-ScMyIteratorBase::UpdateAddress;
+using ScMyIteratorBase::UpdateAddress;
virtual voidSetCellData( ScMyCell rMyCell );
virtual voidSort(); // + remove doublets
};
@@ -167,7 +167,7 @@ public:
inline void AddNewAreaLink( const ScMyAreaLink rAreaLink )
{ aAreaLinkList.push_back( rAreaLink ); }
-ScMyIteratorBase::UpdateAddress;
+using ScMyIteratorBase::UpdateAddress;
virtual voidSetCellData( ScMyCell rMyCell );
virtual voidSort();
};
@@ -193,7 +193,7 @@ public:
virtual ~ScMyEmptyDatabaseRangesContainer();
voidAddNewEmptyDatabaseRange(const
::com::sun::star::table::CellRangeAddress aCellRangeAddress);
-ScMyIteratorBase::UpdateAddress;
+using ScMyIteratorBase::UpdateAddress;
virtual voidSetCellData( ScMyCell rMyCell );
virtual voidSort();
};
@@ -228,7 +228,7 @@ public:
const ScRange rSourceRange,
sal_Bool bHasError );
-ScMyIteratorBase::UpdateAddress;
+using ScMyIteratorBase::UpdateAddress;
virtual voidSetCellData( ScMyCell rMyCell );
virtual voidSort();
};
@@ -258,7 +258,7 @@ public:
voidAddOperation( ScDetOpType eOpType, const
ScAddress rPosition, sal_uInt32 nIndex );
-ScMyIteratorBase::UpdateAddress;
+using ScMyIteratorBase::UpdateAddress;
virtual voidSetCellData( ScMyCell rMyCell );
virtual voidSort();
};
diff --git a/binfilter/bf_sc/source/filter/xml/sc_xmlstyle.cxx
b/binfilter/bf_sc/source/filter/xml/sc_xmlstyle.cxx
index a359233..3c88c16 100644
---
[Libreoffice-commits] .: binfilter/bf_forms binfilter/bf_sc binfilter/bf_sch binfilter/bf_xmloff binfilter/inc
binfilter/bf_forms/source/component/forms_DatabaseForm.cxx |4 -
binfilter/bf_sc/source/core/tool/sc_compiler.cxx |6 -
binfilter/bf_sc/source/filter/xml/sc_xmlconti.cxx |2
binfilter/bf_sch/source/core/sch_memchrt.cxx | 30 -
binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx| 34 --
binfilter/bf_xmloff/source/forms/xmloff_elementimport.cxx | 18 ++---
binfilter/bf_xmloff/source/forms/xmloff_layerimport.cxx|6 -
binfilter/bf_xmloff/source/forms/xmloff_propertyexport.cxx |6 -
binfilter/bf_xmloff/source/forms/xmloff_propertyimport.cxx | 42 ++---
binfilter/bf_xmloff/source/meta/xmloff_xmlmetai.cxx|2
binfilter/inc/bf_sch/memchrt.hxx |2
11 files changed, 74 insertions(+), 78 deletions(-)
New commits:
commit 34c2ec87db4b6962ded661157056c58163e39821
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Sep 27 20:23:45 2011 +0200
Removed uses of rtl::O[U]String[Buffer]::operator sal_{char|Unicode} const
*().
diff --git a/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx
b/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx
index 8e72ef0..55ac80e 100644
--- a/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx
+++ b/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx
@@ -1245,8 +1245,8 @@ bool
ODatabaseForm::fillParameters(::osl::ResettableMutexGuard _rClearForNotifi
}
catch( const Exception )
{
-OSL_FAIL( ::rtl::OString(
ODatabaseForm::fillParameters: master-detail parameter number )
-+= ::rtl::OString::valueOf(
sal_Int32(aFind-second + 1) ));
+OSL_FAIL( (::rtl::OString(
ODatabaseForm::fillParameters: master-detail parameter number )
+ += ::rtl::OString::valueOf(
sal_Int32(aFind-second + 1) )).getStr() );
}
++aFind;
}
diff --git a/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
b/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
index 73d6ae7..dbb3a44 100644
--- a/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
@@ -2992,7 +2992,7 @@ namespace binfilter {
/*N*/ {
/*N*/ ::rtl::OUStringBuffer aBuffer;
/*N*/ ScToken* p = CreateStringFromToken( aBuffer, pInToken,
bAllowArrAdvance );
-/*N*/ rFormula += aBuffer;
+/*N*/ rFormula += aBuffer.makeStringAndClear();
/*N*/ return p;
/*N*/ }
@@ -3140,7 +3140,7 @@ namespace binfilter {
/*?*/ break;
/*?*/ }
/*N*/ if ( aBuffer.getLength() )
-/*N*/ rBuffer.append(aBuffer);
+/*N*/ rBuffer.append(aBuffer.makeStringAndClear());
/*N*/ else
/*?*/ rBuffer.append(ScGlobal::GetRscString(STR_NO_NAME_REF));
/*N*/ break;
@@ -3177,7 +3177,7 @@ namespace binfilter {
/*N*/ {
/*N*/ ::rtl::OUStringBuffer aBuffer( pArr-GetLen() * 2 );
/*N*/ CreateStringFromTokenArray( aBuffer );
-/*N*/ rFormula = aBuffer;
+/*N*/ rFormula = aBuffer.makeStringAndClear();
/*N*/ }
/*N*/ void ScCompiler::CreateStringFromTokenArray( ::rtl::OUStringBuffer
rBuffer )
diff --git a/binfilter/bf_sc/source/filter/xml/sc_xmlconti.cxx
b/binfilter/bf_sc/source/filter/xml/sc_xmlconti.cxx
index 2d1e506..0c297aa 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_xmlconti.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_xmlconti.cxx
@@ -100,7 +100,7 @@ void ScXMLContentContext::Characters( const
::rtl::OUString rChars )
void ScXMLContentContext::EndElement()
{
-sValue.append(sOUText);
+sValue.append(sOUText.toString());
}
}
diff --git a/binfilter/bf_sch/source/core/sch_memchrt.cxx
b/binfilter/bf_sch/source/core/sch_memchrt.cxx
index a8967e7..bf5e151 100644
--- a/binfilter/bf_sch/source/core/sch_memchrt.cxx
+++ b/binfilter/bf_sch/source/core/sch_memchrt.cxx
@@ -686,41 +686,39 @@ using namespace ::com::sun::star;
//
-/*N*/ ::rtl::OUStringBuffer SchMemChart::getXMLStringForCellAddress( const
SchCellAddress rCell )
+/*N*/ void SchMemChart::getXMLStringForCellAddress( const SchCellAddress
rCell, rtl::OUStringBuffer * output )
/*N*/ {
-/*N*/ ::rtl::OUStringBuffer aBuffer;
+/*N*/ OSL_ASSERT(output != 0);
/*N*/ ::std::vector SchSingleCell ::const_iterator aIter;
/*N*/ const ::std::vector SchSingleCell ::const_iterator aEndIter =
rCell.maCells.end();
/*N*/
/*N*/ for( aIter = rCell.maCells.begin(); aIter != aEndIter; aIter++ )
/*N*/ {
/*N*/ sal_Int32 nCol = aIter-mnColumn;
-/*N*/ aBuffer.append( (sal_Unicode)'.' );
+/*N*/ output-append( (sal_Unicode)'.' );
/*N*/ if( ! aIter-mbRelativeColumn )
