[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 6 commits - binfilter/bf_basic binfilter/bf_forms binfilter/bf_sc binfilter/bf_sd binfilter/bf_sfx2 binfilter/bf_sw binfilter/bf_xmloff binfilter/inc
Michael Stahl
mst at kemper.freedesktop.org
Fri Aug 3 03:53:10 PDT 2012
binfilter/bf_basic/source/inc/sbintern.hxx | 1
binfilter/bf_forms/source/component/forms_FormattedField.cxx | 4 +-
binfilter/bf_forms/source/inc/InterfaceContainer.hxx | 3 +
binfilter/bf_forms/source/inc/property.hxx | 2 +
binfilter/bf_sc/source/core/tool/sc_interpr3.cxx | 13 ++++++++
binfilter/bf_sc/source/core/tool/sc_interpr5.cxx | 2 -
binfilter/bf_sc/source/core/tool/sc_rangeutl.cxx | 2 -
binfilter/bf_sc/source/filter/xml/XMLExportIterator.hxx | 12 +++----
binfilter/bf_sc/source/filter/xml/XMLStylesExportHelper.hxx | 6 +--
binfilter/bf_sc/source/filter/xml/sc_xmlstyle.cxx | 2 -
binfilter/bf_sc/source/ui/unoobj/sc_miscuno.cxx | 1
binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx | 4 ++
binfilter/bf_sfx2/source/appl/imestatuswindow.hxx | 7 +---
binfilter/bf_sw/source/core/inc/flowfrm.hxx | 2 +
binfilter/bf_sw/source/core/inc/swcache.hxx | 2 -
binfilter/bf_sw/source/core/inc/txmsrt.hxx | 16 ++++++----
binfilter/bf_sw/source/core/ole/sw_ndole.cxx | 2 -
binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx | 6 +--
binfilter/bf_sw/source/core/txtnode/sw_fntcap.cxx | 9 +++++
binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx | 8 ++---
binfilter/bf_sw/source/filter/excel/sw_excimpop.cxx | 2 -
binfilter/bf_sw/source/filter/sw6/sw6file.hxx | 2 -
binfilter/bf_xmloff/source/chart/MultiPropertySetHandler.hxx | 4 ++
binfilter/bf_xmloff/source/chart/PropertyMap.hxx | 2 -
binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx | 2 -
binfilter/bf_xmloff/source/forms/callbacks.hxx | 15 +++++++++
binfilter/bf_xmloff/source/forms/elementexport.hxx | 8 +++--
binfilter/bf_xmloff/source/forms/eventimport.hxx | 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_basic/basmgr.hxx | 3 +
binfilter/inc/bf_basic/sbxfac.hxx | 1
binfilter/inc/bf_goodies/b3dlight.hxx | 4 ++
binfilter/inc/bf_goodies/b3dtrans.hxx | 6 +++
binfilter/inc/bf_goodies/matril3d.hxx | 2 +
binfilter/inc/bf_sc/conditio.hxx | 2 -
binfilter/inc/bf_sch/schopt.hxx | 2 -
binfilter/inc/bf_sd/sdfilter.hxx | 2 -
binfilter/inc/bf_sfx2/cfgitem.hxx | 7 ++--
binfilter/inc/bf_sfx2/evntconf.hxx | 2 +
binfilter/inc/bf_so3/ipenv.hxx | 3 +
binfilter/inc/bf_so3/transprt.hxx | 3 +
binfilter/inc/bf_starmath/utility.hxx | 5 +--
binfilter/inc/bf_svtools/itemprop.hxx | 2 +
binfilter/inc/bf_svtools/wallitem.hxx | 1
binfilter/inc/bf_svx/camera3d.hxx | 2 +
binfilter/inc/bf_svx/fmdmod.hxx | 2 +
binfilter/inc/bf_svx/numitem.hxx | 4 --
binfilter/inc/bf_svx/svdetc.hxx | 1
binfilter/inc/bf_svx/svdio.hxx | 2 -
binfilter/inc/bf_svx/unomaster.hxx | 3 +
binfilter/inc/bf_svx/unomod.hxx | 2 +
binfilter/inc/bf_svx/unoprov.hxx | 3 +
binfilter/inc/bf_svx/viewpt3d.hxx | 2 +
binfilter/inc/bf_sw/TextCursorHelper.hxx | 7 +++-
binfilter/inc/bf_sw/cellfml.hxx | 2 +
binfilter/inc/bf_sw/index.hxx | 2 -
binfilter/inc/bf_sw/printdata.hxx | 2 +
binfilter/inc/bf_sw/swcrsr.hxx | 3 +
binfilter/inc/bf_sw/unocoll.hxx | 2 +
binfilter/inc/bf_sw/viscrs.hxx | 2 -
binfilter/inc/bf_xmloff/txtvfldi.hxx | 2 +
63 files changed, 173 insertions(+), 64 deletions(-)
New commits:
commit fa8666dda27e401fdf6b7defb7ed03b7daf0cb8f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 13 11:09:45 2012 +0000
WaE: need a virtual dtor
(cherry picked from commit 101a6853e968e22187c4d2aba395ff13e76ae7d7)
Signed-off-by: Michael Stahl <mstahl at redhat.com>
diff --git a/binfilter/bf_sw/source/core/inc/swcache.hxx b/binfilter/bf_sw/source/core/inc/swcache.hxx
index be608e1..dfcc575 100644
--- a/binfilter/bf_sw/source/core/inc/swcache.hxx
+++ b/binfilter/bf_sw/source/core/inc/swcache.hxx
@@ -220,7 +220,7 @@ protected:
inline SwCacheAccess( SwCache &rCache, const void *pOwner, const USHORT nIndex );
public:
- ~SwCacheAccess() { if ( pObj ) pObj->Unlock(); }
+ virtual ~SwCacheAccess() { if ( pObj ) pObj->Unlock(); }
//Abkuerzung fuer diejenigen, die wissen, das die Ableitung das IsAvailable
commit 52535dcad2e5c9bae34d8e1a64d9afb7482fc0f5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Dec 21 16:55:21 2011 +0000
WaE: silence some msvc warnings
(cherry picked from commit baf8f39900cd4763dd4bb325907010969ecc1670)
Signed-off-by: Michael Stahl <mstahl at redhat.com>
diff --git a/binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx b/binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx
index bcc481d..9bf7c6e 100644
--- a/binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx
+++ b/binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx
@@ -136,6 +136,10 @@ SdXMLFilter::SdXMLFilter( SfxMedium& rMedium, SdDrawDocShell& rDocShell, sal_Boo
{
}
+SdXMLFilter::~SdXMLFilter()
+{
+}
+
// -----------------------------------------------------------------------------
sal_Bool SdXMLFilter::Import()
diff --git a/binfilter/bf_sw/source/core/ole/sw_ndole.cxx b/binfilter/bf_sw/source/core/ole/sw_ndole.cxx
index 7bd619c..d1e2683 100644
--- a/binfilter/bf_sw/source/core/ole/sw_ndole.cxx
+++ b/binfilter/bf_sw/source/core/ole/sw_ndole.cxx
@@ -68,7 +68,7 @@ public:
void Load();
- SvPtrarr::Count;
+ using SvPtrarr::Count;
virtual void Commit();
virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
diff --git a/binfilter/inc/bf_sd/sdfilter.hxx b/binfilter/inc/bf_sd/sdfilter.hxx
index 45af8d0..98bd862 100644
--- a/binfilter/inc/bf_sd/sdfilter.hxx
+++ b/binfilter/inc/bf_sd/sdfilter.hxx
@@ -66,7 +66,7 @@ protected:
public:
SdFilter( SfxMedium& rMedium, SdDrawDocShell& rDocShell, sal_Bool bShowProgress );
- ~SdFilter();
+ virtual ~SdFilter();
virtual sal_Bool Import();
virtual sal_Bool Export();
commit b4a6018f1fa02461ba010edaae57e1572835e0e5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri May 18 14:21:46 2012 +0200
backport of parts of 482881720eef9228ce25fa1d228139ebd43fe9cd
Change-Id: I34c1ce7855556a3daf8958b80acb19d9cbf36183
diff --git a/binfilter/inc/bf_sc/conditio.hxx b/binfilter/inc/bf_sc/conditio.hxx
index c2771ea..1ad0c29 100644
--- a/binfilter/inc/bf_sc/conditio.hxx
+++ b/binfilter/inc/bf_sc/conditio.hxx
@@ -114,7 +114,7 @@ public:
ScConditionEntry( const ScConditionEntry& r ); // flache Kopie der Formeln
// echte Kopie der Formeln (fuer Ref-Undo):
ScConditionEntry( ScDocument* pDocument, const ScConditionEntry& r );
- ~ScConditionEntry();
+ virtual ~ScConditionEntry();
int operator== ( const ScConditionEntry& r ) const;
diff --git a/binfilter/inc/bf_svx/svdio.hxx b/binfilter/inc/bf_svx/svdio.hxx
index 37abf5b..ea967d6 100644
--- a/binfilter/inc/bf_svx/svdio.hxx
+++ b/binfilter/inc/bf_svx/svdio.hxx
@@ -262,7 +262,7 @@ protected:
public:
// Als Modus muss STREAM_READ oder STREAM_WRITE angegeben werden.
SdrDownCompat(SvStream& rNewStream, UINT16 nNewMode, BOOL bAutoOpen = TRUE);
- ~SdrDownCompat();
+ virtual ~SdrDownCompat();
#ifdef DBG_UTIL
// fuer etwas aussagekraeftigere Assertions
commit 223d45b18ba8c4ff648d9861d10bb5539e50cc0c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 27 12:43:23 2012 +0000
some windows warnings
(cherry picked from commit d09cf17a6c791228370f3f534ba058325cc0c4f5)
Signed-off-by: Michael Stahl <mstahl at redhat.com>
diff --git a/binfilter/bf_sc/source/core/tool/sc_interpr5.cxx b/binfilter/bf_sc/source/core/tool/sc_interpr5.cxx
index 99a8ef6..d59dd4d 100644
--- a/binfilter/bf_sc/source/core/tool/sc_interpr5.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_interpr5.cxx
@@ -2443,7 +2443,7 @@ void ScInterpreter::ScRGP()
return;
}
BYTE nCase; // 1 = normal, 2,3 = mehrfach
- USHORT nCX, nRX, nCY, nRY, M, N;
+ USHORT nCX, nRX, nCY, nRY, M(0), N(0);
pMatY->GetDimensions(nCY, nRY);
ULONG nCountY = (ULONG) nCY * nRY;
for ( ULONG i = 0; i < nCountY; i++ )
diff --git a/binfilter/bf_sc/source/core/tool/sc_rangeutl.cxx b/binfilter/bf_sc/source/core/tool/sc_rangeutl.cxx
index a0c8573..531a923 100644
--- a/binfilter/bf_sc/source/core/tool/sc_rangeutl.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_rangeutl.cxx
@@ -107,7 +107,7 @@ namespace binfilter {
/*N*/ {
/*N*/ BOOL bResult=FALSE;
/*N*/ ScRangeUtil aRangeUtil;
-/*N*/ USHORT nTab, nColStart, nColEnd, nRowStart, nRowEnd;
+/*N*/ USHORT nTab(0), nColStart(0), nColEnd(0), nRowStart(0), nRowEnd(0);
/*N*/
/*N*/ if( eScope==RUTL_NAMES )
/*N*/ {
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_miscuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_miscuno.cxx
index 17972e6..1730d6b 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_miscuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_miscuno.cxx
@@ -320,7 +320,6 @@ sal_Int32 SAL_CALL ScNameToIndexAccess::getCount( ) throw(::com::sun::star::uno
return xNameAccess->getByName( aNames.getConstArray()[nIndex] );
throw lang::IndexOutOfBoundsException();
- return uno::Any();
}
// XElementAccess
diff --git a/binfilter/bf_sw/source/filter/excel/sw_excimpop.cxx b/binfilter/bf_sw/source/filter/excel/sw_excimpop.cxx
index 8ebf9e9..66a62fb 100644
--- a/binfilter/bf_sw/source/filter/excel/sw_excimpop.cxx
+++ b/binfilter/bf_sw/source/filter/excel/sw_excimpop.cxx
@@ -170,7 +170,7 @@ void SwExcelParser::Label25()
// ------------------------------------------------------------------ 0x06
void SwExcelParser::Formula25()
{
- UINT16 nRow, nCol, nXF, nFormLen;
+ UINT16 nRow, nCol, nXF(0), nFormLen;
double fCurVal;
BYTE nAttr0, nFlag0;
diff --git a/binfilter/inc/bf_svx/numitem.hxx b/binfilter/inc/bf_svx/numitem.hxx
index c85ed83..42bdf9a 100644
--- a/binfilter/inc/bf_svx/numitem.hxx
+++ b/binfilter/inc/bf_svx/numitem.hxx
@@ -140,13 +140,11 @@ class SvxNumberFormat : public SvxNumberType
BitmapEx* pScaledImageCache; // Image scaled to aGraphicSize, only cached for WINDOW/VDEV
-// void GetCharStr( ULONG nNo, String& rStr ) const;
-// void GetCharStrN( ULONG nNo, String& rStr ) const;
public:
SvxNumberFormat(sal_Int16 nNumberingType);
SvxNumberFormat(const SvxNumberFormat& rFormat);
SvxNumberFormat(SvStream &rStream);
- ~SvxNumberFormat();
+ virtual ~SvxNumberFormat();
SvStream& Store(SvStream &rStream, FontToSubsFontConverter) { return rStream; }
commit e1116d6d8b665ec21eeb2e5496738192b29b2f96
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Mar 29 12:00:29 2012 +0200
GCC 4.7 -Werror=deprecated, -Werror=narrowing
(cherry picked from commit 042f74a90557ab312ce6e7d7925204ba531adbe9)
Signed-off-by: Michael Stahl <mstahl at redhat.com>
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 Reference<XMultiServiceFactory>& _rxFactory,LanguageType _eSysLanguage);
operator Reference<XNumberFormatsSupplier> ();
- 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;
void AddNewShape(const ScMyShape& aShape);
sal_Bool HasShapes() { return !aShapeList.empty(); }
const ScMyShapeList* GetShapes() { return &aShapeList; }
@@ -127,7 +127,7 @@ public:
virtual ~ScMyMergedRangesContainer();
void AddRange(const ::com::sun::star::table::CellRangeAddress aMergedRange);
- ScMyIteratorBase::UpdateAddress;
+ using ScMyIteratorBase::UpdateAddress;
virtual void SetCellData( ScMyCell& rMyCell );
virtual void Sort(); // + remove doublets
};
@@ -167,7 +167,7 @@ public:
inline void AddNewAreaLink( const ScMyAreaLink& rAreaLink )
{ aAreaLinkList.push_back( rAreaLink ); }
- ScMyIteratorBase::UpdateAddress;
+ using ScMyIteratorBase::UpdateAddress;
virtual void SetCellData( ScMyCell& rMyCell );
virtual void Sort();
};
@@ -193,7 +193,7 @@ public:
virtual ~ScMyEmptyDatabaseRangesContainer();
void AddNewEmptyDatabaseRange(const ::com::sun::star::table::CellRangeAddress& aCellRangeAddress);
- ScMyIteratorBase::UpdateAddress;
+ using ScMyIteratorBase::UpdateAddress;
virtual void SetCellData( ScMyCell& rMyCell );
virtual void Sort();
};
@@ -228,7 +228,7 @@ public:
const ScRange& rSourceRange,
sal_Bool bHasError );
- ScMyIteratorBase::UpdateAddress;
+ using ScMyIteratorBase::UpdateAddress;
virtual void SetCellData( ScMyCell& rMyCell );
virtual void Sort();
};
@@ -258,7 +258,7 @@ public:
void AddOperation( ScDetOpType eOpType, const ScAddress& rPosition, sal_uInt32 nIndex );
- ScMyIteratorBase::UpdateAddress;
+ using ScMyIteratorBase::UpdateAddress;
virtual void SetCellData( ScMyCell& rMyCell );
virtual void Sort();
};
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
--- a/binfilter/bf_sc/source/filter/xml/sc_xmlstyle.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_xmlstyle.cxx
@@ -58,7 +58,7 @@ using namespace ::binfilter::xmloff::token;
using rtl::OUString;
-#define MAP(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, type, context }
+#define MAP(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, sal::static_int_cast< sal_Int32 >(type), context }
#define MAP_END() { NULL, 0, 0, XML_TOKEN_INVALID, 0, 0 }
const XMLPropertyMapEntry aXMLScCellStylesProperties[] =
diff --git a/binfilter/bf_sfx2/source/appl/imestatuswindow.hxx b/binfilter/bf_sfx2/source/appl/imestatuswindow.hxx
index b491350..64856e8 100644
--- a/binfilter/bf_sfx2/source/appl/imestatuswindow.hxx
+++ b/binfilter/bf_sfx2/source/appl/imestatuswindow.hxx
@@ -71,11 +71,8 @@ public:
*/
void init();
- // At least the Solaris "CC: Forte Developer 7 C++ 5.4 2002/03/09" compiler
- // does not accept the following using-declarations for virtual functions,
- // so use (deprecated) access declarations instead:
- /*using*/ ImeStatusWindow_Impl::acquire;
- /*using*/ ImeStatusWindow_Impl::release;
+ using ImeStatusWindow_Impl::acquire;
+ using ImeStatusWindow_Impl::release;
using ImeStatusWindow_Impl::operator new;
using ImeStatusWindow_Impl::operator delete;
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
index 3da5855..57e2ac2 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
@@ -116,9 +116,9 @@ sal_Char SW5HEADER[] = "SW5HDR"; // 5.0 Header
class Sw3RecordSizeTable: private Table
{
public:
- Table::Count;
- Table::SearchKey;
- Table::GetObjectKey;
+ using Table::Count;
+ using Table::SearchKey;
+ using Table::GetObjectKey;
Sw3RecordSizeTable() :
Table()
diff --git a/binfilter/bf_xmloff/source/chart/PropertyMap.hxx b/binfilter/bf_xmloff/source/chart/PropertyMap.hxx
index 924cf07..0d15a79 100644
--- a/binfilter/bf_xmloff/source/chart/PropertyMap.hxx
+++ b/binfilter/bf_xmloff/source/chart/PropertyMap.hxx
@@ -78,7 +78,7 @@ namespace binfilter {
#define MAP_ENTRY( a, ns, nm, t ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::nm, t, 0 }
#define MAP_CONTEXT( a, ns, nm, t, c ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::nm, t, XML_SCH_CONTEXT_##c }
-#define MAP_SPECIAL( a, ns, nm, t, c ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::nm, t | MID_FLAG_SPECIAL_ITEM, XML_SCH_CONTEXT_SPECIAL_##c }
+#define MAP_SPECIAL( a, ns, nm, t, c ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::nm, sal::static_int_cast< sal_Int32 >(t | MID_FLAG_SPECIAL_ITEM), XML_SCH_CONTEXT_SPECIAL_##c }
#define MAP_ENTRY_END { 0,0,0,xmloff::token::XML_TOKEN_INVALID,0,0 }
// ---------------------------------------------------------
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx b/binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx
index ca35448..fcaf280 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx
@@ -75,7 +75,7 @@ using namespace ::rtl;
using namespace ::com::sun::star;
using namespace ::binfilter::xmloff::token;
-#define MAP(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, type, context }
+#define MAP(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, sal::static_int_cast< sal_Int32 >(type), context }
#define MAP_ENTRY_END { 0,0,0,xmloff::token::XML_TOKEN_INVALID,0,0 }
//////////////////////////////////////////////////////////////////////////////
diff --git a/binfilter/bf_xmloff/source/forms/xmloff_controlpropertymap.cxx b/binfilter/bf_xmloff/source/forms/xmloff_controlpropertymap.cxx
index 7124eb4..df804ae 100644
--- a/binfilter/bf_xmloff/source/forms/xmloff_controlpropertymap.cxx
+++ b/binfilter/bf_xmloff/source/forms/xmloff_controlpropertymap.cxx
@@ -47,7 +47,7 @@ namespace xmloff
//.........................................................................
#define MAP_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, prefix, token, type, context }
-#define MAP_CONST( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, type, context }
+#define MAP_CONST( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, sal::static_int_cast< sal_Int32 >(type), context }
#define MAP_END() { NULL, 0, 0, XML_TOKEN_INVALID, 0, 0 }
XMLPropertyMapEntry* getControlStylePropertyMap_Access( )
diff --git a/binfilter/bf_xmloff/source/style/xmloff_PageMasterStyleMap.cxx b/binfilter/bf_xmloff/source/style/xmloff_PageMasterStyleMap.cxx
index e9b6675..c3f2a6b 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_PageMasterStyleMap.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_PageMasterStyleMap.cxx
@@ -33,7 +33,7 @@ namespace binfilter {
using namespace ::binfilter::xmloff::token;
-#define MAP(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, type, context }
+#define MAP(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, sal::static_int_cast< sal_Int32 >(type), context }
#define MAP_ENTRY_END { 0,0,0,xmloff::token::XML_TOKEN_INVALID,0,0 }
//______________________________________________________________________________
diff --git a/binfilter/bf_xmloff/source/text/xmloff_txtprmap.cxx b/binfilter/bf_xmloff/source/text/xmloff_txtprmap.cxx
index 7c901b6..10cb7d8 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_txtprmap.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_txtprmap.cxx
@@ -38,10 +38,10 @@ using namespace ::com::sun::star::uno;
using namespace ::binfilter::xmloff::token;
#define M_E( a, p, l, t, c ) \
- { a, sizeof(a)-1, XML_NAMESPACE_##p, XML_##l, t, c }
+ { a, sizeof(a)-1, XML_NAMESPACE_##p, XML_##l, sal::static_int_cast< sal_Int32 >(t), c }
#define M_ED( a, p, l, t, c ) \
- { a, sizeof(a)-1, XML_NAMESPACE_##p, XML_##l, (t) | MID_FLAG_DEFAULT_ITEM_EXPORT, c }
+ { a, sizeof(a)-1, XML_NAMESPACE_##p, XML_##l, sal::static_int_cast< sal_Int32 >((t) | MID_FLAG_DEFAULT_ITEM_EXPORT), c }
#define M_END() \
{ NULL, 0, 0, XML_TOKEN_INVALID, 0, 0 }
diff --git a/binfilter/inc/bf_sch/schopt.hxx b/binfilter/inc/bf_sch/schopt.hxx
index ebde75e..7664774 100644
--- a/binfilter/inc/bf_sch/schopt.hxx
+++ b/binfilter/inc/bf_sch/schopt.hxx
@@ -56,7 +56,7 @@ public:
// make public
- Table::Count;
+ using Table::Count;
// specialized methods from Table
void ClearAndDestroy();
commit bb4a97b3ad72c2b725f3e552063bce6e756fafd0
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Mar 14 13:29:56 2012 +0100
Adapted to -Wnon-virtual-dtor enabled for GCC 4.6
(cherry picked from commit c599fdba10c210ecf3f94119cb1138f3846320df)
Signed-off-by: Michael Stahl <mstahl at redhat.com>
diff --git a/binfilter/bf_basic/source/inc/sbintern.hxx b/binfilter/bf_basic/source/inc/sbintern.hxx
index 1ce571a..2d46bab 100644
--- a/binfilter/bf_basic/source/inc/sbintern.hxx
+++ b/binfilter/bf_basic/source/inc/sbintern.hxx
@@ -49,6 +49,7 @@ class SbModule;
class SbiFactory : public SbxFactory
{
public:
+ virtual ~SbiFactory() {}
virtual SbxBase* Create( UINT16 nSbxId, UINT32 = SBXCR_SBX );
virtual SbxObject* CreateObject( const String& );
};
diff --git a/binfilter/bf_forms/source/inc/InterfaceContainer.hxx b/binfilter/bf_forms/source/inc/InterfaceContainer.hxx
index 7203520..3ed6bb0 100644
--- a/binfilter/bf_forms/source/inc/InterfaceContainer.hxx
+++ b/binfilter/bf_forms/source/inc/InterfaceContainer.hxx
@@ -105,12 +105,13 @@ protected:
// EventManager
::com::sun::star::uno::Reference< ::com::sun::star::script::XEventAttacherManager> m_xEventAttacher;
-public:
OInterfaceContainer(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory,
::osl::Mutex& _rMutex,
const ::com::sun::star::uno::Type& _rElementType);
+ ~OInterfaceContainer() {}
+
public:
// ::com::sun::star::io::XPersistObject
virtual ::rtl::OUString SAL_CALL getServiceName( ) throw(::com::sun::star::uno::RuntimeException) = 0;
diff --git a/binfilter/bf_forms/source/inc/property.hxx b/binfilter/bf_forms/source/inc/property.hxx
index 6ad0c21..c7d864d 100644
--- a/binfilter/bf_forms/source/inc/property.hxx
+++ b/binfilter/bf_forms/source/inc/property.hxx
@@ -103,6 +103,8 @@ private:
class ConcretInfoService : public ::comphelper::IPropertyInfoService
{
public:
+ virtual ~ConcretInfoService() {}
+
virtual sal_Int32 getPreferedPropertyId(const ::rtl::OUString& _rName);
};
diff --git a/binfilter/bf_sc/source/core/tool/sc_interpr3.cxx b/binfilter/bf_sc/source/core/tool/sc_interpr3.cxx
index f473906..624643a 100644
--- a/binfilter/bf_sc/source/core/tool/sc_interpr3.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_interpr3.cxx
@@ -55,6 +55,9 @@ class ScDistFunc
{
public:
virtual double GetValue(double x) const = 0;
+
+protected:
+ ~ScDistFunc() {}
};
// iteration for inverse distributions
@@ -1069,6 +1072,8 @@ public:
ScGammaDistFunction( ScInterpreter& rI, double fpVal, double fAlphaVal, double fBetaVal ) :
rInt(rI), fp(fpVal), fAlpha(fAlphaVal), fBeta(fBetaVal) {}
+ virtual ~ScGammaDistFunction() {}
+
double GetValue( double x ) const { return fp - rInt.GetGammaDist(x, fAlpha, fBeta); }
};
@@ -1107,6 +1112,8 @@ public:
ScBetaDistFunction( ScInterpreter& rI, double fpVal, double fAlphaVal, double fBetaVal ) :
rInt(rI), fp(fpVal), fAlpha(fAlphaVal), fBeta(fBetaVal) {}
+ virtual ~ScBetaDistFunction() {}
+
double GetValue( double x ) const { return fp - rInt.GetBetaDist(x, fAlpha, fBeta); }
};
@@ -1163,6 +1170,8 @@ public:
ScTDistFunction( ScInterpreter& rI, double fpVal, double fDFVal ) :
rInt(rI), fp(fpVal), fDF(fDFVal) {}
+ virtual ~ScTDistFunction() {}
+
double GetValue( double x ) const { return fp - 2 * rInt.GetTDist(x, fDF); }
};
@@ -1195,6 +1204,8 @@ public:
ScFDistFunction( ScInterpreter& rI, double fpVal, double fF1Val, double fF2Val ) :
rInt(rI), fp(fpVal), fF1(fF1Val), fF2(fF2Val) {}
+ virtual ~ScFDistFunction() {}
+
double GetValue( double x ) const { return fp - rInt.GetFDist(x, fF1, fF2); }
};
@@ -1228,6 +1239,8 @@ public:
ScChiDistFunction( ScInterpreter& rI, double fpVal, double fDFVal ) :
rInt(rI), fp(fpVal), fDF(fDFVal) {}
+ virtual ~ScChiDistFunction() {}
+
double GetValue( double x ) const { return fp - rInt.GetChiDist(x, fDF); }
};
diff --git a/binfilter/bf_sc/source/filter/xml/XMLStylesExportHelper.hxx b/binfilter/bf_sc/source/filter/xml/XMLStylesExportHelper.hxx
index cf923ff..bf008e1 100644
--- a/binfilter/bf_sc/source/filter/xml/XMLStylesExportHelper.hxx
+++ b/binfilter/bf_sc/source/filter/xml/XMLStylesExportHelper.hxx
@@ -243,7 +243,7 @@ class ScColumnRowStylesBase
public:
ScColumnRowStylesBase();
- ~ScColumnRowStylesBase();
+ virtual ~ScColumnRowStylesBase();
virtual void AddNewTable(const sal_Int16 nTable, const sal_Int32 nFields) = 0;
sal_Int32 AddStyleName(::rtl::OUString* pString);
@@ -270,7 +270,7 @@ class ScColumnStyles : public ScColumnRowStylesBase
public:
ScColumnStyles();
- ~ScColumnStyles();
+ virtual ~ScColumnStyles();
virtual void AddNewTable(const sal_Int16 nTable, const sal_Int32 nFields);
sal_Int32 GetStyleNameIndex(const sal_Int16 nTable, const sal_Int32 nField,
@@ -288,7 +288,7 @@ class ScRowStyles : public ScColumnRowStylesBase
public:
ScRowStyles();
- ~ScRowStyles();
+ virtual ~ScRowStyles();
virtual void AddNewTable(const sal_Int16 nTable, const sal_Int32 nFields);
sal_Int32 GetStyleNameIndex(const sal_Int16 nTable, const sal_Int32 nField);
diff --git a/binfilter/bf_sw/source/core/inc/flowfrm.hxx b/binfilter/bf_sw/source/core/inc/flowfrm.hxx
index 27a8d81..9feae3f 100644
--- a/binfilter/bf_sw/source/core/inc/flowfrm.hxx
+++ b/binfilter/bf_sw/source/core/inc/flowfrm.hxx
@@ -124,6 +124,8 @@ protected:
public:
SwFlowFrm( SwFrm &rFrm );
+ virtual ~SwFlowFrm() {}
+
const SwFrm *GetFrm() const { return &rThis; }
SwFrm *GetFrm() { return &rThis; }
diff --git a/binfilter/bf_sw/source/core/inc/txmsrt.hxx b/binfilter/bf_sw/source/core/inc/txmsrt.hxx
index f82f531..0ebbfdc 100644
--- a/binfilter/bf_sw/source/core/inc/txmsrt.hxx
+++ b/binfilter/bf_sw/source/core/inc/txmsrt.hxx
@@ -115,15 +115,11 @@ struct SwTOXSortTabBase
USHORT nType;
static USHORT nOpt;
- SwTOXSortTabBase( TOXSortType nType,
- const SwCntntNode* pTOXSrc,
- const SwTxtTOXMark* pTxtMark,
- const SwTOXInternational* pIntl,
- const ::com::sun::star::lang::Locale* pLocale = NULL );
-
USHORT GetType() const { return nType; }
USHORT GetOptions() const { return nOpt; }
+ virtual ~SwTOXSortTabBase() {}
+
virtual void FillText( SwTxtNode& rNd, const SwIndex& rInsPos, USHORT nAuthField = 0) const;
virtual USHORT GetLevel() const = 0;
virtual BOOL operator==( const SwTOXSortTabBase& );
@@ -134,6 +130,13 @@ struct SwTOXSortTabBase
inline void GetTxt( String&, String& ) const;
inline const ::com::sun::star::lang::Locale& GetLocale() const;
+protected:
+ SwTOXSortTabBase( TOXSortType nType,
+ const SwCntntNode* pTOXSrc,
+ const SwTxtTOXMark* pTxtMark,
+ const SwTOXInternational* pIntl,
+ const ::com::sun::star::lang::Locale* pLocale = NULL );
+
private:
BOOL bValidTxt;
String sSortTxt;
@@ -183,6 +186,7 @@ private:
public:
SwTOXAuthority( const SwCntntNode& rNd, SwFmtFld& rField, const SwTOXInternational& rIntl );
+ virtual ~SwTOXAuthority() {}
SwFmtFld& GetFldFmt() {return m_rField;}
virtual BOOL operator==( const SwTOXSortTabBase& );
diff --git a/binfilter/bf_sw/source/core/txtnode/sw_fntcap.cxx b/binfilter/bf_sw/source/core/txtnode/sw_fntcap.cxx
index eea8628..fde0201 100644
--- a/binfilter/bf_sw/source/core/txtnode/sw_fntcap.cxx
+++ b/binfilter/bf_sw/source/core/txtnode/sw_fntcap.cxx
@@ -121,6 +121,7 @@ protected:
SwDrawTextInfo &rInf;
SwCapitalInfo* pCapInf; // referes to additional information
// required by the ::Do function
+ ~SwDoCapitals() {}
public:
SwDoCapitals ( SwDrawTextInfo &rInfo ) : rInf( rInfo ), pCapInf( 0 ) { }
virtual void Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont ) = 0;
@@ -141,6 +142,7 @@ protected:
Size aTxtSize;
public:
SwDoGetCapitalSize( SwDrawTextInfo &rInfo ) : SwDoCapitals ( rInfo ) { }
+ virtual ~SwDoGetCapitalSize() {}
virtual void Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont );
virtual void Do();
const Size &GetSize() const { return aTxtSize; }
@@ -203,6 +205,7 @@ public:
, nTxtWidth( nWidth )
, nBreak( STRING_LEN )
{ }
+ virtual ~SwDoGetCapitalBreak() {}
xub_StrLen GetBreak() const { return nBreak; }
};
@@ -226,6 +229,8 @@ public:
SwDoDrawCapital( SwDrawTextInfo &rInfo ) :
SwDoCapitals( rInfo )
{ }
+
+ virtual ~SwDoDrawCapital() {}
};
@@ -258,6 +263,8 @@ public:
, nOfst( nOfs )
{ }
+ virtual ~SwDoCapitalCrsrOfst() {}
+
void DrawSpace( const Point &rPos );
inline xub_StrLen GetCrsr(){ return nCrsr; }
};
@@ -286,6 +293,8 @@ public:
, nCapWidth( nCapWidth2 )
, nOrgWidth( rInfo.GetWidth() )
{ }
+
+ virtual ~SwDoDrawStretchCapital() {}
};
/*************************************************************************
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx
index 15fc057..efa9e98 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx
@@ -145,7 +145,7 @@ public:
BaseFrameProperties_Impl ( const SfxItemPropertyMap* pMap ) :
_pMap(pMap) {}
- ~BaseFrameProperties_Impl();
+ virtual ~BaseFrameProperties_Impl();
void SetProperty(USHORT nWID, BYTE nMemberId, uno::Any aVal);
sal_Bool GetProperty(USHORT nWID, BYTE nMemberId, uno::Any*& pAny );
@@ -523,7 +523,7 @@ protected:
BaseFrameProperties_Impl(pMap){}
public:
SwFrameProperties_Impl();
- ~SwFrameProperties_Impl(){}
+ virtual ~SwFrameProperties_Impl(){}
virtual sal_Bool AnyToItemSet( SwDoc* pDoc, SfxItemSet& rFrmSet, SfxItemSet& rSet, sal_Bool& rSizeFound);
};
@@ -589,7 +589,7 @@ class SwGraphicProperties_Impl : public BaseFrameProperties_Impl
{
public:
SwGraphicProperties_Impl();
- ~SwGraphicProperties_Impl(){}
+ virtual ~SwGraphicProperties_Impl(){}
virtual sal_Bool AnyToItemSet( SwDoc* pDoc, SfxItemSet& rFrmSet, SfxItemSet& rSet, sal_Bool& rSizeFound);
};
@@ -691,7 +691,7 @@ class SwOLEProperties_Impl : public SwFrameProperties_Impl
public:
SwOLEProperties_Impl() :
SwFrameProperties_Impl(aSwMapProvider.GetPropertyMap(PROPERTY_MAP_EMBEDDED_OBJECT) ){}
- ~SwOLEProperties_Impl(){}
+ virtual ~SwOLEProperties_Impl(){}
virtual sal_Bool AnyToItemSet( SwDoc* pDoc, SfxItemSet& rFrmSet, SfxItemSet& rSet, sal_Bool& rSizeFound);
};
diff --git a/binfilter/bf_sw/source/filter/sw6/sw6file.hxx b/binfilter/bf_sw/source/filter/sw6/sw6file.hxx
index ad8fefb..fe64481 100644
--- a/binfilter/bf_sw/source/filter/sw6/sw6file.hxx
+++ b/binfilter/bf_sw/source/filter/sw6/sw6file.hxx
@@ -443,7 +443,7 @@ public:
size_t nBufSize, // Lesepuffer-Groesse, mu?>0 sein
size_t nCtrSize, // Maximale L„nge Ctrl-Zeichenkette
ULONG *pErrno ); // Optionale Fehlernummer
- ~Sw6File(void); // dtor
+ virtual ~Sw6File(void); // dtor
};
diff --git a/binfilter/bf_xmloff/source/chart/MultiPropertySetHandler.hxx b/binfilter/bf_xmloff/source/chart/MultiPropertySetHandler.hxx
index 49d4c59..85d2275 100644
--- a/binfilter/bf_xmloff/source/chart/MultiPropertySetHandler.hxx
+++ b/binfilter/bf_xmloff/source/chart/MultiPropertySetHandler.hxx
@@ -61,6 +61,8 @@ public:
: msName (rName)
{}
+ virtual ~PropertyWrapperBase() {}
+
/** @descr Abstract interface of a method for setting a variables
value to that of the property.
*/
@@ -85,6 +87,8 @@ public:
mrValue (rValue)
{}
+ virtual ~PropertyWrapper() {}
+
/** descr Set the given value inside an Any to the variable referenced
by the data member.
*/
diff --git a/binfilter/bf_xmloff/source/forms/callbacks.hxx b/binfilter/bf_xmloff/source/forms/callbacks.hxx
index 84e3e54..1e73885 100644
--- a/binfilter/bf_xmloff/source/forms/callbacks.hxx
+++ b/binfilter/bf_xmloff/source/forms/callbacks.hxx
@@ -64,6 +64,9 @@ namespace xmloff
virtual ::rtl::OUString getObjectStyleName(
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ) = 0;
+
+ protected:
+ ~IFormsExportContext() {}
};
//=====================================================================
@@ -93,6 +96,9 @@ namespace xmloff
virtual void registerControlReferences(
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl,
const ::rtl::OUString& _rReferringControls) = 0;
+
+ protected:
+ ~IControlIdMap() {}
};
//=====================================================================
@@ -132,6 +138,9 @@ namespace xmloff
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel,
const ::rtl::OUString& _rCellRangeAddress
) = 0;
+
+ protected:
+ ~IFormsImportContext() {}
};
//=====================================================================
@@ -144,6 +153,9 @@ namespace xmloff
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxElement,
const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& _rEvents
) = 0;
+
+ protected:
+ ~IEventAttacherManager() {}
};
//=====================================================================
@@ -155,6 +167,9 @@ namespace xmloff
virtual void registerEvents(
const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& _rEvents
) = 0;
+
+ protected:
+ ~IEventAttacher() {}
};
//.........................................................................
diff --git a/binfilter/bf_xmloff/source/forms/elementexport.hxx b/binfilter/bf_xmloff/source/forms/elementexport.hxx
index a8afa82..4444f12 100644
--- a/binfilter/bf_xmloff/source/forms/elementexport.hxx
+++ b/binfilter/bf_xmloff/source/forms/elementexport.hxx
@@ -59,7 +59,7 @@ namespace xmloff
OElementExport(IFormsExportContext& _rContext,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxProps,
const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& _rEvents);
- ~OElementExport();
+ virtual ~OElementExport();
void doExport();
@@ -131,7 +131,7 @@ namespace xmloff
const ::rtl::OUString& _rControlId,
const ::rtl::OUString& _rReferringControls,
const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& _rxEvents);
- ~OControlExport();
+ virtual ~OControlExport();
protected:
/// start the XML element
@@ -242,7 +242,7 @@ namespace xmloff
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl,
const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& _rxEvents);
- ~OColumnExport();
+ virtual ~OColumnExport();
protected:
// OControlExport overridables
@@ -274,6 +274,8 @@ namespace xmloff
const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& _rxEvents
);
+ virtual ~OFormExport() {}
+
protected:
virtual const sal_Char* getXMLElementName() const;
virtual void exportSubTags();
diff --git a/binfilter/bf_xmloff/source/forms/eventimport.hxx b/binfilter/bf_xmloff/source/forms/eventimport.hxx
index d32c7c1..1e9a38e 100644
--- a/binfilter/bf_xmloff/source/forms/eventimport.hxx
+++ b/binfilter/bf_xmloff/source/forms/eventimport.hxx
@@ -75,6 +75,8 @@ namespace xmloff
MapPropertySet2ScriptSequence m_aEvents;
public:
+ virtual ~ODefaultEventAttacherManager() {}
+
// IEventAttacherManager
virtual void registerEvents(
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxElement,
diff --git a/binfilter/inc/bf_basic/basmgr.hxx b/binfilter/inc/bf_basic/basmgr.hxx
index 2ce19e4..2ff11b1 100644
--- a/binfilter/inc/bf_basic/basmgr.hxx
+++ b/binfilter/inc/bf_basic/basmgr.hxx
@@ -107,6 +107,9 @@ public:
virtual String getLibraryPassword( const String& rLibraryName ) = 0;
virtual void clearLibraryPassword( const String& rLibraryName ) = 0;
virtual sal_Bool hasLibraryPassword( const String& rLibraryName ) = 0;
+
+protected:
+ ~OldBasicPassword() {}
};
struct LibraryContainerInfo
diff --git a/binfilter/inc/bf_basic/sbxfac.hxx b/binfilter/inc/bf_basic/sbxfac.hxx
index 3f5b4ce..59de60f 100644
--- a/binfilter/inc/bf_basic/sbxfac.hxx
+++ b/binfilter/inc/bf_basic/sbxfac.hxx
@@ -47,6 +47,7 @@ class SbxFactory
BOOL bHandleLast; // TRUE: Factory soll zuletzt gefragt werden, da teuer
public:
SbxFactory( BOOL bLast=FALSE ) { bHandleLast = bLast; }
+ virtual ~SbxFactory() {}
BOOL IsHandleLast( void ) { return bHandleLast; }
virtual SbxBase* Create( UINT16 nSbxId, UINT32 = SBXCR_SBX );
virtual SbxObject* CreateObject( const String& );
diff --git a/binfilter/inc/bf_goodies/b3dlight.hxx b/binfilter/inc/bf_goodies/b3dlight.hxx
index e4a42e7..96ea090 100644
--- a/binfilter/inc/bf_goodies/b3dlight.hxx
+++ b/binfilter/inc/bf_goodies/b3dlight.hxx
@@ -96,6 +96,8 @@ private:
public:
B3dLight();
+ virtual ~B3dLight() {}
+
// Zugriffsfunktionen
void SetIntensity(const Color rNew,
Base3DMaterialValue=Base3DMaterialAmbient);
@@ -182,6 +184,8 @@ public:
// Konstruktor
B3dLightGroup();
+ virtual ~B3dLightGroup() {}
+
// lokale Parameter des LightModels
virtual void SetGlobalAmbientLight(const Color rNew);
const Color GetGlobalAmbientLight();
diff --git a/binfilter/inc/bf_goodies/b3dtrans.hxx b/binfilter/inc/bf_goodies/b3dtrans.hxx
index 9fec7e2..abb0c04 100644
--- a/binfilter/inc/bf_goodies/b3dtrans.hxx
+++ b/binfilter/inc/bf_goodies/b3dtrans.hxx
@@ -144,6 +144,8 @@ private:
public:
B3dTransformationSet();
+ virtual ~B3dTransformationSet() {}
+
// Zurueck auf Standard
void Reset();
@@ -235,6 +237,8 @@ private:
public:
B3dViewport();
+ virtual ~B3dViewport() {}
+
void SetVUV(const Vector3D& rNewVUV);
void SetViewportValues(
const Vector3D& rNewVRP,
@@ -272,6 +276,8 @@ public:
double fFocLen = 35.0, double fBnkAng = 0.0,
BOOL bUseFocLen = FALSE);
+ virtual ~B3dCamera() {}
+
// Positionen
const Vector3D& GetPosition() const { return aPosition; }
const Vector3D& GetLookAt() const { return aLookAt; }
diff --git a/binfilter/inc/bf_goodies/matril3d.hxx b/binfilter/inc/bf_goodies/matril3d.hxx
index 2bb9b30..faac47c 100644
--- a/binfilter/inc/bf_goodies/matril3d.hxx
+++ b/binfilter/inc/bf_goodies/matril3d.hxx
@@ -85,6 +85,8 @@ private:
public:
B3dMaterial();
+ virtual ~B3dMaterial() {}
+
// Laden/Speichern in StarView
virtual void ReadData(SvStream& rIn);
diff --git a/binfilter/inc/bf_sfx2/cfgitem.hxx b/binfilter/inc/bf_sfx2/cfgitem.hxx
index 3eb37c4..a24ab9d 100644
--- a/binfilter/inc/bf_sfx2/cfgitem.hxx
+++ b/binfilter/inc/bf_sfx2/cfgitem.hxx
@@ -68,6 +68,10 @@ class SfxConfigItem
BOOL m_bModified : 1;
BOOL m_bInitialized : 1;
+protected:
+ SfxConfigItem( USHORT nType, SfxConfigManager* pCfgMgr );
+ ~SfxConfigItem();
+
public:
static String GetStreamName( USHORT nType );
@@ -77,9 +81,6 @@ public:
ERR_READ
};
- SfxConfigItem( USHORT nType, SfxConfigManager* pCfgMgr );
- ~SfxConfigItem();
-
BOOL Initialize();
BOOL StoreConfig();
void Connect( SfxConfigManager* pMgr );
diff --git a/binfilter/inc/bf_sfx2/evntconf.hxx b/binfilter/inc/bf_sfx2/evntconf.hxx
index 4391bfd..5fb816d 100644
--- a/binfilter/inc/bf_sfx2/evntconf.hxx
+++ b/binfilter/inc/bf_sfx2/evntconf.hxx
@@ -152,6 +152,8 @@ public:
SfxEventConfiguration*,
SfxObjectShell* pObjSh = NULL );
+ virtual ~SfxEventConfigItem_Impl() {}
+
void Init( SfxConfigManager* );
virtual int Load(SotStorage&);
virtual BOOL Store(SotStorage&) {return FALSE;}
diff --git a/binfilter/inc/bf_so3/ipenv.hxx b/binfilter/inc/bf_so3/ipenv.hxx
index f93d3bb..d2f27b3 100644
--- a/binfilter/inc/bf_so3/ipenv.hxx
+++ b/binfilter/inc/bf_so3/ipenv.hxx
@@ -308,6 +308,9 @@ enum PlugInMode
struct PlugJavaRequester
{
virtual void * GetJavaPeer( Window * pPlugWin ) = 0;
+
+protected:
+ ~PlugJavaRequester() {}
};
class SvPlugInObject;
diff --git a/binfilter/inc/bf_so3/transprt.hxx b/binfilter/inc/bf_so3/transprt.hxx
index 901ad59..a94a362 100644
--- a/binfilter/inc/bf_so3/transprt.hxx
+++ b/binfilter/inc/bf_so3/transprt.hxx
@@ -123,6 +123,9 @@ public:
ULONG nNow, ULONG nEnd, SvBindStatus eStatus) = 0;
virtual void OnRedirect (const String &rUrl) = 0;
+
+protected:
+ ~SvBindingTransportCallback() {}
};
/*========================================================================
diff --git a/binfilter/inc/bf_starmath/utility.hxx b/binfilter/inc/bf_starmath/utility.hxx
index 11c2feb..775a1ae 100644
--- a/binfilter/inc/bf_starmath/utility.hxx
+++ b/binfilter/inc/bf_starmath/utility.hxx
@@ -206,11 +206,10 @@ protected:
void InsertPtr(USHORT nPos, void *pItem) { SfxPtrArr::Insert(nPos, pItem); }
void RemovePtr(USHORT nPos, USHORT nCount = 1) { SfxPtrArr::Remove(nPos, nCount); }
-public:
SmPickList(USHORT nInitSize = 0, USHORT nMaxSize = 5);
~SmPickList();
-
+public:
void *Get(USHORT nPos = 0) const { return GetPtr(nPos); }
void *operator [] (USHORT nPos) const { return GetPtr(nPos); }
@@ -256,7 +255,7 @@ public:
: SmPickList(nInitSize, nMaxSize) {}
SmFontPickList(const SmPickList& rOrig )
: SmPickList(rOrig) {}
- ~SmFontPickList() { Clear(); }
+ virtual ~SmFontPickList() { Clear(); }
inline BOOL Contains(const Font &rFont) const;
diff --git a/binfilter/inc/bf_svtools/itemprop.hxx b/binfilter/inc/bf_svtools/itemprop.hxx
index e300ee1..3c726c3 100644
--- a/binfilter/inc/bf_svtools/itemprop.hxx
+++ b/binfilter/inc/bf_svtools/itemprop.hxx
@@ -68,6 +68,8 @@ public:
SfxItemPropertySet( const SfxItemPropertyMap *pMap ) :
_pMap(pMap) {}
+ virtual ~SfxItemPropertySet() {}
+
void getPropertyValue( const SfxItemPropertyMap& rMap,
const SfxItemSet& rSet,
::com::sun::star::uno::Any& rAny) const
diff --git a/binfilter/inc/bf_svtools/wallitem.hxx b/binfilter/inc/bf_svtools/wallitem.hxx
index 56d46ca..c57c678 100644
--- a/binfilter/inc/bf_svtools/wallitem.hxx
+++ b/binfilter/inc/bf_svtools/wallitem.hxx
@@ -54,6 +54,7 @@ typedef USHORT* (*GetSvxBrushTabPageRanges)();
class SfxBrushItemLink
{
public:
+ virtual ~SfxBrushItemLink() {}
virtual Graphic GetGraphic( const String& rLink, const String& rFilter) = 0;
virtual CreateSvxBrushTabPage GetBackgroundTabpageCreateFunc() = 0;
virtual GetSvxBrushTabPageRanges GetBackgroundTabpageRanges() = 0;
diff --git a/binfilter/inc/bf_svx/camera3d.hxx b/binfilter/inc/bf_svx/camera3d.hxx
index 7869979..699ab5d 100644
--- a/binfilter/inc/bf_svx/camera3d.hxx
+++ b/binfilter/inc/bf_svx/camera3d.hxx
@@ -60,6 +60,8 @@ class Camera3D : public Viewport3D
double fFocalLen = 35.0, double fBankAng = 0);
Camera3D();
+ virtual ~Camera3D() {}
+
// Anfangswerte wieder herstellen
void Reset();
diff --git a/binfilter/inc/bf_svx/fmdmod.hxx b/binfilter/inc/bf_svx/fmdmod.hxx
index 1100655..41b0983 100644
--- a/binfilter/inc/bf_svx/fmdmod.hxx
+++ b/binfilter/inc/bf_svx/fmdmod.hxx
@@ -37,6 +37,8 @@ class SvxFmMSFactory : public SvxUnoDrawMSFactory
public:
SvxFmMSFactory() {};
+ virtual ~SvxFmMSFactory() {}
+
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance(const ::rtl::OUString& ServiceSpecifier) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException );
};
diff --git a/binfilter/inc/bf_svx/svdetc.hxx b/binfilter/inc/bf_svx/svdetc.hxx
index 45bc707..ed10a4e 100644
--- a/binfilter/inc/bf_svx/svdetc.hxx
+++ b/binfilter/inc/bf_svx/svdetc.hxx
@@ -149,6 +149,7 @@ public:
class ContainerSorter {
protected:
Container& rCont;
+ ~ContainerSorter() {}
private:
#if _SOLAR__PRIVATE
void ImpSubSort(long nL, long nR) const;
diff --git a/binfilter/inc/bf_svx/unomaster.hxx b/binfilter/inc/bf_svx/unomaster.hxx
index 525b18c..d903a1d 100644
--- a/binfilter/inc/bf_svx/unomaster.hxx
+++ b/binfilter/inc/bf_svx/unomaster.hxx
@@ -59,6 +59,9 @@ public:
virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) = 0;
virtual void dispose() = 0;
+
+protected:
+ ~SvxShapeMaster() {}
};
}//end of namespace binfilter
diff --git a/binfilter/inc/bf_svx/unomod.hxx b/binfilter/inc/bf_svx/unomod.hxx
index cb4bed6..cfeb90d 100644
--- a/binfilter/inc/bf_svx/unomod.hxx
+++ b/binfilter/inc/bf_svx/unomod.hxx
@@ -42,6 +42,8 @@ class SvxUnoDrawMSFactory : public ::com::sun::star::lang::XMultiServiceFactory
public:
SvxUnoDrawMSFactory() throw() {};
+ virtual ~SvxUnoDrawMSFactory() {}
+
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException);
diff --git a/binfilter/inc/bf_svx/unoprov.hxx b/binfilter/inc/bf_svx/unoprov.hxx
index e1f7a31..13fb0f5 100644
--- a/binfilter/inc/bf_svx/unoprov.hxx
+++ b/binfilter/inc/bf_svx/unoprov.hxx
@@ -128,6 +128,9 @@ public:
// helper
static void addToSequence( ::com::sun::star::uno::Sequence< ::rtl::OUString >& rSeq,UINT16 nServices, /* sal_Char* */... ) throw();
static sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& SupportedServices ) throw();
+
+protected:
+ ~SvxServiceInfoHelper() {}
};
/***********************************************************************
diff --git a/binfilter/inc/bf_svx/viewpt3d.hxx b/binfilter/inc/bf_svx/viewpt3d.hxx
index 0bdd06e..8eeb333 100644
--- a/binfilter/inc/bf_svx/viewpt3d.hxx
+++ b/binfilter/inc/bf_svx/viewpt3d.hxx
@@ -87,6 +87,8 @@ class Viewport3D
public:
Viewport3D();
+ virtual ~Viewport3D() {}
+
void SetVRP(const Vector3D& rNewVRP);
void SetVPN(const Vector3D& rNewVPN);
void SetVUV(const Vector3D& rNewVUV);
diff --git a/binfilter/inc/bf_sw/TextCursorHelper.hxx b/binfilter/inc/bf_sw/TextCursorHelper.hxx
index 0000674..27c6089 100644
--- a/binfilter/inc/bf_sw/TextCursorHelper.hxx
+++ b/binfilter/inc/bf_sw/TextCursorHelper.hxx
@@ -37,9 +37,12 @@ class SwUnoCrsr;
class SwPaM;
class OTextCursorHelper : public ::cppu::ImplHelper1< ::com::sun::star::lang::XUnoTunnel>
{
-public:
-
+protected:
OTextCursorHelper(){}
+
+ ~OTextCursorHelper() {}
+
+public:
static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
//XUnoTunnel
diff --git a/binfilter/inc/bf_sw/cellfml.hxx b/binfilter/inc/bf_sw/cellfml.hxx
index ebed9f9..35ba45a 100644
--- a/binfilter/inc/bf_sw/cellfml.hxx
+++ b/binfilter/inc/bf_sw/cellfml.hxx
@@ -98,6 +98,8 @@ protected:
SwTableFormula( const String& rFormel );
+ ~SwTableFormula() {}
+
String MakeFormel( SwTblCalcPara& rCalcPara ) const
{
return ScanString( &SwTableFormula::_MakeFormel,
diff --git a/binfilter/inc/bf_sw/index.hxx b/binfilter/inc/bf_sw/index.hxx
index a2870a9..b985e72 100644
--- a/binfilter/inc/bf_sw/index.hxx
+++ b/binfilter/inc/bf_sw/index.hxx
@@ -127,7 +127,7 @@ protected:
public:
SwIndexReg();
#ifdef DBG_UTIL
- ~SwIndexReg();
+ virtual ~SwIndexReg();
#endif
// rtti, abgeleitete moegens gleichtun oder nicht. Wenn sie es gleichtun
diff --git a/binfilter/inc/bf_sw/printdata.hxx b/binfilter/inc/bf_sw/printdata.hxx
index 8159b92..a2fd946 100644
--- a/binfilter/inc/bf_sw/printdata.hxx
+++ b/binfilter/inc/bf_sw/printdata.hxx
@@ -62,6 +62,8 @@ struct SwPrintData
nPrintPostIts = 0;
}
+ virtual ~SwPrintData() {}
+
sal_Bool operator==(const SwPrintData& rData)const
{
return
diff --git a/binfilter/inc/bf_sw/swcrsr.hxx b/binfilter/inc/bf_sw/swcrsr.hxx
index c41de16..88ec25d 100644
--- a/binfilter/inc/bf_sw/swcrsr.hxx
+++ b/binfilter/inc/bf_sw/swcrsr.hxx
@@ -59,6 +59,9 @@ struct SwFindParas
{
virtual int Find( SwPaM*, SwMoveFn, const SwPaM*, bool ) = 0;
virtual int IsReplaceMode() const = 0;
+
+protected:
+ ~SwFindParas() {}
};
enum SwCursorSelOverFlags
diff --git a/binfilter/inc/bf_sw/unocoll.hxx b/binfilter/inc/bf_sw/unocoll.hxx
index 332dc8d..a56c2dd 100644
--- a/binfilter/inc/bf_sw/unocoll.hxx
+++ b/binfilter/inc/bf_sw/unocoll.hxx
@@ -73,6 +73,8 @@ class SwUnoCollection
, pDoc(p)
{}
+ virtual ~SwUnoCollection() {}
+
virtual void Invalidate();
sal_Bool IsValid() const {return bObjectValid;}
diff --git a/binfilter/inc/bf_sw/viscrs.hxx b/binfilter/inc/bf_sw/viscrs.hxx
index 122aa1e..76698a2 100644
--- a/binfilter/inc/bf_sw/viscrs.hxx
+++ b/binfilter/inc/bf_sw/viscrs.hxx
@@ -88,7 +88,7 @@ class SwSelPaintRects : public SwRects
virtual void FillRects() = 0;
public:
- ~SwSelPaintRects();
+ virtual ~SwSelPaintRects();
void Hide();
diff --git a/binfilter/inc/bf_xmloff/txtvfldi.hxx b/binfilter/inc/bf_xmloff/txtvfldi.hxx
index a489fd9..645c652 100644
--- a/binfilter/inc/bf_xmloff/txtvfldi.hxx
+++ b/binfilter/inc/bf_xmloff/txtvfldi.hxx
@@ -95,6 +95,8 @@ public:
sal_Bool bValue, /// process value (Prep.Field)
sal_Bool bFormula); /// process formula (Prep.F.)
+ virtual ~XMLValueImportHelper() {}
+
/// process attribute values
virtual void ProcessAttribute( sal_uInt16 nAttrToken,
const ::rtl::OUString& sAttrValue );
More information about the Libreoffice-commits
mailing list