[Libreoffice-commits] .: 3 commits - editeng/inc editeng/source filter/inc filter/source l10ntools/inc l10ntools/source sot/inc sot/source svx/inc svx/source unusedcode.easy xmloff/inc xmloff/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Thu Feb 23 20:34:33 PST 2012
editeng/inc/editeng/unoviwou.hxx | 4 -
editeng/source/uno/unoviwou.cxx | 5 -
filter/inc/filter/msfilter/msdffimp.hxx | 2
filter/source/msfilter/msdffimp.cxx | 81 -------------------------
l10ntools/inc/export.hxx | 5 -
l10ntools/source/export2.cxx | 31 ---------
sot/inc/sot/factory.hxx | 1
sot/inc/sot/object.hxx | 102 --------------------------------
sot/inc/sot/storage.hxx | 2
sot/source/base/factory.cxx | 17 -----
sot/source/base/object.cxx | 29 ---------
sot/source/sdstor/storage.cxx | 22 ------
svx/inc/svx/rulritem.hxx | 1
svx/source/dialog/rulritem.cxx | 12 ---
unusedcode.easy | 7 --
xmloff/inc/xmloff/xmlnumfi.hxx | 1
xmloff/source/style/xmlnumfi.cxx | 47 --------------
17 files changed, 369 deletions(-)
New commits:
commit a3fccd27deeee38af5bb08c31e6317002a0e3e9e
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Fri Feb 24 03:33:36 2012 +0100
unusedcode.easy: remove unused code
diff --git a/editeng/inc/editeng/unoviwou.hxx b/editeng/inc/editeng/unoviwou.hxx
index 6c54f90..61a4094 100644
--- a/editeng/inc/editeng/unoviwou.hxx
+++ b/editeng/inc/editeng/unoviwou.hxx
@@ -59,10 +59,6 @@ public:
virtual sal_Bool Copy();
virtual sal_Bool Cut();
virtual sal_Bool Paste();
-
- /// Set the top, left position of the underlying draw shape, to
- /// allow EditEngine offset calculations
- void SetShapePos( const Point& rShapePosTopLeft );
};
#endif
diff --git a/editeng/source/uno/unoviwou.cxx b/editeng/source/uno/unoviwou.cxx
index 3d9ddf0..c4a38b0 100644
--- a/editeng/source/uno/unoviwou.cxx
+++ b/editeng/source/uno/unoviwou.cxx
@@ -163,9 +163,4 @@ sal_Bool SvxDrawOutlinerViewForwarder::Paste()
return sal_True;
}
-void SvxDrawOutlinerViewForwarder::SetShapePos( const Point& rShapePosTopLeft )
-{
- maTextShapeTopLeft = rShapePosTopLeft;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/filter/inc/filter/msfilter/msdffimp.hxx
index e2d6ced..1616adb 100644
--- a/filter/inc/filter/msfilter/msdffimp.hxx
+++ b/filter/inc/filter/msfilter/msdffimp.hxx
@@ -519,7 +519,6 @@ protected :
const unsigned long nDrawingContainerId );
bool ReadGraphic( SvStream& rSt, sal_uLong nIndex, Graphic& rGraphic ) const;
- SdrObject* ImportFontWork( SvStream&, SfxItemSet&, Rectangle& rBoundRect ) const;
SdrObject* ImportGraphic( SvStream&, SfxItemSet&, const DffObjData& );
// #i32596# - pass <nCalledByGroup> to method
// Needed in the Writer Microsoft Word import to avoid import of OLE objects
@@ -530,7 +529,6 @@ protected :
const Rectangle& rVisArea,
const int _nCalledByGroup,
sal_Int64 nAspect ) const;
- SdrObject* GetAutoForm( MSO_SPT eTyp ) const;
static com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > CheckForConvertToSOObj(
sal_uInt32 nConvertFlags, SotStorage& rSrcStg,
const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xDestStg,
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index da90330..a39a556 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -4014,73 +4014,6 @@ rtl::OUString SvxMSDffManager::MSDFFReadZString(SvStream& rIn,
return sBuf.EraseTrailingChars( 0 );
}
-SdrObject* SvxMSDffManager::ImportFontWork( SvStream& rStCt, SfxItemSet& rSet, Rectangle& rBoundRect ) const
-{
- SdrObject* pRet = NULL;
- String aObjectText;
- String aFontName;
- sal_Bool bTextRotate = sal_False;
-
- ((SvxMSDffManager*)this)->mnFix16Angle = 0; // we don't want to use this property in future
- if ( SeekToContent( DFF_Prop_gtextUNICODE, rStCt ) )
- aObjectText = MSDFFReadZString( rStCt, GetPropertyValue( DFF_Prop_gtextUNICODE ), sal_True );
- if ( SeekToContent( DFF_Prop_gtextFont, rStCt ) )
- aFontName = MSDFFReadZString( rStCt, GetPropertyValue( DFF_Prop_gtextFont ), sal_True );
- if ( GetPropertyValue( DFF_Prop_gtextFStrikethrough, 0 ) & 0x2000 )
- {
- // Text ist senkrecht formatiert, Box Kippen
- sal_Int32 nHalfWidth = ( rBoundRect.GetWidth() + 1) >> 1;
- sal_Int32 nHalfHeight = ( rBoundRect.GetHeight() + 1) >> 1;
- Point aTopLeft( rBoundRect.Left() + nHalfWidth - nHalfHeight,
- rBoundRect.Top() + nHalfHeight - nHalfWidth);
- Size aNewSize( rBoundRect.GetHeight(), rBoundRect.GetWidth() );
- Rectangle aNewRect( aTopLeft, aNewSize );
- rBoundRect = aNewRect;
-
- String aSrcText( aObjectText );
- aObjectText.Erase();
- for( sal_uInt16 a = 0; a < aSrcText.Len(); a++ )
- {
- aObjectText += aSrcText.GetChar( a );
- aObjectText += '\n';
- }
- rSet.Put( SdrTextHorzAdjustItem( SDRTEXTHORZADJUST_CENTER ) );
- bTextRotate = sal_True;
- }
- if ( aObjectText.Len() )
- { // FontWork-Objekt Mit dem Text in aObjectText erzeugen
- SdrObject* pNewObj = new SdrRectObj( OBJ_TEXT, rBoundRect );
- if( pNewObj )
- {
- pNewObj->SetModel( pSdrModel );
- ((SdrRectObj*)pNewObj)->SetText( aObjectText );
- SdrFitToSizeType eFTS = SDRTEXTFIT_PROPORTIONAL;
- rSet.Put( SdrTextFitToSizeTypeItem( eFTS ) );
- rSet.Put( SdrTextAutoGrowHeightItem( sal_False ) );
- rSet.Put( SdrTextAutoGrowWidthItem( sal_False ) );
- rSet.Put( SvxFontItem( FAMILY_DONTKNOW, aFontName, String(),
- PITCH_DONTKNOW, RTL_TEXTENCODING_DONTKNOW, EE_CHAR_FONTINFO ));
-
- pNewObj->SetMergedItemSet(rSet);
-
- pRet = pNewObj->ConvertToPolyObj( sal_False, sal_False );
- if( !pRet )
- pRet = pNewObj;
- else
- {
- pRet->NbcSetSnapRect( rBoundRect );
- SdrObject::Free( pNewObj );
- }
- if( bTextRotate )
- {
- double a = 9000 * nPi180;
- pRet->NbcRotate( rBoundRect.Center(), 9000, sin( a ), cos( a ) );
- }
- }
- }
- return pRet;
-}
-
static Size lcl_GetPrefSize(const Graphic& rGraf, MapMode aWanted)
{
MapMode aPrefMapMode(rGraf.GetPrefMapMode());
@@ -7581,20 +7514,6 @@ SdrOle2Obj* SvxMSDffManager::CreateSdrOLEFromStorage(
return pRet;
}
-SdrObject* SvxMSDffManager::GetAutoForm( MSO_SPT eTyp ) const
-{
- SdrObject* pRet = NULL;
-
- if(120 >= sal_uInt16(eTyp))
- {
- pRet = new SdrRectObj();
- }
-
- DBG_ASSERT(pRet, "SvxMSDffManager::GetAutoForm -> UNKNOWN AUTOFORM");
-
- return pRet;
-}
-
sal_Bool SvxMSDffManager::SetPropValue( const uno::Any& rAny, const uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
const String& rPropName, sal_Bool bTestPropertyAvailability )
{
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 97efcd9..760a745 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -310,11 +310,6 @@ public:
static void Languages( std::vector<rtl::OString>::const_iterator& begin , std::vector<rtl::OString>::const_iterator& end );
- static void DumpExportList(const rtl::OString& rListName,
- ExportList& aList);
- static void DumpMap(const rtl::OString& rMapName,
- OStringHashMap& aMap);
-
private:
static std::vector<rtl::OString> aLanguages;
static std::vector<rtl::OString> aForcedLanguages;
diff --git a/l10ntools/source/export2.cxx b/l10ntools/source/export2.cxx
index 1341c41..013ae90 100644
--- a/l10ntools/source/export2.cxx
+++ b/l10ntools/source/export2.cxx
@@ -91,37 +91,6 @@ rtl::OString Export::sLanguages;
rtl::OString Export::sForcedLanguages;
/*****************************************************************************/
-void Export::DumpExportList(const rtl::OString& rListName, ExportList& aList)
-{
- printf( "%s\n", rListName.getStr() );
- rtl::OString l;
- ExportListEntry* aEntry;
- for( unsigned int x = 0; x < aList.size() ; ++x )
- {
- aEntry = (ExportListEntry*) aList[ x ];
- Export::DumpMap( l , *aEntry );
- }
- printf("\n");
-}
-
-void Export::DumpMap(const rtl::OString& rMapName,
- OStringHashMap& aMap)
-{
- if( rMapName.getLength() )
- printf("MapName %s\n", rMapName.getStr());
- if( aMap.size() < 1 )
- return;
- for(OStringHashMap::const_iterator idbg = aMap.begin(); idbg != aMap.end(); ++idbg)
- {
- rtl::OString a( idbg->first );
- rtl::OString b( idbg->second );
- printf("[%s]= %s",a.getStr(),b.getStr());
- printf("\n");
- }
- printf("\n");
- return;
-}
-
/*****************************************************************************/
void Export::SetLanguages( std::vector<rtl::OString> val ){
/*****************************************************************************/
diff --git a/svx/inc/svx/rulritem.hxx b/svx/inc/svx/rulritem.hxx
index e1c4413..b05896a 100644
--- a/svx/inc/svx/rulritem.hxx
+++ b/svx/inc/svx/rulritem.hxx
@@ -235,7 +235,6 @@ public:
sal_Bool IsOrtho () const { return sal_False ; }
sal_Bool IsConsistent() const { return nActColumn < aColumns.size(); }
- long GetVisibleRight() const;// right visible edge of the current column
};
// class SvxObjectItem ---------------------------------------------------
diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx
index dc9af26..9b8df44 100644
--- a/svx/source/dialog/rulritem.cxx
+++ b/svx/source/dialog/rulritem.cxx
@@ -549,18 +549,6 @@ sal_Bool SvxColumnItem::CalcOrtho() const
//------------------------------------------------------------------------
-long SvxColumnItem::GetVisibleRight() const
-{
- sal_uInt16 nIdx = 0;
-
- for ( sal_uInt16 i = 0; i < nActColumn; ++i )
- {
- if ( (*this)[i].bVisible )
- ++nIdx;
- }
- return (*this)[nIdx].nEnd;
-}
-
bool SvxColumnItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
{
nMemberId &= ~CONVERT_TWIPS;
diff --git a/unusedcode.easy b/unusedcode.easy
index a2edafd..e845b81 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -212,7 +212,6 @@ SvXMLImport::SetError(int, rtl::OUString const&, rtl::OUString const&, rtl::OUSt
SvXMLImport::SetError(int, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&)
SvXMLImportContexts_Impl::DeleteAndDestroy(unsigned short, unsigned short)
SvXMLImportPropertyMapper::importXML(std::__debug::vector<XMLPropertyState, std::allocator<XMLPropertyState> >&, com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>, SvXMLUnitConverter const&, SvXMLNamespaceMap const&, unsigned int) const
-SvXMLNumFormatContext::AddCondition(int, rtl::OUString const&, LocaleDataWrapper const&)
SvXMLStyleIndices_Impl::GetPos(SvXMLStyleIndex_Impl const*) const
SvXMLStyleIndices_Impl::Remove(SvXMLStyleIndex_Impl*)
SvXMLTokenMap_Impl::Insert(SvXMLTokenMapEntry_Impl* const&, unsigned short&)
@@ -245,17 +244,13 @@ SvxAutocorrWordList::Remove(unsigned short, unsigned short)
SvxChartDataDescrItem::SvxChartDataDescrItem(SvxChartDataDescr, unsigned short)
SvxChartTextOrientItem::SvxChartTextOrientItem(SvxChartTextOrient, unsigned short)
SvxColorValueSet::SvxColorValueSet(Window*, long)
-SvxColumnItem::GetVisibleRight() const
SvxDoCapitals::Do(String const&, unsigned short, unsigned short, unsigned char)
-SvxDrawOutlinerViewForwarder::SetShapePos(Point const&)
SvxDrawPage::SvxDrawPage()
SvxEditSourceHelper::UserSpaceToEE(Rectangle const&, Size const&, bool)
SvxFrameDirectionItem::SvxFrameDirectionItem(unsigned short)
SvxIMapDlg::GetTargetList() const
SvxJustifyMethodItem::SvxJustifyMethodItem(unsigned short)
SvxLanguageBox::SvxLanguageBox(Window*, long, unsigned char)
-SvxMSDffManager::GetAutoForm(MSO_SPT) const
-SvxMSDffManager::ImportFontWork(SvStream&, SfxItemSet&, Rectangle&) const
SvxMSDffManager::Scale(PolyPolygon&) const
SvxMSDffManager::Scale(Rectangle&) const
SvxMSDffShapeInfos::Insert(SvxMSDffShapeInfo* const&, unsigned short&)
diff --git a/xmloff/inc/xmloff/xmlnumfi.hxx b/xmloff/inc/xmloff/xmlnumfi.hxx
index d001696..cd93e81 100644
--- a/xmloff/inc/xmloff/xmlnumfi.hxx
+++ b/xmloff/inc/xmloff/xmlnumfi.hxx
@@ -213,7 +213,6 @@ public:
void AddNfKeyword( sal_uInt16 nIndex );
sal_Bool ReplaceNfKeyword( sal_uInt16 nOld, sal_uInt16 nNew );
void AddCondition( const sal_Int32 nIndex );
- void AddCondition( const sal_Int32 nIndex, const rtl::OUString& rFormat, const LocaleDataWrapper& rData );
void AddCondition( const rtl::OUString& rCondition, const rtl::OUString& rApplyName );
void AddColor( sal_uInt32 const nColor );
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 5483632..f428ab9 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -2064,53 +2064,6 @@ void SvXMLNumFormatContext::AddCondition( const sal_Int32 nIndex )
}
}
-void SvXMLNumFormatContext::AddCondition( const sal_Int32 nIndex, const rtl::OUString& rFormat, const LocaleDataWrapper& rData )
-{
- rtl::OUString rCondition = aMyConditions[nIndex].sCondition;
- OUString sValue(RTL_CONSTASCII_USTRINGPARAM("value()")); //! define constant
- sal_Int32 nValLen = sValue.getLength();
-
- if ( rCondition.copy( 0, nValLen ) == sValue )
- {
- //! test for valid conditions
- //! test for default conditions
-
- OUString sRealCond = rCondition.copy( nValLen, rCondition.getLength() - nValLen );
- sal_Bool bDefaultCond = sal_False;
-
- //! collect all conditions first and adjust default to >=0, >0 or <0 depending on count
- //! allow blanks in conditions
- sal_Bool bFirstCond = ( aConditions.getLength() == 0 );
- if ( bFirstCond && aMyConditions.size() == 1 && sRealCond.compareToAscii( ">=0" ) == 0 )
- bDefaultCond = sal_True;
-
- if ( nType == XML_TOK_STYLES_TEXT_STYLE && nIndex == 2 )
- {
- // The third condition in a number format with a text part can only be
- // "all other numbers", the condition string must be empty.
- bDefaultCond = sal_True;
- }
-
- if (!bDefaultCond)
- {
- sal_Int32 nPos = sRealCond.indexOf( '.' );
- if ( nPos >= 0 )
- { // #i8026# #103991# localize decimal separator
- const String& rDecSep = rData.getNumDecimalSep();
- if ( rDecSep.Len() > 1 || rDecSep.GetChar(0) != '.' )
- sRealCond = sRealCond.replaceAt( nPos, 1, rDecSep );
- }
- aConditions.append( (sal_Unicode) '[' );
- aConditions.append( sRealCond );
- aConditions.append( (sal_Unicode) ']' );
- }
-
- aConditions.append( rFormat );
-
- aConditions.append( (sal_Unicode) ';' );
- }
-}
-
void SvXMLNumFormatContext::AddCondition( const rtl::OUString& rCondition, const rtl::OUString& rApplyName )
{
MyCondition aCondition;
commit 695dca68537e56e66657a43667793af5eb4b6695
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Fri Feb 24 02:18:32 2012 +0100
unusedcode.easy: OwnerLock includes this feature
diff --git a/sot/inc/sot/object.hxx b/sot/inc/sot/object.hxx
index 1d98d44..326d651 100644
--- a/sot/inc/sot/object.hxx
+++ b/sot/inc/sot/object.hxx
@@ -313,7 +313,6 @@ public:
sal_uInt16 GetStrongLockCount() const { return nStrongLockCount; }
void OwnerLock( sal_Bool bLock );
- void RemoveOwnerLock();
sal_Bool DoClose();
sal_Bool IsInClose() const { return bInClose; }
diff --git a/sot/source/base/object.cxx b/sot/source/base/object.cxx
index e1d3f67..0c293fe 100644
--- a/sot/source/base/object.cxx
+++ b/sot/source/base/object.cxx
@@ -146,18 +146,6 @@ void SotObject::OwnerLock
}
}
-void SotObject::RemoveOwnerLock()
-{
- if ( nOwnerLockCount )
- {
- --nOwnerLockCount;
- ReleaseRef();
- }
- else {
- OSL_FAIL("OwnerLockCount underflow!");
- }
-}
-
//=========================================================================
sal_Bool SotObject::DoClose()
{
diff --git a/unusedcode.easy b/unusedcode.easy
index 96a525b..a2edafd 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -165,7 +165,6 @@ SortedPositions_SAR::Replace(unsigned int const&, unsigned short)
SortedPositions_SAR::Replace(unsigned int const*, unsigned short, unsigned short)
SortedPositions_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned int const&, void*), void*)
SotExchange::GetExchangeAction(com::sun::star::uno::Reference<com::sun::star::datatransfer::XTransferable> const&, unsigned short, unsigned short, unsigned short, unsigned long&, unsigned short&, unsigned long)
-SotObject::RemoveOwnerLock()
SotStorage::GetProperty(String const&, String const&, com::sun::star::uno::Any&)
SpanStyleManager::get(WPXString const&) const
SpinButton::SpinButton(Window*, ResId const&)
commit 323fd82da0738b126335d4458f8a38abb26fa722
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Fri Feb 24 05:33:40 2012 +0100
unusedcode.easy: Remove SotFactory::TestInvariant()
Also CALL_TEST_INVARIANT is never used again.
diff --git a/sot/inc/sot/factory.hxx b/sot/inc/sot/factory.hxx
index 28f4cd6..4655d26 100644
--- a/sot/inc/sot/factory.hxx
+++ b/sot/inc/sot/factory.hxx
@@ -58,7 +58,6 @@ public:
TYPEINFO();
static void IncSvObjectCount( SotObject * = NULL );
static void DecSvObjectCount( SotObject * = NULL );
- static void TestInvariant();
static const SotFactory * Find( const SvGlobalName & );
diff --git a/sot/inc/sot/object.hxx b/sot/inc/sot/object.hxx
index 45c317c..1d98d44 100644
--- a/sot/inc/sot/object.hxx
+++ b/sot/inc/sot/object.hxx
@@ -37,106 +37,6 @@
/*************************************************************************
*************************************************************************/
-#define TEST_INVARIANT
-#ifdef TEST_INVARIANT
-#define SO2_DECL_INVARIANT() \
- virtual void TestObjRef(); \
- void TestMemberObjRef(); \
- virtual void TestInvariant(); \
- void TestMemberInvariant();
-
-#define SO2_IMPL_INVARIANT(ClassName) \
-void ClassName::TestObjRef() \
-{ \
- TestMemberObjRef(); \
-} \
-void ClassName::TestInvariant() \
-{ \
- TestMemberInvariant(); \
-}
-
-#define SO2_IMPL_INVARIANT1(ClassName,Super1) \
-void ClassName::TestObjRef() \
-{ \
- TestMemberObjRef(); \
- Super1::TestObjRef(); \
-} \
-void ClassName::TestInvariant() \
-{ \
- TestMemberInvariant(); \
- Super1::TestInvariant(); \
-}
-
-#define SO2_IMPL_INVARIANT2(ClassName,Super1,Super2) \
-void ClassName::TestObjRef() \
-{ \
- TestMemberObjRef(); \
- Super1::TestObjRef(); \
- Super2::TestObjRef(); \
-} \
-void ClassName::TestInvariant() \
-{ \
- TestMemberInvariant(); \
- Super1::TestInvariant(); \
- Super2::TestInvariant(); \
-}
-
-#define SO2_IMPL_INVARIANT3(ClassName,Super1,Super2,Super3) \
-void ClassName::TestObjRef() \
-{ \
- TestMemberObjRef(); \
- Super1::TestObjRef(); \
- Super2::TestObjRef(); \
- Super3::TestObjRef(); \
-} \
-void ClassName::TestInvariant() \
-{ \
- TestMemberInvariant(); \
- Super1::TestInvariant(); \
- Super2::TestInvariant(); \
- Super3::TestInvariant(); \
-}
-
-#define SO2_IMPL_INVARIANT4(ClassName,Super1,Super2,Super3,Super4) \
-void ClassName::TestObjRef() \
-{ \
- TestMemberObjRef(); \
- Super1::TestObjRef(); \
- Super2::TestObjRef(); \
- Super3::TestObjRef(); \
- Super4::TestObjRef(); \
-} \
-void ClassName::TestInvariant() \
-{ \
- TestMemberInvariant(); \
- Super1::TestInvariant(); \
- Super2::TestInvariant(); \
- Super3::TestInvariant(); \
- Super4::TestInvariant(); \
-}
-
-#ifdef DBG_UTIL
-#define CALL_TEST_INVARIANT() SotFactory::TestInvariant()
-#else
-#define CALL_TEST_INVARIANT()
-#endif // DBG_UTIL
-
-#else // TEST_INVARIANT
-
-#define SO2_DECL_INVARIANT()
-
-#define SO2_IMPL_INVARIANT(ClassName)
-#define SO2_IMPL_INVARIANT1(ClassName,Super1)
-#define SO2_IMPL_INVARIANT2(ClassName,Super1,Super2)
-#define SO2_IMPL_INVARIANT3(ClassName,Super1,Super2,Super3)
-#define SO2_IMPL_INVARIANT4(ClassName,Super1,Super2,Super3,Super4)
-
-#define CALL_TEST_INVARIANT()
-
-#endif // TEST_INVARIANT
-
-/**************************************************************************
-**************************************************************************/
#define SO2_DECL_BASIC_CLASS_DLL(ClassName,FacName) \
private: \
static SotFactory ** GetFactoryAdress() \
@@ -400,7 +300,6 @@ protected:
public:
SotObject();
SO2_DECL_BASIC_CLASS_DLL(SotObject,SOTDATA())
- SO2_DECL_INVARIANT()
// Nur damit die Makros in So3 nicht ganz ausufern
virtual IUnknown * GetInterface( const SvGlobalName & );
diff --git a/sot/inc/sot/storage.hxx b/sot/inc/sot/storage.hxx
index 2057bac..b77d6dd 100644
--- a/sot/inc/sot/storage.hxx
+++ b/sot/inc/sot/storage.hxx
@@ -79,7 +79,6 @@ public:
SotStorageStream( BaseStorageStream *pStm );
SotStorageStream();
SO2_DECL_BASIC_CLASS_DLL(SotStorageStream,SOTDATA())
- SO2_DECL_INVARIANT()
using SvStream::SyncSvStream;
virtual void SyncSvStream();
@@ -143,7 +142,6 @@ public:
SotStorage( SvStream * pStm, sal_Bool bDelete );
SotStorage();
SO2_DECL_BASIC_CLASS_DLL(SotStorage,SOTDATA())
- SO2_DECL_INVARIANT()
SvMemoryStream * CreateMemoryStream();
const SvStream * GetSvStream();
diff --git a/sot/source/base/factory.cxx b/sot/source/base/factory.cxx
index 830c6be..b9e29e5 100644
--- a/sot/source/base/factory.cxx
+++ b/sot/source/base/factory.cxx
@@ -189,23 +189,6 @@ void SotFactory::DecSvObjectCount( SotObject * pObj )
}
}
-
-/*************************************************************************
-|* SotFactory::TestInvariant()
-|*
-|* Beschreibung
-*************************************************************************/
-void SotFactory::TestInvariant()
-{
-#ifdef TEST_INVARIANT
- SotData_Impl * pSotData = SOTDATA();
-
- std::list<SotObject*>::iterator it;
- for( it = pSotData->aObjectList.begin(); it != pSotData->aObjectList.end(); ++it )
- (*it)->TestInvariant();
-#endif
-}
-
/*************************************************************************
|* SotFactory::CreateInstance()
|*
diff --git a/sot/source/base/object.cxx b/sot/source/base/object.cxx
index ac8e128..e1d3f67 100644
--- a/sot/source/base/object.cxx
+++ b/sot/source/base/object.cxx
@@ -49,23 +49,6 @@ TYPEINIT1(SotObjectFactory,SotFactory);
SO2_IMPL_BASIC_CLASS_DLL(SotObject,SotObjectFactory,
SvGlobalName( 0xf44b7830, 0xf83c, 0x11d0,
0xaa, 0xa1, 0x0, 0xa0, 0x24, 0x9d, 0x55, 0x90 ) )
-SO2_IMPL_INVARIANT(SotObject)
-
-/*************************************************************************
-|* SotObject::TestMemberObjRef()
-|*
-|* Beschreibung:
-*************************************************************************/
-void SotObject::TestMemberObjRef() {}
-
-/*************************************************************************
-|* SotObject::TestMemberObjRef()
-|*
-|* Beschreibung:
-*************************************************************************/
-#ifdef TEST_INVARIANT
-void SotObject::TestMemberInvariant() {}
-#endif
/*************************************************************************
|* SotObject::SotObject()
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index 8b7cb30..1006b7c 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -67,14 +67,6 @@ TYPEINIT1(SotStorageStreamFactory,SotFactory);
SO2_IMPL_BASIC_CLASS1_DLL(SotStorageStream,SotStorageStreamFactory,SotObject,
SvGlobalName( 0xd7deb420, 0xf902, 0x11d0,
0xaa, 0xa1, 0x0, 0xa0, 0x24, 0x9d, 0x55, 0x90 ) )
-SO2_IMPL_INVARIANT(SotStorageStream)
-
-
-void SotStorageStream::TestMemberObjRef() {}
-
-#ifdef TEST_INVARIANT
-void SotStorageStream::TestMemberInvariant() {}
-#endif
/************************************************************************
|* SotStorageStream::SotStorageStream()
@@ -435,20 +427,6 @@ TYPEINIT1(SotStorageFactory,SotFactory);
SO2_IMPL_BASIC_CLASS1_DLL(SotStorage,SotStorageFactory,SotObject,
SvGlobalName( 0x980ce7e0, 0xf905, 0x11d0,
0xaa, 0xa1, 0x0, 0xa0, 0x24, 0x9d, 0x55, 0x90 ) )
-SO2_IMPL_INVARIANT(SotStorage)
-
-
-/************************************************************************
-|*
-|* SotStorage::Tes*()
-|*
-|* Beschreibung
-*************************************************************************/
-void SotStorage::TestMemberObjRef() {}
-
-#ifdef TEST_INVARIANT
-void SotStorage::TestMemberInvariant() {}
-#endif
/************************************************************************
|*
diff --git a/unusedcode.easy b/unusedcode.easy
index 6d4cb7f..96a525b 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -165,7 +165,6 @@ SortedPositions_SAR::Replace(unsigned int const&, unsigned short)
SortedPositions_SAR::Replace(unsigned int const*, unsigned short, unsigned short)
SortedPositions_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned int const&, void*), void*)
SotExchange::GetExchangeAction(com::sun::star::uno::Reference<com::sun::star::datatransfer::XTransferable> const&, unsigned short, unsigned short, unsigned short, unsigned long&, unsigned short&, unsigned long)
-SotFactory::TestInvariant()
SotObject::RemoveOwnerLock()
SotStorage::GetProperty(String const&, String const&, com::sun::star::uno::Any&)
SpanStyleManager::get(WPXString const&) const
More information about the Libreoffice-commits
mailing list