[Libreoffice-commits] core.git: 7 commits - editeng/source include/editeng include/sfx2 include/sot include/svtools include/svx include/tools include/vcl sfx2/source sot/source svtools/source svx/source sw/inc sw/source tools/source vcl/source
Noel Grandin
noel at peralex.com
Mon Jun 29 01:07:45 PDT 2015
editeng/source/misc/svxacorr.cxx | 2 --
include/editeng/svxacorr.hxx | 2 --
include/sfx2/frame.hxx | 2 --
include/sot/factory.hxx | 1 -
include/sot/filelist.hxx | 2 --
include/svtools/grfmgr.hxx | 3 ---
include/svtools/imap.hxx | 2 --
include/svx/svdobj.hxx | 2 --
include/svx/svdotext.hxx | 1 -
include/svx/xexch.hxx | 2 --
include/tools/stream.hxx | 1 -
include/vcl/graph.hxx | 3 ---
sfx2/source/view/frame.cxx | 1 -
sot/source/base/factory.cxx | 1 -
sot/source/base/filelist.cxx | 2 --
sot/source/base/object.cxx | 2 --
sot/source/sdstor/storage.cxx | 4 ----
svtools/source/graphic/grfmgr.cxx | 2 --
svtools/source/misc/imap2.cxx | 2 --
svx/source/svdraw/svdobj.cxx | 2 --
svx/source/svdraw/svdotxln.cxx | 2 --
svx/source/xoutdev/xexch.cxx | 2 --
sw/inc/swacorr.hxx | 2 --
sw/source/core/sw3io/swacorr.cxx | 3 ---
tools/source/stream/stream.cxx | 2 --
vcl/source/gdi/graph.cxx | 2 --
26 files changed, 52 deletions(-)
New commits:
commit 39fd37f39db37a83c4a1491d68518e721b04fc5f
Author: Noel Grandin <noel at peralex.com>
Date: Fri Jun 26 14:51:56 2015 +0200
remove custom RTTI from SvxAutoCorrect
unused
Change-Id: I2f4504fdbe88fa83abe6da8a1f733f9ae1c2742d
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 3095aff..426c436 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -95,8 +95,6 @@ static const sal_Char sImplWordChars[] = "-'";
OUString EncryptBlockName_Imp(const OUString& rName);
-TYPEINIT0(SvxAutoCorrect)
-
typedef SvxAutoCorrectLanguageLists* SvxAutoCorrectLanguageListsPtr;
static inline bool IsWordDelim( const sal_Unicode c )
diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx
index b2f2a04..7de2a0e 100644
--- a/include/editeng/svxacorr.hxx
+++ b/include/editeng/svxacorr.hxx
@@ -272,8 +272,6 @@ public:
virtual void refreshBlockList( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rStg);
- TYPEINFO();
-
SvxAutoCorrect( const OUString& rShareAutocorrFile,
const OUString& rUserAutocorrFile );
SvxAutoCorrect( const SvxAutoCorrect& );
diff --git a/sw/inc/swacorr.hxx b/sw/inc/swacorr.hxx
index ebcb304..f913d81 100644
--- a/sw/inc/swacorr.hxx
+++ b/sw/inc/swacorr.hxx
@@ -46,8 +46,6 @@ protected:
const OUString& rFileName, const OUString& rShort, SfxObjectShell&, OUString& ) SAL_OVERRIDE;
public:
- TYPEINFO_OVERRIDE();
-
SwAutoCorrect( const SvxAutoCorrect& rACorr );
virtual ~SwAutoCorrect();
};
diff --git a/sw/source/core/sw3io/swacorr.cxx b/sw/source/core/sw3io/swacorr.cxx
index 1a236fa..ed70466 100644
--- a/sw/source/core/sw3io/swacorr.cxx
+++ b/sw/source/core/sw3io/swacorr.cxx
@@ -27,9 +27,6 @@
using namespace ::com::sun::star;
-TYPEINIT1( SwAutoCorrect, SvxAutoCorrect );
-
-
/**
* Returns the replacement text
*
commit 0f70a4f69c2e4aa9484294c3b1f6fc652757f79e
Author: Noel Grandin <noel at peralex.com>
Date: Fri Jun 26 14:19:46 2015 +0200
remove custom RTTI from SfxFrame
unused
Change-Id: I009f43d192942c14d0ccbf56c78257570c65e41a
diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx
index d9c3620..6c2512a 100644
--- a/include/sfx2/frame.hxx
+++ b/include/sfx2/frame.hxx
@@ -116,8 +116,6 @@ protected:
SAL_DLLPRIVATE SfxFrame( vcl::Window& i_rContainerWindow, bool bHidden );
public:
- TYPEINFO();
-
static SfxFrame* Create( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame );
static ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >
CreateBlankFrame();
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index a371774..8f2d624 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -75,7 +75,6 @@ using namespace ::com::sun::star::util;
using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::container;
-TYPEINIT1(SfxFrame, SfxListener);
TYPEINIT1_AUTOFACTORY(SfxFrameItem, SfxPoolItem);
TYPEINIT1(SfxUsrAnyItem, SfxPoolItem);
TYPEINIT1_AUTOFACTORY(SfxUnoFrameItem, SfxPoolItem);
commit 4e99430e63a940d600cad2aaf1f0e992034b66e2
Author: Noel Grandin <noel at peralex.com>
Date: Fri Jun 26 13:17:34 2015 +0200
remove custom RTTI from SotFactory
unused
Change-Id: I22f55aa403cd97ce2c5bf6a521c14a693e4373a7
diff --git a/include/sot/factory.hxx b/include/sot/factory.hxx
index d5a4f2a..b5f5ff6 100644
--- a/include/sot/factory.hxx
+++ b/include/sot/factory.hxx
@@ -46,7 +46,6 @@ class SOT_DLLPUBLIC SotFactory : public SvGlobalName
protected:
virtual ~SotFactory();
public:
- TYPEINFO();
static void IncSvObjectCount( SotObject * = NULL );
static void DecSvObjectCount( SotObject * = NULL );
diff --git a/sot/source/base/factory.cxx b/sot/source/base/factory.cxx
index 7f13cf9..102e0fc 100644
--- a/sot/source/base/factory.cxx
+++ b/sot/source/base/factory.cxx
@@ -73,7 +73,6 @@ SotData_Impl * SOTDATA()
|*
|* Beschreibung
*************************************************************************/
-TYPEINIT0(SotFactory);
SotFactory::SotFactory( const SvGlobalName & rName,
const OUString & rClassName,
diff --git a/sot/source/base/object.cxx b/sot/source/base/object.cxx
index ddce68b..b809642 100644
--- a/sot/source/base/object.cxx
+++ b/sot/source/base/object.cxx
@@ -24,14 +24,12 @@
class SotObjectFactory : public SotFactory
{
public:
- TYPEINFO_OVERRIDE();
SotObjectFactory( const SvGlobalName & rName,
const OUString & rClassName,
CreateInstanceType pCreateFuncP )
: SotFactory( rName, rClassName, pCreateFuncP )
{}
};
-TYPEINIT1(SotObjectFactory,SotFactory);
SO2_IMPL_BASIC_CLASS_DLL(SotObject,SotObjectFactory,
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index 4421bcd..1a01a04 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -45,14 +45,12 @@ using namespace ::com::sun::star;
class SotStorageStreamFactory : public SotFactory
{
public:
- TYPEINFO_OVERRIDE();
SotStorageStreamFactory( const SvGlobalName & rName,
const OUString & rClassName,
CreateInstanceType pCreateFuncP )
: SotFactory( rName, rClassName, pCreateFuncP )
{}
};
-TYPEINIT1(SotStorageStreamFactory,SotFactory);
SO2_IMPL_BASIC_CLASS1_DLL(SotStorageStream,SotStorageStreamFactory,SotObject,
@@ -279,14 +277,12 @@ bool SotStorageStream::SetProperty( const OUString& rName, const ::com::sun::sta
class SotStorageFactory : public SotFactory
{
public:
- TYPEINFO_OVERRIDE();
SotStorageFactory( const SvGlobalName & rName,
const OUString & rClassName,
CreateInstanceType pCreateFuncP )
: SotFactory( rName, rClassName, pCreateFuncP )
{}
};
-TYPEINIT1(SotStorageFactory,SotFactory);
SO2_IMPL_BASIC_CLASS1_DLL(SotStorage,SotStorageFactory,SotObject,
commit b488c7eeac1a0deba393c3d7b68f3da5a89857de
Author: Noel Grandin <noel at peralex.com>
Date: Fri Jun 26 12:39:41 2015 +0200
remove custom RTTI from ImageMap
unused
Change-Id: I74a26815a5e11fd68094e70adc5ffc3bd4c83d73
diff --git a/include/svtools/imap.hxx b/include/svtools/imap.hxx
index 8255cb7..4c8f231 100644
--- a/include/svtools/imap.hxx
+++ b/include/svtools/imap.hxx
@@ -65,8 +65,6 @@ protected:
public:
- TYPEINFO();
-
ImageMap() {};
ImageMap( const OUString& rName );
ImageMap( const ImageMap& rImageMap );
diff --git a/svtools/source/misc/imap2.cxx b/svtools/source/misc/imap2.cxx
index 0ac0804..b88cd65 100644
--- a/svtools/source/misc/imap2.cxx
+++ b/svtools/source/misc/imap2.cxx
@@ -37,8 +37,6 @@
#define NOTEOL(c) ((c)!='\0')
-TYPEINIT0_AUTOFACTORY( ImageMap );
-
void IMapObject::AppendCERNCoords(OStringBuffer& rBuf, const Point& rPoint100)
{
const Point aPixPt( Application::GetDefaultDevice()->LogicToPixel( rPoint100, MapMode( MAP_100TH_MM ) ) );
commit 24c7375c335c93251c53d9cfa76974d16f803097
Author: Noel Grandin <noel at peralex.com>
Date: Fri Jun 26 11:41:04 2015 +0200
remove custom RTTI from SdrObjUserData
nothing is using it
Change-Id: I9f86b7766b40cc2c4b725795b138e008b915c4fb
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 505635a..3bc77df 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -195,8 +195,6 @@ private:
bool operator!=(const SdrObjUserData& rData) const SAL_DELETED_FUNCTION;
public:
- TYPEINFO();
-
SdrObjUserData(sal_uInt32 nInv, sal_uInt16 nId, sal_uInt16 nVer);
SdrObjUserData(const SdrObjUserData& rData);
virtual ~SdrObjUserData();
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index e8f17c6..1bbfb83 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -105,7 +105,6 @@ class ImpSdrObjTextLinkUserData : public SdrObjUserData
rtl_TextEncoding eCharSet;
public:
- TYPEINFO_OVERRIDE();
ImpSdrObjTextLinkUserData(SdrTextObj* pObj1);
virtual ~ImpSdrObjTextLinkUserData();
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 55f661d..9bf94f7 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -162,8 +162,6 @@ SdrObjMacroHitRec::SdrObjMacroHitRec() :
-TYPEINIT0(SdrObjUserData);
-
SdrObjUserData::SdrObjUserData(sal_uInt32 nInv, sal_uInt16 nId, sal_uInt16 nVer) :
nInventor(nInv),
nIdentifier(nId),
diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx
index 350ffa4..a0d8910 100644
--- a/svx/source/svdraw/svdotxln.cxx
+++ b/svx/source/svdraw/svdotxln.cxx
@@ -100,8 +100,6 @@ void ImpSdrObjTextLink::Closed()
}
-TYPEINIT1(ImpSdrObjTextLinkUserData,SdrObjUserData);
-
ImpSdrObjTextLinkUserData::ImpSdrObjTextLinkUserData(SdrTextObj* pObj1):
SdrObjUserData(SdrInventor,SDRUSERDATA_OBJTEXTLINK,0),
pObj(pObj1),
commit 6a8b38e698ba26f5a9dc8c1bd6b305ff9b3366fb
Author: Noel Grandin <noel at peralex.com>
Date: Fri Jun 26 10:33:45 2015 +0200
remove custom RTTI from XFillExchangeData
nothing is using it
Change-Id: Ie626fcb7f35d98294ec41620c679d46a34a77d90
diff --git a/include/svx/xexch.hxx b/include/svx/xexch.hxx
index cba949d..800348e 100644
--- a/include/svx/xexch.hxx
+++ b/include/svx/xexch.hxx
@@ -40,8 +40,6 @@ private:
SfxItemPool* pPool;
public:
- TYPEINFO();
-
XFillExchangeData();
XFillExchangeData(const XFillAttrSetItem& rXFillAttrSetItem);
virtual ~XFillExchangeData();
diff --git a/svx/source/xoutdev/xexch.cxx b/svx/source/xoutdev/xexch.cxx
index f3eb2fa..3889775 100644
--- a/svx/source/xoutdev/xexch.cxx
+++ b/svx/source/xoutdev/xexch.cxx
@@ -29,8 +29,6 @@
#include <boost/scoped_ptr.hpp>
-TYPEINIT0_AUTOFACTORY( XFillExchangeData );
-
/// default CTOR, for Assign()
XFillExchangeData::XFillExchangeData() :
pXFillAttrSetItem( NULL ),
commit 329350919e7407bdc217c64a5d6a0486f2b41811
Author: Noel Grandin <noel at peralex.com>
Date: Fri Jun 26 09:39:48 2015 +0200
remove custom RTTI from SvDataCopyStream
nothing is using it, except perhaps for XFillExchangeData, which was
using it incorrectly :-(
Change-Id: Ib9246a20bc97ad91d3e3e97fa642217686fc8c46
diff --git a/include/sot/filelist.hxx b/include/sot/filelist.hxx
index 1734c12..7c77fe9 100644
--- a/include/sot/filelist.hxx
+++ b/include/sot/filelist.hxx
@@ -42,8 +42,6 @@ protected:
void ClearAll();
public:
-
- TYPEINFO_OVERRIDE();
FileList() {};
virtual ~FileList();
diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx
index 089b69d..9b43de5 100644
--- a/include/svtools/grfmgr.hxx
+++ b/include/svtools/grfmgr.hxx
@@ -334,9 +334,6 @@ protected:
virtual void Assign( const SvDataCopyStream& ) SAL_OVERRIDE;
public:
-
- TYPEINFO_OVERRIDE();
-
GraphicObject( const GraphicManager* pMgr = NULL );
GraphicObject( const Graphic& rGraphic, const GraphicManager* pMgr = NULL );
GraphicObject( const GraphicObject& rCacheObj, const GraphicManager* pMgr = NULL );
diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index 75d7445c..544a5fe 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.hxx
@@ -756,7 +756,6 @@ class TOOLS_DLLPUBLIC SvDataCopyStream
{
public:
// repeated execution of Load or Assign is allowed
- TYPEINFO();
virtual ~SvDataCopyStream(){}
virtual void Load( SvStream & ) = 0;
virtual void Save( SvStream & ) = 0;
diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx
index 778c6719..3736298 100644
--- a/include/vcl/graph.hxx
+++ b/include/vcl/graph.hxx
@@ -89,9 +89,6 @@ public:
SAL_DLLPRIVATE ImpGraphic* ImplGetImpGraphic() const { return mpImpGraphic; }
public:
-
- TYPEINFO_OVERRIDE();
-
Graphic();
Graphic( const Graphic& rGraphic );
Graphic( const Bitmap& rBmp );
diff --git a/sot/source/base/filelist.cxx b/sot/source/base/filelist.cxx
index 95fdf83..8d182c5 100644
--- a/sot/source/base/filelist.cxx
+++ b/sot/source/base/filelist.cxx
@@ -25,8 +25,6 @@
#include <osl/diagnose.h>
#include <osl/thread.h>
-TYPEINIT1_AUTOFACTORY( FileList, SvDataCopyStream );
-
/*************************************************************************
|*
|* FileList - Ctor/Dtor
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index 5dc7128..63e2af5 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -56,8 +56,6 @@ struct GrfSimpleCacheObj
maGraphic( rGraphic ), maAttr( rAttr ) {}
};
-TYPEINIT1_AUTOFACTORY( GraphicObject, SvDataCopyStream );
-
// unique increasing ID for being able to detect the GraphicObject with the
// oldest last data changes
static sal_uLong aIncrementingTimeOfLastDataChange = 1;
diff --git a/svx/source/xoutdev/xexch.cxx b/svx/source/xoutdev/xexch.cxx
index 5fae82c..f3eb2fa 100644
--- a/svx/source/xoutdev/xexch.cxx
+++ b/svx/source/xoutdev/xexch.cxx
@@ -29,7 +29,7 @@
#include <boost/scoped_ptr.hpp>
-TYPEINIT1_AUTOFACTORY( XFillExchangeData, SvDataCopyStream );
+TYPEINIT0_AUTOFACTORY( XFillExchangeData );
/// default CTOR, for Assign()
XFillExchangeData::XFillExchangeData() :
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index 529f7e2..39b3d08 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -2028,8 +2028,6 @@ bool SvScriptStream::good() const
return mpHandle != NULL;
}
-TYPEINIT0 ( SvDataCopyStream )
-
void SvDataCopyStream::Assign( const SvDataCopyStream& )
{
}
diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx
index 40bd87c..393a8d6 100644
--- a/vcl/source/gdi/graph.cxx
+++ b/vcl/source/gdi/graph.cxx
@@ -178,8 +178,6 @@ static void ImplDrawDefault( OutputDevice* pOutDev, const OUString* pText,
pOutDev->Pop();
}
-TYPEINIT1_AUTOFACTORY( Graphic, SvDataCopyStream );
-
Graphic::Graphic()
{
mpImpGraphic = new ImpGraphic;
More information about the Libreoffice-commits
mailing list